buildSrc to publish

Author: rwinch

bom/spring-security-bom.gradle

@@ -2,10 +2,3 @@ apply plugin: 'io.spring.convention.bom'
 
 sonarqube.skipProject = true
 
-project.rootProject.allprojects.each { p ->
-	p.plugins.withType(io.spring.gradle.convention.SpringMavenPlugin) {
-		if (!project.name.equals(p.name)) {
-			project.mavenBom.projects.add(p)
-		}
-	}
-}

buildSrc/build.gradle

@@ -71,11 +71,11 @@ dependencies {
 	implementation 'net.sourceforge.saxon:saxon:9.1.0.8'
 	implementation localGroovy()
 
+	implementation 'io.github.gradle-nexus:publish-plugin:1.1.0'
 	implementation 'io.projectreactor:reactor-core:3.4.6'
 	implementation 'gradle.plugin.org.gretty:gretty:3.0.1'
 	implementation 'com.apollographql.apollo:apollo-runtime:2.4.5'
 	implementation 'com.github.ben-manes:gradle-versions-plugin:0.38.0'
-	implementation 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.1'
 	implementation 'io.spring.gradle:docbook-reference-plugin:0.3.1'
 	implementation 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE'
 	implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.15'

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

@@ -2,10 +2,8 @@ package io.spring.gradle.convention
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.plugins.MavenPlugin
-import org.gradle.plugins.signing.SigningPlugin
 import org.sonarqube.gradle.SonarQubePlugin
+import org.springframework.gradle.maven.SpringMavenPlugin
 
 public class MavenBomPlugin implements Plugin<Project> {
 	static String MAVEN_BOM_TASK_NAME = "mavenBom"
@@ -14,15 +12,10 @@ public class MavenBomPlugin implements Plugin<Project> {
 		project.configurations {
 			archives
 		}
-		project.plugins.apply('io.spring.convention.artifactory')
-		project.plugins.apply('io.spring.convention.maven')
-		project.plugins.apply(MavenPlugin)
-		project.plugins.apply(SigningPlugin)
-		project.plugins.apply("io.spring.convention.ossrh")
+		project.plugins.apply(SpringMavenPlugin)
 
 		project.group = project.rootProject.group
 		project.task(MAVEN_BOM_TASK_NAME, type: MavenBomTask, group: 'Generate', description: 'Configures the pom as a Maven Build of Materials (BOM)')
-		project.install.dependsOn project.mavenBom
 		project.tasks.uploadArchives.dependsOn project.mavenBom
 		project.tasks.artifactoryPublish.dependsOn project.mavenBom
 
@@ -31,7 +24,7 @@ public class MavenBomPlugin implements Plugin<Project> {
 		}
 
 		project.rootProject.allprojects.each { p ->
-			p.plugins.withType(io.spring.gradle.convention.SpringMavenPlugin) {
+			p.plugins.withType(SpringMavenPlugin) {
 				if (!project.name.equals(p.name)) {
 					project.mavenBom.projects.add(p)
 				}

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

@@ -21,6 +21,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.BasePlugin
 import org.gradle.api.plugins.PluginManager
+import org.springframework.gradle.maven.SpringNexusPublishPlugin
 
 class RootProjectPlugin implements Plugin<Project> {
 
@@ -30,6 +31,7 @@ class RootProjectPlugin implements Plugin<Project> {
 		pluginManager.apply(BasePlugin)
 		pluginManager.apply(SchemaPlugin)
 		pluginManager.apply(NoHttpPlugin)
+        pluginManager.apply(SpringNexusPublishPlugin)
 		pluginManager.apply("org.sonarqube")
 
 		project.repositories.mavenCentral()
@@ -50,17 +52,7 @@ class RootProjectPlugin implements Plugin<Project> {
 
 		def finalizeDeployArtifacts = project.task("finalizeDeployArtifacts")
 		if (Utils.isRelease(project) && project.hasProperty("ossrhUsername")) {
-			project.ext.nexusUsername = project.ossrhUsername
-			project.ext.nexusPassword = project.ossrhPassword
-			project.getPluginManager().apply("io.codearte.nexus-staging")
-			finalizeDeployArtifacts.dependsOn project.tasks.closeAndReleaseRepository
-			project.nexusStaging {
-				packageGroup = 'org.springframework'
-
-				// try for 5 minutes total
-				numberOfRetries = 60 // default is 20
-				delayBetweenRetriesInMillis = 5000 // default is 2000
-			}
+			finalizeDeployArtifacts.dependsOn project.tasks.closeAndReleaseOssrhtagingRepository
 		}
 	}
 

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

@@ -19,7 +19,8 @@ package io.spring.gradle.convention;
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaLibraryPlugin;
 import org.gradle.api.plugins.MavenPlugin;
-import org.gradle.api.plugins.PluginManager;
+import org.gradle.api.plugins.PluginManager
+import org.springframework.gradle.maven.SpringMavenPlugin;
 
 /**
  * @author Rob Winch
@@ -30,9 +31,7 @@ class SpringModulePlugin extends AbstractSpringJavaPlugin {
 	void additionalPlugins(Project project) {
 		PluginManager pluginManager = project.getPluginManager();
 		pluginManager.apply(JavaLibraryPlugin.class)
-		pluginManager.apply(MavenPlugin.class);
-		pluginManager.apply("io.spring.convention.maven");
-		pluginManager.apply("io.spring.convention.artifactory");
+		pluginManager.apply(SpringMavenPlugin.class);
 		pluginManager.apply("io.spring.convention.jacoco");
 
 		def deployArtifacts = project.task("deployArtifacts")