Merge branch 'main' into d070615-modify-hierarchy

Author: etimr

.gitignore

@@ -1,7 +1,6 @@
 gen/
 edmx/
-schema.sql
-schema-nomocks.sql
+schema-h2.sql
 default-env.json
 openapi.json
 .env

app/_i18n/i18n.properties

@@ -69,11 +69,3 @@ AddReview = Add Review
 Notes = Notes
 Note = Note
 ISBN = ISBN
-
-attachment_content = Content
-attachment_mimeType = MIME Type
-attachment_fileName = File Name
-attachment_status = Status
-attachment_note = Note
-attachment = Cover
-attachments = Covers

app/_i18n/i18n_de.properties

@@ -69,11 +69,3 @@ AddReview = Rezension hinzufügen
 Notes = Notizen
 Note = Notiz
 ISBN = ISBN
-
-attachment_content = Inhalt
-attachment_mimeType = MIME-Typ
-attachment_fileName = Dateiname
-attachment_status = Status
-attachment_note = Notiz
-attachment = Buchcover
-attachments = Buchcovers

pom.xml

@@ -27,7 +27,7 @@
 		<cloud.sdk.version>5.15.0</cloud.sdk.version>
 		<xsuaa.version>3.5.7</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
-		<cds-feature-attachments.version>1.0.5</cds-feature-attachments.version>
+		<cds-feature-attachments.version>1.0.6</cds-feature-attachments.version>
 	</properties>
 
 	<modules>
@@ -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>

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>
@@ -220,8 +219,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>

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
@@ -128,6 +127,7 @@ cds:
 ---
 spring:
   config.activate.on-profile: default
+  sql.init.platform: h2
 cds:
   data-source:
     auto-config.enabled: false