diff --git a/0001-Patch-out-dependency-on-JMockit.patch b/0001-Patch-out-dependency-on-JMockit.patch index f02ef793dc3f0ad0d212bcdf645a345a8a1d9cb5..25d6b0dfa30e32e4d0da47d4d53d0ebfe06296c4 100644 --- a/0001-Patch-out-dependency-on-JMockit.patch +++ b/0001-Patch-out-dependency-on-JMockit.patch @@ -1,111 +1,102 @@ -From ebc396ca0b7257ff9fc3844cce118a6ea38a9004 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Mon, 11 Mar 2019 10:30:32 +0000 -Subject: [PATCH 1/3] Patch out dependency on JMockit +From 620e6de1e6054559998605626314ab20b5f090f7 Mon Sep 17 00:00:00 2001 +From: guoxiaoqi +Date: Thu, 13 May 2021 17:26:55 +0800 +Subject: [PATCH] Patch out dependency on JMockit +Signed-off-by: guoxiaoqi --- - .../jersey/server/ResourceConfigTest.java | 50 ----------- - .../scanning/PackageNamesScannerTest.java | 81 ----------------- - .../ext/cdi1x/internal/CdiUtilTest.java | 45 ---------- - .../FormDataMultiPartReaderWriterTest.java | 86 ------------------- - 4 files changed, 262 deletions(-) + .../jersey/ext/cdi1x/internal/CdiUtilTest.java | 45 ------------ + .../internal/scanning/PackageNamesScannerTest.java | 80 ---------------------- + 2 files changed, 125 deletions(-) -diff --git a/core-server/src/test/java/org/glassfish/jersey/server/ResourceConfigTest.java b/core-server/src/test/java/org/glassfish/jersey/server/ResourceConfigTest.java -index 4f4ee99..b0f3bb3 100644 ---- a/core-server/src/test/java/org/glassfish/jersey/server/ResourceConfigTest.java -+++ b/core-server/src/test/java/org/glassfish/jersey/server/ResourceConfigTest.java -@@ -45,9 +45,6 @@ import static org.junit.Assert.assertSame; +diff --git a/ext/cdi/jersey-cdi1x/src/test/java/org/glassfish/jersey/ext/cdi1x/internal/CdiUtilTest.java b/ext/cdi/jersey-cdi1x/src/test/java/org/glassfish/jersey/ext/cdi1x/internal/CdiUtilTest.java +index 0cdafe1..bcc2a66 100644 +--- a/ext/cdi/jersey-cdi1x/src/test/java/org/glassfish/jersey/ext/cdi1x/internal/CdiUtilTest.java ++++ b/ext/cdi/jersey-cdi1x/src/test/java/org/glassfish/jersey/ext/cdi1x/internal/CdiUtilTest.java +@@ -28,11 +28,6 @@ import static org.hamcrest.CoreMatchers.instanceOf; + import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; - import static org.junit.Assert.assertTrue; +-import mockit.Mock; +-import mockit.MockUp; -import mockit.Mocked; -import mockit.Verifications; - /** - * @author Pavel Bucek (pavel.bucek at oracle.com) - */ -@@ -350,53 +347,6 @@ public class ResourceConfigTest { - assertThat(classes, hasItem(InnerStaticClass.PublicClass.class)); + * Unit tests for {@link org.glassfish.jersey.ext.cdi1x.internal.CdiUtil}. + * +@@ -48,34 +43,6 @@ public class CdiUtilTest { + } } -- /** -- * Reproducer for OWLS-19790: Invalidate resource finders in resource config only when needed. -- */ - @Test -- public void testInvalidateResourceFinders(@Mocked final PackageNamesScanner scanner) throws Exception { -- final ResourceConfig resourceConfig = new ResourceConfig() -- .packages(false, PublicRootResourceClass.class.getPackage().getName()); -- -- // Scan packages. -- resourceConfig.getClasses(); +- public void getBeanManagerCustom(@Mocked final TestBeanManagerProvider custom, +- @Mocked final DefaultBeanManagerProvider fallback) throws Exception { +- CdiUtil.getBeanManager(); - -- // No reset. - new Verifications() {{ -- scanner.reset(); -- times = 0; +- custom.getBeanManager(); times = 1; +- fallback.getBeanManager(); times = 0; - }}; +- } - -- resourceConfig.register(InnerStaticClass.PublicClass.class); -- -- // Reset - we called getClasses() on ResourceConfig. -- new Verifications() {{ -- scanner.reset(); -- times = 1; -- }}; +- @Test +- public void getDefaultBeanManagerDefault(@Mocked final DefaultBeanManagerProvider fallback) throws Exception { +- new MockUp() { +- @Mock +- @SuppressWarnings("UnusedDeclaration") +- T lookupService(final Class clazz) { +- return null; +- } +- }; - -- // No reset. -- resourceConfig.register(PublicRootResourceClass.class); -- resourceConfig.register(PublicRootResourceInnerStaticClass.PublicClass.class); +- CdiUtil.getBeanManager(); - -- // No reset - simple registering does not invoke cache invalidation and reset of resource finders. - new Verifications() {{ -- scanner.reset(); -- times = 1; +- fallback.getBeanManager(); times = 1; - }}; +- } - -- // Scan packages. -- resourceConfig.getClasses(); -- -- resourceConfig.registerFinder(new PackageNamesScanner(new String[] {"javax.ws.rs"}, false)); + @Priority(500) + public static class MyServiceOne implements MyService { + } +@@ -115,16 +82,4 @@ public class CdiUtilTest { + assertThat(CdiUtil.createHk2InjectionManagerStore(), instanceOf(TestInjectionManagerStore.class)); + } + +- @Test +- public void createHk2LocatorManagerDefault() throws Exception { +- new MockUp() { +- @Mock +- @SuppressWarnings("UnusedDeclaration") +- T lookupService(final Class clazz) { +- return null; +- } +- }; - -- // Reset - we called getClasses() on ResourceConfig. -- new Verifications() {{ -- scanner.reset(); -- times = 2; -- }}; +- assertThat(CdiUtil.createHk2InjectionManagerStore(), instanceOf(SingleInjectionManagerStore.class)); - } -- - @Test - public void testResourceFinderStreamsClosed() throws IOException { - System.out.println(new ResourceConfig().packages("javax.ws.rs").getClasses()); -diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java -index 29b18c0..563b998 100644 ---- a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java -+++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java -@@ -16,11 +16,6 @@ + } +diff --git a/tests/jmockit/src/test/java/org/glassfish/jersey/tests/jmockit/server/internal/scanning/PackageNamesScannerTest.java b/tests/jmockit/src/test/java/org/glassfish/jersey/tests/jmockit/server/internal/scanning/PackageNamesScannerTest.java +index f8f5668..abc8c49 100644 +--- a/tests/jmockit/src/test/java/org/glassfish/jersey/tests/jmockit/server/internal/scanning/PackageNamesScannerTest.java ++++ b/tests/jmockit/src/test/java/org/glassfish/jersey/tests/jmockit/server/internal/scanning/PackageNamesScannerTest.java +@@ -16,10 +16,6 @@ - package org.glassfish.jersey.server.internal.scanning; + package org.glassfish.jersey.tests.jmockit.server.internal.scanning; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Tested; -import mockit.Verifications; --import mockit.integration.junit4.JMockit; + import org.glassfish.jersey.server.internal.scanning.PackageNamesScanner; + import org.glassfish.jersey.server.internal.scanning.ResourceFinderException; import org.junit.Before; - import org.junit.Test; - import org.junit.runner.RunWith; -@@ -46,7 +41,6 @@ import static org.junit.Assert.fail; - * @author Eric Navarro - * @author Michal Gajdos - */ --@RunWith(JMockit.class) - public class PackageNamesScannerTest { - - private static final String[] packages = {"javax.ws.rs"}; -@@ -96,81 +90,6 @@ public class PackageNamesScannerTest { +@@ -94,82 +90,6 @@ public class PackageNamesScannerTest { + new PackageNamesScanner(createTestClassLoader("bad", createTestURLStreamHandler("bad"), jaxRsApiPath), packages, false); } - +- - @Tested - PackageNamesScanner scanner1 = new PackageNamesScanner(new String[]{"javax.ws.rs"}, false); - @Tested @@ -184,185 +175,6 @@ index 29b18c0..563b998 100644 private ClassLoader createTestClassLoader(final String scheme, final URLStreamHandler urlStreamHandler, final String resourceFilePath) { -diff --git a/ext/cdi/jersey-cdi1x/src/test/java/org/glassfish/jersey/ext/cdi1x/internal/CdiUtilTest.java b/ext/cdi/jersey-cdi1x/src/test/java/org/glassfish/jersey/ext/cdi1x/internal/CdiUtilTest.java -index 0cdafe1..bcc2a66 100644 ---- a/ext/cdi/jersey-cdi1x/src/test/java/org/glassfish/jersey/ext/cdi1x/internal/CdiUtilTest.java -+++ b/ext/cdi/jersey-cdi1x/src/test/java/org/glassfish/jersey/ext/cdi1x/internal/CdiUtilTest.java -@@ -28,11 +28,6 @@ import static org.hamcrest.CoreMatchers.instanceOf; - import static org.hamcrest.CoreMatchers.nullValue; - import static org.junit.Assert.assertThat; - --import mockit.Mock; --import mockit.MockUp; --import mockit.Mocked; --import mockit.Verifications; -- - /** - * Unit tests for {@link org.glassfish.jersey.ext.cdi1x.internal.CdiUtil}. - * -@@ -48,34 +43,6 @@ public class CdiUtilTest { - } - } - -- @Test -- public void getBeanManagerCustom(@Mocked final TestBeanManagerProvider custom, -- @Mocked final DefaultBeanManagerProvider fallback) throws Exception { -- CdiUtil.getBeanManager(); -- -- new Verifications() {{ -- custom.getBeanManager(); times = 1; -- fallback.getBeanManager(); times = 0; -- }}; -- } -- -- @Test -- public void getDefaultBeanManagerDefault(@Mocked final DefaultBeanManagerProvider fallback) throws Exception { -- new MockUp() { -- @Mock -- @SuppressWarnings("UnusedDeclaration") -- T lookupService(final Class clazz) { -- return null; -- } -- }; -- -- CdiUtil.getBeanManager(); -- -- new Verifications() {{ -- fallback.getBeanManager(); times = 1; -- }}; -- } -- - @Priority(500) - public static class MyServiceOne implements MyService { - } -@@ -115,16 +82,4 @@ public class CdiUtilTest { - assertThat(CdiUtil.createHk2InjectionManagerStore(), instanceOf(TestInjectionManagerStore.class)); - } - -- @Test -- public void createHk2LocatorManagerDefault() throws Exception { -- new MockUp() { -- @Mock -- @SuppressWarnings("UnusedDeclaration") -- T lookupService(final Class clazz) { -- return null; -- } -- }; -- -- assertThat(CdiUtil.createHk2InjectionManagerStore(), instanceOf(SingleInjectionManagerStore.class)); -- } - } -diff --git a/media/multipart/src/test/java/org/glassfish/jersey/media/multipart/internal/FormDataMultiPartReaderWriterTest.java b/media/multipart/src/test/java/org/glassfish/jersey/media/multipart/internal/FormDataMultiPartReaderWriterTest.java -index b0a851c..f57d4e7 100644 ---- a/media/multipart/src/test/java/org/glassfish/jersey/media/multipart/internal/FormDataMultiPartReaderWriterTest.java -+++ b/media/multipart/src/test/java/org/glassfish/jersey/media/multipart/internal/FormDataMultiPartReaderWriterTest.java -@@ -69,10 +69,6 @@ import static org.junit.Assert.assertThat; - import static org.junit.Assert.assertTrue; - import static org.junit.Assert.fail; - --import mockit.Expectations; --import mockit.Mocked; --import mockit.Verifications; -- - /** - * Tests for multipart {@code MessageBodyReader} and {@code MessageBodyWriter} as well as {@code FormDataMultiPart} and {@code - * FormDataParam} injections. -@@ -666,35 +662,6 @@ public class FormDataMultiPartReaderWriterTest extends MultiPartJerseyTest { - } - } - -- /** -- * JERSEY-2663 reproducer. Make sure that temporary file created by MIMEPull is not copied into new temporary file created -- * by Jersey. -- */ -- @Test -- public void testInjectedFileNotCopied(@Mocked final BodyPartEntity entity) throws Exception { -- final FormDataMultiPart multipart = new FormDataMultiPart(); -- final FormDataBodyPart bodypart = new FormDataBodyPart(FormDataContentDisposition.name("file").fileName("file").build(), -- "CONTENT"); -- multipart.bodyPart(bodypart); -- -- final Response response = target().path("FileResource").path("InjectedFileNotCopied") -- .request() -- .post(Entity.entity(multipart, MediaType.MULTIPART_FORM_DATA)); -- -- // Make sure that the Mimepull temp file has been moved to specific file. -- new Verifications() {{ -- entity.moveTo(withInstanceOf(File.class)); -- times = 1; -- }}; -- -- // Make sure that the temp file has been removed. -- final String pathname = response.readEntity(String.class); -- // Wait a second to make sure the file doesn't exist. -- Thread.sleep(1000); -- -- assertThat("Temporary file, " + pathname + ", on the server has not been removed", -- new File(pathname).exists(), is(false)); -- } - - /** - * JERSEY-2846 reproducer. Make sure that temporary file created by MIMEPull deleted after a successful request. -@@ -772,59 +739,6 @@ public class FormDataMultiPartReaderWriterTest extends MultiPartJerseyTest { - } - } - -- /** -- * Mocked JERSEY-2794 reproducer. Real test is under integration tests. -- */ -- @Test -- public void mimeTempFileRemovedAfterAbortedUpload(@Mocked final MIMEMessage message) throws Exception { -- new Expectations() {{ -- message.getAttachments(); -- result = new MIMEParsingException(); -- }}; -- -- final URL url = new URL(getBaseUri().toString() + "MediaTypeWithBoundaryResource"); -- final HttpURLConnection connection = (HttpURLConnection) url.openConnection(); -- -- connection.setRequestMethod("PUT"); -- connection.setRequestProperty("Accept", "text/plain"); -- connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=XXXX_YYYY"); -- -- connection.setDoOutput(true); -- connection.connect(); -- -- final OutputStream outputStream = connection.getOutputStream(); -- outputStream.write("--XXXX_YYYY".getBytes()); -- outputStream.write('\n'); -- outputStream.write("Content-Type: text/plain".getBytes()); -- outputStream.write('\n'); -- outputStream.write("Content-Disposition: form-data; name=\"big-part\"".getBytes()); -- outputStream.write('\n'); -- outputStream.write('\n'); -- -- // Send big chunk of data. -- for (int i = 0; i < 16 * 4096; i++) { -- outputStream.write('E'); -- if (i % 1024 == 0) { -- outputStream.flush(); -- } -- } -- -- // Do NOT send end of the MultiPart message to simulate the issue. -- -- // Get Response ... -- final int response = connection.getResponseCode(); -- // ... Disconnect. -- connection.disconnect(); -- -- assertThat("Bad Request expected", response, is(400)); -- -- // Make sure that the Mimepull message and it's parts have been closed and temporary files deleted. -- new Verifications() {{ -- message.close(); -- times = 1; -- }}; -- } -- - private void checkEntity(final String expected, final BodyPartEntity entity) throws IOException { - // Convert the raw bytes into a String - final InputStreamReader sr = new InputStreamReader(entity.getInputStream()); -- -2.20.1 +1.8.3.1 diff --git a/0003-Port-to-hibernate-validation-5.x.patch b/0001-Port-to-hibernate-validation-5.x.patch similarity index 76% rename from 0003-Port-to-hibernate-validation-5.x.patch rename to 0001-Port-to-hibernate-validation-5.x.patch index 2c4cf8116e1bdeb3c44d43c65090ac11222ad941..1c10aed8c1e72607521ee6a900669edded78aca7 100644 --- a/0003-Port-to-hibernate-validation-5.x.patch +++ b/0001-Port-to-hibernate-validation-5.x.patch @@ -1,22 +1,23 @@ -From 4aa4d572fc5aa6c76213940c1d1cf0792d8dc2ac Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Mon, 11 Mar 2019 13:55:53 +0000 -Subject: [PATCH 3/3] Port to hibernate validation 5.x +From 227cdb9bce8e2b5f20983e8c0a600b56233fdbcb Mon Sep 17 00:00:00 2001 +From: guoxiaoqi +Date: Thu, 13 May 2021 17:10:06 +0800 +Subject: [PATCH] Port to hibernate validation 5.x +Signed-off-by: guoxiaoqi --- - ext/bean-validation/pom.xml | 2 +- - ext/cdi/jersey-cdi1x-validation/pom.xml | 2 +- - .../cdi1x/validation/internal/CdiInterceptorWrapper.java | 4 ++-- - .../validation/internal/CdiInterceptorWrapperExtension.java | 2 +- - pom.xml | 6 +++--- + ext/bean-validation/pom.xml | 2 +- + ext/cdi/jersey-cdi1x-validation/pom.xml | 2 +- + .../jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java | 4 ++-- + .../cdi1x/validation/internal/CdiInterceptorWrapperExtension.java | 2 +- + pom.xml | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml -index 7012856..ea3334b 100644 +index d490857..6fe0bc3 100644 --- a/ext/bean-validation/pom.xml +++ b/ext/bean-validation/pom.xml @@ -87,7 +87,7 @@ - validation-api + jakarta.validation-api - org.hibernate.validator @@ -25,7 +26,7 @@ index 7012856..ea3334b 100644 diff --git a/ext/cdi/jersey-cdi1x-validation/pom.xml b/ext/cdi/jersey-cdi1x-validation/pom.xml -index 1b25a2e..6b7ac98 100644 +index 7991cef..a4436a8 100644 --- a/ext/cdi/jersey-cdi1x-validation/pom.xml +++ b/ext/cdi/jersey-cdi1x-validation/pom.xml @@ -41,7 +41,7 @@ @@ -38,7 +39,7 @@ index 1b25a2e..6b7ac98 100644 provided diff --git a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java -index 5b808ce..16a098d 100644 +index 1d3d9d9..5175ae9 100644 --- a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java +++ b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java @@ -27,8 +27,8 @@ import javax.interceptor.AroundInvoke; @@ -53,7 +54,7 @@ index 5b808ce..16a098d 100644 /** * JAX-RS wrapper for Hibernate CDI bean validation interceptor. diff --git a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java -index 3b43ee7..1379866 100644 +index acd1b5c..0561d0e 100644 --- a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java +++ b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java @@ -43,7 +43,7 @@ import javax.interceptor.Interceptor; @@ -66,10 +67,10 @@ index 3b43ee7..1379866 100644 /** * CDI extension to register {@link CdiInterceptorWrapper}. diff --git a/pom.xml b/pom.xml -index 7246f71..81d1a50 100644 +index d07459d..38eda41 100644 --- a/pom.xml +++ b/pom.xml -@@ -1765,13 +1765,13 @@ +@@ -1810,13 +1810,13 @@ @@ -85,15 +86,15 @@ index 7246f71..81d1a50 100644 hibernate-validator-cdi ${validation.impl.version} -@@ -2080,7 +2080,7 @@ - 6.0.1 - 1.7.21 - 4.3.8.RELEASE -- 6.0.11.Final -+ 5.1.3.Final +@@ -2136,7 +2136,7 @@ + 4.3.20.RELEASE + 5.1.5.RELEASE + 3.0.0-M3 +- 6.0.17.Final ++ 5.2.4.Final 2.2.14.Final 3.0.0.Final 2.11.0 -- -2.20.1 +1.8.3.1 diff --git a/jersey-2.28.tar.gz b/jersey-2.29.1.tar.gz similarity index 35% rename from jersey-2.28.tar.gz rename to jersey-2.29.1.tar.gz index e7d019bdd765b0f565d0d63eef881206c3474d0d..9c4ec104c22b585e4ede5092caf5ad4e4221a821 100644 Binary files a/jersey-2.28.tar.gz and b/jersey-2.29.1.tar.gz differ diff --git a/jersey.spec b/jersey.spec index 50a77afda376b60d60493b861d4f1e3a318fc991..dcaf3925bf729b79178deafa4cda5fc0f1279444 100644 --- a/jersey.spec +++ b/jersey.spec @@ -1,7 +1,7 @@ %bcond_with jp_minimal Name: jersey -Version: 2.28 -Release: 2 +Version: 2.29.1 +Release: 1 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 @@ -10,8 +10,7 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Patch0: jersey-2.17-mvc-jsp-servlet31.patch Patch1: 0001-Patch-out-dependency-on-JMockit.patch Patch2: 0002-Port-to-glassfish-jsonp-1.0.patch -Patch3: 0003-Port-to-hibernate-validation-5.x.patch -Patch4: CVE-2021-28168.patch +Patch3: 0001-Port-to-hibernate-validation-5.x.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) @@ -45,7 +44,11 @@ BuildRequires: mvn(org.jboss.spec.javax.transaction:jboss-transaction-api_ BuildRequires: mvn(org.jboss.weld.se:weld-se-core) mvn(org.jvnet.mimepull:mimepull) BuildRequires: mvn(org.mockito:mockito-all) mvn(org.simpleframework:simple-common) BuildRequires: mvn(org.simpleframework:simple-http) mvn(org.simpleframework:simple-transport) -BuildRequires: mvn(org.testng:testng) +BuildRequires: mvn(org.testng:testng) mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.glassfish.hk2:hk2) mvn(org.glassfish.hk2:spring-bridge) mvn(org.aspectj:aspectjrt) mvn(org.aspectj:aspectjweaver) mvn(org.springframework:spring-aop) +BuildRequires: mvn(org.springframework:spring-beans) mvn(org.springframework:spring-beans) mvn(org.springframework:spring-core) mvn(org.springframework:spring-web) mvn(org.springframework:spring-aop) +#BuildRequires: mvn(org.eclipse.microprofile.config:microprofile-config-api) mvn(org.eclipse.microprofile.rest.client:microprofile-rest-client-api) mvn(javax.json:javax.json-api) +#BuildRequires: mvn(org.eclipse.microprofile.config:microprofile-config-api) mvn(io.helidon.microprofile.config:helidon-microprofile-config) %endif BuildArch: noarch %description @@ -66,15 +69,19 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%autosetup -p1 -n %{name}-%{version} +%setup -q -n %{name}-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 find . -name "*.jar" -print -delete find . -name "*.class" -print -delete cp -p %{SOURCE1} . sed -i 's/\r//' LICENSE-2.0.txt -rm -r core-server/src/main/java/jersey -find core-server -name "*.java" -exec sed -i "s|jersey.repackaged.||" {} + -rm -r core-common/src/main/java/org/glassfish/jersey/internal/guava -grep -rl --include=*.java org.glassfish.jersey.internal.guava | xargs sed -i "s|org\.glassfish\.jersey\.internal\.guava|com.google.common.base|" +#rm -r core-server/src/main/java/jersey +#find core-server -name "*.java" -exec sed -i "s|jersey.repackaged.||" {} + +#rm -r core-common/src/main/java/org/glassfish/jersey/internal/guava +#grep -rl --include=*.java org.glassfish.jersey.internal.guava | xargs sed -i "s|org\.glassfish\.jersey\.internal\.guava|com.google.common.base|" find core-* containers/{grizzly2,jdk,jetty}-http media/sse ext/{entity-filtering,bean-validation,rx} -name "*.java" -exec sed -i \ -e "/base\.Cache/s/common\.base/common.cache/" \ -e "/base\.LoadingCache/s/common\.base/common.cache/" \ @@ -98,6 +105,8 @@ find core-* containers/{grizzly2,jdk,jetty}-http media/sse ext/{entity-filtering %pom_change_dep -r jakarta.el:jakarta.el-api javax.el:javax.el-api %pom_change_dep -r org.glassfish:jakarta.el org.glassfish:javax.el %pom_change_dep -r org.glassfish:jakarta.json org.glassfish:javax.json +%pom_change_dep -r jakarta.validation:jakarta.validation-api javax.validation:validation-api +%pom_change_dep -r jakarta.json:jakarta.json-api javax.json:javax.json-api %pom_add_dep javax.json:javax.json-api:1.0 media/json-processing %pom_change_dep javax:javaee-api javax.enterprise:cdi-api:'${cdi.api.version}':provided ext/cdi/jersey-cdi1x-transaction %pom_add_dep org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.0.Alpha3:provided ext/cdi/jersey-cdi1x-transaction @@ -136,6 +145,8 @@ find core-* containers/{grizzly2,jdk,jetty}-http media/sse ext/{entity-filtering %pom_disable_module grizzly-connector connectors %pom_remove_dep :jersey-grizzly-connector bom %pom_remove_dep org.glassfish.jersey.connectors:jersey-grizzly-connector media/multipart +%pom_disable_module mp-rest-client ext/microprofile +%pom_disable_module mp-config ext/microprofile rm media/multipart/src/test/java/org/glassfish/jersey/media/multipart/internal/MultiPartHeaderModificationTest.java %pom_disable_module glassfish containers %pom_remove_dep :jersey-gf-ejb bom @@ -163,6 +174,7 @@ rm media/multipart/src/test/java/org/glassfish/jersey/media/multipart/internal/M %pom_disable_module mvc-mustache ext %pom_disable_module proxy-client ext %pom_disable_module rx ext +%pom_disable_module microprofile ext %endif %pom_xpath_inject "pom:plugin/pom:configuration/pom:instructions" \ 'org.glassfish.jersey.inject.jersey-hk2;bundle-version="%{version}"' core-common @@ -180,6 +192,7 @@ sed -i -e 's/javax\.activation\.\*;/javax.activation.*;resolution:=optional;/' c %mvn_file "org.glassfish.jersey.security:project" %{name}/security-project %mvn_file "org.glassfish.jersey.test-framework:project" %{name}/test-framework-project %mvn_file "org.glassfish.jersey.test-framework.providers:project" %{name}/test-framework-providers-project +%mvn_file "org.glassfish.jersey.ext.microprofile:project" %{name}/ext-microprofile-project %mvn_package "org.glassfish.jersey.test-framework*:" test-framework %build @@ -207,6 +220,9 @@ sed -i -e 's/javax\.activation\.\*;/javax.activation.*;resolution:=optional;/' c %license LICENSE.md NOTICE.md LICENSE-2.0.txt %changelog +* Tue May 18 2021 guoxiaoqi2 - 2.29.1-1 +- update to 2.29.1 + * Fri May 7 2021 wangxiao - 2.28-2 - Fix CVE-2021-28168