X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=dlux-web%2Fpom.xml;h=17cf4bbd6aa9adaf09f2a1be62910bf4a24002fc;hb=4f31d8f0c1fa72e12257773a3e30d906f22c2b2d;hp=bf9ee86ce45202ca93aee76ffa8f6f4d4de73414;hpb=066767f73673086a96e61fc8918d787d0f864f09;p=dlux.git

diff --git a/dlux-web/pom.xml b/dlux-web/pom.xml
index bf9ee86c..17cf4bbd 100644
--- a/dlux-web/pom.xml
+++ b/dlux-web/pom.xml
@@ -1,102 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-  <parent>
-    <groupId>org.opendaylight.dlux</groupId>
-    <artifactId>dlux-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
-  </parent>
+    <parent>
+        <groupId>org.opendaylight.dlux</groupId>
+        <artifactId>dlux-parent</artifactId>
+        <version>0.5.4-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.dlux</groupId>
     <artifactId>dlux-web</artifactId>
-    <name>DLUX - DLUX Static Web </name>
+    <name>DLUX - DLUX Static Web</name>
 
     <dependencies>
-       <dependency>
-         <groupId>org.osgi</groupId>
-         <artifactId>org.osgi.core</artifactId>
-       </dependency>
-       <dependency>
-         <groupId>org.osgi</groupId>
-         <artifactId>org.osgi.compendium</artifactId>
-       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.node.resources</artifactId>
-        <version>${node.resources.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.common.yangutils.resources</artifactId>
-        <version>${common.yangutils.resources.version}</version>
-  	</dependency>
-      <dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.common.sigmatopology.resources</artifactId>
-        <version>${common.sigmatopology.resources.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.common.navigation.resources</artifactId>
-        <version>${common.navigation.resources.version}</version>
-  	</dependency>
-  	<dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.common.layout.resources</artifactId>
-        <version>${common.layout.resources.version}</version>
-  	</dependency>
-  	<dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.common.authentication.resources</artifactId>
-        <version>${common.authentication.resources.version}</version>
-      </dependency>
-  	<dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.common.login.resources</artifactId>
-        <version>${common.login.resources.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.common.general.resources</artifactId>
-        <version>${common.general.resources.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.yangui.resources</artifactId>
-        <version>${yangui.resources.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.yangman.resources</artifactId>
-        <version>${yangman.resources.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.yangvisualizer.resources</artifactId>
-        <version>${yangvisualizer.resources.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.topology.resources</artifactId>
-        <version>${topology.resources.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.loader.resources</artifactId>
-        <version>${loader.resources.version}</version>
-    </dependency>
-      <dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.core.resources</artifactId>
-        <version>${core.resources.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.dlux</groupId>
-        <artifactId>dlux.common.topbar.resources</artifactId>
-        <version>${common.topbar.resources.version}</version>
-      </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>dlux.common.navigation.resources</artifactId>
+            <version>${common.navigation.resources.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>dlux.common.layout.resources</artifactId>
+            <version>${common.layout.resources.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>dlux.common.authentication.resources</artifactId>
+            <version>${common.authentication.resources.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>dlux.common.login.resources</artifactId>
+            <version>${common.login.resources.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>dlux.common.general.resources</artifactId>
+            <version>${common.general.resources.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>dlux.loader.resources</artifactId>
+            <version>${loader.resources.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>dlux.core.resources</artifactId>
+            <version>${core.resources.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>dlux.common.topbar.resources</artifactId>
+            <version>${common.topbar.resources.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -109,145 +75,131 @@
             </resource>
         </resources>
         <plugins>
-        <!--Clean extracted resources-->
-        <plugin>
-            <artifactId>maven-clean-plugin</artifactId>
-            <version>2.5</version>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>src</directory>
-                  <includes>
-              		  <include>test-main.js</include>
-              		  <include>index.html</include>
-              		  <include>main.js</include>
-              		  <include>app/app.controller.js</include>
-              		  <include>app/app.module.js</include>
-              		  <include>app/routingConfig.js</include>
-                      <include>app/node/</include>
-                      <include>app/yangui/</include>
-                      <include>app/yangman/</include>
-                      <include>app/yangvisualizer/</include>
-                      <include>app/topology/</include>
-                      <include>app/core/</include>
-                      <include>app/graph/</include>
-                      <include>common/yangutils/</include>
-                      <include>common/sigmatopology/</include>
-                      <include>common/navigation/</include>
-                      <include>common/layout/</include>
-                      <include>common/authentification/</include>
-                      <include>common/login/</include>
-                      <include>common/general/</include>
-                      <include>common/topbar/</include>
-              		  <include>assets/</include>
-  		            </includes>
-                  <excludes></excludes>
-                  <followSymlinks>false</followSymlinks>
-                </fileset>
-              </filesets>
-            </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <executions>
-  	  <!--src/app/ Resources-->
-            <execution>
-              <id>unpack-core-resources</id>
-              <goals>
-                <goal>unpack-dependencies</goal>
-              </goals>
-              <phase>generate-sources</phase>
-              <configuration>
-                <outputDirectory>${project.basedir}/src/app/</outputDirectory>
-                <groupId>org.opendaylight.dlux</groupId>
-                <includeArtifactIds>
-                  dlux.node.resources,
-                  dlux.yangui.resources,
-                  dlux.yangman.resources,
-                  dlux.yangvisualizer.resources,
-                  dlux.topology.resources,
-                  dlux.core.resources,
-                </includeArtifactIds>
-                <excludes>META-INF\/**</excludes>
-                <excludeTransitive>true</excludeTransitive>
-                <ignorePermissions>false</ignorePermissions>
-              </configuration>
-            </execution>
-  	  <!--src/common Resources-->
-            <execution>
-              <id>unpack-general-resources</id>
-              <goals>
-                <goal>unpack-dependencies</goal>
-              </goals>
-              <phase>generate-sources</phase>
-              <configuration>
-                <outputDirectory>${project.basedir}/src/common/</outputDirectory>
-                <groupId>org.opendaylight.dlux</groupId>
-                <includeArtifactIds>
-                  dlux.common.yangutils.resources,
-                  dlux.common.sigmatopology.resources,
-                  dlux.common.navigation.resources,
-                  dlux.common.layout.resources,
-                  dlux.common.authentication.resources,
-                  dlux.common.login.resources,
-                  dlux.common.general.resources,
-                  dlux.common.topbar.resources,
-                </includeArtifactIds>
-                <excludes>META-INF\/**</excludes>
-                <excludeTransitive>true</excludeTransitive>
-                <ignorePermissions>false</ignorePermissions>
-              </configuration>
-            </execution>
-  	  <!--loader Resources-->
-            <execution>
-              <id>unpack-loader-resources</id>
-              <goals>
-                <goal>unpack-dependencies</goal>
-              </goals>
-              <phase>generate-sources</phase>
-              <configuration>
-                <outputDirectory>${project.basedir}/src/</outputDirectory>
-                <groupId>org.opendaylight.dlux</groupId>
-                <includeArtifactIds>dlux.loader.resources</includeArtifactIds>
-                <excludes>META-INF\/**</excludes>
-                <excludeTransitive>true</excludeTransitive>
-                <ignorePermissions>false</ignorePermissions>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>com.github.eirslett</groupId>
-          <artifactId>frontend-maven-plugin</artifactId>
-          <version>0.0.24</version>
-          <executions>
-            <execution>
-              <id>npm</id>
-              <goals>
-                <goal>install-node-and-npm</goal>
-                <goal>npm</goal>
-              </goals>
-              <phase>generate-resources</phase>
-            </execution>
-            <execution>
-              <id>bower</id>
-              <goals>
-                <goal>bower</goal>
-              </goals>
-            </execution>
-            <execution>
-              <id>grunt</id>
-              <goals>
-                <goal>grunt</goal>
-              </goals>
-            </execution>
-          </executions>
-          <configuration>
-            <nodeVersion>v0.12.7</nodeVersion>
-            <npmVersion>3.1.3</npmVersion>
-          </configuration>
-        </plugin>
+            <!--Clean extracted resources-->
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>src</directory>
+                            <includes>
+                                <include>test-main.js</include>
+                                <include>index.html</include>
+                                <include>main.js</include>
+                                <include>app/app.controller.js</include>
+                                <include>app/app.module.js</include>
+                                <include>app/routingConfig.js</include>
+                                <include>app/core/</include>
+                                <include>app/graph/</include>
+                                <include>common/navigation/</include>
+                                <include>common/layout/</include>
+                                <include>common/authentification/</include>
+                                <include>common/login/</include>
+                                <include>common/general/</include>
+                                <include>common/topbar/</include>
+                                <include>assets/</include>
+                            </includes>
+                            <excludes></excludes>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <!--src/app/ Resources-->
+                    <execution>
+                        <id>unpack-core-resources</id>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <outputDirectory>${project.basedir}/src/app/</outputDirectory>
+                            <groupId>org.opendaylight.dlux</groupId>
+                            <includeArtifactIds>
+                                dlux.core.resources,
+                            </includeArtifactIds>
+                            <excludes>META-INF\/**</excludes>
+                            <excludeTransitive>true</excludeTransitive>
+                            <ignorePermissions>false</ignorePermissions>
+                        </configuration>
+                    </execution>
+                    <!--src/common Resources-->
+                    <execution>
+                        <id>unpack-general-resources</id>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <outputDirectory>${project.basedir}/src/common/</outputDirectory>
+                            <groupId>org.opendaylight.dlux</groupId>
+                            <includeArtifactIds>
+                                dlux.common.navigation.resources,
+                                dlux.common.layout.resources,
+                                dlux.common.authentication.resources,
+                                dlux.common.login.resources,
+                                dlux.common.general.resources,
+                                dlux.common.topbar.resources,
+                            </includeArtifactIds>
+                            <excludes>META-INF\/**</excludes>
+                            <excludeTransitive>true</excludeTransitive>
+                            <ignorePermissions>false</ignorePermissions>
+                        </configuration>
+                    </execution>
+                    <!--loader Resources-->
+                    <execution>
+                        <id>unpack-loader-resources</id>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <outputDirectory>${project.basedir}/src/</outputDirectory>
+                            <groupId>org.opendaylight.dlux</groupId>
+                            <includeArtifactIds>dlux.loader.resources</includeArtifactIds>
+                            <excludes>META-INF\/**</excludes>
+                            <excludeTransitive>true</excludeTransitive>
+                            <ignorePermissions>false</ignorePermissions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>0.0.24</version>
+                <executions>
+                    <execution>
+                        <id>npm</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                    </execution>
+                    <execution>
+                        <id>bower</id>
+                        <goals>
+                            <goal>bower</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>grunt</id>
+                        <goals>
+                            <goal>grunt</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <nodeVersion>v0.12.7</nodeVersion>
+                    <npmVersion>3.1.3</npmVersion>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>