Bump upstreams to Magnesium SR2

[dlux.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 5e59d596d44dbef9fe5f2c7884ca27525c547228..8b46af1b23c73f7cd433d5f8a4cf00c1610d3c88 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,69 +4,45 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-    <relativePath></relativePath>
+    <version>6.0.11</version>
+    <relativePath/>
   </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.dlux</groupId>
-    <artifactId>dlux-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>dlux</name> <!-- Used by Sonar to set project name -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.opendaylight.dlux</groupId>
+  <artifactId>dlux-parent</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>dlux</name> <!-- Used by Sonar to set project name -->
 
-    <properties>
-      <commons.opendaylight.version>1.8.0-SNAPSHOT</commons.opendaylight.version>
-      <loader.resources.version>0.4.0-SNAPSHOT</loader.resources.version>
-      <core.resources.version>0.4.0-SNAPSHOT</core.resources.version>
-      <node.resources.version>0.4.0-SNAPSHOT</node.resources.version>
-      <connection_manager.resources.version>0.4.0-SNAPSHOT</connection_manager.resources.version>
-      <container.resources.version>0.4.0-SNAPSHOT</container.resources.version>
-      <flow.resources.version>0.4.0-SNAPSHOT</flow.resources.version>
-      <network.resources.version>0.4.0-SNAPSHOT</network.resources.version>
-      <topology.resources.version>0.4.0-SNAPSHOT</topology.resources.version>
-      <yangui.resources.version>0.4.0-SNAPSHOT</yangui.resources.version>
-      <yangman.resources.version>0.4.0-SNAPSHOT</yangman.resources.version>
-      <yangvisualizer.resources.version>0.4.0-SNAPSHOT</yangvisualizer.resources.version>
-      <common.authentication.resources.version>0.4.0-SNAPSHOT</common.authentication.resources.version>
-      <common.general.resources.version>0.4.0-SNAPSHOT</common.general.resources.version>
-      <common.navigation.resources.version>0.4.0-SNAPSHOT</common.navigation.resources.version>
-      <common.layout.resources.version>0.4.0-SNAPSHOT</common.layout.resources.version>
-      <common.topbar.resources.version>0.4.0-SNAPSHOT</common.topbar.resources.version>
-      <common.login.resources.version>0.4.0-SNAPSHOT</common.login.resources.version>
-      <common.yangutils.resources.version>0.4.0-SNAPSHOT</common.yangutils.resources.version>
-      <common.sigmatopology.resources.version>0.4.0-SNAPSHOT</common.sigmatopology.resources.version>
-      <restconf.version>1.5.0-SNAPSHOT</restconf.version>
-      <l2switch.version>0.5.0-SNAPSHOT</l2switch.version>
-      <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
-      <branding.version>1.4.0-SNAPSHOT</branding.version>
-      <karaf.resources.version>1.8.0-SNAPSHOT</karaf.resources.version>
-      <feature.l2switch.version>0.5.0-SNAPSHOT</feature.l2switch.version>
-      <feature.aaa.version>0.5.0-SNAPSHOT</feature.aaa.version>
-      <feature.openflowplugin.version>0.4.0-SNAPSHOT</feature.openflowplugin.version>
+  <properties>
+    <loader.resources.version>1.0.0-SNAPSHOT</loader.resources.version>
+    <core.resources.version>1.0.0-SNAPSHOT</core.resources.version>
+    <connection_manager.resources.version>1.0.0-SNAPSHOT</connection_manager.resources.version>
+    <container.resources.version>1.0.0-SNAPSHOT</container.resources.version>
+    <flow.resources.version>1.0.0-SNAPSHOT</flow.resources.version>
+    <network.resources.version>1.0.0-SNAPSHOT</network.resources.version>
+    <common.authentication.resources.version>1.0.0-SNAPSHOT</common.authentication.resources.version>
+    <common.general.resources.version>1.0.0-SNAPSHOT</common.general.resources.version>
+    <common.navigation.resources.version>1.0.0-SNAPSHOT</common.navigation.resources.version>
+    <common.layout.resources.version>1.0.0-SNAPSHOT</common.layout.resources.version>
+    <common.topbar.resources.version>1.0.0-SNAPSHOT</common.topbar.resources.version>
+    <common.login.resources.version>1.0.0-SNAPSHOT</common.login.resources.version>
+  </properties>
 
-      <feature.test.version>1.8.0-SNAPSHOT</feature.test.version>
-      <feature.mdsal.version>1.5.0-SNAPSHOT</feature.mdsal.version>
-      <feature.dlux.version>0.5.0-SNAPSHOT</feature.dlux.version>
-      <feature.flow.version>1.5.0-SNAPSHOT</feature.flow.version>
-      <feature.yangtools.version>1.1.0-SNAPSHOT</feature.yangtools.version>
-      <apache.felix.osgi.compendium.version>1.4.0</apache.felix.osgi.compendium.version>
-      <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
-      <karaf.empty.version>1.8.0-SNAPSHOT</karaf.empty.version>
-    </properties>
-
-    <modules>
-       <module>modules</module>
-       <module>dlux-web</module>
-       <module>loader/api</module>
-       <module>loader/impl</module>
-       <module>bundles</module>
-       <module>features</module>
-       <module>archetype</module>
-    </modules>
+  <modules>
+    <module>modules</module>
+    <module>dlux-web</module>
+    <module>loader/api</module>
+    <module>loader/impl</module>
+    <module>bundles</module>
+    <module>features</module>
+    <module>archetype</module>
+  </modules>
 
   <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/dlux.git</connection>     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/dlux.git</developerConnection>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/dlux.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/dlux.git</developerConnection>
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_dlux:Main</url>
   </scm>