geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [19/44] incubator-geode git commit: GEODE-562: Moved dependencies to sub projects
Date Tue, 15 Mar 2016 00:24:02 GMT
GEODE-562: Moved dependencies to sub projects

Reduced the scope of certain dependencies and moved them
from the common java.gradle to the specific sub projects
This is a retry from an earlier reverted commit


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

Branch: refs/heads/feature/GEODE-949-2
Commit: 8700acca6bf63ed97990ffe6d930700f0258f28a
Parents: aaa586a
Author: Jason Huynh <jhuynh@pivotal.io>
Authored: Thu Mar 10 09:36:08 2016 -0800
Committer: Jason Huynh <jhuynh@pivotal.io>
Committed: Thu Mar 10 09:37:27 2016 -0800

----------------------------------------------------------------------
 extensions/geode-modules/build.gradle |  3 ++-
 geode-core/build.gradle               | 11 +++++++++--
 geode-pulse/build.gradle              | 12 ++++++++++++
 geode-rebalancer/build.gradle         |  1 +
 geode-web-api/build.gradle            |  7 +++++++
 geode-web/build.gradle                |  7 +++++++
 gradle/java.gradle                    |  9 ---------
 7 files changed, 38 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8700acca/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/8700acca/geode-core/build.gradle
----------------------------------------------------------------------
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 1aa07ee..a72d0bf 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'
@@ -73,12 +73,19 @@ dependencies {
   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/8700acca/geode-pulse/build.gradle
----------------------------------------------------------------------
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index 0cd1ef4..6dc7b02 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -26,6 +26,17 @@ sourceSets {
 }
 
 dependencies {
+
+
+
+
+  runtime '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-core:' + project.'springframework.version'
+  compile 'org.springframework:spring-web:' + project.'springframework.version'
+  runtime 'org.springframework:spring-webmvc:' + 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 +44,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/8700acca/geode-rebalancer/build.gradle
----------------------------------------------------------------------
diff --git a/geode-rebalancer/build.gradle b/geode-rebalancer/build.gradle
index 9efdff2..b9992e9 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'
+  runtime 'org.apache.hbase:hbase:' + project.'hbase.version'
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8700acca/geode-web-api/build.gradle
----------------------------------------------------------------------
diff --git a/geode-web-api/build.gradle b/geode-web-api/build.gradle
index 51848c2..dd5f5ca 100755
--- a/geode-web-api/build.gradle
+++ b/geode-web-api/build.gradle
@@ -18,6 +18,7 @@
 apply plugin: 'war'
 
 dependencies {
+
   compile 'commons-lang:commons-lang:' + project.'commons-lang.version'
   compile 'commons-fileupload:commons-fileupload:' + project.'commons-fileupload.version'
   compile 'com.fasterxml:classmate:' + project.'classmate.version'
@@ -38,8 +39,14 @@ dependencies {
   compile 'org.scala-lang:scala-library:' + project.'scala.version'
   compile 'org.scala-lang:scala-reflect:' + project.'scala.version'
   compile 'org.springframework.hateoas:spring-hateoas:' + project.'spring-hateos.version'
+  runtime 'org.springframework:spring-aop:' + project.'springframework.version'
   compile 'org.springframework:spring-aspects:' + project.'springframework.version'
+  runtime 'org.springframework:spring-beans:' + project.'springframework.version'
+  runtime 'org.springframework:spring-context:' + project.'springframework.version'
+  runtime 'org.springframework:spring-expression:' + project.'springframework.version'
   compile 'org.springframework:spring-oxm:' + project.'springframework.version'
+  runtime 'org.springframework:spring-web:' + project.'springframework.version'
+  runtime 'org.springframework:spring-webmvc:' + project.'springframework.version'
 
   provided 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
   provided project(':geode-core')

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8700acca/geode-web/build.gradle
----------------------------------------------------------------------
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index 8ffd9b8..320782d 100755
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -19,7 +19,14 @@ apply plugin: 'war'
 
 dependencies {
   runtime 'org.springframework:spring-aspects:' + project.'springframework.version'
+  runtime 'org.springframework:spring-aop:' + project.'springframework.version'
+  runtime 'org.springframework:spring-beans:' + project.'springframework.version'
+  runtime 'org.springframework:spring-context:' + project.'springframework.version'
+  runtime 'org.springframework:spring-expression:' + project.'springframework.version'
   runtime 'org.springframework:spring-oxm:' + project.'springframework.version'
+  runtime 'org.springframework:spring-web:' + project.'springframework.version'
+  runtime 'org.springframework:spring-webmvc:' + project.'springframework.version'
+
   runtime 'commons-fileupload:commons-fileupload:' + project.'commons-fileupload.version'
 
   testCompile 'org.springframework:spring-test:' + project.'springframework.version'

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8700acca/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'
   }
 }
 


Mime
View raw message