geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From upthewatersp...@apache.org
Subject [1/7] incubator-geode git commit: GEODE-27: Removing some forced dependencies
Date Fri, 18 Mar 2016 20:44:16 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 0d86c3bd7 -> 8310fd9c0


GEODE-27: Removing some forced dependencies

The version we are picking for these dependencies seemed arbitrary, I
think we should just let them be controlled by gradle.


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

Branch: refs/heads/develop
Commit: 8310fd9c08e121c7acce80c5e226e35e23478eb7
Parents: 163046f
Author: Dan Smith <upthewaterspout@apache.org>
Authored: Tue Mar 15 15:05:23 2016 -0700
Committer: Dan Smith <upthewaterspout@apache.org>
Committed: Fri Mar 18 13:43:55 2016 -0700

----------------------------------------------------------------------
 geode-core/build.gradle             | 4 +++-
 gradle/dependency-resolution.gradle | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8310fd9c/geode-core/build.gradle
----------------------------------------------------------------------
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 3f4a671..1d12be3 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -80,7 +80,9 @@ dependencies {
     transitive=false
   }
 
-  compile 'com.google.guava:guava:' + project.'guava.version'
+  compile ('com.google.guava:guava:' + project.'guava.version') {
+    ext.optional = true
+  }
   //jsr305 is included only to prevent javadoc warnings about missing annotations in the
guava jar
   provided 'com.google.code.findbugs:jsr305:' + project.'jsr305.version'
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8310fd9c/gradle/dependency-resolution.gradle
----------------------------------------------------------------------
diff --git a/gradle/dependency-resolution.gradle b/gradle/dependency-resolution.gradle
index e7f1914..dc247d2 100644
--- a/gradle/dependency-resolution.gradle
+++ b/gradle/dependency-resolution.gradle
@@ -23,16 +23,12 @@ subprojects {
       //These are forced to match our old non-transitive configuration
       //These force statements should be removed and tested with the automatically
       //resolved version
-      force 'commons-logging:commons-logging:' + project.'commons-logging.version'
       force 'org.springframework:spring-context-support:' + project.'springframework.version'
       force 'org.springframework:spring-context-support:' + project.'springframework.version'
       force 'org.springframework:spring-context:' + project.'springframework.version'
       force 'org.springframework:spring-web:' + project.'springframework.version'
       force 'org.springframework:spring-tx:' + project.'springframework.version'
       force 'org.springframework:spring-webmvc:' + project.'springframework.version'
-      force 'javax.activation:activation:' + project.'activation.version'
-      force 'commons-beanutils:commons-beanutils:' + project.'commons-beanutils.version'
-      force 'com.thoughtworks.paranamer:paranamer:' + project.'paranamer.version'
       force 'jline:jline:' + project.'jline.version'
     }
   }


Mime
View raw message