Merge remote-tracking branch 'origin/master'

Author: slavisa-baeldung

.gitignore

@@ -31,3 +31,5 @@ spring-openid/src/main/resources/application.properties
 .recommenders/
 /spring-hibernate4/nbproject/
 spring-security-openid/src/main/resources/application.properties
+
+spring-all/*.log

algorithms/README.md

@@ -5,3 +5,4 @@
 - [Ant Colony Optimization](http://www.baeldung.com/java-ant-colony-optimization)
 - [Validating Input With Finite Automata in Java](http://www.baeldung.com/finite-automata-java)
 - [Introduction to Jenetics Library](http://www.baeldung.com/jenetics)
+- [Check If a Number Is Prime in Java](http://www.baeldung.com/java-prime-numbers)

apache-cxf/cxf-aegis/src/test/java/com/baeldung/cxf/aegis/BaeldungTest.java

@@ -3,8 +3,10 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import org.junit.After;
 import org.junit.Test;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.lang.reflect.Type;
@@ -90,4 +92,12 @@ private CourseRepo unmarshalCourseRepo() throws Exception {
         xmlReader.close();
         return courseRepo;
     }
+
+    @After
+    public void cleanup(){
+        File testFile = new File(fileName);
+        if (testFile.exists()) {
+           testFile.delete();     
+        }
+    }
 }

apache-cxf/cxf-jaxrs-implementation/pom.xml

@@ -54,6 +54,12 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>${httpclient.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>

apache-cxf/cxf-spring/pom.xml

@@ -24,6 +24,12 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
             <version>${spring.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

apache-fop/pom.xml

@@ -28,11 +28,6 @@
             <version>${org.slf4j.version}</version>
             <!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
         </dependency>
-        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
 
         <!-- test scoped -->
 
@@ -78,6 +73,10 @@
                     <groupId>org.apache.avalon.framework</groupId>
                     <artifactId>avalon-framework-impl</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>                
             </exclusions>
         </dependency>
 
@@ -90,6 +89,12 @@
             <groupId>avalon-framework</groupId>
             <artifactId>avalon-framework-impl</artifactId>
             <version>${avalon-framework.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>            
         </dependency>
 
         <dependency>

apache-poi/pom.xml

@@ -42,6 +42,12 @@
             <groupId>org.jxls</groupId>
             <artifactId>jxls-jexcel</artifactId>
             <version>${jexcel.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>            
         </dependency>	
     </dependencies>
 </project>

apache-poi/src/test/java/com/baeldung/jexcel/JExcelTest.java

@@ -19,6 +19,7 @@
 
 import org.junit.Test;
 import org.junit.Before;
+import org.junit.After;
 
 public class JExcelTest {
 
@@ -53,4 +54,11 @@ public void whenParsingJExcelFile_thenCorrect() throws IOException, BiffExceptio
             .get(1));
     }
 
+    @After
+    public void cleanup(){
+        File testFile = new File(fileLocation);
+        if (testFile.exists()) {
+           testFile.delete();     
+        }
+    }
 }

apache-poi/src/test/java/com/baeldung/poi/excel/ExcelTest.java

@@ -16,6 +16,7 @@
 
 import org.junit.Test;
 import org.junit.Before;
+import org.junit.After;
 
 public class ExcelTest {
 
@@ -50,4 +51,11 @@ public void whenParsingPOIExcelFile_thenCorrect() throws IOException {
             .get(1));
     }
 
+    @After
+    public void cleanup(){
+        File testFile = new File(fileLocation);
+        if (testFile.exists()) {
+           testFile.delete();     
+        }
+    }
 }