bastif pushed to branch master at Debian Java Maintainers / css-validator
Commits:
3e3fce06 by Fab Stz at 2026-02-27T08:15:13+01:00
Enable autopkgtest of css-validator-jetty12
Now that jetty12 bugs #1108253 & #1108370 are fixed.
- - - - -
91449ac5 by Fab Stz at 2026-02-27T08:15:51+01:00
Remove Depends on curl for test 'cli-validate-file.sh'
- - - - -
1fc1f69f by Fab Stz at 2026-02-27T08:44:54+01:00
d/t/webapp_validate_file.sh: don't exit after successful startup
- - - - -
ccfacada by Fab Stz at 2026-02-27T08:45:32+01:00
css-validator-jetty12: fix path to webapp
- - - - -
5 changed files:
- debian/README.TODO
- debian/css-validator-jetty12.README.Debian
- debian/css-validator-jetty12.xml
- debian/tests/control
- debian/tests/webapp_validate_file.sh
Changes:
=====================================
debian/README.TODO
=====================================
@@ -15,9 +15,5 @@ Reminder & Packaging notes:
- tomcat11: restore test 'debian/tests/webapp_validate_file.sh "tomcat11"'
when fixed upstream Issue css-validator#455
In the meantime, the autopkgtest is made by URL instead of file upload.
- tomcat11: remove `allowCasualMultipartParsing="true"` when fixed upstream
Issue css-validator#455
- - jetty12: reenable autopkgtest test when jetty12 package is fixed. See:
- * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1108253
- * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1108370
- - jetty12: update comment in README.Debian for css-validator-jetty12
Instructions for installation of css-validator on jigsaw can be found at
https://jigsaw.w3.org/css-validator/DOWNLOAD.html
=====================================
debian/css-validator-jetty12.README.Debian
=====================================
@@ -1,14 +1,3 @@
-With jetty12 you need to perform some extra configuration step.
-
- java -jar $JETTY_HOME/start.jar --add-modules=ee8-deploy
- systemctl restart jetty12
-
-Notice: at the time of writing this, jetty12 is not completely functional in
-Debian yet. See:
-- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1108253
-- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1108370
-
-
-Once jetty12 is properly configured, css-validator webapp is reachable at:
+With jetty9, css-validator webapp is reachable at:
http://localhost:8080/css-validator
=====================================
debian/css-validator-jetty12.xml
=====================================
@@ -5,7 +5,7 @@
<Configure id="CssValidatorContext"
class="org.eclipse.jetty.ee8.webapp.WebAppContext">
<Set name="contextPath">/css-validator</Set>
- <Set name="war">/run/schroot/mount/dev/usr/share/css-validator/webapp</Set>
+ <Set name="war">/usr/share/css-validator/webapp</Set>
<!-- get a ContextHandler reference that the AliasChecker can use -->
<Get id="contextHandler" name="coreContextHandler" />
=====================================
debian/tests/control
=====================================
@@ -1,5 +1,5 @@
Tests: cli-validate-file.sh,
-Depends: css-validator, curl,
+Depends: css-validator,
Restrictions: superficial,
Test-Command: debian/tests/webapp_validate_file.sh "jetty9"
@@ -7,13 +7,10 @@ Features: test-name=webapp:jetty9,
Depends: css-validator-jetty9, curl, netcat-openbsd,
Restrictions: isolation-container, needs-sudo, superficial,
-# Know to fail. Skip until bin:jetty12 is fixed.
-# * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1108253
-# * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1108370
-#Test-Command: debian/tests/webapp_validate_file.sh "jetty12"
-#Features: test-name=webapp:jetty12,
-#Depends: css-validator-jetty12, curl, netcat-openbsd,
-#Restrictions: isolation-container, needs-sudo, superficial,
+Test-Command: debian/tests/webapp_validate_file.sh "jetty12"
+Features: test-name=webapp:jetty12,
+Depends: css-validator-jetty12, curl, netcat-openbsd,
+Restrictions: isolation-container, needs-sudo, superficial,
Test-Command: debian/tests/webapp_validate_file.sh "tomcat10"
Features: test-name=webapp:tomcat10,
=====================================
debian/tests/webapp_validate_file.sh
=====================================
@@ -30,7 +30,6 @@ wait_until_ready()
if [ ! $count -gt 60 ]; then
echo "$server is now up and running at http://localhost:${port:-8080}";
echo "Startup took $count seconds."
- exit
else
echo "$server failed starting up in less than 60 seconds"
exit 1
View it on GitLab:
https://salsa.debian.org/java-team/css-validator/-/compare/4281dbbfb531a002b1e260cf71a25d1048f9ecf0...ccfacada770e51a6f2714ba4f0761543e6f589b0
--
View it on GitLab:
https://salsa.debian.org/java-team/css-validator/-/compare/4281dbbfb531a002b1e260cf71a25d1048f9ecf0...ccfacada770e51a6f2714ba4f0761543e6f589b0
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
