Skip to content

Commit f0fa333

Browse files
JohannesRabauerJohannesRabauer
authored
Merge pull request #338 from xdev-software/develop
v2.6.0
2 parents c4f506c + 0662537 commit f0fa333

File tree

23 files changed

+63
-42
lines changed

23 files changed

+63
-42
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# 2.6.0
2+
3+
* Updated org.springframework.boot.version to v4.0.1
4+
* Disabled Tests for HSQL. This is not working due to the unmaintained library cqengine. This must be
5+
fixed [in this issue](https://github.com/xdev-software/spring-data-eclipse-store/issues/336).
6+
7+
# 2.5.4
8+
9+
* Updated org.springframework.boot.version to v3.5.9
10+
111
# 2.5.3
212

313
* Updated org.springframework.boot.version to v3.5.3

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ instructions** are in the documentation](https://xdev-software.github.io/spring-
6161
| ``2.5.0`` | ``17+`` | ``3.4.1`` | ``2.1.0`` |
6262
| ``2.5.1-2.5.2`` | ``17+`` | ``3.4.2`` | ``2.1.1`` |
6363
| ``2.5.3`` | ``17+`` | ``3.5.3`` | ``2.1.3`` |
64-
| ``>= 2.5.4`` | ``17+`` | ``3.5.9`` | ``2.1.3`` |
64+
| ``2.5.4`` | ``17+`` | ``3.5.9`` | ``2.1.3`` |
65+
| ``>= 2.6.0`` | ``17+`` | ``4.0.1`` | ``2.1.3`` |
6566

6667
## Demo
6768

‎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.5.4'
4+
display_version: '2.6.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.5.4'
12-
maven-version: '2.5.4'
11+
display-version: '2.6.0'
12+
maven-version: '2.6.0'
1313
page-editable: false
1414
page-out-of-support: false

‎pom.xml‎

Lines changed: 3 additions & 3 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.5.5-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<organization>
@@ -22,7 +22,7 @@
2222
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2323

2424
<!-- Should be in sync with org.eclipse.store:integrations-spring-boot3 -->
25-
<org.springframework.boot.version>3.5.9</org.springframework.boot.version>
25+
<org.springframework.boot.version>4.0.1</org.springframework.boot.version>
2626
<org.eclipse.store.version>2.1.3</org.eclipse.store.version>
2727
<org.eclipse.serializer.version>2.1.3</org.eclipse.serializer.version>
2828
<org.eclipse.storage-restservice-springboot.version>2.1.3</org.eclipse.storage-restservice-springboot.version>
@@ -107,7 +107,7 @@
107107
<dependency>
108108
<groupId>com.puppycrawl.tools</groupId>
109109
<artifactId>checkstyle</artifactId>
110-
<version>12.3.0</version>
110+
<version>12.3.1</version>
111111
</dependency>
112112
</dependencies>
113113
<configuration>

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

Lines changed: 2 additions & 2 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.5.5-SNAPSHOT</version>
8+
<version>2.6.0-SNAPSHOT</version>
99
</parent>
1010

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

1515
<inceptionYear>2023</inceptionYear>

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

Lines changed: 12 additions & 2 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.5.5-SNAPSHOT</version>
10+
<version>2.6.0-SNAPSHOT</version>
1111
</parent>
1212

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

1717
<organization>
@@ -62,6 +62,16 @@
6262
<artifactId>spring-boot-starter-test</artifactId>
6363
<scope>test</scope>
6464
</dependency>
65+
<dependency>
66+
<groupId>org.springframework.boot</groupId>
67+
<artifactId>spring-boot-resttestclient</artifactId>
68+
<scope>test</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.springframework.boot</groupId>
72+
<artifactId>spring-boot-starter-restclient</artifactId>
73+
<scope>test</scope>
74+
</dependency>
6575
</dependencies>
6676

6777
<build>

‎spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/ComplexConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.eclipse.store.storage.types.Storage;
1414
import org.springframework.beans.factory.ObjectProvider;
1515
import org.springframework.beans.factory.annotation.Autowired;
16-
import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers;
16+
import org.springframework.boot.transaction.autoconfigure.TransactionManagerCustomizers;
1717
import org.springframework.context.annotation.Bean;
1818
import org.springframework.context.annotation.ComponentScan;
1919
import org.springframework.context.annotation.Configuration;

‎spring-data-eclipse-store-demo/src/test/java/software/xdev/spring/data/eclipse/store/demo/complex/ComplexDemoApplicationTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@
88
import org.junit.jupiter.api.BeforeAll;
99
import org.junit.jupiter.api.Test;
1010
import org.springframework.beans.factory.annotation.Autowired;
11+
import org.springframework.boot.resttestclient.TestRestTemplate;
12+
import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
1113
import org.springframework.boot.test.context.SpringBootTest;
12-
import org.springframework.boot.test.web.client.TestRestTemplate;
1314
import org.springframework.boot.test.web.server.LocalServerPort;
1415

1516
import software.xdev.spring.data.eclipse.store.demo.TestUtil;
1617
import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
1718

1819

20+
@AutoConfigureTestRestTemplate
1921
@SpringBootTest(
2022
classes = ComplexDemoApplication.class,
2123
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT

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

Lines changed: 2 additions & 2 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.5.5-SNAPSHOT</version>
10+
<version>2.6.0-SNAPSHOT</version>
1111
</parent>
1212

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

1717
<inceptionYear>2023</inceptionYear>

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

Lines changed: 7 additions & 9 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.5.5-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>spring-data-eclipse-store</name>
@@ -51,7 +51,7 @@
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.5.9</org.springframework.boot.version>
54+
<org.springframework.boot.version>4.0.1</org.springframework.boot.version>
5555
<org.eclipse.store.version>2.1.3</org.eclipse.store.version>
5656
<org.eclipse.serializer.version>2.1.3</org.eclipse.serializer.version>
5757
<hibernate-validator.version>9.0.1.Final</hibernate-validator.version>
@@ -94,6 +94,10 @@
9494
<groupId>org.springframework.boot</groupId>
9595
<artifactId>spring-boot-autoconfigure</artifactId>
9696
</dependency>
97+
<dependency>
98+
<groupId>org.springframework.boot</groupId>
99+
<artifactId>spring-boot-transaction</artifactId>
100+
</dependency>
97101

98102
<dependency>
99103
<groupId>jakarta.annotation</groupId>
@@ -159,12 +163,6 @@
159163
<groupId>org.hibernate.orm</groupId>
160164
<artifactId>hibernate-core</artifactId>
161165
<version>${hibernate-core.version}</version>
162-
<exclusions>
163-
<exclusion>
164-
<artifactId>antlr4-runtime</artifactId>
165-
<groupId>org.antlr</groupId>
166-
</exclusion>
167-
</exclusions>
168166
</dependency>
169167
<dependency>
170168
<groupId>jakarta.el</groupId>
@@ -411,7 +409,7 @@
411409
<dependency>
412410
<groupId>com.puppycrawl.tools</groupId>
413411
<artifactId>checkstyle</artifactId>
414-
<version>12.3.0</version>
412+
<version>12.3.1</version>
415413
</dependency>
416414
</dependencies>
417415
<configuration>

0 commit comments

Comments
 (0)