From 7cbb1216945693d07da5af7c15fd8ee498c318fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Wed, 15 Oct 2025 17:33:13 +0200
Subject: [PATCH 01/29] Initial

---
 cloudplatform/dwc-cf/pom.xml                  |  3 ++
 .../datamodel-metadata-generator/pom.xml      |  3 ++
 datamodel/odata-generator-utility/pom.xml     |  1 +
 .../odata-v4/odata-v4-api-sample/pom.xml      |  3 ++
 .../odata-v4-generator-maven-plugin/pom.xml   |  1 +
 datamodel/odata-v4/odata-v4-generator/pom.xml |  1 +
 datamodel/odata/odata-api-sample/pom.xml      |  3 ++
 .../odata-generator-maven-plugin/pom.xml      |  1 +
 datamodel/odata/odata-generator/pom.xml       |  1 +
 datamodel/soap/pom.xml                        |  3 ++
 pom.xml                                       | 51 +++++++++++++++++++
 s4hana/rfc/pom.xml                            |  3 ++
 s4hana/s4hana-connectivity/pom.xml            |  3 ++
 s4hana/s4hana-core/pom.xml                    |  3 ++
 testutil/pom.xml                              |  1 +
 15 files changed, 81 insertions(+)

diff --git a/cloudplatform/dwc-cf/pom.xml b/cloudplatform/dwc-cf/pom.xml
index a88cb744c..32b617363 100644
--- a/cloudplatform/dwc-cf/pom.xml
+++ b/cloudplatform/dwc-cf/pom.xml
@@ -30,6 +30,9 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
+	<properties>
+		<skipJavaDoc>true</skipJavaDoc>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cloud.sdk</groupId>
diff --git a/datamodel/datamodel-metadata-generator/pom.xml b/datamodel/datamodel-metadata-generator/pom.xml
index 49fcda545..cdee82724 100644
--- a/datamodel/datamodel-metadata-generator/pom.xml
+++ b/datamodel/datamodel-metadata-generator/pom.xml
@@ -28,6 +28,9 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
+	<properties>
+		<skipJavaDoc>true</skipJavaDoc>
+	</properties>
 	<dependencies>
 		<!-- scope compile -->
 		<dependency>
diff --git a/datamodel/odata-generator-utility/pom.xml b/datamodel/odata-generator-utility/pom.xml
index da52e3a24..0b68c9859 100644
--- a/datamodel/odata-generator-utility/pom.xml
+++ b/datamodel/odata-generator-utility/pom.xml
@@ -31,6 +31,7 @@
 	<properties>
 		<!-- allow scope compile for lombok -->
 		<enforcer.skipEnforceScopeLombok>true</enforcer.skipEnforceScopeLombok>
+		<skipJavaDoc>true</skipJavaDoc>
 	</properties>
 	<dependencies>
 		<!-- Scope: Compile -->
diff --git a/datamodel/odata-v4/odata-v4-api-sample/pom.xml b/datamodel/odata-v4/odata-v4-api-sample/pom.xml
index 104b05a74..1ad45a8fd 100644
--- a/datamodel/odata-v4/odata-v4-api-sample/pom.xml
+++ b/datamodel/odata-v4/odata-v4-api-sample/pom.xml
@@ -28,6 +28,9 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
+	<properties>
+		<skipJavaDoc>true</skipJavaDoc>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cloud.sdk.datamodel</groupId>
diff --git a/datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml b/datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml
index 9270b8f18..5b0be9498 100644
--- a/datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml
+++ b/datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml
@@ -36,6 +36,7 @@
 		<enforcer.skipEnforceScopeLombok>true</enforcer.skipEnforceScopeLombok>
 		<!-- allow JUnit 4 as we need to compile against MojoRule, but we don't use JUnit 4 for test execution itself -->
 		<enforcer.skipBanJunit4>true</enforcer.skipBanJunit4>
+		<skipJavaDoc>true</skipJavaDoc>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/datamodel/odata-v4/odata-v4-generator/pom.xml b/datamodel/odata-v4/odata-v4-generator/pom.xml
index 678379386..c507e97d4 100644
--- a/datamodel/odata-v4/odata-v4-generator/pom.xml
+++ b/datamodel/odata-v4/odata-v4-generator/pom.xml
@@ -36,6 +36,7 @@
 		<enforcer.skipEnforceScopeLombok>true</enforcer.skipEnforceScopeLombok>
 		<surefire.tempDirectory>target</surefire.tempDirectory>
 		<jsr305.optional>false</jsr305.optional>
+		<skipJavaDoc>true</skipJavaDoc>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/datamodel/odata/odata-api-sample/pom.xml b/datamodel/odata/odata-api-sample/pom.xml
index 6ba768777..da70fb0e1 100644
--- a/datamodel/odata/odata-api-sample/pom.xml
+++ b/datamodel/odata/odata-api-sample/pom.xml
@@ -28,6 +28,9 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
+	<properties>
+		<skipJavaDoc>true</skipJavaDoc>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
diff --git a/datamodel/odata/odata-generator-maven-plugin/pom.xml b/datamodel/odata/odata-generator-maven-plugin/pom.xml
index 54203172f..a7cd70a91 100644
--- a/datamodel/odata/odata-generator-maven-plugin/pom.xml
+++ b/datamodel/odata/odata-generator-maven-plugin/pom.xml
@@ -36,6 +36,7 @@
 		<enforcer.skipEnforceScopeLombok>true</enforcer.skipEnforceScopeLombok>
 		<!-- allow JUnit 4 as we need to compile against MojoRule, but we don't use JUnit 4 for test execution itself -->
 		<enforcer.skipBanJunit4>true</enforcer.skipBanJunit4>
+		<skipJavaDoc>true</skipJavaDoc>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/datamodel/odata/odata-generator/pom.xml b/datamodel/odata/odata-generator/pom.xml
index fb57e9dee..17da3f9da 100644
--- a/datamodel/odata/odata-generator/pom.xml
+++ b/datamodel/odata/odata-generator/pom.xml
@@ -36,6 +36,7 @@
 		<enforcer.skipEnforceScopeLombok>true</enforcer.skipEnforceScopeLombok>
 		<surefire.tempDirectory>target</surefire.tempDirectory>
 		<jsr305.optional>false</jsr305.optional>
+		<skipJavaDoc>true</skipJavaDoc>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/datamodel/soap/pom.xml b/datamodel/soap/pom.xml
index 58572c627..8135abec9 100644
--- a/datamodel/soap/pom.xml
+++ b/datamodel/soap/pom.xml
@@ -28,6 +28,9 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
+	<properties>
+		<skipJavaDoc>true</skipJavaDoc>
+	</properties>
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
diff --git a/pom.xml b/pom.xml
index 475326a5d..e0aa3ac14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,7 @@
 		<jsr305.optional>true</jsr305.optional>
 		<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
 		<maven.compiler.proc>full</maven.compiler.proc>
+		<skipJavaDoc>false</skipJavaDoc>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -928,6 +929,56 @@
 					<maxHeap>2048</maxHeap>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.projectlombok</groupId>
