From 26cbadccf88518d97793293c37c8e26d4c550285 Mon Sep 17 00:00:00 2001
From: GedMarc <ged_marc@hotmail.com>
Date: Sat, 20 Feb 2021 12:15:50 +0200
Subject: [PATCH 1/2] Transform Service Loaders, and Manifests for Jakarta
 Artifacts

---
 base/pom.xml      | 23 +++++++++++++++++++
 datatypes/pom.xml | 23 +++++++++++++++++++
 json/pom.xml      | 23 +++++++++++++++++++
 xml/pom.xml       | 57 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 126 insertions(+)

diff --git a/base/pom.xml b/base/pom.xml
index f21f9ea1..98f61a74 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -83,10 +83,33 @@ ${project.groupId}.annotation.*;version=${project.version}
                   <pattern>javax.ws.rs</pattern>
                   <shadedPattern>jakarta.ws.rs</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>javax.annotation</pattern>
+                  <shadedPattern>jakarta.annotation</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>javax.validation</pattern>
+                  <shadedPattern>jakarta.validation</shadedPattern>
+                </relocation>
               </relocations>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                <transformer implementation="io.yupiik.maven.shade.transformer.RelocationTransformer">
+                  <delegates>
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+                  </delegates>
+                </transformer>
+              </transformers>
             </configuration>
           </execution>
         </executions>
+        <dependencies>
+          <dependency>
+            <groupId>io.yupiik.maven</groupId>
+            <artifactId>maven-shade-transformers</artifactId>
+            <version>0.0.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
 
     </plugins>
diff --git a/datatypes/pom.xml b/datatypes/pom.xml
index cecc4291..eed5f02f 100644
--- a/datatypes/pom.xml
+++ b/datatypes/pom.xml
@@ -108,10 +108,33 @@
                   <pattern>javax.ws.rs</pattern>
                   <shadedPattern>jakarta.ws.rs</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>javax.annotation</pattern>
+                  <shadedPattern>jakarta.annotation</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>javax.validation</pattern>
+                  <shadedPattern>jakarta.validation</shadedPattern>
+                </relocation>
               </relocations>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                <transformer implementation="io.yupiik.maven.shade.transformer.RelocationTransformer">
+                  <delegates>
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+                  </delegates>
+                </transformer>
+              </transformers>
             </configuration>
           </execution>
         </executions>
+        <dependencies>
+          <dependency>
+            <groupId>io.yupiik.maven</groupId>
+            <artifactId>maven-shade-transformers</artifactId>
+            <version>0.0.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
 
     </plugins>
diff --git a/json/pom.xml b/json/pom.xml
index 8497134b..dcf3b6b9 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -143,10 +143,33 @@
                   <pattern>javax.ws.rs</pattern>
                   <shadedPattern>jakarta.ws.rs</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>javax.annotation</pattern>
+                  <shadedPattern>jakarta.annotation</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>javax.validation</pattern>
+                  <shadedPattern>jakarta.validation</shadedPattern>
+                </relocation>
               </relocations>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                <transformer implementation="io.yupiik.maven.shade.transformer.RelocationTransformer">
+                  <delegates>
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+                  </delegates>
+                </transformer>
+              </transformers>
             </configuration>
           </execution>
         </executions>
+        <dependencies>
+          <dependency>
+            <groupId>io.yupiik.maven</groupId>
+            <artifactId>maven-shade-transformers</artifactId>
+            <version>0.0.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>
diff --git a/xml/pom.xml b/xml/pom.xml
index 6864b9c1..7a683f8f 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -113,6 +113,63 @@
         <groupId>org.moditect</groupId>
         <artifactId>moditect-maven-plugin</artifactId>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>jakarta</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <shadedArtifactAttached>true</shadedArtifactAttached>
+              <shadedClassifierName>jakarta</shadedClassifierName>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
+              <artifactSet>
+                <includes>
+                  <include>${project.groupId}:${project.artifactId}</include>
+                </includes>
+              </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>javax.xml.bind</pattern>
+                  <shadedPattern>jakarta.xml.bind</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>javax.ws.rs</pattern>
+                  <shadedPattern>jakarta.ws.rs</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>javax.annotation</pattern>
+                  <shadedPattern>jakarta.annotation</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>javax.validation</pattern>
+                  <shadedPattern>jakarta.validation</shadedPattern>
+                </relocation>
+              </relocations>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                <transformer implementation="io.yupiik.maven.shade.transformer.RelocationTransformer">
+                  <delegates>
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+                  </delegates>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>io.yupiik.maven</groupId>
+            <artifactId>maven-shade-transformers</artifactId>
+            <version>0.0.1</version>
+          </dependency>
+        </dependencies>
+      </plugin>
     </plugins>
   </build>
 </project>

From 0fc32eb3530cb12da5d9ab1e068ac4f93d9ca13d Mon Sep 17 00:00:00 2001
From: GedMarc <ged_marc@hotmail.com>
Date: Mon, 22 Feb 2021 11:11:55 +0200
Subject: [PATCH 2/2] Create manifest files separately and reference in bundle
 plugin, THEN shade in the new manifest for jakarta separately before install

