diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml
index 02452b6b2c..7d9749ec6f 100644
--- a/jOOQ-codegen-maven/pom.xml
+++ b/jOOQ-codegen-maven/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.3.0-SNAPSHOT</version>
+        <version>3.3.0</version>
     </parent>
     
     <groupId>org.jooq</groupId>
diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml
index f0c3f7628f..5e41b8a6a8 100644
--- a/jOOQ-codegen/pom.xml
+++ b/jOOQ-codegen/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.3.0-SNAPSHOT</version>
+        <version>3.3.0</version>
     </parent>
     
     <groupId>org.jooq</groupId>
diff --git a/jOOQ-examples/jOOQ-spring-example/pom.xml b/jOOQ-examples/jOOQ-spring-example/pom.xml
index 55abeb8336..28397065ed 100644
--- a/jOOQ-examples/jOOQ-spring-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spring-example/pom.xml
@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        <org.jooq.version>3.3.0-SNAPSHOT</org.jooq.version>
+        <org.jooq.version>3.3.0</org.jooq.version>
     </properties>
     
     <dependencies>
diff --git a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
index fab8f9ba41..a0536944f8 100644
--- a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
@@ -19,7 +19,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        <org.jooq.version>3.3.0-SNAPSHOT</org.jooq.version>
+        <org.jooq.version>3.3.0</org.jooq.version>
     </properties>
 
     <dependencies>
diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml
index 9c0d38679f..6db13c0f15 100644
--- a/jOOQ-meta/pom.xml
+++ b/jOOQ-meta/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.3.0-SNAPSHOT</version>
+        <version>3.3.0</version>
     </parent>
 
     <groupId>org.jooq</groupId>
diff --git a/jOOQ-release/build.xml b/jOOQ-release/build.xml
index 3cd17b1901..e8f1b89f18 100644
--- a/jOOQ-release/build.xml
+++ b/jOOQ-release/build.xml
@@ -3,40 +3,40 @@
 	<property name="dir.workspace" value="${basedir}/.." />
 	<property name="dir.target" value="${basedir}/target" />
 	<property name="dir.release" value="${basedir}/release" />
-	<property name="version" value="3.3.0-SNAPSHOT"/>
+	<property name="version" value="3.3.0"/>
 
 	<!-- Run a full mvn clean package install deploy first before this -->
 	<target name="copy-lib-javadoc">
         <mkdir dir="${dir.release}/versions" />
         <mkdir dir="${dir.release}/${version}" />
-        <mkdir dir="${dir.release}/${version}/lib" />
-		<mkdir dir="${dir.release}/${version}/pom"/>
-		<mkdir dir="${dir.release}/${version}/pom/jooq-parent"/>
+        <mkdir dir="${dir.release}/${version}/jOOQ-lib" />
+		<mkdir dir="${dir.release}/${version}/jOOQ-pom"/>
+		<mkdir dir="${dir.release}/${version}/jOOQ-pom/jooq-parent"/>
 		
-        <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-codegen-maven/target/jooq-codegen-maven-${version}.jar"/>
-        <copy todir="${dir.release}/${version}/lib" file="${dir.workspace}/jOOQ-scala/target/jooq-scala-${version}.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-lib" file="${dir.workspace}/jOOQ/target/jooq-${version}.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-lib" file="${dir.workspace}/jOOQ-meta/target/jooq-meta-${version}.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-lib" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version}.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-lib" file="${dir.workspace}/jOOQ-codegen-maven/target/jooq-codegen-maven-${version}.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-lib" file="${dir.workspace}/jOOQ-scala/target/jooq-scala-${version}.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-codegen-maven/target/jooq-codegen-maven-${version}-javadoc.jar"/>
-        <copy todir="${dir.release}/${version}/javadoc" file="${dir.workspace}/jOOQ-scala/target/jooq-scala-${version}-javadoc.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ/target/jooq-${version}-javadoc.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-meta/target/jooq-meta-${version}-javadoc.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version}-javadoc.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-codegen-maven/target/jooq-codegen-maven-${version}-javadoc.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-scala/target/jooq-scala-${version}-javadoc.jar"/>
 		
