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/03/03 10:57:40 UTC
[syncope] branch SYNCOPE-1545 updated: Restoring bootstrap
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-1545 by this push:
new 85c63a1 Restoring bootstrap
85c63a1 is described below
commit 85c63a127afe4a1e8a0026fdfeb8c90773f6a558
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Mar 3 11:56:26 2020 +0100
Restoring bootstrap
---
wa/pom.xml | 1 +
wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java | 3 +--
wa/src/main/resources/application.properties | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/wa/pom.xml b/wa/pom.xml
index c726dcb..3850226 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -35,6 +35,7 @@ under the License.
<properties>
<guava.version>28.2-jre</guava.version>
<opensaml.version>3.4.5</opensaml.version>
+ <bootstrap.version>4.4.1</bootstrap.version>
<slf4j.version>2.0.0-alpha1</slf4j.version>
<rootpom.basedir>${basedir}/..</rootpom.basedir>
diff --git a/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java b/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
index 40b87ae..970d890 100644
--- a/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
+++ b/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
@@ -71,8 +71,7 @@ public class SyncopeWAApplication extends SpringBootServletInitializer {
private static final Logger LOG = LoggerFactory.getLogger(SyncopeWAApplication.class);
public static void main(final String[] args) {
- new SpringApplicationBuilder(SyncopeWAApplication.class).
- run(args);
+ new SpringApplicationBuilder(SyncopeWAApplication.class).run(args);
}
/**
diff --git a/wa/src/main/resources/application.properties b/wa/src/main/resources/application.properties
index 8624c66..487d11b 100644
--- a/wa/src/main/resources/application.properties
+++ b/wa/src/main/resources/application.properties
@@ -34,6 +34,7 @@ spring.main.lazy-initialization=false
service.discovery.address=http://localhost:8080/syncope-wa/
+# Conf directories
conf.directory=${conf.directory}
-
+cas.standalone.configurationDirectory=${conf.directory}
cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore