Skip to content

Commit 32b8304

Browse files
authored
Merge pull request #285 from SolaceProducts/boliao/DATAGO-117321-spring-boot-upgrade
DATAGO-117321: upgrade Spring Boot to 3.5.0
2 parents aecd7ec + 4c31d42 commit 32b8304

File tree

12 files changed

+18
-18
lines changed

12 files changed

+18
-18
lines changed

service/application/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ WORKDIR /opt/ema
2020

2121
ARG PLATFORM=linux_amd64
2222

23-
COPY tofu_1.10.6_amd64.apk /opt/ema/terraform
24-
RUN apk --update add --allow-untrusted /opt/ema/terraform/tofu_1.10.6_amd64.apk
23+
COPY tofu_1.10.7_amd64.apk /opt/ema/terraform
24+
RUN apk --update add --allow-untrusted /opt/ema/terraform/tofu_1.10.7_amd64.apk
2525

2626
COPY .terraformrc $HOME/.terraformrc
2727
RUN printf '#!/bin/ash\ntofu $*' > /opt/ema/terraform/terraform

service/application/docker/tofu_1.10.6_amd64.apk

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:d8d26633bf6eb41ec676623079caf9ba5ca21fb2607e4f6424d0aa25dcefe57e
3+
size 27992810

service/application/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
<name>Solace Event Management Agent - Application</name>
1414
<description>Solace Event Management Agent - Application</description>
1515
<properties>
16-
<spring-boot.version>3.4.10</spring-boot.version>
16+
<spring-boot.version>3.5.0</spring-boot.version>
1717
<snakeyaml.version>2.0</snakeyaml.version>
1818
<spring-security-rsa.version>1.1.3</spring-security-rsa.version>
19-
<spring-kafka.version>3.3.4</spring-kafka.version>
20-
<kafka-clients.version>3.8.1</kafka-clients.version>
19+
<spring-kafka.version>3.3.6</spring-kafka.version>
20+
<kafka-clients.version>3.9.1</kafka-clients.version>
2121
<jackson.version>2.16.1</jackson.version>
2222
<awaitility.version>4.2.0</awaitility.version>
2323
<dockerfile-maven.version>1.4.13</dockerfile-maven.version>

service/confluent-schema-registry-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<properties>
1111
<maven.compiler.source>17</maven.compiler.source>
1212
<maven.compiler.target>17</maven.compiler.target>
13-
<spring-boot.version>3.4.10</spring-boot.version>
13+
<spring-boot.version>3.5.0</spring-boot.version>
1414
<httpclient.version>4.5.14</httpclient.version>
1515
<mockwebserver.version>4.9.0</mockwebserver.version>
1616
<jupiter.version>5.10.2</jupiter.version>

service/kafka-plugin/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<properties>
1111
<maven.compiler.source>17</maven.compiler.source>
1212
<maven.compiler.target>17</maven.compiler.target>
13-
<spring-kafka.version>3.3.4</spring-kafka.version>
14-
<kafka-clients.version>3.8.1</kafka-clients.version>
15-
<spring-boot.version>3.4.10</spring-boot.version>
13+
<spring-kafka.version>3.3.6</spring-kafka.version>
14+
<kafka-clients.version>3.9.1</kafka-clients.version>
15+
<spring-boot.version>3.5.0</spring-boot.version>
1616
<commons-collections4.version>4.4</commons-collections4.version>
1717
<jupiter.version>5.10.2</jupiter.version>
1818
<camel.version>4.8.7</camel.version>

service/local-storage-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<snakeyaml.version>2.0</snakeyaml.version>
1616
<jacksondatabind.version>2.13.4.2</jacksondatabind.version>
1717
<junit.version>4.13.2</junit.version>
18-
<spring-boot.version>3.4.10</spring-boot.version>
18+
<spring-boot.version>3.5.0</spring-boot.version>
1919
<commons-collections4.version>4.4</commons-collections4.version>
2020
<jupiter.version>5.10.2</jupiter.version>
2121
<maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>

service/plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<maven.compiler.target>${java.version}</maven.compiler.target>
2424
<snakeyaml.version>2.0</snakeyaml.version>
2525
<jackson.version>2.16.1</jackson.version>
26-
<spring-boot.version>3.4.10</spring-boot.version>
26+
<spring-boot.version>3.5.0</spring-boot.version>
2727
</properties>
2828

2929
<dependencyManagement>

service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>3.4.10</version>
7+
<version>3.5.0</version>
88
<relativePath /> <!-- lookup parent from repository -->
99
</parent>
1010
<groupId>com.solace.maas</groupId>

service/rabbitmq-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<maven.compiler.source>17</maven.compiler.source>
1212
<maven.compiler.target>17</maven.compiler.target>
1313
<maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
14-
<spring-boot.version>3.4.10</spring-boot.version>
14+
<spring-boot.version>3.5.0</spring-boot.version>
1515
</properties>
1616
<dependencyManagement>
1717
<dependencies>

0 commit comments

Comments
 (0)