summaryrefslogtreecommitdiffstats
path: root/springboot
diff options
context:
space:
mode:
authorMichael Dürre <michael.duerre@highstreet-technologies.com>2020-07-06 06:22:15 +0200
committerMichael Dürre <michael.duerre@highstreet-technologies.com>2020-07-06 06:22:34 +0200
commit2c39a4de018e8fe7e9b31d64354c2020d20b0366 (patch)
tree91974810a20b0fce2cf437dcfd2660c7d85895d1 /springboot
parentb69bc4eae1f9c9fd77752f1e845b60f936ddadb2 (diff)
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
Diffstat (limited to 'springboot')
-rw-r--r--springboot/spring-boot-setup/pom.xml2
-rw-r--r--springboot/spring-boot-setup/src/main/resources/pom-template.xml4
-rw-r--r--springboot/springboot1/pom.xml4
-rw-r--r--springboot/springboot2/pom.xml4
4 files changed, 2 insertions, 12 deletions
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
@@ -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>
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 380654d0..02ca3ac7 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>
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 65b73cad..9c7f457c 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>