Merge "Yangman - Highlight Expanded Collection"

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

diff --git a/dlux-web/pom.xml b/dlux-web/pom.xml
index d7622288f9649d95cb377be9560e8fc9957d37ac..bf9ee86ce45202ca93aee76ffa8f6f4d4de73414 100644 (file)
--- a/dlux-web/pom.xml
+++ b/dlux-web/pom.xml
@@ -4,14 +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
     <name>DLUX - DLUX Static Web </name>\r
 \r
     <dependencies>\r
@@ -68,6 +67,11 @@
         <artifactId>dlux.yangui.resources</artifactId>\r
         <version>${yangui.resources.version}</version>\r
     </dependency>\r
+    <dependency>\r
+        <groupId>org.opendaylight.dlux</groupId>\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.yangvisualizer.resources</artifactId>\r
@@ -88,11 +92,6 @@
         <artifactId>dlux.core.resources</artifactId>\r
         <version>${core.resources.version}</version>\r
       </dependency>\r
-      <dependency>\r
-        <groupId>org.opendaylight.dlux</groupId>\r
-        <artifactId>dlux.graph.resources</artifactId>\r
-        <version>${graph.resources.version}</version>\r
-      </dependency>\r
       <dependency>\r
         <groupId>org.opendaylight.dlux</groupId>\r
         <artifactId>dlux.common.topbar.resources</artifactId>\r
@@ -127,6 +126,7 @@
                          <include>app/routingConfig.js</include>\r
                       <include>app/node/</include>\r
                       <include>app/yangui/</include>\r
+                      <include>app/yangman/</include>\r
                       <include>app/yangvisualizer/</include>\r
                       <include>app/topology/</include>\r
                       <include>app/core/</include>\r
@@ -150,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
@@ -165,10 +164,10 @@
                 <includeArtifactIds>\r
                   dlux.node.resources,\r
                   dlux.yangui.resources,\r
+                  dlux.yangman.resources,\r
                   dlux.yangvisualizer.resources,\r
                   dlux.topology.resources,\r
                   dlux.core.resources,\r
-                  dlux.graph.resources,\r
                 </includeArtifactIds>\r
                 <excludes>META-INF\/**</excludes>\r
                 <excludeTransitive>true</excludeTransitive>\r
@@ -221,7 +220,7 @@
         <plugin>\r
           <groupId>com.github.eirslett</groupId>\r
           <artifactId>frontend-maven-plugin</artifactId>\r
-          <version>0.0.23</version>\r
+          <version>0.0.24</version>\r
           <executions>\r
             <execution>\r
               <id>npm</id>\r
@@ -245,8 +244,8 @@
             </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
         </plugins>\r