[openmeetings] 12/27: Some minor (incomplete) JPMS changes

2023-10-12 Thread solomax
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 e6314ade009a9ceb0989334edf367495eac3c00e
Author: Maxim Solodovnik 
AuthorDate: Mon Sep 25 11:24:42 2023 +0700

Some minor (incomplete) JPMS changes
---
 openmeetings-core/src/main/java/module-info.java | 1 -
 openmeetings-util/src/main/java/module-info.java | 2 +-
 openmeetings-util/src/test/java/module-info.test | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openmeetings-core/src/main/java/module-info.java 
b/openmeetings-core/src/main/java/module-info.java
index ec9973b40..9a17eeddd 100644
--- a/openmeetings-core/src/main/java/module-info.java
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -41,6 +41,5 @@ module org.apache.openmeetings.core {
requires javax.inject;
requires asterisk.java;
requires jain.sip.ri;
-   requires org.apache.tika.parsers;
requires jakarta.mail;
 }
diff --git a/openmeetings-util/src/main/java/module-info.java 
b/openmeetings-util/src/main/java/module-info.java
index fdb492512..3e307dab1 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -39,7 +39,7 @@ module org.apache.openmeetings.util {
requires jakarta.activation;
requires org.mnode.ical4j.core;
requires org.aspectj.tools;
-   requires dom4j;
+   requires org.dom4j;
requires simpleclient;
requires ch.qos.logback.classic;
requires ch.qos.logback.core;
diff --git a/openmeetings-util/src/test/java/module-info.test 
b/openmeetings-util/src/test/java/module-info.test
index b65dab769..579e840ad 100644
--- a/openmeetings-util/src/test/java/module-info.test
+++ b/openmeetings-util/src/test/java/module-info.test
@@ -40,7 +40,7 @@ open module org.apache.openmeetings.util {
requires jakarta.activation;
requires org.mnode.ical4j.core;
requires org.aspectj.tools;
-   requires dom4j;
+   requires org.dom4j;
requires simpleclient;
requires ch.qos.logback.classic;
requires ch.qos.logback.core;



[openmeetings] 12/27: Some minor (incomplete) JPMS changes

2023-10-09 Thread solomax
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 61b77e33df1d45077e81593fc82d028ccbf088f6
Author: Maxim Solodovnik 
AuthorDate: Mon Sep 25 11:24:42 2023 +0700

Some minor (incomplete) JPMS changes
---
 openmeetings-core/src/main/java/module-info.java | 1 -
 openmeetings-util/src/main/java/module-info.java | 2 +-
 openmeetings-util/src/test/java/module-info.test | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openmeetings-core/src/main/java/module-info.java 
b/openmeetings-core/src/main/java/module-info.java
index ec9973b40..9a17eeddd 100644
--- a/openmeetings-core/src/main/java/module-info.java
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -41,6 +41,5 @@ module org.apache.openmeetings.core {
requires javax.inject;
requires asterisk.java;
requires jain.sip.ri;
-   requires org.apache.tika.parsers;
requires jakarta.mail;
 }
diff --git a/openmeetings-util/src/main/java/module-info.java 
b/openmeetings-util/src/main/java/module-info.java
index fdb492512..3e307dab1 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -39,7 +39,7 @@ module org.apache.openmeetings.util {
requires jakarta.activation;
requires org.mnode.ical4j.core;
requires org.aspectj.tools;
-   requires dom4j;
+   requires org.dom4j;
requires simpleclient;
requires ch.qos.logback.classic;
requires ch.qos.logback.core;
diff --git a/openmeetings-util/src/test/java/module-info.test 
b/openmeetings-util/src/test/java/module-info.test
index b65dab769..579e840ad 100644
--- a/openmeetings-util/src/test/java/module-info.test
+++ b/openmeetings-util/src/test/java/module-info.test
@@ -40,7 +40,7 @@ open module org.apache.openmeetings.util {
requires jakarta.activation;
requires org.mnode.ical4j.core;
requires org.aspectj.tools;
-   requires dom4j;
+   requires org.dom4j;
requires simpleclient;
requires ch.qos.logback.classic;
requires ch.qos.logback.core;