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 1417027578f041a0c23560c3d95f0d75328f588f
Author: Maxim Solodovnik <solo...@apache.org>
AuthorDate: Thu Sep 28 12:28:16 2023 +0700

    Build is green
---
 openmeetings-core/src/test/java/module-info.test   |  3 +-
 openmeetings-db/src/main/java/module-info.java     |  1 +
 .../apache/openmeetings/db/dao/user/UserDao.java   |  2 +-
 openmeetings-db/src/test/java/module-info.test     |  4 +--
 .../src/test/java/module-info.test                 |  3 +-
 .../src/test/java/module-info.test                 |  3 +-
 openmeetings-util/src/test/java/module-info.test   |  4 +--
 openmeetings-web/pom.xml                           |  4 +++
 openmeetings-web/src/test/java/module-info.test    |  3 +-
 .../src/main/java/module-info.java                 |  1 +
 .../src/test/java/module-info.test                 |  4 +--
 pom.xml                                            | 37 ++++++----------------
 12 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/openmeetings-core/src/test/java/module-info.test 
b/openmeetings-core/src/test/java/module-info.test
index b76057d82..fb0ceeb30 100644
--- a/openmeetings-core/src/test/java/module-info.test
+++ b/openmeetings-core/src/test/java/module-info.test
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-module org.apache.openmeetings.core {
+open module org.apache.openmeetings.core {
        // This one should be in-sync with module-info.java
        exports org.apache.openmeetings.core.converter;
        exports org.apache.openmeetings.core.data.file;
@@ -62,6 +62,5 @@ module org.apache.openmeetings.core {
        requires org.slf4j;
 
        //tests
-       requires org.junit.jupiter.engine;
        requires org.junit.jupiter.api;
 }
diff --git a/openmeetings-db/src/main/java/module-info.java 
b/openmeetings-db/src/main/java/module-info.java
index b31f406ef..622b7a9b0 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -78,5 +78,6 @@ module org.apache.openmeetings.db {
        requires jakarta.servlet;
        requires jakarta.xml.bind;
 
+       requires org.dom4j;
        requires org.slf4j;
 }
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
index 9b2a51cc8..64212363e 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
@@ -598,7 +598,7 @@ public class UserDao implements 
IGroupAdminDataProviderDao<User> {
        /**
         * login logic
         *
-        * @param userOrEmail - login or email of the user being tested
+        * @param _userOrEmail - login or email of the user being tested
         * @param userpass - password of the user being tested
         * @return User object in case of successful login
         * @throws OmException in case of any issue
diff --git a/openmeetings-db/src/test/java/module-info.test 
b/openmeetings-db/src/test/java/module-info.test
index df483e26a..fd9ed1196 100644
--- a/openmeetings-db/src/test/java/module-info.test
+++ b/openmeetings-db/src/test/java/module-info.test
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-module org.apache.openmeetings.db {
+open module org.apache.openmeetings.db {
        // This one should be in-sync with module-info.java
        exports org.apache.openmeetings;
        exports org.apache.openmeetings.db.bind;
@@ -79,9 +79,9 @@ module org.apache.openmeetings.db {
        requires jakarta.servlet;
        requires jakarta.xml.bind;
 
+       requires org.dom4j;
        requires org.slf4j;
 
        //tests
-       requires org.junit.jupiter.engine;
        requires org.junit.jupiter.api;
 }
diff --git a/openmeetings-install/src/test/java/module-info.test 
b/openmeetings-install/src/test/java/module-info.test
index 6625f6c4d..7841b5f3c 100644
--- a/openmeetings-install/src/test/java/module-info.test
+++ b/openmeetings-install/src/test/java/module-info.test
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-module org.apache.openmeetings.install {
+open module org.apache.openmeetings.install {
        // This one should be in-sync with module-info.java
        exports org.apache.openmeetings.backup;
        exports org.apache.openmeetings.cli;
@@ -53,6 +53,5 @@ module org.apache.openmeetings.install {
        requires org.slf4j;
 
        //tests
-       requires org.junit.jupiter.engine;
        requires org.junit.jupiter.api;
 }
diff --git a/openmeetings-mediaserver/src/test/java/module-info.test 
b/openmeetings-mediaserver/src/test/java/module-info.test
index 5f839623c..3234ebb9b 100644
--- a/openmeetings-mediaserver/src/test/java/module-info.test
+++ b/openmeetings-mediaserver/src/test/java/module-info.test
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-module org.apache.openmeetings.mediaserver {
+open module org.apache.openmeetings.mediaserver {
        // This one should be in-sync with module-info.java
        exports org.apache.openmeetings.mediaserver;
 
@@ -47,6 +47,5 @@ module org.apache.openmeetings.mediaserver {
        requires org.slf4j;
 
        //tests
-       requires org.junit.jupiter.engine;
        requires org.junit.jupiter.api;
 }
diff --git a/openmeetings-util/src/test/java/module-info.test 
b/openmeetings-util/src/test/java/module-info.test
index c064884ae..3ea1b258b 100644
--- a/openmeetings-util/src/test/java/module-info.test
+++ b/openmeetings-util/src/test/java/module-info.test
@@ -51,6 +51,6 @@ open module org.apache.openmeetings.util {
        requires ch.qos.logback.core;
 
        //tests
-       requires org.junit.jupiter.engine;
-       requires org.junit.jupiter.api;
+       requires transitive org.junit.jupiter.engine;
+       requires transitive org.junit.jupiter.api;
 }
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index dda3a619f..5cc6c4d42 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -493,6 +493,10 @@
                        <artifactId>cxf-rt-rs-client</artifactId>
                        <scope>test</scope>
                </dependency>
+               <dependency>
+                       <groupId>jakarta.annotation</groupId>
+                       <artifactId>jakarta.annotation-api</artifactId>
+               </dependency>
                <dependency>
                        <groupId>jakarta.websocket</groupId>
                        <artifactId>jakarta.websocket-client-api</artifactId>
diff --git a/openmeetings-web/src/test/java/module-info.test 
b/openmeetings-web/src/test/java/module-info.test
index 2873bcb6b..428ba6791 100644
--- a/openmeetings-web/src/test/java/module-info.test
+++ b/openmeetings-web/src/test/java/module-info.test
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-module org.apache.openmeetings.web {
+open module org.apache.openmeetings.web {
        // This one should be in-sync with module-info.java
        requires org.apache.openmeetings.core;
        requires org.apache.openmeetings.db;
@@ -88,6 +88,5 @@ module org.apache.openmeetings.web {
        requires org.slf4j;
 
        //tests
-       requires org.junit.jupiter.engine;
        requires org.junit.jupiter.api;
 }
diff --git a/openmeetings-webservice/src/main/java/module-info.java 
b/openmeetings-webservice/src/main/java/module-info.java
index 3d62da8ca..54d68cb7c 100644
--- a/openmeetings-webservice/src/main/java/module-info.java
+++ b/openmeetings-webservice/src/main/java/module-info.java
@@ -25,6 +25,7 @@ module org.apache.openmeetings.webservice {
        requires org.apache.openmeetings.service;
        requires org.apache.openmeetings.util;
 
+       requires com.github.openjson;
        requires org.apache.commons.lang3;
 
        requires jakarta.annotation;
diff --git a/openmeetings-webservice/src/test/java/module-info.test 
b/openmeetings-webservice/src/test/java/module-info.test
index a64ca3edc..d1c1fe2b3 100644
--- a/openmeetings-webservice/src/test/java/module-info.test
+++ b/openmeetings-webservice/src/test/java/module-info.test
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-module org.apache.openmeetings.webservice {
+open module org.apache.openmeetings.webservice {
        // This one should be in-sync with module-info.java
        exports org.apache.openmeetings.webservice.util;
 
@@ -26,6 +26,7 @@ module org.apache.openmeetings.webservice {
        requires org.apache.openmeetings.service;
        requires org.apache.openmeetings.util;
 
+       requires com.github.openjson;
        requires org.apache.commons.lang3;
 
        requires jakarta.annotation;
@@ -53,6 +54,5 @@ module org.apache.openmeetings.webservice {
        requires org.slf4j;
 
        //tests
-       requires org.junit.jupiter.engine;
        requires org.junit.jupiter.api;
 }
diff --git a/pom.xml b/pom.xml
index 1cff9f406..be8b36bb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -463,8 +463,8 @@
                                <version>${spring.version}</version>
                                <exclusions>
                                        <exclusion>
-                                               
<groupId>commons-logging</groupId>
-                                               
<artifactId>commons-logging</artifactId>
+                                               
<groupId>org.springframework</groupId>
+                                               
<artifactId>spring-jcl</artifactId>
                                        </exclusion>
                                </exclusions>
                        </dependency>
@@ -472,45 +472,21 @@
                                <groupId>org.springframework</groupId>
                                <artifactId>spring-context</artifactId>
                                <version>${spring.version}</version>
-                               <exclusions>
-                                       <exclusion>
-                                               
<groupId>commons-logging</groupId>
-                                               
<artifactId>commons-logging</artifactId>
-                                       </exclusion>
-                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>spring-context-support</artifactId>
                                <version>${spring.version}</version>
-                               <exclusions>
-                                       <exclusion>
-                                               
<groupId>commons-logging</groupId>
-                                               
<artifactId>commons-logging</artifactId>
-                                       </exclusion>
-                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>spring-orm</artifactId>
                                <version>${spring.version}</version>
-                               <exclusions>
-                                       <exclusion>
-                                               
<groupId>commons-logging</groupId>
-                                               
<artifactId>commons-logging</artifactId>
-                                       </exclusion>
-                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>spring-aop</artifactId>
                                <version>${spring.version}</version>
-                               <exclusions>
-                                       <exclusion>
-                                               
<groupId>commons-logging</groupId>
-                                               
<artifactId>commons-logging</artifactId>
-                                       </exclusion>
-                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
@@ -531,6 +507,12 @@
                                <groupId>org.mnode.ical4j</groupId>
                                <artifactId>ical4j</artifactId>
                                <version>${ical4j.version}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               
<groupId>commons-logging</groupId>
+                                               
<artifactId>commons-logging</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
                                <groupId>org.apache.cxf</groupId>
@@ -1285,7 +1267,6 @@
                                        <configuration>
                                                <forkCount>1</forkCount>
                                                <reuseForks>true</reuseForks>
-                                               
<useModulePath>false</useModulePath>
                                                
<excludedGroups>${excluded.test.groups}</excludedGroups>
                                                <includes>
                                                        
<include>**/Test*.java</include>
@@ -1293,6 +1274,8 @@
                                                <excludes>
                                                        <exclude/>
                                                </excludes>
+                                               
<useModulePath>false</useModulePath>
+                                               <!--argLine>-Xint 
${argLine}</argLine-->
                                                <argLine>@{argLine} 
--add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED 
--add-opens java.base/java.lang=ALL-UNNAMED --add-opens 
java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED 
--add-opens java.management/sun.management=ALL-UNNAMED --add-opens 
jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens 
java.base/java.util=ALL-UNNAMED 
--add-opens=java.base/sun.security.util=ALL-UNNAMED 
--add-opens=java.base/sun.security.x509=A [...]
                                        </configuration>
                                </plugin>

Reply via email to