Bump versions by 0.1.0 for next dev cycle

[dlux.git] / dlux-web / pom.xml

diff --git a/dlux-web/pom.xml b/dlux-web/pom.xml
index be17103cd6b1b676b78ba10f639db59fe31b9297..bf9ee86ce45202ca93aee76ffa8f6f4d4de73414 100644 (file)
--- a/dlux-web/pom.xml
+++ b/dlux-web/pom.xml
@@ -4,15 +4,13 @@
   <parent>\r
     <groupId>org.opendaylight.dlux</groupId>\r
     <artifactId>dlux-parent</artifactId>\r
-    <version>0.2.0-SNAPSHOT</version>\r
+    <version>0.5.0-SNAPSHOT</version>\r
     <relativePath>..</relativePath>\r
   </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.opendaylight.dlux</groupId>\r
     <artifactId>dlux-web</artifactId>\r
-    <version>0.2.0-SNAPSHOT</version>\r
-    <packaging>bundle</packaging>\r
     <name>DLUX - DLUX Static Web </name>\r
 \r
     <dependencies>\r
@@ -34,6 +32,11 @@
         <artifactId>dlux.common.yangutils.resources</artifactId>\r
         <version>${common.yangutils.resources.version}</version>\r
        </dependency>\r
+      <dependency>\r
+        <groupId>org.opendaylight.dlux</groupId>\r
+        <artifactId>dlux.common.sigmatopology.resources</artifactId>\r
+        <version>${common.sigmatopology.resources.version}</version>\r
+      </dependency>\r
       <dependency>\r
         <groupId>org.opendaylight.dlux</groupId>\r
         <artifactId>dlux.common.navigation.resources</artifactId>\r
@@ -54,7 +57,7 @@
         <artifactId>dlux.common.login.resources</artifactId>\r
         <version>${common.login.resources.version}</version>\r
     </dependency>\r
-       <dependency>\r
+    <dependency>\r
         <groupId>org.opendaylight.dlux</groupId>\r
         <artifactId>dlux.common.general.resources</artifactId>\r
         <version>${common.general.resources.version}</version>\r
@@ -66,18 +69,13 @@
     </dependency>\r
     <dependency>\r
         <groupId>org.opendaylight.dlux</groupId>\r
-        <artifactId>dlux.network.resources</artifactId>\r
-        <version>${network.resources.version}</version>\r
+        <artifactId>dlux.yangman.resources</artifactId>\r
+        <version>${yangman.resources.version}</version>\r
     </dependency>\r
     <dependency>\r
         <groupId>org.opendaylight.dlux</groupId>\r
-        <artifactId>dlux.flow.resources</artifactId>\r
-        <version>${flow.resources.version}</version>\r
-    </dependency>\r
-    <dependency>\r
-        <groupId>org.opendaylight.dlux</groupId>\r
-        <artifactId>dlux.container.resources</artifactId>\r
-        <version>${container.resources.version}</version>\r
+        <artifactId>dlux.yangvisualizer.resources</artifactId>\r
+        <version>${yangvisualizer.resources.version}</version>\r
     </dependency>\r
     <dependency>\r
         <groupId>org.opendaylight.dlux</groupId>\r
@@ -89,11 +87,6 @@
         <artifactId>dlux.loader.resources</artifactId>\r
         <version>${loader.resources.version}</version>\r
     </dependency>\r
-    <dependency>\r
-        <groupId>org.opendaylight.dlux</groupId>\r
-        <artifactId>dlux.connection_manager.resources</artifactId>\r
-        <version>${connection_manager.resources.version}</version>\r
-      </dependency>\r
       <dependency>\r
         <groupId>org.opendaylight.dlux</groupId>\r
         <artifactId>dlux.core.resources</artifactId>\r
@@ -133,13 +126,13 @@
                          <include>app/routingConfig.js</include>\r
                       <include>app/node/</include>\r
                       <include>app/yangui/</include>\r
-                      <include>app/network/</include>\r
-                      <include>app/flow/</include>\r
-                      <include>app/container/</include>\r
+                      <include>app/yangman/</include>\r
+                      <include>app/yangvisualizer/</include>\r
                       <include>app/topology/</include>\r
-                      <include>app/connection_manager/</include>\r
                       <include>app/core/</include>\r
+                      <include>app/graph/</include>\r
                       <include>common/yangutils/</include>\r
+                      <include>common/sigmatopology/</include>\r
                       <include>common/navigation/</include>\r
                       <include>common/layout/</include>\r
                       <include>common/authentification/</include>\r
@@ -157,7 +150,6 @@
         <plugin>\r
           <groupId>org.apache.maven.plugins</groupId>\r
           <artifactId>maven-dependency-plugin</artifactId>\r
-          <version>2.6</version>\r
           <executions>\r
          <!--src/app/ Resources-->\r
             <execution>\r
@@ -172,11 +164,9 @@
                 <includeArtifactIds>\r
                   dlux.node.resources,\r
                   dlux.yangui.resources,\r
-                  dlux.container.resources,\r
+                  dlux.yangman.resources,\r
+                  dlux.yangvisualizer.resources,\r
                   dlux.topology.resources,\r
-                  dlux.connection_manager.resources,\r
-                  dlux.network.resources,\r
-                  dlux.flow.resources,\r
                   dlux.core.resources,\r
                 </includeArtifactIds>\r
                 <excludes>META-INF\/**</excludes>\r
@@ -196,6 +186,7 @@
                 <groupId>org.opendaylight.dlux</groupId>\r
                 <includeArtifactIds>\r
                   dlux.common.yangutils.resources,\r
+                  dlux.common.sigmatopology.resources,\r
                   dlux.common.navigation.resources,\r
                   dlux.common.layout.resources,\r
                   dlux.common.authentication.resources,\r
@@ -229,7 +220,7 @@
         <plugin>\r
           <groupId>com.github.eirslett</groupId>\r
           <artifactId>frontend-maven-plugin</artifactId>\r
-          <version>0.0.20</version>\r
+          <version>0.0.24</version>\r
           <executions>\r
             <execution>\r
               <id>npm</id>\r
@@ -253,24 +244,10 @@
             </execution>\r
           </executions>\r
           <configuration>\r
-            <nodeVersion>v0.10.18</nodeVersion>\r
-            <npmVersion>1.3.8</npmVersion>\r
+            <nodeVersion>v0.12.7</nodeVersion>\r
+            <npmVersion>3.1.3</npmVersion>\r
           </configuration>\r
         </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.felix</groupId>\r
-                <artifactId>maven-bundle-plugin</artifactId>\r
-                <version>2.4.0</version>\r
-                <extensions>true</extensions>\r
-                <configuration>\r
-                    <instructions>\r
-                        <Import-Package>*</Import-Package>\r
-                        <Export-Package>org.opendaylight.dlux.web</Export-Package>\r
-                        <Bundle-Activator>org.opendaylight.dlux.web.Activator</Bundle-Activator>\r
-                    </instructions>\r
-                    <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>\r
-                </configuration>\r
-            </plugin>\r
         </plugins>\r
     </build>\r
 </project>\r