Merge branch 'refs/heads/develop' into feature/junit5

bbottema · bbottema · commit 5487085cdc5c · 2024-04-22T20:45:13.000+02:00
# Conflicts:
#	pom.xml
diff --git a/modules/authenticated-socks-module/pom.xml b/modules/authenticated-socks-module/pom.xml
@@ -9,7 +9,7 @@
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
         <version>8.8.3</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>authenticated-socks-module</artifactId>
diff --git a/modules/batch-module/pom.xml b/modules/batch-module/pom.xml
@@ -9,7 +9,7 @@
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
         <version>8.8.3</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>batch-module</artifactId>
diff --git a/modules/cli-module/pom.xml b/modules/cli-module/pom.xml
@@ -9,7 +9,7 @@
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
         <version>8.8.3</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>cli-module</artifactId>
diff --git a/modules/core-module/pom.xml b/modules/core-module/pom.xml
@@ -9,7 +9,7 @@
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
         <version>8.8.3</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>core-module</artifactId>
diff --git a/modules/core-test-module/pom.xml b/modules/core-test-module/pom.xml
@@ -9,7 +9,7 @@
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
         <version>8.8.3</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>core-test-module</artifactId>
diff --git a/modules/core-test-module/src/main/java/demo/DemoAppBase.java b/modules/core-test-module/src/main/java/demo/DemoAppBase.java
@@ -34,7 +34,6 @@ public class DemoAppBase {
 		}
 	}
 
-	static final MailerRegularBuilder<?> mailerSMTPBuilder = buildMailer("smtp.gmail.com", 25, YOUR_GMAIL_ADDRESS, YOUR_GMAIL_PASSWORD, TransportStrategy.SMTP);
 	static final MailerRegularBuilder<?> mailerTLSBuilder = buildMailer("smtp.gmail.com", 587, YOUR_GMAIL_ADDRESS, YOUR_GMAIL_PASSWORD, TransportStrategy.SMTP_TLS);
 	static final MailerRegularBuilder<?> mailerSSLBuilder = buildMailer("smtp.gmail.com", 465, YOUR_GMAIL_ADDRESS, YOUR_GMAIL_PASSWORD, TransportStrategy.SMTPS);
 
diff --git a/modules/dkim-module/pom.xml b/modules/dkim-module/pom.xml
@@ -9,7 +9,7 @@
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
         <version>8.8.3</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>dkim-module</artifactId>
diff --git a/modules/jacoco-aggregator-module/pom.xml b/modules/jacoco-aggregator-module/pom.xml
@@ -9,7 +9,7 @@
 		<artifactId>maven-master-project</artifactId>
 		<!--suppress MavenPropertyInParent -->
 		<version>8.8.3</version>
-		<relativePath>../../</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>jacoco-aggregator-module</artifactId>
diff --git a/modules/karaf-module/pom.xml b/modules/karaf-module/pom.xml
@@ -9,7 +9,7 @@
 		<artifactId>maven-master-project</artifactId>
 		<!--suppress MavenPropertyInParent -->
 		<version>8.8.3</version>
-		<relativePath>../../</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>karaf-module</artifactId>
diff --git a/modules/outlook-module/pom.xml b/modules/outlook-module/pom.xml
@@ -9,7 +9,7 @@
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
         <version>8.8.3</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>outlook-module</artifactId>
diff --git a/modules/simple-java-mail/pom.xml b/modules/simple-java-mail/pom.xml
@@ -9,7 +9,7 @@
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
         <version>8.8.3</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>simple-java-mail</artifactId>
diff --git a/modules/simple-java-mail/src/test/java/demo/FullEmailDemoApp.java b/modules/simple-java-mail/src/test/java/demo/FullEmailDemoApp.java
@@ -36,7 +36,6 @@ private static void testMixedRelatedAlternativeIncludingCalendarAndMessageParsin
 		MimeMessage mimeMessage = EmailConverter.emailToMimeMessage(emailNormal);
 		Email emailFromMimeMessage = EmailConverter.mimeMessageToEmail(mimeMessage);
 
-		mailerSMTPBuilder.buildMailer().sendMail(emailNormal);
 		mailerTLSBuilder.buildMailer().sendMail(emailNormal);
 		mailerSSLBuilder.buildMailer().sendMail(emailNormal);
 		mailerTLSBuilder.buildMailer().sendMail(emailFromMimeMessage); // should produce the exact same result as emailPopulatingBuilderNormal!
diff --git a/modules/smime-module/pom.xml b/modules/smime-module/pom.xml
@@ -9,7 +9,7 @@
         <artifactId>maven-master-project</artifactId>
         <!--suppress MavenPropertyInParent -->
         <version>8.8.3</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>smime-module</artifactId>
@@ -34,7 +34,7 @@
         <dependency>
 			<groupId>org.simplejavamail</groupId>
 			<artifactId>utils-mail-smime</artifactId>
-			<version>2.3.1</version>
+			<version>2.3.2</version>
 		</dependency>
     </dependencies>
 </project>
diff --git a/modules/spring-module/pom.xml b/modules/spring-module/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
         <version>8.8.3</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>spring-module</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -238,5 +238,26 @@
                 </pluginManagement>
             </build>
         </profile>
+
+        <profile>
+            <id>oss-scan-fail</id>
+            <activation>
+                <property>
+                    <name>oss-scan-warn</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.ossindex.maven</groupId>
+                        <artifactId>ossindex-maven-plugin</artifactId>
+                        <configuration>
+                            <fail>false</fail>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ public class DemoAppBase {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`- static final MailerRegularBuilder<?> mailerSMTPBuilder = buildMailer("smtp.gmail.com", 25, YOUR_GMAIL_ADDRESS, YOUR_GMAIL_PASSWORD, TransportStrategy.SMTP);`
`38`	`37`	`static final MailerRegularBuilder<?> mailerTLSBuilder = buildMailer("smtp.gmail.com", 587, YOUR_GMAIL_ADDRESS, YOUR_GMAIL_PASSWORD, TransportStrategy.SMTP_TLS);`
`39`	`38`	`static final MailerRegularBuilder<?> mailerSSLBuilder = buildMailer("smtp.gmail.com", 465, YOUR_GMAIL_ADDRESS, YOUR_GMAIL_PASSWORD, TransportStrategy.SMTPS);`
`40`	`39`