lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[#2845] Bump Spring boot to 4.x (#2941)

Browse Source 
Notes:
1. (!) Eclipselink shall be migrated to 5.0 (in 4.0.8 there are incompatible classes, e.g EJBQueryImpl doesn't implement some newer methods). In the moment is with beta (5.0.0-B12) - JUST for testing!
2. (!) Ethlo plugin doesn't work with Eclipselink 5.0, it builds with Eclipselink 4.0.8 (could be a problem)
3. Dependencies - new starters, test starters changes, some dependencies refactoring
4. Auto-configs split - package changes, some properties classes changes
5. Spring nullable org.springframework.lang.Nullable/NonNull are depecated and replaced with jspcify -> org.jspecify.annotations.Nullable/NonNull (NullMarked)
6. Lombok config - adding lombok.addNullAnnotations=jspecify - to do not mess annotations
7. Distributed lock table changes - SP_LOCK table db migration
8. Spring Retry replaced with Spring Core Retry - does repace retry in hawkbit
9. Specifications -> added Update/Delete(/Predicate) Specifications and JpaSpecificationExecutor changed
10. HawkbitBaseRepositoryFactoryBean modified to register properly
11. Jackson - 2 -> 3, package migrations, finals are not deserialized by default(enable finals deserialization, consider make non-final), too ‘smart’ tries to set complex objects instead of using non args constructor (-> @JsonIgnore), some other default configs made

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2026-04-14 11:31:41 +03:00
committed by GitHub
parent 23cd368e00
commit 1be473b22c
172 changed files with 1254 additions and 1045 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
pom.xml
View File

@@ -17,7 +17,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.13</version>
<version>4.0.5</version>
</parent>
<groupId>org.eclipse.hawkbit</groupId>
@@ -45,7 +45,7 @@
<!-- Override vulnerable commons-fileupload used by feign-form-spring (via spring-cloud-starter-openfeign) -->
<commons-fileupload.version>1.6.0</commons-fileupload.version>
<!-- Override commons-lang3 version since 3.17 is vulnerable -->
<commons-lang-version>3.20.0</commons-lang-version>
<commons-lang.version>3.20.0</commons-lang.version>
<!-- Overrides END -->
<revision>0-SNAPSHOT</revision>
@@ -56,9 +56,13 @@
<java.client.version>17</java.client.version>
<!-- must be the same as the parent version -->
<spring.boot.version>3.5.13</spring.boot.version>
<spring.cloud.version>2025.0.1</spring.cloud.version>
<springdoc-openapi.version>2.8.16</springdoc-openapi.version>
<spring.boot.version>4.0.5</spring.boot.version>
<spring.cloud.version>2025.1.1</spring.cloud.version>
<springdoc-openapi.version>3.0.3</springdoc-openapi.version>
<!-- openfeign versions -->
<spring-cloud-openfeign.version>5.0.1</spring-cloud-openfeign.version>
<openfeign-hc5.version>13.11</openfeign-hc5.version>
<!-- Spring boot version overrides (should be reviewed with every Spring boot upgrade) - START -->
<!-- Newer versions needed than defined in the Spring boot -->
@@ -66,7 +70,10 @@
<!-- Spring boot version overrides - END -->
<!-- Eclipselink - START -->
<eclipselink.version>4.0.9</eclipselink.version>
<!--
Ethlo plugin uses 4.x dependencies - since it only does static weaving - it should be fine - but should eventually upgrade its dependencies.
-->
<eclipselink.version>5.0.0</eclipselink.version>
<eclipselink.maven.plugin.version>3.0.2</eclipselink.maven.plugin.version>
<!-- Eclipselink - END -->
@@ -98,6 +105,7 @@
<license.maven.plugin.version>5.0.0</license.maven.plugin.version>
<central.publishing.maven.plugin.version>0.10.0</central.publishing.maven.plugin.version>
<maven.gpg.plugin.version>3.2.8</maven.gpg.plugin.version>
<spotless-maven-plugin.version>3.4.0</spotless-maven-plugin.version>
<!-- Maven Plugin versions - END -->
<!-- Test - START -->
@@ -222,7 +230,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang-version}</version>
<version>${commons-lang.version}</version>
</dependency>
<!-- Overrides END -->
@@ -259,25 +267,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-parameter-names</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
@@ -289,13 +278,51 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
<version>${springdoc-openapi.version}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc-openapi.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<version>${spring-cloud-openfeign.version}</version>
<!--
CVE-2025-48976: override commons-fileupload dependency - 1.5 -> 1.6.0,
remove it when spring-cloud-openfeign start bringing it down,
commons-fileupload 1.6.0(+) shall be added explicitly if needed
-->
<exclusions>
<exclusion>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-hc5</artifactId>
<version>${openfeign-hc5.version}</version>
</dependency>
<!-- Protostuff Io -->
<dependency>
<groupId>io.protostuff</groupId>
@@ -386,7 +413,7 @@
-->
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>3.4.0</version>
<version>${spotless-maven-plugin.version}</version>
<configuration>
<ratchetFrom>${ratchetFrom}</ratchetFrom>
<java>
@@ -755,4 +782,4 @@
<module>hawkbit-ui</module>
<module>hawkbit-sdk</module>
</modules>
</project>
</project>