From dac70f4cb1aaac4c5cbf3a87b1e9e4aa54a3a9e0 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Wed, 13 Nov 2024 14:17:54 +0000 Subject: [PATCH 01/26] FISH-10136 Add fallout for if field doesn't exist Signed-off-by: Andrew Pielage --- .../org/glassfish/web/loader/WebappClassLoader.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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..898d2e45dd6 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 @@ -2673,8 +2673,16 @@ private void clearBeanELResolverCache() { 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); + + Field field = CachingReflectionUtil.getFieldFromCache(elUtilsClass, "BEAN_RESOLVER", false); + if (field == null) { + logger.log(Level.FINE, "Could not find BEAN_RESOLVER field on {0}", elUtilsClass.getName()); + return; + } + + // TODO: Review whether this is still required; Mojarra may have fixed this themselves in PR#5479? + // Is there solution enough? Do we need to retain this for cases where another Faces implementation is being provided? + Object resolver = field.get(null); if (resolver != null && elResolverClass.isPresent()) { logger.fine(String.format("Fields: %s", Arrays.stream(elResolverClass.get().getDeclaredFields()) .map(Field::toString).collect(Collectors.toList()))); From 05afe19a332e7939923c4d68edb9dddde10a367b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:43:43 +0000 Subject: [PATCH 02/26] Bump project.version from 3.10.0 to 3.10.1 Bumps `project.version` from 3.10.0 to 3.10.1. Updates `io.smallrye.config:smallrye-config` from 3.10.0 to 3.10.1 - [Release notes](https://github.com/smallrye/smallrye-config/releases) - [Commits](https://github.com/smallrye/smallrye-config/compare/3.10.0...3.10.1) Updates `io.smallrye.config:smallrye-config-core` from 3.10.0 to 3.10.1 Updates `io.smallrye.config:smallrye-config-common` from 3.10.0 to 3.10.1 - [Release notes](https://github.com/smallrye/smallrye-config/releases) - [Commits](https://github.com/smallrye/smallrye-config/compare/3.10.0...3.10.1) --- updated-dependencies: - dependency-name: io.smallrye.config:smallrye-config dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.smallrye.config:smallrye-config-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.smallrye.config:smallrye-config-common dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../repackaged/smallrye-config-repackaged/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..a0c07a8592a 100644 --- a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml +++ b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml @@ -47,7 +47,7 @@ io.smallrye.config smallrye-config-repackaged - 3.10.0 + 3.10.1 Payara Samples - Payara - smallrye-config repackaged as a module From 5b19702c442ff58d7224f9aa33b20ee3f94f2b7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:44:12 +0000 Subject: [PATCH 03/26] Bump org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-bom Bumps [org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-bom](https://github.com/shrinkwrap/resolver) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/shrinkwrap/resolver/releases) - [Commits](https://github.com/shrinkwrap/resolver/compare/3.3.1...3.3.2) --- updated-dependencies: - dependency-name: org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- appserver/tests/payara-samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml index 5dffce4411a..bfbb4fd1b8f 100644 --- a/appserver/tests/payara-samples/pom.xml +++ b/appserver/tests/payara-samples/pom.xml @@ -307,7 +307,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-bom - 3.3.1 + 3.3.2 pom import From 45f79b4f0b8d5bbdd65771ddad5839ce07a55b2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:45:11 +0000 Subject: [PATCH 04/26] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.1 to 3.11.1 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.10.1 to 3.11.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.10.1...maven-javadoc-plugin-3.11.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 6449f586a58..65880ac27e5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -174,7 +174,7 @@ 3.2.7 3.1.3 3.2.1 - 3.10.1 + 3.11.1 3.1.3 5.1.9 3.5.1 From a3f8c9269457fa45a5e1a3e440177693e32b6d79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:46:10 +0000 Subject: [PATCH 05/26] Bump org.apache.maven.plugins:maven-invoker-plugin from 3.8.0 to 3.8.1 Bumps [org.apache.maven.plugins:maven-invoker-plugin](https://github.com/apache/maven-invoker-plugin) from 3.8.0 to 3.8.1. - [Release notes](https://github.com/apache/maven-invoker-plugin/releases) - [Commits](https://github.com/apache/maven-invoker-plugin/compare/maven-invoker-plugin-3.8.0...maven-invoker-plugin-3.8.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-invoker-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- nucleus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nucleus/pom.xml b/nucleus/pom.xml index 8429506f892..31e8a04a4ef 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 From 1cb78fd7250a1ebdd99cc10f3d82db9cbe02330e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:48:08 +0000 Subject: [PATCH 06/26] Bump com.nimbusds:nimbus-jose-jwt from 9.41.2 to 9.47 Bumps [com.nimbusds:nimbus-jose-jwt](https://bitbucket.org/connect2id/nimbus-jose-jwt) from 9.41.2 to 9.47. - [Changelog](https://bitbucket.org/connect2id/nimbus-jose-jwt/src/master/CHANGELOG.txt) - [Commits](https://bitbucket.org/connect2id/nimbus-jose-jwt/commits/tag/9.47) --- updated-dependencies: - dependency-name: com.nimbusds:nimbus-jose-jwt dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- appserver/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/pom.xml b/appserver/pom.xml index 922bbcd8f0f..b936ad15377 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -82,7 +82,7 @@ JAXR_RA_20091012 - 9.41.2 + 9.47 2.5.1 2.5.1 3.6.10 From 9728340ee75a96a1ecb8b831af73311f8b69833a Mon Sep 17 00:00:00 2001 From: luiseufrasio Date: Wed, 20 Nov 2024 08:06:43 -0300 Subject: [PATCH 07/26] FISH-9165 : jaxb versions upgraded to 4.0.2 --- core/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 338cf53e3cb..0577455f93e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -73,12 +73,12 @@ 3.1 1.1.5.payara-p1 2.1.3 - 4.0.1.payara-p1 + 4.0.2 2.18.0 3.1.7.payara-p1 3.0.2 8.0.1.Final - 4.0.1 + 4.0.2 2.1.0 3.0.0 2.1.0 From 978c2e2eb7f1e704bdb64291cd1d1f1d5bf58173 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 22 Nov 2024 09:34:25 +0000 Subject: [PATCH 08/26] FISH-10163 Upgrade smallrye repackaged version --- appserver/tests/payara-samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml index 5dffce4411a..5aa1d82ecc8 100644 --- a/appserver/tests/payara-samples/pom.xml +++ b/appserver/tests/payara-samples/pom.xml @@ -347,7 +347,7 @@ io.smallrye.config smallrye-config-repackaged - 3.10.0 + 3.10.1 jakartaee9 test From 66a640d62eb401fc0f1bef59673d283e769208f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 16:21:09 +0000 Subject: [PATCH 09/26] Bump commons-io:commons-io from 2.17.0 to 2.18.0 Bumps commons-io:commons-io from 2.17.0 to 2.18.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- nucleus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nucleus/pom.xml b/nucleus/pom.xml index 31e8a04a4ef..9f96f2b4f62 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -108,7 +108,7 @@ 2.7.7 - 2.17.0 + 2.18.0 From d8243b3c71a92d98c035cb56bd81000e1d56f176 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 16:22:16 +0000 Subject: [PATCH 10/26] Bump org.testcontainers:junit-jupiter from 1.20.2 to 1.20.4 Bumps [org.testcontainers:junit-jupiter](https://github.com/testcontainers/testcontainers-java) from 1.20.2 to 1.20.4. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.20.2...1.20.4) --- updated-dependencies: - dependency-name: org.testcontainers:junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- appserver/extras/docker-images/tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/extras/docker-images/tests/pom.xml b/appserver/extras/docker-images/tests/pom.xml index 9fe50c210d0..62c333aa59c 100644 --- a/appserver/extras/docker-images/tests/pom.xml +++ b/appserver/extras/docker-images/tests/pom.xml @@ -79,7 +79,7 @@ org.testcontainers junit-jupiter - 1.20.2 + 1.20.4 test From 7db4ea58e62bd0890efdfe9be88978dae8329cdc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 16:24:10 +0000 Subject: [PATCH 11/26] Bump org.testcontainers:testcontainers from 1.20.3 to 1.20.4 Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.20.3 to 1.20.4. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.20.3...1.20.4) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- appserver/extras/docker-images/tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/extras/docker-images/tests/pom.xml b/appserver/extras/docker-images/tests/pom.xml index 9fe50c210d0..75375ce8c32 100644 --- a/appserver/extras/docker-images/tests/pom.xml +++ b/appserver/extras/docker-images/tests/pom.xml @@ -73,7 +73,7 @@ org.testcontainers testcontainers - 1.20.3 + 1.20.4 test From deafe8fc4693e906e4fe607e702f7e30e671231c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 16:24:43 +0000 Subject: [PATCH 12/26] Bump io.projectreactor:reactor-core from 3.6.10 to 3.7.0 Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.6.10 to 3.7.0. - [Release notes](https://github.com/reactor/reactor-core/releases) - [Commits](https://github.com/reactor/reactor-core/compare/v3.6.10...v3.7.0) --- updated-dependencies: - dependency-name: io.projectreactor:reactor-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- appserver/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/pom.xml b/appserver/pom.xml index b936ad15377..83b13a54de2 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -85,7 +85,7 @@ 9.47 2.5.1 2.5.1 - 3.6.10 + 3.7.0 1.0.4 1.0-1 From 9e13bac3c1a94269ce6f6f021e924b7ca1d638b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:59:12 +0000 Subject: [PATCH 13/26] Bump com.microsoft.playwright:playwright from 1.48.0 to 1.49.0 Bumps [com.microsoft.playwright:playwright](https://github.com/microsoft/playwright-java) from 1.48.0 to 1.49.0. - [Release notes](https://github.com/microsoft/playwright-java/releases) - [Commits](https://github.com/microsoft/playwright-java/compare/v1.48.0...v1.49.0) --- updated-dependencies: - dependency-name: com.microsoft.playwright:playwright dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- appserver/tests/payara-samples/samples/cleanboot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 2f608af7b43c62cc38ab5464ab6ce3217705b37a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:59:23 +0000 Subject: [PATCH 14/26] Bump org.easymock:easymock from 5.4.0 to 5.5.0 Bumps [org.easymock:easymock](https://github.com/easymock/easymock) from 5.4.0 to 5.5.0. - [Release notes](https://github.com/easymock/easymock/releases) - [Changelog](https://github.com/easymock/easymock/blob/master/ReleaseNotes.md) - [Commits](https://github.com/easymock/easymock/compare/easymock-5.4.0...easymock-5.5.0) --- updated-dependencies: - dependency-name: org.easymock:easymock dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- appserver/concurrent/concurrent-impl/pom.xml | 2 +- appserver/jdbc/jdbc-config/pom.xml | 2 +- appserver/web/weld-integration/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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/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/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 From 164f9743a5c54d9aa448dcc833bf6487d528b31a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:59:52 +0000 Subject: [PATCH 15/26] Bump org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive Bumps org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive from 3.3.1 to 3.3.2. --- updated-dependencies: - dependency-name: org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- appserver/extras/docker-images/tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/extras/docker-images/tests/pom.xml b/appserver/extras/docker-images/tests/pom.xml index 861f36d0f18..e1ab63f2992 100644 --- a/appserver/extras/docker-images/tests/pom.xml +++ b/appserver/extras/docker-images/tests/pom.xml @@ -109,7 +109,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven-archive - 3.3.1 + 3.3.2 test From 18c14bc6d8c13cb5f5de5909b1ef9f62e4fea058 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 18:00:01 +0000 Subject: [PATCH 16/26] Bump org.apache.maven.plugins:maven-site-plugin from 3.20.0 to 3.21.0 Bumps [org.apache.maven.plugins:maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.20.0 to 3.21.0. - [Release notes](https://github.com/apache/maven-site-plugin/releases) - [Commits](https://github.com/apache/maven-site-plugin/compare/maven-site-plugin-3.20.0...maven-site-plugin-3.21.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-site-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 872f9e5b5dc..fde2b9587f3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -178,7 +178,7 @@ 3.1.3 5.1.9 3.5.1 - 3.20.0 + 3.21.0 3.2.20.payara-p2 3.1.0 3.7.1 From dc83a6a273230782a92a410784279d088f455c71 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Tue, 26 Nov 2024 16:52:57 +0000 Subject: [PATCH 17/26] FISH-10136 Remove now redundant code Mojarra handles this itself now, we should no longer need this on our side Signed-off-by: Andrew Pielage --- .../web/loader/WebappClassLoader.java | 64 ------------------- 1 file changed, 64 deletions(-) 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 898d2e45dd6..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,69 +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)); - - Field field = CachingReflectionUtil.getFieldFromCache(elUtilsClass, "BEAN_RESOLVER", false); - if (field == null) { - logger.log(Level.FINE, "Could not find BEAN_RESOLVER field on {0}", elUtilsClass.getName()); - return; - } - - // TODO: Review whether this is still required; Mojarra may have fixed this themselves in PR#5479? - // Is there solution enough? Do we need to retain this for cases where another Faces implementation is being provided? - Object resolver = field.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 From bc1325d10f8cc9ff0a06dcd11bf9dcaf7394242c Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Wed, 27 Nov 2024 10:18:16 +0000 Subject: [PATCH 18/26] Bump eclipselink asm version to 9.7.1 Signed-off-by: Andrew Pielage --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From d88bcf3528bbb262dc59ab0547dee244ebb43888 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 16:35:25 +0000 Subject: [PATCH 19/26] Bump org.jetbrains.kotlin:kotlin-stdlib from 2.0.21 to 2.1.0 Bumps [org.jetbrains.kotlin:kotlin-stdlib](https://github.com/JetBrains/kotlin) from 2.0.21 to 2.1.0. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index fde2b9587f3..f348ef7a285 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -122,7 +122,7 @@ 1.0-2 1.0 4.12.0 - 2.0.21 + 2.1.0 3.2.3.payara-p1 From d673b8e740d61d772d1e437cd679824e97584443 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 16:37:17 +0000 Subject: [PATCH 20/26] Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.5.1 to 3.5.2 Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- appserver/tests/fish372-tests/datagrid-tests/pom.xml | 2 +- core/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/core/pom.xml b/core/pom.xml index fde2b9587f3..daadc972f6b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -177,7 +177,7 @@ 3.11.1 3.1.3 5.1.9 - 3.5.1 + 3.5.2 3.21.0 3.2.20.payara-p2 3.1.0 From 71961fd61c0ac057532f127309881e635a82d63c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 16:40:46 +0000 Subject: [PATCH 21/26] Bump org.primefaces:primefaces from 14.0.6 to 14.0.8 Bumps [org.primefaces:primefaces](https://github.com/primefaces/primefaces) from 14.0.6 to 14.0.8. - [Release notes](https://github.com/primefaces/primefaces/releases) - [Commits](https://github.com/primefaces/primefaces/compare/14.0.6...14.0.8) --- updated-dependencies: - dependency-name: org.primefaces:primefaces dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../payara-samples/samples/use-bundled-jsf-primefaces/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 57b3ffb530cdc6bee3e56bb74362cb84afc6ee7f Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 2 Dec 2024 10:13:23 +0000 Subject: [PATCH 22/26] Sanitise repackaged module versions Has the repackaged modules pull from the parent so plugin versions are defined. Also aligns the versions of these with a property, because otherwise payara-bom would end up getting resolved as the project.version of the repackaged modules Signed-off-by: Andrew Pielage --- appserver/tests/payara-samples/pom.xml | 12 +++++++++--- .../http-matchers-repackaged/pom.xml | 4 ++-- .../jacc-provider-repackaged/pom.xml | 18 ++---------------- .../tests/payara-samples/repackaged/pom.xml | 7 ++++++- .../smallrye-config-repackaged/pom.xml | 13 ++++--------- 5 files changed, 23 insertions(+), 31 deletions(-) diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml index bd436b824e3..f7ab748d5a0 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 @@ -328,7 +334,7 @@ org.omnifaces jacc-provider-repackaged - 0.3 + ${project.version} jakartaee9 @@ -347,7 +353,7 @@ io.smallrye.config smallrye-config-repackaged - 3.10.1 + ${project.version} jakartaee9 test @@ -395,7 +401,7 @@ org.valid4j http-matchers-repackaged - 1.1 + ${project.version} jakartaee9 test 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..bb3bfa899c6 100644 --- a/appserver/tests/payara-samples/repackaged/http-matchers-repackaged/pom.xml +++ b/appserver/tests/payara-samples/repackaged/http-matchers-repackaged/pom.xml @@ -47,7 +47,7 @@ org.valid4j http-matchers-repackaged - 1.1 + Payara Samples - Payara - http-matchers repackaged as a module @@ -116,7 +116,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..61d9ac2354a 100644 --- a/appserver/tests/payara-samples/repackaged/jacc-provider-repackaged/pom.xml +++ b/appserver/tests/payara-samples/repackaged/jacc-provider-repackaged/pom.xml @@ -48,7 +48,6 @@ org.omnifaces jacc-provider-repackaged - 0.3 Payara Samples - Payara - jacc-provider repackaged as a module @@ -73,7 +72,7 @@ *;scope=compile;inline=true - *;version=${http-matchers.version} + *;version=${jacc-provider.version} !* true @@ -117,21 +116,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 a0c07a8592a..31ef9ece958 100644 --- a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml +++ b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml @@ -47,13 +47,8 @@ io.smallrye.config smallrye-config-repackaged - 3.10.1 Payara Samples - Payara - smallrye-config repackaged as a module - - 2.8.0 - - @@ -76,7 +71,7 @@ *;scope=compile;inline=true - *;version=${project.version} + *;version=${smallrye-config.version} !* true @@ -120,19 +115,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 From ab3e338eee872a281fb79d1d2a2b3630f700d5b7 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 2 Dec 2024 12:22:46 +0000 Subject: [PATCH 23/26] Remove classifier on repackaged modules We're not installing them with the classifier Signed-off-by: Andrew Pielage --- appserver/tests/payara-samples/pom.xml | 3 --- appserver/tests/payara-samples/samples/dynamic-roles/pom.xml | 2 -- appserver/tests/payara-samples/samples/jacc-per-app/pom.xml | 1 - .../samples/jakartaee-namespace-transformer/pom.xml | 1 - .../tests/payara-samples/samples/realm-identity-stores/pom.xml | 2 -- 5 files changed, 9 deletions(-) diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml index f7ab748d5a0..b9b1392b1c7 100644 --- a/appserver/tests/payara-samples/pom.xml +++ b/appserver/tests/payara-samples/pom.xml @@ -335,7 +335,6 @@ org.omnifaces jacc-provider-repackaged ${project.version} - jakartaee9 @@ -354,7 +353,6 @@ io.smallrye.config smallrye-config-repackaged ${project.version} - jakartaee9 test @@ -402,7 +400,6 @@ org.valid4j http-matchers-repackaged ${project.version} - jakartaee9 test diff --git a/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml b/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml index 83b4023de8b..2fac2cc51b9 100644 --- a/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml +++ b/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml @@ -55,7 +55,6 @@ io.smallrye.config smallrye-config-repackaged - jakartaee9 org.glassfish.jersey.ext.microprofile @@ -102,7 +101,6 @@ org.valid4j 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..98c9eecd4a3 100644 --- a/appserver/tests/payara-samples/samples/jacc-per-app/pom.xml +++ b/appserver/tests/payara-samples/samples/jacc-per-app/pom.xml @@ -57,7 +57,6 @@ org.omnifaces jacc-provider-repackaged - jakartaee9 compile 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..ff14cbbc3b5 100644 --- a/appserver/tests/payara-samples/samples/jakartaee-namespace-transformer/pom.xml +++ b/appserver/tests/payara-samples/samples/jakartaee-namespace-transformer/pom.xml @@ -73,7 +73,6 @@ org.valid4j 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..f9b156a8eb3 100644 --- a/appserver/tests/payara-samples/samples/realm-identity-stores/pom.xml +++ b/appserver/tests/payara-samples/samples/realm-identity-stores/pom.xml @@ -59,7 +59,6 @@ io.smallrye.config smallrye-config-repackaged - jakartaee9 org.glassfish.jersey.ext.microprofile @@ -111,7 +110,6 @@ org.valid4j http-matchers-repackaged - jakartaee9 test From 9b0984de946c0920c4d9bf6b365de92e4f073126 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 2 Dec 2024 12:28:35 +0000 Subject: [PATCH 24/26] Use our group ID for repackaged modules --- appserver/tests/payara-samples/pom.xml | 6 +++--- .../repackaged/http-matchers-repackaged/pom.xml | 1 - .../repackaged/jacc-provider-repackaged/pom.xml | 1 - .../repackaged/smallrye-config-repackaged/pom.xml | 1 - .../tests/payara-samples/samples/dynamic-roles/pom.xml | 4 ++-- appserver/tests/payara-samples/samples/jacc-per-app/pom.xml | 2 +- .../samples/jakartaee-namespace-transformer/pom.xml | 2 +- .../payara-samples/samples/realm-identity-stores/pom.xml | 4 ++-- 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml index b9b1392b1c7..08eba0815a4 100644 --- a/appserver/tests/payara-samples/pom.xml +++ b/appserver/tests/payara-samples/pom.xml @@ -332,7 +332,7 @@ - org.omnifaces + fish.payara.server.internal.tests jacc-provider-repackaged ${project.version} @@ -350,7 +350,7 @@ - io.smallrye.config + fish.payara.server.internal.tests smallrye-config-repackaged ${project.version} test @@ -397,7 +397,7 @@ test - org.valid4j + fish.payara.server.internal.tests http-matchers-repackaged ${project.version} test 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 bb3bfa899c6..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,7 +45,6 @@ repackaged 6.2024.12-SNAPSHOT - org.valid4j http-matchers-repackaged Payara Samples - Payara - http-matchers repackaged as a module 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 61d9ac2354a..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,7 +46,6 @@ repackaged 6.2024.12-SNAPSHOT - org.omnifaces jacc-provider-repackaged Payara Samples - Payara - jacc-provider repackaged as a module 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 31ef9ece958..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,7 +45,6 @@ repackaged 6.2024.12-SNAPSHOT - io.smallrye.config smallrye-config-repackaged Payara Samples - Payara - smallrye-config repackaged as a module diff --git a/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml b/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml index 2fac2cc51b9..b2aae420377 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 @@ -99,7 +99,7 @@ samples-test-utils - org.valid4j + fish.payara.server.internal.tests http-matchers-repackaged 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 98c9eecd4a3..81612ca0c7a 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 compile 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 ff14cbbc3b5..e5d6392e052 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 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 f9b156a8eb3..28c06d9e551 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 @@ -108,7 +108,7 @@ test - org.valid4j + fish.payara.server.internal.tests http-matchers-repackaged test From 844b8dbb9e95a9da5fba8fdbbbf346cf28d7447a Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 2 Dec 2024 12:48:09 +0000 Subject: [PATCH 25/26] Revert "Remove classifier on repackaged modules" This reverts commit ab3e338eee872a281fb79d1d2a2b3630f700d5b7. --- appserver/tests/payara-samples/pom.xml | 3 +++ appserver/tests/payara-samples/samples/dynamic-roles/pom.xml | 2 ++ appserver/tests/payara-samples/samples/jacc-per-app/pom.xml | 1 + .../samples/jakartaee-namespace-transformer/pom.xml | 1 + .../tests/payara-samples/samples/realm-identity-stores/pom.xml | 2 ++ 5 files changed, 9 insertions(+) diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml index 08eba0815a4..d6c488f3939 100644 --- a/appserver/tests/payara-samples/pom.xml +++ b/appserver/tests/payara-samples/pom.xml @@ -335,6 +335,7 @@ fish.payara.server.internal.tests jacc-provider-repackaged ${project.version} + jakartaee9 @@ -353,6 +354,7 @@ fish.payara.server.internal.tests smallrye-config-repackaged ${project.version} + jakartaee9 test @@ -400,6 +402,7 @@ fish.payara.server.internal.tests http-matchers-repackaged ${project.version} + jakartaee9 test diff --git a/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml b/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml index b2aae420377..5b787d570e9 100644 --- a/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml +++ b/appserver/tests/payara-samples/samples/dynamic-roles/pom.xml @@ -55,6 +55,7 @@ fish.payara.server.internal.tests smallrye-config-repackaged + jakartaee9 org.glassfish.jersey.ext.microprofile @@ -101,6 +102,7 @@ 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 81612ca0c7a..9abe6944e37 100644 --- a/appserver/tests/payara-samples/samples/jacc-per-app/pom.xml +++ b/appserver/tests/payara-samples/samples/jacc-per-app/pom.xml @@ -57,6 +57,7 @@ fish.payara.server.internal.tests jacc-provider-repackaged + jakartaee9 compile 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 e5d6392e052..840e3aa1f11 100644 --- a/appserver/tests/payara-samples/samples/jakartaee-namespace-transformer/pom.xml +++ b/appserver/tests/payara-samples/samples/jakartaee-namespace-transformer/pom.xml @@ -73,6 +73,7 @@ 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 28c06d9e551..8eb33ede811 100644 --- a/appserver/tests/payara-samples/samples/realm-identity-stores/pom.xml +++ b/appserver/tests/payara-samples/samples/realm-identity-stores/pom.xml @@ -59,6 +59,7 @@ fish.payara.server.internal.tests smallrye-config-repackaged + jakartaee9 org.glassfish.jersey.ext.microprofile @@ -110,6 +111,7 @@ fish.payara.server.internal.tests http-matchers-repackaged + jakartaee9 test From 44111204a4a473b339ec622f2fb57acf6d7348e4 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 2 Dec 2024 16:45:55 +0000 Subject: [PATCH 26/26] Update resolver plugin artefact lookup Signed-off-by: Andrew Pielage --- appserver/tests/payara-samples/pom.xml | 2 ++ .../fish/payara/samples/jaccperapp/InstallJaccProviderTest.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml index d6c488f3939..fe55b226568 100644 --- a/appserver/tests/payara-samples/pom.xml +++ b/appserver/tests/payara-samples/pom.xml @@ -472,6 +472,7 @@ ${session.executionRootDirectory}/target/payara-micro-${payara.version}.jar true ${payara.debug} + ${payara.version} @@ -488,6 +489,7 @@ ${session.executionRootDirectory}/target/payara-micro-${payara.version}.jar true ${payara.debug} + ${payara.version} 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 =