From 0be7de2c42e7f1fd61119ed67f5a762081251d44 Mon Sep 17 00:00:00 2001
From: Doha2012 <dohae243@gmail.com>
Date: Sun, 14 May 2017 21:55:47 +0200
Subject: [PATCH] minor fix (#1847)

* 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

* add parent to pom

* cleanup parent dependencies

* cleanup pom

* cleanup pom

* add missing parent

* fix logging issue
---
 drools/pom.xml                         | 31 ++++++++------------------
 ejb/pom.xml                            | 15 +++++--------
 spring-all/pom.xml                     |  6 -----
 spring-cloud/spring-cloud-rest/pom.xml |  6 +++++
 4 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/drools/pom.xml b/drools/pom.xml
index 908a82df56..b352044fb8 100644
--- a/drools/pom.xml
+++ b/drools/pom.xml
@@ -7,13 +7,19 @@
     <groupId>com.baeldung</groupId>
     <artifactId>drools</artifactId>
     <version>1.0.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
         <http-component-version>4.4.6</http-component-version>
         <drools-version>7.0.0.CR1</drools-version>
         <apache-poi-version>3.13</apache-poi-version>
-        <surefire-plugin-version>2.19.1</surefire-plugin-version>
-        <junit-version>4.11</junit-version>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -53,12 +59,7 @@
             <artifactId>poi-ooxml</artifactId>
             <version>${apache-poi-version}</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
@@ -66,19 +67,5 @@
         </dependency>
 
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire-plugin-version}</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
 </project>
\ No newline at end of file
diff --git a/ejb/pom.xml b/ejb/pom.xml
index bfcc972417..9495020266 100755
--- a/ejb/pom.xml
+++ b/ejb/pom.xml
@@ -9,6 +9,12 @@
     <name>ejb</name>
     <description>EJB Tutorial</description>
 
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
     <repositories>
         <repository>
             <id>jboss-public-repository-group</id>
@@ -55,15 +61,6 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.1</version>
-                    <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
-                    </configuration>
-                </plugin>
-
                 <plugin>
                     <artifactId>maven-ejb-plugin</artifactId>
                     <version>2.4</version>
diff --git a/spring-all/pom.xml b/spring-all/pom.xml
index 5464437e3b..4379a4281f 100644
--- a/spring-all/pom.xml
+++ b/spring-all/pom.xml
@@ -26,12 +26,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/spring-cloud/spring-cloud-rest/pom.xml b/spring-cloud/spring-cloud-rest/pom.xml
index c2b8fcad32..d0e9999ef6 100644
--- a/spring-cloud/spring-cloud-rest/pom.xml
+++ b/spring-cloud/spring-cloud-rest/pom.xml
@@ -17,6 +17,12 @@
 
     <name>spring-cloud-rest</name>
 
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>      
+      
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>