Fix docs some more

Author: dsyer

build-docs.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 # Generate the README.md, CONTRIBUTING.md and the Antora site
-./mvnw package -DskipTests
+./mvnw package -P javadoc -DskipTests
 ./mvnw -pl spring-grpc-docs package antora

pom.xml

@@ -212,7 +212,6 @@
 						<id>javadoc</id>
 						<goals>
 							<goal>jar</goal>
-							<goal>aggregate-no-fork</goal>
 						</goals>
 						<phase>package</phase>
 					</execution>

spring-grpc-docs/pom.xml

@@ -72,27 +72,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${maven-assembly-plugin.version}</version>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assembly/javadocs.xml</descriptor>
-					</descriptors>
-					<finalName>spring-grpc-${project.version}</finalName>
-					<appendAssemblyId>true</appendAssemblyId>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
@@ -187,6 +166,36 @@
 			</plugin>
 		</plugins>
 	</build>
+	<profiles>
+		<profile>
+			<id>javadoc</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<version>${maven-assembly-plugin.version}</version>
+						<configuration>
+							<descriptors>
+								<descriptor>src/assembly/javadocs.xml</descriptor>
+							</descriptors>
+							<finalName>spring-grpc-${project.version}</finalName>
+							<appendAssemblyId>true</appendAssemblyId>
+						</configuration>
+						<executions>
+							<execution>
+								<id>make-assembly</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 
 	<repositories>
 		<repository>

spring-grpc-docs/src/main/antora/antora.yml

@@ -6,7 +6,7 @@ nav:
 ext:
   collector:
     - run:
-        command: mvnw process-resources
+        command: mvnw package -P javadoc -DskipTests
         local: true
       scan:
         dir: spring-grpc-docs/target/classes/antora-resources