Skip to content

Commit ee158ef

Browse files
committed
Upgrade to Spring Data 3.0.x
1 parent 5a6104a commit ee158ef

File tree

62 files changed

+776
-1075
lines changed

Some content is hidden

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

62 files changed

+776
-1075
lines changed

.mvn/maven.config

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--settings site/settings.xml

.mvn/wrapper/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
maven-wrapper.jar

.mvn/wrapper/maven-wrapper.properties

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

README.md

+9
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ This prevents you from choosing the best `EntityGraph` considering the runtime c
4747
<scope>provided</scope>
4848
</dependency>
4949
```
50+
51+
# 2.x to 3.x breaking changes
52+
53+
- Moved from Java 8 to 17 as the source language
54+
- `javax.persistence` replaced by `jakarta.persistence`
55+
- `com.cosium.spring.data.jpa.entity.graph.domain` classes (deprecated in 2.7.x) have been removed in favor of `com.cosium.spring.data.jpa.entity.graph.domain2`
56+
- `Default EntityGraph by name pattern` feature (deprecated in 2.7.x) has been removed. `*.default` named EntityGraph are not considered as default EntityGraph anymore. Please read [default EntityGraph](#repository-default-entitygraph) to use the new `Default EntityGraph` feature instead.
57+
5058
# Usage
5159

5260
## On custom repository methods
@@ -305,6 +313,7 @@ You can play with https://github.com/Cosium/spring-data-jpa-entity-graph-sample
305313

306314
| [Spring Data JPA](https://github.com/spring-projects/spring-data-jpa) version | [Spring Data JPA EntityGraph](https://github.com/Cosium/spring-data-jpa-entity-graph) version |
307315
|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
316+
| 3.0.x | [![Maven Central 3.0.x](https://img.shields.io/maven-central/v/com.cosium.spring.data/spring-data-jpa-entity-graph/3.0.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.cosium.spring.data%22%20AND%20a%3A%22spring-data-jpa-entity-graph%22) |
308317
| 2.7.x | [![Maven Central 2.7.x](https://img.shields.io/maven-central/v/com.cosium.spring.data/spring-data-jpa-entity-graph/2.7.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.cosium.spring.data%22%20AND%20a%3A%22spring-data-jpa-entity-graph%22) |
309318
| 2.6.x | [![Maven Central 2.6.x](https://img.shields.io/maven-central/v/com.cosium.spring.data/spring-data-jpa-entity-graph/2.6.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.cosium.spring.data%22%20AND%20a%3A%22spring-data-jpa-entity-graph%22) |
310319
| 2.5.x | [![Maven Central 2.5.x](https://img.shields.io/maven-central/v/com.cosium.spring.data/spring-data-jpa-entity-graph/2.5.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.cosium.spring.data%22%20AND%20a%3A%22spring-data-jpa-entity-graph%22) |

core/pom.xml

+7-49
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,12 @@
55
<parent>
66
<groupId>com.cosium.spring.data</groupId>
77
<artifactId>spring-data-jpa-entity-graph-parent</artifactId>
8-
<version>2.7.11-SNAPSHOT</version>
8+
<version>3.0.0-SNAPSHOT</version>
99
</parent>
1010

11+
<name>Spring Data JPA EntityGraph</name>
1112
<artifactId>spring-data-jpa-entity-graph</artifactId>
1213

13-
<properties>
14-
<spring.data.jpa>2.7.2</spring.data.jpa>
15-
<eclipselink>3.0.2</eclipselink>
16-
<querydsl>5.0.0</querydsl>
17-
18-
<!--Test-->
19-
<dbunit>2.7.3</dbunit>
20-
<spring-test-dbunit>1.3.0</spring-test-dbunit>
21-
<spring.framework.version>5.3.22</spring.framework.version>
22-
<hibernate.version>5.6.8.Final</hibernate.version>
23-
<hsqldb.version>2.6.1</hsqldb.version>
24-
<assertj>3.23.1</assertj>
25-
<logback>1.2.11</logback>
26-
<junit.version>5.9.0</junit.version>
27-
</properties>
28-
29-
<dependencyManagement>
30-
<dependencies>
31-
<dependency>
32-
<groupId>org.junit</groupId>
33-
<artifactId>junit-bom</artifactId>
34-
<version>${junit.version}</version>
35-
<type>pom</type>
36-
<scope>import</scope>
37-
</dependency>
38-
</dependencies>
39-
</dependencyManagement>
40-
4114
<dependencies>
4215
<dependency>
4316
<!--Needed by SpringHibernateJpaPersistenceProvider for spring-data-jpa while building with JDK 11-->
@@ -50,15 +23,8 @@
5023
<dependency>
5124
<groupId>org.springframework.data</groupId>
5225
<artifactId>spring-data-jpa</artifactId>
53-
<version>${spring.data.jpa}</version>
5426
<scope>provided</scope>
5527
</dependency>
56-
<dependency>
57-
<groupId>org.eclipse.persistence</groupId>
58-
<artifactId>org.eclipse.persistence.jpa</artifactId>
59-
<version>${eclipselink}</version>
60-
<optional>true</optional>
61-
</dependency>
6228

6329
<dependency>
6430
<!--Needed by querydsl for @Generated annotation-->
@@ -71,14 +37,13 @@
7137
<dependency>
7238
<groupId>com.querydsl</groupId>
7339
<artifactId>querydsl-apt</artifactId>
74-
<version>${querydsl}</version>
40+
<classifier>jakarta</classifier>
7541
<scope>provided</scope>
7642
</dependency>
7743

7844
<dependency>
79-
<groupId>org.hibernate</groupId>
45+
<groupId>org.hibernate.orm</groupId>
8046
<artifactId>hibernate-jpamodelgen</artifactId>
81-
<version>${hibernate.version}</version>
8247
<scope>provided</scope>
8348
</dependency>
8449

@@ -92,21 +57,19 @@
9257
<dependency>
9358
<groupId>com.querydsl</groupId>
9459
<artifactId>querydsl-jpa</artifactId>
95-
<version>${querydsl}</version>
60+
<classifier>jakarta</classifier>
9661
<optional>true</optional>
9762
</dependency>
9863

9964
<!--Test-->
10065
<dependency>
10166
<groupId>org.hsqldb</groupId>
10267
<artifactId>hsqldb</artifactId>
103-
<version>${hsqldb.version}</version>
10468
<scope>test</scope>
10569
</dependency>
10670
<dependency>
107-
<groupId>org.hibernate</groupId>
108-
<artifactId>hibernate-entitymanager</artifactId>
109-
<version>${hibernate.version}</version>
71+
<groupId>org.hibernate.orm</groupId>
72+
<artifactId>hibernate-core</artifactId>
11073
<scope>test</scope>
11174
</dependency>
11275
<dependency>
@@ -117,31 +80,26 @@
11780
<dependency>
11881
<groupId>com.github.springtestdbunit</groupId>
11982
<artifactId>spring-test-dbunit</artifactId>
120-
<version>${spring-test-dbunit}</version>
12183
<scope>test</scope>
12284
</dependency>
12385
<dependency>
12486
<groupId>org.springframework</groupId>
12587
<artifactId>spring-test</artifactId>
126-
<version>${spring.framework.version}</version>
12788
<scope>test</scope>
12889
</dependency>
12990
<dependency>
13091
<groupId>org.dbunit</groupId>
13192
<artifactId>dbunit</artifactId>
132-
<version>${dbunit}</version>
13393
<scope>test</scope>
13494
</dependency>
13595
<dependency>
13696
<groupId>org.assertj</groupId>
13797
<artifactId>assertj-core</artifactId>
138-
<version>${assertj}</version>
13998
<scope>test</scope>
14099
</dependency>
141100
<dependency>
142101
<groupId>ch.qos.logback</groupId>
143102
<artifactId>logback-classic</artifactId>
144-
<version>${logback}</version>
145103
<scope>test</scope>
146104
</dependency>
147105
</dependencies>

core/src/main/java/com/cosium/spring/data/jpa/entity/graph/domain/AbstractEntityGraph.java

-63
This file was deleted.

core/src/main/java/com/cosium/spring/data/jpa/entity/graph/domain/DynamicEntityGraph.java

-64
This file was deleted.

core/src/main/java/com/cosium/spring/data/jpa/entity/graph/domain/EntityGraph.java

-43
This file was deleted.

0 commit comments

Comments
 (0)