diff --git a/fda-container-service/pom.xml b/fda-container-service/pom.xml
index 6d600a55b6620f1dbdbc8174aab52e8526a18d07..38a6c4ca2e9ecd6474ce2e31b07b90ae8ac12d6d 100644
--- a/fda-container-service/pom.xml
+++ b/fda-container-service/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.4.3</version>
+ <version>2.3.10.RELEASE</version>
</parent>
<groupId>at.tuwien</groupId>
@@ -24,7 +24,7 @@
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
- <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
+ <spring-cloud.version>3.0.1</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>
@@ -39,14 +39,8 @@
</dependency>
<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>
+ <artifactId>spring-cloud-starter-bootstrap</artifactId>
+ <version>${spring-cloud.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/fda-container-service/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java b/fda-container-service/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java
index cbd6fc6a5edd50ed3426fe6865fff6e57ca9c8ca..b00ea3d5c41cede395978ca06bc92c224c946cef 100644
--- a/fda-container-service/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java
+++ b/fda-container-service/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java
@@ -11,7 +11,7 @@ import springfox.documentation.oas.annotations.EnableOpenApi;
@EnableJpaAuditing
@EnableOpenApi
@EnableJpaRepositories(basePackages = {"at.tuwien.repository"})
-@EntityScan(basePackages = {"at.tuwien.entity"})
+@EntityScan(basePackages = {"at.tuwien.entities"})
public class FdaContainerManagingApplication {
public static void main(String[] args) {
diff --git a/fda-database-service/pom.xml b/fda-database-service/pom.xml
index 84975c35e0294a608535d6ad20f1d31ae6742963..51bd4696aba4dbb3f7c74014031d969a2f739ab6 100644
--- a/fda-database-service/pom.xml
+++ b/fda-database-service/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.4.3</version>
+ <version>2.3.10.RELEASE</version>
</parent>
<groupId>at.tuwien</groupId>
@@ -23,7 +23,7 @@
<properties>
<java.version>11</java.version>
- <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
+ <spring-cloud.version>3.0.1</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>
@@ -42,14 +42,8 @@
</dependency>
<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>
+ <artifactId>spring-cloud-starter-bootstrap</artifactId>
+ <version>${spring-cloud.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/fda-database-service/rest-service/src/main/java/at/tuwien/FdaDatabaseManagingApplication.java b/fda-database-service/rest-service/src/main/java/at/tuwien/FdaDatabaseManagingApplication.java
index 7b7c81eb4a86ada461c5fa9b8ea56ad09ef3bce2..5412e1ed617bbd3c1c96a0163adf0304866849ea 100644
--- a/fda-database-service/rest-service/src/main/java/at/tuwien/FdaDatabaseManagingApplication.java
+++ b/fda-database-service/rest-service/src/main/java/at/tuwien/FdaDatabaseManagingApplication.java
@@ -15,7 +15,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableOpenApi
@EnableTransactionManagement
@EnableJpaRepositories(basePackages = {"at.tuwien.repository"})
-@EntityScan(basePackages = {"at.tuwien.entity"})
+@EntityScan(basePackages = {"at.tuwien.entities"})
public class FdaDatabaseManagingApplication {
public static void main(String[] args) {
diff --git a/fda-discovery-server/pom.xml b/fda-discovery-server/pom.xml
index 8fae4a35fca1790a3b8bbf4c25224b961ea281e5..f2848f4d329c16747747e8fe06cf1d38d1e7690b 100644
--- a/fda-discovery-server/pom.xml
+++ b/fda-discovery-server/pom.xml
@@ -5,8 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.3.4.RELEASE</version>
- <relativePath/> <!-- lookup parent from repository -->
+ <version>2.3.10.RELEASE</version>
</parent>
<groupId>at.tuwien</groupId>
<artifactId>fda-discovery-server</artifactId>
@@ -16,50 +15,14 @@
<properties>
<java.version>11</java.version>
- <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
+ <spring-cloud.version>3.0.1</spring-cloud.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>${spring-cloud.version}</artifactId>
</dependency>
</dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-dependencies</artifactId>
- <version>${spring-cloud.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <finalName>${project.artifactId}-${project.version}</finalName>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/fda-gateway-service/pom.xml b/fda-gateway-service/pom.xml
index 8432ad081db2a049a39c8eaebc0d43e0caf25b16..fa3f712cc4b4ff2507fb2fe443a4d752b2a54c2c 100644
--- a/fda-gateway-service/pom.xml
+++ b/fda-gateway-service/pom.xml
@@ -5,8 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.3.4.RELEASE</version>
- <relativePath/> <!-- lookup parent from repository -->
+ <version>2.3.10.RELEASE</version>
</parent>
<groupId>at.tuwien</groupId>
<artifactId>fda-gateway-service</artifactId>
@@ -16,10 +15,11 @@
<properties>
<java.version>11</java.version>
- <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
+ <spring-cloud.version>3.0.1</spring-cloud.version>
</properties>
<dependencies>
+ <!-- Gate -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
@@ -34,12 +34,10 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+ <artifactId>spring-cloud-starter-bootstrap</artifactId>
+ <version>${spring-cloud.version}</version>
</dependency>
+ <!-- Swagger -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
@@ -50,6 +48,7 @@
<artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version>
</dependency>
+ <!-- Testing -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@@ -63,27 +62,4 @@
</dependency>
</dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-dependencies</artifactId>
- <version>${spring-cloud.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <finalName>${project.artifactId}-${project.version}</finalName>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/fda-query-service/pom.xml b/fda-query-service/pom.xml
index 6d22654e52c3b90b9627bb655cffed3f9b608f48..016e0e430b246b4e4dc4ea4289bc5d5a3d38e655 100644
--- a/fda-query-service/pom.xml
+++ b/fda-query-service/pom.xml
@@ -12,8 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.3.4.RELEASE</version>
- <relativePath/> <!-- lookup parent from repository -->
+ <version>2.3.10.RELEASE</version>
</parent>
<groupId>at.tuwien</groupId>
<artifactId>fda-query-service</artifactId>
@@ -23,7 +22,7 @@
<properties>
<java.version>11</java.version>
- <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
+ <spring-cloud.version>3.0.1</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>
@@ -36,33 +35,36 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
-
<dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-bootstrap</artifactId>
+ <version>${spring-cloud.version}</version>
</dependency>
+ <!-- Data Source -->
<dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
</dependency>
+ <!-- IDE -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
</dependency>
+ <!-- TODO: do we really need this? -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-dbcp</artifactId>
<version>9.0.33</version>
</dependency>
+ <!-- Testing -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
- <!-- exclude junit 4 -->
<exclusions>
<exclusion>
<groupId>org.junit.jupiter</groupId>
@@ -70,19 +72,23 @@
</exclusion>
</exclusions>
</dependency>
- <!-- junit 5 -->
<dependency>
<groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
-
+ <!-- Mapping -->
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
+ <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>
@@ -109,28 +115,5 @@
<artifactId>swagger-models</artifactId>
<version>${swagger.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>
</dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <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>
diff --git a/fda-query-service/rest-service/src/main/java/at/tuwien/FdaQueryServiceApplication.java b/fda-query-service/rest-service/src/main/java/at/tuwien/FdaQueryServiceApplication.java
index e4e86ad9ee11024b3275c386166b2053b8795513..857e6b34b27b2aee8a8330ea2201e5c403d24d3d 100644
--- a/fda-query-service/rest-service/src/main/java/at/tuwien/FdaQueryServiceApplication.java
+++ b/fda-query-service/rest-service/src/main/java/at/tuwien/FdaQueryServiceApplication.java
@@ -9,12 +9,12 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
import springfox.documentation.oas.annotations.EnableOpenApi;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
-@SpringBootApplication
+@EnableOpenApi
@EnableJpaAuditing
-@EntityScan(basePackages = "at.tuwien.entity")
+@SpringBootApplication
@EnableTransactionManagement
+@EntityScan(basePackages = "at.tuwien.entities")
@EnableJpaRepositories(basePackages = {"at.tuwien.repository"})
-@EnableOpenApi
public class FdaQueryServiceApplication {
public static void main(String[] args) {
@@ -22,3 +22,4 @@ public class FdaQueryServiceApplication {
}
}
+
diff --git a/fda-table-service/rest-service/src/main/java/at/tuwien/FdaTableServiceApplication.java b/fda-table-service/rest-service/src/main/java/at/tuwien/FdaTableServiceApplication.java
index a71156e831bc1acc28aff157d120ce06bc227f1f..c3c1fbfeb1830f28f0907db2800db52142d371fd 100644
--- a/fda-table-service/rest-service/src/main/java/at/tuwien/FdaTableServiceApplication.java
+++ b/fda-table-service/rest-service/src/main/java/at/tuwien/FdaTableServiceApplication.java
@@ -14,7 +14,7 @@ import springfox.documentation.oas.annotations.EnableOpenApi;
@EnableOpenApi
@EnableTransactionManagement
@EnableJpaRepositories(basePackages = {"at.tuwien.repository"})
-@EntityScan(basePackages = {"at.tuwien.entity"})
+@EntityScan(basePackages = {"at.tuwien.entities"})
public class FdaTableServiceApplication {
public static void main(String[] args) {