From 425523e534e5089b342ef3277a20a84f0844a92a Mon Sep 17 00:00:00 2001
From: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Date: Tue, 31 Aug 2021 17:34:58 +0200
Subject: Fix ambiguities in pom.xml

set specific spring-boot-maven-plugin - 2.4.3 (spring.version)
set specific docker base image - openjdk:11.0.11-jre-slim

Issue-ID: DCAEGEN2-2719
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: I9d63a28f1e9fd30e8fbb49d6a7b6e521ad988a3e
---
 Changelog.md | 4 +++-
 pom.xml      | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1a0c7d2f..91cf77bb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -61,6 +61,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
             - sending event for many topics at once is no longer supported
             - add backward compatibility status codes
             - add additional validation for batchEvent            
-## [1.10.1] - 24/08/2021
+## [1.10.1] - 31/08/2021
          -  [DCAEGEN2-1483](https://jira.onap.org/browse/DCAEGEN2-2719) - CBS-Client supporting configMap
             - update CBS-Client from 1.8.0 to 1.8.7 in order to enable config file support
+            - fix ambiguous spring-boot-maven-plugin import - set it to 2.4.3
+            - fix ambiguous base docker image - set it to openjdk:11.0.11-jre-slim
diff --git a/pom.xml b/pom.xml
index ac8601fc..b4fb8830 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
         <plugin>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-maven-plugin</artifactId>
+          <version>${spring.version}</version>
         </plugin>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
@@ -185,7 +186,7 @@
             <imageTag>${project.version}</imageTag>
             <imageTag>latest</imageTag>
           </imageTags>
-          <baseImage>openjdk:11-jre-slim</baseImage>
+          <baseImage>openjdk:11.0.11-jre-slim</baseImage>
           <user>vescollector</user>
           <env>
             <HOSTALIASES>/etc/host.aliases</HOSTALIASES>
-- 
cgit 1.2.3-korg