You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/03/07 22:08:07 UTC
[1/3] incubator-geode git commit: GEODE-36 Interim fix to display
correct product name on gfsh cli
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-1050 7baa2a7cb -> a61753b1d
GEODE-36 Interim fix to display correct product name on gfsh cli
Closes #109
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/657b0771
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/657b0771
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/657b0771
Branch: refs/heads/feature/GEODE-1050
Commit: 657b077198e8fdf957b54c86adcb07ef34373e17
Parents: 23950e8
Author: Nitin Lamba <ni...@ampool.io>
Authored: Sun Mar 6 10:56:57 2016 -0800
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Mon Mar 7 07:43:40 2016 -0800
----------------------------------------------------------------------
.../com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/657b0771/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java
index 67a8ccb..f6b6fbc 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java
@@ -506,7 +506,7 @@ public class Gfsh extends JLineShell {
}
public String getWelcomeMessage() {
- return ansiHandler.decorateString("Monitor and Manage GemFire", ANSIStyle.CYAN);
+ return ansiHandler.decorateString("Monitor and Manage " + GemFireVersion.getProductName(), ANSIStyle.CYAN);
}
//Over-ridden to avoid default behavior which is:
[3/3] incubator-geode git commit: Merge remote-tracking branch
'origin/develop' into feature/GEODE-1050
Posted by kl...@apache.org.
Merge remote-tracking branch 'origin/develop' into feature/GEODE-1050
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a61753b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a61753b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a61753b1
Branch: refs/heads/feature/GEODE-1050
Commit: a61753b1d4d9893562a55557cda2dc35a1d1dfa0
Parents: 7baa2a7 4c7fd99
Author: Kirk Lund <kl...@pivotal.io>
Authored: Mon Mar 7 13:01:02 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Mon Mar 7 13:01:02 2016 -0800
----------------------------------------------------------------------
extensions/geode-modules/build.gradle | 3 ++-
geode-core/build.gradle | 12 +++++++++---
.../gemfire/management/internal/cli/shell/Gfsh.java | 2 +-
geode-pulse/build.gradle | 6 ++++++
geode-rebalancer/build.gradle | 1 +
gradle/java.gradle | 9 ---------
6 files changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-geode git commit: GEODE-562: Upgrade commons
collections to v3.2.2
Posted by kl...@apache.org.
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/feature/GEODE-1050
Commit: 4c7fd9958c1bd7a3cee5b104aa48ab7a5a406f2d
Parents: 657b077
Author: Jason Huynh <jh...@pivotal.io>
Authored: Wed Mar 2 09:43:50 2016 -0800
Committer: Jason Huynh <jh...@pivotal.io>
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'
}
}