-		<copy todir="${dir.release}/${version}/pom/jooq-parent" file="${dir.workspace}/pom.xml"/>
+		<copy todir="${dir.release}/${version}/jOOQ-pom/jooq-parent" file="${dir.workspace}/pom.xml"/>
 	</target>
     
     <target name="copy-src">
         <mkdir dir="${dir.release}/versions" />
-        <mkdir dir="${dir.release}/${version}/src" />
+        <mkdir dir="${dir.release}/${version}/jOOQ-src" />
         
-        <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-codegen-maven/target/jooq-codegen-maven-${version}-sources.jar"/>
-        <copy todir="${dir.release}/${version}/src" file="${dir.workspace}/jOOQ-scala/target/jooq-scala-${version}-sources.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-src" file="${dir.workspace}/jOOQ/target/jooq-${version}-sources.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-src" file="${dir.workspace}/jOOQ-meta/target/jooq-meta-${version}-sources.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-src" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version}-sources.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-src" file="${dir.workspace}/jOOQ-codegen-maven/target/jooq-codegen-maven-${version}-sources.jar"/>
+        <copy todir="${dir.release}/${version}/jOOQ-src" file="${dir.workspace}/jOOQ-scala/target/jooq-scala-${version}-sources.jar"/>
     </target>
         
     <target name="copy-trial">
@@ -56,7 +56,7 @@
 
         <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"/>
 
@@ -69,6 +69,13 @@
         <copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\javax\validation\validation-api\1.1.0.Alpha1\validation-api-1.1.0.Alpha1.jar"/>
         <copy todir="${dir.release}/${version}/third-party/src" file="C:\Users\lukas\.m2\repository\javax\validation\validation-api\1.1.0.Alpha1\validation-api-1.1.0.Alpha1-sources.jar"/>
 
+        <mkdir dir="${dir.release}/${version}/sql2jooq" />
+        <copy todir="${dir.release}/${version}/sql2jooq/lib" file="${dir.workspace}/../sql2jooq/sql2jooq/target/sql2jooq-${version}.jar" />
+        <copy todir="${dir.release}/${version}/sql2jooq/lib" file="${dir.workspace}/../sql2jooq/sql2jooq/lib/gsp.jar" />
+        <copy todir="${dir.release}/${version}/sql2jooq">
+            <fileset dir="${dir.workspace}/../sql2jooq/sql2jooq" includes="LICENSE**.txt"/>
+            <fileset dir="${dir.workspace}/../sql2jooq/sql2jooq" includes="README.md"/>
+    	</copy>
 
         <zip destfile="${dir.release}/versions/jOOQ-${version}.zip">
             <fileset dir="${dir.release}/${version}"/>
diff --git a/jOOQ-release/release/template-trial/jOOQ-src/README.txt b/jOOQ-release/release/template-trial/jOOQ-src/README.txt
new file mode 100644
index 0000000000..a9bcd0f2ea
--- /dev/null
+++ b/jOOQ-release/release/template-trial/jOOQ-src/README.txt
@@ -0,0 +1,11 @@
+Thank you for evaluating the jOOQ trial version. While we ship the jOOQ sources
+with the jOOQ Professional Edition and the jOOQ Enterprise Edition, we do not
+ship any source code with the trial version.
+
+Should you need the sources for your evaluation, please contact us at
+
+    sales@datageekery.com
+
+For further questions regarding licensing, please visit the FAQ at
+
+    http://www.jooq.org/licensing
\ No newline at end of file
diff --git a/jOOQ-release/release/template/maven-install.bat b/jOOQ-release/release/template/maven-install.bat
index aac1d2bb5b..c0ae895ce7 100644
--- a/jOOQ-release/release/template/maven-install.bat
+++ b/jOOQ-release/release/template/maven-install.bat
@@ -1,5 +1,5 @@
 @echo off
-set VERSION=3.3.0-SNAPSHOT
+set VERSION=3.3.0
 
 call mvn install:install-file -Dfile=pom\jooq-parent\pom.xml              -DgroupId=org.jooq -DartifactId=jooq-parent        -Dversion=%VERSION% -Dpackaging=pom
 call mvn install:install-file -Dfile=lib\jooq-%VERSION%.jar               -DgroupId=org.jooq -DartifactId=jooq               -Dversion=%VERSION% -Dpackaging=jar
