summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraribeiro <anderson.ribeiro@est.tech>2020-05-27 11:37:44 +0100
committeraribeiro <anderson.ribeiro@est.tech>2020-05-27 11:58:07 +0100
commit6909f0c827bb46180fafc9d306d500e032ae7e0b (patch)
treefb649d6b1364308629a64d74f65e2e7456a80a31
parent18ae7612481c386db22fe983dedf331a29141444 (diff)
Revert "Java 11 migration: fixing problems on 'catalog-fe'"
This reverts commit 50906f4dcd00b0162298d1f86d72dcfc4d3caee9. Issue-ID: SDC-3088 Change-Id: I13c48243b3a137c7e66da1ef217a0ecbbd55f216 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml9
-rw-r--r--pom.xml2
2 files changed, 8 insertions, 3 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml
index bba87f17f1..d261f46f18 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml
@@ -12,7 +12,12 @@
<version>1.7.0-SNAPSHOT</version>
</parent>
+ <properties>
+ <jersey-common.version>2.22.2</jersey-common.version>
+ </properties>
+
<dependencies>
+
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
@@ -63,13 +68,13 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
- <version>${jersey-bom.version}</version>
+ <version>${jersey-common.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
- <version>${jersey-bom.version}</version>
+ <version>${jersey-common.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 92ef75f0a5..798ab3aabc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@ Modifications copyright (c) 2018-2019 Nokia
<guava.version>18.0</guava.version>
<janusgraph.version>0.3.1</janusgraph.version>
<spring.version>4.3.18.RELEASE</spring.version>
- <jersey-bom.version>2.30.1</jersey-bom.version>
+ <jersey-bom.version>2.27</jersey-bom.version>
<netty.version>4.1.36.Final</netty.version>
<servlet-api.version>3.1.0</servlet-api.version>
<wire-mock.version>2.26.3</wire-mock.version>