hstaudacher · guidfort · Sep 28, 2018 · Sep 28, 2018 · Sep 28, 2018 · Sep 28, 2018
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ bin
 .DS_Store
 target
 .idea
-*.iml
+*.iml
+**/pom.xml.versionsBackup
diff --git a/README.md b/README.md
@@ -104,6 +104,9 @@ With Jersey 2.0 the library was splitted into several modules with a whole bunch
 ## Changelog
 Checkout the [github releases](https://github.com/hstaudacher/osgi-jax-rs-connector/releases).
 
+- Upgrade to Jersey 2.25.1
+- Bugfix [Fixed following scenarios not returning HTTP Error 503 while Jersey s…](https://github.com/hstaudacher/osgi-jax-rs-connector/pull/147), publischer version changed to 5.3.2 
+
 ## License
 The code is published under the terms of the [Eclipse Public License, version 1.0](http://www.eclipse.org/legal/epl-v10.html).
 

diff --git a/build/com.eclipsesource.jaxrs.build/pom.xml b/build/com.eclipsesource.jaxrs.build/pom.xml
@@ -10,26 +10,26 @@
 
 	<groupId>com.eclipsesource</groupId>
 	<artifactId>osgi-jaxrs-connector</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>OSGi - JAX-RS Connector</name>
 
 	<properties>
-	  <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<tycho-version>0.24.0</tycho-version>
-		<tycho-extras-version>0.24.0</tycho-extras-version>
+		<tycho-version>1.2.0</tycho-version>
+		<tycho-extras-version>1.2.0</tycho-extras-version>
 		<tycho-groupid>org.eclipse.tycho</tycho-groupid>
-		<surefire-version>2.18</surefire-version>
-		<findbugs-version>2.5.5</findbugs-version>
-		<junit-version>4.11</junit-version>
-		<mockito-version>1.9.5</mockito-version>
+		<surefire-version>2.22.0</surefire-version>
+		<findbugs-version>3.0.5</findbugs-version>
+		<junit-version>4.12</junit-version>
+		<mockito-version>1.10.19</mockito-version>
 		<jacocoagent>${basedir}/../../build/com.eclipsesource.jaxrs.build/lib/jacocoagent.jar</jacocoagent>
 		<test-arguments>-Xms512m -Xmx512m
 			-javaagent:${jacocoagent}=destfile=${basedir}/../../build/com.eclipsesource.jaxrs.build/target/jacoco.exec,append=true</test-arguments>
-	  <javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
+		<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
 	</properties>
 
 	<modules>
@@ -63,7 +63,7 @@
 		<module>../com.eclipsesource.jaxrs.repository</module>
 	</modules>
 
- 	<repositories>
+	<repositories>
 		<repository>
 			<id>connector-dependencies</id>
 			<layout>p2</layout>
@@ -142,7 +142,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-plugin</artifactId>
@@ -157,20 +157,20 @@
 					</execution>
 				</executions>
 			</plugin>
-			
-			<plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.10</version>
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+
+			<!-- <plugin> -->
+			<!-- <groupId>org.apache.maven.plugins</groupId> -->
+			<!-- <artifactId>maven-javadoc-plugin</artifactId> -->
+			<!-- <version>2.10</version> -->
+			<!-- <executions> -->
+			<!-- <execution> -->
+			<!-- <id>attach-javadocs</id> -->
+			<!-- <goals> -->
+			<!-- <goal>jar</goal> -->
+			<!-- </goals> -->
+			<!-- </execution> -->
+			<!-- </executions> -->
+			<!-- </plugin> -->
 
 		</plugins>
 	</build>

diff --git a/build/com.eclipsesource.jaxrs.connector.feature/pom.xml b/build/com.eclipsesource.jaxrs.connector.feature/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.eclipsesource</groupId>
 		<artifactId>osgi-jaxrs-connector</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../com.eclipsesource.jaxrs.build</relativePath>
 	</parent>
 

diff --git a/build/com.eclipsesource.jaxrs.jersey.all/pom.xml b/build/com.eclipsesource.jaxrs.jersey.all/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.eclipsesource.jaxrs</groupId>
 	<artifactId>jersey-all</artifactId>
-	<version>2.22.2</version>
+	<version>2.25.1</version>
 
 	<properties>
 		<maven.compiler.source>1.7</maven.compiler.source>
 		<maven.compiler.target>1.7</maven.compiler.target>
-		<jersey.version>2.22.2</jersey.version>
+		<jersey.version>2.25.1</jersey.version>
 		<jaxrs.version>2.0</jaxrs.version>
 	</properties>
 
@@ -18,7 +18,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>3.1.0</version>
 				<configuration>
 					<archive>
 						<index>false</index>
@@ -35,7 +35,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>2.3.7</version>
+				<version>3.5.1</version>
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
@@ -80,7 +80,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.1</version>
+				<version>3.1.1</version>
 				<configuration>
 					<finalName>shaded-DO-NOT-USE</finalName>
 					<createSourcesJar>true</createSourcesJar>

diff --git a/build/com.eclipsesource.jaxrs.jersey.min/pom.xml b/build/com.eclipsesource.jaxrs.jersey.min/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.eclipsesource.jaxrs</groupId>
 	<artifactId>jersey-min</artifactId>
-	<version>2.22.2</version>
+	<version>2.25.1</version>
 
 	<properties>
 		<maven.compiler.source>1.7</maven.compiler.source>
 		<maven.compiler.target>1.7</maven.compiler.target>
-		<jersey.version>2.22.2</jersey.version>
+		<jersey.version>2.25.1</jersey.version>
 		<jaxrs.version>2.0</jaxrs.version>
 	</properties>
 
@@ -18,7 +18,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>3.1.0</version>
 				<configuration>
 					<archive>
 						<index>false</index>
@@ -35,7 +35,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>2.3.7</version>
+				<version>3.5.1</version>
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
@@ -80,7 +80,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.1</version>
+				<version>3.1.1</version>
 				<configuration>
 					<finalName>shaded-DO-NOT-USE</finalName>
 					<createSourcesJar>true</createSourcesJar>

diff --git a/build/com.eclipsesource.jaxrs.jersey.runtime.feature/pom.xml b/build/com.eclipsesource.jaxrs.jersey.runtime.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.eclipsesource</groupId>
     <artifactId>osgi-jaxrs-connector</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../com.eclipsesource.jaxrs.build</relativePath>
   </parent>
 

diff --git a/build/com.eclipsesource.jaxrs.provider.gson.feature/pom.xml b/build/com.eclipsesource.jaxrs.provider.gson.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.eclipsesource</groupId>
     <artifactId>osgi-jaxrs-connector</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../com.eclipsesource.jaxrs.build</relativePath>
   </parent>
 

diff --git a/build/com.eclipsesource.jaxrs.provider.moxy.feature/pom.xml b/build/com.eclipsesource.jaxrs.provider.moxy.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.eclipsesource</groupId>
     <artifactId>osgi-jaxrs-connector</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../com.eclipsesource.jaxrs.build</relativePath>
   </parent>
 

diff --git a/build/com.eclipsesource.jaxrs.provider.multipart.feature/pom.xml b/build/com.eclipsesource.jaxrs.provider.multipart.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.eclipsesource</groupId>
     <artifactId>osgi-jaxrs-connector</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../com.eclipsesource.jaxrs.build</relativePath>
   </parent>
 

diff --git a/build/com.eclipsesource.jaxrs.provider.security.feature/pom.xml b/build/com.eclipsesource.jaxrs.provider.security.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.eclipsesource</groupId>
     <artifactId>osgi-jaxrs-connector</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../com.eclipsesource.jaxrs.build</relativePath>
   </parent>
 

diff --git a/build/com.eclipsesource.jaxrs.provider.sse.feature/pom.xml b/build/com.eclipsesource.jaxrs.provider.sse.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.eclipsesource</groupId>
     <artifactId>osgi-jaxrs-connector</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../com.eclipsesource.jaxrs.build</relativePath>
   </parent>
 

diff --git a/build/com.eclipsesource.jaxrs.provider.swagger.feature/pom.xml b/build/com.eclipsesource.jaxrs.provider.swagger.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.eclipsesource</groupId>
     <artifactId>osgi-jaxrs-connector</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../com.eclipsesource.jaxrs.build</relativePath>
   </parent>
 

diff --git a/build/com.eclipsesource.jaxrs.repository/pom.xml b/build/com.eclipsesource.jaxrs.repository/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.eclipsesource</groupId>
     <artifactId>osgi-jaxrs-connector</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../com.eclipsesource.jaxrs.build</relativePath>
   </parent>
 

diff --git a/bundles/com.eclipsesource.jaxrs.consumer/pom.xml b/bundles/com.eclipsesource.jaxrs.consumer/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.eclipsesource</groupId>
 		<artifactId>osgi-jaxrs-connector</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../build/com.eclipsesource.jaxrs.build</relativePath>
 	</parent>
 

diff --git a/bundles/com.eclipsesource.jaxrs.provider.gson/pom.xml b/bundles/com.eclipsesource.jaxrs.provider.gson/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.eclipsesource</groupId>
 		<artifactId>osgi-jaxrs-connector</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../build/com.eclipsesource.jaxrs.build</relativePath>
 	</parent>
 

diff --git a/bundles/com.eclipsesource.jaxrs.provider.moxy/pom.xml b/bundles/com.eclipsesource.jaxrs.provider.moxy/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.eclipsesource</groupId>
 		<artifactId>osgi-jaxrs-connector</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../build/com.eclipsesource.jaxrs.build</relativePath>
 	</parent>
 

diff --git a/bundles/com.eclipsesource.jaxrs.provider.multipart/pom.xml b/bundles/com.eclipsesource.jaxrs.provider.multipart/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.eclipsesource</groupId>
 		<artifactId>osgi-jaxrs-connector</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../build/com.eclipsesource.jaxrs.build</relativePath>
 	</parent>
 

diff --git a/bundles/com.eclipsesource.jaxrs.provider.security/pom.xml b/bundles/com.eclipsesource.jaxrs.provider.security/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.eclipsesource</groupId>
 		<artifactId>osgi-jaxrs-connector</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../build/com.eclipsesource.jaxrs.build</relativePath>
 	</parent>
 

diff --git a/bundles/com.eclipsesource.jaxrs.provider.sse/pom.xml b/bundles/com.eclipsesource.jaxrs.provider.sse/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.eclipsesource</groupId>
 		<artifactId>osgi-jaxrs-connector</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../build/com.eclipsesource.jaxrs.build</relativePath>
 	</parent>
 

diff --git a/bundles/com.eclipsesource.jaxrs.provider.swagger/pom.xml b/bundles/com.eclipsesource.jaxrs.provider.swagger/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.eclipsesource</groupId>
 		<artifactId>osgi-jaxrs-connector</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../build/com.eclipsesource.jaxrs.build</relativePath>
 	</parent>
 

diff --git a/...r.swagger/src/com/eclipsesource/jaxrs/provider/swagger/internal/SwaggerConfiguration.java b/...r.swagger/src/com/eclipsesource/jaxrs/provider/swagger/internal/SwaggerConfiguration.java
@@ -53,8 +53,9 @@ public class SwaggerConfiguration implements ManagedService {
 
   private Dictionary<String, ?> configuration;
 
+  @SuppressWarnings( "unchecked" )
   @Override
-  public void updated( Dictionary<String, ?> configuration ) throws ConfigurationException {
+  public void updated( @SuppressWarnings( "rawtypes" ) Dictionary configuration ) throws ConfigurationException {
     this.configuration = configuration;
   }
 

diff --git a/bundles/com.eclipsesource.jaxrs.publisher/META-INF/MANIFEST.MF b/bundles/com.eclipsesource.jaxrs.publisher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.eclipsesource.jaxrs.publisher
-Bundle-Version: 5.3.1.qualifier
+Bundle-Version: 5.3.2
 Bundle-Vendor: %Bundle-Name
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Localization: plugin
@@ -19,4 +19,4 @@ Import-Package: javax.servlet;version="[2.3.0,4.0.0)",
  org.osgi.service.cm;version="[1.2.0,2.0.0)",
  org.osgi.service.http;version="[1.2.0,2.0.0)",
  org.osgi.util.tracker;version="[1.4.0,2.0.0)"
-Export-Package: com.eclipsesource.jaxrs.publisher;version="5.3.1"
+Export-Package: com.eclipsesource.jaxrs.publisher;version="5.3.2"
diff --git a/bundles/com.eclipsesource.jaxrs.publisher/pom.xml b/bundles/com.eclipsesource.jaxrs.publisher/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>com.eclipsesource</groupId>
 		<artifactId>osgi-jaxrs-connector</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../build/com.eclipsesource.jaxrs.build</relativePath>
 	</parent>
 
 	<groupId>com.eclipsesource</groupId>
 	<artifactId>com.eclipsesource.jaxrs.publisher</artifactId>
-	<version>5.3.1-SNAPSHOT</version>
+	<version>5.3.2</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ bin @@
     .DS_Store
     target
     .idea
-    *.iml
+    *.iml
+    **/pom.xml.versionsBackup