Merge "Use String(byte[], Charset)"

[openflowplugin.git] / applications / pom.xml

diff --git a/applications/pom.xml b/applications/pom.xml
index aa80e136118c629df2cdfc905833918c386c1dea..85d84e3a54a72a4b1adb08186e2590d064817894 100644 (file)
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -3,32 +3,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>openflowplugin-parent</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>6.0.1</version>
+        <relativePath/>
     </parent>
 
-    <artifactId>applications</artifactId>
-    <name>applications</name>
-    <url>http://maven.apache.org</url>
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>applications-aggregator</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </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>
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
 
     <modules>
         <module>table-miss-enforcer</module>
@@ -45,6 +34,8 @@
         <module>bulk-o-matic</module>
         <module>reconciliation-framework</module>
         <module>southbound-cli</module>
+        <module>device-ownership-service</module>
+        <module>arbitratorreconciliation</module>
     </modules>
 
 </project>