[openmeetings] branch java11-modules updated: Another attempt to fix the build

[solomax]

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 49cf5a3  Another attempt to fix the build
49cf5a3 is described below

commit 49cf5a31ea190eccee8d788a4c4e12db40206d64
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sat Jul 3 18:07:33 2021 +0700

    Another attempt to fix the build
---
 openmeetings-core/src/main/java/module-info.java | 3 ---
 openmeetings-db/src/main/java/module-info.java   | 1 -
 openmeetings-util/src/main/java/module-info.java | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/openmeetings-core/src/main/java/module-info.java 
b/openmeetings-core/src/main/java/module-info.java
index 8c56291..696b002 100644
--- a/openmeetings-core/src/main/java/module-info.java
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -21,8 +21,6 @@ module apache.openmeetings.core {
 
        requires transitive org.apache.commons.io;
 
-       requires transitive spring.context;
-
        requires kurento.client;
        requires kurento.commons;
        requires kurento.jsonrpc.client;
@@ -35,7 +33,6 @@ module apache.openmeetings.core {
        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;
diff --git a/openmeetings-db/src/main/java/module-info.java 
b/openmeetings-db/src/main/java/module-info.java
index d8849cf..671932f 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -56,7 +56,6 @@ module apache.openmeetings.db {
        requires transitive spring.core;
 
        requires spring.tx;
-       requires spring.context;
        requires javax.persistence;
        requires openjpa;
        requires java.xml.bind;
diff --git a/openmeetings-util/src/main/java/module-info.java 
b/openmeetings-util/src/main/java/module-info.java
index 65ecb4f..3032e41 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -44,6 +44,6 @@ module apache.openmeetings.util {
        requires transitive org.mnode.ical4j.core;
        requires transitive tika.core;
        requires org.aspectj.tools;
-       requires spring.context;
+       requires transitive spring.context;
        requires simpleclient;
 }