diff --git a/jOOQ-codegen-maven-example/pom.xml b/jOOQ-codegen-maven-example/pom.xml
index e0931e4f97..731b2af04f 100644
--- a/jOOQ-codegen-maven-example/pom.xml
+++ b/jOOQ-codegen-maven-example/pom.xml
@@ -9,7 +9,7 @@
 
 	<groupId>org.jooq</groupId>
 	<artifactId>jooq-codegen-maven-example</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.1</version>
 	<packaging>jar</packaging>
 
 	<name>jOOQ Codegen Maven</name>
@@ -51,7 +51,7 @@
 		<dependency>
 			<groupId>org.jooq</groupId>
 			<artifactId>jooq</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.3.1</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -106,7 +106,7 @@
 			<plugin>
 				<groupId>org.jooq</groupId>
 				<artifactId>jooq-codegen-maven</artifactId>
-				<version>2.3.1-SNAPSHOT</version>
+				<version>2.3.1</version>
 				<executions>
 					<execution>
 						<id>exec1</id>
diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml
index 831d815807..5ba9cd6a52 100644
--- a/jOOQ-codegen-maven/pom.xml
+++ b/jOOQ-codegen-maven/pom.xml
@@ -1,173 +1,173 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<artifactId>oss-parent</artifactId>
-		<groupId>org.sonatype.oss</groupId>
-		<version>7</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	
-	<groupId>org.jooq</groupId>
-	<artifactId>jooq-codegen-maven</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
-	<packaging>maven-plugin</packaging>
-	
-	<name>jOOQ Codegen Maven</name>
-	<description>jOOQ effectively combines complex SQL, typesafety, source code generation, active records, stored procedures, advanced data types, and Java in a fluent, intuitive DSL.</description>
-	<url>http://www.jooq.org</url>
-
-
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>http://www.jooq.org/inc/LICENSE.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-
-	<scm>
-		<developerConnection>scm:svn:https://jooq.svn.sourceforge.net/svnroot/jooq</developerConnection>
-		<url>https://jooq.svn.sourceforge.net/svnroot/jooq</url>
-		<connection>scm:svn:https://jooq.svn.sourceforge.net/svnroot/jooq</connection>
-	</scm>
-
-	<issueManagement>
-		<system>Trac</system>
-		<url>https://sourceforge.net/apps/trac/jooq/report/6</url>
-	</issueManagement>
-	
-	<developers>
-		<developer>
-			<name>Lukas Eder</name>
-			<email>lukas.eder@gmail.com</email>
-		</developer>
-		<developer>
-			<name>Sander Plas</name>
-			<email>sander.plas@gmail.com</email>
-		</developer>
-	</developers>
-	
-	<build>
-		<defaultGoal>deploy</defaultGoal>
-		<finalName>${project.artifactId}-${project.version}</finalName>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-gpg-plugin</artifactId>
-				<version>1.1</version>
-				<executions>
-					<execution>
-						<id>sign-artifacts</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<fork>true</fork>
-					<maxmem>512m</maxmem>
-					<meminitial>256m</meminitial>
-					<encoding>UTF-8</encoding>
-					<source>1.6</source>
-					<target>1.6</target>
-					<debug>true</debug>
-					<debuglevel>lines,vars,source</debuglevel>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<inherited>true</inherited>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>2.1.2</version>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-
-				<configuration>
-					<excludeResources>true</excludeResources>
-					<useDefaultExcludes>true</useDefaultExcludes>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<inherited>true</inherited>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.7</version>
-				<executions>
-					<execution>
-						<id>bundle-sources</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<maxmemory>512</maxmemory>
-					<encoding>UTF-8</encoding>
-					<show>protected</show>
-					<notree>true</notree>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.5</version>
-				<configuration>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <downloadSources>true</downloadSources>
-                </configuration>
-            </plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-plugin-api</artifactId>
-			<version>2.2.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jooq</groupId>
-			<artifactId>jooq-codegen</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
-			<type>jar</type>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-project</artifactId>
-			<version>2.2.1</version>
-			<type>jar</type>
-		</dependency>
-	</dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>oss-parent</artifactId>
+		<groupId>org.sonatype.oss</groupId>
+		<version>7</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	
+	<groupId>org.jooq</groupId>
+	<artifactId>jooq-codegen-maven</artifactId>
+	<version>2.3.1</version>
+	<packaging>maven-plugin</packaging>
+	
+	<name>jOOQ Codegen Maven</name>
+	<description>jOOQ effectively combines complex SQL, typesafety, source code generation, active records, stored procedures, advanced data types, and Java in a fluent, intuitive DSL.</description>
+	<url>http://www.jooq.org</url>
+
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>http://www.jooq.org/inc/LICENSE.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<scm>
+		<developerConnection>scm:svn:https://jooq.svn.sourceforge.net/svnroot/jooq</developerConnection>
+		<url>https://jooq.svn.sourceforge.net/svnroot/jooq</url>
+		<connection>scm:svn:https://jooq.svn.sourceforge.net/svnroot/jooq</connection>
+	</scm>
+
+	<issueManagement>
+		<system>Trac</system>
+		<url>https://sourceforge.net/apps/trac/jooq/report/6</url>
+	</issueManagement>
+	
+	<developers>
+		<developer>
+			<name>Lukas Eder</name>
+			<email>lukas.eder@gmail.com</email>
+		</developer>
+		<developer>
+			<name>Sander Plas</name>
+			<email>sander.plas@gmail.com</email>
+		</developer>
+	</developers>
+	
+	<build>
+		<defaultGoal>deploy</defaultGoal>
+		<finalName>${project.artifactId}-${project.version}</finalName>
+
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-gpg-plugin</artifactId>
+				<version>1.1</version>
+				<executions>
+					<execution>
+						<id>sign-artifacts</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>sign</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
+				<configuration>
+					<fork>true</fork>
+					<maxmem>512m</maxmem>
+					<meminitial>256m</meminitial>
+					<encoding>UTF-8</encoding>
+					<source>1.6</source>
+					<target>1.6</target>
+					<debug>true</debug>
+					<debuglevel>lines,vars,source</debuglevel>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<inherited>true</inherited>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.1.2</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+
+				<configuration>
+					<excludeResources>true</excludeResources>
+					<useDefaultExcludes>true</useDefaultExcludes>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<inherited>true</inherited>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.7</version>
+				<executions>
+					<execution>
+						<id>bundle-sources</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<maxmemory>512</maxmemory>
+					<encoding>UTF-8</encoding>
+					<show>protected</show>
+					<notree>true</notree>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.5</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-eclipse-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <downloadSources>true</downloadSources>
+                </configuration>
+            </plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-plugin-api</artifactId>
+			<version>2.2.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jooq</groupId>
+			<artifactId>jooq-codegen</artifactId>
+			<version>2.3.1</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-project</artifactId>
+			<version>2.2.1</version>
+			<type>jar</type>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml
index 617ae04bb6..19a7289d9a 100644
--- a/jOOQ-codegen/pom.xml
+++ b/jOOQ-codegen/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.jooq</groupId>
 	<artifactId>jooq-codegen</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.1</version>
 	<packaging>jar</packaging>
 
 	<name>jOOQ Codegen</name>
