From a511c45ad8234fe2ba86e8699619430e0d7d571e Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 20 Jun 2014 10:51:45 +0200 Subject: [PATCH] Release 3.4.0 --- jOOQ-codegen-maven/pom.xml | 2 +- jOOQ-codegen/pom.xml | 2 +- jOOQ-examples/jOOQ-spring-example/pom.xml | 2 +- jOOQ-examples/jOOQ-spring-guice-example/pom.xml | 2 +- jOOQ-meta/pom.xml | 2 +- jOOQ-release/build.xml | 2 +- jOOQ-release/release/template/RELEASENOTES.txt | 2 +- jOOQ-release/release/template/maven-install.bat | 2 +- jOOQ-release/release/template/maven-install.sh | 2 +- jOOQ-scala/pom.xml | 4 ++-- jOOQ-test-utils/pom.xml | 2 +- jOOQ-test/pom.xml | 2 +- jOOQ/pom.xml | 2 +- jOOQ/src/main/java/org/jooq/Constants.java | 4 ++-- pom.xml | 10 ++++++++-- 15 files changed, 24 insertions(+), 18 deletions(-) diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml index 838f922203..02b1deca84 100644 --- a/jOOQ-codegen-maven/pom.xml +++ b/jOOQ-codegen-maven/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.4.0-SNAPSHOT + 3.4.0 org.jooq diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml index 8c8ecfb062..f2cca464fb 100644 --- a/jOOQ-codegen/pom.xml +++ b/jOOQ-codegen/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.4.0-SNAPSHOT + 3.4.0 org.jooq diff --git a/jOOQ-examples/jOOQ-spring-example/pom.xml b/jOOQ-examples/jOOQ-spring-example/pom.xml index 2a32b20ec7..785916f5d4 100644 --- a/jOOQ-examples/jOOQ-spring-example/pom.xml +++ b/jOOQ-examples/jOOQ-spring-example/pom.xml @@ -19,7 +19,7 @@ UTF-8 3.2.6.RELEASE - 3.4.0-SNAPSHOT + 3.4.0 diff --git a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml index 33e743eb3f..10c9bb615a 100644 --- a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml +++ b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml @@ -19,7 +19,7 @@ UTF-8 3.2.6.RELEASE - 3.4.0-SNAPSHOT + 3.4.0 diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml index 72c7e6c5a0..9a096c37a7 100644 --- a/jOOQ-meta/pom.xml +++ b/jOOQ-meta/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.4.0-SNAPSHOT + 3.4.0 org.jooq diff --git a/jOOQ-release/build.xml b/jOOQ-release/build.xml index 9f4abbb914..c13df1cde7 100644 --- a/jOOQ-release/build.xml +++ b/jOOQ-release/build.xml @@ -3,7 +3,7 @@ - + diff --git a/jOOQ-release/release/template/RELEASENOTES.txt b/jOOQ-release/release/template/RELEASENOTES.txt index dd6b746bef..ee9723ffb8 100644 --- a/jOOQ-release/release/template/RELEASENOTES.txt +++ b/jOOQ-release/release/template/RELEASENOTES.txt @@ -10,7 +10,7 @@ http://www.jooq.org/notes.php For a text version, see http://www.jooq.org/inc/RELEASENOTES.txt -Version 3.4.0-SNAPSHOT - June 2, 2014 +Version 3.4.0 - June 20, 2014 ================================================================================ This is a snapshot preview version of jOOQ 3.4.0. Please do not use this version diff --git a/jOOQ-release/release/template/maven-install.bat b/jOOQ-release/release/template/maven-install.bat index 165242bbd2..252ba65e69 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 +set VERSION=3.4.0 call mvn install:install-file -Dfile=jOOQ-pom\jooq-parent\pom.xml -DgroupId=org.jooq -DartifactId=jooq-parent -Dversion=%VERSION% -Dpackaging=pom call mvn install:install-file -Dfile=jOOQ-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 3d1c4d9dfc..42c378b924 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 +VERSION=3.4.0 mvn install:install-file -Dfile=jOOQ-pom/jooq-parent/pom.xml -DgroupId=org.jooq -DartifactId=jooq-parent -Dversion=$VERSION -Dpackaging=pom mvn install:install-file -Dfile=jOOQ-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 132ac7638c..2cdafb3343 100644 --- a/jOOQ-scala/pom.xml +++ b/jOOQ-scala/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.4.0-SNAPSHOT + 3.4.0 org.jooq @@ -68,7 +68,7 @@ org.jooq jooq-codegen-maven - 3.4.0-SNAPSHOT + 3.4.0 exec1 diff --git a/jOOQ-test-utils/pom.xml b/jOOQ-test-utils/pom.xml index 1d99fd90bc..93580b45da 100644 --- a/jOOQ-test-utils/pom.xml +++ b/jOOQ-test-utils/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.4.0-SNAPSHOT + 3.4.0 jooq-test-utils diff --git a/jOOQ-test/pom.xml b/jOOQ-test/pom.xml index 85958622b0..904fd34cdf 100644 --- a/jOOQ-test/pom.xml +++ b/jOOQ-test/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.4.0-SNAPSHOT + 3.4.0 jooq-test diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml index 5f58f01a44..a2aea64fb3 100644 --- a/jOOQ/pom.xml +++ b/jOOQ/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.4.0-SNAPSHOT + 3.4.0 org.jooq diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java index 5c2d8b456f..802ca44039 100644 --- a/jOOQ/src/main/java/org/jooq/Constants.java +++ b/jOOQ/src/main/java/org/jooq/Constants.java @@ -76,7 +76,7 @@ public final class Constants { /** * The current jooq-runtime XML namespace */ - public static final String NS_RUNTIME = "http://www.jooq.org/xsd/jooq-runtime-3.3.0.xsd"; + public static final String NS_RUNTIME = "http://www.jooq.org/xsd" + XSD_RUNTIME; /** * The current jooq-codegen XSD file name. @@ -86,7 +86,7 @@ public final class Constants { /** * The current jooq-codegen XML namespace. */ - public static final String NS_CODEGEN = "http://www.jooq.org/xsd/jooq-codegen-3.4.0.xsd"; + public static final String NS_CODEGEN = "http://www.jooq.org/xsd/" + XSD_CODEGEN; /** * The maximum degree of {@link Row} and {@link Record} subtypes diff --git a/pom.xml b/pom.xml index 36c6a69f79..fc64e1c8f8 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.jooq jooq-parent - 3.4.0-SNAPSHOT + 3.4.0 pom jOOQ Parent @@ -40,7 +40,7 @@ - 3.4.0-SNAPSHOT + 3.4.0 @@ -158,6 +158,12 @@ jOOQ-codegen-maven jOOQ-meta jOOQ-scala + + jOOQ-examples/jOOQ-spring-example + jOOQ-examples/jOOQ-spring-guice-example + + jOOQ-test-utils + jOOQ-test