You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2021/07/01 11:57:50 UTC
[wicket] branch wicket-9.x-with-jpms updated: Remove automatic
module names
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch wicket-9.x-with-jpms
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/wicket-9.x-with-jpms by this push:
new 2565ade Remove automatic module names
2565ade is described below
commit 2565ade1df3be5495e7957ec7ae8870b3ad6635e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Thu Jul 1 14:57:28 2021 +0300
Remove automatic module names
---
pom.xml | 4 ----
testing/wicket-common-tests/pom.xml | 1 -
testing/wicket-js-tests/pom.xml | 1 -
wicket-auth-roles/pom.xml | 4 ----
wicket-bean-validation/pom.xml | 4 ----
wicket-cdi/pom.xml | 4 ----
wicket-core/pom.xml | 4 ----
wicket-devutils/pom.xml | 4 ----
.../wicket-http2/wicket-http2-core/pom.xml | 4 ----
wicket-experimental/wicket-metrics/pom.xml | 4 ----
wicket-extensions/pom.xml | 4 ----
wicket-guice/pom.xml | 4 ----
wicket-ioc/pom.xml | 4 ----
wicket-jmx/pom.xml | 4 ----
.../wicket-native-websocket-core/pom.xml | 4 ----
.../src/main/java/module-info.java | 2 +-
.../wicket-native-websocket-javax/pom.xml | 4 ----
.../src/main/java/module-info.java | 4 ++--
wicket-objectsizeof-agent/pom.xml | 4 ----
wicket-objectsizeof-agent/src/main/java/module-info.java | 16 +++++++++++++++-
20 files changed, 18 insertions(+), 66 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5962314..da78e5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,6 @@
<maven-war-plugin.version>3.3.1</maven-war-plugin.version>
<yuicompressor-maven-plugin.version>1.5.1</yuicompressor-maven-plugin.version>
- <automatic-module-name>MUST-BE-OVERRIDDEN-BY-MODULES</automatic-module-name>
</properties>
<dependencyManagement>
@@ -1002,9 +1001,6 @@
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
- <manifestEntries>
- <Automatic-Module-Name>${automatic-module-name}</Automatic-Module-Name>
- </manifestEntries>
</archive>
</configuration>
</plugin>
diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml
index 08c67bf..99bf234 100644
--- a/testing/wicket-common-tests/pom.xml
+++ b/testing/wicket-common-tests/pom.xml
@@ -29,7 +29,6 @@
<description>Tests for all Wicket modules</description>
<properties>
- <automatic-module-name>org.apache.wicket.common.tests</automatic-module-name>
<clirr.skip>true</clirr.skip>
</properties>
diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml
index 0d3f3b0..776c6f1 100644
--- a/testing/wicket-js-tests/pom.xml
+++ b/testing/wicket-js-tests/pom.xml
@@ -29,7 +29,6 @@
<description>JavaScript tests for all Wicket modules</description>
<properties>
- <automatic-module-name>org.apache.wicket.js.tests</automatic-module-name>
<clirr.skip>true</clirr.skip>
</properties>
diff --git a/wicket-auth-roles/pom.xml b/wicket-auth-roles/pom.xml
index daba532..8322d85 100644
--- a/wicket-auth-roles/pom.xml
+++ b/wicket-auth-roles/pom.xml
@@ -31,10 +31,6 @@
annotations.
</description>
- <properties>
- <automatic-module-name>org.apache.wicket.auth.roles</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml
index 7dd268c..7cb6ccf 100644
--- a/wicket-bean-validation/pom.xml
+++ b/wicket-bean-validation/pom.xml
@@ -11,10 +11,6 @@
<packaging>bundle</packaging>
<name>Wicket Bean Validation</name>
- <properties>
- <automatic-module-name>org.apache.wicket.bean.validation</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>jakarta.el</groupId>
diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml
index f4f7620..060447f 100644
--- a/wicket-cdi/pom.xml
+++ b/wicket-cdi/pom.xml
@@ -33,10 +33,6 @@
and resources.
</description>
- <properties>
- <automatic-module-name>org.apache.wicket.cdi</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>jakarta.annotation</groupId>
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index 5311dff..a68a398 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -36,10 +36,6 @@
persisted using your favorite technology.
</description>
- <properties>
- <automatic-module-name>org.apache.wicket.core</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.hamcrest</groupId>
diff --git a/wicket-devutils/pom.xml b/wicket-devutils/pom.xml
index 8c6ef6e..2bc742b 100644
--- a/wicket-devutils/pom.xml
+++ b/wicket-devutils/pom.xml
@@ -32,10 +32,6 @@
turned on for additional production debugging.
</description>
- <properties>
- <automatic-module-name>org.apache.wicket.devutils</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
diff --git a/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml
index e57a8ae..d3a9a54 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml
@@ -33,10 +33,6 @@
that uses the API.
</description>
- <properties>
- <automatic-module-name>org.apache.wicket.http2.core</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
diff --git a/wicket-experimental/wicket-metrics/pom.xml b/wicket-experimental/wicket-metrics/pom.xml
index 599d7e8..3d54c37 100644
--- a/wicket-experimental/wicket-metrics/pom.xml
+++ b/wicket-experimental/wicket-metrics/pom.xml
@@ -32,10 +32,6 @@
about web applications build on the web framework.
</description>
- <properties>
- <automatic-module-name>org.apache.wicket.metrics</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/wicket-extensions/pom.xml b/wicket-extensions/pom.xml
index 572a7fa..c78e9b3 100644
--- a/wicket-extensions/pom.xml
+++ b/wicket-extensions/pom.xml
@@ -28,10 +28,6 @@
<name>Wicket Extensions</name>
<description>Wicket Extensions is a rich component library for the Wicket framework.</description>
- <properties>
- <automatic-module-name>org.apache.wicket.extensions</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/wicket-guice/pom.xml b/wicket-guice/pom.xml
index 72e18e4..d4201ee 100644
--- a/wicket-guice/pom.xml
+++ b/wicket-guice/pom.xml
@@ -31,10 +31,6 @@
examples project for usecases.
</description>
- <properties>
- <automatic-module-name>org.apache.wicket.guice</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>com.google.inject</groupId>
diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml
index 9d0a283..0ea9594 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -31,10 +31,6 @@
Spring, Guice, etc.
</description>
- <properties>
- <automatic-module-name>org.apache.wicket.ioc</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>cglib</groupId>
diff --git a/wicket-jmx/pom.xml b/wicket-jmx/pom.xml
index 662d6f5..22d0401 100644
--- a/wicket-jmx/pom.xml
+++ b/wicket-jmx/pom.xml
@@ -28,10 +28,6 @@
<name>Wicket JMX</name>
<description>Wicket Java Management Extensions</description>
- <properties>
- <automatic-module-name>org.apache.wicket.jmx</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>cglib</groupId>
diff --git a/wicket-native-websocket/wicket-native-websocket-core/pom.xml b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
index 567231c..2d1770a 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
@@ -30,10 +30,6 @@
<name>Wicket Native WebSocket Core</name>
<description>Provides the common code needed for the different integrations with web container's WebSocket implementations</description>
- <properties>
- <automatic-module-name>org.apache.wicket.websocket.core</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/module-info.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/module-info.java
index 0ab0bf7..756e180 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/module-info.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/module-info.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-module org.apache.wicket.native_websocket.core {
+module org.apache.wicket.websocket.core {
requires org.apache.wicket.util;
requires org.apache.wicket.request;
requires org.apache.wicket.core;
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
index cfc1376..a331689 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
@@ -28,10 +28,6 @@
<name>Wicket Native WebSocket Javax</name>
<description>Provides the common code needed for the different integrations with web container's WebSocket implementations</description>
- <properties>
- <automatic-module-name>org.apache.wicket.websocket.javax</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>jakarta.websocket</groupId>
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/module-info.java b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/module-info.java
index 32aee40..7c985ad 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/module-info.java
+++ b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/module-info.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-module org.apache.wicket.native_websocket.javax {
+module org.apache.wicket.websocket.javax {
requires org.apache.wicket.util;
requires org.apache.wicket.request;
requires org.apache.wicket.core;
- requires org.apache.wicket.native_websocket.core;
+ requires org.apache.wicket.websocket.core;
requires javax.servlet.api;
requires jakarta.websocket.api;
requires org.slf4j;
diff --git a/wicket-objectsizeof-agent/pom.xml b/wicket-objectsizeof-agent/pom.xml
index ef3f421..1f23b80 100644
--- a/wicket-objectsizeof-agent/pom.xml
+++ b/wicket-objectsizeof-agent/pom.xml
@@ -28,10 +28,6 @@
<name>Wicket Objects Sizeof Agent</name>
<description>Agent for pluggin in object size measurements using instrumentation</description>
- <properties>
- <automatic-module-name>org.apache.wicket.objectsizeof.agent</automatic-module-name>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
diff --git a/wicket-objectsizeof-agent/src/main/java/module-info.java b/wicket-objectsizeof-agent/src/main/java/module-info.java
index a680487..5b29867 100644
--- a/wicket-objectsizeof-agent/src/main/java/module-info.java
+++ b/wicket-objectsizeof-agent/src/main/java/module-info.java
@@ -1,6 +1,20 @@
-/**
+/*
+ * 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.wicket.objectsizeof.agent {
requires java.instrument;
requires org.slf4j;