From 35a59ed968bd93c3870d14da5e1d850631111210 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 7 Oct 2024 12:09:37 +0200
Subject: [PATCH 01/53] Add dependency to cds-feature-attachments

---
 db/books.cds |  2 ++
 db/pom.xml   | 40 ++++++++++++++++++++++++++++++++++++++++
 pom.xml      | 21 +++++++++++++++++++++
 srv/pom.xml  |  1 +
 4 files changed, 64 insertions(+)
 create mode 100644 db/pom.xml

diff --git a/db/books.cds b/db/books.cds
index fe2e5e0a..7973a1d3 100644
--- a/db/books.cds
+++ b/db/books.cds
@@ -8,6 +8,7 @@ using {
 } from '@sap/cds/common';
 using my.bookshop.Reviews from './reviews';
 using my.bookshop.TechnicalBooleanFlag from './common';
+using {sap.attachments.Attachments} from `com.sap.cds/cds-feature-attachments`;
 
 @fiori.draft.enabled
 entity Books : cuid, managed {
@@ -22,6 +23,7 @@ entity Books : cuid, managed {
     reviews      : Association to many Reviews
                        on reviews.book = $self;
     isReviewable : TechnicalBooleanFlag not null default true;
+    covers       : Composition of many Attachments;
 }
 
 entity Authors : cuid, managed {
diff --git a/db/pom.xml b/db/pom.xml
new file mode 100644
index 00000000..155d40fb
--- /dev/null
+++ b/db/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>bookshop-parent</artifactId>
+		<groupId>my</groupId>
+		<version>${revision}</version>
+	</parent>
+
+    <artifactId>bookshop-db</artifactId>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.sap.cds</groupId>
+                <artifactId>cds-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>cds.clean</id>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+
+                    <execution>
+                        <id>cds.resolve</id>
+                        <goals>
+                            <goal>resolve</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 957cccc3..076dc5ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,9 +28,11 @@
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
 		<cds.cdsdk-version>8.3.0</cds.cdsdk-version>
+		<cds-feature-attachments.version>1.0.4-SNAPSHOT</cds-feature-attachments.version>
 	</properties>
 
 	<modules>
+		<module>db</module>
 		<module>srv</module>
 		<module>integration-tests</module>
 	</modules>
@@ -74,6 +76,14 @@
 		</dependencies>
 	</dependencyManagement>
 
+	<dependencies>
+		<dependency>
+			<groupId>com.sap.cds</groupId>
+			<artifactId>cds-feature-attachments</artifactId>
+			<version>${cds-feature-attachments.version}</version>
+		</dependency>
+	</dependencies>
+
 	<build>
 		<plugins>
 			<!-- JAVA VERSION -->
@@ -167,4 +177,15 @@
 			</plugin>
 		</plugins>
 	</build>
+
+	<repositories>
+		<repository>
+			<id>Artifactory_DMZ-snapshots</id>
+			<name>SAP's Artifactory</name>
+			<url>https://common.repositories.cloud.sap/artifactory/cap-java/</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
 </project>
diff --git a/srv/pom.xml b/srv/pom.xml
index a8d9ae7b..2016fc48 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -236,4 +236,5 @@
 			</plugin>
 		</plugins>
 	</build>
+
 </project>

From 298d31be83ba064a70e680b3354fef79a7387d20 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 7 Oct 2024 12:46:45 +0200
Subject: [PATCH 02/53] Added UI facets with translations

---
 app/_i18n/i18n.properties    | 2 ++
 app/_i18n/i18n_de.properties | 2 ++
 app/admin/fiori-service.cds  | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/app/_i18n/i18n.properties b/app/_i18n/i18n.properties
index d9718f5a..3aa2f556 100644
--- a/app/_i18n/i18n.properties
+++ b/app/_i18n/i18n.properties
@@ -68,3 +68,5 @@ AddReview = Add Review
 Notes = Notes
 Note = Note
 ISBN = ISBN
+
+attachmentsAndLinks = Attachments and Links
\ No newline at end of file
diff --git a/app/_i18n/i18n_de.properties b/app/_i18n/i18n_de.properties
index afdd8243..b9e3c8e6 100644
--- a/app/_i18n/i18n_de.properties
+++ b/app/_i18n/i18n_de.properties
@@ -68,3 +68,5 @@ AddReview = Rezension hinzufügen
 Notes = Notizen
 Note = Notiz
 ISBN = ISBN
+
+attachmentsAndLinks = Anhänge und Links
\ No newline at end of file
diff --git a/app/admin/fiori-service.cds b/app/admin/fiori-service.cds
index 2480f4cc..0726e285 100644
--- a/app/admin/fiori-service.cds
+++ b/app/admin/fiori-service.cds
@@ -31,6 +31,12 @@ annotate AdminService.Books with @(UI : {
             Label : '{i18n>Admin}',
             Target : '@UI.FieldGroup#Admin'
         },
+        {
+            $Type  : 'UI.ReferenceFacet',
+            ID     : 'AttachmentsFacet',
+            Label  : '{i18n>attachmentsAndLinks}',
+            Target : 'attachments/@UI.LineItem'
+        }
     ],
     FieldGroup #General : {Data : [
         {Value : title},

From 2e85b8bddc05eefc260dda346837f831f3706e72 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 7 Oct 2024 12:49:15 +0200
Subject: [PATCH 03/53] fixed wrong target

---
 app/admin/fiori-service.cds | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin/fiori-service.cds b/app/admin/fiori-service.cds
index 0726e285..59cf774d 100644
--- a/app/admin/fiori-service.cds
+++ b/app/admin/fiori-service.cds
@@ -35,7 +35,7 @@ annotate AdminService.Books with @(UI : {
             $Type  : 'UI.ReferenceFacet',
             ID     : 'AttachmentsFacet',
             Label  : '{i18n>attachmentsAndLinks}',
-            Target : 'attachments/@UI.LineItem'
+            Target : 'covers/@UI.LineItem'
         }
     ],
     FieldGroup #General : {Data : [

From 925bc98aa7bd991597ea0d0715a9a041f81f88b8 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 7 Oct 2024 13:44:40 +0200
Subject: [PATCH 04/53] added further texts

---
 app/_i18n/i18n.properties    | 9 ++++++++-
 app/_i18n/i18n_de.properties | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/_i18n/i18n.properties b/app/_i18n/i18n.properties
index 3aa2f556..d1226f53 100644
--- a/app/_i18n/i18n.properties
+++ b/app/_i18n/i18n.properties
@@ -69,4 +69,11 @@ Notes = Notes
 Note = Note
 ISBN = ISBN
 
-attachmentsAndLinks = Attachments and Links
\ No newline at end of file
+attachmentsAndLinks = Attachments and Links
+attachment_content = Content
+attachment_mimeType = MIME Type
+attachment_fileName = File Name
+attachment_status = Status
+attachment_note = Note
+attachment = Attachment
+attachments = Attachments
\ No newline at end of file
diff --git a/app/_i18n/i18n_de.properties b/app/_i18n/i18n_de.properties
index b9e3c8e6..81ff4355 100644
--- a/app/_i18n/i18n_de.properties
+++ b/app/_i18n/i18n_de.properties
@@ -69,4 +69,11 @@ Notes = Notizen
 Note = Notiz
 ISBN = ISBN
 
-attachmentsAndLinks = Anhänge und Links
\ No newline at end of file
+attachmentsAndLinks = Anhänge und Links
+attachment_content = Inhalt
+attachment_mimeType = MIME-Typ
+attachment_fileName = Dateiname
+attachment_status = Status
+attachment_note = Notiz
+attachment = Anhang
+attachments = Anhänge
\ No newline at end of file

From 02fc3d1f49b5ed7d480449009c372f0c8715aef5 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 7 Oct 2024 14:53:12 +0200
Subject: [PATCH 05/53] use version 1.0.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 076dc5ed..a382c5da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
 		<cds.cdsdk-version>8.3.0</cds.cdsdk-version>
-		<cds-feature-attachments.version>1.0.4-SNAPSHOT</cds-feature-attachments.version>
+		<cds-feature-attachments.version>1.0.3</cds-feature-attachments.version>
 	</properties>
 
 	<modules>

From 6dc93dc77fc261bd42475fd5e95aba57a6780941 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 7 Oct 2024 15:37:38 +0200
Subject: [PATCH 06/53] minor fixes

---
 db/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/pom.xml b/db/pom.xml
index 155d40fb..fcaf34b2 100644
--- a/db/pom.xml
+++ b/db/pom.xml
@@ -18,6 +18,7 @@
             <plugin>
                 <groupId>com.sap.cds</groupId>
                 <artifactId>cds-maven-plugin</artifactId>
+                <version>${cds.services.version}</version>
                 <executions>
                     <execution>
                         <id>cds.clean</id>

From 708dbfde5f50391860a7e89778404120a42bdf10 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 7 Oct 2024 17:15:46 +0200
Subject: [PATCH 07/53] Update UI5 to version 1.129.0

---
 app/fiori.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/fiori.html b/app/fiori.html
index 736a2458..4191d16c 100644
--- a/app/fiori.html
+++ b/app/fiori.html
@@ -14,8 +14,8 @@
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.124.2/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.124.2/resources/sap-ui-core.js"
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.129.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.129.0/resources/sap-ui-core.js"
 			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
 			data-sap-ui-compatVersion="edge"
 			data-sap-ui-theme="sap_horizon"

From d8964e54c625234006846c12d9d77556ec1f8dcf Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 7 Oct 2024 17:24:58 +0200
Subject: [PATCH 08/53] Renamed attachmentsAndLinks to covers

---
 app/_i18n/i18n.properties    | 2 +-
 app/_i18n/i18n_de.properties | 2 +-
 app/admin/fiori-service.cds  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/_i18n/i18n.properties b/app/_i18n/i18n.properties
index d1226f53..2a5bef0f 100644
--- a/app/_i18n/i18n.properties
+++ b/app/_i18n/i18n.properties
@@ -69,7 +69,7 @@ Notes = Notes
 Note = Note
 ISBN = ISBN
 
-attachmentsAndLinks = Attachments and Links
+covers = Covers
 attachment_content = Content
 attachment_mimeType = MIME Type
 attachment_fileName = File Name
diff --git a/app/_i18n/i18n_de.properties b/app/_i18n/i18n_de.properties
index 81ff4355..f00a1486 100644
--- a/app/_i18n/i18n_de.properties
+++ b/app/_i18n/i18n_de.properties
@@ -69,7 +69,7 @@ Notes = Notizen
 Note = Notiz
 ISBN = ISBN
 
-attachmentsAndLinks = Anhänge und Links
+covers = Buchcovers
 attachment_content = Inhalt
 attachment_mimeType = MIME-Typ
 attachment_fileName = Dateiname
diff --git a/app/admin/fiori-service.cds b/app/admin/fiori-service.cds
index 59cf774d..7d22542b 100644
--- a/app/admin/fiori-service.cds
+++ b/app/admin/fiori-service.cds
@@ -34,7 +34,7 @@ annotate AdminService.Books with @(UI : {
         {
             $Type  : 'UI.ReferenceFacet',
             ID     : 'AttachmentsFacet',
-            Label  : '{i18n>attachmentsAndLinks}',
+            Label  : '{i18n>covers}',
             Target : 'covers/@UI.LineItem'
         }
     ],

From 4bcc3e538d8f906de288699c8b26071670eb4fa0 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 8 Oct 2024 13:26:07 +0200
Subject: [PATCH 09/53] use snapshot again

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a382c5da..076dc5ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
 		<cds.cdsdk-version>8.3.0</cds.cdsdk-version>
-		<cds-feature-attachments.version>1.0.3</cds-feature-attachments.version>
+		<cds-feature-attachments.version>1.0.4-SNAPSHOT</cds-feature-attachments.version>
 	</properties>
 
 	<modules>

From c9a10a237e1cfad276dc3b47f39e03584cf09e9e Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 8 Oct 2024 15:39:45 +0200
Subject: [PATCH 10/53] workaround for etag issue

---
 db/common.cds | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/db/common.cds b/db/common.cds
index a1c0cd80..162024ea 100644
--- a/db/common.cds
+++ b/db/common.cds
@@ -1,4 +1,5 @@
 namespace my.bookshop;
+using {sap.attachments.Attachments} from `com.sap.cds/cds-feature-attachments`;
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -8,3 +9,7 @@ type TechnicalBooleanFlag : Boolean @(
     UI.Hidden,
     Core.Computed
 );
+
+annotate Attachments with {
+    modifiedAt @(odata.etag: null);
+}

From b650ec1335034622398451d80696a05564e48065 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 8 Oct 2024 15:59:21 +0200
Subject: [PATCH 11/53] revert to released version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 076dc5ed..a382c5da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
 		<cds.cdsdk-version>8.3.0</cds.cdsdk-version>
-		<cds-feature-attachments.version>1.0.4-SNAPSHOT</cds-feature-attachments.version>
+		<cds-feature-attachments.version>1.0.3</cds-feature-attachments.version>
 	</properties>
 
 	<modules>

From 68889d669bf73dc4e4ce6e5de9c72e24cac28821 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 8 Oct 2024 17:25:11 +0200
Subject: [PATCH 12/53] Revert to UI5 1.128.0 to fix etag issue.

---
 app/fiori.html | 4 ++--
 db/common.cds  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/fiori.html b/app/fiori.html
index 4191d16c..08c188f5 100644
--- a/app/fiori.html
+++ b/app/fiori.html
@@ -14,8 +14,8 @@
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.129.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.129.0/resources/sap-ui-core.js"
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.128.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.128.0/resources/sap-ui-core.js"
 			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
 			data-sap-ui-compatVersion="edge"
 			data-sap-ui-theme="sap_horizon"
diff --git a/db/common.cds b/db/common.cds
index 162024ea..333ed36c 100644
--- a/db/common.cds
+++ b/db/common.cds
@@ -10,6 +10,6 @@ type TechnicalBooleanFlag : Boolean @(
     Core.Computed
 );
 
-annotate Attachments with {
-    modifiedAt @(odata.etag: null);
-}
+// annotate Attachments with {
+//     modifiedAt @(odata.etag: null);
+// }

From 85c12f60bfdec67ef6c54c5d9b745993dec2e039 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 8 Oct 2024 17:34:15 +0200
Subject: [PATCH 13/53] Downgrade to UI5 1.126.0

---
 app/fiori.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/fiori.html b/app/fiori.html
index 08c188f5..ddf546bd 100644
--- a/app/fiori.html
+++ b/app/fiori.html
@@ -14,8 +14,8 @@
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.128.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.128.0/resources/sap-ui-core.js"
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.126.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.126.0/resources/sap-ui-core.js"
 			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
 			data-sap-ui-compatVersion="edge"
 			data-sap-ui-theme="sap_horizon"

From dca19768fb197ecf02d0bc1b076694697a3f1f37 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Wed, 9 Oct 2024 13:32:51 +0200
Subject: [PATCH 14/53] Update UI5 to 1.126.2

---
 app/fiori.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/fiori.html b/app/fiori.html
index ddf546bd..380ad0c1 100644
--- a/app/fiori.html
+++ b/app/fiori.html
@@ -14,8 +14,8 @@
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.126.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.126.0/resources/sap-ui-core.js"
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.126.2/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.126.2/resources/sap-ui-core.js"
 			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
 			data-sap-ui-compatVersion="edge"
 			data-sap-ui-theme="sap_horizon"

From cdcd3b2154f9f53bcf785a0903e9da6b10a3cd73 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Thu, 10 Oct 2024 13:02:59 +0200
Subject: [PATCH 15/53] fixed broken link in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 00df451e..63e724ee 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Welcome to the bookshop-java project. It demonstrates how to build business appl
   - [Demonstrated Features](#demonstrated-features)
 - [Getting Started](#getting-started)
   - [Prerequisites](#prerequisites)
-  - [Clone Build & Run](#clone-build--run)
+  - [Clone Build & Run](#clone-build-run)
   - [Using VS Code](#using-vs-code)
   - [Using Eclipse](#using-eclipse)
     - [Building and Running](#building-and-running)

From 95a2c87ea2964306b982de5ca14cb2281df654d8 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Thu, 10 Oct 2024 15:01:28 +0200
Subject: [PATCH 16/53] for testing

---
 app/fiori.html |  4 ++--
 db/books.cds   | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/fiori.html b/app/fiori.html
index 380ad0c1..4191d16c 100644
--- a/app/fiori.html
+++ b/app/fiori.html
@@ -14,8 +14,8 @@
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.126.2/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.126.2/resources/sap-ui-core.js"
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.129.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.129.0/resources/sap-ui-core.js"
 			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
 			data-sap-ui-compatVersion="edge"
 			data-sap-ui-theme="sap_horizon"
diff --git a/db/books.cds b/db/books.cds
index 7973a1d3..f50f8ab0 100644
--- a/db/books.cds
+++ b/db/books.cds
@@ -26,6 +26,18 @@ entity Books : cuid, managed {
     covers       : Composition of many Attachments;
 }
 
+annotate Attachments with @UI: {
+    LineItem  : [
+        {Value: content},
+        {Value: status},
+        {Value: createdAt},
+        {Value: createdBy},
+        {Value: note},
+        {Value: fileName}
+    ]
+} {
+}
+
 entity Authors : cuid, managed {
     @assert.format : '^\p{Lu}.*' // assert that name starts with a capital letter
     name         : String(111);

From bd0a97033b1d0067f2e6d7f18303e9733dcbf8a7 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Thu, 10 Oct 2024 15:18:11 +0200
Subject: [PATCH 17/53] disable etag for testing

---
 db/books.cds | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/books.cds b/db/books.cds
index f50f8ab0..417f70f1 100644
--- a/db/books.cds
+++ b/db/books.cds
@@ -36,6 +36,7 @@ annotate Attachments with @UI: {
         {Value: fileName}
     ]
 } {
+    modifiedAt @(odata.etag: null);
 }
 
 entity Authors : cuid, managed {

From 2b429b49717dae63ff5a8f9d611ed0d5ec24e836 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 14 Oct 2024 12:48:32 +0200
Subject: [PATCH 18/53] Use 1.0.4-SNAPSHOT

---
 db/books.cds | 13 -------------
 pom.xml      |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/db/books.cds b/db/books.cds
index 417f70f1..7973a1d3 100644
--- a/db/books.cds
+++ b/db/books.cds
@@ -26,19 +26,6 @@ entity Books : cuid, managed {
     covers       : Composition of many Attachments;
 }
 
-annotate Attachments with @UI: {
-    LineItem  : [
-        {Value: content},
-        {Value: status},
-        {Value: createdAt},
-        {Value: createdBy},
-        {Value: note},
-        {Value: fileName}
-    ]
-} {
-    modifiedAt @(odata.etag: null);
-}
-
 entity Authors : cuid, managed {
     @assert.format : '^\p{Lu}.*' // assert that name starts with a capital letter
     name         : String(111);
diff --git a/pom.xml b/pom.xml
index e54cfc1e..fc40769f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
 		<cds.cdsdk-version>8.3.0</cds.cdsdk-version>
-		<cds-feature-attachments.version>1.0.3</cds-feature-attachments.version>
+		<cds-feature-attachments.version>1.0.4-SNAPSHOT</cds-feature-attachments.version>
 	</properties>
 
 	<modules>
@@ -79,7 +79,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cds</groupId>
-			<artifactId>cds-feature-attachments</artifactId>
+			<artifactId>cds-feature-attachments-fs</artifactId>
 			<version>${cds-feature-attachments.version}</version>
 		</dependency>
 	</dependencies>

From 651c17b03631f11449c7dd28a1a47b8083b906df Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 14 Oct 2024 14:22:05 +0200
Subject: [PATCH 19/53] use Attachments from cds-feature-attachments-fs

---
 app/_i18n/i18n.properties    | 1 +
 app/_i18n/i18n_de.properties | 1 +
 db/books.cds                 | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/_i18n/i18n.properties b/app/_i18n/i18n.properties
index 2a5bef0f..72a0d039 100644
--- a/app/_i18n/i18n.properties
+++ b/app/_i18n/i18n.properties
@@ -75,5 +75,6 @@ attachment_mimeType = MIME Type
 attachment_fileName = File Name
 attachment_status = Status
 attachment_note = Note
+attachment_size = Size
 attachment = Attachment
 attachments = Attachments
\ No newline at end of file
diff --git a/app/_i18n/i18n_de.properties b/app/_i18n/i18n_de.properties
index f00a1486..10dbe5a3 100644
--- a/app/_i18n/i18n_de.properties
+++ b/app/_i18n/i18n_de.properties
@@ -75,5 +75,6 @@ attachment_mimeType = MIME-Typ
 attachment_fileName = Dateiname
 attachment_status = Status
 attachment_note = Notiz
+attachment_size = Größe
 attachment = Anhang
 attachments = Anhänge
\ No newline at end of file
diff --git a/db/books.cds b/db/books.cds
index 7973a1d3..9daa824e 100644
--- a/db/books.cds
+++ b/db/books.cds
@@ -8,7 +8,7 @@ using {
 } from '@sap/cds/common';
 using my.bookshop.Reviews from './reviews';
 using my.bookshop.TechnicalBooleanFlag from './common';
-using {sap.attachments.Attachments} from `com.sap.cds/cds-feature-attachments`;
+using {sap.attachments.Attachments} from `com.sap.cds/cds-feature-attachments-fs`;
 
 @fiori.draft.enabled
 entity Books : cuid, managed {

From d8256736f60d14b21286e259f8d78aab8c2db66a Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 15 Oct 2024 16:41:35 +0200
Subject: [PATCH 20/53] revert to standard plugin

---
 db/books.cds | 2 +-
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/books.cds b/db/books.cds
index 9daa824e..7973a1d3 100644
--- a/db/books.cds
+++ b/db/books.cds
@@ -8,7 +8,7 @@ using {
 } from '@sap/cds/common';
 using my.bookshop.Reviews from './reviews';
 using my.bookshop.TechnicalBooleanFlag from './common';
-using {sap.attachments.Attachments} from `com.sap.cds/cds-feature-attachments-fs`;
+using {sap.attachments.Attachments} from `com.sap.cds/cds-feature-attachments`;
 
 @fiori.draft.enabled
 entity Books : cuid, managed {
diff --git a/pom.xml b/pom.xml
index fc40769f..1d6af24e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>com.sap.cds</groupId>
-			<artifactId>cds-feature-attachments-fs</artifactId>
+			<artifactId>cds-feature-attachments</artifactId>
 			<version>${cds-feature-attachments.version}</version>
 		</dependency>
 	</dependencies>

From 0bf63697433590af5137c556f7ad2cb4f3c47507 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 15 Oct 2024 16:43:54 +0200
Subject: [PATCH 21/53] revert changes

---
 db/common.cds | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/db/common.cds b/db/common.cds
index 333ed36c..a1c0cd80 100644
--- a/db/common.cds
+++ b/db/common.cds
@@ -1,5 +1,4 @@
 namespace my.bookshop;
-using {sap.attachments.Attachments} from `com.sap.cds/cds-feature-attachments`;
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -9,7 +8,3 @@ type TechnicalBooleanFlag : Boolean @(
     UI.Hidden,
     Core.Computed
 );
-
-// annotate Attachments with {
-//     modifiedAt @(odata.etag: null);
-// }

From e2460ba4dbdd2bc8d6cd4a02e6b3f4adf51b6f32 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 15 Oct 2024 16:44:36 +0200
Subject: [PATCH 22/53] removed unused labels

---
 app/_i18n/i18n.properties    | 1 -
 app/_i18n/i18n_de.properties | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/_i18n/i18n.properties b/app/_i18n/i18n.properties
index 72a0d039..2a5bef0f 100644
--- a/app/_i18n/i18n.properties
+++ b/app/_i18n/i18n.properties
@@ -75,6 +75,5 @@ attachment_mimeType = MIME Type
 attachment_fileName = File Name
 attachment_status = Status
 attachment_note = Note
-attachment_size = Size
 attachment = Attachment
 attachments = Attachments
\ No newline at end of file
diff --git a/app/_i18n/i18n_de.properties b/app/_i18n/i18n_de.properties
index 10dbe5a3..f00a1486 100644
--- a/app/_i18n/i18n_de.properties
+++ b/app/_i18n/i18n_de.properties
@@ -75,6 +75,5 @@ attachment_mimeType = MIME-Typ
 attachment_fileName = Dateiname
 attachment_status = Status
 attachment_note = Notiz
-attachment_size = Größe
 attachment = Anhang
 attachments = Anhänge
\ No newline at end of file

From 286d291146c92b752f5907c08c497549f067d286 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 15 Oct 2024 16:51:38 +0200
Subject: [PATCH 23/53] disable etag for testing

---
 db/books.cds | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/db/books.cds b/db/books.cds
index 7973a1d3..4be94b81 100644
--- a/db/books.cds
+++ b/db/books.cds
@@ -35,6 +35,8 @@ entity Authors : cuid, managed {
     placeOfDeath : String;
     books        : Association to many Books
                        on books.author = $self;
+} {
+    modifiedAt @(odata.etag: null);
 }
 
 // annotations for Data Privacy

From 77748bcd7fbc6db87a8c034a1c8efb865062f324 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 15 Oct 2024 17:23:14 +0200
Subject: [PATCH 24/53] fixed model

---
 db/books.cds | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/db/books.cds b/db/books.cds
index 4be94b81..4bd09979 100644
--- a/db/books.cds
+++ b/db/books.cds
@@ -26,6 +26,19 @@ entity Books : cuid, managed {
     covers       : Composition of many Attachments;
 }
 
+annotate Attachments with @UI: {
+    LineItem  : [
+        {Value: content},
+        {Value: fileName},
+        {Value: status},
+        {Value: createdAt},
+        {Value: createdBy},
+        {Value: note}
+    ]
+} {
+    modifiedAt @(odata.etag: null);
+}
+
 entity Authors : cuid, managed {
     @assert.format : '^\p{Lu}.*' // assert that name starts with a capital letter
     name         : String(111);
@@ -35,8 +48,6 @@ entity Authors : cuid, managed {
     placeOfDeath : String;
     books        : Association to many Books
                        on books.author = $self;
-} {
-    modifiedAt @(odata.etag: null);
 }
 
 // annotations for Data Privacy

From c0d552fc703f3c751531829593b7d084e51067c0 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Wed, 16 Oct 2024 13:31:40 +0200
Subject: [PATCH 25/53] enhanced logging

---
 srv/src/main/resources/application.yaml   | 2 ++
 srv/src/main/resources/logback-spring.xml | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml
index dad875b3..32b85e8f 100644
--- a/srv/src/main/resources/application.yaml
+++ b/srv/src/main/resources/application.yaml
@@ -2,6 +2,8 @@
 logging:
   level:
     '[com.sap.cds.auditlog]': DEBUG
+    '[com.sap.cds.persistence.sql]': DEBUG
+    '[com.sap.cds.handlers]': DEBUG
 spring:
   jmx:
     enabled: true
diff --git a/srv/src/main/resources/logback-spring.xml b/srv/src/main/resources/logback-spring.xml
index bef4441a..6cffe01e 100644
--- a/srv/src/main/resources/logback-spring.xml
+++ b/srv/src/main/resources/logback-spring.xml
@@ -2,12 +2,14 @@
 <!DOCTYPE xml>
 <configuration debug="false" scan="false">
     <springProfile name="cloud">
-        <appender name="STDOUT-JSON" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- appender name="STDOUT-JSON" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="com.sap.hcp.cf.logback.encoder.JsonEncoder"/>
          </appender>
          <root level="${LOG_ROOT_LEVEL:-INFO}">
             <appender-ref ref="STDOUT-JSON" />
-         </root>
+         </root -->
+        <include resource="org/springframework/boot/logging/logback/base.xml" />
+        <logger name="com.sap.hcp.cf.logging.servlet.filter.RequestLogger" level="WARN" />
     </springProfile>
     <springProfile name="!cloud">
         <include resource="org/springframework/boot/logging/logback/base.xml" />

From 7c48e06024e7180cbf5b8f5dce6a5ea7b93f542f Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Thu, 17 Oct 2024 11:34:13 +0200
Subject: [PATCH 26/53] use css annotations

---
 db/books.cds | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/db/books.cds b/db/books.cds
index 4bd09979..55bc49ba 100644
--- a/db/books.cds
+++ b/db/books.cds
@@ -28,11 +28,12 @@ entity Books : cuid, managed {
 
 annotate Attachments with @UI: {
     LineItem  : [
-        {Value: content},
-        {Value: fileName},
-        {Value: status},
-        {Value: createdAt},
-        {Value: createdBy},
+        {Value: content, @HTML5.CssDefaults: {width: '25%'}},
+        {Value: fileName, @HTML5.CssDefaults: {width: '25%'}},
+        {Value: mimeType, @HTML5.CssDefaults: {width: '10%'}},
+        {Value: status, @HTML5.CssDefaults: {width: '10%'}},
+        {Value: createdAt, @HTML5.CssDefaults: {width: '20%'}},
+        {Value: createdBy, @HTML5.CssDefaults: {width: '15%'}},
         {Value: note}
     ]
 } {

From e9ac89a892fe0682d803d00eec36b3b472d3d299 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Thu, 17 Oct 2024 18:05:25 +0200
Subject: [PATCH 27/53] Use snapshot

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1d6af24e..16726189 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 		<!-- DEPENDENCIES VERSION -->
 		<jdk.version>21</jdk.version>
-		<cds.services.version>3.3.0</cds.services.version>
+		<cds.services.version>3.4.0-SNAPSHOT</cds.services.version>
 		<cloud.sdk.version>5.13.0</cloud.sdk.version>
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>

From 0df64a96ae0fb64fb8cf75d518ffc3e075466539 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 22 Oct 2024 13:35:03 +0200
Subject: [PATCH 28/53] Bump cds-feature-attachments to 1.0.4

---
 db/books.cds | 12 +-----------
 pom.xml      |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/db/books.cds b/db/books.cds
index 55bc49ba..f1d86a30 100644
--- a/db/books.cds
+++ b/db/books.cds
@@ -26,17 +26,7 @@ entity Books : cuid, managed {
     covers       : Composition of many Attachments;
 }
 
-annotate Attachments with @UI: {
-    LineItem  : [
-        {Value: content, @HTML5.CssDefaults: {width: '25%'}},
-        {Value: fileName, @HTML5.CssDefaults: {width: '25%'}},
-        {Value: mimeType, @HTML5.CssDefaults: {width: '10%'}},
-        {Value: status, @HTML5.CssDefaults: {width: '10%'}},
-        {Value: createdAt, @HTML5.CssDefaults: {width: '20%'}},
-        {Value: createdBy, @HTML5.CssDefaults: {width: '15%'}},
-        {Value: note}
-    ]
-} {
+annotate Attachments with {
     modifiedAt @(odata.etag: null);
 }
 
diff --git a/pom.xml b/pom.xml
index 16726189..f9eaa15b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
 		<cds.cdsdk-version>8.3.0</cds.cdsdk-version>
-		<cds-feature-attachments.version>1.0.4-SNAPSHOT</cds-feature-attachments.version>
+		<cds-feature-attachments.version>1.0.4</cds-feature-attachments.version>
 	</properties>
 
 	<modules>

From 749bbac1e7f3cbff6d54f3cfed06927988f09e5c Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 22 Oct 2024 13:55:36 +0200
Subject: [PATCH 29/53] revert some logging changes

---
 srv/src/main/resources/application.yaml   | 2 --
 srv/src/main/resources/logback-spring.xml | 8 +++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml
index 32b85e8f..dad875b3 100644
--- a/srv/src/main/resources/application.yaml
+++ b/srv/src/main/resources/application.yaml
@@ -2,8 +2,6 @@
 logging:
   level:
     '[com.sap.cds.auditlog]': DEBUG
-    '[com.sap.cds.persistence.sql]': DEBUG
-    '[com.sap.cds.handlers]': DEBUG
 spring:
   jmx:
     enabled: true
diff --git a/srv/src/main/resources/logback-spring.xml b/srv/src/main/resources/logback-spring.xml
index 6cffe01e..cc2a7f05 100644
--- a/srv/src/main/resources/logback-spring.xml
+++ b/srv/src/main/resources/logback-spring.xml
@@ -2,17 +2,15 @@
 <!DOCTYPE xml>
 <configuration debug="false" scan="false">
     <springProfile name="cloud">
-        <!-- appender name="STDOUT-JSON" class="ch.qos.logback.core.ConsoleAppender">
+        <appender name="STDOUT-JSON" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="com.sap.hcp.cf.logback.encoder.JsonEncoder"/>
          </appender>
          <root level="${LOG_ROOT_LEVEL:-INFO}">
             <appender-ref ref="STDOUT-JSON" />
-         </root -->
-        <include resource="org/springframework/boot/logging/logback/base.xml" />
-        <logger name="com.sap.hcp.cf.logging.servlet.filter.RequestLogger" level="WARN" />
+         </root>
     </springProfile>
     <springProfile name="!cloud">
         <include resource="org/springframework/boot/logging/logback/base.xml" />
         <logger name="com.sap.hcp.cf.logging.servlet.filter.RequestLogger" level="WARN" />
     </springProfile>
-</configuration>
+</configuration>
\ No newline at end of file

From 1641d432285aaf84d575e26767fc70816671153f Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 22 Oct 2024 13:56:07 +0200
Subject: [PATCH 30/53] revert formatting change

---
 srv/src/main/resources/logback-spring.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/src/main/resources/logback-spring.xml b/srv/src/main/resources/logback-spring.xml
index cc2a7f05..bef4441a 100644
--- a/srv/src/main/resources/logback-spring.xml
+++ b/srv/src/main/resources/logback-spring.xml
@@ -13,4 +13,4 @@
         <include resource="org/springframework/boot/logging/logback/base.xml" />
         <logger name="com.sap.hcp.cf.logging.servlet.filter.RequestLogger" level="WARN" />
     </springProfile>
-</configuration>
\ No newline at end of file
+</configuration>

From def3609b4f9b7874b426952db0a84f7bf1881a04 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Thu, 24 Oct 2024 13:20:17 +0200
Subject: [PATCH 31/53] Use 1.0.5-SNAPSHOT

---
 srv/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/srv/pom.xml b/srv/pom.xml
index b1128937..05ed78d0 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -128,11 +128,6 @@
 		</dependency>
 
 		<!-- DEV TOOLS -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<optional>true</optional>
-		</dependency>
 	</dependencies>
 
 	<build>

From 3f11505af1fcfa55f900670f798f72376d256bdd Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Thu, 24 Oct 2024 16:08:18 +0200
Subject: [PATCH 32/53] use snapshot

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f9eaa15b..63793abf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
 		<cds.cdsdk-version>8.3.0</cds.cdsdk-version>
-		<cds-feature-attachments.version>1.0.4</cds-feature-attachments.version>
+		<cds-feature-attachments.version>1.0.5-SNAPSHOT</cds-feature-attachments.version>
 	</properties>
 
 	<modules>

From d56fd145c97a098f575e28c081d01fd5a3c66bd1 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Thu, 24 Oct 2024 17:22:48 +0200
Subject: [PATCH 33/53] Revert "Use 1.0.5-SNAPSHOT"

This reverts commit def3609b4f9b7874b426952db0a84f7bf1881a04.
---
 srv/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srv/pom.xml b/srv/pom.xml
index 05ed78d0..b1128937 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -128,6 +128,11 @@
 		</dependency>
 
 		<!-- DEV TOOLS -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 
 	<build>

From 74ef51b5b4a64fc92f14f6206df9e86d2422af8b Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Thu, 24 Oct 2024 17:23:00 +0200
Subject: [PATCH 34/53] Revert "use snapshot"

This reverts commit 3f11505af1fcfa55f900670f798f72376d256bdd.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 63793abf..f9eaa15b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
 		<cds.cdsdk-version>8.3.0</cds.cdsdk-version>
-		<cds-feature-attachments.version>1.0.5-SNAPSHOT</cds-feature-attachments.version>
+		<cds-feature-attachments.version>1.0.4</cds-feature-attachments.version>
 	</properties>
 
 	<modules>

From 091e3e830498537e7ae8d503aa46e9fdf604eafe Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 28 Oct 2024 11:21:26 +0100
Subject: [PATCH 35/53] enable etag on content field again and test with UI5
 1.131 SNAPSHOT

---
 app/fiori.html | 4 ++--
 db/books.cds   | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/fiori.html b/app/fiori.html
index 4191d16c..dc4a8663 100644
--- a/app/fiori.html
+++ b/app/fiori.html
@@ -14,8 +14,8 @@
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.129.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.129.0/resources/sap-ui-core.js"
+	<script id="sap-ushell-bootstrap" src="https://sapui5nightly.int.sap.eu2.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5nightly.int.sap.eu2.hana.ondemand.com/resources/sap-ui-core.js"
 			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
 			data-sap-ui-compatVersion="edge"
 			data-sap-ui-theme="sap_horizon"
diff --git a/db/books.cds b/db/books.cds
index f1d86a30..7973a1d3 100644
--- a/db/books.cds
+++ b/db/books.cds
@@ -26,10 +26,6 @@ entity Books : cuid, managed {
     covers       : Composition of many Attachments;
 }
 
-annotate Attachments with {
-    modifiedAt @(odata.etag: null);
-}
-
 entity Authors : cuid, managed {
     @assert.format : '^\p{Lu}.*' // assert that name starts with a capital letter
     name         : String(111);

From a5d63fcad129418593b92d60f27275b224748d15 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Tue, 29 Oct 2024 11:36:30 +0100
Subject: [PATCH 36/53] annotate up_ with UI.Hidden: true

---
 app/admin/fiori-service.cds | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/admin/fiori-service.cds b/app/admin/fiori-service.cds
index 7d22542b..450189c8 100644
--- a/app/admin/fiori-service.cds
+++ b/app/admin/fiori-service.cds
@@ -137,3 +137,6 @@ annotate AdminService.Books actions {
     quantity @title : '{i18n>Quantity}'
     )
 }
+
+// Hides technical field up__ID in View Setitings dialog for Books.covers
+annotate AdminService.Books.covers:up_ with @UI.Hidden;

From 2bb8afc5fedad0aadc5762a65bc83b4c824f1c47 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Wed, 30 Oct 2024 10:41:14 +0100
Subject: [PATCH 37/53] use snapshot

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f9eaa15b..63793abf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
 		<cds.cdsdk-version>8.3.0</cds.cdsdk-version>
-		<cds-feature-attachments.version>1.0.4</cds-feature-attachments.version>
+		<cds-feature-attachments.version>1.0.5-SNAPSHOT</cds-feature-attachments.version>
 	</properties>
 
 	<modules>

From 3a9c61bcb9cf7ab2f61a22c250225da760659e3f Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Wed, 30 Oct 2024 16:23:12 +0100
Subject: [PATCH 38/53] Use cds-services 3.4.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 63793abf..be592c95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 		<!-- DEPENDENCIES VERSION -->
 		<jdk.version>21</jdk.version>
-		<cds.services.version>3.4.0-SNAPSHOT</cds.services.version>
+		<cds.services.version>3.4.0</cds.services.version>
 		<cloud.sdk.version>5.13.0</cloud.sdk.version>
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>

From 231fed48e0faec66ab057c45b3458f0cf71bee8e Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus.ofterdinger@sap.com>
Date: Wed, 30 Oct 2024 16:30:15 +0100
Subject: [PATCH 39/53] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 4ebe08c0..95253fc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,15 +177,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
-	<repositories>
-		<repository>
-			<id>Artifactory_DMZ-snapshots</id>
-			<name>SAP's Artifactory</name>
-			<url>https://common.repositories.cloud.sap/artifactory/cap-java/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
 </project>

From 87a18e78fc7907752544972efc36589858039ea4 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus.ofterdinger@sap.com>
Date: Wed, 30 Oct 2024 16:32:15 +0100
Subject: [PATCH 40/53] Update pom.xml

---
 srv/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srv/pom.xml b/srv/pom.xml
index b1128937..10125ea9 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -237,5 +237,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
 </project>

From 1defce93f992892f95d2d3ac1171b40903cd531c Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 4 Nov 2024 08:58:28 +0100
Subject: [PATCH 41/53] increase app router timeout

---
 mta-multi-tenant.yaml  | 1 +
 mta-single-tenant.yaml | 1 +
 pom.xml                | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mta-multi-tenant.yaml b/mta-multi-tenant.yaml
index e42d3ad2..8457d3b7 100644
--- a/mta-multi-tenant.yaml
+++ b/mta-multi-tenant.yaml
@@ -81,6 +81,7 @@ modules:
         url: ~{srv-url}
         forwardAuthToken: true
         strictSSL: true
+        timeout: 600000
     - name: bookshop-mt-uaa
     provides:
       - name: app-api
diff --git a/mta-single-tenant.yaml b/mta-single-tenant.yaml
index 81038a49..dc447e48 100644
--- a/mta-single-tenant.yaml
+++ b/mta-single-tenant.yaml
@@ -62,6 +62,7 @@ modules:
         url: ~{srv-url}
         forwardAuthToken: true
         strictSSL: true
+        timeout: 600000
     - name: bookshop-uaa
     provides:
       - name: app-api
diff --git a/pom.xml b/pom.xml
index 2f2dac4e..993f5dfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
 		<cds.cdsdk-version>8.4.0</cds.cdsdk-version>
-		<cds-feature-attachments.version>1.0.4</cds-feature-attachments.version>
+		<cds-feature-attachments.version>1.0.5-SNAPSHOT</cds-feature-attachments.version>
 	</properties>
 
 	<modules>

From ea54fb4cd37a320e2e33cad57a8609d9e9c66873 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 4 Nov 2024 14:09:11 +0100
Subject: [PATCH 42/53] added binding to malware-scanner service

---
 mta-multi-tenant.yaml  | 6 ++++++
 mta-single-tenant.yaml | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/mta-multi-tenant.yaml b/mta-multi-tenant.yaml
index 8457d3b7..a9461ad0 100644
--- a/mta-multi-tenant.yaml
+++ b/mta-multi-tenant.yaml
@@ -35,6 +35,7 @@ modules:
         properties:
           CDS_MULTITENANCY_APPUI_URL: ~{app-url}
       - name: cf-logging
+      - name: malware-scanner
     provides:
       - name: srv-api
         properties:
@@ -134,3 +135,8 @@ resources:
     parameters:
       service: application-logs
       service-plan: lite
+  - name: malware-scanner
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: malware-scanner
+      service-plan: clamav
diff --git a/mta-single-tenant.yaml b/mta-single-tenant.yaml
index dc447e48..875bfcdf 100644
--- a/mta-single-tenant.yaml
+++ b/mta-single-tenant.yaml
@@ -27,6 +27,7 @@ modules:
       - name: bookshop-hdi-container
       - name: bookshop-uaa
       - name: cf-logging
+      - name: malware-scanner
     provides:
       - name: srv-api
         properties:
@@ -94,3 +95,8 @@ resources:
     parameters:
       service: application-logs
       service-plan: lite
+  - name: malware-scanner
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: malware-scanner
+      service-plan: clamav

From ad9be099239edf133f64df1b1fabe2df2d89dea8 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 11 Nov 2024 14:26:12 +0100
Subject: [PATCH 43/53] Removed malware scanner binding

---
 mta-multi-tenant.yaml  | 6 ------
 mta-single-tenant.yaml | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/mta-multi-tenant.yaml b/mta-multi-tenant.yaml
index a9461ad0..8457d3b7 100644
--- a/mta-multi-tenant.yaml
+++ b/mta-multi-tenant.yaml
@@ -35,7 +35,6 @@ modules:
         properties:
           CDS_MULTITENANCY_APPUI_URL: ~{app-url}
       - name: cf-logging
-      - name: malware-scanner
     provides:
       - name: srv-api
         properties:
@@ -135,8 +134,3 @@ resources:
     parameters:
       service: application-logs
       service-plan: lite
-  - name: malware-scanner
-    type: org.cloudfoundry.managed-service
-    parameters:
-      service: malware-scanner
-      service-plan: clamav
diff --git a/mta-single-tenant.yaml b/mta-single-tenant.yaml
index 875bfcdf..dc447e48 100644
--- a/mta-single-tenant.yaml
+++ b/mta-single-tenant.yaml
@@ -27,7 +27,6 @@ modules:
       - name: bookshop-hdi-container
       - name: bookshop-uaa
       - name: cf-logging
-      - name: malware-scanner
     provides:
       - name: srv-api
         properties:
@@ -95,8 +94,3 @@ resources:
     parameters:
       service: application-logs
       service-plan: lite
-  - name: malware-scanner
-    type: org.cloudfoundry.managed-service
-    parameters:
-      service: malware-scanner
-      service-plan: clamav

From 1d87f1199372ed3595aaf48cb758e421fd765ca1 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 11 Nov 2024 14:27:34 +0100
Subject: [PATCH 44/53] Use 1.0.5 of cds-feature-attachments

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 993f5dfa..ebe55de9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
 		<cds.cdsdk-version>8.4.0</cds.cdsdk-version>
-		<cds-feature-attachments.version>1.0.5-SNAPSHOT</cds-feature-attachments.version>
+		<cds-feature-attachments.version>1.0.5</cds-feature-attachments.version>
 	</properties>
 
 	<modules>

From 9f7660238ee574bbbf7df57fc3d458735bef44bc Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Wed, 27 Nov 2024 09:45:19 +0100
Subject: [PATCH 45/53] review feedback

---
 db/books.cds          |  2 --
 db/pom.xml            | 41 -----------------------------------------
 pom.xml               |  9 ---------
 srv/admin-service.cds |  8 +++++++-
 srv/pom.xml           |  7 +++++++
 5 files changed, 14 insertions(+), 53 deletions(-)
 delete mode 100644 db/pom.xml

diff --git a/db/books.cds b/db/books.cds
index 7973a1d3..fe2e5e0a 100644
--- a/db/books.cds
+++ b/db/books.cds
@@ -8,7 +8,6 @@ using {
 } from '@sap/cds/common';
 using my.bookshop.Reviews from './reviews';
 using my.bookshop.TechnicalBooleanFlag from './common';
-using {sap.attachments.Attachments} from `com.sap.cds/cds-feature-attachments`;
 
 @fiori.draft.enabled
 entity Books : cuid, managed {
@@ -23,7 +22,6 @@ entity Books : cuid, managed {
     reviews      : Association to many Reviews
                        on reviews.book = $self;
     isReviewable : TechnicalBooleanFlag not null default true;
-    covers       : Composition of many Attachments;
 }
 
 entity Authors : cuid, managed {
diff --git a/db/pom.xml b/db/pom.xml
deleted file mode 100644
index fcaf34b2..00000000
--- a/db/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<artifactId>bookshop-parent</artifactId>
-		<groupId>my</groupId>
-		<version>${revision}</version>
-	</parent>
-
-    <artifactId>bookshop-db</artifactId>
-    <packaging>pom</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.sap.cds</groupId>
-                <artifactId>cds-maven-plugin</artifactId>
-                <version>${cds.services.version}</version>
-                <executions>
-                    <execution>
-                        <id>cds.clean</id>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                    </execution>
-
-                    <execution>
-                        <id>cds.resolve</id>
-                        <goals>
-                            <goal>resolve</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/pom.xml b/pom.xml
index c38df1e1..e0c90139 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,6 @@
 	</properties>
 
 	<modules>
-		<module>db</module>
 		<module>srv</module>
 		<module>integration-tests</module>
 	</modules>
@@ -76,14 +75,6 @@
 		</dependencies>
 	</dependencyManagement>
 
-	<dependencies>
-		<dependency>
-			<groupId>com.sap.cds</groupId>
-			<artifactId>cds-feature-attachments</artifactId>
-			<version>${cds-feature-attachments.version}</version>
-		</dependency>
-	</dependencies>
-
 	<build>
 		<plugins>
 			<!-- JAVA VERSION -->
diff --git a/srv/admin-service.cds b/srv/admin-service.cds
index 0f0e1a9b..79d3ce34 100644
--- a/srv/admin-service.cds
+++ b/srv/admin-service.cds
@@ -1,6 +1,7 @@
 using {sap.common.Languages as CommonLanguages} from '@sap/cds/common';
 using {my.bookshop as my} from '../db/index';
 using {sap.changelog as changelog} from 'com.sap.cds/change-tracking';
+using {sap.attachments.Attachments} from `com.sap.cds/cds-feature-attachments`;
 
 extend my.Orders with changelog.changeTracked;
 
@@ -62,4 +63,9 @@ annotate AdminService.Orders with @changelog: [OrderNo];
 annotate AdminService.OrderItems with @changelog: [
     parent.OrderNo,
     book.title,
-  ];
\ No newline at end of file
+  ];
+
+// Extends the Books entity with the Attachments composition
+extend my.Books with {
+    covers : Composition of many Attachments;
+};
diff --git a/srv/pom.xml b/srv/pom.xml
index 10125ea9..cf27d565 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -74,6 +74,13 @@
 			<artifactId>connectivity-apache-httpclient4</artifactId>
 		</dependency>
 
+		<!-- RE-USE PLUGIN DEPENDENCIES -->
+		<dependency>
+			<groupId>com.sap.cds</groupId>
+			<artifactId>cds-feature-attachments</artifactId>
+			<version>${cds-feature-attachments.version}</version>
+		</dependency>
+
 		<!-- OTHER DEPENDENCIES -->
 		<dependency>
 			<groupId>com.h2database</groupId>

From 04a3255cd73810761827408571ff3a086a2f71d6 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Wed, 27 Nov 2024 09:49:57 +0100
Subject: [PATCH 46/53] added comments

---
 mta-multi-tenant.yaml  | 2 +-
 mta-single-tenant.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mta-multi-tenant.yaml b/mta-multi-tenant.yaml
index 47e2af42..d8670a2d 100644
--- a/mta-multi-tenant.yaml
+++ b/mta-multi-tenant.yaml
@@ -85,7 +85,7 @@ modules:
         url: ~{srv-url}
         forwardAuthToken: true
         strictSSL: true
-        timeout: 600000
+        timeout: 600000  # required for long running HTTP requests, e.g. large attachment uploads
     - name: bookshop-mt-uaa
     provides:
       - name: app-api
diff --git a/mta-single-tenant.yaml b/mta-single-tenant.yaml
index a8c7c562..3bb4c89b 100644
--- a/mta-single-tenant.yaml
+++ b/mta-single-tenant.yaml
@@ -66,7 +66,7 @@ modules:
         url: ~{srv-url}
         forwardAuthToken: true
         strictSSL: true
-        timeout: 600000
+        timeout: 600000 # required for long running HTTP requests, e.g. large attachment uploads
     - name: bookshop-uaa
     provides:
       - name: app-api

From c9648c08bbe1ff3ef3b878b1b50d72dc54c93527 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Wed, 27 Nov 2024 10:45:04 +0100
Subject: [PATCH 47/53] review feedback

---
 srv/pom.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srv/pom.xml b/srv/pom.xml
index cf27d565..b03c58fd 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -58,6 +58,12 @@
 			<scope>runtime</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>com.sap.cds</groupId>
+			<artifactId>cds-feature-attachments</artifactId>
+			<version>${cds-feature-attachments.version}</version>
+		</dependency>
+
 		<!-- CLOUD SDK dependencies -->
 		<dependency>
 			<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
@@ -74,13 +80,6 @@
 			<artifactId>connectivity-apache-httpclient4</artifactId>
 		</dependency>
 
-		<!-- RE-USE PLUGIN DEPENDENCIES -->
-		<dependency>
-			<groupId>com.sap.cds</groupId>
-			<artifactId>cds-feature-attachments</artifactId>
-			<version>${cds-feature-attachments.version}</version>
-		</dependency>
-
 		<!-- OTHER DEPENDENCIES -->
 		<dependency>
 			<groupId>com.h2database</groupId>

From da1cf224d54b8ca6443fa1bfb14c395e1521aa3f Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Wed, 27 Nov 2024 10:48:57 +0100
Subject: [PATCH 48/53] added runtime scope

---
 srv/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srv/pom.xml b/srv/pom.xml
index b03c58fd..a75e447a 100644
--- a/srv/pom.xml
+++ b/srv/pom.xml
@@ -62,6 +62,7 @@
 			<groupId>com.sap.cds</groupId>
 			<artifactId>cds-feature-attachments</artifactId>
 			<version>${cds-feature-attachments.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 
 		<!-- CLOUD SDK dependencies -->

From 7445a5e5af13ffb4254a01c27666d7e7dee8fc6c Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Wed, 27 Nov 2024 11:03:30 +0100
Subject: [PATCH 49/53] review feedback

---
 mta-multi-tenant.yaml  | 1 -
 mta-single-tenant.yaml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/mta-multi-tenant.yaml b/mta-multi-tenant.yaml
index d8670a2d..1293b234 100644
--- a/mta-multi-tenant.yaml
+++ b/mta-multi-tenant.yaml
@@ -85,7 +85,6 @@ modules:
         url: ~{srv-url}
         forwardAuthToken: true
         strictSSL: true
-        timeout: 600000  # required for long running HTTP requests, e.g. large attachment uploads
     - name: bookshop-mt-uaa
     provides:
       - name: app-api
diff --git a/mta-single-tenant.yaml b/mta-single-tenant.yaml
index 3bb4c89b..e7252ba0 100644
--- a/mta-single-tenant.yaml
+++ b/mta-single-tenant.yaml
@@ -66,7 +66,6 @@ modules:
         url: ~{srv-url}
         forwardAuthToken: true
         strictSSL: true
-        timeout: 600000 # required for long running HTTP requests, e.g. large attachment uploads
     - name: bookshop-uaa
     provides:
       - name: app-api

From 9311fcd87d96e0286f06d8186d220a1e5b05f468 Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 2 Dec 2024 10:14:59 +0100
Subject: [PATCH 50/53] Update SAP UI5 to 1.131.0

---
 app/fiori.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/fiori.html b/app/fiori.html
index dc4a8663..7fa46503 100644
--- a/app/fiori.html
+++ b/app/fiori.html
@@ -14,8 +14,8 @@
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5nightly.int.sap.eu2.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5nightly.int.sap.eu2.hana.ondemand.com/resources/sap-ui-core.js"
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.131.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.131.0/resources/sap-ui-core.js"
 			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
 			data-sap-ui-compatVersion="edge"
 			data-sap-ui-theme="sap_horizon"

From 2e09a49457b55a5bd496a41d9eba896abdcdaa4e Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 2 Dec 2024 10:21:32 +0100
Subject: [PATCH 51/53] added missing translations

---
 app/_i18n/i18n.properties    | 1 +
 app/_i18n/i18n_de.properties | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/_i18n/i18n.properties b/app/_i18n/i18n.properties
index 2a5bef0f..c5c03a94 100644
--- a/app/_i18n/i18n.properties
+++ b/app/_i18n/i18n.properties
@@ -7,6 +7,7 @@ ModifiedBy = Modified By
 General = General
 Details = Details
 Admin = Administrative
+Translations = Translations
 
 ID = ID
 Currency = Currency
diff --git a/app/_i18n/i18n_de.properties b/app/_i18n/i18n_de.properties
index f00a1486..9ffb6126 100644
--- a/app/_i18n/i18n_de.properties
+++ b/app/_i18n/i18n_de.properties
@@ -7,6 +7,7 @@ ModifiedBy = Bearbeitet von
 General = Generelles
 Details = Details
 Admin = Administratives
+Translations = Ãœbersetzungen
 
 ID = ID
 Currency = W\u00E4hrung

From 67c220fe9fc3b57ede02b0fa75cef531e8072c1c Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 2 Dec 2024 10:43:34 +0100
Subject: [PATCH 52/53] moved administrative data to the bottom

---
 app/admin/fiori-service.cds | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/admin/fiori-service.cds b/app/admin/fiori-service.cds
index 450189c8..8795103c 100644
--- a/app/admin/fiori-service.cds
+++ b/app/admin/fiori-service.cds
@@ -26,16 +26,16 @@ annotate AdminService.Books with @(UI : {
             Label : '{i18n>Details}',
             Target : '@UI.FieldGroup#Details'
         },
-        {
-            $Type : 'UI.ReferenceFacet',
-            Label : '{i18n>Admin}',
-            Target : '@UI.FieldGroup#Admin'
-        },
         {
             $Type  : 'UI.ReferenceFacet',
             ID     : 'AttachmentsFacet',
             Label  : '{i18n>covers}',
             Target : 'covers/@UI.LineItem'
+        },
+        {
+            $Type : 'UI.ReferenceFacet',
+            Label : '{i18n>Admin}',
+            Target : '@UI.FieldGroup#Admin'
         }
     ],
     FieldGroup #General : {Data : [

From 8a7e4fa314f93ac63cc2e0bd68ee8214094bca1e Mon Sep 17 00:00:00 2001
From: Markus Ofterdinger <markus@ofterdinger.de>
Date: Mon, 2 Dec 2024 11:12:51 +0100
Subject: [PATCH 53/53] Cleanup translations

---
 app/_i18n/i18n.properties    | 5 ++---
 app/_i18n/i18n_de.properties | 5 ++---
 app/admin/fiori-service.cds  | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/_i18n/i18n.properties b/app/_i18n/i18n.properties
index c5c03a94..84a329b5 100644
--- a/app/_i18n/i18n.properties
+++ b/app/_i18n/i18n.properties
@@ -70,11 +70,10 @@ Notes = Notes
 Note = Note
 ISBN = ISBN
 
-covers = Covers
 attachment_content = Content
 attachment_mimeType = MIME Type
 attachment_fileName = File Name
 attachment_status = Status
 attachment_note = Note
-attachment = Attachment
-attachments = Attachments
\ No newline at end of file
+attachment = Cover
+attachments = Covers
\ No newline at end of file
diff --git a/app/_i18n/i18n_de.properties b/app/_i18n/i18n_de.properties
index 9ffb6126..b9eb4a9c 100644
--- a/app/_i18n/i18n_de.properties
+++ b/app/_i18n/i18n_de.properties
@@ -70,11 +70,10 @@ Notes = Notizen
 Note = Notiz
 ISBN = ISBN
 
-covers = Buchcovers
 attachment_content = Inhalt
 attachment_mimeType = MIME-Typ
 attachment_fileName = Dateiname
 attachment_status = Status
 attachment_note = Notiz
-attachment = Anhang
-attachments = Anhänge
\ No newline at end of file
+attachment = Buchcover
+attachments = Buchcovers
\ No newline at end of file
diff --git a/app/admin/fiori-service.cds b/app/admin/fiori-service.cds
index 8795103c..cec4f215 100644
--- a/app/admin/fiori-service.cds
+++ b/app/admin/fiori-service.cds
@@ -29,7 +29,6 @@ annotate AdminService.Books with @(UI : {
         {
             $Type  : 'UI.ReferenceFacet',
             ID     : 'AttachmentsFacet',
-            Label  : '{i18n>covers}',
             Target : 'covers/@UI.LineItem'
         },
         {