[Git][java-team/groovy][master] 2 commits: Remove javax.servlet:servlet-api mapping rules from debian/maven.rules

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / groovy


Commits:
05109b1c by tony mancill at 2022-10-03T20:43:57-07:00
Remove javax.servlet:servlet-api mapping rules from debian/maven.rules

- - - - -
baf2c42c by tony mancill at 2022-10-03T21:34:39-07:00
Prepare changelog for upload

- - - - -


2 changed files:

- debian/changelog
- debian/maven.rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+groovy (2.4.21-6) unstable; urgency=medium
+
+  * Team upload.
+  * Remove javax.servlet:servlet-api mapping rules from debian/maven.rules
+    (Required to resolve FTBFS with gradle 4.4.1-16.)
+
+ -- tony mancill <tmancill at debian.org>  Mon, 03 Oct 2022 21:34:10 -0700
+
 groovy (2.4.21-5) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/maven.rules
=====================================
@@ -2,9 +2,7 @@ junit junit jar s/3\..*/3.x/ * *
 junit junit jar s/4\..*/4.x/ * *
 org.testng testng jar s/.*/6.x/ * *
 javax.el javax.el-api * s/.*/3.0/ * *
-javax.servlet javax.servlet-api * s/.*/3.1/ * *
 javax.servlet.jsp javax.servlet.jsp-api * s/.*/2.3/ * *
-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/ * *
 antlr antlr * s/.*/2.x/ * *
 jline jline * s/.*/2.x/ * *



View it on GitLab: https://salsa.debian.org/java-team/groovy/-/compare/279e5eadacfa596ad15cb5e3828632038591f049...baf2c42ccbfad6eb3c517703fab6b429d3b320fe

-- 
View it on GitLab: https://salsa.debian.org/java-team/groovy/-/compare/279e5eadacfa596ad15cb5e3828632038591f049...baf2c42ccbfad6eb3c517703fab6b429d3b320fe
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/20221004/a7f2aa19/attachment.htm>