geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject incubator-geode git commit: Remove geode-joptsimple
Date Wed, 11 May 2016 22:51:43 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-835 f93c87f13 -> 29861e4fd


Remove geode-joptsimple


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

Branch: refs/heads/feature/GEODE-835
Commit: 29861e4fddf7d6f9123656d43a8e753243b85e12
Parents: f93c87f
Author: Kirk Lund <klund@apache.org>
Authored: Wed May 11 15:51:30 2016 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Wed May 11 15:51:30 2016 -0700

----------------------------------------------------------------------
 geode-assembly/build.gradle           | 6 +-----
 geode-core/build.gradle               | 3 ++-
 gradle/dependency-versions.properties | 1 +
 settings.gradle                       | 1 -
 4 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29861e4f/geode-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index ed5154e..de52e77 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -52,8 +52,7 @@ dependencies {
 
   archives project(':geode-common')  
   archives project(':geode-json')  
-  archives project(':geode-joptsimple')  
-  archives project(':geode-core')  
+  archives project(':geode-core')
   archives project(':geode-lucene')
   archives project(':geode-web')
   archives project(':geode-web-api')
@@ -309,9 +308,6 @@ distributions {
         from project(":geode-json").configurations.runtime
         from project(":geode-json").configurations.archives.allArtifacts.files
 
-        from project(":geode-joptsimple").configurations.runtime
-        from project(":geode-joptsimple").configurations.archives.allArtifacts.files
-
         from project(":geode-wan").configurations.runtime
         from project(":geode-wan").configurations.archives.allArtifacts.files
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29861e4f/geode-core/build.gradle
----------------------------------------------------------------------
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 8cd5bf3..2cca564 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -63,6 +63,8 @@ dependencies {
   }
   compile ('net.java.dev.jna:jna:' + project.'jna.version')
 
+  compile ('net.sf.jopt-simple:jopt-simple:' + project.'jopt-simple.version')
+
   compile 'org.apache.logging.log4j:log4j-api:' + project.'log4j.version'
   compile 'org.apache.logging.log4j:log4j-core:' + project.'log4j.version'
   runtime ('org.fusesource.jansi:jansi:' + project.'jansi.version') {
@@ -101,7 +103,6 @@ dependencies {
   compile 'org.apache.shiro:shiro-core:' + project.'shiro.version'
  
   compile project(':geode-common')
-  compile project(':geode-joptsimple')
   compile project(':geode-json')
   
   jcaCompile sourceSets.main.output

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29861e4f/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index 640b175..8a306e2 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -66,6 +66,7 @@ jetty.version = 9.3.6.v20151106
 jline.version = 2.12
 jmock.version = 2.8.2
 jna.version = 4.0.0
+jopt-simple.version = 5.0.1
 json-path.version = 1.2.0
 json4s.version = 3.2.4
 jsr305.version = 3.0.1

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29861e4f/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
index 188faa4..825637e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,7 +17,6 @@
 rootProject.name = 'geode'
 
 include 'geode-common'
-include 'geode-joptsimple'
 include 'geode-json'
 include 'geode-junit'
 include 'geode-core'


Mime
View raw message