From f355f650e779643cf1dbf39138f313cb7a7d1023 Mon Sep 17 00:00:00 2001
From: Owen Nichols <onichols@apache.org>
Date: Tue, 22 Sep 2020 17:20:15 -0700
Subject: [PATCH 1/2] fix commit message in bump script

---
 dev-tools/dependencies/bump.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-tools/dependencies/bump.sh b/dev-tools/dependencies/bump.sh
index 3361c74518ce..c209c58ed433 100755
--- a/dev-tools/dependencies/bump.sh
+++ b/dev-tools/dependencies/bump.sh
@@ -43,6 +43,7 @@ fi
 NAME="$1"
 SRCH="$2"
 REPL="$3"
+OLDV="$SRCH"
 SRCH=${SRCH//./\\.}
 git grep -n --color "$SRCH" | cat
 git grep -l "$SRCH" | while read f; do
@@ -50,7 +51,7 @@ git grep -l "$SRCH" | while read f; do
   rm -f $f.bak
 done
 git add -p
-git commit -m "Bump $NAME from $OLDV to $NEWV"
+git commit -m "Bump $NAME from $OLDV to $REPL"
 if [ $(git diff | wc -l) -gt 0 ] ; then
   git stash
   git stash drop

From 0003f1cd4af0db739d86b040836567866bda66fb Mon Sep 17 00:00:00 2001
From: Owen Nichols <onichols@apache.org>
Date: Tue, 22 Sep 2020 17:32:19 -0700
Subject: [PATCH 2/2] fix for windows

---
 .../geode/test/junit/rules/ExpectedTimeoutRuleTest.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
index c235242be283..625f3f96c562 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
@@ -82,9 +82,9 @@ public void failsWithExpectedTimeoutButWrongError() {
     assertThat(failures.size()).as("Failures: " + failures).isEqualTo(1);
 
     Failure failure = failures.get(0);
-    String expectedMessage = "\n"
+    String expectedMessage = System.lineSeparator()
         + "Expected: (an instance of java.util.concurrent.TimeoutException and exception with message a string containing \"this is a message for FailsWithExpectedTimeoutButWrongError\")"
-        + "\n" + "     "
+        + System.lineSeparator() + "     "
         + "but: an instance of java.util.concurrent.TimeoutException <java.lang.NullPointerException> is a java.lang.NullPointerException";
     assertThat(failure.getException()).isExactlyInstanceOf(AssertionError.class)
         .hasMessageContaining(expectedMessage);