Continue Gradle 9 update

The previous commit to update to Gradle 9 missed a few locations. This continues that effort by doing the following: - remove Jacoco as it seems to not be compatible w/ Java 25 - fix syntax in JFrog Artifactory plugin (remove closure from repoKey var) - update Groovy version to 4.0.27 Signed-off-by: onobc <chris.bono@gmail.com>

Author: onobc

.github/workflows/ci-pr.yml

@@ -53,19 +53,6 @@ jobs:
  name: test-results
  path: '*/build/reports/tests/**/*.*'
  retention-days: 3
- - name: Create Aggregated Jacoco Report
- run: |
- ./gradlew aggregateJacocoTestReport --info
- - name: Verify Code Coverage
- run: |
- ./gradlew jacocoTestCoverageVerification --info
- - name: Upload Aggregated Jacoco Report
- if: failure() || contains(github.event.pull_request.labels.*.name, 'ci/upload-jacoco')
- uses: actions/upload-artifact@v4
- with:
- name: jacoco-results
- path: 'build/reports/jacoco/**/*.*'
- retention-days: 3
  integration_tests:
  needs: [prerequisites, build_and_verify]
  runs-on: ubuntu-latest

build.gradle

@@ -10,8 +10,6 @@ plugins {
 
 description = 'Spring for Apache Pulsar'
 
-apply from: 'gradle/jacoco-conventions.gradle'
-apply from: 'gradle/aggregate-jacoco-report.gradle'
 apply from: 'gradle/version-catalog-update.gradle'
 apply from: 'gradle/java-conventions.gradle'
 apply from: 'gradle/nullability-conventions.gradle'

buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy

@@ -26,22 +26,22 @@ class ArtifactoryPlugin implements Plugin<Project> {
 @Override
 void apply(Project project) {
 project.plugins.apply('com.jfrog.artifactory')
-boolean isSnapshot = ProjectUtils.isSnapshot(project);
-boolean isMilestone = ProjectUtils.isMilestone(project);
+boolean isSnapshot = ProjectUtils.isSnapshot(project)
+boolean isMilestone = ProjectUtils.isMilestone(project)
+def repoKey = isSnapshot ? 'libs-snapshot-local' :
+(isMilestone ? 'libs-milestone-local' : 'libs-release-local')
 project.artifactory {
 contextUrl = 'https://repo.spring.io'
 publish {
 repository {
-repoKey = isSnapshot ? 'libs-snapshot-local' :
-(isMilestone ? 'libs-milestone-local' : 'libs-release-local')
-if(project.hasProperty('artifactoryUsername')) {
-username = artifactoryUsername
-password = artifactoryPassword
+repoKey = "${repoKey}"
+if (project.hasProperty('artifactoryUsername')) {
+username = "${project.artifactoryUsername}"
+password = "${project.artifactoryPassword}"
 }
 }
 }
 }
-
 project.plugins.withType(MavenPublishPlugin) {
 project.artifactory {
 publish {

gradle/build-libs.versions.toml

@@ -2,7 +2,7 @@
 asciidoc-gradle = "3.3.2"
 commons-codec = "1.18.0"
 commons-compress = "1.26.2"
-groovy = "2.5.17"
+groovy = "4.0.27"
 jackson = "2.19.1"
 javaformat = "0.0.47"
 jfrog = "6.0.1"