+				<artifactId>lombok-maven-plugin</artifactId>
+				<version>1.18.20.0</version>
+				<configuration>
+					<sourceDirectory>src/main/java</sourceDirectory>
+					<outputDirectory>target/delombok</outputDirectory>
+					<skip>${skipJavaDoc}</skip>
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.projectlombok</groupId>
+						<artifactId>lombok</artifactId>
+						<version>1.18.42</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<skip>${skipJavaDoc}</skip>
+					<quiet>true</quiet>
+					<doclint>none</doclint>
+					<show>protected</show>
+					<encoding>UTF-8</encoding>
+					<additionalJOptions>
+						<additionalJOption>-Xdoclint:none</additionalJOption>
+						<additionalJOption>-quiet</additionalJOption>
+					</additionalJOptions>
+					<groups>
+						<group>
+							<title>Cloud Platform</title>
+							<packages>com.sap.cloud.sdk.cloudplatform*</packages>
+						</group>
+						<group>
+							<title>Utility Packages</title>
+							<packages>com.sap.cloud.sdk.datamodel* :com.sap.cloud.sdk.result*:*
+								:com.sap.cloud.sdk.scp* :com.sap.cloud.sdk.testutil*
+								:com.sap.cloud.sdk.typeconverter* :com.sap.marmolata* :com.sap.security*
+								:org.eclipse*</packages>
+						</group>
+						<group>
+							<title>SAP S/4HANA</title>
+							<packages>com.sap.cloud.sdk.s4hana*</packages>
+						</group>
+					</groups>
+					<overview>${project.rootdir}/javadoc.overview.html</overview>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<profiles>
diff --git a/s4hana/rfc/pom.xml b/s4hana/rfc/pom.xml
index c1e481210..cf595a184 100644
--- a/s4hana/rfc/pom.xml
+++ b/s4hana/rfc/pom.xml
@@ -28,6 +28,9 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
+	<properties>
+		<skipJavaDoc>true</skipJavaDoc>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
diff --git a/s4hana/s4hana-connectivity/pom.xml b/s4hana/s4hana-connectivity/pom.xml
index 9eba66e2a..8a60629c2 100644
--- a/s4hana/s4hana-connectivity/pom.xml
+++ b/s4hana/s4hana-connectivity/pom.xml
@@ -28,6 +28,9 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
+	<properties>
+		<skipJavaDoc>true</skipJavaDoc>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
diff --git a/s4hana/s4hana-core/pom.xml b/s4hana/s4hana-core/pom.xml
index 20e051a0e..cb0dc25e0 100644
--- a/s4hana/s4hana-core/pom.xml
+++ b/s4hana/s4hana-core/pom.xml
@@ -28,6 +28,9 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
+	<properties>
+		<skipJavaDoc>true</skipJavaDoc>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
diff --git a/testutil/pom.xml b/testutil/pom.xml
index 00daf062b..61a98b0d4 100644
--- a/testutil/pom.xml
+++ b/testutil/pom.xml
@@ -31,6 +31,7 @@
 	<properties>
 		<enforcer.skipBanWiremockCompileScope>true</enforcer.skipBanWiremockCompileScope>
 		<project.rootdir>${project.basedir}/../</project.rootdir>
+		<skipJavaDoc>true</skipJavaDoc>
 	</properties>
 	<dependencies>
 		<!-- Please note: One can **not** use this module within any of the Cloud SDK modules listed below, as that would lead to circular dependencies.

From 1a8add443faf11b766c448c98300c043e837c1dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 10:43:57 +0200
Subject: [PATCH 02/29] Reduce change

---
 cloudplatform/dwc-cf/pom.xml                  |  3 --
 .../datamodel-metadata-generator/pom.xml      |  3 --
 datamodel/odata-generator-utility/pom.xml     |  1 -
 .../odata-v4/odata-v4-api-sample/pom.xml      |  3 --
 .../odata-v4-generator-maven-plugin/pom.xml   |  1 -
 datamodel/odata-v4/odata-v4-generator/pom.xml |  1 -
 datamodel/odata/odata-api-sample/pom.xml      |  3 --
 .../odata-generator-maven-plugin/pom.xml      |  1 -
 datamodel/odata/odata-generator/pom.xml       |  1 -
 datamodel/soap/pom.xml                        |  3 --
 pom.xml                                       | 34 -------------------
 s4hana/rfc/pom.xml                            |  3 --
 s4hana/s4hana-connectivity/pom.xml            |  3 --
 s4hana/s4hana-core/pom.xml                    |  3 --
 testutil/pom.xml                              |  1 -
 15 files changed, 64 deletions(-)

diff --git a/cloudplatform/dwc-cf/pom.xml b/cloudplatform/dwc-cf/pom.xml
index 32b617363..a88cb744c 100644
--- a/cloudplatform/dwc-cf/pom.xml
+++ b/cloudplatform/dwc-cf/pom.xml
@@ -30,9 +30,6 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
-	<properties>
-		<skipJavaDoc>true</skipJavaDoc>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cloud.sdk</groupId>
diff --git a/datamodel/datamodel-metadata-generator/pom.xml b/datamodel/datamodel-metadata-generator/pom.xml
index cdee82724..49fcda545 100644
--- a/datamodel/datamodel-metadata-generator/pom.xml
+++ b/datamodel/datamodel-metadata-generator/pom.xml
@@ -28,9 +28,6 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
-	<properties>
-		<skipJavaDoc>true</skipJavaDoc>
-	</properties>
 	<dependencies>
 		<!-- scope compile -->
 		<dependency>
diff --git a/datamodel/odata-generator-utility/pom.xml b/datamodel/odata-generator-utility/pom.xml
index 0b68c9859..da52e3a24 100644
--- a/datamodel/odata-generator-utility/pom.xml
+++ b/datamodel/odata-generator-utility/pom.xml
@@ -31,7 +31,6 @@
 	<properties>
 		<!-- allow scope compile for lombok -->
 		<enforcer.skipEnforceScopeLombok>true</enforcer.skipEnforceScopeLombok>
-		<skipJavaDoc>true</skipJavaDoc>
 	</properties>
 	<dependencies>
 		<!-- Scope: Compile -->
diff --git a/datamodel/odata-v4/odata-v4-api-sample/pom.xml b/datamodel/odata-v4/odata-v4-api-sample/pom.xml
index 1ad45a8fd..104b05a74 100644
--- a/datamodel/odata-v4/odata-v4-api-sample/pom.xml
+++ b/datamodel/odata-v4/odata-v4-api-sample/pom.xml
@@ -28,9 +28,6 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
-	<properties>
-		<skipJavaDoc>true</skipJavaDoc>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cloud.sdk.datamodel</groupId>
diff --git a/datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml b/datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml
index 5b0be9498..9270b8f18 100644
--- a/datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml
+++ b/datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml
@@ -36,7 +36,6 @@
 		<enforcer.skipEnforceScopeLombok>true</enforcer.skipEnforceScopeLombok>
 		<!-- allow JUnit 4 as we need to compile against MojoRule, but we don't use JUnit 4 for test execution itself -->
 		<enforcer.skipBanJunit4>true</enforcer.skipBanJunit4>
-		<skipJavaDoc>true</skipJavaDoc>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/datamodel/odata-v4/odata-v4-generator/pom.xml b/datamodel/odata-v4/odata-v4-generator/pom.xml
index c507e97d4..678379386 100644
--- a/datamodel/odata-v4/odata-v4-generator/pom.xml
+++ b/datamodel/odata-v4/odata-v4-generator/pom.xml
@@ -36,7 +36,6 @@
 		<enforcer.skipEnforceScopeLombok>true</enforcer.skipEnforceScopeLombok>
 		<surefire.tempDirectory>target</surefire.tempDirectory>
 		<jsr305.optional>false</jsr305.optional>
