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 247abdd Upgrading Wicket
247abdd is described below
commit 247abdd8e9e047a55002ecc60c70d68163f73433
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Wed Mar 31 08:40:29 2021 +0200
Upgrading Wicket
---
client/am/console/pom.xml | 28 +---------------------
.../client/console/SyncopeWebApplication.java | 4 ++--
pom.xml | 2 +-
3 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/client/am/console/pom.xml b/client/am/console/pom.xml
index afd6f11..edce786 100644
--- a/client/am/console/pom.xml
+++ b/client/am/console/pom.xml
@@ -62,34 +62,8 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
-
- <plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>sass-compilation</id>
- <phase>compile</phase>
- <goals>
- <goal>update-stylesheets</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <resources>
- <resource>
- <source>
-
<directory>${basedir}/src/main/resources/META-INF/resources/css</directory>
- </source>
-
<destination>${project.build.outputDirectory}/META-INF/resources/css</destination>
- </resource>
- </resources>
- <skip>${sass.skip}</skip>
- </configuration>
- </plugin>
</plugins>
-
+
<resources>
<resource>
<directory>src/main/resources</directory>
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
index 30b3b32..76ff69c 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
@@ -53,7 +53,6 @@ import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDa
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.servlet.XForwardedRequestWrapperFactory;
-import
org.apache.wicket.protocol.ws.WebSocketAwareCsrfPreventionRequestCycleListener;
import org.apache.wicket.protocol.ws.api.WebSocketResponse;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebResponse;
@@ -74,6 +73,7 @@ import
org.apache.syncope.client.ui.commons.SyncopeUIRequestCycleListener;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
import org.apache.syncope.common.keymaster.client.api.ServiceOps;
+import
org.apache.wicket.protocol.ws.WebSocketAwareResourceIsolationRequestCycleListener;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.cycle.IRequestCycleListener;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -306,7 +306,7 @@ public class SyncopeWebApplication extends
WicketBootSecuredWebApplication {
}
if (BooleanUtils.toBoolean(props.getProperty("csrf"))) {
- getRequestCycleListeners().add(new
WebSocketAwareCsrfPreventionRequestCycleListener());
+ getRequestCycleListeners().add(new
WebSocketAwareResourceIsolationRequestCycleListener());
}
getRequestCycleListeners().add(new IRequestCycleListener() {
diff --git a/pom.xml b/pom.xml
index f4279d9..e92fc72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -473,7 +473,7 @@ under the License.
<jsplumb.version>2.0.7</jsplumb.version>
<chartjs.version>1.0.2</chartjs.version>
- <wicket.version>9.2.0</wicket.version>
+ <wicket.version>9.3.0</wicket.version>
<wicketstuff.version>9.2.0</wicketstuff.version>
<wicket-jqueryui.version>9.2.1</wicket-jqueryui.version>
<wicket-bootstrap.version>5.0.3</wicket-bootstrap.version>
