Remove docker login from settings.xml

[sdc.git] / openecomp-ui / pom.xml

diff --git a/openecomp-ui/pom.xml b/openecomp-ui/pom.xml
index 0e98b7c..0e9c245 100644 (file)
--- a/openecomp-ui/pom.xml
+++ b/openecomp-ui/pom.xml
@@ -1,5 +1,6 @@
-<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">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.openecomp.sdc</groupId>
@@ -14,11 +15,12 @@
         <relativePath>../onboarding</relativePath>
     </parent>
 
+    <properties>
+        <maven.war.plugin.version>3.0.0</maven.war.plugin.version>
+    </properties>
+
     <build>
         <plugins>
-            <!-- ============================================= -->
-            <!-- Clean dist folder -->
-            <!-- ============================================= -->
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
                 <version>2.6.1</version>
@@ -34,15 +36,17 @@
                                 <fileset>
                                     <directory>${basedir}/dist</directory>
                                 </fileset>
+                                <!--<fileset>-->
+                                    <!--<directory>${basedir}/node_modules</directory>-->
+                                <!--</fileset>-->
                                 <fileset>
-                                    <directory>${basedir}/node_modules</directory>
-                                </fileset>
-                                <fileset>
-                                    <directory>${basedir}/../dox-sequence-diagram-ui/dist</directory>
-                                </fileset>
-                                <fileset>
-                                    <directory>${basedir}/../dox-sequence-diagram-ui/node_modules</directory>
+                                    <directory>${basedir}/../dox-sequence-diagram-ui/dist
+                                    </directory>
                                 </fileset>
+                                <!--<fileset>-->
+                                    <!--<directory>${basedir}/../dox-sequence-diagram-ui/node_modules-->
+                                    <!--</directory>-->
+                                <!--</fileset>-->
                             </filesets>
                         </configuration>
                     </execution>
@@ -58,8 +62,8 @@
                 <version>1.4</version>
 
                 <configuration>
-                               <installDirectory>${project.parent.parent.basedir}</installDirectory>
-                       </configuration>
+                    <installDirectory>${project.parent.parent.basedir}</installDirectory>
+                </configuration>
 
                 <executions>
 
@@ -75,13 +79,13 @@
                     </execution>
 
                     <execution>
-                       <id>npm set progress off</id>
-                       <goals>
-                               <goal>npm</goal>
-                       </goals>
-                       <configuration>
-                               <arguments>set progress=false</arguments>
-                       </configuration>
+                        <id>npm set progress off</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>set progress=false</arguments>
+                        </configuration>
                     </execution>
 
                     <execution>
@@ -90,11 +94,34 @@
                             <goal>npm</goal>
                         </goals>
                         <configuration>
-                            <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui</workingDirectory>
+                            <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui
+                            </workingDirectory>
                             <arguments>install</arguments>
                         </configuration>
                     </execution>
 
+                    <!-- Fix jQuery dependency in restful-js -->
+                    <execution>
+                        <id>npm restful-js</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>install restful-js</arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm install restful-js dependencies</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <workingDirectory>${project.basedir}/node_modules/restful-js
+                            </workingDirectory>
+                            <arguments>install --production</arguments>
+                        </configuration>
+                    </execution>
+
                     <execution>
                         <id>npm install</id>
                         <goals>
@@ -111,7 +138,7 @@
                             <goal>npm</goal>
                         </goals>
                         <configuration>
-                            <arguments>run build -- --version=${version}</arguments>
+                            <arguments>run build -- --version=${project.version}</arguments>
                         </configuration>
                     </execution>
                 </executions>
@@ -143,11 +170,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>${maven.war.plugin.version}</version>
                 <configuration>
                     <webResources>
                         <resource>
-                                <directory>${basedir}/target/dist</directory>
+                            <directory>${basedir}/target/dist</directory>
                         </resource>
                     </webResources>
                 </configuration>