You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/07/24 12:41:36 UTC
[12/12] git commit: Merge branch 'develop' into MARMOTTA-499
Merge branch 'develop' into MARMOTTA-499
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/0d3bdf8c
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/0d3bdf8c
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/0d3bdf8c
Branch: refs/heads/MARMOTTA-499
Commit: 0d3bdf8cfc11dc047603fbd306aed338f2efd4d3
Parents: 1dd77c4 d5241ed
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Jul 24 12:38:47 2014 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Jul 24 12:38:47 2014 +0200
----------------------------------------------------------------------
.../persistence/KiWiSparqlConnection.java | 4 ++
.../kiwi/sparql/test/KiWiSparqlUpdateTest.java | 43 ++++++++++++++++++++
.../model/selectors/RecursivePathSelector.java | 17 ++++----
.../marmotta/ldpath/parser/SelectorsTest.java | 10 +++++
parent/pom.xml | 19 +++++----
.../backends/marmotta-backend-bigdata/pom.xml | 4 +-
platform/backends/marmotta-backend-http/pom.xml | 2 +-
platform/backends/marmotta-backend-kiwi/pom.xml | 4 +-
.../backends/marmotta-backend-memory/pom.xml | 4 +-
.../backends/marmotta-backend-native/pom.xml | 4 +-
.../backends/marmotta-backend-sparql/pom.xml | 4 +-
.../backends/marmotta-backend-titan/pom.xml | 4 +-
.../ldcache/marmotta-ldcache-common/pom.xml | 10 ++---
platform/ldcache/marmotta-ldcache-file/pom.xml | 4 +-
platform/ldcache/marmotta-ldcache-kiwi/pom.xml | 4 +-
platform/marmotta-core/pom.xml | 4 +-
.../platform/core/test/ld/LinkedDataTest.java | 2 +-
platform/marmotta-ldp/pom.xml | 4 +-
platform/marmotta-ldpath/pom.xml | 4 +-
platform/marmotta-reasoner-kiwi/pom.xml | 4 +-
platform/marmotta-security/pom.xml | 4 +-
platform/marmotta-sparql/pom.xml | 4 +-
.../sparql/webservices/SparqlWebService.java | 4 +-
platform/marmotta-user/pom.xml | 6 +--
platform/marmotta-versioning-common/pom.xml | 6 +--
platform/marmotta-versioning-kiwi/pom.xml | 4 +-
platform/marmotta-zookeeper/pom.xml | 6 +--
27 files changed, 126 insertions(+), 63 deletions(-)
----------------------------------------------------------------------