Merge pull request #3961 from senivam/EE4J_8
Jersey dependencies version upgrade (part II)
diff --git a/bundles/jaxrs-ri/pom.xml b/bundles/jaxrs-ri/pom.xml
index c78f2a7..7fe3a16 100644
--- a/bundles/jaxrs-ri/pom.xml
+++ b/bundles/jaxrs-ri/pom.xml
@@ -168,7 +168,6 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml
index 4c14f2e..abf68cd 100644
--- a/examples/extended-wadl-webapp/pom.xml
+++ b/examples/extended-wadl-webapp/pom.xml
@@ -122,6 +122,12 @@
<artifactId>javassist</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java
index 2853bf8..7c58b85 100644
--- a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java
+++ b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java
@@ -112,19 +112,6 @@
mavenBundle().groupId("org.glassfish.hk2.external").artifactId("aopalliance-repackaged").versionAsInProject(),
mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),
- // JAX-RS API
- mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject(),
-
- // Jersey bundles
- mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-common").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-jaxb").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-server").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-client").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),
-
- // jettison
- mavenBundle().groupId("org.codehaus.jettison").artifactId("jettison").versionAsInProject(),
-
// validation
mavenBundle().groupId("javax.validation").artifactId("validation-api").versionAsInProject(),
@@ -138,10 +125,32 @@
mavenBundle().groupId("org.glassfish.jersey.containers").artifactId("jersey-container-grizzly2-http")
.versionAsInProject(),
+ //JAXB-API
+ mavenBundle().groupId("javax.xml.bind").artifactId("jaxb-api").versionAsInProject(),
+ //SUN JAXB IMPL OSGI
+ mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
+ systemPackage("com.sun.source.tree"),
+ systemPackage("com.sun.source.util"),
+
+
// tinybundles + required dependencies
mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").versionAsInProject(),
mavenBundle().groupId("biz.aQute.bnd").artifactId("bndlib").versionAsInProject(),
+ // JAX-RS API
+ mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject(),
+
+ // Jersey bundles
+ mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-common").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-jaxb").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-server").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-client").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),
+
+ // jettison
+ mavenBundle().groupId("org.codehaus.jettison").artifactId("jettison").versionAsInProject(),
+
+
// create ad-hoc bundle
provision(
bundle()
diff --git a/examples/json-with-padding/pom.xml b/examples/json-with-padding/pom.xml
index dc814a3..28ef7fc 100644
--- a/examples/json-with-padding/pom.xml
+++ b/examples/json-with-padding/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <artifactId>jaxb-osgi</artifactId>
</dependency>
<dependency>
diff --git a/examples/osgi-helloworld-webapp/functional-test/pom.xml b/examples/osgi-helloworld-webapp/functional-test/pom.xml
index de4aeaf..005897b 100644
--- a/examples/osgi-helloworld-webapp/functional-test/pom.xml
+++ b/examples/osgi-helloworld-webapp/functional-test/pom.xml
@@ -137,6 +137,11 @@
<artifactId>org.apache.felix.framework.security</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- uncomment the following dependency to get ability
to run felix console in the test -->
<!--dependency>
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 86bd28a..1307e87 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
@@ -52,6 +52,7 @@
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemPackage;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
/**
@@ -142,8 +143,13 @@
mavenBundle().groupId("org.glassfish.hk2.external").artifactId("javax.inject").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2.external").artifactId("aopalliance-repackaged").versionAsInProject(),
mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),
- // JAX-RS API
- mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject(),
+ //JAXB-API
+ mavenBundle().groupId("javax.xml.bind").artifactId("jaxb-api").versionAsInProject(),
+ //SUN JAXB IMPL OSGI
+ mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
+ systemPackage("com.sun.source.tree"),
+ systemPackage("com.sun.source.util"),
+
// validation - required by jersey-container-servlet-core
mavenBundle().groupId("javax.validation").artifactId("validation-api").versionAsInProject(),
// Jersey bundles
@@ -153,6 +159,10 @@
mavenBundle().groupId("org.glassfish.jersey.containers").artifactId("jersey-container-servlet-core")
.versionAsInProject(),
mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),
+
+ // JAX-RS API
+ mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject(),
+
// Those two bundles have different (unique) maven coordinates, but represent the same OSGi bundle in two
// different versions.
// (see the maven bundle plugin configuration in each of the two pom.xml files
diff --git a/examples/osgi-http-service/functional-test/pom.xml b/examples/osgi-http-service/functional-test/pom.xml
index 7d147fc..2f04451 100644
--- a/examples/osgi-http-service/functional-test/pom.xml
+++ b/examples/osgi-http-service/functional-test/pom.xml
@@ -129,6 +129,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
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 8ec4109..e6a823f 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
@@ -44,6 +44,7 @@
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemPackage;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
/**
@@ -106,8 +107,12 @@
mavenBundle().groupId("org.glassfish.hk2.external").artifactId("aopalliance-repackaged").versionAsInProject(),
mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),
- // JAX-RS API
- mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject(),
+ //JAXB-API
+ mavenBundle().groupId("javax.xml.bind").artifactId("jaxb-api").versionAsInProject(),
+ //SUN JAXB IMPL OSGI
+ mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
+ systemPackage("com.sun.source.tree"),
+ systemPackage("com.sun.source.util"),
// validation
mavenBundle().groupId("javax.validation").artifactId("validation-api").versionAsInProject(),
@@ -118,7 +123,11 @@
mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-client").versionAsInProject(),
mavenBundle().groupId("org.glassfish.jersey.containers").artifactId("jersey-container-servlet-core")
.versionAsInProject(),
- mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject()
+ mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),
+
+ // JAX-RS API
+ mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject()
+
));
final String localRepository = AccessController.doPrivileged(PropertiesHelper.getSystemProperty("localRepository"));
diff --git a/media/jaxb/pom.xml b/media/jaxb/pom.xml
index e5c309c..47a1813 100644
--- a/media/jaxb/pom.xml
+++ b/media/jaxb/pom.xml
@@ -123,7 +123,6 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
diff --git a/pom.xml b/pom.xml
index edcd35d..7e3a16e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -603,7 +603,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.5.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -1536,7 +1536,6 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb.api.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -1544,6 +1543,11 @@
<artifactId>jaxb-impl</artifactId>
<version>${jaxb.ri.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <version>${jaxb.ri.version}</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
@@ -1966,8 +1970,8 @@
<javax.interceptor.version>1.2.2</javax.interceptor.version>
<javax.persistence.version>1.0.2</javax.persistence.version>
<javax.validation.api.version>2.0.1.Final</javax.validation.api.version>
- <jaxb.api.version>2.2.7</jaxb.api.version>
- <jaxb.ri.version>2.2.7</jaxb.ri.version>
+ <jaxb.api.version>2.3.1</jaxb.api.version>
+ <jaxb.ri.version>2.3.1</jaxb.ri.version>
<jsonb.api.version>1.0</jsonb.api.version>
<jaxrs.api.spec.version>2.1</jaxrs.api.spec.version>
<jaxrs.api.impl.version>2.1.1</jaxrs.api.impl.version>
diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml
index 4cfa5e3..370de6d 100644
--- a/tests/osgi/functional/pom.xml
+++ b/tests/osgi/functional/pom.xml
@@ -366,6 +366,17 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/AbstractJsonOsgiIntegrationTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/AbstractJsonOsgiIntegrationTest.java
index 7d3a5dc..cf3f3e7 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/AbstractJsonOsgiIntegrationTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/AbstractJsonOsgiIntegrationTest.java
@@ -50,7 +50,7 @@
protected abstract Feature getJsonProviderFeature();
@Test
- public void testJson() throws Exception {
+ public void testJson() {
final Feature jsonProviderFeature = getJsonProviderFeature();
final Client client = ClientBuilder.newClient();
final ResourceConfig resourceConfig = new ResourceConfig(JsonResource.class);
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JaxRsRiBundleTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JaxRsRiBundleTest.java
index 34c9977..6ee0ec8 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JaxRsRiBundleTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JaxRsRiBundleTest.java
@@ -54,7 +54,7 @@
@Configuration
public static Option[] configuration() {
- List<Option> options = Helper.getCommonOsgiOptions(false);
+ List<Option> options = Helper.getCommonOsgiOptions();
options.addAll(Helper.expandedList(
// vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java
index afa5cc0..d173643 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java
@@ -27,6 +27,7 @@
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.Configuration;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemPackage;
/**
* @author Michal Gajdos
@@ -41,8 +42,12 @@
options.addAll(Helper.expandedList(
// jersey-json dependencies
mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-json-jettison").versionAsInProject(),
- mavenBundle().groupId("org.codehaus.jettison").artifactId("jettison").versionAsInProject()
- ));
+ mavenBundle().groupId("org.codehaus.jettison").artifactId("jettison").versionAsInProject(),
+ //SUN JAXB IMPL OSGI
+ mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
+ systemPackage("com.sun.source.tree"),
+ systemPackage("com.sun.source.util")
+ ));
return Helper.asArray(options);
}
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/WebResourceFactoryTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/WebResourceFactoryTest.java
index 3f99393..faef96f 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/WebResourceFactoryTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/WebResourceFactoryTest.java
@@ -49,6 +49,7 @@
import org.ops4j.pax.exam.junit.PaxExam;
import static org.junit.Assert.assertEquals;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemPackage;
/**
* @author Michal Gajdos
@@ -69,7 +70,13 @@
options.addAll(Helper.expandedList(
// jersey-multipart dependencies
- mavenBundle().groupId("org.glassfish.jersey.ext").artifactId("jersey-proxy-client").versionAsInProject()));
+ mavenBundle().groupId("org.glassfish.jersey.ext").artifactId("jersey-proxy-client").versionAsInProject(),
+ //SUN JAXB IMPL OSGI
+ mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
+ systemPackage("com.sun.source.tree"),
+ systemPackage("com.sun.source.util")
+
+ ));
options = Helper.addPaxExamMavenLocalRepositoryProperty(options);
return Helper.asArray(options);
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 c3d9670..5de0537 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
@@ -168,7 +168,9 @@
mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-client").versionAsInProject(),
// Jersey Injection provider
- mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject()
+ mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),
+// Jaxb - api
+ mavenBundle().groupId("javax.xml.bind").artifactId("jaxb-api").versionAsInProject().versionAsInProject()
));
}
