diff options
| author |   Einat Vinouze <einat.vinouze@intl.att.com> | 2019-07-07 14:15:07 +0300 |
|---|---|---|
| committer | Einat Vinouze <einat.vinouze@intl.att.com> | 2019-07-08 13:48:31 +0300 |
| commit | d7192595536591a764afbdf159f68509b6b20bae (patch) | |
| tree | bfaea56a47298f5d654acda158d7fc4e658898cf /vid-app-common | |
| parent | 89b0566dcf587d36f713d301b27009ce1d3bbec6 (diff) | |
Upgrade to Spring 5.1.6 + simulator fasterxml
Issue-ID: VID-512
Change-Id: I9a74e6357671c5eee0a425354dcd07c762c69c83
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Diffstat (limited to 'vid-app-common')
| -rwxr-xr-x | vid-app-common/pom.xml | 8 | ||||
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java | 6 |
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 |