You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@juneau.apache.org by GitBox <gi...@apache.org> on 2019/01/10 13:51:26 UTC
[GitHub] jamesbognar closed pull request #45: Upgrade to Jena 3.x
jamesbognar closed pull request #45: Upgrade to Jena 3.x
URL: https://github.com/apache/juneau/pull/45
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
index 32995f6b5..9c42ed4c1 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
@@ -83,7 +83,7 @@
* Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when
* created.
* Default is the pretty writer but can be overridden with system property
- * <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code>.
+ * <code>org.apache.jena.n3.N3JenaWriter.writer</code>.
* <li>
* <js>"N3-PP"</js> - Name of the N3 pretty writer.
* The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
index aa892874d..2284c8481 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
@@ -136,7 +136,7 @@ public RdfParserBuilder juneauNs(Namespace value) {
* Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when
* created.
* Default is the pretty writer but can be overridden with system property
- * <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code>.
+ * <code>org.apache.jena.n3.N3JenaWriter.writer</code>.
* <li>
* <js>"N3-PP"</js> - Name of the N3 pretty writer.
* The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding
@@ -786,4 +786,4 @@ public RdfParserBuilder apply(PropertyStore copyFrom) {
super.apply(copyFrom);
return this;
}
-}
\ No newline at end of file
+}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
index 1f35951c2..5d55f195d 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
@@ -17,14 +17,13 @@
import java.util.*;
+import org.apache.jena.rdf.model.*;
+import org.apache.jena.util.iterator.*;
import org.apache.juneau.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.transform.*;
import org.apache.juneau.xml.*;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.util.iterator.*;
-
/**
* Session object that lives for the duration of a single use of {@link RdfParser}.
*
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
index 8b2b1289c..da003f78b 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
@@ -231,7 +231,7 @@ public RdfSerializerBuilder juneauNs(Namespace value) {
* Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when
* created.
* Default is the pretty writer but can be overridden with system property
- * <code>com.hp.hpl.jena.n3.N3JenaWriter.writer</code>.
+ * <code>org.apache.jena.n3.N3JenaWriter.writer</code>.
* <li>
* <js>"N3-PP"</js> - Name of the N3 pretty writer.
* The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding
@@ -985,4 +985,4 @@ public RdfSerializerBuilder apply(PropertyStore copyFrom) {
super.apply(copyFrom);
return this;
}
-}
\ No newline at end of file
+}
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index ca91ba1c4..98aca283f 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -17,6 +17,7 @@
import java.util.*;
+import org.apache.jena.rdf.model.*;
import org.apache.juneau.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.jena.annotation.*;
@@ -25,8 +26,6 @@
import org.apache.juneau.xml.*;
import org.apache.juneau.xml.annotation.*;
-import com.hp.hpl.jena.rdf.model.*;
-
/**
* Session object that lives for the duration of a single use of {@link RdfSerializer}.
*
diff --git a/juneau-doc/docs/docs.txt b/juneau-doc/docs/docs.txt
index 4fb157136..05944af76 100644
--- a/juneau-doc/docs/docs.txt
+++ b/juneau-doc/docs/docs.txt
@@ -34,7 +34,7 @@ RFC2616 = https://www.w3.org/Protocols/rfc2616/rfc2616.html, Hypertext Transfer
RFC2616.section9 = https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html, RFC2616/9
RFC2616.section14.1 = https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html, RFC2616/14.1
JsonSchemaValidation = http://json-schema.org/latest/json-schema-validation.html, JSON Schema Org > Validation
-ARP = http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp
+ARP = https://jena.apache.org/documentation/io/arp.html
HTML5 = https://www.w3.org/TR/html5
HTML5.text-level-semantics = https://www.w3.org/TR/html5/text-level-semantics.html
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index a415849d0..d4f24a6fa 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -521,7 +521,7 @@ <h3 class='topic ' onclick='toggle(this)'><a href='#Introduction.Features' id='I
<li>Minimal library dependencies:
<ul>
<li><b>juneau-marshall</b>, <b>juneau-dto</b>, <b>juneau-svl</b>, <b>juneau-config</b> - No external dependencies. Entirely self-contained.
- <li><b>juneau-marshall-rdf</b> - Optional RDF support. Requires Apache Jena 2.7.1+.
+ <li><b>juneau-marshall-rdf</b> - Optional RDF support. Requires Apache Jena 3+.
<li><b>juneau-rest-server</b> - Any Servlet 3.1.0+ container.
<li><b>juneau-rest-client</b> - Apache HttpClient 4.5+.
<li><b>juneau-microservice</b> - Eclipse Jetty.
diff --git a/juneau-doc/src/main/javadoc/resources/docs.txt b/juneau-doc/src/main/javadoc/resources/docs.txt
index ff74611b2..fb438b65d 100644
--- a/juneau-doc/src/main/javadoc/resources/docs.txt
+++ b/juneau-doc/src/main/javadoc/resources/docs.txt
@@ -1,4 +1,4 @@
-ARP = http://jena.sourceforge.net/javadoc/com/hp/hpl/jena/rdf/arp, arp
+ARP = https://jena.apache.org/documentation/io/arp.html, arp
ConfigurableProperties = #juneau-marshall.ConfigurableProperties, Configurable Properties
DefaultRestSvlVariables = #DefaultRestSvlVariables, Default REST SVL Variables
GFM = https://help.github.com/articles/github-flavored-markdown, GFM syntax
diff --git a/pom.xml b/pom.xml
index 3eef320e8..e062322c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<jaxb.version>2.3.1</jaxb.version>
- <jena.version>2.7.1</jena.version>
+ <jena.version>3.10.0</jena.version>
<junit.version>4.11</junit.version>
<jaxrs.version>1.1.1</jaxrs.version>
<servlet.version>3.1.0</servlet.version>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services