X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=74ea79e78b738788947d377ce7163938b4d8a995;hb=93cc9aa399738c2c73ef3073936cfbf08c42d0e9;hp=10034e01283c869880a927a2d104b8f27d8327ca;hpb=6545458fe6c50d7bc83400234066d2729553132b;p=openflowplugin.git

diff --git a/pom.xml b/pom.xml
index 10034e0128..74ea79e78b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,17 +44,10 @@
 
     <properties>
       <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-      <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
       <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
       <openflowjava.version>0.6.0-SNAPSHOT</openflowjava.version>
-      <openflowplugin.model.version>${project.version}</openflowplugin.model.version>
-      <controller.model.version>1.2.0-SNAPSHOT</controller.model.version>
-      <sal.binding.api.version>1.2.0-SNAPSHOT</sal.binding.api.version>
+      <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
       <sal.api.version>0.9.0-SNAPSHOT</sal.api.version>
-      <sal.connection.api.version>0.2.0-SNAPSHOT</sal.connection.api.version>
-      <sal.common.util.version>1.2.0-SNAPSHOT</sal.common.util.version>
-      <netconf.parent.version>0.3.0-SNAPSHOT</netconf.parent.version>
-      <config.parent.version>0.3.0-SNAPSHOT</config.parent.version>
       <build.helper.version>1.8</build.helper.version>
       <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
       <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
@@ -69,122 +62,66 @@
       <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
       <sonar.profile>Sonar way with Findbugs</sonar.profile>
 
-      <karaf.distro.empty.version>1.5.0-SNAPSHOT</karaf.distro.empty.version>
-      <yang.binding.version>0.7.0-SNAPSHOT</yang.binding.version>
-      <dlux.version>0.2.0-SNAPSHOT</dlux.version>
       <config.version>0.3.0-SNAPSHOT</config.version>
+      <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
+      <netconf.version>0.3.0-SNAPSHOT</netconf.version>
       <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-      <opendaylight-l2-types.version>2013.08.27.7-SNAPSHOT</opendaylight-l2-types.version>
-      <ietf-yang-types.version>2010.09.24.7-SNAPSHOT</ietf-yang-types.version>
-      <ietf-inet-types.version>2010.09.24.7-SNAPSHOT</ietf-inet-types.version>
-      <yang-ext.version>2013.09.07.7-SNAPSHOT</yang-ext.version>
+
+      <features.test.version>1.5.0-SNAPSHOT</features.test.version>
+      <karaf.distro.empty.version>1.5.0-SNAPSHOT</karaf.distro.empty.version>
+      <dlux.version>0.2.0-SNAPSHOT</dlux.version>
     </properties>
 
     <dependencyManagement>
       <dependencies>
