Turns out we didn't need any of the apache commons collection stuff. We only use whats in our utils so the dependency could be trimmed. Also removed erroneous mention of hazel cast in a logger.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/01dde6fc Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/01dde6fc Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/01dde6fc Branch: refs/heads/USERGRID-1246-MASTER Commit: 01dde6fcdb9b646eda103734013815542132b002 Parents: ff9dcab Author: George Reyes <[email protected]> Authored: Fri Apr 29 10:05:23 2016 -0700 Committer: George Reyes <[email protected]> Committed: Fri Apr 29 10:05:23 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/usergrid/utils/MapUtils.java | 3 +-- stack/core/src/test/java/org/usergrid/Simple.java | 3 +-- stack/corepersistence/queryindex/pom.xml | 9 +-------- .../apache/usergrid/persistence/index/utils/ListUtils.java | 2 +- 4 files changed, 4 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/01dde6fc/stack/core/src/main/java/org/apache/usergrid/utils/MapUtils.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/utils/MapUtils.java b/stack/core/src/main/java/org/apache/usergrid/utils/MapUtils.java index 5b8fcfd..2777844 100644 --- a/stack/core/src/main/java/org/apache/usergrid/utils/MapUtils.java +++ b/stack/core/src/main/java/org/apache/usergrid/utils/MapUtils.java @@ -34,8 +34,7 @@ import static org.apache.commons.lang.StringUtils.isNotBlank; import static org.apache.usergrid.utils.ClassUtils.cast; -public class MapUtils extends org.apache.commons.collections4.MapUtils{ - +public class MapUtils { public static <A, B> void addMapSet( Map<A, Set<B>> map, A a, B b ) { addMapSet( map, false, a, b ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/01dde6fc/stack/core/src/test/java/org/usergrid/Simple.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/usergrid/Simple.java b/stack/core/src/test/java/org/usergrid/Simple.java index 78ad226..f859fab 100644 --- a/stack/core/src/test/java/org/usergrid/Simple.java +++ b/stack/core/src/test/java/org/usergrid/Simple.java @@ -20,13 +20,12 @@ package org.usergrid; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.clustering.hazelcast.HazelcastTest; import org.apache.usergrid.persistence.TypedEntity; public class Simple extends TypedEntity { - private static final Logger logger = LoggerFactory.getLogger( HazelcastTest.class ); + private static final Logger logger = LoggerFactory.getLogger( Simple.class ); public Simple() { http://git-wip-us.apache.org/repos/asf/usergrid/blob/01dde6fc/stack/corepersistence/queryindex/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/pom.xml b/stack/corepersistence/queryindex/pom.xml index 60c7c5e..fb2ce23 100644 --- a/stack/corepersistence/queryindex/pom.xml +++ b/stack/corepersistence/queryindex/pom.xml @@ -145,14 +145,7 @@ <version>${commons.io.version}</version> <type>jar</type> </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - <version>4.0</version> - <type>jar</type> - </dependency> - + <dependency> <groupId>org.apache.usergrid</groupId> <artifactId>common</artifactId> http://git-wip-us.apache.org/repos/asf/usergrid/blob/01dde6fc/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ListUtils.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ListUtils.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ListUtils.java index c93428e..3f743f9 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ListUtils.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ListUtils.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; -public class ListUtils extends org.apache.commons.collections.ListUtils { +public class ListUtils { private static final Logger logger = LoggerFactory.getLogger( ListUtils.class );