-		<skipJavaDoc>true</skipJavaDoc>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/datamodel/odata/odata-api-sample/pom.xml b/datamodel/odata/odata-api-sample/pom.xml
index da70fb0e1..6ba768777 100644
--- a/datamodel/odata/odata-api-sample/pom.xml
+++ b/datamodel/odata/odata-api-sample/pom.xml
@@ -28,9 +28,6 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
-	<properties>
-		<skipJavaDoc>true</skipJavaDoc>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
diff --git a/datamodel/odata/odata-generator-maven-plugin/pom.xml b/datamodel/odata/odata-generator-maven-plugin/pom.xml
index a7cd70a91..54203172f 100644
--- a/datamodel/odata/odata-generator-maven-plugin/pom.xml
+++ b/datamodel/odata/odata-generator-maven-plugin/pom.xml
@@ -36,7 +36,6 @@
 		<enforcer.skipEnforceScopeLombok>true</enforcer.skipEnforceScopeLombok>
 		<!-- allow JUnit 4 as we need to compile against MojoRule, but we don't use JUnit 4 for test execution itself -->
 		<enforcer.skipBanJunit4>true</enforcer.skipBanJunit4>
-		<skipJavaDoc>true</skipJavaDoc>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/datamodel/odata/odata-generator/pom.xml b/datamodel/odata/odata-generator/pom.xml
index 17da3f9da..fb57e9dee 100644
--- a/datamodel/odata/odata-generator/pom.xml
+++ b/datamodel/odata/odata-generator/pom.xml
@@ -36,7 +36,6 @@
 		<enforcer.skipEnforceScopeLombok>true</enforcer.skipEnforceScopeLombok>
 		<surefire.tempDirectory>target</surefire.tempDirectory>
 		<jsr305.optional>false</jsr305.optional>
-		<skipJavaDoc>true</skipJavaDoc>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/datamodel/soap/pom.xml b/datamodel/soap/pom.xml
index 8135abec9..58572c627 100644
--- a/datamodel/soap/pom.xml
+++ b/datamodel/soap/pom.xml
@@ -28,9 +28,6 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
-	<properties>
-		<skipJavaDoc>true</skipJavaDoc>
-	</properties>
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
diff --git a/pom.xml b/pom.xml
index e0aa3ac14..fccba995a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,6 @@
 		<jsr305.optional>true</jsr305.optional>
 		<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
 		<maven.compiler.proc>full</maven.compiler.proc>
-		<skipJavaDoc>false</skipJavaDoc>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -946,39 +945,6 @@
 					</dependency>
 				</dependencies>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<skip>${skipJavaDoc}</skip>
-					<quiet>true</quiet>
-					<doclint>none</doclint>
-					<show>protected</show>
-					<encoding>UTF-8</encoding>
-					<additionalJOptions>
-						<additionalJOption>-Xdoclint:none</additionalJOption>
-						<additionalJOption>-quiet</additionalJOption>
-					</additionalJOptions>
-					<groups>
-						<group>
-							<title>Cloud Platform</title>
-							<packages>com.sap.cloud.sdk.cloudplatform*</packages>
-						</group>
-						<group>
-							<title>Utility Packages</title>
-							<packages>com.sap.cloud.sdk.datamodel* :com.sap.cloud.sdk.result*:*
-								:com.sap.cloud.sdk.scp* :com.sap.cloud.sdk.testutil*
-								:com.sap.cloud.sdk.typeconverter* :com.sap.marmolata* :com.sap.security*
-								:org.eclipse*</packages>
-						</group>
-						<group>
-							<title>SAP S/4HANA</title>
-							<packages>com.sap.cloud.sdk.s4hana*</packages>
-						</group>
-					</groups>
-					<overview>${project.rootdir}/javadoc.overview.html</overview>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<profiles>
diff --git a/s4hana/rfc/pom.xml b/s4hana/rfc/pom.xml
index cf595a184..c1e481210 100644
--- a/s4hana/rfc/pom.xml
+++ b/s4hana/rfc/pom.xml
@@ -28,9 +28,6 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
-	<properties>
-		<skipJavaDoc>true</skipJavaDoc>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
diff --git a/s4hana/s4hana-connectivity/pom.xml b/s4hana/s4hana-connectivity/pom.xml
index 8a60629c2..9eba66e2a 100644
--- a/s4hana/s4hana-connectivity/pom.xml
+++ b/s4hana/s4hana-connectivity/pom.xml
@@ -28,9 +28,6 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
-	<properties>
-		<skipJavaDoc>true</skipJavaDoc>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
diff --git a/s4hana/s4hana-core/pom.xml b/s4hana/s4hana-core/pom.xml
index cb0dc25e0..20e051a0e 100644
--- a/s4hana/s4hana-core/pom.xml
+++ b/s4hana/s4hana-core/pom.xml
@@ -28,9 +28,6 @@
 			<organizationUrl>https://www.sap.com</organizationUrl>
 		</developer>
 	</developers>
-	<properties>
-		<skipJavaDoc>true</skipJavaDoc>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
diff --git a/testutil/pom.xml b/testutil/pom.xml
index 61a98b0d4..00daf062b 100644
--- a/testutil/pom.xml
+++ b/testutil/pom.xml
@@ -31,7 +31,6 @@
 	<properties>
 		<enforcer.skipBanWiremockCompileScope>true</enforcer.skipBanWiremockCompileScope>
 		<project.rootdir>${project.basedir}/../</project.rootdir>
-		<skipJavaDoc>true</skipJavaDoc>
 	</properties>
 	<dependencies>
 		<!-- Please note: One can **not** use this module within any of the Cloud SDK modules listed below, as that would lead to circular dependencies.

From a4ce86edf63871933329f5c5681fab81f57d7a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 10:44:49 +0200
Subject: [PATCH 03/29] Reduce change

---
 pom.xml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index fccba995a..475326a5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -928,23 +928,6 @@
 					<maxHeap>2048</maxHeap>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.projectlombok</groupId>
-				<artifactId>lombok-maven-plugin</artifactId>
-				<version>1.18.20.0</version>
-				<configuration>
-					<sourceDirectory>src/main/java</sourceDirectory>
-					<outputDirectory>target/delombok</outputDirectory>
-					<skip>${skipJavaDoc}</skip>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.projectlombok</groupId>
-						<artifactId>lombok</artifactId>
-						<version>1.18.42</version>
-					</dependency>
-				</dependencies>
-			</plugin>
 		</plugins>
 	</build>
 	<profiles>

From bc39fe95f9e1060fd02e9151f7fb0db0da008e44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 11:39:31 +0200
Subject: [PATCH 04/29] Add workflow

