[Git][java-team/resteasy][master] use libgeronimo-annotations instead of tomcat.

[Timo Aaltonen]

Timo Aaltonen pushed to branch master at Debian Java Maintainers / resteasy


Commits:
0a013d9f by Timo Aaltonen at 2018-12-04T18:51:22Z
use libgeronimo-annotations instead of tomcat.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/libresteasy-java.classpath
- debian/maven.rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,7 @@
 resteasy (3.6.2-2) UNRELEASED; urgency=medium
 
-  * Switch to libtomcat9-java.
+  * Replace build-dep on libtomcat8-java with
+    libgeronimo-annotation-1.3-spec-java.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Tue, 04 Dec 2018 19:32:09 +0200
 


=====================================
debian/control
=====================================
@@ -9,6 +9,7 @@ Build-Depends-Indep:
  junit4,
  libcommons-io-java,
  libgeronimo-validation-1.1-spec-java,
+ libgeronimo-annotation-1.3-spec-java,
  libhttpasyncclient-java,
  libhttpclient-java,
  libjackson-json-java,
@@ -24,7 +25,6 @@ Build-Depends-Indep:
  libreactive-streams-java,
  libscannotation-java,
  libslf4j-java,
- libtomcat9-java,
  libyaml-snake-java
 Standards-Version: 4.1.1
 Vcs-Git: https://salsa.debian.org/java-team/resteasy.git


=====================================
debian/libresteasy-java.classpath
=====================================
@@ -1,4 +1,4 @@
-usr/share/java/resteasy-jaxrs.jar	/usr/share/java/log4j-1.2.jar /usr/share/java/slf4j-api.jar /usr/share/java/slf4j-simple.jar /usr/share/java/scannotation.jar /usr/share/java/httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/tomcat-annotations-api.jar /usr/share/java/el-api-2.1.jar
+usr/share/java/resteasy-jaxrs.jar	/usr/share/java/log4j-1.2.jar /usr/share/java/slf4j-api.jar /usr/share/java/slf4j-simple.jar /usr/share/java/scannotation.jar /usr/share/java/httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/geronimo-annotation-1.3-spec.jar /usr/share/java/el-api-2.1.jar
 usr/share/java/resteasy-jaxb-provider.jar	/usr/share/java/jaxb-impl.jar
 usr/share/java/resteasy-jettison-provider.jar	/usr/share/java/jettison.jar
 usr/share/java/resteasy-jackson-provider.jar	/usr/share/java/jackson-core-asl.jar /usr/share/java/jackson-mapper-asl.jar /usr/share/java/jackson-jaxrs.jar /usr/share/java/jackson-xc.jar


=====================================
debian/maven.rules
=====================================
@@ -9,7 +9,7 @@ org.yaml snakeyaml * s/.*/1.x/ * *
 com.sun.istack istack-commons-runtime * s/debian/2.17/ * *
 s/jboss/javassist/ javassist * s/.*/debian/ * *
 log4j log4j * s/.*/1.2.x/ * *
-s/org.jboss.spec.javax.annotation/org.apache.tomcat/ s/jboss-annotations-api_1.2_spec/tomcat-annotations-api/ * s/.*/9.x/ * *
+s/org.jboss.spec.javax.annotation/org.apache.geronimo.specs/ s/jboss-annotations-api_1.2_spec/geronimo-annotation_1.3_spec/ * s/.*/debian/ * *
 s/org.jboss.spec.javax.servlet/javax.servlet/ s/jboss-servlet-api_3.1_spec/javax.servlet-api/ * s/.*/3.1/ * *
 s/org.jboss.spec.javax.el/javax.el/ s/jboss-el-api_3.0_spec/javax.el-api/ * s/.*/3.0/ * *
 s/org.jboss.spec.javax.ws.rs/javax.ws.rs/ s/jboss-jaxrs-api_2.1_spec/javax.ws.rs-api/ * s/.*/debian/ * *



View it on GitLab: https://salsa.debian.org/java-team/resteasy/commit/0a013d9f12ff124eb1503103f2375461a25a8134

-- 
View it on GitLab: https://salsa.debian.org/java-team/resteasy/commit/0a013d9f12ff124eb1503103f2375461a25a8134
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181204/03202e0e/attachment.html>