Skip to content

Commit a7e57da

Browse files
aspanvelo
andauthored
Use querydsl-apt with classifier jpa for querydsl-jpa-spring and the … (#227)
* Use querydsl-apt with classifier jpa for querydsl-jpa-spring and the jpa examples to enable automatic detection of com.querydsl.apt.jpa.JPAAnnotationProcessor. * Attempt build with mvn package instead --------- Co-authored-by: Marvin <[email protected]> Co-authored-by: Marvin Froeder <[email protected]>
1 parent 58ad60e commit a7e57da

File tree

6 files changed

+16
-115
lines changed

6 files changed

+16
-115
lines changed

.circleci/config.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ commands:
3131
save-test-results:
3232
steps:
3333
- run:
34-
name: Save test results
34+
name: Save package results
3535
command: |
3636
mkdir -p ~/test-results/junit/
3737
find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/test-results/junit/ \;
@@ -185,7 +185,7 @@ jobs:
185185
- run:
186186
name: 'Test'
187187
command: |
188-
./mvnw -ntp -B test -Pci -Dgroups=com.querydsl.core.testutil.MySQL
188+
./mvnw -ntp -B package -Pci -Dgroups=com.querydsl.core.testutil.MySQL
189189
- save-test-results
190190
testPostgreSQL:
191191
<<: *defaults
@@ -206,7 +206,7 @@ jobs:
206206
- run:
207207
name: 'Test'
208208
command: |
209-
./mvnw -ntp -B test -Pci -Dgroups=com.querydsl.core.testutil.PostgreSQL
209+
./mvnw -ntp -B package -Pci -Dgroups=com.querydsl.core.testutil.PostgreSQL
210210
- save-test-results
211211
testCUBRID:
212212
<<: *defaults
@@ -225,7 +225,7 @@ jobs:
225225
- run:
226226
name: 'Test'
227227
command: |
228-
./mvnw -ntp -B test -Pci -Dgroups=com.querydsl.core.testutil.CUBRID
228+
./mvnw -ntp -B package -Pci -Dgroups=com.querydsl.core.testutil.CUBRID
229229
- save-test-results
230230
testOracle:
231231
<<: *defaults
@@ -247,7 +247,7 @@ jobs:
247247
- run:
248248
name: 'Test'
249249
command: |
250-
./mvnw -ntp -B test -Pci -Dgroups=com.querydsl.core.testutil.Oracle
250+
./mvnw -ntp -B package -Pci -Dgroups=com.querydsl.core.testutil.Oracle
251251
- save-test-results
252252
testMongo:
253253
<<: *defaults
@@ -264,7 +264,7 @@ jobs:
264264
- run:
265265
name: 'Test'
266266
command: |
267-
./mvnw -ntp -B test -Pci -Dgroups=com.querydsl.core.testutil.MongoDB
267+
./mvnw -ntp -B package -Pci -Dgroups=com.querydsl.core.testutil.MongoDB
268268
- save-test-results
269269
testFirebird:
270270
<<: *defaults
@@ -287,7 +287,7 @@ jobs:
287287
- run:
288288
name: 'Test'
289289
command: |
290-
./mvnw -ntp -B test -Pci -Dgroups=com.querydsl.core.testutil.Firebird
290+
./mvnw -ntp -B package -Pci -Dgroups=com.querydsl.core.testutil.Firebird
291291
- save-test-results
292292
testMSSQL:
293293
<<: *defaults
@@ -308,7 +308,7 @@ jobs:
308308
- run:
309309
name: 'Test'
310310
command: |
311-
./mvnw -ntp -B test -Pci -Dgroups=com.querydsl.core.testutil.SQLServer
311+
./mvnw -ntp -B package -Pci -Dgroups=com.querydsl.core.testutil.SQLServer
312312
- save-test-results
313313
testEmbedded:
314314
<<: *defaults
@@ -324,7 +324,7 @@ jobs:
324324
- run:
325325
name: 'Test'
326326
command: |
327-
./mvnw -ntp -B test -Pci -Dgroups=com.querydsl.core.testutil.EmbeddedDatabase
327+
./mvnw -ntp -B package -Pci -Dgroups=com.querydsl.core.testutil.EmbeddedDatabase
328328
- save-test-results
329329

330330
deploy:
@@ -350,25 +350,25 @@ workflows:
350350
filters:
351351
<<: *all-branches
352352
- test:
353-
name: 'Compile and Test (no external databases)'
353+
name: 'Compile and package (no external databases)'
354354
requires:
355355
- 'Resolve dependencies'
356356
filters:
357357
<<: *all-branches
358358
- windows:
359-
name: 'Compile and Test on Windows (no external databases)'
359+
name: 'Compile and package on Windows (no external databases)'
360360
requires:
361361
- 'Resolve dependencies'
362362
filters:
363363
<<: *all-branches
364364
- buildExamples:
365-
name: 'Compile and Test Examples'
365+
name: 'Compile and package Examples'
366366
requires:
367367
- 'Resolve dependencies'
368368
filters:
369369
<<: *all-branches
370370
- buildQuarkusExample:
371-
name: 'Compile and Test Quarkus Example'
371+
name: 'Compile and package Quarkus Example'
372372
filters:
373373
<<: *all-branches
374374
- testMySQL:

querydsl-examples/querydsl-example-jpa-guice/pom.xml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<groupId>io.github.openfeign.querydsl</groupId>
8484
<artifactId>querydsl-apt</artifactId>
8585
<version>${project.version}</version>
86+
<classifier>jpa</classifier>
8687
</dependency>
8788
<dependency>
8889
<groupId>com.h2database</groupId>
@@ -99,17 +100,6 @@
99100

100101
<build>
101102
<finalName>querydsl-example-jpa-guice</finalName>
102-
<plugins>
103-
<plugin>
104-
<groupId>org.apache.maven.plugins</groupId>
105-
<artifactId>maven-compiler-plugin</artifactId>
106-
<configuration>
107-
<annotationProcessors>
108-
<processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
109-
</annotationProcessors>
110-
</configuration>
111-
</plugin>
112-
</plugins>
113103
</build>
114104

115105
</project>

querydsl-examples/querydsl-example-jpa-quarkus/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,12 @@
7474
<groupId>org.apache.maven.plugins</groupId>
7575
<artifactId>maven-compiler-plugin</artifactId>
7676
<configuration>
77-
<annotationProcessors>
78-
<processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
79-
</annotationProcessors>
8077
<annotationProcessorPaths>
8178
<annotationProcessorPath>
8279
<groupId>io.github.openfeign.querydsl</groupId>
8380
<artifactId>querydsl-apt</artifactId>
8481
<version>${project.version}</version>
82+
<classifier>jpa</classifier>
8583
</annotationProcessorPath>
8684
</annotationProcessorPaths>
8785

querydsl-examples/querydsl-example-jpa-spring/pom.xml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -66,29 +66,6 @@
6666
<build>
6767
<finalName>querydsl-example-jpa-spring</finalName>
6868
<plugins>
69-
<plugin>
70-
<groupId>org.apache.maven.plugins</groupId>
71-
<artifactId>maven-compiler-plugin</artifactId>
72-
<configuration>
73-
<annotationProcessors>
74-
<processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
75-
</annotationProcessors>
76-
<annotationProcessorPaths>
77-
<annotationProcessorPath>
78-
<groupId>io.github.openfeign.querydsl</groupId>
79-
<artifactId>querydsl-apt</artifactId>
80-
<version>${project.version}</version>
81-
</annotationProcessorPath>
82-
</annotationProcessorPaths>
83-
</configuration>
84-
<dependencies>
85-
<dependency>
86-
<groupId>io.github.openfeign.querydsl</groupId>
87-
<artifactId>querydsl-apt</artifactId>
88-
<version>${project.version}</version>
89-
</dependency>
90-
</dependencies>
91-
</plugin>
9269
<plugin>
9370
<groupId>org.springframework.boot</groupId>
9471
<artifactId>spring-boot-maven-plugin</artifactId>

querydsl-jpa-spring/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<groupId>io.github.openfeign.querydsl</groupId>
5353
<artifactId>querydsl-apt</artifactId>
5454
<version>${project.version}</version>
55+
<classifier>jpa</classifier>
5556
</dependency>
5657

5758
<!-- Test -->

querydsl-jpa-spring/src/test/java/io/github/openfeign/querydsl/jpa/spring/repository/sample/QCountry.java

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)