---
 .github/workflows/javadoc.yaml | 104 +++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 .github/workflows/javadoc.yaml

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
new file mode 100644
index 000000000..183938586
--- /dev/null
+++ b/.github/workflows/javadoc.yaml
@@ -0,0 +1,104 @@
+name: JavaDoc to Documentation Portal
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to clone'
+        required: false
+        default: 'rel/5.24.0'
+
+env:
+  JAVA_VERSION: 17
+  DOCS_REPO: SAP/cloud-sdk
+  PROJECTS: "!:rfc,!:dwc-cf,!:datamodel-metadata-generator,!:odata-generator,!:odata-generator-maven-plugin,!:odata-generator-utility,!:odata-v4-generator,!:odata-v4-generator-maven-plugin,!:s4hana-connectivity,!:soap,!:testutil,!:s4hana-core"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: "Prepare git"
+        run: |
+          git config --global user.email "cloudsdk@sap.com"
+          git config --global user.name "SAP Cloud SDK Bot"
+
+      - name: "Checkout Repository"
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: "Switch branch"
+        run: git checkout "${{ github.event.inputs.branch || 'rel/5.24.0' }}"
+
+      - name: "Set up JDK 17"
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: "Determine Major Version"
+        id: determine-major-version
+        run: echo "MAJOR_VERSION=$(jq -r '.version' latest.json | cut -d '.' -f 1)" >> $GITHUB_OUTPUT
+
+      - name: "Install project (skip tests)"
+        run: mvn install -DskipTests
+
+      - name: "Process sources"
+        run: mvn process-sources -Drelease --fail-at-end --projects "${PROJECTS}"
+
+      - name: "Copy delombok sources"
+        run: find . -type d -path "*/target/delombok" -exec sh -c 'cp -r "$1"/* "$(dirname $(dirname "$1"))/src/main/java/"' _ {} \;
+
+      - name: "Generate aggregated Javadoc"
+        run: mvn clean javadoc:aggregate -Drelease -Djava.failOnWarning=false -Djavadoc.sourcepath=src/main/java --projects "${PROJECTS}"
+
+      - name: "Checkout Docs Repository"
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ env.DOCS_REPO }}
+          path: .cloud-sdk-docs
+          token: ${{ secrets.BOT_SDK_JS_FOR_DOCS_REPO_PR }}
+
+      - name: "Replace JavaDoc"
+        id: replace-javadoc
+        run: |
+          TARGET_DIR=./.cloud-sdk-docs/static/java-api/v${{ steps.determine-major-version.outputs.MAJOR_VERSION }}
+
+          rm -rf $TARGET_DIR
+          mkdir -p $TARGET_DIR
+          mv ./.targets/target/reports/apidocs/* $TARGET_DIR
+
+          cd ./.cloud-sdk-docs
+          git add -A .
+
+          CHANGED_FILES="$(git status -s)"
+          if [[ -z "$CHANGED_FILES" ]]; then
+              echo "[DEBUG] No changes to API docs detected, skipping Pull Request creation."
+              echo "CREATE_PR=false" >> $GITHUB_OUTPUT
+              exit 0
+          fi
+
+          echo "CREATE_PR=true" >> $GITHUB_OUTPUT
+          BRANCH_NAME=java/release-docs-${{ needs.bump-version.outputs.release-version }}
+          echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
+
+          git switch --create $BRANCH_NAME
+          git commit -m "chore: Update JavaDocs for release ${{ needs.bump-version.outputs.release-version }}"
+          COMMIT_SHA=$(git log -1 --pretty=format:"%H")
+          echo "COMMIT_SHA=$COMMIT_SHA" >> $GITHUB_OUTPUT
+
+          git push origin $BRANCH_NAME
+
+      - name: "Create JavaDoc PR"
+        id: create-javadoc-pr
+        if: ${{ steps.replace-javadoc.outputs.CREATE_PR == 'true' }}
+        working-directory: ./.cloud-sdk-docs
+        run: |
+          PR_TITLE="Java: Update JavaDocs for release ${{ needs.bump-version.outputs.release-version }}"
+          PR_BODY="Replace the contents of v${{ steps.determine-major-version.outputs.MAJOR_VERSION }} API docs with the latest release of the SDK."
+
+          PR_URL=$(gh pr create --title "$PR_TITLE" --body "$PR_BODY" --repo "${{ env.DOCS_REPO }}")
+          echo "PR_URL=$PR_URL" >> $GITHUB_OUTPUT
+        env:
+          GH_TOKEN: ${{ secrets.BOT_SDK_JS_FOR_DOCS_REPO_PR }}

From 9359b5357825cb663f68f24f39c8860c0db73375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 11:43:57 +0200
Subject: [PATCH 05/29] Add workflow

---
 .github/workflows/javadoc.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index 183938586..a43910d24 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -7,6 +7,9 @@ on:
         description: 'Branch to clone'
         required: false
         default: 'rel/5.24.0'
+  push:
+    branches:
+      - javadoc-aggregate-delombok
 
 env:
   JAVA_VERSION: 17

From b5aafc57f721a585417986e45fc0b55a238fe00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 11:44:39 +0200
Subject: [PATCH 06/29] Add workflow

---
 .github/workflows/javadoc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index a43910d24..e7e1cc61e 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -6,7 +6,7 @@ on:
       branch:
         description: 'Branch to clone'
         required: false
-        default: 'rel/5.24.0'
+        default: 'rel/5.23.0'
   push:
     branches:
       - javadoc-aggregate-delombok

From 28eeb9fcc2894c486da6b0f1fc5aaec014b28661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 11:46:00 +0200
Subject: [PATCH 07/29] Add workflow

---
 .github/workflows/javadoc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index e7e1cc61e..e707018b6 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -31,7 +31,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: "Switch branch"
-        run: git checkout "${{ github.event.inputs.branch || 'rel/5.24.0' }}"
+        run: git checkout "${{ github.event.inputs.branch || 'rel/5.23.0' }}"
 
       - name: "Set up JDK 17"
         uses: actions/setup-java@v4

From 57aee5d445db10a52208663e4a2370ebb5fdc659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 11:50:19 +0200
Subject: [PATCH 08/29] Add workflow

---
 .github/workflows/javadoc.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index e707018b6..f2174587f 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -18,6 +18,7 @@ env:
 
 jobs:
   build:
+    name: "JavaDoc to Documentation Portal"
     runs-on: ubuntu-latest
 
     steps:
@@ -45,7 +46,7 @@ jobs:
         run: echo "MAJOR_VERSION=$(jq -r '.version' latest.json | cut -d '.' -f 1)" >> $GITHUB_OUTPUT
 
       - name: "Install project (skip tests)"
-        run: mvn install -DskipTests
+        run: mvn install -DskipTests --quiet
 
       - name: "Process sources"
         run: mvn process-sources -Drelease --fail-at-end --projects "${PROJECTS}"
@@ -70,7 +71,7 @@ jobs:
 
           rm -rf $TARGET_DIR
           mkdir -p $TARGET_DIR
-          mv ./.targets/target/reports/apidocs/* $TARGET_DIR
+          mv ./target/reports/apidocs/* $TARGET_DIR
 
           cd ./.cloud-sdk-docs
           git add -A .

From 38a60a78eef98c461ba74f084d2d56044e090711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 12:09:27 +0200
Subject: [PATCH 09/29] Add workflow

---
 .github/workflows/javadoc.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index f2174587f..6eedf6315 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -49,13 +49,13 @@ jobs:
         run: mvn install -DskipTests --quiet
 
       - name: "Process sources"
-        run: mvn process-sources -Drelease --fail-at-end --projects "${PROJECTS}"
+        run: mvn process-sources -Drelease --fail-at-end --projects "${PROJECTS}" --quiet
 
       - name: "Copy delombok sources"
         run: find . -type d -path "*/target/delombok" -exec sh -c 'cp -r "$1"/* "$(dirname $(dirname "$1"))/src/main/java/"' _ {} \;
 
       - name: "Generate aggregated Javadoc"
-        run: mvn clean javadoc:aggregate -Drelease -Djava.failOnWarning=false -Djavadoc.sourcepath=src/main/java --projects "${PROJECTS}"
+        run: mvn clean javadoc:aggregate -Drelease -Djava.failOnWarning=false -Djavadoc.sourcepath=src/main/java --projects "${PROJECTS}" --quiet
 
       - name: "Checkout Docs Repository"
         uses: actions/checkout@v4
@@ -67,11 +67,13 @@ jobs:
       - name: "Replace JavaDoc"
         id: replace-javadoc
         run: |
+          SOURCE_DIR=${{ github.workspace }}/target/reports/apidocs
           TARGET_DIR=./.cloud-sdk-docs/static/java-api/v${{ steps.determine-major-version.outputs.MAJOR_VERSION }}
 
+          ls -lA
           rm -rf $TARGET_DIR
           mkdir -p $TARGET_DIR
