Skip to content

Commit a86b0e8

Browse files
authored
Merge pull request #254 from OndraZizka/main
Fix the JOOQ Pro dependency versions.
2 parents 3038bae + 05d8e7a commit a86b0e8

File tree

9 files changed

+25
-14
lines changed

9 files changed

+25
-14
lines changed

deployment/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@
7171
</plugin>
7272
</plugins>
7373
</build>
74-
</project>
74+
</project>

docs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@
9393
</plugins>
9494
</build>
9595

96-
</project>
96+
</project>

integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@
103103
</properties>
104104
</profile>
105105
</profiles>
106-
</project>
106+
</project>

pom.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
<maven.compiler.target>17</maven.compiler.target>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25-
<quarkus.version>3.15.1</quarkus.version>
26-
<org.jooq.version>3.19.22</org.jooq.version>
25+
26+
<quarkus.version>3.15.3</quarkus.version>
27+
<org.jooq.version>3.20.3</org.jooq.version>
2728
</properties>
2829

2930
<scm>
@@ -105,6 +106,7 @@
105106
<module>docs</module>
106107
</modules>
107108
</profile>
109+
108110
<profile>
109111
<id>it</id>
110112
<activation>
@@ -117,6 +119,7 @@
117119
<module>integration-tests</module>
118120
</modules>
119121
</profile>
122+
120123
<profile>
121124
<id>jooq-pro</id>
122125
<activation>
@@ -135,9 +138,10 @@
135138
</plugin>
136139
</plugins>
137140
</build>
141+
138142
<modules>
139143
<module>quarkus-jooq-pro</module>
140144
</modules>
141145
</profile>
142146
</profiles>
143-
</project>
147+
</project>

quarkus-jooq-pro/deployment/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.quarkiverse.jooq.pro</groupId>
88
<artifactId>quarkus-jooq-parent</artifactId>
9-
<version>0.2.2-SNAPSHOT</version>
9+
<version>999-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

quarkus-jooq-pro/deployment/src/main/java/io/quarkiverse/jooq/pro/deployment/JooqProProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ protected void build(RecorderContext recorder, JooqRecorder template,
4242
reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, AbstractDslContextProducer.class));
4343
reflectiveClass.produce(new ReflectiveClassBuildItem(false, true, LoggerListener.class));
4444

45-
if (!isPresentDialect(jooqConfig.defaultConfig)) {
45+
if (!isPresentDialect(jooqConfig.defaultConfig())) {
4646
log.warn("No default sql-dialect been defined");
4747
}
4848

4949
createDslContextProducerBean(generatedBean, unremovableBeans, jooqConfig, dataSourceConfig, jdbcDataSourcesBuildItem,
5050
AbstractDslContextProducer.class);
5151
}
52-
}
52+
}

quarkus-jooq-pro/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6+
67
<parent>
78
<groupId>io.quarkiverse.jooq</groupId>
89
<artifactId>quarkus-jooq-parent</artifactId>
9-
<version>0.2.2-SNAPSHOT</version>
10+
<version>999-SNAPSHOT</version>
1011
<relativePath>../pom.xml</relativePath>
1112
</parent>
1213

@@ -20,4 +21,9 @@
2021
<module>deployment</module>
2122
<module>runtime</module>
2223
</modules>
23-
</project>
24+
25+
<properties>
26+
<jooq.groupId>org.jooq.pro-java-17</jooq.groupId>
27+
</properties>
28+
29+
</project>

quarkus-jooq-pro/runtime/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.quarkiverse.jooq.pro</groupId>
88
<artifactId>quarkus-jooq-parent</artifactId>
9-
<version>0.2.2-SNAPSHOT</version>
9+
<version>999-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

@@ -33,7 +33,7 @@
3333

3434
<!-- jOOQ dependencies -->
3535
<dependency>
36-
<groupId>org.jooq.pro-java-8</groupId>
36+
<groupId>${jooq.groupId}</groupId>
3737
<artifactId>jooq</artifactId>
3838
<version>${org.jooq.version}</version>
3939
</dependency>
@@ -44,4 +44,5 @@
4444
<version>${project.version}</version>
4545
</dependency>
4646
</dependencies>
47+
4748
</project>

runtime/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@
7575
</plugin>
7676
</plugins>
7777
</build>
78-
</project>
78+
</project>

0 commit comments

Comments
 (0)