This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new eb223a0 [SYNCOPE-1586] Adding wait-for-it, upgrading JDBC drivers
eb223a0 is described below
commit eb223a0a7ae82eaa49ec1ad824c22d6d436010c7
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Tue Sep 8 11:16:41 2020 +0200
[SYNCOPE-1586] Adding wait-for-it, upgrading JDBC drivers
---
docker/core/src/main/resources/build.sh | 1 +
.../docker-compose/docker-compose-myjson.yml | 1 +
.../docker-compose/docker-compose-mysql.yml | 1 +
.../support/DomainProcessEngineConfiguration.java | 31 ----------------------
.../src/main/resources/workflowFlowableContext.xml | 2 +-
pom.xml | 8 +++---
6 files changed, 8 insertions(+), 36 deletions(-)
diff --git a/docker/core/src/main/resources/build.sh
b/docker/core/src/main/resources/build.sh
index 06df0b3..3876d52 100755
--- a/docker/core/src/main/resources/build.sh
+++ b/docker/core/src/main/resources/build.sh
@@ -45,6 +45,7 @@ echo 'deb http://repos.azulsystems.com/debian stable main' >
/etc/apt/sources.li
apt-get -q update \
&& apt-get -q install -y \
xtail \
+ wait-for-it \
zulu-8 \
tomcat8 \
libservlet3.1-java \
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 b5922b8..21e49a0 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", "--", "/sbin/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 e9e25c7..765debe 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", "--", "/sbin/startup.sh"]
image: apache/syncope:${SYNCOPE_VERSION}
ports:
- "18080:8080"
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/resources/workflowFlowableContext.xml
b/ext/flowable/flowable-bpmn/src/main/resources/workflowFlowableContext.xml
index 5b07186..bbc6eb2 100644
--- a/ext/flowable/flowable-bpmn/src/main/resources/workflowFlowableContext.xml
+++ b/ext/flowable/flowable-bpmn/src/main/resources/workflowFlowableContext.xml
@@ -42,7 +42,7 @@ under the License.
<bean id="idGenerator"
class="org.flowable.common.engine.impl.persistence.StrongUuidGenerator"/>
- <bean
class="org.apache.syncope.core.flowable.support.DomainProcessEngineConfiguration"
scope="prototype">
+ <bean class="org.flowable.spring.SpringProcessEngineConfiguration"
scope="prototype">
<property name="databaseSchemaUpdate" value="true"/>
<property name="jpaHandleTransaction" value="true"/>
diff --git a/pom.xml b/pom.xml
index 733320a..778c875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -541,10 +541,10 @@ 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.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>
<adminUser>admin</adminUser>
<anonymousUser>anonymous</anonymousUser>