@@ -147,17 +147,17 @@
 	</developers>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.jooq</groupId>
-			<artifactId>jooq</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+		<dependency>
+			<groupId>org.jooq</groupId>
+			<artifactId>jooq</artifactId>
+			<version>2.3.1</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jooq</groupId>
 			<artifactId>jooq-meta</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.3.1</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/jOOQ-console/pom.xml b/jOOQ-console/pom.xml
index 8a9174a651..09cc54448e 100644
--- a/jOOQ-console/pom.xml
+++ b/jOOQ-console/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-console</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.3.1</version>
     <packaging>jar</packaging>
 
     <name>jOOQ</name>
@@ -201,7 +201,7 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>2.3.1-SNAPSHOT</version>
+            <version>2.3.1</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml
index e7007492ae..d4ddace240 100644
--- a/jOOQ-meta/pom.xml
+++ b/jOOQ-meta/pom.xml
@@ -9,7 +9,7 @@
 
 	<groupId>org.jooq</groupId>
 	<artifactId>jooq-meta</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.1</version>
 	<packaging>jar</packaging>
 
 	<name>jOOQ Meta</name>
@@ -198,7 +198,7 @@
 		<dependency>
 			<groupId>org.jooq</groupId>
 			<artifactId>jooq</artifactId>
