Skip to content
Snippets Groups Projects
Verified Commit 0d830ebe authored by Tobias Grantner's avatar Tobias Grantner
Browse files

Removed dependencies on docker from metadata service

parent aa863512
No related branches found
No related tags found
6 merge requests!231CI: Remove build for log-service,!228Better error message handling in the frontend,!223Release of version 1.4.0,!177Updated keycloak realms to only allow creation of containers for developers,...,!176Hotfix views,!166Resolve "Independence of deployment environment"
......@@ -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>
......
......@@ -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);
}
......
......@@ -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
CREATE SCHEMA IF NOT EXISTS fda;
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment