From 483ac99924df8c0f1045cadb04a76bd4c539bf5f Mon Sep 17 00:00:00 2001 From: Douglas SIX Date: Sat, 12 Oct 2024 18:46:11 +0200 Subject: [PATCH 1/3] chore(bump): bump framework versions - mapstruct : 1.5.5.Final -> 1.6.2 - lombok : 1.18.32 -> 1.18.34 - snakeyaml : 2.2 -> 2.3 - spring-boot : 3.1.9 -> 3.3.4 - json : 20231013 -> 20240303 - guava : 33.0.0-jre -> 33.3.1-jre - junit : 5.9.1 -> 5.11.2 - testcontainers : 1.19.5 -> 1.20.2 --- api/pom.xml | 25 ------------------- .../ui/serdes/PropertyResolverImplTest.java | 8 +----- .../ui/service/ksql/KsqlApiClientTest.java | 11 ++++---- pom.xml | 16 ++++++------ 4 files changed, 14 insertions(+), 46 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index a892eba7f..4f1022ca7 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -265,31 +265,6 @@ dev.cel cel - - - ch.qos.logback - logback-classic - 1.4.12 - - - - ch.qos.logback - logback-core - 1.4.12 - - - - com.squareup.okhttp3 - logging-interceptor - 4.12.0 - - - - org.apache.commons - commons-compress - 1.26.0 - - diff --git a/api/src/test/java/io/kafbat/ui/serdes/PropertyResolverImplTest.java b/api/src/test/java/io/kafbat/ui/serdes/PropertyResolverImplTest.java index 59d650ef7..97d592dc6 100644 --- a/api/src/test/java/io/kafbat/ui/serdes/PropertyResolverImplTest.java +++ b/api/src/test/java/io/kafbat/ui/serdes/PropertyResolverImplTest.java @@ -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; @@ -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 diff --git a/api/src/test/java/io/kafbat/ui/service/ksql/KsqlApiClientTest.java b/api/src/test/java/io/kafbat/ui/service/ksql/KsqlApiClientTest.java index 7bfb7c22a..90e549662 100644 --- a/api/src/test/java/io/kafbat/ui/service/ksql/KsqlApiClientTest.java +++ b/api/src/test/java/io/kafbat/ui/service/ksql/KsqlApiClientTest.java @@ -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; @@ -80,11 +79,11 @@ 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")) @@ -92,11 +91,11 @@ private void assertLastKsqTutorialQueryResult(KsqlApiClient client) { 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)); diff --git a/pom.xml b/pom.xml index 75cae5bfc..1cf347c8f 100644 --- a/pom.xml +++ b/pom.xml @@ -40,23 +40,23 @@ 3.0.13 2.14.0 3.5.2 - 1.5.5.Final - 1.18.32 + 1.6.2 + 1.18.34 3.25.5 2.13.9 - 2.2 - 3.1.9 + 2.3 + 3.3.4 1.0.0 0.1.17 0.1.39 - 20231013 + 20240303 0.3.0 - 33.0.0-jre + 33.3.1-jre - 5.9.1 + 5.11.2 5.11.0 4.12.0 - 1.19.5 + 1.20.2 v18.17.1 From 8916443a237fbab2f8beaa180a0ab127d0ed16b8 Mon Sep 17 00:00:00 2001 From: Douglas SIX Date: Mon, 14 Oct 2024 20:30:21 +0200 Subject: [PATCH 2/3] chore(bump): bump framework versions - logback : 1.4.5 -> 1.4.12 - avro : 1.11.3 -> 1.11.4 --- api/pom.xml | 24 ++++++++++++++++++++++++ pom.xml | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/api/pom.xml b/api/pom.xml index 4f1022ca7..5e21dbd64 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -265,6 +265,30 @@ dev.cel cel + + + ch.qos.logback + logback-classic + 1.4.12 + + + + ch.qos.logback + logback-core + 1.4.12 + + + + com.squareup.okhttp3 + logging-interceptor + 4.12.0 + + + + org.apache.commons + commons-compress + 1.26.0 + diff --git a/pom.xml b/pom.xml index 1cf347c8f..e38658fbb 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 4.12.0 2.12.0 3.25.3 - 1.11.3 + 1.11.4 1.12.19 7.4.4 3.1.0 From 95fffc4fd2235e0dff85d4b3beb83e4f03a94568 Mon Sep 17 00:00:00 2001 From: Douglas SIX Date: Mon, 14 Oct 2024 21:03:58 +0200 Subject: [PATCH 3/3] chore(bump): bump framework versions Back to: - logback : 1.4.12 -> 1.5.8 --- api/pom.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 5e21dbd64..09297b840 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -266,18 +266,6 @@ cel - - ch.qos.logback - logback-classic - 1.4.12 - - - - ch.qos.logback - logback-core - 1.4.12 - - com.squareup.okhttp3 logging-interceptor