[Git][java-team/jabref][master] 5 commits: Fix FTBFS with jsoup 1.14.2
Markus Koschany (@apo)
gitlab at salsa.debian.org
Fri Sep 10 13:17:51 BST 2021
Markus Koschany pushed to branch master at Debian Java Maintainers / jabref
Commits:
2d0dc3ae by Markus Koschany at 2021-09-10T14:09:26+02:00
Fix FTBFS with jsoup 1.14.2
- - - - -
b52db781 by Markus Koschany at 2021-09-10T14:09:44+02:00
Declare compliance with Debian Policy 4.6.0.
- - - - -
30f879ab by Markus Koschany at 2021-09-10T14:10:09+02:00
Update changelog
- - - - -
da6e094c by Markus Koschany at 2021-09-10T14:11:45+02:00
Remove no longer needed lintian-overrides file.
- - - - -
dadc14fd by Markus Koschany at 2021-09-10T14:15:34+02:00
Tighten build-dependency on jsoup
- - - - -
5 changed files:
- debian/changelog
- debian/control
- + debian/patches/jsoup-1.14.2.patch
- debian/patches/series
- − debian/source/lintian-overrides
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jabref (3.8.2+ds-16) unstable; urgency=medium
+
+ * Team upload.
+ * Fix FTBFS with jsoup 1.14.2.
+ * Declare compliance with Debian Policy 4.6.0.
+
+ -- Markus Koschany <apo at debian.org> Fri, 10 Sep 2021 14:09:53 +0200
+
jabref (3.8.2+ds-15) unstable; urgency=medium
* Add default-jre to Depends.
=====================================
debian/control
=====================================
@@ -42,7 +42,7 @@ Build-Depends-Indep: ant,
libunirest-java-java,
libxml-commons-resolver1.1-java,
ure (>= 5.0~)
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/java-team/jabref
Vcs-Git: https://salsa.debian.org/java-team/jabref.git
Homepage: https://www.jabref.org/
@@ -72,7 +72,7 @@ Depends: ${misc:Depends},
libjgoodies-forms-java (>= 1.9.0),
libjgoodies-looks-java (>= 2.7.0),
libjhlabs-filters-java,
- libjsoup-java,
+ libjsoup-java (>= 1.14.2),
liblog4j2-java (>= 2.10.0-2) | liblog4j2-java (<< 2.10),
libmicroba-java,
libpdfbox-java (<< 1:2),
=====================================
debian/patches/jsoup-1.14.2.patch
=====================================
@@ -0,0 +1,80 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 10 Sep 2021 14:08:45 +0200
+Subject: jsoup 1.14.2
+
+Compatibility patch for jsoup 1.14.2
+
+Forwarded: no
+---
+ src/main/java/net/sf/jabref/logic/importer/IdBasedParserFetcher.java | 2 +-
+ .../java/net/sf/jabref/logic/importer/SearchBasedParserFetcher.java | 2 +-
+ .../net/sf/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java | 2 +-
+ src/main/java/net/sf/jabref/logic/importer/fetcher/IsbnFetcher.java | 2 +-
+ .../net/sf/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/main/java/net/sf/jabref/logic/importer/IdBasedParserFetcher.java b/src/main/java/net/sf/jabref/logic/importer/IdBasedParserFetcher.java
+index ba3a83d..142f5c1 100644
+--- a/src/main/java/net/sf/jabref/logic/importer/IdBasedParserFetcher.java
++++ b/src/main/java/net/sf/jabref/logic/importer/IdBasedParserFetcher.java
+@@ -15,7 +15,7 @@ import net.sf.jabref.model.entry.BibEntry;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+-import org.jsoup.helper.StringUtil;
++import org.jsoup.internal.StringUtil;
+
+ /**
+ * Provides a convenient interface for ID-based fetcher, which follow the usual three-step procedure:
+diff --git a/src/main/java/net/sf/jabref/logic/importer/SearchBasedParserFetcher.java b/src/main/java/net/sf/jabref/logic/importer/SearchBasedParserFetcher.java
+index ed49f48..ae01257 100644
+--- a/src/main/java/net/sf/jabref/logic/importer/SearchBasedParserFetcher.java
++++ b/src/main/java/net/sf/jabref/logic/importer/SearchBasedParserFetcher.java
+@@ -12,7 +12,7 @@ import java.util.List;
+ import net.sf.jabref.model.cleanup.Formatter;
+ import net.sf.jabref.model.entry.BibEntry;
+
+-import org.jsoup.helper.StringUtil;
++import org.jsoup.internal.StringUtil;
+
+ /**
+ * Provides a convenient interface for search-based fetcher, which follow the usual three-step procedure:
+diff --git a/src/main/java/net/sf/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java b/src/main/java/net/sf/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
+index e25f6d5..6fbfec9 100644
+--- a/src/main/java/net/sf/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
++++ b/src/main/java/net/sf/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
+@@ -28,7 +28,7 @@ import net.sf.jabref.model.entry.BibEntry;
+ import net.sf.jabref.model.entry.FieldName;
+
+ import org.apache.http.client.utils.URIBuilder;
+-import org.jsoup.helper.StringUtil;
++import org.jsoup.internal.StringUtil;
+
+ /**
+ * Fetches data from the SAO/NASA Astrophysics Data System (http://www.adsabs.harvard.edu/)
+diff --git a/src/main/java/net/sf/jabref/logic/importer/fetcher/IsbnFetcher.java b/src/main/java/net/sf/jabref/logic/importer/fetcher/IsbnFetcher.java
+index eca6dba..e6aafd6 100644
+--- a/src/main/java/net/sf/jabref/logic/importer/fetcher/IsbnFetcher.java
++++ b/src/main/java/net/sf/jabref/logic/importer/fetcher/IsbnFetcher.java
+@@ -9,7 +9,7 @@ import net.sf.jabref.logic.importer.FetcherException;
+ import net.sf.jabref.logic.importer.ImportFormatPreferences;
+ import net.sf.jabref.model.entry.BibEntry;
+
+-import org.jsoup.helper.StringUtil;
++import org.jsoup.internal.StringUtil;
+
+ /**
+ * Fetcher for ISBN trying ebook.de first and then chimbori.com
+diff --git a/src/main/java/net/sf/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java b/src/main/java/net/sf/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java
+index 5964941..180f08d 100644
+--- a/src/main/java/net/sf/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java
++++ b/src/main/java/net/sf/jabref/logic/importer/fetcher/IsbnViaChimboriFetcher.java
+@@ -14,7 +14,7 @@ import net.sf.jabref.model.entry.BibEntry;
+ import com.mashape.unirest.http.HttpResponse;
+ import com.mashape.unirest.http.Unirest;
+ import com.mashape.unirest.http.exceptions.UnirestException;
+-import org.jsoup.helper.StringUtil;
++import org.jsoup.internal.StringUtil;
+
+ /**
+ * Fetcher for ISBN using https://bibtex.chimbori.com/, which in turn uses Amazon's API.
=====================================
debian/patches/series
=====================================
@@ -9,3 +9,4 @@
090_mariadb.patch
100_CVE-2018-1000652_XXE-vulnerability.patch
110_doi.org.patch
+jsoup-1.14.2.patch
=====================================
debian/source/lintian-overrides deleted
=====================================
@@ -1,2 +0,0 @@
-# this is a side effect of creating the +ds version
-jabref source: source-contains-empty-directory src/main/java/osx/macadapter/
View it on GitLab: https://salsa.debian.org/java-team/jabref/-/compare/87c2bd7a4a58b2b203cad587236ccaa1e9a22f46...dadc14fd2e979e80eca2d2b32bad16ebada280cd
--
View it on GitLab: https://salsa.debian.org/java-team/jabref/-/compare/87c2bd7a4a58b2b203cad587236ccaa1e9a22f46...dadc14fd2e979e80eca2d2b32bad16ebada280cd
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/d468ff04/attachment.htm>
More information about the pkg-java-commits
mailing list