Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TOMEE-4318 | TOMEE-4317 - ActiveMQ 6 + Java 17 #1120

Merged
merged 12 commits into from
Apr 16, 2024
Merged

TOMEE-4318 | TOMEE-4317 - ActiveMQ 6 + Java 17 #1120

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dd9e594
TOMEE-4317 - ActiveMQ 6.1.0
rzo1 Mar 31, 2024
a84c278
Switch Java Level to 17
rzo1 Apr 11, 2024
d10dc48
Migrate V11 to V17 class constant in jwt tests
rzo1 Apr 12, 2024
095765f
Adds --add-opens for legacy code fragements with libraries not suppor…
rzo1 Apr 12, 2024
f7daf6c
Bump maven-plugin-plugin version
jungm Apr 12, 2024
71354a2
Add ScriptEngine implementation for js on Java 15+
jungm Apr 12, 2024
e082bd5
Add ScriptEngine implementation for js in tomee-embedded-maven-plugin…
jungm Apr 12, 2024
6cfd850
Add ScriptEngine implementation for js on Java 15+
rzo1 Apr 12, 2024
75fc5e7
Upgrade Mockito to make it work under J17+ env
rzo1 Apr 12, 2024
fba5b7b
Exclude bean validaiton tck tests from "org.hibernate.beanvalidation.…
rzo1 Apr 12, 2024
658773e
Update GH actions to run with Java 17
rzo1 Apr 13, 2024
5332031
Fix review comments
rzo1 Apr 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arquillian/arquillian-openejb-embedded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<version>5.11.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
8 changes: 4 additions & 4 deletions arquillian/arquillian-tomee-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@

<!-- ActiveMQ is optional in openejb-core -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-ra-shade</artifactId>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-broker-shade</artifactId>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
Expand Down
1 change: 1 addition & 0 deletions assembly/openejb-standalone/src/main/resources/openejb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions assembly/openejb-standalone/src/main/resources/openejb.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
98 changes: 38 additions & 60 deletions boms/tomee-plume/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,17 +188,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.9.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.churchkey</groupId>
<artifactId>churchkey</artifactId>
Expand Down Expand Up @@ -486,9 +475,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
<groupId>net.shibboleth.utilities</groupId>
<artifactId>java-support</artifactId>
<version>8.4.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -497,9 +486,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
<groupId>org.apache.activemq.protobuf</groupId>
<artifactId>activemq-protobuf</artifactId>
<version>1.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -508,9 +497,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>net.shibboleth.utilities</groupId>
<artifactId>java-support</artifactId>
<version>8.4.0</version>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>6.1.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -519,9 +508,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq.protobuf</groupId>
<artifactId>activemq-protobuf</artifactId>
<version>1.1</version>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>6.1.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -531,8 +520,8 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client-jakarta</artifactId>
<version>5.18.3</version>
<artifactId>activemq-jdbc-store</artifactId>
<version>6.1.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -542,8 +531,30 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jdbc-store</artifactId>
<version>5.18.3</version>
<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>
Expand Down Expand Up @@ -1300,39 +1311,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>activemq-broker-shade</artifactId>
<version>10.0.0-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>activemq-kahadb-store-shade</artifactId>
<version>10.0.0-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>activemq-ra-shade</artifactId>
<version>10.0.0-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>commons-dbcp2-shade</artifactId>
Expand Down
98 changes: 38 additions & 60 deletions boms/tomee-plus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,17 +188,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.9.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.churchkey</groupId>
<artifactId>churchkey</artifactId>
Expand Down Expand Up @@ -486,9 +475,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
<groupId>net.shibboleth.utilities</groupId>
<artifactId>java-support</artifactId>
<version>8.4.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -497,9 +486,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
<groupId>org.apache.activemq.protobuf</groupId>
<artifactId>activemq-protobuf</artifactId>
<version>1.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -508,9 +497,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>net.shibboleth.utilities</groupId>
<artifactId>java-support</artifactId>
<version>8.4.0</version>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>6.1.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -519,9 +508,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq.protobuf</groupId>
<artifactId>activemq-protobuf</artifactId>
<version>1.1</version>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>6.1.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -531,8 +520,8 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client-jakarta</artifactId>
<version>5.18.3</version>
<artifactId>activemq-jdbc-store</artifactId>
<version>6.1.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
Expand All @@ -542,8 +531,30 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jdbc-store</artifactId>
<version>5.18.3</version>
<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>
Expand Down Expand Up @@ -1322,39 +1333,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>activemq-broker-shade</artifactId>
<version>10.0.0-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>activemq-kahadb-store-shade</artifactId>
<version>10.0.0-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>activemq-ra-shade</artifactId>
<version>10.0.0-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>commons-dbcp2-shade</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions container/openejb-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,13 +512,13 @@

<!-- ActiveMQ -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-ra-shade</artifactId>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-broker-shade</artifactId>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
9 changes: 9 additions & 0 deletions container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,15 @@ private void cmd(final List<String> 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());
Expand Down
1 change: 1 addition & 0 deletions container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ private Class forcefulLoad(final ClassPath classPath, final ClassLoader classLoa
}
classPath.addJarsToPath(libsDir);
} catch (final Exception e2) {
e2.printStackTrace();
rzo1 marked this conversation as resolved.
Show resolved Hide resolved
throw new Exception("Could not load OpenEJB libraries. Exception: " + e2.getClass().getName() + " " + e2.getMessage());
}

Expand Down
Loading
Loading