This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 0ed3b04 [SYNCOPE-1586] Adding wait-for-it, upgrading JDBC drivers
0ed3b04 is described below
commit 0ed3b04721651066eaff3b74fed365d7900427b4
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Tue Sep 8 11:16:41 2020 +0200
[SYNCOPE-1586] Adding wait-for-it, upgrading JDBC drivers
---
docker/console/src/main/resources/Dockerfile | 2 +-
docker/core/src/main/resources/Dockerfile | 4 ++-
docker/enduser/src/main/resources/Dockerfile | 4 +--
docker/sra/src/main/resources/Dockerfile | 2 +-
.../docker-compose/docker-compose-myjson.yml | 1 +
.../docker-compose/docker-compose-mysql.yml | 1 +
docker/wa/src/main/resources/Dockerfile | 4 +--
.../core/flowable/WorkflowFlowableContext.java | 6 ++---
.../support/DomainProcessEngineConfiguration.java | 31 ----------------------
.../support/DomainProcessEngineFactoryBean.java | 2 +-
pom.xml | 10 +++----
11 files changed, 20 insertions(+), 47 deletions(-)
diff --git a/docker/console/src/main/resources/Dockerfile
b/docker/console/src/main/resources/Dockerfile
index 7a7fb23..2cb5219 100644
--- a/docker/console/src/main/resources/Dockerfile
+++ b/docker/console/src/main/resources/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM adoptopenjdk/openjdk11-openj9:alpine-slim
+FROM adoptopenjdk/openjdk11-openj9:debian-slim
MAINTAINER [email protected]
RUN set -x
diff --git a/docker/core/src/main/resources/Dockerfile
b/docker/core/src/main/resources/Dockerfile
index 0a26616..a1eeda8 100644
--- a/docker/core/src/main/resources/Dockerfile
+++ b/docker/core/src/main/resources/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM adoptopenjdk/openjdk11-openj9:alpine-slim
+FROM adoptopenjdk/openjdk11-openj9:debian-slim
MAINTAINER [email protected]
RUN set -x
@@ -44,4 +44,6 @@ COPY startup.sh /opt/syncope/bin
RUN chmod 755 /opt/syncope/bin/startup.sh
CMD ["/opt/syncope/bin/startup.sh"]
+RUN apt-get update && apt-get -y install wait-for-it
+
EXPOSE 8080
diff --git a/docker/enduser/src/main/resources/Dockerfile
b/docker/enduser/src/main/resources/Dockerfile
index be2ccea..d0c0792 100644
--- a/docker/enduser/src/main/resources/Dockerfile
+++ b/docker/enduser/src/main/resources/Dockerfile
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-# Cannot FROM adoptopenjdk/openjdk11-openj9:alpine-slim because it's headless,
and fonts are required for captcha
-FROM openjdk:11
+# Cannot FROM adoptopenjdk/openjdk11-openj9:debian-slim because it's headless,
and fonts are required for captcha
+FROM adoptopenjdk/openjdk11:debian-slim
MAINTAINER [email protected]
RUN set -x
diff --git a/docker/sra/src/main/resources/Dockerfile
b/docker/sra/src/main/resources/Dockerfile
index c7398f3..e9aab29 100644
--- a/docker/sra/src/main/resources/Dockerfile
+++ b/docker/sra/src/main/resources/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM adoptopenjdk/openjdk11-openj9:alpine-slim
+FROM adoptopenjdk/openjdk11-openj9:debian-slim
MAINTAINER [email protected]
RUN set -x
diff --git a/docker/src/main/resources/docker-compose/docker-compose-myjson.yml
b/docker/src/main/resources/docker-compose/docker-compose-myjson.yml
index 91fa9c5..91df141 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-myjson.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-myjson.yml
@@ -32,6 +32,7 @@ services:
syncope:
depends_on:
- db
+ command: ["wait-for-it", "db:3306", "-t", "60", "--",
"/opt/syncope/bin/startup.sh"]
image: apache/syncope:${SYNCOPE_VERSION}
ports:
- "18080:8080"
diff --git a/docker/src/main/resources/docker-compose/docker-compose-mysql.yml
b/docker/src/main/resources/docker-compose/docker-compose-mysql.yml
index ccead01..56dc133 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-mysql.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-mysql.yml
@@ -32,6 +32,7 @@ services:
syncope:
depends_on:
- db
+ command: ["wait-for-it", "db:3306", "-t", "60", "--",
"/opt/syncope/bin/startup.sh"]
image: apache/syncope:${SYNCOPE_VERSION}
ports:
- "18080:8080"
diff --git a/docker/wa/src/main/resources/Dockerfile
b/docker/wa/src/main/resources/Dockerfile
index 7edf8dc..584fe11 100644
--- a/docker/wa/src/main/resources/Dockerfile
+++ b/docker/wa/src/main/resources/Dockerfile
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-# Cannot FROM adoptopenjdk/openjdk11-openj9:alpine-slim because it's headless,
and fonts might be required
-FROM openjdk:11
+# Cannot FROM adoptopenjdk/openjdk11-openj9:debian-slim because it's headless,
and fonts might be required
+FROM adoptopenjdk/openjdk11:debian-slim
MAINTAINER [email protected]
RUN set -x
diff --git
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/WorkflowFlowableContext.java
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/WorkflowFlowableContext.java
index 64003bc..ac0ef5c 100644
---
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/WorkflowFlowableContext.java
+++
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/WorkflowFlowableContext.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.syncope.core.flowable.impl.FlowableBpmnProcessManager;
import org.apache.syncope.core.flowable.impl.FlowableUserRequestHandler;
import org.apache.syncope.core.flowable.impl.FlowableWorkflowUtils;
-import
org.apache.syncope.core.flowable.support.DomainProcessEngineConfiguration;
import
org.apache.syncope.core.flowable.support.ShellServiceTaskDisablingBpmnParseHandler;
import org.apache.syncope.core.flowable.support.SyncopeEntitiesVariableType;
import org.apache.syncope.core.flowable.support.SyncopeFormHandlerHelper;
@@ -36,6 +35,7 @@ import org.flowable.common.engine.impl.history.HistoryLevel;
import org.flowable.common.engine.impl.persistence.StrongUuidGenerator;
import org.flowable.idm.spring.SpringIdmEngineConfiguration;
import org.flowable.idm.spring.configurator.SpringIdmEngineConfigurator;
+import org.flowable.spring.SpringProcessEngineConfiguration;
import org.springframework.beans.factory.annotation.Value;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
@@ -116,8 +116,8 @@ public class WorkflowFlowableContext {
@ConditionalOnMissingBean
@Bean
@Scope("prototype")
- public DomainProcessEngineConfiguration processEngineConfiguration() {
- DomainProcessEngineConfiguration conf = new
DomainProcessEngineConfiguration();
+ public SpringProcessEngineConfiguration processEngineConfiguration() {
+ SpringProcessEngineConfiguration conf = new
SpringProcessEngineConfiguration();
conf.setDatabaseSchemaUpdate(AbstractEngineConfiguration.DB_SCHEMA_UPDATE_TRUE);
conf.setJpaHandleTransaction(true);
conf.setJpaCloseEntityManager(false);
diff --git
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineConfiguration.java
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineConfiguration.java
deleted file mode 100644
index 6f18e84..0000000
---
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.syncope.core.flowable.support;
-
-import org.flowable.spring.SpringProcessEngineConfiguration;
-
-public class DomainProcessEngineConfiguration extends
SpringProcessEngineConfiguration {
-
- public DomainProcessEngineConfiguration() {
- super();
-
- // workaround for Flowable not supporting (yet?) MariaDB
- databaseTypeMappings.setProperty("MariaDB", DATABASE_TYPE_MYSQL);
- }
-}
diff --git
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java
index ac670dc..1c7e01c 100644
---
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java
+++
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java
@@ -72,7 +72,7 @@ public class DomainProcessEngineFactoryBean
domain + "TransactionManager",
PlatformTransactionManager.class);
Object entityManagerFactory = ctx.getBean(domain +
"EntityManagerFactory");
- DomainProcessEngineConfiguration conf =
ctx.getBean(DomainProcessEngineConfiguration.class);
+ SpringProcessEngineConfiguration conf =
ctx.getBean(SpringProcessEngineConfiguration.class);
conf.setDataSource(datasource);
conf.setTransactionManager(transactionManager);
conf.setTransactionsExternallyManaged(true);
diff --git a/pom.xml b/pom.xml
index 01a50f2..047c5b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -517,11 +517,11 @@ under the License.
<docker.mysql.version>8.0</docker.mysql.version>
<docker.mariadb.version>10.5</docker.mariadb.version>
- <jdbc.postgresql.version>42.2.12</jdbc.postgresql.version>
- <jdbc.mysql.version>8.0.20</jdbc.mysql.version>
- <jdbc.mariadb.version>2.6.0</jdbc.mariadb.version>
- <jdbc.mssql.version>8.2.2.jre</jdbc.mssql.version>
- <jdbc.oracle.version>19.6.0.0</jdbc.oracle.version>
+ <jdbc.postgresql.version>42.2.16</jdbc.postgresql.version>
+ <jdbc.mysql.version>8.0.21</jdbc.mysql.version>
+ <jdbc.mariadb.version>2.6.2</jdbc.mariadb.version>
+ <jdbc.mssql.version>8.4.1.jre</jdbc.mssql.version>
+ <jdbc.oracle.version>19.7.0.0</jdbc.oracle.version>
<conf.directory>${project.build.directory}/test-classes</conf.directory>
<bundles.directory>${project.build.directory}/bundles</bundles.directory>
