[Git][java-team/resteasy][master-3.0] 2 commits: Replace build-dep on libtomcat8-java with libgeronimo-annotation-1.3-spec-java.

[Timo Aaltonen]

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


Commits:
1c76aca6 by Timo Aaltonen at 2018-12-05T15:20:20Z
Replace build-dep on libtomcat8-java with libgeronimo-annotation-1.3-spec-java.

- - - - -
57bd2821 by Timo Aaltonen at 2018-12-05T15:22:35Z
Drop libscannotation-java from build-depends and classpath, it got removed in 3.0.7.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/libresteasy3.0-java.classpath
- debian/maven.rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+resteasy3.0 (3.0.19-6) UNRELEASED; urgency=medium
+
+  * Replace build-dep on libtomcat8-java with
+    libgeronimo-annotation-1.3-spec-java.
+  * Drop libscannotation-java from build-depends and classpath, it got
+    removed in 3.0.7.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 05 Dec 2018 17:19:55 +0200
+
 resteasy3.0 (3.0.19-5) unstable; urgency=medium
 
   * control, jaxb-api-compatibility.diff: Fix build, add libjaxb-api-java to


=====================================
debian/control
=====================================
@@ -8,6 +8,7 @@ Build-Depends-Indep:
  javahelper,
  junit4,
  libcommons-io-java,
+ libgeronimo-annotation-1.3-spec-java,
  libhttpclient-java,
  libjackson-json-java,
  libjackson2-core-java,
@@ -22,9 +23,7 @@ Build-Depends-Indep:
  libjettison-java,
  liblog4j1.2-java (>= 1.2.17),
  libmaven-install-plugin-java,
- libscannotation-java,
  libslf4j-java,
- libtomcat8-java,
  libyaml-snake-java
 Standards-Version: 3.9.8
 Vcs-Git: https://salsa.debian.org/java-team/resteasy.git


=====================================
debian/libresteasy3.0-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/scannotation.jar /usr/share/java/httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/tomcat8-annotations-api.jar /usr/share/java/el-api-3.0.jar
+usr/share/java/resteasy-jaxrs.jar	/usr/share/java/log4j-1.2.jar /usr/share/java/slf4j-api.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-3.0.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
=====================================
@@ -12,7 +12,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\..*/1.2.x/ * *
-s/org.jboss.spec.javax.annotation/org.apache.tomcat/ s/jboss-annotations-api_1.2_spec/tomcat-annotations-api/ * s/.*/8.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.0_spec/javax.ws.rs-api/ * s/.*/debian/ * *



View it on GitLab: https://salsa.debian.org/java-team/resteasy/compare/18ed5f410e16deb9c1db96105e6601e4f9e611b2...57bd28217d7f1b1cdcf3b10523106cd092fb68e0

-- 
View it on GitLab: https://salsa.debian.org/java-team/resteasy/compare/18ed5f410e16deb9c1db96105e6601e4f9e611b2...57bd28217d7f1b1cdcf3b10523106cd092fb68e0
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/20181205/2bd71a44/attachment.html>