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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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/26] 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 bbb008d1c433272bb869c22fb4cb27133dcfbe36 Mon Sep 17 00:00:00 2001
From: SAP Cloud SDK Bot <cloudsdk@sap.com>
Date: Tue, 21 Oct 2025 17:02:58 +0000
Subject: [PATCH 25/26] Update to version 5.24.0-M3

---
 README.md                                                     | 2 +-
 archetypes/pom.xml                                            | 2 +-
 archetypes/spring-boot3/pom.xml                               | 2 +-
 .../src/main/resources/archetype-resources/pom.xml            | 2 +-
 cloudplatform/caching/pom.xml                                 | 2 +-
 cloudplatform/cloudplatform-connectivity-scp-cf/pom.xml       | 2 +-
 cloudplatform/cloudplatform-connectivity/pom.xml              | 2 +-
 cloudplatform/cloudplatform-core/pom.xml                      | 2 +-
 cloudplatform/connectivity-apache-httpclient4/pom.xml         | 2 +-
 cloudplatform/connectivity-apache-httpclient5/pom.xml         | 2 +-
 cloudplatform/connectivity-destination-service/pom.xml        | 2 +-
 cloudplatform/connectivity-dwc/pom.xml                        | 2 +-
 cloudplatform/connectivity-oauth/pom.xml                      | 2 +-
 cloudplatform/connectivity-ztis/pom.xml                       | 2 +-
 cloudplatform/dwc-cf/pom.xml                                  | 2 +-
 cloudplatform/pom.xml                                         | 2 +-
 cloudplatform/resilience-api/pom.xml                          | 2 +-
 cloudplatform/resilience/pom.xml                              | 2 +-
 cloudplatform/resilience4j/pom.xml                            | 2 +-
 cloudplatform/scp-cf/pom.xml                                  | 2 +-
 cloudplatform/security/pom.xml                                | 2 +-
 cloudplatform/servlet-jakarta/pom.xml                         | 2 +-
 cloudplatform/tenant/pom.xml                                  | 2 +-
 datamodel/datamodel-metadata-generator/pom.xml                | 2 +-
 datamodel/fluent-result/pom.xml                               | 2 +-
 datamodel/odata-client/pom.xml                                | 2 +-
 datamodel/odata-generator-utility/pom.xml                     | 2 +-
 datamodel/odata-v4/odata-v4-api-sample/pom.xml                | 2 +-
 datamodel/odata-v4/odata-v4-core/pom.xml                      | 2 +-
 datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml    | 2 +-
 .../src/test/resources/DataModelGeneratorMojoTest/pom.xml     | 2 +-
 datamodel/odata-v4/odata-v4-generator/pom.xml                 | 2 +-
 datamodel/odata-v4/pom.xml                                    | 2 +-
 datamodel/odata/odata-api-sample/pom.xml                      | 2 +-
 datamodel/odata/odata-core/pom.xml                            | 2 +-
 datamodel/odata/odata-generator-maven-plugin/pom.xml          | 2 +-
 .../src/test/resources/DataModelGeneratorMojoTest/pom.xml     | 2 +-
 datamodel/odata/odata-generator/pom.xml                       | 2 +-
 datamodel/odata/pom.xml                                       | 2 +-
 datamodel/openapi/openapi-api-sample/pom.xml                  | 2 +-
 datamodel/openapi/openapi-core/pom.xml                        | 2 +-
 datamodel/openapi/openapi-generator-maven-plugin/pom.xml      | 2 +-
 .../sodastore/input/pom.xml                                   | 2 +-
 .../testAdditionalPropertiesAndEnablingAnyOfOneOf/pom.xml     | 2 +-
 .../testEmptyRequiredParameter/pom.xml                        | 2 +-
 .../testInvocationWithAllParameters/pom.xml                   | 2 +-
 .../testInvocationWithMandatoryParameters/pom.xml             | 2 +-
 .../testInvocationWithUnexpectedApiMaturity/pom.xml           | 2 +-
 .../DataModelGeneratorMojoUnitTest/testSkipExecution/pom.xml  | 2 +-
 datamodel/openapi/openapi-generator/pom.xml                   | 2 +-
 datamodel/openapi/pom.xml                                     | 2 +-
 datamodel/pom.xml                                             | 2 +-
 datamodel/soap/pom.xml                                        | 2 +-
 dependency-bundles/bom/pom.xml                                | 4 ++--
 dependency-bundles/modules-bom/pom.xml                        | 4 ++--
 dependency-bundles/sdk-core/pom.xml                           | 2 +-
 latest.json                                                   | 2 +-
 pom.xml                                                       | 4 ++--
 s4hana/pom.xml                                                | 2 +-
 s4hana/rfc/pom.xml                                            | 2 +-
 s4hana/s4hana-connectivity/pom.xml                            | 2 +-
 s4hana/s4hana-core/pom.xml                                    | 2 +-
 testutil/pom.xml                                              | 2 +-
 63 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/README.md b/README.md
