[openmeetings] branch java11-modules updated: some compilation errors are resolved

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/java11-modules by this push:
     new b81a11b  some compilation errors are resolved
b81a11b is described below

commit b81a11b9d130a7b4e2e7e42cba7248a69af0b372
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Jul 3 13:00:04 2021 +0700

    some compilation errors are resolved
---
 openmeetings-core/src/main/java/module-info.java | 11 +++++++++--
 openmeetings-db/src/main/java/module-info.java   |  5 ++---
 openmeetings-util/src/main/java/module-info.java | 12 ++++++++----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/openmeetings-core/src/main/java/module-info.java b/openmeetings-core/src/main/java/module-info.java
index bdbea86..8c56291 100644
--- a/openmeetings-core/src/main/java/module-info.java
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -29,12 +29,19 @@ module apache.openmeetings.core {
 	requires java.activation;
 	requires com.google.gson;
 	requires java.mail;
-	requires api.all;
-	requires org.apache.tika.parsers;
 	requires java.xml;
 	requires xstream;
 
 	requires jodconverter.core;
 	requires jodconverter.local;
+	requires org.apache.directory.ldap.api.all;
+	requires tika.core;
+	requires tika.parsers;
+	requires javax.inject;
+	requires wicket.ioc;
+	requires java.annotation;
+	requires apache.openmeetings.util;
+	requires asterisk.java;
+	requires jain.sip.ri;
 }
 
diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java
index 120187f..d8849cf 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -49,8 +49,8 @@ module apache.openmeetings.db {
 	exports org.apache.openmeetings.db.util.ws;
 
 	requires transitive apache.openmeetings.util;
-	requires transitive org.apache.wicket.request;
-	requires transitive org.apache.wicket.websocket.core;
+	requires transitive wicket.request;
+	requires transitive wicket.native.websocket.core;
 	requires transitive spring.beans;
 	requires transitive spring.web;
 	requires transitive spring.core;
@@ -59,7 +59,6 @@ module apache.openmeetings.db {
 	requires spring.context;
 	requires javax.persistence;
 	requires openjpa;
-	requires asterisk.java;
 	requires java.xml.bind;
 	requires org.apache.commons.text;
 }
diff --git a/openmeetings-util/src/main/java/module-info.java b/openmeetings-util/src/main/java/module-info.java
index 72dfb3c..65ecb4f 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -22,16 +22,16 @@ module apache.openmeetings.util {
 	exports org.apache.openmeetings.util.mail;
 	exports org.apache.openmeetings.util.process;
 	exports org.apache.openmeetings.util.ws;
+	exports org.apache.openmeetings.util.logging;
 
 	requires transitive javax.servlet.api;
 
-	requires transitive org.apache.wicket.util;
-	requires transitive org.apache.wicket.core;
-	requires transitive org.apache.wicket.extensions;
+	requires transitive wicket.util;
+	requires transitive wicket.core;
+	requires transitive wicket.extensions;
 
 	requires transitive org.apache.commons.codec;
 	requires transitive org.apache.commons.lang3;
-	requires transitive org.apache.tika.core;
 
 	requires transitive com.github.openjson;
 	requires transitive org.slf4j;
@@ -42,4 +42,8 @@ module apache.openmeetings.util {
 	requires transitive org.bouncycastle.provider;
 	requires transitive java.activation;
 	requires transitive org.mnode.ical4j.core;
+	requires transitive tika.core;
+	requires org.aspectj.tools;
+	requires spring.context;
+	requires simpleclient;
 }