Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-11.0.x-…

…5772-fix-jndi-mail
jetty · Dec 8, 2020 · b31f6b3 · b31f6b3
2 parents 1fb9e27 + adb8a4e
commit b31f6b3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/demos/demo-jndi-webapp/src/main/config/modules/demo-jndi.mod b/demos/demo-jndi-webapp/src/main/config/modules/demo-jndi.mod
@@ -17,5 +17,4 @@ demo-mock-resources
 [files]
 basehome:modules/demo.d/demo-jndi.xml|webapps/demo-jndi.xml
 maven://org.eclipse.jetty.demos/demo-jndi-webapp/${jetty.version}/war|webapps/demo-jndi.war
-maven://jakarta.mail/jakarta.mail-api/2.0.0-RC4/jar|lib/ext/jakarta.mail-api-2.0.0-RC4.jar
-maven://jakarta.transaction/jakarta.transaction-api/2.0.0-RC1/jar|lib/ext/jakarta.transaction-api-2.0.0-RC1.jar
+maven://jakarta.mail/jakarta.mail-api/2.0.0/jar|lib/ext/jakarta.mail-api-2.0.0.jar
diff --git a/jetty-plus/src/main/java/module-info.java b/jetty-plus/src/main/java/module-info.java
@@ -34,7 +34,7 @@
     // Only required if using DataSourceLoginService.
     requires static java.sql;
     // Only required if using Transaction.
-    requires static java.transaction;
+    requires static jakarta.transaction;
     // Only required if using RunAs.
     requires static org.eclipse.jetty.servlet;
 

diff --git a/pom.xml b/pom.xml
@@ -29,9 +29,9 @@
     <jsp.version>10.0.0-M10</jsp.version>
     <jsp.api.version>3.0</jsp.api.version>
     <annotation-api.version>2.0.0</annotation-api.version>
-    <transaction-api.version>2.0.0-RC1</transaction-api.version>
+    <transaction-api.version>2.0.0</transaction-api.version>
     <mail-api.version>2.0.0</mail-api.version>
-    <inject-api.version>2.0.0-RC4</inject-api.version>
+    <inject-api.version>2.0.0</inject-api.version>
     <infinispan.version>9.4.8.Final</infinispan.version>
     <infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version>
     <gson.version>2.8.6</gson.version>