-         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-binding</artifactId>
-            <version>${yang.binding.version}</version>
-        </dependency>
-	<dependency>
-      	    <groupId>org.opendaylight.yangtools</groupId>
-     	    <artifactId>yang-common</artifactId>
-            <version>${yang.binding.version}</version>
-    	</dependency>
-    	<dependency>
-	    <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>ietf-inet-types</artifactId>
-	    <version>${ietf-inet-types.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>ietf-yang-types</artifactId>
-	    <version>${ietf-yang-types.version}</version>
-        </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>yang-ext</artifactId>
-            <version>${yang-ext.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>opendaylight-l2-types</artifactId>
-            <version>${opendaylight-l2-types.version}</version>
+          <groupId>org.opendaylight.openflowplugin</groupId>
+          <artifactId>openflowplugin-artifacts</artifactId>
+          <version>${openflowplugin.version}</version>
+          <scope>import</scope>
+          <type>pom</type>
         </dependency>
 
-          <dependency>
-              <groupId>org.opendaylight.openflowplugin</groupId>
-              <artifactId>openflowplugin-api</artifactId>
-              <version>${project.version}</version>
-          </dependency>
         <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>openflow-protocol-impl</artifactId>
-          <version>${openflowjava.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.openflowjava</groupId>
-          <artifactId>openflow-protocol-api</artifactId>
-          <version>${openflowjava.version}</version>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-artifacts</artifactId>
+          <version>${config.version}</version>
+          <scope>import</scope>
+          <type>pom</type>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>openflow-protocol-spi</artifactId>
-          <version>${openflowjava.version}</version>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>mdsal-artifacts</artifactId>
+          <version>${mdsal.version}</version>
+          <scope>import</scope>
+          <type>pom</type>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>util</artifactId>
-          <version>${openflowjava.version}</version>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>netconf-artifacts</artifactId>
+          <version>${netconf.version}</version>
+          <scope>import</scope>
+          <type>pom</type>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>simple-client</artifactId>
+          <artifactId>openflowjava-artifacts</artifactId>
           <version>${openflowjava.version}</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.opendaylight.openflowplugin.model</groupId>
-          <artifactId>model-flow-base</artifactId>
-          <version>${openflowplugin.model.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.openflowplugin.model</groupId>
-          <artifactId>model-flow-service</artifactId>
-          <version>${openflowplugin.model.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.openflowplugin.model</groupId>
-          <artifactId>model-flow-statistics</artifactId>
-          <version>${openflowplugin.model.version}</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
-          <artifactId>model-inventory</artifactId>
-          <version>${controller.model.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
-          <artifactId>model-topology</artifactId>
-          <version>${controller.model.version}</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-binding-api</artifactId>
-          <version>${sal.binding.api.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-binding-config</artifactId>
-          <version>${sal.binding.api.version}</version>
+          <scope>import</scope>
+          <type>pom</type>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-binding-util</artifactId>
-          <version>${controller.model.version}</version>
+          <groupId>org.opendaylight.odlparent</groupId>
+          <artifactId>features-test</artifactId>
+	  <version>${features.test.version}</version>
+	  <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -192,100 +129,6 @@
             <artifactId>liblldp</artifactId>
             <version>${sal.api.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-            <version>${sal.common.util.version}</version>
-        </dependency>
-        <!-- IT -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-netconf-connector</artifactId>
-            <version>${netconf.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-it</artifactId>
-            <version>${sal.binding.api.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-binding-broker-impl</artifactId>
-          <version>${sal.binding.api.version}</version>
-
-          <!-- excluding old models pulled as transient dependencies 
-               TODO: remove -->
-          <exclusions>
-            <exclusion>
-              <groupId>org.opendaylight.controller.model</groupId>
-              <artifactId>model-flow-base</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.opendaylight.controller.model</groupId>
-              <artifactId>model-flow-service</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.opendaylight.controller.model</groupId>
-              <artifactId>model-flow-statistics</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-manager</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-api</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools.thirdparty</groupId>
-          <artifactId>antlr4-runtime-osgi-nohead</artifactId>
-          <version>4.0</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>logback-config</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-persister-api</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-persister-impl</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-persister-file-xml-adapter</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>netconf-monitoring</artifactId>
-          <version>${netconf.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>netconf-client</artifactId>
-          <version>${netconf.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>netconf-impl</artifactId>
-          <version>${netconf.parent.version}</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.opendaylight.odlparent</groupId>
-          <artifactId>features-test</artifactId>
-          <version>${features.test.version}</version>
-        </dependency>
 
         <!-- thirdparty -->
         <dependency>
@@ -370,11 +213,6 @@
               </configuration>
             </plugin>
             <plugin>
-              <groupId>org.ops4j.pax.exam</groupId>
-              <artifactId>maven-paxexam-plugin</artifactId>
-              <version>1.2.4</version>
-            </plugin>
-          <plugin>
               <artifactId>maven-clean-plugin</artifactId>
               <configuration>
                   <filesets>
@@ -416,7 +254,7 @@
             <plugin>
               <groupId>org.opendaylight.yangtools</groupId>
               <artifactId>yang-maven-plugin</artifactId>
-              <version>${yang.binding.version}</version>
+              <version>${yangtools.version}</version>
             </plugin>
             <plugin>
               <groupId>org.apache.felix</groupId>
@@ -634,8 +472,10 @@
     </profiles>
 
     <modules>
+      <module>artifacts</module>
       <module>openflowplugin-api</module>
       <module>openflowplugin</module>
+      <module>openflowplugin-impl</module>
       <module>extension</module>
       <module>distribution/karaf</module>
       <module>openflowplugin-controller-config</module>