This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch jakarta-spring-6 in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 5aac0901c587de5cd79dd13f7813cb54981f476c Author: Maxim Solodovnik <[email protected]> AuthorDate: Fri Oct 13 14:56:37 2023 +0700 [OPENMEETINGS-2756] dependencies are aligned to wicket-M2 --- openmeetings-core/src/main/java/module-info.java | 6 +++--- openmeetings-db/src/main/java/module-info.java | 6 +++--- openmeetings-install/src/main/java/module-info.java | 2 +- openmeetings-mediaserver/src/main/java/module-info.java | 4 ++-- openmeetings-service/src/main/java/module-info.java | 2 +- openmeetings-util/src/main/java/module-info.java | 2 +- .../apache/openmeetings/util/process/ProcessHelper.java | 2 +- openmeetings-web/pom.xml | 8 ++++++++ openmeetings-web/src/main/java/module-info.java | 12 ++++++------ .../apache/openmeetings/web/AbstractWicketTesterTest.java | 2 +- .../java/org/apache/openmeetings/web/TestCalendar.java | 1 - .../java/org/apache/openmeetings/web/TestMainAreas.java | 1 - .../java/org/apache/openmeetings/web/TestMainMenu.java | 1 - .../org/apache/openmeetings/web/pages/TestHashPage.java | 2 +- openmeetings-webservice/src/main/java/module-info.java | 2 +- pom.xml | 14 +++++++++++++- 16 files changed, 42 insertions(+), 25 deletions(-) diff --git a/openmeetings-core/src/main/java/module-info.java b/openmeetings-core/src/main/java/module-info.java index e14c5ac26..2bf323ec7 100644 --- a/openmeetings-core/src/main/java/module-info.java +++ b/openmeetings-core/src/main/java/module-info.java @@ -27,7 +27,7 @@ module org.apache.openmeetings.core { exports org.apache.openmeetings.core.sip; exports org.apache.openmeetings.core.util; - requires com.github.openjson; + requires transitive com.github.openjson; requires jakarta.annotation; requires jakarta.inject; @@ -39,8 +39,8 @@ module org.apache.openmeetings.core { requires org.apache.tika.core; requires org.apache.tika.parser.image; - requires org.apache.openmeetings.db; - requires org.apache.openmeetings.util; + requires transitive org.apache.openmeetings.db; + requires transitive org.apache.openmeetings.util; requires org.apache.wicket.core; requires org.apache.wicket.websocket.core; diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java index 622b7a9b0..592e04f20 100644 --- a/openmeetings-db/src/main/java/module-info.java +++ b/openmeetings-db/src/main/java/module-info.java @@ -51,14 +51,14 @@ module org.apache.openmeetings.db { exports org.apache.openmeetings.db.util; exports org.apache.openmeetings.db.util.ws; - requires com.github.openjson; + requires transitive com.github.openjson; requires org.apache.commons.lang3; requires org.apache.commons.text; requires org.apache.openjpa; - requires org.apache.openmeetings.util; + requires transitive org.apache.openmeetings.util; requires org.apache.wicket.core; requires org.apache.wicket.extensions; @@ -74,7 +74,7 @@ module org.apache.openmeetings.db { requires jakarta.annotation; requires jakarta.inject; - requires jakarta.persistence; + requires transitive jakarta.persistence; requires jakarta.servlet; requires jakarta.xml.bind; diff --git a/openmeetings-install/src/main/java/module-info.java b/openmeetings-install/src/main/java/module-info.java index 60729e6df..e7aa2a2c2 100644 --- a/openmeetings-install/src/main/java/module-info.java +++ b/openmeetings-install/src/main/java/module-info.java @@ -30,7 +30,7 @@ module org.apache.openmeetings.install { requires org.apache.openjpa; requires org.apache.openmeetings.core; - requires org.apache.openmeetings.db; + requires transitive org.apache.openmeetings.db; requires org.apache.openmeetings.util; requires org.apache.wicket.core; diff --git a/openmeetings-mediaserver/src/main/java/module-info.java b/openmeetings-mediaserver/src/main/java/module-info.java index 45dee43fb..13752f047 100644 --- a/openmeetings-mediaserver/src/main/java/module-info.java +++ b/openmeetings-mediaserver/src/main/java/module-info.java @@ -25,7 +25,7 @@ module org.apache.openmeetings.mediaserver { requires org.apache.commons.lang3; requires org.apache.openmeetings.core; - requires org.apache.openmeetings.db; + requires transitive org.apache.openmeetings.db; requires org.apache.openmeetings.util; requires org.apache.wicket.ioc; @@ -38,7 +38,7 @@ module org.apache.openmeetings.mediaserver { requires spring.context; requires spring.core; - requires kurento.client; + requires transitive kurento.client; requires kurento.jsonrpc.client; requires kurento.commons; requires com.google.gson; diff --git a/openmeetings-service/src/main/java/module-info.java b/openmeetings-service/src/main/java/module-info.java index b0f443fcf..16b3d8aba 100644 --- a/openmeetings-service/src/main/java/module-info.java +++ b/openmeetings-service/src/main/java/module-info.java @@ -28,7 +28,7 @@ module org.apache.openmeetings.service { requires org.apache.commons.lang3; - requires org.apache.openmeetings.db; + requires transitive org.apache.openmeetings.db; requires org.apache.openmeetings.core; requires org.apache.openmeetings.util; diff --git a/openmeetings-util/src/main/java/module-info.java b/openmeetings-util/src/main/java/module-info.java index 12b8d3ca4..cf9e7ebb6 100644 --- a/openmeetings-util/src/main/java/module-info.java +++ b/openmeetings-util/src/main/java/module-info.java @@ -30,7 +30,7 @@ module org.apache.openmeetings.util { requires com.github.openjson; requires org.apache.commons.codec; - requires org.apache.commons.lang3; + requires transitive org.apache.commons.lang3; requires org.apache.tika.core; diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java index 1eeb86b2a..be3413535 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class ProcessHelper { - public static final Logger log = LoggerFactory.getLogger(ProcessHelper.class); + private static final Logger log = LoggerFactory.getLogger(ProcessHelper.class); // This is necessary to prevent 'buffer overflow' // https://stackoverflow.com/questions/9885643/ffmpeg-executed-from-javas-processbuilder-does-not-return-under-windows-7 diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml index 48dceb1ab..296658a08 100644 --- a/openmeetings-web/pom.xml +++ b/openmeetings-web/pom.xml @@ -474,6 +474,14 @@ <artifactId>commons-net</artifactId> </dependency> <!-- Test dependencies --> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-tester</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-native-websocket-tester</artifactId> + </dependency> <dependency> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-tests</artifactId> diff --git a/openmeetings-web/src/main/java/module-info.java b/openmeetings-web/src/main/java/module-info.java index 78eefd4db..b9cbf922c 100644 --- a/openmeetings-web/src/main/java/module-info.java +++ b/openmeetings-web/src/main/java/module-info.java @@ -47,12 +47,12 @@ module org.apache.openmeetings.web { requires org.apache.wicket.util; requires org.apache.wicket.websocket.core; - requires wicketstuff.dashboard.core; - requires wicketstuff.datastore.hazelcast; - requires wicketstuff.select2; - requires wicketstuff.urlfragment; - requires jqplot; - requires jqplot4java; + requires org.wicketstuff.dashboard; + requires org.wicketstuff.datastore.hazelcast; + requires org.wicketstuff.select2; + requires org.wicketstuff.urlfragment; + requires org.wicketstuff.jqplot; + requires org.wicketstuff.jqplot4j; requires wicket.bootstrap.extensions; requires wicket.bootstrap.core; requires wicket.bootstrap.themes; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractWicketTesterTest.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractWicketTesterTest.java index 1338fb00d..53e358747 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractWicketTesterTest.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractWicketTesterTest.java @@ -40,7 +40,7 @@ import org.apache.openmeetings.util.OmException; import org.apache.wicket.behavior.AbstractAjaxBehavior; import org.apache.wicket.feedback.ExactLevelFeedbackMessageFilter; import org.apache.wicket.feedback.FeedbackMessage; -import org.apache.wicket.protocol.ws.util.tester.WebSocketTester; +import org.apache.wicket.protocol.ws.tester.WebSocketTester; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.tester.WicketTester; import org.junit.jupiter.api.BeforeEach; 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 aa41ad9c2..83bd16230 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 @@ -25,7 +25,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.time.LocalDateTime; import java.util.List; -import org.apache.openmeetings.web.AbstractWicketTesterTest; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.web.user.calendar.CalendarPanel; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java index 0f189264e..2a2498c02 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java @@ -40,7 +40,6 @@ import static org.junit.jupiter.api.Assertions.fail; import java.util.function.Consumer; -import org.apache.openmeetings.web.AbstractWicketTesterTest; import org.apache.openmeetings.web.admin.backup.BackupPanel; import org.apache.openmeetings.web.admin.configurations.ConfigsPanel; import org.apache.openmeetings.web.admin.connection.ConnectionsPanel; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java index bd2be7d93..a73ff1054 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java @@ -20,7 +20,6 @@ package org.apache.openmeetings.web; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.apache.openmeetings.web.AbstractWicketTesterTest; import org.apache.openmeetings.web.admin.backup.BackupPanel; import org.apache.openmeetings.web.admin.configurations.ConfigsPanel; import org.apache.openmeetings.web.admin.connection.ConnectionsPanel; diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java index c7be79a20..8cf579901 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java @@ -44,7 +44,7 @@ import org.apache.openmeetings.web.room.RoomPanel; import org.apache.openmeetings.web.user.record.VideoInfo; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.panel.Panel; -import org.apache.wicket.protocol.ws.util.tester.WebSocketTester; +import org.apache.wicket.protocol.ws.tester.WebSocketTester; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.string.Strings; import org.junit.jupiter.api.Test; diff --git a/openmeetings-webservice/src/main/java/module-info.java b/openmeetings-webservice/src/main/java/module-info.java index 8ce3aff07..3024213c5 100644 --- a/openmeetings-webservice/src/main/java/module-info.java +++ b/openmeetings-webservice/src/main/java/module-info.java @@ -21,7 +21,7 @@ module org.apache.openmeetings.webservice { exports org.apache.openmeetings.webservice.util; requires org.apache.openmeetings.core; - requires org.apache.openmeetings.db; + requires transitive org.apache.openmeetings.db; requires org.apache.openmeetings.service; requires org.apache.openmeetings.util; diff --git a/pom.xml b/pom.xml index 88ebeee40..5f8a667fc 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,7 @@ <wicket-bootstrap.version>7.0.1</wicket-bootstrap.version> <spring.version>6.1.2</spring.version> <tomcat.version>10.1.17</tomcat.version> + <jetty.version>12.0.4</jetty.version> <ical4j.version>4.0.0-rc1</ical4j.version> <cxf.version>4.0.3</cxf.version> <io.prometheus.version>1.0.0</io.prometheus.version> @@ -126,7 +127,6 @@ <tika-parsers.version>3.0.0-BETA</tika-parsers.version> <slf4j.version>2.0.9</slf4j.version> <logback.version>1.4.14</logback.version> - <jetty.version>12.0.4</jetty.version> <license.excludedScopes>test</license.excludedScopes> <bcprov.version>1.77</bcprov.version> <mockito.version>5.2.0</mockito.version> @@ -605,11 +605,23 @@ <artifactId>wicket-util</artifactId> <version>${wicket.version}</version> </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-tester</artifactId> + <version>${wicket.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-native-websocket-core</artifactId> <version>${wicket.version}</version> </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-native-websocket-tester</artifactId> + <version>${wicket.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId>
