Add support to distribute an individual project release bundle

releaser-core/src/main/java/releaser/internal/Releaser.java

@@ -40,6 +40,8 @@ import releaser.internal.template.TemplateGenerator;
 
 import org.springframework.util.Assert;
 
+import static releaser.internal.commercial.ReleaseBundleCreator.createReleaseBundleName;
+
 /**
  * @author Marcin Grzejszczak
  */
@@ -395,19 +397,16 @@ public class Releaser {
 		List<String> repos = commercialRepos.get(projectName);
 		log.info("Creating release bundles for project [{}] in repos [{}]", projectName, repos);
 		try {
-			boolean result = this.releaseBundleCreator.createReleaseBundle(repos, versionFromBom.version,
-					"TNZ-" + projectName + "-commercial");
-			if (!result) {
-				log.warn("Failed to create release bundle");
-				return ExecutionResult.unstable(new BuildUnstableException("Failed to create a release bundle"));
+			if (this.releaseBundleCreator.createReleaseBundle(repos, versionFromBom.version,
+					createReleaseBundleName(projectName))) {
+				log.info("\nSuccessfully created a release bundle");
+				return ExecutionResult.success();
 			}
-			log.info("\nSuccessfully created a release bundle");
-			return ExecutionResult.success();
 		}
 		catch (Exception ex) {
 			log.error("Failed to create a release bundle", ex);
-			return ExecutionResult.unstable(new BuildUnstableException("Failed to create a release bundle", ex));
 		}
+		return ExecutionResult.unstable(new BuildUnstableException("Failed to create a release bundle"));
 	}
 
 	private boolean shouldCreateReleaseBundle(boolean dryRun, boolean isSnapshot, boolean commercial) {
@@ -432,21 +431,34 @@ public class Releaser {
 			return ExecutionResult.skipped();
 		}
 		try {
-			boolean result = this.releaseBundleCreator.createReleaseTrainSourceBundle(projectsWithNewRelease,
-					projectVersion.version);
-			if (!result) {
-				log.warn("Failed to create release train source bundle");
-				return ExecutionResult
-						.unstable(new BuildUnstableException("Failed to create a release train source bundle"));
+			if (this.releaseBundleCreator.createReleaseTrainSourceBundle(projectsWithNewRelease,
+					projectVersion.version)) {
+				log.info("\nSuccessfully created a release train source bundle");
+				return ExecutionResult.success();
 			}
-			log.info("\nSuccessfully created a release train source bundle");
-			return ExecutionResult.success();
 		}
 		catch (Exception ex) {
 			log.error("Failed to create a release train source bundle", ex);
-			return ExecutionResult
-					.unstable(new BuildUnstableException("Failed to create a release train source bundle", ex));
 		}
+		return ExecutionResult.unstable(new BuildUnstableException("Failed to create a release train source bundle"));
+	}
+
+	public ExecutionResult distributeProjectReleaseBundle(boolean isCommercial, boolean dryRun,
+			ProjectVersion projectVersion) {
+		if (!shouldCreateReleaseBundle(dryRun, projectVersion.isSnapshot(), isCommercial)) {
+			return ExecutionResult.skipped();
+		}
+		try {
+			if (this.releaseBundleCreator.distributeProjectReleaseBundle(
+					createReleaseBundleName(projectVersion.projectName), projectVersion.version)) {
+				log.info("\nSuccessfully distributed a project release bundle");
+				return ExecutionResult.success();
+			}
+		}
+		catch (Exception ex) {
+			log.error("Failed to distribute a project release bundle", ex);
+		}
+		return ExecutionResult.unstable(new BuildUnstableException("Failed to distribute a project release bundle"));
 	}
 
 	public ExecutionResult distributeReleaseTrainSourceBundle(boolean isCommercial, boolean dryRun,
@@ -455,20 +467,17 @@ public class Releaser {
 			return ExecutionResult.skipped();
 		}
 		try {
-			boolean result = this.releaseBundleCreator.distributeReleaseTrainSourceBundle(projectVersion.version);
-			if (!result) {
-				log.warn("Failed to distribute release train source bundle");
-				return ExecutionResult
-						.unstable(new BuildUnstableException("Failed to distribute a release train source bundle"));
+			if (this.releaseBundleCreator.distributeReleaseTrainSourceBundle(projectVersion.version)) {
+				log.info("\nSuccessfully distributed a release train source bundle");
+				return ExecutionResult.success();
 			}
-			log.info("\nSuccessfully distributed a release train source bundle");
-			return ExecutionResult.success();
 		}
 		catch (Exception ex) {
 			log.error("Failed to distribute a release train source bundle", ex);
-			return ExecutionResult
-					.unstable(new BuildUnstableException("Failed to distribute a release train source bundle", ex));
+
 		}
+		return ExecutionResult
+				.unstable(new BuildUnstableException("Failed to distribute a release train source bundle"));
 	}
 
 }

releaser-core/src/main/java/releaser/internal/ReleaserProperties.java

@@ -223,7 +223,8 @@ public class ReleaserProperties implements Serializable {
 		return "ReleaserProperties{" + "workingDir='" + this.workingDir + '\'' + ", git=" + this.git + ", pom="
 				+ this.pom + ", maven=" + this.maven + ", gradle=" + this.gradle + ", sagan=" + this.sagan
 				+ ", fixedVersions=" + this.fixedVersions + ", metaRelease=" + this.metaRelease + ", template="
-				+ this.template + ", versions=" + this.versions + ", commercial=" + this.commercial + '}';
+				+ this.template + ", versions=" + this.versions + ", commercial=" + this.commercial + ", bundles="
+				+ this.bundles + '}';
 	}
 
 	public ReleaserProperties copy() {
@@ -1579,7 +1580,9 @@ public class ReleaserProperties implements Serializable {
 
 		private boolean createReleaseTrainReleaseBundle = false;
 
-		private boolean distributeReleaseBundle = false;
+		private boolean distributeReleaseTrainSourceBundle = false;
+
+		private boolean distributeProjectReleaseBundle = false;
 
 		private String repoUrl = "https://usw1.packages.broadcom.com";
 
@@ -1605,12 +1608,20 @@ public class ReleaserProperties implements Serializable {
 			this.createReleaseTrainReleaseBundle = createReleaseTrainReleaseBundle;
 		}
 
-		public boolean isDistributeReleaseBundle() {
-			return distributeReleaseBundle;
+		public boolean isDistributeReleaseTrainSourceBundle() {
+			return distributeReleaseTrainSourceBundle;
 		}
 
-		public void setDistributeReleaseBundle(boolean distributeReleaseBundle) {
-			this.distributeReleaseBundle = distributeReleaseBundle;
+		public void setDistributeReleaseTrainSourceBundle(boolean distributeReleaseTrainSourceBundle) {
+			this.distributeReleaseTrainSourceBundle = distributeReleaseTrainSourceBundle;
+		}
+
+		public boolean isDistributeProjectReleaseBundle() {
+			return distributeProjectReleaseBundle;
+		}
+
+		public void setDistributeProjectReleaseBundle(boolean distributeProjectReleaseBundle) {
+			this.distributeProjectReleaseBundle = distributeProjectReleaseBundle;
 		}
 
 		public Map<String, List<String>> getRepos() {
@@ -1645,6 +1656,16 @@ public class ReleaserProperties implements Serializable {
 			this.repoAccessToken = repoAccessToken;
 		}
 
+		@Override
+		public String toString() {
+			return "Bundles{" + "createProjectReleaseBundle=" + createProjectReleaseBundle
+					+ ", createReleaseTrainReleaseBundle=" + createReleaseTrainReleaseBundle
+					+ ", distributeReleaseTrainSourceBundle=" + distributeReleaseTrainSourceBundle
+					+ ", distributeProjectReleaseBundle=" + distributeProjectReleaseBundle + ", repoUrl='" + repoUrl
+					+ '\'' + ", repoUsername='" + repoUsername + '\'' + ", repoAccessToken='" + repoAccessToken + '\''
+					+ ", repos=" + repos + '}';
+		}
+
 	}
 
 }

releaser-core/src/main/java/releaser/internal/commercial/ReleaseBundleCreator.java

@@ -121,11 +121,15 @@ public class ReleaseBundleCreator {
 		Map<String, Object> json = new HashMap<>();
 		json.put("project_key", "spring");
 		json.put("repository_key", "spring-release-bundles-v2");
-		json.put("release_bundle_name", "TNZ-" + project.projectName + "-commercial");
+		json.put("release_bundle_name", createReleaseBundleName(project.projectName));
 		json.put("release_bundle_version", project.version);
 		return json;
 	}
 
+	public static String createReleaseBundleName(String projectName) {
+		return "TNZ-" + projectName + "-commercial";
+	}
+
 	public boolean distributeReleaseTrainSourceBundle(String version) throws IOException {
 		return distributeReleaseBundle(RELEASE_TRAIN_BUNDLE_NAME, version,
 				objectMapper.writeValueAsString(createDistributionJson()));
@@ -168,4 +172,8 @@ public class ReleaseBundleCreator {
 		return Collections.singletonMap("mappings", mappingsArray);
 	}
 
+	public boolean distributeProjectReleaseBundle(String projectName, String version) throws IOException {
+		return distributeReleaseBundle(projectName, version, objectMapper.writeValueAsString(createDistributionJson()));
+	}
+
 }

releaser-spring/src/main/java/releaser/internal/tasks/postrelease/CreateProjectReleaseBundlePostReleaseTask.java

@@ -60,7 +60,7 @@ public class CreateProjectReleaseBundlePostReleaseTask implements ProjectPostRel
 	}
 
 	@Override
-	public ExecutionResult runTask(Arguments args) throws BuildUnstableException, RuntimeException {
+	public ExecutionResult runTask(Arguments args) throws BuildUnstableException {
 		return this.releaser.createReleaseBundle(args.properties.isCommercial(), args.versionFromBom,
 				args.options.dryRun, args.properties.getBundles().getRepos(),
 				new ProjectVersion(args.project).projectName);

releaser-spring/src/main/java/releaser/internal/tasks/postrelease/DistributeProjectReleaseBundleTask.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2013-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package releaser.internal.tasks.postrelease;
+
+import releaser.internal.Releaser;
+import releaser.internal.spring.Arguments;
+import releaser.internal.tasks.ProjectPostReleaseReleaserTask;
+import releaser.internal.tech.BuildUnstableException;
+import releaser.internal.tech.ExecutionResult;
+
+/**
+ * @author Ryan Baxter
+ */
+public class DistributeProjectReleaseBundleTask implements ProjectPostReleaseReleaserTask {
+
+	public int ORDER = CreateProjectReleaseBundlePostReleaseTask.ORDER + 10;
+
+	private Releaser releaser;
+
+	public DistributeProjectReleaseBundleTask(Releaser releaser) {
+		this.releaser = releaser;
+	}
+
+	@Override
+	public String name() {
+		return "Distribute Project Release Bundle Task";
+	}
+
+	@Override
+	public String shortName() {
+		return "dprbt";
+	}
+
+	@Override
+	public String header() {
+		return "DISTRIBUTE PROJECT RELEASE BUNDLE TASK";
+	}
+
+	@Override
+	public String description() {
+		return "Distributes a release bundle for an individual project.";
+	}
+
+	@Override
+	public ExecutionResult runTask(Arguments args) throws BuildUnstableException {
+		return releaser.distributeProjectReleaseBundle(args.properties.isCommercial(), args.options.dryRun,
+				args.versionFromBom);
+	}
+
+	@Override
+	public int getOrder() {
+		return ORDER;
+	}
+
+}

releaser-spring/src/main/java/releaser/internal/tasks/postrelease/DistributeReleaseTrainSourceBundleTask.java

@@ -25,7 +25,7 @@ import releaser.internal.tech.ExecutionResult;
 /**
  * @author Ryan Baxter
  */
-public class DistributeReleaseBundleTask implements TrainPostReleaseReleaserTask {
+public class DistributeReleaseTrainSourceBundleTask implements TrainPostReleaseReleaserTask {
 
 	/**
 	 * Order of this task. The higher value, the lower order.
@@ -34,7 +34,7 @@ public class DistributeReleaseBundleTask implements TrainPostReleaseReleaserTask
 
 	private final Releaser releaser;
 
-	public DistributeReleaseBundleTask(Releaser releaser) {
+	public DistributeReleaseTrainSourceBundleTask(Releaser releaser) {
 		this.releaser = releaser;
 	}
 

releaser-spring/src/main/java/releaser/internal/tasks/postrelease/PostReleaseTasksConfiguration.java

@@ -108,9 +108,16 @@ class PostReleaseTasksConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnProperty("releaser.bundles.distribute-release-bundle")
-	DistributeReleaseBundleTask distributeReleaseBundleTask(Releaser releaser) {
-		return new DistributeReleaseBundleTask(releaser);
+	@ConditionalOnProperty("releaser.bundles.distribute-release-train-source-bundle")
+	DistributeReleaseTrainSourceBundleTask distributeReleaseBundleTask(Releaser releaser) {
+		return new DistributeReleaseTrainSourceBundleTask(releaser);
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	@ConditionalOnProperty("releaser.bundles.distribute-project-release-bundle")
+	DistributeProjectReleaseBundleTask distributeProjectReleaseBundleTask(Releaser releaser) {
+		return new DistributeProjectReleaseBundleTask(releaser);
 	}
 
 }