aboutsummaryrefslogtreecommitdiffstats
path: root/cmso-optimizer/pom.xml
diff options
context:
space:
mode:
authorJerry Flood <jflood@att.com>2019-07-26 12:48:41 -0400
committerJerry Flood <jflood@att.com>2019-07-26 12:48:56 -0400
commit05d1e18373779df333d1f1fa30cc4891a8da59a4 (patch)
tree1477ee93ac6c3e618926ed009fe6cdd19dce9207 /cmso-optimizer/pom.xml
parent8d79b30fed898ede2b551a579e3564cb196f707b (diff)
Cleanup POMs and Dockerfiles
Issue-ID: OPTFRA-539 Change-Id: I94da0bc947b4cbb226c5e248c85c8d87f799c659 Signed-off-by: Jerry Flood <jflood@att.com>
Diffstat (limited to 'cmso-optimizer/pom.xml')
-rw-r--r--cmso-optimizer/pom.xml29
1 files changed, 9 insertions, 20 deletions
diff --git a/cmso-optimizer/pom.xml b/cmso-optimizer/pom.xml
index 4ffa2e9..c3d8de8 100644
--- a/cmso-optimizer/pom.xml
+++ b/cmso-optimizer/pom.xml
@@ -30,30 +30,15 @@
<name>cmso-optimizer</name>
<properties>
- <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-
- <cmso.project.version>${project.version}</cmso.project.version>
- <cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>
-
<service.name>cmso</service.name>
- <release-tag>Dublin</release-tag>
<name.space>org.onap.optf.cmso</name.space>
<serviceArtifactName>cmso</serviceArtifactName>
- <java.version>1.8</java.version>
- <eelf.version>1.0.0</eelf.version>
- <spring.version>5.1.5.RELEASE</spring.version>
- <swagger.core.version>2.0.0</swagger.core.version>
-
- <maven.compiler.target>1.8</maven.compiler.target>
- <maven.compiler.source>1.8</maven.compiler.source>
<build.number>${maven.build.timestamp}</build.number>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<mariadb.version>2.2.1</mariadb.version>
<swagger.directory>${basedir}/src/main/resources/META-INF/resources/swagger/</swagger.directory>
- <aaf.version>2.1.4</aaf.version>
<!-- Sonar -->
<ilib.version>2.0.7</ilib.version>
@@ -67,8 +52,6 @@
<sonar.surefire.reportsPath>${basedir}/target/surefire-reports</sonar.surefire.reportsPath>
<sonar.failsafe.reportsPath>${basedir}/target/failsafe-reports</sonar.failsafe.reportsPath>
- <docker.push.registry>localhost:5000</docker.push.registry>
- <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
<docker.skip.build>false</docker.skip.build>
<docker.skip.push>false</docker.skip.push>
<docker.skip.tag>false</docker.skip.tag>
@@ -335,13 +318,13 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.26.0</version>
+ <version>${docker.maven.plugin.version}</version>
<configuration>
<verbose>true</verbose>
<apiVersion>1.23</apiVersion>
<images>
<image>
- <name>onap/optf-cmso-optimizer</name>
+ <name>${image.namespace}/optf-cmso-optimizer</name>
<alias>onap-optf-cmso-optimizer</alias>
<build>
<cleanup>true</cleanup>
@@ -355,6 +338,12 @@
<descriptor>${project.basedir}/src/main/docker/assembly/cmso-files.xml</descriptor>
<name>onap-cmso-optimizer</name>
</assembly>
+ <args>
+ <!-- plugin cannot handle empty (no proxy) arguments
+ <http_proxy_arg>${docker.http_proxy}</http_proxy_arg>
+ <https_proxy_arg>${docker.https_proxy}</https_proxy_arg>
+ -->
+ </args>
</build>
</image>
</images>
@@ -375,7 +364,7 @@
<goal>push</goal>
</goals>
<configuration>
- <image>onap/optf-cmso-optimizer:%l</image>
+ <image>${image.namespace}/optf-cmso-optimizer:%l</image>
</configuration>
</execution>
</executions>