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 2020/05/07 14:32:26 UTC
[syncope] branch 2_1_X updated (01b5b92 -> 1abd48d)
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 01b5b92 More sensible checks of Realms with Delegated Admin
new 3d2c340 Upgrading Spring Security
new f10e82e DBMS-related dependency upgrades
new 1abd48d Ensure Audit works with MariaDB
The 3 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:
.../audit/{audit_mysql_innodb.sql => audit_mariadb.sql} | 2 +-
.../resources/docker-compose/docker-compose-mariadb.yml | 2 +-
.../resources/docker-compose/docker-compose-postgresql.yml | 2 +-
.../src/main/resources/mariadb/domains/Master.properties | 4 ++--
pom.xml | 14 +++++++-------
.../systemadministration/dbms.adoc | 1 +
6 files changed, 13 insertions(+), 12 deletions(-)
copy core/persistence-jpa/src/main/resources/audit/{audit_mysql_innodb.sql => audit_mariadb.sql} (98%)
[syncope] 01/03: Upgrading Spring Security
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 3d2c340077cd88fe3f873e9fd64a95ba79599992
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu May 7 16:24:33 2020 +0200
Upgrading Spring Security
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5d61052..87a7cea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -409,7 +409,7 @@ under the License.
<jackson.version>2.10.4</jackson.version>
<spring.version>5.1.15.RELEASE</spring.version>
- <spring-security.version>5.1.9.RELEASE</spring-security.version>
+ <spring-security.version>5.1.10.RELEASE</spring-security.version>
<openjpa.version>3.1.1</openjpa.version>
<hikaricp.version>3.4.3</hikaricp.version>
[syncope] 02/03: DBMS-related dependency upgrades
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 f10e82e328ebb8b0e7ebc7c62f6201c799553d32
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu May 7 16:27:36 2020 +0200
DBMS-related dependency upgrades
---
.../main/resources/docker-compose/docker-compose-mariadb.yml | 2 +-
.../resources/docker-compose/docker-compose-postgresql.yml | 2 +-
pom.xml | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
index e39ff8b..b09ca80 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
@@ -21,7 +21,7 @@ version: '3.3'
services:
db:
- image: mariadb:10.4
+ image: mariadb:10.5
restart: always
environment:
MYSQL_ROOT_PASSWORD: password
diff --git a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
index 7040bc7..56de700 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
@@ -21,7 +21,7 @@ version: '3.3'
services:
db:
- image: postgres:11.5
+ image: postgres:11
restart: always
environment:
POSTGRES_DB: syncope
diff --git a/pom.xml b/pom.xml
index 87a7cea..0d05553 100644
--- a/pom.xml
+++ b/pom.xml
@@ -539,14 +539,14 @@ under the License.
<nodejs.version>v8.11.4</nodejs.version>
<protractor.version>5.4.0</protractor.version>
- <docker.postgresql.version>11.7</docker.postgresql.version>
- <docker.mysql.version>8.0.19</docker.mysql.version>
+ <docker.postgresql.version>11</docker.postgresql.version>
+ <docker.mysql.version>8.0</docker.mysql.version>
<docker.mariadb.version>10.5</docker.mariadb.version>
- <jdbc.postgresql.version>42.2.10</jdbc.postgresql.version>
- <jdbc.mysql.version>8.0.19</jdbc.mysql.version>
- <jdbc.mariadb.version>2.5.4</jdbc.mariadb.version>
- <jdbc.mssql.version>8.2.0.jre</jdbc.mssql.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>
<adminUser>admin</adminUser>
<anonymousUser>anonymous</anonymousUser>
[syncope] 03/03: Ensure Audit works with 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 1abd48dd193f6a4a788e6ae6fdc58da52698b97d
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu May 7 16:31:17 2020 +0200
Ensure Audit works with MariaDB
---
.../src/main/resources/audit/audit_mariadb.sql | 24 ++++++++++++++++++++++
.../resources/mariadb/domains/Master.properties | 4 ++--
.../systemadministration/dbms.adoc | 1 +
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/core/persistence-jpa/src/main/resources/audit/audit_mariadb.sql b/core/persistence-jpa/src/main/resources/audit/audit_mariadb.sql
new file mode 100644
index 0000000..c6ee824
--- /dev/null
+++ b/core/persistence-jpa/src/main/resources/audit/audit_mariadb.sql
@@ -0,0 +1,24 @@
+-- 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.
+
+CREATE TABLE IF NOT EXISTS SYNCOPEAUDIT (
+ EVENT_DATE TIMESTAMP,
+ LOGGER_LEVEL VARCHAR(255) NOT NULL,
+ LOGGER VARCHAR(255) NOT NULL,
+ MESSAGE LONGTEXT NOT NULL,
+ THROWABLE TEXT
+);
diff --git a/fit/core-reference/src/main/resources/mariadb/domains/Master.properties b/fit/core-reference/src/main/resources/mariadb/domains/Master.properties
index 7e745ce..0cff2c4 100644
--- a/fit/core-reference/src/main/resources/mariadb/domains/Master.properties
+++ b/fit/core-reference/src/main/resources/mariadb/domains/Master.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
Master.driverClassName=org.mariadb.jdbc.Driver
-Master.url=jdbc:mariadb://localhost:3306/syncope?characterEncoding=UTF-8
+Master.url=jdbc:mariadb://${DB_CONTAINER_IP}:3306/syncope?characterEncoding=UTF-8
Master.schema=
Master.username=syncope
Master.password=syncope
@@ -25,4 +25,4 @@ Master.orm=META-INF/spring-orm.xml
Master.pool.maxActive=10
Master.pool.minIdle=2
-Master.audit.sql=audit.sql
+Master.audit.sql=audit_mariadb.sql
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc
index cfb20eb..1548632 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc
@@ -319,6 +319,7 @@ Master.username=syncope
Master.password=syncope
Master.databasePlatform=org.apache.openjpa.jdbc.sql.MariaDBDictionary(blobTypeName=LONGBLOB,dateFractionDigits=3)
Master.orm=META-INF/spring-orm.xml
+Master.audit.sql=audit_mariadb.sql
....
[CAUTION]