You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2024/04/12 09:52:49 UTC
(tomee) branch amq6 updated (b2c0a6df1a -> e1a252419e)
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a change to branch amq6
in repository https://gitbox.apache.org/repos/asf/tomee.git
from b2c0a6df1a Adds --add-opens for legacy code fragements with libraries not supporting J17+
new 8e357423ef Bump maven-plugin-plugin version
new 392d68b311 Add ScriptEngine implementation for js on Java 15+
new cf1e2e70a7 Add ScriptEngine implementation for js in tomee-embedded-maven-plugin as well
new 815f812cdb mp-jwt generate java 17 class files
new 97c5831e8c Fix openejb-hessian tests
new e1a252419e Merge remote-tracking branch 'jm/amq6-java17' into amq6
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/testing-security-4/pom.xml | 6 ++++++
maven/pom.xml | 4 ++--
maven/tomee-embedded-maven-plugin/pom.xml | 5 +++++
pom.xml | 7 +++++++
server/openejb-hessian/pom.xml | 7 +++----
5 files changed, 23 insertions(+), 6 deletions(-)
(tomee) 03/06: Add ScriptEngine implementation for js in tomee-embedded-maven-plugin as well
Posted by rz...@apache.org.
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 cf1e2e70a72e34d8363fbb64f0f27394507354b8
Author: Markus Jung <ju...@apache.org>
AuthorDate: Fri Apr 12 08:19:46 2024 +0200
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 2b6e8ffb1c..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.
@@ -96,21 +102,4 @@
<url>file://${basedir}/target/snapshot-repo/</url>
</snapshotRepository>
</distributionManagement>
-
- <profiles>
- <profile>
- <id>jdk15+</id>
- <activation>
- <jdk>[15,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.openjdk.nashorn</groupId>
- <artifactId>nashorn-core</artifactId>
- <version>15.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
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/pom.xml b/pom.xml
index 0e7705c7eb..17944ad03b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -1385,6 +1386,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>
(tomee) 05/06: Fix openejb-hessian tests
Posted by rz...@apache.org.
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 97c5831e8c13ce2f114f9948472ff78bbaa776ad
Author: Markus Jung <ju...@apache.org>
AuthorDate: Fri Apr 12 09:47:53 2024 +0200
Fix openejb-hessian tests
---
server/openejb-hessian/pom.xml | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/server/openejb-hessian/pom.xml b/server/openejb-hessian/pom.xml
index d54914235d..ffd00b50d5 100644
--- a/server/openejb-hessian/pom.xml
+++ b/server/openejb-hessian/pom.xml
@@ -60,23 +60,17 @@ 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>
+ <!-- com.caucho.hessian.io.StackTraceElementDeserializer doesnt support java 9+ without "opens" -->
+ <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
(tomee) 01/06: Bump maven-plugin-plugin version
Posted by rz...@apache.org.
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 8e357423efb15b1b3c722c68f362ea40b6cf0d9c
Author: Markus Jung <ju...@apache.org>
AuthorDate: Fri Apr 12 07:35:26 2024 +0200
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 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>
(tomee) 02/06: Add ScriptEngine implementation for js on Java 15+
Posted by rz...@apache.org.
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 392d68b311daecbb57ff67912809b0cd1c225757
Author: Markus Jung <ju...@apache.org>
AuthorDate: Fri Apr 12 07:40:19 2024 +0200
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 3ae6b9b38f..2b6e8ffb1c 100644
--- a/examples/testing-security-4/pom.xml
+++ b/examples/testing-security-4/pom.xml
@@ -96,4 +96,21 @@
<url>file://${basedir}/target/snapshot-repo/</url>
</snapshotRepository>
</distributionManagement>
+
+ <profiles>
+ <profile>
+ <id>jdk15+</id>
+ <activation>
+ <jdk>[15,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>15.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
(tomee) 04/06: mp-jwt generate java 17 class files
Posted by rz...@apache.org.
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 815f812cdbf1c746e4339e47df66a2337b910cf6
Author: Markus Jung <ju...@apache.org>
AuthorDate: Fri Apr 12 08:32:20 2024 +0200
mp-jwt generate java 17 class files
---
.../org/apache/tomee/microprofile/jwt/bval/ValidationGenerator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
(tomee) 06/06: Merge remote-tracking branch 'jm/amq6-java17' into amq6
Posted by rz...@apache.org.
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 e1a252419efad667114a5571f80c2eb7878fc55a
Merge: b2c0a6df1a 97c5831e8c
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Fri Apr 12 11:52:32 2024 +0200
Merge remote-tracking branch 'jm/amq6-java17' into amq6
# Conflicts:
# server/openejb-hessian/pom.xml
examples/testing-security-4/pom.xml | 6 ++++++
maven/pom.xml | 4 ++--
maven/tomee-embedded-maven-plugin/pom.xml | 5 +++++
pom.xml | 7 +++++++
server/openejb-hessian/pom.xml | 7 +++----
5 files changed, 23 insertions(+), 6 deletions(-)