diff --git a/examples/osgi-helloworld-webapp/functional-test/pom.xml b/examples/osgi-helloworld-webapp/functional-test/pom.xml index 90425ab256..8b6f330c6a 100644 --- a/examples/osgi-helloworld-webapp/functional-test/pom.xml +++ b/examples/osgi-helloworld-webapp/functional-test/pom.xml @@ -1,7 +1,7 @@ - - **/WebAppFelixTest.java - - - - - + + + com.sun.activation + jakarta.activation + ${jakarta.activation.version} + + release diff --git a/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java b/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java index 597f4f81e3..d682b2e87e 100644 --- a/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java +++ b/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -35,6 +35,7 @@ import javax.inject.Inject; +import org.glassfish.jersey.internal.util.JdkVersion; import org.glassfish.jersey.internal.util.PropertiesHelper; import org.ops4j.pax.exam.Configuration; @@ -54,6 +55,7 @@ import static org.ops4j.pax.exam.CoreOptions.options; import static org.ops4j.pax.exam.CoreOptions.systemPackage; import static org.ops4j.pax.exam.CoreOptions.systemProperty; +import static org.ops4j.pax.exam.CoreOptions.vmOption; /** * @author Jakub Podlesak @@ -104,6 +106,7 @@ public List release diff --git a/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java b/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java index ebb3f907fe..db56a1145f 100644 --- a/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java +++ b/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -30,6 +30,7 @@ import javax.inject.Inject; +import org.glassfish.jersey.internal.util.JdkVersion; import org.glassfish.jersey.internal.util.PropertiesHelper; import org.ops4j.pax.exam.Configuration; @@ -111,6 +112,7 @@ public List - - testsSkipJdk6 - - 1.6 - - - - - maven-surefire-plugin - - - **/PackageScanningTest.java - - - - - + + + com.sun.activation + jakarta.activation + ${jakarta.activation.version} + + sonar diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java index 9108cd6807..70bb3f7de9 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java @@ -21,6 +21,7 @@ import java.util.LinkedList; import java.util.List; +import org.glassfish.jersey.internal.util.JdkVersion; import org.glassfish.jersey.internal.util.PropertiesHelper; import org.glassfish.jersey.test.TestProperties; @@ -170,13 +171,19 @@ public static List