Skip to content

MINOR: Java 9/10 fixes, gradle and minor deps update #4725

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 6 commits into from
Mar 23, 2018
Merged

MINOR: Java 9/10 fixes, gradle and minor deps update #4725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa49aa3
Bump dependencies and gradle versions
ijuma Mar 16, 2018
e8d266a
Disable jacoco with Java 10
ijuma Mar 16, 2018
b79dd83
Add dependencies so that trogdor works with Java 9 and 10
ijuma Mar 16, 2018
b40669c
Revert "Disable jacoco with Java 10"
ijuma Mar 22, 2018
f3c467a
Upgrade jacoco
ijuma Mar 22, 2018
2a95817
Also add jaxbApi and activation to connect-runtime
ijuma Mar 22, 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
10 changes: 7 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ buildscript {
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
classpath 'org.scoverage:gradle-scoverage:2.1.0'
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
classpath 'org.owasp:dependency-check-gradle:3.0.2'
classpath 'org.owasp:dependency-check-gradle:3.1.1'
}
}

Expand Down Expand Up @@ -79,7 +79,7 @@ allprojects {
}

ext {
gradleVersion = "4.5.1"
gradleVersion = "4.6"
buildVersionFileName = "kafka-version.properties"

maxPermSizeArgs = []
Expand Down Expand Up @@ -386,7 +386,7 @@ subprojects {
if (it.path != ':core') {

jacoco {
toolVersion = "0.8.0"
toolVersion = "0.8.1"
}

// NOTE: Jacoco Gradle plugin does not support "offline instrumentation" this means that classes mocked by PowerMock
Expand Down Expand Up @@ -874,6 +874,8 @@ project(':tools') {

compile libs.jacksonJaxrsJsonProvider
compile libs.jerseyContainerServlet
compile libs.jaxbApi // Jersey dependency that was available in the JDK before Java 9
compile libs.activation // Jersey dependency that was available in the JDK before Java 9
compile libs.jettyServer
compile libs.jettyServlet
compile libs.jettyServlets
Expand Down Expand Up @@ -1203,6 +1205,8 @@ project(':connect:runtime') {

compile libs.jacksonJaxrsJsonProvider
compile libs.jerseyContainerServlet
compile libs.jaxbApi // Jersey dependency that was available in the JDK before Java 9
compile libs.activation // Jersey dependency that was available in the JDK before Java 9
compile libs.jettyServer
compile libs.jettyServlet
compile libs.jettyServlets
Expand Down
16 changes: 10 additions & 6 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,36 +47,39 @@ if (hasProperty('scalaVersion')) {
versions["baseScala"] = versions.scala.substring(0, versions.scala.lastIndexOf("."))

versions += [
activation: "1.1.1",
apacheda: "1.0.0",
apacheds: "2.0.0-M24",
argparse4j: "0.7.0",
bcpkix: "1.58",
bcpkix: "1.59",
easymock: "3.5.1",
jackson: "2.9.4",
jetty: "9.2.24.v20180105",
jersey: "2.25.1",
jmh: "1.19",
jmh: "1.20",
log4j: "1.2.17",
scalaLogging: "3.7.2",
scalaLogging: "3.8.0",
jaxb: "2.3.0",
jopt: "5.0.4",
junit: "4.12",
lz4: "1.4",
lz4: "1.4.1",
metrics: "2.2.0",
// PowerMock 1.x doesn't support Java 9, so use PowerMock 2.0.0 beta
powermock: "2.0.0-beta.5",
reflections: "0.9.11",
rocksDB: "5.7.3",
scalatest: "3.0.4",
scalatest: "3.0.5",
scoverage: "1.3.1",
slf4j: "1.7.25",
snappy: "1.1.7.1",
zkclient: "0.10",
zookeeper: "3.4.10",
jfreechart: "1.0.0",
mavenArtifact: "3.5.2"
mavenArtifact: "3.5.3"
]

libs += [
activation: "javax.activation:activation:$versions.activation",
argparse4j: "net.sourceforge.argparse4j:argparse4j:$versions.argparse4j",
apacheda: "org.apache.directory.api:api-all:$versions.apacheda",
apachedsCoreApi: "org.apache.directory.server:apacheds-core-api:$versions.apacheds",
Expand All @@ -91,6 +94,7 @@ libs += [
easymock: "org.easymock:easymock:$versions.easymock",
jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jackson",
jacksonJaxrsJsonProvider: "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$versions.jackson",
jaxbApi: "javax.xml.bind:jaxb-api:$versions.jaxb",
jettyServer: "org.eclipse.jetty:jetty-server:$versions.jetty",
jettyClient: "org.eclipse.jetty:jetty-client:$versions.jetty",
jettyServlet: "org.eclipse.jetty:jetty-servlet:$versions.jetty",
Expand Down