Merge branch '3.3.x'

Closes gh-43225

Author: wilkinsona

buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraContributorPlugin.java

@@ -48,6 +48,8 @@ public static class Contribution {
 
 		private final Project project;
 
+		private boolean publish;
+
 		@Inject
 		public Contribution(String name, Project project) {
 			this.name = name;
@@ -58,20 +60,24 @@ public String getName() {
 			return this.name;
 		}
 
+		public void publish() {
+			this.publish = true;
+		}
+
 		public void source() {
 			new SourceContribution(this.project, this.name).produce();
 		}
 
 		public void catalogContent(Action<CopySpec> action) {
 			CopySpec copySpec = this.project.copySpec();
 			action.execute(copySpec);
-			new CatalogContentContribution(this.project, this.name).produceFrom(copySpec);
+			new CatalogContentContribution(this.project, this.name).produceFrom(copySpec, this.publish);
 		}
 
 		public void aggregateContent(Action<CopySpec> action) {
 			CopySpec copySpec = this.project.copySpec();
 			action.execute(copySpec);
-			new AggregateContentContribution(this.project, this.name).produceFrom(copySpec);
+			new AggregateContentContribution(this.project, this.name).produceFrom(copySpec, this.publish);
 		}
 
 		public void localAggregateContent(Action<CopySpec> action) {

buildSrc/src/main/java/org/springframework/boot/build/antora/ConsumableContentContribution.java

@@ -42,7 +42,14 @@ protected ConsumableContentContribution(Project project, String type, String nam
 
 	@Override
 	void produceFrom(CopySpec copySpec) {
+		this.produceFrom(copySpec, false);
+	}
+
+	void produceFrom(CopySpec copySpec, boolean publish) {
 		TaskProvider<? extends Task> producer = super.configureProduction(copySpec);
+		if (publish) {
+			publish(producer);
+		}
 		Configuration configuration = createConfiguration(getName(),
 				"Configuration for %s Antora %s content artifacts.");
 		configuration.setCanBeConsumed(true);
@@ -63,11 +70,15 @@ void consumeFrom(String path) {
 				CopyAntoraContent.class, (task) -> configureCopyContent(task, path, configuration, outputDirectory));
 		configureAntora(addInputFrom(copyAntoraContent, configuration.getName()));
 		configurePlaybookGeneration(this::addToZipContentsCollectorDependencies);
+		publish(copyAntoraContent);
+	}
+
+	void publish(TaskProvider<? extends Task> producer) {
 		getProject().getExtensions()
 			.getByType(PublishingExtension.class)
 			.getPublications()
 			.withType(MavenPublication.class)
-			.configureEach((mavenPublication) -> addPublishedMavenArtifact(mavenPublication, copyAntoraContent));
+			.configureEach((mavenPublication) -> addPublishedMavenArtifact(mavenPublication, producer));
 	}
 
 	private void configureCopyContent(CopyAntoraContent task, String path, Configuration configuration,
@@ -82,10 +93,10 @@ private void addToZipContentsCollectorDependencies(GenerateAntoraPlaybook task)
 		task.getAntoraExtensions().getZipContentsCollector().getDependencies().add(getName());
 	}
 
-	private void addPublishedMavenArtifact(MavenPublication mavenPublication, TaskProvider<?> copyAntoraContent) {
+	private void addPublishedMavenArtifact(MavenPublication mavenPublication, TaskProvider<?> producer) {
 		if ("maven".equals(mavenPublication.getName())) {
 			String classifier = "%s-%s-content".formatted(getName(), getType());
-			mavenPublication.artifact(copyAntoraContent, (mavenArtifact) -> mavenArtifact.setClassifier(classifier));
+			mavenPublication.artifact(producer, (mavenArtifact) -> mavenArtifact.setClassifier(classifier));
 		}
 	}
 

spring-boot-project/spring-boot-docs/build.gradle

@@ -328,6 +328,7 @@ antoraDependencies {
 
 antoraContributions {
 	'api' {
+		publish()
 		catalogContent {
 			from(aggregatedJavadoc) {
 				into "java"
@@ -338,6 +339,7 @@ antoraContributions {
 		}
 	}
 	'root' {
+		publish()
 		aggregateContent {
 			from("src/main") {
 				into "modules/ROOT/examples"