From c4cc162ba77a3765d3fac9973ec67dd94cbe8ea3 Mon Sep 17 00:00:00 2001
From: jansupol <jan.supol@oracle.com>
Date: Tue, 30 Aug 2022 22:32:18 +0200
Subject: [PATCH] Additional OSGi headers

Signed-off-by: jansupol <jan.supol@oracle.com>
---
 connectors/jetty-connector/pom.xml     | 22 +++++++++++++---------
 connectors/netty-connector/pom.xml     |  5 +++++
 connectors/pom.xml                     |  2 +-
 containers/jetty-http/pom.xml          |  8 ++++++++
 containers/jetty-servlet/pom.xml       |  1 +
 incubator/declarative-linking/pom.xml  |  5 +++++
 incubator/kryo/pom.xml                 | 16 ++++++++++++++++
 pom.xml                                |  1 +
 test-framework/providers/jetty/pom.xml | 12 ------------
 9 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/connectors/jetty-connector/pom.xml b/connectors/jetty-connector/pom.xml
index b2cd08ab4b..ea9db625e5 100644
--- a/connectors/jetty-connector/pom.xml
+++ b/connectors/jetty-connector/pom.xml
@@ -84,6 +84,19 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <inherited>true</inherited>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            ${jetty.osgi.version},
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -101,15 +114,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>testsSkipJdk6</id>
-            <activation>
-                <jdk>1.6</jdk>
-            </activation>
-            <properties>
-                <skip.tests>true</skip.tests>
-            </properties>
-        </profile>
     </profiles>
 
 </project>
diff --git a/connectors/netty-connector/pom.xml b/connectors/netty-connector/pom.xml
index 448e0c2c62..d6cfecdfc0 100644
--- a/connectors/netty-connector/pom.xml
+++ b/connectors/netty-connector/pom.xml
@@ -67,6 +67,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <inherited>true</inherited>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 844149953f..7a698c3c6a 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -81,7 +81,7 @@
         <profile>
             <id>HelidonConnector</id>
             <activation>
-                <jdk>11</jdk>
+                <jdk>[11,)</jdk>
             </activation>
             <modules>
                 <module>helidon-connector</module>
diff --git a/containers/jetty-http/pom.xml b/containers/jetty-http/pom.xml
index 195b6c3eac..bd07c6c8cf 100644
--- a/containers/jetty-http/pom.xml
+++ b/containers/jetty-http/pom.xml
@@ -72,6 +72,14 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <inherited>true</inherited>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            ${jetty.osgi.version},
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
             </plugin>
         </plugins>
 
diff --git a/containers/jetty-servlet/pom.xml b/containers/jetty-servlet/pom.xml
index 66c0909eab..6bb32453bc 100644
--- a/containers/jetty-servlet/pom.xml
+++ b/containers/jetty-servlet/pom.xml
@@ -67,6 +67,7 @@
                     <instructions>
                         <Import-Package>
                             javax.servlet.*;version="[2.4,5.0)",
+                            ${jetty.osgi.version},
                             *
                         </Import-Package>
                     </instructions>
diff --git a/incubator/declarative-linking/pom.xml b/incubator/declarative-linking/pom.xml
index 743886ab5b..52efc85391 100644
--- a/incubator/declarative-linking/pom.xml
+++ b/incubator/declarative-linking/pom.xml
@@ -169,6 +169,11 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <inherited>true</inherited>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/incubator/kryo/pom.xml b/incubator/kryo/pom.xml
index dc30852a28..5246bdbd3b 100644
--- a/incubator/kryo/pom.xml
+++ b/incubator/kryo/pom.xml
@@ -67,5 +67,21 @@
                 <directory>${project.build.directory}/legal</directory>
             </resource>
         </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <inherited>true</inherited>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            com.esotericsoftware.kryo.*;version="!",
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 71b31037e5..7b5da0af6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2230,6 +2230,7 @@
         <jaxrs.api.spec.version>2.1</jaxrs.api.spec.version>
         <jaxrs.api.impl.version>2.1.6</jaxrs.api.impl.version>
         <jetty.plugin.version>6.1.26</jetty.plugin.version>
+        <jetty.osgi.version>org.eclipse.jetty.*;version="[9.4,11)"</jetty.osgi.version>
         <jetty.version>9.4.46.v20220331</jetty.version>
         <jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
         <jsonb.api.version>1.0.2</jsonb.api.version>
diff --git a/test-framework/providers/jetty/pom.xml b/test-framework/providers/jetty/pom.xml
index 2ffd3e959e..7989f31ff1 100644
--- a/test-framework/providers/jetty/pom.xml
+++ b/test-framework/providers/jetty/pom.xml
@@ -44,16 +44,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>testsSkipJdk6</id>
-            <activation>
-                <jdk>1.6</jdk>
-            </activation>
-            <properties>
-                <skip.tests>true</skip.tests>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>