Skip to content

Commit 09926f1

Browse files
velovelo
committed
Merge remote-tracking branch 'origin/master' into r2dbc
2 parents f27d6a0 + e2087b1 commit 09926f1

File tree

54 files changed

+2222
-1591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2222
-1591
lines changed

‎.circleci/config.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,6 @@ jobs:
143143
keys:
144144
- querydsl-dependencies-{{ checksum "pom.xml" }}
145145
- querydsl-dependencies-
146-
- setup_remote_docker:
147-
docker_layer_caching: true
148146
- run:
149147
name: 'Test'
150148
command: |

‎.gitattributes‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,14 @@
44
*.jpg binary
55
*.pdf binary
66
*.png binary
7+
8+
#
9+
# https://help.github.com/articles/dealing-with-line-endings/
10+
#
11+
# Linux start script should use lf
12+
/querydsl-gradle-plugin/gradlew text eol=lf
13+
/mvnw text eol=lf
14+
15+
# These are Windows script files and should use crlf
16+
*.bat text eol=crlf
17+

‎.gitignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,8 @@ derby.log
2626
.gitignore
2727
.checkstyle
2828

29-
querydsl-gradle-plugin/build/
30-
querydsl-gradle-plugin/.gradle/
29+
# Ignore Gradle project-specific cache directory
30+
.gradle
31+
32+
# Ignore Gradle build output directory
33+
build

‎pom.xml‎

Lines changed: 93 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,13 @@
6666

6767
<modules>
6868
<module>querydsl-core</module>
69+
<module>querydsl-spatial</module>
70+
6971
<module>querydsl-codegen</module>
7072
<module>querydsl-codegen-utils</module>
71-
<module>querydsl-spatial</module>
7273
<module>querydsl-apt</module>
74+
<module>querydsl-maven-plugin</module>
75+
7376
<module>querydsl-collections</module>
7477
<module>querydsl-guava</module>
7578
<module>querydsl-sql</module>
@@ -78,7 +81,7 @@
7881
<module>querydsl-sql-spring</module>
7982
<module>querydsl-r2dbc</module>
8083
<module>querydsl-r2dbc-codegen</module>
81-
<module>querydsl-maven-plugin</module>
84+
8285
<module>querydsl-jpa</module>
8386
<module>querydsl-jpa-codegen</module>
8487
<module>querydsl-jpa-spring</module>
@@ -156,7 +159,7 @@
156159
<mongodb.version>3.12.14</mongodb.version>
157160

