From 261a1cbbec43b402cc5b8557254cbac871737159 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 27 May 2014 11:08:31 +0200
Subject: [PATCH] Integration test pom.xml fixes

---
 jOOQ-test/pom.xml                           | 13 ++++---------
 jOOQ-test/src/{test => main}/java/log4j.xml |  0
 2 files changed, 4 insertions(+), 9 deletions(-)
 rename jOOQ-test/src/{test => main}/java/log4j.xml (100%)

diff --git a/jOOQ-test/pom.xml b/jOOQ-test/pom.xml
index 87e2036442..944b34a8d0 100644
--- a/jOOQ-test/pom.xml
+++ b/jOOQ-test/pom.xml
@@ -81,12 +81,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>integration</artifactId>
-            <version>1.6.1</version>
+            <version>1.7.5</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -3511,7 +3506,7 @@
         
       
         xxxxxxxxx
-            xxxxxxxxxxxxxxxxxxxx
+            xxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxx
                 xxxxxxxxx
                     xxxxxxxx
@@ -3521,7 +3516,7 @@
         
                         xxxxxxxxxxxx
                             xxxxxxxxxxx
-                                xxxxxxxxxxxxxxxxxxxxx
+                                xxxxxxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                 xxxxxxx
                                     xxxxxxxxxxxxxxxxxxxxx
@@ -3531,7 +3526,7 @@
                                     xxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxx
-                                        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                                        xxxxxxxxxxxxxxxxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                                     xxxxxxx
diff --git a/jOOQ-test/src/test/java/log4j.xml b/jOOQ-test/src/main/java/log4j.xml
similarity index 100%
rename from jOOQ-test/src/test/java/log4j.xml
rename to jOOQ-test/src/main/java/log4j.xml