[Git][java-team/resteasy][master-3.0] Depend on libservlet-api-java and libel-api-java instead of libtomcat9-java (Closes: #1033366)

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master-3.0 at Debian Java Maintainers / resteasy


Commits:
d5b577c5 by Emmanuel Bourg at 2023-05-14T19:15:25+02:00
Depend on libservlet-api-java and libel-api-java instead of libtomcat9-java (Closes: #1033366)

- - - - -


4 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+resteasy3.0 (3.0.26-6) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on libservlet-api-java and libel-api-java instead of libtomcat9-java
+    (Closes: #1033366)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 14 May 2023 19:12:25 +0200
+
 resteasy3.0 (3.0.26-5) unstable; urgency=medium
 
   * patches: Replace javax/activation with jakarta/activation, fixes noise


=====================================
debian/control
=====================================
@@ -10,6 +10,7 @@ Build-Depends-Indep:
  javahelper,
  junit4,
  libcommons-io-java,
+ libel-api-java,
  libgeronimo-annotation-1.3-spec-java,
  libhttpclient-java,
  libjackson2-core-java,
@@ -22,8 +23,8 @@ Build-Depends-Indep:
  libjboss-logging-java,
  libjboss-logging-tools-java,
  libmaven-install-plugin-java,
- libslf4j-java,
- libtomcat9-java,
+ libservlet-api-java,
+ libslf4j-java
 Standards-Version: 4.5.1
 Vcs-Git: https://salsa.debian.org/java-team/resteasy.git
 Vcs-Browser: https://salsa.debian.org/java-team/resteasy


=====================================
debian/libresteasy3.0-java.classpath
=====================================
@@ -1,2 +1,2 @@
-usr/share/java/resteasy-jaxrs.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/tomcat9-el-api.jar /usr/share/java/jakarta-activation.jar
+usr/share/java/resteasy-jaxrs.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/jakarta-activation.jar
 usr/share/java/resteasy-jackson2-provider.jar	/usr/share/java/jackson-core.jar /usr/share/java/jackson-databind.jar /usr/share/java/jackson-jaxrs-base.jar /usr/share/java/jackson-jaxrs-json-provider.jar /usr/share/java/jackson-module-jaxb-annotations.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/ * *
 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/org.apache.tomcat/ s/jboss-servlet-api_3.1_spec/tomcat-servlet-api/ * s/.*/9.x/ * *
-s/org.jboss.spec.javax.el/org.apache.tomcat/ s/jboss-el-api_3.0_spec/tomcat-el-api/ * s/.*/9.x/ * *
+s/org.jboss.spec.javax.servlet/javax.servlet/ s/jboss-servlet-api_3.1_spec/javax.servlet-api/ * s/.*/debian/ * *
+s/org.jboss.spec.javax.el/javax.el/ s/jboss-el-api_3.0_spec/javax.el-api/ * s/.*/debian/ * *
 s/org.jboss.spec.javax.ws.rs/javax.ws.rs/ s/jboss-jaxrs-api_2.0_spec/javax.ws.rs-api/ * s/.*/debian/ * *
 s/javax.activation/jakarta.activation/ s/activation/jakarta.activation-api/ * s/.*/debian/ * *



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

-- 
View it on GitLab: https://salsa.debian.org/java-team/resteasy/-/commit/d5b577c5f92baa9189a976ee4e21a43d2da47e90
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/20230514/a188c456/attachment.htm>