You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2022/12/29 06:37:59 UTC

[openmeetings] 10/10: More work on JPMS

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 d205e21ff7c27eea3be324c61bee4befea58ffa2
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jul 14 15:48:18 2022 +0700

    More work on JPMS
---
 openmeetings-core/pom.xml                          |  1 -
 openmeetings-core/src/main/java/module-info.java   | 28 ++++++------
 openmeetings-db/pom.xml                            |  1 -
 openmeetings-db/src/main/java/module-info.java     | 13 +++---
 openmeetings-install/pom.xml                       |  1 -
 .../src/main/java/module-info.java                 | 15 ++++---
 openmeetings-mediaserver/pom.xml                   |  1 -
 .../src/main/java/module-info.java                 | 16 ++++---
 openmeetings-screenshare/pom.xml                   |  1 -
 openmeetings-server/pom.xml                        |  1 -
 openmeetings-service/pom.xml                       |  1 -
 .../src/main/java/module-info.java                 | 20 +++++----
 openmeetings-util/pom.xml                          |  1 -
 openmeetings-util/src/main/java/module-info.java   | 36 ++++++++--------
 openmeetings-util/src/test/java/module-info.test   | 30 ++++++++++++-
 openmeetings-web/pom.xml                           |  1 -
 openmeetings-web/src/main/java/module-info.java    | 50 ++++++++++++++++++++++
 .../openmeetings/web/admin/extra/ExtraPanel.java   |  2 +-
 .../util/logging/OpenMeetingsMetricsServlet.java   |  3 +-
 openmeetings-webservice/pom.xml                    |  1 -
 .../src/main/java/module-info.java                 | 20 ++++-----
 pom.xml                                            | 12 ------
 22 files changed, 162 insertions(+), 93 deletions(-)

diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 02360662b..652baa6da 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -31,7 +31,6 @@
 	<description>Module for OpenMeetings core classes and services</description>
 	<properties>
 		<site.basedir>${project.parent.basedir}</site.basedir>
-		<autoModuleName>apache.openmeetings.core</autoModuleName>
 	</properties>
 	<build>
 		<plugins>
diff --git a/openmeetings-core/src/main/java/module-info.java b/openmeetings-core/src/main/java/module-info.java
index 6495df2b8..ec9973b40 100644
--- a/openmeetings-core/src/main/java/module-info.java
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -17,28 +17,30 @@
  * under the License.
  */
 
