summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pom.xml181
-rw-r--r--sdc-os-chef/pom.xml37
2 files changed, 114 insertions, 104 deletions
diff --git a/pom.xml b/pom.xml
index cbee9e9b89..50fa98ca83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,21 +167,22 @@
<!--cassandra -->
<cassandra.driver.version>3.0.0</cassandra.driver.version>
-
+
<!-- Sonar properties -->
- <sonar.login>sonaruser</sonar.login>
+ <!-- <sonar.login>sonaruser</sonar.login>
<sonar.password>us7USi0Htu93nFY91DPuQLFo6ebKcKXv</sonar.password>
- <sonar.host.url>http://104.239.145.8:9000</sonar.host.url>
+ <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.sources>.</sonar.sources>
<sonar.exclusions>**/scripts/**/*</sonar.exclusions>
- <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
- <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
-
- <!--nexus-->
- <nexus.proxy>https://nexus.openecomp.org</nexus.proxy>
+ <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
+ <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
+
+ <!--nexus-->
+ <nexus.proxy>https://nexus.openecomp.org</nexus.proxy>
+ <staging.profile.id>176c31dfe190a</staging.profile.id>
</properties>
<reporting>
@@ -577,15 +578,15 @@
</dependencies>
</plugin>
- <plugin>
- <groupId>io.wcm.maven.plugins</groupId>
- <artifactId>nodejs-maven-plugin</artifactId>
- <configuration>
- <npmVersion>4.3.0</npmVersion>
- <nodeJsVersion>7.5.0</nodeJsVersion>
- <nodeJsDirectory>/tmp/nodejs</nodeJsDirectory>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>io.wcm.maven.plugins</groupId>
+ <artifactId>nodejs-maven-plugin</artifactId>
+ <configuration>
+ <npmVersion>4.3.0</npmVersion>
+ <nodeJsVersion>7.5.0</nodeJsVersion>
+ <nodeJsDirectory>/tmp/nodejs</nodeJsDirectory>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -711,8 +712,18 @@
</executions>
</plugin>
-
-
+ <!-- Staging Plugin -->
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <nexusUrl>${nexus.proxy}</nexusUrl>
+ <stagingProfileId>${staging.profile.id}</stagingProfileId>
+ <serverId>ecomp-staging</serverId>
+ </configuration>
+ </plugin>
<!-- license plugin -->
<plugin>
@@ -780,69 +791,69 @@
- <repositories>
- <repository>
- <id>virtuos</id>
- <name>Virtuos</name>
- <url>http://nexus.virtuos.uos.de/nexus/content/repositories/public/</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>apache-public</id>
- <name>Apache-Public</name>
- <url>https://repository.apache.org/content/groups/public/</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>elasticsearch-releases</id>
- <url>https://maven.elasticsearch.org/releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>central</id>
- <name>Official Maven repository</name>
- <url>http://repo2.maven.org/maven2/</url>
- </repository>
- <repository>
- <id>ecomp-releases</id>
- <name>Release Repository</name>
- <url>${nexus.proxy}/content/repositories/releases/</url>
- </repository>
- <repository>
- <id>ecomp-staging</id>
- <name>Staging Repository</name>
- <url>${nexus.proxy}/content/repositories/staging/</url>
- </repository>
- <repository>
- <id>node</id>
- <name>Node</name>
- <url>https://maven-nodejs-proxy.pvtool.org/</url>
- </repository>
- <repository>
- <id>ecomp-snapshots</id>
- <name>Snapshots Repository</name>
- <url>${nexus.proxy}/content/repositories/snapshots/</url>
- </repository>
- </repositories>
-
- <distributionManagement>
-
- <repository>
- <id>ecomp-releases</id>
- <name>Release Repository</name>
- <url>${nexus.proxy}/content/repositories/releases/</url>
- </repository>
- <snapshotRepository>
- <id>ecomp-snapshots</id>
- <name>Snapshot Repository</name>
- <url>${nexus.proxy}/content/repositories/snapshots/</url>
- </snapshotRepository>
-
- </distributionManagement>
-</project>
+ <repositories>
+ <repository>
+ <id>virtuos</id>
+ <name>Virtuos</name>
+ <url>http://nexus.virtuos.uos.de/nexus/content/repositories/public/</url>
+ <layout>default</layout>
+ </repository>
+ <repository>
+ <id>apache-public</id>
+ <name>Apache-Public</name>
+ <url>https://repository.apache.org/content/groups/public/</url>
+ <layout>default</layout>
+ </repository>
+ <repository>
+ <id>elasticsearch-releases</id>
+ <url>https://maven.elasticsearch.org/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>central</id>
+ <name>Official Maven repository</name>
+ <url>http://repo2.maven.org/maven2/</url>
+ </repository>
+ <repository>
+ <id>ecomp-releases</id>
+ <name>Release Repository</name>
+ <url>${nexus.proxy}/content/repositories/releases/</url>
+ </repository>
+ <repository>
+ <id>ecomp-staging</id>
+ <name>Staging Repository</name>
+ <url>${nexus.proxy}/content/repositories/staging/</url>
+ </repository>
+ <repository>
+ <id>ecomp-snapshots</id>
+ <name>Snapshots Repository</name>
+ <url>${nexus.proxy}/content/repositories/snapshots/</url>
+ </repository>
+ <repository>
+ <id>node</id>
+ <name>Node</name>
+ <url>https://maven-nodejs-proxy.pvtool.org/</url>
+ </repository>
+ </repositories>
+
+ <distributionManagement>
+
+ <repository>
+ <id>ecomp-releases</id>
+ <name>Release Repository</name>
+ <url>${nexus.proxy}/content/repositories/releases/</url>
+ </repository>
+ <snapshotRepository>
+ <id>ecomp-snapshots</id>
+ <name>Snapshot Repository</name>
+ <url>${nexus.proxy}/content/repositories/snapshots/</url>
+ </snapshotRepository>
+
+ </distributionManagement>
+ </project>
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index d665595bb5..3d761df5e6 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -1,5 +1,5 @@
<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">
+ 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>
@@ -162,15 +162,15 @@
</configuration>
<executions>
<execution>
- <id>clean-images</id>
- <phase>pre-clean</phase>
- <goals>
- <goal>remove</goal>
- </goals>
- <configuration>
- <removeAll>true</removeAll>
- <image>openecomp/sdc-backend:%l,openecomp/sdc-frontend:%l,openecomp/sdc-elasticsearch:%l,openecomp/sdc-kibana:%l</image>
- </configuration>
+ <id>clean-images</id>
+ <phase>pre-clean</phase>
+ <goals>
+ <goal>remove</goal>
+ </goals>
+ <configuration>
+ <removeAll>true</removeAll>
+ <image>openecomp/sdc-backend:%l,openecomp/sdc-frontend:%l,openecomp/sdc-elasticsearch:%l,openecomp/sdc-kibana:%l</image>
+ </configuration>
</execution>
<execution>
@@ -182,15 +182,14 @@
</execution>
<execution>
- <id>push-images</id>
- <phase>deploy</phase>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- <configuration>
- <image>openecomp/sdc-backend:%l,openecomp/sdc-frontend:%l,openecomp/sdc-elasticsearch:%l,openecomp/sdc-kibana:%l</image>
- </configuration>
+ <id>push-images</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <image>openecomp/sdc-backend:%l,openecomp/sdc-frontend:%l,openecomp/sdc-elasticsearch:%l,openecomp/sdc-kibana:%l</image>
+ </configuration>
</execution>
</executions>