Merge "BUG-2363: Wire NSF apps to local models"

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

diff --git a/applications/forwardingrules-manager/pom.xml b/applications/forwardingrules-manager/pom.xml
index 75eb8c66fdbc478be1d88980538f5d34b05bc3cb..db549ac975f81a1d5c269b119824e5e49b3e5455 100644 (file)
--- a/applications/forwardingrules-manager/pom.xml
+++ b/applications/forwardingrules-manager/pom.xml
@@ -20,7 +20,7 @@
       <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>

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

diff --git a/applications/inventory-manager/pom.xml b/applications/inventory-manager/pom.xml
index 32d7455e8a84632fc27ca026fa59c4db833b0d14..6dcebaaab6572f69c74c770af8d66b063df19503 100644 (file)
--- a/applications/inventory-manager/pom.xml
+++ b/applications/inventory-manager/pom.xml
@@ -20,7 +20,7 @@
       <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>

diff --git a/applications/of-switch-config-pusher/pom.xml b/applications/of-switch-config-pusher/pom.xml
index 571f71b2dff485852ae5f2f459fe7b3b42b0b160..94338010aeb1b1d8704e36585a2b74f5d1868c46 100644 (file)
--- a/applications/of-switch-config-pusher/pom.xml
+++ b/applications/of-switch-config-pusher/pom.xml
@@ -42,12 +42,8 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-flow-service</artifactId>
-        </dependency>
-
     </dependencies>
+    
     <build>
         <plugins>
             <plugin>

diff --git a/applications/pom.xml b/applications/pom.xml
index eaf955d01741110ed54a4b55c4ef686c4824f530..d01761eae1287a92802066ddd7ea3a04a44b07ba 100644 (file)
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -76,6 +76,87 @@
                </plugins>
        </build>
 
+    <profiles>
+      <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>
+
     <scm>
       <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
       <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>

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

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

diff --git a/applications/statistics-manager/pom.xml b/applications/statistics-manager/pom.xml
index 0b752efb7c806487352e5506d05483acf4165476..abd3c02597f5eccf74aa2a2ac1d4294e97192066 100644 (file)
--- a/applications/statistics-manager/pom.xml
+++ b/applications/statistics-manager/pom.xml
@@ -30,11 +30,11 @@
       <artifactId>sal-binding-api</artifactId>
     </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-statistics</artifactId>
     </dependency>
     <dependency>

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

diff --git a/applications/topology-lldp-discovery/pom.xml b/applications/topology-lldp-discovery/pom.xml
index f71e93497fa099014d0e6fd6d6e547599d24ab62..1e6fe7eb8177bf1641efd60606c85ef8d2dc1870 100644 (file)
--- a/applications/topology-lldp-discovery/pom.xml
+++ b/applications/topology-lldp-discovery/pom.xml
@@ -41,11 +41,11 @@
       <artifactId>liblldp</artifactId>
     </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>

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

diff --git a/applications/topology-manager/pom.xml b/applications/topology-manager/pom.xml
index 72109f5732f953a8f75a8710ac287044f6fd07e6..0f337ad0ce72f7c04c35de5f83f59958fa0d37e7 100644 (file)
--- a/applications/topology-manager/pom.xml
+++ b/applications/topology-manager/pom.xml
@@ -24,7 +24,7 @@
       <artifactId>sal-binding-util</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/model/model-flow-base/pom.xml b/model/model-flow-base/pom.xml
index 2e46aaf1aaa43d47906c08f8d643ce78f93b19c9..625159d193d90a969f7ec9c8ac1ec66b4240afd3 100644 (file)
--- a/model/model-flow-base/pom.xml
+++ b/model/model-flow-base/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opendaylight.openflowplugin.model</groupId>
     <artifactId>model-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>model-flow-base</artifactId>
   <packaging>bundle</packaging>

diff --git a/model/model-flow-service/pom.xml b/model/model-flow-service/pom.xml
index b42ecfbf9ac6f278f2d70f04301f02bc53270d77..819d16dda1ef66797c3b5214239b6a13d3056460 100644 (file)
--- a/model/model-flow-service/pom.xml
+++ b/model/model-flow-service/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opendaylight.openflowplugin.model</groupId>
     <artifactId>model-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>model-flow-service</artifactId>
   <packaging>bundle</packaging>

diff --git a/model/model-flow-statistics/pom.xml b/model/model-flow-statistics/pom.xml
index 5a866666d736d139579d7cbe9facef58edf79161..d9e15fee1c75d3d94769b7c9f491a099af73ac6e 100644 (file)
--- a/model/model-flow-statistics/pom.xml
+++ b/model/model-flow-statistics/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opendaylight.openflowplugin.model</groupId>
     <artifactId>model-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>model-flow-statistics</artifactId>
   <packaging>bundle</packaging>

diff --git a/model/pom.xml b/model/pom.xml
index 5ce937fb48b42baa3326d88e7391ec459508f5d1..4dd3563b675baf669a51d7023b901059a46dc9cc 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -10,7 +10,6 @@
   </parent>
   <groupId>org.opendaylight.openflowplugin.model</groupId>
   <artifactId>model-parent</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>