Merge remote-tracking branch 'origin/develop' into preparing-6.0.0-rc1

bbottema · bbottema · commit 7e586f739585 · 2019-12-18T10:56:52.000+01:00
diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt
@@ -185,18 +185,4 @@
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016 Benny Bottema
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+      identification within third-party archives.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -0,0 +1,9 @@
+  =========================================================================
+  ==  NOTICE file for use with the Apache License, Version 2.0           ==
+  =========================================================================
+
+  Simple Java Mail - Master Project
+  Copyright (C) 2009 Benny Bottema (benny@bennybottema.com)
+  http://www.simplejavamail.org
+
+  This product uses no commercial products.
diff --git a/modules/authenticated-socks-module/LICENSE-2.0.txt b/modules/authenticated-socks-module/LICENSE-2.0.txt
@@ -185,18 +185,4 @@
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016 Benny Bottema
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+      identification within third-party archives.
diff --git a/modules/authenticated-socks-module/NOTICE.txt b/modules/authenticated-socks-module/NOTICE.txt
@@ -3,7 +3,7 @@
   =========================================================================
   
   Simple Java Mail - DKIM module
-  Copyright 2009-2019 Benny Bottema
+  Copyright (C) 2009 Benny Bottema (benny@bennybottema.com)
   http://www.simplejavamail.org
   
   This product uses no commercial products.
diff --git a/modules/batch-module/LICENSE-2.0.txt b/modules/batch-module/LICENSE-2.0.txt
@@ -185,18 +185,4 @@
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016 Benny Bottema
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+      identification within third-party archives.
diff --git a/modules/batch-module/NOTICE.txt b/modules/batch-module/NOTICE.txt
@@ -3,7 +3,7 @@
   =========================================================================
   
   Simple Java Mail - Batch module
-  Copyright 2009-2019 Benny Bottema
+  Copyright (C) 2009 Benny Bottema (benny@bennybottema.com)
   http://www.simplejavamail.org
   
   This product uses no commercial products.
diff --git a/modules/cli-module/LICENSE-2.0.txt b/modules/cli-module/LICENSE-2.0.txt
@@ -185,18 +185,4 @@
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016 Benny Bottema
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+      identification within third-party archives.
diff --git a/modules/cli-module/NOTICE.txt b/modules/cli-module/NOTICE.txt
@@ -3,7 +3,7 @@
   =========================================================================
   
   Simple Java Mail - CLI module
-  Copyright 2009-2019 Benny Bottema
+  Copyright (C) 2009 Benny Bottema (benny@bennybottema.com)
   http://www.simplejavamail.org
   
   This product uses no commercial products.
diff --git a/modules/core-module/LICENSE-2.0.txt b/modules/core-module/LICENSE-2.0.txt
@@ -185,18 +185,4 @@
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016 Benny Bottema
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+      identification within third-party archives.
diff --git a/modules/core-module/NOTICE.txt b/modules/core-module/NOTICE.txt
@@ -3,7 +3,7 @@
   =========================================================================
   
   Simple Java Mail - Core module
-  Copyright 2009-2019 Benny Bottema
+  Copyright (C) 2009 Benny Bottema (benny@bennybottema.com)
   http://www.simplejavamail.org
   
   This product uses no commercial products.
diff --git a/modules/core-test-module/LICENSE-2.0.txt b/modules/core-test-module/LICENSE-2.0.txt
@@ -185,18 +185,4 @@
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016 Benny Bottema
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+      identification within third-party archives.
diff --git a/modules/core-test-module/NOTICE.txt b/modules/core-test-module/NOTICE.txt
@@ -0,0 +1,9 @@
+  =========================================================================
+  ==  NOTICE file for use with the Apache License, Version 2.0           ==
+  =========================================================================
+  
+  Simple Java Mail - Core Test Module
+  Copyright (C) 2009 Benny Bottema (benny@bennybottema.com)
+  http://www.simplejavamail.org
+  
+  This product uses no commercial products.
diff --git a/modules/dkim-module/LICENSE-2.0.txt b/modules/dkim-module/LICENSE-2.0.txt
@@ -185,18 +185,4 @@
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016 Benny Bottema
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+      identification within third-party archives.
diff --git a/modules/dkim-module/NOTICE.txt b/modules/dkim-module/NOTICE.txt
@@ -3,7 +3,7 @@
   =========================================================================
   
   Simple Java Mail - DKIM module
-  Copyright 2009-2019 Benny Bottema
+  Copyright (C) 2009 Benny Bottema (benny@bennybottema.com)
   http://www.simplejavamail.org
   
   This product uses no commercial products.
diff --git a/modules/outlook-module/LICENSE-2.0.txt b/modules/outlook-module/LICENSE-2.0.txt
@@ -185,18 +185,4 @@
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016 Benny Bottema
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+      identification within third-party archives.
diff --git a/modules/outlook-module/NOTICE.txt b/modules/outlook-module/NOTICE.txt
@@ -3,7 +3,7 @@
   =========================================================================
   
   Simple Java Mail - Outlook module
-  Copyright 2009-2019 Benny Bottema
+  Copyright (C) 2009 Benny Bottema (benny@bennybottema.com)
   http://www.simplejavamail.org
   
   This product uses no commercial products.
diff --git a/modules/simple-java-mail/LICENSE-2.0.txt b/modules/simple-java-mail/LICENSE-2.0.txt
@@ -185,18 +185,4 @@
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016 Benny Bottema
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+      identification within third-party archives.
diff --git a/modules/simple-java-mail/NOTICE.txt b/modules/simple-java-mail/NOTICE.txt
@@ -0,0 +1,9 @@
+  =========================================================================
+  ==  NOTICE file for use with the Apache License, Version 2.0           ==
+  =========================================================================
+  
+  Simple Java Mail - Implementation Module
+  Copyright (C) 2009 Benny Bottema (benny@bennybottema.com)
+  http://www.simplejavamail.org
+  
+  This product uses no commercial products.
diff --git a/modules/simple-java-mail/src/test/java/org/simplejavamail/api/email/NamedDataSource.java b/modules/simple-java-mail/src/test/java/org/simplejavamail/api/email/NamedDataSource.java
@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2009 Benny Bottema (benny@bennybottema.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.simplejavamail.api.email;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/modules/smime-module/LICENSE-2.0.txt b/modules/smime-module/LICENSE-2.0.txt
@@ -185,18 +185,4 @@
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016 Benny Bottema
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+      identification within third-party archives.
diff --git a/modules/smime-module/NOTICE.txt b/modules/smime-module/NOTICE.txt
@@ -3,7 +3,7 @@
   =========================================================================
   
   Simple Java Mail - S/MIME module
-  Copyright 2009-2019 Benny Bottema
+  Copyright (C) 2009 Benny Bottema (benny@bennybottema.com)
   http://www.simplejavamail.org
   
   This product uses no commercial products.
diff --git a/modules/spring-module/LICENSE-2.0.txt b/modules/spring-module/LICENSE-2.0.txt
@@ -185,18 +185,4 @@
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016 Benny Bottema
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+      identification within third-party archives.
diff --git a/modules/spring-module/NOTICE.txt b/modules/spring-module/NOTICE.txt
@@ -3,7 +3,7 @@
   =========================================================================
   
   Simple Java Mail - Spring module
-  Copyright 2009-2019 Benny Bottema
+  Copyright (C) 2009 Benny Bottema (benny@bennybottema.com)
   http://www.simplejavamail.org
   
   This product uses no commercial products.
