BUG-2637: Create features for migrated apps

  - created features
  - replaced old md-sal flow* models
  - this change depends on disabling of apps and models in their
    old place in md-sal
  - fixed outdated dirty dependencies of features
  - added sal-compatibility
  - rebased
  - redirected features and IT to local models

see controller: https://git.opendaylight.org/gerrit/#/c/14464/

Change-Id: I6d7d4f1461bc7200e31736462a284ff94ed3b8f6
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/applications/forwardingrules-manager/migrationStep.1 b/applications/forwardingrules-manager/migrationStep.1
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/applications/inventory-manager/migrationStep.1 b/applications/inventory-manager/migrationStep.1
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/applications/lldp-speaker/pom.xml b/applications/lldp-speaker/pom.xml
index 5d033df1b8c5f11bd1cea56d86fbdec535fcc7e6..ad449ca83a4502a49d28f3d43e8b44f3fb1c12ab 100644 (file)
--- a/applications/lldp-speaker/pom.xml
+++ b/applications/lldp-speaker/pom.xml
@@ -24,16 +24,12 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>

diff --git a/applications/of-switch-config-pusher/pom.xml b/applications/of-switch-config-pusher/pom.xml
index 4543630ee0266065890621e82c935db440fa91ac..b5973b936062f1819018c9a2180568e64f701eb6 100644 (file)
--- a/applications/of-switch-config-pusher/pom.xml
+++ b/applications/of-switch-config-pusher/pom.xml
@@ -29,7 +29,7 @@
             <artifactId>model-inventory</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>

diff --git a/applications/statistics-manager-config/migrationStep.1 b/applications/statistics-manager-config/migrationStep.1
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/applications/statistics-manager/migrationStep.1 b/applications/statistics-manager/migrationStep.1
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/applications/table-miss-enforcer/pom.xml b/applications/table-miss-enforcer/pom.xml
index 56b5150c9f61454f949039eaf93b32fe11d83693..a15f63742abda12df2f2990a885f99766a55150b 100644 (file)
--- a/applications/table-miss-enforcer/pom.xml
+++ b/applications/table-miss-enforcer/pom.xml
@@ -28,7 +28,7 @@
           <artifactId>model-inventory</artifactId>
       </dependency>
       <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
+          <groupId>org.opendaylight.openflowplugin.model</groupId>
           <artifactId>model-flow-service</artifactId>
       </dependency>
       <dependency>

diff --git a/applications/topology-lldp-discovery/migrationStep.1 b/applications/topology-lldp-discovery/migrationStep.1
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/applications/topology-manager/migrationStep.1 b/applications/topology-manager/migrationStep.1
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml
index 2aab1e2c387bb857db4a77cb48d1c08f47280497..89288fbaa560dea3c4057bd75b97916a09d53158 100644 (file)
--- a/drop-test-karaf/pom.xml
+++ b/drop-test-karaf/pom.xml
@@ -28,11 +28,11 @@
             <artifactId>sal-binding-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-base</artifactId>
         </dependency>
         <dependency>

diff --git a/drop-test/pom.xml b/drop-test/pom.xml
index a0d210518623cdd8f191e8d72151554e356616c1..55f449f232e37cf5ad56b7982a8716b4d575c654 100644 (file)
--- a/drop-test/pom.xml
+++ b/drop-test/pom.xml
@@ -27,11 +27,11 @@
             <artifactId>sal-binding-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>    
            <dependency>
-             <groupId>org.opendaylight.controller.model</groupId>
+             <groupId>org.opendaylight.openflowplugin.model</groupId>
              <artifactId>model-flow-base</artifactId>
            </dependency>
         <dependency>

diff --git a/extension/features/src/main/resources/features.xml b/extension/features/src/main/resources/features.xml
index 523b235ece4fd5ef186b9ae6ed9ebb4c18e84f59..54deacf45637afd8c54a1db3b82964f34473ba57 100644 (file)
--- a/extension/features/src/main/resources/features.xml
+++ b/extension/features/src/main/resources/features.xml
@@ -8,8 +8,6 @@
     <feature name="odl-openflowplugin-nxm-extensions" description="OpenDaylight :: Openflow Plugin :: Nicira Extensions" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-southbound</feature>
         <configfile finalname="etc/opendaylight/karaf/43-openflowjava-nx-config.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-extension-nicira-config/${project.version}/xml/config</configfile>
