Skip to content

Commit

Permalink
Merge branch 'master' into maven-4
Browse files Browse the repository at this point in the history
  • Loading branch information
velo authored Jun 27, 2024
2 parents f7069a1 + 68b8d41 commit db66dc4
Show file tree
Hide file tree
Showing 35 changed files with 55 additions and 52 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-root</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>

<packaging>pom</packaging>
<name>Querydsl</name>
Expand Down Expand Up @@ -104,8 +104,8 @@
<junit.version>5.10.2</junit.version>
<ecj.version>3.33.0</ecj.version>
<jdo.version>3.2.1</jdo.version>
<springboot.version>3.3.0</springboot.version>
<spring.version>6.1.9</spring.version>
<springboot.version>3.3.1</springboot.version>
<spring.version>6.1.10</spring.version>

<!-- SQL deps -->
<db2.version>11.5.9.0</db2.version>
Expand Down Expand Up @@ -196,7 +196,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.173</version>
<version>4.8.174</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -524,7 +524,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
</plugin>
<plugin>
<groupId>de.qaware.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-root</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-docs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-root</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-examples/querydsl-example-jpa-guice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-examples</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-example-jpa-guice</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions querydsl-examples/querydsl-example-jpa-quarkus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-examples</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-example-jpa-quarkus</artifactId>
<name>Querydsl example - JPA Quarkus</name>

<properties>
<quarkus.version>3.11.2</quarkus.version>
<quarkus.version>3.12.0</quarkus.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-examples/querydsl-example-jpa-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-examples</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-example-jpa-spring</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-examples/querydsl-example-kotlin-codegen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-examples</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>
<artifactId>querydsl-example-kotlin-codegen</artifactId>
<name>Querydsl example - Kotlin Codegen</name>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-examples/querydsl-example-kotlin-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-examples</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>
<artifactId>querydsl-example-kotlin</artifactId>
<name>Querydsl example - Kotlin JPA</name>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-examples</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>
<artifactId>querydsl-example-kotlin-mongodb</artifactId>
<name>Querydsl example - Kotlin MongoDB</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-examples</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-example-r2dbc-sql-codegen</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-examples/querydsl-example-sql-guice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-examples</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-example-sql-guice</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-examples/querydsl-example-sql-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-examples</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-example-sql-spring</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-libraries/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-root</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-libraries</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions querydsl-libraries/querydsl-collections/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-libraries</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<groupId>io.github.openfeign.querydsl</groupId>
Expand Down Expand Up @@ -80,7 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
4 changes: 2 additions & 2 deletions querydsl-libraries/querydsl-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-libraries</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-core</artifactId>
Expand Down Expand Up @@ -64,7 +64,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
4 changes: 2 additions & 2 deletions querydsl-libraries/querydsl-guava/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-libraries</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-guava</artifactId>
Expand Down Expand Up @@ -32,7 +32,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-libraries/querydsl-jpa-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-libraries</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-jpa-spring</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions querydsl-libraries/querydsl-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-libraries</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-jpa</artifactId>
Expand Down Expand Up @@ -190,7 +190,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-libraries/querydsl-kotlin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-libraries</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-kotlin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions querydsl-libraries/querydsl-mongodb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-libraries</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-mongodb</artifactId>
Expand Down Expand Up @@ -78,7 +78,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-libraries/querydsl-r2dbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-libraries</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-r2dbc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-libraries/querydsl-scala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-libraries</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-scala</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions querydsl-libraries/querydsl-spatial/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-libraries</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-spatial</artifactId>
Expand Down Expand Up @@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
4 changes: 2 additions & 2 deletions querydsl-libraries/querydsl-sql-spatial/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-libraries</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-sql-spatial</artifactId>
Expand Down Expand Up @@ -196,7 +196,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-libraries/querydsl-sql-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-libraries</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-sql-spring</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions querydsl-libraries/querydsl-sql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-libraries</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-sql</artifactId>
Expand Down Expand Up @@ -199,7 +199,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-tooling/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-root</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-tooling</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions querydsl-tooling/querydsl-apt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-tooling</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>

<artifactId>querydsl-apt</artifactId>
Expand Down Expand Up @@ -122,7 +122,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
4 changes: 2 additions & 2 deletions querydsl-tooling/querydsl-codegen-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.github.openfeign.querydsl</groupId>
<artifactId>querydsl-tooling</artifactId>
<version>6.5-SNAPSHOT</version>
<version>6.6-SNAPSHOT</version>
</parent>
<artifactId>codegen-utils</artifactId>

Expand Down Expand Up @@ -49,7 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
Loading

0 comments on commit db66dc4

Please sign in to comment.