You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/11/27 13:30:58 UTC
[syncope] branch 2_1_X updated (92a2b10 -> d7a382b)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from 92a2b10 Adding anchors
new 6b7c5df Upgrading Spring and MariaDB
new d7a382b Using a more standard angular-aria dependency
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
client/enduser/pom.xml | 4 ++--
.../enduser/src/main/resources/META-INF/resources/app/index.html | 2 +-
fit/core-reference/pom.xml | 6 +++++-
pom.xml | 9 +++++----
4 files changed, 13 insertions(+), 8 deletions(-)
[syncope] 02/02: Using a more standard angular-aria dependency
Posted by il...@apache.org.
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 d7a382b520bface4ed66151ff9d068852885885c
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Nov 27 14:27:17 2018 +0100
Using a more standard angular-aria dependency
---
client/enduser/pom.xml | 4 ++--
client/enduser/src/main/resources/META-INF/resources/app/index.html | 2 +-
pom.xml | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/client/enduser/pom.xml b/client/enduser/pom.xml
index b92935d..b7f1aa4 100644
--- a/client/enduser/pom.xml
+++ b/client/enduser/pom.xml
@@ -119,8 +119,8 @@ under the License.
<artifactId>kendo-ui-core</artifactId>
</dependency>
<dependency>
- <groupId>org.webjars.bowergithub.angular</groupId>
- <artifactId>bower-angular-aria</artifactId>
+ <groupId>org.webjars.bower</groupId>
+ <artifactId>angular-aria</artifactId>
</dependency>
<!--Bootstrap-->
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/index.html b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index 4a13796..8819fdd 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -105,7 +105,7 @@ under the License.
<script src="../webjars/angular-translate-loader-partial/${angular-translate-loader-partial.version}/angular-translate-loader-partial.js"></script>
<script src="../webjars/angular-translate-storage-cookie/${angular-translate.version}/angular-translate-storage-cookie.js"></script>
<script src="../webjars/bootstrap-fileinput/${bootstrap-fileinput.version}/js/fileinput.js"></script>
- <script src="../webjars/angular-aria/angular-aria.min.js" ></script>
+ <script src="../webjars/angular-aria/${angular.version}/angular-aria.min.js" ></script>
<!--main angular application-->
<script src="js/app.js"></script>
diff --git a/pom.xml b/pom.xml
index a860941..dbf4105 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1492,8 +1492,8 @@ under the License.
<version>${angular-translate.version}</version>
</dependency>
<dependency>
- <groupId>org.webjars.bowergithub.angular</groupId>
- <artifactId>bower-angular-aria</artifactId>
+ <groupId>org.webjars.bower</groupId>
+ <artifactId>angular-aria</artifactId>
<version>${angular.version}</version>
</dependency>
[syncope] 01/02: Upgrading Spring and MariaDB
Posted by il...@apache.org.
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ò <il...@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>