Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
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-9.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-all.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
17 changes: 11 additions & 6 deletions sonatype/src/test/kotlin/com/bakdata/gradle/SonatypePluginIT.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down Expand Up @@ -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)
}

Expand Down Expand Up @@ -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)
}

Expand All @@ -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<String> =
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}")
Expand Down Expand Up @@ -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)
}

Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
Loading