https://github.com/FasterXML/jackson-jaxrs-providers/issues/132
---
 base/pom.xml      | 54 +++++++++++++++++++++++++++++++++++++++++++----
 datatypes/pom.xml | 54 +++++++++++++++++++++++++++++++++++++++++++----
 json/pom.xml      | 54 +++++++++++++++++++++++++++++++++++++++++++----
 pom.xml           |  8 ++++---
 xml/pom.xml       | 54 +++++++++++++++++++++++++++++++++++++++++++----
 5 files changed, 205 insertions(+), 19 deletions(-)

diff --git a/base/pom.xml b/base/pom.xml
index 98f61a74..a62bc900 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -74,6 +74,14 @@ ${project.groupId}.annotation.*;version=${project.version}
                   <include>${project.groupId}:${project.artifactId}</include>
                 </includes>
               </artifactSet>
+              <filters>
+                <filter>
+                  <artifact>${project.groupId}:${project.artifactId}</artifact>
+                  <excludes>
+                    <exclude>META-INF/MANIFEST.MF</exclude>
+                  </excludes>
+                </filter>
+              </filters>
               <relocations>
                 <relocation>
                   <pattern>javax.xml.bind</pattern>
@@ -94,10 +102,9 @@ ${project.groupId}.annotation.*;version=${project.version}
               </relocations>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                <transformer implementation="io.yupiik.maven.shade.transformer.RelocationTransformer">
-                  <delegates>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
-                  </delegates>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                  <resource>META-INF/MANIFEST.MF</resource>
+                  <file>${build.directory}/jakarta/MANIFEST.MF</file>
                 </transformer>
               </transformers>
             </configuration>
@@ -112,6 +119,45 @@ ${project.groupId}.annotation.*;version=${project.version}
         </dependencies>
       </plugin>
 
+  <!-- Jakarta bundle fix - nb place last for execution order on package phase
+  @gedmarc 20210222-->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>5.1.1</version>
+        <executions>
+          <execution>
+            <id>default_bundle</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>bundle</goal>
+            </goals>
+            <configuration>
+              <manifestLocation>${build.directory}/javax</manifestLocation>
+              <packaging>jar</packaging>
+              <instructions>
+                <_nouses>false</_nouses>
+              </instructions>
+            </configuration>
+          </execution>
+          <execution>
+            <id>bundle_jakarta_manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <configuration>
+              <manifestLocation>${build.directory}/jakarta</manifestLocation>
+              <classifier>jakarta</classifier>
+              <packaging>jar</packaging>
+              <instructions>
+                <Import-Package>jakarta.ws.rs;version="[3.0,4)",jakarta.ws.rs.core;version="[3.0,4)",jakarta.ws.rs.ext;version="[3.0,4)",!javax.ws*,*</Import-Package>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 </project>
diff --git a/datatypes/pom.xml b/datatypes/pom.xml
index eed5f02f..faa4db85 100644
--- a/datatypes/pom.xml
+++ b/datatypes/pom.xml
@@ -99,6 +99,14 @@
                   <include>${project.groupId}:${project.artifactId}</include>
                 </includes>
               </artifactSet>
+              <filters>
+                <filter>
+                  <artifact>${project.groupId}:${project.artifactId}</artifact>
+                  <excludes>
+                    <exclude>META-INF/MANIFEST.MF</exclude>
+                  </excludes>
+                </filter>
+              </filters>
               <relocations>
                 <relocation>
                   <pattern>javax.xml.bind</pattern>
@@ -119,10 +127,9 @@
               </relocations>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                <transformer implementation="io.yupiik.maven.shade.transformer.RelocationTransformer">
-                  <delegates>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
-                  </delegates>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                  <resource>META-INF/MANIFEST.MF</resource>
+                  <file>${build.directory}/jakarta/MANIFEST.MF</file>
                 </transformer>
               </transformers>
             </configuration>
@@ -137,6 +144,45 @@
         </dependencies>
       </plugin>
 
+      <!-- Jakarta bundle fix - nb place last for execution order on package phase
+      @gedmarc 20210222-->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>5.1.1</version>
+        <executions>
+          <execution>
+            <id>default_bundle</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>bundle</goal>
+            </goals>
+            <configuration>
+              <manifestLocation>${build.directory}/javax</manifestLocation>
+              <packaging>jar</packaging>
+              <instructions>
+                <_nouses>false</_nouses>
+              </instructions>
+            </configuration>
+          </execution>
+          <execution>
+            <id>bundle_jakarta_manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <configuration>
+              <manifestLocation>${build.directory}/jakarta</manifestLocation>
+              <classifier>jakarta</classifier>
+              <packaging>jar</packaging>
+              <instructions>
+                <Import-Package>jakarta.ws.rs;version="[3.0,4)",jakarta.ws.rs.core;version="[3.0,4)",jakarta.ws.rs.ext;version="[3.0,4)",!javax.ws*,*</Import-Package>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 </project>
diff --git a/json/pom.xml b/json/pom.xml
index dcf3b6b9..9ef727e3 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -134,6 +134,14 @@
                   <include>${project.groupId}:${project.artifactId}</include>
                 </includes>
               </artifactSet>
