diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-08-05 17:56:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-08-05 17:56:15 +0000 |
| commit | 786f1203928b2e846d291d83fe150cb679d9bc07 (patch) | |
| tree | d85730ef1fd5c3a9bc3354362c52c5a1e2dffd5b /springboot | |
| parent | d674b9f99534106b4c99b9aa5e01c27e6585e633 (diff) | |
| parent | 2c39a4de018e8fe7e9b31d64354c2020d20b0366 (diff) | |
Merge "switch to sodium"
Diffstat (limited to 'springboot')
| -rw-r--r-- | springboot/spring-boot-setup/pom.xml | 2 | ||||
| -rw-r--r-- | springboot/spring-boot-setup/src/main/resources/pom-template.xml | 4 | ||||
| -rw-r--r-- | springboot/springboot1/pom.xml | 4 | ||||
| -rw-r--r-- | springboot/springboot2/pom.xml | 4 |
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> |