Skip to content

MINOR: Update to Gradle 6.5 and tweak build jvm config #8751

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 4 commits into from
Jun 3, 2020
Merged

MINOR: Update to Gradle 6.5 and tweak build jvm config #8751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cff44ef
MINOR: Update to Gradle 6.5
ijuma May 29, 2020
72741a4
Update to Gradle 6.5 final
ijuma Jun 3, 2020
6dd007f
Configure scalac heap to be consistent with everything else
ijuma Jun 3, 2020
416ef59
Consolidate jvm config
ijuma Jun 3, 2020
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
23 changes: 14 additions & 9 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ ext {
minJavaVersion = "8"
buildVersionFileName = "kafka-version.properties"

defaultMaxHeapSize = "2g"
defaultJvmArgs = ["-Xss4m", "-XX:+UseParallelGC"]

userMaxForks = project.hasProperty('maxParallelForks') ? maxParallelForks.toInteger() : null

userMaxTestRetries = project.hasProperty('maxTestRetries') ? maxTestRetries.toInteger() : 0
Expand Down Expand Up @@ -293,8 +296,8 @@ subprojects {
test {
maxParallelForks = userMaxForks ?: Runtime.runtime.availableProcessors()

minHeapSize = "256m"
maxHeapSize = "2048m"
maxHeapSize = defaultMaxHeapSize
jvmArgs = defaultJvmArgs

testLogging {
events = userTestLoggingEvents ?: testLoggingEvents
Expand All @@ -316,8 +319,9 @@ subprojects {
task integrationTest(type: Test, dependsOn: compileJava) {
maxParallelForks = userMaxForks ?: Runtime.runtime.availableProcessors()

minHeapSize = "256m"
maxHeapSize = "2048m"
maxHeapSize = defaultMaxHeapSize
jvmArgs = defaultJvmArgs


testLogging {
events = userTestLoggingEvents ?: testLoggingEvents
Expand All @@ -343,8 +347,8 @@ subprojects {
task unitTest(type: Test, dependsOn: compileJava) {
maxParallelForks = userMaxForks ?: Runtime.runtime.availableProcessors()

minHeapSize = "256m"
maxHeapSize = "2048m"
maxHeapSize = defaultMaxHeapSize
jvmArgs = defaultJvmArgs

testLogging {
events = userTestLoggingEvents ?: testLoggingEvents
Expand Down Expand Up @@ -506,8 +510,8 @@ subprojects {
scalaCompileOptions.additionalParameters += ["-release", minJavaVersion]

configure(scalaCompileOptions.forkOptions) {
memoryMaximumSize = '1g'
jvmArgs = ['-Xss4m']
memoryMaximumSize = defaultMaxHeapSize
jvmArgs = defaultJvmArgs
}
}

Expand Down Expand Up @@ -542,7 +546,8 @@ subprojects {
xml.enabled(project.hasProperty('xmlSpotBugsReport') || project.hasProperty('xmlFindBugsReport'))
html.enabled(!project.hasProperty('xmlSpotBugsReport') && !project.hasProperty('xmlFindBugsReport'))
}
maxHeapSize = "2g"
maxHeapSize = defaultMaxHeapSize
jvmArgs = defaultJvmArgs
}

// Ignore core since its a scala project
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ group=org.apache.kafka
version=2.6.0-SNAPSHOT
scalaVersion=2.13.2
task=build
org.gradle.jvmargs=-Xmx2g -Xss2m
org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC
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 @@ -61,7 +61,7 @@ versions += [
bcpkix: "1.64",
checkstyle: "8.20",
commonsCli: "1.4",
gradle: "6.4.1",
gradle: "6.5",
gradleVersionsPlugin: "0.28.0",
grgit: "4.0.1",
httpclient: "4.5.11",
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ esac
# Loop in case we encounter an error.
for attempt in 1 2 3; do
if [ ! -e $APP_HOME/gradle/wrapper/gradle-wrapper.jar ]; then
if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v6.4.1/gradle/wrapper/gradle-wrapper.jar"; then
if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v6.5.0/gradle/wrapper/gradle-wrapper.jar"; then
rm -f "$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
# Pause for a bit before looping in case the server throttled us.
sleep 5
Expand Down