bastif pushed to branch master at Debian Java Maintainers / css-validator


Commits:
315e8c9f by Fab Stz at 2026-04-09T08:24:32+02:00
Remove package css-validator-tomcat10

Closes: #1132872

- - - - -
127aeb11 by Fab Stz at 2026-04-09T08:25:25+02:00
Update version to 0~20250226+dfsg-5

Gbp-Dch: Ignore

- - - - -


9 changed files:

- debian/README.TODO
- debian/changelog
- debian/control
- − debian/css-validator-tomcat10.README.Debian
- − debian/css-validator-tomcat10.install
- − debian/css-validator-tomcat10.links
- − debian/css-validator-tomcat10.xml
- debian/tests/control
- debian/tests/webapp_validate_common.sh


Changes:

=====================================
debian/README.TODO
=====================================
@@ -12,6 +12,6 @@ Reminder & Packaging notes:
    In the meantime, we create symlinks to the english page.
      - https://github.com/jetty/jetty.project/issues/13330
      - https://bz.apache.org/bugzilla/show_bug.cgi?id=69735
- - tomcat10 & tomcat11: update comment in README.Debian once tomcat bugs are 
fixed (wrt jakartaee-migration)
+ - tomcat11: update comment in README.Debian once tomcat bugs are fixed (wrt 
jakartaee-migration)
 
 Instructions for installation of css-validator on jigsaw can be found at 
https://jigsaw.w3.org/css-validator/DOWNLOAD.html


=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+css-validator (0~20250226+dfsg-5) UNRELEASED; urgency=medium
+
+  * Remove package css-validator-tomcat10 (Closes: #1132872)
+
+ -- Fab Stz <[email protected]>  Thu, 09 Apr 2026 08:24:46 +0200
+
 css-validator (0~20250226+dfsg-4) unstable; urgency=medium
 
   * d/t/webapp_validate_common.sh: remove workaround for #1129201


=====================================
debian/control
=====================================
@@ -125,29 +125,6 @@ Description: W3C CSS Validator - jetty12 configuration 
files
  .
  This package ships configuration files for usage with jetty12.
 
-Package: css-validator-tomcat10
-Architecture: all
-Depends:
- css-validator-common,
- tomcat-jakartaee-migration,
- tomcat10,
- ${misc:Depends}
-Recommends: ${java:Recommends}
-Description: W3C CSS Validator - tomcat10 configuration files
- Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets.
- .
- The W3C CSS Validation Service is a free software created by the W3C to help
- Web designers and Web developers check Cascading Style Sheets (CSS). It can
- be used from https://jigsaw.w3.org/css-validator/, or as a java program, or
- as a java servlet on a Web server.
- .
- If you are a Web developer or a Web designer, this tool will be an invaluable
- ally. Not only will it compare your style sheets to the CSS specifications,
- helping you find errors, typos, or incorrect uses of CSS, it will also tell
- you when your CSS poses some risks in terms of usability.
- .
- This package ships configuration files for usage with tomcat10.
-
 Package: css-validator-tomcat11
 Architecture: all
 Depends:


=====================================
debian/css-validator-tomcat10.README.Debian deleted
=====================================
@@ -1,15 +0,0 @@
-With tomcat10 you need to perform some extra configuration step.
-
-  1. install `tomcat-jakartaee-migration` package if not done yet
-  2. and then one of these:
-      - add ",/usr/share/tomcat-jakartaee-migration/lib/*.jar" to
-        common.loader in '/etc/tomcat10/catalina.properties'
-      - create a link to 
/usr/share/tomcat-jakartaee-migration/lib/jakartaee-migration-1.0.6-shaded.jar
-        in /usr/share/tomcat10/lib
-
-Notice: at the time of writing this, there is a bug report on this. See:
-- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1108280
-
-With tomcat10, css-validator webapp is reachable at:
-
-  http://localhost:8080/css-validator


=====================================
debian/css-validator-tomcat10.install deleted
=====================================
@@ -1 +0,0 @@
-debian/css-validator-tomcat10.xml /etc/css-validator/


=====================================
debian/css-validator-tomcat10.links deleted
=====================================
@@ -1 +0,0 @@
-/etc/css-validator/css-validator-tomcat10.xml 
/etc/tomcat10/Catalina/localhost/css-validator.xml


=====================================
debian/css-validator-tomcat10.xml deleted
=====================================
@@ -1,9 +0,0 @@
-<!--
-    Context configuration file for Css Validator
--->
-
-<Context docBase="/usr/share/css-validator/webapp">
-  <!-- Let Tomcat convert from javax.servlet to jakarta.servlet. Since 
Tomcat10 -->
-  <Loader jakartaConverter="TOMCAT" />
-  <Resources allowLinking="true" />
-</Context>


=====================================
debian/tests/control
=====================================
@@ -23,16 +23,6 @@ Features: 
test-name=webapp:jetty12-by-POST-request-fileupload,
 Depends: css-validator-jetty12, curl, netcat-openbsd,
 Restrictions: isolation-container, needs-sudo, superficial,
 
-Test-Command: debian/tests/webapp_validate_url.sh "tomcat10"
-Features: test-name=webapp:tomcat10-by-GET-request-url,
-Depends: css-validator-tomcat10, curl, netcat-openbsd,
-Restrictions: isolation-container, needs-sudo, superficial,
-
-Test-Command: debian/tests/webapp_validate_file.sh "tomcat10"
-Features: test-name=webapp:tomcat10-by-POST-request-fileupload,
-Depends: css-validator-tomcat10, curl, netcat-openbsd,
-Restrictions: isolation-container, needs-sudo, superficial,
-
 Test-Command: debian/tests/webapp_validate_url.sh "tomcat11"
 Features: test-name=webapp:tomcat11-by-GET-request-url,
 Depends: css-validator-tomcat11, curl, netcat-openbsd,


=====================================
debian/tests/webapp_validate_common.sh
=====================================
@@ -78,9 +78,6 @@ start_server()
   path="$3"
   if [ -n "$AUTOPKGTEST_TMP" ]; then
     case "$server" in
-    tomcat10)
-      sudo sed -i '/common.loader/ 
s#$#,/usr/share/tomcat-jakartaee-migration/lib/*.jar#' 
"/etc/tomcat10/catalina.properties"
-      ;;
     tomcat11)
       sudo sed -i '/common.loader/ 
s#$#,/usr/share/tomcat-jakartaee-migration/lib/*.jar#' 
"/etc/tomcat11/catalina.properties"
       ;;



View it on GitLab: 
https://salsa.debian.org/java-team/css-validator/-/compare/ec04927782af546a59b0d1392dc2ed1257992467...127aeb117ec16b62424179a07f461ec98c8f796f

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/css-validator/-/compare/ec04927782af546a59b0d1392dc2ed1257992467...127aeb117ec16b62424179a07f461ec98c8f796f
You're receiving this email because of your account on salsa.debian.org.


_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to