diff options
| author |   Eddy Hautot <eh552t@intl.att.com> | 2017-08-31 15:57:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-08-31 15:57:42 +0000 |
| commit | 2af0691f0691ec96711103f5456bcea22ba76e36 (patch) | |
| tree | eef5d1a458ecd4debc4fdbfbacd8428746213c0e /pom.xml | |
| parent | 1fc37da6ed8e76a134aa3c34e25a0bf0fe52cbb0 (diff) | |
| parent | b1cc5ba4901b76e9cbc05b3a4a53a7485e619c55 (diff) | |
Merge "Add Docker tags"
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 74 |
1 files changed, 47 insertions, 27 deletions
@@ -30,11 +30,11 @@ <version>1.0.1-SNAPSHOT</version> <name>ONAP CLAMP</name> - <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> +<!-- <parent> --> +<!-- <groupId>org.onap.oparent</groupId> --> +<!-- <artifactId>oparent</artifactId> --> +<!-- <version>1.0.0-SNAPSHOT</version> --> +<!-- </parent> --> <description> This project build the ONAP CLAMP JAR that contains AJSC + CLAMP code. @@ -57,6 +57,9 @@ </description> <properties> + <maven.build.timestamp.format>yyyy.MM.dd'T'hh.mm.ss'Z'</maven.build.timestamp.format> + <clamp.project.version>${project.version}</clamp.project.version> + <clamp.build.timestamp>${maven.build.timestamp}</clamp.build.timestamp> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -339,7 +342,7 @@ <dependency> <groupId>org.onap.policy.engine</groupId> <artifactId>PolicyEngineAPI</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <exclusions> <exclusion> <artifactId>log4j</artifactId> @@ -362,7 +365,7 @@ <dependency> <groupId>org.onap.policy.common</groupId> <artifactId>ONAP-Logging</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <exclusions> <exclusion> <artifactId>log4j</artifactId> @@ -466,6 +469,22 @@ <plugins> <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source>${project.basedir}/src/main/script/TagVersion.groovy</source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>3.0.2</version> @@ -587,8 +606,9 @@ <dockerDirectory>src/main/docker</dockerDirectory> <serverId>docker-hub</serverId> <imageTags> - <imageTag>${project.version}</imageTag> <imageTag>latest</imageTag> + <imageTag>${project.docker.latesttagtimestamp.version}</imageTag> + <imageTag>${project.docker.latesttag.version}</imageTag> </imageTags> <forceTags>true</forceTags> <resources> @@ -643,7 +663,7 @@ <goal>push</goal> </goals> <configuration> - <imageName>${docker.push.registry}/onap/clamp</imageName> + <imageName>${docker.push.registry}/onap/clamp</imageName> <skipDockerPush>${skip.docker.push}</skipDockerPush> </configuration> </execution> @@ -770,22 +790,22 @@ </configuration> </execution> <execution> - <goals> - <goal>merge</goal> - </goals> - <phase>post-integration-test</phase> - <configuration> - <fileSets> - <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet"> - <directory>${project.build.directory}/coverage-reports</directory> - <includes> - <include>*.exec</include> - </includes> - </fileSet> - </fileSets> - <destFile>${project.build.directory}/jacoco-dev.exec</destFile> - </configuration> - </execution> + <goals> + <goal>merge</goal> + </goals> + <phase>post-integration-test</phase> + <configuration> + <fileSets> + <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet"> + <directory>${project.build.directory}/coverage-reports</directory> + <includes> + <include>*.exec</include> + </includes> + </fileSet> + </fileSets> + <destFile>${project.build.directory}/jacoco-dev.exec</destFile> + </configuration> + </execution> </executions> </plugin> @@ -803,8 +823,8 @@ <properties> <skip.staging.artifacts>true</skip.staging.artifacts> <skip.docker.build>false</skip.docker.build> - <skip.docker.tag>false</skip.docker.tag> - <skip.docker.push>false</skip.docker.push> + <skip.docker.tag>true</skip.docker.tag> + <skip.docker.push>true</skip.docker.push> </properties> </profile> </profiles> |