summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdyta Krukowska <edyta.krukowska@nokia.com>2020-12-08 13:06:50 +0100
committerEdyta Krukowska <edyta.krukowska@nokia.com>2020-12-08 14:05:30 +0100
commit92dd0f7884a0a7b8e23f63336bbbca569b06fe6e (patch)
tree083636ead8603ff7451958a2a06839620eedab09
parent736ee9bee7970acd8c3411d8a867e0080de16655 (diff)
Upgrade libraries to work with java 11
Issue-ID: SDC-3400 Signed-off-by: Edyta Krukowska <edyta.krukowska@nokia.com> Change-Id: I1c4f8cd4153111851bc83187af424a833ee7a1f7
-rw-r--r--pom.xml48
-rw-r--r--sdc-distribution-client/pom.xml6
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/YamlToObjectConverter.java3
3 files changed, 33 insertions, 24 deletions
diff --git a/pom.xml b/pom.xml
index 52add6d..f42c3f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,15 +33,16 @@
<!-- Dependencies projects version -->
<org.glassfish.jersey.version>2.24</org.glassfish.jersey.version>
- <functionaljava.version>4.2</functionaljava.version>
- <httpclient.version>4.5.4</httpclient.version>
- <httpcore.version>4.4.1</httpcore.version>
- <logback.version>1.1.2</logback.version>
+ <functionaljava.version>4.8</functionaljava.version>
+ <httpclient.version>4.5.13</httpclient.version>
+ <httpcore.version>4.4.14</httpcore.version>
+ <logback.version>1.2.3</logback.version>
<junit.version>4.12</junit.version>
- <snakeyaml.version>1.14</snakeyaml.version>
- <guava.version>21.0</guava.version>
- <jetty.version>9.4.18.v20190429</jetty.version>
- <bean-matchers.version>0.11</bean-matchers.version>
+ <snakeyaml.version>1.27</snakeyaml.version>
+ <guava.version>30.0-jre</guava.version>
+ <jetty.version>9.4.35.v20201120</jetty.version>
+ <bean-matchers.version>0.12</bean-matchers.version>
+ <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<nexus.proxy>https://nexus.onap.org</nexus.proxy>
<sitePath>/content/sites/site/org/onap/sdc/sdc-distribution-client/${project.version}</sitePath>
@@ -60,20 +61,29 @@
<sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
<sonar.branch>${project.version}</sonar.branch>
+ <umlgraph.version>5.6.6</umlgraph.version>
+ <maven-site-plugin.version>3.9.1</maven-site-plugin.version>
+ <wagon-webdav-jackrabbit.version>3.4.2</wagon-webdav-jackrabbit.version>
+ <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
+ <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+ <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+ <maven-compiler-plugin.source>11</maven-compiler-plugin.source>
+ <maven-compiler-plugin.target>11</maven-compiler-plugin.target>
+ <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
</properties>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>${maven-javadoc-plugin.version}</version>
<configuration>
<failOnError>false</failOnError>
<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
<docletArtifact>
<groupId>org.umlgraph</groupId>
<artifactId>umlgraph</artifactId>
- <version>5.6</version>
+ <version>${umlgraph.version}</version>
</docletArtifact>
<additionalparam>-views</additionalparam>
<useStandardDocletOptions>true</useStandardDocletOptions>
@@ -95,12 +105,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
+ <version>${maven-site-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.10</version>
+ <version>${wagon-webdav-jackrabbit.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -108,7 +118,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.8</version>
+ <version>${jacoco-maven-plugin.version}</version>
<executions>
<!-- Unit-Tests -->
<execution>
@@ -126,7 +136,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<argLine>${argLine} -Xmx2048m</argLine>
</configuration>
@@ -135,23 +145,23 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>${maven-compiler-plugin.version}</version>
<inherited>true</inherited>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>${maven-compiler-plugin.source}</source>
+ <target>${maven-compiler-plugin.target}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.3</version>
+ <version>${maven-javadoc-plugin.version}</version>
<configuration/>
</plugin>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>3.0.2</version>
+ <version>${sonar-maven-plugin.version}</version>
</plugin>
</plugins>
</build>
diff --git a/sdc-distribution-client/pom.xml b/sdc-distribution-client/pom.xml
index 596d3d3..d4effc6 100644
--- a/sdc-distribution-client/pom.xml
+++ b/sdc-distribution-client/pom.xml
@@ -6,10 +6,10 @@
<properties>
<assertj-core.version>3.18.1</assertj-core.version>
<mockito-all.version>3.6.28</mockito-all.version>
- <commons-io.version>2.5</commons-io.version>
- <gson.version>2.3.1</gson.version>
+ <commons-io.version>2.8.0</commons-io.version>
+ <gson.version>2.8.6</gson.version>
<cambriaClient.version>0.0.1</cambriaClient.version>
- <slf4j-api.version>1.7.10</slf4j-api.version>
+ <slf4j-api.version>1.7.30</slf4j-api.version>
</properties>
<parent>
diff --git a/sdc-distribution-client/src/main/java/org/onap/sdc/utils/YamlToObjectConverter.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/YamlToObjectConverter.java
index ab0a528..00b10a0 100644
--- a/sdc-distribution-client/src/main/java/org/onap/sdc/utils/YamlToObjectConverter.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/YamlToObjectConverter.java
@@ -57,8 +57,7 @@ public class YamlToObjectConverter {
PropertyUtils propertyUtils = new PropertyUtils() {
@Override
//This is in order to workaround "default" field in HeatParameterEntry, since default is Java keyword
- public Property getProperty(Class<? extends Object> type, String name, BeanAccess bAccess)
- throws IntrospectionException {
+ public Property getProperty(Class<?> type, String name, BeanAccess bAccess) {
name = name.substring(0, 1).toLowerCase() + name.substring(1);
return super.getProperty(type, name, bAccess);
}