Fix dependency versions
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2e309351
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2e309351
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2e309351
Branch: refs/heads/feature/GEODE-1255
Commit: 2e3093512dfbcf507ce971a2ce8dc44e17e75d03
Parents: f6334f2
Author: Kirk Lund <kl...@apache.org>
Authored: Tue May 3 14:51:23 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue May 3 14:51:23 2016 -0700
----------------------------------------------------------------------
.../CustomConfigWithCacheIntegrationTest.java | 6 ------
.../security/GfshShellConnectionRule.java | 8 ++++----
.../pulse/internal/data/JMXDataUpdater.java | 3 ---
gradle/dependency-versions.properties | 20 ++++++++++----------
4 files changed, 14 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2e309351/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
index 18faed1..632b69c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
@@ -20,13 +20,9 @@ import static com.gemstone.gemfire.internal.logging.log4j.custom.CustomConfigura
import static org.assertj.core.api.Assertions.*;
import java.io.File;
-import java.io.FileOutputStream;
-import java.net.URL;
import java.util.Properties;
-import org.apache.commons.io.IOUtils;
import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.status.StatusLogger;
@@ -34,11 +30,9 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.contrib.java.lang.system.SystemErrRule;
import org.junit.contrib.java.lang.system.SystemOutRule;
import org.junit.experimental.categories.Category;
-import org.junit.rules.ExternalResource;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2e309351/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshShellConnectionRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshShellConnectionRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshShellConnectionRule.java
index 17549d5..d0f33d9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshShellConnectionRule.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GfshShellConnectionRule.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.management.internal.security;
+import org.junit.runner.Description;
+
import com.gemstone.gemfire.management.internal.cli.CliUtil;
import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
@@ -24,12 +26,10 @@ import com.gemstone.gemfire.management.internal.cli.result.ErrorResultData;
import com.gemstone.gemfire.management.internal.cli.result.ResultBuilder;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.test.junit.rules.DescribedExternalResource;
-import org.junit.runner.Description;
/**
* Class which eases the creation of MBeans for security testing. When combined with {@link JMXConnectionConfiguration}
* it allows for the creation of per-test connections with different user/password combinations.
- *
*/
public class GfshShellConnectionRule extends DescribedExternalResource {
@@ -38,9 +38,9 @@ public class GfshShellConnectionRule extends DescribedExternalResource {
private boolean useHttp = false;
private HeadlessGfsh gfsh;
private boolean authenticated;
+
/**
* Rule constructor
- *
*/
public GfshShellConnectionRule(int jmxPort, int httpPort, boolean useHttp) {
this.jmxPort = jmxPort;
@@ -55,7 +55,7 @@ public class GfshShellConnectionRule extends DescribedExternalResource {
CliUtil.isGfshVM = true;
String shellId = getClass().getSimpleName() + "_" + description.getMethodName();
- gfsh = new HeadlessGfsh(shellId, 30);
+ gfsh = new HeadlessGfsh(shellId, 30, "gfsh_files"); // TODO: move to TemporaryFolder
final CommandStringBuilder connectCommand = new CommandStringBuilder(CliStrings.CONNECT);
connectCommand.addOption(CliStrings.CONNECT__USERNAME, config.user());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2e309351/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java
index 47ff69e..4a95c91 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java
@@ -200,7 +200,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
/**
* Default connection is Pulse which uses configured userName and password
- * @return
*/
public JMXConnector getJMXConnection() {
return getJMXConnection(true);
@@ -209,8 +208,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
/**
* Get connection for given userName and password. This is used for DataBrowser
* queries which has to be fired using credentials provided at pulse login page
- *
- * @return
*/
public JMXConnector getJMXConnection(final boolean registerURL) {
JMXConnector connection = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2e309351/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index b3e004e..f4e7aad 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -17,14 +17,14 @@
activation.version = 1.1.1
annotations.version = 3.0.0
antlr.version = 2.7.7
-asm.version = 5.0.3
-assertj-core.version = 3.2.0
+asm.version = 5.1
+assertj-core.version = 3.4.1
awaitility.version = 1.7.0
bcel.version = 5.2
catch-exception.version = 1.4.4
catch-throwable.version = 1.4.4
cdi-api.version = 1.2
-cglib.version = 3.1
+cglib.version = 3.2.2
classmate.version = 0.9.0
commons-collections.version = 3.2.2
commons-configuration.version = 1.6
@@ -39,6 +39,7 @@ commons-exec.version=1.3
derby.version = 10.2.2.0
dom4j.version = 1.6.1
fastutil.version = 7.0.2
+google-gson.version=2.3.1
guava.version = 15.0
hadoop.version = 2.4.1
hamcrest-all.version = 1.3
@@ -63,17 +64,18 @@ javax.transaction-api.version = 1.2
jedis.version = 2.7.2
jetty.version = 9.3.6.v20151106
jline.version = 2.12
-jmock.version = 2.8.1
+jmock.version = 2.8.2
jna.version = 4.0.0
json-path.version = 1.2.0
json4s.version = 3.2.4
jsr305.version = 3.0.1
junit.version = 4.12
-JUnitParams.version = 1.0.4
+JUnitParams.version = 1.0.5
log4j.version = 2.5
lucene.version = 6.0.0
mockito-core.version = 1.10.19
mockrunner.version = 1.0.8
+mortbay-jetty-servlet-api.version=2.5-20081211
multithreadedtc.version = 1.01
mx4j.version = 3.0.1
mx4j-remote.version = 3.0.1
@@ -83,6 +85,8 @@ paranamer.version = 2.3
powermock.version = 1.6.4
quartz.version = 2.2.1
scala.version = 2.10.0
+selenium.version=2.52.0
+shiro.version=1.2.4
slf4j-api.version = 1.7.7
snappy-java.version = 1.1.1.6
spring-hateos.version = 0.16.0.RELEASE
@@ -95,11 +99,7 @@ stephenc-findbugs.version = 1.3.9-1
spymemcached.version = 2.9.0
swagger.version = 1.3.2
swagger-springmvc.version = 0.8.2
-system-rules.version = 1.15.0
+system-rules.version = 1.16.0
tempus-fugit.version = 1.1
tomcat6.version = 6.0.37
tomcat7.version = 7.0.30
-mortbay-jetty-servlet-api.version=2.5-20081211
-selenium.version=2.52.0
-google-gson.version=2.3.1
-shiro.version=1.2.4