You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2024/04/28 08:12:36 UTC
(jena) branch main updated (741a621f90 -> 2fad0f749b)
This is an automated email from the ASF dual-hosted git repository.
andy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
from 741a621f90 GH-2382 - Track engine instances in a Set rather than a List
new c66e2b80e0 GH-2433; Localise use of dependency commons-cli
new a49e91d97d Group Apache Commons dependencies
new c6c13d8fab Remove redundant contract dependency exclusions
new 3300f1aa7c Make TestRDFParser tests run silently
new 2fad0f749b Add RDF/XML to data validation choices
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/jena/riot/RDFParser.java | 1 -
.../java/org/apache/jena/riot/TS_RiotGeneral.java | 3 +-
.../java/org/apache/jena/riot/TestRDFParser.java | 27 +++++++++------
jena-cmds/pom.xml | 6 +++-
jena-core/pom.xml | 39 +++++++---------------
jena-extras/jena-querybuilder/pom.xml | 10 ------
.../sparqler/pages/data-validator.html | 32 ++++++------------
pom.xml | 24 ++++++-------
8 files changed, 57 insertions(+), 85 deletions(-)
(jena) 05/05: Add RDF/XML to data validation choices
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit 2fad0f749b0090b764079b6df4eadda3d0b67695
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Apr 27 15:17:35 2024 +0100
Add RDF/XML to data validation choices
---
.../sparqler/pages/data-validator.html | 32 ++++++++--------------
1 file changed, 11 insertions(+), 21 deletions(-)
diff --git a/jena-fuseki2/jena-fuseki-main/sparqler/pages/data-validator.html b/jena-fuseki2/jena-fuseki-main/sparqler/pages/data-validator.html
index e0d4084eaf..1d261f238e 100755
--- a/jena-fuseki2/jena-fuseki-main/sparqler/pages/data-validator.html
+++ b/jena-fuseki2/jena-fuseki-main/sparqler/pages/data-validator.html
@@ -25,35 +25,25 @@
<form action="$/validate/data" method="post" accept-charset="UTF-8" >
<textarea name="data" cols="70" rows="30">
# Prefixes for Turtle or TriG - these can be edited or removed.
-@base <http://example.org/base/> .
-@prefix : <http://example.org/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-
+BASE <http://example.org/base/>
+PREFIX : <http://example.org/>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+PREFIX sh: <http://www.w3.org/ns/shacl#>
</textarea>
<br/>
Input syntax:
+<p>
<input type="radio" name="languageSyntax" value="Turtle" checked="checked"/>Turtle
<input type="radio" name="languageSyntax" value="TriG"/>TriG
<input type="radio" name="languageSyntax" value="N-Triples"/>N-Triples
<input type="radio" name="languageSyntax" value="N-Quads"/>N-Quad
- <br/>
- <!--
-Output syntax:
- <input type="checkbox" name="outputFormat" value="sparql" checked="checked"/>SPARQL
- <input type="checkbox" name="outputFormat" value="algebra"/>SPARQL algebra
- <input type="checkbox" name="outputFormat" value="quads"/>SPARQL algebra (quads)
- <br/>
-
- Line numbers:
- <input type="radio" name="linenumbers" value="true" checked="checked"/>Yes
- <input type="radio" name="linenumbers" value="false"/>No
- <br/>
- -->
- <input type="submit" value="Validate RDF Data" />
+<input type="radio" name="languageSyntax" value="RDF/XML"/>RDF-XML
+</p>
+<input type="submit" value="Validate RDF Data"/>
</form>
<hr/>
Parsing provided by <a href="http://jena.apache.org/documentation/io/">Jena/RIOT</a>.
(jena) 03/05: Remove redundant contract dependency exclusions
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit c6c13d8fab980698a1c6fadfedb5503066f5e7b4
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Apr 27 13:58:14 2024 +0100
Remove redundant contract dependency exclusions
---
jena-extras/jena-querybuilder/pom.xml | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/jena-extras/jena-querybuilder/pom.xml b/jena-extras/jena-querybuilder/pom.xml
index d4cabbe9f7..dbd5095823 100644
--- a/jena-extras/jena-querybuilder/pom.xml
+++ b/jena-extras/jena-querybuilder/pom.xml
@@ -44,16 +44,6 @@
<groupId>org.xenei</groupId>
<artifactId>junit-contracts</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>commons-cli</artifactId>
- <groupId>commons-cli</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
(jena) 01/05: GH-2433; Localise use of dependency commons-cli
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit c66e2b80e0ed381da43ffb8f8c497de9cd5a6d8b
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Apr 27 13:55:51 2024 +0100
GH-2433; Localise use of dependency commons-cli
---
jena-cmds/pom.xml | 6 +++++-
jena-core/pom.xml | 39 ++++++++++++---------------------------
2 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/jena-cmds/pom.xml b/jena-cmds/pom.xml
index 1fd5407a35..29a7b6c766 100644
--- a/jena-cmds/pom.xml
+++ b/jena-cmds/pom.xml
@@ -55,7 +55,6 @@
This works ...
except it breaks javadoc:javadoc building with Java11.
But it does work if Java17 is used for the build
-
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
@@ -103,6 +102,11 @@
<version>5.1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <artifactId>commons-cli</artifactId>
+ <groupId>commons-cli</groupId>
+ </dependency>
+
<!-- Pull test code into scope -->
<dependency>
<groupId>org.apache.jena</groupId>
diff --git a/jena-core/pom.xml b/jena-core/pom.xml
index 4c39bd7399..9a520e9928 100644
--- a/jena-core/pom.xml
+++ b/jena-core/pom.xml
@@ -59,36 +59,21 @@
</dependency>
<dependency>
- <artifactId>commons-cli</artifactId>
- <groupId>commons-cli</groupId>
+ <groupId>org.roaringbitmap</groupId>
+ <artifactId>RoaringBitmap</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.roaringbitmap</groupId>
- <artifactId>RoaringBitmap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>org.xenei</groupId>
- <artifactId>junit-contracts</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>commons-cli</artifactId>
- <groupId>commons-cli</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.xenei</groupId>
+ <artifactId>junit-contracts</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
(jena) 04/05: Make TestRDFParser tests run silently
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit 3300f1aa7c7d2ee4c54955f1eeefc2c77da73a64
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Apr 27 13:59:13 2024 +0100
Make TestRDFParser tests run silently
---
.../main/java/org/apache/jena/riot/RDFParser.java | 1 -
.../java/org/apache/jena/riot/TS_RiotGeneral.java | 3 +--
.../java/org/apache/jena/riot/TestRDFParser.java | 27 +++++++++++++---------
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
index f7bee9079f..35c451d004 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
@@ -55,7 +55,6 @@ import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.sparql.core.DatasetGraphFactory;
import org.apache.jena.sparql.graph.GraphFactory;
import org.apache.jena.sparql.util.Context;
-import org.apache.jena.system.Txn;
/**
* An {@link RDFParser} is a process that will generate triples and quads;
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java b/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java
index d9c0f4ac32..121ea73c8c 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java
@@ -31,10 +31,9 @@ import org.junit.runners.Suite.SuiteClasses ;
, TestJenaReaderRIOT.class
, TestReadData.class
, TestRiotReader.class
- , TestRDFParser.class
, TestParserRegistry.class
- , TestRDFWriter.class
, TestRDFParser.class
+ , TestRDFWriter.class
, TestParseURISchemeBases.class
, TestTurtleTrigWriter.class
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestRDFParser.java b/jena-arq/src/test/java/org/apache/jena/riot/TestRDFParser.java
index ec8adb61f0..b96923fb21 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TestRDFParser.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TestRDFParser.java
@@ -26,6 +26,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.Map;
+import org.apache.jena.atlas.logging.LogCtl;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
@@ -313,7 +314,8 @@ public class TestRDFParser {
RDFParserBuilder builder = RDFParserBuilder.create().lang(Lang.TRIG).fromString(testdata + "\njunk data goes here");
DatasetGraph dsg = DatasetGraphFactory.createTxnMem();
try {
- Txn.executeWrite(dsg, () -> builder.parse(dsg));
+ LogCtl.withLevel(SysRIOT.getLogger(), "FATAL", ()->
+ Txn.executeWrite(dsg, () -> builder.parse(dsg)));
Assert.fail("Parsing should have produced an error");
} catch (RiotException e) {
// Size should be zero as failure to parse should abort the transaction and produce an empty dataset
@@ -322,11 +324,12 @@ public class TestRDFParser {
}
@Test
- public void parse_to_dataset_malformed_01a() {
+ public void parse_to_dataset_malformed_02() {
RDFParserBuilder builder = RDFParserBuilder.create().lang(Lang.TRIG).fromString(testdata + "\njunk data goes here");
DatasetGraph dsg = DatasetGraphFactory.createTxnMem();
try {
- builder.parse(dsg);
+ LogCtl.withLevel(SysRIOT.getLogger(), "FATAL", ()->
+ builder.parse(dsg));
Assert.fail("Parsing should have produced an error");
} catch (RiotException e) {
// Without a transaction the valid quad would have gone into the dataset prior to the error occurring
@@ -335,14 +338,16 @@ public class TestRDFParser {
}
@Test
- public void parse_to_dataset_malformed_02() {
+ public void parse_to_dataset_malformed_03() {
RDFParserBuilder builder = RDFParserBuilder.create().lang(Lang.TRIG).fromString(testdata + "\njunk data goes here");
- DatasetGraph dsg = null;
- try {
- dsg = builder.toDatasetGraph();
- Assert.fail("Parsing should have produced an error");
- } catch (RiotException e) {
- assertNull(dsg);
- }
+ LogCtl.withLevel(SysRIOT.getLogger(), "FATAL", ()-> {
+ DatasetGraph dsg = null;
+ try {
+ dsg = builder.toDatasetGraph();
+ Assert.fail("Parsing should have produced an error");
+ } catch (RiotException e) {
+ assertNull(dsg);
+ }
+ });
}
}
(jena) 02/05: Group Apache Commons dependencies
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit a49e91d97da6e51de2d857340479e1dd08adfbae
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Apr 27 13:56:32 2024 +0100
Group Apache Commons dependencies
---
pom.xml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9b63baa73a..3235b70301 100644
--- a/pom.xml
+++ b/pom.xml
@@ -316,6 +316,12 @@
<artifactId>commons-io</artifactId>
<version>${ver.commons-io}</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-</artifactId>
+ <version>${ver.commons-io}</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -330,6 +336,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-rdf-api</artifactId>
+ <version>${ver.commons-rdf}</version>
+ </dependency>
+
<!-- Protobuf only, not gRPC -->
<dependency>
<groupId>com.google.protobuf</groupId>
@@ -597,18 +609,6 @@
<version>${ver.slf4j}</version>
</dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>${ver.commons-cli}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-rdf-api</artifactId>
- <version>${ver.commons-rdf}</version>
- </dependency>
-
<dependency>
<groupId>org.roaringbitmap</groupId>
<artifactId>RoaringBitmap</artifactId>