158161
<!-- JPA deps -->
159-
<hibernate.version>6.4.3.Final</hibernate.version>
162+
<hibernate.version>6.4.4.Final</hibernate.version>
160163
<hibernate.validator.version>8.0.1.Final</hibernate.validator.version>
161164
<eclipselink.version>4.0.2</eclipselink.version>
162165
<jpa.version>3.1.0</jpa.version>
@@ -165,7 +168,7 @@
165168
<guava.version>33.0.0-jre</guava.version>
166169
<codegen.version>0.6.8</codegen.version>
167170
<mysema.lang.version>0.2.4</mysema.lang.version>
168-
<byte-buddy.version>1.14.11</byte-buddy.version>
171+
<byte-buddy.version>1.14.12</byte-buddy.version>
169172
<slf4j.version>2.0.12</slf4j.version>
170173
<surefire.version>3.2.5</surefire.version>
171174
<animal-sniffer.version>1.23</animal-sniffer.version>
@@ -504,7 +507,7 @@
504507
<plugin>
505508
<groupId>com.github.siom79.japicmp</groupId>
506509
<artifactId>japicmp-maven-plugin</artifactId>
507-
<version>0.18.3</version>
510+
<version>0.18.4</version>
508511
<configuration>
509512
<parameter>
510513
<ignoreMissingOldVersion>true</ignoreMissingOldVersion>
@@ -647,10 +650,94 @@
647650
<include>io.github.openfeign.querydsl:*</include>
648651
</includes>
649652
<excludes>
653+
<exclude>*:querydsl-examples</exclude>
650654
<exclude>*:querydsl-example-*</exclude>
651-
<exclude>*:querydsl-benchmark</exclude>
655+
<exclude>*:querydsl-jpa-spring</exclude>
652656
</excludes>
653657
</modules>
658+
659+
<extraDependencies>
660+
<dependency>
661+
<groupId>${project.groupId}</groupId>
662+
<artifactId>querydsl-apt</artifactId>
663+
<version>${project.version}</version>
664+
<classifier>genaral</classifier>
665+
</dependency>
666+
<dependency>
667+
<groupId>${project.groupId}</groupId>
668+
<artifactId>querydsl-apt</artifactId>
669+
<version>${project.version}</version>
670+
<classifier>hibernate</classifier>
671+
</dependency>
672+
<dependency>
673+
<groupId>${project.groupId}</groupId>
674+
<artifactId>querydsl-apt</artifactId>
675+
<version>${project.version}</version>
676+
<classifier>jakarta</classifier>
677+
</dependency>
678+
<dependency>
679+
<groupId>${project.groupId}</groupId>
680+
<artifactId>querydsl-apt</artifactId>
681+
<version>${project.version}</version>
682+
<classifier>jdo</classifier>
683+
</dependency>
684+
<dependency>
685+
<groupId>${project.groupId}</groupId>
686+
<artifactId>querydsl-apt</artifactId>
687+
<version>${project.version}</version>
688+
<classifier>jpa</classifier>
689+
</dependency>
690+
<dependency>
691+
<groupId>${project.groupId}</groupId>
692+
<artifactId>querydsl-apt</artifactId>
693+
<version>${project.version}</version>
694+
<classifier>morphia</classifier>
695+
</dependency>
696+
<dependency>
697+
<groupId>${project.groupId}</groupId>
698+
<artifactId>querydsl-apt</artifactId>
699+
<version>${project.version}</version>
700+
<classifier>roo</classifier>
701+
</dependency>
702+
<dependency>
703+
<groupId>${project.groupId}</groupId>
704+
<artifactId>querydsl-apt</artifactId>
705+
<version>${project.version}</version>
706+
<classifier>general-one</classifier>
707+
</dependency>
708+
709+
<dependency>
710+
<groupId>${project.groupId}</groupId>
711+
<artifactId>querydsl-jpa</artifactId>
712+
<version>${project.version}</version>
713+
<classifier>apt-one-jar</classifier>
714+
</dependency>
715+
<dependency>
716+
<groupId>${project.groupId}</groupId>
717+
<artifactId>querydsl-jpa</artifactId>
718+
<version>${project.version}</version>
719+
<classifier>apt-hibernate-one-jar</classifier>
720+
</dependency>
721+
<dependency>
722+
<groupId>${project.groupId}</groupId>
723+
<artifactId>querydsl-jpa</artifactId>
724+
<version>${project.version}</version>
725+
<classifier>apt</classifier>
726+
</dependency>
727+
728+
<dependency>
729+
<groupId>${project.groupId}</groupId>
730+
<artifactId>querydsl-mongodb</artifactId>
731+
<version>${project.version}</version>
732+
<classifier>apt-one-jar</classifier>
733+
</dependency>
734+
<dependency>
735+
<groupId>${project.groupId}</groupId>
736+
<artifactId>querydsl-mongodb</artifactId>
737+
<version>${project.version}</version>
738+
<classifier>apt</classifier>
739+
</dependency>
740+
</extraDependencies>
654741
</bom>
655742
</boms>
656743
</configuration>

