diff options
| -rw-r--r-- | dmaap-bc/pom.xml | 11 | ||||
| -rw-r--r-- | dmaap-bc/src/main/resources/Dockerfile | 2 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | releases/2.0.2.yaml | 10 | ||||
| -rw-r--r-- | releases/2.0.3.yaml | 8 | ||||
| -rw-r--r-- | version.properties | 2 |
6 files changed, 29 insertions, 6 deletions
diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml index e268f2b..175f300 100644 --- a/dmaap-bc/pom.xml +++ b/dmaap-bc/pom.xml @@ -384,6 +384,11 @@ <version>${jettyVersion}</version> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jettyVersion}</version> + </dependency> + <dependency> <groupId>org.onap.aaf.authz</groupId> <artifactId>aaf-cadi-aaf</artifactId> <version>2.1.7</version> @@ -456,12 +461,12 @@ <properties> <multiproject.basedir>${basedir}/..</multiproject.basedir> <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version> - <jersey.version>2.16</jersey.version> + <jersey.version>2.29</jersey.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <jettyVersion>9.4.12.RC2</jettyVersion> + <jettyVersion>9.4.24.v20191120</jettyVersion> <eelf.version>1.0.0</eelf.version> <swagger.version>1.5.19</swagger.version> - <artifact.version>2.0.2-SNAPSHOT</artifact.version> + <artifact.version>2.0.3-SNAPSHOT</artifact.version> <timestamp>${maven.build.timestamp}</timestamp> <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format> <!-- SONAR --> diff --git a/dmaap-bc/src/main/resources/Dockerfile b/dmaap-bc/src/main/resources/Dockerfile index 7375450..64bd689 100644 --- a/dmaap-bc/src/main/resources/Dockerfile +++ b/dmaap-bc/src/main/resources/Dockerfile @@ -18,7 +18,7 @@ # limitations under the License. # ============LICENSE_END==================================================== # -FROM openjdk:11.0.5-jre-slim +FROM library/maven:3.6-jdk-11 MAINTAINER DMAAP Team @@ -33,7 +33,7 @@ </parent> <properties> - <artifactVersion>2.0.2</artifactVersion> + <artifactVersion>2.0.3</artifactVersion> <multiproject.basedir>${basedir}</multiproject.basedir> <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version> <skip.docker.build>true</skip.docker.build> diff --git a/releases/2.0.2.yaml b/releases/2.0.2.yaml new file mode 100644 index 0000000..4410c66 --- /dev/null +++ b/releases/2.0.2.yaml @@ -0,0 +1,10 @@ +distribution_type: 'container' +container_release_tag: '2.0.2' +project: 'dmaap-buscontroller' +log-dir: 'dmaap-buscontroller-maven-docker-stage-master/235' +ref: 311c7633e06861ab8d93de1738a3d6b3517abfbb +containers: + - name: dmaap/dmaap-bc + version: 2.0.2-20200207T200335Z + - name: dmaap/dbc-client + version: 2.0.2-20200207T200335Z diff --git a/releases/2.0.3.yaml b/releases/2.0.3.yaml new file mode 100644 index 0000000..1d8e7f6 --- /dev/null +++ b/releases/2.0.3.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '2.0.3' +project: 'dmaap-buscontroller' +log-dir: 'dmaap-buscontroller-maven-docker-stage-master/241' +ref: de1681ed5d3884d7c62ce3dd530c552b5dff11d9 +containers: + - name: dmaap/dmaap-bc + version: 2.0.3-20200212T214753Z diff --git a/version.properties b/version.properties index a922965..d71c466 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=2 minor=0 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins |