Merge branch 'develop' into ldp
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/33d9d119 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/33d9d119 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/33d9d119 Branch: refs/heads/ldp Commit: 33d9d1196bdcc14913a70df48a3fa026936ee924 Parents: 16c0383 42f5db0 Author: Sergio Fernández <[email protected]> Authored: Thu Jul 10 14:20:04 2014 +0200 Committer: Sergio Fernández <[email protected]> Committed: Thu Jul 10 14:20:04 2014 +0200 ---------------------------------------------------------------------- .../persistence/KiWiSparqlConnection.java | 4 ++ .../kiwi/sparql/test/KiWiSparqlUpdateTest.java | 43 ++++++++++++++++++++ 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 +-- 25 files changed, 106 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/33d9d119/parent/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/33d9d119/platform/marmotta-ldp/pom.xml ----------------------------------------------------------------------
