From 48c0e417913e634f96ca06e03921ad5bf43a0725 Mon Sep 17 00:00:00 2001
From: Doha2012 <dohae243@gmail.com>
Date: Sun, 23 Apr 2017 22:10:56 +0200
Subject: [PATCH] fix commons-logging issue (#1714)

* 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

* minor fix

* minor fix

* minor fix

* cleanup generated files

* fix commons-logging issue
---
 cdi/pom.xml                 |  8 +-------
 mapstruct/pom.xml           |  8 +-------
 rest-assured/pom.xml        | 16 ++--------------
 spring-akka/pom.xml         |  8 +-------
 spring-hibernate3/pom.xml   |  8 +-------
 spring-integration/pom.xml  |  8 +-------
 spring-mvc-velocity/pom.xml |  8 +-------
 spring-spel/pom.xml         |  8 +-------
 8 files changed, 9 insertions(+), 63 deletions(-)

diff --git a/cdi/pom.xml b/cdi/pom.xml
index d2fcec59d7..e77e5d9a10 100644
--- a/cdi/pom.xml
+++ b/cdi/pom.xml
@@ -11,13 +11,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>            
+            <version>${spring.version}</version>         
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/mapstruct/pom.xml b/mapstruct/pom.xml
index 81bcdb4cb9..4ee6c1e822 100644
--- a/mapstruct/pom.xml
+++ b/mapstruct/pom.xml
@@ -31,13 +31,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>${springframework.version}</version>
-		            <exclusions>
-		                <exclusion>
-		                    <artifactId>commons-logging</artifactId>
-		                    <groupId>commons-logging</groupId>
-		                </exclusion>
-		            </exclusions>			
+			<version>${springframework.version}</version>		
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/rest-assured/pom.xml b/rest-assured/pom.xml
index 0c3bf38dc5..f96897852f 100644
--- a/rest-assured/pom.xml
+++ b/rest-assured/pom.xml
@@ -144,13 +144,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>
@@ -183,13 +177,7 @@
         <dependency>
             <groupId>com.github.fge</groupId>
             <artifactId>json-schema-core</artifactId>
-            <version>${json-schema-core.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>            
+            <version>${json-schema-core.version}</version>       
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/spring-akka/pom.xml b/spring-akka/pom.xml
index 497022064c..f73c6aeaa7 100644
--- a/spring-akka/pom.xml
+++ b/spring-akka/pom.xml
@@ -11,13 +11,7 @@
 
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>            
+            <artifactId>spring-context</artifactId>           
         </dependency>
 
         <dependency>
diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml
index c45c9bb15e..32ea394311 100644
--- a/spring-hibernate3/pom.xml
+++ b/spring-hibernate3/pom.xml
@@ -13,13 +13,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${org.springframework.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>            
+            <version>${org.springframework.version}</version>           
         </dependency>
 
         <!-- persistence -->
diff --git a/spring-integration/pom.xml b/spring-integration/pom.xml
index 34c40cb00f..9add0cc290 100644
--- a/spring-integration/pom.xml
+++ b/spring-integration/pom.xml
@@ -95,13 +95,7 @@
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-core</artifactId>
-            <version>${spring.integration.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>            
+            <version>${spring.integration.version}</version>         
         </dependency>
         <dependency>
             <groupId>javax.activation</groupId>
diff --git a/spring-mvc-velocity/pom.xml b/spring-mvc-velocity/pom.xml
index 51348acd4a..5bfedc9df6 100644
--- a/spring-mvc-velocity/pom.xml
+++ b/spring-mvc-velocity/pom.xml
@@ -25,13 +25,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>${org.springframework.version}</version>
-		            <exclusions>
-		                <exclusion>
-		                    <artifactId>commons-logging</artifactId>
-		                    <groupId>commons-logging</groupId>
-		                </exclusion>
-		            </exclusions>			
+			<version>${org.springframework.version}</version>	
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/spring-spel/pom.xml b/spring-spel/pom.xml
index 5bb8480715..6ebeb70bc5 100644
--- a/spring-spel/pom.xml
+++ b/spring-spel/pom.xml
@@ -30,13 +30,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${springframework.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>            
+            <version>${springframework.version}</version>          
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>