diff --git a/build/com.eclipsesource.jaxrs.build/JAX-RS Connector Build.launch b/build/com.eclipsesource.jaxrs.build/JAX-RS Connector Build.launch
index f8f3b794..291b68e5 100644
--- a/build/com.eclipsesource.jaxrs.build/JAX-RS Connector Build.launch
+++ b/build/com.eclipsesource.jaxrs.build/JAX-RS Connector Build.launch
@@ -10,12 +10,14 @@
+
-
+
-
+
+
diff --git a/build/com.eclipsesource.jaxrs.build/pom.xml b/build/com.eclipsesource.jaxrs.build/pom.xml
index 767df0f3..6f4cc074 100644
--- a/build/com.eclipsesource.jaxrs.build/pom.xml
+++ b/build/com.eclipsesource.jaxrs.build/pom.xml
@@ -34,6 +34,7 @@
+ ../com.eclipsesource.jaxrs.jersey.all
../../bundles/com.eclipsesource.jaxrs.publisher
../../bundles/com.eclipsesource.jaxrs.consumer
../../bundles/com.eclipsesource.jaxrs.provider.moxy
@@ -60,7 +61,7 @@
../com.eclipsesource.jaxrs.repository
-
+
connector-dependencies
p2
@@ -112,7 +113,7 @@
${project.groupId}
${project.artifactId}
${project.version}
- ${project.parent.relativePath}/../com.eclipsesource.jaxrs.connector.target/Equinox-4.4-jersey2.6.0
+ ${project.parent.relativePath}/../com.eclipsesource.jaxrs.connector.target/Equinox-3.6-jersey2.8.0
diff --git a/build/com.eclipsesource.jaxrs.connector.target/feature.xml b/build/com.eclipsesource.jaxrs.connector.target/feature.xml
index ef287c89..db012ccf 100644
--- a/build/com.eclipsesource.jaxrs.connector.target/feature.xml
+++ b/build/com.eclipsesource.jaxrs.connector.target/feature.xml
@@ -63,13 +63,6 @@
version="0.0.0"
unpack="false"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ com.eclipsesource.jaxrs.jersey.all
+
+
+
+
+
+
+
+
diff --git a/build/com.eclipsesource.jaxrs.jersey.all/Jersey All.launch b/build/com.eclipsesource.jaxrs.jersey.all/Jersey All.launch
new file mode 100644
index 00000000..a5e85b37
--- /dev/null
+++ b/build/com.eclipsesource.jaxrs.jersey.all/Jersey All.launch
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/com.eclipsesource.jaxrs.jersey.all/pom.xml b/build/com.eclipsesource.jaxrs.jersey.all/pom.xml
new file mode 100644
index 00000000..dd4ffbe5
--- /dev/null
+++ b/build/com.eclipsesource.jaxrs.jersey.all/pom.xml
@@ -0,0 +1,153 @@
+
+ 4.0.0
+ com.eclipsesource.jaxrs
+ jersey-all
+ 2.8
+
+
+ 1.7
+ 1.7
+ 2.8
+ 2.0
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 2.4
+
+
+ false
+
+ false
+
+
+ EclipseSource
+
+
+
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+ 2.3.7
+ true
+
+
+ ${project.groupId}.${project.artifactId}
+ ${project.version}
+ EclipseSource
+
+ javax.ws.*,
+ javax.annotation.*,
+ org.glassfish.*
+
+
+ !com.sun.jdi.*,
+ !sun.misc,
+ !javax.persistence,
+ javax.servlet.*;resolution:=optional,
+ *
+
+ JavaSE-1.7
+ *;scope=compile|runtime
+ target/dependency
+ true
+ true
+
+
+
+
+ osgi-bundle
+ package
+
+ bundle
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 2.2
+
+ sheded-DO-NOT-USE
+ true
+
+
+
+ ${project.groupId}.${project.artifactId}.source
+ ${project.groupId}.${project.artifactId};version="${project.version}"
+
+
+
+
+
+
+
+
+
+
+
+
+
+ package
+
+ shade
+
+
+
+
+
+
+
+
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+ ${jaxrs.version}
+ jar
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+ ${jaxrs.version}
+ jar
+ sources
+
+
+ org.glassfish.jersey.containers
+ jersey-container-servlet
+ ${jersey.version}
+
+
+ org.glassfish.jersey.core
+ jersey-client
+ ${jersey.version}
+
+
+ org.glassfish.jersey.core
+ jersey-server
+ ${jersey.version}
+
+
+ org.glassfish.jersey.media
+ jersey-media-sse
+ ${jersey.version}
+
+
+ org.glassfish.jersey.media
+ jersey-media-multipart
+ ${jersey.version}
+
+
+
+
\ No newline at end of file
diff --git a/bundles/com.eclipsesource.jaxrs.publisher/pom.xml b/bundles/com.eclipsesource.jaxrs.publisher/pom.xml
index d3ccd30f..bc1dd817 100644
--- a/bundles/com.eclipsesource.jaxrs.publisher/pom.xml
+++ b/bundles/com.eclipsesource.jaxrs.publisher/pom.xml
@@ -34,7 +34,26 @@
-
-
+
+
+ ${tycho-groupid}
+ target-platform-configuration
+ ${tycho-version}
+
+
+
+ java-package
+ javax.servlet
+
+ osgi-bundle
+ javax.servlet-api
+ [2.3.0,4.0.0)
+
+
+
+
+
+
+
diff --git a/bundles/com.eclipsesource.jaxrs.publisher/src/com/eclipsesource/jaxrs/publisher/internal/Configuration.java b/bundles/com.eclipsesource.jaxrs.publisher/src/com/eclipsesource/jaxrs/publisher/internal/Configuration.java
index 017f0743..8cafd599 100644
--- a/bundles/com.eclipsesource.jaxrs.publisher/src/com/eclipsesource/jaxrs/publisher/internal/Configuration.java
+++ b/bundles/com.eclipsesource.jaxrs.publisher/src/com/eclipsesource/jaxrs/publisher/internal/Configuration.java
@@ -18,8 +18,9 @@ public Configuration( JAXRSConnector jaxRsConnector ) {
this.connector = jaxRsConnector;
}
+ @SuppressWarnings( "rawtypes" )
@Override
- public void updated( Dictionary properties ) throws ConfigurationException {
+ public void updated( Dictionary properties ) throws ConfigurationException {
if( properties != null ) {
Object root = properties.get( ROOT_PROPERTY );
ensureRootIsPresent( root );
diff --git a/tests/com.eclipsesource.jaxrs.publisher.test/META-INF/MANIFEST.MF b/tests/com.eclipsesource.jaxrs.publisher.test/META-INF/MANIFEST.MF
index 1546999a..67f33b10 100644
--- a/tests/com.eclipsesource.jaxrs.publisher.test/META-INF/MANIFEST.MF
+++ b/tests/com.eclipsesource.jaxrs.publisher.test/META-INF/MANIFEST.MF
@@ -8,3 +8,5 @@ Fragment-Host: com.eclipsesource.jaxrs.publisher;bundle-version="3.3.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.junit;bundle-version="4.10.0",
org.mockito.mockito-all;bundle-version="1.9.5"
+Import-Package: javax.servlet;version="[2.3.0,4.0.0)",
+ javax.servlet.http;version="[2.3.0,4.0.0)"
diff --git a/tests/com.eclipsesource.jaxrs.publisher.test/pom.xml b/tests/com.eclipsesource.jaxrs.publisher.test/pom.xml
index 75badd2a..1d66cb93 100644
--- a/tests/com.eclipsesource.jaxrs.publisher.test/pom.xml
+++ b/tests/com.eclipsesource.jaxrs.publisher.test/pom.xml
@@ -34,6 +34,25 @@
+
+
+ ${tycho-groupid}
+ target-platform-configuration
+ ${tycho-version}
+
+
+
+ java-package
+ javax.servlet
+
+ osgi-bundle
+ javax.servlet-api
+ [2.3.0,4.0.0)
+
+
+
+
+