[Git][java-team/libhibernate-validator-java][master] 5 commits: Switch to debhelper-compat = 13.

[Markus Koschany (@apo)]

Markus Koschany pushed to branch master at Debian Java Maintainers / libhibernate-validator-java


Commits:
300e036a by Markus Koschany at 2022-05-24T00:52:20+02:00
Switch to debhelper-compat = 13.

- - - - -
b9d56bae by Markus Koschany at 2022-05-24T00:52:41+02:00
Declare compliance with Debian Policy 4.6.1.

- - - - -
5074f26e by Markus Koschany at 2022-05-24T00:53:09+02:00
Tighten BD on libjsoup-java.

- - - - -
8566896e by Markus Koschany at 2022-05-24T00:55:03+02:00
Fix FTBFS with jsoup 1.15.1.

- - - - -
514a0056 by Markus Koschany at 2022-05-24T00:55:25+02:00
Update changelog

- - - - -


5 changed files:

- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/Whitelist-is-Safelist.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libhibernate-validator-java (5.3.6-2) unstable; urgency=medium
+
+  * Team upload.
+  * Switch to debhelper-compat = 13.
+  * Declare compliance with Debian Policy 4.6.1.
+  * Fix FTBFS with jsoup 1.15.1.
+
+ -- Markus Koschany <apo at debian.org>  Tue, 24 May 2022 00:55:06 +0200
+
 libhibernate-validator-java (5.3.6-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Uploaders:
  Torsten Werner <twerner at debian.org>,
  Varun Hiremath <varun at debian.org>
 Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
  groovy,
  libclassmate-java,
@@ -18,7 +18,7 @@ Build-Depends:
  libjboss-logging-java,
  libjboss-logging-tools-java,
  libjoda-time-java,
- libjsoup-java,
+ libjsoup-java (>= 1.15.1),
  libjtype-java,
  liblog4j1.2-java,
  libmaven-bundle-plugin-java,
@@ -30,7 +30,7 @@ Build-Depends:
  libparanamer-java,
  maven-debian-helper,
  testng (>= 6.8.7)
-Standards-Version: 4.4.0
+Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/java-team/libhibernate-validator-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libhibernate-validator-java
 Homepage: http://validator.hibernate.org


=====================================
debian/patches/Whitelist-is-Safelist.patch
=====================================
@@ -0,0 +1,56 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 24 May 2022 00:53:54 +0200
+Subject: Whitelist is Safelist
+
+Fix FTBFS with jsoup 1.15.1.
+
+Forwarded: no
+---
+ .../constraintvalidators/hv/SafeHtmlValidator.java         | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/SafeHtmlValidator.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/SafeHtmlValidator.java
+index 7fba356..59fe5c7 100644
+--- a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/SafeHtmlValidator.java
++++ b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/SafeHtmlValidator.java
+@@ -15,7 +15,7 @@
+ import org.jsoup.nodes.Element;
+ import org.jsoup.parser.Parser;
+ import org.jsoup.safety.Cleaner;
+-import org.jsoup.safety.Whitelist;
++import org.jsoup.safety.Safelist;
+ 
+ import org.hibernate.validator.constraints.SafeHtml;
+ 
+@@ -28,25 +28,25 @@
+  * @author Hardy Ferentschik
+  */
+ public class SafeHtmlValidator implements ConstraintValidator<SafeHtml, CharSequence> {
+-	private Whitelist whitelist;
++	private Safelist whitelist;
+ 
+ 	@Override
+ 	public void initialize(SafeHtml safeHtmlAnnotation) {
+ 		switch ( safeHtmlAnnotation.whitelistType() ) {
+ 			case BASIC:
+-				whitelist = Whitelist.basic();
++				whitelist = Safelist.basic();
+ 				break;
+ 			case BASIC_WITH_IMAGES:
+-				whitelist = Whitelist.basicWithImages();
++				whitelist = Safelist.basicWithImages();
+ 				break;
+ 			case NONE:
+-				whitelist = Whitelist.none();
++				whitelist = Safelist.none();
+ 				break;
+ 			case RELAXED:
+-				whitelist = Whitelist.relaxed();
++				whitelist = Safelist.relaxed();
+ 				break;
+ 			case SIMPLE_TEXT:
+-				whitelist = Whitelist.simpleText();
++				whitelist = Safelist.simpleText();
+ 				break;
+ 		}
+ 		whitelist.addTags( safeHtmlAnnotation.additionalTags() );


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 02-jaxb-plugin.patch
 05-jaxb-dependency.patch
 06-javafx-dependency.patch
+Whitelist-is-Safelist.patch



View it on GitLab: https://salsa.debian.org/java-team/libhibernate-validator-java/-/compare/87ea50f03bc294f024826babc6715824f7c1237d...514a0056bd1f1b6a37e408a9a72267711367291d

-- 
View it on GitLab: https://salsa.debian.org/java-team/libhibernate-validator-java/-/compare/87ea50f03bc294f024826babc6715824f7c1237d...514a0056bd1f1b6a37e408a9a72267711367291d
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/20220523/f7df5e51/attachment.htm>