Merge branch 'main' into dbmSpringBoot3.1.7

dbmalkovsky · Jan 12, 2024 · 1ff26ad · 1ff26ad
2 parents e4c9143 + 8a438e6
commit 1ff26ad
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 45 deletions.
diff --git a/docs/docusaurus/docs/bpmn/ch14-REST.md b/docs/docusaurus/docs/bpmn/ch14-REST.md
@@ -7374,30 +7374,21 @@ The response body contains the binary content. By default, the content-type of t
 **Success response body:**
 
     {
-      "data": [
-        {
-          "id" : "5",
-          "businessKey" : "myKey",
-          "processDefinitionId" : "oneTaskProcess%3A1%3A4",
-          "processDefinitionUrl" : "http://localhost:8182/repository/process-definitions/oneTaskProcess%3A1%3A4",
-          "startTime" : "2013-04-17T10:17:43.902+0000",
-          "endTime" : "2013-04-18T14:06:32.715+0000",
-          "durationInMillis" : 86400056,
-          "startUserId" : "kermit",
-          "startActivityId" : "startEvent",
-          "endActivityId" : "endEvent",
-          "deleteReason" : null,
-          "superProcessInstanceId" : "3",
-          "url" : "http://localhost:8182/history/historic-process-instances/5",
-          "variables": null,
-          "tenantId":null
-        }
-      ],
-      "total": 1,
-      "start": 0,
-      "sort": "name",
-      "order": "asc",
-      "size": 1
+      "id" : "5",
+      "businessKey" : "myKey",
+      "processDefinitionId" : "oneTaskProcess%3A1%3A4",
+      "processDefinitionUrl" : "http://localhost:8182/repository/process-definitions/oneTaskProcess%3A1%3A4",
+      "startTime" : "2013-04-17T10:17:43.902+0000",
+      "endTime" : "2013-04-18T14:06:32.715+0000",
+      "durationInMillis" : 86400056,
+      "startUserId" : "kermit",
+      "startActivityId" : "startEvent",
+      "endActivityId" : "endEvent",
+      "deleteReason" : null,
+      "superProcessInstanceId" : "3",
+      "url" : "http://localhost:8182/history/historic-process-instances/5",
+      "variables": null,
+      "tenantId":null
     }
 
 ### List of historic process instances

diff --git a/modules/flowable-app-rest/src/main/java/org/flowable/rest/app/FlowableRestApplication.java b/modules/flowable-app-rest/src/main/java/org/flowable/rest/app/FlowableRestApplication.java
@@ -19,7 +19,6 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.security.config.core.GrantedAuthorityDefaults;
@@ -38,7 +37,7 @@
     DevelopmentConfiguration.class
 })
 @SpringBootApplication(proxyBeanMethods = false)
