Remove publishArtifacts and publishToOssrh

Issue gh-70

Author: rwinch

.github/workflows/deploy-artifacts.yml

@@ -34,8 +34,6 @@ env:
   DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
   ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
   ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-  OSSRH_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
-  OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
 
 jobs:
   deploy-artifacts:
@@ -91,7 +89,7 @@ jobs:
           ARTIFACTORY_USER_AGENT_NAME: GitHub Actions
           ARTIFACTORY_USER_AGENT_VERSION: Unknown
           ARTIFACTORY_VCS_REVISION: ${{ github.sha }}
-        run: ./gradlew publishArtifacts -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace
+        run: ./gradlew artifactoryPublish -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace
       - name: Stage Local Artifacts for Publishing to Central
         if: ${{ steps.deploy-location.outputs.deploy_location == 'central' }}
         env:

buildSrc/src/main/java/org/springframework/gradle/SpringMavenPlugin.java

@@ -24,7 +24,6 @@
 import org.springframework.gradle.maven.SpringArtifactoryPlugin;
 import org.springframework.gradle.maven.SpringMavenPublishingConventionsPlugin;
 import org.springframework.gradle.maven.SpringPublishAllJavaComponentsPlugin;
-import org.springframework.gradle.maven.SpringPublishArtifactsPlugin;
 import org.springframework.gradle.maven.SpringPublishLocalPlugin;
 import org.springframework.gradle.maven.SpringSigningPlugin;
 
@@ -43,6 +42,5 @@ public void apply(Project project) {
 		pluginManager.apply(SpringArtifactoryPlugin.class);
 		pluginManager.apply(SpringMavenPublishingConventionsPlugin.class);
 		pluginManager.apply(SpringPublishLocalPlugin.class);
-		pluginManager.apply(SpringPublishArtifactsPlugin.class);
 	}
 }

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

@@ -46,12 +46,13 @@ public void apply(Project project) {
 	}
 
 	private void sign(Project project) {
-		SigningExtension signing = project.getExtensions().getByType(SigningExtension.class);
-		signing.setRequired((Callable<Boolean>) () -> project.getGradle().getTaskGraph().hasTask("publishArtifacts"));
-
 		String signingKeyId = (String) project.findProperty("signingKeyId");
 		String signingKey = (String) project.findProperty("signingKey");
 		String signingPassword = (String) project.findProperty("signingPassword");
+
+		SigningExtension signing = project.getExtensions().getByType(SigningExtension.class);
+		signing.setRequired((Callable<Boolean>) () -> signingKeyId != null || signingKey != null || signingPassword != null);
+
 		if (signingKeyId != null) {
 			signing.useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword);
 		} else {

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

@@ -140,13 +140,6 @@ public void apply(Project project) {
 				buildInfo.setVcsRevision(vcsRevision);
 			}
 		});
-
-		// Publish snapshots, milestones, and release candidates to Artifactory
-		project.getTasks().named("publishArtifacts", (publishArtifacts) -> {
-			if (!ProjectUtils.isRelease(project)) {
-				publishArtifacts.dependsOn("artifactoryPublish");
-			}
-		});
 	}
 
 }

maven-plugin/src/main/java/io/spring/gradle/plugin/maven/SpringArtifactoryPlugin.java

@@ -74,7 +74,7 @@ private static void configureSigning(Project project) {
 		String signingPassword = (String) project.findProperty("signingPassword");
 
 		SigningExtension signing = project.getExtensions().getByType(SigningExtension.class);
-		signing.setRequired((Callable<Boolean>) () -> project.getGradle().getTaskGraph().hasTask("publishArtifacts"));
+		signing.setRequired((Callable<Boolean>) () -> signingKeyId != null || signingKey != null || signingPassword != null);
 		if (signingKeyId != null) {
 			signing.useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword);
 		}