syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [syncope] 01/02: Upgrading Spring and MariaDB
Date Tue, 27 Nov 2018 13:30:59 GMT
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

commit 6b7c5df70941e410cb825b9d4661268beff95e03
Author: Francesco Chicchiriccò <ilgrosso@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 b7ce361..85c992c 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 72165ad..a860941 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>


Mime
View raw message