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

Removed dependencies on docker from semantics service

parent 9f139ef8
Branches
Tags
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"
...@@ -160,7 +160,7 @@ test-metadata-service: build-metadata-db build-metadata-service ...@@ -160,7 +160,7 @@ test-metadata-service: build-metadata-db build-metadata-service
test-user-service: build-metadata-db build-user-service test-user-service: build-metadata-db build-user-service
mvn -f ./dbrepo-user-service/pom.xml clean test verify mvn -f ./dbrepo-user-service/pom.xml clean test verify
test-semantics-service: clean build-metadata-db build-semantics-service test-semantics-service: build-metadata-db build-semantics-service
mvn -f ./dbrepo-semantics-service/pom.xml clean test verify mvn -f ./dbrepo-semantics-service/pom.xml clean test verify
test-analyse-service: build-analyse-service test-analyse-service: build-analyse-service
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
<java.version>17</java.version> <java.version>17</java.version>
<spring-cloud.version>4.0.2</spring-cloud.version> <spring-cloud.version>4.0.2</spring-cloud.version>
<mapstruct.version>1.5.5.Final</mapstruct.version> <mapstruct.version>1.5.5.Final</mapstruct.version>
<docker.version>3.3.0</docker.version>
<swagger.version>2.2.9</swagger.version> <swagger.version>2.2.9</swagger.version>
<jacoco.version>0.8.10</jacoco.version> <jacoco.version>0.8.10</jacoco.version>
<jwt.version>4.3.0</jwt.version> <jwt.version>4.3.0</jwt.version>
...@@ -36,6 +35,7 @@ ...@@ -36,6 +35,7 @@
<c3p0-hibernate.version>6.2.2.Final</c3p0-hibernate.version> <c3p0-hibernate.version>6.2.2.Final</c3p0-hibernate.version>
<apache-jena.version>4.8.0</apache-jena.version> <apache-jena.version>4.8.0</apache-jena.version>
<springdoc-openapi.version>2.1.0</springdoc-openapi.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> <opensearch-client.version>1.1.0</opensearch-client.version>
</properties> </properties>
...@@ -121,8 +121,9 @@ ...@@ -121,8 +121,9 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>org.hsqldb</groupId>
<artifactId>h2</artifactId> <artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -9,14 +9,14 @@ spring.cloud.config.discovery.enabled=false ...@@ -9,14 +9,14 @@ spring.cloud.config.discovery.enabled=false
spring.cloud.config.enabled=false spring.cloud.config.enabled=false
# internal datasource # internal datasource
# spring 6 fix https://github.com/h2database/h2database/issues/3363 spring.datasource.driver-class-name=org.hsqldb.jdbc.JDBCDriver
spring.datasource.url=jdbc:h2:mem:testdb;NON_KEYWORDS=VALUE,KEY;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA spring.datasource.url=jdbc:hsqldb:mem:testdb;db_close_delay=-1;sql.syntax_mys=true
spring.datasource.driverClassName=org.h2.Driver spring.jpa.database-platform=org.hibernate.dialect.HSQLDialect
spring.datasource.username=sa spring.datasource.username=root
spring.datasource.password=password spring.datasource.password=dbrepo
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect spring.sql.init.mode=always
spring.jpa.hibernate.ddl-auto=create-drop spring.sql.init.schema-locations=classpath*:init/schema.sql
spring.jpa.show-sql=false spring.jpa.hibernate.ddl-auto=create
# log # log
logging.level.org.hibernate.SQL=trace logging.level.org.hibernate.SQL=trace
......
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 register or to comment