From 1fb9e27560aeb46457208cec2139c5f9f55d819a Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Tue, 8 Dec 2020 13:05:53 +0100
Subject: [PATCH] Issue #5772 Fix jndi mail class duplication

Signed-off-by: Jan Bartel <janb@webtide.com>
---
 javadoc/pom.xml                               |  2 +-
 jetty-jndi/pom.xml                            | 14 -------
 pom.xml                                       |  2 +-
 tests/pom.xml                                 |  1 +
 tests/test-jndi/pom.xml                       | 37 +++++++++++++++++++
 .../factories/TestMailSessionReference.java   |  0
 6 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 tests/test-jndi/pom.xml
 rename {jetty-jndi => tests/test-jndi}/src/test/java/org/eclipse/jetty/jndi/factories/TestMailSessionReference.java (100%)

diff --git a/javadoc/pom.xml b/javadoc/pom.xml
index adcf6fe01cf..2750f07b9d2 100644
--- a/javadoc/pom.xml
+++ b/javadoc/pom.xml
@@ -400,7 +400,7 @@
     </dependency>
     <dependency>
       <groupId>com.sun.mail</groupId>
-      <artifactId>mailapi</artifactId>
+      <artifactId>jakarta.mail</artifactId>
       <version>${mail-api.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index 74527f2e0ad..d534364e297 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -16,14 +16,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>
-            @{argLine} ${jetty.surefire.argLine} --add-modules jakarta.mail --patch-module jakarta.mail=${settings.localRepository}/com/sun/mail/mailapi/${mail-api.version}/mailapi-${mail-api.version}.jar
-          </argLine>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -75,11 +67,5 @@
       <artifactId>jakarta.mail-api</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>com.sun.mail</groupId>
-      <artifactId>mailapi</artifactId>
-      <version>${mail-api.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 4a24462d5ea..ebf10174220 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     <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>
-    <mail-api.version>2.0.0-RC6</mail-api.version>
+    <mail-api.version>2.0.0</mail-api.version>
     <inject-api.version>2.0.0-RC4</inject-api.version>
     <infinispan.version>9.4.8.Final</infinispan.version>
     <infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version>
diff --git a/tests/pom.xml b/tests/pom.xml
index 4af9fc7eb0e..9856c9a3041 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -69,5 +69,6 @@
     <module>test-http-client-transport</module>
     <module>test-distribution</module>
     <module>test-cdi</module>
+    <module>test-jndi</module>
   </modules>
 </project>
diff --git a/tests/test-jndi/pom.xml b/tests/test-jndi/pom.xml
new file mode 100644
index 00000000000..224903ca036
--- /dev/null
+++ b/tests/test-jndi/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty.tests</groupId>
+    <artifactId>tests-parent</artifactId>
+    <version>11.0.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>test-jndi</artifactId>
+  <packaging>jar</packaging>
+  <name>Test :: JNDI</name>
+
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.jndi.tests</bundle-symbolic-name>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jndi</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-test-helper</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.mail</groupId>
+      <artifactId>jakarta.mail</artifactId>
+      <version>${mail-api.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/factories/TestMailSessionReference.java b/tests/test-jndi/src/test/java/org/eclipse/jetty/jndi/factories/TestMailSessionReference.java
similarity index 100%
rename from jetty-jndi/src/test/java/org/eclipse/jetty/jndi/factories/TestMailSessionReference.java
rename to tests/test-jndi/src/test/java/org/eclipse/jetty/jndi/factories/TestMailSessionReference.java