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 ea275c368 [OPENMEETINGS-2780] build should be fixed
ea275c368 is described below
commit ea275c36861d23cf81b14426a440fd4ba287f518
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Dec 17 11:41:28 2024 +0700
[OPENMEETINGS-2780] build should be fixed
---
openmeetings-webservice/src/main/java/module-info.java | 1 -
pom.xml | 9 +++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/openmeetings-webservice/src/main/java/module-info.java
b/openmeetings-webservice/src/main/java/module-info.java
index 3024213c5..246465751 100644
--- a/openmeetings-webservice/src/main/java/module-info.java
+++ b/openmeetings-webservice/src/main/java/module-info.java
@@ -32,7 +32,6 @@ module org.apache.openmeetings.webservice {
requires jakarta.annotation;
requires jakarta.inject;
- requires jakarta.jws;
requires jakarta.servlet;
requires jakarta.xml.ws;
requires jakarta.ws.rs;
diff --git a/pom.xml b/pom.xml
index 1ca51dc19..13a9de05a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,8 +86,8 @@
<!-- dependency versions -->
<junit.version>5.11.4</junit.version>
- <wicket.version>10.2.0</wicket.version>
- <wicketstuff.version>10.2.0</wicketstuff.version>
+ <wicket.version>10.3.0-SNAPSHOT</wicket.version>
+ <wicketstuff.version>10.3.0-SNAPSHOT</wicketstuff.version>
<wicket-bootstrap.version>7.0.8</wicket-bootstrap.version>
<fullcalendar.version>6.1.15</fullcalendar.version>
<spring.version>6.2.1</spring.version>
@@ -555,6 +555,11 @@
<groupId>jakarta.servlet</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <!-- this one removed to avoid
conflict with jakarta.xml.ws:jakarta.xml.ws-api -->
+ <groupId>jakarta.jws</groupId>
+
<artifactId>jakarta.jws-api</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
