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 2016/03/18 14:02:42 UTC
[1/3] jena git commit: Fix to ElementTransformer for GRAPH.
Repository: jena
Updated Branches:
refs/heads/master c7b83dbe6 -> e2bd6d539
Fix to ElementTransformer for GRAPH.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bc5ace0e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bc5ace0e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bc5ace0e
Branch: refs/heads/master
Commit: bc5ace0e9460ae979079532f610a88b6363e96e5
Parents: c7b83db
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Mar 17 14:56:08 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Mar 17 14:56:08 2016 +0000
----------------------------------------------------------------------
.../syntaxtransform/ElementTransformer.java | 6 ++----
.../syntaxtransform/TestSyntaxTransform.java | 19 +++++++++++++++----
2 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/bc5ace0e/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java
index 04d2299..4a741e4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java
@@ -204,7 +204,7 @@ public class ElementTransformer {
public void visit(ElementDataset el) {
Element sub = pop() ;
Element el2 = transform.transform(el, sub) ;
- push(el) ;
+ push(el2) ;
}
@Override
@@ -212,7 +212,7 @@ public class ElementTransformer {
Node n = el.getGraphNameNode() ;
Node n1 = transformNode(n) ;
Element elt1 = pop() ;
- Element el2 = transform.transform(el, n, elt1) ;
+ Element el2 = transform.transform(el, n1, elt1) ;
push(el2) ;
}
@@ -252,10 +252,8 @@ public class ElementTransformer {
@Override
public void visit(ElementService el) {
- boolean b = el.getSilent() ;
Node n = el.getServiceNode() ;
Node n1 = transformNode(n) ;
- Element elt = el.getElement() ;
Element elt1 = pop() ;
Element el2 = transform.transform(el, n1, elt1) ;
push(el2) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/bc5ace0e/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java
index c09f0fe..23d9f9b 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java
@@ -76,11 +76,22 @@ public class TestSyntaxTransform extends BaseTest
"o", "1");
}
- @Test public void subst_query_11() { testQuery
- ("SELECT * { ?s ?p ?o { SELECT ?x { ?x ?p ?o } } }",
- "SELECT * { ?s ?p 1 { SELECT ?x { ?x ?p 1 } } }",
- "o", "1") ; }
+ @Test public void subst_query_11() {
+ testQuery("SELECT * { ?s ?p ?o { SELECT ?x { ?x ?p ?o } } }",
+ "SELECT * { ?s ?p 1 { SELECT ?x { ?x ?p 1 } } }",
+ "o", "1") ; }
+
+ @Test public void subst_query_20() {
+ testQuery("SELECT * { ?s ?p ?g GRAPH ?g { ?s ?p ?g } }",
+ "SELECT * { ?s ?p <urn:graph> GRAPH <urn:graph> { ?s ?p <urn:graph> } }",
+ "g", "<urn:graph>") ; }
+ @Test public void subst_query_21() {
+ testQuery("SELECT * { ?s ?p ?srv SERVICE ?srv { ?s ?p ?srv}}",
+ "SELECT * { ?s ?p <urn:service> SERVICE <urn:service> { ?s ?p <urn:service>}}",
+ "srv", "<urn:service>") ; }
+
+
@Test public void subst_update_01() {
testUpdate("DELETE { ?s <urn:p> ?x } WHERE {}",
"DELETE { ?s <urn:p> <urn:x> } WHERE {}",
[3/3] jena git commit: Issue error message on unrecogized file
extension
Posted by an...@apache.org.
Issue error message on unrecogized file extension
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e2bd6d53
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e2bd6d53
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e2bd6d53
Branch: refs/heads/master
Commit: e2bd6d539362b978dc0c87b9eff167744da7bd94
Parents: f89bd24
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Mar 18 12:59:52 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Mar 18 12:59:52 2016 +0000
----------------------------------------------------------------------
jena-fuseki2/apache-jena-fuseki/bin/s-delete | 5 ++++-
jena-fuseki2/apache-jena-fuseki/bin/s-get | 5 ++++-
jena-fuseki2/apache-jena-fuseki/bin/s-head | 5 ++++-
jena-fuseki2/apache-jena-fuseki/bin/s-post | 5 ++++-
jena-fuseki2/apache-jena-fuseki/bin/s-put | 5 ++++-
jena-fuseki2/apache-jena-fuseki/bin/s-query | 5 ++++-
jena-fuseki2/apache-jena-fuseki/bin/s-update | 5 ++++-
jena-fuseki2/apache-jena-fuseki/bin/s-update-form | 5 ++++-
jena-fuseki2/apache-jena-fuseki/bin/soh | 5 ++++-
9 files changed, 36 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e2bd6d53/jena-fuseki2/apache-jena-fuseki/bin/s-delete
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-delete b/jena-fuseki2/apache-jena-fuseki/bin/s-delete
index 9f6a619..16cb44c 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-delete
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-delete
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.2"
+SOH_VERSION="1.0.0"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -192,6 +192,9 @@ end
def send_body(dataset, graph, file, method)
mt = content_type(file)
+ if mt.nil?
+ warn_exit "Can't identify the content type of '#{file}'", 9
+ end
headers = {}
headers.merge!($headers)
headers[$hContentType] = mt
http://git-wip-us.apache.org/repos/asf/jena/blob/e2bd6d53/jena-fuseki2/apache-jena-fuseki/bin/s-get
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-get b/jena-fuseki2/apache-jena-fuseki/bin/s-get
index 9f6a619..16cb44c 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-get
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-get
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.2"
+SOH_VERSION="1.0.0"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -192,6 +192,9 @@ end
def send_body(dataset, graph, file, method)
mt = content_type(file)
+ if mt.nil?
+ warn_exit "Can't identify the content type of '#{file}'", 9
+ end
headers = {}
headers.merge!($headers)
headers[$hContentType] = mt
http://git-wip-us.apache.org/repos/asf/jena/blob/e2bd6d53/jena-fuseki2/apache-jena-fuseki/bin/s-head
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-head b/jena-fuseki2/apache-jena-fuseki/bin/s-head
index 9f6a619..16cb44c 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-head
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-head
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.2"
+SOH_VERSION="1.0.0"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -192,6 +192,9 @@ end
def send_body(dataset, graph, file, method)
mt = content_type(file)
+ if mt.nil?
+ warn_exit "Can't identify the content type of '#{file}'", 9
+ end
headers = {}
headers.merge!($headers)
headers[$hContentType] = mt
http://git-wip-us.apache.org/repos/asf/jena/blob/e2bd6d53/jena-fuseki2/apache-jena-fuseki/bin/s-post
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-post b/jena-fuseki2/apache-jena-fuseki/bin/s-post
index 9f6a619..16cb44c 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-post
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-post
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.2"
+SOH_VERSION="1.0.0"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -192,6 +192,9 @@ end
def send_body(dataset, graph, file, method)
mt = content_type(file)
+ if mt.nil?
+ warn_exit "Can't identify the content type of '#{file}'", 9
+ end
headers = {}
headers.merge!($headers)
headers[$hContentType] = mt
http://git-wip-us.apache.org/repos/asf/jena/blob/e2bd6d53/jena-fuseki2/apache-jena-fuseki/bin/s-put
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-put b/jena-fuseki2/apache-jena-fuseki/bin/s-put
index 9f6a619..16cb44c 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-put
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-put
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.2"
+SOH_VERSION="1.0.0"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -192,6 +192,9 @@ end
def send_body(dataset, graph, file, method)
mt = content_type(file)
+ if mt.nil?
+ warn_exit "Can't identify the content type of '#{file}'", 9
+ end
headers = {}
headers.merge!($headers)
headers[$hContentType] = mt
http://git-wip-us.apache.org/repos/asf/jena/blob/e2bd6d53/jena-fuseki2/apache-jena-fuseki/bin/s-query
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-query b/jena-fuseki2/apache-jena-fuseki/bin/s-query
index 9f6a619..16cb44c 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-query
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-query
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.2"
+SOH_VERSION="1.0.0"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -192,6 +192,9 @@ end
def send_body(dataset, graph, file, method)
mt = content_type(file)
+ if mt.nil?
+ warn_exit "Can't identify the content type of '#{file}'", 9
+ end
headers = {}
headers.merge!($headers)
headers[$hContentType] = mt
http://git-wip-us.apache.org/repos/asf/jena/blob/e2bd6d53/jena-fuseki2/apache-jena-fuseki/bin/s-update
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-update b/jena-fuseki2/apache-jena-fuseki/bin/s-update
index 9f6a619..16cb44c 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-update
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-update
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.2"
+SOH_VERSION="1.0.0"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -192,6 +192,9 @@ end
def send_body(dataset, graph, file, method)
mt = content_type(file)
+ if mt.nil?
+ warn_exit "Can't identify the content type of '#{file}'", 9
+ end
headers = {}
headers.merge!($headers)
headers[$hContentType] = mt
http://git-wip-us.apache.org/repos/asf/jena/blob/e2bd6d53/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-update-form b/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
index 9f6a619..16cb44c 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.2"
+SOH_VERSION="1.0.0"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -192,6 +192,9 @@ end
def send_body(dataset, graph, file, method)
mt = content_type(file)
+ if mt.nil?
+ warn_exit "Can't identify the content type of '#{file}'", 9
+ end
headers = {}
headers.merge!($headers)
headers[$hContentType] = mt
http://git-wip-us.apache.org/repos/asf/jena/blob/e2bd6d53/jena-fuseki2/apache-jena-fuseki/bin/soh
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/soh b/jena-fuseki2/apache-jena-fuseki/bin/soh
index 9f6a619..16cb44c 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/soh
+++ b/jena-fuseki2/apache-jena-fuseki/bin/soh
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.2"
+SOH_VERSION="1.0.0"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -192,6 +192,9 @@ end
def send_body(dataset, graph, file, method)
mt = content_type(file)
+ if mt.nil?
+ warn_exit "Can't identify the content type of '#{file}'", 9
+ end
headers = {}
headers.merge!($headers)
headers[$hContentType] = mt
[2/3] jena git commit: Tidy up POMs : remove tabs, fix indent
Posted by an...@apache.org.
Tidy up POMs : remove tabs, fix indent
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f89bd242
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f89bd242
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f89bd242
Branch: refs/heads/master
Commit: f89bd242b3c5075c5048c32b18ccd5840a793161
Parents: bc5ace0
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Mar 18 08:34:54 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Mar 18 08:34:54 2016 +0000
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi/pom.xml | 97 ++++++++--------
jena-base/pom.xml | 4 +-
jena-csv/pom.xml | 9 +-
jena-fuseki2/apache-jena-fuseki/pom.xml | 124 ++++++++++-----------
jena-shaded-guava/pom.xml | 22 ++--
jena-spatial/pom.xml | 158 +++++++++++++--------------
jena-text/pom.xml | 145 ++++++++++++------------
7 files changed, 282 insertions(+), 277 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f89bd242/apache-jena-osgi/jena-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml
index d766a43..f42c09e 100644
--- a/apache-jena-osgi/jena-osgi/pom.xml
+++ b/apache-jena-osgi/jena-osgi/pom.xml
@@ -16,8 +16,10 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
@@ -30,8 +32,7 @@
<description>
Embedding the main Jena modules (iri/core/arq/tdb) in a single OSGi bundle.
</description>
-
-
+
<!--
Most of the job is done by maven-bundle-plugin (see below).
It inspects the embedded/shadowed class files from jena-* to
@@ -80,30 +81,30 @@
<version>3.1.0-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
- <!-- These are all embedded within httpclient-osgi -->
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-cache</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>fluent-hc</artifactId>
- </exclusion>
+ <!-- These are all embedded within httpclient-osgi -->
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-cache</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>fluent-hc</artifactId>
+ </exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
@@ -116,7 +117,7 @@
<version>3.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb</artifactId>
@@ -143,27 +144,27 @@
<artifactId>httpclient-osgi</artifactId>
<version>${ver.httpclient-osgi}</version>
<exclusions>
- <!-- These are all embedded within httpclient-osgi -->
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-cache</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>fluent-hc</artifactId>
- </exclusion>
+ <!-- These are all embedded within httpclient-osgi -->
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-cache</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>fluent-hc</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/jena/blob/f89bd242/jena-base/pom.xml
----------------------------------------------------------------------
diff --git a/jena-base/pom.xml b/jena-base/pom.xml
index 353ffb6..75ecfea 100644
--- a/jena-base/pom.xml
+++ b/jena-base/pom.xml
@@ -126,10 +126,10 @@
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
- <id>attach-javadocs</id>
+ <id>attach-javadocs</id>
<goals>
<goal>jar</goal>
- </goals>
+ </goals>
</execution>
</executions>
<configuration>
http://git-wip-us.apache.org/repos/asf/jena/blob/f89bd242/jena-csv/pom.xml
----------------------------------------------------------------------
diff --git a/jena-csv/pom.xml b/jena-csv/pom.xml
index 142d730..9693371 100644
--- a/jena-csv/pom.xml
+++ b/jena-csv/pom.xml
@@ -16,7 +16,9 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>jena-csv</artifactId>
<packaging>jar</packaging>
@@ -31,14 +33,13 @@
</parent>
- <!-- Need if the parent is a snapshot -->
<repositories>
<repository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
<releases>
- <enabled>false</enabled>
+ <enabled>false</enabled>
</releases>
</repository>
</repositories>
@@ -172,5 +173,5 @@
</plugins>
</build>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/jena/blob/f89bd242/jena-fuseki2/apache-jena-fuseki/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/pom.xml b/jena-fuseki2/apache-jena-fuseki/pom.xml
index 3eb292f..1341ac5 100644
--- a/jena-fuseki2/apache-jena-fuseki/pom.xml
+++ b/jena-fuseki2/apache-jena-fuseki/pom.xml
@@ -1,77 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-<modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
-<name>Apache Jena - Fuseki Binary Distribution</name>
-<artifactId>apache-jena-fuseki</artifactId>
-<version>2.4.0-SNAPSHOT</version>
-<packaging>pom</packaging>
-
-<parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki</artifactId>
+ <name>Apache Jena - Fuseki Binary Distribution</name>
+ <artifactId>apache-jena-fuseki</artifactId>
<version>2.4.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
-</parent>
-
-<description>Fuseki distribution</description>
+ <packaging>pom</packaging>
-<dependencies>
-
- <dependency>
+ <parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki-server</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <artifactId>jena-fuseki</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <description>Fuseki distribution</description>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
+ <dependencies>
-</dependencies>
-<build>
- <plugins>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>create-zip-assembly</id>
- <phase>package</phase>
- <!--<phase />-->
- <goals><goal>single</goal></goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>assembly-dist.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-fuseki-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- </plugins>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-fuseki-war</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+
+ </dependencies>
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-zip-assembly</id>
+ <phase>package</phase>
+ <!--<phase />-->
+ <goals><goal>single</goal></goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>assembly-dist.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
-</build>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/jena/blob/f89bd242/jena-shaded-guava/pom.xml
----------------------------------------------------------------------
diff --git a/jena-shaded-guava/pom.xml b/jena-shaded-guava/pom.xml
index dcb2db4..fbbd507 100644
--- a/jena-shaded-guava/pom.xml
+++ b/jena-shaded-guava/pom.xml
@@ -16,7 +16,9 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -50,7 +52,7 @@
</dependency>
</dependencies>
- <build>
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -64,7 +66,7 @@
</execution>
</executions>
<configuration>
- <createSourcesJar>true</createSourcesJar>
+ <createSourcesJar>true</createSourcesJar>
<artifactSet>
<includes>
<artifact>com.google.guava:guava</artifact>
@@ -74,8 +76,8 @@
<filters>
<filter>
<!-- Modify the below patterns if a later guava
- contains other packages
- -->
+ contains other packages
+ -->
<artifact>com.google.guava:guava</artifact>
<includes>
<include>com/google/common/**</include>
@@ -85,13 +87,13 @@
</filters>
<!--
- Shade to a different package, so the JAR we produce will not be
- in conflict with any newer/older guava present in client code
- depending on Jena.
+ Shade to a different package, so the JAR we produce will not be
+ in conflict with any newer/older guava present in client code
+ depending on Jena.
-->
<relocations>
- <!-- Modify the below patterns if a later guava contains other
- packages -->
+ <!-- Modify the below patterns if a later guava contains other
+ packages -->
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>org.apache.jena.ext.com.google.common</shadedPattern>
http://git-wip-us.apache.org/repos/asf/jena/blob/f89bd242/jena-spatial/pom.xml
----------------------------------------------------------------------
diff --git a/jena-spatial/pom.xml b/jena-spatial/pom.xml
index 49232d8..ffeb84f 100644
--- a/jena-spatial/pom.xml
+++ b/jena-spatial/pom.xml
@@ -100,14 +100,14 @@
<type>jar</type>
<scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -124,104 +124,102 @@
<resources>
<resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>org/apache/jena/query/spatial/properties.xml</include>
- </includes>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>org/apache/jena/query/spatial/properties.xml</include>
+ </includes>
</resource>
<resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>org/apache/jena/query/spatial/properties.xml</exclude>
- </excludes>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>org/apache/jena/query/spatial/properties.xml</exclude>
+ </excludes>
</resource>
</resources>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>
- </systemPropertyVariables>
-
- <includes>
- <include>**/TS_*.java</include>
- </includes>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>
+ </systemPropertyVariables>
+
+ <includes>
+ <include>**/TS_*.java</include>
+ </includes>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- <!-- Only material in the main jar <execution> <id>attach-sources-test</id>
- <goals> <goal>test-jar-no-fork</goal> </goals> </execution> -->
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ <!-- Only material in the main jar <execution> <id>attach-sources-test</id>
+ <goals> <goal>test-jar-no-fork</goal> </goals> </execution>
+ -->
+ </executions>
</plugin>
-
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <version>true</version>
- <show>public</show>
- <quiet>true</quiet>
- <encoding>UTF-8</encoding>
- <windowtitle>${project.name} ${project.version}</windowtitle>
- <doctitle>${project.name} ${project.version}</doctitle>
- <bottom>Licenced under the Apache License, Version 2.0</bottom>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <version>true</version>
+ <show>public</show>
+ <quiet>true</quiet>
+ <encoding>UTF-8</encoding>
+ <windowtitle>${project.name} ${project.version}</windowtitle>
+ <doctitle>${project.name} ${project.version}</doctitle>
+ <bottom>Licenced under the Apache License, Version 2.0</bottom>
+ </configuration>
</plugin>
-
+
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
</plugin>
-
+
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <overWriteReleases>false</overWriteReleases>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <!-- By default, have separate Eclipse and maven build areas -->
- <buildOutputDirectory>${project.build.directory}/classes</buildOutputDirectory>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>false</downloadJavadocs>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <!-- By default, have separate Eclipse and maven build areas -->
+ <buildOutputDirectory>${project.build.directory}/classes</buildOutputDirectory>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>false</downloadJavadocs>
+ </configuration>
</plugin>
-
</plugins>
</build>
-
</project>
http://git-wip-us.apache.org/repos/asf/jena/blob/f89bd242/jena-text/pom.xml
----------------------------------------------------------------------
diff --git a/jena-text/pom.xml b/jena-text/pom.xml
index 8f81f13..cc9f8eb 100644
--- a/jena-text/pom.xml
+++ b/jena-text/pom.xml
@@ -96,14 +96,14 @@
<scope>test</scope>
<optional>true</optional>
<exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -121,97 +121,98 @@
<resources>
<resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>org/apache/jena/query/text/properties.xml</include>
- </includes>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>org/apache/jena/query/text/properties.xml</include>
+ </includes>
</resource>
<resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>org/apache/jena/query/text/properties.xml</exclude>
- </excludes>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>org/apache/jena/query/text/properties.xml</exclude>
+ </excludes>
</resource>
</resources>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
</plugin>
-
+
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/TS_*.java</include>
- </includes>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/TS_*.java</include>
+ </includes>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- <!-- Only material in the main jar <execution> <id>attach-sources-test</id>
- <goals> <goal>test-jar-no-fork</goal> </goals> </execution> -->
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ <!-- Only material in the main jar <execution> <id>attach-sources-test</id>
+ <goals> <goal>test-jar-no-fork</goal> </goals> </execution>
+ -->
+ </executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <version>true</version>
- <show>public</show>
- <quiet>true</quiet>
- <encoding>UTF-8</encoding>
- <windowtitle>${project.name} ${project.version}</windowtitle>
- <doctitle>${project.name} ${project.version}</doctitle>
- <bottom>Licenced under the Apache License, Version 2.0</bottom>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <version>true</version>
+ <show>public</show>
+ <quiet>true</quiet>
+ <encoding>UTF-8</encoding>
+ <windowtitle>${project.name} ${project.version}</windowtitle>
+ <doctitle>${project.name} ${project.version}</doctitle>
+ <bottom>Licenced under the Apache License, Version 2.0</bottom>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <overWriteReleases>false</overWriteReleases>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <!-- By default, have separate Eclipse and maven build areas -->
- <buildOutputDirectory>${project.build.directory}/classes</buildOutputDirectory>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>false</downloadJavadocs>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <!-- By default, have separate Eclipse and maven build areas -->
+ <buildOutputDirectory>${project.build.directory}/classes</buildOutputDirectory>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>false</downloadJavadocs>
+ </configuration>
</plugin>
</plugins>