diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml index afda4b6f98bf98c75461264ab8b367a71e3e74e7..fad76bc1469d19d8c041e51c5574edf3446828e5 100644 --- a/dbrepo-metadata-service/pom.xml +++ b/dbrepo-metadata-service/pom.xml @@ -39,7 +39,6 @@ <java.version>17</java.version> <spring-cloud.version>4.0.2</spring-cloud.version> <mapstruct.version>1.5.5.Final</mapstruct.version> - <docker.version>3.3.0</docker.version> <jacoco.version>0.8.10</jacoco.version> <jwt.version>4.3.0</jwt.version> <hibernate-c3po.version>5.6.3.Final</hibernate-c3po.version> @@ -49,6 +48,7 @@ <keycloak.version>21.0.2</keycloak.version> <hibernate.version>6.2.2.Final</hibernate.version> <springdoc-openapi.version>2.1.0</springdoc-openapi.version> + <hsqldb.version>2.7.2</hsqldb.version> <opensearch-client.version>1.1.0</opensearch-client.version> </properties> @@ -196,8 +196,9 @@ </exclusions> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>${hsqldb.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java index 13f015213effec80e94ac457c8201795c24fbb71..51f9f62605ab60a715ad1dc9b2a32349dd02e002 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java @@ -50,7 +50,7 @@ public class MetadataServiceIntegrationTest extends BaseUnitTest { imageRepository.save(IMAGE_1_SIMPLE); realmRepository.save(REALM_DBREPO); userRepository.save(USER_1_SIMPLE); - containerRepository.save(CONTAINER_1_SIMPLE); + containerRepository.save(CONTAINER_1); databaseRepository.save(DATABASE_1_SIMPLE); identifierRepository.save(IDENTIFIER_1); } diff --git a/dbrepo-metadata-service/rest-service/src/test/resources/application.properties b/dbrepo-metadata-service/rest-service/src/test/resources/application.properties index f56b5e38f304e8d5a124ef78a20b965efd94aff1..8b076b0dfe26323eeabbdf2c593bc8f595283816 100644 --- a/dbrepo-metadata-service/rest-service/src/test/resources/application.properties +++ b/dbrepo-metadata-service/rest-service/src/test/resources/application.properties @@ -9,14 +9,14 @@ spring.cloud.config.discovery.enabled = false spring.cloud.config.enabled = false # disable datasource -# spring 6 fix https://github.com/h2database/h2database/issues/3363 -spring.datasource.url=jdbc:h2:mem:testdb;NON_KEYWORDS=VALUE;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA -spring.datasource.driverClassName=org.h2.Driver -spring.datasource.username=sa -spring.datasource.password=password -spring.jpa.database-platform=org.hibernate.dialect.H2Dialect -spring.jpa.hibernate.ddl-auto=create-drop -spring.jpa.show-sql=false +spring.datasource.driver-class-name=org.hsqldb.jdbc.JDBCDriver +spring.datasource.url=jdbc:hsqldb:mem:testdb;db_close_delay=-1;sql.syntax_mys=true +spring.jpa.database-platform=org.hibernate.dialect.HSQLDialect +spring.datasource.username=root +spring.datasource.password=dbrepo +spring.sql.init.mode=always +spring.sql.init.schema-locations=classpath*:init/schema.sql +spring.jpa.hibernate.ddl-auto=create fda.mapping.path: /tmp fda.table.path: /tmp \ No newline at end of file diff --git a/dbrepo-metadata-service/rest-service/src/test/resources/init/schema.sql b/dbrepo-metadata-service/rest-service/src/test/resources/init/schema.sql new file mode 100644 index 0000000000000000000000000000000000000000..f8482e47d5b0827e87537d940b54900a8f2d8f3b --- /dev/null +++ b/dbrepo-metadata-service/rest-service/src/test/resources/init/schema.sql @@ -0,0 +1 @@ +CREATE SCHEMA IF NOT EXISTS fda; \ No newline at end of file