Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-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 25659182FA for ; Mon, 7 Mar 2016 18:39:19 +0000 (UTC) Received: (qmail 38190 invoked by uid 500); 7 Mar 2016 18:39:18 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 38157 invoked by uid 500); 7 Mar 2016 18:39:18 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 38147 invoked by uid 99); 7 Mar 2016 18:39:18 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Mar 2016 18:39:18 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 339B7C698F for ; Mon, 7 Mar 2016 18:39:18 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id gNdG88eyBkck for ; Mon, 7 Mar 2016 18:39:16 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id D3CC05F2ED for ; Mon, 7 Mar 2016 18:39:15 +0000 (UTC) Received: (qmail 38144 invoked by uid 99); 7 Mar 2016 18:39:15 -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; Mon, 07 Mar 2016 18:39:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D65DADFBD7; Mon, 7 Mar 2016 18:39:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jasonhuynh@apache.org To: commits@geode.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-geode git commit: GEODE-562: Upgrade commons collections to v3.2.2 Date: Mon, 7 Mar 2016 18:39:14 +0000 (UTC) Repository: incubator-geode Updated Branches: refs/heads/develop 657b07719 -> 4c7fd9958 GEODE-562: Upgrade commons collections to v3.2.2 Incremental improvement on gradle build Bumped up the version of commons collection in another commit by mistake Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4c7fd995 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4c7fd995 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4c7fd995 Branch: refs/heads/develop Commit: 4c7fd9958c1bd7a3cee5b104aa48ab7a5a406f2d Parents: 657b077 Author: Jason Huynh Authored: Wed Mar 2 09:43:50 2016 -0800 Committer: Jason Huynh Committed: Mon Mar 7 10:31:55 2016 -0800 ---------------------------------------------------------------------- extensions/geode-modules/build.gradle | 3 ++- geode-core/build.gradle | 12 +++++++++--- geode-pulse/build.gradle | 6 ++++++ geode-rebalancer/build.gradle | 1 + gradle/java.gradle | 9 --------- 5 files changed, 18 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4c7fd995/extensions/geode-modules/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules/build.gradle index f96fde6..1389585 100644 --- a/extensions/geode-modules/build.gradle +++ b/extensions/geode-modules/build.gradle @@ -26,7 +26,8 @@ test { dependencies { compile project(':geode-core') - + + compile 'org.slf4j:slf4j-api:' + project.'slf4j-api.version' compile 'org.apache.tomcat:catalina:' + project.'tomcat6.version' compile 'org.apache.tomcat:catalina-ha:' + project.'tomcat6.version' compile 'org.apache.tomcat:juli:' + project.'tomcat6.version' http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4c7fd995/geode-core/build.gradle ---------------------------------------------------------------------- diff --git a/geode-core/build.gradle b/geode-core/build.gradle index 1aa07ee..aa47d58 100755 --- a/geode-core/build.gradle +++ b/geode-core/build.gradle @@ -57,7 +57,7 @@ dependencies { provided 'org.apache.hadoop:hadoop-annotations:' + project.'hadoop.version' provided 'org.apache.hadoop:hadoop-hdfs:' + project.'hadoop.version' provided 'org.apache.hadoop:hadoop-mapreduce-client-core:' + project.'hadoop.version' - compile 'org.apache.hbase:hbase:' + project.'hbase.version' + provided 'org.apache.hbase:hbase:' + project.'hbase.version' compile 'org.apache.logging.log4j:log4j-api:' + project.'log4j.version' compile 'org.apache.logging.log4j:log4j-core:' + project.'log4j.version' runtime 'org.apache.logging.log4j:log4j-slf4j-impl:' + project.'log4j.version' @@ -72,13 +72,19 @@ dependencies { compile 'org.eclipse.jetty:jetty-webapp:' + project.'jetty.version' compile 'org.eclipse.jetty:jetty-xml:' + project.'jetty.version' compile 'org.fusesource.jansi:jansi:' + project.'jansi.version' - compile 'org.slf4j:slf4j-api:' + project.'slf4j-api.version' + runtime 'org.springframework:spring-aop:' + project.'springframework.version' compile 'org.springframework.data:spring-data-commons:' + project.'spring-data-commons.version' provided 'org.springframework.data:spring-data-gemfire:' + project.'spring-data-gemfire.version' + compile 'org.springframework:spring-beans:' + project.'springframework.version' //only used in AbstractCommandsController + compile 'org.springframework:spring-context:' + project.'springframework.version' + compile 'org.springframework:spring-context-support:' + project.'springframework.version' + compile 'org.springframework:spring-core:' + project.'springframework.version' + runtime 'org.springframework:spring-expression:' + project.'springframework.version' compile 'org.springframework:spring-tx:' + project.'springframework.version' + compile 'org.springframework:spring-web:' + project.'springframework.version' + compile 'org.springframework:spring-webmvc:' + project.'springframework.version' compile 'org.springframework.shell:spring-shell:' + project.'spring-shell.version' compile 'org.xerial.snappy:snappy-java:' + project.'snappy-java.version' - compile 'org.apache.hbase:hbase:' + project.'hbase.version' compile project(':geode-common') compile project(':geode-joptsimple') http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4c7fd995/geode-pulse/build.gradle ---------------------------------------------------------------------- diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle index 0cd1ef4..ad21c1f 100755 --- a/geode-pulse/build.gradle +++ b/geode-pulse/build.gradle @@ -26,6 +26,11 @@ sourceSets { } dependencies { + compile 'org.springframework:spring-beans:' + project.'springframework.version' + compile 'org.springframework:spring-context:' + project.'springframework.version' + compile 'org.springframework:spring-core:' + project.'springframework.version' + compile 'org.springframework:spring-web:' + project.'springframework.version' + compile 'commons-beanutils:commons-beanutils:' + project.'commons-beanutils.version' compile 'commons-collections:commons-collections:' + project.'commons-collections.version' compile 'commons-digester:commons-digester:' + project.'commons-digester.version' @@ -33,6 +38,7 @@ dependencies { compile 'org.springframework.ldap:spring-ldap-core:' + project.'spring-ldap-core.version' compile 'org.springframework.security:spring-security-config:' + project.'spring-security.version' compile 'org.springframework.security:spring-security-core:' + project.'spring-security.version' + runtime 'org.springframework:spring-expression:' + project.'springframework.version' compile 'org.springframework.security:spring-security-ldap:' + project.'spring-security.version' compile 'org.springframework.security:spring-security-web:' + project.'spring-security.version' compile 'org.springframework:spring-tx:' + project.'spring-tx.version' http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4c7fd995/geode-rebalancer/build.gradle ---------------------------------------------------------------------- diff --git a/geode-rebalancer/build.gradle b/geode-rebalancer/build.gradle index 9efdff2..f426749 100644 --- a/geode-rebalancer/build.gradle +++ b/geode-rebalancer/build.gradle @@ -25,4 +25,5 @@ dependencies { // the following test dependencies are needed for mocking cache instance testRuntime 'org.apache.hadoop:hadoop-common:' + project.'hadoop.version' testRuntime 'org.apache.hadoop:hadoop-hdfs:' + project.'hadoop.version' + testRuntime 'org.apache.hbase:hbase:' + project.'hbase.version' } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4c7fd995/gradle/java.gradle ---------------------------------------------------------------------- diff --git a/gradle/java.gradle b/gradle/java.gradle index 06fb766..ba1122b 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -121,17 +121,8 @@ subprojects { } dependencies { - compile 'org.springframework:spring-aop:' + project.'springframework.version' - compile 'org.springframework:spring-beans:' + project.'springframework.version' - compile 'org.springframework:spring-context:' + project.'springframework.version' - compile 'org.springframework:spring-context-support:' + project.'springframework.version' - compile 'org.springframework:spring-core:' + project.'springframework.version' - compile 'org.springframework:spring-expression:' + project.'springframework.version' - compile 'org.springframework:spring-web:' + project.'springframework.version' - compile 'org.springframework:spring-webmvc:' + project.'springframework.version' compile 'com.github.stephenc.findbugs:findbugs-annotations:' + project.'stephenc-findbugs.version' compile 'com.google.code.findbugs:jsr305:' + project.'jsr305.version' - compile 'javax.enterprise:cdi-api:' + project.'cdi-api.version' } }