Repository: marmotta Updated Branches: refs/heads/develop 60867dac7 -> da96706ce
relax dependencies from marmotta-commons to marmotta-model-vocabs, as marmotta-commons itself does not use it (avoids problems with shade plugin) Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/da96706c Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/da96706c Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/da96706c Branch: refs/heads/develop Commit: da96706cef10f9025df8d3fc40c9e365a8e49152 Parents: 60867da Author: Sebastian Schaffert <[email protected]> Authored: Fri Nov 7 15:28:16 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Fri Nov 7 15:28:16 2014 +0100 ---------------------------------------------------------------------- commons/marmotta-commons/pom.xml | 4 ---- .../marmotta/commons/collections/CollectionUtils.java | 9 +-------- .../marmotta/commons/collections/EquivalenceHashMap.java | 2 -- .../org/apache/marmotta/commons/http/MarmottaHttpUtils.java | 8 +++----- .../org/apache/marmotta/commons/locking/ObjectLocks.java | 2 -- libraries/kiwi/kiwi-sparql/pom.xml | 4 ---- libraries/kiwi/kiwi-triplestore/pom.xml | 4 ++++ libraries/kiwi/kiwi-versioning/pom.xml | 4 ---- libraries/ldclient/ldclient-provider-facebook/pom.xml | 4 ++++ libraries/ldclient/ldclient-provider-freebase/pom.xml | 4 ++++ libraries/ldclient/ldclient-provider-html/pom.xml | 4 ++++ libraries/ldclient/ldclient-provider-ldap/pom.xml | 4 ++++ libraries/ldclient/ldclient-provider-mediawiki/pom.xml | 4 ++++ libraries/ldclient/ldclient-provider-phpbb/pom.xml | 5 +++++ libraries/ldclient/ldclient-provider-vimeo/pom.xml | 5 +++++ platform/marmotta-core/pom.xml | 5 +++++ 16 files changed, 43 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/commons/marmotta-commons/pom.xml ---------------------------------------------------------------------- diff --git a/commons/marmotta-commons/pom.xml b/commons/marmotta-commons/pom.xml index 3bf80e9..5735f6b 100644 --- a/commons/marmotta-commons/pom.xml +++ b/commons/marmotta-commons/pom.xml @@ -117,10 +117,6 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>org.apache.marmotta</groupId> - <artifactId>marmotta-model-vocabs</artifactId> - </dependency> - <dependency> <groupId>commons-validator</groupId> <artifactId>commons-validator</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/CollectionUtils.java ---------------------------------------------------------------------- diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/CollectionUtils.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/CollectionUtils.java index 0b9785f..82064e5 100644 --- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/CollectionUtils.java +++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/CollectionUtils.java @@ -17,15 +17,8 @@ */ package org.apache.marmotta.commons.collections; -import com.google.common.base.Equivalence; - import java.text.Format; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; +import java.util.*; /** * This class contains static helper methods for supporting java collections http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/EquivalenceHashMap.java ---------------------------------------------------------------------- diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/EquivalenceHashMap.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/EquivalenceHashMap.java index 451f2ac..9c7822a 100644 --- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/EquivalenceHashMap.java +++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/EquivalenceHashMap.java @@ -21,8 +21,6 @@ import com.google.common.base.Equivalence; import com.google.common.base.Function; import com.google.common.collect.Collections2; import com.google.common.collect.Iterators; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.lang.reflect.Array; import java.util.*; http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/MarmottaHttpUtils.java ---------------------------------------------------------------------- diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/MarmottaHttpUtils.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/MarmottaHttpUtils.java index c0d7ce4..199dde9 100644 --- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/MarmottaHttpUtils.java +++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/MarmottaHttpUtils.java @@ -17,17 +17,15 @@ */ package org.apache.marmotta.commons.http; +import org.apache.commons.lang3.StringUtils; +import org.openrdf.query.resultio.QueryResultFormat; + import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import com.google.common.base.Function; -import com.google.common.collect.Lists; -import org.apache.commons.lang3.StringUtils; -import org.openrdf.query.resultio.QueryResultFormat; - /** * Add file description here! * <p/> http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/locking/ObjectLocks.java ---------------------------------------------------------------------- diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/locking/ObjectLocks.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/locking/ObjectLocks.java index ebe4a1c..eded3b7 100644 --- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/locking/ObjectLocks.java +++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/locking/ObjectLocks.java @@ -22,8 +22,6 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.util.concurrent.Monitor; -import java.util.HashSet; - /** * An implementation of dynamic name-based locks that allows more fine-grained locking methods based on a string name. * http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/libraries/kiwi/kiwi-sparql/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/pom.xml b/libraries/kiwi/kiwi-sparql/pom.xml index c2087e7..bd5ecd9 100644 --- a/libraries/kiwi/kiwi-sparql/pom.xml +++ b/libraries/kiwi/kiwi-sparql/pom.xml @@ -103,10 +103,6 @@ </dependency> <dependency> <groupId>org.apache.marmotta</groupId> - <artifactId>marmotta-commons</artifactId> - </dependency> - <dependency> - <groupId>org.apache.marmotta</groupId> <artifactId>marmotta-util-filter</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/libraries/kiwi/kiwi-triplestore/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml index 129fcca..5185eeb 100644 --- a/libraries/kiwi/kiwi-triplestore/pom.xml +++ b/libraries/kiwi/kiwi-triplestore/pom.xml @@ -123,6 +123,10 @@ <artifactId>marmotta-commons</artifactId> </dependency> <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>marmotta-model-vocabs</artifactId> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/libraries/kiwi/kiwi-versioning/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml index f5d175a..cf13e71 100644 --- a/libraries/kiwi/kiwi-versioning/pom.xml +++ b/libraries/kiwi/kiwi-versioning/pom.xml @@ -79,10 +79,6 @@ </dependency> <dependency> <groupId>org.apache.marmotta</groupId> - <artifactId>marmotta-commons</artifactId> - </dependency> - <dependency> - <groupId>org.apache.marmotta</groupId> <artifactId>marmotta-util-filter</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/libraries/ldclient/ldclient-provider-facebook/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml index 8ce90cf..5c5b72e 100644 --- a/libraries/ldclient/ldclient-provider-facebook/pom.xml +++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml @@ -48,6 +48,10 @@ <artifactId>marmotta-commons</artifactId> </dependency> <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>marmotta-model-vocabs</artifactId> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/libraries/ldclient/ldclient-provider-freebase/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-freebase/pom.xml b/libraries/ldclient/ldclient-provider-freebase/pom.xml index 5cba92c..1bad391 100644 --- a/libraries/ldclient/ldclient-provider-freebase/pom.xml +++ b/libraries/ldclient/ldclient-provider-freebase/pom.xml @@ -46,6 +46,10 @@ <groupId>org.apache.marmotta</groupId> <artifactId>marmotta-commons</artifactId> </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>marmotta-model-vocabs</artifactId> + </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/libraries/ldclient/ldclient-provider-html/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-html/pom.xml b/libraries/ldclient/ldclient-provider-html/pom.xml index 89f302d..8c39b8f 100644 --- a/libraries/ldclient/ldclient-provider-html/pom.xml +++ b/libraries/ldclient/ldclient-provider-html/pom.xml @@ -51,6 +51,10 @@ <groupId>org.apache.marmotta</groupId> <artifactId>marmotta-commons</artifactId> </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>marmotta-model-vocabs</artifactId> + </dependency> <dependency> <groupId>org.apache.marmotta</groupId> http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/libraries/ldclient/ldclient-provider-ldap/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-ldap/pom.xml b/libraries/ldclient/ldclient-provider-ldap/pom.xml index f321e5c..0e31791 100644 --- a/libraries/ldclient/ldclient-provider-ldap/pom.xml +++ b/libraries/ldclient/ldclient-provider-ldap/pom.xml @@ -56,6 +56,10 @@ <groupId>org.apache.marmotta</groupId> <artifactId>marmotta-commons</artifactId> </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>marmotta-model-vocabs</artifactId> + </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/libraries/ldclient/ldclient-provider-mediawiki/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml index 01cdf17..1726015 100644 --- a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml +++ b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml @@ -56,6 +56,10 @@ <groupId>org.apache.marmotta</groupId> <artifactId>marmotta-commons</artifactId> </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>marmotta-model-vocabs</artifactId> + </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/libraries/ldclient/ldclient-provider-phpbb/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-phpbb/pom.xml b/libraries/ldclient/ldclient-provider-phpbb/pom.xml index 0f78526..7ea4c0b 100644 --- a/libraries/ldclient/ldclient-provider-phpbb/pom.xml +++ b/libraries/ldclient/ldclient-provider-phpbb/pom.xml @@ -53,6 +53,11 @@ <artifactId>marmotta-commons</artifactId> </dependency> <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>marmotta-model-vocabs</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/libraries/ldclient/ldclient-provider-vimeo/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-vimeo/pom.xml b/libraries/ldclient/ldclient-provider-vimeo/pom.xml index 8a6ad54..1204c0b 100644 --- a/libraries/ldclient/ldclient-provider-vimeo/pom.xml +++ b/libraries/ldclient/ldclient-provider-vimeo/pom.xml @@ -56,6 +56,11 @@ <artifactId>marmotta-commons</artifactId> </dependency> <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>marmotta-model-vocabs</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/da96706c/platform/marmotta-core/pom.xml ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml index e17230e..134b458 100644 --- a/platform/marmotta-core/pom.xml +++ b/platform/marmotta-core/pom.xml @@ -525,6 +525,11 @@ </dependency> <dependency> <groupId>org.apache.marmotta</groupId> + <artifactId>marmotta-model-vocabs</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.marmotta</groupId> <artifactId>marmotta-util-filter</artifactId> </dependency> <dependency>