-			<version>2.3.1-SNAPSHOT</version>
+			<version>2.3.1</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/jOOQ-release/build.xml b/jOOQ-release/build.xml
index da9b7409d9..cb501c6f24 100644
--- a/jOOQ-release/build.xml
+++ b/jOOQ-release/build.xml
@@ -1,79 +1,79 @@
-<?xml version="1.0"?>
-<project name="jOOQ-release" basedir="." default="release">
-	<property name="dir.workspace" value="${basedir}/.." />
-	<property name="dir.target" value="${basedir}/target" />
-	<property name="dir.release" value="${basedir}/release" />
-	<property name="version" value="2.3.0"/>
-
-	<!-- Run a full mvn clean package install deploy first before this -->
-	<target name="release" description="Release a new version">
-		<mkdir dir="${dir.release}/versions" />
-		<mkdir dir="${dir.release}/${version}" />
-		<mkdir dir="${dir.release}/${version}/lib" />
-		<mkdir dir="${dir.release}/${version}/src" />
-
-		<copy todir="${dir.release}/${version}/lib" file="${dir.workspace}/jOOQ/target/jooq-${version}.jar"/>
-		<copy todir="${dir.release}/${version}/lib" file="${dir.workspace}/jOOQ-meta/target/jooq-meta-${version}.jar"/>
-		<copy todir="${dir.release}/${version}/lib" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version}.jar"/>
-		<copy todir="${dir.release}/${version}/lib" file="${dir.workspace}/jOOQ-console/target/jooq-console-${version}.jar"/>
-
-		<copy todir="${dir.release}/${version}/src" file="${dir.workspace}/jOOQ/target/jooq-${version}-sources.jar"/>
-		<copy todir="${dir.release}/${version}/src" file="${dir.workspace}/jOOQ-meta/target/jooq-meta-${version}-sources.jar"/>
-		<copy todir="${dir.release}/${version}/src" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version}-sources.jar"/>
-		<copy todir="${dir.release}/${version}/src" file="${dir.workspace}/jOOQ-console/target/jooq-console-${version}-sources.jar"/>
-
-		<copy todir="${dir.release}/${version}/javadoc" file="${dir.workspace}/jOOQ/target/jooq-${version}-javadoc.jar"/>
-		<copy todir="${dir.release}/${version}/javadoc" file="${dir.workspace}/jOOQ-meta/target/jooq-meta-${version}-javadoc.jar"/>
-		<copy todir="${dir.release}/${version}/javadoc" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version}-javadoc.jar"/>
-		<copy todir="${dir.release}/${version}/javadoc" file="${dir.workspace}/jOOQ-console/target/jooq-console-${version}-javadoc.jar"/>
-
-		<copy todir="${dir.release}/${version}">
-			<fileset dir="${dir.release}/template">
-				<include name="**/*"/>
-			</fileset>
-		</copy>
-
-		<mkdir dir="${dir.release}/${version}/third-party/lib" />
-		<mkdir dir="${dir.release}/${version}/third-party/src" />
-
-		<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\org\slf4j\slf4j-api\1.6.1\slf4j-api-1.6.1.jar"/>
-		<copy todir="${dir.release}/${version}/third-party/src" file="C:\Users\lukas\.m2\repository\org\slf4j\slf4j-api\1.6.1\slf4j-api-1.6.1-sources.jar"/>
-
-		<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\log4j\log4j\1.2.16\log4j-1.2.16.jar"/>
-		<copy todir="${dir.release}/${version}/third-party/src" file="C:\Users\lukas\.m2\repository\log4j\log4j\1.2.16\log4j-1.2.16-sources.jar"/>
-
-		<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\javax\persistence\persistence-api\1.0\persistence-api-1.0.jar"/>
-		<copy todir="${dir.release}/${version}/third-party/src" file="C:\Users\lukas\.m2\repository\javax\persistence\persistence-api\1.0\persistence-api-1.0-sources.jar"/>
-
-		<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\com\fifesoft\rsyntaxtextarea\2.0.2\rsyntaxtextarea-2.0.2.jar"/>
-		<copy todir="${dir.release}/${version}/third-party/src" file="C:\Users\lukas\.m2\repository\com\fifesoft\rsyntaxtextarea\2.0.2\rsyntaxtextarea-2.0.2-sources.jar"/>
-
- 		<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\org\apache\ant\ant\1.8.2\ant-1.8.2.jar"/>
-
-		<!-- Include jooq.jar and rsyntaxtextarea.jar binaries in jooq-console.jar -->
-		<unzip dest="${dir.release}/${version}/third-party/src/unzipped" src="${dir.workspace}/jOOQ/target/jooq-${version}.jar"/>
-		<unzip dest="${dir.release}/${version}/third-party/src/unzipped" src="${dir.release}/${version}/third-party/lib/rsyntaxtextarea-2.0.2.jar"/>
-
-
-		<jar update="true" destfile="${dir.release}/${version}/lib/jooq-console-${version}.jar">
-			<fileset dir="${dir.release}/${version}/third-party/src/unzipped">
-				<include name="org/**"/>
-			</fileset>
-		</jar>
-
-		<delete dir="${dir.release}/${version}/third-party/src/unzipped"/>
-		<!-- Include rsyntaxtextarea.jar binaries in jooq-console.jar -->
-
-		<zip destfile="${dir.release}/versions/jOOQ-${version}-full.zip">
-			<fileset dir="${dir.release}/${version}"/>
-		</zip>
-		<zip destfile="${dir.release}/versions/jOOQ-${version}-binaries-only.zip">
-			<fileset dir="${dir.release}/${version}">
-				<include name="*.txt"/>
-				<include name="lib/**"/>
-			</fileset>
-		</zip>
-
-		<delete dir="${dir.release}/${version}"/>
-	</target>
+<?xml version="1.0"?>
+<project name="jOOQ-release" basedir="." default="release">
+	<property name="dir.workspace" value="${basedir}/.." />
+	<property name="dir.target" value="${basedir}/target" />
+	<property name="dir.release" value="${basedir}/release" />
+	<property name="version" value="2.3.1"/>
+
+	<!-- Run a full mvn clean package install deploy first before this -->
+	<target name="release" description="Release a new version">
+		<mkdir dir="${dir.release}/versions" />
+		<mkdir dir="${dir.release}/${version}" />
+		<mkdir dir="${dir.release}/${version}/lib" />
+		<mkdir dir="${dir.release}/${version}/src" />
+
+		<copy todir="${dir.release}/${version}/lib" file="${dir.workspace}/jOOQ/target/jooq-${version}.jar"/>
+		<copy todir="${dir.release}/${version}/lib" file="${dir.workspace}/jOOQ-meta/target/jooq-meta-${version}.jar"/>
+		<copy todir="${dir.release}/${version}/lib" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version}.jar"/>
+		<copy todir="${dir.release}/${version}/lib" file="${dir.workspace}/jOOQ-console/target/jooq-console-${version}.jar"/>
+
+		<copy todir="${dir.release}/${version}/src" file="${dir.workspace}/jOOQ/target/jooq-${version}-sources.jar"/>
+		<copy todir="${dir.release}/${version}/src" file="${dir.workspace}/jOOQ-meta/target/jooq-meta-${version}-sources.jar"/>
+		<copy todir="${dir.release}/${version}/src" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version}-sources.jar"/>
+		<copy todir="${dir.release}/${version}/src" file="${dir.workspace}/jOOQ-console/target/jooq-console-${version}-sources.jar"/>
+
+		<copy todir="${dir.release}/${version}/javadoc" file="${dir.workspace}/jOOQ/target/jooq-${version}-javadoc.jar"/>
+		<copy todir="${dir.release}/${version}/javadoc" file="${dir.workspace}/jOOQ-meta/target/jooq-meta-${version}-javadoc.jar"/>
+		<copy todir="${dir.release}/${version}/javadoc" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version}-javadoc.jar"/>
+		<copy todir="${dir.release}/${version}/javadoc" file="${dir.workspace}/jOOQ-console/target/jooq-console-${version}-javadoc.jar"/>
+
+		<copy todir="${dir.release}/${version}">
+			<fileset dir="${dir.release}/template">
+				<include name="**/*"/>
+			</fileset>
+		</copy>
+
+		<mkdir dir="${dir.release}/${version}/third-party/lib" />
+		<mkdir dir="${dir.release}/${version}/third-party/src" />
+
+		<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\org\slf4j\slf4j-api\1.6.1\slf4j-api-1.6.1.jar"/>
+		<copy todir="${dir.release}/${version}/third-party/src" file="C:\Users\lukas\.m2\repository\org\slf4j\slf4j-api\1.6.1\slf4j-api-1.6.1-sources.jar"/>
+
+		<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\log4j\log4j\1.2.16\log4j-1.2.16.jar"/>
+		<copy todir="${dir.release}/${version}/third-party/src" file="C:\Users\lukas\.m2\repository\log4j\log4j\1.2.16\log4j-1.2.16-sources.jar"/>
+
+		<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\javax\persistence\persistence-api\1.0\persistence-api-1.0.jar"/>
+		<copy todir="${dir.release}/${version}/third-party/src" file="C:\Users\lukas\.m2\repository\javax\persistence\persistence-api\1.0\persistence-api-1.0-sources.jar"/>
+
+		<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\com\fifesoft\rsyntaxtextarea\2.0.2\rsyntaxtextarea-2.0.2.jar"/>
+		<copy todir="${dir.release}/${version}/third-party/src" file="C:\Users\lukas\.m2\repository\com\fifesoft\rsyntaxtextarea\2.0.2\rsyntaxtextarea-2.0.2-sources.jar"/>
+
+ 		<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\org\apache\ant\ant\1.8.2\ant-1.8.2.jar"/>
+
+		<!-- Include jooq.jar and rsyntaxtextarea.jar binaries in jooq-console.jar -->
+		<unzip dest="${dir.release}/${version}/third-party/src/unzipped" src="${dir.workspace}/jOOQ/target/jooq-${version}.jar"/>
+		<unzip dest="${dir.release}/${version}/third-party/src/unzipped" src="${dir.release}/${version}/third-party/lib/rsyntaxtextarea-2.0.2.jar"/>
+
+
+		<jar update="true" destfile="${dir.release}/${version}/lib/jooq-console-${version}.jar">
+			<fileset dir="${dir.release}/${version}/third-party/src/unzipped">
+				<include name="org/**"/>
+			</fileset>
+		</jar>
+
+		<delete dir="${dir.release}/${version}/third-party/src/unzipped"/>
+		<!-- Include rsyntaxtextarea.jar binaries in jooq-console.jar -->
+
+		<zip destfile="${dir.release}/versions/jOOQ-${version}-full.zip">
+			<fileset dir="${dir.release}/${version}"/>
+		</zip>
+		<zip destfile="${dir.release}/versions/jOOQ-${version}-binaries-only.zip">
+			<fileset dir="${dir.release}/${version}">
+				<include name="*.txt"/>
+				<include name="lib/**"/>
+			</fileset>
+		</zip>
+
+		<delete dir="${dir.release}/${version}"/>
+	</target>
 </project>
