diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | a1-policy-management/TagVersion.groovy | 41 | ||||
| -rw-r--r-- | a1-policy-management/pom.xml | 21 | ||||
| -rw-r--r-- | pom.xml | 2 |
4 files changed, 63 insertions, 3 deletions
@@ -11,6 +11,8 @@ org.eclipse.core.resources.prefs maven-eclipse.xml workspace .pydevproject +.vscode +.factorypath ## Compilation Files ## *.class diff --git a/a1-policy-management/TagVersion.groovy b/a1-policy-management/TagVersion.groovy new file mode 100644 index 00000000..68a8b780 --- /dev/null +++ b/a1-policy-management/TagVersion.groovy @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CCSDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * =================================================================== + * + */ + +package org.onap.ccsdk.distribution + + +def versionArray; +if ( project.properties['ccsdk.project.version'] != null ) { + versionArray = project.properties['ccsdk.project.version'].split('\\.'); +} + +if ( project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT") ) { + patchArray = versionArray[2].split('-'); + project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest"; + project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-latest"; + project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp']; +} else { + project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-latest"; + project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-"+project.properties['ccsdk.build.timestamp']; +} diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml index bb8abe20..91f73adf 100644 --- a/a1-policy-management/pom.xml +++ b/a1-policy-management/pom.xml @@ -54,6 +54,7 @@ <surefire-maven-plugin.version>2.22.2</surefire-maven-plugin.version><!-- Version must be this for tests to be run. Do not remove! --> <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version> <exec.skip>true</exec.skip> + <ccsdk.project.version>${project.version}</ccsdk.project.version> </properties> <dependencies> @@ -193,6 +194,21 @@ <build> <plugins> <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source>${basedir}/TagVersion.groovy</source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> </plugin> @@ -321,8 +337,9 @@ <JAR>${project.build.finalName}.jar</JAR> </args> <tags> - <tag>${project.version}</tag> - <tag>latest</tag> + <tag>${project.docker.latestminortag.version}</tag> + <tag>${project.docker.latestfulltag.version}</tag> + <tag>${project.docker.latesttagtimestamp.version}</tag> </tags> </build> </image> @@ -36,8 +36,8 @@ <packaging>pom</packaging> <modules> - <module>a1-policy-management</module> <module>a1-adapter</module> + <module>a1-policy-management</module> </modules> <properties> |