[Git][java-team/libhibernate-validator4-java][master] 5 commits: Tighten BD on libjsoup-java.

[Markus Koschany (@apo)]

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


Commits:
3b65c153 by Markus Koschany at 2022-05-24T00:40:15+02:00
Tighten BD on libjsoup-java.

- - - - -
2025933b by Markus Koschany at 2022-05-24T00:45:51+02:00
Fix FTBFS with jsoup 1.15.1

- - - - -
d219810e by Markus Koschany at 2022-05-24T00:46:24+02:00
Switch to debhelper-compat = 13

- - - - -
1a814bcc by Markus Koschany at 2022-05-24T00:47:05+02:00
Declare compliance with Debian Policy 4.6.1.

- - - - -
5cbcc482 by Markus Koschany at 2022-05-24T00:48:47+02:00
Update Whitelist-is-Safelist.patch

- - - - -


4 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libhibernate-validator4-java (4.3.4-5) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS with jsoup 1.15.1.
+  * Declare compliance with Debian Policy 4.6.1.
+
+ -- Markus Koschany <apo at debian.org>  Tue, 24 May 2022 00:45:57 +0200
+
 libhibernate-validator4-java (4.3.4-4) unstable; urgency=medium
 
   * Team upload.


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


=====================================
debian/patches/Whitelist-is-Safelist.patch
=====================================
@@ -0,0 +1,53 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 24 May 2022 00:44:02 +0200
+Subject: Whitelist is Safelist
+
+Forwarded: no
+---
+ .../internal/constraintvalidators/SafeHtmlValidator.java   | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/SafeHtmlValidator.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/SafeHtmlValidator.java
+index 854eb57..ef55f99 100644
+--- a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/SafeHtmlValidator.java
++++ b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/SafeHtmlValidator.java
+@@ -20,7 +20,7 @@ import javax.validation.ConstraintValidator;
+ import javax.validation.ConstraintValidatorContext;
+ 
+ import org.jsoup.Jsoup;
+-import org.jsoup.safety.Whitelist;
++import org.jsoup.safety.Safelist;
+ 
+ import org.hibernate.validator.constraints.SafeHtml;
+ 
+@@ -32,24 +32,24 @@ import org.hibernate.validator.constraints.SafeHtml;
+  * @author George Gastaldi
+  */
+ public class SafeHtmlValidator implements ConstraintValidator<SafeHtml, CharSequence> {
+-	private Whitelist whitelist;
++	private Safelist whitelist;
+ 
+ 	public void initialize(SafeHtml constraintAnn) {
+ 		switch ( constraintAnn.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( constraintAnn.additionalTags() );


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



View it on GitLab: https://salsa.debian.org/java-team/libhibernate-validator4-java/-/compare/84b4d5684a00b71bb563fb64e3e2acd8e30cd0a6...5cbcc4826657542dc0a4f7628daa3ee530cf8f7e

-- 
View it on GitLab: https://salsa.debian.org/java-team/libhibernate-validator4-java/-/compare/84b4d5684a00b71bb563fb64e3e2acd8e30cd0a6...5cbcc4826657542dc0a4f7628daa3ee530cf8f7e
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/aa35d324/attachment.htm>