summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xepsdk-app-onap/pom.xml8
-rwxr-xr-xvid-app-common/pom.xml8
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java6
-rw-r--r--vid-automation/pom.xml2
-rw-r--r--vid-ext-services-simulator/pom.xml15
-rw-r--r--vid-webpack-master/pom.xml2
6 files changed, 28 insertions, 13 deletions
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index f817f8db6..6bb4ffd7a 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -26,7 +26,11 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<epsdk.version>2.4.0</epsdk.version>
<jackson.version>2.9.8</jackson.version>
- <springframework.version>4.3.22.RELEASE</springframework.version>
+ <springframework.version>5.1.6.RELEASE</springframework.version>
+ <!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5:
+ org.springframework.orm.hibernate4.HibernateTransactionManager
+ so following orm.version lets epsdk-core find it -->
+ <springframework.orm.version>4.3.22.RELEASE</springframework.orm.version>
<hibernate.version>4.3.11.Final</hibernate.version>
<!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
<skipassembly>true</skipassembly>
@@ -427,7 +431,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>${springframework.version}</version>
+ <version>${springframework.orm.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 6a48190bd..10fb3da62 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -26,7 +26,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<epsdk.version>2.4.0</epsdk.version>
- <springframework.version>4.3.22.RELEASE</springframework.version>
+ <springframework.version>5.1.6.RELEASE</springframework.version>
+ <springframework.orm.version>4.3.22.RELEASE</springframework.orm.version>
+ <!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5:
+ org.springframework.orm.hibernate4.HibernateTransactionManager
+ so following orm.version lets epsdk-core find it -->
<hibernate.version>4.3.11.Final</hibernate.version>
<jackson.version>2.9.8</jackson.version>
<jersey.version>2.27</jersey.version>
@@ -704,7 +708,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>${springframework.version}</version>
+ <version>${springframework.orm.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java
index 7b78f0712..4ef6fbd24 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java
@@ -736,11 +736,7 @@ public class AaiClient implements AaiClientInterface {
}
private static String encodePathSegment(String segmentToEncode) {
- try {
- return UriUtils.encodePathSegment(segmentToEncode, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new GenericUncheckedException("URI encoding failed unexpectedly", e);
- }
+ return UriUtils.encodePathSegment(segmentToEncode, "UTF-8");
}
@Override
diff --git a/vid-automation/pom.xml b/vid-automation/pom.xml
index fb51a4a31..64135ce50 100644
--- a/vid-automation/pom.xml
+++ b/vid-automation/pom.xml
@@ -6,7 +6,7 @@
<artifactId>automationTest</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
- <springframework.version>4.3.22.RELEASE</springframework.version>
+ <springframework.version>5.1.6.RELEASE</springframework.version>
<jersey.version>2.27</jersey.version>
<jackson.version>2.9.7</jackson.version>
<aspectj.version>1.8.10</aspectj.version>
diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index 56404f876..59f886826 100644
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -13,8 +13,9 @@
<properties>
<encoding>UTF-8</encoding>
<epsdk.version>1.3.0</epsdk.version>
- <springframework.version>4.3.22.RELEASE</springframework.version>
+ <springframework.version>5.1.6.RELEASE</springframework.version>
<hibernate.version>5.3.4.Final</hibernate.version>
+ <jackson.version>2.9.8</jackson.version>
<!-- Skip assembling the zip by default -->
<skipassembly>true</skipassembly>
<!-- Tests usually require some setup that maven cannot do, so skip. -->
@@ -132,8 +133,18 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.8.7</version>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml
index 184f3c99d..38c0f7f0c 100644
--- a/vid-webpack-master/pom.xml
+++ b/vid-webpack-master/pom.xml
@@ -16,7 +16,7 @@
<properties>
<encoding>UTF-8</encoding>
- <!--<springframework.version>4.2.0.RELEASE</springframework.version>-->
+ <!--<springframework.version>5.1.6.RELEASE</springframework.version>-->
<!--<hibernate.version>4.3.11.Final</hibernate.version>-->
<!--<jackson.version>2.6.3</jackson.version>-->
<!-- Skip assembling the zip by default -->