Skip to content
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

Jump to bottom

Go to Spring Boot 3.3.4 #606

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Go to Spring Boot 3.3.4 #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
483ac99
chore(bump): bump framework versions
sixdouglas Oct 12, 2024
8916443
chore(bump): bump framework versions
sixdouglas Oct 14, 2024
95fffc4
chore(bump): bump framework versions
sixdouglas Oct 14, 2024
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
13 changes: 0 additions & 13 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,18 +266,6 @@
<artifactId>cel</artifactId>
</dependency>
<!-- CVE fixes -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.4.12</version>
</dependency>
<!-- CVE fixes -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.4.12</version>
</dependency>
<!-- CVE fixes -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
Expand All @@ -289,7 +277,6 @@
<artifactId>commons-compress</artifactId>
<version>1.26.0</version>
</dependency>

</dependencies>

<build>
Expand Down
8 changes: 1 addition & 7 deletions api/src/test/java/io/kafbat/ui/serdes/PropertyResolverImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

import java.util.List;
import java.util.Map;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.boot.context.properties.bind.BindException;
Expand All @@ -21,11 +19,7 @@ class PropertyResolverImplTest {

private final MockEnvironment env = new MockEnvironment();

@Data
@AllArgsConstructor
public static class CustomPropertiesClass {
private String f1;
private Integer f2;
public record CustomPropertiesClass(String f1, Integer f2) {
}

@Test
Expand Down
11 changes: 5 additions & 6 deletions api/src/test/java/io/kafbat/ui/service/ksql/KsqlApiClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
import static org.assertj.core.api.Assertions.assertThat;

import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.DecimalNode;
import com.fasterxml.jackson.databind.node.DoubleNode;
import com.fasterxml.jackson.databind.node.IntNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.TextNode;
import io.kafbat.ui.AbstractIntegrationTest;
import java.math.BigDecimal;
import java.time.Duration;
import java.util.Map;
import org.junit.jupiter.api.AfterAll;
Expand Down Expand Up @@ -80,23 +79,23 @@ private void assertLastKsqTutorialQueryResult(KsqlApiClient client) {
assertThat(header.getValues()).isNull();
})
.assertNext(row -> {
var distance = (DecimalNode) row.getValues().get(0).get(0);
var distance = (DoubleNode) row.getValues().get(0).get(0);
var riders = (ArrayNode) row.getValues().get(0).get(1);
var count = (IntNode) row.getValues().get(0).get(2);

assertThat(distance).isEqualTo(new DecimalNode(new BigDecimal(0)));
assertThat(distance).isEqualTo(new DoubleNode(0D));
assertThat(riders).isEqualTo(new ArrayNode(JsonNodeFactory.instance)
.add(new TextNode("4ab5cbad"))
.add(new TextNode("8b6eae59"))
.add(new TextNode("4a7c7b41")));
assertThat(count).isEqualTo(new IntNode(3));
})
.assertNext(row -> {
var distance = (DecimalNode) row.getValues().get(0).get(0);
var distance = (DoubleNode) row.getValues().get(0).get(0);
var riders = (ArrayNode) row.getValues().get(0).get(1);
var count = (IntNode) row.getValues().get(0).get(2);

assertThat(distance).isEqualTo(new DecimalNode(new BigDecimal(10)));
assertThat(distance).isEqualTo(new DoubleNode(10D));
assertThat(riders).isEqualTo(new ArrayNode(JsonNodeFactory.instance)
.add(new TextNode("18f4ea86")));
assertThat(count).isEqualTo(new IntNode(1));
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,30 +33,30 @@
<antlr4-maven-plugin.version>4.12.0</antlr4-maven-plugin.version>
<apache.commons.version>2.12.0</apache.commons.version>
<assertj.version>3.25.3</assertj.version>
<avro.version>1.11.3</avro.version>
<avro.version>1.11.4</avro.version>
<byte-buddy.version>1.12.19</byte-buddy.version>
<confluent.version>7.4.4</confluent.version>
<datasketches-java.version>3.1.0</datasketches-java.version>
<groovy.version>3.0.13</groovy.version>
<jackson.version>2.14.0</jackson.version>
<kafka-clients.version>3.5.2</kafka-clients.version>
<org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
<org.projectlombok.version>1.18.32</org.projectlombok.version>
<org.mapstruct.version>1.6.2</org.mapstruct.version>
<org.projectlombok.version>1.18.34</org.projectlombok.version>
<protobuf-java.version>3.25.5</protobuf-java.version>
<scala-lang.library.version>2.13.9</scala-lang.library.version>
<snakeyaml.version>2.2</snakeyaml.version>
<spring-boot.version>3.1.9</spring-boot.version>
<snakeyaml.version>2.3</snakeyaml.version>
<spring-boot.version>3.3.4</spring-boot.version>
<serde-api.version>1.0.0</serde-api.version>
<odd-oddrn-generator.version>0.1.17</odd-oddrn-generator.version>
<odd-oddrn-client.version>0.1.39</odd-oddrn-client.version>
<org.json.version>20231013</org.json.version>
<org.json.version>20240303</org.json.version>
<dev.cel.version>0.3.0</dev.cel.version>
<guava.version>33.0.0-jre</guava.version>
<guava.version>33.3.1-jre</guava.version>
<!-- Test dependency versions -->
<junit.version>5.9.1</junit.version>
<junit.version>5.11.2</junit.version>
<mockito.version>5.11.0</mockito.version>
<okhttp3.mockwebserver.version>4.12.0</okhttp3.mockwebserver.version>
<testcontainers.version>1.19.5</testcontainers.version>
<testcontainers.version>1.20.2</testcontainers.version>

<!-- Frontend dependency versions -->
<node.version>v18.17.1</node.version>
Expand Down
Loading