[Git][java-team/apache-jena][master] 6 commits: Add RDFReader.patch and reintroduce this class for backwards compatibility.

[Markus Koschany (@apo)]

Markus Koschany pushed to branch master at Debian Java Maintainers / apache-jena


Commits:
4b6cae97 by Markus Koschany at 2023-01-09T23:31:48+01:00
Add RDFReader.patch and reintroduce this class for backwards compatibility.

- - - - -
edf440a9 by Markus Koschany at 2023-01-09T23:32:27+01:00
Update changelog

- - - - -
02030d7b by Markus Koschany at 2023-01-10T00:11:03+01:00
Update RDFReader.patch

- - - - -
a552281f by Markus Koschany at 2023-01-10T00:18:06+01:00
Declare compliance with Debian Policy 4.6.2.

- - - - -
362b4910 by Markus Koschany at 2023-01-10T00:18:45+01:00
Update patch header

- - - - -
c6cc32d7 by Markus Koschany at 2023-01-10T00:19:54+01:00
Update changelog

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/RDFReader.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+apache-jena (4.5.0-2) unstable; urgency=medium
+
+  * Add RDFReader.patch for backwards compatibility to fix a FTBFS in
+    librdfa-java.
+  * Declare compliance with Debian Policy 4.6.2.
+
+ -- Markus Koschany <apo at debian.org>  Mon, 09 Jan 2023 23:32:16 +0100
+
 apache-jena (4.5.0-1) unstable; urgency=high
 
   * New upstream version 4.5.0.


=====================================
debian/control
=====================================
@@ -27,7 +27,7 @@ Build-Depends:
  libthrift-java (>= 0.16.0),
  libtitanium-json-ld-java,
  maven-debian-helper
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/apache-jena.git
 Vcs-Browser: https://salsa.debian.org/java-team/apache-jena
 Homepage: https://jena.apache.org/


=====================================
debian/patches/RDFReader.patch
=====================================
@@ -0,0 +1,57 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 9 Jan 2023 23:31:33 +0100
+Subject: RDFReader
+
+Forwarded: not-needed
+
+Compatibility patch for librdfa-java in Debian.
+---
+ .../apache/jena/rdf/model/impl/RDFReaderFImpl.java | 28 ++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java
+index 9f76c34..d5def91 100644
+--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java
++++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java
+@@ -25,6 +25,7 @@ import org.apache.jena.atlas.logging.Log ;
+ import org.apache.jena.rdf.model.RDFReaderI;
+ import org.apache.jena.rdf.model.RDFReaderF;
+ import org.apache.jena.shared.JenaException;
++import org.apache.jena.shared.ConfigException;
+ import org.apache.jena.shared.NoReaderForLangException;
+ 
+ public class RDFReaderFImpl extends Object implements RDFReaderF {
+@@ -72,6 +73,33 @@ public class RDFReaderFImpl extends Object implements RDFReaderF {
+         reset();
+     }
+ 
++    /**
++     * Use RIOT to add custom RDF parsers. See
++     * {@code RDFParserRegistry.registerLang}
++     *
++     * @deprecated Register with RIOT.
++     */
++    @Deprecated
++    public static String setBaseReaderClassName(String lang, String className) {
++        if ( rewiredAlternative != null )
++            Log.error(RDFReaderFImpl.class, "Rewired RDFReaderFImpl - configuration changes have no effect on reading");
++
++        String oldClassName = currentEntry(lang);
++        try {
++            @SuppressWarnings("unchecked")
++            Class<? extends RDFReaderI> newClass = (Class<? extends RDFReaderI>)Class.forName(className, false,
++                                                                                            Thread.currentThread().getContextClassLoader());
++            custom.put(lang, newClass);
++            return oldClassName;
++        }
++        catch (ClassNotFoundException e) {
++            throw new ConfigException("Reader not found on classpath", e);
++        }
++        catch (Exception e) {
++            throw new JenaException(e);
++        }
++    }
++
+     private static void reset() {
+         Class<? extends RDFReaderI> rdfxmlReader = org.apache.jena.rdfxml.xmlinput.JenaReader.class;
+         Class<? extends RDFReaderI> ntReader = org.apache.jena.rdf.model.impl.NTripleReader.class;


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ jena-tdb2-javadoc.patch
 debian-system-guava.patch
 fuseki2-geosparql.patch
 jena-db.patch
+RDFReader.patch



View it on GitLab: https://salsa.debian.org/java-team/apache-jena/-/compare/b3dee373de3337766482309df57d09396d635321...c6cc32d7c5575de407af72531615eee69f06902a

-- 
View it on GitLab: https://salsa.debian.org/java-team/apache-jena/-/compare/b3dee373de3337766482309df57d09396d635321...c6cc32d7c5575de407af72531615eee69f06902a
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/20230109/d47a1f7c/attachment.htm>