Revert "Merge branch '16-refactoring-backend-endpoints' into 'master'"

This reverts merge request !9

.gitlab-ci.yml

@@ -4,7 +4,6 @@ image: docker/compose:latest
 before_script:
   - docker version
   - docker-compose version
-  - mvn --version
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
 cache:
@@ -29,7 +28,7 @@ build:
 test-backend:
   stage: test
   script:
-    - mvn -f fda-container-managing-service/pom.xml clean test
+    - echo "todo"
 
 test-frontend:
   stage: test
@@ -71,7 +70,7 @@ production:
     - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
     - echo "$PROD_SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
     - chmod 600 ~/.ssh/id_rsa
-    - scp docker-compose.dbrepo.yml $PROD_SSH_HOST:~/deployment/docker-compose.yml
+    - scp docker-compose.dev.yml $PROD_SSH_HOST:~/deployment/docker-compose.yml
     - ssh $PROD_SSH_HOST "docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY"
     - ssh $PROD_SSH_HOST "docker-compose -f ~/deployment/docker-compose.yml pull"
     - ssh $PROD_SSH_HOST "docker-compose -f ~/deployment/docker-compose.yml -p 'fda' down"

README.md

@@ -42,19 +42,12 @@ Everything is handled by compose, just build it by running:
 docker-compose build
 ```
 
-## Develop
-
-The endpoints are documented with Swagger 2.1 and OpenAPI 3.0. The current specification for the front-end is obtainable programatically from `http://localhost:<port>/swagger-resources`
-
-For easy visualization use OpenAPI at:
-
-- [http://fda-container-managing-service/swagger-ui/](http://localhost:9091/swagger-ui/)
-- [http://fda-database-managing-service/swagger-ui/](http://localhost:9092/swagger-ui/)
-
 ## Deployment
 
 The pipeline is set-up to build and test all commits. A commit to dev or master branch triggers additional jobs.
 
+### Development
+
 A commit to `dev` triggers the following pipeline. It deploys the docker images to the docker registry hosted on the fda-runner server and deploys it also to a test server (fda-deployment) at TU Wien. 
 
 ![pipeline dev](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-docs/-/raw/master/figures/fda-pipeline-dev.png)

docker-compose.dbrepo.yml → docker-compose.dev.yml

@@ -139,7 +139,7 @@ services:
     hostname: fda-ui
     image:  docker.martinweise.at/fda-ui:latest
     ports:
-      - 80:3000
+      - 3000:3000
     links:
       - fda-discovery-server
       - fda-container-managing-service

docker-compose.prod.yml

+version: "3.6"
+
+services:
+
+  fda-discovery-server:
+    container_name: fda-discovery-server
+    hostname: fda-discovery-server
+    image: docker.martinweise.at/fda-discovery-server:stable
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+    network_mode: bridge
+    ports:
+      - 9090:9090
+
+  fda-gateway-service:
+    container_name: fda-gateway-service
+    hostname: fda-gateway-service
+    image: docker.martinweise.at/fda-gateway-service:stable
+    network_mode: bridge
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+    ports:
+      - 9095:9095
+    links:
+      - fda-discovery-server
+      - fda-database-managing-service
+      - fda-container-managing-service
+      - fda-query-service
+      - fda-table-service
+    depends_on:
+      - fda-discovery-server
+      - fda-database-managing-service
+      - fda-container-managing-service
+      - fda-query-service
+      - fda-table-service
+    logging:
+      driver: json-file
+
+  fda-database-managing-service:
+    container_name: fda-database-managing-service
+    hostname: fda-database-managing-service
+    image:  docker.martinweise.at/fda-database-managing-service:stable
+    network_mode: bridge
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+    ports:
+      - 9092:9092
+    links:
+      - fda-discovery-server
+      - fda-container-managing-service
+    depends_on:
+      - fda-discovery-server
+      - fda-container-managing-service
+    logging:
+      driver: json-file
+
+  fda-container-managing-service:
+    container_name: fda-container-managing-service
+    hostname: fda-container-managing-service
+    image: docker.martinweise.at/fda-container-managing-service:stable
+    network_mode: bridge
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+    ports:
+      - 9091:9091
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    links:
+      - fda-discovery-server
+    depends_on:
+      - fda-discovery-server
+    logging:
+      driver: json-file
+
+  fda-query-service:
+    container_name: fda-query-service
+    hostname: fda-query-service
+    image:  docker.martinweise.at/fda-query-service:stable
+    network_mode: bridge
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+    ports:
+      - 9093:9093
+    volumes:
+      - /tmp:/tmp
+    links:
+      - fda-discovery-server
+      - fda-container-managing-service
+    depends_on:
+      - fda-discovery-server
+      - fda-container-managing-service
+    logging:
+      driver: json-file
+
+  fda-table-service:
+    container_name: fda-table-service
+    hostname: fda-table-service
+    image:  docker.martinweise.at/fda-table-service:stable
+    network_mode: bridge
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+      multipart.location: /tmp
+    ports:
+      - 9094:9094
+    volumes:
+      - /tmp:/tmp
+    links:
+      - fda-discovery-server
+      - fda-query-service
+      - fda-analyse-service
+    depends_on:
+      - fda-discovery-server
+
+  fda-analyse-service:
+    container_name: fda-analyse-service
+    hostname: fda-analyse-service
+    image:  docker.martinweise.at/fda-analyse-service:stable
+    network_mode: bridge
+    command: sh -c "/wait && flask run"
+    environment:
+      EUREKA_SERVER: http://fda-discovery-server:9090/eureka
+      WAIT_HOSTS: fda-discovery-server:9090
+      WAIT_HOSTS_TIMEOUT: 600
+      WAIT_SLEEP_INTERVAL: 30
+      WAIT_HOST_CONNECT_TIMEOUT: 30
+    ports:
+      - 5000:5000
+    volumes:
+      - /tmp:/tmp
+    links:
+      - fda-discovery-server
+    depends_on:
+      - fda-discovery-server
+    logging:
+      driver: json-file
+
+  fda-ui:
+    container_name: fda-ui
+    hostname: fda-ui
+    image:  docker.martinweise.at/fda-ui:stable
+    ports:
+      - 3000:3000
+    links:
+      - fda-discovery-server
+      - fda-container-managing-service
+      - fda-query-service
+      - fda-analyse-service
+    depends_on:
+      - fda-discovery-server
+    environment:
+      HOST: 0.0.0.0
+      API_URL: //fda-database-managing-service:9092/api

docker-compose.yml

 version: "3.6"
 
-volumes:
-  fda-metadata-db-data:
-
 services:
 
-  fda-metadata-db:
-    restart: always
-    container_name: fda-metadata-db
-    hostname: fda-metadata-db
-    image: postgres:13-alpine
-    volumes:
-      - fda-metadata-db-data:/var/lib/postgresql/data
-    network_mode: bridge
-    ports:
-      - 5432:5432
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: fda
-
   fda-discovery-server:
-    restart: always
     container_name: fda-discovery-server
     hostname: fda-discovery-server
     build: ./fda-discovery-server
@@ -33,7 +14,6 @@ services:
       - 9090:9090
 
   fda-gateway-service:
-    restart: always
     container_name: fda-gateway-service
     hostname: fda-gateway-service
     build: ./fda-gateway-service
@@ -51,11 +31,14 @@ services:
       - fda-table-service
     depends_on:
       - fda-discovery-server
+      - fda-database-managing-service
+      - fda-container-managing-service
+      - fda-query-service
+      - fda-table-service
     logging:
       driver: json-file
 
   fda-database-managing-service:
-    restart: always
     container_name: fda-database-managing-service
     hostname: fda-database-managing-service
     build:
@@ -69,16 +52,13 @@ services:
     links:
       - fda-discovery-server
       - fda-container-managing-service
-      - fda-metadata-db
     depends_on:
       - fda-discovery-server
       - fda-container-managing-service
-      - fda-metadata-db
     logging:
       driver: json-file
 
   fda-container-managing-service:
-    restart: always
     container_name: fda-container-managing-service
     hostname: fda-container-managing-service
     build: ./fda-container-managing-service
@@ -92,15 +72,12 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     links:
       - fda-discovery-server
-      - fda-metadata-db
     depends_on:
       - fda-discovery-server
-      - fda-metadata-db
     logging:
       driver: json-file
 
   fda-query-service:
-    restart: always
     container_name: fda-query-service
     hostname: fda-query-service
     build: ./fda-query-service
@@ -122,7 +99,6 @@ services:
       driver: json-file
 
   fda-table-service:
-    restart: always
     container_name: fda-table-service
     hostname: fda-table-service
     build: ./fda-table-service
@@ -137,11 +113,12 @@ services:
       - /tmp:/tmp
     links:
       - fda-discovery-server
+      - fda-query-service
+      - fda-analyse-service
     depends_on:
       - fda-discovery-server
 
   fda-analyse-service:
-    restart: always
     container_name: fda-analyse-service
     hostname: fda-analyse-service
     build: ./fda-analyse-service
@@ -166,16 +143,19 @@ services:
       driver: json-file
 
   fda-ui:
-    restart: always
     container_name: fda-ui
     hostname: fda-ui
     build: ./fda-ui
     image: fda-ui
     ports:
       - 3000:3000
-    depends_on:
+    links:
+      - fda-discovery-server
       - fda-container-managing-service
-      - fda-database-managing-service
+      - fda-query-service
+      - fda-analyse-service
+    depends_on:
+      - fda-discovery-server
     environment:
       HOST: 0.0.0.0
       API_URL: //fda-database-managing-service:9092/api

fda-analyse-service/createMDB.py

@@ -29,7 +29,7 @@ cursor = conn.cursor()
 cursor.execute(f"""CREATE SEQUENCE seq_data;
 CREATE SEQUENCE seq_user; 
 
-CREATE TABLE md_DATA ( 
+CREATE TABLE DATA ( 
 	ID INTEGER PRIMARY KEY DEFAULT nextval('seq_data'), 
 	PROVENANCE TEXT, 
 	FileEncoding TEXT, 
@@ -38,17 +38,17 @@ CREATE TABLE md_DATA (
 	Seperator TEXT
 );  
 
-CREATE TABLE md_USERS ( 
+CREATE TABLE USERS ( 
 	UserID INTEGER PRIMARY KEY DEFAULT nextval('seq_user'),
 	Name VARCHAR(50)
 ); 
 
-CREATE TABLE md_CONTACTPERSON (
-	cUserID INTEGER PRIMARY KEY REFERENCES md_USERS(UserID),
+CREATE TABLE CONTACTPERSON (
+	cUserID INTEGER PRIMARY KEY REFERENCES USERS(UserID),
 	Email TEXT
 );
 
-CREATE TABLE md_DATABASES ( 
+CREATE TABLE DATABASES ( 
 	DBID TEXT PRIMARY KEY, -- (= DockerContainer ID)
 	Title VARCHAR(50), 
 	ResourceType TEXT, 
@@ -57,11 +57,11 @@ CREATE TABLE md_DATABASES (
 	Publisher VARCHAR(50), 
 	Year DATE DEFAULT CURRENT_DATE, 
 	Open BOOLEAN DEFAULT TRUE, 
-	Contact INTEGER REFERENCES md_CONTACTPERSON(cUserID)
+	Contact INTEGER REFERENCES CONTACTPERSON(cUserID)
 ); 
 
-CREATE TABLE md_TABLES ( 
-	tDBID TEXT REFERENCES md_DATABASES(DBID), 
+CREATE TABLE TABLES ( 
+	tDBID TEXT REFERENCES DATABASES(DBID), 
 	tName VARCHAR(50), 
 	NumCols INTEGER, 
 	NumRows INTEGER, 
@@ -69,7 +69,7 @@ CREATE TABLE md_TABLES (
 	PRIMARY KEY(tDBID,tName)
 );
 
-CREATE TABLE md_COLUMNS ( 
+CREATE TABLE COLUMNS ( 
 	cDBID TEXT NOT NULL, 
 	tName VARCHAR(50) NOT NULL, 
 	cName VARCHAR(50), 
@@ -77,12 +77,12 @@ CREATE TABLE md_COLUMNS (
 	SIunit TEXT, 
 	MaxVal NUMERIC, 
 	MinVal NUMERIC , 
-	FOREIGN KEY (cDBID,tName) REFERENCES md_TABLES(tDBID,tName),
+	FOREIGN KEY (cDBID,tName) REFERENCES TABLES(tDBID,tName),
 	PRIMARY KEY(cDBID, tName, cName)
 );
 
-CREATE TABLE md_VIEW ( 
-	vDBID TEXT REFERENCES md_DATABASES(DBID), 
+CREATE TABLE VIEW ( 
+	vDBID TEXT REFERENCES Databases(DBID), 
 	vName VARCHAR(50), 
 	Query TEXT, 
 	Public BOOLEAN , 
@@ -91,24 +91,24 @@ CREATE TABLE md_VIEW (
 	PRIMARY KEY (vDBID,vName)
 );
 
-CREATE TABLE md_feed ( 
+CREATE TABLE feed ( 
 	fDBID TEXT, 
 	fName VARCHAR(50),
-	fUserId INTEGER REFERENCES md_USERS(UserID), 
-	fDataID INTEGER REFERENCES md_DATA(ID), 
-	FOREIGN KEY (fDBID,fName) REFERENCES md_TABLES(tDBID,tNAME), 
+	fUserId INTEGER REFERENCES USERS(UserID), 
+	fDataID INTEGER REFERENCES DATA(ID), 
+	FOREIGN KEY (fDBID,fName) REFERENCES TABLES(tDBID,tNAME), 
 	PRIMARY KEY (fDBID,fName,fUserId, fDataID)
 );
 
-CREATE TABLE md_update ( 
-	uUserID INTEGER REFERENCES md_USERS(UserID),
-	uDBID TEXT REFERENCES md_DATABASES(DBID), 
+CREATE TABLE update ( 
+	uUserID INTEGER REFERENCES USERS(UserID),
+	uDBID TEXT REFERENCES Databases(DBID), 
 	PRIMARY KEY (uUserID,uDBID)
 ); 
 
-CREATE TABLE md_access (
-	aUserID INTEGER REFERENCES md_USERS(UserID),
-	aDBID TEXT REFERENCES md_DATABASES(DBID),
+CREATE TABLE access (
+	aUserID INTEGER REFERENCES USERS(UserID),
+	aDBID TEXT REFERENCES Databases(DBID),
 	attime TIMESTAMP, 
 	download BOOLEAN, 
 	PRIMARY KEY (aUserID, aDBID, attime, download)

fda-container-managing-service/Dockerfile

@@ -10,13 +10,13 @@ COPY ./api ./api
 COPY ./rest-service ./rest-service
 COPY ./services ./services
 
-RUN mvn -q clean package -DskipTests
+RUN mvn -q clean package > /dev/null
 
 ###### SECOND STAGE ######
 FROM openjdk:11-jre-slim as runtime
 
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
+COPY --from=build ./rest-service/target/fda-container-managing-service-*.jar ./rest.jar
 
 EXPOSE 9091
 
-ENTRYPOINT ["java", "-jar", "./rest-service.jar"]
+ENTRYPOINT ["java", "-jar", "./rest.jar"]

fda-container-managing-service/api/pom.xml

@@ -2,22 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>at.tuwien</groupId>
         <artifactId>fda-container-managing-service</artifactId>
+        <groupId>at.tuwien</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
+    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>api</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>fda-container-managing-service-api</name>
-
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
 
-    <dependencies/>
 
 </project>
\ No newline at end of file

fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/IpAddressDto.java

-package at.tuwien.api.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.net.InetAddress;
-
-@Getter
-@Setter
-public class IpAddressDto {
-
-    @NotNull
-    @Size(min = 7, max = 15)
-    private String ipv4;
-
-}

fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerActionTypeDto.java

-package at.tuwien.api.dto.container;
-
-public enum ContainerActionTypeDto {
-    START, STOP, REMOVE
-}

fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerBriefDto.java

-package at.tuwien.api.dto.container;
-
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
-@Getter
-@Setter
-public class ContainerBriefDto {
-
-    @NotNull
-    @Size(min = 64, max = 64)
-    private String id;
-
-    @NotBlank
-    @Size(min = 3)
-    private String containerName;
-}

fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerChangeDto.java

-package at.tuwien.api.dto.container;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-@Getter
-@Setter
-public class ContainerChangeDto {
-
-    @NotNull
-    private ContainerActionTypeDto action;
-
-}

fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerCreateRequestDto.java

-package at.tuwien.api.dto.container;
-
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-@Getter
-@Setter
-@Builder
-public class ContainerCreateRequestDto {
-
-    @NotBlank
-    @Size(min = 3)
-    private String containerName;
-
-    @NotBlank
-    @Size(min = 3)
-    private String image;
-
-}

fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerDto.java

-package at.tuwien.api.dto.container;
-
-import at.tuwien.api.dto.IpAddressDto;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-import java.time.Instant;
-
-@Getter
-@Setter
-public class ContainerDto extends ContainerBriefDto {
-
-    @NotNull
-    private ContainerStateDto status;
-
-    @NotNull
-    private IpAddressDto ipAddress;
-
-    @NotNull
-    private Instant created;
-
-}

fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerStateDto.java

-package at.tuwien.api.dto.container;
-
-import lombok.Getter;
-
-@Getter
-public enum ContainerStateDto {
-    CREATED, RESTARTING, RUNNING, PAUSED, EXITED, DEAD
-}

fda-container-managing-service/api/src/main/java/at/tuwien/api/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>fda-container-managing-service</artifactId>
-        <groupId>at.tuwien</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>api</artifactId>
-
-
-</project>
\ No newline at end of file

fda-container-managing-service/api/src/main/java/at/tuwien/dto/CreateDatabaseConnectionDataDTO.java

+package at.tuwien.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@AllArgsConstructor
+@Getter
+@Setter
+public class CreateDatabaseConnectionDataDTO {
+
+    @JsonProperty("IpAddress")
+    private String ipAddress;
+    @JsonProperty("DatabaseName")
+    private String dbName;
+}

fda-container-managing-service/api/src/main/java/at/tuwien/dto/CreateDatabaseContainerDTO.java

+package at.tuwien.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CreateDatabaseContainerDTO {
+
+    @JsonProperty("ContainerName")
+    private String containerName;
+    @JsonProperty("DatabaseName")
+    private String dbName;
+
+}

fda-container-managing-service/pom.xml

@@ -2,33 +2,27 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
+    <modules>
+        <module>rest-service</module>
+        <module>api</module>
+        <module>services</module>
+    </modules>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.3</version>
+        <version>2.3.4.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
     </parent>
-
     <groupId>at.tuwien</groupId>
     <artifactId>fda-container-managing-service</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>fda-container-managing-service</name>
     <description>Demo project for Spring Boot</description>
 
-    <packaging>pom</packaging>
-    <modules>
-        <module>rest-service</module>
-        <module>api</module>
-        <module>services</module>
-    </modules>
-
     <properties>
         <java.version>11</java.version>
         <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
-        <mapstruct.version>1.4.2.Final</mapstruct.version>
-        <docker.version>3.2.7</docker.version>
-        <testcontainers.version>1.15.2</testcontainers.version>
-        <swagger.version>2.1.7</swagger.version>
-        <springfox.version>3.0.0</springfox.version>
     </properties>
 
     <dependencies>
@@ -39,25 +33,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-            <version>3.0.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.ws.rs</groupId>
-                    <artifactId>jsr311-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-        <!-- DataSource -->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <!-- Testing -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -69,72 +45,21 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- DTO -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-spring-web</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <!-- IDE -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-        <!-- Docker -->
-        <dependency>
-            <groupId>com.github.docker-java</groupId>
-            <artifactId>docker-java</artifactId>
-            <version>${docker.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.ws.rs</groupId>
-                    <artifactId>jsr311-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.github.docker-java</groupId>
-            <artifactId>docker-java-transport-httpclient5</artifactId>
-            <version>${docker.version}</version>
-        </dependency>
-        <!-- Mapping -->
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-processor</artifactId>
-            <version>${mapstruct.version}</version>
-            <optional>true</optional><!-- IntelliJ -->
-        </dependency>
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct</artifactId>
-            <version>${mapstruct.version}</version>
-        </dependency>
-        <!-- Swagger -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-            <version>${springfox.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${springfox.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-spring-web</artifactId>
-            <version>${springfox.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger.version}</version>
-        </dependency>
+    </dependencies>
+    <dependencyManagement>
+        <dependencies>
             <dependency>
-            <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>${swagger.version}</version>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
         </dependencies>
+    </dependencyManagement>
 
 </project>

fda-container-managing-service/rest-service/pom.xml

@@ -2,49 +2,46 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>at.tuwien</groupId>
         <artifactId>fda-container-managing-service</artifactId>
+        <groupId>at.tuwien</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
+    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>rest-service</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>fda-container-managing-service-rest-service</name>
-
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>at.tuwien</groupId>
             <artifactId>services</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>at.tuwien</groupId>
             <artifactId>api</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal><!-- to make it exuteable with $ java -jar ./app.jar -->
-                        </goals>
-                    </execution>
-                </executions>
+                <configuration>
+                    <finalName>${project.parent.artifactId}-${project.version}</finalName>
+                    <mainClass>at.tuwien.application.FdaContainerManagingApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>
-
 </project>
\ No newline at end of file