From 63bf41b9b61517f4875fc591e0a335c4b6899ae5 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Fri, 20 Jun 2014 11:48:58 +0200
Subject: [PATCH] Release 3.4.0

---
 .../.settings/org.eclipse.core.resources.prefs     |  1 -
 .../.settings/org.eclipse.core.resources.prefs     |  1 -
 jOOQ-test/src/main/java/log4j.xml                  | 14 --------------
 jOOQ/.settings/org.eclipse.core.resources.prefs    |  1 -
 pom.xml                                            |  6 ++++++
 5 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 jOOQ-test/src/main/java/log4j.xml

diff --git a/jOOQ-meta/.settings/org.eclipse.core.resources.prefs b/jOOQ-meta/.settings/org.eclipse.core.resources.prefs
index 74bee3fd6d..abdea9ac03 100644
--- a/jOOQ-meta/.settings/org.eclipse.core.resources.prefs
+++ b/jOOQ-meta/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,4 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//target/generated-sources/xjc=UTF-8
 encoding/<project>=UTF-8
diff --git a/jOOQ-test/.settings/org.eclipse.core.resources.prefs b/jOOQ-test/.settings/org.eclipse.core.resources.prefs
index a37cfca45c..615f0773a6 100644
--- a/jOOQ-test/.settings/org.eclipse.core.resources.prefs
+++ b/jOOQ-test/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,4 @@
 eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding//target/generated-sources/xjc=UTF-8
diff --git a/jOOQ-test/src/main/java/log4j.xml b/jOOQ-test/src/main/java/log4j.xml
deleted file mode 100644
index 617678bd22..0000000000
--- a/jOOQ-test/src/main/java/log4j.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" >
-<log4j:configuration>
-	<appender name="stdout" class="org.apache.log4j.ConsoleAppender">
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d{ABSOLUTE} %5p [%-50c{4}] - %m%n" />
-		</layout>
-	</appender>
-
-	<root>
-		<priority value="debug" />
-		<appender-ref ref="stdout" />
-	</root>
-</log4j:configuration>
\ No newline at end of file
diff --git a/jOOQ/.settings/org.eclipse.core.resources.prefs b/jOOQ/.settings/org.eclipse.core.resources.prefs
index a37cfca45c..839d647eef 100644
--- a/jOOQ/.settings/org.eclipse.core.resources.prefs
+++ b/jOOQ/.settings/org.eclipse.core.resources.prefs
@@ -2,5 +2,4 @@ eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
-encoding//target/generated-sources/xjc=UTF-8
 encoding/<project>=UTF-8
diff --git a/pom.xml b/pom.xml
index 6dcb8f2ff5..14210ccb9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -356,6 +356,9 @@
                             xxxxxxxxxxxxxxxxxxxxxxxxxx
                             xxxxxxxxxxxxxxxxxxxxxx
                             xxxxxxxxxxxxxxxxxxxxx
+                            
+                            xxxx xxxxx xxxxxxx xxxx xxxx xxx xxxx xxxxxxxxxxx xxxxxxx xxxxxx xxx
+                            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxx
                     xxxxxxxxx
                 xxxxxxxxxx
@@ -419,6 +422,9 @@
                                 xxxxxxxxx
                             xxx
                             xxxxxxxxx
+                            
+                            xxxx xxxxx xxxxxxx xxxx xxxx xxx xxxx xxxxxxxxxxx xxxxxxx xxxxxx xxx
+                            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                         xxxxxxxxxxxxxxxx
                     xxxxxxxxx
                 xxxxxxxxxx