github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release 3.3.0

Browse Source
This commit is contained in:
Lukas Eder 2014-02-14 16:45:40 +01:00
parent 528b568634
commit 2c5130acee
13 changed files with 73 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-codegen-maven/pom.xml
View File

@ -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>

2
jOOQ-codegen/pom.xml
View File

@ -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>

2
jOOQ-examples/jOOQ-spring-example/pom.xml
View File

@ -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>

2
jOOQ-examples/jOOQ-spring-guice-example/pom.xml
View File

@ -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>

2
jOOQ-meta/pom.xml
View File

@ -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>

51
jOOQ-release/build.xml
View File

@ -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}"/>

11
jOOQ-release/release/template-trial/jOOQ-src/README.txt Normal file
View File

@ -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

2
jOOQ-release/release/template/maven-install.bat
View File

@ -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

2
jOOQ-release/release/template/maven-install.sh
View File

@ -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

4
jOOQ-scala/pom.xml
View File

@ -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>

41
jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
View File

@ -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:

2
jOOQ/pom.xml
View File

@ -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>

2
pom.xml
View File

@ -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>