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 @@ org.apache.maven.plugins maven-compiler-plugin + + org.apache.felix + maven-bundle-plugin + true + + + + ${jetty.osgi.version}, + * + + + + @@ -101,15 +114,6 @@ - - testsSkipJdk6 - - 1.6 - - - true - - 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 @@ org.apache.maven.plugins maven-compiler-plugin + + org.apache.felix + maven-bundle-plugin + true + 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 @@ HelidonConnector - 11 + [11,) helidon-connector 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 @@ org.apache.felix maven-bundle-plugin true + + + + ${jetty.osgi.version}, + * + + + 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 @@ javax.servlet.*;version="[2.4,5.0)", + ${jetty.osgi.version}, * 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 @@ + + org.apache.felix + maven-bundle-plugin + true + 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 @@ ${project.build.directory}/legal + + + + org.apache.felix + maven-bundle-plugin + true + + + + com.esotericsoftware.kryo.*;version="!", + * + + + + + diff --git a/pom.xml b/pom.xml index 71b31037e5..7b5da0af6b 100644 --- a/pom.xml +++ b/pom.xml @@ -2230,6 +2230,7 @@ 2.1 2.1.6 6.1.26 + org.eclipse.jetty.*;version="[9.4,11)" 9.4.46.v20220331 6.1.14 1.0.2 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 @@ - - - testsSkipJdk6 - - 1.6 - - - true - - - -