From e4dacd7fe7d622d89e47face56cbf618088b5c04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raymond=20Aug=C3=A9?= <raymond.auge@liferay.com>
Date: Thu, 17 Dec 2020 23:15:33 -0500
Subject: [PATCH] Migrate from maven-bundle-plugin to bnd-maven-plugin for
 finer OSGi metadata
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes #3842

Signed-off-by: Raymond Augé <raymond.auge@liferay.com>
---
 modules/swagger-annotations/pom.xml           | 20 +++++---
 modules/swagger-core/pom.xml                  | 25 ++++++----
 modules/swagger-integration/pom.xml           | 28 ++++++-----
 .../pom.xml                                   | 29 +++++------
 .../pom.xml                                   | 32 ++++++------
 modules/swagger-jaxrs2/pom.xml                | 32 +++++-------
 modules/swagger-models/pom.xml                | 34 +++++--------
 pom.xml                                       | 50 ++++++++++++++++---
 8 files changed, 142 insertions(+), 108 deletions(-)

diff --git a/modules/swagger-annotations/pom.xml b/modules/swagger-annotations/pom.xml
index cdc39b8ff2..e6eb2155fc 100644
--- a/modules/swagger-annotations/pom.xml
+++ b/modules/swagger-annotations/pom.xml
@@ -8,7 +8,6 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>swagger-annotations</artifactId>
-    <packaging>bundle</packaging>
     <name>swagger-annotations</name>
     <description>swagger-annotations</description>
     <build>
@@ -16,14 +15,19 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${felix-version}</version>
-                <extensions>true</extensions>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <instructions>
-                        <Automatic-Module-Name>io.swagger.v3.oas.annotations</Automatic-Module-Name>
-                    </instructions>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Automatic-Module-Name>io.swagger.v3.oas.annotations</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/swagger-core/pom.xml b/modules/swagger-core/pom.xml
index a860166a95..99dfdbb071 100644
--- a/modules/swagger-core/pom.xml
+++ b/modules/swagger-core/pom.xml
@@ -8,7 +8,6 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>swagger-core</artifactId>
-    <packaging>bundle</packaging>
     <name>swagger-core</name>
     <description>swagger-core</description>
     <build>
@@ -29,15 +28,12 @@
         </testResources>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${felix-version}</version>
-                <extensions>true</extensions>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
                 <configuration>
-                    <instructions>
-                        <Automatic-Module-Name>io.swagger.v3.core</Automatic-Module-Name>
-                        <Import-Package>javax.validation.constraints;version="[1.1,3)",*</Import-Package>
-                    </instructions>
+                    <bnd>
+                        Import-Package: javax.validation.constraints;version="[1.1,3)",*
+                    </bnd>
                 </configuration>
             </plugin>
             <plugin>
@@ -45,6 +41,17 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.2.0</version>
                 <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <configuration>
+                            <archive>
+                                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                <manifestEntries>
+                                    <Automatic-Module-Name>io.swagger.v3.core</Automatic-Module-Name>
+                                </manifestEntries>
+                            </archive>
+                        </configuration>
+                    </execution>
                     <execution>
                         <goals>
                             <goal>test-jar</goal>
diff --git a/modules/swagger-integration/pom.xml b/modules/swagger-integration/pom.xml
index 8b747a6e59..17b98ccf60 100644
--- a/modules/swagger-integration/pom.xml
+++ b/modules/swagger-integration/pom.xml
@@ -10,7 +10,6 @@
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>swagger-integration</artifactId>
-	<packaging>bundle</packaging>
 	<name>swagger-integration</name>
 	<description>swagger-integration</description>
 	<dependencies>
@@ -43,17 +42,22 @@
 		<sourceDirectory>src/main/java</sourceDirectory>
 		<defaultGoal>install</defaultGoal>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${felix-version}</version>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Automatic-Module-Name>io.swagger.v3.oas.integration</Automatic-Module-Name>
