Skip to content

Commit 1539e19

Browse files
AB-xdevAB-xdev
authored
Merge pull request #281 from xdev-software/develop
Release
2 parents 3292f67 + 138173f commit 1539e19

File tree

67 files changed

+465
-1086
lines changed

Some content is hidden

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

67 files changed

+465
-1086
lines changed

‎.github/workflows/check-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
timeout-minutes: 30
2626
strategy:
2727
matrix:
28-
java: [17, 21, 25]
28+
java: [21, 25]
2929
distribution: [temurin]
3030
steps:
3131
- uses: actions/checkout@v6
@@ -107,7 +107,7 @@ jobs:
107107
timeout-minutes: 15
108108
strategy:
109109
matrix:
110-
java: [17]
110+
java: [21]
111111
distribution: [temurin]
112112
steps:
113113
- uses: actions/checkout@v6

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up JDK
2121
uses: actions/setup-java@v5
2222
with:
23-
java-version: '17'
23+
java-version: '21'
2424
distribution: 'temurin'
2525

2626
# Try to reuse existing cache from check-build
@@ -125,7 +125,7 @@ jobs:
125125
uses: actions/setup-java@v5
126126
with: # running setup-java overwrites the settings.xml
127127
distribution: 'temurin'
128-
java-version: '17'
128+
java-version: '21'
129129
server-id: github-central
130130
server-password: PACKAGES_CENTRAL_TOKEN
131131
gpg-passphrase: MAVEN_GPG_PASSPHRASE
@@ -147,7 +147,7 @@ jobs:
147147
uses: actions/setup-java@v5
148148
with: # running setup-java again overwrites the settings.xml
149149
distribution: 'temurin'
150-
java-version: '17'
150+
java-version: '21'
151151
server-id: sonatype-central-portal
152152
server-username: MAVEN_CENTRAL_USERNAME
153153
server-password: MAVEN_CENTRAL_TOKEN
@@ -182,7 +182,7 @@ jobs:
182182
- name: Setup - Java
183183
uses: actions/setup-java@v5
184184
with:
185-
java-version: '17'
185+
java-version: '21'
186186
distribution: 'temurin'
187187

188188
# Try to reuse existing cache from check-build

‎.github/workflows/run-integration-tests.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,15 @@ jobs:
4242
with:
4343
distribution: temurin
4444
java-version: ${{ matrix.java }}
45-
cache: 'maven'
45+
46+
- name: Cache Maven
47+
uses: actions/cache@v5
48+
with:
49+
path: ~/.m2/repository
50+
key: ${{ runner.os }}-mvn-it-build-${{ hashFiles('**/pom.xml') }}
51+
restore-keys: |
52+
${{ runner.os }}-mvn-it-build-
53+
${{ runner.os }}-mvn-build-
4654
4755
- name: Test
4856
run: |

‎.github/workflows/test-deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/setup-java@v5
1515
with: # running setup-java overwrites the settings.xml
1616
distribution: 'temurin'
17-
java-version: '17'
17+
java-version: '21'
1818
server-id: github-central
1919
server-password: PACKAGES_CENTRAL_TOKEN
2020
gpg-passphrase: MAVEN_GPG_PASSPHRASE
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/setup-java@v5
3737
with: # running setup-java again overwrites the settings.xml
3838
distribution: 'temurin'
39-
java-version: '17'
39+
java-version: '21'
4040
server-id: sonatype-central-portal
4141
server-username: MAVEN_CENTRAL_USERNAME
4242
server-password: MAVEN_CENTRAL_TOKEN

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# 2.0.0
2+
_Minimum required Java version: 21_
3+
* Updated to Spring Boot 4.x
4+
* Removed fork of `OidcUserService` to move closer to the standard implementation. Only fork the required `OidcUserRequestUtils#shouldRetrieveUserInfo`
5+
* Update Vaadin to 25
6+
* Removed `TotalVaadinFlowWebSecurity` as it's no longer supported
7+
* Please note that Stylesheet [may now required being added to `PublicStatelessPathsProvider`](https://vaadin.com/docs/v25/upgrading#themes-and-styling)
8+
* Updated Jackson Databind to v3
9+
* `ActuatorUserConfig`: Remove deprecated `passwordSha256` - Use `passwordHash` instead
10+
* Migrated demos and tests
11+
* Code cleanup
12+
113
# 1.5.3
214
_Last expected version for Spring Boot 3.x_
315
* Updated dependencies

‎bom/pom.xml‎

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

77
<groupId>software.xdev.sse</groupId>
88
<artifactId>bom</artifactId>
9-
<version>1.5.4-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<name>bom</name>
@@ -51,62 +51,62 @@
5151
<dependency>
5252
<groupId>software.xdev.sse</groupId>
5353
<artifactId>client-storage</artifactId>
54-
<version>1.5.4-SNAPSHOT</version>
54+
<version>2.0.0-SNAPSHOT</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>software.xdev.sse</groupId>
5858
<artifactId>crypto-symmetric</artifactId>
59-
<version>1.5.4-SNAPSHOT</version>
59+
<version>2.0.0-SNAPSHOT</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>software.xdev.sse</groupId>
6363
<artifactId>crypto-symmetric-managed</artifactId>
64-
<version>1.5.4-SNAPSHOT</version>
64+
<version>2.0.0-SNAPSHOT</version>
6565
</dependency>
6666
<dependency>
6767
<groupId>software.xdev.sse</groupId>
6868
<artifactId>codec-sha256</artifactId>
69-
<version>1.5.4-SNAPSHOT</version>
69+
<version>2.0.0-SNAPSHOT</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>software.xdev.sse</groupId>
7373
<artifactId>csp</artifactId>
74-
<version>1.5.4-SNAPSHOT</version>
74+
<version>2.0.0-SNAPSHOT</version>
7575
</dependency>
7676
<dependency>
7777
<groupId>software.xdev.sse</groupId>
7878
<artifactId>metrics</artifactId>
79-
<version>1.5.4-SNAPSHOT</version>
79+
<version>2.0.0-SNAPSHOT</version>
8080
</dependency>
8181
<dependency>
8282
<groupId>software.xdev.sse</groupId>
8383
<artifactId>oauth2-oidc</artifactId>
84-
<version>1.5.4-SNAPSHOT</version>
84+
<version>2.0.0-SNAPSHOT</version>
8585
</dependency>
8686
<dependency>
8787
<groupId>software.xdev.sse</groupId>
8888
<artifactId>oauth2-oidc-remember-me</artifactId>
89-
<version>1.5.4-SNAPSHOT</version>
89+
<version>2.0.0-SNAPSHOT</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.xdev.sse</groupId>
9393
<artifactId>vaadin</artifactId>
94-
<version>1.5.4-SNAPSHOT</version>
94+
<version>2.0.0-SNAPSHOT</version>
9595
</dependency>
9696
<dependency>
9797
<groupId>software.xdev.sse</groupId>
9898
<artifactId>web</artifactId>
99-
<version>1.5.4-SNAPSHOT</version>
99+
<version>2.0.0-SNAPSHOT</version>
100100
</dependency>
101101
<dependency>
102102
<groupId>software.xdev.sse</groupId>
103103
<artifactId>web-sidecar-actuator</artifactId>
104-
<version>1.5.4-SNAPSHOT</version>
104+
<version>2.0.0-SNAPSHOT</version>
105105
</dependency>
106106
<dependency>
107107
<groupId>software.xdev.sse</groupId>
108108
<artifactId>web-sidecar-common</artifactId>
109-
<version>1.5.4-SNAPSHOT</version>
109+
<version>2.0.0-SNAPSHOT</version>
110110
</dependency>
111111
</dependencies>
112112
</dependencyManagement>

‎client-storage/pom.xml‎

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

77
<groupId>software.xdev.sse</groupId>
88
<artifactId>client-storage</artifactId>
9-
<version>1.5.4-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>client-storage</name>
@@ -42,7 +42,7 @@
4242
</licenses>
4343

4444
<properties>
45-
<javaVersion>17</javaVersion>
45+
<javaVersion>21</javaVersion>
4646
<maven.compiler.release>${javaVersion}</maven.compiler.release>
4747

4848
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎codec-sha256/pom.xml‎

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

77
<groupId>software.xdev.sse</groupId>
88
<artifactId>codec-sha256</artifactId>
9-
<version>1.5.4-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>codec-sha256</name>
@@ -42,7 +42,7 @@
4242
</licenses>
4343

4444
<properties>
45-
<javaVersion>17</javaVersion>
45+
<javaVersion>21</javaVersion>
4646
<maven.compiler.release>${javaVersion}</maven.compiler.release>
4747

4848
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎crypto-symmetric-managed/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.sse</groupId>
88
<artifactId>crypto-symmetric-managed</artifactId>
9-
<version>1.5.4-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>crypto-symmetric-managed</name>
@@ -42,7 +42,7 @@
4242
</licenses>
4343

4444
<properties>
45-
<javaVersion>17</javaVersion>
45+
<javaVersion>21</javaVersion>
4646
<maven.compiler.release>${javaVersion}</maven.compiler.release>
4747

4848
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>org.springframework.boot</groupId>
5656
<artifactId>spring-boot-dependencies</artifactId>
57-
<version>3.5.9</version>
57+
<version>4.0.2</version>
5858
<type>pom</type>
5959
<scope>import</scope>
6060
</dependency>

‎crypto-symmetric/pom.xml‎

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

77
<groupId>software.xdev.sse</groupId>
88
<artifactId>crypto-symmetric</artifactId>
9-
<version>1.5.4-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>crypto-symmetric</name>
@@ -42,7 +42,7 @@
4242
</licenses>
4343

4444
<properties>
45-
<javaVersion>17</javaVersion>
45+
<javaVersion>21</javaVersion>
4646
<maven.compiler.release>${javaVersion}</maven.compiler.release>
4747

4848
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

0 commit comments

Comments
 (0)