From dd9e594ae7f47e7256b8a732066ee19fe11a8975 Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Sun, 31 Mar 2024 10:10:58 +0200 Subject: [PATCH 01/12] TOMEE-4317 - ActiveMQ 6.1.0 Drop related shades. --- arquillian/arquillian-tomee-tests/pom.xml | 8 +- boms/tomee-plume/pom.xml | 98 +++++-------- boms/tomee-plus/pom.xml | 101 +------------ container/openejb-core/pom.xml | 8 +- deps/activemq-broker-shade/pom.xml | 125 ---------------- deps/activemq-kahadb-store-shade/pom.xml | 131 ----------------- deps/activemq-ra-shade/pom.xml | 134 ------------------ deps/pom.xml | 3 - .../client-resource-lookup-preview/pom.xml | 6 +- itests/openejb-itests-client/pom.xml | 4 +- pom.xml | 43 ++---- server/openejb-activemq/pom.xml | 4 +- tck/cdi-embedded/pom.xml | 8 +- .../src/main/assembly/war.xml | 4 - tomee/tomee-plume-webapp/pom.xml | 8 +- .../src/main/assembly/war.xml | 4 - tomee/tomee-plus-webapp/pom.xml | 8 +- .../src/main/assembly/war.xml | 4 - tomee/tomee-webapp/src/main/assembly/war.xml | 4 - 19 files changed, 74 insertions(+), 631 deletions(-) delete mode 100644 deps/activemq-broker-shade/pom.xml delete mode 100644 deps/activemq-kahadb-store-shade/pom.xml delete mode 100644 deps/activemq-ra-shade/pom.xml diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml index 332ead32c41..a2a80057cf1 100644 --- a/arquillian/arquillian-tomee-tests/pom.xml +++ b/arquillian/arquillian-tomee-tests/pom.xml @@ -122,12 +122,12 @@ - ${project.groupId} - activemq-ra-shade + org.apache.activemq + activemq-ra - ${project.groupId} - activemq-broker-shade + org.apache.activemq + activemq-broker org.apache.activemq diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml index 521c56fa049..1a60a9471a1 100644 --- a/boms/tomee-plume/pom.xml +++ b/boms/tomee-plume/pom.xml @@ -188,17 +188,6 @@ - - commons-net - commons-net - 3.9.0 - - - * - * - - - io.churchkey churchkey @@ -486,9 +475,9 @@ - javax.activation - javax.activation-api - 1.2.0 + net.shibboleth.utilities + java-support + 8.4.0 * @@ -497,9 +486,9 @@ - javax.xml.bind - jaxb-api - 2.3.1 + org.apache.activemq.protobuf + activemq-protobuf + 1.1 * @@ -508,9 +497,9 @@ - net.shibboleth.utilities - java-support - 8.4.0 + org.apache.activemq + activemq-broker + 6.1.0 * @@ -519,9 +508,9 @@ - org.apache.activemq.protobuf - activemq-protobuf - 1.1 + org.apache.activemq + activemq-client + 6.1.0 * @@ -531,8 +520,8 @@ org.apache.activemq - activemq-client-jakarta - 5.18.3 + activemq-jdbc-store + 6.1.0 * @@ -542,8 +531,30 @@ org.apache.activemq - activemq-jdbc-store - 5.18.3 + activemq-kahadb-store + 6.1.0 + + + * + * + + + + + org.apache.activemq + activemq-openwire-legacy + 6.1.0 + + + * + * + + + + + org.apache.activemq + activemq-ra + 6.1.0 * @@ -1300,39 +1311,6 @@ - - org.apache.tomee - activemq-broker-shade - 10.0.0-M2-SNAPSHOT - - - * - * - - - - - org.apache.tomee - activemq-kahadb-store-shade - 10.0.0-M2-SNAPSHOT - - - * - * - - - - - org.apache.tomee - activemq-ra-shade - 10.0.0-M2-SNAPSHOT - - - * - * - - - org.apache.tomee commons-dbcp2-shade diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml index b40376c0b6d..cfaeb9e8c2b 100644 --- a/boms/tomee-plus/pom.xml +++ b/boms/tomee-plus/pom.xml @@ -188,17 +188,6 @@ - - commons-net - commons-net - 3.9.0 - - - * - * - - - io.churchkey churchkey @@ -485,28 +474,6 @@ - - javax.activation - javax.activation-api - 1.2.0 - - - * - * - - - - - javax.xml.bind - jaxb-api - 2.3.1 - - - * - * - - - net.shibboleth.utilities java-support @@ -518,32 +485,10 @@ - - org.apache.activemq.protobuf - activemq-protobuf - 1.1 - - - * - * - - - - - org.apache.activemq - activemq-client-jakarta - 5.18.3 - - - * - * - - - org.apache.activemq activemq-jdbc-store - 5.18.3 + 6.1.0 * @@ -1322,39 +1267,6 @@ - - org.apache.tomee - activemq-broker-shade - 10.0.0-M2-SNAPSHOT - - - * - * - - - - - org.apache.tomee - activemq-kahadb-store-shade - 10.0.0-M2-SNAPSHOT - - - * - * - - - - - org.apache.tomee - activemq-ra-shade - 10.0.0-M2-SNAPSHOT - - - * - * - - - org.apache.tomee commons-dbcp2-shade @@ -2125,17 +2037,6 @@ - - org.fusesource.hawtbuf - hawtbuf - 1.11 - - - * - * - - - org.glassfish.jaxb jaxb-core diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml index 1e64dfe9f50..c7e23ac4f8c 100644 --- a/container/openejb-core/pom.xml +++ b/container/openejb-core/pom.xml @@ -512,13 +512,13 @@ - ${project.groupId} - activemq-ra-shade + org.apache.activemq + activemq-ra true - ${project.groupId} - activemq-broker-shade + org.apache.activemq + activemq-broker true diff --git a/deps/activemq-broker-shade/pom.xml b/deps/activemq-broker-shade/pom.xml deleted file mode 100644 index 55739436aec..00000000000 --- a/deps/activemq-broker-shade/pom.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - deps - org.apache.tomee - 10.0.0-M2-SNAPSHOT - - 4.0.0 - - activemq-broker-shade - TomEE :: Deps :: Apache ActiveMQ Broker shade - - - - org.apache.activemq - activemq-broker - ${version.activemq} - - - org.apache.activemq - activemq-client - - - - - org.apache.activemq - activemq-client-jakarta - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - true - true - false - - - org.apache.activemq:activemq-broker - - - - - - - - javax.annotation - jakarta.annotation - - javax.annotation.processing.** - - - - javax.jms - jakarta.jms - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.4.0 - - - workaround-makeItVisibleOnIntellij - none - - attach-artifact - - - - - ${project.build.directory}/activemq-broker-shade-10.0.0-M2-SNAPSHOT.jar - jar - optional - - - - - - - - - diff --git a/deps/activemq-kahadb-store-shade/pom.xml b/deps/activemq-kahadb-store-shade/pom.xml deleted file mode 100644 index cd4c97d6108..00000000000 --- a/deps/activemq-kahadb-store-shade/pom.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - deps - org.apache.tomee - 10.0.0-M2-SNAPSHOT - - 4.0.0 - - activemq-kahadb-store-shade - TomEE :: Deps :: Apache ActiveMQ KahaDB Store shade - - - - org.apache.activemq - activemq-kahadb-store - ${version.activemq} - - - org.apache.activemq - activemq-broker - - - org.apache.geronimo.specs - * - - - - - org.apache.tomee - activemq-broker-shade - - - commons-net - commons-net - - - org.apache.activemq.protobuf - activemq-protobuf - 1.1 - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - true - true - false - - - org.apache.activemq:activemq-kahadb-store - - - - - - - - javax.jms - jakarta.jms - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.4.0 - - - workaround-makeItVisibleOnIntellij - none - - attach-artifact - - - - - ${project.build.directory}/activemq-kahadb-store-shade-10.0.0-M2-SNAPSHOT.jar - jar - optional - - - - - - - - - diff --git a/deps/activemq-ra-shade/pom.xml b/deps/activemq-ra-shade/pom.xml deleted file mode 100644 index 88e90c59c04..00000000000 --- a/deps/activemq-ra-shade/pom.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - deps - org.apache.tomee - 10.0.0-M2-SNAPSHOT - - 4.0.0 - - activemq-ra-shade - TomEE :: Deps :: Apache ActiveMQ RA shade - - - - org.apache.activemq - activemq-ra - ${version.activemq} - - - org.apache.activemq - activemq-broker - - - org.apache.activemq - activemq-kahadb-store - - - org.apache.geronimo.specs - * - - - - - org.apache.tomee - activemq-broker-shade - - - org.apache.tomee - activemq-kahadb-store-shade - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - true - true - false - - - org.apache.activemq:activemq-ra - - - - - - - - javax.jms - jakarta.jms - - - javax.resource - jakarta.resource - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.4.0 - - - workaround-makeItVisibleOnIntellij - none - - attach-artifact - - - - - ${project.build.directory}/activemq-ra-shade-10.0.0-M2-SNAPSHOT.jar - jar - optional - - - - - - - - - diff --git a/deps/pom.xml b/deps/pom.xml index 3a162d82212..a2c45b3c23d 100644 --- a/deps/pom.xml +++ b/deps/pom.xml @@ -30,9 +30,6 @@ taglibs-shade sxc-shade - activemq-broker-shade - activemq-kahadb-store-shade - activemq-ra-shade commons-dbcp2-shade servicemix-bcel-shade diff --git a/examples/client-resource-lookup-preview/pom.xml b/examples/client-resource-lookup-preview/pom.xml index dc088583d2c..0eaa68d7dfa 100644 --- a/examples/client-resource-lookup-preview/pom.xml +++ b/examples/client-resource-lookup-preview/pom.xml @@ -67,9 +67,9 @@ 10.0.0-M2-SNAPSHOT - org.apache.tomee - activemq-broker-shade - ${project.version} + org.apache.activemq + activemq-broker + 6.1.0 runtime diff --git a/itests/openejb-itests-client/pom.xml b/itests/openejb-itests-client/pom.xml index 99f38117c8c..ec58a7de04e 100644 --- a/itests/openejb-itests-client/pom.xml +++ b/itests/openejb-itests-client/pom.xml @@ -99,8 +99,8 @@ true - ${project.groupId} - activemq-ra-shade + org.apache.activemq + activemq-ra junit diff --git a/pom.xml b/pom.xml index d864aec395d..42334d09755 100644 --- a/pom.xml +++ b/pom.xml @@ -210,7 +210,7 @@ 2.0.1 - 5.18.3 + 6.1.0 1.0.4 3.0.0 @@ -1412,15 +1412,9 @@ - ${project.groupId} - activemq-ra-shade - ${project.version} - - - org.apache.activemq - activemq-ra - - + org.apache.activemq + activemq-ra + ${version.activemq} commons-net @@ -1429,34 +1423,13 @@ org.apache.activemq - activemq-client-jakarta + activemq-client ${version.activemq} - ${project.groupId} - activemq-kahadb-store-shade - ${project.version} - - - org.apache.activemq - activemq-kahadb-store - - - - - ${project.groupId} - activemq-broker-shade - ${project.version} - - - org.apache.activemq - activemq-broker - - - jakarta.jms - jakarta.jms-api - - + org.apache.activemq + activemq-broker + ${version.activemq} org.apache.activemq diff --git a/server/openejb-activemq/pom.xml b/server/openejb-activemq/pom.xml index 337e5c406d2..5f57e6f9969 100644 --- a/server/openejb-activemq/pom.xml +++ b/server/openejb-activemq/pom.xml @@ -38,8 +38,8 @@ ${project.version} - ${project.groupId} - activemq-ra-shade + org.apache.activemq + activemq-ra junit diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml index 8753dd16709..4c7018620e5 100644 --- a/tck/cdi-embedded/pom.xml +++ b/tck/cdi-embedded/pom.xml @@ -230,13 +230,13 @@ - ${project.groupId} - activemq-ra-shade + org.apache.activemq + activemq-ra test - ${project.groupId} - activemq-broker-shade + org.apache.activemq + activemq-broker test diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/war.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/war.xml index 8a8feef5b1f..981df2726e4 100644 --- a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/war.xml +++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/war.xml @@ -87,11 +87,7 @@ it picks up transitive dependencies from shaded libraries --> - org.apache.activemq:activemq-broker - org.apache.activemq:activemq-kahadb-store - org.apache.activemq:activemq-ra org.apache.commons.dbcp2:* - commons-fileupload:* org.metatype.sxc:* org.apache.taglibs:* diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml index 59aae1c4a1c..46149cdd1fb 100644 --- a/tomee/tomee-plume-webapp/pom.xml +++ b/tomee/tomee-plume-webapp/pom.xml @@ -327,8 +327,8 @@ - ${project.groupId} - activemq-broker-shade + org.apache.activemq + activemq-broker org.apache.activemq @@ -341,8 +341,8 @@ - ${project.groupId} - activemq-ra-shade + org.apache.activemq + activemq-ra org.apache.batchee diff --git a/tomee/tomee-plume-webapp/src/main/assembly/war.xml b/tomee/tomee-plume-webapp/src/main/assembly/war.xml index 9106bd3084d..b67de693389 100644 --- a/tomee/tomee-plume-webapp/src/main/assembly/war.xml +++ b/tomee/tomee-plume-webapp/src/main/assembly/war.xml @@ -106,11 +106,7 @@ it picks up transitive dependencies from shaded libraries --> - org.apache.activemq:activemq-broker - org.apache.activemq:activemq-kahadb-store - org.apache.activemq:activemq-ra org.apache.commons.dbcp2:* - commons-fileupload:* org.metatype.sxc:* org.apache.taglibs:* diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml index 60fed0dcb54..713d4294dcd 100644 --- a/tomee/tomee-plus-webapp/pom.xml +++ b/tomee/tomee-plus-webapp/pom.xml @@ -327,8 +327,8 @@ - ${project.groupId} - activemq-broker-shade + org.apache.activemq + activemq-broker org.apache.activemq @@ -341,8 +341,8 @@ - ${project.groupId} - activemq-ra-shade + org.apache.activemq + activemq-ra org.apache.batchee diff --git a/tomee/tomee-plus-webapp/src/main/assembly/war.xml b/tomee/tomee-plus-webapp/src/main/assembly/war.xml index 40ae4fe9cbc..86dbfbd4ec3 100644 --- a/tomee/tomee-plus-webapp/src/main/assembly/war.xml +++ b/tomee/tomee-plus-webapp/src/main/assembly/war.xml @@ -100,11 +100,7 @@ it picks up transitive dependencies from shaded libraries --> - org.apache.activemq:activemq-broker - org.apache.activemq:activemq-kahadb-store - org.apache.activemq:activemq-ra org.apache.commons.dbcp2:* - commons-fileupload:* org.metatype.sxc:* org.apache.taglibs:* diff --git a/tomee/tomee-webapp/src/main/assembly/war.xml b/tomee/tomee-webapp/src/main/assembly/war.xml index 2ddf1e4df96..c4e8936e174 100644 --- a/tomee/tomee-webapp/src/main/assembly/war.xml +++ b/tomee/tomee-webapp/src/main/assembly/war.xml @@ -110,11 +110,7 @@ it picks up transitive dependencies from shaded libraries --> - org.apache.activemq:activemq-broker - org.apache.activemq:activemq-kahadb-store - org.apache.activemq:activemq-ra org.apache.commons.dbcp2:* - commons-fileupload:* org.metatype.sxc:* org.apache.taglibs:* From a84c278189a5925468302b8be7d2965ad3d94421 Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Thu, 11 Apr 2024 16:36:21 +0200 Subject: [PATCH 02/12] Switch Java Level to 17 --- .../src/main/resources/openejb | 1 + .../src/main/resources/openejb.bat | 1 + boms/tomee-plus/pom.xml | 77 +++++++++++++++++++ .../apache/openejb/config/RemoteServer.java | 9 +++ .../org/apache/openejb/loader/Embedder.java | 1 + docker-compose.yml | 8 +- examples/jpa-eclipselink/pom.xml | 2 +- .../server/control/StandaloneServer.java | 1 + pom.xml | 25 ++---- 9 files changed, 103 insertions(+), 22 deletions(-) diff --git a/assembly/openejb-standalone/src/main/resources/openejb b/assembly/openejb-standalone/src/main/resources/openejb index 57bdfa2d70b..063b984c9f0 100755 --- a/assembly/openejb-standalone/src/main/resources/openejb +++ b/assembly/openejb-standalone/src/main/resources/openejb @@ -86,6 +86,7 @@ JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util=ALL-UNNAMED" JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED" +JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.net=ALL-UNNAMED" export JDK_JAVA_OPTIONS diff --git a/assembly/openejb-standalone/src/main/resources/openejb.bat b/assembly/openejb-standalone/src/main/resources/openejb.bat index fe03d9a7067..48f738ae384 100644 --- a/assembly/openejb-standalone/src/main/resources/openejb.bat +++ b/assembly/openejb-standalone/src/main/resources/openejb.bat @@ -55,6 +55,7 @@ set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.util=ALL-UNN set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED" +set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.net=ALL-UNNAMED" for %%a in (%OPENEJB_CORE_JAR%) do ( set OPENEJB_CORE_JAR="%%a" diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml index cfaeb9e8c2b..87efa9f68d5 100644 --- a/boms/tomee-plus/pom.xml +++ b/boms/tomee-plus/pom.xml @@ -485,6 +485,39 @@ + + org.apache.activemq.protobuf + activemq-protobuf + 1.1 + + + * + * + + + + + org.apache.activemq + activemq-broker + 6.1.0 + + + * + * + + + + + org.apache.activemq + activemq-client + 6.1.0 + + + * + * + + + org.apache.activemq activemq-jdbc-store @@ -496,6 +529,39 @@ + + org.apache.activemq + activemq-kahadb-store + 6.1.0 + + + * + * + + + + + org.apache.activemq + activemq-openwire-legacy + 6.1.0 + + + * + * + + + + + org.apache.activemq + activemq-ra + 6.1.0 + + + * + * + + + org.apache.batchee batchee-jbatch @@ -2037,6 +2103,17 @@ + + org.fusesource.hawtbuf + hawtbuf + 1.11 + + + * + * + + + org.glassfish.jaxb jaxb-core diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java index 52b5245e66e..560dcc13616 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java @@ -343,6 +343,15 @@ private void cmd(final List additionalArgs, final String cmd, final bool argsList.add("-ea"); } + // Add the JAVA 11+ specific start-up parameters required by TomEE + argsList.add("--add-opens=java.base/java.lang=ALL-UNNAMED"); + argsList.add("--add-opens=java.base/java.io=ALL-UNNAMED"); + argsList.add("--add-opens=java.base/java.util=ALL-UNNAMED"); + argsList.add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"); + argsList.add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"); + argsList.add("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"); + argsList.add("--add-opens=java.base/java.net=ALL-UNNAMED"); + argsList.add("-classpath"); final StringBuilder cp = new StringBuilder(bootstrapJar.getAbsolutePath()).append(ps).append(juliJar.getAbsolutePath()); diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java index 2cf23292f9b..36c14eb7643 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java @@ -105,6 +105,7 @@ private Class forcefulLoad(final ClassPath classPath, final ClassLoader classLoa } classPath.addJarsToPath(libsDir); } catch (final Exception e2) { + e2.printStackTrace(); throw new Exception("Could not load OpenEJB libraries. Exception: " + e2.getClass().getName() + " " + e2.getMessage()); } diff --git a/docker-compose.yml b/docker-compose.yml index f018e114415..0565f1c4f6d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,7 @@ # limitations under the License. # -version: '2' +version: '3' volumes: m2: services: @@ -43,7 +43,7 @@ services: - volume_perms # Build+test. Does not stop on test failures build-all: - image: "maven:3-eclipse-temurin-11" + image: "maven:3-eclipse-temurin-17" profiles: ["build-all"] command: ["--fail-at-end", "-Duser.home=/var/maven", "-Pall-adapters", "-Dsurefire.useFile=false", "-DdisableXmlReport=true", "clean", "install"] entrypoint: "mvn" @@ -61,7 +61,7 @@ services: - volume_perms # Just build (no tests) build-quick: - image: "maven:3-eclipse-temurin-11" + image: "maven:3-eclipse-temurin-17" profiles: ["build-quick"] command: ["-Duser.home=/var/maven", "-Pquick", "-Dsurefire.useFile=false", "-DdisableXmlReport=true", "-DuniqueVersion=false", "-ff", "-Dassemble", "-DskipTests", "-DfailIfNoTests=false", "clean", "install"] entrypoint: "mvn" @@ -77,7 +77,7 @@ services: - volume_perms # Build+test. Waits for debugger on port 5005. Stops on first test failure debug: - image: "maven:3-eclipse-temurin-11" + image: "maven:3-eclipse-temurin-17" profiles: ["build-debug"] command: ["-Duser.home=/var/maven", "-Pall-adapters", "-Dsurefire.useFile=false", "-DdisableXmlReport=true", "-Dopenejb.server.debug", "-Dmaven.surefire.debug", "-Dopenejb.arquillian.debug=true", "clean", "install"] entrypoint: "mvn" diff --git a/examples/jpa-eclipselink/pom.xml b/examples/jpa-eclipselink/pom.xml index 629104651c5..da6687da865 100644 --- a/examples/jpa-eclipselink/pom.xml +++ b/examples/jpa-eclipselink/pom.xml @@ -115,7 +115,7 @@ [9, - --add-opens java.base/jdk.internal.loader=ALL-UNNAMED -Djdk.attach.allowAttachSelf + --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/jdk.internal.loader=ALL-UNNAMED -Djdk.attach.allowAttachSelf diff --git a/itests/failover/src/main/java/org/apache/openejb/server/control/StandaloneServer.java b/itests/failover/src/main/java/org/apache/openejb/server/control/StandaloneServer.java index d7958db11e0..be1da342742 100644 --- a/itests/failover/src/main/java/org/apache/openejb/server/control/StandaloneServer.java +++ b/itests/failover/src/main/java/org/apache/openejb/server/control/StandaloneServer.java @@ -89,6 +89,7 @@ public StandaloneServer(final File home, final File base) { jvmOpts.add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"); jvmOpts.add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"); jvmOpts.add("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"); + jvmOpts.add("--add-opens=java.base/java.net=ALL-UNNAMED"); } diff --git a/pom.xml b/pom.xml index 42334d09755..0e7705c7eb3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,9 +33,9 @@ pom 10.0.0-M2-SNAPSHOT - Apache OpenEJB - Apache OpenEJB is an open source, modular, configurable and extensible EJB Container System and EJB Server. - http://tomee.apache.org + Apache TomEE + Apache TomEE is a JakartaEE 10 Web Profile stack for Apache Tomcat + https://tomee.apache.org 1999 @@ -44,7 +44,7 @@ jira - http://issues.apache.org/jira/browse/TOMEE + https://issues.apache.org/jira/browse/TOMEE @@ -172,9 +172,9 @@ - 11 - 11 - 11 + 17 + 17 + 17 5.0 @@ -482,7 +482,7 @@ org.apache.maven.plugins maven-compiler-plugin - 11 + 17 - true - - - - - - + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + --add-opens=java.base/java.lang=ALL-UNNAMED + + + + + From f7daf6cb6b1d1a09c15477dac5bf8a940c70bc6e Mon Sep 17 00:00:00 2001 From: Markus Jung Date: Fri, 12 Apr 2024 07:35:26 +0200 Subject: [PATCH 05/12] Bump maven-plugin-plugin version --- maven/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven/pom.xml b/maven/pom.xml index b182ddf8c57..c941bcc3c85 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -105,7 +105,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.6.0 + 3.12.0 mojo-descriptor @@ -128,7 +128,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.5 + 3.12.0 From 71354a23d47b3dcfaf72b21622dbfca8f089c764 Mon Sep 17 00:00:00 2001 From: Markus Jung Date: Fri, 12 Apr 2024 07:40:19 +0200 Subject: [PATCH 06/12] Add ScriptEngine implementation for js on Java 15+ --- examples/testing-security-4/pom.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/examples/testing-security-4/pom.xml b/examples/testing-security-4/pom.xml index 3ae6b9b38f8..2b6e8ffb1cb 100644 --- a/examples/testing-security-4/pom.xml +++ b/examples/testing-security-4/pom.xml @@ -96,4 +96,21 @@ file://${basedir}/target/snapshot-repo/ + + + + jdk15+ + + [15,) + + + + org.openjdk.nashorn + nashorn-core + 15.4 + test + + + + From e082bd53ae10bafc37b7d6c0aec26e3a902c63fc Mon Sep 17 00:00:00 2001 From: Markus Jung Date: Fri, 12 Apr 2024 08:19:46 +0200 Subject: [PATCH 07/12] Add ScriptEngine implementation for js in tomee-embedded-maven-plugin as well --- examples/testing-security-4/pom.xml | 23 ++++++----------------- maven/tomee-embedded-maven-plugin/pom.xml | 5 +++++ pom.xml | 7 +++++++ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/examples/testing-security-4/pom.xml b/examples/testing-security-4/pom.xml index 2b6e8ffb1cb..e1155c881bc 100644 --- a/examples/testing-security-4/pom.xml +++ b/examples/testing-security-4/pom.xml @@ -70,6 +70,12 @@ 4.13.2 test + + org.openjdk.nashorn + nashorn-core + 15.4 + test + 2.0.12 @@ -1394,6 +1395,12 @@ ${junit.jupiter.version} test + + org.openjdk.nashorn + nashorn-core + ${version.nashorn} + test + com.agical.rmock rmock From 6cfd850ff07ecb9faec9ddab8b246827c0bf828f Mon Sep 17 00:00:00 2001 From: Richard Zowalla <13417392+rzo1@users.noreply.github.com> Date: Fri, 12 Apr 2024 16:24:39 +0200 Subject: [PATCH 08/12] Add ScriptEngine implementation for js on Java 15+ --- tomee/tomee-webaccess/pom.xml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml index 1ce63c5d70f..7ee4e7fcd61 100644 --- a/tomee/tomee-webaccess/pom.xml +++ b/tomee/tomee-webaccess/pom.xml @@ -28,12 +28,12 @@ - java9 + java11plus - 9 + [11,) - 2.5.0-alpha-1 + 2.5.23 @@ -42,6 +42,19 @@ true + + jdk15+ + + [15,) + + + + org.openjdk.nashorn + nashorn-core + test + + + From 75fc5e7de9145f4aea6309dc45789f17eefa4ad5 Mon Sep 17 00:00:00 2001 From: Richard Zowalla <13417392+rzo1@users.noreply.github.com> Date: Fri, 12 Apr 2024 16:27:34 +0200 Subject: [PATCH 09/12] Upgrade Mockito to make it work under J17+ env --- arquillian/arquillian-openejb-embedded/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arquillian/arquillian-openejb-embedded/pom.xml b/arquillian/arquillian-openejb-embedded/pom.xml index 14f5058422f..defde810874 100644 --- a/arquillian/arquillian-openejb-embedded/pom.xml +++ b/arquillian/arquillian-openejb-embedded/pom.xml @@ -133,7 +133,7 @@ org.mockito mockito-core - 1.9.5 + 5.11.0 test From fba5b7bf87d5ef42a1c0920a4a3f1c1a90c243cf Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Fri, 12 Apr 2024 20:46:51 +0200 Subject: [PATCH 10/12] Exclude bean validaiton tck tests from "org.hibernate.beanvalidation.tck.tests.constraints.groups.groupconversion.*" as they seem to be broken in BVAL itself with Java 17 --- tck/bval-embedded/pom.xml | 3 +- .../beanvalidation-tck-tests-suite.xml | 47 +++++++++++++ tck/bval-tomee/pom.xml | 66 ++++++++----------- .../bval/tck/BValTCKArchiveProcessor.java | 2 +- .../beanvalidation-tck-tests-suite.xml | 47 +++++++++++++ 5 files changed, 123 insertions(+), 42 deletions(-) create mode 100644 tck/bval-embedded/src/test/resources/beanvalidation-tck-tests-suite.xml create mode 100644 tck/bval-tomee/src/test/resources/beanvalidation-tck-tests-suite.xml diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml index 430fe76c84a..8bf6257b4be 100644 --- a/tck/bval-embedded/pom.xml +++ b/tck/bval-embedded/pom.xml @@ -148,7 +148,8 @@ false - ${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml + ${project.build.directory}/test-classes/beanvalidation-tck-tests-suite.xml + ${validation.provider} diff --git a/tck/bval-embedded/src/test/resources/beanvalidation-tck-tests-suite.xml b/tck/bval-embedded/src/test/resources/beanvalidation-tck-tests-suite.xml new file mode 100644 index 00000000000..23b3ce68187 --- /dev/null +++ b/tck/bval-embedded/src/test/resources/beanvalidation-tck-tests-suite.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml index 5c78b9d422c..7a154adbc54 100644 --- a/tck/bval-tomee/pom.xml +++ b/tck/bval-tomee/pom.xml @@ -28,7 +28,8 @@ ${project.build.directory}${file.separator}apache-tomee-webprofile-${project.version} - ${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml + + ${project.build.directory}/test-classes/beanvalidation-tck-tests-suite.xml @@ -128,16 +129,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - false - false - true - - - org.apache.maven.plugins maven-dependency-plugin @@ -165,43 +156,38 @@ org.apache.maven.plugins - maven-failsafe-plugin + maven-surefire-plugin + ${surefire.version} + + -Duser.language=en --add-opens=java.base/java.lang=ALL-UNNAMED + false + + ${suiteFile} + + + ${validation.provider} + + none + 4 + + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${surefire.version} - integration-test - integration-test - - integration-test - - - - verify - verify + generate-test-report + test - verify + report-only - false - - ${validation.provider} - - - ${suiteFile} - - 1 - false + ${project.build.directory}/surefire-reports + test-report - - - - org.apache.tomee.bom - jaxb-runtime - 8.0.10 - pom - - diff --git a/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java b/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java index f632b0a3a2d..2e6fc3c2e3b 100644 --- a/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java +++ b/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java @@ -30,6 +30,6 @@ public void process(final Archive archive, final TestClass testClass) { WebArchive.class.cast(archive).addAsLibrary(jarLocation(PlatformUtil.class)); } */ - System.out.println(archive.toString(true)); + //System.out.println(archive.toString(true)); } } diff --git a/tck/bval-tomee/src/test/resources/beanvalidation-tck-tests-suite.xml b/tck/bval-tomee/src/test/resources/beanvalidation-tck-tests-suite.xml new file mode 100644 index 00000000000..23b3ce68187 --- /dev/null +++ b/tck/bval-tomee/src/test/resources/beanvalidation-tck-tests-suite.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From 658773e634cafc11c3660268a1f5b84fc9531364 Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Sat, 13 Apr 2024 20:29:20 +0200 Subject: [PATCH 11/12] Update GH actions to run with Java 17 --- .github/workflows/main-pull-request-build.yml | 4 ++-- .github/workflows/main-push-build.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main-pull-request-build.yml b/.github/workflows/main-pull-request-build.yml index 7f662a49d43..9ea4158f3d1 100644 --- a/.github/workflows/main-pull-request-build.yml +++ b/.github/workflows/main-pull-request-build.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: '11' + java-version: '17' - name: Cache Maven packages uses: actions/cache@v2 diff --git a/.github/workflows/main-push-build.yml b/.github/workflows/main-push-build.yml index 927c7d59d04..7712e827981 100644 --- a/.github/workflows/main-push-build.yml +++ b/.github/workflows/main-push-build.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: '11' + java-version: '17' - name: Cache Maven packages uses: actions/cache@v2 From 5332031c317a6352480c7c8b669c97edea764576 Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Sat, 13 Apr 2024 20:40:40 +0200 Subject: [PATCH 12/12] Fix review comments --- .../org/apache/openejb/loader/Embedder.java | 1 - tomee/tomee-webaccess/pom.xml | 28 ++++--------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java index 36c14eb7643..2cf23292f9b 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java @@ -105,7 +105,6 @@ private Class forcefulLoad(final ClassPath classPath, final ClassLoader classLoa } classPath.addJarsToPath(libsDir); } catch (final Exception e2) { - e2.printStackTrace(); throw new Exception("Could not load OpenEJB libraries. Exception: " + e2.getClass().getName() + " " + e2.getMessage()); } diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml index 7ee4e7fcd61..ada19d87f70 100644 --- a/tomee/tomee-webaccess/pom.xml +++ b/tomee/tomee-webaccess/pom.xml @@ -25,36 +25,15 @@ ${project.groupId}.tomee.webaccess UTF-8 + 2.5.23 - - java11plus - - [11,) - - - 2.5.23 - - tomee true - - jdk15+ - - [15,) - - - - org.openjdk.nashorn - nashorn-core - test - - - @@ -236,6 +215,11 @@ ${version.groovy} test + + org.openjdk.nashorn + nashorn-core + test + org.apache.ivy ivy