[CI] Move closeOssrhStagingRepository to root project

This commit is contained in:
Chris Bono
2023-11-20 15:47:18 -06:00
parent dabe0a8b8d
commit 92aa2c5d86
3 changed files with 7 additions and 2 deletions

View File

@@ -119,7 +119,7 @@ jobs:
OSSRH_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
run: |
./gradlew publishArtifacts \
./gradlew publishArtifacts finalizeDeployArtifacts \
--stacktrace \
-PossrhUsername="$OSSRH_TOKEN_USERNAME" -PossrhPassword="$OSSRH_TOKEN_PASSWORD" \
-PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD"

View File

@@ -40,6 +40,11 @@ public class RootProjectPlugin implements Plugin<Project> {
pluginManager.apply(ArtifactoryPlugin.class);
pluginManager.apply(SonarQubeConventionsPlugin.class);
project.getRepositories().mavenCentral();
Task finalizeDeployArtifacts = project.task("finalizeDeployArtifacts");
if (ProjectUtils.isRelease(project) && project.hasProperty("ossrhUsername")) {
finalizeDeployArtifacts.dependsOn(project.getTasks().findByName("closeOssrhStagingRepository"));
}
}
}

View File

@@ -13,7 +13,7 @@ public class PublishArtifactsPlugin implements Plugin<Project> {
publishArtifacts.setGroup("Publishing");
publishArtifacts.setDescription("Publish the artifacts to either Artifactory or Maven Central based on the version");
if (ProjectUtils.isRelease(project)) {
publishArtifacts.dependsOn("publishToOssrh", "closeOssrhStagingRepository");
publishArtifacts.dependsOn("publishToOssrh");
}
else {
publishArtifacts.dependsOn("artifactoryPublish");