This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 8f7a7fd5be TOMEE-4318 | TOMEE-4317 - ActiveMQ 6 + Java 17 (#1120)
8f7a7fd5be is described below
commit 8f7a7fd5be46321eeeed94e75bac36d6f9a008a9
Author: Richard Zowalla <13417392+r...@users.noreply.github.com>
AuthorDate: Tue Apr 16 20:56:09 2024 +0200
TOMEE-4318 | TOMEE-4317 - ActiveMQ 6 + Java 17 (#1120)
* TOMEE-4317 - ActiveMQ 6.1.0
Drop related shades.
* Switch Java Level to 17
* Migrate V11 to V17 class constant in jwt tests
* Adds --add-opens for legacy code fragements with libraries not supporting
J17+
* Bump maven-plugin-plugin version
* Add ScriptEngine implementation for js on Java 15+
* Add ScriptEngine implementation for js in tomee-embedded-maven-plugin as
well
* Add ScriptEngine implementation for js on Java 15+
* Upgrade Mockito to make it work under J17+ env
* 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
* Update GH actions to run with Java 17
* Fix review comments
---------
Co-authored-by: Markus Jung <ju...@apache.org>
---
.github/workflows/main-pull-request-build.yml | 4 +-
.github/workflows/main-push-build.yml | 4 +-
arquillian/arquillian-openejb-embedded/pom.xml | 2 +-
arquillian/arquillian-tomee-tests/pom.xml | 8 +-
.../openejb-standalone/src/main/resources/openejb | 1 +
.../src/main/resources/openejb.bat | 1 +
boms/tomee-plume/pom.xml | 98 ++++++---------
boms/tomee-plus/pom.xml | 98 ++++++---------
container/openejb-core/pom.xml | 8 +-
.../org/apache/openejb/config/RemoteServer.java | 9 ++
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 -
docker-compose.yml | 8 +-
examples/client-resource-lookup-preview/pom.xml | 6 +-
examples/jpa-eclipselink/pom.xml | 2 +-
examples/testing-security-4/pom.xml | 6 +
.../openejb/server/control/StandaloneServer.java | 1 +
itests/openejb-itests-client/pom.xml | 4 +-
maven/pom.xml | 4 +-
maven/tomee-embedded-maven-plugin/pom.xml | 5 +
.../microprofile/jwt/bval/ValidationGenerator.java | 2 +-
pom.xml | 66 ++++------
server/openejb-activemq/pom.xml | 4 +-
server/openejb-ejbd/pom.xml | 3 +-
server/openejb-hessian/pom.xml | 33 +++--
tck/bval-embedded/pom.xml | 3 +-
.../resources/beanvalidation-tck-tests-suite.xml | 47 ++++++++
tck/bval-tomee/pom.xml | 66 ++++------
.../tomee/bval/tck/BValTCKArchiveProcessor.java | 2 +-
.../resources/beanvalidation-tck-tests-suite.xml | 47 ++++++++
tck/cdi-embedded/pom.xml | 8 +-
.../src/main/assembly/war.xml | 4 -
tomee/tomee-plume-webapp/pom.xml | 8 +-
tomee/tomee-plume-webapp/src/main/assembly/war.xml | 4 -
tomee/tomee-plus-webapp/pom.xml | 8 +-
tomee/tomee-plus-webapp/src/main/assembly/war.xml | 4 -
tomee/tomee-webaccess/pom.xml | 15 +--
tomee/tomee-webapp/src/main/assembly/war.xml | 4 -
40 files changed, 307 insertions(+), 683 deletions(-)
diff --git a/.github/workflows/main-pull-request-build.yml
b/.github/workflows/main-pull-request-build.yml
index 7f662a49d4..9ea4158f3d 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 927c7d59d0..7712e82798 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
diff --git a/arquillian/arquillian-openejb-embedded/pom.xml
b/arquillian/arquillian-openejb-embedded/pom.xml
index 14f5058422..defde81087 100644
--- a/arquillian/arquillian-openejb-embedded/pom.xml
+++ b/arquillian/arquillian-openejb-embedded/pom.xml
@@ -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>
diff --git a/arquillian/arquillian-tomee-tests/pom.xml
b/arquillian/arquillian-tomee-tests/pom.xml
index 332ead32c4..a2a80057cf 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -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>
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-plume/pom.xml b/boms/tomee-plume/pom.xml
index 521c56fa04..1a60a9471a 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index b40376c0b6..87efa9f68d 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 1e64dfe9f5..c7e23ac4f8 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -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>
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/deps/activemq-broker-shade/pom.xml
b/deps/activemq-broker-shade/pom.xml
deleted file mode 100644
index 55739436ae..0000000000
--- a/deps/activemq-broker-shade/pom.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>10.0.0-M2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>activemq-broker-shade</artifactId>
- <name>TomEE :: Deps :: Apache ActiveMQ Broker shade</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- <version>${version.activemq}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client-jakarta</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes>
- <include>org.apache.activemq:activemq-broker</include> <!--
only this dep to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.annotation</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>javax.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Purpose of build-helper-maven-plugin is to ensure that IntelliJ sees
shaded classes.
- When navigating over to java classes in importing modules, the shaded
imported classes will
- show as resolved instead of unknown.
- The artifact specified below is created when this module is built but
is also used to resolve classes in IntelliJ.
- "phase" is set to "none" - with this setting, the artifact jar will
not be uploaded to repo
- when running standalone "mvn install" command.
-
- build-helper-maven-plugin can be removed completely with no effect on
the "mvn clean" and "mvn install",
- which is handled by maven-shade-plugin.
- -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.4.0</version>
- <executions>
- <execution>
- <id>workaround-makeItVisibleOnIntellij</id>
- <phase>none</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
-
<file>${project.build.directory}/activemq-broker-shade-10.0.0-M2-SNAPSHOT.jar</file>
- <type>jar</type>
- <classifier>optional</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/deps/activemq-kahadb-store-shade/pom.xml
b/deps/activemq-kahadb-store-shade/pom.xml
deleted file mode 100644
index cd4c97d610..0000000000
--- a/deps/activemq-kahadb-store-shade/pom.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>10.0.0-M2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>activemq-kahadb-store-shade</artifactId>
- <name>TomEE :: Deps :: Apache ActiveMQ KahaDB Store shade</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kahadb-store</artifactId>
- <version>${version.activemq}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-broker-shade</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes>
- <include>org.apache.activemq:activemq-kahadb-store</include>
<!-- only this dep to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Purpose of build-helper-maven-plugin is to ensure that IntelliJ sees
shaded classes.
- When navigating over to java classes in importing modules, the shaded
imported classes will
- show as resolved instead of unknown.
- The artifact specified below is created when this module is built but
is also used to resolve classes in IntelliJ.
- "phase" is set to "none" - with this setting, the artifact jar will
not be uploaded to repo
- when running standalone "mvn install" command.
-
- build-helper-maven-plugin can be removed completely with no effect on
the "mvn clean" and "mvn install",
- which is handled by maven-shade-plugin.
- -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.4.0</version>
- <executions>
- <execution>
- <id>workaround-makeItVisibleOnIntellij</id>
- <phase>none</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
-
<file>${project.build.directory}/activemq-kahadb-store-shade-10.0.0-M2-SNAPSHOT.jar</file>
- <type>jar</type>
- <classifier>optional</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/deps/activemq-ra-shade/pom.xml b/deps/activemq-ra-shade/pom.xml
deleted file mode 100644
index 88e90c59c0..0000000000
--- a/deps/activemq-ra-shade/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>10.0.0-M2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>activemq-ra-shade</artifactId>
- <name>TomEE :: Deps :: Apache ActiveMQ RA shade</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>${version.activemq}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kahadb-store</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-broker-shade</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-kahadb-store-shade</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes>
- <include>org.apache.activemq:activemq-ra</include> <!-- only
this dep to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.resource</pattern>
- <shadedPattern>jakarta.resource</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Purpose of build-helper-maven-plugin is to ensure that IntelliJ sees
shaded classes.
- When navigating over to java classes in importing modules, the shaded
imported classes will
- show as resolved instead of unknown.
- The artifact specified below is created when this module is built but
is also used to resolve classes in IntelliJ.
- "phase" is set to "none" - with this setting, the artifact jar will
not be uploaded to repo
- when running standalone "mvn install" command.
-
- build-helper-maven-plugin can be removed completely with no effect on
the "mvn clean" and "mvn install",
- which is handled by maven-shade-plugin.
- -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.4.0</version>
- <executions>
- <execution>
- <id>workaround-makeItVisibleOnIntellij</id>
- <phase>none</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
-
<file>${project.build.directory}/activemq-ra-shade-10.0.0-M2-SNAPSHOT.jar</file>
- <type>jar</type>
- <classifier>optional</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/deps/pom.xml b/deps/pom.xml
index 3a162d8221..a2c45b3c23 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -30,9 +30,6 @@
<modules>
<module>taglibs-shade</module>
<module>sxc-shade</module>
- <module>activemq-broker-shade</module>
- <module>activemq-kahadb-store-shade</module>
- <module>activemq-ra-shade</module>
<module>commons-dbcp2-shade</module>
<module>servicemix-bcel-shade</module>
</modules>
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/client-resource-lookup-preview/pom.xml
b/examples/client-resource-lookup-preview/pom.xml
index dc088583d2..0eaa68d7df 100644
--- a/examples/client-resource-lookup-preview/pom.xml
+++ b/examples/client-resource-lookup-preview/pom.xml
@@ -67,9 +67,9 @@
<version>10.0.0-M2-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-broker-shade</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <version>6.1.0</version>
<scope>runtime</scope>
</dependency>
<!-- test deps -->
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/examples/testing-security-4/pom.xml
b/examples/testing-security-4/pom.xml
index 3ae6b9b38f..e1155c881b 100644
--- a/examples/testing-security-4/pom.xml
+++ b/examples/testing-security-4/pom.xml
@@ -70,6 +70,12 @@
<version>4.13.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>15.4</version>
+ <scope>test</scope>
+ </dependency>
<!--
The <scope>test</scope> guarantees that non of your runtime
code is dependent on any OpenEJB classes.
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/itests/openejb-itests-client/pom.xml
b/itests/openejb-itests-client/pom.xml
index 99f38117c8..ec58a7de04 100644
--- a/itests/openejb-itests-client/pom.xml
+++ b/itests/openejb-itests-client/pom.xml
@@ -99,8 +99,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/maven/pom.xml b/maven/pom.xml
index b182ddf8c5..c941bcc3c8 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -105,7 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
+ <version>3.12.0</version>
<executions>
<execution>
<id>mojo-descriptor</id>
@@ -128,7 +128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.5</version>
+ <version>3.12.0</version>
</plugin>
</plugins>
</reporting>
diff --git a/maven/tomee-embedded-maven-plugin/pom.xml
b/maven/tomee-embedded-maven-plugin/pom.xml
index 5b8000565e..4ef3a40b82 100644
--- a/maven/tomee-embedded-maven-plugin/pom.xml
+++ b/maven/tomee-embedded-maven-plugin/pom.xml
@@ -62,6 +62,11 @@
<artifactId>livereload-tomee</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<properties>
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
index e278dac367..ba66be7d7f 100644
---
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
+++
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java
@@ -153,7 +153,7 @@ public abstract class ValidationGenerator implements
Opcodes {
final String generatedClassName = getName().replace('.', '/');
- cw.visit(V11, ACC_PUBLIC + ACC_SUPER, generatedClassName, null,
"java/lang/Object", null);
+ cw.visit(V17, ACC_PUBLIC + ACC_SUPER, generatedClassName, null,
"java/lang/Object", null);
{ // public constructor
final MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "<init>",
"()V", null, null);
diff --git a/pom.xml b/pom.xml
index d864aec395..2f5d98fd67 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>
@@ -147,6 +147,7 @@
<version.osgi.framework>4.2.0</version.osgi.framework>
<version.aether>1.13.1</version.aether>
<version.xalan>2.7.2</version.xalan>
+ <version.nashorn>15.4</version.nashorn>
<!-- Logging frameworks -->
<version.slf4j>2.0.12</version.slf4j>
@@ -172,9 +173,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>
@@ -210,7 +211,7 @@
<!-- com.sun -->
<version.impl.saaj>2.0.1</version.impl.saaj>
<!-- org.apache -->
- <version.activemq>5.18.3</version.activemq>
+ <version.activemq>6.1.0</version.activemq>
<!-- downgrade to avoid a henn egg issue with batchee -->
<version.batchee>1.0.4</version.batchee>
<version.bval>3.0.0</version.bval>
@@ -482,7 +483,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>
@@ -1394,6 +1395,12 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>${version.nashorn}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.agical.rmock</groupId>
<artifactId>rmock</artifactId>
@@ -1412,15 +1419,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <version>${version.activemq}</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
@@ -1429,34 +1430,13 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client-jakarta</artifactId>
+ <artifactId>activemq-client</artifactId>
<version>${version.activemq}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-kahadb-store-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kahadb-store</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-broker-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.jms</groupId>
- <artifactId>jakarta.jms-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <version>${version.activemq}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
diff --git a/server/openejb-activemq/pom.xml b/server/openejb-activemq/pom.xml
index 337e5c406d..5f57e6f996 100644
--- a/server/openejb-activemq/pom.xml
+++ b/server/openejb-activemq/pom.xml
@@ -38,8 +38,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/server/openejb-ejbd/pom.xml b/server/openejb-ejbd/pom.xml
index bca744fab3..feced152fa 100644
--- a/server/openejb-ejbd/pom.xml
+++ b/server/openejb-ejbd/pom.xml
@@ -89,6 +89,7 @@
<argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${project.version}.jar=foo=bar"
-Dopenejb.classloader.forced-skip=org.apache.openejb.jee.,org.apache.openejb.api.
-Dopenejb.classloader.forced-load=org.apache.openejb
+ --add-opens=java.base/java.lang=ALL-UNNAMED
</argLine>
<systemPropertyVariables>
<!--
@@ -174,7 +175,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
- <version>3.2.5</version>
+ <version>3.3.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/server/openejb-hessian/pom.xml b/server/openejb-hessian/pom.xml
index d54914235d..d2e7a9c441 100644
--- a/server/openejb-hessian/pom.xml
+++ b/server/openejb-hessian/pom.xml
@@ -60,23 +60,18 @@ limitations under the License.
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>java9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration> <!--
com.caucho.hessian.io.StackTraceElementDeserializer doesnt support java 9
without "opens" -->
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <reuseForks>false</reuseForks>
+ <argLine>
+ --add-opens=java.base/java.lang=ALL-UNNAMED
+ </argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml
index 430fe76c84..8bf6257b4b 100644
--- a/tck/bval-embedded/pom.xml
+++ b/tck/bval-embedded/pom.xml
@@ -148,7 +148,8 @@
<configuration>
<reuseForks>false</reuseForks>
<suiteXmlFiles>
-
<suiteXmlFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</suiteXmlFile>
+
<suiteXmlFile>${project.build.directory}/test-classes/beanvalidation-tck-tests-suite.xml</suiteXmlFile>
+<!--
<suiteXmlFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</suiteXmlFile>-->
</suiteXmlFiles>
<systemPropertyVariables>
<validation.provider>${validation.provider}</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 0000000000..23b3ce6818
--- /dev/null
+++ b/tck/bval-embedded/src/test/resources/beanvalidation-tck-tests-suite.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<!--
+
+ Jakarta Bean Validation TCK
+
+ License: Apache License, Version 2.0
+ See the license.txt file in the root directory or
<http://www.apache.org/licenses/LICENSE-2.0>.
+
+-->
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; >
+
+<suite name="Jakarta-Bean-Validation-TCK" verbose="1">
+ <test name="Jakarta-Bean-Validation-TCK">
+
+ <method-selectors>
+ <method-selector>
+ <selector-class
name="org.hibernate.beanvalidation.tck.util.IntegrationTestsMethodSelector"/>
+ </method-selector>
+ <method-selector>
+ <selector-class
name="org.hibernate.beanvalidation.tck.util.JavaFXTestsMethodSelector"/>
+ </method-selector>
+ </method-selectors>
+
+ <packages>
+ <package name="org.hibernate.beanvalidation.tck.tests.*">
+ <!-- FIXME: This tests seem to be broken on Java 17+ (also in
BVAL itself) - exclude for now -->
+ <exclude
name="org.hibernate.beanvalidation.tck.tests.constraints.groups.groupconversion.*"/>
+ </package>
+ </packages>
+ </test>
+</suite>
diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml
index 5c78b9d422..7a154adbc5 100644
--- a/tck/bval-tomee/pom.xml
+++ b/tck/bval-tomee/pom.xml
@@ -28,7 +28,8 @@
<properties>
<openejb.home>${project.build.directory}${file.separator}apache-tomee-webprofile-${project.version}</openejb.home>
-
<suiteFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</suiteFile>
+<!--
<suiteFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</suiteFile>-->
+
<suiteFile>${project.build.directory}/test-classes/beanvalidation-tck-tests-suite.xml</suiteFile>
</properties>
<dependencies>
@@ -128,16 +129,6 @@
</resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <useFile>false</useFile>
- <disableXmlReport>false</disableXmlReport>
- <skip>true</skip>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -165,43 +156,38 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <argLine>-Duser.language=en
--add-opens=java.base/java.lang=ALL-UNNAMED</argLine>
+ <reuseForks>false</reuseForks>
+ <suiteXmlFiles>
+ <suiteXmlFile>${suiteFile}</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemPropertyVariables>
+ <validation.provider>${validation.provider}</validation.provider>
+ </systemPropertyVariables>
+ <parallel>none</parallel>
+ <threadCount>4</threadCount>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${surefire.version}</version>
<executions>
<execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <phase>verify</phase>
+ <id>generate-test-report</id>
+ <phase>test</phase>
<goals>
- <goal>verify</goal>
+ <goal>report-only</goal>
</goals>
</execution>
</executions>
<configuration>
- <trimStackTrace>false</trimStackTrace>
- <systemPropertyVariables>
- <validation.provider>${validation.provider}</validation.provider>
- </systemPropertyVariables>
- <suiteXmlFiles>
- <suiteXmlFile>${suiteFile}</suiteXmlFile>
- </suiteXmlFiles>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
+
<outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
+ <outputName>test-report</outputName>
</configuration>
- <dependencies>
- <!-- failsafe has dependencies on javax -->
- <dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>8.0.10</version>
- <type>pom</type>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
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 f632b0a3a2..2e6fc3c2e3 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 class BValTCKArchiveProcessor implements
ApplicationArchiveProcessor {
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 0000000000..23b3ce6818
--- /dev/null
+++ b/tck/bval-tomee/src/test/resources/beanvalidation-tck-tests-suite.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<!--
+
+ Jakarta Bean Validation TCK
+
+ License: Apache License, Version 2.0
+ See the license.txt file in the root directory or
<http://www.apache.org/licenses/LICENSE-2.0>.
+
+-->
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; >
+
+<suite name="Jakarta-Bean-Validation-TCK" verbose="1">
+ <test name="Jakarta-Bean-Validation-TCK">
+
+ <method-selectors>
+ <method-selector>
+ <selector-class
name="org.hibernate.beanvalidation.tck.util.IntegrationTestsMethodSelector"/>
+ </method-selector>
+ <method-selector>
+ <selector-class
name="org.hibernate.beanvalidation.tck.util.JavaFXTestsMethodSelector"/>
+ </method-selector>
+ </method-selectors>
+
+ <packages>
+ <package name="org.hibernate.beanvalidation.tck.tests.*">
+ <!-- FIXME: This tests seem to be broken on Java 17+ (also in
BVAL itself) - exclude for now -->
+ <exclude
name="org.hibernate.beanvalidation.tck.tests.constraints.groups.groupconversion.*"/>
+ </package>
+ </packages>
+ </test>
+</suite>
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index 8753dd1670..4c7018620e 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -230,13 +230,13 @@
</dependency>
<!-- ActiveMQ is optional in openejb-core (embedded needs openejb-core +
all deps)-->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-broker-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
<scope>test</scope>
</dependency>
<dependency>
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 8a8feef5b1..981df2726e 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
-->
<!-- exclude shaded artifacts because they are under our own groupId
-->
- <exclude>org.apache.activemq:activemq-broker</exclude>
- <exclude>org.apache.activemq:activemq-kahadb-store</exclude>
- <exclude>org.apache.activemq:activemq-ra</exclude>
<exclude>org.apache.commons.dbcp2:*</exclude>
- <exclude>commons-fileupload:*</exclude>
<exclude>org.metatype.sxc:*</exclude>
<exclude>org.apache.taglibs:*</exclude>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 59aae1c4a1..46149cdd1f 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -327,8 +327,8 @@
</exclusions>
</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>
@@ -341,8 +341,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
</dependency>
<dependency>
<groupId>org.apache.batchee</groupId>
diff --git a/tomee/tomee-plume-webapp/src/main/assembly/war.xml
b/tomee/tomee-plume-webapp/src/main/assembly/war.xml
index 9106bd3084..b67de69338 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
-->
<!-- exclude shaded artifacts because they are under our own groupId
-->
- <exclude>org.apache.activemq:activemq-broker</exclude>
- <exclude>org.apache.activemq:activemq-kahadb-store</exclude>
- <exclude>org.apache.activemq:activemq-ra</exclude>
<exclude>org.apache.commons.dbcp2:*</exclude>
- <exclude>commons-fileupload:*</exclude>
<exclude>org.metatype.sxc:*</exclude>
<exclude>org.apache.taglibs:*</exclude>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 60fed0dcb5..713d4294dc 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -327,8 +327,8 @@
</exclusions>
</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>
@@ -341,8 +341,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
</dependency>
<dependency>
<groupId>org.apache.batchee</groupId>
diff --git a/tomee/tomee-plus-webapp/src/main/assembly/war.xml
b/tomee/tomee-plus-webapp/src/main/assembly/war.xml
index 40ae4fe9cb..86dbfbd4ec 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
-->
<!-- exclude shaded artifacts because they are under our own groupId
-->
- <exclude>org.apache.activemq:activemq-broker</exclude>
- <exclude>org.apache.activemq:activemq-kahadb-store</exclude>
- <exclude>org.apache.activemq:activemq-ra</exclude>
<exclude>org.apache.commons.dbcp2:*</exclude>
- <exclude>commons-fileupload:*</exclude>
<exclude>org.metatype.sxc:*</exclude>
<exclude>org.apache.taglibs:*</exclude>
diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml
index 1ce63c5d70..ada19d87f7 100644
--- a/tomee/tomee-webaccess/pom.xml
+++ b/tomee/tomee-webaccess/pom.xml
@@ -25,17 +25,9 @@
<properties>
<tomee.build.name>${project.groupId}.tomee.webaccess</tomee.build.name>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <version.groovy>2.5.23</version.groovy>
</properties>
<profiles>
- <profile>
- <id>java9</id>
- <activation>
- <jdk>9</jdk>
- </activation>
- <properties>
- <version.groovy>2.5.0-alpha-1</version.groovy>
- </properties>
- </profile>
<profile>
<id>tomee</id>
<activation>
@@ -223,6 +215,11 @@
<version>${version.groovy}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.ivy</groupId>
<artifactId>ivy</artifactId>
diff --git a/tomee/tomee-webapp/src/main/assembly/war.xml
b/tomee/tomee-webapp/src/main/assembly/war.xml
index 2ddf1e4df9..c4e8936e17 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
-->
<!-- exclude shaded artifacts because they are under our own groupId
-->
- <exclude>org.apache.activemq:activemq-broker</exclude>
- <exclude>org.apache.activemq:activemq-kahadb-store</exclude>
- <exclude>org.apache.activemq:activemq-ra</exclude>
<exclude>org.apache.commons.dbcp2:*</exclude>
- <exclude>commons-fileupload:*</exclude>
<exclude>org.metatype.sxc:*</exclude>
<exclude>org.apache.taglibs:*</exclude>
