Code Review / l2switch.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bump yangtools to 2.0.1
[l2switch.git] / parent / pom.xml
diff --git a/parent/pom.xml b/parent/pom.xml
index 9650a87be3c38b3d0d11771bb34f40811607cc33..ea805b9dce5fd7493c5009b1404f48f399021982 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5,121 +5,90 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>3.0.2</version>
+    <relativePath/>
   </parent>
   <groupId>org.opendaylight.l2switch</groupId>
   <artifactId>l2switch-parent</artifactId>
-  <version>0.1.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.1-SNAPSHOT</mdsal.version>
-    <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
-    <ietf-yang-types.version>2010.09.24.4-SNAPSHOT</ietf-yang-types.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.2.5-SNAPSHOT</config.version>
-    <openflow.plugin.version>0.0.3-SNAPSHOT</openflow.plugin.version>
-    <dlux.version>0.1.0-SNAPSHOT</dlux.version>
-    <karaf.version>3.0.1</karaf.version>
-    <bundle.plugin.version>2.4.0</bundle.plugin.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>
     <dependencies>
-      <!-- SAL bundles -->
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-binding-api</artifactId>
-        <version>${mdsal.version}</version>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>${yangtools.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-binding-config</artifactId>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
         <version>${mdsal.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller.model</groupId>
-        <artifactId>model-inventory</artifactId>
-        <version>${mdsal.version}</version>
+        <groupId>org.opendaylight.mdsal.model</groupId>
+        <artifactId>mdsal-model-artifacts</artifactId>
+        <version>${mdsal.model.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller.model</groupId>
-        <artifactId>model-topology</artifactId>
-        <version>${mdsal.version}</version>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>${controller.mdsal.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-binding</artifactId>
-        <version>${yangtools.version}</version>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-artifacts</artifactId>
+        <version>${openflow.plugin.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-common</artifactId>
-        <version>${yangtools.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools.model</groupId>
-        <artifactId>ietf-yang-types</artifactId>
-        <version>${ietf-yang-types.version}</version>
+        <groupId>org.opendaylight.l2switch</groupId>
+        <artifactId>l2switch-artifacts</artifactId>
+        <version>${project.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
+
       <dependency>
-        <groupId>org.opendaylight.controller.model</groupId>
-        <artifactId>model-flow-service</artifactId>
-        <version>${mdsal.version}</version>
+        <groupId>net.sf.jung</groupId>
+        <artifactId>jung-api</artifactId>
+        <version>2.1.1</version>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller.thirdparty</groupId>
-        <artifactId>net.sf.jung2</artifactId>
-        <version>${jung2.version}</version>
+        <groupId>net.sf.jung</groupId>
+        <artifactId>jung-algorithms</artifactId>
+        <version>2.1.1</version>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-api</artifactId>
-        <version>${config.version}</version>
+        <groupId>net.sf.jung</groupId>
+        <artifactId>jung-graph-impl</artifactId>
+        <version>2.1.1</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
 
-  <repositories>
-    <!-- OpenDayLight Repo Mirror -->
-    <repository>
-      <id>opendaylight-mirror</id>
-      <name>opendaylight-mirror</name>
-      <url>http://nexus.opendaylight.org/content/groups/public/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-    </repository>
-
-    <!-- OpenDayLight Snapshot artifact -->
-    <repository>
-      <id>opendaylight-snapshot</id>
-      <name>opendaylight-snapshot</name>
-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-
-  </repositories>
-
   <distributionManagement>
     <!-- OpenDayLight Released artifact -->
     <repository>
@@ -151,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.0.3-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
@@ -198,6 +166,7 @@
                               <sources>
                                   <source>src/main/yang</source>
                                   <source>${codeGeneratorPath}</source>
+                                  <source>${configCodeGeneratorPath}</source>
                               </sources>
                           </configuration>
                       </execution>
@@ -210,6 +179,7 @@
                       <filesets>
                           <fileset>
                               <directory>${codeGeneratorPath}</directory>
+                              <directory>${configCodeGeneratorPath}</directory>
                               <includes>
                                   <include>**</include>
                               </includes>
@@ -239,19 +209,6 @@
                                       <ignore />
                                   </action>
                               </pluginExecution>
-                              <pluginExecution>
-                                  <pluginExecutionFilter>
-                                      <groupId>org.codehaus.enunciate</groupId>
-                                      <artifactId>maven-enunciate-plugin</artifactId>
-                                      <versionRange>[0.0,)</versionRange>
-                                      <goals>
-                                          <goal>docs</goal>
-                                      </goals>
-                                  </pluginExecutionFilter>
-                                  <action>
-                                      <ignore />
-                                  </action>
-                              </pluginExecution>
                               <pluginExecution>
                                   <pluginExecutionFilter>
                                       <groupId>org.jacoco</groupId>
@@ -292,7 +249,7 @@
                                       </goals>
                                   </pluginExecutionFilter>
                                   <action>
-                                      <ignore />
+                                      <execute />
                                   </action>
                               </pluginExecution>
                               <pluginExecution>
@@ -338,11 +295,6 @@
                       </lifecycleMappingMetadata>
                   </configuration>
               </plugin>
-              <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${bundle.plugin.version}</version>
-              </plugin>
           </plugins>
       </pluginManagement>
       <plugins>
separate out Layer 2 code