diff options
| author |   Venkata Harish K Kajur <vk250x@att.com> | 2017-03-07 19:08:23 +0000 |
|---|---|---|
| committer | Venkata Harish K Kajur <vk250x@att.com> | 2017-03-08 15:01:34 +0000 |
| commit | 16573359029ab1260a6ba07b9cbbbbbb5698d3b4 (patch) | |
| tree | 532165062347e7674ec8abf285a778a4538a6f78 | |
| parent | 6041dd2d732f710398e72914fdc2c051444befb0 (diff) | |
Update version props from load to patch
- Also add the tags for docker images
- Change the docker push to using plugin
- Change back the docker plugin tag name
- Also update to 1.0.0
Change-Id: Ia6c29cf4dabfd158668b774be2df558e3070687c
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
| -rw-r--r-- | aai-schema/pom.xml | 2 | ||||
| -rw-r--r-- | ajsc-aai/pom.xml | 10 | ||||
| -rw-r--r-- | annotations/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 4 |
5 files changed, 11 insertions, 9 deletions
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml index 450b13b..3301437 100644 --- a/aai-schema/pom.xml +++ b/aai-schema/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp.aai.aai-service</groupId> <artifactId>aai-service</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <artifactId>aai-schema</artifactId> <name>aai-schema</name> diff --git a/ajsc-aai/pom.xml b/ajsc-aai/pom.xml index 9176bba..5479044 100644 --- a/ajsc-aai/pom.xml +++ b/ajsc-aai/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp.aai.aai-service</groupId> <artifactId>aai-service</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <artifactId>ajsc-aai</artifactId> <name>ajsc</name> @@ -17,6 +17,9 @@ <skipTests>false</skipTests> <!-- sonar properties --> <sonar.language>java</sonar.language> + <docker.image.version>1.0.0</docker.image.version> + <timestamp>${maven.build.timestamp}</timestamp> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath> <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath> @@ -339,12 +342,12 @@ <dependency> <groupId>org.openecomp.aai.aai-service</groupId> <artifactId>aai-schema</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </dependency> <dependency> <groupId>org.openecomp.aai.aai-service</groupId> <artifactId>annotations</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </dependency> </dependencies> <build> @@ -435,7 +438,6 @@ <dockerDirectory>${dockerLocation}</dockerDirectory> <serverId>docker-hub</serverId> <imageTags> - <imageTag>${docker_imageversion}</imageTag> <imageTag>latest</imageTag> </imageTags> <forceTags>true</forceTags> diff --git a/annotations/pom.xml b/annotations/pom.xml index 86dcecd..1e76e66 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp.aai.aai-service</groupId> <artifactId>aai-service</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <artifactId>annotations</artifactId> <name>annotations</name> @@ -9,7 +9,7 @@ </parent> <groupId>org.openecomp.aai.aai-service</groupId> <artifactId>aai-service</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> <name>aai</name> <packaging>pom</packaging> <modules> diff --git a/version.properties b/version.properties index f016a54..a09eab9 100644 --- a/version.properties +++ b/version.properties @@ -5,9 +5,9 @@ major_version=1 minor_version=0 -load_number=0 +patch_version=0 -base_version=${major_version}.${minor_version}.${load_number} +base_version=${major_version}.${minor_version}.${patch_version} # Release must be completed with GIT information # in Jenkins release_version=${base_version} |