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/17 06:46:22 UTC
[syncope] 02/09: [SYNCOPE-1545] Skipping
maven-remote-resources-plugin by default, keeping it enabled in the
apache-release profile; for SNAPSHOT publishing we'll need to add
-Dskip.maven-remote-resources-plugin=false
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
commit 2351ca5d19fbb03c37999aa8424cd2a1b312d597
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Mar 3 09:45:18 2020 +0100
[SYNCOPE-1545] Skipping maven-remote-resources-plugin by default, keeping it enabled in the apache-release profile; for SNAPSHOT publishing we'll need to add -Dskip.maven-remote-resources-plugin=false
---
.travis.yml | 2 +-
client/am/console/pom.xml | 2 +-
client/idm/console/pom.xml | 2 +-
client/idrepo/common-ui/pom.xml | 2 +-
client/idrepo/console/pom.xml | 2 +-
client/idrepo/enduser/pom.xml | 2 +-
pom.xml | 374 ++++++---------------
wa/pom.xml | 19 +-
.../apache/syncope/wa/SyncopeWAApplication.java | 3 +-
wa/src/main/resources/application.properties | 3 +-
10 files changed, 106 insertions(+), 305 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a1fa1b3..e2597fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,7 @@ jobs:
######################################################
- stage: test
name: "Unit Tests"
- script: mvn -T 1C clean test -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Dskip.sass=true
+ script: mvn -T 1C clean test -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Dsass.skip=true
######################################################
- stage: fit
name: "Full Integration Tests: Apache Tomcat / H2 / JSON Content-Type"
diff --git a/client/am/console/pom.xml b/client/am/console/pom.xml
index bfddc84..f79ac21 100644
--- a/client/am/console/pom.xml
+++ b/client/am/console/pom.xml
@@ -85,7 +85,7 @@ under the License.
<destination>${project.build.outputDirectory}/META-INF/resources/css</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/client/idm/console/pom.xml b/client/idm/console/pom.xml
index adb6a4d..028d8c7 100644
--- a/client/idm/console/pom.xml
+++ b/client/idm/console/pom.xml
@@ -85,7 +85,7 @@ under the License.
<destination>${project.build.outputDirectory}/META-INF/resources/css</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/client/idrepo/common-ui/pom.xml b/client/idrepo/common-ui/pom.xml
index 3c49f74..d8be621 100644
--- a/client/idrepo/common-ui/pom.xml
+++ b/client/idrepo/common-ui/pom.xml
@@ -134,7 +134,7 @@ under the License.
<destination>${project.build.outputDirectory}/META-INF/resources/ui-commons/css/accessibility</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/client/idrepo/console/pom.xml b/client/idrepo/console/pom.xml
index 86e69aa..e8447fd 100644
--- a/client/idrepo/console/pom.xml
+++ b/client/idrepo/console/pom.xml
@@ -177,7 +177,7 @@ under the License.
<destination>${project.build.outputDirectory}/META-INF/resources/css</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/client/idrepo/enduser/pom.xml b/client/idrepo/enduser/pom.xml
index 4291275..c80e81e 100644
--- a/client/idrepo/enduser/pom.xml
+++ b/client/idrepo/enduser/pom.xml
@@ -150,7 +150,7 @@ under the License.
<destination>${project.build.outputDirectory}/org/apache/syncope/client/enduser/assets/css</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index 93a886e..11ed853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@ under the License.
<role>PMC member</role>
</roles>
<url>http://people.apache.org/~massi/</url>
- </developer>
+ </developer>
<developer>
<id>rene</id>
<name>René Mulder</name>
@@ -409,9 +409,9 @@ under the License.
<jackson.version>2.10.3</jackson.version>
<spring.version>5.2.4.RELEASE</spring.version>
- <spring-security.version>5.3.0.RELEASE</spring-security.version>
+ <spring-security.version>5.2.2.RELEASE</spring-security.version>
<spring-boot.version>2.2.5.RELEASE</spring-boot.version>
- <spring-cloud-gateway.version>2.2.2.RELEASE</spring-cloud-gateway.version>
+ <spring-cloud-gateway.version>2.2.1.RELEASE</spring-cloud-gateway.version>
<openjpa.version>3.1.1</openjpa.version>
<hikaricp.version>3.4.2</hikaricp.version>
@@ -423,7 +423,7 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <groovy.version>3.0.2</groovy.version>
+ <groovy.version>3.0.1</groovy.version>
<flowable.version>6.5.0</flowable.version>
@@ -432,21 +432,19 @@ under the License.
<slf4j.version>1.7.30</slf4j.version>
<opensaml.version>3.3.1</opensaml.version>
- <elasticsearch.version>7.6.1</elasticsearch.version>
+ <elasticsearch.version>7.6.0</elasticsearch.version>
<apacheds.version>2.0.0.AM25</apacheds.version>
<apachedirapi.version>2.0.0.AM2</apachedirapi.version>
<log4j.version>2.13.1</log4j.version>
<disruptor.version>3.4.2</disruptor.version>
-
+
<commons-jexl.version>3.1</commons-jexl.version>
<commons-lang.version>3.9</commons-lang.version>
<commons-text.version>1.8</commons-text.version>
<commons-logging.version>1.1.3</commons-logging.version>
- <tika.version>1.23</tika.version>
-
<joda.version>2.10.5</joda.version>
<cas.version>6.2.0-SNAPSHOT</cas.version>
@@ -454,9 +452,9 @@ under the License.
<h2.version>1.4.200</h2.version>
<junit.version>5.6.0</junit.version>
- <mockito.version>3.3.3</mockito.version>
+ <mockito.version>3.3.0</mockito.version>
- <swagger-core.version>2.1.1</swagger-core.version>
+ <swagger-core.version>2.1.1</swagger-core.version>
<swagger-ui.version>3.25.0</swagger-ui.version>
<guava.version>20.0</guava.version>
@@ -464,7 +462,7 @@ under the License.
<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>
-
+
<bootstrap.version>3.4.1</bootstrap.version>
<bootstrap-select.version>1.12.4</bootstrap-select.version>
<bootstrap-fileinput.version>4.4.8</bootstrap-fileinput.version>
@@ -477,12 +475,12 @@ under the License.
<googlediffmatchpath.version>895a9512bb</googlediffmatchpath.version>
<jsplumb.version>2.0.7</jsplumb.version>
<chartjs.version>1.0.2</chartjs.version>
-
+
<wicket.version>8.7.0</wicket.version>
<wicket-jqueryui.version>8.6.0</wicket-jqueryui.version>
<wicket-bootstrap.version>2.0.12</wicket-bootstrap.version>
<wicket-spring-boot.version>2.1.9</wicket-spring-boot.version>
-
+
<ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>
<netbeans.version>RELEASE112</netbeans.version>
@@ -549,7 +547,8 @@ under the License.
<argLine>-Xms512m -Xmx1024m -Xss256k</argLine>
<ianal.skip>false</ianal.skip>
- <skip.sass>false</skip.sass>
+ <sass.skip>false</sass.skip>
+ <remote-resources.skip>true</remote-resources.skip>
<sonar.language>java</sonar.language>
<sonar.java.source>${targetJdk}</sonar.java.source>
@@ -591,9 +590,9 @@ under the License.
<artifactId>geronimo-javamail_1.4_mail</artifactId>
<version>1.8.4</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
@@ -608,7 +607,7 @@ under the License.
<artifactId>taglibs-standard-impl</artifactId>
<version>1.2.5</version>
</dependency>
-
+
<!-- CXF -->
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -672,7 +671,7 @@ under the License.
</dependency>
<!-- /CXF -->
- <!-- Swagger -->
+ <!-- Swagger -->
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
@@ -683,7 +682,7 @@ under the License.
<artifactId>jackson-dataformat-yaml</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
@@ -694,13 +693,13 @@ under the License.
<artifactId>swagger-ui</artifactId>
<version>${swagger-ui.version}</version>
</dependency>
-
+
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
- <!-- /Swagger -->
+ <!-- /Swagger -->
<!-- Camel -->
<dependency>
@@ -918,7 +917,7 @@ under the License.
<artifactId>javax.el</artifactId>
<version>3.0.1-b09</version>
</dependency>
-
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@ -989,7 +988,7 @@ under the License.
<artifactId>joda-time</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>joda-time</groupId>
@@ -1016,6 +1015,22 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>${spring-boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
<version>${cxf.version}</version>
@@ -1157,13 +1172,13 @@ under the License.
<artifactId>spring-security-config</artifactId>
<version>${spring-security.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.5</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl3</artifactId>
@@ -1183,7 +1198,7 @@ under the License.
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${tika.version}</version>
+ <version>1.23</version>
</dependency>
<dependency>
@@ -1201,7 +1216,7 @@ under the License.
<artifactId>slf4j-logging</artifactId>
<version>${connid.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
@@ -1215,7 +1230,7 @@ under the License.
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-xml</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1258,7 +1273,7 @@ under the License.
<artifactId>groovy-groovysh</artifactId>
<version>${groovy.version}</version>
</dependency>
-
+
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -1313,13 +1328,13 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId>
<version>${jasypt.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
@@ -1339,7 +1354,7 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.cocoon.sax</groupId>
<artifactId>cocoon-sax</artifactId>
@@ -1354,25 +1369,18 @@ under the License.
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<exclusions>
<exclusion>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-i18n</artifactId>
- <version>1.10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-constants</artifactId>
- <version>1.10</version>
- </dependency>
-
<!-- Flowable -->
<dependency>
<groupId>org.flowable</groupId>
@@ -1430,181 +1438,6 @@ under the License.
</dependency>
<!-- /Flowable -->
- <!-- CAS -->
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-api-configuration-model</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-audit</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-validation-api</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-authentication</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-configuration</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-configuration-metadata-repository</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-cookie</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-logout</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-logging</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-services</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-services-api</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-tickets</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-util</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-validation</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-web</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-webflow</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-events-configuration</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-thymeleaf</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-actions</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-ldap</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-jdbc</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-reports</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-saml</artifactId>
- <version>${cas.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-person-directory</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-themes</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-oidc</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-validation</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-pm-webflow</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-pac4j-webflow</artifactId>
- <version>${cas.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-consent-webflow</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-webapp-config</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <!-- /CAS -->
-
<!-- Wicket -->
<dependency>
<groupId>org.apache.wicket</groupId>
@@ -1682,7 +1515,7 @@ under the License.
</exclusions>
</dependency>
<!-- /Wicket -->
-
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -1750,7 +1583,7 @@ under the License.
<artifactId>pdfbox</artifactId>
<version>2.0.18</version>
</dependency>
-
+
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
@@ -1795,7 +1628,7 @@ under the License.
<artifactId>bootstrap</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
@@ -2024,7 +1857,7 @@ under the License.
<scope>test</scope>
</dependency>
</dependencies>
-
+
</dependencyManagement>
<repositories>
@@ -2038,16 +1871,6 @@ under the License.
<enabled>true</enabled>
</snapshots>
</repository>
- <repository>
- <id>shibboleth-releases</id>
- <url>https://build.shibboleth.net/nexus/content/repositories/releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
</repositories>
<pluginRepositories>
@@ -2091,7 +1914,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.8.1</version>
<configuration>
<release>${targetJdk}</release>
<useIncrementalCompilation>false</useIncrementalCompilation>
@@ -2100,7 +1923,7 @@ under the License.
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -2112,11 +1935,11 @@ under the License.
</delimiters>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
@@ -2124,7 +1947,7 @@ under the License.
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
</plugin>
-
+
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
@@ -2134,7 +1957,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.2</version>
+ <version>3.1.1</version>
<configuration>
<outputDirectory>${bundles.directory}</outputDirectory>
<useBaseVersion>true</useBaseVersion>
@@ -2197,13 +2020,13 @@ under the License.
</artifactItems>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
@@ -2221,13 +2044,13 @@ under the License.
</webResources>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
@@ -2240,17 +2063,17 @@ under the License.
</dependency>
</dependencies>
</plugin>
-
+
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.7.11</version>
+ <version>1.7.10</version>
<configuration>
<configuration>
<type>standalone</type>
@@ -2264,7 +2087,7 @@ under the License.
</configuration>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -2293,7 +2116,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -2328,7 +2151,7 @@ under the License.
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
@@ -2340,13 +2163,13 @@ under the License.
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
</plugin>
-
+
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<version>${antlr4.version}</version>
</plugin>
-
+
<plugin>
<groupId>nl.geodienstencentrum.maven</groupId>
<artifactId>sass-maven-plugin</artifactId>
@@ -2386,7 +2209,7 @@ under the License.
<requireMavenVersion>
<version>3.5.0</version>
</requireMavenVersion>
- </rules>
+ </rules>
</configuration>
</execution>
</executions>
@@ -2476,11 +2299,11 @@ under the License.
<script><![CDATA[
import java.util.Date
import java.text.MessageFormat
- def year = MessageFormat.format("{0,date,yyyy}", new Date())
+ def year = MessageFormat.format("{0,date,yyyy}", new Date())
project.properties['year'] = year
project.properties['snapshotOrRelease'] = project.version.endsWith("SNAPSHOT") ? "snapshot" : "release"
project.properties['licenseUrl'] = project.parent.licenses[0].url
- project.properties['site.deploymentBaseDir'] =
+ project.properties['site.deploymentBaseDir'] =
project.properties['site.deploymentBaseUrl'] == null || !project.properties['site.deploymentBaseUrl'].startsWith('file:') ? project.properties['project.build.directory'] + "/generated-docs" : project.properties['site.deploymentBaseUrl'].substring(7)
if (!project.properties.containsKey('buildNumber'))
@@ -2491,7 +2314,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@ -2502,7 +2325,7 @@ under the License.
<exclude>**/nb-configuration.xml</exclude>
<exclude>**/META-INF/cxf/**</exclude>
<exclude>**/META-INF/services/**</exclude>
- <exclude>**/META-INF/MANIFEST.MF</exclude>
+ <exclude>**/META-INF/MANIFEST.MF</exclude>
<exclude>**/*.csv</exclude>
<exclude>**/archetype-resources/**</exclude>
<exclude>**/AdminLTE*/**</exclude>
@@ -2533,24 +2356,15 @@ under the License.
</execution>
</executions>
</plugin>
-
- <!-- Drop inherited behavior (i.e. don't put any more default LICENSE and NOTICE files in all artifacts) -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <phase>none</phase>
- </execution>
- <execution>
- <id>process-resource-bundles</id>
- <phase>none</phase>
- </execution>
- </executions>
+ <configuration>
+ <skip>${remote-resources.skip}</skip>
+ </configuration>
</plugin>
+
<!-- Put NOTICE and LICENSE files in all artifacts and javadocs -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -2597,7 +2411,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>ianal-maven-plugin</artifactId>
@@ -2685,7 +2499,7 @@ under the License.
<link>https://docs.spring.io/spring-security/site/docs/current/api/</link>
<link>http://www.flowable.org/docs/javadocs/</link>
<link>https://build.shibboleth.net/nexus/content/sites/site/java-opensaml/3.3.1/apidocs/</link>
- <link>https://artifacts.elastic.co/javadoc/org/elasticsearch/elasticsearch/7.6.1/index.html</link>
+ <link>https://artifacts.elastic.co/javadoc/org/elasticsearch/elasticsearch/7.6.0/index.html</link>
<link>http://docs.swagger.io/swagger-core/v2.1.1/apidocs/</link>
</links>
</configuration>
@@ -2710,6 +2524,10 @@ under the License.
<profile>
<id>apache-release</id>
+ <properties>
+ <remote-resources.skip>false</remote-resources.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -2754,7 +2572,7 @@ under the License.
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-pdf</artifactId>
- <version>1.5.3</version>
+ <version>1.5.2</version>
</dependency>
</dependencies>
<configuration>
@@ -2849,13 +2667,13 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.9.0</version>
+ <version>3.8.2</version>
<configuration>
<locales>en</locales>
<generateProjectInfo>false</generateProjectInfo>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -2896,7 +2714,7 @@ under the License.
<build>
<defaultGoal>clean install</defaultGoal>
-
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -2920,7 +2738,7 @@ under the License.
</modules>
</profile>
</profiles>
-
+
<modules>
<module>common</module>
<module>core</module>
diff --git a/wa/pom.xml b/wa/pom.xml
index 9c4d4de..3850226 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -29,7 +29,6 @@ under the License.
<name>Apache Syncope WA</name>
<description>Apache Syncope WA</description>
- <groupId>org.apache.syncope</groupId>
<artifactId>syncope-wa</artifactId>
<packaging>jar</packaging>
@@ -47,11 +46,7 @@ under the License.
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-api-configuration-model</artifactId>
- </dependency>
+
<dependency>
<groupId>org.apereo.cas</groupId>
<artifactId>cas-server-core</artifactId>
@@ -62,10 +57,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-validation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
<artifactId>cas-server-core-authentication</artifactId>
</dependency>
<dependency>
@@ -74,10 +65,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-configuration-metadata-repository</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
<artifactId>cas-server-core-cookie</artifactId>
</dependency>
<dependency>
@@ -94,10 +81,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-services-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
<artifactId>cas-server-core-tickets</artifactId>
</dependency>
<dependency>
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