From 45a61e0cf59bcdd68835cb355492aa8d42ba32d7 Mon Sep 17 00:00:00 2001
From: Makhtar DIAGNE <makhtar.diagne@teamdlab.com>
Date: Thu, 28 May 2020 17:50:43 +0200
Subject: [PATCH] [TECH] Cas : fix war build with tomcat dependencies
---
cas/cas-server/pom.xml | 14 ++++++++++++++
cas/pom.xml | 3 ---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/cas/cas-server/pom.xml b/cas/cas-server/pom.xml
index 5452c039..1fbd6d1e 100644
--- a/cas/cas-server/pom.xml
+++ b/cas/cas-server/pom.xml
@@ -33,6 +33,20 @@
<dependency>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>iam-external-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.components</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Consul -->
diff --git a/cas/pom.xml b/cas/pom.xml
index 5c639015..c324ce1d 100644
--- a/cas/pom.xml
+++ b/cas/pom.xml
@@ -12,11 +12,8 @@
<properties>
<commons-io.version>2.6</commons-io.version>
<fongo.version>2.1.1</fongo.version>
- <java.version>1.8</java.version>
<jackson.version>2.8.10</jackson.version>
<junit.version>4.12</junit.version>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
<mockito.version>2.15.0</mockito.version>
<servlet-api.version>3.1.0</servlet-api.version>
</properties>
--
GitLab