Skip to content

Bump org.springframework.boot:spring-boot-starter-parent from 3.5.7 to 4.0.0 #810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

Bump org.springframework.boot:spring-boot-starter-parent from 3.5.7 to 4.0.0 #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ad6bdf9
Bump org.springframework.boot:spring-boot-starter-parent
dependabot[bot] Nov 24, 2025
3e789fc
switch from spring-boot-starter-aop to spring-boot-starter-aspectj
dennisvang Nov 26, 2025
9eda3bc
use spring-boot-starter-webmvc instead of the older spring-boot-start…
dennisvang Nov 26, 2025
5fcfd39
add spring-boot-starter-security-test for consistency
dennisvang Nov 26, 2025
81487fc
remove spring-security-test dependency
dennisvang Nov 26, 2025
6ef40c2
add spring-boot-starter-data-jpa-test dependency
dennisvang Nov 26, 2025
13ef9ce
remove spring-boot-starter-test dependency
dennisvang Nov 26, 2025
3ffc059
add spring-boot-starter-flyway dependency
dennisvang Nov 26, 2025
310ea42
replace PostgreSQLEnumJdbcType by SqlTypes.NAMED_ENUM
dennisvang Nov 26, 2025
a643185
upgrade to hypersistence-utils-hibernate-71 dependency
dennisvang Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 26 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.7</version>
<version>4.0.0</version>
<!-- spring-boot managed dependencies: https://docs.spring.io/spring-boot/appendix/dependency-versions/coordinates.html -->
<relativePath/> <!-- lookup parent from repository -->
</parent>
Expand Down Expand Up @@ -104,7 +104,7 @@
<!-- ////////////////// -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<artifactId>spring-boot-starter-webmvc</artifactId>
<exclusions>
<exclusion>
<!-- excluded because we're using spring-boot-starter-log4j2 instead (see spring-boot logging docs) -->
Expand All @@ -129,6 +129,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-flyway</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-acl</artifactId>
Expand All @@ -139,7 +143,7 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
<artifactId>spring-boot-starter-aspectj</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -207,7 +211,7 @@
</dependency>
<dependency>
<groupId>io.hypersistence</groupId>
<artifactId>hypersistence-utils-hibernate-63</artifactId>
<artifactId>hypersistence-utils-hibernate-71</artifactId>
<version>${hypersistence.version}</version>
</dependency>

Expand All @@ -222,18 +226,27 @@
<!-- ////////////////// -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<artifactId>spring-boot-starter-aspectj-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.vaadin.external.google</groupId>
<artifactId>android-json</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webmvc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-flyway-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/fairdatapoint/entity/index/entry/IndexEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
import lombok.experimental.SuperBuilder;
import org.fairdatapoint.entity.base.BaseEntity;
import org.fairdatapoint.entity.index.event.IndexEvent;
import org.hibernate.annotations.JdbcType;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.annotations.Type;
import org.hibernate.dialect.PostgreSQLEnumJdbcType;
import org.hibernate.type.SqlTypes;

