Merge branch 'develop' into feature/GEODE-2449
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c2c5e07e Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c2c5e07e Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c2c5e07e Branch: refs/heads/feature/GEODE-2449 Commit: c2c5e07eb8ad7ae55a24f5d972678b78852e0a15 Parents: f79beb1 fb14e9a Author: Galen O'Sullivan <gosulli...@pivotal.io> Authored: Mon Feb 13 15:53:16 2017 -0800 Committer: Galen O'Sullivan <gosulli...@pivotal.io> Committed: Mon Feb 13 15:53:16 2017 -0800 ---------------------------------------------------------------------- geode-assembly/src/main/dist/LICENSE | 2 +- .../org/apache/geode/internal/cache/Oplog.java | 39 +- .../geode/internal/cache/OplogFlushTest.java | 169 +++++++++ .../geode/management/JMXMBeanDUnitTest.java | 380 +++++++------------ .../dunit/rules/LocatorServerStartupRule.java | 14 +- .../dunit/rules/MBeanServerConnectionRule.java | 101 +++-- .../logging/configuring_log4j2.html.md.erb | 6 +- .../internal/directory/RegionDirectory.java | 8 +- .../cache/lucene/internal/filesystem/File.java | 3 + .../lucene/internal/filesystem/FileSystem.java | 23 +- .../filesystem/FileSystemJUnitTest.java | 35 +- .../10/managing/logging/configuring_log4j2.html | 10 +- gradle/dependency-versions.properties | 72 ++-- 13 files changed, 522 insertions(+), 340 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/c2c5e07e/gradle/dependency-versions.properties ---------------------------------------------------------------------- diff --cc gradle/dependency-versions.properties index e019673,12a76b4..b4a663a --- a/gradle/dependency-versions.properties +++ b/gradle/dependency-versions.properties @@@ -84,16 -84,16 +84,16 @@@ multithreadedtc.version = 1.0 mx4j.version = 3.0.1 mx4j-remote.version = 3.0.1 mx4j-tools.version = 3.0.1 -netty-all.version = 4.1.7.Final +netty-all.version = 4.1.8.Final open-json.version = 1.7 paranamer.version = 2.3 - phantomjsdriver.version=1.2.1 - powermock.version = 1.6.4 + phantomjsdriver.version=1.3.0 + powermock.version = 1.6.6 quartz.version = 2.2.1 scala.version = 2.10.0 - selenium.version=2.53.1 - shiro.version=1.3.1 - slf4j-api.version = 1.7.21 + selenium.version=3.0.1 + shiro.version=1.3.2 + slf4j-api.version = 1.7.22 snappy-java.version=0.4 spring-hateoas.version = 0.21.0.RELEASE spring-shell.version = 1.2.0.RELEASE
