From d7388fc1b2967500bd7ac6b17c766503986eae10 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Thu, 2 Nov 2023 16:51:57 -0400
Subject: [PATCH] Remove obsolete `sonarqube` plugin

* Use on-demand `tasks.register('artifactoryPublish')`
---
 .../spring-artifactory-gradle-snapshot.yml    |  2 +-
 build.gradle                                  | 26 +++++++----------
 publish-maven.gradle                          | 29 +++++++------------
 3 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/spring-artifactory-gradle-snapshot.yml b/.github/workflows/spring-artifactory-gradle-snapshot.yml
index e524b61..a28bda5 100644
--- a/.github/workflows/spring-artifactory-gradle-snapshot.yml
+++ b/.github/workflows/spring-artifactory-gradle-snapshot.yml
@@ -41,6 +41,6 @@ jobs:
 
       - name: Build and Publish
         run: |
-          jf gradle build ${{ inputs.gradleTasks }} artifactoryPublish -d -x test
+          jf gradle build ${{ inputs.gradleTasks }} artifactoryPublish
           jf rt build-publish
 
diff --git a/build.gradle b/build.gradle
index 3915e49..0d372b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,6 @@ plugins {
 	id 'eclipse'
 	id 'idea'
 	id 'jacoco'
-	id 'org.sonarqube' version '4.3.1.3277'
 	id 'checkstyle'
 	id 'org.ajoberstar.grgit' version '4.1.1'
 	id 'io.spring.dependency-management' version '1.1.3'
@@ -50,7 +49,13 @@ ext {
 	linkScmConnection = 'https://github.com/spring-projects/spring-integration-aws.git'
 	linkScmDevConnection = 'git@github.com:spring-projects/spring-integration-aws.git'
 
-	modifiedFiles = files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') }
+	modifiedFiles =
+			files()
+					.from {
+						files(grgit.status().unstaged.modified)
+								.filter { f -> f.name.endsWith('.java') }
+					}
+	modifiedFiles.finalizeValueOnRead()
 }
 
 ext.javadocLinks = [
@@ -162,7 +167,7 @@ javadoc {
 	options.addStringOption('Xdoclint:none', '-quiet')
 	source = sourceSets.main.allJava
 	classpath = project.sourceSets.main.compileClasspath
-	destinationDir = file("$buildDir/api")
+	destinationDir = file('build/api')
 
 	// suppress warnings due to cross-module @see and @link references;
 	// note that global 'api' task does display all warnings.
@@ -177,7 +182,7 @@ ext.xLintArg = '-Xlint:all,-options'
 test {
 	maxHeapSize = '1024m'
 	jacoco {
-		destinationFile = file("$buildDir/jacoco.exec")
+		destinationFile = file('build/jacoco.exec')
 	}
 	useJUnitPlatform()
 	// suppress all console output during testing unless running `gradle -i`
@@ -193,12 +198,11 @@ jacocoTestReport {
 }
 
 check.dependsOn javadoc
-tasks['sonarqube'].dependsOn jacocoTestReport
 
 task updateCopyrights {
 	onlyIf { !isCI }
 	inputs.files(modifiedFiles)
-	outputs.dir("$buildDir/classes")
+	outputs.dir('build/classes')
 
 	doLast {
 		def now = Calendar.instance.get(Calendar.YEAR) as String
@@ -226,16 +230,6 @@ task updateCopyrights {
 
 compileJava.dependsOn updateCopyrights
 
-sonar {
-	properties {
-		property 'sonar.links.homepage', linkHomepage
-		property 'sonar.links.ci', linkCi
-		property 'sonar.links.issue', linkIssue
-		property 'sonar.links.scm', linkScmUrl
-		property 'sonar.links.scm_dev', linkScmDevConnection
-	}
-}
-
 task docsZip(type: Zip) {
 	group = 'Distribution'
 	archiveClassifier = 'docs'
diff --git a/publish-maven.gradle b/publish-maven.gradle
index 3208d47..deca859 100644
--- a/publish-maven.gradle
+++ b/publish-maven.gradle
@@ -54,24 +54,15 @@ publishing {
     }
 }
 
-if (isCI) {
-    artifactory {
-        publish {
-            defaults {
-                def  zipArtifactProps =
-                        ['zip.name': 'spring-integration-aws',
-                         'zip.displayname': 'Spring Integration Aws',
-                         'zip.deployed': 'false']
-                properties {
-                    mavenJava zipArtifactProps, '*:*:*:*@zip'
-                    mavenJava  'zip.type': 'docs', '*:*:*:docs@zip'
-                    mavenJava 'zip.type': 'dist', '*:*:*:dist@zip'
-                }
-            }
-        }
-    }
-
-    artifactoryPublish {
-        publications(publishing.publications.mavenJava)
+tasks.register('artifactoryPublish') {
+    publications(publishing.publications.mavenJava)
+    def zipArtifactProps =
+            ['zip.name'       : 'spring-integration-aws',
+             'zip.displayname': 'Spring Integration Aws',
+             'zip.deployed'   : 'false']
+    properties {
+        mavenJava zipArtifactProps, '*:*:*:*@zip'
+        mavenJava 'zip.type': 'docs', '*:*:*:docs@zip'
+        mavenJava 'zip.type': 'dist', '*:*:*:dist@zip'
     }
 }
\ No newline at end of file