diff --git a/appserver/concurrent/concurrent-impl/pom.xml b/appserver/concurrent/concurrent-impl/pom.xml index c3facb05bb7..b790e325041 100644 --- a/appserver/concurrent/concurrent-impl/pom.xml +++ b/appserver/concurrent/concurrent-impl/pom.xml @@ -114,7 +114,7 @@ org.easymock easymock - 5.4.0 + 5.5.0 test diff --git a/appserver/extras/docker-images/tests/pom.xml b/appserver/extras/docker-images/tests/pom.xml index 9fe50c210d0..e1ab63f2992 100644 --- a/appserver/extras/docker-images/tests/pom.xml +++ b/appserver/extras/docker-images/tests/pom.xml @@ -73,13 +73,13 @@ org.testcontainers testcontainers - 1.20.3 + 1.20.4 test org.testcontainers junit-jupiter - 1.20.2 + 1.20.4 test @@ -109,7 +109,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven-archive - 3.3.1 + 3.3.2 test diff --git a/appserver/jdbc/jdbc-config/pom.xml b/appserver/jdbc/jdbc-config/pom.xml index aa70fef348b..931f4f473d0 100644 --- a/appserver/jdbc/jdbc-config/pom.xml +++ b/appserver/jdbc/jdbc-config/pom.xml @@ -77,7 +77,7 @@ org.easymock easymock - 5.4.0 + 5.5.0 test diff --git a/appserver/pom.xml b/appserver/pom.xml index 922bbcd8f0f..83b13a54de2 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -82,10 +82,10 @@ JAXR_RA_20091012 - 9.41.2 + 9.47 2.5.1 2.5.1 - 3.6.10 + 3.7.0 1.0.4 1.0-1 diff --git a/appserver/tests/fish372-tests/datagrid-tests/pom.xml b/appserver/tests/fish372-tests/datagrid-tests/pom.xml index e3e79b31f69..88ffc34ac87 100644 --- a/appserver/tests/fish372-tests/datagrid-tests/pom.xml +++ b/appserver/tests/fish372-tests/datagrid-tests/pom.xml @@ -186,7 +186,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.1 + 3.5.2 integration-test diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml index 5dffce4411a..fe55b226568 100644 --- a/appserver/tests/payara-samples/pom.xml +++ b/appserver/tests/payara-samples/pom.xml @@ -68,6 +68,12 @@ fish.payara.samples.Unstable + + + 1.1 + 3.10.1 + 2.8.0 + 0.3 @@ -307,7 +313,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-bom - 3.3.1 + 3.3.2 pom import @@ -326,9 +332,9 @@ - org.omnifaces + fish.payara.server.internal.tests jacc-provider-repackaged - 0.3 + ${project.version} jakartaee9 @@ -345,9 +351,9 @@ - io.smallrye.config + fish.payara.server.internal.tests smallrye-config-repackaged - 3.10.0 + ${project.version} jakartaee9 test @@ -393,9 +399,9 @@ test - org.valid4j + fish.payara.server.internal.tests http-matchers-repackaged - 1.1 + ${project.version} jakartaee9 test @@ -466,6 +472,7 @@ ${session.executionRootDirectory}/target/payara-micro-${payara.version}.jar true ${payara.debug} + ${payara.version} @@ -482,6 +489,7 @@ ${session.executionRootDirectory}/target/payara-micro-${payara.version}.jar true ${payara.debug} + ${payara.version} diff --git a/appserver/tests/payara-samples/repackaged/http-matchers-repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/http-matchers-repackaged/pom.xml index e62f68532d3..340f479b147 100644 --- a/appserver/tests/payara-samples/repackaged/http-matchers-repackaged/pom.xml +++ b/appserver/tests/payara-samples/repackaged/http-matchers-repackaged/pom.xml @@ -45,9 +45,8 @@ repackaged 6.2024.12-SNAPSHOT - org.valid4j http-matchers-repackaged - 1.1 + Payara Samples - Payara - http-matchers repackaged as a module @@ -116,7 +115,7 @@ org.valid4j http-matchers - ${project.version} + ${http-matchers.version} true diff --git a/appserver/tests/payara-samples/repackaged/jacc-provider-repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/jacc-provider-repackaged/pom.xml index 950f1893108..6db06656fd4 100644 --- a/appserver/tests/payara-samples/repackaged/jacc-provider-repackaged/pom.xml +++ b/appserver/tests/payara-samples/repackaged/jacc-provider-repackaged/pom.xml @@ -46,9 +46,7 @@ repackaged 6.2024.12-SNAPSHOT - org.omnifaces jacc-provider-repackaged - 0.3 Payara Samples - Payara - jacc-provider repackaged as a module @@ -73,7 +71,7 @@ *;scope=compile;inline=true - *;version=${http-matchers.version} + *;version=${jacc-provider.version} !* true @@ -117,21 +115,8 @@ org.omnifaces jacc-provider - ${project.version} + ${jacc-provider.version} true - - - - payara-nexus-artifacts - https://nexus.dev.payara.fish/repository/payara-artifacts - - true - - - false - - - diff --git a/appserver/tests/payara-samples/repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/pom.xml index f22ed7c85ed..29c55056695 100644 --- a/appserver/tests/payara-samples/repackaged/pom.xml +++ b/appserver/tests/payara-samples/repackaged/pom.xml @@ -41,9 +41,14 @@ 4.0.0 + + fish.payara.samples + payara-samples + 6.2024.12-SNAPSHOT + + fish.payara.server.internal.tests repackaged - 6.2024.12-SNAPSHOT Payara Samples - Payara - repackaged libs as a module pom diff --git a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml index 231fdee5ddd..966ddf5360c 100644 --- a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml +++ b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml @@ -45,15 +45,9 @@ repackaged 6.2024.12-SNAPSHOT - io.smallrye.config smallrye-config-repackaged - 3.10.0 Payara Samples - Payara - smallrye-config repackaged as a module - - 2.8.0 - - @@ -76,7 +70,7 @@ *;scope=compile;inline=true - *;version=${project.version} + *;version=${smallrye-config.version} !* true @@ -120,19 +114,19 @@ io.smallrye.config smallrye-config - ${project.version} + ${smallrye-config.version} true io.smallrye.config smallrye-config-core - ${project.version} + ${smallrye-config.version} true io.smallrye.config smallrye-config-common - ${project.version} + ${smallrye-config.version} true diff --git a/appserver/tests/payara-samples/samples/cleanboot/pom.xml b/appserver/tests/payara-samples/samples/cleanboot/pom.xml index 09940236f9e..3f8eb473535 100644 --- a/appserver/tests/payara-samples/samples/cleanboot/pom.xml +++ b/appserver/tests/payara-samples/samples/cleanboot/pom.xml @@ -41,7 +41,7 @@ - 1.48.0 + 1.49.0 diff --git a/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml b/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml index 83b4023de8b..5b787d570e9 100644 --- a/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml +++ b/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml @@ -53,7 +53,7 @@ - io.smallrye.config + fish.payara.server.internal.tests smallrye-config-repackaged jakartaee9 @@ -100,7 +100,7 @@ samples-test-utils - org.valid4j + fish.payara.server.internal.tests http-matchers-repackaged jakartaee9 test diff --git a/appserver/tests/payara-samples/samples/jacc-per-app/pom.xml b/appserver/tests/payara-samples/samples/jacc-per-app/pom.xml index ddf8a90f39c..9abe6944e37 100644 --- a/appserver/tests/payara-samples/samples/jacc-per-app/pom.xml +++ b/appserver/tests/payara-samples/samples/jacc-per-app/pom.xml @@ -55,7 +55,7 @@ - org.omnifaces + fish.payara.server.internal.tests jacc-provider-repackaged jakartaee9 compile diff --git a/appserver/tests/payara-samples/samples/jacc-per-app/src/test/java/fish/payara/samples/jaccperapp/InstallJaccProviderTest.java b/appserver/tests/payara-samples/samples/jacc-per-app/src/test/java/fish/payara/samples/jaccperapp/InstallJaccProviderTest.java index 281893fdaad..06dfcf4e7f2 100644 --- a/appserver/tests/payara-samples/samples/jacc-per-app/src/test/java/fish/payara/samples/jaccperapp/InstallJaccProviderTest.java +++ b/appserver/tests/payara-samples/samples/jacc-per-app/src/test/java/fish/payara/samples/jaccperapp/InstallJaccProviderTest.java @@ -83,7 +83,7 @@ public static WebArchive createDeployment() { assertNotNull("System property pomPath", pomPath); MavenResolvedArtifact jaccLibrary = Maven.resolver() .loadPomFromFile(pomPath) - .resolve("org.omnifaces:jacc-provider-repackaged:jar:jakartaee9:0.3") + .resolve("fish.payara.server.internal.tests:jacc-provider-repackaged:jar:jakartaee9:" + System.getProperty("payara.version")) .withTransitivity() .asSingleResolvedArtifact(); WebArchive archive = diff --git a/appserver/tests/payara-samples/samples/jakartaee-namespace-transformer/pom.xml b/appserver/tests/payara-samples/samples/jakartaee-namespace-transformer/pom.xml index ebaf15c89cc..840e3aa1f11 100644 --- a/appserver/tests/payara-samples/samples/jakartaee-namespace-transformer/pom.xml +++ b/appserver/tests/payara-samples/samples/jakartaee-namespace-transformer/pom.xml @@ -71,7 +71,7 @@ htmlunit - org.valid4j + fish.payara.server.internal.tests http-matchers-repackaged jakartaee9 test diff --git a/appserver/tests/payara-samples/samples/realm-identity-stores/pom.xml b/appserver/tests/payara-samples/samples/realm-identity-stores/pom.xml index 6d2c8e3e53f..8eb33ede811 100644 --- a/appserver/tests/payara-samples/samples/realm-identity-stores/pom.xml +++ b/appserver/tests/payara-samples/samples/realm-identity-stores/pom.xml @@ -57,7 +57,7 @@ - io.smallrye.config + fish.payara.server.internal.tests smallrye-config-repackaged jakartaee9 @@ -109,7 +109,7 @@ test - org.valid4j + fish.payara.server.internal.tests http-matchers-repackaged jakartaee9 test diff --git a/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml b/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml index 6308b966639..96fb9f67ccf 100644 --- a/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml +++ b/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml @@ -70,7 +70,7 @@ org.primefaces primefaces - 14.0.6 + 14.0.8 jakarta diff --git a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java index d8e665518f9..93578a1a19a 100644 --- a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java +++ b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java @@ -2051,7 +2051,6 @@ public void stop() throws Exception { // START SJSAS 6258619 ClassLoaderUtil.releaseLoader(this); // END SJSAS 6258619 - clearBeanELResolverCache(); clearJaxRSCache(); synchronized(jarFilesLock) { @@ -2659,61 +2658,6 @@ private void clearReferencesRmiTargets() { } } - private void clearBeanELResolverCache() { - try { - Class elUtilsClass = CachingReflectionUtil.getClassFromCache("com.sun.faces.el.ELUtils", this); - if (elUtilsClass != null) { - clearBeanResolver(elUtilsClass); - } - } catch (Exception e) { - logger.log(Level.WARNING, "Error clearing BeanELResolver cache", e); - } - } - - private void clearBeanResolver(Class elUtilsClass) throws Exception { - Optional> elResolverClass = Optional.ofNullable(CachingReflectionUtil - .getClassFromCache("jakarta.el.BeanELResolver", this)); - Object resolver = CachingReflectionUtil.getFieldFromCache(elUtilsClass, "BEAN_RESOLVER", - false).get(null); - if (resolver != null && elResolverClass.isPresent()) { - logger.fine(String.format("Fields: %s", Arrays.stream(elResolverClass.get().getDeclaredFields()) - .map(Field::toString).collect(Collectors.toList()))); - Method clearPropertiesMethod = CachingReflectionUtil.getMethodFromCache(elResolverClass.get(), - "clearProperties", false, ClassLoader.class); - if (clearPropertiesMethod != null) { - clearPropertiesMethod.invoke(resolver, this); - } else { - clearBeanELResolverPropertiesCache(resolver, elResolverClass.get()); - } - } else { - logger.warning("BeanELResolver not found"); - } - } - - /** - * Workaround until clearProperties() is available in Jakarta EL - * @see Jakarta EL Pull Request - */ - private void clearBeanELResolverPropertiesCache(Object resolver, Class elResolverClass) throws Exception { - Optional> elResolverCacheClass = Optional.ofNullable(CachingReflectionUtil - .getClassFromCache("jakarta.el.BeanELResolver$SoftConcurrentHashMap", this)); - var propertiesField = Optional.ofNullable(CachingReflectionUtil - .getFieldFromCache(elResolverClass, "properties", true)); - @SuppressWarnings("unchecked") - ConcurrentHashMap, Object> properties = - (ConcurrentHashMap, Object>) propertiesField.get().get(resolver); - properties.entrySet().removeIf(entry -> entry.getKey().getClassLoader() == this); - var mapField = Optional.ofNullable(CachingReflectionUtil - .getFieldFromCache(elResolverCacheClass.get(), "map", true)); - @SuppressWarnings("unchecked") - ConcurrentHashMap, Object> map = - (ConcurrentHashMap, Object>) mapField.get().get(propertiesField.get().get(resolver)); - map.entrySet().removeIf(entry -> entry.getKey().getClassLoader() == this); - var cleanupMethod = Optional.ofNullable(CachingReflectionUtil - .getMethodFromCache(elResolverCacheClass.get(), "cleanup", true)); - cleanupMethod.get().invoke(propertiesField.get().get(resolver)); - } - private void clearJaxRSCache() { try { Class cdiComponentProvider = CachingReflectionUtil diff --git a/appserver/web/weld-integration/pom.xml b/appserver/web/weld-integration/pom.xml index cf8583c266c..0eedd33cd55 100644 --- a/appserver/web/weld-integration/pom.xml +++ b/appserver/web/weld-integration/pom.xml @@ -188,7 +188,7 @@ org.easymock easymock - 5.4.0 + 5.5.0 test diff --git a/core/pom.xml b/core/pom.xml index 2ff1276c608..924736fde2e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -73,13 +73,13 @@ 3.1 1.1.5.payara-p1 2.1.3 - 4.0.1.payara-p1 + 4.0.2 2.18.1 3.1.7.payara-p1 3.0.2 8.0.1.Final.payara-p1 8.0.1.Final - 4.0.1 + 4.0.2 2.1.0 3.0.0 2.1.0 @@ -123,7 +123,7 @@ 1.0-2 1.0 4.12.0 - 2.0.21 + 2.1.0 3.2.3.payara-p1 @@ -175,11 +175,11 @@ 3.2.7 3.1.3 3.2.1 - 3.10.1 + 3.11.1 3.1.3 5.1.9 - 3.5.1 - 3.20.0 + 3.5.2 + 3.21.0 3.2.20.payara-p2 3.1.0 3.7.1 diff --git a/nucleus/pom.xml b/nucleus/pom.xml index 8429506f892..9f96f2b4f62 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -88,7 +88,7 @@ ${build.number} 2.10 - 3.8.0 + 3.8.1 3.4.0 0.6.2 0.15.3 @@ -108,7 +108,7 @@ 2.7.7 - 2.17.0 + 2.18.0 diff --git a/pom.xml b/pom.xml index 1148896586d..c86d83206fd 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ 3.0.4 4.0.1.payara-p3 - 9.7.0 + 9.7.1 6.3.0.payara-p3 2.1.1 2.1.1