[Pkg-remote-commits] [guacamole-client] 06/11: Build without jaxrs-api

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository guacamole-client.

commit 04cee980c99e458656e28dd2744a1dfdc66393b5
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Mon Nov 28 22:27:43 2016 +0100

    Build without jaxrs-api
---
 debian/control                      |  2 --
 debian/maven.rules                  |  1 -
 debian/patches/fix-java-build.patch | 13 -------------
 3 files changed, 16 deletions(-)

diff --git a/debian/control b/debian/control
index 06e3e56..d7e6298 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends:
  libguava-java,
  libguice-java,
  libjackson-json-java,
- libjaxrs-api-java,
  libjsr311-api-java,
  libjersey1-core-java,
  libjersey1-guice-java,
@@ -51,7 +50,6 @@ Depends:
  libguava-java,
  libguice-java,
  libjackson-json-java,
- libjaxrs-api-java,
  libjsr311-api-java,
  libjersey1-core-java,
  libjersey1-guice-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 63bd8d9..cbc7b7d 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -8,4 +8,3 @@ org.glyptodon.guacamole guacamole-common-js zip *
 junit junit jar s/4\..*/4.x/ * *
 javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/
 javax.websocket javax.websocket-api jar s/.*/1.0/
-javax.ws.rs javax.ws.rs-api jar debian
diff --git a/debian/patches/fix-java-build.patch b/debian/patches/fix-java-build.patch
index 7e31fec..9c71223 100644
--- a/debian/patches/fix-java-build.patch
+++ b/debian/patches/fix-java-build.patch
@@ -82,19 +82,6 @@
          <!-- Guice - Dependency Injection -->
          <dependency>
              <groupId>com.google.inject</groupId>
-@@ -334,6 +296,12 @@
-             <version>1.17.1</version>
-         </dependency>
- 
-+	<dependency>
-+	    <groupId>javax.ws.rs</groupId>
-+	    <artifactId>javax.ws.rs-api</artifactId>
-+	    <version>debian</version>
-+	</dependency>
-+
-     </dependencies>
- 
- </project>
 --- a/pom.xml
 +++ b/pom.xml
 @@ -28,8 +28,6 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/packages/guacamole-client.git