Skip to content

Commit acb8e9a

Browse files
JohannesRabauerJohannesRabauer
committed
Merge branch 'develop' into renovate/major-org.eclipse.store.version
2 parents dc00d4c + 96f2cb8 commit acb8e9a

8 files changed

Lines changed: 30 additions & 25 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 2.4.0
2+
3+
* Updated org.springframework.boot.version to v3.4.0
4+
15
# 2.3.1
26

37
* Auto-Fix problems with adding ids to entities with existing data store.

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ instructions** are in the documentation](https://xdev-software.github.io/spring-
5656
| ``1.0.5-1.0.7`` | ``17`` | ``3.2.5`` | ``1.3.2`` |
5757
| ``1.0.8-1.0.10`` | ``17`` | ``3.3.1`` | ``1.3.2`` |
5858
| ``2.0.0-2.1.0`` | ``17`` | ``3.3.2`` | ``1.4.0`` |
59-
| ``>= 2.2.0`` | ``17`` | ``3.3.4`` | ``1.4.0`` |
59+
| ``2.2.0-2.3.1`` | ``17`` | ``3.3.4`` | ``1.4.0`` |
60+
| ``>= 2.4.0`` | ``17`` | ``3.4.0`` | ``1.4.0`` |
6061

6162
## Demo
6263

‎docs/antora.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: ROOT
22
title: Spring-Data-Eclipse-Store
33
version: master
4-
display_version: '2.3.1'
4+
display_version: '2.4.0'
55
start_page: index.adoc
66
nav:
77
- modules/ROOT/nav.adoc
88
asciidoc:
99
attributes:
1010
product-name: 'Spring-Data-Eclipse-Store'
11-
display-version: '2.3.1'
12-
maven-version: '2.3.1'
11+
display-version: '2.4.0'
12+
maven-version: '2.4.0'
1313
page-editable: false
1414
page-out-of-support: false

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>spring-data-eclipse-store-root</artifactId>
9-
<version>2.3.2-SNAPSHOT</version>
9+
<version>2.4.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<organization>
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>com.puppycrawl.tools</groupId>
5252
<artifactId>checkstyle</artifactId>
53-
<version>10.20.1</version>
53+
<version>10.20.2</version>
5454
</dependency>
5555
</dependencies>
5656
<configuration>
@@ -93,12 +93,12 @@
9393
<dependency>
9494
<groupId>net.sourceforge.pmd</groupId>
9595
<artifactId>pmd-core</artifactId>
96-
<version>7.7.0</version>
96+
<version>7.8.0</version>
9797
</dependency>
9898
<dependency>
9999
<groupId>net.sourceforge.pmd</groupId>
100100
<artifactId>pmd-java</artifactId>
101-
<version>7.7.0</version>
101+
<version>7.8.0</version>
102102
</dependency>
103103
</dependencies>
104104
</plugin>

‎spring-data-eclipse-store-benchmark/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<parent>
66
<groupId>software.xdev</groupId>
77
<artifactId>spring-data-eclipse-store-root</artifactId>
8-
<version>2.3.2-SNAPSHOT</version>
8+
<version>2.4.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>spring-data-eclipse-store-benchmark</artifactId>
12-
<version>2.3.2-SNAPSHOT</version>
12+
<version>2.4.0-SNAPSHOT</version>
1313
<packaging>jar</packaging>
1414

1515
<inceptionYear>2023</inceptionYear>
@@ -25,7 +25,7 @@
2525
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2626
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2727

28-
<org.springframework.boot.version>3.3.4</org.springframework.boot.version>
28+
<org.springframework.boot.version>3.4.0</org.springframework.boot.version>
2929
<jmh.version>1.37</jmh.version>
3030
</properties>
3131

‎spring-data-eclipse-store-demo/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>software.xdev</groupId>
99
<artifactId>spring-data-eclipse-store-root</artifactId>
10-
<version>2.3.2-SNAPSHOT</version>
10+
<version>2.4.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>spring-data-eclipse-store-demo</artifactId>
14-
<version>2.3.2-SNAPSHOT</version>
14+
<version>2.4.0-SNAPSHOT</version>
1515
<packaging>jar</packaging>
1616

1717
<organization>
@@ -28,7 +28,7 @@
2828

2929
<mainClass>software.xdev.spring.data.eclipse.store.demo.complex.ComplexDemoApplication</mainClass>
3030

31-
<org.springframework.boot.version>3.3.4</org.springframework.boot.version>
31+
<org.springframework.boot.version>3.4.0</org.springframework.boot.version>
3232
</properties>
3333

3434
<dependencyManagement>
@@ -113,7 +113,7 @@
113113
<plugin>
114114
<groupId>org.apache.maven.plugins</groupId>
115115
<artifactId>maven-surefire-plugin</artifactId>
116-
<version>3.5.0</version>
116+
<version>3.5.2</version>
117117
<configuration>
118118
<argLine>
119119
--add-opens java.base/java.util=ALL-UNNAMED

‎spring-data-eclipse-store-jpa/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>software.xdev</groupId>
99
<artifactId>spring-data-eclipse-store-root</artifactId>
10-
<version>2.3.2-SNAPSHOT</version>
10+
<version>2.4.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>spring-data-eclipse-store-jpa</artifactId>
14-
<version>2.3.2-SNAPSHOT</version>
14+
<version>2.4.0-SNAPSHOT</version>
1515
<packaging>jar</packaging>
1616

1717
<inceptionYear>2023</inceptionYear>
@@ -30,7 +30,7 @@
3030

3131
<mainClass>software.xdev.spring.data.eclipse.store.demo.complex.ComplexDemoApplication</mainClass>
3232

33-
<org.springframework.boot.version>3.3.4</org.springframework.boot.version>
33+
<org.springframework.boot.version>3.4.0</org.springframework.boot.version>
3434
</properties>
3535

3636
<dependencyManagement>

‎spring-data-eclipse-store/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>spring-data-eclipse-store</artifactId>
9-
<version>2.3.2-SNAPSHOT</version>
9+
<version>2.4.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>spring-data-eclipse-store</name>
@@ -51,13 +51,13 @@
5151
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5252

5353
<!-- Should be in sync with org.eclipse.store:integrations-spring-boot3 -->
54-
<org.springframework.boot.version>3.3.4</org.springframework.boot.version>
54+
<org.springframework.boot.version>3.4.0</org.springframework.boot.version>
5555
<org.eclipse.store.version>2.0.0</org.eclipse.store.version>
5656
<org.eclipse.serializer.version>1.4.0</org.eclipse.serializer.version>
5757
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
5858
<jakarta.el-api.version>6.0.1</jakarta.el-api.version>
5959
<expressly.version>6.0.0-M1</expressly.version>
60-
<hibernate-core.version>6.6.1.Final</hibernate-core.version>
60+
<hibernate-core.version>6.6.3.Final</hibernate-core.version>
6161
</properties>
6262

6363
<repositories>
@@ -341,7 +341,7 @@
341341
<plugin>
342342
<groupId>org.apache.maven.plugins</groupId>
343343
<artifactId>maven-surefire-plugin</artifactId>
344-
<version>3.5.0</version>
344+
<version>3.5.2</version>
345345
<configuration>
346346
<argLine>
347347
--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
@@ -440,7 +440,7 @@
440440
<dependency>
441441
<groupId>com.puppycrawl.tools</groupId>
442442
<artifactId>checkstyle</artifactId>
443-
<version>10.20.1</version>
443+
<version>10.20.2</version>
444444
</dependency>
445445
</dependencies>
446446
<configuration>
@@ -482,12 +482,12 @@
482482
<dependency>
483483
<groupId>net.sourceforge.pmd</groupId>
484484
<artifactId>pmd-core</artifactId>
485-
<version>7.7.0</version>
485+
<version>7.8.0</version>
486486
</dependency>
487487
<dependency>
488488
<groupId>net.sourceforge.pmd</groupId>
489489
<artifactId>pmd-java</artifactId>
490-
<version>7.7.0</version>
490+
<version>7.8.0</version>
491491
</dependency>
492492
</dependencies>
493493
</plugin>

0 commit comments

Comments
 (0)