Skip to content

Setup Jena 6 development #3529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 23, 2025
Merged

Setup Jena 6 development #3529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
241f287
GH-3528: Switch to Jena 6.0.0 development
afs Oct 18, 2025
5dfd1f2
GH-3528: Switch to jena-iri3986. Remove jena-iri usage.
afs Oct 18, 2025
57cc799
Act on warnings arising from Java21
afs Oct 20, 2025
9043f99
GH-3526: Remove alternative relativization of XML output
afs Oct 20, 2025
24c48b0
Code tidy
afs Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions apache-jena-libs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<artifactId>apache-jena-libs</artifactId>
<packaging>pom</packaging>
<name>Apache Jena - Libraries POM</name>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>

<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<description>
Expand All @@ -46,43 +46,43 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-rdfpatch</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-ontapi</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-shacl</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-shex</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb1</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb2</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-rdfconnection</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
30 changes: 15 additions & 15 deletions apache-jena/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<organization>
Expand All @@ -57,91 +57,91 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-ontapi</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-ontapi</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-rdfconnection</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-rdfconnection</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-shacl</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-shacl</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-shex</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-shex</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-cmds</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<!-- Require a logging implementation for command line tools -->
Expand All @@ -154,7 +154,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-cmds</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions jena-arq/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<description>SPARQL 1.1 query engine and RDF parsers for Apache Jena</description>
Expand All @@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>5.7.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
9 changes: 2 additions & 7 deletions jena-arq/src/main/java/org/apache/jena/riot/system/Checker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.apache.jena.graph.Node;
import org.apache.jena.graph.TextDirection;
import org.apache.jena.graph.Triple;
import org.apache.jena.iri.IRI;
import org.apache.jena.irix.*;
import org.apache.jena.langtagx.LangTagX;
import org.apache.jena.sparql.core.Quad;
Expand Down Expand Up @@ -100,10 +99,6 @@ public static boolean checkIRI(Node node, ErrorHandler errorHandler, long line,
public static boolean checkIRI(String iriStr, ErrorHandler errorHandler, long line, long col) {
try {
IRIx iri = IRIs.reference(iriStr);
if ( iri instanceof IRIProviderJenaIRI.IRIxJena jiri ) {
IRI jenaIRI = jiri.getImpl();
return CheckerJenaIRI.iriViolations(jenaIRI, errorHandler, line, col);
}
if ( ! iri.hasViolations() )
return true;
// IRI errors are errorHandler warnings when checking.
Expand All @@ -129,7 +124,7 @@ public static void iriViolationMessage(String iriStr, boolean isError, String ms
errorHandler(errorHandler).warning("Bad IRI: " + msg, line, col);
} else
errorHandler(errorHandler).warning("Unwise IRI: " + msg, line, col);
} catch (org.apache.jena.iri.IRIException0 | org.apache.jena.irix.IRIException ex) {}
} catch (org.apache.jena.irix.IRIException ex) {}
}

public static boolean checkLiteral(Node node) {
Expand Down Expand Up @@ -208,7 +203,7 @@ else if ( ! datatype.equals( RDFLangString.rdfLangString ) ) {
if ( datatype.equals(XSDDatatype.XSDstring) )
// Simple literals are always well-formed...
return true;

// If the Literal has a datatype (but no language or base direction)...
if ( datatype.equals(RDF.dtLangString) ) {
errorHandler(errorHandler).warning("Literal has datatype "+datatype.getURI()+" but no language tag", line, col);
Expand Down
126 changes: 0 additions & 126 deletions jena-arq/src/main/java/org/apache/jena/riot/system/CheckerJenaIRI.java
View file
Open in desktop

This file was deleted.

Loading