Return-Path: X-Original-To: apmail-kylin-commits-archive@minotaur.apache.org Delivered-To: apmail-kylin-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C94DF1819F for ; Wed, 30 Dec 2015 09:00:32 +0000 (UTC) Received: (qmail 18071 invoked by uid 500); 30 Dec 2015 09:00:32 -0000 Delivered-To: apmail-kylin-commits-archive@kylin.apache.org Received: (qmail 18042 invoked by uid 500); 30 Dec 2015 09:00:32 -0000 Mailing-List: contact commits-help@kylin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.apache.org Delivered-To: mailing list commits@kylin.apache.org Received: (qmail 18033 invoked by uid 99); 30 Dec 2015 09:00:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Dec 2015 09:00:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8EE4AE01F4; Wed, 30 Dec 2015 09:00:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: liyang@apache.org To: commits@kylin.apache.org Message-Id: <375ec5ab477f4378a0e212309e6f38ac@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: kylin git commit: KYLIN-1266 Add back commons-collections, but a shared version not collections4 Date: Wed, 30 Dec 2015 09:00:32 +0000 (UTC) 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 Authored: Wed Dec 30 16:55:00 2015 +0800 Committer: Li, Yang 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 @@ commons-lang3 + commons-collections + commons-collections + + commons-io commons-io 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 @@ 1.2

2.6

3.1 + 3.2.1

2.4

1.0.15

3.1 @@ -329,6 +330,11 @@ ${commons-lang3.version} + commons-collections + commons-collections + ${commons-collections.version} + + org.apache.commons commons-math3 ${commons-math3.version}