From 6046ae0399734f988e8f3c029f7e5e192197f82c Mon Sep 17 00:00:00 2001 From: David Pilato Date: Mon, 3 Apr 2017 16:47:48 +0200 Subject: [PATCH 1/2] =?UTF-8?q?[WIP]=C2=A0Upgrade=20to=20JUnit=204.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By curiosity, I was just trying today to upgrade JUnit to 4.12 but this is not straight forward as now the SM is complaining. ```sh gradle :test:framework:test -Dtests.jvm.argline="-Djava.security.debug=access,failure" ``` ``` java.lang.Exception: Stack trace 2> at java.lang.Thread.dumpStack(Thread.java:1333) 2> at java.security.AccessControlContext.checkPermission(AccessControlContext.java:462) 2> at java.security.AccessController.checkPermission(AccessController.java:884) 2> at java.lang.SecurityManager.checkPermission(SecurityManager.java:549) 2> at java.lang.Class.checkMemberAccess(Class.java:2348) 2> at java.lang.Class.getDeclaredMethods(Class.java:1974) 2> at org.junit.internal.MethodSorter.getDeclaredMethods(MethodSorter.java:54) 2> at org.junit.runners.model.TestClass.scanAnnotatedMembers(TestClass.java:65) 2> at org.junit.runners.model.TestClass.(TestClass.java:57) 2> at com.carrotsearch.randomizedtesting.RandomizedRunner$12.run(RandomizedRunner.java:1053) 2> at com.carrotsearch.randomizedtesting.RandomizedRunner$12.run(RandomizedRunner.java:1050) 2> at java.security.AccessController.doPrivileged(Native Method) 2> at com.carrotsearch.randomizedtesting.RandomizedRunner.getAnnotatedFieldValues(RandomizedRunner.java:1050) 2> at com.carrotsearch.randomizedtesting.RandomizedRunner.withClassRules(RandomizedRunner.java:885) 2> at com.carrotsearch.randomizedtesting.RandomizedRunner.runSuite(RandomizedRunner.java:674) 2> at com.carrotsearch.randomizedtesting.RandomizedRunner.access$200(RandomizedRunner.java:140) 2> at com.carrotsearch.randomizedtesting.RandomizedRunner$2.run(RandomizedRunner.java:598) ``` Just opening this PR for now as a WIP. May be something super easy to fix... --- buildSrc/version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index cea96db283d15..53386e55ca86c 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 From f7457710beb6b3f1fc0c631ad7334da43c4c9e14 Mon Sep 17 00:00:00 2001 From: David Pilato Date: Mon, 3 Apr 2017 17:06:05 +0200 Subject: [PATCH 2/2] Add permission to junit 4.12 and remove junit4-ant specific permission --- .../org/elasticsearch/bootstrap/test-framework.policy | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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 2c39ccb350ea3..e78dc85bdc15e 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"; };