Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D31A5200C28 for ; Mon, 13 Mar 2017 18:57:29 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D19A7160B6C; Mon, 13 Mar 2017 17:57:29 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 25BE7160B5D for ; Mon, 13 Mar 2017 18:57:28 +0100 (CET) Received: (qmail 64746 invoked by uid 500); 13 Mar 2017 17:57:28 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 64737 invoked by uid 99); 13 Mar 2017 17:57:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Mar 2017 17:57:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0D8A7DFE8F; Mon, 13 Mar 2017 17:57:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kduling@apache.org To: commits@geode.apache.org Message-Id: <95aedfaed4e24c2b9d42aa66598ce2cf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: geode git commit: GEODE-2539: Upgrading Jetty causes RestSecurityIntegrationTest to fail (#2) Date: Mon, 13 Mar 2017 17:57:28 +0000 (UTC) archived-at: Mon, 13 Mar 2017 17:57:30 -0000 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 Authored: Thu Mar 9 16:23:51 2017 -0800 Committer: Kevin J. Duling 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