From 186b401fd873b472303dcd6a9a83d22bad99b3c1 Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Tue, 2 May 2017 09:58:21 +0200
Subject: [PATCH] Upgrade to JUnit 4.12 (#23877)

* Upgrade to JUnit 4.12
* Add permission to junit 4.12 and remove junit4-ant specific permission
---
 buildSrc/version.properties                                | 2 +-
 .../org/elasticsearch/bootstrap/test-framework.policy      | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index ca263b0efa9..680c2fc89f5 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -14,7 +14,7 @@ jna               = 4.4.0
 
 # test dependencies
 randomizedrunner  = 2.5.0
-junit             = 4.11
+junit             = 4.12
 httpclient        = 4.5.2
 # When updating httpcore, please also update core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
 httpcore          = 4.4.5
diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy b/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
index 9a089ef2810..1e26c42a4cc 100644
--- a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
+++ b/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
@@ -53,12 +53,7 @@ grant codeBase "${codebase.randomizedtesting-runner-2.5.0.jar}" {
   permission java.lang.RuntimePermission "accessDeclaredMembers";
 };
 
-grant codeBase "${codebase.junit4-ant-2.3.2.jar}" {
-  // needed for stream redirection
-  permission java.lang.RuntimePermission "setIO";
-};
-
-grant codeBase "${codebase.junit-4.11.jar}" {
+grant codeBase "${codebase.junit-4.12.jar}" {
   // needed for TestClass creation
   permission java.lang.RuntimePermission "accessDeclaredMembers";
 };