Skip to content

MINOR: Java 10 fixes so that the build passes #4839

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
ijuma merged 2 commits into from
Apr 9, 2018
Merged

MINOR: Java 10 fixes so that the build passes #4839

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
aa23aad
MINOR: Upgrade EasyMock to 3.6 for Java 10 support
ijuma Apr 9, 2018
6c78f3d
Don't enable jacoco for core project (since it's Scala)
ijuma Apr 9, 2018
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
5 changes: 2 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ allprojects {
}

apply plugin: 'idea'
apply plugin: "jacoco"
apply plugin: 'org.owasp.dependencycheck'
apply plugin: 'com.github.ben-manes.versions'

Expand Down Expand Up @@ -384,6 +383,7 @@ subprojects {

// Ignore core since its a scala project
if (it.path != ':core') {
apply plugin: "jacoco"

jacoco {
toolVersion = "0.8.1"
Expand Down Expand Up @@ -591,8 +591,7 @@ project(':core') {
scoverage libs.scoveragePlugin
scoverage libs.scoverageRuntime
}

jacocoTestReport.enabled = false

scoverage {
reportDir = file("${rootProject.buildDir}/scoverage")
highlighting = false
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ versions += [
apacheds: "2.0.0-M24",
argparse4j: "0.7.0",
bcpkix: "1.59",
easymock: "3.5.1",
easymock: "3.6",
jackson: "2.9.5",
jetty: "9.2.24.v20180105",
jersey: "2.25.1",
Expand Down