This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new 157cedb5 JOHNZON-305 : Java Modules (#99)
157cedb5 is described below
commit 157cedb52c8b4245e60af6dec88a144fc6595814
Author: Samael <[email protected]>
AuthorDate: Fri Jan 27 09:05:43 2023 +0000
JOHNZON-305 : Java Modules (#99)
* JOHNZON-305: Add Automatic-Module-Name to manifest
* JOHNZON-305: core and jaxrs now use module-info
* configure Automatic-Module-Name in other modules
* set Automatic-Module-Name using bundle plugin
---
johnzon-core/pom.xml | 1 +
johnzon-jaxrs/pom.xml | 9 +++++++++
johnzon-jsonb/pom.xml | 1 +
johnzon-jsonlogic/pom.xml | 9 +++++++++
johnzon-jsonschema/pom.xml | 9 +++++++++
johnzon-mapper/pom.xml | 1 +
johnzon-websocket/pom.xml | 27 ++++++++++++++++++---------
pom.xml | 1 +
8 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml
index e17434d7..00cf51c4 100644
--- a/johnzon-core/pom.xml
+++ b/johnzon-core/pom.xml
@@ -40,6 +40,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
+
<Automatic-Module-Name>org.apache.johnzon.core</Automatic-Module-Name>
<Require-Capability>osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
<Provide-Capability>osgi.serviceloader;osgi.serviceloader=jakarta.json.spi.JsonProvider</Provide-Capability>
</instructions>
diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml
index c408766c..3ca4a654 100644
--- a/johnzon-jaxrs/pom.xml
+++ b/johnzon-jaxrs/pom.xml
@@ -65,6 +65,15 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Automatic-Module-Name>org.apache.johnzon.jaxrs</Automatic-Module-Name>
+ </instructions>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml
index 7bcfd30b..5ad89d04 100644
--- a/johnzon-jsonb/pom.xml
+++ b/johnzon-jsonb/pom.xml
@@ -144,6 +144,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
+
<Automatic-Module-Name>org.apache.johnzon.jsonb</Automatic-Module-Name>
<Import-Package>
javax.ws.rs.*;resolution:=optional,
*
diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml
index 48cffa60..e2a47521 100644
--- a/johnzon-jsonlogic/pom.xml
+++ b/johnzon-jsonlogic/pom.xml
@@ -40,6 +40,15 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Automatic-Module-Name>org.apache.johnzon.jsonlogic</Automatic-Module-Name>
+ </instructions>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml
index 21347f86..d4e65049 100644
--- a/johnzon-jsonschema/pom.xml
+++ b/johnzon-jsonschema/pom.xml
@@ -54,6 +54,15 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Automatic-Module-Name>org.apache.johnzon.jsonschema</Automatic-Module-Name>
+ </instructions>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml
index 312b5343..c4666137 100644
--- a/johnzon-mapper/pom.xml
+++ b/johnzon-mapper/pom.xml
@@ -78,6 +78,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
+
<Automatic-Module-Name>org.apache.johnzon.mapper</Automatic-Module-Name>
<Export-Package>{local-packages};-split-package:=error,org.apache.johnzon.mapper.internal</Export-Package>
</instructions>
</configuration>
diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml
index d8adbf69..a86963ea 100644
--- a/johnzon-websocket/pom.xml
+++ b/johnzon-websocket/pom.xml
@@ -144,15 +144,24 @@
</testResources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
-
<openejb.deployer.repository>https://repo1.maven.org/maven2/</openejb.deployer.repository>
- </systemPropertyVariables>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+
<openejb.deployer.repository>https://repo1.maven.org/maven2/</openejb.deployer.repository>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Automatic-Module-Name>org.apache.johnzon.websocket</Automatic-Module-Name>
+ </instructions>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 521f2d10..86e68aa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,6 +304,7 @@
</executions>
<configuration>
<encoding>UTF-8</encoding>
+ <excludes>**/module-info*</excludes>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
