Merge branch 'DEVELOP_BE' of ssh://git.eclipse.org:29418/elogbook/authandauth into DEVELOP_BE

diff --git a/pom.xml b/pom.xml
index 3151c18..d857599 100644
--- a/pom.xml
+++ b/pom.xml

@@ -6,15 +6,12 @@
 
     <groupId>openk.pta.de</groupId>
     <artifactId>portal</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <packaging>war</packaging>
 
     <properties>
         <skip.asciidoc>false</skip.asciidoc>
         <httpclient.version>4.5.3</httpclient.version>
-        <jersey-bundle.version>1.19.3</jersey-bundle.version>
-        <org.json.version>20160810</org.json.version>
-        <jersey.server.version>1.19.3</jersey.server.version>
         <gson.version>2.8.0</gson.version>
         <log4j.version>1.2.17</log4j.version>
         <commons-io.version>2.5</commons-io.version>
@@ -34,22 +31,11 @@
             <version>${httpclient.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>${org.json.version}</version>
+            <groupId>org.glassfish.jersey.bundles</groupId>
+            <artifactId>jaxrs-ri</artifactId>
+            <version>2.22.1</version>
         </dependency>
         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxrs</artifactId>
-            <version>3.0.21.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>jaxrs-api</artifactId>
-            <version>3.0.12.Final</version>
-        </dependency>
-
-        <dependency>
           <groupId>javax.servlet</groupId>
           <artifactId>javax.servlet-api</artifactId>
           <version>3.0.1</version>

diff --git a/src/main/java/org/eclipse/openk/portal/rest/BackendRestService.java b/src/main/java/org/eclipse/openk/portal/rest/BackendRestService.java
index 79ce8e8..bf13edb 100644
--- a/src/main/java/org/eclipse/openk/portal/rest/BackendRestService.java
+++ b/src/main/java/org/eclipse/openk/portal/rest/BackendRestService.java

@@ -138,7 +138,7 @@
     @GET
     @Path("/healthcheck")
     @Produces("application/json")
-    public Response getHealthCheck(@FormParam(value = "pretty") boolean yn) {
+    public Response getHealthCheck() {
         HealthChecker hc = new HealthChecker();
         hc.register("Keycloak present", new KeyCloakPresentHealthCheck());
 

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 2b6bcdb..2ce8042 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml

@@ -5,33 +5,22 @@
 	http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
   <display-name>Restful Web Application</display-name>
 
-  <context-param>
-    <param-name>resteasy.servlet.mapping.prefix</param-name>
-    <param-value>/rest</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>resteasy.scan</param-name>
-    <param-value>false</param-value>
-  </context-param>
-
-  <listener>
-    <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
-  </listener>
-
   <servlet>
-    <servlet-name>Resteasy</servlet-name>
+    <servlet-name>jersey-serlvet</servlet-name>
     <servlet-class>
-      org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher
+      org.glassfish.jersey.servlet.ServletContainer
     </servlet-class>
     <init-param>
-      <param-name>javax.ws.rs.Application</param-name>
-      <param-value>org.eclipse.openk.portal.rest.RestServiceConfiguration</param-value>
+      <param-name>jersey.config.server.provider.packages</param-name>
+      <param-value>org.eclipse.openk.portal.rest</param-value>
     </init-param>
+    <load-on-startup>1</load-on-startup>
+
   </servlet>
 
+
   <servlet-mapping>
-    <servlet-name>Resteasy</servlet-name>
+    <servlet-name>jersey-serlvet</servlet-name>
     <url-pattern>/rest/*</url-pattern>
   </servlet-mapping>