Adds support for automated jpms modules

Manifest will be automatically updated with automated jpms entry. As the value we're taking the project name and converting dashes to dots

.gitignore

@@ -25,5 +25,5 @@ _configprops.adoc
 _spans.adoc
 _metrics.adoc
 _conventions.adoc
-package.json
-package-lock.json
+/package.json
+package-lock.json

.settings.xml

@@ -52,14 +52,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</repository>
-				<repository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
 			</repositories>
 			<pluginRepositories>
 				<pluginRepository>

README.adoc

@@ -26,18 +26,6 @@ and to deploy snapshots to repo.spring.io:
 $ mvn deploy -DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/snapshot
 ----
 
-for a RELEASE build use
-
-----
-$ mvn deploy -DaltReleaseDeploymentRepository=repo.spring.io::default::https://repo.spring.io/release
-----
-
-and for jcenter use
-
-----
-$ mvn deploy -DaltReleaseDeploymentRepository=bintray::default::https://api.bintray.com/maven/spring/jars/org.springframework.cloud:build
-----
-
 and for Maven Central use
 
 ----
@@ -347,7 +335,7 @@ approach of generating documentation just add these plugins to your `docs` modul
                     <artifactId>antora-component-version-maven-plugin</artifactId>
                 </plugin>
                 <plugin>
-                    <groupId>io.spring.maven.antora</groupId>
+                    <groupId>org.antora</groupId>
                     <artifactId>antora-maven-plugin</artifactId>
                 </plugin>
                 <plugin>

docs/antora-playbook.yml

@@ -1,14 +1,7 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    # atlas-extension must be before latest-version-extension so latest versions are applied to imported versions
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'cloud-build'
-    - '@springio/antora-extensions/static-page-extension'
 site:
   title: Spring Cloud Build
   url: https://docs.spring.io/spring-cloud-build/reference/
@@ -37,4 +30,4 @@ runtime:
     format: pretty
 ui:
   bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.11/ui-bundle.zip
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.15/ui-bundle.zip

docs/package.json

@@ -0,0 +1,10 @@
+{
+  "dependencies": {
+    "antora": "3.2.0-alpha.4",
+    "@antora/atlas-extension": "1.0.0-alpha.2",
+    "@antora/collector-extension": "1.0.0-alpha.3",
+    "@asciidoctor/tabs": "1.0.0-beta.6",
+    "@springio/antora-extensions": "1.11.1",
+    "@springio/asciidoctor-extensions": "1.0.0-alpha.10"
+  }
+}

docs/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.1.2</version>
+		<version>4.1.3-SNAPSHOT</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
@@ -114,7 +114,7 @@
 						<artifactId>antora-component-version-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>io.spring.maven.antora</groupId>
+						<groupId>org.antora</groupId>
 						<artifactId>antora-maven-plugin</artifactId>
 					</plugin>
 					<plugin>

docs/src/main/asciidoc/README.adoc

@@ -19,18 +19,6 @@ and to deploy snapshots to repo.spring.io:
 $ mvn deploy -DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/snapshot
 ----
 
-for a RELEASE build use
-
-----
-$ mvn deploy -DaltReleaseDeploymentRepository=repo.spring.io::default::https://repo.spring.io/release
-----
-
-and for jcenter use
-
-----
-$ mvn deploy -DaltReleaseDeploymentRepository=bintray::default::https://api.bintray.com/maven/spring/jars/org.springframework.cloud:build
-----
-
 and for Maven Central use
 
 ----

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>4.1.2</version>
+	<version>4.1.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -29,7 +29,7 @@
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
 		<spring-boot.version>3.2.6</spring-boot.version>
-		<spring-cloud-build.version>4.1.2</spring-cloud-build.version>
+		<spring-cloud-build.version>4.1.3-SNAPSHOT</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
 		<docs.classes.dir>${project.build.directory}/build-docs-classes</docs.classes.dir>
 		<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
@@ -139,6 +139,8 @@
 		<copy-missing-html-files.phase>package</copy-missing-html-files.phase>
 		<package-and-attach-docs-zip.phase>package</package-and-attach-docs-zip.phase>
 		<antora-maven-plugin.version>0.0.4</antora-maven-plugin.version>
