Support Deploying to Central Portal

Closes gh-70

Author: rwinch

.github/workflows/deploy-artifacts.yml

@@ -4,7 +4,7 @@ on:
   workflow_call:
     inputs:
       should-deploy-artifacts:
-        description: Whether artifacts should be deployed.
+        description: Whether artifacts should be deployed (true|false|central|artifactory).
         required: true
         type: string
     outputs:
@@ -21,9 +21,9 @@ on:
         required: false
       ARTIFACTORY_PASSWORD:
         required: false
-      OSSRH_S01_TOKEN_USERNAME:
+      CENTRAL_TOKEN_USERNAME:
         required: false
-      OSSRH_S01_TOKEN_PASSWORD:
+      CENTRAL_TOKEN_PASSWORD:
         required: false
       GPG_PRIVATE_KEY:
         required: false
@@ -40,7 +40,7 @@ env:
 jobs:
   deploy-artifacts:
     name: Deploy Artifacts
-    if: ${{ inputs.should-deploy-artifacts == 'true' }}
+    if: ${{ inputs.should-deploy-artifacts != 'false' }}
     runs-on: ubuntu-latest
     outputs:
       artifacts-deployed: ${{ steps.artifacts-deployed.outputs.result }}
@@ -63,7 +63,25 @@ jobs:
             branch="${VERSION%.*}.x"
           fi
           echo "branch=$branch" >> $GITHUB_OUTPUT
-      - name: Deploy Artifacts
+      - id: deploy-location
+        name: Default the Deploy Location
+        env:
+          SHOULD_DEPLOY_ARTIFACTS: ${{ inputs.should-deploy-artifacts }}
+          VERSION: ${{ steps.project-version.outputs.version }}
+        run: |
+          deploy_location="$SHOULD_DEPLOY_ARTIFACTS"
+          if [[ "$deploy_location" = "true" ]] ; then
+            if [[ "$VERSION" =~ "-" ]] ; then
+              # -SNAPSHOT, -M\d+, and -RC\d+ all go to artifactory by default to remain passive
+              # Newer generations will only deploy -SNAPSHOT to artifactory, but they must opt into central explicitly
+              deploy_location=artifactory
+            else
+              deploy_location=central
+            fi
+          fi
+          echo "deploy_location=$deploy_location" >> $GITHUB_OUTPUT
+      - name: Deploy to Artifactory
+        if: ${{ steps.deploy-location.outputs.deploy_location == 'artifactory' }}
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
@@ -73,7 +91,19 @@ jobs:
           ARTIFACTORY_USER_AGENT_NAME: GitHub Actions
           ARTIFACTORY_USER_AGENT_VERSION: Unknown
           ARTIFACTORY_VCS_REVISION: ${{ github.sha }}
-        run: ./gradlew publishArtifacts finalizeDeployArtifacts -PossrhUsername="$OSSRH_TOKEN_USERNAME" -PossrhPassword="$OSSRH_TOKEN_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace
+        run: ./gradlew publishArtifacts -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace
+      - name: Stage Local Artifacts for Publishing to Central
+        if: ${{ steps.deploy-location.outputs.deploy_location == 'central' }}
+        env:
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
+        run: ./gradlew publishAllPublicationsToLocalRepository --stacktrace
+      - name: Publish Staged Artifacts to Central
+        uses: spring-io/central-publish-action@0cdd90d12e6876341e82860d951e1bcddc1e51b6 # v0.2.0
+        with:
+          token-name: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
+          token: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
+          dir: build/publications/repos
       - id: artifacts-deployed
         name: Artifacts Deployed
         run: echo "result=true" >> $GITHUB_OUTPUT

buildSrc/build.gradle