+              <filters>
+                <filter>
+                  <artifact>${project.groupId}:${project.artifactId}</artifact>
+                  <excludes>
+                    <exclude>META-INF/MANIFEST.MF</exclude>
+                  </excludes>
+                </filter>
+              </filters>
               <relocations>
                 <relocation>
                   <pattern>javax.xml.bind</pattern>
@@ -154,10 +162,9 @@
               </relocations>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                <transformer implementation="io.yupiik.maven.shade.transformer.RelocationTransformer">
-                  <delegates>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
-                  </delegates>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                  <resource>META-INF/MANIFEST.MF</resource>
+                  <file>${build.directory}/jakarta/MANIFEST.MF</file>
                 </transformer>
               </transformers>
             </configuration>
@@ -171,6 +178,45 @@
           </dependency>
         </dependencies>
       </plugin>
+
+      <!-- Jakarta bundle fix - nb place last for execution order on package phase
+      @gedmarc 20210222-->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>5.1.1</version>
+        <executions>
+          <execution>
+            <id>default_bundle</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>bundle</goal>
+            </goals>
+            <configuration>
+              <manifestLocation>${build.directory}/javax</manifestLocation>
+              <packaging>jar</packaging>
+              <instructions>
+                <_nouses>false</_nouses>
+              </instructions>
+            </configuration>
+          </execution>
+          <execution>
+            <id>bundle_jakarta_manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <configuration>
+              <manifestLocation>${build.directory}/jakarta</manifestLocation>
+              <classifier>jakarta</classifier>
+              <packaging>jar</packaging>
+              <instructions>
+                <Import-Package>jakarta.ws.rs;version="[3.0,4)",jakarta.ws.rs.core;version="[3.0,4)",jakarta.ws.rs.ext;version="[3.0,4)",!javax.ws*,*</Import-Package>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/pom.xml b/pom.xml
index a5ed148b..9f33b055 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,13 +131,14 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>5.1.1</version>
           <configuration>
             <instructions>
               <_nouses>false</_nouses>
             </instructions>
           </configuration>
         </plugin>
+
         <plugin>
           <!-- Inherited from oss-base. Generate PackageVersion.java.-->
           <groupId>com.google.code.maven-replacer-plugin</groupId>
@@ -155,10 +156,11 @@
 
     <!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
     <plugins>
-      <plugin>
+
+     <plugin>
         <groupId>de.jjohannes</groupId>
         <artifactId>gradle-module-metadata-maven-plugin</artifactId>
-      </plugin>    
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/xml/pom.xml b/xml/pom.xml
index 7a683f8f..43db6ffe 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -133,6 +133,14 @@
                   <include>${project.groupId}:${project.artifactId}</include>
                 </includes>
               </artifactSet>
+              <filters>
+                <filter>
+                  <artifact>${project.groupId}:${project.artifactId}</artifact>
+                  <excludes>
+                    <exclude>META-INF/MANIFEST.MF</exclude>
+                  </excludes>
+                </filter>
+              </filters>
               <relocations>
                 <relocation>
                   <pattern>javax.xml.bind</pattern>
@@ -153,10 +161,9 @@
               </relocations>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                <transformer implementation="io.yupiik.maven.shade.transformer.RelocationTransformer">
-                  <delegates>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
-                  </delegates>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                  <resource>META-INF/MANIFEST.MF</resource>
+                  <file>${build.directory}/jakarta/MANIFEST.MF</file>
                 </transformer>
               </transformers>
             </configuration>
@@ -170,6 +177,45 @@
           </dependency>
         </dependencies>
       </plugin>
+
+      <!-- Jakarta bundle fix - nb place last for execution order on package phase
+      @gedmarc 20210222-->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>5.1.1</version>
+        <executions>
+          <execution>
+            <id>default_bundle</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>bundle</goal>
+            </goals>
+            <configuration>
+              <manifestLocation>${build.directory}/javax</manifestLocation>
+              <packaging>jar</packaging>
+              <instructions>
+                <_nouses>false</_nouses>
+              </instructions>
+            </configuration>
+          </execution>
+          <execution>
+            <id>bundle_jakarta_manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <configuration>
+              <manifestLocation>${build.directory}/jakarta</manifestLocation>
+              <classifier>jakarta</classifier>
+              <packaging>jar</packaging>
+              <instructions>
+                <Import-Package>jakarta.ws.rs;version="[3.0,4)",jakarta.ws.rs.core;version="[3.0,4)",jakarta.ws.rs.ext;version="[3.0,4)",!javax.ws*,*</Import-Package>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>