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:31:02 UTC
[syncope] branch master updated (a044615 -> 0527047)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from a044615 Adding anchors
new d79f5fa Upgrading Spring and MariaDB
new 0527047 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 master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 05270474f91d0e00174f652da831da07d27ce364
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 5af92a8..afedbc0 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 8443369..2accfd1 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 master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit d79f5faee5e2773ce6a45c9055227e4fa3d70996
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 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>