Skip to content
Snippets Groups Projects
Commit ee152daf authored by Martin Weise's avatar Martin Weise
Browse files

using maven release version now for services, using junit 5 for testing,... 

using maven release version now for services, using junit 5 for testing, entities had naming issue in the application
parent f8c01900
No related branches found
No related tags found
1 merge request!23Sprint results
Show whitespace changes
Inline Side-by-side
Showing
with 51 additions and 140 deletions
fda-container-service/pom.xml
+ 4
− 10
View file @ ee152daf
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.3</version> <version>2.3.10.RELEASE</version>
</parent> </parent>
<groupId>at.tuwien</groupId> <groupId>at.tuwien</groupId>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<java.version>11</java.version> <java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <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> <mapstruct.version>1.4.2.Final</mapstruct.version>
<docker.version>3.2.7</docker.version> <docker.version>3.2.7</docker.version>
<testcontainers.version>1.15.2</testcontainers.version> <testcontainers.version>1.15.2</testcontainers.version>
...@@ -39,14 +39,8 @@ ...@@ -39,14 +39,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> <artifactId>spring-cloud-starter-bootstrap</artifactId>
<version>3.0.1</version> <version>${spring-cloud.version}</version>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
fda-container-service/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java
+ 1
− 1
View file @ ee152daf
...@@ -11,7 +11,7 @@ import springfox.documentation.oas.annotations.EnableOpenApi; ...@@ -11,7 +11,7 @@ import springfox.documentation.oas.annotations.EnableOpenApi;
@EnableJpaAuditing @EnableJpaAuditing
@EnableOpenApi @EnableOpenApi
@EnableJpaRepositories(basePackages = {"at.tuwien.repository"}) @EnableJpaRepositories(basePackages = {"at.tuwien.repository"})
@EntityScan(basePackages = {"at.tuwien.entity"}) @EntityScan(basePackages = {"at.tuwien.entities"})
public class FdaContainerManagingApplication { public class FdaContainerManagingApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
fda-database-service/pom.xml
+ 4
− 10
View file @ ee152daf
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.3</version> <version>2.3.10.RELEASE</version>
</parent> </parent>
<groupId>at.tuwien</groupId> <groupId>at.tuwien</groupId>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<properties> <properties>
<java.version>11</java.version> <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> <mapstruct.version>1.4.2.Final</mapstruct.version>
<docker.version>3.2.7</docker.version> <docker.version>3.2.7</docker.version>
<testcontainers.version>1.15.2</testcontainers.version> <testcontainers.version>1.15.2</testcontainers.version>
...@@ -42,14 +42,8 @@ ...@@ -42,14 +42,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> <artifactId>spring-cloud-starter-bootstrap</artifactId>
<version>3.0.1</version> <version>${spring-cloud.version}</version>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
fda-database-service/rest-service/src/main/java/at/tuwien/FdaDatabaseManagingApplication.java
+ 1
− 1
View file @ ee152daf
...@@ -15,7 +15,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; ...@@ -15,7 +15,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableOpenApi @EnableOpenApi
@EnableTransactionManagement @EnableTransactionManagement
@EnableJpaRepositories(basePackages = {"at.tuwien.repository"}) @EnableJpaRepositories(basePackages = {"at.tuwien.repository"})
@EntityScan(basePackages = {"at.tuwien.entity"}) @EntityScan(basePackages = {"at.tuwien.entities"})
public class FdaDatabaseManagingApplication { public class FdaDatabaseManagingApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
fda-discovery-server/pom.xml
+ 3
− 40
View file @ ee152daf
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.4.RELEASE</version> <version>2.3.10.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>at.tuwien</groupId> <groupId>at.tuwien</groupId>
<artifactId>fda-discovery-server</artifactId> <artifactId>fda-discovery-server</artifactId>
...@@ -16,50 +15,14 @@ ...@@ -16,50 +15,14 @@
<properties> <properties>
<java.version>11</java.version> <java.version>11</java.version>
<spring-cloud.version>Hoxton.SR8</spring-cloud.version> <spring-cloud.version>3.0.1</spring-cloud.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId> <artifactId>${spring-cloud.version}</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>
</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> </dependency>
</dependencies> </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> </project>
fda-gateway-service/pom.xml
+ 7
− 31
View file @ ee152daf
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.4.RELEASE</version> <version>2.3.10.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>at.tuwien</groupId> <groupId>at.tuwien</groupId>
<artifactId>fda-gateway-service</artifactId> <artifactId>fda-gateway-service</artifactId>
...@@ -16,10 +15,11 @@ ...@@ -16,10 +15,11 @@
<properties> <properties>
<java.version>11</java.version> <java.version>11</java.version>
<spring-cloud.version>Hoxton.SR8</spring-cloud.version> <spring-cloud.version>3.0.1</spring-cloud.version>
</properties> </properties>
<dependencies> <dependencies>
<!-- Gate -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
...@@ -34,12 +34,10 @@ ...@@ -34,12 +34,10 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId> <artifactId>spring-cloud-starter-bootstrap</artifactId>
</dependency> <version>${spring-cloud.version}</version>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency> </dependency>
<!-- Swagger -->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
...@@ -50,6 +48,7 @@ ...@@ -50,6 +48,7 @@
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version> <version>2.9.2</version>
</dependency> </dependency>
<!-- Testing -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
...@@ -63,27 +62,4 @@ ...@@ -63,27 +62,4 @@
</dependency> </dependency>
</dependencies> </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> </project>
fda-query-service/pom.xml
+ 26
− 43
View file @ ee152daf
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.4.RELEASE</version> <version>2.3.10.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>at.tuwien</groupId> <groupId>at.tuwien</groupId>
<artifactId>fda-query-service</artifactId> <artifactId>fda-query-service</artifactId>
...@@ -23,7 +22,7 @@ ...@@ -23,7 +22,7 @@
<properties> <properties>
<java.version>11</java.version> <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> <mapstruct.version>1.4.2.Final</mapstruct.version>
<docker.version>3.2.7</docker.version> <docker.version>3.2.7</docker.version>
<testcontainers.version>1.15.2</testcontainers.version> <testcontainers.version>1.15.2</testcontainers.version>
...@@ -36,33 +35,36 @@ ...@@ -36,33 +35,36 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>postgresql</artifactId> <artifactId>spring-cloud-starter-bootstrap</artifactId>
<version>${spring-cloud.version}</version>
</dependency> </dependency>
<!-- Data Source -->
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> <artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.postgresql</groupId>
<artifactId>lombok</artifactId> <artifactId>postgresql</artifactId>
</dependency> </dependency>
<!-- IDE -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.projectlombok</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<!-- TODO: do we really need this? -->
<dependency> <dependency>
<groupId>org.apache.tomcat</groupId> <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-dbcp</artifactId> <artifactId>tomcat-dbcp</artifactId>
<version>9.0.33</version> <version>9.0.33</version>
</dependency> </dependency>
<!-- Testing -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
<!-- exclude junit 4 -->
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
...@@ -70,19 +72,23 @@ ...@@ -70,19 +72,23 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- junit 5 -->
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- Mapping -->
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.mapstruct</groupId>
<artifactId>junit-jupiter-engine</artifactId> <artifactId>mapstruct-processor</artifactId>
<scope>test</scope> <version>${mapstruct.version}</version>
<optional>true</optional><!-- IntelliJ -->
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>${mapstruct.version}</version>
</dependency> </dependency>
<!-- Swagger --> <!-- Swagger -->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
...@@ -109,28 +115,5 @@ ...@@ -109,28 +115,5 @@
<artifactId>swagger-models</artifactId> <artifactId>swagger-models</artifactId>
<version>${swagger.version}</version> <version>${swagger.version}</version>
</dependency> </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> </dependencies>
</dependencyManagement>
</project> </project>
fda-query-service/rest-service/src/main/java/at/tuwien/FdaQueryServiceApplication.java
+ 4
− 3
View file @ ee152daf
...@@ -9,12 +9,12 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; ...@@ -9,12 +9,12 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
import springfox.documentation.oas.annotations.EnableOpenApi; import springfox.documentation.oas.annotations.EnableOpenApi;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
@SpringBootApplication @EnableOpenApi
@EnableJpaAuditing @EnableJpaAuditing
@EntityScan(basePackages = "at.tuwien.entity") @SpringBootApplication
@EnableTransactionManagement @EnableTransactionManagement
@EntityScan(basePackages = "at.tuwien.entities")
@EnableJpaRepositories(basePackages = {"at.tuwien.repository"}) @EnableJpaRepositories(basePackages = {"at.tuwien.repository"})
@EnableOpenApi
public class FdaQueryServiceApplication { public class FdaQueryServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
...@@ -22,3 +22,4 @@ public class FdaQueryServiceApplication { ...@@ -22,3 +22,4 @@ public class FdaQueryServiceApplication {
} }
} }
fda-table-service/rest-service/src/main/java/at/tuwien/FdaTableServiceApplication.java
+ 1
− 1
View file @ ee152daf
...@@ -14,7 +14,7 @@ import springfox.documentation.oas.annotations.EnableOpenApi; ...@@ -14,7 +14,7 @@ import springfox.documentation.oas.annotations.EnableOpenApi;
@EnableOpenApi @EnableOpenApi
@EnableTransactionManagement @EnableTransactionManagement
@EnableJpaRepositories(basePackages = {"at.tuwien.repository"}) @EnableJpaRepositories(basePackages = {"at.tuwien.repository"})
@EntityScan(basePackages = {"at.tuwien.entity"}) @EntityScan(basePackages = {"at.tuwien.entities"})
public class FdaTableServiceApplication { public class FdaTableServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment