Merge "Make model/pom.xml inherit from odlparent-lite"

diff --git a/model/model-flow-base/pom.xml b/model/model-flow-base/pom.xml
index b01541b3688df938c71fe9f0ec333d74d78df218..31910ceb05b6bb5c0bd19f1098425813125d16b7 100644 (file)
--- a/model/model-flow-base/pom.xml
+++ b/model/model-flow-base/pom.xml
@@ -4,10 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.openflowplugin.model</groupId>
-    <artifactId>model-parent</artifactId>
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>openflowplugin-parent</artifactId>
     <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
   </parent>
+
+  <groupId>org.opendaylight.openflowplugin.model</groupId>
   <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 9fac320c6f881b5e23a8116b48114faf49413f17..03c8260cc244edcf9025bd746922702817429a40 100644 (file)
--- a/model/model-flow-service/pom.xml
+++ b/model/model-flow-service/pom.xml
@@ -4,10 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.openflowplugin.model</groupId>
-    <artifactId>model-parent</artifactId>
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>openflowplugin-parent</artifactId>
     <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
   </parent>
+
+  <groupId>org.opendaylight.openflowplugin.model</groupId>
   <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 329a1b789e501624720133195bdd01c82f11340b..a3b86dbd44f1335b3172a3cb5ec511a6c3c84e4e 100644 (file)
--- a/model/model-flow-statistics/pom.xml
+++ b/model/model-flow-statistics/pom.xml
@@ -4,10 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.openflowplugin.model</groupId>
-    <artifactId>model-parent</artifactId>
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>openflowplugin-parent</artifactId>
     <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
   </parent>
+
+  <groupId>org.opendaylight.openflowplugin.model</groupId>
   <artifactId>model-flow-statistics</artifactId>
   <packaging>bundle</packaging>
 

diff --git a/model/pom.xml b/model/pom.xml
index 1e3731faedd47a11a66ddb7cbe845b3f7e96b46d..10fb01e42de2c1d7f4ad70196649a66add0a7aa3 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -4,62 +4,26 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.openflowplugin</groupId>
-    <artifactId>openflowplugin-parent</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <version>6.0.0</version>
+    <relativePath/>
   </parent>
+
   <groupId>org.opendaylight.openflowplugin.model</groupId>
-  <artifactId>model-parent</artifactId>
+  <artifactId>model-aggregator</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <maven.install.skip>true</maven.install.skip>
+  </properties>
+
   <modules>
     <module>model-flow-base</module>
     <module>model-flow-service</module>
     <module>model-flow-statistics</module>
   </modules>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>yang-binding</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yang-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>yang-ext</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-            <Import-Package>org.opendaylight.yangtools.yang.binding.annotations, *</Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main</url>
-    <tag>HEAD</tag>
-  </scm>
-
 </project>