aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2020-12-23 16:07:15 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2020-12-23 16:07:15 +0100
commitcd0699b3ea0849214b4c35869f9eca431d00790a (patch)
tree754696eeabfb1972eb92bb0854d224f316db7cb3
parent6b098e7070dedb5692325f6d330a20de696b9edc (diff)
downloadNational_eIDAS_Gateway-cd0699b3ea0849214b4c35869f9eca431d00790a.tar.gz
National_eIDAS_Gateway-cd0699b3ea0849214b4c35869f9eca431d00790a.tar.bz2
National_eIDAS_Gateway-cd0699b3ea0849214b4c35869f9eca431d00790a.zip
add build profiles to select Spring-Boot with or without embbeded Tomcat
-rw-r--r--connector/pom.xml37
1 files changed, 13 insertions, 24 deletions
diff --git a/connector/pom.xml b/connector/pom.xml
index 7fbc2a36..6d3cad33 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -33,12 +33,6 @@
<dependency>
<groupId>at.gv.egiz.eaaf</groupId>
<artifactId>eaaf_module_pvp2_idp</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>at.asitplus.eidas.ms_specific</groupId>
@@ -55,6 +49,16 @@
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
</dependency>
@@ -75,10 +79,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
@@ -133,18 +133,7 @@
<name>default</name>
</property>
</activation>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-tomcat</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
+ <dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -157,8 +146,8 @@
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </dependency>
<dependency>
<groupId>at.gv.egiz.eaaf</groupId>
<artifactId>eaaf-springboot-utils</artifactId>