diff --git a/docs/docusaurus/docs/bpmn/ch14-REST.md b/docs/docusaurus/docs/bpmn/ch14-REST.md index 819b34273fe..9009b365f6d 100644 --- 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 index 757d94dbc2f..d68fdfb57b2 100644 --- 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/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/cfg/mail/FlowableMailClientCreator.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/cfg/mail/FlowableMailClientCreator.java index 1ba1420a63b..928b073b50f 100644 --- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/cfg/mail/FlowableMailClientCreator.java +++ b/modules/flowable-engine-common/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/modules/flowable-mail/src/main/java/org/flowable/mail/common/impl/BaseMailHostServerConfiguration.java b/modules/flowable-mail/src/main/java/org/flowable/mail/common/impl/BaseMailHostServerConfiguration.java index ae110442109..4b46399908d 100644 --- a/modules/flowable-mail/src/main/java/org/flowable/mail/common/impl/BaseMailHostServerConfiguration.java +++ b/modules/flowable-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/modules/flowable-mail/src/main/java/org/flowable/mail/common/impl/MailHostServerConfiguration.java b/modules/flowable-mail/src/main/java/org/flowable/mail/common/impl/MailHostServerConfiguration.java index 0fe04056c5f..cb797d70030 100644 --- a/modules/flowable-mail/src/main/java/org/flowable/mail/common/impl/MailHostServerConfiguration.java +++ b/modules/flowable-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/modules/flowable-mail/src/main/java/org/flowable/mail/common/impl/jakarta/mail/JakartaMailFlowableMailClient.java b/modules/flowable-mail/src/main/java/org/flowable/mail/common/impl/jakarta/mail/JakartaMailFlowableMailClient.java index 4df67a2709d..dc19341f3b7 100644 --- a/modules/flowable-mail/src/main/java/org/flowable/mail/common/impl/jakarta/mail/JakartaMailFlowableMailClient.java +++ b/modules/flowable-mail/src/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 index 5ed6067a2bb..e867608119c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,14 +26,14 @@ 4.0.0 4.0.2 2.0.9 - 4.0.16 - 3.3.1 + 4.0.15 + 3.4.0 4.13.2 5.9.3 5.0.1 3.1.1 - 3.3.0 + 3.3.1 5.5.0