[debian-edu-commits] debian-edu/ 02/03: remove dependencies for the removed APIs

[Thorsten Glaser]

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

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

commit 5ba3f6203531f8112551e3c89a7b4ddfcb0bdecb
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Tue Nov 8 21:48:45 2016 +0100

    remove dependencies for the removed APIs
---
 debian/maven.rules                  |  2 --
 debian/patches/fix-java-build.patch | 54 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/debian/maven.rules b/debian/maven.rules
index c755a11..63bd8d9 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -8,6 +8,4 @@ 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/
-org.apache.tomcat tomcat-catalina jar s/.*/debian/
-org.apache.tomcat tomcat-coyote jar s/.*/debian/
 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 32f2bb7..7e31fec 100644
--- a/debian/patches/fix-java-build.patch
+++ b/debian/patches/fix-java-build.patch
@@ -1,6 +1,7 @@
 # DP: first hunk is from original Debian package to fix .war file name
 # DP: packages never use -Werror, that's for upstream
 # DP: exclude non-JSR356 websocket implementations we cannot build
+# DP: remove dependencies for those removed implementations
 # DP: add various dependencies to build
 # DP: remove extensions we cannot possibly build, for now
 
@@ -30,7 +31,58 @@
                  </configuration>
              </plugin>
  
-@@ -334,6 +340,12 @@
+@@ -241,50 +247,6 @@
+             <scope>runtime</scope>
+         </dependency>
+ 
+-        <!-- Jetty 8 servlet API (websocket)  -->
+-        <dependency>
+-            <groupId>org.eclipse.jetty</groupId>
+-            <artifactId>jetty-websocket</artifactId>
+-            <version>8.1.1.v20120215</version>
+-            <scope>provided</scope>
+-        </dependency>
+-
+-        <!-- Jetty 9.0 servlet API (websocket)  -->
+-        <dependency>
+-            <groupId>org.eclipse.jetty</groupId>
+-            <artifactId>jetty-parent</artifactId>
+-            <version>20</version>
+-            <scope>provided</scope>
+-            <type>pom</type>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.eclipse.jetty.websocket</groupId>
+-            <artifactId>websocket-api</artifactId>
+-            <version>9.0.7.v20131107</version>
+-            <scope>provided</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.eclipse.jetty.websocket</groupId>
+-            <artifactId>websocket-servlet</artifactId>
+-            <version>9.0.7.v20131107</version>
+-            <scope>provided</scope>
+-        </dependency>
+-
+-        <!-- Tomcat servlet API (websocket)  -->
+-        <dependency>
+-            <groupId>org.apache.tomcat</groupId>
+-            <artifactId>tomcat-catalina</artifactId>
+-            <version>7.0.37</version>
+-            <scope>provided</scope>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>org.apache.tomcat</groupId>
+-            <artifactId>tomcat-coyote</artifactId>
+-            <version>7.0.37</version>
+-            <scope>provided</scope>
+-        </dependency>
+-
+         <!-- Guice - Dependency Injection -->
+         <dependency>
+             <groupId>com.google.inject</groupId>
+@@ -334,6 +296,12 @@
              <version>1.17.1</version>
          </dependency>
  

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