[04/14] jena git commit: Merge remote-tracking branch 'upstream/master' into highlighting

[andy]

Merge remote-tracking branch 'upstream/master' into highlighting


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5e95a09e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5e95a09e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5e95a09e

Branch: refs/heads/master
Commit: 5e95a09eccaf7f8fa5ec659bebde83cdf8398163
Parents: e144571 ff92fae
Author: Chris Tomlinson 
Authored: Sun Nov 26 10:19:11 2017 -0600
Committer: Chris Tomlinson 
Committed: Sun Nov 26 10:19:11 2017 -0600

--
 jena-cmds/src/main/java/tdb2/cmdline/ModTDBDataset.java | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)
--

[04/14] jena git commit: Merge remote-tracking branch 'upstream/master'

[andy]

Merge remote-tracking branch 'upstream/master'


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d5b72f11
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d5b72f11
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d5b72f11

Branch: refs/heads/master
Commit: d5b72f11ca9c8dfae2f607368ea94c745b0b4dcc
Parents: 858de20 3ac8891
Author: ales004 
Authored: Mon May 9 22:55:25 2016 +0200
Committer: ales004 
Committed: Mon May 9 22:55:25 2016 +0200

--
 apache-jena-libs/pom.xml|  6 +-
 apache-jena-osgi/jena-osgi-features/pom.xml |  2 +-
 apache-jena-osgi/jena-osgi/pom.xml  | 12 ++--
 apache-jena-osgi/pom.xml|  4 +-
 apache-jena/assembly-jena-zip.xml   | 23 +---
 apache-jena/pom.xml | 34 +--
 jena-arq/pom.xml| 12 ++--
 .../apache/jena/sparql/expr/TestFunctions.java  | 33 +--
 jena-base/pom.xml   |  6 +-
 jena-cmds/pom.xml   | 12 ++--
 jena-core/pom.xml   | 10 ++--
 jena-csv/pom.xml| 10 ++--
 jena-elephas/jena-elephas-common/pom.xml|  2 +-
 jena-elephas/jena-elephas-io/pom.xml|  2 +-
 jena-elephas/jena-elephas-mapreduce/pom.xml |  2 +-
 jena-elephas/jena-elephas-stats/pom.xml |  2 +-
 jena-elephas/pom.xml|  6 +-
 jena-extras/jena-querybuilder/pom.xml   |  2 +-
 jena-extras/pom.xml |  6 +-
 jena-fuseki1/pom.xml| 18 +++---
 jena-fuseki2/apache-jena-fuseki/pom.xml |  4 +-
 jena-fuseki2/jena-fuseki-core/pom.xml   | 12 ++--
 jena-fuseki2/jena-fuseki-server/pom.xml |  4 +-
 jena-fuseki2/jena-fuseki-war/pom.xml|  2 +-
 jena-fuseki2/pom.xml|  4 +-
 jena-iri/pom.xml|  4 +-
 jena-jdbc/jena-jdbc-core/pom.xml|  4 +-
 jena-jdbc/jena-jdbc-driver-bundle/pom.xml   | 20 +++
 jena-jdbc/jena-jdbc-driver-mem/pom.xml  |  6 +-
 jena-jdbc/jena-jdbc-driver-remote/pom.xml   | 10 ++--
 jena-jdbc/jena-jdbc-driver-tdb/pom.xml  | 10 ++--
 jena-jdbc/pom.xml   |  4 +-
 jena-maven-tools/pom.xml|  6 +-
 jena-parent/pom.xml |  2 +-
 jena-permissions/pom.xml|  4 +-
 jena-sdb/pom.xml| 14 ++---
 jena-shaded-guava/pom.xml   |  4 +-
 jena-spatial/pom.xml| 10 ++--
 jena-tdb/pom.xml| 12 ++--
 jena-text/pom.xml   | 10 ++--
 .../org/apache/jena/query/text/TextQueryPF.java |  9 +--
 .../org/apache/jena/query/text/TestTextTDB.java | 59 
 pom.xml |  2 +-
 43 files changed, 252 insertions(+), 168 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/jena/blob/d5b72f11/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestFunctions.java
--