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 d583317 Upgrading to Spring Boot 2.2
d583317 is described below
commit d58331778ed51a9436d844e90a15ba4ff98ad8f1
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Tue Oct 29 08:53:33 2019 +0100
Upgrading to Spring Boot 2.2
---
.../SyncopeBasicAuthenticationEntryPoint.java | 4 +---
.../core/spring/security/WebSecurityContext.java | 2 +-
pom.xml | 22 +++++++++++++++++-----
sra/pom.xml | 6 ------
.../org/apache/syncope/sra/SyncopeSRATest.java | 4 ++--
5 files changed, 21 insertions(+), 17 deletions(-)
diff --git
a/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeBasicAuthenticationEntryPoint.java
b/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeBasicAuthenticationEntryPoint.java
index 5689ff6..c521b88 100644
---
a/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeBasicAuthenticationEntryPoint.java
+++
b/core/spring/src/main/java/org/apache/syncope/core/spring/security/SyncopeBasicAuthenticationEntryPoint.java
@@ -19,7 +19,6 @@
package org.apache.syncope.core.spring.security;
import java.io.IOException;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -33,11 +32,10 @@ public class SyncopeBasicAuthenticationEntryPoint extends
BasicAuthenticationEnt
@Override
public void commence(final HttpServletRequest request, final
HttpServletResponse response,
- final AuthenticationException authException) throws IOException,
ServletException {
+ final AuthenticationException authException) throws IOException {
response.addHeader(RESTHeaders.ERROR_INFO, authException.getMessage());
super.commence(request, response, authException);
}
-
}
diff --git
a/core/spring/src/main/java/org/apache/syncope/core/spring/security/WebSecurityContext.java
b/core/spring/src/main/java/org/apache/syncope/core/spring/security/WebSecurityContext.java
index 752776c..0778d0e 100644
---
a/core/spring/src/main/java/org/apache/syncope/core/spring/security/WebSecurityContext.java
+++
b/core/spring/src/main/java/org/apache/syncope/core/spring/security/WebSecurityContext.java
@@ -59,7 +59,7 @@ public class WebSecurityContext extends
WebSecurityConfigurerAdapter {
}
@Override
- public void configure(final WebSecurity web) throws Exception {
+ public void configure(final WebSecurity web) {
web.httpFirewall(allowUrlEncodedSlashHttpFirewall());
}
diff --git a/pom.xml b/pom.xml
index 912c693..3a435c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -403,10 +403,10 @@ under the License.
<jackson.version>2.10.0</jackson.version>
- <spring.version>5.1.10.RELEASE</spring.version>
- <spring-security.version>5.1.6.RELEASE</spring-security.version>
- <spring-boot.version>2.1.9.RELEASE</spring-boot.version>
- <spring-cloud-gateway.version>2.1.3.RELEASE</spring-cloud-gateway.version>
+ <spring.version>5.2.0.RELEASE</spring.version>
+ <spring-security.version>5.2.0.RELEASE</spring-security.version>
+ <spring-boot.version>2.2.0.RELEASE</spring-boot.version>
+ <spring-cloud-gateway.version>2.2.0.RC1</spring-cloud-gateway.version>
<openjpa.version>3.1.0</openjpa.version>
<hikaricp.version>3.4.1</hikaricp.version>
@@ -1812,6 +1812,18 @@ under the License.
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
+ <!-- Temporary until Spring Gateway goes GA -->
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
<repository>
<id>shibboleth-releases</id>
<url>https://build.shibboleth.net/nexus/content/repositories/releases</url>
@@ -2273,7 +2285,7 @@ under the License.
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.13</version>
+ <version>0.13</version>
<configuration>
<excludes>
<exclude>**/nbactions.xml</exclude>
diff --git a/sra/pom.xml b/sra/pom.xml
index 5b0d595..adfe9e6 100644
--- a/sra/pom.xml
+++ b/sra/pom.xml
@@ -132,12 +132,6 @@ under the License.
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-netty-server</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </exclusion>
- </exclusions>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/sra/src/test/java/org/apache/syncope/sra/SyncopeSRATest.java
b/sra/src/test/java/org/apache/syncope/sra/SyncopeSRATest.java
index 3b16c64..7225d68 100644
--- a/sra/src/test/java/org/apache/syncope/sra/SyncopeSRATest.java
+++ b/sra/src/test/java/org/apache/syncope/sra/SyncopeSRATest.java
@@ -184,12 +184,12 @@ public class SyncopeSRATest {
routeRefresher.refresh();
webClient.post().uri("/custom").
-
body(BodyInserters.fromObject(MAPPER.createObjectNode().put("other", true))).
+
body(BodyInserters.fromValue(MAPPER.createObjectNode().put("other", true))).
exchange().
expectStatus().isNotFound();
webClient.post().uri("/custom").
-
body(BodyInserters.fromObject(MAPPER.createObjectNode().put("cool", true))).
+
body(BodyInserters.fromValue(MAPPER.createObjectNode().put("cool", true))).
exchange().
expectStatus().isOk().
expectHeader().valueEquals("Custom", "matched").