From 542378e25ca29b35e02fe9d201e8713e0e2d3759 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Wed, 12 Feb 2025 12:45:09 +0100
Subject: [PATCH 1/4] Align bookshop with CAP Java archetype

---
 .gitignore                              | 2 +-
 srv/pom.xml                             | 3 +--
 srv/src/main/resources/application.yaml | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0d7f525b..28cb6310 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 gen/
 edmx/
-schema.sql
+schema-h2.sql
 schema-nomocks.sql
 default-env.json
 openapi.json
diff --git a/srv/pom.xml b/srv/pom.xml
index 18b22bff..93f9e51e 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -220,8 +220,7 @@
 						<configuration>
 							<commands>
 								<command>build --for java</command>
-								<command>deploy --to h2 --with-mocks --dry --out "${project.basedir}/src/main/resources/schema.sql"</command>
-								<command>deploy --to h2 --dry --out "${project.basedir}/src/main/resources/schema-nomocks.sql"</command>
+								<command>deploy --to h2 --with-mocks --dry --out "${project.basedir}/src/main/resources/schema-h2.sql"</command>
 								<command>compile srv/cat-service.cds -2 openapi --openapi:url /api/browse &gt;
 									"${project.basedir}/src/main/resources/swagger/openapi.json"</command>
 							</commands>
diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml
index 477f3dfb..838247b4 100644
--- a/srv/src/main/resources/application.yaml
+++ b/srv/src/main/resources/application.yaml
@@ -128,6 +128,7 @@ cds:
 ---
 spring:
   config.activate.on-profile: default
+  sql.init.platform: h2
 cds:
   data-source:
     auto-config.enabled: false

From 777f90b4970ae6fc15e74116065447fa09983b5f Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Wed, 12 Feb 2025 13:15:38 +0100
Subject: [PATCH 2/4] remove schema location from cloud profile

---
 srv/src/main/resources/application.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml
index 838247b4..da6f33a7 100644
--- a/srv/src/main/resources/application.yaml
+++ b/srv/src/main/resources/application.yaml
@@ -44,7 +44,6 @@ management:
 ---
 spring:
   config.activate.on-profile: cloud
-  sql.init.schema-locations: "classpath:schema-nomocks.sql"
 cds:
   sql.hana.search:
     fuzzy: true

From 58e7bb833b54d8323675ffd8a3e250ccef87b9fe Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Wed, 12 Feb 2025 13:53:15 +0100
Subject: [PATCH 3/4] added cds-maven-plugin to plugin management in root
 pom.xm.

---
 pom.xml     | 11 +++++++++++
 srv/pom.xml |  1 -
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2c536a3b..b64c4404 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,17 @@
 	</dependencyManagement>
 
 	<build>
+		<pluginManagement>
+			<plugins>
+				<!-- MAKE CDS PLUGIN RUNNABLE FROM ROOT -->
+				<plugin>
+					<groupId>com.sap.cds</groupId>
+					<artifactId>cds-maven-plugin</artifactId>
+					<version>${cds.services.version}</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+
 		<plugins>
 			<!-- JAVA VERSION -->
 			<plugin>
diff --git a/srv/pom.xml b/srv/pom.xml
index 93f9e51e..dfbaf573 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -179,7 +179,6 @@
 			<plugin>
 				<groupId>com.sap.cds</groupId>
 				<artifactId>cds-maven-plugin</artifactId>
-				<version>${cds.services.version}</version>
 				<executions>
 					<execution>
 						<id>cds.clean</id>

From c555912a97bde20d2203571981161cc43b46c205 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus.ofterdinger@sap.com>
Date: Wed, 12 Feb 2025 14:00:59 +0100
Subject: [PATCH 4/4] Update .gitignore

Co-authored-by: Marc Becker <marc.becker@sap.com>
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 28cb6310..f9986b41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 gen/
 edmx/
 schema-h2.sql
-schema-nomocks.sql
 default-env.json
 openapi.json
 .env