-<!--         <configfile finalname="etc/opendaylight/karaf/44-openflowjava-nx-config.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-extension-nicira-config/${project.version}/xml/openflowjava-nx-config/</configfile> -->
-<!--         <configfile finalname="etc/opendaylight/karaf/44-nicira-extension.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-extension-nicira-config/${project.version}/xml/nicira-extension-config</configfile> -->
         <bundle>mvn:org.opendaylight.openflowplugin/openflowjava-extension-nicira-api/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowjava-extension-nicira/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-extension-nicira/${project.version}</bundle>

diff --git a/extension/openflowplugin-extension-api/pom.xml b/extension/openflowplugin-extension-api/pom.xml
index 968cd8d910e4e67138c6847dca3e3f98d2b66f87..3bfb344e0e4389aaca60058901f1771f740722cd 100644 (file)
--- a/extension/openflowplugin-extension-api/pom.xml
+++ b/extension/openflowplugin-extension-api/pom.xml
@@ -81,15 +81,15 @@
 
         <!-- MD-SAL models -->
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-base</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
         </dependency>
         <dependency>

diff --git a/extension/openflowplugin-extension-nicira/pom.xml b/extension/openflowplugin-extension-nicira/pom.xml
index 808f0a80a007396ae4c34ac42653b483a17c1a62..58b86c3d3f751575a4634f14d8be6cb5ad256e94 100644 (file)
--- a/extension/openflowplugin-extension-nicira/pom.xml
+++ b/extension/openflowplugin-extension-nicira/pom.xml
@@ -95,15 +95,15 @@
 
         <!-- MD-SAL models -->
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-base</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
         </dependency>
         <dependency>

diff --git a/extension/test-extension/pom.xml b/extension/test-extension/pom.xml
index dfd60c0c701e67ad36e319c3f0b7149cfc444c80..064936fe84da4d646be909bc1ff2b451f78baab6 100644 (file)
--- a/extension/test-extension/pom.xml
+++ b/extension/test-extension/pom.xml
@@ -101,15 +101,15 @@
 
         <!-- MD-SAL models -->
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-base</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
         </dependency>
         <dependency>

diff --git a/features/pom.xml b/features/pom.xml
index d1bf2075eb191b2f8312af272ca9ed17bea4ea91..3eb0df4d696a3cf7e10bdc6a68b06359508c2567 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -15,6 +15,8 @@
     <features.file>features.xml</features.file>
     <karaf.empty.distro.version>1.5.0-SNAPSHOT</karaf.empty.distro.version>
     <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+    <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
+    <config.statistics.manager.configfile>30-statistics-manager.xml</config.statistics.manager.configfile>
   </properties>
 
   <dependencies>
@@ -26,6 +28,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-yangtools</artifactId>
+      <classifier>features</classifier>
+      <version>${yangtools.version}</version>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-restconf</artifactId>
@@ -40,13 +49,58 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+
+    <!-- bundle dependencies -->
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-flow</artifactId>
-      <version>${mdsal.version}</version>
-      <classifier>features</classifier>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
+      <artifactId>model-flow-base</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
+      <artifactId>model-flow-service</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
+      <artifactId>model-flow-statistics</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.model</groupId>
+      <artifactId>model-inventory</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.model</groupId>
+      <artifactId>model-topology</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>forwardingrules-manager</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>inventory-manager</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>lldp-speaker</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>statistics-manager</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>statistics-manager-config</artifactId>
+      <version>${project.version}</version>
+      <classifier>config</classifier>
       <type>xml</type>
     </dependency>
+    
+    
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>features-dlux</artifactId>
@@ -83,6 +137,17 @@
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
+    
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>topology-lldp-discovery</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>topology-manager</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
       <dependency>
           <groupId>org.opendaylight.openflowplugin.applications</groupId>
