diff --git a/jOOQ-codegen-maven/.classpath b/jOOQ-codegen-maven/.classpath
index 46188e1fa1..934f3282ad 100644
--- a/jOOQ-codegen-maven/.classpath
+++ b/jOOQ-codegen-maven/.classpath
@@ -18,12 +18,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/jOOQ-codegen/.classpath b/jOOQ-codegen/.classpath
index bbc6e3f1b1..7588058c2f 100644
--- a/jOOQ-codegen/.classpath
+++ b/jOOQ-codegen/.classpath
@@ -18,12 +18,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/jOOQ-examples/jOOQ-flyway-example/.classpath b/jOOQ-examples/jOOQ-flyway-example/.classpath
new file mode 100644
index 0000000000..c50542cecf
--- /dev/null
+++ b/jOOQ-examples/jOOQ-flyway-example/.classpath
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/jOOQ-examples/jOOQ-flyway-example/.gitignore b/jOOQ-examples/jOOQ-flyway-example/.gitignore
new file mode 100644
index 0000000000..0fd7a02083
--- /dev/null
+++ b/jOOQ-examples/jOOQ-flyway-example/.gitignore
@@ -0,0 +1,2 @@
+/target
+/jooq-flyway-example.iml
diff --git a/jOOQ-examples/jOOQ-flyway-example/.project b/jOOQ-examples/jOOQ-flyway-example/.project
new file mode 100644
index 0000000000..60978d75f8
--- /dev/null
+++ b/jOOQ-examples/jOOQ-flyway-example/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jOOQ-flyway-example</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.core.resources.prefs b/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.core.resources.prefs
index 2b2ebf894c..839d647eef 100644
--- a/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.core.resources.prefs
+++ b/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8
diff --git a/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.jdt.core.prefs b/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.jdt.core.prefs
index 0b7d1d1a31..319c4a7c4f 100644
--- a/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.jdt.core.prefs
+++ b/jOOQ-examples/jOOQ-flyway-example/.settings/org.eclipse.jdt.core.prefs
@@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.4
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=48
diff --git a/jOOQ-examples/jOOQ-flyway-example/jooq-flyway-example.iml b/jOOQ-examples/jOOQ-flyway-example/jooq-flyway-example.iml
index 3d5d7b4cd5..898deccd54 100644
--- a/jOOQ-examples/jOOQ-flyway-example/jooq-flyway-example.iml
+++ b/jOOQ-examples/jOOQ-flyway-example/jooq-flyway-example.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -10,34 +10,18 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
       <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="jooq" />
-    <orderEntry type="module" module-name="jooq-meta" />
-    <orderEntry type="module" module-name="jooq-codegen" />
-    <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.4" level="project" />
     <orderEntry type="library" name="Maven: com.h2database:h2:1.4.177" level="project" />
-    <orderEntry type="library" name="Maven: org.flywaydb:flyway-core:3.0" level="project" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.5" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:3.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:3.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:3.2.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.2.6.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:3.2.6.RELEASE" level="project" />
   </component>
 </module>
 
