aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2018-07-18 14:42:16 +0200
committergjoranv <gv@oath.com>2018-07-18 16:58:32 +0200
commit3056ca2dcb1234dd4575818106d3eba2bbb760fc (patch)
tree6d87fc05ec6a22f072ab2656036c5bac9cf2d36e
parent110332d121490fd9794344d0406459d1d59e0295 (diff)
Use apache.httpcomponents 4.4.1
- Use separate version properties, as they have separate release cycles.
-rw-r--r--container-dependencies-enforcer/pom.xml4
-rw-r--r--container-dependency-versions/pom.xml6
2 files changed, 6 insertions, 4 deletions
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 9929f267c47..bad78ce4182 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -104,8 +104,8 @@
<include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include>
<include>org.apache.felix:org.apache.felix.log:[1.0.1]:jar:provided</include>
<include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include>
- <include>org.apache.httpcomponents:httpclient:[4.3.6]:jar:provided</include>
- <include>org.apache.httpcomponents:httpcore:[4.3.3]:jar:provided</include>
+ <include>org.apache.httpcomponents:httpclient:[${apache.httpclient.version}]:jar:provided</include>
+ <include>org.apache.httpcomponents:httpcore:[${apache.httpcore.version}]:jar:provided</include>
<include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided</include>
<include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided</include>
<include>org.eclipse.jetty:jetty-http:[${jetty.version}]:jar:provided</include>
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index 10ccf7a7161..2f12ceaa2d0 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -238,12 +238,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.4.1</version>
+ <version>${apache.httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.4.1</version>
+ <version>${apache.httpcore.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
@@ -452,6 +452,8 @@
</dependencyManagement>
<properties>
+ <apache.httpclient.version>4.4.1</apache.httpclient.version>
+ <apache.httpcore.version>4.4.1</apache.httpcore.version>
<bouncycastle.version>1.58</bouncycastle.version>
<felix.version>5.6.10</felix.version>
<findbugs.version>1.3.9</findbugs.version>