From 74bd655ff61f3fa845ce8f8ff1ad110d47dd9f09 Mon Sep 17 00:00:00 2001 From: wang--ge Date: Wed, 14 May 2025 19:13:09 +0800 Subject: [PATCH] fix build failure due to jsonp updated --- 0003-replace-jaxrs-with-jaxrs1x.patch | 27 +++++++++++++++++++++++++++ jersey.spec | 8 +++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0003-replace-jaxrs-with-jaxrs1x.patch diff --git a/0003-replace-jaxrs-with-jaxrs1x.patch b/0003-replace-jaxrs-with-jaxrs1x.patch new file mode 100644 index 0000000..04d96b1 --- /dev/null +++ b/0003-replace-jaxrs-with-jaxrs1x.patch @@ -0,0 +1,27 @@ +From 70eb49c2b75a418a5c68d8bed896462e9391d180 Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Wed, 14 May 2025 17:53:16 +0800 +Subject: [PATCH] replace jaxrs with jaxrs1x + +--- + .../org/glassfish/jersey/jsonp/JsonProcessingFeature.java | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +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 226dc59..bb32839 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 +@@ -22,8 +22,8 @@ import javax.ws.rs.core.FeatureContext; + + import org.glassfish.jersey.CommonProperties; + +-import org.glassfish.json.jaxrs.JsonStructureBodyReader; +-import org.glassfish.json.jaxrs.JsonStructureBodyWriter; ++import org.glassfish.json.jaxrs1x.JsonStructureBodyReader; ++import org.glassfish.json.jaxrs1x.JsonStructureBodyWriter; + + /** + * {@link Feature} used to register JSON-P providers. +-- +2.48.1 + diff --git a/jersey.spec b/jersey.spec index 4a67644..9b6a382 100644 --- a/jersey.spec +++ b/jersey.spec @@ -1,7 +1,7 @@ %bcond_with jp_minimal Name: jersey Version: 2.29.1 -Release: 3 +Release: 4 Summary: JAX-RS (JSR 311) production quality Reference Implementation License: (EPL-2.0 or GPLv2 with exceptions) and ASL 2.0 URL: https://github.com/eclipse-ee4j/jersey @@ -12,6 +12,7 @@ Patch1: 0001-Patch-out-dependency-on-JMockit.patch Patch2: 0002-Port-to-glassfish-jsonp-1.0.patch Patch3: 0001-Port-to-hibernate-validation-5.x.patch Patch4: CVE-2021-28168.patch +Patch5: 0003-replace-jaxrs-with-jaxrs1x.patch BuildRequires: maven-local mvn(com.fasterxml.jackson.core:jackson-annotations) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) BuildRequires: mvn(com.fasterxml.jackson.module:jackson-module-jaxb-annotations) @@ -76,6 +77,7 @@ This package contains javadoc for %{name}. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 find . -name "*.jar" -print -delete find . -name "*.class" -print -delete cp -p %{SOURCE1} . @@ -178,6 +180,7 @@ rm media/multipart/src/test/java/org/glassfish/jersey/media/multipart/internal/M %pom_disable_module rx ext %pom_disable_module microprofile ext %endif +sed -i 's/jsonp-jaxrs/jsonp-jaxrs-1x/g' media/json-processing/pom.xml %pom_xpath_inject "pom:plugin/pom:configuration/pom:instructions" \ 'org.glassfish.jersey.inject.jersey-hk2;bundle-version="%{version}"' core-common cp -p inject/hk2/src/main/resources/META-INF/services/org.glassfish.jersey.internal.inject.InjectionManagerFactory \ @@ -223,6 +226,9 @@ sed -i -e 's/javax\.activation\.\*;/javax.activation.*;resolution:=optional;/' c %license LICENSE.md NOTICE.md LICENSE-2.0.txt %changelog +* Wed May 14 2025 Ge Wang - 2.29.1-4 +- fix build failure due to jsonp updated + * Wed Jan 03 2024 wangkai <13474090681@163.com> - 2.29.1-3 - fix CVE-2021-28168 -- Gitee