Skip to content

Commit

Permalink
Upgrade to Spring Boot 3.3 (#441)
Browse files Browse the repository at this point in the history
  • Loading branch information
pacphi authored May 25, 2024
1 parent 9e5b7c7 commit fbef811
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 40 deletions.
43 changes: 4 additions & 39 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.5</version>
<version>3.3.0</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
Expand All @@ -67,16 +67,10 @@

<properties>
<java.version>21</java.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<jackson-bom.version>2.17.0</jackson-bom.version>
<logback.version>1.4.14</logback.version>
<mockito.version>5.11.0</mockito.version>
<snakeyaml.version>2.2</snakeyaml.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<lombok.version>1.18.32</lombok.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -148,14 +142,10 @@
<artifactId>commons-csv</artifactId>
<version>1.10.0</version>
</dependency>
<!--
While it may be tempting to upgrade to address CVEs, DO NOT upgrade until CRC errors and corrupt TAR read requests are fixed
@see https://issues.apache.org/jira/browse/COMPRESS-666
-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.26.1</version>
<version>1.26.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -164,12 +154,11 @@
<dependency>
<groupId>com.sanctionco.jmail</groupId>
<artifactId>jmail</artifactId>
<version>1.6.2</version>
<version>1.6.3</version>
</dependency>
<dependency>
<groupId>com.sendgrid</groupId>
<artifactId>sendgrid-java</artifactId>
<version>4.10.2</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Expand Down Expand Up @@ -204,7 +193,6 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.25.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -304,19 +292,6 @@
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
<version>2.8.0</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>makeAggregateBom</goal>
</goals>
</execution>
</executions>
<configuration>
<outputFormat>json</outputFormat>
<outputName>classes/bom</outputName>
</configuration>
</plugin>
<plugin>
<groupId>org.projectlombok</groupId>
Expand Down Expand Up @@ -366,7 +341,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>generate-delomboked-sources-jar</id>
Expand Down Expand Up @@ -446,7 +420,6 @@
<plugin>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
<version>8.0.2</version>
<executions>
<execution>
<id>get-the-git-infos</id>
Expand All @@ -467,12 +440,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.16.2</version>
<configuration>
<generateBackupPoms>false</generateBackupPoms>
</configuration>
Expand Down Expand Up @@ -585,15 +556,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<configuration>
<argLine>${surefire.jacoco.args}</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.2.5</version>
<configuration>
<argLine>${failsafe.jacoco.args}</argLine>
</configuration>
Expand All @@ -609,7 +578,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>3.2.5</version>
<configuration>
<image>
<builder>paketobuildpacks/builder-jammy-tiny</builder>
Expand Down Expand Up @@ -747,7 +715,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<excludes>
<exclude>**/H2ConsoleConfig*</exclude>
Expand Down Expand Up @@ -785,7 +752,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<excludes>
<exclude>**/H2ConsoleConfig*</exclude>
Expand Down Expand Up @@ -839,7 +805,7 @@
<dependency>
<groupId>org.cftoolsuite.actuator</groupId>
<artifactId>spring-boot-starter-runtime-metadata</artifactId>
<version>0.3.0</version>
<version>0.4.0</version>
</dependency>
</dependencies>
</profile>
Expand All @@ -866,7 +832,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.16.2</version>
<reportSets>
<reportSet>
<reports>
Expand Down
6 changes: 5 additions & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ management:
endpoints:
web:
exposure:
include: info,health,metrics,scheduledtasks,loggers,prometheus
include: info,health,metrics,scheduledtasks,loggers,prometheus,sbom
endpoint:
health:
show-details: always
Expand Down Expand Up @@ -140,3 +140,7 @@ spring:
# SendGrid API key (alternative to username/password).
sendgrid:
api-key: replace_me

threads:
virtual:
enabled: true

0 comments on commit fbef811

Please sign in to comment.