Skip to content
This repository was archived by the owner on Nov 10, 2025. It is now read-only.

Commit d7388fc

Browse files
committed
Remove obsolete sonarqube plugin
* Use on-demand `tasks.register('artifactoryPublish')`
1 parent 3ac6e70 commit d7388fc

File tree

3 files changed

+21
-36
lines changed

3 files changed

+21
-36
lines changed

.github/workflows/spring-artifactory-gradle-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ jobs:
4141
4242
- name: Build and Publish
4343
run: |
44-
jf gradle build ${{ inputs.gradleTasks }} artifactoryPublish -d -x test
44+
jf gradle build ${{ inputs.gradleTasks }} artifactoryPublish
4545
jf rt build-publish
4646

build.gradle

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ plugins {
77
id 'eclipse'
88
id 'idea'
99
id 'jacoco'
10-
id 'org.sonarqube' version '4.3.1.3277'
1110
id 'checkstyle'
1211
id 'org.ajoberstar.grgit' version '4.1.1'
1312
id 'io.spring.dependency-management' version '1.1.3'
@@ -50,7 +49,13 @@ ext {
5049
linkScmConnection = 'https://github.com/spring-projects/spring-integration-aws.git'
5150
linkScmDevConnection = 'git@github.com:spring-projects/spring-integration-aws.git'
5251

53-
modifiedFiles = files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') }
52+
modifiedFiles =
53+
files()
54+
.from {
55+
files(grgit.status().unstaged.modified)
56+
.filter { f -> f.name.endsWith('.java') }
57+
}
58+
modifiedFiles.finalizeValueOnRead()
5459
}
5560

5661
ext.javadocLinks = [
@@ -162,7 +167,7 @@ javadoc {
162167
options.addStringOption('Xdoclint:none', '-quiet')
163168
source = sourceSets.main.allJava
164169
classpath = project.sourceSets.main.compileClasspath
165-
destinationDir = file("$buildDir/api")
170+
destinationDir = file('build/api')
166171

167172
// suppress warnings due to cross-module @see and @link references;
168173
// note that global 'api' task does display all warnings.
@@ -177,7 +182,7 @@ ext.xLintArg = '-Xlint:all,-options'
177182
test {
178183
maxHeapSize = '1024m'
179184
jacoco {
180-
destinationFile = file("$buildDir/jacoco.exec")
185+
destinationFile = file('build/jacoco.exec')
181186
}
182187
useJUnitPlatform()
183188
// suppress all console output during testing unless running `gradle -i`
@@ -193,12 +198,11 @@ jacocoTestReport {
193198
}
194199

195200
check.dependsOn javadoc
196-
tasks['sonarqube'].dependsOn jacocoTestReport
197201

198202
task updateCopyrights {
199203
onlyIf { !isCI }
200204
inputs.files(modifiedFiles)
201-
outputs.dir("$buildDir/classes")
205+
outputs.dir('build/classes')
202206

203207
doLast {
204208
def now = Calendar.instance.get(Calendar.YEAR) as String
@@ -226,16 +230,6 @@ task updateCopyrights {
226230

227231
compileJava.dependsOn updateCopyrights
228232

229-
sonar {
230-
properties {
231-
property 'sonar.links.homepage', linkHomepage
232-
property 'sonar.links.ci', linkCi
233-
property 'sonar.links.issue', linkIssue
234-
property 'sonar.links.scm', linkScmUrl
235-
property 'sonar.links.scm_dev', linkScmDevConnection
236-
}
237-
}
238-
239233
task docsZip(type: Zip) {
240234
group = 'Distribution'
241235
archiveClassifier = 'docs'

publish-maven.gradle

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,15 @@ publishing {
5454
}
5555
}
5656

57-
if (isCI) {
58-
artifactory {
59-
publish {
60-
defaults {
61-
def zipArtifactProps =
62-
['zip.name': 'spring-integration-aws',
63-
'zip.displayname': 'Spring Integration Aws',
64-
'zip.deployed': 'false']
65-
properties {
66-
mavenJava zipArtifactProps, '*:*:*:*@zip'
67-
mavenJava 'zip.type': 'docs', '*:*:*:docs@zip'
68-
mavenJava 'zip.type': 'dist', '*:*:*:dist@zip'
69-
}
70-
}
71-
}
72-
}
73-
74-
artifactoryPublish {
75-
publications(publishing.publications.mavenJava)
57+
tasks.register('artifactoryPublish') {
58+
publications(publishing.publications.mavenJava)
59+
def zipArtifactProps =
60+
['zip.name' : 'spring-integration-aws',
61+
'zip.displayname': 'Spring Integration Aws',
62+
'zip.deployed' : 'false']
63+
properties {
64+
mavenJava zipArtifactProps, '*:*:*:*@zip'
65+
mavenJava 'zip.type': 'docs', '*:*:*:docs@zip'
66+
mavenJava 'zip.type': 'dist', '*:*:*:dist@zip'
7667
}
7768
}

0 commit comments

Comments
 (0)