-module apache.openmeetings.core {
-	requires transitive apache.openmeetings.db;
+module org.apache.openmeetings.core {
+	exports org.apache.openmeetings.core.converter;
+	exports org.apache.openmeetings.core.data.file;
+	exports org.apache.openmeetings.core.ldap;
+	exports org.apache.openmeetings.core.mail;
+	exports org.apache.openmeetings.core.notifier;
+	exports org.apache.openmeetings.core.rss;
+	exports org.apache.openmeetings.core.sip;
+	exports org.apache.openmeetings.core.util;
+
+	requires transitive org.apache.openmeetings.db;
 
 	requires transitive org.apache.commons.io;
+	requires transitive java.annotation;
+	requires transitive java.xml;
 
-	requires kurento.client;
-	requires kurento.commons;
-	requires kurento.jsonrpc.client;
-	requires java.activation;
-	requires com.google.gson;
-	requires java.mail;
-	requires java.xml;
 	requires xstream;
 
 	requires jodconverter.core;
 	requires jodconverter.local;
 	requires org.apache.directory.ldap.api.all;
-	requires tika.parsers;
 	requires javax.inject;
-	requires wicket.ioc;
-	requires java.annotation;
-	requires apache.openmeetings.util;
 	requires asterisk.java;
 	requires jain.sip.ri;
+	requires org.apache.tika.parsers;
+	requires jakarta.mail;
 }
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index b6fd3e83f..f5eff2a9f 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -31,7 +31,6 @@
 	<description>OpenMeetings module for all Database/DTO related classes</description>
 	<properties>
 		<site.basedir>${project.parent.basedir}</site.basedir>
-		<autoModuleName>apache.openmeetings.db</autoModuleName>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java
index aa1690d87..f65ad04b8 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -16,8 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-module apache.openmeetings.db {
+module org.apache.openmeetings.db {
 	exports org.apache.openmeetings;
+	exports org.apache.openmeetings.db.bind;
+	exports org.apache.openmeetings.db.bind.adapter;
 	exports org.apache.openmeetings.db.dao;
 	exports org.apache.openmeetings.db.dao.basic;
 	exports org.apache.openmeetings.db.dao.calendar;
@@ -45,19 +47,20 @@ module apache.openmeetings.db {
 	exports org.apache.openmeetings.db.entity.server;
 	exports org.apache.openmeetings.db.entity.user;
 	exports org.apache.openmeetings.db.manager;
+	exports org.apache.openmeetings.db.mapper;
 	exports org.apache.openmeetings.db.util;
 	exports org.apache.openmeetings.db.util.ws;
 
-	requires transitive apache.openmeetings.util;
+	requires transitive org.apache.openmeetings.util;
 	requires transitive org.apache.wicket.request;
 	requires transitive org.apache.wicket.websocket.core;
+	requires transitive org.apache.commons.text;
+	requires transitive java.xml.bind;
+	requires transitive org.apache.openjpa;
 	requires transitive spring.beans;
 	requires transitive spring.web;
 	requires transitive spring.core;
 
 	requires spring.tx;
 	requires javax.persistence;
-	requires openjpa;
-	requires java.xml.bind;
-	requires org.apache.commons.text;
 }
diff --git a/openmeetings-install/pom.xml b/openmeetings-install/pom.xml
index 73c79c29f..8e5dbb082 100644
--- a/openmeetings-install/pom.xml
+++ b/openmeetings-install/pom.xml
@@ -31,7 +31,6 @@
 	<description>Module for OpenMeetings command line admin and classes necessary for installer.</description>
 	<properties>
 		<site.basedir>${project.parent.basedir}</site.basedir>
-		<autoModuleName>apache.openmeetings.install</autoModuleName>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/openmeetings-util/src/test/java/module-info.test b/openmeetings-install/src/main/java/module-info.java
similarity index 71%
copy from openmeetings-util/src/test/java/module-info.test
copy to openmeetings-install/src/main/java/module-info.java
index 5987c837c..cb5c126f9 100644
--- a/openmeetings-util/src/test/java/module-info.test
+++ b/openmeetings-install/src/main/java/module-info.java
@@ -16,10 +16,15 @@
  * 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;
+module org.apache.openmeetings.install {
+	exports org.apache.openmeetings.backup;
+	exports org.apache.openmeetings.cli;
+	exports org.apache.openmeetings.installation;
+
+	requires transitive org.apache.openmeetings.core;
+	requires java.desktop;
+	requires commons.cli;
+	requires spring.context.support;
+	requires quartz;
 }
diff --git a/openmeetings-mediaserver/pom.xml b/openmeetings-mediaserver/pom.xml
index 2f725fdc7..79713d9f8 100644
--- a/openmeetings-mediaserver/pom.xml
+++ b/openmeetings-mediaserver/pom.xml
@@ -31,7 +31,6 @@
 	<description>Module for OpenMeetings MediaServer classes and services</description>
 	<properties>
 		<site.basedir>${project.parent.basedir}</site.basedir>
-		<autoModuleName>apache.openmeetings.mediaserver</autoModuleName>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/openmeetings-util/src/test/java/module-info.test b/openmeetings-mediaserver/src/main/java/module-info.java
similarity index 71%
copy from openmeetings-util/src/test/java/module-info.test
copy to openmeetings-mediaserver/src/main/java/module-info.java
index 5987c837c..47ee94e67 100644
--- a/openmeetings-util/src/test/java/module-info.test
+++ b/openmeetings-mediaserver/src/main/java/module-info.java
@@ -16,10 +16,16 @@
  * 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;
+module org.apache.openmeetings.mediaserver {
+	exports org.apache.openmeetings.mediaserver;
+
+	requires transitive org.apache.openmeetings.core;
+	requires transitive org.apache.wicket.ioc;
+
+	requires kurento.client;
+	requires kurento.jsonrpc.client;
+	requires kurento.commons;
+	requires javax.inject;
+	requires com.google.gson;
 }
diff --git a/openmeetings-screenshare/pom.xml b/openmeetings-screenshare/pom.xml
index 8ed871c9a..b556bb90c 100644
--- a/openmeetings-screenshare/pom.xml
+++ b/openmeetings-screenshare/pom.xml
@@ -37,7 +37,6 @@
 		<key.alias>screen</key.alias>
 		<site.basedir>${project.parent.basedir}</site.basedir>
 		<jnlp.out.dir>${project.build.directory}/jnlp</jnlp.out.dir>
-		<autoModuleName>apache.openmeetings.screenshare</autoModuleName>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 60380e4f4..8290c4469 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -40,7 +40,6 @@
 		<om.webapp>webapps/openmeetings</om.webapp>
 		<root.webapp>webapps/ROOT</root.webapp>
 		<server-file.dir>web-server</server-file.dir>
-		<autoModuleName>apache.openmeetings.server</autoModuleName>
 	</properties>
 	<url>https://openmeetings.apache.org</url>
 	<scm>
diff --git a/openmeetings-service/pom.xml b/openmeetings-service/pom.xml
index 064613460..cfdf4a7a6 100644
--- a/openmeetings-service/pom.xml
+++ b/openmeetings-service/pom.xml
@@ -31,7 +31,6 @@
 	<description>Module for OpenMeetings schedulers, mail templates and managers.</description>
 	<properties>
 		<site.basedir>${project.parent.basedir}</site.basedir>
-		<autoModuleName>apache.openmeetings.service</autoModuleName>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java b/openmeetings-service/src/main/java/module-info.java
similarity index 62%
copy from openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
copy to openmeetings-service/src/main/java/module-info.java
index 05c1555a6..2969affec 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
+++ b/openmeetings-service/src/main/java/module-info.java
@@ -16,17 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.web.util.logging;
 
-import io.prometheus.client.exporter.MetricsServlet;
+module org.apache.openmeetings.service {
+	exports org.apache.openmeetings.service.calendar.caldav;
+	exports org.apache.openmeetings.service.mail;
+	exports org.apache.openmeetings.service.mail.template;
+	exports org.apache.openmeetings.service.room;
 
-public class OpenMeetingsMetricsServlet extends MetricsServlet {
+	requires transitive org.apache.openmeetings.core;
 
-	private static final long serialVersionUID = -2488393857088858502L;
-
-	public OpenMeetingsMetricsServlet() {
-		super();
-		new TomcatGenericExports(false).register();
-	}
+	requires transitive org.apache.wicket.spring;
 
+	requires org.apache.httpcomponents.httpcore;
+	requires org.apache.httpcomponents.httpclient;
+	requires jackrabbit.webdav;
+	requires caldav4j;
 }
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index 11f0d4473..d863c0f9a 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -31,7 +31,6 @@
 	<description>Module for utility classes being used by all OpenMeetings modules</description>
 	<properties>
 		<site.basedir>${project.parent.basedir}</site.basedir>
-		<autoModuleName>apache.openmeetings.util</autoModuleName>
 	</properties>
 	<build>
 		<plugins>
diff --git a/openmeetings-util/src/main/java/module-info.java b/openmeetings-util/src/main/java/module-info.java
index ecd52506e..fdb492512 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -17,32 +17,30 @@
  * under the License.
  */
 module org.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 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 org.bouncycastle.provider;
-	requires transitive jakarta.activation;
-	requires transitive org.mnode.ical4j.core;
-	requires org.aspectj.tools;
 	requires transitive javax.servlet.api;
-	requires transitive tika.core;
+	requires transitive org.apache.tika.core;
 	requires transitive spring.context;
-	requires transitive logback.classic;
-	requires transitive logback.core;
-	requires transitive dom4j;
-	requires transitive jcip.annotations;
-	requires simpleclient;
+	requires transitive org.apache.commons.codec;
 
-	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 org.bouncycastle.provider;
+	requires jakarta.activation;
+	requires org.mnode.ical4j.core;
+	requires org.aspectj.tools;
+	requires 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 5987c837c..b65dab769 100644
--- a/openmeetings-util/src/test/java/module-info.test
+++ b/openmeetings-util/src/test/java/module-info.test
@@ -16,8 +16,34 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-module org.apache.openmeetings.util.test {
-	requires transitive org.apache.openmeetings.util;
+open module org.apache.openmeetings.util {
+	// This one should be in-sync with module-info.java
+	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 org.apache.wicket.util;
+	requires transitive org.apache.wicket.core;
+	requires transitive org.apache.wicket.extensions;
+	requires transitive org.apache.commons.lang3;
+	requires transitive com.github.openjson;
+	requires transitive org.slf4j;
+	requires transitive javax.servlet.api;
+	requires transitive org.apache.tika.core;
+	requires transitive spring.context;
+	requires transitive org.apache.commons.codec;
+
+	requires org.bouncycastle.provider;
+	requires jakarta.activation;
+	requires org.mnode.ical4j.core;
+	requires org.aspectj.tools;
+	requires dom4j;
+	requires simpleclient;
+	requires ch.qos.logback.classic;
+	requires ch.qos.logback.core;
 
 	//tests
 	requires org.junit.jupiter.engine;
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 2c94d67a3..16d7bcff6 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -32,7 +32,6 @@
 	<properties>
 		<old-backups.dir>${project.build.directory}/test-data</old-backups.dir>
 		<site.basedir>${project.parent.basedir}</site.basedir>
-		<autoModuleName>apache.openmeetings.web</autoModuleName>
 	</properties>
 	<profiles>
 		<profile>
diff --git a/openmeetings-web/src/main/java/module-info.java b/openmeetings-web/src/main/java/module-info.java
new file mode 100644
index 000000000..346ccc2c1
--- /dev/null
+++ b/openmeetings-web/src/main/java/module-info.java
@@ -0,0 +1,50 @@
+/*
+ * 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.web {
+	requires org.apache.openmeetings.install;
+	requires org.apache.openmeetings.mediaserver;
+	requires org.apache.openmeetings.webservice;
+
+	requires org.apache.wicket.auth.roles;
+	requires org.apache.wicket.devutils;
+	requires wicketstuff.dashboard.core;
+	requires wicketstuff.datastore.hazelcast;
+	requires wicketstuff.select2;
+	requires wicketstuff.urlfragment;
+	requires jqplot;
+	requires jqplot4java;
+	requires wicket.bootstrap.extensions;
+	requires wicket.bootstrap.core;
+	requires wicket.bootstrap.themes;
+	requires wicket.webjars;
+	requires wicket.jquery.ui;
+	requires wicket.jquery.ui.calendar;
+	requires wicket.jquery.ui.core;
+	requires wicket.jquery.ui.plugins;
+
+	requires java.net.http;
+	requires java.sql;
+	requires javax.websocket.api;
+	requires com.hazelcast.core;
+	requires org.danekja.jdk.serializable.functional;
+	requires spring.orm;
+	requires java.management;
+	requires simpleclient.servlet;
+}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraPanel.java
index 4d0b215e1..0152a6429 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraPanel.java
@@ -68,7 +68,7 @@ public class ExtraPanel extends AdminBasePanel {
 		};
 		add(list.add(dataView).setOutputMarkupId(true));
 		final PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
-			private static final long serialVersionUID = -1L;
+			private static final long serialVersionUID = 1L;
 
 			@Override
 			protected void onEvent(AjaxRequestTarget target) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
index 05c1555a6..1b9bdd531 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
@@ -21,8 +21,7 @@ package org.apache.openmeetings.web.util.logging;
 import io.prometheus.client.exporter.MetricsServlet;
 
 public class OpenMeetingsMetricsServlet extends MetricsServlet {
-
-	private static final long serialVersionUID = -2488393857088858502L;
+	private static final long serialVersionUID = 1L;
 
 	public OpenMeetingsMetricsServlet() {
 		super();
diff --git a/openmeetings-webservice/pom.xml b/openmeetings-webservice/pom.xml
index 8c8516d56..b4aecd0cd 100644
--- a/openmeetings-webservice/pom.xml
+++ b/openmeetings-webservice/pom.xml
@@ -31,7 +31,6 @@
 	<description>Module for OpenMeetings CXF based web services.</description>
 	<properties>
 		<site.basedir>${project.parent.basedir}</site.basedir>
-		<autoModuleName>apache.openmeetings.webservice</autoModuleName>
 	</properties>
 	<build>
 		<plugins>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java b/openmeetings-webservice/src/main/java/module-info.java
similarity index 70%
copy from openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
copy to openmeetings-webservice/src/main/java/module-info.java
index 05c1555a6..9fa9d844d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
+++ b/openmeetings-webservice/src/main/java/module-info.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.web.util.logging;
 
-import io.prometheus.client.exporter.MetricsServlet;
+module org.apache.openmeetings.webservice {
+	requires transitive org.apache.openmeetings.service;
 
-public class OpenMeetingsMetricsServlet extends MetricsServlet {
-
-	private static final long serialVersionUID = -2488393857088858502L;
-
-	public OpenMeetingsMetricsServlet() {
-		super();
-		new TomcatGenericExports(false).register();
-	}
+	requires transitive java.ws.rs;
 
+	requires java.jws;
+	requires org.apache.cxf.core;
+	requires io.swagger.v3.oas.annotations;
+	requires org.apache.cxf.frontend.jaxrs;
+	requires org.apache.pdfbox;
+	requires java.desktop;
+	requires java.xml.ws;
 }
diff --git a/pom.xml b/pom.xml
index 009c96b07..42aa55350 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,6 @@
 		<om.notquick.build>true</om.notquick.build>
 		<logback.console></logback.console>
 		<db>h2</db>
-		<autoModuleName>apache.openmeetings.parent</autoModuleName>
 		<jdk.version>17</jdk.version>
 		<!-- plugin versions -->
 		<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
@@ -667,11 +666,6 @@
 				<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>
@@ -824,11 +818,6 @@
 				<artifactId>commons-io</artifactId>
 				<version>${commons-io.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.wicketstuff</groupId>
-				<artifactId>wicketstuff-datastore-hazelcast</artifactId>
-				<version>${wicketstuff.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.apache.openjpa</groupId>
 				<artifactId>openjpa</artifactId>
@@ -1222,7 +1211,6 @@
 								<Built-On>${maven.build.timestamp}</Built-On>
 								<Git-Revision>${buildNumber}</Git-Revision>
 								<Product-Version>${project.version}</Product-Version>
-								<Automatic-Module-Name>${autoModuleName}</Automatic-Module-Name>
 							</manifestEntries>
 						</archive>
 					</configuration>