From b34d8f8f46418e4f60b2c38a740669456ec3e3c2 Mon Sep 17 00:00:00 2001
From: Andreas Hager <andy@mazebert.com>
Date: Sun, 7 Feb 2021 10:03:17 +0100
Subject: [PATCH 1/3] Add automatic module name

---
 META-INF/MANIFEST.MF | 1 +
 1 file changed, 1 insertion(+)

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 2aaee67..992fb32 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -7,3 +7,4 @@ Bundle-Version: 1.2.1
 Created-By: 1.8.0_181 (Oracle Corporation)
 Export-Package: org.owasp.encoder
 Tool: Bnd-1.50.0
+Automatic-Module-Name: org.owasp.encoder

From 1e858125ef482877030ac906e7d0bf6a67f1e18f Mon Sep 17 00:00:00 2001
From: Andreas Hager <andy@mazebert.com>
Date: Sun, 7 Feb 2021 10:58:16 +0100
Subject: [PATCH 2/3] Revert adding Automatic-Modulue-Name to root MANIFEST.MF

---
 META-INF/MANIFEST.MF | 1 -
 1 file changed, 1 deletion(-)

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 992fb32..2aaee67 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -7,4 +7,3 @@ Bundle-Version: 1.2.1
 Created-By: 1.8.0_181 (Oracle Corporation)
 Export-Package: org.owasp.encoder
 Tool: Bnd-1.50.0
-Automatic-Module-Name: org.owasp.encoder

From f5bb67496a874f04828395016cb6b0b1d95c35e9 Mon Sep 17 00:00:00 2001
From: Andreas Hager <andy@mazebert.com>
Date: Sun, 7 Feb 2021 10:59:04 +0100
Subject: [PATCH 3/3] Add Automatic-Modulue-Name via apache felix bundle plugin
 for each module.

---
 core/pom.xml  | 4 ++++
 esapi/pom.xml | 4 ++++
 jsp/pom.xml   | 4 ++++
 pom.xml       | 1 +
 4 files changed, 13 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index ad329f1..29baed5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -56,6 +56,10 @@
         Scripting.
     </description>
 
+    <properties>
+        <jigsaw.module.name>org.owasp.encoder</jigsaw.module.name>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
diff --git a/esapi/pom.xml b/esapi/pom.xml
index 263f4e0..fbf5c1f 100644
--- a/esapi/pom.xml
+++ b/esapi/pom.xml
@@ -54,6 +54,10 @@
         Projects API into an implementation of ESAPI.
     </description>
 
+    <properties>
+        <jigsaw.module.name>org.owasp.encoder.esapi</jigsaw.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.owasp.encoder</groupId>
diff --git a/jsp/pom.xml b/jsp/pom.xml
index f720cb6..2b25fac 100644
--- a/jsp/pom.xml
+++ b/jsp/pom.xml
@@ -55,6 +55,10 @@
         definitions and JSP EL functions.
     </description>
 
+    <properties>
+        <jigsaw.module.name>org.owasp.encoder.jsp</jigsaw.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.owasp.encoder</groupId>
diff --git a/pom.xml b/pom.xml
index d3ea074..5d1a085 100755
--- a/pom.xml
+++ b/pom.xml
@@ -285,6 +285,7 @@
                             <instructions>
                                 <_noee>true</_noee>
                                 <_nouses>true</_nouses>
+                                <Automatic-Module-Name>${jigsaw.module.name}</Automatic-Module-Name>
                             </instructions>
                         </configuration>
                     </execution>