aboutsummaryrefslogtreecommitdiffstats
path: root/vid-app-common
diff options
context:
space:
mode:
Diffstat (limited to 'vid-app-common')
-rwxr-xr-xvid-app-common/pom.xml8
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java6
2 files changed, 7 insertions, 7 deletions
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