geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [02/44] incubator-geode git commit: Revert "GEODE-562: Upgrade commons collections to v3.2.2"
Date Tue, 15 Mar 2016 00:23:45 GMT
Revert "GEODE-562: Upgrade commons collections to v3.2.2"

This reverts commit 4c7fd9958c1bd7a3cee5b104aa48ab7a5a406f2d.
Caused some tests in geode-assembly to fail and/or not able to locate certain dependencies
Will revert this change and try to work out some of these issues


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/79e2a431
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/79e2a431
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/79e2a431

Branch: refs/heads/feature/GEODE-949-2
Commit: 79e2a4311581da151f0dfae15f3fb22e1bfcac5f
Parents: d1ca32d
Author: Jason Huynh <jhuynh@pivotal.io>
Authored: Tue Mar 8 09:55:58 2016 -0800
Committer: Jason Huynh <jhuynh@pivotal.io>
Committed: Tue Mar 8 09:57:06 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, 13 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/79e2a431/extensions/geode-modules/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules/build.gradle
index 1389585..f96fde6 100644
--- a/extensions/geode-modules/build.gradle
+++ b/extensions/geode-modules/build.gradle
@@ -26,8 +26,7 @@ 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/79e2a431/geode-core/build.gradle
----------------------------------------------------------------------
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index aa47d58..1aa07ee 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'
-  provided 'org.apache.hbase:hbase:' + project.'hbase.version'
+  compile '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,19 +72,13 @@ 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'
-  runtime 'org.springframework:spring-aop:' + project.'springframework.version'
+  compile 'org.slf4j:slf4j-api:' + project.'slf4j-api.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/79e2a431/geode-pulse/build.gradle
----------------------------------------------------------------------
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index ad21c1f..0cd1ef4 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -26,11 +26,6 @@ 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'
@@ -38,7 +33,6 @@ 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/79e2a431/geode-rebalancer/build.gradle
----------------------------------------------------------------------
diff --git a/geode-rebalancer/build.gradle b/geode-rebalancer/build.gradle
index f426749..9efdff2 100644
--- a/geode-rebalancer/build.gradle
+++ b/geode-rebalancer/build.gradle
@@ -25,5 +25,4 @@ 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/79e2a431/gradle/java.gradle
----------------------------------------------------------------------
diff --git a/gradle/java.gradle b/gradle/java.gradle
index ba1122b..06fb766 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -121,8 +121,17 @@ 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'
   }
 }
 


Mime
View raw message