[openmeetings] 06/11: Some more work on modules

[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

commit 7b8ac068bd0f9c4b39c343d06b64359841c73ea9
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Jul 23 10:22:37 2021 +0700

    Some more work on modules
---
 openmeetings-db/src/main/java/module-info.java   |  4 +--
 openmeetings-util/src/main/java/module-info.java | 37 ++++++++++++------------
 openmeetings-util/src/test/java/module-info.test | 25 ++++++++++++++++
 pom.xml                                          | 10 +++++++
 4 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java
index 671932f9f..aa1690d87 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 wicket.request;
-	requires transitive wicket.native.websocket.core;
+	requires transitive org.apache.wicket.request;
+	requires transitive org.apache.wicket.websocket.core;
 	requires transitive spring.beans;
 	requires transitive spring.web;
 	requires transitive spring.core;
diff --git a/openmeetings-util/src/main/java/module-info.java b/openmeetings-util/src/main/java/module-info.java
index 3032e41b1..ecd52506e 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -16,34 +16,33 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-module apache.openmeetings.util {
-	exports org.apache.openmeetings.util;
-	exports org.apache.openmeetings.util.crypt;
-	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 wicket.util;
-	requires transitive wicket.core;
-	requires transitive wicket.extensions;
+module org.apache.openmeetings.util {
+	requires transitive org.apache.wicket.util;
+	requires transitive org.apache.wicket.core;
+	requires transitive org.apache.wicket.extensions;
 
 	requires transitive org.apache.commons.codec;
 	requires transitive org.apache.commons.lang3;
 
 	requires transitive com.github.openjson;
 	requires transitive org.slf4j;
-	requires transitive logback.classic;
-	requires transitive logback.core;
-	requires transitive dom4j;
-	requires transitive jcip.annotations;
 	requires transitive org.bouncycastle.provider;
-	requires transitive java.activation;
+	requires transitive jakarta.activation;
 	requires transitive org.mnode.ical4j.core;
-	requires transitive tika.core;
 	requires org.aspectj.tools;
+	requires transitive javax.servlet.api;
+	requires transitive tika.core;
 	requires transitive spring.context;
+	requires transitive logback.classic;
+	requires transitive logback.core;
+	requires transitive dom4j;
+	requires transitive jcip.annotations;
 	requires simpleclient;
+
+	exports org.apache.openmeetings.util;
+	exports org.apache.openmeetings.util.crypt;
+	exports org.apache.openmeetings.util.mail;
+	exports org.apache.openmeetings.util.process;
+	exports org.apache.openmeetings.util.ws;
+	exports org.apache.openmeetings.util.logging;
 }
diff --git a/openmeetings-util/src/test/java/module-info.test b/openmeetings-util/src/test/java/module-info.test
new file mode 100644
index 000000000..5987c837c
--- /dev/null
+++ b/openmeetings-util/src/test/java/module-info.test
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module org.apache.openmeetings.util.test {
+	requires transitive org.apache.openmeetings.util;
+
+	//tests
+	requires org.junit.jupiter.engine;
+	requires org.junit.jupiter.api;
+}
diff --git a/pom.xml b/pom.xml
index a4ee9ccf0..c68c7cf52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -659,6 +659,16 @@
 				<artifactId>wicket-spring</artifactId>
 				<version>${wicket.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.wicketstuff</groupId>
+				<artifactId>wicketstuff-datastore-hazelcast</artifactId>
+				<version>${wicketstuff.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.googlecode.wicket-jquery-ui</groupId>
+				<artifactId>wicket-jquery-ui-calendar</artifactId>
+				<version>${wicket-jquery-ui.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>javax.servlet</groupId>
 				<artifactId>javax.servlet-api</artifactId>