Code Review / dlux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
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 429ac215e2fd005d8f2ed3a9ee914489ba87476d..bf9ee86ce45202ca93aee76ffa8f6f4d4de73414 100644 (file)
--- a/dlux-web/pom.xml
+++ b/dlux-web/pom.xml
@@ -4,165 +4,250 @@
   <parent>\r
     <groupId>org.opendaylight.dlux</groupId>\r
     <artifactId>dlux-parent</artifactId>\r
-    <version>0.1.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.1.0-SNAPSHOT</version>\r
-    <packaging>bundle</packaging>\r
     <name>DLUX - DLUX Static Web </name>\r
-    <properties>\r
-        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
-    </properties>\r
 \r
     <dependencies>\r
-\r
-        <dependency>\r
-           <groupId>org.osgi</groupId>\r
-           <artifactId>org.osgi.core</artifactId>\r
+       <dependency>\r
+         <groupId>org.osgi</groupId>\r
+         <artifactId>org.osgi.core</artifactId>\r
        </dependency>\r
-\r
        <dependency>\r
-           <groupId>org.osgi</groupId>\r
-           <artifactId>org.osgi.compendium</artifactId>\r
+         <groupId>org.osgi</groupId>\r
+         <artifactId>org.osgi.compendium</artifactId>\r
        </dependency>\r
-\r
+      <dependency>\r
+        <groupId>org.opendaylight.dlux</groupId>\r
+        <artifactId>dlux.node.resources</artifactId>\r
+        <version>${node.resources.version}</version>\r
+      </dependency>\r
+      <dependency>\r
+        <groupId>org.opendaylight.dlux</groupId>\r
+        <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
+        <version>${common.navigation.resources.version}</version>\r
+       </dependency>\r
+       <dependency>\r
+        <groupId>org.opendaylight.dlux</groupId>\r
+        <artifactId>dlux.common.layout.resources</artifactId>\r
+        <version>${common.layout.resources.version}</version>\r
+       </dependency>\r
+       <dependency>\r
+        <groupId>org.opendaylight.dlux</groupId>\r
+        <artifactId>dlux.common.authentication.resources</artifactId>\r
+        <version>${common.authentication.resources.version}</version>\r
+      </dependency>\r
+       <dependency>\r
+        <groupId>org.opendaylight.dlux</groupId>\r
+        <artifactId>dlux.common.login.resources</artifactId>\r
+        <version>${common.login.resources.version}</version>\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
+    </dependency>\r
+    <dependency>\r
+        <groupId>org.opendaylight.dlux</groupId>\r
+        <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
+        <version>${yangvisualizer.resources.version}</version>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>org.opendaylight.dlux</groupId>\r
+        <artifactId>dlux.topology.resources</artifactId>\r
+        <version>${topology.resources.version}</version>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>org.opendaylight.dlux</groupId>\r
+        <artifactId>dlux.loader.resources</artifactId>\r
+        <version>${loader.resources.version}</version>\r
+    </dependency>\r
+      <dependency>\r
+        <groupId>org.opendaylight.dlux</groupId>\r
+        <artifactId>dlux.core.resources</artifactId>\r
+        <version>${core.resources.version}</version>\r
+      </dependency>\r
+      <dependency>\r
+        <groupId>org.opendaylight.dlux</groupId>\r
+        <artifactId>dlux.common.topbar.resources</artifactId>\r
+        <version>${common.topbar.resources.version}</version>\r
+      </dependency>\r
     </dependencies>\r
 \r
     <build>\r
