You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/11/14 13:52:11 UTC

[karaf-cave] branch master updated: Make sure the deployer service uses the base defined httpclient version

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-cave.git


The following commit(s) were added to refs/heads/master by this push:
     new e9ca1aa  Make sure the deployer service uses the base defined httpclient version
     new 96d1ee7  Merge pull request #29 from coheigea/httpclient
e9ca1aa is described below

commit e9ca1aa1cab9f809319c739fb210212ec5b0b5d1
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Nov 13 11:25:31 2019 +0000

    Make sure the deployer service uses the base defined httpclient version
---
 deployer/service/pom.xml | 6 +++---
 pom.xml                  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/deployer/service/pom.xml b/deployer/service/pom.xml
index 8c7e6db..a442511 100644
--- a/deployer/service/pom.xml
+++ b/deployer/service/pom.xml
@@ -148,7 +148,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore-osgi</artifactId>
-            <version>4.2.5</version>
+            <version>${httpcore.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -159,7 +159,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient-osgi</artifactId>
-            <version>4.2.5</version>
+            <version>${httpclient.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -356,4 +356,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 45c57f3b..7a69606 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
     <properties>
         <commons-io.version>2.6</commons-io.version>
         <cxf.version>3.3.2</cxf.version>
+        <httpcore.version>4.4.12</httpcore.version>
         <httpclient.version>4.5.10</httpclient.version>
         <jackson.version>2.10.0</jackson.version>
         <jsoup.version>1.12.1</jsoup.version>