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 ca11d0c54c Upgrading Spring Boot and WicketStuff
ca11d0c54c is described below
commit ca11d0c54c4449a2e62bd30ec83a549064ffb5b1
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Fri Oct 20 16:15:35 2023 +0200
Upgrading Spring Boot and WicketStuff
---
.../apache/syncope/client/enduser/SyncopeWebApplication.java | 11 ++++++++---
pom.xml | 4 ++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeWebApplication.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeWebApplication.java
index 63d3c0272c..c24f260184 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeWebApplication.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeWebApplication.java
@@ -48,6 +48,7 @@ import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.authorization.IAuthorizationStrategy;
import
org.apache.wicket.authorization.IAuthorizationStrategy.AllowAllAuthorizationStrategy;
+import
org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.ResourceIsolationRequestCycleListener;
import org.apache.wicket.protocol.http.WebApplication;
@@ -145,9 +146,8 @@ public class SyncopeWebApplication extends
WicketBootSecuredWebApplication {
@Override
public void onEndRequest(final RequestCycle cycle) {
- if (cycle.getResponse() instanceof WebResponse) {
- props.getSecurityHeaders().
- forEach((name, value) -> ((WebResponse)
cycle.getResponse()).setHeader(name, value));
+ if (cycle.getResponse() instanceof WebResponse webResponse) {
+ props.getSecurityHeaders().forEach((name, value) ->
webResponse.setHeader(name, value));
}
}
});
@@ -279,6 +279,11 @@ public class SyncopeWebApplication extends
WicketBootSecuredWebApplication {
return props.getPage().getOrDefault(name, defaultValue);
}
+ @Override
+ protected Class<? extends AbstractAuthenticatedWebSession>
getWebSessionClass() {
+ return SyncopeEnduserSession.class;
+ }
+
@Override
protected Class<? extends WebPage> getSignInPageClass() {
return Login.class;
diff --git a/pom.xml b/pom.xml
index 53a04e02f4..725e655ec7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -413,7 +413,7 @@ under the License.
<bouncycastle.version>1.76</bouncycastle.version>
<nimbus-jose-jwt.version>9.37</nimbus-jose-jwt.version>
- <spring-boot.version>3.2.0-M3</spring-boot.version>
+ <spring-boot.version>3.2.0-RC1</spring-boot.version>
<spring-cloud-gateway.version>4.1.0-M2</spring-cloud-gateway.version>
<openjpa.version>4.0.0-SNAPSHOT</openjpa.version>
@@ -454,7 +454,7 @@ under the License.
<chartjs.version>4.1.2</chartjs.version>
<wicket.version>10.0.0-M2</wicket.version>
- <wicketstuff.version>10.0.0-M1</wicketstuff.version>
+ <wicketstuff.version>10.0.0-M2</wicketstuff.version>
<wicket-jqueryui.version>10.0.0-M1</wicket-jqueryui.version>
<wicket-bootstrap.version>7.0.0</wicket-bootstrap.version>
<wicket-spring-boot.version>4.0.0-M1</wicket-spring-boot.version>
