Skip to content

Commit

Permalink
Update to jOOQ 3.19.1
Browse files Browse the repository at this point in the history
  • Loading branch information
etiennestuder committed Dec 25, 2023
1 parent 1b3b6e4 commit 6b616ed
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions KotlinDSL.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Working with Configurations using the Gradle Kotlin DSL

Each configuration `create()`ed under the `jooq { configurations { } }` block presents the script author with an opportunity to customize a tree of JAXB elements drawn
from `jooq-meta` which encodes the [JOOQ Codegen XML Schema](https://www.jooq.org/xsd/jooq-codegen-3.18.0.xsd).
from `jooq-meta` which encodes the [JOOQ Codegen XML Schema](https://www.jooq.org/xsd/jooq-codegen-3.19.0.xsd).

For each configuration so configured, this tree is serialized to a temporary XML file and passed as a command-line argument to `org.jooq.codegen.GenerationTool` for code
generation.
Expand Down Expand Up @@ -67,6 +67,6 @@ jooqConfiguration.apply {
}
```

Familiarity with the [JOOQ Codegen XML Schema](https://www.jooq.org/xsd/jooq-codegen-3.18.0.xsd) and
the [`org.jooq.meta.jaxb` package](https://github.com/jOOQ/jOOQ/tree/version-3.18.7/jOOQ-meta/src/main/java/org/jooq/meta/jaxb)
Familiarity with the [JOOQ Codegen XML Schema](https://www.jooq.org/xsd/jooq-codegen-3.19.0.xsd) and
the [`org.jooq.meta.jaxb` package](https://github.com/jOOQ/jOOQ/tree/version-3.19.1/jOOQ-meta/src/main/java/org/jooq/meta/jaxb)
will inform your configuration efforts.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Note that the `org.jooq:jooq` dependency of the specified version and edition is

```groovy
jooq {
version = '3.18.7' // the default (can be omitted)
version = '3.19.1' // the default (can be omitted)
edition = nu.studer.gradle.jooq.JooqEdition.OSS // the default (can be omitted)
}
```
Expand All @@ -125,7 +125,7 @@ jooq {

```kotlin
jooq {
version.set("3.18.7") // the default (can be omitted)
version.set("3.19.1") // the default (can be omitted)
edition.set(nu.studer.gradle.jooq.JooqEdition.OSS) // the default (can be omitted)
}
```
Expand Down Expand Up @@ -162,8 +162,8 @@ buildscript {
## Configuring the jOOQ generation tool

Configure the jOOQ generation tool via `jooq` extension, made available by the jOOQ plugin. The full set of configuration options when using jOOQ 3.18.x can
be seen on the jOOQ generation tool's [Configuration](https://github.com/jOOQ/jOOQ/tree/version-3.18.7/jOOQ-meta/src/main/java/org/jooq/meta/jaxb) class, or
on the [jOOQ XSD](https://www.jooq.org/xsd/jooq-codegen-3.18.0.xsd).
be seen on the jOOQ generation tool's [Configuration](https://github.com/jOOQ/jOOQ/tree/version-3.19.1/jOOQ-meta/src/main/java/org/jooq/meta/jaxb) class, or
on the [jOOQ XSD](https://www.jooq.org/xsd/jooq-codegen-3.19.0.xsd).

By default, the generated sources are written to `<projectDir>/build/generated-src/jooq/<configurationName>`. The target directory can be changed by
explicitly setting the `directory` attribute of the `target` configuration of the `generator` configuration.
Expand All @@ -174,7 +174,7 @@ explicitly setting the `directory` attribute of the `target` configuration of th
import org.jooq.meta.jaxb.Logging
jooq {
version = '3.18.7' // default (can be omitted)
version = '3.19.1' // default (can be omitted)
edition = nu.studer.gradle.jooq.JooqEdition.OSS // default (can be omitted)
configurations {
Expand Down Expand Up @@ -241,7 +241,7 @@ import org.jooq.meta.jaxb.Logging
import org.jooq.meta.jaxb.Property

jooq {
version.set("3.18.7") // default (can be omitted)
version.set("3.19.1") // default (can be omitted)
edition.set(nu.studer.gradle.jooq.JooqEdition.OSS) // default (can be omitted)

configurations {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ repositories {
}

dependencies {
api 'org.jooq:jooq-codegen:3.18.7'
api 'org.jooq:jooq-codegen:3.19.1'

runtimeOnly 'org.glassfish.jaxb:jaxb-core:3.0.2'
runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:3.0.2'
Expand Down
2 changes: 1 addition & 1 deletion example/configure_custom_generator_strategy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {
}

jooq {
version = '3.18.7'
version = '3.19.1'
configurations {
main {
generationTool {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ repositories {
}

dependencies {
implementation 'org.jooq:jooq-codegen:3.18.7'
implementation 'org.jooq:jooq-codegen:3.19.1'
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ repositories {

dependencies {
implementation 'nu.studer:gradle-jooq-plugin:8.2'
implementation 'org.jooq:jooq-codegen:3.18.7'
implementation 'org.jooq:jooq-codegen:3.19.1'
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
}

jooq {
version = '3.18.7'
version = '3.19.1'
edition = JooqEdition.OSS

configurations {
Expand Down
2 changes: 1 addition & 1 deletion example/use_groovy_dsl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
}

jooq {
version = '3.18.7'
version = '3.19.1'
edition = JooqEdition.OSS

configurations {
Expand Down
2 changes: 1 addition & 1 deletion example/use_kotlin_dsl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
}

jooq {
version.set("3.18.7")
version.set("3.19.1")
edition.set(JooqEdition.OSS)

configurations {
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/nu/studer/gradle/jooq/JooqExtension.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

public class JooqExtension {

private static final String DEFAULT_VERSION = "3.18.7";
private static final String DEFAULT_VERSION = "3.19.1";
private static final JooqEdition DEFAULT_EDITION = JooqEdition.OSS;

private final Property<String> version;
Expand Down
6 changes: 3 additions & 3 deletions src/test/groovy/nu/studer/gradle/jooq/JooqFuncTest.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ dependencies {
}
jooq {
version.set("3.18.7")
version.set("3.19.1")
configurations {
create("main") {
jooqConfiguration.apply {
Expand Down Expand Up @@ -1008,7 +1008,7 @@ dependencies {
}
jooq {
version = '3.18.7'
version = '3.19.1'
configurations {
main {
generationTool {
Expand Down Expand Up @@ -1047,7 +1047,7 @@ repositories {
}
dependencies {
implementation 'org.jooq:jooq-codegen:3.18.7'
implementation 'org.jooq:jooq-codegen:3.19.1'
}
"""
}
Expand Down

0 comments on commit 6b616ed

Please sign in to comment.