diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/docker/pom.xml | 35 | ||||
| -rw-r--r-- | packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image | 2 | ||||
| -rw-r--r-- | packages/pom.xml | 2 |
3 files changed, 4 insertions, 35 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 217a5fdb5c..c260e12123 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.onap.so</groupId> <artifactId>packages</artifactId> - <version>1.6.0-SNAPSHOT</version> + <version>1.7.1-SNAPSHOT</version> </parent> <packaging>pom</packaging> @@ -65,13 +65,11 @@ <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> <version>0.31.0</version> - - <configuration> + <configuration combine.self="override"> <verbose>true</verbose> <apiVersion>1.23</apiVersion> <pullRegistry>${docker.pull.registry}</pullRegistry> <pushRegistry>${docker.push.registry}</pushRegistry> - <images> <image> <name>${docker.image.prefix}/base-image:1.0</name> @@ -105,30 +103,6 @@ </build> </image> <image> - <name>${docker.image.prefix}/ve-vnfm-adapter</name> - <build> - <cleanup>try</cleanup> - <dockerFile>docker-files/Dockerfile.so-app</dockerFile> - <tags> - <tag>${project.version}</tag> - <tag>${project.version}-${maven.build.timestamp}</tag> - <tag>${project.docker.latesttag.version}</tag> - </tags> - <assembly> - <inline> - <dependencySets> - <dependencySet> - <includes> - <include>org.onap.so.adapters:etsi-sol002-adapter</include> - </includes> - <outputFileNameMapping>app.jar</outputFileNameMapping> - </dependencySet> - </dependencySets> - </inline> - </assembly> - </build> - </image> - <image> <name>${docker.image.prefix}/catalog-db-adapter</name> <build> <cleanup>try</cleanup> @@ -472,11 +446,6 @@ </dependency> <dependency> <groupId>org.onap.so.adapters</groupId> - <artifactId>etsi-sol002-adapter</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.onap.so.adapters</groupId> <artifactId>mso-catalog-db-adapter</artifactId> <version>${project.version}</version> </dependency> diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image index e3eb954e1e..bf4a2fe01f 100644 --- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image +++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image @@ -1,4 +1,4 @@ -FROM docker.io/openjdk:8-jdk-alpine +FROM docker.io/onap/integration-java11:7.0.0 ARG http_proxy ARG https_proxy diff --git a/packages/pom.xml b/packages/pom.xml index af302405cc..3df696c74b 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so</groupId> <artifactId>so</artifactId> - <version>1.6.0-SNAPSHOT</version> + <version>1.7.1-SNAPSHOT</version> </parent> <artifactId>packages</artifactId> |