Solving module conflicts with bundled jar

demos/demo/pom.xml

@@ -38,7 +38,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <excludes>
-                        <exclude>internal/**</exclude>
+                        <exclude>example/app/internal/**</exclude>
                     </excludes>
                 </configuration>
             </plugin>

demos/demo/src/main/java/CRLFOutputStream.java → demos/demo/src/main/java/example/app/CRLFOutputStream.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/NewlineOutputStream.java → demos/demo/src/main/java/example/app/NewlineOutputStream.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/copier.java → demos/demo/src/main/java/example/app/copier.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1996, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/folderlist.java → demos/demo/src/main/java/example/app/folderlist.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1996, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/internal/TtyAuthenticator.java → demos/demo/src/main/java/example/app/internal/TtyAuthenticator.java

@@ -1,3 +1,4 @@
+package example.app.internal;
 /*
  * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *

demos/demo/src/main/java/internal/answer.java → demos/demo/src/main/java/example/app/internal/answer.java

@@ -1,3 +1,4 @@
+package example.app.internal;
 /*
  * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *

demos/demo/src/main/java/internal/foldersplit.java → demos/demo/src/main/java/example/app/internal/foldersplit.java

@@ -1,3 +1,4 @@
+package example.app.internal;
 /*
  * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *

demos/demo/src/main/java/internal/fpopulate.java → demos/demo/src/main/java/example/app/internal/fpopulate.java

@@ -1,3 +1,4 @@
+package example.app.internal;
 /*
  * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *

demos/demo/src/main/java/internal/msgsperweek.java → demos/demo/src/main/java/example/app/internal/msgsperweek.java

@@ -1,3 +1,4 @@
+package example.app.internal;
 /*
  * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *

demos/demo/src/main/java/internal/testidle.java → demos/demo/src/main/java/example/app/internal/testidle.java

@@ -1,3 +1,4 @@
+package example.app.internal;
 /*
  * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *

demos/demo/src/main/java/monitor.java → demos/demo/src/main/java/example/app/monitor.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1996, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/mover.java → demos/demo/src/main/java/example/app/mover.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1996, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/msgmultisendsample.java → demos/demo/src/main/java/example/app/msgmultisendsample.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1996, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/msgsend.java → demos/demo/src/main/java/example/app/msgsend.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/msgsendsample.java → demos/demo/src/main/java/example/app/msgsendsample.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1996, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/msgshow.java → demos/demo/src/main/java/example/app/msgshow.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/namespace.java → demos/demo/src/main/java/example/app/namespace.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/populate.java → demos/demo/src/main/java/example/app/populate.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/registry.java → demos/demo/src/main/java/example/app/registry.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/search.java → demos/demo/src/main/java/example/app/search.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/sendfile.java → demos/demo/src/main/java/example/app/sendfile.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1996, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/sendhtml.java → demos/demo/src/main/java/example/app/sendhtml.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/smtpsend.java → demos/demo/src/main/java/example/app/smtpsend.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/transport.java → demos/demo/src/main/java/example/app/transport.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

demos/demo/src/main/java/uidmsgshow.java → demos/demo/src/main/java/example/app/uidmsgshow.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at

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

@@ -0,0 +1,19 @@
+/*
+ * 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;
+}

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

@@ -0,0 +1,43 @@
+/*
+ * 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.util.MailStreamProvider;
+
+import jakarta.mail.NoSuchProviderException;
+import jakarta.mail.Session;
+import jakarta.mail.util.StreamProvider;
+
+public class ModulesTest {
+
+    // With org.eclipse.angus:angus-mail
+    @Test
+    public void test() throws NoSuchProviderException, ClassNotFoundException {
+        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.pop3.POP3Provider");
+        Class.forName("com.sun.mail.smtp.SMTPProvider");
+    }
+}

demos/logging/pom.xml

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

demos/logging/src/main/java/FileErrorManager.java → demos/logging/src/main/java/example/app/FileErrorManager.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 2009, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2009, 2019 Jason Mehrens. All Rights Reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -284,7 +285,7 @@ private OutputStream wrap(OutputStream out) {
         assert out != null;
         Class<?> k;
         try {
-            k = Class.forName("NewlineOutputStream");
+            k = Class.forName("example.app.NewlineOutputStream");
             if (OutputStream.class.isAssignableFrom(k)) {
                 Constructor<?> c = k.getConstructor(OutputStream.class);
                 return (OutputStream) c.newInstance(out);

demos/logging/src/main/java/MailHandlerDemo.java → demos/logging/src/main/java/example/app/MailHandlerDemo.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2009, 2018 Jason Mehrens. All Rights Reserved.
  *
  * This program and the accompanying materials are made available under the

demos/logging/src/main/java/SummaryFormatter.java → demos/logging/src/main/java/example/app/SummaryFormatter.java

@@ -1,5 +1,6 @@
+package example.app;
 /*
- * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2009, 2018 Jason Mehrens. All Rights Reserved.
  *
  * This program and the accompanying materials are made available under the

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

@@ -0,0 +1,21 @@
+/*
+ * 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 jakarta.mail;
+    requires java.management;
+    requires java.logging;
+}

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

@@ -0,0 +1,42 @@
+/*
+ * 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.util.MailStreamProvider;
+
+import jakarta.mail.Session;
+import jakarta.mail.util.StreamProvider;
+
+public class ModulesTest {
+
+    // With org.eclipse.angus:jakarta.mail
+    @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.pop3.POP3Provider");
+        Class.forName("com.sun.mail.smtp.SMTPProvider");
+    }
+}

demos/pom.xml

@@ -42,5 +42,13 @@
         <module>logging</module>
         <module>outlook</module>
     </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>
 

demos/servlet/pom.xml

@@ -71,7 +71,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>dsn</artifactId>
         </dependency>
     </dependencies>
 </project>