-          mv ./target/reports/apidocs/* $TARGET_DIR
+          mv $SOURCE_DIR/* $TARGET_DIR
 
           cd ./.cloud-sdk-docs
           git add -A .

From fa71e3ac4466d7a8ad59557ea6cbb09743256de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 12:15:13 +0200
Subject: [PATCH 10/29] Add workflow

---
 .github/workflows/javadoc.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index 6eedf6315..0e019a71a 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -57,6 +57,10 @@ jobs:
       - name: "Generate aggregated Javadoc"
         run: mvn clean javadoc:aggregate -Drelease -Djava.failOnWarning=false -Djavadoc.sourcepath=src/main/java --projects "${PROJECTS}" --quiet
 
+      - name: "Save JavaDoc path"
+        id: javadoc-path
+        run: echo "JAVADOC_DIR=$(pwd)/target/reports/apidocs" >> $GITHUB_OUTPUT
+
       - name: "Checkout Docs Repository"
         uses: actions/checkout@v4
         with:
@@ -67,13 +71,12 @@ jobs:
       - name: "Replace JavaDoc"
         id: replace-javadoc
         run: |
-          SOURCE_DIR=${{ github.workspace }}/target/reports/apidocs
           TARGET_DIR=./.cloud-sdk-docs/static/java-api/v${{ steps.determine-major-version.outputs.MAJOR_VERSION }}
 
           ls -lA
           rm -rf $TARGET_DIR
           mkdir -p $TARGET_DIR
-          mv $SOURCE_DIR/* $TARGET_DIR
+          mv ${{ steps.javadoc-path.outputs.JAVADOC_DIR }}/* $TARGET_DIR
 
           cd ./.cloud-sdk-docs
           git add -A .

From 8af65c48851673b83fbfb6cefe0005c3663c5916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 12:19:59 +0200
Subject: [PATCH 11/29] Add workflow

---
 .github/workflows/javadoc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index 0e019a71a..008380304 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -59,7 +59,7 @@ jobs:
 
       - name: "Save JavaDoc path"
         id: javadoc-path
-        run: echo "JAVADOC_DIR=$(pwd)/target/reports/apidocs" >> $GITHUB_OUTPUT
+        run: echo "JAVADOC_DIR=$(pwd)/target" >> $GITHUB_OUTPUT
 
       - name: "Checkout Docs Repository"
         uses: actions/checkout@v4

From 542ada510484b1a8643adfb6f990e3ff7d95a112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 12:31:24 +0200
Subject: [PATCH 12/29] Add workflow

---
 .github/workflows/javadoc.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index 008380304..dd63310d2 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -45,8 +45,8 @@ jobs:
         id: determine-major-version
         run: echo "MAJOR_VERSION=$(jq -r '.version' latest.json | cut -d '.' -f 1)" >> $GITHUB_OUTPUT
 
-      - name: "Install project (skip tests)"
-        run: mvn install -DskipTests --quiet
+      #- name: "Install project (skip tests)"
+      #  run: mvn install -DskipTests --quiet
 
       - name: "Process sources"
         run: mvn process-sources -Drelease --fail-at-end --projects "${PROJECTS}" --quiet
@@ -73,10 +73,10 @@ jobs:
         run: |
           TARGET_DIR=./.cloud-sdk-docs/static/java-api/v${{ steps.determine-major-version.outputs.MAJOR_VERSION }}
 
-          ls -lA
+          ls -lA target
           rm -rf $TARGET_DIR
           mkdir -p $TARGET_DIR
-          mv ${{ steps.javadoc-path.outputs.JAVADOC_DIR }}/* $TARGET_DIR
+          mv target $TARGET_DIR
 
           cd ./.cloud-sdk-docs
           git add -A .

From 737b2254d82f58a04bd845c22c0893fb4092f70e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 12:36:29 +0200
Subject: [PATCH 13/29] Add workflow

---
 .github/workflows/javadoc.yaml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index dd63310d2..7ba20f3bf 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -43,7 +43,9 @@ jobs:
 
       - name: "Determine Major Version"
         id: determine-major-version
-        run: echo "MAJOR_VERSION=$(jq -r '.version' latest.json | cut -d '.' -f 1)" >> $GITHUB_OUTPUT
+        run: |
+          echo "MAJOR_VERSION=$(jq -r '.version' latest.json | cut -d '.' -f 1)" >> $GITHUB_OUTPUT
+          echo ${GITHUB_OUTPUT}
 
       #- name: "Install project (skip tests)"
       #  run: mvn install -DskipTests --quiet
@@ -55,7 +57,9 @@ jobs:
         run: find . -type d -path "*/target/delombok" -exec sh -c 'cp -r "$1"/* "$(dirname $(dirname "$1"))/src/main/java/"' _ {} \;
 
       - name: "Generate aggregated Javadoc"
-        run: mvn clean javadoc:aggregate -Drelease -Djava.failOnWarning=false -Djavadoc.sourcepath=src/main/java --projects "${PROJECTS}" --quiet
+        run: |
+          mvn clean javadoc:aggregate -Drelease -Djava.failOnWarning=false -Djavadoc.sourcepath=src/main/java --projects "${PROJECTS}" --quiet
+          ls -lA target
 
       - name: "Save JavaDoc path"
         id: javadoc-path
@@ -80,6 +84,8 @@ jobs:
 
           cd ./.cloud-sdk-docs
           git add -A .
+          
+          exit 1
 
           CHANGED_FILES="$(git status -s)"
           if [[ -z "$CHANGED_FILES" ]]; then

From 82fcb61c12f1900977b218093380daabd6a58c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 12:53:59 +0200
Subject: [PATCH 14/29] Add workflow

---
 .github/workflows/javadoc.yaml | 10 +++-------
 pom.xml                        |  4 +++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index 7ba20f3bf..302577239 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -58,13 +58,9 @@ jobs:
 
       - name: "Generate aggregated Javadoc"
         run: |
-          mvn clean javadoc:aggregate -Drelease -Djava.failOnWarning=false -Djavadoc.sourcepath=src/main/java --projects "${PROJECTS}" --quiet
+          mvn clean javadoc:aggregate -Drelease -Djava.failOnWarning=false --projects "${PROJECTS}" --quiet
           ls -lA target
 
-      - name: "Save JavaDoc path"
-        id: javadoc-path
-        run: echo "JAVADOC_DIR=$(pwd)/target" >> $GITHUB_OUTPUT
-
       - name: "Checkout Docs Repository"
         uses: actions/checkout@v4
         with:
@@ -80,7 +76,7 @@ jobs:
           ls -lA target
           rm -rf $TARGET_DIR
           mkdir -p $TARGET_DIR
