X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=ee01d89d369c81071798209bd031b6640ee66f63;hb=42d77fc7c0b4fc944b270a29f15ae600fc494cb2;hp=c1bf621875cff26b2eb390e8ea2c6828414e4ca8;hpb=55b6b6b415e0212847baa40ece5a98330ca611c5;p=openflowjava.git

diff --git a/pom.xml b/pom.xml
index c1bf6218..ee01d89d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,25 +4,26 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.5.4-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflow-protocol-parent</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.6.4-SNAPSHOT</version>
     <name>openflowjava</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
     <modules>
+        <module>artifacts</module>
+        <module>features</module>
         <module>openflowjava-config</module>
         <module>openflow-protocol-api</module>
-        <module>openflow-protocol-spi</module>
-        <module>util</module>
         <module>openflow-protocol-impl</module>
         <module>openflow-protocol-it</module>
-        <module>features</module>
+        <module>openflow-protocol-spi</module>
         <module>simple-client</module>
+        <module>util</module>
     </modules>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/openflowjava.git</connection>
@@ -32,20 +33,15 @@
     </scm>
 
     <properties>
-        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
         <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmxGeneratorPath>${project.build.directory}/yang-gen-config</jmxGeneratorPath>
-        <karaf.distro.empty.version>1.5.0-SNAPSHOT</karaf.distro.empty.version>
+        <karaf.distro.empty.version>1.5.4-SNAPSHOT</karaf.distro.empty.version>
         <salGeneratorPath>${project.build.directory}/yang-gen-sal</salGeneratorPath>
-        <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>
-        <yang.prototype.version>1.2.0-SNAPSHOT</yang.prototype.version>
-        <ietf.model.version>2010.09.24.7-SNAPSHOT</ietf.model.version>
-        <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
-        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-        <yangtools.generator.version>0.7.0-SNAPSHOT</yangtools.generator.version>
-        <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-	<config.version>0.3.0-SNAPSHOT</config.version>
+
+        <config.version>0.3.4-SNAPSHOT</config.version>
+        <mdsal.version>1.2.4-SNAPSHOT</mdsal.version>
+        <yangtools.version>0.7.4-SNAPSHOT</yangtools.version>
 
         <!-- Sonar config -->
         <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
@@ -54,66 +50,35 @@
         <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
     </properties>
 
-    <distributionManagement>
-        <!-- OpenDayLight Released artifact -->
-        <repository>
-            <id>opendaylight-release</id>
-            <url>${nexusproxy}/repositories/opendaylight.release/</url>
-        </repository>
-        <!-- OpenDayLight Snapshot artifact -->
-        <snapshotRepository>
-            <id>opendaylight-snapshot</id>
-            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-        </snapshotRepository>
-        <!-- Site deployment -->
-        <!-- site>
-            <id>website</id>
-            <url>${sitedeploy}</url>
-        </site -->
-    </distributionManagement>
-
-
     <dependencyManagement>
         <dependencies>
-            <!-- feature dependencies -->
+            <dependency>
+              <groupId>org.opendaylight.openflowjava</groupId>
+              <artifactId>openflowjava-artifacts</artifactId>
+              <version>${project.version}</version>
+              <type>pom</type>
+              <scope>import</scope>
+            </dependency>
             <dependency>
               <groupId>org.opendaylight.yangtools</groupId>
-              <artifactId>features-yangtools</artifactId>
+              <artifactId>yangtools-artifacts</artifactId>
               <version>${yangtools.version}</version>
-              <classifier>features</classifier>
-              <type>xml</type>
+              <type>pom</type>
+              <scope>import</scope>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.controller</groupId>
-              <artifactId>features-config</artifactId>
+              <artifactId>config-artifacts</artifactId>
               <version>${config.version}</version>
-              <classifier>features</classifier>
-              <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools.model</groupId>
-                <artifactId>ietf-inet-types</artifactId>
-                <version>${ietf.model.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools.model</groupId>
-                <artifactId>ietf-yang-types</artifactId>
-                <version>${ietf.model.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools.model</groupId>
-                <artifactId>yang-ext</artifactId>
-                <version>${yang.ext.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>config-api</artifactId>
-                <version>0.3.0-SNAPSHOT</version>
+              <type>pom</type>
+              <scope>import</scope>
             </dependency>
             <dependency>
-              <groupId>org.opendaylight.yangtools</groupId>
-              <artifactId>features-test</artifactId>
-              <version>${yangtools.version}</version>
+              <groupId>org.opendaylight.controller</groupId>
+              <artifactId>mdsal-artifacts</artifactId>
+              <version>${mdsal.version}</version>
+              <scope>import</scope>
+              <type>pom</type>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -300,19 +265,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>