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
The following commit(s) were added to refs/heads/master by this push:
new 5f55e43c78 Upgrading Elasticsearch, Zookeeper, Tomcat, AspectJ
5f55e43c78 is described below
commit 5f55e43c78a0e38046d9a04db94dc00bcf8f4293
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Mon Apr 4 10:50:55 2022 +0200
Upgrading Elasticsearch, Zookeeper, Tomcat, AspectJ
---
.../core/persistence/jpa/StartupDomainLoader.java | 28 ++++++++++------------
.../provisioning/java/job/SchedulerDBInit.java | 3 +--
pom.xml | 16 +++++++++----
.../reference-guide/usage/customization.adoc | 12 +++++++++-
4 files changed, 37 insertions(+), 22 deletions(-)
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/StartupDomainLoader.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/StartupDomainLoader.java
index 0dcdeb71c5..621a495dec 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/StartupDomainLoader.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/StartupDomainLoader.java
@@ -81,21 +81,19 @@ public class StartupDomainLoader implements
SyncopeCoreLoader {
LOG.info("Domain {} successfully inited",
domainProps.getKey());
} else {
- Domain.Builder builder = new
Domain.Builder(domainProps.getKey());
-
- builder.adminPassword(domainProps.getAdminPassword());
-
builder.adminCipherAlgorithm(domainProps.getAdminCipherAlgorithm());
-
- builder.jdbcDriver(domainProps.getJdbcDriver());
- builder.jdbcURL(domainProps.getJdbcURL());
- builder.dbSchema(domainProps.getDbSchema());
- builder.dbUsername(domainProps.getDbUsername());
- builder.dbPassword(domainProps.getDbPassword());
- builder.databasePlatform(domainProps.getDatabasePlatform());
- builder.orm(domainProps.getOrm());
- builder.poolMaxActive(domainProps.getPoolMaxActive());
- builder.poolMinIdle(domainProps.getPoolMinIdle());
- builder.auditSql(domainProps.getAuditSql());
+ Domain.Builder builder = new
Domain.Builder(domainProps.getKey()).
+ adminPassword(domainProps.getAdminPassword()).
+
adminCipherAlgorithm(domainProps.getAdminCipherAlgorithm()).
+ jdbcDriver(domainProps.getJdbcDriver()).
+ jdbcURL(domainProps.getJdbcURL()).
+ dbSchema(domainProps.getDbSchema()).
+ dbUsername(domainProps.getDbUsername()).
+ dbPassword(domainProps.getDbPassword()).
+ databasePlatform(domainProps.getDatabasePlatform()).
+ orm(domainProps.getOrm()).
+ poolMaxActive(domainProps.getPoolMaxActive()).
+ poolMinIdle(domainProps.getPoolMinIdle()).
+ auditSql(domainProps.getAuditSql());
try {
builder.content(IOUtils.toString(
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/SchedulerDBInit.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/SchedulerDBInit.java
index 00bd68b84c..f94cce8597 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/SchedulerDBInit.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/SchedulerDBInit.java
@@ -57,7 +57,7 @@ public class SchedulerDBInit implements InitializingBean {
JdbcTemplate jdbcTemplate = new JdbcTemplate(this.dataSource);
boolean existingData;
try {
- existingData = jdbcTemplate.queryForObject("SELECT COUNT(0) FROM
QRTZ_SCHEDULER_STATE", Integer.class) > 0;
+ existingData = jdbcTemplate.queryForObject("SELECT COUNT(0) FROM
QRTZ_SCHEDULER_STATE", Integer.class) >= 0;
} catch (BadSqlGrammarException e) {
LOG.debug("Could not access to table QRTZ_SCHEDULER_STATE", e);
existingData = false;
@@ -71,5 +71,4 @@ public class SchedulerDBInit implements InitializingBean {
DatabasePopulatorUtils.execute(databasePopulator, this.dataSource);
}
}
-
}
diff --git a/pom.xml b/pom.xml
index a91f8c3406..6ab6e27888 100644
--- a/pom.xml
+++ b/pom.xml
@@ -428,7 +428,7 @@ under the License.
<slf4j.version>1.7.36</slf4j.version>
- <elasticsearch.version>8.1.1</elasticsearch.version>
+ <elasticsearch.version>8.1.2</elasticsearch.version>
<apacheds.version>2.0.0.AM26</apacheds.version>
<apachedirapi.version>2.0.0</apachedirapi.version>
@@ -474,7 +474,7 @@ under the License.
<antlr4.version>4.9.3</antlr4.version>
<curator.version>5.2.0</curator.version>
- <zookeeper.version>3.7.0</zookeeper.version>
+ <zookeeper.version>3.8.0</zookeeper.version>
<testds.port>1389</testds.port>
<testdb.webport>9082</testdb.webport>
@@ -499,7 +499,7 @@ under the License.
<cargo.log>${log.directory}/cargo.log</cargo.log>
<cargo.output>${log.directory}/cargo-output.log</cargo.output>
- <tomcat.version>9.0.60</tomcat.version>
+ <tomcat.version>9.0.62</tomcat.version>
<wildfly.version>25.0.1.Final</wildfly.version>
<payara.version>5.2022.1</payara.version>
<javax.faces.version>2.3.14</javax.faces.version>
@@ -995,7 +995,7 @@ under the License.
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.9.9</version>
+ <version>1.9.9.1</version>
</dependency>
<dependency>
@@ -1837,6 +1837,14 @@ under the License.
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/src/main/asciidoc/reference-guide/usage/customization.adoc
b/src/main/asciidoc/reference-guide/usage/customization.adoc
index 08b232ad49..4e54b98ac5 100644
--- a/src/main/asciidoc/reference-guide/usage/customization.adoc
+++ b/src/main/asciidoc/reference-guide/usage/customization.adoc
@@ -212,7 +212,7 @@ Apache Syncope needs three base directories to be defined:
* bundles - where the <<connector-bundles,connector bundles>> are stored;
* log - where all the system logs are written;
-* conf (optional) - where configuration files are located, if overriding the
default values is needed.
+* conf - where configuration files are located.
[WARNING]
The `bundles` directory should only contain connector bundle JAR files. +
@@ -227,6 +227,16 @@ $ mkdir /opt/syncope/log
$ mkdir /opt/syncope/conf
....
+[TIP]
+====
+The `conf` directory must be configured for deployment, following Spring Boot's
+https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.external-config[Externalized
Configuration^]
+settings; with above reference:
+
+* <<standalone>>: `--spring.config.location=/opt/syncope/conf/`
+* <<javaee-container>>: `-Dspring.config.location=/opt/syncope/conf/`
+====
+
[[customization-core]]
==== Core