index c61b7d2e1..4e44b11d1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ![build](https://github.com/SAP/cloud-sdk-java/actions/workflows/continuous-integration.yaml/badge.svg?branch=main)
 [![REUSE status](https://api.reuse.software/badge/github.com/SAP/cloud-sdk-java)](https://api.reuse.software/info/github.com/SAP/cloud-sdk-java)
 [![Fosstars security rating](https://github.com/SAP/cloud-sdk-java/blob/fosstars-report/fosstars_badge.svg)](https://github.com/SAP/cloud-sdk-java/blob/fosstars-report/fosstars_report.md)
-[![Maven Central](https://img.shields.io/badge/maven_central-5.23.0-blue.svg)](https://search.maven.org/search?q=g:com.sap.cloud.sdk%20AND%20a:sdk-core%20AND%20v:5.23.0)
+[![Maven Central](https://img.shields.io/badge/maven_central-5.24.0-M3-blue.svg)](https://search.maven.org/search?q=g:com.sap.cloud.sdk%20AND%20a:sdk-core%20AND%20v:5.24.0-M3)
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/SAP/cloud-sdk-java)
 
 # <img src="https://sap.github.io/cloud-sdk/img/logo.svg" alt="SAP Cloud SDK" width="30"/> SAP Cloud SDK for Java
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index e083637cf..8a8414f4c 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<groupId>com.sap.cloud.sdk.archetypes</groupId>
 	<artifactId>archetypes-parent</artifactId>
diff --git a/archetypes/spring-boot3/pom.xml b/archetypes/spring-boot3/pom.xml
index 180fe0640..008c44bf3 100644
--- a/archetypes/spring-boot3/pom.xml
+++ b/archetypes/spring-boot3/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.archetypes</groupId>
 		<artifactId>archetypes-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>spring-boot3</artifactId>
 	<packaging>maven-archetype</packaging>
diff --git a/archetypes/spring-boot3/src/main/resources/archetype-resources/pom.xml b/archetypes/spring-boot3/src/main/resources/archetype-resources/pom.xml
index ba5250c1c..a9f291744 100644
--- a/archetypes/spring-boot3/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/spring-boot3/src/main/resources/archetype-resources/pom.xml
@@ -15,7 +15,7 @@
         <spring-boot.version>3.3.0</spring-boot.version>
 
         <java.version>17</java.version>
-        <cloud-sdk.version>5.24.0-SNAPSHOT</cloud-sdk.version>
+        <cloud-sdk.version>5.24.0-M3</cloud-sdk.version>
 
         <maven.compiler.release>${java.version}</maven.compiler.release>
         <maven.compiler.proc>full</maven.compiler.proc>
diff --git a/cloudplatform/caching/pom.xml b/cloudplatform/caching/pom.xml
index 3d2f63399..b6339f3ba 100644
--- a/cloudplatform/caching/pom.xml
+++ b/cloudplatform/caching/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>caching</artifactId>
 	<name>Business Technology Platform - Caching</name>
diff --git a/cloudplatform/cloudplatform-connectivity-scp-cf/pom.xml b/cloudplatform/cloudplatform-connectivity-scp-cf/pom.xml
index 4ac9b3d00..ae5348034 100644
--- a/cloudplatform/cloudplatform-connectivity-scp-cf/pom.xml
+++ b/cloudplatform/cloudplatform-connectivity-scp-cf/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>cloudplatform-connectivity-scp-cf</artifactId>
 	<name>(Deprecated) Cloud Platform - Connectivity SAP BTP Cloud Foundry</name>
diff --git a/cloudplatform/cloudplatform-connectivity/pom.xml b/cloudplatform/cloudplatform-connectivity/pom.xml
index 78be5453f..5f0ac90df 100644
--- a/cloudplatform/cloudplatform-connectivity/pom.xml
+++ b/cloudplatform/cloudplatform-connectivity/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>cloudplatform-connectivity</artifactId>
 	<name>Business Technology Platform - Connectivity</name>
diff --git a/cloudplatform/cloudplatform-core/pom.xml b/cloudplatform/cloudplatform-core/pom.xml
index ab98d7d6c..b3ab86ad6 100644
--- a/cloudplatform/cloudplatform-core/pom.xml
+++ b/cloudplatform/cloudplatform-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>cloudplatform-core</artifactId>
 	<name>Cloud Platform - Core</name>
diff --git a/cloudplatform/connectivity-apache-httpclient4/pom.xml b/cloudplatform/connectivity-apache-httpclient4/pom.xml
index 31041e446..8bf3f66e1 100644
--- a/cloudplatform/connectivity-apache-httpclient4/pom.xml
+++ b/cloudplatform/connectivity-apache-httpclient4/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>connectivity-apache-httpclient4</artifactId>
 	<name>Connectivity - Apache HTTP Client 4</name>
diff --git a/cloudplatform/connectivity-apache-httpclient5/pom.xml b/cloudplatform/connectivity-apache-httpclient5/pom.xml
index 34c1b426a..7dc33729e 100644
--- a/cloudplatform/connectivity-apache-httpclient5/pom.xml
+++ b/cloudplatform/connectivity-apache-httpclient5/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>connectivity-apache-httpclient5</artifactId>
 	<name>Apache version 5 Http Client integration</name>
diff --git a/cloudplatform/connectivity-destination-service/pom.xml b/cloudplatform/connectivity-destination-service/pom.xml
index c5083718b..7b82788d2 100644
--- a/cloudplatform/connectivity-destination-service/pom.xml
+++ b/cloudplatform/connectivity-destination-service/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>connectivity-destination-service</artifactId>
 	<name>Cloud Platform - Connectivity SAP BTP Cloud Foundry</name>
diff --git a/cloudplatform/connectivity-dwc/pom.xml b/cloudplatform/connectivity-dwc/pom.xml
index ff0c21401..5f616f1ba 100644
--- a/cloudplatform/connectivity-dwc/pom.xml
+++ b/cloudplatform/connectivity-dwc/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>connectivity-dwc</artifactId>
 	<name>Deploy with Confidence Connectivity</name>
diff --git a/cloudplatform/connectivity-oauth/pom.xml b/cloudplatform/connectivity-oauth/pom.xml
index de7bc7e65..993710ea0 100644
--- a/cloudplatform/connectivity-oauth/pom.xml
+++ b/cloudplatform/connectivity-oauth/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>connectivity-oauth</artifactId>
 	<name>OAuth2 Connectivity</name>
diff --git a/cloudplatform/connectivity-ztis/pom.xml b/cloudplatform/connectivity-ztis/pom.xml
index a869c46b7..dc5f5f9bc 100644
--- a/cloudplatform/connectivity-ztis/pom.xml
+++ b/cloudplatform/connectivity-ztis/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>connectivity-ztis</artifactId>
 	<name>Connectivity - Zero Trust Identity Service</name>
diff --git a/cloudplatform/dwc-cf/pom.xml b/cloudplatform/dwc-cf/pom.xml
index a88cb744c..f4a34da2e 100644
--- a/cloudplatform/dwc-cf/pom.xml
+++ b/cloudplatform/dwc-cf/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>dwc-cf</artifactId>
 	<name>(Deprecated) Cloud Platform - SAP Deploy with Confidence on Cloud Foundry</name>
diff --git a/cloudplatform/pom.xml b/cloudplatform/pom.xml
index dad63bc72..90c8a35c3 100644
--- a/cloudplatform/pom.xml
+++ b/cloudplatform/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 	<artifactId>cloudplatform-parent</artifactId>
diff --git a/cloudplatform/resilience-api/pom.xml b/cloudplatform/resilience-api/pom.xml
index ffbd8e0e5..b91c07219 100644
--- a/cloudplatform/resilience-api/pom.xml
+++ b/cloudplatform/resilience-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>resilience-api</artifactId>
 	<name>Cloud Platform - Resilience API</name>
diff --git a/cloudplatform/resilience/pom.xml b/cloudplatform/resilience/pom.xml
index c5538e7d4..acd3e2e77 100644
--- a/cloudplatform/resilience/pom.xml
+++ b/cloudplatform/resilience/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>resilience</artifactId>
 	<name>Cloud Platform - Resilience API and Default Implementation</name>
diff --git a/cloudplatform/resilience4j/pom.xml b/cloudplatform/resilience4j/pom.xml
index 75a941cd8..106539f3e 100644
--- a/cloudplatform/resilience4j/pom.xml
+++ b/cloudplatform/resilience4j/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>resilience4j</artifactId>
 	<name>Cloud Platform - Resilience4j</name>
diff --git a/cloudplatform/scp-cf/pom.xml b/cloudplatform/scp-cf/pom.xml
index 29f12164e..d6190f0a4 100644
--- a/cloudplatform/scp-cf/pom.xml
+++ b/cloudplatform/scp-cf/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>scp-cf</artifactId>
 	<name>(Deprecated) Business Technology Platform - SAP BTP Cloud Foundry</name>
diff --git a/cloudplatform/security/pom.xml b/cloudplatform/security/pom.xml
index 21f1dd607..282ed5754 100644
--- a/cloudplatform/security/pom.xml
+++ b/cloudplatform/security/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>security</artifactId>
 	<name>Business Technology Platform - Security</name>
diff --git a/cloudplatform/servlet-jakarta/pom.xml b/cloudplatform/servlet-jakarta/pom.xml
index 812875b68..26185199c 100644
--- a/cloudplatform/servlet-jakarta/pom.xml
+++ b/cloudplatform/servlet-jakarta/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>servlet-jakarta</artifactId>
 	<name>Cloud Platform - Servlet Jakarta compatible</name>
diff --git a/cloudplatform/tenant/pom.xml b/cloudplatform/tenant/pom.xml
index 9c14c8f0f..a547bd7a6 100644
--- a/cloudplatform/tenant/pom.xml
+++ b/cloudplatform/tenant/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>tenant</artifactId>
 	<name>Cloud Platform - Tenant</name>
diff --git a/datamodel/datamodel-metadata-generator/pom.xml b/datamodel/datamodel-metadata-generator/pom.xml
index 49fcda545..d9aff35f1 100644
--- a/datamodel/datamodel-metadata-generator/pom.xml
+++ b/datamodel/datamodel-metadata-generator/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>datamodel-metadata-generator</artifactId>
 	<name>Data Model - Metadata Generator (Beta)</name>
diff --git a/datamodel/fluent-result/pom.xml b/datamodel/fluent-result/pom.xml
index 733ed9e17..1fe9a8e6b 100644
--- a/datamodel/fluent-result/pom.xml
+++ b/datamodel/fluent-result/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>fluent-result</artifactId>
 	<name>Data Model - Fluent Result</name>
diff --git a/datamodel/odata-client/pom.xml b/datamodel/odata-client/pom.xml
index 4e3802894..1a55f21dc 100644
--- a/datamodel/odata-client/pom.xml
+++ b/datamodel/odata-client/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>odata-client</artifactId>
 	<packaging>jar</packaging>
diff --git a/datamodel/odata-generator-utility/pom.xml b/datamodel/odata-generator-utility/pom.xml
index da52e3a24..f7dd01ec4 100644
--- a/datamodel/odata-generator-utility/pom.xml
+++ b/datamodel/odata-generator-utility/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>odata-generator-utility</artifactId>
 	<name>OData Utility</name>
diff --git a/datamodel/odata-v4/odata-v4-api-sample/pom.xml b/datamodel/odata-v4/odata-v4-api-sample/pom.xml
index 104b05a74..5ccdf53c5 100644
--- a/datamodel/odata-v4/odata-v4-api-sample/pom.xml
+++ b/datamodel/odata-v4/odata-v4-api-sample/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-v4-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>odata-v4-api-sample</artifactId>
 	<name>OData V4 VDM - Sample API</name>
diff --git a/datamodel/odata-v4/odata-v4-core/pom.xml b/datamodel/odata-v4/odata-v4-core/pom.xml
index 292b67fd4..7b6c3a812 100644
--- a/datamodel/odata-v4/odata-v4-core/pom.xml
+++ b/datamodel/odata-v4/odata-v4-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-v4-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>odata-v4-core</artifactId>
 	<packaging>jar</packaging>
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..08c2a598b 100644
--- a/datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml
+++ b/datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-v4-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>odata-v4-generator-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
diff --git a/datamodel/odata-v4/odata-v4-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml b/datamodel/odata-v4/odata-v4-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml
index 9d8aba81e..3574a4a30 100644
--- a/datamodel/odata-v4/odata-v4-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml
+++ b/datamodel/odata-v4/odata-v4-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.company</groupId>
     <artifactId>application</artifactId>
-    <version>5.24.0-SNAPSHOT</version>
+    <version>5.24.0-M3</version>
 
     <build>
         <plugins>
diff --git a/datamodel/odata-v4/odata-v4-generator/pom.xml b/datamodel/odata-v4/odata-v4-generator/pom.xml
index 678379386..d94e8d648 100644
--- a/datamodel/odata-v4/odata-v4-generator/pom.xml
+++ b/datamodel/odata-v4/odata-v4-generator/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-v4-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>odata-v4-generator</artifactId>
 	<packaging>jar</packaging>
diff --git a/datamodel/odata-v4/pom.xml b/datamodel/odata-v4/pom.xml
index bfc89369d..027550ec3 100644
--- a/datamodel/odata-v4/pom.xml
+++ b/datamodel/odata-v4/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>odata-v4-parent</artifactId>
 	<packaging>pom</packaging>
diff --git a/datamodel/odata/odata-api-sample/pom.xml b/datamodel/odata/odata-api-sample/pom.xml
index 6ba768777..949ee2925 100644
--- a/datamodel/odata/odata-api-sample/pom.xml
+++ b/datamodel/odata/odata-api-sample/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>odata-api-sample</artifactId>
 	<name>OData VDM - Sample API</name>
diff --git a/datamodel/odata/odata-core/pom.xml b/datamodel/odata/odata-core/pom.xml
index 57d1d77cf..591c3a411 100644
--- a/datamodel/odata/odata-core/pom.xml
+++ b/datamodel/odata/odata-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>odata-core</artifactId>
 	<packaging>jar</packaging>
diff --git a/datamodel/odata/odata-generator-maven-plugin/pom.xml b/datamodel/odata/odata-generator-maven-plugin/pom.xml
index 54203172f..09df494c8 100644
--- a/datamodel/odata/odata-generator-maven-plugin/pom.xml
+++ b/datamodel/odata/odata-generator-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>odata-generator-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
diff --git a/datamodel/odata/odata-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml b/datamodel/odata/odata-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml
index 84a128bb7..92f2caf8f 100644
--- a/datamodel/odata/odata-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml
+++ b/datamodel/odata/odata-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.company</groupId>
     <artifactId>application</artifactId>
-    <version>5.24.0-SNAPSHOT</version>
+    <version>5.24.0-M3</version>
 
     <build>
         <plugins>
diff --git a/datamodel/odata/odata-generator/pom.xml b/datamodel/odata/odata-generator/pom.xml
index fb57e9dee..943716026 100644
--- a/datamodel/odata/odata-generator/pom.xml
+++ b/datamodel/odata/odata-generator/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>odata-generator</artifactId>
 	<packaging>jar</packaging>
diff --git a/datamodel/odata/pom.xml b/datamodel/odata/pom.xml
index b853e24e2..736679a24 100644
--- a/datamodel/odata/pom.xml
+++ b/datamodel/odata/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>odata-parent</artifactId>
 	<packaging>pom</packaging>
diff --git a/datamodel/openapi/openapi-api-sample/pom.xml b/datamodel/openapi/openapi-api-sample/pom.xml
index f37f5c06f..7f9142f99 100644
--- a/datamodel/openapi/openapi-api-sample/pom.xml
+++ b/datamodel/openapi/openapi-api-sample/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>openapi-api-sample</artifactId>
 	<name>Data Model - OpenAPI Services - Sample API</name>
diff --git a/datamodel/openapi/openapi-core/pom.xml b/datamodel/openapi/openapi-core/pom.xml
index 652d928af..77680a663 100644
--- a/datamodel/openapi/openapi-core/pom.xml
+++ b/datamodel/openapi/openapi-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>openapi-core</artifactId>
 	<name>Data Model - OpenAPI Services - Core</name>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/pom.xml
index 9d3e1a944..f5a8c0883 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>openapi-generator-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoIntegrationTest/sodastore/input/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoIntegrationTest/sodastore/input/pom.xml
index eb9ec842d..b6dca5663 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoIntegrationTest/sodastore/input/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoIntegrationTest/sodastore/input/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-SNAPSHOT</version>
+	<version>5.24.0-M3</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testAdditionalPropertiesAndEnablingAnyOfOneOf/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testAdditionalPropertiesAndEnablingAnyOfOneOf/pom.xml
index c73f5550a..cc34ae7ea 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testAdditionalPropertiesAndEnablingAnyOfOneOf/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testAdditionalPropertiesAndEnablingAnyOfOneOf/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-SNAPSHOT</version>
+	<version>5.24.0-M3</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testEmptyRequiredParameter/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testEmptyRequiredParameter/pom.xml
index 3abddd181..6893ec2d1 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testEmptyRequiredParameter/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testEmptyRequiredParameter/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-SNAPSHOT</version>
+	<version>5.24.0-M3</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithAllParameters/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithAllParameters/pom.xml
index e489f4811..7001f2675 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithAllParameters/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithAllParameters/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-SNAPSHOT</version>
+	<version>5.24.0-M3</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithMandatoryParameters/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithMandatoryParameters/pom.xml
index 272891530..f76cade54 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithMandatoryParameters/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithMandatoryParameters/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-SNAPSHOT</version>
+	<version>5.24.0-M3</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithUnexpectedApiMaturity/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithUnexpectedApiMaturity/pom.xml
index 9e141b536..3f25cd0ff 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithUnexpectedApiMaturity/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithUnexpectedApiMaturity/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-SNAPSHOT</version>
+	<version>5.24.0-M3</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testSkipExecution/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testSkipExecution/pom.xml
index 9dc3d935b..409b3869b 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testSkipExecution/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testSkipExecution/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-SNAPSHOT</version>
+	<version>5.24.0-M3</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator/pom.xml b/datamodel/openapi/openapi-generator/pom.xml
index 353df4c30..721da098b 100644
--- a/datamodel/openapi/openapi-generator/pom.xml
+++ b/datamodel/openapi/openapi-generator/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>openapi-generator</artifactId>
 	<packaging>jar</packaging>
diff --git a/datamodel/openapi/pom.xml b/datamodel/openapi/pom.xml
index eb3faa80c..adcdb9dd8 100644
--- a/datamodel/openapi/pom.xml
+++ b/datamodel/openapi/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>openapi-parent</artifactId>
 	<packaging>pom</packaging>
diff --git a/datamodel/pom.xml b/datamodel/pom.xml
index 5f6a91f46..511778640 100644
--- a/datamodel/pom.xml
+++ b/datamodel/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<groupId>com.sap.cloud.sdk.datamodel</groupId>
 	<artifactId>datamodel-parent</artifactId>
diff --git a/datamodel/soap/pom.xml b/datamodel/soap/pom.xml
index 58572c627..4bf3bc23e 100644
--- a/datamodel/soap/pom.xml
+++ b/datamodel/soap/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>soap</artifactId>
 	<name>Data Model - SOAP Queries</name>
diff --git a/dependency-bundles/bom/pom.xml b/dependency-bundles/bom/pom.xml
index 996585ac6..77f89d38e 100644
--- a/dependency-bundles/bom/pom.xml
+++ b/dependency-bundles/bom/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.sap.cloud.sdk</groupId>
 	<artifactId>sdk-bom</artifactId>
-	<version>5.24.0-SNAPSHOT</version>
+	<version>5.24.0-M3</version>
 	<packaging>pom</packaging>
 	<name>SAP Cloud SDK - Modules and Dependencies BOM</name>
 	<description>Bill of Materials (BOM) of the SAP Cloud SDK modules and dependencies.</description>
@@ -44,7 +44,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- do not modify the following line, it is updated by the versioning script -->
-		<sdk.version>5.24.0-SNAPSHOT</sdk.version>
+		<sdk.version>5.24.0-M3</sdk.version>
 		<service-binding.version>0.21.0</service-binding.version>
 		<!-- HTTP stuff -->
 		<httpcore.version>4.4.16</httpcore.version>
diff --git a/dependency-bundles/modules-bom/pom.xml b/dependency-bundles/modules-bom/pom.xml
index f792f69b2..2843254e5 100644
--- a/dependency-bundles/modules-bom/pom.xml
+++ b/dependency-bundles/modules-bom/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.sap.cloud.sdk</groupId>
 	<artifactId>sdk-modules-bom</artifactId>
-	<version>5.24.0-SNAPSHOT</version>
+	<version>5.24.0-M3</version>
 	<packaging>pom</packaging>
 	<name>SAP Cloud SDK - Modules BOM</name>
 	<description>Bill of Materials (BOM) of the SAP Cloud SDK modules.</description>
@@ -44,7 +44,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- do not modify the following line, it is updated by the versioning script -->
-		<sdk.version>5.24.0-SNAPSHOT</sdk.version>
+		<sdk.version>5.24.0-M3</sdk.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/dependency-bundles/sdk-core/pom.xml b/dependency-bundles/sdk-core/pom.xml
index ef1e43aec..780060d2a 100644
--- a/dependency-bundles/sdk-core/pom.xml
+++ b/dependency-bundles/sdk-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>sdk-core</artifactId>
diff --git a/latest.json b/latest.json
index 7b69301cd..629a2e38c 100644
--- a/latest.json
+++ b/latest.json
@@ -1,3 +1,3 @@
 {
-    "version": "5.24.0-SNAPSHOT"
+    "version": "5.24.0-M3"
 }
diff --git a/pom.xml b/pom.xml
index 3d30dce6a..aeeee5e59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.sap.cloud.sdk</groupId>
 	<artifactId>sdk-parent</artifactId>
-	<version>5.24.0-SNAPSHOT</version>
+	<version>5.24.0-M3</version>
 	<packaging>pom</packaging>
 	<name>SAP Cloud SDK - Parent POM</name>
 	<description>Parent POM of the SAP Cloud SDK.</description>
@@ -49,7 +49,7 @@
 	</distributionManagement>
 	<properties>
 		<!--  do not modify the following line, it is updated by the versioning script  -->
-		<sdk.version>5.24.0-SNAPSHOT</sdk.version>
+		<sdk.version>5.24.0-M3</sdk.version>
 		<maven.version>3.5</maven.version>
 		<java.version>17</java.version>
 		<java.failOnWarning>true</java.failOnWarning>
diff --git a/s4hana/pom.xml b/s4hana/pom.xml
index b8c9fa6e3..223aeb973 100644
--- a/s4hana/pom.xml
+++ b/s4hana/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<groupId>com.sap.cloud.sdk.s4hana</groupId>
 	<artifactId>s4hana-parent</artifactId>
diff --git a/s4hana/rfc/pom.xml b/s4hana/rfc/pom.xml
index c1e481210..80b810dff 100644
--- a/s4hana/rfc/pom.xml
+++ b/s4hana/rfc/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.s4hana</groupId>
 		<artifactId>s4hana-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>rfc</artifactId>
 	<name>SAP S/4HANA - RFC Queries</name>
diff --git a/s4hana/s4hana-connectivity/pom.xml b/s4hana/s4hana-connectivity/pom.xml
index 9eba66e2a..9c10564ca 100644
--- a/s4hana/s4hana-connectivity/pom.xml
+++ b/s4hana/s4hana-connectivity/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.s4hana</groupId>
 		<artifactId>s4hana-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>s4hana-connectivity</artifactId>
 	<name>SAP S/4HANA - Connectivity</name>
diff --git a/s4hana/s4hana-core/pom.xml b/s4hana/s4hana-core/pom.xml
index 20e051a0e..aa7c00bb3 100644
--- a/s4hana/s4hana-core/pom.xml
+++ b/s4hana/s4hana-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.s4hana</groupId>
 		<artifactId>s4hana-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>s4hana-core</artifactId>
 	<name>SAP S/4HANA - Core</name>
diff --git a/testutil/pom.xml b/testutil/pom.xml
index 00daf062b..319011094 100644
--- a/testutil/pom.xml
+++ b/testutil/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.24.0-SNAPSHOT</version>
+		<version>5.24.0-M3</version>
 	</parent>
 	<artifactId>testutil</artifactId>
 	<name>(Internal) Test Utilities</name>

From 942ef1d87bb1aae2909760a75ae6d80273363ca9 Mon Sep 17 00:00:00 2001
From: SAP Cloud SDK Bot <cloudsdk@sap.com>
Date: Tue, 21 Oct 2025 17:27:33 +0000
Subject: [PATCH 26/26] Update to version 5.24.0-SNAPSHOT

---
 archetypes/pom.xml                                            | 2 +-
 archetypes/spring-boot3/pom.xml                               | 2 +-
 .../src/main/resources/archetype-resources/pom.xml            | 2 +-
 cloudplatform/caching/pom.xml                                 | 2 +-
 cloudplatform/cloudplatform-connectivity-scp-cf/pom.xml       | 2 +-
 cloudplatform/cloudplatform-connectivity/pom.xml              | 2 +-
 cloudplatform/cloudplatform-core/pom.xml                      | 2 +-
 cloudplatform/connectivity-apache-httpclient4/pom.xml         | 2 +-
 cloudplatform/connectivity-apache-httpclient5/pom.xml         | 2 +-
 cloudplatform/connectivity-destination-service/pom.xml        | 2 +-
 cloudplatform/connectivity-dwc/pom.xml                        | 2 +-
 cloudplatform/connectivity-oauth/pom.xml                      | 2 +-
 cloudplatform/connectivity-ztis/pom.xml                       | 2 +-
 cloudplatform/dwc-cf/pom.xml                                  | 2 +-
 cloudplatform/pom.xml                                         | 2 +-
 cloudplatform/resilience-api/pom.xml                          | 2 +-
 cloudplatform/resilience/pom.xml                              | 2 +-
 cloudplatform/resilience4j/pom.xml                            | 2 +-
 cloudplatform/scp-cf/pom.xml                                  | 2 +-
 cloudplatform/security/pom.xml                                | 2 +-
 cloudplatform/servlet-jakarta/pom.xml                         | 2 +-
 cloudplatform/tenant/pom.xml                                  | 2 +-
 datamodel/datamodel-metadata-generator/pom.xml                | 2 +-
 datamodel/fluent-result/pom.xml                               | 2 +-
 datamodel/odata-client/pom.xml                                | 2 +-
 datamodel/odata-generator-utility/pom.xml                     | 2 +-
 datamodel/odata-v4/odata-v4-api-sample/pom.xml                | 2 +-
 datamodel/odata-v4/odata-v4-core/pom.xml                      | 2 +-
 datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml    | 2 +-
 .../src/test/resources/DataModelGeneratorMojoTest/pom.xml     | 2 +-
 datamodel/odata-v4/odata-v4-generator/pom.xml                 | 2 +-
 datamodel/odata-v4/pom.xml                                    | 2 +-
 datamodel/odata/odata-api-sample/pom.xml                      | 2 +-
 datamodel/odata/odata-core/pom.xml                            | 2 +-
 datamodel/odata/odata-generator-maven-plugin/pom.xml          | 2 +-
 .../src/test/resources/DataModelGeneratorMojoTest/pom.xml     | 2 +-
 datamodel/odata/odata-generator/pom.xml                       | 2 +-
 datamodel/odata/pom.xml                                       | 2 +-
 datamodel/openapi/openapi-api-sample/pom.xml                  | 2 +-
 datamodel/openapi/openapi-core/pom.xml                        | 2 +-
 datamodel/openapi/openapi-generator-maven-plugin/pom.xml      | 2 +-
 .../sodastore/input/pom.xml                                   | 2 +-
 .../testAdditionalPropertiesAndEnablingAnyOfOneOf/pom.xml     | 2 +-
 .../testEmptyRequiredParameter/pom.xml                        | 2 +-
 .../testInvocationWithAllParameters/pom.xml                   | 2 +-
 .../testInvocationWithMandatoryParameters/pom.xml             | 2 +-
 .../testInvocationWithUnexpectedApiMaturity/pom.xml           | 2 +-
 .../DataModelGeneratorMojoUnitTest/testSkipExecution/pom.xml  | 2 +-
 datamodel/openapi/openapi-generator/pom.xml                   | 2 +-
 datamodel/openapi/pom.xml                                     | 2 +-
 datamodel/pom.xml                                             | 2 +-
 datamodel/soap/pom.xml                                        | 2 +-
 dependency-bundles/bom/pom.xml                                | 4 ++--
 dependency-bundles/modules-bom/pom.xml                        | 4 ++--
 dependency-bundles/sdk-core/pom.xml                           | 2 +-
 latest.json                                                   | 2 +-
 pom.xml                                                       | 4 ++--
 s4hana/pom.xml                                                | 2 +-
 s4hana/rfc/pom.xml                                            | 2 +-
 s4hana/s4hana-connectivity/pom.xml                            | 2 +-
 s4hana/s4hana-core/pom.xml                                    | 2 +-
 testutil/pom.xml                                              | 2 +-
 62 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 8a8414f4c..e083637cf 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<groupId>com.sap.cloud.sdk.archetypes</groupId>
 	<artifactId>archetypes-parent</artifactId>
diff --git a/archetypes/spring-boot3/pom.xml b/archetypes/spring-boot3/pom.xml
index 008c44bf3..180fe0640 100644
--- a/archetypes/spring-boot3/pom.xml
+++ b/archetypes/spring-boot3/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.archetypes</groupId>
 		<artifactId>archetypes-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-boot3</artifactId>
 	<packaging>maven-archetype</packaging>
diff --git a/archetypes/spring-boot3/src/main/resources/archetype-resources/pom.xml b/archetypes/spring-boot3/src/main/resources/archetype-resources/pom.xml
index a9f291744..ba5250c1c 100644
--- a/archetypes/spring-boot3/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/spring-boot3/src/main/resources/archetype-resources/pom.xml
@@ -15,7 +15,7 @@
         <spring-boot.version>3.3.0</spring-boot.version>
 
         <java.version>17</java.version>
-        <cloud-sdk.version>5.24.0-M3</cloud-sdk.version>
+        <cloud-sdk.version>5.24.0-SNAPSHOT</cloud-sdk.version>
 
         <maven.compiler.release>${java.version}</maven.compiler.release>
         <maven.compiler.proc>full</maven.compiler.proc>
diff --git a/cloudplatform/caching/pom.xml b/cloudplatform/caching/pom.xml
index b6339f3ba..3d2f63399 100644
--- a/cloudplatform/caching/pom.xml
+++ b/cloudplatform/caching/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>caching</artifactId>
 	<name>Business Technology Platform - Caching</name>
diff --git a/cloudplatform/cloudplatform-connectivity-scp-cf/pom.xml b/cloudplatform/cloudplatform-connectivity-scp-cf/pom.xml
index ae5348034..4ac9b3d00 100644
--- a/cloudplatform/cloudplatform-connectivity-scp-cf/pom.xml
+++ b/cloudplatform/cloudplatform-connectivity-scp-cf/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cloudplatform-connectivity-scp-cf</artifactId>
 	<name>(Deprecated) Cloud Platform - Connectivity SAP BTP Cloud Foundry</name>
diff --git a/cloudplatform/cloudplatform-connectivity/pom.xml b/cloudplatform/cloudplatform-connectivity/pom.xml
index 5f0ac90df..78be5453f 100644
--- a/cloudplatform/cloudplatform-connectivity/pom.xml
+++ b/cloudplatform/cloudplatform-connectivity/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cloudplatform-connectivity</artifactId>
 	<name>Business Technology Platform - Connectivity</name>
diff --git a/cloudplatform/cloudplatform-core/pom.xml b/cloudplatform/cloudplatform-core/pom.xml
index b3ab86ad6..ab98d7d6c 100644
--- a/cloudplatform/cloudplatform-core/pom.xml
+++ b/cloudplatform/cloudplatform-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cloudplatform-core</artifactId>
 	<name>Cloud Platform - Core</name>
diff --git a/cloudplatform/connectivity-apache-httpclient4/pom.xml b/cloudplatform/connectivity-apache-httpclient4/pom.xml
index 8bf3f66e1..31041e446 100644
--- a/cloudplatform/connectivity-apache-httpclient4/pom.xml
+++ b/cloudplatform/connectivity-apache-httpclient4/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>connectivity-apache-httpclient4</artifactId>
 	<name>Connectivity - Apache HTTP Client 4</name>
diff --git a/cloudplatform/connectivity-apache-httpclient5/pom.xml b/cloudplatform/connectivity-apache-httpclient5/pom.xml
index 7dc33729e..34c1b426a 100644
--- a/cloudplatform/connectivity-apache-httpclient5/pom.xml
+++ b/cloudplatform/connectivity-apache-httpclient5/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>connectivity-apache-httpclient5</artifactId>
 	<name>Apache version 5 Http Client integration</name>
diff --git a/cloudplatform/connectivity-destination-service/pom.xml b/cloudplatform/connectivity-destination-service/pom.xml
index 7b82788d2..c5083718b 100644
--- a/cloudplatform/connectivity-destination-service/pom.xml
+++ b/cloudplatform/connectivity-destination-service/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>connectivity-destination-service</artifactId>
 	<name>Cloud Platform - Connectivity SAP BTP Cloud Foundry</name>
diff --git a/cloudplatform/connectivity-dwc/pom.xml b/cloudplatform/connectivity-dwc/pom.xml
index 5f616f1ba..ff0c21401 100644
--- a/cloudplatform/connectivity-dwc/pom.xml
+++ b/cloudplatform/connectivity-dwc/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>connectivity-dwc</artifactId>
 	<name>Deploy with Confidence Connectivity</name>
diff --git a/cloudplatform/connectivity-oauth/pom.xml b/cloudplatform/connectivity-oauth/pom.xml
index 993710ea0..de7bc7e65 100644
--- a/cloudplatform/connectivity-oauth/pom.xml
+++ b/cloudplatform/connectivity-oauth/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>connectivity-oauth</artifactId>
 	<name>OAuth2 Connectivity</name>
diff --git a/cloudplatform/connectivity-ztis/pom.xml b/cloudplatform/connectivity-ztis/pom.xml
index dc5f5f9bc..a869c46b7 100644
--- a/cloudplatform/connectivity-ztis/pom.xml
+++ b/cloudplatform/connectivity-ztis/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>connectivity-ztis</artifactId>
 	<name>Connectivity - Zero Trust Identity Service</name>
diff --git a/cloudplatform/dwc-cf/pom.xml b/cloudplatform/dwc-cf/pom.xml
index f4a34da2e..a88cb744c 100644
--- a/cloudplatform/dwc-cf/pom.xml
+++ b/cloudplatform/dwc-cf/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dwc-cf</artifactId>
 	<name>(Deprecated) Cloud Platform - SAP Deploy with Confidence on Cloud Foundry</name>
diff --git a/cloudplatform/pom.xml b/cloudplatform/pom.xml
index 90c8a35c3..dad63bc72 100644
--- a/cloudplatform/pom.xml
+++ b/cloudplatform/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 	<artifactId>cloudplatform-parent</artifactId>
diff --git a/cloudplatform/resilience-api/pom.xml b/cloudplatform/resilience-api/pom.xml
index b91c07219..ffbd8e0e5 100644
--- a/cloudplatform/resilience-api/pom.xml
+++ b/cloudplatform/resilience-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>resilience-api</artifactId>
 	<name>Cloud Platform - Resilience API</name>
diff --git a/cloudplatform/resilience/pom.xml b/cloudplatform/resilience/pom.xml
index acd3e2e77..c5538e7d4 100644
--- a/cloudplatform/resilience/pom.xml
+++ b/cloudplatform/resilience/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>resilience</artifactId>
 	<name>Cloud Platform - Resilience API and Default Implementation</name>
diff --git a/cloudplatform/resilience4j/pom.xml b/cloudplatform/resilience4j/pom.xml
index 106539f3e..75a941cd8 100644
--- a/cloudplatform/resilience4j/pom.xml
+++ b/cloudplatform/resilience4j/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>resilience4j</artifactId>
 	<name>Cloud Platform - Resilience4j</name>
diff --git a/cloudplatform/scp-cf/pom.xml b/cloudplatform/scp-cf/pom.xml
index d6190f0a4..29f12164e 100644
--- a/cloudplatform/scp-cf/pom.xml
+++ b/cloudplatform/scp-cf/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>scp-cf</artifactId>
 	<name>(Deprecated) Business Technology Platform - SAP BTP Cloud Foundry</name>
diff --git a/cloudplatform/security/pom.xml b/cloudplatform/security/pom.xml
index 282ed5754..21f1dd607 100644
--- a/cloudplatform/security/pom.xml
+++ b/cloudplatform/security/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>security</artifactId>
 	<name>Business Technology Platform - Security</name>
diff --git a/cloudplatform/servlet-jakarta/pom.xml b/cloudplatform/servlet-jakarta/pom.xml
index 26185199c..812875b68 100644
--- a/cloudplatform/servlet-jakarta/pom.xml
+++ b/cloudplatform/servlet-jakarta/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>servlet-jakarta</artifactId>
 	<name>Cloud Platform - Servlet Jakarta compatible</name>
diff --git a/cloudplatform/tenant/pom.xml b/cloudplatform/tenant/pom.xml
index a547bd7a6..9c14c8f0f 100644
--- a/cloudplatform/tenant/pom.xml
+++ b/cloudplatform/tenant/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tenant</artifactId>
 	<name>Cloud Platform - Tenant</name>
diff --git a/datamodel/datamodel-metadata-generator/pom.xml b/datamodel/datamodel-metadata-generator/pom.xml
index d9aff35f1..49fcda545 100644
--- a/datamodel/datamodel-metadata-generator/pom.xml
+++ b/datamodel/datamodel-metadata-generator/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>datamodel-metadata-generator</artifactId>
 	<name>Data Model - Metadata Generator (Beta)</name>
diff --git a/datamodel/fluent-result/pom.xml b/datamodel/fluent-result/pom.xml
index 1fe9a8e6b..733ed9e17 100644
--- a/datamodel/fluent-result/pom.xml
+++ b/datamodel/fluent-result/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>fluent-result</artifactId>
 	<name>Data Model - Fluent Result</name>
diff --git a/datamodel/odata-client/pom.xml b/datamodel/odata-client/pom.xml
index 1a55f21dc..4e3802894 100644
--- a/datamodel/odata-client/pom.xml
+++ b/datamodel/odata-client/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>odata-client</artifactId>
 	<packaging>jar</packaging>
diff --git a/datamodel/odata-generator-utility/pom.xml b/datamodel/odata-generator-utility/pom.xml
index f7dd01ec4..da52e3a24 100644
--- a/datamodel/odata-generator-utility/pom.xml
+++ b/datamodel/odata-generator-utility/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>odata-generator-utility</artifactId>
 	<name>OData Utility</name>
diff --git a/datamodel/odata-v4/odata-v4-api-sample/pom.xml b/datamodel/odata-v4/odata-v4-api-sample/pom.xml
index 5ccdf53c5..104b05a74 100644
--- a/datamodel/odata-v4/odata-v4-api-sample/pom.xml
+++ b/datamodel/odata-v4/odata-v4-api-sample/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-v4-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>odata-v4-api-sample</artifactId>
 	<name>OData V4 VDM - Sample API</name>
diff --git a/datamodel/odata-v4/odata-v4-core/pom.xml b/datamodel/odata-v4/odata-v4-core/pom.xml
index 7b6c3a812..292b67fd4 100644
--- a/datamodel/odata-v4/odata-v4-core/pom.xml
+++ b/datamodel/odata-v4/odata-v4-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-v4-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>odata-v4-core</artifactId>
 	<packaging>jar</packaging>
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 08c2a598b..9270b8f18 100644
--- a/datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml
+++ b/datamodel/odata-v4/odata-v4-generator-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-v4-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>odata-v4-generator-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
diff --git a/datamodel/odata-v4/odata-v4-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml b/datamodel/odata-v4/odata-v4-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml
index 3574a4a30..9d8aba81e 100644
--- a/datamodel/odata-v4/odata-v4-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml
+++ b/datamodel/odata-v4/odata-v4-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.company</groupId>
     <artifactId>application</artifactId>
-    <version>5.24.0-M3</version>
+    <version>5.24.0-SNAPSHOT</version>
 
     <build>
         <plugins>
diff --git a/datamodel/odata-v4/odata-v4-generator/pom.xml b/datamodel/odata-v4/odata-v4-generator/pom.xml
index d94e8d648..678379386 100644
--- a/datamodel/odata-v4/odata-v4-generator/pom.xml
+++ b/datamodel/odata-v4/odata-v4-generator/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-v4-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>odata-v4-generator</artifactId>
 	<packaging>jar</packaging>
diff --git a/datamodel/odata-v4/pom.xml b/datamodel/odata-v4/pom.xml
index 027550ec3..bfc89369d 100644
--- a/datamodel/odata-v4/pom.xml
+++ b/datamodel/odata-v4/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>odata-v4-parent</artifactId>
 	<packaging>pom</packaging>
diff --git a/datamodel/odata/odata-api-sample/pom.xml b/datamodel/odata/odata-api-sample/pom.xml
index 949ee2925..6ba768777 100644
--- a/datamodel/odata/odata-api-sample/pom.xml
+++ b/datamodel/odata/odata-api-sample/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>odata-api-sample</artifactId>
 	<name>OData VDM - Sample API</name>
diff --git a/datamodel/odata/odata-core/pom.xml b/datamodel/odata/odata-core/pom.xml
index 591c3a411..57d1d77cf 100644
--- a/datamodel/odata/odata-core/pom.xml
+++ b/datamodel/odata/odata-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>odata-core</artifactId>
 	<packaging>jar</packaging>
diff --git a/datamodel/odata/odata-generator-maven-plugin/pom.xml b/datamodel/odata/odata-generator-maven-plugin/pom.xml
index 09df494c8..54203172f 100644
--- a/datamodel/odata/odata-generator-maven-plugin/pom.xml
+++ b/datamodel/odata/odata-generator-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>odata-generator-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
diff --git a/datamodel/odata/odata-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml b/datamodel/odata/odata-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml
index 92f2caf8f..84a128bb7 100644
--- a/datamodel/odata/odata-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml
+++ b/datamodel/odata/odata-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoTest/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.company</groupId>
     <artifactId>application</artifactId>
-    <version>5.24.0-M3</version>
+    <version>5.24.0-SNAPSHOT</version>
 
     <build>
         <plugins>
diff --git a/datamodel/odata/odata-generator/pom.xml b/datamodel/odata/odata-generator/pom.xml
index 943716026..fb57e9dee 100644
--- a/datamodel/odata/odata-generator/pom.xml
+++ b/datamodel/odata/odata-generator/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>odata-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>odata-generator</artifactId>
 	<packaging>jar</packaging>
diff --git a/datamodel/odata/pom.xml b/datamodel/odata/pom.xml
index 736679a24..b853e24e2 100644
--- a/datamodel/odata/pom.xml
+++ b/datamodel/odata/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>odata-parent</artifactId>
 	<packaging>pom</packaging>
diff --git a/datamodel/openapi/openapi-api-sample/pom.xml b/datamodel/openapi/openapi-api-sample/pom.xml
index 7f9142f99..f37f5c06f 100644
--- a/datamodel/openapi/openapi-api-sample/pom.xml
+++ b/datamodel/openapi/openapi-api-sample/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>openapi-api-sample</artifactId>
 	<name>Data Model - OpenAPI Services - Sample API</name>
diff --git a/datamodel/openapi/openapi-core/pom.xml b/datamodel/openapi/openapi-core/pom.xml
index 77680a663..652d928af 100644
--- a/datamodel/openapi/openapi-core/pom.xml
+++ b/datamodel/openapi/openapi-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>openapi-core</artifactId>
 	<name>Data Model - OpenAPI Services - Core</name>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/pom.xml
index f5a8c0883..9d3e1a944 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>openapi-generator-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoIntegrationTest/sodastore/input/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoIntegrationTest/sodastore/input/pom.xml
index b6dca5663..eb9ec842d 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoIntegrationTest/sodastore/input/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoIntegrationTest/sodastore/input/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-M3</version>
+	<version>5.24.0-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testAdditionalPropertiesAndEnablingAnyOfOneOf/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testAdditionalPropertiesAndEnablingAnyOfOneOf/pom.xml
index cc34ae7ea..c73f5550a 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testAdditionalPropertiesAndEnablingAnyOfOneOf/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testAdditionalPropertiesAndEnablingAnyOfOneOf/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-M3</version>
+	<version>5.24.0-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testEmptyRequiredParameter/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testEmptyRequiredParameter/pom.xml
index 6893ec2d1..3abddd181 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testEmptyRequiredParameter/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testEmptyRequiredParameter/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-M3</version>
+	<version>5.24.0-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithAllParameters/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithAllParameters/pom.xml
index 7001f2675..e489f4811 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithAllParameters/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithAllParameters/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-M3</version>
+	<version>5.24.0-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithMandatoryParameters/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithMandatoryParameters/pom.xml
index f76cade54..272891530 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithMandatoryParameters/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithMandatoryParameters/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-M3</version>
+	<version>5.24.0-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithUnexpectedApiMaturity/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithUnexpectedApiMaturity/pom.xml
index 3f25cd0ff..9e141b536 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithUnexpectedApiMaturity/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithUnexpectedApiMaturity/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-M3</version>
+	<version>5.24.0-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testSkipExecution/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testSkipExecution/pom.xml
index 409b3869b..9dc3d935b 100644
--- a/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testSkipExecution/pom.xml
+++ b/datamodel/openapi/openapi-generator-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testSkipExecution/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.24.0-M3</version>
+	<version>5.24.0-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/datamodel/openapi/openapi-generator/pom.xml b/datamodel/openapi/openapi-generator/pom.xml
index 721da098b..353df4c30 100644
--- a/datamodel/openapi/openapi-generator/pom.xml
+++ b/datamodel/openapi/openapi-generator/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>openapi-generator</artifactId>
 	<packaging>jar</packaging>
diff --git a/datamodel/openapi/pom.xml b/datamodel/openapi/pom.xml
index adcdb9dd8..eb3faa80c 100644
--- a/datamodel/openapi/pom.xml
+++ b/datamodel/openapi/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>openapi-parent</artifactId>
 	<packaging>pom</packaging>
diff --git a/datamodel/pom.xml b/datamodel/pom.xml
index 511778640..5f6a91f46 100644
--- a/datamodel/pom.xml
+++ b/datamodel/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<groupId>com.sap.cloud.sdk.datamodel</groupId>
 	<artifactId>datamodel-parent</artifactId>
diff --git a/datamodel/soap/pom.xml b/datamodel/soap/pom.xml
index 4bf3bc23e..58572c627 100644
--- a/datamodel/soap/pom.xml
+++ b/datamodel/soap/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>soap</artifactId>
 	<name>Data Model - SOAP Queries</name>
diff --git a/dependency-bundles/bom/pom.xml b/dependency-bundles/bom/pom.xml
index 77f89d38e..996585ac6 100644
--- a/dependency-bundles/bom/pom.xml
+++ b/dependency-bundles/bom/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.sap.cloud.sdk</groupId>
 	<artifactId>sdk-bom</artifactId>
-	<version>5.24.0-M3</version>
+	<version>5.24.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>SAP Cloud SDK - Modules and Dependencies BOM</name>
 	<description>Bill of Materials (BOM) of the SAP Cloud SDK modules and dependencies.</description>
@@ -44,7 +44,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- do not modify the following line, it is updated by the versioning script -->
-		<sdk.version>5.24.0-M3</sdk.version>
+		<sdk.version>5.24.0-SNAPSHOT</sdk.version>
 		<service-binding.version>0.21.0</service-binding.version>
 		<!-- HTTP stuff -->
 		<httpcore.version>4.4.16</httpcore.version>
diff --git a/dependency-bundles/modules-bom/pom.xml b/dependency-bundles/modules-bom/pom.xml
index 2843254e5..f792f69b2 100644
--- a/dependency-bundles/modules-bom/pom.xml
+++ b/dependency-bundles/modules-bom/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.sap.cloud.sdk</groupId>
 	<artifactId>sdk-modules-bom</artifactId>
-	<version>5.24.0-M3</version>
+	<version>5.24.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>SAP Cloud SDK - Modules BOM</name>
 	<description>Bill of Materials (BOM) of the SAP Cloud SDK modules.</description>
@@ -44,7 +44,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- do not modify the following line, it is updated by the versioning script -->
-		<sdk.version>5.24.0-M3</sdk.version>
+		<sdk.version>5.24.0-SNAPSHOT</sdk.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/dependency-bundles/sdk-core/pom.xml b/dependency-bundles/sdk-core/pom.xml
index 780060d2a..ef1e43aec 100644
--- a/dependency-bundles/sdk-core/pom.xml
+++ b/dependency-bundles/sdk-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>sdk-core</artifactId>
diff --git a/latest.json b/latest.json
index 629a2e38c..7b69301cd 100644
--- a/latest.json
+++ b/latest.json
@@ -1,3 +1,3 @@
 {
-    "version": "5.24.0-M3"
+    "version": "5.24.0-SNAPSHOT"
 }
diff --git a/pom.xml b/pom.xml
index aeeee5e59..3d30dce6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.sap.cloud.sdk</groupId>
 	<artifactId>sdk-parent</artifactId>
-	<version>5.24.0-M3</version>
+	<version>5.24.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>SAP Cloud SDK - Parent POM</name>
 	<description>Parent POM of the SAP Cloud SDK.</description>
@@ -49,7 +49,7 @@
 	</distributionManagement>
 	<properties>
 		<!--  do not modify the following line, it is updated by the versioning script  -->
-		<sdk.version>5.24.0-M3</sdk.version>
+		<sdk.version>5.24.0-SNAPSHOT</sdk.version>
 		<maven.version>3.5</maven.version>
 		<java.version>17</java.version>
 		<java.failOnWarning>true</java.failOnWarning>
diff --git a/s4hana/pom.xml b/s4hana/pom.xml
index 223aeb973..b8c9fa6e3 100644
--- a/s4hana/pom.xml
+++ b/s4hana/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<groupId>com.sap.cloud.sdk.s4hana</groupId>
 	<artifactId>s4hana-parent</artifactId>
diff --git a/s4hana/rfc/pom.xml b/s4hana/rfc/pom.xml
index 80b810dff..c1e481210 100644
--- a/s4hana/rfc/pom.xml
+++ b/s4hana/rfc/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.s4hana</groupId>
 		<artifactId>s4hana-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>rfc</artifactId>
 	<name>SAP S/4HANA - RFC Queries</name>
diff --git a/s4hana/s4hana-connectivity/pom.xml b/s4hana/s4hana-connectivity/pom.xml
index 9c10564ca..9eba66e2a 100644
--- a/s4hana/s4hana-connectivity/pom.xml
+++ b/s4hana/s4hana-connectivity/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.s4hana</groupId>
 		<artifactId>s4hana-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>s4hana-connectivity</artifactId>
 	<name>SAP S/4HANA - Connectivity</name>
diff --git a/s4hana/s4hana-core/pom.xml b/s4hana/s4hana-core/pom.xml
index aa7c00bb3..20e051a0e 100644
--- a/s4hana/s4hana-core/pom.xml
+++ b/s4hana/s4hana-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.s4hana</groupId>
 		<artifactId>s4hana-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>s4hana-core</artifactId>
 	<name>SAP S/4HANA - Core</name>
diff --git a/testutil/pom.xml b/testutil/pom.xml
index 319011094..00daf062b 100644
--- a/testutil/pom.xml
+++ b/testutil/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.24.0-M3</version>
+		<version>5.24.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>testutil</artifactId>
 	<name>(Internal) Test Utilities</name>