Skip to content

Commit 658bf05

Browse files
author
Andreas Austing
committed
Support for spring-data 4.0.0 GA
Fixed annotation processing
1 parent d118ccd commit 658bf05

File tree

3 files changed

+33
-51
lines changed

3 files changed

+33
-51
lines changed

‎core/pom.xml‎

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,6 @@
1212
<artifactId>spring-data-jpa-entity-graph</artifactId>
1313

1414
<dependencies>
15-
16-
<!--Needed by SpringHibernateJpaPersistenceProvider for spring-data-jpa while building with JDK 11
17-
<dependency>
18-
<groupId>javax.xml.bind</groupId>
19-
<artifactId>jaxb-api</artifactId>
20-
<version>2.4.0-b180830.0359</version>
21-
<scope>provided</scope>
22-
</dependency>
23-
-->
24-
2515
<dependency>
2616
<groupId>org.springframework.data</groupId>
2717
<artifactId>spring-data-jpa</artifactId>
@@ -31,7 +21,6 @@
3121
<dependency>
3222
<groupId>jakarta.persistence</groupId>
3323
<artifactId>jakarta.persistence-api</artifactId>
34-
<version>3.2.0</version>
3524
<scope>provided</scope>
3625
</dependency>
3726

@@ -42,29 +31,6 @@
4231
<version>1.3.2</version>
4332
<scope>provided</scope>
4433
</dependency>
45-
46-
<!--
47-
<dependency>
48-
<groupId>com.querydsl</groupId>
49-
<artifactId>querydsl-apt</artifactId>
50-
<classifier>jakarta</classifier>
51-
<scope>provided</scope>
52-
</dependency>
53-
54-
<dependency>
55-
<groupId>org.hibernate.orm</groupId>
56-
<artifactId>hibernate-processor</artifactId>
57-
<version>${hibernate.version}</version>
58-
<scope>provided</scope>
59-
</dependency>
60-
61-
<dependency>
62-
<groupId>${project.groupId}</groupId>
63-
<artifactId>spring-data-jpa-entity-graph-generator</artifactId>
64-
<version>${project.version}</version>
65-
<scope>provided</scope>
66-
</dependency>
67-
-->
6834

6935
<dependency>
7036
<groupId>com.querydsl</groupId>
@@ -135,27 +101,25 @@
135101
<artifactId>maven-compiler-plugin</artifactId>
136102
<configuration>
137103
<annotationProcessorPaths>
138-
<annotationProcessorPath>
139-
<groupId>com.querydsl</groupId>
140-
<artifactId>querydsl-apt</artifactId>
141-
<version>${querydsl}</version>
142-
<classifier>jakarta</classifier>
143-
</annotationProcessorPath>
144-
<annotationProcessorPath>
145-
<groupId>jakarta.persistence</groupId>
146-
<artifactId>jakarta.persistence-api</artifactId>
147-
</annotationProcessorPath>
148104
<path>
149105
<groupId>org.hibernate.orm</groupId>
150106
<artifactId>hibernate-processor</artifactId>
151107
<version>${hibernate.version}</version>
152108
</path>
153109
<path>
154-
<groupId>com.cosium.spring.data</groupId>
110+
<groupId>com.querydsl</groupId>
111+
<artifactId>querydsl-apt</artifactId>
112+
<version>${querydsl}</version>
113+
<classifier>jakarta</classifier>
114+
</path>
115+
<path>
116+
<groupId>${project.groupId}</groupId>
155117
<artifactId>spring-data-jpa-entity-graph-generator</artifactId>
156-
<version>3.5.0</version>
118+
<version>${project.version}</version>
157119
</path>
158120
</annotationProcessorPaths>
121+
<generatedTestSourcesDirectory>target/generated-test-sources</generatedTestSourcesDirectory>
122+
<generatedSourcesDirectory>target/generated-sources</generatedSourcesDirectory>
159123
</configuration>
160124
</plugin>
161125
</plugins>

‎generator/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,20 @@
4444
</archive>
4545
</configuration>
4646
</plugin>
47+
<plugin>
48+
<groupId>org.apache.maven.plugins</groupId>
49+
<artifactId>maven-compiler-plugin</artifactId>
50+
<configuration>
51+
<annotationProcessorPaths>
52+
<path>
53+
<groupId>com.google.auto.service</groupId>
54+
<artifactId>auto-service</artifactId>
55+
</path>
56+
</annotationProcessorPaths>
57+
<generatedTestSourcesDirectory>target/generated-test-sources</generatedTestSourcesDirectory>
58+
<generatedSourcesDirectory>target/generated-sources</generatedSourcesDirectory>
59+
</configuration>
60+
</plugin>
4761
</plugins>
4862
</build>
4963

‎pom.xml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
<packaging>pom</packaging>
1313

1414
<modules>
15-
<module>core</module>
1615
<module>generator</module>
16+
<module>core</module>
1717
</modules>
1818

1919
<properties>
2020
<maven.compiler.release>17</maven.compiler.release>
2121

22-
<spring.data.jpa>4.0.0-RC2</spring.data.jpa>
22+
<spring.data.jpa>4.0.0</spring.data.jpa>
2323
<querydsl>5.1.0</querydsl>
2424

2525
<dbunit>3.0.0</dbunit>
2626
<spring-test-dbunit>1.3.0</spring-test-dbunit>
27-
<spring.framework.version>7.0.0-RC3</spring.framework.version>
28-
<hibernate.version>7.1.6.Final</hibernate.version>
27+
<spring.framework.version>7.0.0</spring.framework.version>
28+
<hibernate.version>7.1.7.Final</hibernate.version>
2929
<hsqldb.version>2.7.4</hsqldb.version>
3030
<assertj>3.27.6</assertj>
3131
<logback>1.5.20</logback>
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>jakarta.persistence</groupId>
4141
<artifactId>jakarta.persistence-api</artifactId>
42-
<version>3.1.0</version>
42+
<version>3.2.0</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>org.springframework.data</groupId>
@@ -132,12 +132,15 @@
132132
<artifactId>git-code-format-maven-plugin</artifactId>
133133
<version>${git-code-format-maven-plugin.version}</version>
134134
<executions>
135+
<!-- On commit, format the modified java files -->
135136
<execution>
136137
<id>install-formatter-hook</id>
137138
<goals>
138139
<goal>install-hooks</goal>
139140
</goals>
140141
</execution>
142+
<!-- On Maven verify phase, fail if any file
143+
(including unmodified) is badly formatted -->
141144
<execution>
142145
<id>validate-code-format</id>
143146
<goals>
@@ -146,6 +149,7 @@
146149
</execution>
147150
</executions>
148151
<dependencies>
152+
<!-- Enable https://github.com/google/google-java-format -->
149153
<dependency>
150154
<groupId>com.cosium.code</groupId>
151155
<artifactId>google-java-format</artifactId>

0 commit comments

Comments
 (0)