\ No newline at end of file
diff --git a/jOOQ-release/release/template/RELEASENOTES.txt b/jOOQ-release/release/template/RELEASENOTES.txt
index 94ae18ae0a..0ae18a0785 100644
--- a/jOOQ-release/release/template/RELEASENOTES.txt
+++ b/jOOQ-release/release/template/RELEASENOTES.txt
@@ -10,6 +10,26 @@ http://www.jooq.org/notes.php
 For a text version, see
 http://www.jooq.org/inc/RELEASENOTES.txt
 
+Version 2.3.1 - May 11, 2012
+=================================================================
+This is an important patch release fixing some regressions in the
+code generator for the Postgres dialect. With 2.3.0, it was no
+longer possible to generate schemata of which the database user
+was not the owner.
+
+Bug fixes
+---------
+#1334 - Fix inaccurate simulation of TRUNC(number, decimals) for
+        Derby
+#1403 - Documentation bug: ctx.statement() can be replaced in
+        executeStart(). This is not documented
+#1406 - Compilation errors in generated source code when Postgres
+        stored procedure parameter is called "NAME"
+#1407 - Compilation errors in generated source code when Postgres
+        data-type is "any" (with quotes!)
+#1409 - Postgres code generation broken when not connecting with
+        the owner of a schema
+
 Version 2.3.0 - May 6, 2012
 =================================================================
 
