geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kdul...@apache.org
Subject geode git commit: GEODE-2539: Upgrading Jetty causes RestSecurityIntegrationTest to fail (#2)
Date Mon, 13 Mar 2017 17:57:28 GMT
Repository: geode
Updated Branches:
  refs/heads/develop f111cfef8 -> 02ffd528f


GEODE-2539: Upgrading Jetty causes RestSecurityIntegrationTest to fail (#2)


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

Branch: refs/heads/develop
Commit: 02ffd528f5136cb8fe3acfd29f91369901bf15de
Parents: f111cfe
Author: Kevin J. Duling <kduling@pivotal.io>
Authored: Thu Mar 9 16:23:51 2017 -0800
Committer: Kevin J. Duling <kduling@pivotal.io>
Committed: Mon Mar 13 10:56:57 2017 -0700

----------------------------------------------------------------------
 .../SessionReplicationIntegrationJUnitTest.java | 31 ++++++++++++--------
 gradle/dependency-versions.properties           |  2 +-
 2 files changed, 20 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/02ffd528/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
index 3bd517c..cc52bde 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
@@ -14,6 +14,16 @@
  */
 package org.apache.geode.modules.session.internal.filter;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
 import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.modules.session.filter.SessionCachingFilter;
@@ -32,6 +42,15 @@ import org.junit.experimental.categories.Category;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.concurrent.TimeUnit;
 import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -39,18 +58,6 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.*;
-
-import com.meterware.httpunit.GetMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
 
 /**
  * In-container testing using Jetty. This allows us to test context listener events as well
as

http://git-wip-us.apache.org/repos/asf/geode/blob/02ffd528/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index 34e5d67..7613dba 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -52,7 +52,7 @@ javax.resource-api.version = 1.7
 javax.servlet-api.version = 3.1.0
 javax.transaction-api.version = 1.2
 jedis.version = 2.9.0
-jetty.version = 9.3.6.v20151106
+jetty.version = 9.3.11.v20160721
 jgroups.version = 3.6.10.Final
 jmock.version = 2.8.2
 jna.version = 4.0.0


Mime
View raw message