aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--asdc-tests/pom.xml4
-rw-r--r--catalog-be/pom.xml2
-rw-r--r--catalog-fe/pom.xml2
-rw-r--r--openecomp-ui/pom.xml50
-rw-r--r--pom.xml3
-rw-r--r--sdc-os-chef/scripts/docker_run.sh2
6 files changed, 53 insertions, 10 deletions
diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml
index ce346ae901..cc41ca9019 100644
--- 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 ddf421a046..a13c9bb909 100644
--- 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 cb41d46b6c..b12c32b020 100644
--- 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 ee6d32dd9a..400ad9a533 100644
--- a/openecomp-ui/pom.xml
+++ b/openecomp-ui/pom.xml
@@ -11,8 +11,12 @@
<groupId>org.openecomp.sdc.onboarding</groupId>
<artifactId>onboarding-fe</artifactId>
<name>onboarding-ui-war</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <sonar.skip>true</sonar.skip>
+ </properties>
- <packaging>war</packaging>
<build>
<plugins>
@@ -52,11 +56,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 50fa98ca83..c4bba322a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,9 +169,6 @@
<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>
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index 53a476d290..f885c76d67 100644
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -19,7 +19,7 @@ function cleanup {
function dir_perms {
mkdir -p /data/logs/BE/ASDC/ASDC-BE
mkdir -p /data/logs/FE/ASDC/ASDC-FE
- chmod -R 775 /data/logs
+ chmod -R 777 /data/logs
}