Support gimap

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>

demos/demo/src/test/java/example/app/ModulesTest.java

@@ -25,18 +25,17 @@
 import com.sun.mail.util.MailStreamProvider;
 
 import jakarta.mail.NoSuchProviderException;
-import jakarta.mail.Provider;
 import jakarta.mail.Session;
 import jakarta.mail.util.StreamProvider;
 
 public class ModulesTest {
 
     // With org.eclipse.angus:angus-mail
     @Test
-    public void test() throws NoSuchProviderException {
+    public void test() throws NoSuchProviderException, ClassNotFoundException {
         Session session = Session.getDefaultInstance(new Properties());
         StreamProvider provider = session.getStreamProvider();
         assertEquals(MailStreamProvider.class, provider.getClass());
-        assertEquals(Provider.class, session.getProvider("imap").getClass());
+        Class.forName("com.sun.mail.imap.IMAPProvider");
     }
 }

demos/logging/src/test/java/example/app/ModulesTest.java

@@ -24,19 +24,17 @@
 
 import com.sun.mail.util.MailStreamProvider;
 
-import jakarta.mail.NoSuchProviderException;
-import jakarta.mail.Provider;
 import jakarta.mail.Session;
 import jakarta.mail.util.StreamProvider;
 
 public class ModulesTest {
 
     // With org.eclipse.angus:jakarta.mail
     @Test
-    public void test() throws NoSuchProviderException {
+    public void test() throws Exception {
         Session session = Session.getDefaultInstance(new Properties());
         StreamProvider provider = session.getStreamProvider();
         assertEquals(MailStreamProvider.class, provider.getClass());
-        assertEquals(Provider.class, session.getProvider("imap").getClass());
+        Class.forName("com.sun.mail.imap.IMAPProvider");
     }
 }

demos/servlet/src/test/java/example/app/ModulesTest.java

@@ -22,24 +22,20 @@
 
 import org.junit.Test;
 
-import com.sun.mail.dsn.DeliveryStatus;
 import com.sun.mail.util.MailStreamProvider;
 
-import jakarta.mail.MessagingException;
-import jakarta.mail.NoSuchProviderException;
-import jakarta.mail.Provider;
 import jakarta.mail.Session;
 import jakarta.mail.util.StreamProvider;
 
 public class ModulesTest {
 
     // With org.eclipse.angus:jakarta.mail and org.eclipse.angus:dsn
     @Test
-    public void test() throws NoSuchProviderException, MessagingException {
+    public void test() throws Exception {
         Session session = Session.getDefaultInstance(new Properties());
         StreamProvider provider = session.getStreamProvider();
         assertEquals(MailStreamProvider.class, provider.getClass());
-        assertEquals(Provider.class, session.getProvider("imap").getClass());
-        new DeliveryStatus();
+        Class.forName("com.sun.mail.imap.IMAPProvider");
+        Class.forName("com.sun.mail.dsn.DeliveryStatus");
     }
 }

demos/taglib/pom.xml

@@ -43,7 +43,12 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.angus</groupId>
-            <artifactId>angus-mail</artifactId>
+            <artifactId>jakarta.mail</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>gimap</artifactId>
         </dependency>
     </dependencies>
 </project>

demos/taglib/src/main/java/module-info.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+module demo {
+    requires jakarta.servlet;
+    requires jakarta.mail;
+    requires com.sun.mail.gimap;
+    requires jakarta.servlet.jsp;
+}

demos/taglib/src/test/java/demo/ModulesTest.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package demo;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Properties;
+
+import org.junit.Test;
+
+import com.sun.mail.util.MailStreamProvider;
+
+import jakarta.mail.MessagingException;
+import jakarta.mail.NoSuchProviderException;
+import jakarta.mail.Provider;
+import jakarta.mail.Session;
+import jakarta.mail.util.StreamProvider;
+
+public class ModulesTest {
+
+    // With org.eclipse.angus:jakarta.mail and org.eclipse.angus:gimap
+    @Test
+    public void test() throws Exception {
+        Session session = Session.getDefaultInstance(new Properties());
+        StreamProvider provider = session.getStreamProvider();
+        assertEquals(MailStreamProvider.class, provider.getClass());
+        Class.forName("com.sun.mail.imap.IMAPProvider");
+        Class.forName("com.sun.mail.gimap.GmailProvider");
+    }
+}

dsn/pom.xml

@@ -67,11 +67,11 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-		<dependency>
-		    <groupId>junit</groupId>
-		    <artifactId>junit</artifactId>
-		    <scope>test</scope>
-		</dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

providers/gimap/pom.xml

@@ -60,9 +60,16 @@
     </build>
 
     <dependencies>
+        <!-- Overwrite parent dependencies -->
         <dependency>
             <groupId>org.eclipse.angus</groupId>
             <artifactId>angus-mail</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

providers/gimap/src/main/java/module-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,8 +16,8 @@
 
 module com.sun.mail.gimap {
 
-    requires transitive jakarta.mail;
-    requires transitive com.sun.mail;
+    requires static com.sun.mail;
+    requires static jakarta.mail;
 
     exports com.sun.mail.gimap;
     exports com.sun.mail.gimap.protocol;

providers/gimap/src/test/java/example/app/ModulesTest.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package example.app;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Properties;
+
+import org.junit.Test;
+
+import com.sun.mail.gimap.GmailProvider;
+import com.sun.mail.util.MailStreamProvider;
+
+import jakarta.mail.NoSuchProviderException;
+import jakarta.mail.Provider;
+import jakarta.mail.Session;
+import jakarta.mail.util.StreamProvider;
+
+public class ModulesTest {
+
+    // With org.eclipse.angus:angus-mail and org.eclipse.angus:gimap
+    @Test
+    public void test() throws Exception {
+        Session session = Session.getDefaultInstance(new Properties());
+        StreamProvider provider = session.getStreamProvider();
+        assertEquals(MailStreamProvider.class, provider.getClass());
+        assertEquals(Provider.class, session.getProvider("imap").getClass());
+        Class.forName("com.sun.mail.gimap.GmailProvider");
+    }
+}

providers/gimap/src/test/java/module-info.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+module example.app {
+    requires com.sun.mail.gimap;
+    requires com.sun.mail;
+    requires junit;
+    exports example.app;
+}

providers/imap/pom.xml

@@ -33,4 +33,14 @@
     <packaging>jar</packaging>
     <name>Angus Mail imap provider</name>
 
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>angus-core</artifactId>
+        </dependency>
+    </dependencies>
 </project>

providers/pom.xml

@@ -33,17 +33,6 @@
     <packaging>pom</packaging>
     <name>Angus Mail providers</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>jakarta.mail</groupId>
-            <artifactId>jakarta.mail-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.angus</groupId>
-            <artifactId>angus-core</artifactId>
-        </dependency>
-    </dependencies>
-
     <modules>
         <module>angus-mail</module>
         <module>smtp</module>

providers/pop3/pom.xml

@@ -33,4 +33,14 @@
     <packaging>jar</packaging>
     <name>Angus Mail pop3 provider</name>
 
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>angus-core</artifactId>
+        </dependency>
+    </dependencies>
 </project>

providers/smtp/pom.xml

@@ -33,4 +33,14 @@
     <packaging>jar</packaging>
     <name>Angus Mail smtp provider</name>
 
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>angus-core</artifactId>
+        </dependency>
+    </dependencies>
 </project>