diff --git a/jOOQ-website/frame.php b/jOOQ-website/frame.php
index fb7862adcd..30dcb1a648 100644
--- a/jOOQ-website/frame.php
+++ b/jOOQ-website/frame.php
@@ -1,6 +1,6 @@
 <?php
   $root = "";
-  $version = "2.3.0";
+  $version = "2.3.1";
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
diff --git a/jOOQ-website/inc/RELEASENOTES-2.3.txt b/jOOQ-website/inc/RELEASENOTES-2.3.txt
index 94ae18ae0a..0ae18a0785 100644
--- a/jOOQ-website/inc/RELEASENOTES-2.3.txt
+++ b/jOOQ-website/inc/RELEASENOTES-2.3.txt
@@ -10,6 +10,26 @@ http://www.jooq.org/notes.php
 For a text version, see
 http://www.jooq.org/inc/RELEASENOTES.txt
 
+Version 2.3.1 - May 11, 2012
+=================================================================
+This is an important patch release fixing some regressions in the
+code generator for the Postgres dialect. With 2.3.0, it was no
+longer possible to generate schemata of which the database user
+was not the owner.
+
+Bug fixes
+---------
+#1334 - Fix inaccurate simulation of TRUNC(number, decimals) for
+        Derby
+#1403 - Documentation bug: ctx.statement() can be replaced in
+        executeStart(). This is not documented
+#1406 - Compilation errors in generated source code when Postgres
+        stored procedure parameter is called "NAME"
+#1407 - Compilation errors in generated source code when Postgres
+        data-type is "any" (with quotes!)
+#1409 - Postgres code generation broken when not connecting with
+        the owner of a schema
+
 Version 2.3.0 - May 6, 2012
 =================================================================
 
