Bump yangtools to 2.0.1

[l2switch.git] / parent / pom.xml

diff --git a/parent/pom.xml b/parent/pom.xml
index bb87611e2e1d53746c6706f4a70162d821ce08ad..ea805b9dce5fd7493c5009b1404f48f399021982 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5,31 +5,25 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.l2switch</groupId>
   <artifactId>l2switch-parent</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
     <codeGeneratorPath>src/main/yang-gen-code</codeGeneratorPath>
     <configCodeGeneratorPath>src/main/yang-gen-config</configCodeGeneratorPath>
-    <nexus_proxy>http://nexus.opendaylight.org/content</nexus_proxy>
-    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
-    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+    <branding.version>1.6.0-SNAPSHOT</branding.version>
+    <mdsal.version>2.4.0-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
+    <controller.mdsal.version>1.7.0-SNAPSHOT</controller.mdsal.version>
     <jung2.version>2.0.1</jung2.version>
-    <config.version>0.4.0-SNAPSHOT</config.version>
-    <openflow.plugin.version>0.2.0-SNAPSHOT</openflow.plugin.version>
-    <dlux.version>0.3.0-SNAPSHOT</dlux.version>
-    <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-    <config.packethandler.configfile>50-packethandler.xml</config.packethandler.configfile>
-    <config.loopremover.configfile>52-loopremover.xml</config.loopremover.configfile>
-    <config.arphandler.configfile>54-arphandler.xml</config.arphandler.configfile>
-    <config.addresstracker.configfile>56-addresstracker.xml</config.addresstracker.configfile>
-    <config.hosttracker.configfile>57-hosttracker.xml</config.hosttracker.configfile>
-    <config.l2switchmain.configfile>58-l2switchmain.xml</config.l2switchmain.configfile>
+    <yangtools.version>2.0.1</yangtools.version>
+    <openflow.plugin.version>0.6.0-SNAPSHOT</openflow.plugin.version>
+    <dlux.version>0.7.0-SNAPSHOT</dlux.version>
   </properties>
 
   <dependencyManagement>
@@ -44,28 +38,21 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>${mdsal.version}</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal.model</groupId>
         <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>${config.version}</version>
+        <version>${mdsal.model.version}</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -85,9 +72,19 @@
       </dependency>
 
       <dependency>
-        <groupId>org.opendaylight.controller.thirdparty</groupId>
-        <artifactId>net.sf.jung2</artifactId>
-        <version>${jung2.version}</version>
+        <groupId>net.sf.jung</groupId>
+        <artifactId>jung-api</artifactId>
+        <version>2.1.1</version>
+      </dependency>
+      <dependency>
+        <groupId>net.sf.jung</groupId>
+        <artifactId>jung-algorithms</artifactId>
+        <version>2.1.1</version>
+      </dependency>
+      <dependency>
+        <groupId>net.sf.jung</groupId>
+        <artifactId>jung-graph-impl</artifactId>
+        <version>2.1.1</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -123,34 +120,33 @@
               </plugin>
 
               <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>${checkstyle.version}</version>
-                <configuration>
-                  <failsOnError>true</failsOnError>
-                  <configLocation>controller/checkstyle.xml</configLocation>
-                  <consoleOutput>true</consoleOutput>
-                  <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                  <sourceDirectory>${project.basedir}</sourceDirectory>
-                  <includes>**\/*.java,**\/*.yang,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</includes>
-                  <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,\/,**\/xtend-gen\/,**\/yang-gen-code\/,**\/${codeGeneratorPath}\/,**\/${configCodeGeneratorPath}\/,</excludes>
-                </configuration>
-                <dependencies>
-                  <dependency>
-                    <groupId>org.opendaylight.controller</groupId>
-                    <artifactId>checkstyle</artifactId>
-                    <version>0.2.0-SNAPSHOT</version>
-                  </dependency>
-                </dependencies>
-                <executions>
-                  <execution>
-                    <id>check</id>
-                    <goals>
-                      <goal>check</goal>
-                    </goals>
-                    <phase>process-sources</phase>
-                  </execution>
-                </executions>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-checkstyle-plugin</artifactId>
+                  <configuration>
+                      <failOnViolation>true</failOnViolation>
+                      <configLocation>checkstyle-logging.xml</configLocation>
+                      <consoleOutput>true</consoleOutput>
+                      <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                      <sourceDirectory>${project.basedir}</sourceDirectory>
+                      <includes>**\/*.java,**\/*.yang,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</includes>
+                      <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/xtend-gen\/,**\/${codeGeneratorPath}\/,**\/${configCodeGeneratorPath}\/,</excludes>
+                  </configuration>
+                  <dependencies>
+                      <dependency>
+                          <groupId>org.opendaylight.yangtools</groupId>
+                          <artifactId>checkstyle-logging</artifactId>
+                          <version>${yangtools.version}</version>
+                      </dependency>
+                  </dependencies>
+                  <executions>
+                      <execution>
+                          <id>check</id>
+                          <goals>
+                              <goal>check</goal>
+                          </goals>
+                          <phase>process-sources</phase>
+                      </execution>
+                  </executions>
               </plugin>
 
               <!--  tells eclipse to import these folders into the package explorer as "source" folders
@@ -253,7 +249,7 @@
                                       </goals>
                                   </pluginExecutionFilter>
                                   <action>
-                                      <ignore />
+                                      <execute />
                                   </action>
                               </pluginExecution>
                               <pluginExecution>
@@ -310,30 +306,6 @@
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-checkstyle-plugin</artifactId>
           </plugin>
-          <plugin>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <configuration>
-              <includes>
-                <include>org.opendaylight.l2switch.*</include>
-              </includes>
-            </configuration>
-            <executions>
-              <execution>
-                <id>pre-test</id>
-                <goals>
-                  <goal>prepare-agent</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>post-test</id>
-                <goals>
-                  <goal>report</goal>
-                </goals>
-                <phase>test</phase>
-              </execution>
-            </executions>
-          </plugin>
       </plugins>
   </build>