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 eba192890075801e989f88508c3846a376708e78
Author: Misagh Moayyed <mm1...@gmail.com>
AuthorDate: Fri Mar 13 15:53:56 2020 +0330
[SYNCOPE-1545] add AUP support; off by default
---
.travis.yml | 9 +++++----
pom.xml | 11 +++++++----
wa/pom.xml | 9 ++++++---
.../org/apache/syncope/wa/config/SyncopeWAConfiguration.java | 11 ++++++-----
wa/src/main/resources/wa.properties | 6 +++++-
5 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 0ed30c8..a1fa1b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,9 +28,6 @@ git:
env:
global:
- MAVEN_OPTS="-Xmx4096M -Xss128M -XX:+CMSClassUnloadingEnabled
-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -noverify"
- - JAVAEE_CONTAINER=Tomcat
- - DBMS=H2
- - jaxrsContentType=application/json
install: true
notifications:
email:
@@ -52,10 +49,14 @@ 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
-Dsass.skip=true
+ script: mvn -T 1C clean test -Dinvoker.streamLogs=true
-Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true
-Dskip.sass=true
######################################################
- stage: fit
name: "Full Integration Tests: Apache Tomcat / H2 / JSON Content-Type"
+ env:
+ - JAVAEE_CONTAINER=Tomcat
+ - DBMS=H2
+ - jaxrsContentType=application/json
script: travis_wait 55 mvn -f fit/core-reference/pom.xml verify
-Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true
-Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
after_failure:
- cat fit/core-reference/target/log/*
diff --git a/pom.xml b/pom.xml
index d13c03e..bfc1ce0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -422,6 +422,7 @@ under the License.
<quartz.version>2.3.2</quartz.version>
<cocoon.version>3.0.0-alpha-3</cocoon.version>
+ <batik.version>1.12</batik.version>
<groovy.version>3.0.1</groovy.version>
@@ -444,8 +445,6 @@ under the License.
<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>
- <batik.version>1.10</batik.version>
- <tika.version>1.23</tika.version>
<joda.version>2.10.5</joda.version>
@@ -1200,7 +1199,7 @@ under the License.
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${tika.version}</version>
+ <version>1.23</version>
</dependency>
<dependency>
@@ -1371,7 +1370,7 @@ 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>
@@ -1393,6 +1392,10 @@ under the License.
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-extension</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/wa/pom.xml b/wa/pom.xml
index 85cff67..fe7a713 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -132,9 +132,8 @@ under the License.
<artifactId>cas-server-support-reports</artifactId>
</dependency>
<dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-syncope-authentication</artifactId>
- <scope>compile</scope>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-syncope-authentication</artifactId>
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
@@ -170,6 +169,10 @@ under the License.
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-aup-webflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
<artifactId>cas-server-support-rest-service-registry</artifactId>
</dependency>
<dependency>
diff --git
a/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java
b/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java
index 2107f51..701cb53 100644
--- a/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java
+++ b/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java
@@ -6,7 +6,8 @@
* 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
+ *
+ * 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
@@ -14,26 +15,26 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-
package org.apache.syncope.wa.config;
+import java.io.Serializable;
import org.apereo.cas.services.DefaultRegisteredServiceEntityMapper;
import org.apereo.cas.services.RegisteredServiceEntityMapper;
-
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStart;
import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStop;
+import org.apereo.cas.services.RegisteredService;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration(proxyBeanMethods = false)
public class SyncopeWAConfiguration {
+
@Bean
@ConditionalOnProperty(name = "cas.serviceRegistry.rest.url")
- public RegisteredServiceEntityMapper registeredServiceEntityMapper() {
+ public RegisteredServiceEntityMapper<RegisteredService, Serializable>
registeredServiceEntityMapper() {
return new DefaultRegisteredServiceEntityMapper();
}
diff --git a/wa/src/main/resources/wa.properties
b/wa/src/main/resources/wa.properties
index 14e07af..9a0d56e 100644
--- a/wa/src/main/resources/wa.properties
+++ b/wa/src/main/resources/wa.properties
@@ -26,4 +26,8 @@ cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
# Disable access to the login endpoint
# if no target application is specified.
-cas.sso.allow-missing-service-parameter=false
+cas.sso.allow-missing-service-parameter=true
+
+# Disable the acceptable usage policy
+# by default for now.
+cas.acceptableUsagePolicy.enabled=false
