chore: upgrade to spring boot 2.7

Onlineberatung · May 23, 2024 · 9554032 · 9554032
1 parent b8342da
commit 9554032
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/main/resources/application-testing.properties b/src/main/resources/application-testing.properties
@@ -40,7 +40,7 @@ spring.liquibase.enabled=false
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
 spring.sql.init.data-locations=classpath:database/UserServiceDatabase.sql
-spring.datasource.data=classpath*:database/UserServiceDatabase.sql
+
 spring.jpa.defer-datasource-initialization=true
 spring.jpa.generate-ddl=true
 spring.jpa.hibernate.dialect=org.hibernate.dialect.H2Dialect

diff --git a/...b/userservice/api/admin/service/consultant/ConsultantAdminFilterServiceTenantAwareIT.java b/...b/userservice/api/admin/service/consultant/ConsultantAdminFilterServiceTenantAwareIT.java
@@ -11,20 +11,12 @@
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.jdbc.Sql;
 import org.springframework.transaction.annotation.Transactional;
 
 @SpringBootTest(classes = UserServiceApplication.class)
 @TestPropertySource(properties = "spring.profiles.active=testing")
 @AutoConfigureTestDatabase(replace = Replace.ANY)
 @TestPropertySource(properties = "multitenancy.enabled=false")
-@TestPropertySource(
-    properties =
-        "spring.datasource.data=classpath*:database/UserServiceDatabase.sql,classpath*:database/transformDataForTenants.sql")
-@TestPropertySource(
-    properties =
-        "spring.sql.init.data-locations=classpath:database/UserServiceDatabase.sql,classpath:database/transformDataForTenants.sql")
-@Sql(scripts = {"classpath:database/transformDataForTenants.sql"})
 @Transactional
 public class ConsultantAdminFilterServiceTenantAwareIT extends ConsultantAdminFilterServiceBase {