Skip to content

Upgrade to JUnit 4.12 #23877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 2, 2017
Merged

Upgrade to JUnit 4.12 #23877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6046ae0
[WIP] Upgrade to JUnit 4.12
dadoonet Apr 3, 2017
f745771
Add permission to junit 4.12 and remove junit4-ant specific permission
dadoonet Apr 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
Expand Down