diff --git a/jOOQ-release/build.xml b/jOOQ-release/build.xml
index 2af8f3925c..215c354392 100644
--- a/jOOQ-release/build.xml
+++ b/jOOQ-release/build.xml
@@ -89,6 +89,7 @@
         <delete dir="${dir.release}/${version}"/>
 	</target>
 
+    <!-- [java-8] -->
 	<!-- [trial] -->
 	<target name="release-oss" description="Release a new version">
 		<property name="version" value="${version-prefix}"/>
@@ -107,11 +108,20 @@
         xxxxxxxx xxxxxxxxxxxxxxx
     xxxxxxxxx
     xxxx xxxxxxxx xxx
-	
+
     xxxxxxx xxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxx x xxx xxxxxxxxx
-    	xxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
-    	
-    	xxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
+        
+        xxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxx xxxxxxxxxxxxxxxxxxx
+        xxxxxxxx xxxxxxxxxxxxxxx
+    xxxxxxxxx
+    xxxx xxxxxxxxx xxx
+	
+    xxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxx x xxx xxxxxxxxx
+        xxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
+        
+        xxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
         xxxxxxxx xxxxxxxxxxxxxxxxxxx
         xxxxxxxx xxxxxxxxxxxxxxx
     xxxxxxxxx
diff --git a/pom.xml b/pom.xml
index 6915198fd5..776f8d7cc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,8 +195,8 @@
                     <maxmem>512m</maxmem>
                     <meminitial>256m</meminitial>
                     <encoding>UTF-8</encoding>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                     <debug>true</debug>
                     <debuglevel>lines,vars,source</debuglevel>
                     <!-- [#2413] Make compiler warnings a bit more visible
@@ -282,10 +282,11 @@
         <profile>
             <id>release-oss</id>
             <properties>
-                <classifier></classifier>
+                <java.version>1.8</java.version>
             </properties>
             <build>
                 <plugins>
+                    <!-- This is required by Maven Central -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
@@ -349,22 +350,10 @@
         </profile>
         
         <!-- [pro] xxx
-        xxxx 
-        xxxxxxxxx
-            xxxxxxxxxxxxxxxx
-            xxxxxxxxxxxx
-                xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-            xxxxxxxxxxxxx
-            xxxxxxxxxxxx
-                xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-            xxxxxxxxxxxxx
-        xxxxxxxxxx
-         xxx
-         
         xxxxxxxxx
             xxxxxxxxxxxxxxxxxxxxxx
             xxxxxxxxxxxx
-                xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxxxxxxxx
             xxxxxxx
                 xxxxxxxxx
@@ -397,9 +386,10 @@
         xxxxxxxxxx
         
         xxxxxxxxx
+            xxxx xxxx xxxx xxxxxxx xx xxxx xxxx xxx xxxxx xxxxxxxxxxxxxxxxxx xxxxxxx xxx
             xxxxxxxxxxxxxxxxxxxx
             xxxxxxxxxxxx
-                xxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxxxxxxxxxxx
             xxxxxxx
                 xxxxxxxxx
@@ -464,6 +454,58 @@
                 xxxxxxxxxx
             xxxxxxxx
         xxxxxxxxxx
+        
+        xxxxxxxxx
+            xxxx xxxx xxxx xxxxxxx xx xxxx xxxx xxx xxxxx xxxxxxxxxxx xxxxxxx xxx
+            xxxxxxxxxxxxxxxxxxxxxxxxxxx
+            xxxxxxxxxxxx
+                xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+            xxxxxxxxxxxxx
+            xxxxxxx
+                xxxxxxxxx
+                    xxxxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxxxx
+                        xxxxxxxxxxxx
+                            xxxxxxxxxxx
+                                xxxxxxxxxxxxxxxxxxxxxxx
+                                xxxxxxx
+                                    xxxxxxxxxxxxxxxx
+                                xxxxxxxx
+                            xxxxxxxxxxxx
+                        xxxxxxxxxxxxx
+                        xxxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxxxx
+                    xxxxxxxxx
+                    
+                    xxxxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxxxxxxxxxx
+                        xxxxxxxxxxxx
+                            xxxxxxxxxxx
+                                xxxxxxxxxxxxxxxxxxxxxxx
+                                xxxxxxxxxxxxxxxxxxxxxx
+                                xxxxxxx
+                                    xxxxxxxxxxxxxxxx
+                                xxxxxxxx
+                            xxxxxxxxxxxx
+                        xxxxxxxxxxxxx
+                        xxxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxxxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxxxxxxxxxx
+                            xxxxxxxxxxxxxxxxxxxxx
+                        xxxxxxxxxxxxxxxx
+                    xxxxxxxxx
+                xxxxxxxxxx
+            xxxxxxxx
+        xxxxxxxxxx
         xxxx [/pro] -->
     </profiles>
 </project>