-					</instructions>
-				</configuration>
-			</plugin>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+						<manifestEntries>
+							<Automatic-Module-Name>io.swagger.v3.oas.integration</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/modules/swagger-jaxrs2-servlet-initializer-v2/pom.xml b/modules/swagger-jaxrs2-servlet-initializer-v2/pom.xml
index 5a702972ac..6389f13145 100644
--- a/modules/swagger-jaxrs2-servlet-initializer-v2/pom.xml
+++ b/modules/swagger-jaxrs2-servlet-initializer-v2/pom.xml
@@ -10,7 +10,6 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>swagger-jaxrs2-servlet-initializer-v2</artifactId>
-    <packaging>bundle</packaging>
     <name>swagger-jaxrs2-servlet-initializer-v2</name>
     <description>swagger-servlet-initializer-v2</description>
     <build>
@@ -23,22 +22,20 @@
         </testResources>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${felix-version}</version>
-                <extensions>true</extensions>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <instructions>
-                        <Export-Package>
-                            io.swagger.v3.jaxrs2.integration.servlet
-                        </Export-Package>
-                        <Import-Package>
-                            javax.ws.rs*;version="2.0",
-                            *
-                        </Import-Package>
-                        <Automatic-Module-Name>io.swagger.v3.jaxrs2.integration.servlet</Automatic-Module-Name>
-                    </instructions>
-                </configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Automatic-Module-Name>io.swagger.v3.jaxrs2.integration.servlet</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+            </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/modules/swagger-jaxrs2-servlet-initializer/pom.xml b/modules/swagger-jaxrs2-servlet-initializer/pom.xml
index fbb3f6568f..e20cafd657 100644
--- a/modules/swagger-jaxrs2-servlet-initializer/pom.xml
+++ b/modules/swagger-jaxrs2-servlet-initializer/pom.xml
@@ -10,7 +10,6 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>swagger-jaxrs2-servlet-initializer</artifactId>
-    <packaging>bundle</packaging>
     <name>swagger-jaxrs2-servlet-initializer</name>
     <description>swagger-servlet-initializer</description>
     <build>
@@ -23,21 +22,24 @@
         </testResources>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${felix-version}</version>
-                <extensions>true</extensions>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
                 <configuration>
-                    <instructions>
-                        <Export-Package>
-                            io.swagger.v3.jaxrs2.integration
-                        </Export-Package>
-                        <Import-Package>
-                            javax.ws.rs*;version="2.0",
-                            *
-                        </Import-Package>
-                        <Automatic-Module-Name>io.swagger.v3.jaxrs2.integration</Automatic-Module-Name>
-                    </instructions>
+                    <bnd>
+                        Export-Package: io.swagger.v3.jaxrs2.integration
+                    </bnd>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Automatic-Module-Name>io.swagger.v3.jaxrs2.integration</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/modules/swagger-jaxrs2/pom.xml b/modules/swagger-jaxrs2/pom.xml
index 6d1b98b87f..a66e22d1f9 100644
--- a/modules/swagger-jaxrs2/pom.xml
+++ b/modules/swagger-jaxrs2/pom.xml
@@ -10,7 +10,6 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>swagger-jaxrs2</artifactId>
-    <packaging>bundle</packaging>
     <name>swagger-jaxrs2</name>
     <description>swagger-jaxrs2</description>
     <build>
@@ -23,26 +22,19 @@
         </testResources>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${felix-version}</version>
