diff --git a/core-common/pom.xml b/core-common/pom.xml index 424315b1be..27d61f34b7 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -848,6 +848,9 @@ securityOff + + [24,) + @@ -856,12 +859,17 @@ org.apache.maven.plugins maven-surefire-plugin - - - **/SecurityManagerConfiguredTest.java - **/ReflectionHelperTest.java - - + + + default-test + + + **/SecurityManagerConfiguredTest.java + **/ReflectionHelperTest.java + + + + diff --git a/core-common/src/test/java/org/glassfish/jersey/internal/config/ExternalPropertiesConfigurationFactoryTest.java b/core-common/src/test/java/org/glassfish/jersey/internal/config/ExternalPropertiesConfigurationFactoryTest.java index 6f1f7b163e..ff3e9ef9bd 100644 --- a/core-common/src/test/java/org/glassfish/jersey/internal/config/ExternalPropertiesConfigurationFactoryTest.java +++ b/core-common/src/test/java/org/glassfish/jersey/internal/config/ExternalPropertiesConfigurationFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2024 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 @@ -30,11 +30,14 @@ public class ExternalPropertiesConfigurationFactoryTest { + private static boolean isSecurityManager; + /** * Predefine some properties to be read from config */ @BeforeAll public static void setUp() { + isSecurityManager = System.getSecurityManager() != null; System.setProperty(CommonProperties.ALLOW_SYSTEM_PROPERTIES_PROVIDER, Boolean.TRUE.toString()); System.setProperty("jersey.config.server.provider.scanning.recursive", "PASSED"); @@ -53,7 +56,11 @@ public static void tearDown() { public void readSystemPropertiesTest() { final Object result = readExternalPropertiesMap().get("jersey.config.server.provider.scanning.recursive"); - Assertions.assertNull(result); + if (isSecurityManager) { + Assertions.assertNull(result); + } else { + Assertions.assertEquals("PASSED", result); + } Assertions.assertEquals(Boolean.TRUE, getConfig().isProperty(CommonProperties.JSON_PROCESSING_FEATURE_DISABLE)); Assertions.assertEquals(Boolean.TRUE, @@ -81,8 +88,11 @@ public void mergePropertiesTest() { inputProperties.put("org.jersey.microprofile.config.added", "ADDED"); getConfig().mergeProperties(inputProperties); final Object result = readExternalPropertiesMap().get("jersey.config.server.provider.scanning.recursive"); - Assertions.assertNull(result); - Assertions.assertNull(readExternalPropertiesMap().get("org.jersey.microprofile.config.added")); + final Object resultAdded = readExternalPropertiesMap().get("org.jersey.microprofile.config.added"); + if (isSecurityManager) { + Assertions.assertNull(result); + Assertions.assertNull(resultAdded); + } } } diff --git a/core-server/pom.xml b/core-server/pom.xml index b3373059ac..3e0a8fd2a2 100644 --- a/core-server/pom.xml +++ b/core-server/pom.xml @@ -270,6 +270,9 @@ securityOff + + [24,) + diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/inject/ParamConverterDateTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/inject/ParamConverterDateTest.java index fd841f1a7b..d6200c92e3 100644 --- a/core-server/src/test/java/org/glassfish/jersey/server/internal/inject/ParamConverterDateTest.java +++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/inject/ParamConverterDateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024 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 @@ -40,6 +40,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class ParamConverterDateTest extends AbstractTest { + private final String format = "EEE MMM dd HH:mm:ss Z yyyy"; + private final SimpleDateFormat formatter = new SimpleDateFormat(format, new Locale("US")); @Path("/") public static class DateResource { @@ -55,7 +57,7 @@ public String doGet(@QueryParam("d") final Date d) { public void testDateResource() throws ExecutionException, InterruptedException { initiateWebApplication(getBinder(), ParamConverterDateTest.DateResource.class); final ContainerResponse responseContext = getResponseContext(UriBuilder.fromPath("/") - .queryParam("d", new Date()).build().toString()); + .queryParam("d", formatter.format(new Date())).build().toString()); assertEquals(200, responseContext.getStatus()); } @@ -80,8 +82,6 @@ public T fromString(final String value) { ); } try { - final String format = "EEE MMM dd HH:mm:ss Z yyyy"; - final SimpleDateFormat formatter = new SimpleDateFormat(format, new Locale("US")); return rawType.cast(formatter.parse(value)); } catch (final ParseException ex) { throw new ExtractorException(ex); diff --git a/examples/groovy/pom.xml b/examples/groovy/pom.xml index 320bf243d6..84fd62f0ed 100644 --- a/examples/groovy/pom.xml +++ b/examples/groovy/pom.xml @@ -83,7 +83,7 @@ org.codehaus.gmavenplus gmavenplus-plugin - 3.0.0 + 4.0.1 1 @@ -99,10 +99,12 @@ removeTestStubs groovydoc + + 11 + - org.apache.maven.plugins maven-antrun-plugin diff --git a/examples/osgi-helloworld-webapp/pom.xml b/examples/osgi-helloworld-webapp/pom.xml index 5c46db93ea..2079a95a72 100644 --- a/examples/osgi-helloworld-webapp/pom.xml +++ b/examples/osgi-helloworld-webapp/pom.xml @@ -25,15 +25,20 @@ jersey-examples-osgi-helloworld-webapp pom - - war-bundle - functional-test - lib-bundle - additional-bundle - alternate-version-bundle - - + + securityOn + + [1.8,24) + + + war-bundle + functional-test + lib-bundle + additional-bundle + alternate-version-bundle + + pre-release diff --git a/examples/pom.xml b/examples/pom.xml index 33243b2c08..ac6b963ede 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -70,7 +70,6 @@ freemarker-webapp - groovy helloworld helloworld-benchmark helloworld-cdi2-se @@ -281,5 +280,16 @@ + + + GROOVY-EXAMPLE + + [11,) + + + groovy + + + diff --git a/incubator/pom.xml b/incubator/pom.xml index 86d124c376..ada684372b 100644 --- a/incubator/pom.xml +++ b/incubator/pom.xml @@ -39,7 +39,6 @@ cdi-inject-weld declarative-linking gae-integration - html-json injectless-client kryo open-tracing @@ -53,4 +52,16 @@ test + + + + HTML-JSON-FOR-PRE-JDK24 + + [1.8, 24) + + + html-json + + + diff --git a/media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/DefaultJsonJacksonProviderForBothModulesTest.java b/media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/DefaultJsonJacksonProviderForBothModulesTest.java index 9d86b842b2..fe74a94dd3 100644 --- a/media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/DefaultJsonJacksonProviderForBothModulesTest.java +++ b/media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/DefaultJsonJacksonProviderForBothModulesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024 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 @@ -23,6 +23,9 @@ import javax.ws.rs.core.Application; +import java.util.List; +import java.util.Arrays; +import java.util.Collections; import static org.junit.jupiter.api.Assertions.assertEquals; public class DefaultJsonJacksonProviderForBothModulesTest extends JerseyTest { @@ -36,8 +39,12 @@ protected final Application configure() { public final void testDisabledModule() { final String response = target("entity/simple") .request().get(String.class); + String expected = "{\"name\":\"Hello\",\"value\":\"World\"}"; + List response_list = Arrays.asList(response.replaceAll("[{}]", "").split(",")); + List expected_list = Arrays.asList(expected.replaceAll("[{}]", "").split(",")); + Collections.sort(response_list); - assertEquals("{\"name\":\"Hello\",\"value\":\"World\"}", response); + assertEquals(expected_list, response_list); } } diff --git a/pom.xml b/pom.xml index bd4efe38b3..79644cecf6 100644 --- a/pom.xml +++ b/pom.xml @@ -2183,7 +2183,7 @@ 3.3.1 3.6.0 3.3.1 - 3.3.1 + 3.5.2 3.4.0 2.11.0 1.1.0 @@ -2209,7 +2209,7 @@ 1.7 2.3.33 2.0.29 - 4.0.22 + 5.0.0-alpha-11 2.11.0 33.3.0-jre 3.0 diff --git a/tests/integration/microprofile/rest-client/pom.xml b/tests/integration/microprofile/rest-client/pom.xml index 3f374e96cb..535e3b999c 100644 --- a/tests/integration/microprofile/rest-client/pom.xml +++ b/tests/integration/microprofile/rest-client/pom.xml @@ -218,6 +218,15 @@ + + securityOff + + [24,) + + + + + diff --git a/tests/pom.xml b/tests/pom.xml index 9122b05cb6..1ea4733d04 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -47,7 +47,6 @@ e2e-testng e2e-tls integration - jmockit mem-leaks osgi stress @@ -117,5 +116,14 @@ release-test + + JMOCKIT-MODULE-FOR-PRE-JDK24 + + [1.8,24) + + + jmockit + +