-          mv target $TARGET_DIR
+          mv target/reports/apidocs/* $TARGET_DIR
 
           cd ./.cloud-sdk-docs
           git add -A .
@@ -95,7 +91,7 @@ jobs:
           fi
 
           echo "CREATE_PR=true" >> $GITHUB_OUTPUT
-          BRANCH_NAME=java/release-docs-${{ needs.bump-version.outputs.release-version }}
+          BRANCH_NAME=java/release-docs-${{ steps.determine-major-version.outputs.MAJOR_VERSION }}
           echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
 
           git switch --create $BRANCH_NAME
diff --git a/pom.xml b/pom.xml
index 475326a5d..d7f78874a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1015,7 +1015,6 @@
 										<packages>com.sap.cloud.sdk.s4hana*</packages>
 									</group>
 								</groups>
-								<sourcepath>${project.basedir}/target/delombok</sourcepath>
 								<overview>${project.rootdir}/javadoc.overview.html</overview>
 							</configuration>
 							<executions>
@@ -1024,6 +1023,9 @@
 									<goals>
 										<goal>jar</goal>
 									</goals>
+									<configuration>
+										<sourcepath>${project.basedir}/target/delombok</sourcepath>
+									</configuration>
 								</execution>
 							</executions>
 						</plugin>

From bd6fb2587ff16d730af57ed246e8def77e7398df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 12:54:13 +0200
Subject: [PATCH 15/29] Add workflow

---
 .github/workflows/javadoc.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index 302577239..f079d7f82 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -59,7 +59,6 @@ jobs:
       - name: "Generate aggregated Javadoc"
         run: |
           mvn clean javadoc:aggregate -Drelease -Djava.failOnWarning=false --projects "${PROJECTS}" --quiet
-          ls -lA target
 
       - name: "Checkout Docs Repository"
         uses: actions/checkout@v4
@@ -80,8 +79,6 @@ jobs:
 
           cd ./.cloud-sdk-docs
           git add -A .
-          
-          exit 1
 
           CHANGED_FILES="$(git status -s)"
           if [[ -z "$CHANGED_FILES" ]]; then

From d1465b8391123fb50500b5ce670062945e83bf15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 13:05:18 +0200
Subject: [PATCH 16/29] Add workflow

---
 .github/workflows/javadoc.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index f079d7f82..70979e40c 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -32,7 +32,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: "Switch branch"
-        run: git checkout "${{ github.event.inputs.branch || 'rel/5.23.0' }}"
+        run: git checkout "${{ github.event.inputs.branch || 'javadoc-aggregate-delombok' }}"
 
       - name: "Set up JDK 17"
         uses: actions/setup-java@v4
@@ -47,8 +47,8 @@ jobs:
           echo "MAJOR_VERSION=$(jq -r '.version' latest.json | cut -d '.' -f 1)" >> $GITHUB_OUTPUT
           echo ${GITHUB_OUTPUT}
 
-      #- name: "Install project (skip tests)"
-      #  run: mvn install -DskipTests --quiet
+      - name: "Install project (skip tests)"
+        run: mvn install -DskipTests --quiet
 
       - name: "Process sources"
         run: mvn process-sources -Drelease --fail-at-end --projects "${PROJECTS}" --quiet

From 114453047d6f128e5dee73246c3e6ffc09370bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 14:05:45 +0200
Subject: [PATCH 17/29] Add workflow

---
 .github/workflows/javadoc.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index 70979e40c..df1e118db 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -32,7 +32,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: "Switch branch"
-        run: git checkout "${{ github.event.inputs.branch || 'javadoc-aggregate-delombok' }}"
+        run: git checkout "${{ github.event.inputs.branch || 'rel/5.23.0' }}"
 
       - name: "Set up JDK 17"
         uses: actions/setup-java@v4
@@ -58,6 +58,7 @@ jobs:
 
       - name: "Generate aggregated Javadoc"
         run: |
+          sed -i '/<sourcepath>${project.basedir}\/target\/delombok<\/sourcepath>/d' pom.xml
           mvn clean javadoc:aggregate -Drelease -Djava.failOnWarning=false --projects "${PROJECTS}" --quiet
 
       - name: "Checkout Docs Repository"

From fceadbb38932244bb1cecf241178ee9ad9234a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 14:14:25 +0200
Subject: [PATCH 18/29] Add workflow

---
 .github/workflows/javadoc.yaml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index df1e118db..d4c4bdb1f 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -5,11 +5,8 @@ on:
     inputs:
       branch:
         description: 'Branch to clone'
-        required: false
-        default: 'rel/5.23.0'
-  push:
-    branches:
-      - javadoc-aggregate-delombok
+        required: true
+        default: 'rel/5.24.0'
 
 env:
   JAVA_VERSION: 17
@@ -57,9 +54,7 @@ jobs:
         run: find . -type d -path "*/target/delombok" -exec sh -c 'cp -r "$1"/* "$(dirname $(dirname "$1"))/src/main/java/"' _ {} \;
 
       - name: "Generate aggregated Javadoc"
-        run: |
-          sed -i '/<sourcepath>${project.basedir}\/target\/delombok<\/sourcepath>/d' pom.xml
-          mvn clean javadoc:aggregate -Drelease -Djava.failOnWarning=false --projects "${PROJECTS}" --quiet
+        run: mvn clean javadoc:aggregate -Drelease -Djava.failOnWarning=false --projects "${PROJECTS}" --quiet
 
       - name: "Checkout Docs Repository"
         uses: actions/checkout@v4
@@ -109,5 +104,6 @@ jobs:
 
           PR_URL=$(gh pr create --title "$PR_TITLE" --body "$PR_BODY" --repo "${{ env.DOCS_REPO }}")
           echo "PR_URL=$PR_URL" >> $GITHUB_OUTPUT
+          echo "PR: $PR_URL" >> $GITHUB_STEP_SUMMARY
         env:
           GH_TOKEN: ${{ secrets.BOT_SDK_JS_FOR_DOCS_REPO_PR }}

From 16f60da41c9e448dccc3c0416b273a5cffca0a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 14:30:28 +0200
Subject: [PATCH 19/29] Add workflow

---
 .github/workflows/javadoc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index d4c4bdb1f..8310da5ef 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -29,7 +29,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: "Switch branch"
-        run: git checkout "${{ github.event.inputs.branch || 'rel/5.23.0' }}"
+        run: git checkout "${{ github.event.inputs.branch || 'main' }}"
 
       - name: "Set up JDK 17"
         uses: actions/setup-java@v4

From 6f9268fbdbd523e899544fe73455c98cd91d828b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Thu, 16 Oct 2025 14:36:46 +0200
Subject: [PATCH 20/29] Add workflow

---
 .github/workflows/javadoc.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index 8310da5ef..b56fce4dc 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -40,9 +40,7 @@ jobs:
 
       - name: "Determine Major Version"
         id: determine-major-version
-        run: |
-          echo "MAJOR_VERSION=$(jq -r '.version' latest.json | cut -d '.' -f 1)" >> $GITHUB_OUTPUT
-          echo ${GITHUB_OUTPUT}
+        run: echo "MAJOR_VERSION=$(jq -r '.version' latest.json | cut -d '.' -f 1)" >> $GITHUB_OUTPUT
 
       - name: "Install project (skip tests)"
         run: mvn install -DskipTests --quiet

From a9ffff5dcb3a96be51957be3d6096fa23462ec47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Tue, 21 Oct 2025 09:36:21 +0200
Subject: [PATCH 21/29] Invoke workflow during release preparation

---
 .github/workflows/javadoc.yaml         |  4 ++--
 .github/workflows/prepare-release.yaml | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index b56fce4dc..fb2d03db9 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -4,9 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       branch:
-        description: 'Branch to clone'
+        description: 'Branch/Commit/Tag for JavaDoc'
         required: true
-        default: 'rel/5.24.0'
+        default: 'main'
 
 env:
   JAVA_VERSION: 17
diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml
index c3d3d2662..731fc43d3 100644
--- a/.github/workflows/prepare-release.yaml
+++ b/.github/workflows/prepare-release.yaml
@@ -154,6 +154,18 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
 
+  create-javadoc-aggregated-pr:
+    needs: [ create-release ]
+    name: "Create Aggregated JavaDoc PR on Documentation Portal"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Trigger workflow (ignore failures)"
+        uses: ./.github/actions/trigger-workflow
+        with:
+          workflow: javadoc.yaml
+          workflow-ref: ${{ needs.bump-version.outputs.release-branch }}
+          parameters: -f branch=${{ needs.create-release.outputs.release-name }}
+
   create-release-notes-pr:
     name: "Create Release Notes PR"
     needs: [ bump-version, run-ci ]