diff --git a/jOOQ-examples/jOOQ-flyway-example/pom.xml b/jOOQ-examples/jOOQ-flyway-example/pom.xml
index 7cd38bd0cc..ddf833a231 100644
--- a/jOOQ-examples/jOOQ-flyway-example/pom.xml
+++ b/jOOQ-examples/jOOQ-flyway-example/pom.xml
@@ -34,31 +34,11 @@
             <artifactId>jooq</artifactId>
             <version>${org.jooq.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.jooq</groupId>
-            <artifactId>jooq-meta</artifactId>
-            <version>${org.jooq.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jooq</groupId>
-            <artifactId>jooq-codegen</artifactId>
-            <version>${org.jooq.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
-            <version>1.4</version>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <version>1.4.177</version>
         </dependency>
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
-            <version>3.0</version>
-        </dependency>
 
         <!-- Logging -->
         <dependency>
@@ -72,57 +52,17 @@
             <version>1.7.5</version>
         </dependency>
 
-        <!-- Spring (transitive dependencies are not listed explicitly) -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${org.springframework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <version>${org.springframework.version}</version>
-        </dependency>
-
         <!-- Testing -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.11</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${org.springframework.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <fork>true</fork>
-                    <maxmem>1024m</maxmem>
-                    <meminitial>256m</meminitial>
-                    <encoding>UTF-8</encoding>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <debug>true</debug>
-                    <debuglevel>lines,vars,source</debuglevel>
-                    <!-- [#2413] Make compiler warnings a bit more visible
-                         But don't fail (yet) -->
-                    <compilerArgs>
-                        <arg>-Xlint:varargs</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.flywaydb</groupId>
                 <artifactId>flyway-maven-plugin</artifactId>
@@ -165,9 +105,7 @@
                             <generator>
                                 <name>org.jooq.util.DefaultGenerator</name>
                                 <database>
-                                    <name>org.jooq.util.h2.H2Database</name>
                                     <includes>.*</includes>
-                                    <excludes></excludes>
                                     <inputSchema>FLYWAY_TEST</inputSchema>
                                 </database>
                                 <target>
@@ -178,13 +116,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.h2database</groupId>
-                        <artifactId>h2</artifactId>
-                        <version>1.4.177</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/jOOQ-examples/jOOQ-spring-example/.classpath b/jOOQ-examples/jOOQ-spring-example/.classpath
index b68034cc95..cf9f912f5b 100644
--- a/jOOQ-examples/jOOQ-spring-example/.classpath
+++ b/jOOQ-examples/jOOQ-spring-example/.classpath
@@ -19,12 +19,12 @@
 	</classpathentry>
 	<classpathentry kind="src" path="target/generated-sources/jooq-h2"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.core.resources.prefs b/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.core.resources.prefs
index 2b2ebf894c..839d647eef 100644
--- a/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.core.resources.prefs
+++ b/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8
diff --git a/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.jdt.core.prefs b/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.jdt.core.prefs
index 0b7d1d1a31..319c4a7c4f 100644
--- a/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.jdt.core.prefs
+++ b/jOOQ-examples/jOOQ-spring-example/.settings/org.eclipse.jdt.core.prefs
@@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.4
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=48
diff --git a/jOOQ-examples/jOOQ-spring-guice-example/.classpath b/jOOQ-examples/jOOQ-spring-guice-example/.classpath
index c8559af74a..18954d4efd 100644
--- a/jOOQ-examples/jOOQ-spring-guice-example/.classpath
+++ b/jOOQ-examples/jOOQ-spring-guice-example/.classpath
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" output="target/classes" path="src/main/java">
-        <attributes>
-            <attribute name="optional" value="true"/>
-            <attribute name="maven.pomderived" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-        <attributes>
-            <attribute name="maven.pomderived" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry kind="src" output="target/test-classes" path="src/test/java">
-        <attributes>
-            <attribute name="optional" value="true"/>
-            <attribute name="maven.pomderived" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry kind="src" path="target/generated-sources/jooq-h2"/>
-    <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-        <attributes>
-            <attribute name="maven.pomderived" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-        <attributes>
-            <attribute name="maven.pomderived" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/jooq-h2"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.core.resources.prefs b/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.core.resources.prefs
index 2b2ebf894c..839d647eef 100644
--- a/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.core.resources.prefs
+++ b/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8
diff --git a/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.jdt.core.prefs b/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.jdt.core.prefs
index e6f968da5e..d834c80a20 100644
--- a/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.jdt.core.prefs
+++ b/jOOQ-examples/jOOQ-spring-guice-example/.settings/org.eclipse.jdt.core.prefs
@@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.5
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=48
diff --git a/jOOQ-meta/.classpath b/jOOQ-meta/.classpath
index 04b89bbf53..e184d1ebe0 100644
--- a/jOOQ-meta/.classpath
+++ b/jOOQ-meta/.classpath
@@ -24,12 +24,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/jOOQ-scala/.classpath b/jOOQ-scala/.classpath
index 0b70e55cb9..1fbc07cddc 100644
--- a/jOOQ-scala/.classpath
+++ b/jOOQ-scala/.classpath
@@ -6,23 +6,23 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/scala">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
 	<classpathentry kind="src" path="target/generated-test-sources/jooq-h2"/>
 	<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
 	<classpathentry exported="true" kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/jOOQ-scala/.settings/org.eclipse.core.resources.prefs b/jOOQ-scala/.settings/org.eclipse.core.resources.prefs
index f6afad94cf..4860d68ee1 100644
--- a/jOOQ-scala/.settings/org.eclipse.core.resources.prefs
+++ b/jOOQ-scala/.settings/org.eclipse.core.resources.prefs
@@ -3,5 +3,6 @@ encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/main/scala=UTF-8
 encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
 encoding//src/test/scala=UTF-8
 encoding/<project>=UTF-8
diff --git a/jOOQ-test-utils/.settings/org.eclipse.jdt.core.prefs b/jOOQ-test-utils/.settings/org.eclipse.jdt.core.prefs
index 0b7d1d1a31..5779150c69 100644
--- a/jOOQ-test-utils/.settings/org.eclipse.jdt.core.prefs
+++ b/jOOQ-test-utils/.settings/org.eclipse.jdt.core.prefs
@@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=48
diff --git a/jOOQ-test/.classpath b/jOOQ-test/.classpath
index 342804ef9e..bc93b7f389 100644
--- a/jOOQ-test/.classpath
+++ b/jOOQ-test/.classpath
@@ -6,20 +6,20 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/jOOQ-test/.settings/org.eclipse.core.resources.prefs b/jOOQ-test/.settings/org.eclipse.core.resources.prefs
index a37cfca45c..5240b69c1b 100644
--- a/jOOQ-test/.settings/org.eclipse.core.resources.prefs
+++ b/jOOQ-test/.settings/org.eclipse.core.resources.prefs
@@ -2,5 +2,6 @@ eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
 encoding//target/generated-sources/xjc=UTF-8
 encoding/<project>=UTF-8
diff --git a/jOOQ-test/.settings/org.eclipse.jdt.core.prefs b/jOOQ-test/.settings/org.eclipse.jdt.core.prefs
index 0b7d1d1a31..319c4a7c4f 100644
--- a/jOOQ-test/.settings/org.eclipse.jdt.core.prefs
+++ b/jOOQ-test/.settings/org.eclipse.jdt.core.prefs
@@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.4
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=48
diff --git a/jOOQ-test/launch/ASETest.launch b/jOOQ-test/launch/ASETest.launch
index 19971557e1..2f5f6fd958 100644
--- a/jOOQ-test/launch/ASETest.launch
+++ b/jOOQ-test/launch/ASETest.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.ASETest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=ase -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/AccessTest.launch b/jOOQ-test/launch/AccessTest.launch
index 32ca9ac72b..09702038b1 100644
--- a/jOOQ-test/launch/AccessTest.launch
+++ b/jOOQ-test/launch/AccessTest.launch
@@ -24,5 +24,6 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_45 (32 bit)"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.AccessTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=access -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/CUBRIDTest.launch b/jOOQ-test/launch/CUBRIDTest.launch
index 8ca0a16679..26ab39de81 100644
--- a/jOOQ-test/launch/CUBRIDTest.launch
+++ b/jOOQ-test/launch/CUBRIDTest.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.CUBRIDTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=cubrid -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/DB2Test.launch b/jOOQ-test/launch/DB2Test.launch
index a38240f62e..b2b2a3b41b 100644
--- a/jOOQ-test/launch/DB2Test.launch
+++ b/jOOQ-test/launch/DB2Test.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.DB2Test"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=db2 -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/DerbyTest.launch b/jOOQ-test/launch/DerbyTest.launch
index 8958f64acc..97a3e86c6f 100644
--- a/jOOQ-test/launch/DerbyTest.launch
+++ b/jOOQ-test/launch/DerbyTest.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.DerbyTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=derby -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/FirebirdTest.launch b/jOOQ-test/launch/FirebirdTest.launch
index 5df2ccc7b8..f2fd87c3f4 100644
--- a/jOOQ-test/launch/FirebirdTest.launch
+++ b/jOOQ-test/launch/FirebirdTest.launch
@@ -23,6 +23,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.FirebirdTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=firebird -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 <stringAttribute key="yk-options" value="&#13;&#10;use-64-bit=true&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/H2Test.launch b/jOOQ-test/launch/H2Test.launch
index 1dbaf1a3b1..02cd319219 100644
--- a/jOOQ-test/launch/H2Test.launch
+++ b/jOOQ-test/launch/H2Test.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.H2Test"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=h2 -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/HSQLDBTest (Oracle schema, renderSchema=false).launch b/jOOQ-test/launch/HSQLDBTest (Oracle schema, renderSchema=false).launch
index 03cefa06f9..4884ba15b4 100644
--- a/jOOQ-test/launch/HSQLDBTest (Oracle schema, renderSchema=false).launch	
+++ b/jOOQ-test/launch/HSQLDBTest (Oracle schema, renderSchema=false).launch	
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.HSQLDBTest2"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=hsqldb -XX:+UnlockCommercialFeatures -XX:+FlightRecorder -Dorg.jooq.settings.renderSchema"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/HSQLDBTest.launch b/jOOQ-test/launch/HSQLDBTest.launch
index 57c3dab658..e4a580700b 100644
--- a/jOOQ-test/launch/HSQLDBTest.launch
+++ b/jOOQ-test/launch/HSQLDBTest.launch
@@ -23,6 +23,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.HSQLDBTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=hsqldb -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 <stringAttribute key="yk-options" value="&#13;&#10;use-64-bit=true&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/IngresTest.launch b/jOOQ-test/launch/IngresTest.launch
index 73a582459e..4cbc869fdf 100644
--- a/jOOQ-test/launch/IngresTest.launch
+++ b/jOOQ-test/launch/IngresTest.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.IngresTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=ingres -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/MariaDBTest.launch b/jOOQ-test/launch/MariaDBTest.launch
index c8d67b11ac..f145b79d1a 100644
--- a/jOOQ-test/launch/MariaDBTest.launch
+++ b/jOOQ-test/launch/MariaDBTest.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.MariaDBTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=mariadb -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/MySQLTest (schema mapping).launch b/jOOQ-test/launch/MySQLTest (schema mapping).launch
index f9ba424eb8..2cd78bd836 100644
--- a/jOOQ-test/launch/MySQLTest (schema mapping).launch	
+++ b/jOOQ-test/launch/MySQLTest (schema mapping).launch	
@@ -24,5 +24,6 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.MySQLTestSchemaMapping"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_Torg.jooq.test.MySQLTestSchemaMappingOQMySQLTestSchemaMapping" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=mysql -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/MySQLTest (schema rewrite).launch b/jOOQ-test/launch/MySQLTest (schema rewrite).launch
index b87e987082..8a28fa7ba1 100644
--- a/jOOQ-test/launch/MySQLTest (schema rewrite).launch	
+++ b/jOOQ-test/launch/MySQLTest (schema rewrite).launch	
@@ -24,5 +24,6 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.MySQLTestSchemaRewrite"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_Torg.jooq.test.MySQLTestSchemaMappingOQMySQLTestSchemaMapping" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.configuration=/org/jooq/configuration/${env_var:USERNAME}/mysql/library-schema-rewrite.xml"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/MySQLTest.launch b/jOOQ-test/launch/MySQLTest.launch
index bda82af174..4a2d376f06 100644
--- a/jOOQ-test/launch/MySQLTest.launch
+++ b/jOOQ-test/launch/MySQLTest.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.MySQLTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=mysql -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/OracleTest (11g).launch b/jOOQ-test/launch/OracleTest (11g).launch
index 82ff90e71c..5bc48aca4f 100644
--- a/jOOQ-test/launch/OracleTest (11g).launch	
+++ b/jOOQ-test/launch/OracleTest (11g).launch	
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.OracleTest11g"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=oracle -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/OracleTest (No bind variables).launch b/jOOQ-test/launch/OracleTest (No bind variables).launch
index 514c506dc9..4ea78a8f39 100644
--- a/jOOQ-test/launch/OracleTest (No bind variables).launch	
+++ b/jOOQ-test/launch/OracleTest (No bind variables).launch	
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.OracleTestInline"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=oracle -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/OracleTest (default schema).launch b/jOOQ-test/launch/OracleTest (default schema).launch
index 1288d27149..297f645560 100644
--- a/jOOQ-test/launch/OracleTest (default schema).launch	
+++ b/jOOQ-test/launch/OracleTest (default schema).launch	
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.OracleTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=oracle -XX:+UnlockCommercialFeatures -XX:+FlightRecorder -Dorg.jooq.settings.defaultSchema=TEST"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/OracleTest.launch b/jOOQ-test/launch/OracleTest.launch
index 8d385591a5..a3f6496926 100644
--- a/jOOQ-test/launch/OracleTest.launch
+++ b/jOOQ-test/launch/OracleTest.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.OracleTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=oracle -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/PostgresTest.launch b/jOOQ-test/launch/PostgresTest.launch
index 30f2760cb6..b0525a7abc 100644
--- a/jOOQ-test/launch/PostgresTest.launch
+++ b/jOOQ-test/launch/PostgresTest.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.PostgresTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=postgres -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/SQLServer2008Test.launch b/jOOQ-test/launch/SQLServer2008Test.launch
index 088eb976be..049e0b129a 100644
--- a/jOOQ-test/launch/SQLServer2008Test.launch
+++ b/jOOQ-test/launch/SQLServer2008Test.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.SQLServer2008Test"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=sqlserver -XX:+UnlockCommercialFeatures -XX:+FlightRecorder&#13;&#10;-Djava.library.path=C:\sqljdbc_4.0\enu\auth\x64"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/SQLServerTest (No bind variables).launch b/jOOQ-test/launch/SQLServerTest (No bind variables).launch
index d60dcceef0..590b3208b6 100644
--- a/jOOQ-test/launch/SQLServerTest (No bind variables).launch	
+++ b/jOOQ-test/launch/SQLServerTest (No bind variables).launch	
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.SQLServerTestInline"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=sqlserver -XX:+UnlockCommercialFeatures -XX:+FlightRecorder&#13;&#10;-Djava.library.path=C:\sqljdbc_4.0\enu\auth\x64"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/SQLServerTest (jTDS).launch b/jOOQ-test/launch/SQLServerTest (jTDS).launch
index a439a7db76..b40e0d550d 100644
--- a/jOOQ-test/launch/SQLServerTest (jTDS).launch	
+++ b/jOOQ-test/launch/SQLServerTest (jTDS).launch	
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.SQLServerTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.configuration=/org/jooq/configuration/${env_var:USERNAME}/sqlserver/library-jtds.xml&#13;&#10;-Djava.library.path=C:\jtds-1.3.1-dist\x64\SSO"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/SQLServerTest.launch b/jOOQ-test/launch/SQLServerTest.launch
index a0c396f5b3..9613db2ad1 100644
--- a/jOOQ-test/launch/SQLServerTest.launch
+++ b/jOOQ-test/launch/SQLServerTest.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.SQLServerTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=sqlserver -XX:+UnlockCommercialFeatures -XX:+FlightRecorder&#13;&#10;-Djava.library.path=C:\sqljdbc_4.0\enu\auth\x64"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/SQLiteTest.launch b/jOOQ-test/launch/SQLiteTest.launch
index 753ceb4bfd..c53efae52e 100644
--- a/jOOQ-test/launch/SQLiteTest.launch
+++ b/jOOQ-test/launch/SQLiteTest.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.SQLiteTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=sqlite -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/SybaseTest.launch b/jOOQ-test/launch/SybaseTest.launch
index 42310274de..cb823b4e01 100644
--- a/jOOQ-test/launch/SybaseTest.launch
+++ b/jOOQ-test/launch/SybaseTest.launch
@@ -23,5 +23,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.SybaseTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.test-dialects=sybase -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"/>
 </launchConfiguration>
diff --git a/jOOQ/.classpath b/jOOQ/.classpath
index f3ae25e969..6379e614e4 100644
--- a/jOOQ/.classpath
+++ b/jOOQ/.classpath
@@ -23,14 +23,14 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
 	<classpathentry exported="true" kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/jOOQ/.settings/org.eclipse.core.resources.prefs b/jOOQ/.settings/org.eclipse.core.resources.prefs
index a37cfca45c..5240b69c1b 100644
--- a/jOOQ/.settings/org.eclipse.core.resources.prefs
+++ b/jOOQ/.settings/org.eclipse.core.resources.prefs
@@ -2,5 +2,6 @@ eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
 encoding//target/generated-sources/xjc=UTF-8
 encoding/<project>=UTF-8
diff --git a/pom.xml b/pom.xml
index e44145850f..4b38acfa45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,14 +159,14 @@
         <module>jOOQ-meta</module>
         <module>jOOQ-scala</module>
 
-        <!-- 
+        <!--
         These modules have a Java 8 dependency, which is currently not suitable for Travis-CI
+         -->
         <module>jOOQ-examples/jOOQ-spring-example</module>
         <module>jOOQ-examples/jOOQ-spring-guice-example</module>
 
         <module>jOOQ-test-utils</module>
         <module>jOOQ-test</module>
-         -->
     </modules>
 
     <dependencyManagement>