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:21 UTC
[syncope] branch master updated (05412fb -> a8cd5cb)
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 05412fb DBMS-related dependency upgrades
new 8a43984 Upgrading jQuery
new a8cd5cb Ensure Audit works with MariaDB
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:
.../resources/audit/{audit_mysql_innodb.sql => audit_mariadb.sql} | 2 +-
.../src/main/resources/mariadb/domains/Master.properties | 4 ++--
pom.xml | 2 +-
.../workingwithapachesyncope/systemadministration/dbms.adoc | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
copy core/persistence-jpa/src/main/resources/audit/{audit_mysql_innodb.sql => audit_mariadb.sql} (98%)
[syncope] 01/02: Upgrading jQuery
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 8a43984b2dd877d4fdcbd65b5429f96f78524a8f
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu May 7 16:15:50 2020 +0200
Upgrading jQuery
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cd854fe..9aa6df0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -458,7 +458,7 @@ under the License.
<swagger-ui.version>3.25.1</swagger-ui.version>
<guava.version>29.0-jre</guava.version>
- <jquery.version>3.5.0</jquery.version>
+ <jquery.version>3.5.1</jquery.version>
<jquery-ui.version>1.12.1</jquery-ui.version>
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>
[syncope] 02/02: 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 master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit a8cd5cb4c219d24eeb74f12c1f8939d90463cd9c
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 6602420..9cf2bec 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc
@@ -317,6 +317,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]