[Git][java-team/jakarta-jmeter][master] 7 commits: Switch to debhelper-compat = 13.

[Markus Koschany (@apo)]

Markus Koschany pushed to branch master at Debian Java Maintainers / jakarta-jmeter


Commits:
6e222e7b by Markus Koschany at 2021-09-09T23:16:51+02:00
Switch to debhelper-compat = 13.

- - - - -
c2b9ebc4 by Markus Koschany at 2021-09-09T23:17:17+02:00
Declare compliance with Debian Policy 4.6.0.

- - - - -
18396d5e by Markus Koschany at 2021-09-09T23:18:34+02:00
Tighten build-dependency on libjsoup-java

- - - - -
dbe94627 by Markus Koschany at 2021-09-09T23:19:20+02:00
Start new changelog entry

- - - - -
88373276 by Markus Koschany at 2021-09-09T23:19:56+02:00
Remove debian/compat

- - - - -
d47dd95c by Markus Koschany at 2021-09-10T14:34:16+02:00
Add jsoup-1.14.2.patch

- - - - -
f5563b93 by Markus Koschany at 2021-09-10T14:34:49+02:00
Update changelog

- - - - -


5 changed files:

- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/jsoup-1.14.2.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+jakarta-jmeter (2.13-5) unstable; urgency=medium
+
+  * Team upload.
+  * Switch to debhelper-compat = 13.
+  * Declare compliance with Debian Policy 4.6.0.
+  * Tighten build-dependency on libjsoup-java.
+  * Fix FTBFS with jsoup 1.14.2.
+
+ -- Markus Koschany <apo at debian.org>  Fri, 10 Sep 2021 14:34:42 +0200
+
 jakarta-jmeter (2.13-4) unstable; urgency=medium
 
   * Team upload.


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


=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Uploaders:
 Build-Depends:
  ant,
  ant-optional,
- debhelper (>= 11~),
+ debhelper-compat (= 13),
  default-jdk,
  default-jdk-doc,
  javahelper,
@@ -39,7 +39,7 @@ Build-Depends:
  libhttpmime-java,
  libjcharts-java,
  libjdom1-java,
- libjsoup-java,
+ libjsoup-java (>= 1.14.2),
  libjtidy-java,
  libmail-java,
  libmongodb-java,
@@ -50,7 +50,7 @@ Build-Depends:
  libxmlgraphics-commons-java,
  libxstream-java,
  velocity
-Standards-Version: 4.1.5
+Standards-Version: 4.6.0
 Vcs-Git: https://salsa.debian.org/java-team/jakarta-jmeter.git
 Vcs-Browser: https://salsa.debian.org/java-team/jakarta-jmeter
 Homepage: http://jmeter.apache.org


=====================================
debian/patches/jsoup-1.14.2.patch
=====================================
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 9 Sep 2021 23:23:37 +0200
+Subject: jsoup 1.14.2
+
+Compatibility patch with jsoup 1.14.2
+
+Forwarded: not-needed
+---
+ .../org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java b/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
+index d91e977..3d41798 100644
+--- a/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
++++ b/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
+@@ -146,7 +146,7 @@ public class JsoupBasedHtmlParser extends HTMLParser {
+             String contents = new String(html,encoding);
+             Document doc = Jsoup.parse(contents);
+             JMeterNodeVisitor nodeVisitor = new JMeterNodeVisitor(new URLPointer(baseUrl), coll);
+-            new NodeTraversor(nodeVisitor).traverse(doc);
++            NodeTraversor.traverse(nodeVisitor, doc);
+             return coll.iterator();
+         } catch (Exception e) {
+             throw new HTMLParseException(e);


=====================================
debian/patches/series
=====================================
@@ -9,3 +9,4 @@
 10_xstream-compatibility.patch
 11_java9-compatibility.patch
 12_mongodb-compatibility.patch
+jsoup-1.14.2.patch



View it on GitLab: https://salsa.debian.org/java-team/jakarta-jmeter/-/compare/ef265f8dcc48cb62b603c3e3e41be4d805e8ff30...f5563b9332c60ffd95e59e91e55ebd075a5d0121

-- 
View it on GitLab: https://salsa.debian.org/java-team/jakarta-jmeter/-/compare/ef265f8dcc48cb62b603c3e3e41be4d805e8ff30...f5563b9332c60ffd95e59e91e55ebd075a5d0121
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/20210910/0d1fecdc/attachment.htm>