Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena

charischen · May 30, 2017 · f3a1faa · f3a1faa
2 parents db8b0e7 + ff723ec
commit f3a1faa
Show file tree

Hide file tree

Showing 519 changed files with 17,009 additions and 6,772 deletions.
diff --git a/apache-jena-libs/pom.xml b/apache-jena-libs/pom.xml
@@ -15,12 +15,12 @@
   <artifactId>apache-jena-libs</artifactId>
   <packaging>pom</packaging>
   <name>Apache Jena - Libraries POM</name>
-  <version>3.3.0-SNAPSHOT</version>
+  <version>3.4.0-SNAPSHOT</version>
 
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-parent</artifactId>
-    <version>19-SNAPSHOT</version>
+    <version>20-SNAPSHOT</version>
     <relativePath>../jena-parent</relativePath>
   </parent>
 
@@ -43,13 +43,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.4.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-rdfconnection</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.4.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

diff --git a/apache-jena-osgi/jena-osgi-features/pom.xml b/apache-jena-osgi/jena-osgi-features/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>apache-jena-osgi</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>jena-osgi-features</artifactId>  
   <packaging>bundle</packaging>

diff --git a/apache-jena-osgi/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>apache-jena-osgi</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>jena-osgi</artifactId>  
   <packaging>bundle</packaging>
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.4.0-SNAPSHOT</version>
       <scope>provided</scope>
       <exclusions>
         <!-- These are all embedded within httpclient-osgi -->
@@ -106,7 +106,14 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.4.0-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-rdfconnection</artifactId>
+      <version>3.4.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
    <!-- xerces is needed - but this is marked as optional as some
@@ -126,14 +133,14 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shaded-guava</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.4.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.4.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <!--
@@ -146,7 +153,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-iri</artifactId>
-      <version>3.3.0-SNAPSHOT</version>
+      <version>3.4.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 

diff --git a/apache-jena-osgi/pom.xml b/apache-jena-osgi/pom.xml
@@ -21,13 +21,13 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-parent</artifactId>
-    <version>19-SNAPSHOT</version>
+    <version>20-SNAPSHOT</version>
     <relativePath>../jena-parent</relativePath>
   </parent> 
 
   <name>Apache Jena - OSGi</name>
   <artifactId>apache-jena-osgi</artifactId>
-  <version>3.3.0-SNAPSHOT</version>
+  <version>3.4.0-SNAPSHOT</version>
 
   <description>Apache Jena OSGi distribution and test</description>
   <packaging>pom</packaging>

diff --git a/apache-jena/bin/arq b/apache-jena/bin/arq
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/infer b/apache-jena/bin/infer
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/iri b/apache-jena/bin/iri
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/juuid b/apache-jena/bin/juuid
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/nquads b/apache-jena/bin/nquads
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/ntriples b/apache-jena/bin/ntriples
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/qparse b/apache-jena/bin/qparse
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/rdfcat b/apache-jena/bin/rdfcat
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/rdfcompare b/apache-jena/bin/rdfcompare
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/rdfcopy b/apache-jena/bin/rdfcopy
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/rdfdiff b/apache-jena/bin/rdfdiff
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/rdfparse b/apache-jena/bin/rdfparse
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/rdfxml b/apache-jena/bin/rdfxml
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/riot b/apache-jena/bin/riot
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/rset b/apache-jena/bin/rset
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/rsparql b/apache-jena/bin/rsparql
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/rupdate b/apache-jena/bin/rupdate
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/schemagen b/apache-jena/bin/schemagen
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/sparql b/apache-jena/bin/sparql
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/tdbbackup b/apache-jena/bin/tdbbackup
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/tdbdump b/apache-jena/bin/tdbdump
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/tdbloader b/apache-jena/bin/tdbloader
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/tdbquery b/apache-jena/bin/tdbquery
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/tdbstats b/apache-jena/bin/tdbstats
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/tdbupdate b/apache-jena/bin/tdbupdate
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/trig b/apache-jena/bin/trig
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/turtle b/apache-jena/bin/turtle
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/uparse b/apache-jena/bin/uparse
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/update b/apache-jena/bin/update
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/utf8 b/apache-jena/bin/utf8
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)

diff --git a/apache-jena/bin/wwwdec b/apache-jena/bin/wwwdec
@@ -10,7 +10,7 @@ resolveLink() {
         # BSD style readlink behaves differently to GNU readlink
         # Have to manually follow links
         while [ -L "$NAME" ]; do
-          NAME=$(readlink "$NAME")
+          NAME=$( cd $NAME && pwd -P ) ;
         done
         ;;
       *)