Skip to content
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

[pull] master from aeron-io:master #2357

Merged
merged 1 commit into from
Jan 31, 2025
Merged

[pull] master from aeron-io:master #2357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
[Java] Upgrade to Gradle 8.12.1.
  • Loading branch information
@vyazelenko
vyazelenko committed Jan 31, 2025
commit 467942d70f1c40f67a4095ef20c1a78202f27d78
47 changes: 31 additions & 16 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,12 @@ subprojects {
}
testClassesDirs = testing.suites.test.sources.output.classesDirs
classpath = testing.suites.test.sources.runtimeClasspath
maxHeapSize("1g")
maxHeapSize = '1g'
jvmArgs("-XX:MaxDirectMemorySize=1g",
"-XX:+CreateCoredumpOnCrash",
"-XX:+HeapDumpOnOutOfMemoryError",
"-XX:+CrashOnOutOfMemoryError",
"-XX:HeapDumpPath=" + project.rootDir + "/heap.hprof")
"-XX:HeapDumpPath=${project.rootDir}/heap.hprof")

useJUnitPlatform {
if (test.name != 'slowTest' && test.name != 'bindingsTest' && test.name != 'topologyTest')
Expand Down Expand Up @@ -316,7 +316,7 @@ subprojects {
}

javadoc {
failOnError false
failOnError = false
title = '<h1>Aeron Message Transport</h1>'
options.bottom = '<i>Copyright &#169; 2014-2025 Real Logic Limited. All Rights Reserved.</i>'
options.encoding = 'UTF-8'
Expand Down Expand Up @@ -363,6 +363,9 @@ project(':aeron-annotations') {

jar {
bundle {
// workaround for https://github.com/bndtools/bnd/issues/6346
properties.put("project.group", provider({project.group}))
// workaround
bnd """
Automatic-Module-Name: io.aeron.annotations
Bundle-Name: io.aeron.annotations
Expand Down Expand Up @@ -395,7 +398,7 @@ project(':aeron-annotations') {

repositories {
maven {
url(!isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl)
url = !isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl
credentials {
username = ossrhUsername
password = ossrhPassword
Expand Down Expand Up @@ -426,6 +429,9 @@ project(':aeron-client') {

jar {
bundle {
// workaround for https://github.com/bndtools/bnd/issues/6346
properties.put("project.group", provider({project.group}))
// workaround
bnd """
Automatic-Module-Name: io.aeron.client
Bundle-Name: io.aeron.client
Expand Down Expand Up @@ -462,7 +468,7 @@ project(':aeron-client') {

repositories {
maven {
url(!isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl)
url = !isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl
credentials {
username = ossrhUsername
password = ossrhPassword
Expand Down Expand Up @@ -532,6 +538,9 @@ project(':aeron-driver') {

jar {
bundle {
// workaround for https://github.com/bndtools/bnd/issues/6346
properties.put("project.group", provider({project.group}))
// workaround
bnd """
Automatic-Module-Name: io.aeron.driver
Bundle-Name: io.aeron.driver
Expand Down Expand Up @@ -573,7 +582,7 @@ project(':aeron-driver') {

repositories {
maven {
url(!isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl)
url = !isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl
credentials {
username = ossrhUsername
password = ossrhPassword
Expand Down Expand Up @@ -759,6 +768,9 @@ project(':aeron-archive') {
from sourceSets.generated.output

bundle {
// workaround for https://github.com/bndtools/bnd/issues/6346
properties.put("project.group", provider({project.group}))
// workaround
bnd """
Automatic-Module-Name: io.aeron.archive
Bundle-Name: io.aeron.archive
Expand Down Expand Up @@ -807,7 +819,7 @@ project(':aeron-archive') {

repositories {
maven {
url(!isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl)
url = !isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl
credentials {
username = ossrhUsername
password = ossrhPassword
Expand Down Expand Up @@ -915,6 +927,9 @@ project(':aeron-cluster') {
from sourceSets.generated.output

bundle {
// workaround for https://github.com/bndtools/bnd/issues/6346
properties.put("project.group", provider({project.group}))
// workaround
bnd """
Automatic-Module-Name: io.aeron.cluster
Bundle-Name: io.aeron.cluster
Expand Down Expand Up @@ -965,7 +980,7 @@ project(':aeron-cluster') {

repositories {
maven {
url(!isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl)
url = !isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl
credentials {
username = ossrhUsername
password = ossrhPassword
Expand Down Expand Up @@ -1033,10 +1048,10 @@ project(':aeron-agent') {
jar.finalizedBy shadowJar

tasks.register('dedupJar', io.aeron.build.DeduplicateTask) {
source shadowJar.outputs.files.singleFile
source = shadowJar.outputs.files.singleFile
}

shadowJar.finalizedBy dedupJar
shadowJar.finalizedBy('dedupJar')

tasks.register('sourcesJar', Jar) {
dependsOn ':aeron-archive:generateCodecs', ':aeron-cluster:generateCodecs'
Expand Down Expand Up @@ -1079,7 +1094,7 @@ project(':aeron-agent') {
}
repositories {
maven {
url(!isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl)
url = !isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl
credentials {
username = ossrhUsername
password = ossrhPassword
Expand Down Expand Up @@ -1121,7 +1136,7 @@ project(':aeron-samples') {

repositories {
maven {
url(!isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl)
url = !isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl
credentials {
username = ossrhUsername
password = ossrhPassword
Expand Down Expand Up @@ -1248,7 +1263,7 @@ project(':aeron-test-support') {

repositories {
maven {
url(!isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl)
url = !isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl
credentials {
username = ossrhUsername
password = ossrhPassword
Expand Down Expand Up @@ -1296,10 +1311,10 @@ project(':aeron-all') {
jar.finalizedBy shadowJar

tasks.register('dedupJar', io.aeron.build.DeduplicateTask) {
source shadowJar.outputs.files.singleFile
source = shadowJar.outputs.files.singleFile
}

shadowJar.finalizedBy dedupJar
shadowJar.finalizedBy('dedupJar')

tasks.register('sourcesJar', Jar) {
dependsOn ':aeron-archive:generateCodecs', ':aeron-cluster:generateCodecs'
Expand Down Expand Up @@ -1344,7 +1359,7 @@ project(':aeron-all') {
}
repositories {
maven {
url(!isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl)
url = !isReleaseVersion ? snapshotsRepoUrl : releasesRepoUrl
credentials {
username = ossrhUsername
password = ossrhPassword
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ checkstyle = "10.21.2"
commons-codec = "1.15"
commons-lang3 = "3.8.1"
findbugs = "3.0.1"
gradle = "8.11.1"
gradle = "8.12.1"
hamcrest = "3.0"
hdrHistogram = "2.2.2"
httpcore = "4.4.14"
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,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions gradlew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
Loading