diff options
| author |   Jerry Flood <jflood@att.com> | 2019-07-26 12:48:41 -0400 |
|---|---|---|
| committer | Jerry Flood <jflood@att.com> | 2019-07-26 12:48:56 -0400 |
| commit | 05d1e18373779df333d1f1fa30cc4891a8da59a4 (patch) | |
| tree | 1477ee93ac6c3e618926ed009fe6cdd19dce9207 /cmso-topology/pom.xml | |
| parent | 8d79b30fed898ede2b551a579e3564cb196f707b (diff) | |
Cleanup POMs and Dockerfiles
Issue-ID: OPTFRA-539
Change-Id: I94da0bc947b4cbb226c5e248c85c8d87f799c659
Signed-off-by: Jerry Flood <jflood@att.com>
Diffstat (limited to 'cmso-topology/pom.xml')
| -rw-r--r-- | cmso-topology/pom.xml | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/cmso-topology/pom.xml b/cmso-topology/pom.xml index b450960..e27960a 100644 --- a/cmso-topology/pom.xml +++ b/cmso-topology/pom.xml @@ -30,30 +30,15 @@ <name>cmso-topology</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> - - <release-tag>Dublin</release-tag> <service.name>cmso</service.name> <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> @@ -316,13 +299,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-topology</name> + <name>${image.namespace}/optf-cmso-topology</name> <alias>onap-optf-cmso-topology</alias> <build> <cleanup>true</cleanup> @@ -336,6 +319,12 @@ <descriptor>${project.basedir}/src/main/docker/assembly/cmso-files.xml</descriptor> <name>onap-cmso-topology</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> @@ -356,7 +345,7 @@ <goal>push</goal> </goals> <configuration> - <image>onap/optf-cmso-topology:%l</image> + <image>${image.namespace}/optf-cmso-topology:%l</image> </configuration> </execution> </executions> |