diff --git a/jOOQ-release/release/template/maven-install.sh b/jOOQ-release/release/template/maven-install.sh
index 5a5798cb17..ad6b16f3f1 100644
--- a/jOOQ-release/release/template/maven-install.sh
+++ b/jOOQ-release/release/template/maven-install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-VERSION=3.3.0-SNAPSHOT
+VERSION=3.3.0
 
 mvn install:install-file -Dfile=pom/jooq-parent/pom.xml             -DgroupId=org.jooq -DartifactId=jooq-parent        -Dversion=$VERSION -Dpackaging=pom
 mvn install:install-file -Dfile=lib/jooq-$VERSION.jar               -DgroupId=org.jooq -DartifactId=jooq               -Dversion=$VERSION -Dpackaging=jar
diff --git a/jOOQ-scala/pom.xml b/jOOQ-scala/pom.xml
index 0387227603..500b6f11a0 100644
--- a/jOOQ-scala/pom.xml
+++ b/jOOQ-scala/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.3.0-SNAPSHOT</version>
+        <version>3.3.0</version>
     </parent>
 
     <groupId>org.jooq</groupId>
@@ -68,7 +68,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>3.3.0-SNAPSHOT</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>exec1</id>
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
index a248c68908..9ef5d197b2 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
@@ -1021,27 +1021,30 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
                 return;
         }
 
-        Result<?> result1 = create().select(
-                TAuthor_FIRST_NAME(),
-                TAuthor_LAST_NAME(),
-                groupConcat(TBook_ID(), ", ")
-                    .as("books"))
-            .from(TAuthor())
-            .join(TBook()).on(TAuthor_ID().equal(TBook_AUTHOR_ID()))
-            .groupBy(
-                TAuthor_ID(),
-                TAuthor_FIRST_NAME(),
-                TAuthor_LAST_NAME())
-            .orderBy(TAuthor_ID())
-            .fetch();
+        // [#3045] Skip this test for the time being
+        if (!asList().contains(dialect().family())) {
+            Result<?> result1 = create().select(
+                    TAuthor_FIRST_NAME(),
+                    TAuthor_LAST_NAME(),
+                    groupConcat(TBook_ID(), ", ")
+                        .as("books"))
+                .from(TAuthor())
+                .join(TBook()).on(TAuthor_ID().equal(TBook_AUTHOR_ID()))
+                .groupBy(
+                    TAuthor_ID(),
+                    TAuthor_FIRST_NAME(),
+                    TAuthor_LAST_NAME())
+                .orderBy(TAuthor_ID())
+                .fetch();
 
-        assertEquals(2, result1.size());
-        assertEquals(AUTHOR_FIRST_NAMES, result1.getValues(TAuthor_FIRST_NAME()));
-        assertEquals(AUTHOR_LAST_NAMES, result1.getValues(TAuthor_LAST_NAME()));
+            assertEquals(2, result1.size());
+            assertEquals(AUTHOR_FIRST_NAMES, result1.getValues(TAuthor_FIRST_NAME()));
+            assertEquals(AUTHOR_LAST_NAMES, result1.getValues(TAuthor_LAST_NAME()));
 
-        // [#2944] SQLite cannot guarantee any order among aggregated values...
-        assertTrue(asList("1, 2", "2, 1").contains(result1.getValue(0, "books")));
-        assertTrue(asList("3, 4", "4, 3").contains(result1.getValue(1, "books")));
+            // [#2944] SQLite cannot guarantee any order among aggregated values...
+            assertTrue(asList("1, 2", "2, 1").contains(result1.getValue(0, "books")));
+            assertTrue(asList("3, 4", "4, 3").contains(result1.getValue(1, "books")));
+        }
 
         switch (dialect().family()) {
             case SQLITE:
diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml
index 44cb5ee842..ce85146679 100644
--- a/jOOQ/pom.xml
+++ b/jOOQ/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jooq</groupId>
         <artifactId>jooq-parent</artifactId>
-        <version>3.3.0-SNAPSHOT</version>
+        <version>3.3.0</version>
     </parent>
 
     <groupId>org.jooq</groupId>
diff --git a/pom.xml b/pom.xml
index 93879181e1..f4bf63e38a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.0</version>
     <packaging>pom</packaging>
 
     <name>jOOQ Parent</name>