This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch amq6 in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a84c278189a5925468302b8be7d2965ad3d94421 Author: Richard Zowalla <[email protected]> AuthorDate: Thu Apr 11 16:36:21 2024 +0200 Switch Java Level to 17 --- .../openejb-standalone/src/main/resources/openejb | 1 + .../src/main/resources/openejb.bat | 1 + boms/tomee-plus/pom.xml | 77 ++++++++++++++++++++++ .../org/apache/openejb/config/RemoteServer.java | 9 +++ .../java/org/apache/openejb/loader/Embedder.java | 1 + docker-compose.yml | 8 +-- examples/jpa-eclipselink/pom.xml | 2 +- .../openejb/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 57bdfa2d70..063b984c9f 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 fe03d9a706..48f738ae38 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 cfaeb9e8c2..87efa9f68d 100644 --- a/boms/tomee-plus/pom.xml +++ b/boms/tomee-plus/pom.xml @@ -485,6 +485,39 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.activemq.protobuf</groupId> + <artifactId>activemq-protobuf</artifactId> + <version>1.1</version> + <exclusions> + <exclusion> + <artifactId>*</artifactId> + <groupId>*</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-broker</artifactId> + <version>6.1.0</version> + <exclusions> + <exclusion> + <artifactId>*</artifactId> + <groupId>*</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-client</artifactId> + <version>6.1.0</version> + <exclusions> + <exclusion> + <artifactId>*</artifactId> + <groupId>*</groupId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-jdbc-store</artifactId> @@ -496,6 +529,39 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-kahadb-store</artifactId> + <version>6.1.0</version> + <exclusions> + <exclusion> + <artifactId>*</artifactId> + <groupId>*</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-openwire-legacy</artifactId> + <version>6.1.0</version> + <exclusions> + <exclusion> + <artifactId>*</artifactId> + <groupId>*</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-ra</artifactId> + <version>6.1.0</version> + <exclusions> + <exclusion> + <artifactId>*</artifactId> + <groupId>*</groupId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.batchee</groupId> <artifactId>batchee-jbatch</artifactId> @@ -2037,6 +2103,17 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.fusesource.hawtbuf</groupId> + <artifactId>hawtbuf</artifactId> + <version>1.11</version> + <exclusions> + <exclusion> + <artifactId>*</artifactId> + <groupId>*</groupId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-core</artifactId> 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 52b5245e66..560dcc1361 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 @@ public class RemoteServer { 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 2cf23292f9..36c14eb764 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 @@ public class Embedder { } 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 f018e11441..0565f1c4f6 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 629104651c..da6687da86 100644 --- a/examples/jpa-eclipselink/pom.xml +++ b/examples/jpa-eclipselink/pom.xml @@ -115,7 +115,7 @@ <jdk>[9,</jdk> </activation> <properties> - <surefire.argline>--add-opens java.base/jdk.internal.loader=ALL-UNNAMED -Djdk.attach.allowAttachSelf</surefire.argline> + <surefire.argline>--add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/jdk.internal.loader=ALL-UNNAMED -Djdk.attach.allowAttachSelf</surefire.argline> </properties> </profile> </profiles> 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 d7958db11e..be1da34274 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 class StandaloneServer { 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 42334d0975..0e7705c7eb 100644 --- a/pom.xml +++ b/pom.xml @@ -33,9 +33,9 @@ <packaging>pom</packaging> <version>10.0.0-M2-SNAPSHOT</version> - <name>Apache OpenEJB</name> - <description>Apache OpenEJB is an open source, modular, configurable and extensible EJB Container System and EJB Server.</description> - <url>http://tomee.apache.org</url> + <name>Apache TomEE</name> + <description>Apache TomEE is a JakartaEE 10 Web Profile stack for Apache Tomcat</description> + <url>https://tomee.apache.org</url> <inceptionYear>1999</inceptionYear> <prerequisites> @@ -44,7 +44,7 @@ <issueManagement> <system>jira</system> - <url>http://issues.apache.org/jira/browse/TOMEE</url> + <url>https://issues.apache.org/jira/browse/TOMEE</url> </issueManagement> <mailingLists> @@ -172,9 +172,9 @@ <!-- Java SE version --> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> - <maven.compiler.release>11</maven.compiler.release> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.target>17</maven.compiler.target> + <maven.compiler.release>17</maven.compiler.release> <!-- Micro Profile API --> <version.microprofile>5.0</version.microprofile> @@ -482,7 +482,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <release>11</release> + <release>17</release> <!-- <verbose>true</verbose> <fork>true</fork> @@ -662,15 +662,6 @@ </repository> </repositories> </profile> - <profile> - <id>java11tests</id> - <modules> - <module>examples</module> - <module>itests/microprofile-jwt-itests</module> - <module>arquillian/arquillian-tomee-tests</module> - <module>tck</module> - </modules> - </profile> <profile> <id>no-examples</id> <modules>
