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
commit d79f5faee5e2773ce6a45c9055227e4fa3d70996
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Tue Nov 27 14:26:40 2018 +0100
Upgrading Spring and MariaDB
---
fit/core-reference/pom.xml | 6 +++++-
pom.xml | 5 +++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index f34ac1d..0987594 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -978,7 +978,7 @@ under the License.
<configuration>
<images>
<image>
- <name>mariadb:10.3.7</name>
+ <name>mariadb:${docker.mariadb.version}</name>
<run>
<env>
<MYSQL_ROOT_PASSWORD>password</MYSQL_ROOT_PASSWORD>
@@ -989,6 +989,10 @@ under the License.
<ports>
<port>3306:3306</port>
</ports>
+ <wait>
+ <log>MySQL init process done. Ready for start up.</log>
+ <time>30000</time>
+ </wait>
</run>
</image>
</images>
diff --git a/pom.xml b/pom.xml
index bdeac22..8443369 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,7 +393,7 @@ under the License.
<jackson.version>2.9.7</jackson.version>
- <spring.version>5.1.2.RELEASE</spring.version>
+ <spring.version>5.1.3.RELEASE</spring.version>
<spring-security.version>5.1.1.RELEASE</spring-security.version>
<openjpa.version>3.0.0</openjpa.version>
@@ -518,10 +518,11 @@ under the License.
<protractor.version>5.4.0</protractor.version>
<docker.postgresql.version>11.1</docker.postgresql.version>
+ <docker.mariadb.version>10.4</docker.mariadb.version>
<jdbc.postgresql.version>42.2.5</jdbc.postgresql.version>
<jdbc.mysql.version>5.1.47</jdbc.mysql.version>
- <jdbc.mariadb.version>2.2.6</jdbc.mariadb.version>
+ <jdbc.mariadb.version>2.3.0</jdbc.mariadb.version>
<jdbc.mssql.version>6.4.0.jre</jdbc.mssql.version>
<adminUser>admin</adminUser>
