Use CDS Services 2.0 (#231)

Co-authored-by: Markus Ofterdinger <[email protected]>

Author: beckermarc

pom.xml

@@ -16,10 +16,10 @@
 
 		<!-- DEPENDENCIES VERSION -->
 		<jdk.version>17</jdk.version>
-		<cds.services.version>1.34.1</cds.services.version>
-		<spring.boot.version>2.7.11</spring.boot.version>
-		<cloud.sdk.version>4.12.0</cloud.sdk.version>
-		<xsuaa.version>2.13.9</xsuaa.version>
+		<cds.services.version>2.0.1</cds.services.version>
+		<spring.boot.version>3.0.7</spring.boot.version>
+		<cloud.sdk.version>4.14.0</cloud.sdk.version>
+		<xsuaa.version>3.0.1</xsuaa.version>
 		<cf-java-logging-support.version>3.7.0</cf-java-logging-support.version>
 		<cds.install-cdsdk.version>6.8.2</cds.install-cdsdk.version>
 	</properties>

srv/pom.xml

@@ -83,7 +83,7 @@
 
 		<dependency>
 			<groupId>com.sap.hcp.cf.logging</groupId>
-			<artifactId>cf-java-logging-support-servlet</artifactId>
+			<artifactId>cf-java-logging-support-servlet-jakarta</artifactId>
 			<version>${cf-java-logging-support.version}</version>
 		</dependency>
 

srv/src/main/java/my/bookshop/Application.java

@@ -1,14 +1,14 @@
 package my.bookshop;
 
-import javax.servlet.DispatcherType;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 
 import com.sap.hcp.cf.logging.servlet.filter.RequestLoggingFilter;
 
+import jakarta.servlet.DispatcherType;
+
 @SpringBootApplication
 public class Application {
 

srv/src/main/java/my/bookshop/config/WebSecurityConfig.java

@@ -1,5 +1,7 @@
 package my.bookshop.config;
 
+import static org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher;
+
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -16,10 +18,8 @@ public class WebSecurityConfig {
 
 	@Bean
 	public SecurityFilterChain configure(HttpSecurity http) throws Exception {
-		return http.requestMatchers() //
-				.antMatchers("/actuator/health") //
-				.antMatchers("/swagger/**") //
-				.and().csrf().disable().authorizeRequests().anyRequest().permitAll().and()
+		return http.securityMatchers().requestMatchers(antMatcher("/actuator/health"), antMatcher("/swagger/**")) //
+				.and().csrf().disable().authorizeHttpRequests().anyRequest().permitAll().and()
 				.build();
 	}
 }

srv/src/test/java/my/bookshop/AdminServiceTest.java

@@ -3,9 +3,10 @@
 import static cds.gen.adminservice.AdminService_.AUTHORS;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.math.BigDecimal;
 import java.util.Collections;
-import javax.annotation.Resource;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -24,6 +25,7 @@
 import cds.gen.adminservice.OrderItems;
 import cds.gen.adminservice.Orders;
 import cds.gen.adminservice.Orders_;
+import jakarta.annotation.Resource;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest