File tree Expand file tree Collapse file tree 4 files changed +9
-24
lines changed
buildSrc/src/main/groovy/io/spring/gradle/convention Expand file tree Collapse file tree 4 files changed +9
-24
lines changed Original file line number Diff line number Diff line change 53
53
name : test-results
54
54
path : ' */build/reports/tests/**/*.*'
55
55
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
69
56
integration_tests :
70
57
needs : [prerequisites, build_and_verify]
71
58
runs-on : ubuntu-latest
Original file line number Diff line number Diff line change @@ -10,8 +10,6 @@ plugins {
10
10
11
11
description = ' Spring for Apache Pulsar'
12
12
13
- apply from : ' gradle/jacoco-conventions.gradle'
14
- apply from : ' gradle/aggregate-jacoco-report.gradle'
15
13
apply from : ' gradle/version-catalog-update.gradle'
16
14
apply from : ' gradle/java-conventions.gradle'
17
15
apply from : ' gradle/nullability-conventions.gradle'
Original file line number Diff line number Diff line change @@ -26,22 +26,22 @@ class ArtifactoryPlugin implements Plugin<Project> {
26
26
@Override
27
27
void apply (Project project ) {
28
28
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' )
31
33
project. artifactory {
32
34
contextUrl = ' https://repo.spring.io'
33
35
publish {
34
36
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} "
40
41
}
41
42
}
42
43
}
43
44
}
44
-
45
45
project. plugins. withType(MavenPublishPlugin ) {
46
46
project. artifactory {
47
47
publish {
Original file line number Diff line number Diff line change 2
2
asciidoc-gradle = " 3.3.2"
3
3
commons-codec = " 1.18.0"
4
4
commons-compress = " 1.26.2"
5
- groovy = " 2.5.17 "
5
+ groovy = " 4.0.27 "
6
6
jackson = " 2.19.1"
7
7
javaformat = " 0.0.47"
8
8
jfrog = " 6.0.1"
You can’t perform that action at this time.
0 commit comments