From e503dcb6352dfa9a1b75af1850a82a9fb51be82a Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 15 Oct 2018 09:34:07 +0200
Subject: [PATCH] fix on httpcomponents library upgrade
---
annotation/pom.xml | 2 +-
pom.xml | 3 ++-
service/pom.xml | 5 -----
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/annotation/pom.xml b/annotation/pom.xml
index 290d4bb71c..aded5d09b3 100644
--- a/annotation/pom.xml
+++ b/annotation/pom.xml
@@ -185,7 +185,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>${apache.httpcomponents.version}</version>
+ <version>${apache.httpcomponents-core.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index e2323345d3..8da511d429 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,8 @@
<miriam-lib.version>1.1.6</miriam-lib.version>
<apache.httpcomponents.version>4.5.6</apache.httpcomponents.version>
+ <apache.httpcomponents-core.version>4.4.10</apache.httpcomponents-core.version>
+ <apache.poi.version>3.16</apache.poi.version>
<springframework.version>4.2.2.RELEASE</springframework.version>
<springframework.security.version>4.0.3.RELEASE</springframework.security.version>
@@ -52,7 +54,6 @@
<apache.commons-lang3.version>3.1</apache.commons-lang3.version>
- <apache.poi.version>3.12</apache.poi.version>
<commons-io.version>2.4</commons-io.version>
<commons-cli.version>1.2</commons-cli.version>
diff --git a/service/pom.xml b/service/pom.xml
index 72f58ccaf0..7f6e82680b 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -115,11 +115,6 @@
<artifactId>poi</artifactId>
<version>${apache.poi.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>${apache.poi.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
--
GitLab