From ee1e71555b4cf2649180ae98469e6c91878ad7a2 Mon Sep 17 00:00:00 2001 From: Lisa Julia Nebel Date: Fri, 28 Aug 2026 10:28:10 +0200 Subject: [PATCH 01/13] Move code to namespace com.sap.cds and adjust some versions --- pom.xml | 14 +++++++------- samples/bookshop/pom.xml | 12 ++++++------ samples/bookshop/srv/pom.xml | 6 ++++++ .../java/customer/bookshop/ApplicationTest.java | 2 -- .../java/customer/bookshop/IntegrationTest.java | 2 +- .../sap/cds/feature/emoji}/EmojiHandler.java | 11 ++++++----- .../emoji}/EmojiHandlerRuntimeConfiguration.java | 4 ++-- ...ap.cds.services.runtime.CdsRuntimeConfiguration | 2 +- 8 files changed, 29 insertions(+), 24 deletions(-) rename srv/src/main/java/{sap/capire/emoji_plugin => com/sap/cds/feature/emoji}/EmojiHandler.java (97%) rename srv/src/main/java/{sap/capire/emoji_plugin => com/sap/cds/feature/emoji}/EmojiHandlerRuntimeConfiguration.java (96%) diff --git a/pom.xml b/pom.xml index cb4dc70..f60033b 100644 --- a/pom.xml +++ b/pom.xml @@ -16,9 +16,9 @@ 1.0.0-SNAPSHOT - 17 - 4.4.1 - 3.5.6 + 21 + 5.0.0 + 4.1.0 https://nodejs.org/dist/ UTF-8 @@ -66,7 +66,7 @@ maven-compiler-plugin - 3.14.1 + 3.14.0 ${jdk.version} UTF-8 @@ -86,7 +86,7 @@ maven-surefire-plugin - 3.5.4 + 3.5.6 @@ -132,7 +132,7 @@ 3.6.3 - ${jdk.version} + [21,) @@ -166,4 +166,4 @@ - \ No newline at end of file + diff --git a/samples/bookshop/pom.xml b/samples/bookshop/pom.xml index dea3b81..2a97957 100644 --- a/samples/bookshop/pom.xml +++ b/samples/bookshop/pom.xml @@ -16,9 +16,9 @@ 1.0.0-SNAPSHOT - 17 - 4.4.0 - 3.5.6 + 21 + 5.0.0 + 4.1.0 https://nodejs.org/dist/ UTF-8 @@ -72,7 +72,7 @@ maven-compiler-plugin - 3.14.1 + 3.14.0 ${jdk.version} UTF-8 @@ -92,7 +92,7 @@ maven-surefire-plugin - 3.5.4 + 3.5.6 @@ -138,7 +138,7 @@ 3.6.3 - ${jdk.version} + [21,) diff --git a/samples/bookshop/srv/pom.xml b/samples/bookshop/srv/pom.xml index ce60f5c..a98afdc 100644 --- a/samples/bookshop/srv/pom.xml +++ b/samples/bookshop/srv/pom.xml @@ -62,6 +62,12 @@ spring-security-test test + + + org.springframework.boot + spring-boot-starter-webmvc-test + test + diff --git a/samples/bookshop/srv/src/test/java/customer/bookshop/ApplicationTest.java b/samples/bookshop/srv/src/test/java/customer/bookshop/ApplicationTest.java index 152543a..5bb40e5 100644 --- a/samples/bookshop/srv/src/test/java/customer/bookshop/ApplicationTest.java +++ b/samples/bookshop/srv/src/test/java/customer/bookshop/ApplicationTest.java @@ -4,12 +4,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; @SpringBootTest -@AutoConfigureMockMvc class ApplicationTest { @Autowired private ApplicationContext context; diff --git a/samples/bookshop/srv/src/test/java/customer/bookshop/IntegrationTest.java b/samples/bookshop/srv/src/test/java/customer/bookshop/IntegrationTest.java index 1f02c98..63e04ed 100644 --- a/samples/bookshop/srv/src/test/java/customer/bookshop/IntegrationTest.java +++ b/samples/bookshop/srv/src/test/java/customer/bookshop/IntegrationTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.web.servlet.MockMvc; diff --git a/srv/src/main/java/sap/capire/emoji_plugin/EmojiHandler.java b/srv/src/main/java/com/sap/cds/feature/emoji/EmojiHandler.java similarity index 97% rename from srv/src/main/java/sap/capire/emoji_plugin/EmojiHandler.java rename to srv/src/main/java/com/sap/cds/feature/emoji/EmojiHandler.java index c368751..81069f4 100644 --- a/srv/src/main/java/sap/capire/emoji_plugin/EmojiHandler.java +++ b/srv/src/main/java/com/sap/cds/feature/emoji/EmojiHandler.java @@ -1,4 +1,8 @@ -package sap.capire.emoji_plugin; +package com.sap.cds.feature.emoji; + +import java.util.HashSet; +import java.util.Set; +import java.util.stream.Collectors; import com.sap.cds.Result; import com.sap.cds.reflect.CdsElement; @@ -9,9 +13,6 @@ import com.sap.cds.services.handler.EventHandler; import com.sap.cds.services.handler.annotations.After; import com.sap.cds.services.handler.annotations.ServiceName; -import java.util.HashSet; -import java.util.Set; -import java.util.stream.Collectors; /** * Event handler that decorates fields annotated with @emoji by appending an emoji. @@ -44,4 +45,4 @@ private Set checkForEmojiAnnotatedElments(final Result result) { } return annotatedElementNames; } -} \ No newline at end of file +} diff --git a/srv/src/main/java/sap/capire/emoji_plugin/EmojiHandlerRuntimeConfiguration.java b/srv/src/main/java/com/sap/cds/feature/emoji/EmojiHandlerRuntimeConfiguration.java similarity index 96% rename from srv/src/main/java/sap/capire/emoji_plugin/EmojiHandlerRuntimeConfiguration.java rename to srv/src/main/java/com/sap/cds/feature/emoji/EmojiHandlerRuntimeConfiguration.java index d15bf75..1ebbfef 100644 --- a/srv/src/main/java/sap/capire/emoji_plugin/EmojiHandlerRuntimeConfiguration.java +++ b/srv/src/main/java/com/sap/cds/feature/emoji/EmojiHandlerRuntimeConfiguration.java @@ -1,4 +1,4 @@ -package sap.capire.emoji_plugin; +package com.sap.cds.feature.emoji; import com.sap.cds.services.runtime.CdsRuntimeConfiguration; import com.sap.cds.services.runtime.CdsRuntimeConfigurer; @@ -26,4 +26,4 @@ public void eventHandlers(CdsRuntimeConfigurer configurer) { logger.info("Registered EmojiHandler event handler."); } -} \ No newline at end of file +} diff --git a/srv/src/main/resources/META-INF/services/com.sap.cds.services.runtime.CdsRuntimeConfiguration b/srv/src/main/resources/META-INF/services/com.sap.cds.services.runtime.CdsRuntimeConfiguration index 97b4d6d..c49931d 100644 --- a/srv/src/main/resources/META-INF/services/com.sap.cds.services.runtime.CdsRuntimeConfiguration +++ b/srv/src/main/resources/META-INF/services/com.sap.cds.services.runtime.CdsRuntimeConfiguration @@ -1 +1 @@ -sap.capire.emoji_plugin.EmojiHandlerRuntimeConfiguration \ No newline at end of file +com.sap.cds.feature.emoji.EmojiHandlerRuntimeConfiguration From dc8dc25174537f04055e0009ae350907d9a5067e Mon Sep 17 00:00:00 2001 From: Lisa Julia Nebel Date: Fri, 28 Aug 2026 10:29:54 +0200 Subject: [PATCH 02/13] Pin SAPUI5 version to 1.148.2 --- samples/bookshop/app/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/bookshop/app/index.html b/samples/bookshop/app/index.html index 70f6315..4748377 100644 --- a/samples/bookshop/app/index.html +++ b/samples/bookshop/app/index.html @@ -14,8 +14,8 @@ }; - - +