From 2d1379a46af670069427f1f18c6486e4a37df187 Mon Sep 17 00:00:00 2001
From: Doha2012 <dohae243@gmail.com>
Date: Wed, 19 Apr 2017 20:37:34 +0200
Subject: [PATCH] fix dependency issues (#1691)

* upgrade to spring boot 1.5.2

* add full update to REST API

* modify ratings controller

* upgrade herold

* fix integration test

* fix integration test

* minor fix

* fix integration test

* fix integration test

* minor cleanup

* minor cleanup

* remove log4j properties

* use standard logbook.xml

* remove log4j dependencies

* remove commons-logging

* merge

* fix conflict

* exclude commons-logging dependency

* cleanup

* minor fix

* minor fix

* fix dependency issues

* Revert "fix dependency issues"

This reverts commit 83bf1f9fd2e1a9a55f9cacb085669568b06b49ec.

* fix dependency issues
---
 libraries/pom.xml            | 8 +-------
 log4j2/pom.xml               | 8 +-------
 spring-state-machine/pom.xml | 8 +-------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/libraries/pom.xml b/libraries/pom.xml
index ba16995d8f..c0c2321388 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -136,13 +136,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>               
+            <version>${httpclient.version}</version>        
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/log4j2/pom.xml b/log4j2/pom.xml
index 1267caeb08..c348982bcf 100644
--- a/log4j2/pom.xml
+++ b/log4j2/pom.xml
@@ -43,13 +43,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-dbcp2</artifactId>
-			<version>${commons-dbcp2.version}</version>
-		            <exclusions>
-		                <exclusion>
-		                    <artifactId>commons-logging</artifactId>
-		                    <groupId>commons-logging</groupId>
-		                </exclusion>
-		            </exclusions>			
+			<version>${commons-dbcp2.version}</version>		
 		</dependency>
 
 		<!-- This is used for testing only. -->
diff --git a/spring-state-machine/pom.xml b/spring-state-machine/pom.xml
index d7e7027023..9dcb51fe4e 100644
--- a/spring-state-machine/pom.xml
+++ b/spring-state-machine/pom.xml
@@ -24,13 +24,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>4.3.7.RELEASE</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>            
+            <version>4.3.7.RELEASE</version>        
         </dependency>
         <dependency>
             <groupId>junit</groupId>