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/06/13 10:58:38 UTC

[078/100] [abbrv] git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop


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

Branch: refs/heads/ldp
Commit: 2c784942ba4f6caf3a21052549ece7c6ca497819
Parents: 6c47f77 c8bd0c0
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Thu Apr 10 10:11:48 2014 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Thu Apr 10 10:11:48 2014 +0200

----------------------------------------------------------------------
 .../marmotta-archetype-module/pom.xml           |  4 ++--
 .../marmotta-archetype-webapp/pom.xml           | 24 ++++++++++----------
 build/archetypes/pom.xml                        |  2 +-
 build/checkstyle-resources/pom.xml              |  2 +-
 build/dependency-resource-supplement/pom.xml    |  2 +-
 build/plugins/buildinfo-maven-plugin/pom.xml    |  2 +-
 build/plugins/marmotta-maven-plugin/pom.xml     |  2 +-
 build/plugins/pom.xml                           |  2 +-
 build/plugins/refpack-maven-plugin/pom.xml      |  2 +-
 build/plugins/repocheck-maven-plugin/pom.xml    |  2 +-
 build/pom.xml                                   |  2 +-
 client/marmotta-client-java/pom.xml             |  2 +-
 client/marmotta-client-js/pom.xml               |  2 +-
 client/pom.xml                                  |  2 +-
 commons/marmotta-commons/pom.xml                |  2 +-
 .../marmotta-model-vocabs/pom.xml               |  2 +-
 .../marmotta-rio-api/pom.xml                    |  2 +-
 .../marmotta-rio-ical/pom.xml                   |  2 +-
 .../marmotta-rio-rss/pom.xml                    |  2 +-
 .../marmotta-rio-vcard/pom.xml                  |  2 +-
 .../marmotta-sail-contextaware/pom.xml          |  2 +-
 .../marmotta-sail-transactions/pom.xml          |  2 +-
 .../marmotta-sesame-matchers/pom.xml            |  2 +-
 .../marmotta-util-facading/pom.xml              |  2 +-
 .../marmotta-util-filter/pom.xml                |  2 +-
 .../marmotta-util-rdfpatch/pom.xml              |  2 +-
 .../marmotta-util-tripletable/pom.xml           |  2 +-
 commons/marmotta-sesame-tools/pom.xml           |  2 +-
 commons/pom.xml                                 |  2 +-
 extras/pom.xml                                  |  2 +-
 extras/webjars/codemirror/pom.xml               |  2 +-
 extras/webjars/pom.xml                          |  2 +-
 extras/webjars/strftime/pom.xml                 |  2 +-
 launchers/marmotta-installer/pom.xml            |  2 +-
 launchers/marmotta-splash/pom.xml               |  2 +-
 launchers/marmotta-webapp/pom.xml               |  2 +-
 launchers/pom.xml                               |  2 +-
 libraries/kiwi/kiwi-caching-ehcache/pom.xml     |  6 ++---
 libraries/kiwi/kiwi-caching-hazelcast/pom.xml   |  6 ++---
 libraries/kiwi/kiwi-caching-infinispan/pom.xml  |  6 ++---
 libraries/kiwi/kiwi-loader/pom.xml              |  5 ++--
 libraries/kiwi/kiwi-reasoner/pom.xml            |  2 +-
 libraries/kiwi/kiwi-sparql/pom.xml              |  2 +-
 libraries/kiwi/kiwi-triplestore/pom.xml         |  2 +-
 libraries/kiwi/kiwi-versioning/pom.xml          |  2 +-
 libraries/kiwi/pom.xml                          |  2 +-
 libraries/ldcache/ldcache-api/pom.xml           |  2 +-
 libraries/ldcache/ldcache-backend-file/pom.xml  |  2 +-
 .../ldcache/ldcache-backend-infinispan/pom.xml  |  6 ++---
 libraries/ldcache/ldcache-backend-kiwi/pom.xml  |  2 +-
 libraries/ldcache/ldcache-core/pom.xml          |  2 +-
 libraries/ldcache/ldcache-sail-generic/pom.xml  |  2 +-
 libraries/ldcache/ldcache-sail-kiwi/pom.xml     |  2 +-
 libraries/ldcache/pom.xml                       |  2 +-
 libraries/ldclient/ldclient-api/pom.xml         |  2 +-
 libraries/ldclient/ldclient-core/pom.xml        |  2 +-
 .../ldclient/ldclient-provider-facebook/pom.xml |  2 +-
 .../ldclient/ldclient-provider-freebase/pom.xml |  2 +-
 .../ldclient/ldclient-provider-html/pom.xml     |  2 +-
 .../ldclient/ldclient-provider-ldap/pom.xml     |  2 +-
 .../ldclient-provider-mediawiki/pom.xml         |  2 +-
 .../ldclient/ldclient-provider-phpbb/pom.xml    |  2 +-
 .../ldclient/ldclient-provider-rdf/pom.xml      |  2 +-
 .../ldclient/ldclient-provider-rdfa/pom.xml     |  2 +-
 .../ldclient/ldclient-provider-vimeo/pom.xml    |  2 +-
 .../ldclient/ldclient-provider-xml/pom.xml      |  2 +-
 .../ldclient/ldclient-provider-youtube/pom.xml  |  2 +-
 libraries/ldclient/pom.xml                      |  2 +-
 libraries/ldpath/ldpath-api/pom.xml             |  2 +-
 libraries/ldpath/ldpath-backend-file/pom.xml    |  2 +-
 libraries/ldpath/ldpath-backend-jena/pom.xml    |  2 +-
 .../ldpath-backend-linkeddata/assembly.xml      |  6 -----
 .../ldpath/ldpath-backend-linkeddata/pom.xml    |  6 ++++-
 libraries/ldpath/ldpath-backend-sesame/pom.xml  |  2 +-
 libraries/ldpath/ldpath-core-bundle/pom.xml     |  2 +-
 libraries/ldpath/ldpath-core/pom.xml            |  2 +-
 .../ldpath/ldpath-functions-collections/pom.xml |  2 +-
 libraries/ldpath/ldpath-functions-date/pom.xml  |  2 +-
 libraries/ldpath/ldpath-functions-html/pom.xml  |  2 +-
 libraries/ldpath/ldpath-functions-math/pom.xml  |  2 +-
 libraries/ldpath/ldpath-functions-text/pom.xml  |  2 +-
 libraries/ldpath/ldpath-functions-xml/pom.xml   |  2 +-
 .../ldpath/ldpath-template-linkeddata/pom.xml   |  2 +-
 libraries/ldpath/ldpath-template/pom.xml        |  2 +-
 libraries/ldpath/pom.xml                        |  2 +-
 libraries/pom.xml                               |  2 +-
 loader/marmotta-loader-berkeley/pom.xml         |  6 ++---
 loader/marmotta-loader-core/pom.xml             |  2 +-
 loader/marmotta-loader-hbase/pom.xml            |  6 ++---
 loader/marmotta-loader-kiwi/pom.xml             |  6 ++---
 loader/marmotta-loader-titan/pom.xml            |  2 +-
 loader/pom.xml                                  |  2 +-
 parent/pom.xml                                  |  2 +-
 platform/backends/marmotta-backend-kiwi/pom.xml |  6 ++---
 .../backends/marmotta-backend-memory/pom.xml    |  6 ++---
 .../backends/marmotta-backend-native/pom.xml    |  6 ++---
 .../backends/marmotta-backend-titan/pom.xml     |  6 ++---
 platform/backends/pom.xml                       |  2 +-
 .../ldcache/marmotta-ldcache-common/pom.xml     |  6 ++---
 platform/ldcache/marmotta-ldcache-file/pom.xml  |  2 +-
 platform/ldcache/marmotta-ldcache-kiwi/pom.xml  |  2 +-
 platform/ldcache/pom.xml                        |  2 +-
 platform/marmotta-core/pom.xml                  |  2 +-
 platform/marmotta-ldp/pom.xml                   |  2 +-
 platform/marmotta-ldpath/pom.xml                |  2 +-
 platform/marmotta-reasoner-kiwi/pom.xml         |  2 +-
 platform/marmotta-security/pom.xml              |  2 +-
 platform/marmotta-sparql/pom.xml                |  2 +-
 platform/marmotta-user/pom.xml                  |  2 +-
 platform/marmotta-versioning-common/pom.xml     |  6 ++---
 platform/marmotta-versioning-kiwi/pom.xml       |  2 +-
 platform/marmotta-zookeeper/pom.xml             |  6 ++---
 platform/pom.xml                                |  2 +-
 pom.xml                                         |  5 +++-
 114 files changed, 150 insertions(+), 172 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/2c784942/build/archetypes/marmotta-archetype-module/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/marmotta/blob/2c784942/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------