Merge branch 'master' into context-accessor

transferwise · Nov 8, 2024 · 880a824 · 880a824
2 parents 498dacb + 952769e
commit 880a824
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,10 +18,8 @@ jobs:
       max-parallel: 100
       matrix:
         spring_boot_version:
+          - 3.3.1
           - 3.2.2
-          - 3.1.2
-          - 3.0.9
-          - 2.7.14
     container:
       image: azul/zulu-openjdk:17
     env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,11 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.1.0] - 2024-05-28
+## [2.1.0] - 2024-11-08
 
 ### Changed
 * Added ThreadLocalAccessor for TwContext so it can be available for libraries using micrometer context propagation API
 
+## [2.0.1] - 2024-07-16
+
+### Changed
+* Added support for Spring Boot 3.3.
+
 ## [2.0.0] - 2024-05-28
 
 ### Changed
@@ -22,8 +27,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [1.0.1] - 2024-02-21
 
 ### Changed
-* - Added support for Spring Boot 3.2.
-    - Updated dependencies.
+* Added support for Spring Boot 3.2.
+  * Updated dependencies.
 
 ## [1.0.0] - 2023-09-22
 

diff --git a/build.libraries.gradle b/build.libraries.gradle
@@ -1,5 +1,5 @@
 ext {
-    springBootVersion = "${System.getenv("SPRING_BOOT_VERSION") ?: '2.6.15'}"
+    springBootVersion = "${System.getenv("SPRING_BOOT_VERSION") ?: '3.2.2'}"
 
     libraries = [
             // version defined

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1,2 @@
 version=2.1.0
+