Additional OSGi headers Signed-off-by: jansupol <jan.supol@oracle.com>
diff --git a/connectors/jetty-connector/pom.xml b/connectors/jetty-connector/pom.xml index b2cd08a..ea9db62 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 448e0c2..d6cfecd 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 8441499..7a698c3 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 195b6c3..bd07c6c 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 66c0909..6bb3245 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 743886a..52efc85 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 dc30852..5246bdb 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 71b3103..7b5da0a 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 2ffd3e9..7989f31 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>