diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b1b8ef5..eddabd2 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8747320..8c15739 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-all.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/sonatype/src/test/kotlin/com/bakdata/gradle/SonatypePluginIT.kt b/sonatype/src/test/kotlin/com/bakdata/gradle/SonatypePluginIT.kt index 15ff711..3b97fa6 100644 --- a/sonatype/src/test/kotlin/com/bakdata/gradle/SonatypePluginIT.kt +++ b/sonatype/src/test/kotlin/com/bakdata/gradle/SonatypePluginIT.kt @@ -112,7 +112,7 @@ internal class SonatypePluginIT { .map { classifier -> "$projectName/$TEST_VERSION/$projectName-$TEST_VERSION$classifier" } .flatMap { baseFile -> listOf(baseFile, "$baseFile.asc") } .plus("$projectName/maven-metadata.xml") - .flatMap { file -> listOf(file, "$file.md5", "$file.sha1", "$file.sha256", "$file.sha512") } + .flatMap(::checksumFiles) assertThat(getUploadedFilesInGroup(wiremock)).containsExactlyInAnyOrderElementsOf(expectedUploads) } @@ -177,7 +177,7 @@ internal class SonatypePluginIT { .map { classifier -> "$projectName/$TEST_VERSION/$projectName-$TEST_VERSION$classifier" } .flatMap { baseFile -> listOf(baseFile, "$baseFile.asc") } .plus("$projectName/maven-metadata.xml") - .flatMap { file -> listOf(file, "$file.md5", "$file.sha1", "$file.sha256", "$file.sha512") } + .flatMap(::checksumFiles) assertThat(getUploadedFilesInGroup(wiremock)).containsExactlyInAnyOrderElementsOf(expectedUploads) } @@ -254,7 +254,7 @@ internal class SonatypePluginIT { .map { classifier -> "$projectName/$TEST_VERSION/$projectName-$TEST_VERSION$classifier" } .flatMap { baseFile -> listOf(baseFile, "$baseFile.asc") } .plus("$projectName/maven-metadata.xml") - .flatMap { file -> listOf(file, "$file.md5", "$file.sha1", "$file.sha256", "$file.sha512") } + .flatMap(::checksumFiles) assertThat(getUploadedFilesInGroup(wiremock)).containsExactlyInAnyOrderElementsOf(expectedUploads) } @@ -265,6 +265,11 @@ internal class SonatypePluginIT { .map { it.request.url.substringAfter(baseUrl) } } + // Gradle no longer publishes checksums for signature files: https://github.com/gradle/gradle/issues/20232 + private fun checksumFiles(file: String): List = + if (file.endsWith(".asc")) listOf(file) + else listOf(file, "$file.md5", "$file.sha1", "$file.sha256", "$file.sha512") + private fun mockNexusProtocol(wiremock: WireMockServer) { wiremock.addMockServiceRequestListener { request, response -> println("Answered request ${request.method} ${request.url} with response ${response.status}") @@ -363,7 +368,7 @@ internal class SonatypePluginIT { .flatMap { classifier -> children.map { child -> "$child/$TEST_VERSION/$child-$TEST_VERSION$classifier" } } .flatMap { baseFile -> listOf(baseFile, "$baseFile.asc") } .plus(children.map { child -> "$child/maven-metadata.xml" }) - .flatMap { file -> listOf(file, "$file.md5", "$file.sha1", "$file.sha256", "$file.sha512") } + .flatMap(::checksumFiles) assertThat(getUploadedFilesInGroup(wiremock)).containsExactlyInAnyOrderElementsOf(expectedUploads) } @@ -426,7 +431,7 @@ internal class SonatypePluginIT { .map { classifier -> "$projectName/$TEST_VERSION/$projectName-$TEST_VERSION$classifier" } .flatMap { baseFile -> listOf(baseFile, "$baseFile.asc") } .plus("$projectName/maven-metadata.xml") - .flatMap { file -> listOf(file, "$file.md5", "$file.sha1", "$file.sha256", "$file.sha512") } + .flatMap(::checksumFiles) .flatMap { file -> listOf(file, file) } //FIXME somehow elements are uploaded twice assertThat(getUploadedFilesInGroup(wiremock)).containsExactlyInAnyOrderElementsOf(expectedUploads) } @@ -491,7 +496,7 @@ internal class SonatypePluginIT { .map { classifier -> "$projectName/$TEST_VERSION/$projectName-$TEST_VERSION$classifier" } .flatMap { baseFile -> listOf(baseFile, "$baseFile.asc") } .plus("$projectName/maven-metadata.xml") - .flatMap { file -> listOf(file, "$file.md5", "$file.sha1", "$file.sha256", "$file.sha512") } + .flatMap(::checksumFiles) .flatMap { file -> listOf(file, file) } //FIXME somehow elements are uploaded twice assertThat(getUploadedFilesInGroup(wiremock)).containsExactlyInAnyOrderElementsOf(expectedUploads) }