From b01f59f82140660043641f0e48b7e0717825b985 Mon Sep 17 00:00:00 2001 From: jansupol Date: Tue, 14 Jun 2022 17:09:15 +0200 Subject: [PATCH] Updated dependencies for 3.0.5 Signed-off-by: jansupol --- containers/glassfish/jersey-gf-ejb/pom.xml | 69 +++++++++++++++---- etc/jenkins/jenkins_build.sh | 2 +- ext/microprofile/mp-rest-client/pom.xml | 5 +- .../restclient/RestClientModel.java | 8 +-- media/json-binding/pom.xml | 5 +- media/json-processing/pom.xml | 12 ++-- .../jersey/jsonp/JsonProcessingFeature.java | 8 +-- media/moxy/pom.xml | 5 +- pom.xml | 35 +++++----- tests/osgi/functional/pom.xml | 9 ++- .../osgi/test/basic/JsonProcessingTest.java | 7 +- 11 files changed, 96 insertions(+), 69 deletions(-) diff --git a/containers/glassfish/jersey-gf-ejb/pom.xml b/containers/glassfish/jersey-gf-ejb/pom.xml index b261c00f25..ecfd83b7d7 100644 --- a/containers/glassfish/jersey-gf-ejb/pom.xml +++ b/containers/glassfish/jersey-gf-ejb/pom.xml @@ -61,21 +61,6 @@ ${project.version} provided - - org.glassfish.main.ejb - ejb-container - provided - - - org.glassfish.main.common - container-common - provided - - - org.glassfish.main.hk2 - hk2-config - true - @@ -127,4 +112,58 @@ + + + jdk8 + + 1.8 + + + + org.glassfish.main.ejb + ejb-container + 6.0.0 + provided + + + org.glassfish.main.common + container-common + 6.0.0 + provided + + + org.glassfish.main.hk2 + hk2-config + 6.0.0 + provided + true + + + + + jdk11 + + [11,) + + + + org.glassfish.main.ejb + ejb-container + provided + + + org.glassfish.main.common + container-common + provided + + + org.glassfish.main.hk2 + hk2-config + provided + true + + + + + diff --git a/etc/jenkins/jenkins_build.sh b/etc/jenkins/jenkins_build.sh index dbebc8689c..4e96c4e276 100644 --- a/etc/jenkins/jenkins_build.sh +++ b/etc/jenkins/jenkins_build.sh @@ -2,5 +2,5 @@ export DEBUG=true -mvn -V -U -B -e clean install glassfish-copyright:check -Dcopyright.quiet=false +mvn -V -U -B -e -Pstaging clean install glassfish-copyright:check -Dcopyright.quiet=false diff --git a/ext/microprofile/mp-rest-client/pom.xml b/ext/microprofile/mp-rest-client/pom.xml index 4a60f3213e..cc11d33f93 100644 --- a/ext/microprofile/mp-rest-client/pom.xml +++ b/ext/microprofile/mp-rest-client/pom.xml @@ -72,7 +72,6 @@ jakarta.json jakarta.json-api - ${jsonp.ri.version} jakarta.enterprise @@ -80,8 +79,8 @@ provided - org.glassfish - jsonp-jaxrs + org.eclipse.parsson + parsson-media org.reactivestreams diff --git a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientModel.java b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientModel.java index 94c5fa4097..8219865213 100644 --- a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientModel.java +++ b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019 Payara Foundation and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -22,13 +22,7 @@ import java.util.HashMap; import java.util.Map; -import jakarta.enterprise.inject.spi.BeanManager; import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.ext.ParamConverterProvider; - -import org.eclipse.microprofile.rest.client.ext.AsyncInvocationInterceptorFactory; -import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; -import org.glassfish.jersey.internal.inject.InjectionManager; /** * Model of the rest client interface. diff --git a/media/json-binding/pom.xml b/media/json-binding/pom.xml index f5395b150d..3ae3b876b6 100644 --- a/media/json-binding/pom.xml +++ b/media/json-binding/pom.xml @@ -78,9 +78,8 @@ jakarta.json.bind-api - org.glassfish - jakarta.json - module + org.eclipse.parsson + parsson diff --git a/media/json-processing/pom.xml b/media/json-processing/pom.xml index 10dee3a7bd..373b174952 100644 --- a/media/json-processing/pom.xml +++ b/media/json-processing/pom.xml @@ -57,8 +57,7 @@ ${jakarta.annotation.osgi.version}, - jakarta.json.*;version="[0,3)", - org.glassfish.json.*;version="[0,3)", + jakarta.json.*;version="[2,3)", * @@ -81,13 +80,12 @@ jakarta.json-api - org.glassfish - jakarta.json - module + org.eclipse.parsson + parsson - org.glassfish - jsonp-jaxrs + org.eclipse.parsson + parsson-media diff --git a/media/json-processing/src/main/java/org/glassfish/jersey/jsonp/JsonProcessingFeature.java b/media/json-processing/src/main/java/org/glassfish/jersey/jsonp/JsonProcessingFeature.java index cc1c913802..aa3e96cc9c 100644 --- a/media/json-processing/src/main/java/org/glassfish/jersey/jsonp/JsonProcessingFeature.java +++ b/media/json-processing/src/main/java/org/glassfish/jersey/jsonp/JsonProcessingFeature.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -20,10 +20,10 @@ import jakarta.ws.rs.core.Feature; import jakarta.ws.rs.core.FeatureContext; -import org.glassfish.jersey.CommonProperties; +import org.eclipse.parsson.media.JsonValueBodyReader; +import org.eclipse.parsson.media.JsonValueBodyWriter; -import org.glassfish.json.jaxrs.JsonValueBodyReader; -import org.glassfish.json.jaxrs.JsonValueBodyWriter; +import org.glassfish.jersey.CommonProperties; /** * {@link Feature} used to register JSON-P providers. diff --git a/media/moxy/pom.xml b/media/moxy/pom.xml index 2a36b2cbab..f590550e8e 100644 --- a/media/moxy/pom.xml +++ b/media/moxy/pom.xml @@ -101,9 +101,8 @@ jakarta.json.bind-api - org.glassfish - jakarta.json - module + org.eclipse.parsson + parsson diff --git a/pom.xml b/pom.xml index 1d8f55354f..a2d73bc1f3 100644 --- a/pom.xml +++ b/pom.xml @@ -1841,14 +1841,13 @@ ${jakarta.jsonp.version} - org.glassfish - jakarta.json - module + org.eclipse.parsson + parsson ${jsonp.ri.version} - org.glassfish - jsonp-jaxrs + org.eclipse.parsson + parsson-media ${jsonp.jaxrs.version} @@ -2122,11 +2121,10 @@ 1.6 org.glassfish.hk2.*;version="[2.5,4)" org.jvnet.hk2.*;version="[2.5,4)" - 6.0.0 4.5.13 5.1.2 2.13.3 - 3.25.0-GA + 3.28.0-GA 3.3.0.Final 1.19.3 ${jersey1.version} @@ -2169,16 +2167,17 @@ 20.3.2 - 6.0.0 + 6.2.5 + 6.2.5 3.0.0 - 4.0.0 + 4.0.1 3.0.1 2.0.0 - 3.0.2 + 3.0.3 3.0.0 2.0.0 - 2.0.0 + 2.0.1 5.0.0 4.0.0 2.0.1 @@ -2188,22 +2187,22 @@ jakarta.annotation.*;version="[2.0,3)" 2.0.0 2.0.1 - 2.0.0 - 2.0.1 + 2.0.1 + 2.0.2 3.0.0 3.0.0 3.0.1 3.0.2 3.0 3.0.0 - 11.0.7 - 11.0.7 + 11.0.9 + 11.0.9 6.1.14 2.0.0 - 2.0.1 - 2.0.1 + 1.0.0 + 1.0.0 3.0.2 - 2.0.3 + 2.0.4 1.3.2 diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml index 23317baaf6..b898c4ede0 100644 --- a/tests/osgi/functional/pom.xml +++ b/tests/osgi/functional/pom.xml @@ -309,14 +309,13 @@ jakarta.json-api - org.glassfish - jakarta.json - module + org.eclipse.parsson + parsson test - org.glassfish - jsonp-jaxrs + org.eclipse.parsson + parsson-media test diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java index ca3a7a0976..4d4ca72038 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -69,8 +69,9 @@ public static Option[] configuration() { // JSON processing. mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-json-processing") .versionAsInProject(), - mavenBundle().groupId("org.glassfish").artifactId("jakarta.json").versionAsInProject(), - mavenBundle().groupId("org.glassfish").artifactId("jsonp-jaxrs").versionAsInProject() + mavenBundle().groupId("jakarta.json").artifactId("jakarta.json-api").versionAsInProject(), + mavenBundle().groupId("org.eclipse.parsson").artifactId("parsson").versionAsInProject(), + mavenBundle().groupId("org.eclipse.parsson").artifactId("parsson-media").versionAsInProject() )); options = Helper.addPaxExamMavenLocalRepositoryProperty(options);