From 5e99baaff53c46cba5ce521f341f9b09aaa0dddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Tue, 21 Oct 2025 09:38:32 +0200
Subject: [PATCH 22/29] Continue on error

---
 .github/workflows/prepare-release.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml
index 731fc43d3..4784062c4 100644
--- a/.github/workflows/prepare-release.yaml
+++ b/.github/workflows/prepare-release.yaml
@@ -161,6 +161,7 @@ jobs:
     steps:
       - name: "Trigger workflow (ignore failures)"
         uses: ./.github/actions/trigger-workflow
+        continue-on-error: true
         with:
           workflow: javadoc.yaml
           workflow-ref: ${{ needs.bump-version.outputs.release-branch }}

From 5febe31bbaa8ade7f73b0b130264361bfbc8f26d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Tue, 21 Oct 2025 11:42:03 +0200
Subject: [PATCH 23/29] Fix checkout

---
 .github/workflows/prepare-release.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml
index 4784062c4..cb3d44838 100644
--- a/.github/workflows/prepare-release.yaml
+++ b/.github/workflows/prepare-release.yaml
@@ -158,7 +158,14 @@ jobs:
     needs: [ create-release ]
     name: "Create Aggregated JavaDoc PR on Documentation Portal"
     runs-on: ubuntu-latest
+    permissions:
+      actions: write # needed to trigger the ci-build workflow
+      statuses: write # needed to update the commit status
     steps:
+      - name: "Checkout repository"
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ needs.bump-version.outputs.release-branch }}
       - name: "Trigger workflow (ignore failures)"
         uses: ./.github/actions/trigger-workflow
         continue-on-error: true

From df0c9df1ef4e4832a08d601adea00a8d8b2c67da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Tue, 21 Oct 2025 13:58:27 +0200
Subject: [PATCH 24/29] Fix checkout

---
 .github/workflows/prepare-release.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml
index cb3d44838..e621cc3c8 100644
--- a/.github/workflows/prepare-release.yaml
+++ b/.github/workflows/prepare-release.yaml
@@ -165,13 +165,13 @@ jobs:
       - name: "Checkout repository"
         uses: actions/checkout@v5
         with:
-          ref: ${{ needs.bump-version.outputs.release-branch }}
+          ref: ${{ needs.create-release.outputs.release-name }}
       - name: "Trigger workflow (ignore failures)"
         uses: ./.github/actions/trigger-workflow
         continue-on-error: true
         with:
           workflow: javadoc.yaml
-          workflow-ref: ${{ needs.bump-version.outputs.release-branch }}
+          workflow-ref: javadoc-aggregate-delombok
           parameters: -f branch=${{ needs.create-release.outputs.release-name }}
 
   create-release-notes-pr:

From 3d011e3e6c3e08bc80fe518e45bb7b5e468b057b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?=
 <22489773+newtork@users.noreply.github.com>
Date: Tue, 21 Oct 2025 20:28:31 +0200
Subject: [PATCH 25/29] Update prepare-release.yaml

---
 .github/workflows/prepare-release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml
index e621cc3c8..ebcacbd70 100644
--- a/.github/workflows/prepare-release.yaml
+++ b/.github/workflows/prepare-release.yaml
@@ -171,7 +171,7 @@ jobs:
         continue-on-error: true
         with:
           workflow: javadoc.yaml
-          workflow-ref: javadoc-aggregate-delombok
+          workflow-ref: main
           parameters: -f branch=${{ needs.create-release.outputs.release-name }}
 
   create-release-notes-pr:

From a83cecc9e8945e1f2b6a5a99cefa1f6dc204fbc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?=
 <22489773+newtork@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:50:49 +0200
Subject: [PATCH 26/29] Update .github/workflows/javadoc.yaml

Co-authored-by: Jonas-Isr <jonas.israel@sap.com>
---
 .github/workflows/javadoc.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index fb2d03db9..d648e5e3a 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -28,6 +28,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          
       - name: "Switch branch"
         run: git checkout "${{ github.event.inputs.branch || 'main' }}"
 

From 4d63eb80aa5f3e4837920b3c532bac1967b2f530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Wed, 22 Oct 2025 14:55:36 +0200
Subject: [PATCH 27/29] Mention JavaDoc PR in prepare-release-workflow

---
 .github/workflows/prepare-release.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml
index ebcacbd70..097158a6c 100644
--- a/.github/workflows/prepare-release.yaml
+++ b/.github/workflows/prepare-release.yaml
@@ -283,6 +283,7 @@ jobs:
           PR_URL=$(gh pr create --title "Release ${{ needs.bump-version.outputs.release-version }}" --body "## TODOs
           - [ ] Review the changes in [the release commit]($COMMIT_URL)
           - [ ] Review **and approve** the [Release Notes PR](${{ needs.create-release-notes-pr.outputs.pr-url }})
+          - [ ] Review **and approve** the [JavaDoc PR](https://github.com/SAP/cloud-sdk/pulls?q=is%3Aopen+is%3Apr+author%3Abot-sdk-js+Update+JavaDocs)
           - [ ] Review the [Draft Release](${{ needs.create-release.outputs.release-url }})
           - [ ] Review **and approve** this PR
           - [ ] Once all tests of this PR are green, trigger the [Perform Release Workflow](${{ github.event.repository.html_url }}/actions/workflows/perform-release.yml)

From 46fe88e6f60d5772f0657df519a449f2ccc6f76d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?=
 <22489773+newtork@users.noreply.github.com>
Date: Mon, 27 Oct 2025 10:42:55 +0100
Subject: [PATCH 28/29] chore: Update JavaDoc Maven Plugin to `3.12.0` (#979)

---
 .github/dependabot.yaml                | 2 --
 dependency-bundles/bom/pom.xml         | 2 +-
 dependency-bundles/modules-bom/pom.xml | 2 +-
 pom.xml                                | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 2da96cdcd..73be63d7b 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -36,8 +36,6 @@ updates:
       - dependency-name: 'com.github.ekryd.sortpom:sortpom-maven-plugin'
       # used by deprecated code only, not worth updating for now
       - dependency-name: 'org.apache.axis2:*'
-      # newer versions cause issues with our release process
-      - dependency-name: 'org.apache.maven.plugins:maven-javadoc-plugin'
       # Ignore problematic license versions
       - dependency-name: 'com.sap.cloud.security:java-security'
         versions: ['3.6.1', '3.6.2']
diff --git a/dependency-bundles/bom/pom.xml b/dependency-bundles/bom/pom.xml
index 996585ac6..f23a2af52 100644
--- a/dependency-bundles/bom/pom.xml
+++ b/dependency-bundles/bom/pom.xml
@@ -345,7 +345,7 @@
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
 							<artifactId>maven-javadoc-plugin</artifactId>
-							<version>3.11.2</version>
+							<version>3.12.0</version>
 							<executions>
 								<execution>
 									<id>javadoc-jar</id>
diff --git a/dependency-bundles/modules-bom/pom.xml b/dependency-bundles/modules-bom/pom.xml
index f792f69b2..50989420c 100644
--- a/dependency-bundles/modules-bom/pom.xml
+++ b/dependency-bundles/modules-bom/pom.xml
@@ -272,7 +272,7 @@
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
 							<artifactId>maven-javadoc-plugin</artifactId>
-							<version>3.11.2</version>
+							<version>3.12.0</version>
 							<executions>
 								<execution>
 									<id>javadoc-jar</id>
diff --git a/pom.xml b/pom.xml
index 3d30dce6a..c26d9dc56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -515,7 +515,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.11.2</version>
+					<version>3.12.0</version>
 				</plugin>
 				<plugin>
 					<groupId>com.sap.cloud.sdk.datamodel</groupId>

From 3b580e5257cf4b9a25df00e1fb76817ceb6be7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20D=C3=BCmont?= <alexander.duemont@gmail.com>
Date: Tue, 28 Oct 2025 10:48:19 +0100
Subject: [PATCH 29/29] Make javadoc branch name predictable; Automatically
 merge on perform-release

---
 .github/workflows/javadoc.yaml        | 16 +++++++++-------
 .github/workflows/perform-release.yml | 21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/javadoc.yaml b/.github/workflows/javadoc.yaml
index d648e5e3a..d9f78e4ea 100644
--- a/.github/workflows/javadoc.yaml
+++ b/.github/workflows/javadoc.yaml
@@ -39,9 +39,11 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: "Determine Major Version"
-        id: determine-major-version
-        run: echo "MAJOR_VERSION=$(jq -r '.version' latest.json | cut -d '.' -f 1)" >> $GITHUB_OUTPUT
+      - name: "Determine Versions"
+        id: determine-version
+        run: |
+          echo "MAJOR_VERSION=$(jq -r '.version' latest.json | cut -d '.' -f 1)" >> $GITHUB_OUTPUT
+          echo "CURRENT_VERSION=$(jq -r '.version' latest.json" >> $GITHUB_OUTPUT
 
       - name: "Install project (skip tests)"
         run: mvn install -DskipTests --quiet
@@ -65,7 +67,7 @@ jobs:
       - name: "Replace JavaDoc"
         id: replace-javadoc
         run: |
-          TARGET_DIR=./.cloud-sdk-docs/static/java-api/v${{ steps.determine-major-version.outputs.MAJOR_VERSION }}
+          TARGET_DIR=./.cloud-sdk-docs/static/java-api/v${{ steps.determine-version.outputs.MAJOR_VERSION }}
 
           ls -lA target
           rm -rf $TARGET_DIR
@@ -83,11 +85,11 @@ jobs:
           fi
 
           echo "CREATE_PR=true" >> $GITHUB_OUTPUT
-          BRANCH_NAME=java/release-docs-${{ steps.determine-major-version.outputs.MAJOR_VERSION }}
+          BRANCH_NAME=java/release-docs-${{ steps.determine-version.outputs.CURRENT_VERSION }}
           echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
 
           git switch --create $BRANCH_NAME
-          git commit -m "chore: Update JavaDocs for release ${{ needs.bump-version.outputs.release-version }}"
+          git commit -m "chore: Update JavaDocs for release ${{ steps.determine-version.outputs.CURRENT_VERSION }}"
           COMMIT_SHA=$(git log -1 --pretty=format:"%H")
           echo "COMMIT_SHA=$COMMIT_SHA" >> $GITHUB_OUTPUT
 
@@ -99,7 +101,7 @@ jobs:
         working-directory: ./.cloud-sdk-docs
         run: |
           PR_TITLE="Java: Update JavaDocs for release ${{ needs.bump-version.outputs.release-version }}"
-          PR_BODY="Replace the contents of v${{ steps.determine-major-version.outputs.MAJOR_VERSION }} API docs with the latest release of the SDK."
+          PR_BODY="Replace the contents of v${{ steps.determine-version.outputs.MAJOR_VERSION }} API docs with the latest release of the SDK."
 
           PR_URL=$(gh pr create --title "$PR_TITLE" --body "$PR_BODY" --repo "${{ env.DOCS_REPO }}")
           echo "PR_URL=$PR_URL" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/perform-release.yml b/.github/workflows/perform-release.yml
index 70d12f9dd..7e4edb46b 100644
--- a/.github/workflows/perform-release.yml
+++ b/.github/workflows/perform-release.yml
@@ -24,6 +24,7 @@ jobs:
       code-branch: ${{ steps.determine-branch-names.outputs.CODE_BRANCH_NAME }}
       docs-branch: ${{ steps.determine-branch-names.outputs.DOCS_BRANCH_NAME }}
       release-notes-branch: ${{ steps.determine-branch-names.outputs.RELEASE_NOTES_BRANCH_NAME }}
+      release-javadoc-branch: ${{ steps.determine-branch-names.outputs.RELEASE_JAVADOC_BRANCH_NAME }}
       release-tag: ${{ steps.determine-branch-names.outputs.RELEASE_TAG }}
       release-commit: ${{ steps.determine-branch-names.outputs.RELEASE_COMMIT }}
     permissions: write-all # contents and push are needed to see the draft release
@@ -37,12 +38,14 @@ jobs:
           RELEASE_TAG=rel/$RELEASE_VERSION
           RELEASE_COMMIT=$(gh release view $RELEASE_TAG --repo ${{github.repository}} --json targetCommitish --jq '.targetCommitish')
           RELEASE_NOTES_BRANCH_NAME=java/release-notes-$RELEASE_VERSION
+          RELEASE_JAVADOC_BRANCH_NAME=java/release-docs-$RELEASE_VERSION
           
           echo "CODE_BRANCH_NAME=$CODE_BRANCH_NAME" >> $GITHUB_OUTPUT
           echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_OUTPUT
           echo "RELEASE_TAG=$RELEASE_TAG" >> $GITHUB_OUTPUT
           echo "RELEASE_COMMIT=$RELEASE_COMMIT" >> $GITHUB_OUTPUT
           echo "RELEASE_NOTES_BRANCH_NAME=$RELEASE_NOTES_BRANCH_NAME" >> $GITHUB_OUTPUT
+          echo "RELEASE_JAVADOC_BRANCH_NAME=$RELEASE_JAVADOC_BRANCH_NAME" >> $GITHUB_OUTPUT
           
           echo -e "[DEBUG] Current GITHUB_OUTPUT:\n$(cat $GITHUB_OUTPUT)"
         env:
@@ -82,6 +85,18 @@ jobs:
               \"Build Cloud SDK Documentation\": [\"dependabot\"]
             }
 
+      - name: "Check Whether JavaDoc PR Can Be Merged"
+        if: ${{ inputs.skip-pr-merge != 'true' }}
+        uses: ./.github/actions/pr-is-mergeable
+        with:
+          pr-ref: ${{ steps.determine-branch-names.outputs.RELEASE_JAVADOC_BRANCH_NAME }}
+          repo: ${{ env.DOCS_REPO }}
+          token: ${{ secrets.BOT_SDK_JS_FOR_DOCS_REPO_PR }}
+          excluded-check-runs: |
+            {
+              \"Build Cloud SDK Documentation\": [\"dependabot\"]
+            }
+
   release:
     name: "Release"
     needs: [ prerequisites ]
@@ -136,5 +151,11 @@ jobs:
       - name: "Merge Release Notes PR"
         if: ${{ inputs.skip-pr-merge != 'true' }}
         run: gh pr merge --squash "${{ needs.prerequisites.outputs.release-notes-branch }}" --delete-branch --repo "${{ env.DOCS_REPO }}"
+        env:
+          GH_TOKEN: ${{ secrets.BOT_SDK_JS_FOR_DOCS_REPO_PR }}
+
+      - name: "Merge JavaDoc PR"
+        if: ${{ inputs.skip-pr-merge != 'true' }}
+        run: gh pr merge --squash "${{ needs.prerequisites.outputs.release-javadoc-branch }}" --delete-branch --repo "${{ env.DOCS_REPO }}"
         env:
           GH_TOKEN: ${{ secrets.BOT_SDK_JS_FOR_DOCS_REPO_PR }}
\ No newline at end of file