summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorefiacor <fiachra.corcoran@est.tech>2021-08-17 12:22:17 +0100
committerefiacor <fiachra.corcoran@est.tech>2021-08-17 16:42:38 +0100
commit301592541b7e1d12823bc6c125d0b72b6af91ae3 (patch)
treefb8ea171ff0fbb278ef951ed78a2b5525f70f216
parent6310c1e1a1eea3dee9e8f69d1f7080e37a25eacb (diff)
[DMAAP-BC] Package upgrades for I release2.0.8
Signed-off-by: efiacor <fiachra.corcoran@est.tech> Change-Id: I0cdbb918040e918df0c56d3fb379467d6fac474c Issue-ID: DMAAP-1608
-rw-r--r--csit/scripts/dmaap-message-router/docker-compose/docker-compose.yml6
-rw-r--r--dmaap-bc/pom.xml6
-rw-r--r--dmaap-bc/src/main/resources/docker/Dockerfile2
-rw-r--r--pom.xml2
-rw-r--r--version.properties2
5 files changed, 11 insertions, 7 deletions
diff --git a/csit/scripts/dmaap-message-router/docker-compose/docker-compose.yml b/csit/scripts/dmaap-message-router/docker-compose/docker-compose.yml
index 94765f4..8443dd3 100644
--- a/csit/scripts/dmaap-message-router/docker-compose/docker-compose.yml
+++ b/csit/scripts/dmaap-message-router/docker-compose/docker-compose.yml
@@ -1,7 +1,7 @@
version: '2.1'
services:
zookeeper:
- image: nexus3.onap.org:10001/onap/dmaap/zookeeper:6.0.3
+ image: nexus3.onap.org:10001/onap/dmaap/zookeeper:6.1.0
container_name: zookeeper
ports:
- "2181:2181"
@@ -24,7 +24,7 @@ services:
- zookeeper
kafka:
- image: nexus3.onap.org:10001/onap/dmaap/kafka111:1.0.5
+ image: nexus3.onap.org:10001/onap/dmaap/kafka111:1.1.1
container_name: kafka
ports:
- "9092:9092"
@@ -53,7 +53,7 @@ services:
- zookeeper
dmaap:
- image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.20
+ image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.3.0
container_name: dmaap-mr
ports:
- "3904:3904"
diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml
index 2c34e8d..3c09d70 100644
--- a/dmaap-bc/pom.xml
+++ b/dmaap-bc/pom.xml
@@ -187,7 +187,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>${jettyVersion}</version>
+ <version>9.4.43.v20210629</version>
<scope>compile</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
@@ -262,6 +262,10 @@
<artifactId>bsh</artifactId>
<groupId>org.beanshell</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>maven-core</artifactId>
+ <groupId>org.apache.maven</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/dmaap-bc/src/main/resources/docker/Dockerfile b/dmaap-bc/src/main/resources/docker/Dockerfile
index a801896..f9c913f 100644
--- a/dmaap-bc/src/main/resources/docker/Dockerfile
+++ b/dmaap-bc/src/main/resources/docker/Dockerfile
@@ -27,7 +27,7 @@ WORKDIR /opt/app/dmaapbc
COPY /opt /opt
USER root
-RUN apk add --no-cache curl jq net-tools wget procps \
+RUN apk add --no-cache curl jq net-tools procps \
&& mkdir -p /opt/app/osaaf && \
chmod +x bin/* && \
diff --git a/pom.xml b/pom.xml
index fccdb22..f70c083 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
</parent>
<properties>
- <revision>2.0.7-SNAPSHOT</revision>
+ <revision>2.0.8-SNAPSHOT</revision>
<multiproject.basedir>${basedir}</multiproject.basedir>
<docker.maven.plugin.version>1.0.0</docker.maven.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/version.properties b/version.properties
index 00f338b..b972981 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
major=2
minor=0
-patch=7
+patch=8
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins