You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2020/11/19 09:34:47 UTC
[tomee-tck] branch jakartaee9-tck updated: Attempt to get some EE 9
figures with staged M3
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch jakartaee9-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
The following commit(s) were added to refs/heads/jakartaee9-tck by this push:
new 671eccd Attempt to get some EE 9 figures with staged M3
671eccd is described below
commit 671eccd81b15a9b425959f74f747a6a607b3da2f
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Thu Nov 19 10:34:30 2020 +0100
Attempt to get some EE 9 figures with staged M3
---
pom.xml | 26 ++++++++++++++++++----
.../cts/TransactionalWorkaroundLeakGuardValve.java | 4 ++--
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 711cdf5..c20dbe3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,12 +42,12 @@
<!-- A bit tricky because of the nature we create the 9.x version. Even if the zip is
upgraded to 9.x, lib jars are still in the same old package and still using the base version
For example, for 9.0.0-M2, we are using 8.0.4 as a base line, so it must be aligned -->
- <openejb.version>8.0.6-SNAPSHOT</openejb.version>
- <tomee.version>8.0.6-SNAPSHOT</tomee.version>
+ <openejb.version>8.0.5</openejb.version>
+ <tomee.version>8.0.5</tomee.version>
<tomee.zip.groupId>org.apache.tomee.jakarta</tomee.zip.groupId>
<tomee.zip.version>9.0.0-M3</tomee.zip.version>
- <tomcat.version>9.0.40</tomcat.version>
+ <tomcat.version>10.0.0-M10</tomcat.version>
<derby.version>10.7.1.1</derby.version>
@@ -104,7 +104,17 @@
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
- <version>4.0.0-RC2</version>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>5.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>2.0.0</version>
</dependency>
<dependency>
@@ -1048,6 +1058,14 @@
</snapshots>
</repository>
<repository>
+ <id>8.0.5</id>
+ <url>https://repository.apache.org/content/repositories/orgapachetomee-1177/</url>
+ </repository>
+ <repository>
+ <id>M3-staging</id>
+ <url>https://repository.apache.org/content/repositories/orgapachetomee-1178/</url>
+ </repository>
+ <repository>
<id>openejb-cts-file</id>
<name>OpenEJB CTS File Repository</name>
<url>file://${pom.basedir}/src/test/repo</url>
diff --git a/src/main/java/org/apache/openejb/cts/TransactionalWorkaroundLeakGuardValve.java b/src/main/java/org/apache/openejb/cts/TransactionalWorkaroundLeakGuardValve.java
index 8403897..e552cfb 100644
--- a/src/main/java/org/apache/openejb/cts/TransactionalWorkaroundLeakGuardValve.java
+++ b/src/main/java/org/apache/openejb/cts/TransactionalWorkaroundLeakGuardValve.java
@@ -5,8 +5,8 @@ import org.apache.catalina.connector.Response;
import org.apache.catalina.valves.ValveBase;
import javax.naming.InitialContext;
-import javax.servlet.ServletException;
-import javax.transaction.UserTransaction;
+import jakarta.servlet.ServletException;
+import jakarta.transaction.UserTransaction;
import java.io.IOException;
/**