diff -Nru resteasy3.0-3.0.19/debian/changelog resteasy3.0-3.0.19/debian/changelog
--- resteasy3.0-3.0.19/debian/changelog	2017-09-19 09:06:03.000000000 +0000
+++ resteasy3.0-3.0.19/debian/changelog	2017-12-14 16:43:45.000000000 +0000
@@ -1,3 +1,11 @@
+resteasy3.0 (3.0.19-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with jaxrs-api 2.1
+  * Removed the build dependency on glassfish-javaee
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 14 Dec 2017 17:43:45 +0100
+
 resteasy3.0 (3.0.19-1) unstable; urgency=medium
 
   * Initial packaging. (Closes: #876161)
diff -Nru resteasy3.0-3.0.19/debian/control resteasy3.0-3.0.19/debian/control
--- resteasy3.0-3.0.19/debian/control	2017-09-19 06:25:37.000000000 +0000
+++ resteasy3.0-3.0.19/debian/control	2017-12-14 16:41:52.000000000 +0000
@@ -5,14 +5,13 @@
 Uploaders: Timo Aaltonen <tjaalton@debian.org>
 Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.5)
 Build-Depends-Indep:
- glassfish-javaee,
  javahelper,
  junit4,
  libcommons-io-java,
  libhttpclient-java,
  libjackson-json-java,
  libjaxb-java,
- libjaxrs-api-java,
+ libjaxrs-api-java (>= 2.1),
  libjboss-logging-java,
  libjboss-logging-tools-java,
  libjettison-java,
diff -Nru resteasy3.0-3.0.19/debian/patches/03-jaxrs-api-compatibility.patch resteasy3.0-3.0.19/debian/patches/03-jaxrs-api-compatibility.patch
--- resteasy3.0-3.0.19/debian/patches/03-jaxrs-api-compatibility.patch	1970-01-01 00:00:00.000000000 +0000
+++ resteasy3.0-3.0.19/debian/patches/03-jaxrs-api-compatibility.patch	2017-12-14 16:39:44.000000000 +0000
@@ -0,0 +1,66 @@
+--- a/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/specimpl/ResponseBuilderImpl.java
++++ b/jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/specimpl/ResponseBuilderImpl.java
+@@ -64,6 +64,13 @@
+    }
+ 
+    @Override
++   public Response.ResponseBuilder status(int status, String reasonPhrase)
++   {
++      this.status = status;
++      return this;
++   }
++
++   @Override
+    public Response.ResponseBuilder entity(Object entity)
+    {
+       this.entity = entity;
+--- a/jaxrs/resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/ResteasyClientBuilder.java
++++ b/jaxrs/resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/ResteasyClientBuilder.java
+@@ -586,4 +586,28 @@
+       }
+       return this;
+    }
++
++   @Override
++   public ClientBuilder executorService(java.util.concurrent.ExecutorService executorService)
++   {
++      throw new UnsupportedOperationException();
++   }
++
++   @Override
++   public ClientBuilder scheduledExecutorService(java.util.concurrent.ScheduledExecutorService scheduledExecutorService)
++   {
++      throw new UnsupportedOperationException();
++   }
++
++   @Override
++   public ClientBuilder connectTimeout(long timeout, java.util.concurrent.TimeUnit unit)
++   {
++      throw new UnsupportedOperationException();
++   }
++
++   @Override
++   public ClientBuilder readTimeout(long timeout, java.util.concurrent.TimeUnit unit)
++   {
++      throw new UnsupportedOperationException();
++   }
+ }
+--- a/jaxrs/resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/internal/ClientInvocationBuilder.java
++++ b/jaxrs/resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/internal/ClientInvocationBuilder.java
+@@ -309,4 +309,16 @@
+       invocation.property(name, value);
+       return this;
+    }
++
++   @Override
++   public javax.ws.rs.client.CompletionStageRxInvoker rx()
++   {
++      throw new UnsupportedOperationException();
++   }
++
++   @Override
++   public <T extends javax.ws.rs.client.RxInvoker> T rx(Class<T> clazz)
++   {
++      throw new UnsupportedOperationException();
++   }
+ }
diff -Nru resteasy3.0-3.0.19/debian/patches/series resteasy3.0-3.0.19/debian/patches/series
--- resteasy3.0-3.0.19/debian/patches/series	2017-09-19 05:57:53.000000000 +0000
+++ resteasy3.0-3.0.19/debian/patches/series	2017-12-14 16:22:49.000000000 +0000
@@ -1,2 +1,3 @@
 01-ignore-tjws.patch
 02-servlet-api-compatibility.patch
+03-jaxrs-api-compatibility.patch