This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 58b591d30 [OPENMEETINGS-2780] wicket, wicketstuff, wicket-bootstrap,
tomact, jetty, spring, ical4j, commons-cli, commons-net, swagger and plugins
58b591d30 is described below
commit 58b591d30496a28d8ae38b2d47c2a64e1e813843
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Jun 25 12:25:37 2024 +0700
[OPENMEETINGS-2780] wicket, wicketstuff, wicket-bootstrap, tomact, jetty,
spring, ical4j, commons-cli, commons-net, swagger and plugins
---
openmeetings-core/pom.xml | 4 -
.../jackrabbit/webdav/WebdavResponseImpl.java | 5 ++
openmeetings-web/pom.xml | 16 ++--
openmeetings-web/src/main/java/module-info.java | 8 +-
.../apache/openmeetings/web/app/Application.java | 2 +-
.../web/common/tree/FileTreePanel.java | 12 +--
.../openmeetings/web/common/tree/FolderPanel.java | 12 +--
.../apache/openmeetings/web/room/RoomPanel.java | 8 +-
.../openmeetings/web/user/MessageDialog.java | 2 +-
.../openmeetings/web/user/OmWysiwygToolbar.java | 2 +-
.../web/user/calendar/AppointmentDialog.java | 2 +-
.../web/user/calendar/AppointmentModel.java | 6 +-
.../web/user/calendar/CalendarPanel.java | 8 +-
.../web/user/calendar/OmCalendarEvent.java | 2 +-
.../apache/openmeetings/web/user/chat/Chat.java | 2 +-
.../openmeetings/web/user/chat/ChatForm.java | 2 +-
.../openmeetings/web/user/chat/ChatToolbar.java | 6 +-
.../src/main/webapp/WEB-INF/classes/hazelcast.xml | 2 +-
.../org/apache/openmeetings/web/TestCalendar.java | 2 +-
pom.xml | 87 ++++++++++------------
20 files changed, 92 insertions(+), 98 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 2339024c3..dbfc52c3f 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -69,10 +69,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- </dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
diff --git
a/openmeetings-service/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java
b/openmeetings-service/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java
index 660d951ad..00a146786 100644
---
a/openmeetings-service/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java
+++
b/openmeetings-service/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java
@@ -389,4 +389,9 @@ public class WebdavResponseImpl implements WebdavResponse {
throw new UnsupportedOperationException("no servlet 4.0 support
on: " + httpResponse.getClass(), ex);
}
}
+
+ @Override
+ public void sendRedirect(String arg0, int arg1, boolean arg2) throws
IOException {
+ httpResponse.sendRedirect(arg0, arg1, arg2);
+ }
}
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 296658a08..d249ac4cc 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -422,20 +422,20 @@
<artifactId>wicket-devutils</artifactId>
</dependency>
<dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-jquery-ui-core</artifactId>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-jquery-ui-core</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-calendar</artifactId>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-jquery-ui-calendar</artifactId>
</dependency>
<dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-jquery-ui-plugins</artifactId>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-jquery-ui-plugins</artifactId>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
diff --git a/openmeetings-web/src/main/java/module-info.java
b/openmeetings-web/src/main/java/module-info.java
index 0dd794bbe..7630d283b 100644
--- a/openmeetings-web/src/main/java/module-info.java
+++ b/openmeetings-web/src/main/java/module-info.java
@@ -54,14 +54,14 @@ module org.apache.openmeetings.web {
requires org.wicketstuff.urlfragment;
requires org.wicketstuff.jqplot;
requires org.wicketstuff.jqplot4j;
+ requires wicketstuff.jquery.ui;
+ requires wicketstuff.jquery.ui.calendar;
+ requires wicketstuff.jquery.ui.core;
+ requires wicketstuff.jquery.ui.plugins;
requires wicket.bootstrap.extensions;
requires wicket.bootstrap.core;
requires wicket.bootstrap.themes;
requires de.agilecoders.wicket.webjars;
- requires wicket.jquery.ui;
- requires wicket.jquery.ui.calendar;
- requires wicket.jquery.ui.core;
- requires wicket.jquery.ui.plugins;
requires jakarta.annotation;
requires jakarta.inject;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 34c850eb7..24b6a8bb4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -144,7 +144,7 @@ import org.wicketstuff.dashboard.web.DashboardContext;
import org.wicketstuff.dashboard.web.DashboardSettings;
import org.wicketstuff.datastores.hazelcast.HazelcastDataStore;
-import
com.googlecode.wicket.jquery.ui.plugins.wysiwyg.settings.WysiwygLibrarySettings;
+import
org.wicketstuff.jquery.ui.plugins.wysiwyg.settings.WysiwygLibrarySettings;
import com.hazelcast.cluster.Member;
import com.hazelcast.cluster.MembershipEvent;
import com.hazelcast.cluster.MembershipListener;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
index f77068bb6..bf24004cc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
@@ -70,12 +70,12 @@ import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.resource.FileSystemResource;
-import com.googlecode.wicket.jquery.core.JQueryBehavior;
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.core.ajax.IJQueryAjaxAware;
-import com.googlecode.wicket.jquery.core.ajax.JQueryAjaxBehavior;
-import com.googlecode.wicket.jquery.ui.interaction.droppable.Droppable;
-import com.googlecode.wicket.jquery.ui.interaction.droppable.DroppableBehavior;
+import org.wicketstuff.jquery.core.JQueryBehavior;
+import org.wicketstuff.jquery.core.Options;
+import org.wicketstuff.jquery.core.ajax.IJQueryAjaxAware;
+import org.wicketstuff.jquery.core.ajax.JQueryAjaxBehavior;
+import org.wicketstuff.jquery.ui.interaction.droppable.Droppable;
+import org.wicketstuff.jquery.ui.interaction.droppable.DroppableBehavior;
import
de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameAppender;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
index fab8c2a57..b2f0a38f9 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
@@ -46,12 +46,12 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.string.Strings;
import com.github.openjson.JSONObject;
-import com.googlecode.wicket.jquery.core.IJQueryWidget.JQueryWidget;
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.ui.interaction.draggable.DraggableBehavior;
-import
com.googlecode.wicket.jquery.ui.interaction.draggable.IDraggableListener;
-import com.googlecode.wicket.jquery.ui.interaction.droppable.DroppableBehavior;
-import
com.googlecode.wicket.jquery.ui.interaction.droppable.IDroppableListener;
+import org.wicketstuff.jquery.core.IJQueryWidget.JQueryWidget;
+import org.wicketstuff.jquery.core.Options;
+import org.wicketstuff.jquery.ui.interaction.draggable.DraggableBehavior;
+import org.wicketstuff.jquery.ui.interaction.draggable.IDraggableListener;
+import org.wicketstuff.jquery.ui.interaction.droppable.DroppableBehavior;
+import org.wicketstuff.jquery.ui.interaction.droppable.IDroppableListener;
import jakarta.inject.Inject;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 90830cb7a..d67cb3a8d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -103,10 +103,10 @@ import org.slf4j.LoggerFactory;
import com.github.openjson.JSONArray;
import com.github.openjson.JSONObject;
-import com.googlecode.wicket.jquery.core.JQueryBehavior;
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.ui.interaction.droppable.Droppable;
-import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings;
+import org.wicketstuff.jquery.core.JQueryBehavior;
+import org.wicketstuff.jquery.core.Options;
+import org.wicketstuff.jquery.ui.interaction.droppable.Droppable;
+import org.wicketstuff.jquery.ui.settings.JQueryUILibrarySettings;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
index 65a4c946f..533afaffb 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
@@ -72,7 +72,7 @@ import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.model.util.CollectionModel;
-import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
+import org.wicketstuff.jquery.ui.plugins.wysiwyg.WysiwygEditor;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButton;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/OmWysiwygToolbar.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/OmWysiwygToolbar.java
index ce310bc38..ffa70b225 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/OmWysiwygToolbar.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/OmWysiwygToolbar.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.user;
-import
com.googlecode.wicket.jquery.ui.plugins.wysiwyg.toolbar.DefaultWysiwygToolbar;
+import org.wicketstuff.jquery.ui.plugins.wysiwyg.toolbar.DefaultWysiwygToolbar;
public class OmWysiwygToolbar extends DefaultWysiwygToolbar {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
index e2f28d16b..a1aba2395 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
@@ -88,7 +88,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.wicketstuff.select2.Select2MultiChoice;
-import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
+import org.wicketstuff.jquery.ui.plugins.wysiwyg.WysiwygEditor;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButton;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java
index 15233f33b..3b58b5167 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java
@@ -28,9 +28,9 @@ import java.util.List;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import com.googlecode.wicket.jquery.ui.calendar.CalendarEvent;
-import com.googlecode.wicket.jquery.ui.calendar.CalendarModel;
-import com.googlecode.wicket.jquery.ui.calendar.ICalendarVisitor;
+import org.wicketstuff.jquery.ui.calendar.CalendarEvent;
+import org.wicketstuff.jquery.ui.calendar.CalendarModel;
+import org.wicketstuff.jquery.ui.calendar.ICalendarVisitor;
public class AppointmentModel extends CalendarModel implements
ICalendarVisitor {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
index afcb41f71..4703db21b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
@@ -64,10 +64,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.github.openjson.JSONObject;
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.ui.calendar.Calendar;
-import com.googlecode.wicket.jquery.ui.calendar.CalendarView;
-import com.googlecode.wicket.jquery.ui.calendar.EventSource.GoogleCalendar;
+import org.wicketstuff.jquery.core.Options;
+import org.wicketstuff.jquery.ui.calendar.Calendar;
+import org.wicketstuff.jquery.ui.calendar.CalendarView;
+import org.wicketstuff.jquery.ui.calendar.EventSource.GoogleCalendar;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java
index 1e8e98e1f..007699625 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java
@@ -22,7 +22,7 @@ import static
org.apache.openmeetings.web.util.CalendarWebHelper.getDateTime;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import com.googlecode.wicket.jquery.ui.calendar.CalendarEvent;
+import org.wicketstuff.jquery.ui.calendar.CalendarEvent;
public class OmCalendarEvent extends CalendarEvent {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index f6d526043..8bf820c75 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -60,7 +60,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.github.openjson.JSONObject;
-import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings;
+import org.wicketstuff.jquery.ui.settings.JQueryUILibrarySettings;
import jakarta.inject.Inject;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
index cc2a591e6..7d15c7aff 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
@@ -54,7 +54,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.github.openjson.JSONObject;
-import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
+import org.wicketstuff.jquery.ui.plugins.wysiwyg.WysiwygEditor;
import jakarta.inject.Inject;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
index 548787b41..9e043082b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
@@ -54,13 +54,13 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import com.github.openjson.JSONObject;
-import com.googlecode.wicket.jquery.core.IJQueryWidget.JQueryWidget;
-import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.toolbar.IWysiwygToolbar;
+import org.wicketstuff.jquery.core.IJQueryWidget.JQueryWidget;
+import org.wicketstuff.jquery.ui.plugins.wysiwyg.toolbar.IWysiwygToolbar;
import
de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
/**
- * Provides a custom implementation for
com.googlecode.wicket.jquery.ui.plugins.wysiwyg.toolbar.IWysiwygToolbar suitable
+ * Provides a custom implementation for
org.wicketstuff.jquery.ui.plugins.wysiwyg.toolbar.IWysiwygToolbar suitable
* for chat}
*/
public class ChatToolbar extends Panel implements IWysiwygToolbar {
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
index 39fe9a65b..5baae1858 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
@@ -21,7 +21,7 @@
<hazelcast
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://www.hazelcast.com/schema/config";
- xsi:schemaLocation="http://www.hazelcast.com/schema/config
http://www.hazelcast.com/schema/config/hazelcast-config-5.3.xsd";
+ xsi:schemaLocation="http://www.hazelcast.com/schema/config
http://www.hazelcast.com/schema/config/hazelcast-config-5.4.xsd";
>
<map name="ONLINE_USERS_KEY">
<near-cache>
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
index 83bd16230..9884d35dc 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
@@ -33,7 +33,7 @@ import org.apache.wicket.behavior.AbstractAjaxBehavior;
import org.apache.wicket.util.tester.FormTester;
import org.junit.jupiter.api.Test;
-import com.googlecode.wicket.jquery.ui.calendar.CalendarView;
+import org.wicketstuff.jquery.ui.calendar.CalendarView;
import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar;
diff --git a/pom.xml b/pom.xml
index 785bc6e03..7d49d90e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,27 +43,27 @@
<minimalJavaBuildVersion>${jdk.version}</minimalJavaBuildVersion>
<!-- plugin versions -->
-
<version.maven-javadoc-plugin>3.6.3</version.maven-javadoc-plugin>
- <version.maven-surefire>3.2.5</version.maven-surefire>
+
<version.maven-javadoc-plugin>3.7.0</version.maven-javadoc-plugin>
+ <version.maven-surefire>3.3.0</version.maven-surefire>
<version.maven-site-plugin>4.0.0-M9</version.maven-site-plugin>
-
<version.maven-enforcer-plugin>3.4.1</version.maven-enforcer-plugin>
+
<version.maven-enforcer-plugin>3.5.0</version.maven-enforcer-plugin>
<version.maven-source-plugin>3.3.1</version.maven-source-plugin>
<version.maven-compiler-plugin>3.13.0</version.maven-compiler-plugin>
-
<version.maven-project-info-reports-plugin>3.5.0</version.maven-project-info-reports-plugin>
- <version.maven-jar-plugin>3.4.1</version.maven-jar-plugin>
+
<version.maven-project-info-reports-plugin>3.6.0</version.maven-project-info-reports-plugin>
+ <version.maven-jar-plugin>3.4.2</version.maven-jar-plugin>
<version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
-
<version.maven-dependency-plugin>3.6.1</version.maven-dependency-plugin>
+
<version.maven-dependency-plugin>3.7.1</version.maven-dependency-plugin>
<version.maven-war-plugin>3.4.0</version.maven-war-plugin>
- <version.maven-clean-plugin>3.3.2</version.maven-clean-plugin>
+ <version.maven-clean-plugin>3.4.0</version.maven-clean-plugin>
<version.maven-antrun-plugin>3.1.0</version.maven-antrun-plugin>
<version.maven-resources-plugin>3.3.1</version.maven-resources-plugin>
<version.maven-gpg-plugin>3.2.4</version.maven-gpg-plugin>
<version.apache-rat-plugin>0.16.1</version.apache-rat-plugin>
<version.checksum-maven-plugin>1.11</version.checksum-maven-plugin>
+
<version.maven-checkstyle-plugin>3.4.0</version.maven-checkstyle-plugin>
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
-
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
- <exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
+ <exec-maven-plugin.version>3.3.0</exec-maven-plugin.version>
<minify-maven-plugin.version>1.7.6</minify-maven-plugin.version>
<license-maven-plugin.version>2.4.0</license-maven-plugin.version>
<reflow-maven-skin.version>2.3.4</reflow-maven-skin.version>
@@ -74,7 +74,7 @@
<buildnumber-maven-plugin.version>3.2.0</buildnumber-maven-plugin.version>
<keytool-maven-plugin.version>1.7</keytool-maven-plugin.version>
<maven-jarsigner-plugin.version>3.0.0</maven-jarsigner-plugin.version>
-
<sonar-maven-plugin.version>3.11.0.3922</sonar-maven-plugin.version>
+
<sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
<jacoco-maven-plugin.versoin>0.8.12</jacoco-maven-plugin.versoin>
<forbiddenapis.version>3.7</forbiddenapis.version>
<frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
@@ -83,16 +83,15 @@
<!-- dependency versions -->
<junit.version>5.10.2</junit.version>
- <wicket.version>10.0.0</wicket.version>
- <wicket-jquery-ui.version>10.0.0-M1</wicket-jquery-ui.version>
- <wicketstuff.version>10.0.0</wicketstuff.version>
- <wicket-bootstrap.version>7.0.3</wicket-bootstrap.version>
- <spring.version>6.1.6</spring.version>
- <tomcat.version>10.1.24</tomcat.version>
- <jetty.version>11.0.20</jetty.version>
- <ical4j.version>4.0.0-rc6</ical4j.version>
+ <wicket.version>10.1.0</wicket.version>
+ <wicketstuff.version>10.1.1</wicketstuff.version>
+ <wicket-bootstrap.version>7.0.5</wicket-bootstrap.version>
+ <spring.version>6.1.10</spring.version>
+ <tomcat.version>10.1.25</tomcat.version>
+ <jetty.version>11.0.21</jetty.version>
+ <ical4j.version>4.0.0</ical4j.version>
<cxf.version>4.0.4</cxf.version>
- <io.prometheus.version>1.2.1</io.prometheus.version>
+ <io.prometheus.version>1.3.1</io.prometheus.version>
<aspectjtools.version>1.9.22.1</aspectjtools.version>
<simple-xml.version>2.7.1</simple-xml.version>
<jettison.version>1.5.4</jettison.version>
@@ -101,20 +100,20 @@
<h2.version>2.2.224</h2.version>
<jakarta.mail.version>2.0.1</jakarta.mail.version>
<openjpa.version>4.0.0</openjpa.version>
- <jakarta.persistence.version>3.1.0</jakarta.persistence.version>
+ <jakarta.persistence.version>3.2.0</jakarta.persistence.version>
<jakarta.transaction.version>2.0.1</jakarta.transaction.version>
- <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
-
<jakarta.websocket-api.version>2.1.1</jakarta.websocket-api.version>
+ <jakarta.annotation.version>3.0.0</jakarta.annotation.version>
+
<jakarta.websocket-api.version>2.2.0</jakarta.websocket-api.version>
+ <jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
<asterisk-java.version>3.39.0</asterisk-java.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<commons-dbcp.version>2.12.0</commons-dbcp.version>
<commons-pool2.version>2.12.0</commons-pool2.version>
- <commons-cli.version>1.7.0</commons-cli.version>
+ <commons-cli.version>1.8.0</commons-cli.version>
<commons-codec.version>1.17.0</commons-codec.version>
<commons-io.version>2.16.1</commons-io.version>
-
<commons-collections4.version>4.5.0-M1</commons-collections4.version>
<commons-text.version>1.12.0</commons-text.version>
- <commons-net.version>3.10.0</commons-net.version>
+ <commons-net.version>3.11.1</commons-net.version>
<dom4j.version>2.1.4</dom4j.version>
<postgresql.version>42.7.3</postgresql.version>
<mysql.version>8.4.0</mysql.version>
@@ -136,10 +135,9 @@
<jasny-bootstrap.version>3.1.3-2</jasny-bootstrap.version>
<jodconverter.version>4.4.7</jodconverter.version>
<jaxb-runtime.version>4.0.5</jaxb-runtime.version>
- <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
<jquery-ui-touch-punch.version>0.2.3-2</jquery-ui-touch-punch.version>
<apacheds-test-framework.version>2.0.0.AM27</apacheds-test-framework.version>
- <swagger.version>2.2.21</swagger.version>
+ <swagger.version>2.2.22</swagger.version>
<jsr305.version>3.0.2</jsr305.version>
<totp.version>1.7.1</totp.version>
<!-- Exclude all generated code -->
@@ -773,11 +771,6 @@
<artifactId>jquery-ui-touch-punch</artifactId>
<version>${jquery-ui-touch-punch.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
-
<version>${commons-collections4.version}</version>
- </dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
@@ -892,7 +885,7 @@
</exclusion>
</exclusions>
</dependency>
- <!--dependency> FIXME TODO have to be placed back as
soon as `jackrabbit.webdav` will be jackarta compatible
+ <!--dependency> FIXME TODO have to be placed back as
soon as `jackrabbit.webdav` will be jakarta compatible
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId>
<version>${jackrabbit-webdav.version}</version>
@@ -919,24 +912,24 @@
<version>${wicketstuff.version}</version>
</dependency>
<dependency>
-
<groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-jquery-ui-core</artifactId>
- <version>${wicket-jquery-ui.version}</version>
+ <groupId>org.wicketstuff</groupId>
+
<artifactId>wicketstuff-jquery-ui-core</artifactId>
+ <version>${wicketstuff.version}</version>
</dependency>
<dependency>
-
<groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-jquery-ui</artifactId>
- <version>${wicket-jquery-ui.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-calendar</artifactId>
- <version>${wicket-jquery-ui.version}</version>
+ <groupId>org.wicketstuff</groupId>
+
<artifactId>wicketstuff-jquery-ui-calendar</artifactId>
+ <version>${wicketstuff.version}</version>
</dependency>
<dependency>
-
<groupId>com.googlecode.wicket-jquery-ui</groupId>
-
<artifactId>wicket-jquery-ui-plugins</artifactId>
- <version>${wicket-jquery-ui.version}</version>
+ <groupId>org.wicketstuff</groupId>
+
<artifactId>wicketstuff-jquery-ui-plugins</artifactId>
+ <version>${wicketstuff.version}</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
@@ -1250,7 +1243,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
-
<version>${maven-checkstyle-plugin.version}</version>
+
<version>${version.maven-checkstyle-plugin}</version>
<configuration>
<checkstyleRules>
<module name =
"Checker">
@@ -1667,7 +1660,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
-
<version>${maven-checkstyle-plugin.version}</version>
+
<version>${version.maven-checkstyle-plugin}</version>
<configuration>
<skip>${om.quick.build}</skip>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