import java.time.Duration;
import java.time.Instant;
Expand Down Expand Up @@ -60,13 +60,13 @@ public class IndexEntry extends BaseEntity {

@NotNull
@Enumerated(EnumType.STRING)
@JdbcType(PostgreSQLEnumJdbcType.class)
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Column(name = "state", columnDefinition = "INDEX_ENTRY_STATE", nullable = false)
private IndexEntryState state = IndexEntryState.UNKNOWN;

@NotNull
@Enumerated(EnumType.STRING)
@JdbcType(PostgreSQLEnumJdbcType.class)
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Column(name = "permit", columnDefinition = "INDEX_ENTRY_PERMIT", nullable = false)
private IndexEntryPermit permit = IndexEntryPermit.PENDING;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/fairdatapoint/entity/index/event/IndexEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
import org.fairdatapoint.entity.base.BaseEntity;
import org.fairdatapoint.entity.index.entry.IndexEntry;
import org.fairdatapoint.entity.index.event.payload.*;
import org.hibernate.annotations.JdbcType;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.annotations.Type;
import org.hibernate.dialect.PostgreSQLEnumJdbcType;
import org.hibernate.type.SqlTypes;

import java.time.Instant;

Expand All @@ -50,7 +50,7 @@ public class IndexEvent extends BaseEntity {

@NotNull
@Enumerated(EnumType.STRING)
@JdbcType(PostgreSQLEnumJdbcType.class)
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Column(name = "type", columnDefinition = "INDEX_EVENT_TYPE", nullable = false)
private IndexEventType type;

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
import lombok.*;
import lombok.experimental.SuperBuilder;
import org.fairdatapoint.entity.base.BaseEntityCustomUUID;
import org.hibernate.annotations.JdbcType;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.annotations.Type;
import org.hibernate.dialect.PostgreSQLEnumJdbcType;
import org.hibernate.type.SqlTypes;

import java.util.HashSet;
import java.util.List;
Expand Down Expand Up @@ -83,7 +83,7 @@ public class MetadataSchemaVersion extends BaseEntityCustomUUID {

@NotNull
@Enumerated(EnumType.STRING)
@JdbcType(PostgreSQLEnumJdbcType.class)
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Column(name = "type", columnDefinition = "METADATA_SCHEMA_TYPE", nullable = false)
private MetadataSchemaType type;

Expand All @@ -95,7 +95,7 @@ public class MetadataSchemaVersion extends BaseEntityCustomUUID {

@NotNull
@Enumerated(EnumType.STRING)
@JdbcType(PostgreSQLEnumJdbcType.class)
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Column(name = "state", columnDefinition = "METADATA_SCHEMA_STATE", nullable = false)
private MetadataSchemaState state;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/fairdatapoint/entity/search/SearchSavedQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import lombok.experimental.SuperBuilder;
import org.fairdatapoint.entity.base.BaseEntity;
import org.fairdatapoint.entity.user.UserAccount;
import org.hibernate.annotations.JdbcType;
import org.hibernate.dialect.PostgreSQLEnumJdbcType;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.type.SqlTypes;

@Entity(name = "SearchSavedQuery")
@Table(name = "search_saved_query")
Expand All @@ -55,7 +55,7 @@ public class SearchSavedQuery extends BaseEntity {

@NotNull
@Enumerated(EnumType.STRING)
@JdbcType(PostgreSQLEnumJdbcType.class)
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Column(name = "type", columnDefinition = "SAVED_QUERY_TYPE", nullable = false)
private SearchSavedQueryType type;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import lombok.experimental.SuperBuilder;
import org.fairdatapoint.entity.base.BaseEntity;
import org.fairdatapoint.entity.search.SearchFilterType;
import org.hibernate.annotations.JdbcType;
import org.hibernate.dialect.PostgreSQLEnumJdbcType;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.type.SqlTypes;

import java.util.List;

Expand All @@ -44,7 +44,7 @@ public class SettingsSearchFilter extends BaseEntity {

@NotNull
@Enumerated(EnumType.STRING)
@JdbcType(PostgreSQLEnumJdbcType.class)
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Column(name = "type", columnDefinition = "SEARCH_FILTER_TYPE", nullable = false)
private SearchFilterType type;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/fairdatapoint/entity/user/UserAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import org.fairdatapoint.entity.apikey.ApiKey;
import org.fairdatapoint.entity.base.BaseEntity;
import org.fairdatapoint.entity.search.SearchSavedQuery;
import org.hibernate.annotations.JdbcType;
import org.hibernate.dialect.PostgreSQLEnumJdbcType;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.type.SqlTypes;

import java.util.List;
import java.util.UUID;
Expand Down Expand Up @@ -62,7 +62,7 @@ public class UserAccount extends BaseEntity {

@NotNull
@Enumerated(EnumType.STRING)
@JdbcType(PostgreSQLEnumJdbcType.class)
@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Column(name = "user_role", columnDefinition = "USER_ROLE", nullable = false)
private UserRole role;

Expand Down
Loading