-                <extensions>true</extensions>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <instructions>
-                        <Export-Package>
-                            io.swagger.v3.jaxrs2,
-                            io.swagger.v3.jaxrs2.ext,
-                            io.swagger.v3.jaxrs2.integration,
-                            io.swagger.v3.jaxrs2.integration.api,
-                            io.swagger.v3.jaxrs2.integration.resources,
-                            io.swagger.v3.jaxrs2.util
-                        </Export-Package>
-                        <Import-Package>
-                            javax.ws.rs*;version="2.0",
-                            *
-                        </Import-Package>
-                        <Automatic-Module-Name>io.swagger.v3.jaxrs2</Automatic-Module-Name>
-                    </instructions>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Automatic-Module-Name>io.swagger.v3.jaxrs2</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/modules/swagger-models/pom.xml b/modules/swagger-models/pom.xml
index 6923236700..b5b5ae93ad 100644
--- a/modules/swagger-models/pom.xml
+++ b/modules/swagger-models/pom.xml
@@ -9,7 +9,6 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>swagger-models</artifactId>
-    <packaging>bundle</packaging>
     <name>swagger-models</name>
     <description>swagger-models</description>
     <build>
@@ -22,28 +21,19 @@
         </testResources>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${felix-version}</version>
-                <extensions>true</extensions>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <instructions>
-                        <Export-Package>
-                            io.swagger.v3.oas.models,
-                            io.swagger.v3.oas.models.callbacks,
-                            io.swagger.v3.oas.models.examples,
-                            io.swagger.v3.oas.models.headers,
-                            io.swagger.v3.oas.models.info,
-                            io.swagger.v3.oas.models.links,
-                            io.swagger.v3.oas.models.media,
-                            io.swagger.v3.oas.models.parameters,
-                            io.swagger.v3.oas.models.responses,
-                            io.swagger.v3.oas.models.security,
-                            io.swagger.v3.oas.models.servers,
-                            io.swagger.v3.oas.models.tags
-                        </Export-Package>
-                        <Automatic-Module-Name>io.swagger.v3.oas.models</Automatic-Module-Name>
-                    </instructions>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Automatic-Module-Name>io.swagger.v3.oas.models</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/pom.xml b/pom.xml
index f3033737f5..b7d787b231 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,6 +215,49 @@
         </plugins>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>biz.aQute.bnd</groupId>
+                    <artifactId>bnd-maven-plugin</artifactId>
+                    <version>${bnd-version}</version>
+                    <configuration>
+                        <bnd><![CDATA[
+                            Bundle-SymbolicName: ${project.groupId}.${project.artifactId}
+                            -exportcontents: ${packages;NAMED;!*.internal}
+                            -noextraheaders: true
+                            -noclassforname: true
+                            -snapshot: SNAPSHOT
+                            -contract: \
+                                JavaJAXRS;resolution:=optional,\
+                                JavaServlet;resolution:=optional
+                            -define-contract: \
+                                osgi.contract;\
+                                    osgi.contract=JavaJAXRS;\
+                                    version:List<Version>="2.0";\
+                                    uses:="\
+                                        javax.ws.rs,\
+                                        javax.ws.rs.core,\
+                                        javax.ws.rs.ext,\
+                                        javax.ws.rs.client,\
+                                        javax.ws.rs.container",\
+                                osgi.contract;\
+                                    osgi.contract=JavaServlet;\
+                                    version:List<Version>="4.0";\
+                                    uses:="\
+                                        javax.servlet,\
+                                        javax.servlet.annotation,\
+                                        javax.servlet.descriptor,\
+                                        javax.servlet.http"
+                            -cdiannotations:
+                        ]]></bnd>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>bnd-process</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
@@ -380,11 +423,6 @@
                 <artifactId>maven-plugin-tools-api</artifactId>
                 <version>3.5.1</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${felix-version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-ext</artifactId>
@@ -561,7 +599,7 @@
         <jakarta.ws-version>2.1.6</jakarta.ws-version>
         <jakarta.xml.bind-api-version>2.3.3</jakarta.xml.bind-api-version>
         <jakarta.activation-api-version>1.2.2</jakarta.activation-api-version>
-        <felix-version>4.2.1</felix-version>
+        <bnd-version>5.1.2</bnd-version>
         <servlet-api-version>4.0.3</servlet-api-version>
         <jersey2-version>2.26</jersey2-version>
         <junit-version>4.13.1</junit-version>