You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/12/30 10:00:32 UTC
kylin git commit: KYLIN-1266 Add back commons-collections,
but a shared version not collections4
Repository: kylin
Updated Branches:
refs/heads/2.0-rc 6d7d2d71a -> e0748f5b4
KYLIN-1266 Add back commons-collections, but a shared version not collections4
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e0748f5b
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e0748f5b
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e0748f5b
Branch: refs/heads/2.0-rc
Commit: e0748f5b4cf97d671250c967666a02bb9d03a700
Parents: 6d7d2d7
Author: Li, Yang <ya...@ebay.com>
Authored: Wed Dec 30 16:55:00 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Wed Dec 30 17:00:07 2015 +0800
----------------------------------------------------------------------
core-common/pom.xml | 4 +++
.../kylin/common/util/CollectionUtils.java | 29 --------------------
.../cube/upgrade/v2/CubeMetadataUpgradeV2.java | 2 +-
pom.xml | 6 ++++
4 files changed, 11 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/e0748f5b/core-common/pom.xml
----------------------------------------------------------------------
diff --git a/core-common/pom.xml b/core-common/pom.xml
index 72d8808..07a7ee1 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -49,6 +49,10 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/kylin/blob/e0748f5b/core-common/src/main/java/org/apache/kylin/common/util/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/util/CollectionUtils.java b/core-common/src/main/java/org/apache/kylin/common/util/CollectionUtils.java
deleted file mode 100644
index c4b7d1d..0000000
--- a/core-common/src/main/java/org/apache/kylin/common/util/CollectionUtils.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-package org.apache.kylin.common.util;
-
-import java.util.Collection;
-
-public class CollectionUtils {
-
- public static boolean isEmpty(final Collection<?> coll) {
- return coll == null || coll.isEmpty();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/kylin/blob/e0748f5b/core-cube/src/main/java/org/apache/kylin/cube/upgrade/v2/CubeMetadataUpgradeV2.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/upgrade/v2/CubeMetadataUpgradeV2.java b/core-cube/src/main/java/org/apache/kylin/cube/upgrade/v2/CubeMetadataUpgradeV2.java
index 4b823e6..f11d95c 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/upgrade/v2/CubeMetadataUpgradeV2.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/upgrade/v2/CubeMetadataUpgradeV2.java
@@ -23,12 +23,12 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.ResourceStore;
-import org.apache.kylin.common.util.CollectionUtils;
import org.apache.kylin.cube.CubeDescManager;
import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.CubeManager;
http://git-wip-us.apache.org/repos/asf/kylin/blob/e0748f5b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c936774..7a709a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
<commons-cli.version>1.2</commons-cli.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.1</commons-lang3.version>
+ <commons-collections.version>3.2.1</commons-collections.version>
<commons-io.version>2.4</commons-io.version>
<commons-daemon.version>1.0.15</commons-daemon.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
@@ -329,6 +330,11 @@
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>${commons-math3.version}</version>