[Git][java-team/jersey1][master] Depend on libgeronimo-annotation-1.3-spec-java instead of libtomcat8-java

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jersey1


Commits:
76665437 by Emmanuel Bourg at 2018-12-13T10:56:21Z
Depend on libgeronimo-annotation-1.3-spec-java instead of libtomcat8-java

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/maven.rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,7 @@
 jersey1 (1.19.3-5) UNRELEASED; urgency=medium
 
   * Fixed the build failure with Java 11 (Closes: #905358)
+  * Depend on libgeronimo-annotation-1.3-spec-java instead of libtomcat8-java
   * Standards-Version updated to 4.2.1
   * Use salsa.debian.org Vcs-* URLs
 


=====================================
debian/control
=====================================
@@ -10,6 +10,7 @@ Build-Depends:
  libbuild-helper-maven-plugin-java,
  libcdi-api-java,
  libfastinfoset-java,
+ libgeronimo-annotation-1.3-spec-java,
  libgeronimo-ejb-3.2-spec-java,
  libgeronimo-interceptor-3.0-spec-java (>= 1.0.1-2~),
  libgeronimo-jpa-2.0-spec-java,
@@ -24,7 +25,6 @@ Build-Depends:
  libmaven-bundle-plugin-java,
  libosgi-core-java,
  librome-java,
- libtomcat8-java,
  maven-debian-helper (>= 1.5)
 Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/jersey1.git


=====================================
debian/maven.rules
=====================================
@@ -3,7 +3,7 @@ javax.mail javax.mail-api jar s/.*/debian/ * *
 s/jdom/org.jdom/ jdom jar s/1\..*/debian/ * *
 org.codehaus.jettison jettison s/bundle/jar/ s/.*/debian/ * *
 com.sun.istack s/maven-istack-commons-plugin/istack-commons-maven-plugin/ * * * *
-s/javax.annotation/org.apache.tomcat/ s/jsr250-api/tomcat-annotations-api/ * s/.*/8.x/ * *
+s/javax.annotation/org.apache.geronimo.specs/ s/jsr250-api/geronimo-annotation_1.3_spec/ * s/.*/debian/ * *
 s/javax.mail/com.sun.mail/ s/mail/javax.mail/ * s/.*/debian/ * *
 s/jdom/org.jdom/ jdom * s/.*/debian/ * *
 junit junit * s/.*/4.x/ * *
@@ -16,4 +16,3 @@ s/ant/org.apache.ant/ ant * s/.*/debian/ * *
 javax.servlet javax.servlet-api * s/.*/3.1/ * *
 javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
 s/javax.servlet/javax.servlet.jsp/ s/jsp-api/javax.servlet.jsp-api/ * s/.*/2.3/ * *
-s/javax.annotation/org.apache.tomcat/ s/jsr250-api/tomcat-annotations-api/ * s/.*/8.x/ * *



View it on GitLab: https://salsa.debian.org/java-team/jersey1/commit/76665437767517ba88ffece4c9f129315276fdae

-- 
View it on GitLab: https://salsa.debian.org/java-team/jersey1/commit/76665437767517ba88ffece4c9f129315276fdae
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/20181213/73b00e39/attachment.html>