+		<org-antora-maven-plugin.version>1.0.0-alpha.4</org-antora-maven-plugin.version>
+		<node.version>v16.20.2</node.version>
 		<antora-maven-plugin.phase>prepare-package</antora-maven-plugin.phase>
 		<generate-readme.phase>prepare-package</generate-readme.phase>
 		<generate-cloud-resources.phase>generate-resources</generate-cloud-resources.phase>
@@ -292,6 +294,46 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>${maven-antrun-plugin.version}</version>
+				<dependencies>
+					<dependency>
+						<groupId>ant-contrib</groupId>
+						<artifactId>ant-contrib</artifactId>
+						<version>1.0b3</version>
+						<exclusions>
+							<exclusion>
+								<groupId>ant</groupId>
+								<artifactId>ant</artifactId>
+							</exclusion>
+						</exclusions>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.ant</groupId>
+						<artifactId>ant-nodeps</artifactId>
+						<version>${ant-nodeps.version}</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<id>setup-default-maven-properties</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<exportAntProperties>true</exportAntProperties>
+							<target>
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+								<propertyregex property="java-module-name" override="true"
+											   input="${project.name}" regexp="(-)+" replace="."/>
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
@@ -360,14 +402,14 @@
 								<addDefaultImplementationEntries>true
 								</addDefaultImplementationEntries>
 							</manifest>
+							<manifestEntries>
+								<Implementation-Title>${project.name}</Implementation-Title>
+								<Implementation-Version>${project.version}</Implementation-Version>
+								<Automatic-Module-Name>${java-module-name}</Automatic-Module-Name>
+							</manifestEntries>
 						</archive>
 					</configuration>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-antrun-plugin</artifactId>
-					<version>${maven-antrun-plugin.version}</version>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
@@ -781,14 +823,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</repository>
-				<repository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
 			</repositories>
 			<pluginRepositories>
 				<pluginRepository>
@@ -810,14 +844,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</pluginRepository>
-				<pluginRepository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
 			</pluginRepositories>
 		</profile>
 		<profile>
@@ -1066,22 +1092,18 @@
 							</executions>
 						</plugin>
 						<plugin>
-							<groupId>io.spring.maven.antora</groupId>
+							<groupId>org.antora</groupId>
 							<artifactId>antora-maven-plugin</artifactId>
-							<version>${antora-maven-plugin.version}</version>
+							<version>${org-antora-maven-plugin.version}</version>
+							<extensions>true</extensions>
 							<configuration>
 								<!-- TODO: remove when CI upgrades past ubuntu 1804 -->
-								<node>
-									<version>v16.16.0</version>
-								</node>
-								<packages>
-									<package>@antora/atlas-extension@1.0.0-alpha.1</package>
-									<package>@antora/collector-extension@1.0.0-alpha.3</package>
-									<package>@asciidoctor/tabs@1.0.0-beta.3</package>
-									<package>@springio/antora-extensions@1.6.0</package>
-									<package>@springio/asciidoctor-extensions@1.0.0-alpha.9</package>
-									<package>asciidoctor-kroki@0.17.0</package>
-								</packages>
+								<nodeVersion>${node.version}</nodeVersion>
+								<options>
+									<option>--to-dir=target/antora/site</option>
+									<option>--stacktrace</option>
+									<option>--fetch</option>
+								</options>
 							</configuration>
 							<executions>
 								<execution>
@@ -1279,14 +1301,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</pluginRepository>
-				<pluginRepository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
 			</pluginRepositories>
 		</profile>
 		<profile>

spring-cloud-build-dependencies/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>4.1.2</version>
+	<version>4.1.3-SNAPSHOT</version>
 	<name>spring-cloud-build-dependencies</name>
 	<packaging>pom</packaging>
 	<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -141,14 +141,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</repository>
-				<repository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
 			</repositories>
 			<pluginRepositories>
 				<pluginRepository>
@@ -167,14 +159,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</pluginRepository>
-				<pluginRepository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
 			</pluginRepositories>
 		</profile>
 	</profiles>

spring-cloud-build-tools/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.1.2</version>
+		<version>4.1.3-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>

spring-cloud-dependencies-parent/pom.xml

@@ -4,7 +4,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
-	<version>4.1.2</version>
+	<version>4.1.3-SNAPSHOT</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -187,14 +187,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</repository>
-				<repository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
 			</repositories>
 			<pluginRepositories>
 				<pluginRepository>
@@ -213,14 +205,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</pluginRepository>
-				<pluginRepository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
 			</pluginRepositories>
 		</profile>
 	</profiles>