aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/deliveries/pom.xml5
-rw-r--r--packages/docker/pom.xml34
-rw-r--r--pom.xml4
3 files changed, 38 insertions, 5 deletions
diff --git a/packages/deliveries/pom.xml b/packages/deliveries/pom.xml
index 679cebdafe..61236ed5fc 100644
--- a/packages/deliveries/pom.xml
+++ b/packages/deliveries/pom.xml
@@ -16,7 +16,7 @@
<description>This project is responsible of the final packages</description>
<organization>
<name>OPENECOMP - MSO</name>
- <url>http://www.openecomp.org/</url>
+ <url>http://www.onap.org/</url>
</organization>
@@ -52,6 +52,7 @@
<!-- DEVELOPER PACKS -->
<execution>
<configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
<descriptors>
<descriptor>src/main/assembly/war-pack/mso-wars.xml</descriptor>
@@ -75,4 +76,4 @@
</plugins>
</build>
-</project> \ No newline at end of file
+</project>
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index c31a775290..58ac368d03 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -19,13 +19,43 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- If the maven profile "docker" is specified the parameter -Dmso.git.url=<MsoGitRepo> must be provided
- i.e: mvn clean install -P docker -Dmso.git.url=https://gerrit.openecomp.org/r-->
+ i.e: mvn clean install -P docker -Dmso.git.url=https://gerrit.onap.org/r-->
<mso.git.url>${env.GIT_NO_PROJECT}</mso.git.url>
+ <mso.project.version>${project.version}</mso.project.version>
</properties>
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ println project.properties['mso.project.version'];
+ def versionArray;
+ if ( project.properties['mso.project.version'] != null ) {
+ versionArray = project.properties['mso.project.version'].split('\\.');
+ }
+
+ if ( project.properties['mso.project.version'].endsWith("-SNAPSHOT") ) {
+ project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
+ } else {
+ project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+ }
+
+ println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
@@ -111,6 +141,7 @@
<build>
<tags>
<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+ <tag>${project.docker.latesttag.version}</tag>
</tags>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
@@ -124,6 +155,7 @@
<build>
<tags>
<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+ <tag>${project.docker.latesttag.version}</tag>
</tags>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
diff --git a/pom.xml b/pom.xml
index 7e308c70b7..0f0ca27011 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
</description>
<organization>
<name>OPENECOMP - MSO</name>
- <url>http://www.openecomp.org/</url>
+ <url>http://www.onap.org/</url>
</organization>
<modules>
<module>common</module>
@@ -39,7 +39,7 @@
<!-- this is used for Chef mso-code cookbook -->
<swm.version>2.19.3-1</swm.version>
<evosuiteVersion>1.0.4-alpha2</evosuiteVersion>
- <nexusproxy>https://nexus.openecomp.org</nexusproxy>
+ <nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<sitePath>/content/sites/site/org/openecomp/mso/${project.version}</sitePath>