From 2c39a4de018e8fe7e9b31d64354c2020d20b0366 Mon Sep 17 00:00:00 2001
From: Michael Dürre <michael.duerre@highstreet-technologies.com>
Date: Mon, 6 Jul 2020 06:22:15 +0200
Subject: switch to sodium
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix dependencies and versions for sodium SR3

Issue-ID: CCSDK-2518
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: I46a4def45fed75aeb3b507831446a2d8d26a2f52
---
 springboot/spring-boot-setup/pom.xml                             | 2 ++
 springboot/spring-boot-setup/src/main/resources/pom-template.xml | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'springboot/spring-boot-setup')

diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml
index 53a8a596..b1916b11 100644
--- a/springboot/spring-boot-setup/pom.xml
+++ b/springboot/spring-boot-setup/pom.xml
@@ -44,6 +44,7 @@
                             <filters>
                                 <filter>${basedir}/src/main/properties/springboot1.properties</filter>
                             </filters>
+                            <encoding>UTF-8</encoding>
                         </configuration>
                     </execution>
                     <execution>
@@ -67,6 +68,7 @@
                             <filters>
                                 <filter>${basedir}/src/main/properties/springboot2.properties</filter>
                             </filters>
+                            <encoding>UTF-8</encoding>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
index bb107194..1924649c 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -612,10 +612,6 @@
                 <version>1.12</version>
             </plugin>
             <!-- Jacoco / Sonar -->
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-- 
cgit 1.2.3-korg