From 029895f0e1de0799aa4e6b1ccb0d21ac6f7a040f Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Wed, 27 Nov 2024 12:57:39 +0100 Subject: [PATCH] Update build / test plugins, and ignore EE 11 versions --- appserver/pom.xml | 2 +- appserver/tests/appserv-tests/lib/pom.xml | 2 +- appserver/tests/embedded/web/pom.xml | 2 +- docs/parent/pom.xml | 2 +- nucleus/parent/pom.xml | 632 +++++++++++++++++++++- pom.xml | 1 + qa/pom.xml | 3 + 7 files changed, 634 insertions(+), 10 deletions(-) diff --git a/appserver/pom.xml b/appserver/pom.xml index a48a0bc1ea3..1606605b104 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -720,7 +720,7 @@ org.codehaus.plexus plexus-utils - 4.0.1 + 4.0.2 diff --git a/appserver/tests/appserv-tests/lib/pom.xml b/appserver/tests/appserv-tests/lib/pom.xml index 1dd2de60006..75416f64138 100644 --- a/appserver/tests/appserv-tests/lib/pom.xml +++ b/appserver/tests/appserv-tests/lib/pom.xml @@ -95,7 +95,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 commons-codec diff --git a/appserver/tests/embedded/web/pom.xml b/appserver/tests/embedded/web/pom.xml index a42c1d0f804..6b17373aa1f 100755 --- a/appserver/tests/embedded/web/pom.xml +++ b/appserver/tests/embedded/web/pom.xml @@ -42,7 +42,7 @@ org.hamcrest hamcrest - 2.2 + 3.0 diff --git a/docs/parent/pom.xml b/docs/parent/pom.xml index 50fe7610e4b..2840bb61d7d 100644 --- a/docs/parent/pom.xml +++ b/docs/parent/pom.xml @@ -31,7 +31,7 @@ true 2.2.4 - 2.3.9 + 2.3.19 DRAFT Eclipse GlassFish diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index 9fc45c53744..57c28304522 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -152,7 +152,7 @@ 1.5.3 - 5.3.0 + 5.5.0 5.11.3 1.37 1.0.3 @@ -834,7 +834,7 @@ maven-dependency-plugin - 3.7.1 + 3.8.1 org.glassfish.build @@ -851,7 +851,7 @@ org.codehaus.plexus plexus-utils - 4.0.1 + 4.0.2 @@ -934,7 +934,7 @@ maven-surefire-report-plugin - 3.3.1 + 3.5.2 maven-checkstyle-plugin @@ -990,7 +990,7 @@ com.googlecode.maven-download-plugin download-maven-plugin - 1.9.0 + 1.13.0 maven-release-plugin @@ -1118,7 +1118,7 @@ org.codehaus.mojo versions-maven-plugin - 2.16.2 + 2.18.0 default-cli @@ -1170,6 +1170,626 @@ maven + + + + + jakarta.annotation + jakarta.annotation-api + + + range + [3.0.0,) + + + regex + .*-M.* + + + maven + + + + jakarta.authentication + jakarta.authentication-api + + + range + [3.1.0,) + + + regex + .*-M.* + + + maven + + + + jakarta.authorization + jakarta.authorization-api + + + range + [3.0.0,) + + + regex + .*-M.* + + + maven + + + + jakarta.security.enterprise + jakarta.security.enterprise-api + + + range + [4.0.0,) + + + regex + .*-M.* + + + maven + + + + jakarta.el + jakarta.el-api + + + range + [6.0.0,) + + + regex + .*-M.* + + + regex + .*-RC.* + + + maven + + + + jakarta.servlet + jakarta.servlet-api + + + range + [6.1.0,) + + + regex + .*-M.* + + + regex + .*-RC.* + + + maven + + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + + + range + [4.0.0,) + + + regex + .*-M.* + + + regex + .*-RC.* + + + maven + + + + jakarta.validation + + + range + [3.1.0,) + + + regex + .*-M.* + + + maven + + + + jakarta.faces + + + range + [4.1,) + + + regex + .*-M.* + + + maven + + + + jakarta.enterprise.concurrent + + + range + [3.1,) + + + regex + .*-M.* + + + regex + .*RC.* + + + maven + + + + jakarta.interceptor + + + range + [2.2,) + + + regex + .*-M.* + + + regex + .*RC.* + + + maven + + + + jakarta.websocket + + + range + [2.2,) + + + regex + .*-M.* + + + maven + + + + jakarta.persistence + + + range + [3.2,) + + + regex + .*-M.* + + + regex + .*-B.* + + + maven + + + + jakarta.platform + + + range + [11.0,) + + + regex + .*-M.* + + + maven + + + + jakarta.enterprise + jakarta.enterprise.cdi-api + + + range + [4.1,) + + + regex + .*-M.* + + + regex + .*CR.* + + + regex + .*RC.* + + + regex + .*Beta.* + + + regex + .*Alpha.* + + + maven + + + + jakarta.enterprise + jakarta.enterprise.lang-model + + + range + [4.1,) + + + regex + .*-M.* + + + regex + .*CR.* + + + regex + .*RC.* + + + regex + .*Beta.* + + + regex + .*Alpha.* + + + maven + + + + jakarta.ws.rs + + + range + [4.0.0,) + + + regex + .*-M.* + + + maven + + + + jakarta.mvc + + + range + [3.0,) + + + regex + .*M.* + + + maven + + + + org.glassfish.grizzly + + + range + [4.1.0,) + + + regex + .*-M.* + + + maven + + + + org.glassfish.hk2 + + + range + [4.0.0,) + + + regex + .*-M.* + + + maven + + + + org.glassfish.jersey + + + range + [4.0,) + + + regex + .*-M.* + + + maven + + + + org.glassfish.expressly + + + range + [6.0,) + + + regex + .*-M.* + + + maven + + + + org.glassfish.tyrus + + + range + [2.2,) + + + regex + .*-M.* + + + maven + + + + org.glassfish.wasp + + + range + [4.0,) + + + regex + .*-M.* + + + maven + + + + org.glassfish.soteria + + + range + [4.0,) + + + regex + .*-M.* + + + maven + + + + org.glassfish.epicyro + + + range + [3.1,) + + + regex + .*-M.* + + + maven + + + + org.glassfish.exousia + + + range + [3.0,) + + + regex + .*-M.* + + + maven + + + + org.glassfish + jakarta.faces + + + range + [4.1,) + + + regex + .*-M.* + + + maven + + + + org.glassfish.main + + + range + [8.0,) + + + regex + .*-M.* + + + maven + + + + org.eclipse.persistence + + + range + [5.0,6.0) + + + regex + .*-M.* + + + regex + .*-B.* + + + maven + + + + org.hibernate.validator + + + range + [9.0,) + + + regex + .*-M.* + + + regex + .*CR.* + + + regex + .*Beta.* + + + regex + .*Alpha.* + + + maven + + + + org.jboss.weld + + + range + [6.0,) + + + regex + .*-M.* + + + regex + .*CR.* + + + regex + .*Beta.* + + + regex + .*Alpha.* + + + maven + + + + io.helidon.microprofile.config + + + range + [4.0,) + + + regex + .*-M.* + + + regex + .*-RC.* + + + regex + .*-BETA.* + + + regex + .*-ALPHA.* + + + maven + + + + org.omnifaces + microprofile-jwt-auth + + + range + [3.0,) + + + regex + .*-M.* + + + maven + + diff --git a/pom.xml b/pom.xml index 9d91f7fe6b1..062dea73cc4 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,7 @@ maven-deploy-plugin + 3.1.3 true diff --git a/qa/pom.xml b/qa/pom.xml index e301ed13dec..00d12067dc7 100644 --- a/qa/pom.xml +++ b/qa/pom.xml @@ -19,6 +19,7 @@ maven-compiler-plugin + 3.13.0 default-compile @@ -32,6 +33,7 @@ maven-surefire-plugin + 3.5.2 default-test @@ -41,6 +43,7 @@ maven-resources-plugin + 3.3.1 default-testResources