‎querydsl-apt/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
<!-- test -->
7171
<dependency>
72-
<groupId>org.hibernate</groupId>
72+
<groupId>org.hibernate.orm</groupId>
7373
<artifactId>hibernate-core</artifactId>
7474
<version>${hibernate.version}</version>
7575
<scope>test</scope>
@@ -85,7 +85,7 @@
8585
</exclusions>
8686
</dependency>
8787
<dependency>
88-
<groupId>org.hibernate</groupId>
88+
<groupId>org.hibernate.orm</groupId>
8989
<artifactId>hibernate-envers</artifactId>
9090
<version>${hibernate.version}</version>
9191
<scope>test</scope>
@@ -160,6 +160,7 @@
160160
<descriptors>
161161
<descriptor>src/main/general.xml</descriptor>
162162
<descriptor>src/main/hibernate.xml</descriptor>
163+
<descriptor>src/main/jakarta.xml</descriptor>
163164
<descriptor>src/main/jdo.xml</descriptor>
164165
<descriptor>src/main/jpa.xml</descriptor>
165166
<descriptor>src/main/morphia.xml</descriptor>

‎querydsl-apt/src/main/jakarta.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
4+
<id>jakarta</id>
5+
<formats>
6+
<format>jar</format>
7+
</formats>
8+
<includeBaseDirectory>false</includeBaseDirectory>
9+
<fileSets>
10+
<fileSet>
11+
<directory>src/apt/jpa</directory>
12+
<outputDirectory>/</outputDirectory>
13+
</fileSet>
14+
<fileSet>
15+
<directory>${project.build.outputDirectory}</directory>
16+
<outputDirectory>/</outputDirectory>
17+
</fileSet>
18+
</fileSets>
19+
</assembly>

‎querydsl-apt/src/test/java/com/querydsl/apt/AbstractProcessorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected void process(
4949
File out = new File("target/" + target);
5050
FileUtils.delete(out);
5151
if (!out.mkdirs()) {
52-
fail("", "Creation of " + out.getPath() + " failed");
52+
fail("Creation of " + out.getPath() + " failed");
5353
}
5454
compile(processorClass, classes, target);
5555
}
@@ -75,7 +75,7 @@ protected void compile(
7575
// Processor.elementCache.clear();
7676
if (compilationResult != 0) {
7777
System.err.println(compiler.getClass().getName());
78-
fail("", "Compilation Failed:\n " + new String(err.toByteArray(), "UTF-8"));
78+
fail("Compilation Failed:\n " + new String(err.toByteArray(), "UTF-8"));
7979
}
8080
}
8181

‎querydsl-apt/src/test/java/com/querydsl/apt/EclipseCompilationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void test() throws IOException {
5050
File out = new File("target/out-eclipse");
5151
FileUtils.delete(out);
5252
if (!out.mkdirs()) {
53-
fail("", "Creation of " + out.getPath() + " failed");
53+
fail("Creation of " + out.getPath() + " failed");
5454
}
5555

5656
String classPath = SimpleCompiler.getClassPath((URLClassLoader) getClass().getClassLoader());

‎querydsl-apt/src/test/java/com/querydsl/apt/domain/AbstractTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ protected void assertPresent(String name) {
4848
try {
4949
cl.getField(name);
5050
} catch (NoSuchFieldException e) {
51-
fail("", "Expected present field : " + cl.getSimpleName() + "." + name);
51+
fail("Expected present field : " + cl.getSimpleName() + "." + name);
5252
}
5353
}
5454

5555
protected void assertMissing(String name) {
5656
try {
5757
cl.getField(name);
58-
fail("", "Expected missing field : " + cl.getSimpleName() + "." + name);
58+
fail("Expected missing field : " + cl.getSimpleName() + "." + name);
5959
} catch (NoSuchFieldException e) {
6060
// expected
6161
}

‎querydsl-codegen/src/test/java/com/querydsl/codegen/CompileUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static void assertCompiles(String name, String source) {
3737
null,
3838
Collections.singletonList(javaFileObject));
3939
if (!task.call()) {
40-
fail("", "Compilation of " + source + " failed.\n" + out.toString());
40+
fail("Compilation of " + source + " failed.\n" + out.toString());
4141
}
4242
}
4343
}

0 commit comments

Comments
 (0)