@@ -97,11 +162,6 @@
           <classifier>config</classifier>
       </dependency>
 
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin.applications</groupId>
-      <artifactId>lldp-speaker</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>lldp-speaker</artifactId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index bd1c903df3233bcebbaa9dac79fe8fc4bf06ea98..1b6549ab696fcefc602ff7bf256de885b5aca4e9 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -5,9 +5,9 @@
    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-flow/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowjava/features-openflowjava/${openflowjava.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
 
     <feature name='odl-openflowplugin-all' description="OpenDaylight :: Openflow Plugin :: All" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-southbound</feature>
@@ -18,7 +18,7 @@
 
     <feature name='odl-openflowplugin-southbound' description="OpenDaylight :: Openflow Plugin :: SouthBound" version='${project.version}'>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
-        <feature version="${mdsal.version}">odl-flow-model</feature>
+        <feature version="${project.version}">odl-openflowplugin-nsf-model</feature>
         <feature version="${openflowjava.version}">odl-openflowjava-protocol</feature>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-api/${project.version}</bundle>
@@ -28,11 +28,37 @@
         <configfile finalname="etc/opendaylight/karaf/43-msg-spy.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/configmsgspy</configfile>
     </feature>
     <feature name='odl-openflowplugin-flow-services' description="OpenDaylight :: Openflow Plugin :: Flow Services" version='${project.version}'>
-        <feature version="${mdsal.version}">odl-flow-services</feature>
+        <feature version="${project.version}">odl-openflowplugin-nsf-services</feature>
         <feature version="${project.version}">odl-openflowplugin-southbound</feature>
         <feature version="${project.version}">odl-openflowplugin-app-config-pusher</feature>
         <feature version="${project.version}">odl-openflowplugin-app-lldp-speaker</feature>
     </feature>
+    
+    <feature name='odl-openflowplugin-nsf-services' version='${project.version}'
+        description="OpenDaylight :: OpenflowPlugin :: NSF :: Services">
+        <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+        <feature version='${project.version}'>odl-openflowplugin-nsf-model</feature>
+        <bundle>mvn:org.opendaylight.openflowplugin.applications/topology-manager/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin.applications/topology-lldp-discovery/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin.applications/statistics-manager/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin.applications/inventory-manager/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin.applications/forwardingrules-manager/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.controller/liblldp/${sal.api.version}</bundle>
+        <configfile finalname="${config.configfile.directory}/${config.statistics.manager.configfile}">mvn:org.opendaylight.openflowplugin.applications/statistics-manager-config/${project.version}/xml/config</configfile>
+    </feature>
+    
+    <feature name='odl-openflowplugin-nsf-model' version='${project.version}'
+        description="OpenDaylight :: OpenflowPlugin :: NSF :: Model">
+        <!-- general models -->
+        <feature version='${yangtools.version}'>odl-yangtools-models</feature>
+        <bundle>mvn:org.opendaylight.controller.model/model-inventory/${controller.model.version}</bundle>
+        <bundle>mvn:org.opendaylight.controller.model/model-topology/${controller.model.version}</bundle>
+        <!-- openflow specific models -->
+        <bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-base/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-statistics/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-service/${project.version}</bundle>
+    </feature>
+    
     <feature name='odl-openflowplugin-flow-services-rest' description="OpenDaylight :: Openflow Plugin :: Flow Services :: REST" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-flow-services</feature>
         <feature version="${mdsal.version}">odl-restconf</feature>

diff --git a/legacy/features-legacy/pom.xml b/legacy/features-legacy/pom.xml
new file mode 100644 (file)
index 0000000..29057c8
--- /dev/null
+++ b/legacy/features-legacy/pom.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+   <modelVersion>4.0.0</modelVersion>\r
+   <parent>\r
+     <groupId>org.opendaylight.openflowplugin.legacy</groupId>\r
+     <artifactId>legacy-parent</artifactId>\r
+     <version>0.1.0-SNAPSHOT</version>\r
+     <relativePath>../</relativePath>\r
+   </parent>\r
+\r
+   <artifactId>features-legacy</artifactId>\r
+   <packaging>jar</packaging>\r
+   <properties>\r
+      <features.file>features.xml</features.file>\r
+      <feature.test.version>0.7.0-SNAPSHOT</feature.test.version>\r
+      <sal.version>0.9.0-SNAPSHOT</sal.version>\r
+   </properties>\r
+   <dependencies>\r
+    <!--\r
+      Necessary TODO: Put dependencies on any feature repos\r
+      you use in your features.xml file.\r
+\r
+      Note: they will need to be <type>xml</xml>\r
+      and <classifier>features</classifier>.\r
+      One other thing to watch for is to make sure they are\r
+      <scope>compile</compile>, which they should be by default,\r
+      but be cautious lest they be at a different scope in a parent pom.\r
+\r
+      Examples:\r
+        <dependency>\r
+          <groupId>org.opendaylight.yangtools</groupId>\r
+          <artifactId>features-yangtools</artifactId>\r
+          <version>0.7.0-SNAPSHOT</version>\r
+          <classifier>features</classifier>\r
+          <type>xml</type>\r
+        </dependency>\r
+        <dependency>\r
+          <groupId>org.opendaylight.controller</groupId>\r
+          <artifactId>features-mdsal</artifactId>\r
+          <version>1.2.0-SNAPSHOT</version>\r
+          <classifier>features</classifier>\r
+          <type>xml</type>\r
+        </dependency>\r
+        <dependency>\r
+          <groupId>org.opendaylight.openflowplugin</groupId>\r
+          <artifactId>features-openflowplugin</artifactId>\r
+          <version>0.1.0-SNAPSHOT</version>\r
+          <classifier>features</classifier>\r
+          <type>xml</type>\r
+        </dependency>\r
+    -->\r
+      <dependency>\r
+        <groupId>org.opendaylight.controller</groupId>\r
+        <artifactId>features-mdsal</artifactId>\r
+        <version>${mdsal.version}</version>\r
+        <classifier>features</classifier>\r
+        <type>xml</type>\r
+      </dependency>\r
+      <dependency>\r
+        <groupId>org.opendaylight.controller</groupId>\r
+        <artifactId>features-flow</artifactId>\r
+        <version>${mdsal.version}</version>\r
+        <classifier>features</classifier>\r
+        <type>xml</type>\r
+      </dependency>\r
+      <dependency>\r
+        <groupId>org.opendaylight.controller</groupId>\r
+        <artifactId>features-adsal</artifactId>\r
+        <version>${sal.version}</version>\r
+        <classifier>features</classifier>\r
+        <type>xml</type>\r
+      </dependency>\r
+      <dependency>\r
+        <groupId>org.opendaylight.openflowplugin</groupId>\r
+        <artifactId>features-openflowplugin</artifactId>\r
+        <version>${project.version}</version>\r
+        <classifier>features</classifier>\r
+        <type>xml</type>\r
+      </dependency>\r
+\r
+    <!--\r
+      Necessary TODO: Put dependencies for bundles directly referenced\r
+      in your features.xml file.  For every <bundle> reference in your\r
+      features.xml file, you need a corresponding dependency here.\r
+\r
+      Examples:\r
+      <dependency>\r
+        <groupId>org.opendaylight.controller</groupId>\r
+        <artifactId>controller-provider</artifactId>\r
+        <version>${project.version}</version>\r
+      </dependency>\r
+      <dependency>\r
+        <groupId>org.opendaylight.controller</groupId>\r
+        <artifactId>controller-model</artifactId>\r
+        <version>${project.version}</version>\r
+      </dependency>\r
+    -->\r
+      <dependency>\r
+        <groupId>org.opendaylight.openflowplugin.legacy</groupId>\r
+        <artifactId>sal-compatibility</artifactId>\r
+        <version>${project.version}</version>\r
+      </dependency>\r
+\r
+    <!--\r
+      Necessary TODO: Put dependencies for configfiles directly referenced\r
+      in your features.xml file.  For every <configfile> reference in your\r
+      features.xml file, you need a corresponding dependency here.\r
+\r
+      Example (presuming here version is coming from the parent pom):\r
+      <dependency>\r
+        <groupId>org.opendaylight.controller</groupId>\r
+        <artifactId>controller-config</artifactId>\r
+        <version>${project.version}</version>\r
+        <type>xml</type>\r
+        <classifier>config</classifier>\r
+      </dependency>\r
+    -->\r
+\r
+    <!--\r
+      Optional TODO: Remove TODO comments.\r
+    -->\r
+    <!-- test to validate features.xml -->\r
+    <dependency>\r
+      <groupId>org.opendaylight.yangtools</groupId>\r
+      <artifactId>features-test</artifactId>\r
+      <version>${yangtools.version}</version>\r
+      <scope>test</scope>\r
+    </dependency>\r
+    <!-- dependency for opendaylight-karaf-empty for use by testing -->\r
+    <dependency>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>opendaylight-karaf-empty</artifactId>\r
+      <version>${karaf.distro.empty.version}</version>\r
+      <type>zip</type>\r
+    </dependency>\r
+    <!-- Uncomment this if you get an error : java.lang.NoSuchMethodError: org.slf4j.helpers.MessageFormatter.format(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Lorg/slf4j/helpers/FormattingTuple;\r
+    <dependency>\r
+      <groupId>org.slf4j</groupId>\r
+      <artifactId>slf4j-simple</artifactId>\r
+      <version>1.7.2</version>\r
+    </dependency>\r
+    -->\r
+\r
+   </dependencies>\r
+   <build>\r
+      <resources>\r
+         <resource>\r
+            <directory>src/main/resources</directory>\r
+            <filtering>true</filtering>\r
+         </resource>\r
+      </resources>\r
+      <plugins>\r
+         <plugin>\r
+            <groupId>org.apache.maven.plugins</groupId>\r
+            <artifactId>maven-resources-plugin</artifactId>\r
+            <executions>\r
+               <execution>\r
+                  <id>filter</id>\r
+                  <phase>generate-resources</phase>\r
+                  <goals>\r
+                     <goal>resources</goal>\r
+                  </goals>\r
+               </execution>\r
+            </executions>\r
+         </plugin>\r
+         <plugin>\r
+            <groupId>org.codehaus.mojo</groupId>\r
+            <artifactId>build-helper-maven-plugin</artifactId>\r
+            <executions>\r
+               <execution>\r
+                  <id>attach-artifacts</id>\r
+                  <phase>package</phase>\r
+                  <goals>\r
+                     <goal>attach-artifact</goal>\r
+                  </goals>\r
+                  <configuration>\r
+                     <artifacts>\r
+                        <artifact>\r
+                           <file>${project.build.directory}/classes/${features.file}</file>\r
+                           <type>xml</type>\r
+                           <classifier>features</classifier>\r
+                        </artifact>\r
+                     </artifacts>\r
+                  </configuration>\r
+               </execution>\r
+            </executions>\r
+         </plugin>\r
+         <plugin>\r
+            <groupId>org.apache.maven.plugins</groupId>\r
+            <artifactId>maven-surefire-plugin</artifactId>\r
+            <configuration>\r
+              <systemPropertyVariables>\r
+                <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>\r
+                <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>\r
+                <karaf.distro.version>${karaf.distro.empty.version}</karaf.distro.version>\r
+              </systemPropertyVariables>\r
+              <dependenciesToScan>\r
+               <dependency>org.opendaylight.yangtools:features-test</dependency>\r
+              </dependenciesToScan>\r
+            </configuration>\r
+          </plugin>\r
+      </plugins>\r
+   </build>\r
+\r
+   <scm>\r
+     <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>\r
+     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>\r
+     <url>https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main</url>\r
+     <tag>HEAD</tag>\r
+   </scm>\r
+\r
+</project>\r

diff --git a/legacy/features-legacy/src/main/resources/features.xml b/legacy/features-legacy/src/main/resources/features.xml
new file mode 100644 (file)
index 0000000..e6b43a1
--- /dev/null
+++ b/legacy/features-legacy/src/main/resources/features.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Necessary TODO: Put your copyright statement here
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<features name="openflowplugin-legacy-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+    <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-adsal/${sal.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${project.version}/xml/features</repository>
+
+    <feature name='odl-openflowplugin-adsal-compatibility-all' version='${project.version}' description='OpenDaylight :: openflowplugin :: All'>
+        <feature version='${project.version}'>odl-openflowplugin-adsal-compatibility</feature>
+    </feature>
+
+    <feature name='odl-openflowplugin-adsal-compatibility' description="OpenDaylight :: openflowplugin :: AD-SAL Compatibility" version="${project.version}">
+      <feature version="${mdsal.version}">odl-mdsal-broker</feature>
+      <feature version="${project.version}">odl-openflowplugin-nsf-model</feature>
+      <feature version="${sal.version}">odl-adsal-all</feature>
+      <bundle>mvn:org.opendaylight.openflowplugin.legacy/sal-compatibility/${project.version}</bundle>
+   </feature>
+</features>

diff --git a/legacy/pom.xml b/legacy/pom.xml
index 4e6ea36481aae1c226ecc443271b90c216c21e7f..da2c24dc481759c4b944774613bd9c7b642d557f 100644 (file)
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -14,6 +14,7 @@
 
   <modules>
     <module>sal-compatibility</module>
+    <module>features-legacy</module>
   </modules>
 
   <dependencies>
@@ -53,30 +54,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>org.opendaylight.controller.*</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>
 

diff --git a/legacy/sal-compatibility/migrationStep.1 b/legacy/sal-compatibility/migrationStep.1
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/legacy/sal-compatibility/pom.xml b/legacy/sal-compatibility/pom.xml
index 06208a13648f6a9a36705eadc6b175888538d98e..9d5e2d48681188d7feac8ece78829c0dddc85cc5 100644 (file)
--- a/legacy/sal-compatibility/pom.xml
+++ b/legacy/sal-compatibility/pom.xml
@@ -39,7 +39,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>${project.name}</Bundle-Name>
-            <Bundle-Activator>org.opendaylight.controller.sal.compatibility.ComponentActivator</Bundle-Activator>
+            <Bundle-Activator>org.opendaylight.openflowplugin.legacy.sal.compatibility.ComponentActivator</Bundle-Activator>
           </instructions>
         </configuration>
       </plugin>
@@ -52,5 +52,5 @@
     <url>https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main</url>
     <tag>HEAD</tag>
   </scm>
-  
+
 </project>

diff --git a/openflowplugin-api/pom.xml b/openflowplugin-api/pom.xml
index 5eddb5ca7a69d0ebee937fb9109cd94317ecf333..6394f54d5e4f24b7d4ff4893164831728fa72f7b 100644 (file)
--- a/openflowplugin-api/pom.xml
+++ b/openflowplugin-api/pom.xml
@@ -21,11 +21,11 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
         </dependency>
         <dependency>

diff --git a/openflowplugin-it/pom.xml b/openflowplugin-it/pom.xml
index 182c42507e14d4ab2560d30ead17d3e613ef67e1..25941822aae3416d6a92ce09d3e6add7183ae513 100644 (file)
--- a/openflowplugin-it/pom.xml
+++ b/openflowplugin-it/pom.xml
@@ -113,6 +113,21 @@
             <artifactId>simple-client</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-base</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-statistics</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-service</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.javassist</groupId>
@@ -246,16 +261,16 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.md</groupId>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>forwardingrules-manager</artifactId>
             <scope>test</scope>
-            <version>${mdsal.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.md</groupId>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>inventory-manager</artifactId>
             <scope>test</scope>
-            <version>${mdsal.version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
index 0ebcd0116764e9709f8100c4f8efcf51a1d922df..2aa70fb1a2651ff14777de451fc65cd571ae2360 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
@@ -31,8 +31,12 @@ public abstract class OFPaxOptionsAssistant {
     public static final String CONTROLLER_MD = "org.opendaylight.controller.md";
     /** OFLibrary package */
     public static final String OFLIBRARY = "org.opendaylight.openflowjava";
-    /** OFLibrary package */
+    /** OFPlugin package */
     public static final String OFPLUGIN = "org.opendaylight.openflowplugin";
+    /** OFPlugin applications package */
+    public static final String OFPLUGIN_APPS = "org.opendaylight.openflowplugin.applications";
+    /** OFPlugin model package */
+    public static final String OFPLUGIN_MODEL = "org.opendaylight.openflowplugin.model";
     /** controller.model package */
     public static final String CONTROLLER_MODEL = "org.opendaylight.controller.model";
 
@@ -77,12 +81,15 @@ public abstract class OFPaxOptionsAssistant {
         return new DefaultCompositeOption(
                 baseSalBundles(),
                 ofLibraryBundles(),
-                mavenBundle(CONTROLLER_MODEL, "model-flow-statistics").versionAsInProject(),
+                mavenBundle(CONTROLLER_MODEL, "model-inventory").versionAsInProject(),
+                mavenBundle(OFPLUGIN_MODEL, "model-flow-statistics").versionAsInProject(),
+                mavenBundle(OFPLUGIN_MODEL, "model-flow-base").versionAsInProject(),
+                mavenBundle(OFPLUGIN_MODEL, "model-flow-service").versionAsInProject(),
                 mavenBundle(OFPLUGIN, "openflowplugin-api").versionAsInProject(),
                 mavenBundle(OFPLUGIN, "openflowplugin-extension-api").versionAsInProject(),
                 mavenBundle(OFPLUGIN, "openflowplugin").versionAsInProject(),
-                mavenBundle(CONTROLLER_MD, "forwardingrules-manager").versionAsInProject(),
-                mavenBundle(CONTROLLER_MD, "inventory-manager").versionAsInProject(),
+                mavenBundle(OFPLUGIN_APPS, "forwardingrules-manager").versionAsInProject(),
+                mavenBundle(OFPLUGIN_APPS, "inventory-manager").versionAsInProject(),
                 mavenBundle("org.openexi", "nagasena").versionAsInProject()
                 );
     }

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginFlowTest.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginFlowTest.java
index 4cd426cc98781eeb618a9ebe00dcb6a391ccd882..6821009b2073014871785ea347e440130d8ae96d 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginFlowTest.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginFlowTest.java
@@ -253,7 +253,6 @@ public class OFPluginFlowTest {
                 TestHelper.mdSalCoreBundles(),
                 TestHelper.configMinumumBundles(),
                 TestHelper.baseModelBundles(),
-                TestHelper.flowCapableModelBundles(),
 
                 OFPaxOptionsAssistant.ofPluginBundles());
     }

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginToLibraryTest.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginToLibraryTest.java
index 982f9e73d5a5f14b259ee049c79d5b6a4126da69..4716856fecd1b6288ed3d0d43b4b7b8fa1c0f710 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginToLibraryTest.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginToLibraryTest.java
@@ -234,7 +234,6 @@ public class OFPluginToLibraryTest {
                 TestHelper.mdSalCoreBundles(),
                 TestHelper.configMinumumBundles(),
                 TestHelper.baseModelBundles(),
-                TestHelper.flowCapableModelBundles(),
 
                 OFPaxOptionsAssistant.ofPluginBundles());
     }

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java
index 9211817889d417e13a77caf2c19a45b3e9b71752..d71ef60bc345af1660d2de5570d8c79a823a7c30 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java
@@ -149,7 +149,6 @@ public class SalIntegrationTest {
                 TestHelper.mdSalCoreBundles(), 
                 TestHelper.configMinumumBundles(),
                 TestHelper.baseModelBundles(),
-                TestHelper.flowCapableModelBundles(), 
                 OFPaxOptionsAssistant.ofLibraryBundles(),
                 OFPaxOptionsAssistant.ofPluginBundles()
                 );

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index df1e94a504093a038de5456923346afb6ffd7306..3e705d33fc2e28eaa245058faf7e20b0d72db87f 100644 (file)
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -89,15 +89,15 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-base</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
index be5647fb83cddef6a3ab51aebde40c132e1676ad..2349ffd5075c4e0e9285e5a4c8846498940eddd5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,9 @@
       <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>
       <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>
@@ -141,21 +143,23 @@
           <artifactId>simple-client</artifactId>
           <version>${openflowjava.version}</version>
         </dependency>
+
         <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
+          <groupId>org.opendaylight.openflowplugin.model</groupId>
           <artifactId>model-flow-base</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${openflowplugin.model.version}</version>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
+          <groupId>org.opendaylight.openflowplugin.model</groupId>
           <artifactId>model-flow-service</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${openflowplugin.model.version}</version>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
+          <groupId>org.opendaylight.openflowplugin.model</groupId>
           <artifactId>model-flow-statistics</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${openflowplugin.model.version}</version>
         </dependency>
+
         <dependency>
           <groupId>org.opendaylight.controller.model</groupId>
           <artifactId>model-inventory</artifactId>
@@ -170,12 +174,12 @@
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>sal-binding-api</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${sal.binding.api.version}</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>sal-binding-config</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${sal.binding.api.version}</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
@@ -188,17 +192,12 @@
             <artifactId>liblldp</artifactId>
             <version>${sal.api.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-            <version>${controller.model.version}</version>
-        </dependency>
-        <!-- IT -->
         <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>
@@ -207,27 +206,44 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-it</artifactId>
-            <version>${controller.model.version}</version>
+            <version>${sal.binding.api.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <version>${controller.model.version}</version>
+          <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>
+          <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>
+          <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>
@@ -615,85 +631,6 @@
           </plugins>
         </reporting>
       </profile>
-
-      <profile>
-        <id>nsf-migration</id>
-        <activation>
-          <activeByDefault>false</activeByDefault>
-          <file>
-            <exists>${basedir}/migrationStep.1</exists>
-          </file>
-        </activation>
-
-        <properties>
-          <!-- TODO: pull out into parent -->
-          <openflowplugin.model.version>${project.version}</openflowplugin.model.version>
-        </properties>
-
-        <dependencyManagement>
-          <!-- TODO: pull out into parent -->
-          <dependencies>
-            <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>
-
-            <!-- excluding old models pulled as transient dependencies
-                 TODO: remove -->
-            <dependency>
-              <groupId>org.opendaylight.openflowplugin</groupId>
-              <artifactId>openflowplugin-api</artifactId>
-              <version>${project.version}</version>
-              <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>sal-binding-broker-impl</artifactId>
-              <version>${controller.model.version}</version>
-              <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>
-          </dependencies>
-
-        </dependencyManagement>
-      </profile>
-
     </profiles>
 
     <modules>

diff --git a/samples/learning-switch/pom.xml b/samples/learning-switch/pom.xml
index 972cd1b45f601606ed163e000c3b8377a381ea19..f7fce4499327b206b528050c1d7b9912c6e98baf 100644 (file)
--- a/samples/learning-switch/pom.xml
+++ b/samples/learning-switch/pom.xml
@@ -35,11 +35,11 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-base</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>

diff --git a/samples/sample-consumer/pom.xml b/samples/sample-consumer/pom.xml
index fdfb1558aab4e9ed72d63bc5158c7d5b9a1db9dc..efa3f9f51bdaabeafcd1eb73754c08dfe7550673 100644 (file)
--- a/samples/sample-consumer/pom.xml
+++ b/samples/sample-consumer/pom.xml
@@ -35,16 +35,16 @@
     </build>
     <dependencies>
         <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-base</artifactId>
-            <groupId>org.opendaylight.controller.model</groupId>
         </dependency>
         <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
-            <groupId>org.opendaylight.controller.model</groupId>
         </dependency>
         <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
-            <groupId>org.opendaylight.controller.model</groupId>
         </dependency>
         <dependency>
             <artifactId>model-inventory</artifactId>

diff --git a/test-common/pom.xml b/test-common/pom.xml
index 14cc75fbb81fc82d2b4f5b9f8991ab65cb2b1418..4ea0c9b5348fe3769367e87d09b2400416f3ee55 100644 (file)
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -25,11 +25,11 @@
             <artifactId>sal-binding-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-base</artifactId>
         </dependency>
         <dependency>

diff --git a/test-provider/pom.xml b/test-provider/pom.xml
index 11b3bfab8b05d5e0f969ecdb5c6ba46ea066d8fb..8cc74c07f985bc1e232361432d3900a99516effc 100644 (file)
--- a/test-provider/pom.xml
+++ b/test-provider/pom.xml
@@ -22,11 +22,11 @@
             <artifactId>sal-binding-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>    
            <dependency>
-             <groupId>org.opendaylight.controller.model</groupId>
+             <groupId>org.opendaylight.openflowplugin.model</groupId>
              <artifactId>model-flow-base</artifactId>
            </dependency>
         <dependency>
@@ -34,7 +34,7 @@
             <artifactId>model-inventory</artifactId>
         </dependency>
                <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
         </dependency>
          <dependency>