diff options
| -rw-r--r-- | SdncReports/pom.xml | 2 | ||||
| -rw-r--r-- | admportal/pom.xml | 2 | ||||
| -rw-r--r-- | configbackuprestore/pom.xml | 2 | ||||
| -rw-r--r-- | installation/dmaap-listener/pom.xml | 19 | ||||
| -rw-r--r-- | installation/dmaap-listener/src/main/docker/Dockerfile | 11 | ||||
| -rw-r--r-- | installation/ueb-listener/pom.xml | 21 | ||||
| -rwxr-xr-x | pom.xml | 13 |
7 files changed, 31 insertions, 39 deletions
diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index 1fdc408a..e12759cd 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-1-starter-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.2.1</version> <relativePath/> </parent> diff --git a/admportal/pom.xml b/admportal/pom.xml index ac5c5b98..67367831 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.2.1</version> <relativePath/> </parent> diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 9294dd87..073aad35 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-1-starter-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.2.1</version> </parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 08afb99f..02035a5c 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -26,6 +26,15 @@ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>dmaap-listener</artifactId> + <type>zip</type> + <version>${ccsdk.sli.northbound.version}</version> + </dependency> + </dependencies> + <build> <plugins> <plugin> @@ -114,18 +123,10 @@ <execution> <id>unpack</id> <goals> - <goal>unpack</goal> + <goal>unpack-dependencies</goal> </goals> <phase>initialize</phase> <configuration> - <artifactItems> - <artifactItem> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>dmaap-listener</artifactId> - <type>zip</type> - <version>${ccsdk.sli.northbound.version}</version> - </artifactItem> - </artifactItems> <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/dmaap-listener</outputDirectory> <excludes>bin/**,**/*-javadoc.jar,**/*-sources.jar</excludes> <overWriteReleases>true</overWriteReleases> diff --git a/installation/dmaap-listener/src/main/docker/Dockerfile b/installation/dmaap-listener/src/main/docker/Dockerfile index d7c8fa7f..d3780e47 100644 --- a/installation/dmaap-listener/src/main/docker/Dockerfile +++ b/installation/dmaap-listener/src/main/docker/Dockerfile @@ -15,17 +15,6 @@ MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties USER root -RUN apk update && apk add \ - bash \ - git \ - maven \ - mysql-client \ - nodejs \ - py3-pip \ - graphviz \ - unzip \ - rsync - # Create sdnc user RUN addgroup -S sdnc && adduser -S sdnc -G sdnc diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 4f6ec418..33c442f1 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -26,6 +26,15 @@ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>ueb-listener</artifactId> + <type>zip</type> + <version>${ccsdk.sli.northbound.version}</version> + </dependency> + </dependencies> + <build> <plugins> <plugin> @@ -114,18 +123,10 @@ <execution> <id>unpack</id> <goals> - <goal>unpack</goal> + <goal>unpack-dependencies</goal> </goals> <phase>initialize</phase> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>ueb-listener</artifactId> - <type>zip</type> - <version>${ccsdk.sli.northbound.version}</version> - </artifactItem> - </artifactItems> + <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/ueb-listener</outputDirectory> <excludes>bin/**,**/*-javadoc.jar,**/*-sources.jar</excludes> <overWriteReleases>true</overWriteReleases> @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.2.1</version> <relativePath/> </parent> @@ -25,11 +25,12 @@ <sdnc.project.version>${project.version}</sdnc.project.version> <!-- All Version definition is placed in org.onap.ccsdk.parent/odlparent-lite --> - <ccsdk.oran.a1adapter.version>1.2.0-SNAPSHOT</ccsdk.oran.a1adapter.version> - <sdnc.northbound.version>2.2.0-SNAPSHOT</sdnc.northbound.version> <!-- Used by installation/sdnc --> - <ccsdk.distribution.version>1.2.0-SNAPSHOT</ccsdk.distribution.version> - <ccsdk.features.version>1.2.0-SNAPSHOT</ccsdk.features.version> - <ccsdk.sli.northbound.version>1.3.0-SNAPSHOT</ccsdk.sli.northbound.version> + <ccsdk.oran.a1adapter.version>1.2.1</ccsdk.oran.a1adapter.version> + <sdnc.northbound.version>2.2.0</sdnc.northbound.version> <!-- Used by installation/sdnc --> + <ccsdk.distribution.version>1.2.1</ccsdk.distribution.version> + <ccsdk.sli.version>1.3.1</ccsdk.sli.version> + <ccsdk.features.version>1.2.3</ccsdk.features.version> + <ccsdk.sli.northbound.version>1.3.1</ccsdk.sli.northbound.version> <!-- docker images versions --> <ccsdk.docker.alpine.j11.version>1.2-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener --> <ccsdk.docker.odlsli.alpine.version>1.2-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc --> |