@@ -16,7 +16,6 @@ repositories {
 }
 
 dependencies {
-	implementation "io.github.gradle-nexus:publish-plugin:2.0.0"
 	implementation "io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.41"
 	implementation "io.spring.nohttp:nohttp-gradle:0.0.11"
 	implementation "org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0"

buildSrc/src/main/java/io/spring/gradle/convention/SpringRootProjectPlugin.java

@@ -21,7 +21,6 @@
 import org.gradle.api.plugins.BasePlugin;
 import org.gradle.api.plugins.PluginManager;
 
-import org.springframework.gradle.maven.SpringNexusPlugin;
 import org.springframework.gradle.nohttp.SpringNoHttpPlugin;
 
 /**
@@ -34,7 +33,6 @@ public void apply(Project project) {
 		PluginManager pluginManager = project.getPluginManager();
 		pluginManager.apply(BasePlugin.class);
 		pluginManager.apply(SpringNoHttpPlugin.class);
-		pluginManager.apply(SpringNexusPlugin.class);
 
 		// Apply default repositories
 		project.getRepositories().mavenCentral();

buildSrc/src/main/java/org/springframework/gradle/maven/SpringNexusPlugin.java

@@ -12,20 +12,12 @@ plugins {
 ----
 
 == Overview
-
 This plugin has two main goals:
 
 1. Automatically apply plugins and configuration for publishing artifacts to both Maven Central (Sonatype) and Spring (Artifactory).
 2. Provide tasks for automatically choosing which artifact repository to publish artifacts to based on the project version.
 
-This plugin performs the following on the root project:
-
-* Applies the `io.github.gradle-nexus.publish-plugin` plugin
-* Creates an `ossrh` repository for publishing artifacts to the Sonatype staging repository
-* Configures the `publishArtifacts` task to publish releases to the Sonatype staging repository (`ossrh`)
-* Configures the `finalizeDeployArtifacts` task to close and release any opened staging repository (for Sonatype releases only)
-
-This plugin also performs the following on each sub-module it is applied to:
+This plugin performs the following on each sub-module it is applied to:
 
 * Applies the `maven-publish` plugin
 * Applies the `signing` plugin
@@ -35,59 +27,9 @@ This plugin also performs the following on each sub-module it is applied to:
 * Configures the `publishing` extension to sign artifacts
 * Creates a `local` repository for publishing artifacts to a local directory
 * Configures the `artifactory` extension using gradle properties
-* Configures the `publishArtifacts` task to publish snapshots, milestones and release candidates to Artifactory
 
 == Task Reference
 
-=== `publishArtifacts`
-
-This task works together with `finalizeDeployArtifacts` to publish artifacts to the appropriate artifact repository and automatically close and release staging repositories (for Sonatype releases only) once publishing is complete.
-
-For snapshots, milestones , and release candidates (e.g. `-SNAPSHOT`, `-M1`, `-RC1`, etc.), Artifactory is used.
-For releases (any other version), the Sonatype staging repository is used instead.
-
-The default Nexus URL is `https://s01.oss.sonatype.org/service/local/`, which is for the Sonatype staging repository.
-You can override this by passing the optional environment variable `OSSRH_URL`.
-
-The default Nexus snapshots URL is `https://s01.oss.sonatype.org/content/repositories/snapshots/`.
-You can override this by passing the optional environment variable `OSSRH_SNAPSHOT_REPOSITORY_URL`.
-
-The default Artifactory URL is `https://repo.spring.io`.
-You can override this by passing the optional environment variable `ARTIFACTORY_URL`.
-
-*Example:*
-
-[source,bash]
-----
-export ORG_GRADLE_PROJECT_signingKey=...
-export ORG_GRADLE_PROJECT_signingPassword=...
-OSSRH_USERNAME=...
-OSSRH_PASSWORD=...
-ARTIFACTORY_USERNAME=...
-ARTIFACTORY_PASSWORD=...
-./gradlew publishArtifacts finalizeDeployArtifacts -PossrhUsername="$OSSRH_USERNAME" -PossrhPassword="$OSSRH_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace
-----
-
-== `publishToOssrh`
-
-This task is provided by the `maven-publish` plugin when the `ossrh` repository is defined, and can be used directly to publish snapshots and other artifacts to the Sonatype staging repository.
-
-[NOTE]
-====
-You will need to call `closeAndReleaseOssrhStagingRepository` yourself.
-====
-
-*Example:*
-
-[source,bash]
-----
-export ORG_GRADLE_PROJECT_signingKey=...
-export ORG_GRADLE_PROJECT_signingPassword=...
-OSSRH_USERNAME=...
-OSSRH_PASSWORD=...
-./gradlew publishToOssrh closeAndReleaseOssrhStagingRepository -PossrhUsername="$OSSRH_USERNAME" -PossrhPassword="$OSSRH_PASSWORD" --stacktrace
-----
-
 == `artifactoryPublish`
 
 This task is provided by the `com.jfrog.artifactory` plugin, and can be used directly to publish artifacts (including releases) to Artifactory.

maven-plugin/README.adoc

@@ -31,7 +31,6 @@ repositories {
 
 dependencies {
 	management platform(project(":dependencies"))
-	implementation "io.github.gradle-nexus:publish-plugin:2.0.0"
 	implementation "org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0"
 
 	testImplementation "org.junit.jupiter:junit-jupiter"

maven-plugin/spring-security-maven-plugin.gradle

@@ -27,27 +27,9 @@ public class SpringMavenPlugin implements Plugin<Project> {
 
 	@Override
 	public void apply(Project project) {
-		// Create publish task
-		project.getTasks().register("publishArtifacts", (task) -> {
-			task.setGroup("Publishing");
-			task.setDescription("Publish the artifacts to either Artifactory or Maven Central based on the version");
-		});
-
-		// Create finalize task to run after publish task
-		project.getTasks().register("finalizeDeployArtifacts", (task) -> {
-			task.setGroup("Publishing");
-			task.setDescription(
-					"Automatically close and release staging repositories when required based on the version");
-		});
-
 		PluginManager pluginManager = project.getPluginManager();
-		if (project.getRootProject().equals(project)) {
-			pluginManager.apply(SpringNexusPlugin.class);
-		}
-		else {
-			pluginManager.apply(SpringMavenPublishPlugin.class);
-			pluginManager.apply(SpringArtifactoryPlugin.class);
-		}
+		pluginManager.apply(SpringMavenPublishPlugin.class);
+		pluginManager.apply(SpringArtifactoryPlugin.class);
 	}
 
 }