Skip to content

Bump spring boot 4 #22

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

Merged
jvmdev4 merged 2 commits into from
Jul 28, 2026
Merged

Bump spring boot 4 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdbaa7a
Bump spring boot 4
jvmdev4 Jul 28, 2026
8e5de15
fix
jvmdev4 Jul 28, 2026
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
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ on:

jobs:
build:
uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v3
uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v4
with:
java-version: "25"
Comment thread
jvmdev4 marked this conversation as resolved.
Dismissed
4 changes: 3 additions & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@

jobs:
deploy:
uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v3
uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v4
with:
java-version: "25"
secrets:
server-username: ${{ secrets.OSSRH_USERNAME }}
server-password: ${{ secrets.OSSRH_TOKEN }}
deploy-secret-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
deploy-secret-key-password: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
101 changes: 57 additions & 44 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<parent>
<groupId>dev.vality</groupId>
<artifactId>library-parent-pom</artifactId>
<version>3.1.0</version>
<version>4.0.0</version>
<relativePath/>
</parent>

<artifactId>adapter-flow-lib</artifactId>
<version>1.1.0</version>
<version>2.0.0</version>
<packaging>jar</packaging>

<name>adapter-flow-lib</name>
Expand Down Expand Up @@ -44,65 +44,65 @@
<dockerfile.registry>${env.REGISTRY}</dockerfile.registry>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<woody.version>2.0.0</woody.version>
<bender-proto.version>1.20-be9cdeb</bender-proto.version>
<damsel.version>1.670-1d0c1ec</damsel.version>
<apache.commons.lang3.version>3.12.0</apache.commons.lang3.version>
<apache.commons.codec.version>1.15</apache.commons.codec.version>
<slf4j.version>1.7.36</slf4j.version>
<lombok.version>1.18.36</lombok.version>
<logback.version>1.2.11</logback.version>
<logstash-logback-encoder.version>7.1.1</logstash-logback-encoder.version>
<jackson.version>2.14.0</jackson.version>
<junit-jupiter-engine.version>5.10.3</junit-jupiter-engine.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<validation-api.version>3.0.2</validation-api.version>
<spring.version>6.1.6</spring.version>
<spring-boot-starter.version>3.3.1</spring-boot-starter.version>
<cds-proto.version>1.66-01353ce</cds-proto.version>
<adapter-common-lib.version>3.0.0</adapter-common-lib.version>
<woody.version>3.0.0</woody.version>
<bender-proto.version>1.27-753b935</bender-proto.version>
<damsel.version>1.698-99c91c9</damsel.version>
<spring-boot.version>4.0.6</spring-boot.version>
<lombok.version>1.18.46</lombok.version>
<logstash-logback-encoder.version>9.0</logstash-logback-encoder.version>
<maven-surefire-plugin.version>3.5.5</maven-surefire-plugin.version>
<cds-proto.version>1.71-b3db02c</cds-proto.version>
<msgpack-proto.version>1.17-7481bb4</msgpack-proto.version>
<geck.version>1.0.2</geck.version>
<adapter-common-lib.version>4.0.0</adapter-common-lib.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- springframework -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<version>${spring-boot-starter.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- Third party libs -->
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>${validation-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${apache.commons.lang3.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${apache.commons.codec.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand All @@ -113,13 +113,11 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -129,14 +127,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>

<!--Vality libs-->
Expand All @@ -152,12 +144,30 @@
<version>${woody.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>dev.vality.woody</groupId>
<artifactId>woody-api</artifactId>
<version>${woody.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>dev.vality.woody</groupId>
<artifactId>libthrift</artifactId>
<version>${woody.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>bender-proto</artifactId>
<version>${bender-proto.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>msgpack-proto</artifactId>
<version>${msgpack-proto.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>cds-proto</artifactId>
Expand All @@ -175,31 +185,27 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot-starter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<version>${spring-boot-starter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot-starter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter-engine.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>dev.vality.geck</groupId>
<artifactId>serializer</artifactId>
<version>0.0.1</version>
<version>${geck.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -221,6 +227,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<parameters>true</parameters>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
Expand Down
22 changes: 22 additions & 0 deletions src/main/java/dev/vality/adapter/flow/lib/logback/mask/MaskedEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
import ch.qos.logback.classic.spi.LoggerContextVO;
import lombok.RequiredArgsConstructor;
import org.slf4j.Marker;
import org.slf4j.event.KeyValuePair;

import java.util.List;
import java.util.Map;

@RequiredArgsConstructor
Expand Down Expand Up @@ -70,6 +72,11 @@ public Marker getMarker() {
return event.getMarker();
}

@Override
public List<Marker> getMarkerList() {
return event.getMarkerList();
}

@Override
public Map<String, String> getMDCPropertyMap() {
return event.getMDCPropertyMap();
Expand All @@ -85,6 +92,21 @@ public long getTimeStamp() {
return event.getTimeStamp();
}

@Override
public int getNanoseconds() {
return event.getNanoseconds();
}

@Override
public long getSequenceNumber() {
return event.getSequenceNumber();
}

@Override
public List<KeyValuePair> getKeyValuePairs() {
return event.getKeyValuePairs();
}

@Override
public void prepareForDeferredProcessing() {
// Do nothing
Expand Down
5 changes: 2 additions & 3 deletions ...main/java/dev/vality/adapter/flow/lib/logback/mask/PatternMaskingMessageJsonProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package dev.vality.adapter.flow.lib.logback.mask;

import ch.qos.logback.classic.spi.ILoggingEvent;
import com.fasterxml.jackson.core.JsonGenerator;
import net.logstash.logback.composite.AbstractFieldJsonProvider;
import net.logstash.logback.composite.FieldNamesAware;
import net.logstash.logback.composite.JsonWritingUtils;
import net.logstash.logback.fieldnames.LogstashFieldNames;
import tools.jackson.core.JsonGenerator;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
Expand All @@ -29,7 +28,7 @@ public PatternMaskingMessageJsonProvider() {
}

@Override
public void writeTo(JsonGenerator generator, ILoggingEvent event) throws IOException {
public void writeTo(JsonGenerator generator, ILoggingEvent event) {
JsonWritingUtils.writeStringField(generator, getFieldName(),
MaskingMessageWithPattern.maskMessage(event.getFormattedMessage(), multilinePattern)
);
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/dev/vality/adapter/flow/lib/serde/ParametersDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package dev.vality.adapter.flow.lib.serde;

import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import dev.vality.adapter.flow.lib.exception.DeserializationException;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import tools.jackson.core.JacksonException;
import tools.jackson.core.type.TypeReference;
import tools.jackson.databind.ObjectMapper;

import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
Expand All @@ -24,7 +24,7 @@ public Map<String, String> read(byte[] data) {
try {
return mapper.readValue(data, new TypeReference<HashMap<String, String>>() {
});
} catch (IOException ex) {
} catch (JacksonException ex) {
throw new IllegalArgumentException(ex);
}
}
Expand All @@ -41,4 +41,4 @@ public Map<String, String> read(HttpServletRequest request) {
.collect(Collectors.toMap(k -> k.getKey().trim(),
v -> v.getValue()[0]));
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/dev/vality/adapter/flow/lib/serde/ParametersSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package dev.vality.adapter.flow.lib.serde;

import com.fasterxml.jackson.databind.ObjectMapper;
import tools.jackson.databind.ObjectMapper;

import java.util.Map;

public class ParametersSerializer extends StateSerializer<Map<String, String>> {
public ParametersSerializer(ObjectMapper mapper) {
super(mapper);
}
}
}
10 changes: 5 additions & 5 deletions src/main/java/dev/vality/adapter/flow/lib/serde/StateSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package dev.vality.adapter.flow.lib.serde;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.SerializationException;
import tools.jackson.core.JacksonException;
import tools.jackson.databind.ObjectMapper;

import java.io.IOException;
import java.util.Base64;

@Getter
Expand All @@ -20,7 +20,7 @@ public abstract class StateSerializer<T> implements Serializer<T> {
public byte[] writeByte(Object obj) {
try {
return mapper.writeValueAsBytes(obj);
} catch (IOException e) {
} catch (JacksonException e) {
throw new SerializationException(e);
}
}
Expand All @@ -29,9 +29,9 @@ public byte[] writeByte(Object obj) {
public String writeString(Object obj) {
try {
return Base64.getEncoder().encodeToString(getMapper().writeValueAsBytes(obj));
} catch (IOException e) {
} catch (JacksonException e) {
throw new SerializationException(e);
}
}

}
}
Loading
Loading