Skip to content

Commit 77604a1

Browse files
committed
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 <[email protected]>
1 parent bcb9ffb commit 77604a1

File tree

4 files changed

+9
-24
lines changed

4 files changed

+9
-24
lines changed

.github/workflows/ci-pr.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,6 @@ jobs:
5353
name: test-results
5454
path: '*/build/reports/tests/**/*.*'
5555
retention-days: 3
56-
- name: Create Aggregated Jacoco Report
57-
run: |
58-
./gradlew aggregateJacocoTestReport --info
59-
- name: Verify Code Coverage
60-
run: |
61-
./gradlew jacocoTestCoverageVerification --info
62-
- name: Upload Aggregated Jacoco Report
63-
if: failure() || contains(github.event.pull_request.labels.*.name, 'ci/upload-jacoco')
64-
uses: actions/upload-artifact@v4
65-
with:
66-
name: jacoco-results
67-
path: 'build/reports/jacoco/**/*.*'
68-
retention-days: 3
6956
integration_tests:
7057
needs: [prerequisites, build_and_verify]
7158
runs-on: ubuntu-latest

build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ plugins {
1010

1111
description = 'Spring for Apache Pulsar'
1212

13-
apply from: 'gradle/jacoco-conventions.gradle'
14-
apply from: 'gradle/aggregate-jacoco-report.gradle'
1513
apply from: 'gradle/version-catalog-update.gradle'
1614
apply from: 'gradle/java-conventions.gradle'
1715
apply from: 'gradle/nullability-conventions.gradle'

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ class ArtifactoryPlugin implements Plugin<Project> {
2626
@Override
2727
void apply(Project project) {
2828
project.plugins.apply('com.jfrog.artifactory')
29-
boolean isSnapshot = ProjectUtils.isSnapshot(project);
30-
boolean isMilestone = ProjectUtils.isMilestone(project);
29+
boolean isSnapshot = ProjectUtils.isSnapshot(project)
30+
boolean isMilestone = ProjectUtils.isMilestone(project)
31+
def repoKey = isSnapshot ? 'libs-snapshot-local' :
32+
(isMilestone ? 'libs-milestone-local' : 'libs-release-local')
3133
project.artifactory {
3234
contextUrl = 'https://repo.spring.io'
3335
publish {
3436
repository {
35-
repoKey = isSnapshot ? 'libs-snapshot-local' :
36-
(isMilestone ? 'libs-milestone-local' : 'libs-release-local')
37-
if(project.hasProperty('artifactoryUsername')) {
38-
username = artifactoryUsername
39-
password = artifactoryPassword
37+
repoKey = "${repoKey}"
38+
if (project.hasProperty('artifactoryUsername')) {
39+
username = "${project.artifactoryUsername}"
40+
password = "${project.artifactoryPassword}"
4041
}
4142
}
4243
}
4344
}
44-
4545
project.plugins.withType(MavenPublishPlugin) {
4646
project.artifactory {
4747
publish {

gradle/build-libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
asciidoc-gradle = "3.3.2"
33
commons-codec = "1.18.0"
44
commons-compress = "1.26.2"
5-
groovy = "2.5.17"
5+
groovy = "4.0.27"
66
jackson = "2.19.1"
77
javaformat = "0.0.47"
88
jfrog = "6.0.1"

0 commit comments

Comments
 (0)