Fix Dependabot config

* Fix `publish-maven.gradle` and its `apply`

Author: artembilan

.github/dependabot.yml

@@ -11,8 +11,9 @@ updates:
   - package-ecosystem: gradle
     directory: /
     schedule:
-      interval: weekly
-      day: saturday
+      interval: monthly
+    registries:
+      - spring-commercial
     ignore:
       - dependency-name: '*'
         update-types:
@@ -43,8 +44,7 @@ updates:
   - package-ecosystem: github-actions
     directory: /
     schedule:
-      interval: weekly
-      day: saturday
+      interval: monthly
     labels:
       - 'type: task'
     groups:

build.gradle

@@ -16,14 +16,12 @@ buildscript {
 
 plugins {
 	id 'base'
-	id 'project-report'
-	id 'idea'
+	id 'io.spring.nohttp' version '0.0.11' apply false
 	id 'org.ajoberstar.grgit' version '4.1.1'
-	id 'io.spring.nohttp' version '0.0.11'
-	id 'io.spring.dependency-management' version '1.1.5' apply false
+	id 'io.spring.dependency-management' version '1.1.5'
 	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'
-	id 'com.github.spotbugs' version '6.0.14'
+	id 'com.github.spotbugs' version '6.0.15'
 }
 
 description = 'Spring AMQP'
@@ -73,9 +71,14 @@ ext {
 	javaProjects = subprojects - project(':spring-amqp-bom')
 }
 
-nohttp {
-	source.include '**/src/**'
-	source.exclude '**/*.gif', '**/*.ks'
+
+if (isCI) {
+	apply plugin: 'io.spring.nohttp'
+
+	nohttp {
+		source.include '**/src/**'
+		source.exclude '**/*.gif', '**/*.ks'
+	}
 }
 
 allprojects {
@@ -130,10 +133,8 @@ apply from: 'commercial-settings.gradle'
 
 configure(javaProjects) { subproject ->
 	apply plugin: 'java-library'
-	apply plugin: 'java'
 	apply plugin: 'eclipse'
 	apply plugin: 'idea'
-	apply plugin: 'project-report'
 	apply plugin: 'checkstyle'
 	apply plugin: 'kotlin'
 	apply plugin: 'kotlin-spring'
@@ -203,27 +204,6 @@ configure(javaProjects) { subproject ->
 	ext.xLintArg = '-Xlint:all,-options,-processing,-deprecation'
 	[compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg]
 
-	publishing {
-		publications {
-			mavenJava(MavenPublication) {
-				suppressAllPomMetadataWarnings()
-				from components.java
-				pom.withXml {
-					def pomDeps = asNode().dependencies.first()
-					subproject.configurations.providedImplementation.allDependencies.each { dep ->
-						pomDeps.remove(pomDeps.'*'.find { it.artifactId.text() == dep.name })
-						pomDeps.appendNode('dependency').with {
-							it.appendNode('groupId', dep.group)
-							it.appendNode('artifactId', dep.name)
-							it.appendNode('version', dep.version)
-							it.appendNode('scope', 'provided')
-						}
-					}
-				}
-			}
-		}
-	}
-
 	task updateCopyrights {
 		onlyIf { !isCI }
 		inputs.files(modifiedFiles.filter { f -> f.path.contains(subproject.name) })
@@ -328,6 +308,26 @@ configure(javaProjects) { subproject ->
 
 	check.dependsOn javadoc
 
+	publishing {
+		publications {
+			mavenJava(MavenPublication) {
+				suppressAllPomMetadataWarnings()
+				from components.java
+				pom.withXml {
+					def pomDeps = asNode().dependencies.first()
+					subproject.configurations.providedImplementation.allDependencies.each { dep ->
+						pomDeps.remove(pomDeps.'*'.find { it.artifactId.text() == dep.name })
+						pomDeps.appendNode('dependency').with {
+							it.appendNode('groupId', dep.group)
+							it.appendNode('artifactId', dep.name)
+							it.appendNode('version', dep.version)
+							it.appendNode('scope', 'provided')
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 project('spring-amqp') {

publish-maven.gradle

@@ -1,81 +1,65 @@
-apply plugin: 'maven-publish'
+allprojects {
+	apply plugin: 'maven-publish'
 
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			pom {
-				afterEvaluate {
-					name = project.description
-					description = project.description
-				}
-				url = linkScmUrl
-				organization {
-					name = 'Spring IO'
-					url = 'https://spring.io/projects/spring-amqp'
-				}
-				licenses {
-					license {
-						name = 'Apache License, Version 2.0'
-						url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
-						distribution = 'repo'
+	publishing {
+		publications {
+			mavenJava(MavenPublication) {
+				pom {
+					afterEvaluate {
+						name = project.description
+						description = project.description
 					}
-				}
-				scm {
 					url = linkScmUrl
-					connection = linkScmConnection
-					developerConnection = linkScmDevConnection
-				}
-				developers {
-					developer {
-						id = 'artembilan'
-						name = 'Artem Bilan'
-						email = 'artem.bilan@broadcom.com'
-						roles = ['project lead']
-					}
-					developer {
-						id = 'garyrussell'
-						name = 'Gary Russell'
-						email = 'github@gprussell.net'
-						roles = ['project lead emeritus']
+					organization {
+						name = 'Spring IO'
+						url = 'https://spring.io/projects/spring-amqp'
 					}
-					developer {
-						id = 'sobychacko'
-						name = 'Soby Chacko'
-						email = 'soby.chacko@broadcom.com'
-						roles = ['contributor']
+					licenses {
+						license {
+							name = 'Apache License, Version 2.0'
+							url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
+							distribution = 'repo'
+						}
 					}
-					developer {
-						id = 'dsyer'
-						name = 'Dave Syer'
-						email = 'david.syer@broadcom.com'
-						roles = ['project founder']
+					scm {
+						url = linkScmUrl
+						connection = linkScmConnection
+						developerConnection = linkScmDevConnection
 					}
-					developer {
-						id = 'markfisher'
-						name = 'Mark Fisher'
-						email = 'mark.fisher@broadcom.com'
-						roles = ['project founder']
+					developers {
+						developer {
+							id = 'artembilan'
+							name = 'Artem Bilan'
+							email = 'artem.bilan@broadcom.com'
+							roles = ['project lead']
+						}
+						developer {
+							id = 'garyrussell'
+							name = 'Gary Russell'
+							email = 'github@gprussell.net'
+							roles = ['project lead emeritus']
+						}
+						developer {
+							id = 'markfisher'
+							name = 'Mark Fisher'
+							email = 'mark.ryan.fisher@gmail.com'
+							roles = ['project founder and lead emeritus']
+						}
 					}
-					developer {
-						id = 'markpollack'
-						name = 'Mark Pollack'
-						email = 'mark.pollack@broadcom.com'
-						roles = ['project founder']
+					issueManagement {
+						system = 'GitHub'
+						url = linkIssue
 					}
 				}
-				issueManagement {
-					system = 'GitHub'
-					url = linkIssue
-				}
-			}
-			versionMapping {
-				usage('java-api') {
-					fromResolutionResult()
-				}
-				usage('java-runtime') {
-					fromResolutionResult()
+				versionMapping {
+					usage('java-api') {
+						fromResolutionResult()
+					}
+					usage('java-runtime') {
+						fromResolutionResult()
+					}
 				}
 			}
 		}
 	}
-}
+}