aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerard Hickey <gerard.hickey@ericsson.com>2019-06-27 08:04:57 +0100
committerGerard Hickey <gerard.hickey@ericsson.com>2019-06-27 08:05:07 +0100
commitcfb4963e45e28dfa819dacbfa54534a90a0fa647 (patch)
treeaed81570c2370d43ce59dab91a148ecc795362a2
parent4545ce1221e81f15f73cbadaedd1ccfb3ba42c41 (diff)
JJB alignment across DCAE components - DCAE inventory-api
Issue-ID: DCAEGEN2-1578 Signed-off-by: Gerard Hickey <gerard.hickey@ericsson.com> Change-Id: Ie1a222c22c1ec600ca311d7f4e6b71763604cbd2
-rw-r--r--pom.xml17
-rw-r--r--version.properties2
2 files changed, 4 insertions, 15 deletions
diff --git a/pom.xml b/pom.xml
index f416b91..08bb09f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,12 +24,12 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.2.0</version>
+ <version>2.0.0</version>
</parent>
<groupId>org.onap.dcaegen2.platform</groupId>
<artifactId>inventory-api</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0-SNAPSHOT</version>
<name>dcaegen2-platform-inventory-api</name>
<!--internal <version>3.0.0</version>-->
@@ -355,7 +355,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<expose>8080</expose>
</exposes>
<imageTags>
- <imageTag>${project.version}-SNAPSHOT-${maven.build.timestamp}Z</imageTag>
+ <imageTag>${project.version}-${maven.build.timestamp}Z</imageTag>
<imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
@@ -381,17 +381,6 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<artifactId>sonar-maven-plugin</artifactId>
<version>3.2</version>
</plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <serverId>ecomp-staging</serverId>
- <nexusUrl>${nexusproxy}</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/version.properties b/version.properties
index 8eed1b7..92866fb 100644
--- a/version.properties
+++ b/version.properties
@@ -2,7 +2,7 @@
# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
# because they are used in Jenkins, whose plug-in doesn't support
major=3
-minor=2
+minor=3
patch=0
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins