Fix release process

Exclude some .js files for Sonar
Fix openecomp-UI (was empty)
Change ecompFW to version 1.0.0

Change-Id: I91b252cc942c0c7402dc65c99e6fd807f7936846
Signed-off-by: ml636r <ml636r@att.com>

diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml
index ce346ae..cc41ca9 100644 (file)
--- a/asdc-tests/pom.xml
+++ b/asdc-tests/pom.xml
@@ -251,14 +251,14 @@
                <dependency>
                        <groupId>org.openecomp.sdc</groupId>
                        <artifactId>sdc-distribution-client</artifactId>
-                       <version>1.0.0-SNAPSHOT</version>
+                       <version>1.0.0</version>
                        <scope>compile</scope>
                </dependency>
                
                <dependency>
                        <groupId>org.openecomp.ecompsdkos</groupId>
                        <artifactId>ecompFW</artifactId>
-                       <version>${ecomp.version}</version>
+                       <version>1.0.0</version>
                        <scope>compile</scope>
             <exclusions>
                 <exclusion>

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index ddf421a..a13c9bb 100644 (file)
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -436,7 +436,7 @@
                <dependency>
                        <groupId>org.openecomp.ecompsdkos</groupId>
                        <artifactId>ecompFW</artifactId>
-                       <version>${ecomp.version}</version>
+                       <version>1.0.0</version>
                        <scope>compile</scope>
                        <exclusions>
                                <exclusion>

diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index cb41d46..b12c32b 100644 (file)
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -222,7 +222,7 @@
                        <dependency>
                                <groupId>org.openecomp.ecompsdkos</groupId>
                                <artifactId>ecompFW</artifactId>
-                               <version>${ecomp.version}</version>
+                               <version>1.0.0</version>
                                <scope>compile</scope>
                                <exclusions>
                                        <exclusion>

diff --git a/openecomp-ui/pom.xml b/openecomp-ui/pom.xml
index ee6d32d..579e1f7 100644 (file)
--- a/openecomp-ui/pom.xml
+++ b/openecomp-ui/pom.xml
@@ -11,8 +11,8 @@
        <groupId>org.openecomp.sdc.onboarding</groupId>
        <artifactId>onboarding-fe</artifactId>
        <name>onboarding-ui-war</name>
+       <packaging>pom</packaging>
 
-       <packaging>war</packaging>
        <build>
                <plugins>
 
@@ -52,11 +52,53 @@
                        </plugin>
 
                        <plugin>
+        <groupId>com.coderplus.maven.plugins</groupId>
+        <artifactId>copy-rename-maven-plugin</artifactId>
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <id>copy-file</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <sourceFile>${project.basedir}/dist/onboarding.war</sourceFile>
+              <destinationFile>${project.basedir}/target/onboarding-fe-${project.version}.war</destinationFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+       <groupId>org.codehaus.mojo</groupId>
+       <artifactId>build-helper-maven-plugin</artifactId>
+       <version>1.7</version>
+       <executions>
+               <execution>
+                       <id>attach-artifacts</id>
+                       <phase>compile</phase>
+                       <goals>
+                               <goal>attach-artifact</goal>
+                       </goals>
+                       <configuration>
+                               <artifacts>
+                                       <artifact>
+                                               <file>${project.basedir}/target/onboarding-fe-${project.version}.war</file>
+                                               <type>war</type>                           
+                                       </artifact>
+                               </artifacts>
+                       </configuration>
+               </execution>
+       </executions>
+      </plugin>
+
+<!--                   <plugin>
                                <artifactId>maven-war-plugin</artifactId>
                                <configuration>
                                        <webXml>webapp-onboarding\WEB-INF\web.xml</webXml>
                                </configuration>
-                       </plugin>
+                       </plugin> -->
                </plugins>
        </build>
 

diff --git a/pom.xml b/pom.xml
index 50fa98c..1765da8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -169,14 +169,15 @@
                <cassandra.driver.version>3.0.0</cassandra.driver.version>
 
                <!-- Sonar properties -->
-               <!-- <sonar.login>sonaruser</sonar.login>
-               <sonar.password>us7USi0Htu93nFY91DPuQLFo6ebKcKXv</sonar.password>
-               <sonar.host.url>http://104.239.145.8:9000</sonar.host.url> -->
                <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
                <sonar.skipDesign>true</sonar.skipDesign>
                <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
                <sonar.sources>.</sonar.sources>
-               <sonar.exclusions>**/scripts/**/*</sonar.exclusions>
+               <sonar.exclusions>**/scripts/**/*,
+                       openecomp-ui/src/nfvo-utils/ErrorResponseHandler.js,
+                       openecomp-ui/src/nfvo-utils/json/JSONPointer.js,
+                       openecomp-ui/src/sdc-app/AppStore.js,
+                       openecomp-ui/src/sdc-app/config/Configuration.js</sonar.exclusions>
                <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
                <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>