Solving module conflicts with bundled jar (#36)

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Co-authored-by: Lukas Jungmann <lukas.jungmann@oracle.com>

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,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.io.*;
 
 /**

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.io.*;
 
 /**

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 /**
  *
  * @author	Christopher Cotton

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.Properties;
 import jakarta.mail.*;
 

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

@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.io.*;
 import java.net.*;
 import jakarta.mail.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.*;
 import java.io.*;
 import jakarta.mail.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.*;
 import java.text.*;
 import jakarta.mail.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.io.*;
 import jakarta.mail.*;
 import jakarta.mail.internet.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.*;
 import java.text.*;
 import java.io.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.*;
 import java.util.concurrent.atomic.*;
 import java.io.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.*;
 import java.io.*;
 import jakarta.mail.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.io.*;
 import java.util.*;
 import jakarta.mail.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.*;
 import java.io.*;
 import jakarta.mail.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.io.*;
 import java.util.Properties;
 import java.util.Date;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.*;
 import java.io.*;
 import jakarta.mail.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.*;
 import java.io.*;
 import jakarta.mail.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.*;
 import java.io.*;
 import jakarta.mail.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import jakarta.mail.*;
 import jakarta.mail.internet.*;
 

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.*;
 
 import jakarta.mail.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.*;
 import java.io.*;
 import jakarta.mail.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.*;
 import java.io.*;
 import jakarta.mail.*;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.io.*;
 import java.util.Properties;
 

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.io.*;
 import java.net.InetAddress;
 import java.util.Properties;

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

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -8,6 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+package example.app.internal;
+
 import java.util.*;
 import jakarta.mail.*;
 import jakarta.mail.internet.*;