From 79b0820f6b01a6fbae4e8e3fdfe8cb2b0704dd7a Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 13 Apr 2014 16:03:38 +0200
Subject: [PATCH 1/2] declare direct dependency to httpclient to fix version
 conflict

---
 scm-webapp/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 9064b4c571..f782dbd173 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -191,6 +191,14 @@
       <version>${guava.version}</version>
     </dependency>
     
+    <!-- fix version conflict -->
+    
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.2.6</version>
+    </dependency>
+    
     <!-- template engine -->
 
     <dependency>

From afe6ebddcde05fc37bebbbe9623be2cbd49eefd8 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 15 Apr 2014 07:46:28 +0200
Subject: [PATCH 2/2] close branch issue-558