commit 2c39a4de018e8fe7e9b31d64354c2020d20b0366
author Michael Dürre <michael.duerre@highstreet-technologies.com> Mon Jul 06 06:22:15 2020 +0200
committer Michael Dürre <michael.duerre@highstreet-technologies.com> Mon Jul 06 06:22:34 2020 +0200
tree 91974810a20b0fce2cf437dcfd2660c7d85895d1
parent b69bc4eae1f9c9fd77752f1e845b60f936ddadb2

switch to sodium

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

diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml
index 53a8a59..b1916b1 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>

springboot/spring-boot-setup/src/main/resources/pom-template.xml

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 bb10719..1924649 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -613,10 +613,6 @@
             </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>
             </plugin>

springboot/springboot1/pom.xml

diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 380654d..02ca3ac 100644
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -613,10 +613,6 @@
             </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>
             </plugin>

springboot/springboot2/pom.xml

diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 65b73ca..9c7f457 100644
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -613,10 +613,6 @@
             </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>
             </plugin>