-public class FlowableRestApplication extends SpringBootServletInitializer {
+public class FlowableRestApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(FlowableRestApplication.class, args);

diff --git a/...mon/src/main/java/org/flowable/common/engine/impl/cfg/mail/FlowableMailClientCreator.java b/...mon/src/main/java/org/flowable/common/engine/impl/cfg/mail/FlowableMailClientCreator.java
@@ -62,16 +62,14 @@ protected static MailHostServerConfiguration createMailHostServerConfiguration(S
 
         if (mailServer.isMailServerUseSSL()) {
             serverConfiguration.setPort(mailServer.getMailServerSSLPort());
-            if (mailServer.isMailServerUseSSL()) {
-                serverConfiguration.setTransport(MailHostServerConfiguration.Transport.SMTPS_TLS);
-            } else {
-                serverConfiguration.setTransport(MailHostServerConfiguration.Transport.SMTPS);
-            }
+            serverConfiguration.setTransport(MailHostServerConfiguration.Transport.SMTPS);
         } else {
             serverConfiguration.setPort(mailServer.getMailServerPort());
             serverConfiguration.setTransport(MailHostServerConfiguration.Transport.SMTP);
         }
 
+        serverConfiguration.setStartTlsEnabled(mailServer.isMailServerUseTLS());
+
         serverConfiguration.setUser(mailServer.getMailServerUsername());
         serverConfiguration.setPassword(mailServer.getMailServerPassword());
         return serverConfiguration;

diff --git a/...ble-mail/src/main/java/org/flowable/mail/common/impl/BaseMailHostServerConfiguration.java b/...ble-mail/src/main/java/org/flowable/mail/common/impl/BaseMailHostServerConfiguration.java
@@ -21,6 +21,7 @@ public class BaseMailHostServerConfiguration implements MailHostServerConfigurat
 
     protected int port = 25;
     protected Transport transport = Transport.SMTP;
+    protected boolean startTlsEnabled;
 
     protected String user;
     protected String password;
@@ -52,6 +53,15 @@ public void setTransport(Transport transport) {
         this.transport = transport;
     }
 
+    @Override
+    public boolean isStartTlsEnabled() {
+        return startTlsEnabled;
+    }
+
+    public void setStartTlsEnabled(boolean startTlsEnabled) {
+        this.startTlsEnabled = startTlsEnabled;
+    }
+
     @Override
     public String user() {
         return user;

diff --git a/...lowable-mail/src/main/java/org/flowable/mail/common/impl/MailHostServerConfiguration.java b/...lowable-mail/src/main/java/org/flowable/mail/common/impl/MailHostServerConfiguration.java
@@ -27,10 +27,11 @@ public non-sealed interface MailHostServerConfiguration extends MailServerConfig
 
     String password();
 
+    boolean isStartTlsEnabled();
+
     enum Transport {
         SMTP,
         SMTPS,
-        SMTPS_TLS,
     }
 
 }
diff --git a/...c/main/java/org/flowable/mail/common/impl/jakarta/mail/JakartaMailFlowableMailClient.java b/...c/main/java/org/flowable/mail/common/impl/jakarta/mail/JakartaMailFlowableMailClient.java
@@ -379,7 +379,7 @@ protected Session createSession(MailHostServerConfiguration serverConfiguration)
         properties.setProperty(MAIL_HOST, host);
 
         MailHostServerConfiguration.Transport transport = serverConfiguration.transport();
-        properties.setProperty(MAIL_TRANSPORT_STARTTLS_ENABLE, transport == MailHostServerConfiguration.Transport.SMTPS_TLS ? "true" : "false");
+        properties.setProperty(MAIL_TRANSPORT_STARTTLS_ENABLE, Boolean.toString(serverConfiguration.isStartTlsEnabled()));
         properties.setProperty(MAIL_TRANSPORT_STARTTLS_REQUIRED, "false");
 
         properties.setProperty(MAIL_SMTP_SEND_PARTIAL, "false");
@@ -390,7 +390,7 @@ protected Session createSession(MailHostServerConfiguration serverConfiguration)
             properties.setProperty(MAIL_SMTP_AUTH, "true");
         }
 
-        if (transport == MailHostServerConfiguration.Transport.SMTPS || transport == MailHostServerConfiguration.Transport.SMTPS_TLS) {
+        if (transport == MailHostServerConfiguration.Transport.SMTPS) {
             properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_PORT, String.valueOf(serverConfiguration.port()));
             properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_CLASS, "javax.net.ssl.SSLSocketFactory");
             properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_FALLBACK, "false");

diff --git a/pom.xml b/pom.xml
@@ -27,13 +27,13 @@
 		<cxf.version>4.0.2</cxf.version>
 		<slf4j.version>2.0.9</slf4j.version>
 		<groovy.version>4.0.16</groovy.version>
-		<jib-maven-plugin.version>3.3.1</jib-maven-plugin.version>
+		<jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
 
 		<junit.version>4.13.2</junit.version>
 		<junit.jupiter.version>5.9.3</junit.jupiter.version>
 		<hikari.version>5.0.1</hikari.version>
 		<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
-		<maven.resources.plugin.version>3.3.0</maven.resources.plugin.version>
+		<maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
 		<mockito.version>5.5.0</mockito.version>
 		<!--
 		 	AssertJ 3.24.2 is pulling older byte buddy not compatible with Java 21.
@@ -542,7 +542,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.10.1</version>
+				<version>3.12.1</version>
 				<configuration>
 					<source>${jdk.version}</source>
 					<target>${jdk.version}</target>
@@ -553,7 +553,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M5</version>
+				<version>3.2.3</version>
 				<configuration>
 					<failIfNoTests>false</failIfNoTests>
 					<trimStackTrace>false</trimStackTrace>
@@ -568,7 +568,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>5.1.8</version>
+				<version>5.1.9</version>
 				<extensions>true</extensions>
 				<configuration>
 					<excludeDependencies>${flowable.osgi.exclude.dependencies}</excludeDependencies>
@@ -619,15 +619,15 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.4.1</version>
+					<version>3.6.3</version>
 					<configuration>
 						<source>${jdk.version}</source>
 					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-gpg-plugin</artifactId>
-					<version>3.0.1</version>
+					<version>3.1.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -637,12 +637,12 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>3.2.1</version>
+					<version>3.3.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-war-plugin</artifactId>
-					<version>3.3.2</version>
+					<version>3.4.0</version>
 					<configuration>
 						<failOnMissingWebXml>false</failOnMissingWebXml>
 						<archive>
@@ -681,7 +681,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>2.5.3</version>
+					<version>3.0.1</version>
 					<configuration>
 						<mavenExecutorId>forked-path</mavenExecutorId>
 						<useReleaseProfile>false</useReleaseProfile>
@@ -713,7 +713,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>exec-maven-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.1.1</version>
 				</plugin>
 				<plugin>
 					<groupId>com.google.cloud.tools</groupId>