+        <resources>\r
+            <resource>\r
+                <directory>target/generated-resources</directory>\r
+                <includes>\r
+                    <include>**/*</include>\r
+                </includes>\r
+            </resource>\r
+        </resources>\r
         <plugins>\r
-            <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>exec-maven-plugin</artifactId>\r
-                <version>1.3.1</version>\r
-                <executions>\r
-                    <execution>\r
-                        <phase>process-resources</phase>\r
-                        <goals>\r
-                            <goal>exec</goal>\r
-                        </goals>\r
-                    </execution>\r
-                </executions>\r
-                <configuration>\r
-                    <executable>grunt</executable>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-               <groupId>org.apache.maven.plugins</groupId> \r
-               <artifactId>maven-jar-plugin</artifactId> \r
-               <executions>\r
-                  <execution>\r
-                     <phase>package</phase>\r
-                     <goals>\r
-                        <goal>jar</goal>\r
-                     </goals>\r
-                  </execution>\r
-               </executions>\r
-               <configuration> \r
-                  <classesDirectory>target/generated-resources</classesDirectory> \r
-                   <includes> \r
-                      <include>**/*</include> \r
-                   </includes> \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
+        <!--Clean extracted resources-->\r
+        <plugin>\r
+            <artifactId>maven-clean-plugin</artifactId>\r
+            <version>2.5</version>\r
+            <configuration>\r
+              <filesets>\r
+                <fileset>\r
+                  <directory>src</directory>\r
+                  <includes>\r
+                         <include>test-main.js</include>\r
+                         <include>index.html</include>\r
+                         <include>main.js</include>\r
+                         <include>app/app.controller.js</include>\r
+                         <include>app/app.module.js</include>\r
+                         <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
+                      <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
+                      <include>common/login/</include>\r
+                      <include>common/general/</include>\r
+                      <include>common/topbar/</include>\r
+                         <include>assets/</include>\r
+                           </includes>\r
+                  <excludes></excludes>\r
+                  <followSymlinks>false</followSymlinks>\r
+                </fileset>\r
+              </filesets>\r
+            </configuration>\r
+        </plugin>\r
+        <plugin>\r
+          <groupId>org.apache.maven.plugins</groupId>\r
+          <artifactId>maven-dependency-plugin</artifactId>\r
+          <executions>\r
+         <!--src/app/ Resources-->\r
+            <execution>\r
+              <id>unpack-core-resources</id>\r
+              <goals>\r
+                <goal>unpack-dependencies</goal>\r
+              </goals>\r
+              <phase>generate-sources</phase>\r
+              <configuration>\r
+                <outputDirectory>${project.basedir}/src/app/</outputDirectory>\r
+                <groupId>org.opendaylight.dlux</groupId>\r
+                <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
+                </includeArtifactIds>\r
+                <excludes>META-INF\/**</excludes>\r
+                <excludeTransitive>true</excludeTransitive>\r
+                <ignorePermissions>false</ignorePermissions>\r
+              </configuration>\r
+            </execution>\r
+         <!--src/common Resources-->\r
+            <execution>\r
+              <id>unpack-general-resources</id>\r
+              <goals>\r
+                <goal>unpack-dependencies</goal>\r
+              </goals>\r
+              <phase>generate-sources</phase>\r
+              <configuration>\r
+                <outputDirectory>${project.basedir}/src/common/</outputDirectory>\r
+                <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
+                  dlux.common.login.resources,\r
+                  dlux.common.general.resources,\r
+                  dlux.common.topbar.resources,\r
+                </includeArtifactIds>\r
+                <excludes>META-INF\/**</excludes>\r
+                <excludeTransitive>true</excludeTransitive>\r
+                <ignorePermissions>false</ignorePermissions>\r
+              </configuration>\r
+            </execution>\r
+         <!--loader Resources-->\r
+            <execution>\r
+              <id>unpack-loader-resources</id>\r
+              <goals>\r
+                <goal>unpack-dependencies</goal>\r
+              </goals>\r
+              <phase>generate-sources</phase>\r
+              <configuration>\r
+                <outputDirectory>${project.basedir}/src/</outputDirectory>\r
+                <groupId>org.opendaylight.dlux</groupId>\r
+                <includeArtifactIds>dlux.loader.resources</includeArtifactIds>\r
+                <excludes>META-INF\/**</excludes>\r
+                <excludeTransitive>true</excludeTransitive>\r
+                <ignorePermissions>false</ignorePermissions>\r
+              </configuration>\r
+            </execution>\r
+          </executions>\r
+        </plugin>\r
+        <plugin>\r
+          <groupId>com.github.eirslett</groupId>\r
+          <artifactId>frontend-maven-plugin</artifactId>\r
+          <version>0.0.24</version>\r
+          <executions>\r
+            <execution>\r
+              <id>npm</id>\r
+              <goals>\r
+                <goal>install-node-and-npm</goal>\r
+                <goal>npm</goal>\r
+              </goals>\r
+              <phase>generate-resources</phase>\r
+            </execution>\r
+            <execution>\r
+              <id>bower</id>\r
+              <goals>\r
+                <goal>bower</goal>\r
+              </goals>\r
+            </execution>\r
+            <execution>\r
+              <id>grunt</id>\r
+              <goals>\r
+                <goal>grunt</goal>\r
+              </goals>\r
+            </execution>\r
+          </executions>\r
+          <configuration>\r
+            <nodeVersion>v0.12.7</nodeVersion>\r
+            <npmVersion>3.1.3</npmVersion>\r
+          </configuration>\r
+        </plugin>\r
         </plugins>\r
     </build>\r
-\r
-  <repositories>\r
-    <!-- Opendaylight public group -->\r
-    <repository>\r
-      <id>opendaylight-public</id>\r
-      <name>opendaylight-public</name>\r
-      <url>${nexusproxy}/groups/public/</url>\r
-      <snapshots>\r
-        <enabled>false</enabled>\r
-      </snapshots>\r
-      <releases>\r
-        <enabled>true</enabled>\r
-        <updatePolicy>never</updatePolicy>\r
-      </releases>\r
-    </repository>\r
-    <!-- OpenDayLight Released artifact -->\r
-    <repository>\r
-      <id>opendaylight-release</id>\r
-      <name>opendaylight-release</name>\r
-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release/</url>\r
-      <snapshots>\r
-        <enabled>false</enabled>\r
-      </snapshots>\r
-      <releases>\r
-        <enabled>true</enabled>\r
-      </releases>\r
-    </repository>\r
-    <!-- OpenDayLight Snapshot artifact -->\r
-    <repository>\r
-      <id>opendaylight-snapshot</id>\r
-      <name>opendaylight-snapshot</name>\r
-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>\r
-      <snapshots>\r
-        <enabled>true</enabled>\r
-      </snapshots>\r
-      <releases>\r
-        <enabled>false</enabled>\r
-      </releases>\r
-    </repository>\r
-  </repositories>\r
-\r
-  <pluginRepositories>\r
-    <!-- Opendaylight public group -->\r
-    <pluginRepository>\r
-      <id>opendaylight-public</id>\r
-      <name>opendaylight-public</name>\r
-      <url>${nexusproxy}/groups/public/</url>\r
-      <snapshots>\r
-        <enabled>false</enabled>\r
-      </snapshots>\r
-      <releases>\r
-        <enabled>true</enabled>\r
-        <updatePolicy>never</updatePolicy>\r
-      </releases>\r
-    </pluginRepository>\r
-    <!-- OpenDayLight Released artifact -->\r
-    <pluginRepository>\r
-      <id>opendaylight-release</id>\r
-      <name>opendaylight-release</name>\r
-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release/</url>\r
-      <snapshots>\r
-        <enabled>false</enabled>\r
-      </snapshots>\r
-      <releases>\r
-        <enabled>true</enabled>\r
-      </releases>\r
-    </pluginRepository>\r
-    <!-- OpenDayLight Snapshot artifact -->\r
-    <pluginRepository>\r
-      <id>opendaylight-snapshot</id>\r
-      <name>opendaylight-snapshot</name>\r
-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>\r
-      <snapshots>\r
-        <enabled>true</enabled>\r
-      </snapshots>\r
-      <releases>\r
-        <enabled>false</enabled>\r
-      </releases>\r
-    </pluginRepository>\r
-  </pluginRepositories>\r
-\r
 </project>\r
OpenDaylight UX - archived