Bump upstreams

[openflowplugin.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 45f69cab60453e7ab4b3ff75bfec562de4fcbf35..3e8d9d4bb5fc5d264f49dab504b9fa8327a133e0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,47 +4,65 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.18.0-SNAPSHOT</version>
         <relativePath>parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-aggregator</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.18.0-SNAPSHOT</version>
     <name>openflowplugin</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
     <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>
+        <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>
 
     <modules>
-      <module>artifacts</module>
-      <module>parent</module>
-      <module>openflowplugin-api</module>
-      <module>openflowplugin</module>
-      <module>openflowplugin-impl</module>
-      <module>openflowplugin-common</module>
-      <module>extension</module>
-      <module>distribution/karaf</module>
-      <module>openflowplugin-controller-config</module>
-      <module>openflowplugin-blueprint-config-he</module>
-      <module>openflowplugin-blueprint-config</module>
-      <!--
-      <module>openflowplugin-it</module>
-      -->
-      <module>test-provider</module>
-      <module>drop-test</module>
-      <module>drop-test-karaf</module>
-      <module>test-common</module>
-      <module>features</module>
-      <module>features-he</module>
-      <module>samples/sample-consumer</module>
-      <module>samples/learning-switch</module>
-      <module>applications</module>
-      <module>model</module>
-  </modules>
+        <module>artifacts</module>
+        <module>parent</module>
+        <module>libraries</module>
+        <module>openflowjava</module>
+        <module>openflowplugin-api</module>
+        <module>openflowplugin</module>
+        <module>openflowplugin-impl</module>
+        <module>openflowplugin-common</module>
+        <module>extension</module>
+        <module>openflowplugin-blueprint-config</module>
+        <!-- <module>openflowplugin-it</module> -->
+        <module>test-provider</module>
+        <module>drop-test-karaf</module>
+        <module>test-common</module>
+        <module>features-aggregator</module>
+        <module>applications</module>
+        <module>model</module>
+        <module>samples</module>
+    </modules>
+
+    <profiles>
+        <profile>
+            <id>karaf</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>distribution/karaf</module>
+            </modules>
+        </profile>
+    </profiles>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <!-- https://issues.apache.org/jira/browse/MJAVADOC-649 -->
+                    <version>3.1.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>