X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=f8c1c0b12af00305dc24fc56d427b2d2fafd5d2a;hb=ddb4b9fb34dd2d7b397cb22259e271ae24dc6fb5;hp=7c27da1e4224bce848a91cdd0cf6476b5e9414fc;hpb=1a420c0b2d7895ae2da7e3b695e82e323517804e;p=dlux.git

diff --git a/pom.xml b/pom.xml
index 7c27da1e..f8c1c0b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,58 +4,55 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath></relativePath>
   </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.dlux</groupId>
     <artifactId>dlux-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>dlux</name> <!-- Used by Sonar to set project name -->
 
     <properties>
       <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
-      <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
-      <loader.resources.version>0.2.0-SNAPSHOT</loader.resources.version>
-      <core.resources.version>0.2.0-SNAPSHOT</core.resources.version>
-      <node.resources.version>0.2.0-SNAPSHOT</node.resources.version>
-      <connection_manager.resources.version>0.2.0-SNAPSHOT</connection_manager.resources.version>
-      <container.resources.version>0.2.0-SNAPSHOT</container.resources.version>
-      <flow.resources.version>0.2.0-SNAPSHOT</flow.resources.version>
-      <network.resources.version>0.2.0-SNAPSHOT</network.resources.version>
-      <topology.resources.version>0.2.0-SNAPSHOT</topology.resources.version>
-      <yangui.resources.version>0.2.0-SNAPSHOT</yangui.resources.version>
-      <yangvisualizer.resources.version>0.2.0-SNAPSHOT</yangvisualizer.resources.version>
-      <common.authentication.resources.version>0.2.0-SNAPSHOT</common.authentication.resources.version>
-      <common.general.resources.version>0.2.0-SNAPSHOT</common.general.resources.version>
-      <common.navigation.resources.version>0.2.0-SNAPSHOT</common.navigation.resources.version>
-      <common.layout.resources.version>0.2.0-SNAPSHOT</common.layout.resources.version>
-      <common.topbar.resources.version>0.2.0-SNAPSHOT</common.topbar.resources.version>
-      <common.login.resources.version>0.2.0-SNAPSHOT</common.login.resources.version>
-      <common.yangutils.resources.version>0.2.0-SNAPSHOT</common.yangutils.resources.version>
-      <common.sigmatopology.resources.version>0.2.0-SNAPSHOT</common.sigmatopology.resources.version>
-      <restconf.version>1.3.0-SNAPSHOT</restconf.version>
-      <l2switch.version>0.3.0-SNAPSHOT</l2switch.version>
-      <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
-      <branding.version>1.2.0-SNAPSHOT</branding.version>
-      <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
-      <feature.l2switch.version>0.3.0-SNAPSHOT</feature.l2switch.version>
-      <feature.aaa.version>0.3.0-SNAPSHOT</feature.aaa.version>
-      <feature.openflowplugin.version>0.2.0-SNAPSHOT</feature.openflowplugin.version>
+      <commons.opendaylight.version>1.7.0-SNAPSHOT</commons.opendaylight.version>
+      <loader.resources.version>0.3.0-SNAPSHOT</loader.resources.version>
+      <core.resources.version>0.3.0-SNAPSHOT</core.resources.version>
+      <node.resources.version>0.3.0-SNAPSHOT</node.resources.version>
+      <connection_manager.resources.version>0.3.0-SNAPSHOT</connection_manager.resources.version>
+      <container.resources.version>0.3.0-SNAPSHOT</container.resources.version>
+      <flow.resources.version>0.3.0-SNAPSHOT</flow.resources.version>
+      <network.resources.version>0.3.0-SNAPSHOT</network.resources.version>
+      <topology.resources.version>0.3.0-SNAPSHOT</topology.resources.version>
+      <yangui.resources.version>0.3.0-SNAPSHOT</yangui.resources.version>
+      <yangvisualizer.resources.version>0.3.0-SNAPSHOT</yangvisualizer.resources.version>
+      <common.authentication.resources.version>0.3.0-SNAPSHOT</common.authentication.resources.version>
+      <common.general.resources.version>0.3.0-SNAPSHOT</common.general.resources.version>
+      <common.navigation.resources.version>0.3.0-SNAPSHOT</common.navigation.resources.version>
+      <common.layout.resources.version>0.3.0-SNAPSHOT</common.layout.resources.version>
+      <common.topbar.resources.version>0.3.0-SNAPSHOT</common.topbar.resources.version>
+      <common.login.resources.version>0.3.0-SNAPSHOT</common.login.resources.version>
+      <common.yangutils.resources.version>0.3.0-SNAPSHOT</common.yangutils.resources.version>
+      <common.sigmatopology.resources.version>0.3.0-SNAPSHOT</common.sigmatopology.resources.version>
+      <restconf.version>1.4.0-SNAPSHOT</restconf.version>
+      <l2switch.version>0.4.0-SNAPSHOT</l2switch.version>
+      <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
+      <branding.version>1.3.0-SNAPSHOT</branding.version>
+      <karaf.resources.version>1.7.0-SNAPSHOT</karaf.resources.version>
+      <feature.l2switch.version>0.4.0-SNAPSHOT</feature.l2switch.version>
+      <feature.aaa.version>0.4.0-SNAPSHOT</feature.aaa.version>
+      <feature.openflowplugin.version>0.3.0-SNAPSHOT</feature.openflowplugin.version>
 
-      <feature.test.version>1.6.0-SNAPSHOT</feature.test.version>
-      <feature.mdsal.version>1.3.0-SNAPSHOT</feature.mdsal.version>
-      <feature.dlux.version>0.3.0-SNAPSHOT</feature.dlux.version>
-      <feature.flow.version>1.3.0-SNAPSHOT</feature.flow.version>
-      <feature.yangtools.version>0.8.0-SNAPSHOT</feature.yangtools.version>
-      <feature.adsal.version>0.10.0-SNAPSHOT</feature.adsal.version>
-      <feature.nsf.version>0.6.0-SNAPSHOT</feature.nsf.version>
+      <feature.test.version>1.7.0-SNAPSHOT</feature.test.version>
+      <feature.mdsal.version>1.4.0-SNAPSHOT</feature.mdsal.version>
+      <feature.dlux.version>0.4.0-SNAPSHOT</feature.dlux.version>
+      <feature.flow.version>1.4.0-SNAPSHOT</feature.flow.version>
+      <feature.yangtools.version>1.0.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.6.0-SNAPSHOT</karaf.empty.version>
-      <jacoco.version>0.6.2.201302030002</jacoco.version>
+      <karaf.empty.version>1.7.0-SNAPSHOT</karaf.empty.version>
     </properties>
 
     <modules>
@@ -65,51 +62,12 @@
        <module>loader/impl</module>
        <module>bundles</module>
        <module>features</module>
-       <module>distribution-dlux</module>
        <module>archetype</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>${jacoco.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>org.opendaylight.dlux.loader.*</include>
-                    </includes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>pre-test</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>post-test</id>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <phase>test</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-   
   <scm>
     <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>  
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_dlux:Main</url>
   </scm>
 </project>