This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git
The following commit(s) were added to refs/heads/master by this push:
new bc8465c [OLINGO-1352] Versions clean up
bc8465c is described below
commit bc8465cb59be1c43bf9943fd348815ec10da4177
Author: mibo <[email protected]>
AuthorDate: Wed May 1 06:32:45 2019 +0200
[OLINGO-1352] Versions clean up
---
lib/client-core/pom.xml | 39 ++++++++++++++++++++++++++++++++-------
lib/server-core/pom.xml | 16 ++++++++++------
pom.xml | 9 ++++-----
3 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/lib/client-core/pom.xml b/lib/client-core/pom.xml
index bf20fa5..a902f12 100644
--- a/lib/client-core/pom.xml
+++ b/lib/client-core/pom.xml
@@ -45,12 +45,32 @@
<artifactId>odata-commons-core</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
@@ -58,7 +78,7 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
</dependency>
@@ -66,22 +86,27 @@
<groupId>com.fasterxml</groupId>
<artifactId>aalto-xml</artifactId>
</dependency>
-
+
+ <!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml
index 8815b32..0ef3558 100644
--- a/lib/server-core/pom.xml
+++ b/lib/server-core/pom.xml
@@ -51,6 +51,10 @@
<version>2.5</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -61,17 +65,17 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
- <version>4.1.16.Final</version>
</dependency>
+
<!-- Test dependencies -->
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
diff --git a/pom.xml b/pom.xml
index f318757..849b0ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,9 +66,9 @@
</modules>
<properties>
- <commons.codec.version>1.9</commons.codec.version>
- <commons.io.version>2.4</commons.io.version>
- <commons.lang3.version>3.3.2</commons.lang3.version>
+ <commons.codec.version>1.12</commons.codec.version>
+ <commons.io.version>2.6</commons.io.version>
+ <commons.lang3.version>3.9</commons.lang3.version>
<commons.logging.version>1.2</commons.logging.version>
<commons.vfs.version>2.0</commons.vfs.version>
@@ -82,8 +82,7 @@
<maven.plugin.api.version>3.2.2</maven.plugin.api.version>
<maven.plugin.tools.version>3.3</maven.plugin.tools.version>
<maven.bundle.plugin.version>2.5.3</maven.bundle.plugin.version>
- <hc.client.version>4.2.6</hc.client.version>
- <hc.core.version>4.2.5</hc.core.version>
+ <hc.client.version>4.5.8</hc.client.version>
<jackson.version>2.9.8</jackson.version>
<aalto-xml.version>0.9.10</aalto-xml.version>