diff --git a/jOOQ-website/inc/RELEASENOTES.txt b/jOOQ-website/inc/RELEASENOTES.txt
index 94ae18ae0a..0ae18a0785 100644
--- a/jOOQ-website/inc/RELEASENOTES.txt
+++ b/jOOQ-website/inc/RELEASENOTES.txt
@@ -10,6 +10,26 @@ http://www.jooq.org/notes.php
 For a text version, see
 http://www.jooq.org/inc/RELEASENOTES.txt
 
+Version 2.3.1 - May 11, 2012
+=================================================================
+This is an important patch release fixing some regressions in the
+code generator for the Postgres dialect. With 2.3.0, it was no
+longer possible to generate schemata of which the database user
+was not the owner.
+
+Bug fixes
+---------
+#1334 - Fix inaccurate simulation of TRUNC(number, decimals) for
+        Derby
+#1403 - Documentation bug: ctx.statement() can be replaced in
+        executeStart(). This is not documented
+#1406 - Compilation errors in generated source code when Postgres
+        stored procedure parameter is called "NAME"
+#1407 - Compilation errors in generated source code when Postgres
+        data-type is "any" (with quotes!)
+#1409 - Postgres code generation broken when not connecting with
+        the owner of a schema
+
 Version 2.3.0 - May 6, 2012
 =================================================================
 
diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml
index 63f3673e6c..bcf3cc20b8 100644
--- a/jOOQ/pom.xml
+++ b/jOOQ/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.jooq</groupId>
 	<artifactId>jooq</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.3.1</version>
 	<packaging>jar</packaging>
 
 	<name>jOOQ</name>
diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java
index 070a518bbc..9050f816f7 100644
--- a/jOOQ/src/main/java/org/jooq/Constants.java
+++ b/jOOQ/src/main/java/org/jooq/Constants.java
@@ -45,7 +45,7 @@ public final class Constants {
     /**
      * The latest jOOQ version
      */
-    public static final String VERSION = "2.3.1-SNAPSHOT";
+    public static final String VERSION = "2.3.1";
 
     /**
      * No further instances