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 bbf03b3639 Cleanup Wicket dependencies
bbf03b3639 is described below
commit bbf03b3639194b00a62a9a5f9160bb81bb5b8fb8
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Thu Oct 2 14:47:05 2025 +0200
Cleanup Wicket dependencies
---
client/idrepo/common-ui/pom.xml | 20 ++++++------
.../syncope/client/ui/commons/BaseLogin.java | 2 +-
.../ui/commons/StyledNotificationBehavior.java | 6 ++--
.../markup/html/form/AjaxDateFieldPanel.java | 2 +-
.../markup/html/form/AjaxDateTimeFieldPanel.java | 2 +-
.../markup/html/form/AjaxNumberFieldPanel.java | 6 ++--
.../commons/markup/html/form/DateFieldPanel.java | 2 +-
.../ui/commons/panels/NotificationPanel.java | 6 ++--
.../client/enduser/pages/BaseReauthPage.java | 2 +-
docker/console/LICENSE | 5 ---
docker/enduser/LICENSE | 5 ---
pom.xml | 37 +++++++++-------------
standalone/LICENSE | 5 ---
13 files changed, 39 insertions(+), 61 deletions(-)
diff --git a/client/idrepo/common-ui/pom.xml b/client/idrepo/common-ui/pom.xml
index d7b3770587..3532795ff2 100644
--- a/client/idrepo/common-ui/pom.xml
+++ b/client/idrepo/common-ui/pom.xml
@@ -71,24 +71,24 @@ under the License.
<artifactId>wicket-native-websocket-javax</artifactId>
</dependency>
<dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-jquery-ui</artifactId>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-jquery-ui</artifactId>
</dependency>
<dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-jquery-ui-theme-base</artifactId>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-jquery-ui-theme-base</artifactId>
</dependency>
<dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-kendo-ui</artifactId>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-kendo-ui</artifactId>
</dependency>
<dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-kendo-ui-culture</artifactId>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-kendo-ui-culture</artifactId>
</dependency>
<dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-kendo-ui-theme-bootstrap</artifactId>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-kendo-ui-theme-bootstrap</artifactId>
</dependency>
<dependency>
<groupId>de.agilecoders.wicket</groupId>
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/BaseLogin.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/BaseLogin.java
index b00a81f4b4..e28ef9c2a1 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/BaseLogin.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/BaseLogin.java
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.client.ui.commons;
-import com.googlecode.wicket.kendo.ui.widget.notification.Notification;
import jakarta.ws.rs.NotAuthorizedException;
import jakarta.ws.rs.core.HttpHeaders;
import java.util.ArrayList;
@@ -55,6 +54,7 @@ import
org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.wicketstuff.kendo.ui.widget.notification.Notification;
public abstract class BaseLogin extends WebPage {
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/StyledNotificationBehavior.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/StyledNotificationBehavior.java
index 82b97da06b..2faf75f932 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/StyledNotificationBehavior.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/StyledNotificationBehavior.java
@@ -18,11 +18,11 @@
*/
package org.apache.syncope.client.ui.commons;
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.kendo.ui.widget.notification.Notification;
-import com.googlecode.wicket.kendo.ui.widget.notification.NotificationBehavior;
import java.io.Serializable;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.wicketstuff.jquery.core.Options;
+import org.wicketstuff.kendo.ui.widget.notification.Notification;
+import org.wicketstuff.kendo.ui.widget.notification.NotificationBehavior;
public class StyledNotificationBehavior extends NotificationBehavior {
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateFieldPanel.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateFieldPanel.java
index 780495289d..370cd5d13c 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateFieldPanel.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateFieldPanel.java
@@ -18,12 +18,12 @@
*/
package org.apache.syncope.client.ui.commons.markup.html.form;
-import com.googlecode.wicket.kendo.ui.form.datetime.AjaxDatePicker;
import java.util.Date;
import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
+import org.wicketstuff.kendo.ui.form.datetime.AjaxDatePicker;
public class AjaxDateFieldPanel extends DateFieldPanel {
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateTimeFieldPanel.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateTimeFieldPanel.java
index 3b962e50a5..f56fb159b1 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateTimeFieldPanel.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxDateTimeFieldPanel.java
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.client.ui.commons.markup.html.form;
-import com.googlecode.wicket.kendo.ui.form.datetime.AjaxDateTimePicker;
import java.text.DateFormat;
import java.util.Date;
import java.util.Locale;
@@ -27,6 +26,7 @@ import org.apache.wicket.Session;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
+import org.wicketstuff.kendo.ui.form.datetime.AjaxDateTimePicker;
public class AjaxDateTimeFieldPanel extends DateFieldPanel {
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxNumberFieldPanel.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxNumberFieldPanel.java
index 1a9da14125..81e1b612f9 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxNumberFieldPanel.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxNumberFieldPanel.java
@@ -18,9 +18,6 @@
*/
package org.apache.syncope.client.ui.commons.markup.html.form;
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.kendo.ui.form.NumberTextField;
-import com.googlecode.wicket.kendo.ui.resource.KendoCultureResourceReference;
import java.io.Serializable;
import java.util.List;
import java.util.Optional;
@@ -37,6 +34,9 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
+import org.wicketstuff.jquery.core.Options;
+import org.wicketstuff.kendo.ui.form.NumberTextField;
+import org.wicketstuff.kendo.ui.resource.KendoCultureResourceReference;
public final class AjaxNumberFieldPanel<T extends Number & Comparable<T>>
extends FieldPanel<T> {
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/DateFieldPanel.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/DateFieldPanel.java
index 4912f8cabb..6167b3559e 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/DateFieldPanel.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/DateFieldPanel.java
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.client.ui.commons.markup.html.form;
-import com.googlecode.wicket.kendo.ui.resource.KendoCultureResourceReference;
import java.io.Serializable;
import java.text.ParseException;
import java.util.Date;
@@ -34,6 +33,7 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.springframework.util.StringUtils;
+import org.wicketstuff.kendo.ui.resource.KendoCultureResourceReference;
public abstract class DateFieldPanel extends FieldPanel<Date> {
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/panels/NotificationPanel.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/panels/NotificationPanel.java
index 7eeced21a0..9d061621ff 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/panels/NotificationPanel.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/panels/NotificationPanel.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.client.ui.commons.panels;
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.kendo.ui.widget.notification.Notification;
import java.util.List;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.client.ui.commons.StyledNotificationBehavior;
@@ -30,6 +28,8 @@ import org.apache.wicket.feedback.FeedbackMessagesModel;
import org.apache.wicket.feedback.IFeedback;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
+import org.wicketstuff.jquery.core.Options;
+import org.wicketstuff.kendo.ui.widget.notification.Notification;
public class NotificationPanel extends Panel
implements IFeedback, IGenericComponent<List<FeedbackMessage>,
NotificationPanel> {
@@ -118,5 +118,5 @@ public class NotificationPanel extends Panel
public String getNotificationMarkupId() {
return this.notification.getMarkupId();
}
-
+
}
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/pages/BaseReauthPage.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/pages/BaseReauthPage.java
index d151839fe9..ab1cec9572 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/pages/BaseReauthPage.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/pages/BaseReauthPage.java
@@ -18,11 +18,11 @@
*/
package org.apache.syncope.client.enduser.pages;
-import com.googlecode.wicket.kendo.ui.widget.notification.Notification;
import org.apache.syncope.client.enduser.SyncopeEnduserSession;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.wicketstuff.kendo.ui.widget.notification.Notification;
abstract class BaseReauthPage extends BasePage {
diff --git a/docker/console/LICENSE b/docker/console/LICENSE
index 4d0f60a354..bb5f752678 100644
--- a/docker/console/LICENSE
+++ b/docker/console/LICENSE
@@ -297,11 +297,6 @@ This is licensed under the AL 2.0, see above.
==
-For Wicket - jQuery UI (http://www.7thweb.net/wicket-jquery-ui/):
-This is licensed under the AL 2.0, see above.
-
-==
-
For LMAX Disruptor (https://lmax-exchange.github.io/disruptor/):
This is licensed under the AL 2.0, see above.
diff --git a/docker/enduser/LICENSE b/docker/enduser/LICENSE
index 52bbf7b3e0..a21eb9e4a0 100644
--- a/docker/enduser/LICENSE
+++ b/docker/enduser/LICENSE
@@ -282,11 +282,6 @@ This is licensed under the AL 2.0, see above.
==
-For Wicket - jQuery UI (http://www.7thweb.net/wicket-jquery-ui/):
-This is licensed under the AL 2.0, see above.
-
-==
-
For LMAX Disruptor (https://lmax-exchange.github.io/disruptor/):
This is licensed under the AL 2.0, see above.
diff --git a/pom.xml b/pom.xml
index 86a3be9ca4..ae197c5237 100644
--- a/pom.xml
+++ b/pom.xml
@@ -463,9 +463,7 @@ under the License.
<wicket.version>10.7.0</wicket.version>
<wicketstuff.version>10.6.0</wicketstuff.version>
- <wicket-jqueryui.version>10.0.0-M1</wicket-jqueryui.version>
<wicket-bootstrap.version>7.0.11</wicket-bootstrap.version>
- <wicket-jquery-selectors.version>4.0.4</wicket-jquery-selectors.version>
<wicket-spring-boot.version>4.1.1</wicket-spring-boot.version>
<antlr4.version>4.13.2</antlr4.version>
@@ -1114,40 +1112,35 @@ under the License.
<version>${wicketstuff.version}</version>
</dependency>
<dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-jquery-ui</artifactId>
- <version>${wicket-jqueryui.version}</version>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-jquery-ui</artifactId>
+ <version>${wicketstuff.version}</version>
</dependency>
<dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-jquery-ui-theme-base</artifactId>
- <version>${wicket-jqueryui.version}</version>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-jquery-ui-theme-base</artifactId>
+ <version>${wicketstuff.version}</version>
</dependency>
<dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-kendo-ui</artifactId>
- <version>${wicket-jqueryui.version}</version>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-kendo-ui</artifactId>
+ <version>${wicketstuff.version}</version>
</dependency>
<dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-kendo-ui-culture</artifactId>
- <version>${wicket-jqueryui.version}</version>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-kendo-ui-culture</artifactId>
+ <version>${wicketstuff.version}</version>
</dependency>
<dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-kendo-ui-theme-bootstrap</artifactId>
- <version>${wicket-jqueryui.version}</version>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-kendo-ui-theme-bootstrap</artifactId>
+ <version>${wicketstuff.version}</version>
</dependency>
<dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-core</artifactId>
<version>${wicket-bootstrap.version}</version>
</dependency>
- <dependency>
- <groupId>de.agilecoders.wicket</groupId>
- <artifactId>wicket-jquery-selectors</artifactId>
- <version>${wicket-jquery-selectors.version}</version>
- </dependency>
<dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-extensions</artifactId>
diff --git a/standalone/LICENSE b/standalone/LICENSE
index bb98c12d53..27b3678b06 100644
--- a/standalone/LICENSE
+++ b/standalone/LICENSE
@@ -577,11 +577,6 @@ This is licensed under the AL 2.0, see above.
==
-For Wicket - jQuery UI (http://www.7thweb.net/wicket-jquery-ui/):
-This is licensed under the AL 2.0, see above.
-
-==
-
For H2 (http://www.h2database.com/):
This is licensed under the EPL 1.0: