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 2019/02/24 00:04:18 UTC

[wicket] branch master updated: Add Automatic-Module-Name to all released jars

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

mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/master by this push:
     new 5b1c33a  Add Automatic-Module-Name to all released jars
5b1c33a is described below

commit 5b1c33a66fc018ac8596588abab2a387cacc6366
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Sun Feb 24 02:03:08 2019 +0200

    Add Automatic-Module-Name to all released jars
    
    It is used by Java 9+ Jigsaw module system
---
 pom.xml                                                           | 3 +++
 wicket-auth-roles/pom.xml                                         | 5 +++++
 wicket-bean-validation/pom.xml                                    | 4 ++++
 wicket-cdi/pom.xml                                                | 5 +++++
 wicket-core/pom.xml                                               | 7 ++++++-
 wicket-devutils/pom.xml                                           | 5 +++++
 wicket-experimental/wicket-http2/wicket-http2-core/pom.xml        | 5 +++++
 wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml       | 5 +++++
 wicket-experimental/wicket-http2/wicket-http2-servlet4/pom.xml    | 4 ++++
 wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml      | 4 ++++
 wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml    | 4 ++++
 wicket-experimental/wicket-metrics/pom.xml                        | 5 +++++
 wicket-extensions/pom.xml                                         | 5 +++++
 wicket-guice/pom.xml                                              | 5 +++++
 wicket-ioc/pom.xml                                                | 5 +++++
 wicket-jmx/pom.xml                                                | 5 +++++
 wicket-native-websocket/wicket-native-websocket-core/pom.xml      | 4 ++++
 wicket-native-websocket/wicket-native-websocket-javax/pom.xml     | 6 +++++-
 wicket-objectsizeof-agent/src/main/resources/META-INF/MANIFEST.MF | 2 +-
 wicket-request/pom.xml                                            | 7 ++++++-
 wicket-spring/pom.xml                                             | 5 +++++
 wicket-util/pom.xml                                               | 5 +++++
 wicket-velocity/pom.xml                                           | 5 +++++
 23 files changed, 106 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2567229..79c9a7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,8 @@
 		<weld.version>3.0.4.Final</weld.version>
 		<forbiddenapis.version>2.6</forbiddenapis.version>
 		<velocity.version>1.7</velocity.version>
+
+		<automatic-module-name>MUST-BE-OVERRIDDEN-BY-MODULES</automatic-module-name>
 	</properties>
 
 	<dependencyManagement>
@@ -919,6 +921,7 @@
 								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 							</manifest>
 							<manifestEntries>
+								<Automatic-Module-Name>${automatic-module-name}</Automatic-Module-Name>
 							</manifestEntries>
 						</archive>
 					</configuration>
diff --git a/wicket-auth-roles/pom.xml b/wicket-auth-roles/pom.xml
index a724dc0..3bfc235 100644
--- a/wicket-auth-roles/pom.xml
+++ b/wicket-auth-roles/pom.xml
@@ -30,6 +30,11 @@
 		Wicket Authorization Integration Based on roles, metadata and
 		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 44e23a5..b47b0fc 100644
--- a/wicket-bean-validation/pom.xml
+++ b/wicket-bean-validation/pom.xml
@@ -11,6 +11,10 @@
 	<packaging>bundle</packaging>
 	<name>Wicket Bean Validation</name>
 
+	<properties>
+		<automatic-module-name>org.apache.wicket.bean-validation</automatic-module-name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>javax.el</groupId>
diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml
index ac6c3c2..e09abf7 100644
--- a/wicket-cdi/pom.xml
+++ b/wicket-cdi/pom.xml
@@ -34,6 +34,11 @@
 		Also enables propagation of conversations between wicket artifacts such as pages
 		and resources.
 	</description>
+
+	<properties>
+		<automatic-module-name>org.apache.wicket.cdi</automatic-module-name>
+	</properties>
+
 	<dependencyManagement>
 		<dependencies>
 			<!-- local management because we can only define one GAV in the parent -->
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index a3746b4..d597ab1 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -33,8 +33,13 @@
 		standard WYSIWYG HTML design tools. Dynamic content processing and 
 		form handling is all handled in Java code using a first-class 
 		component model backed by POJO data beans that can easily be 
-		persisted using your favorite technology. 
+		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 48bb68a..4de4ce7 100644
--- a/wicket-devutils/pom.xml
+++ b/wicket-devutils/pom.xml
@@ -31,6 +31,11 @@
 		are typically used during development only, but may be 
 		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 4ce6994..0aea4b6 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-core/pom.xml
@@ -32,6 +32,11 @@
 		is the core implementation which provides the header item
 		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-http2/wicket-http2-jetty/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
index 7a84563..736764e 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
@@ -32,6 +32,11 @@
 		is the jetty implementation to resolve the PushBuilder API and
 		provide the IInitializer.
 	</description>
+
+	<properties>
+		<automatic-module-name>org.apache.wicket.http2.jetty</automatic-module-name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
diff --git a/wicket-experimental/wicket-http2/wicket-http2-servlet4/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-servlet4/pom.xml
index fd869c9..21b7803 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-servlet4/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-servlet4/pom.xml
@@ -33,6 +33,10 @@
 		provide the IInitializer.
 	</description>
 
+	<properties>
+		<automatic-module-name>org.apache.wicket.http2.servlet4</automatic-module-name>
+	</properties>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
diff --git a/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml
index 3c06abb..cae1cc7 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-tomcat/pom.xml
@@ -33,6 +33,10 @@
 		provide the IInitializer.
 	</description>
 
+	<properties>
+		<automatic-module-name>org.apache.wicket.http2.tomcat</automatic-module-name>
+	</properties>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
diff --git a/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml
index 6b9e0de..8bfb100 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-undertow/pom.xml
@@ -33,6 +33,10 @@
 		provide the IInitializer.
 	</description>
 
+	<properties>
+		<automatic-module-name>org.apache.wicket.http2.undertow</automatic-module-name>
+	</properties>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
diff --git a/wicket-experimental/wicket-metrics/pom.xml b/wicket-experimental/wicket-metrics/pom.xml
index c4e74ad..d9c19e8 100644
--- a/wicket-experimental/wicket-metrics/pom.xml
+++ b/wicket-experimental/wicket-metrics/pom.xml
@@ -31,6 +31,11 @@
 		Wicket’s implementation to show metric information
 		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 33e6dde..06088d1 100644
--- a/wicket-extensions/pom.xml
+++ b/wicket-extensions/pom.xml
@@ -27,6 +27,11 @@
 	<packaging>bundle</packaging>
 	<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 35ea19e..d30898f 100644
--- a/wicket-guice/pom.xml
+++ b/wicket-guice/pom.xml
@@ -30,6 +30,11 @@
 		Google Guice integration in your Wicket web applications. See the
 		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 ae4280b..31c9a9b 100644
--- a/wicket-ioc/pom.xml
+++ b/wicket-ioc/pom.xml
@@ -32,6 +32,11 @@
 		Wicket IoC common dependencies for injection and proxying. Used by
 		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 c7e3b97..3e907de 100644
--- a/wicket-jmx/pom.xml
+++ b/wicket-jmx/pom.xml
@@ -27,6 +27,11 @@
 	<packaging>bundle</packaging>
 	<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 53eaa11..b4c0880 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-core/pom.xml
@@ -30,6 +30,10 @@
     <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.native-websocket.core</automatic-module-name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.wicket</groupId>
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
index ef8cfa3..aed14b0 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
+++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
@@ -28,7 +28,11 @@
 	<name>Wicket Native WebSocket Javax</name>
 	<description>Provides the common code needed for the different integrations with web container's WebSocket implementations</description>
 
-    <dependencies>
+	<properties>
+		<automatic-module-name>org.apache.wicket.native-websocket.javax</automatic-module-name>
+	</properties>
+
+	<dependencies>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
diff --git a/wicket-objectsizeof-agent/src/main/resources/META-INF/MANIFEST.MF b/wicket-objectsizeof-agent/src/main/resources/META-INF/MANIFEST.MF
index 7e3da39..302782d 100644
--- a/wicket-objectsizeof-agent/src/main/resources/META-INF/MANIFEST.MF
+++ b/wicket-objectsizeof-agent/src/main/resources/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Premain-Class: org.apache.wicket.util.instrument.ObjectSizeOfAgent
 Agent-Class: org.apache.wicket.util.instrument.ObjectSizeOfAgent
-
+Automatic-Module-Name: org.apache.wicket.objectsizeof-agent
diff --git a/wicket-request/pom.xml b/wicket-request/pom.xml
index 809edb8..ddc441b 100755
--- a/wicket-request/pom.xml
+++ b/wicket-request/pom.xml
@@ -26,7 +26,12 @@
   <packaging>bundle</packaging>
   <name>Wicket Request</name>
   <url>http://maven.apache.org</url>
-  <dependencies>
+
+    <properties>
+        <automatic-module-name>org.apache.wicket.request</automatic-module-name>
+    </properties>
+
+    <dependencies>
     <dependency>
       <groupId>org.apache.wicket</groupId>
       <artifactId>wicket-util</artifactId>
diff --git a/wicket-spring/pom.xml b/wicket-spring/pom.xml
index bd615c4..9ba02b1 100644
--- a/wicket-spring/pom.xml
+++ b/wicket-spring/pom.xml
@@ -27,6 +27,11 @@
 	<packaging>bundle</packaging>
 	<name>Wicket Spring Integration</name>
 	<description>Integration project to use Spring injection in your Wicket applications. See the wicket-spring-examples for integration patterns.</description>
+
+	<properties>
+		<automatic-module-name>org.apache.wicket.spring</automatic-module-name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index f7ad0b1..3aa27dd 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -26,6 +26,11 @@
 	<artifactId>wicket-util</artifactId>
 	<packaging>bundle</packaging>
 	<name>Wicket Util</name>
+
+	<properties>
+		<automatic-module-name>org.apache.wicket.util</automatic-module-name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>commons-fileupload</groupId>
diff --git a/wicket-velocity/pom.xml b/wicket-velocity/pom.xml
index 49f59cd..7224c72 100644
--- a/wicket-velocity/pom.xml
+++ b/wicket-velocity/pom.xml
@@ -31,6 +31,11 @@
 		users to work with Velocity and Wicket. Particularly useful for
 		simple CMS like applications.
 	</description>
+
+	<properties>
+		<automatic-module-name>org.apache.wicket.velocity</automatic-module-name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>commons-collections</groupId>