theborakompanioni · theborakompanioni · Oct 28, 2023 · Oct 25, 2023 · Oct 25, 2023 · Oct 25, 2023
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [ 17, 18 ]
+        java-version: [ 17, 18, 21 ]
 
     steps:
       - name: Checkout Code

diff --git a/...c/main/java/org/tbk/bitcoin/fee/example/BitcoinFeeExampleApplicationWebMvcConfigurer.java b/...c/main/java/org/tbk/bitcoin/fee/example/BitcoinFeeExampleApplicationWebMvcConfigurer.java
@@ -95,7 +95,6 @@ private static void configureObjectMapper(ObjectMapper objectMapper) {
                 .enable(SerializationFeature.INDENT_OUTPUT)
                 .enable(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN)
                 .enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
-                .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
                 .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
     }
 

diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,6 @@
+import com.github.spotbugs.snom.Confidence
+import com.github.spotbugs.snom.Effort
+import com.github.spotbugs.snom.SpotBugsTask
 import io.franzbecker.gradle.lombok.task.DelombokTask
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
@@ -30,7 +33,7 @@ plugins {
     id 'nebula.release' version '17.2.2'
     id 'nebula.lint' version '18.1.0'
     id 'com.netflix.nebula.project' version '10.1.5'
-    id 'com.github.spotbugs' version '5.0.13' apply false
+    id 'com.github.spotbugs' version '5.2.1' apply false
     id 'net.bytebuddy.byte-buddy-gradle-plugin' version "$bytebuddyPluginVersion" apply false
     id 'org.springframework.boot' version "$springBootGradlePluginVersion" apply false
     id 'io.franzbecker.gradle-lombok' version '5.0.0' apply false
@@ -287,13 +290,13 @@ subprojects {
     }
 
     spotbugs {
-        effort = 'max'
-        reportLevel = 'medium' // TODO: set to 'low' to also find 'low confidence issues'
+        effort = Effort.MAX
+        reportLevel = Confidence.MEDIUM // TODO: set to 'LOW' to also find 'low confidence issues'
         ignoreFailures = false
         excludeFilter = rootProject.file('./spotbugs-exclude.xml')
         reportsDir = rootProject.file("$rootProject.buildDir/reports/spotbugs/$project.name")
     }
-    tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
+    tasks.withType(SpotBugsTask) {
         onlyIf { gradle.taskGraph.hasTask('build') }
         reports {
             html.required = true

diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
@@ -8,8 +8,8 @@ com.fasterxml.jackson.core:jackson-databind:2.14.2=classpath
 com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.2=classpath
 com.fasterxml.jackson:jackson-bom:2.14.2=classpath
 com.fasterxml:classmate:1.5.1=classpath
-com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.13=classpath
-com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.0.13=classpath
+com.github.spotbugs.snom:spotbugs-gradle-plugin:5.2.1=classpath
+com.github.spotbugs:com.github.spotbugs.gradle.plugin:5.2.1=classpath
 com.github.zafarkhaja:java-semver:0.9.0=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.gradle:osdetector-gradle-plugin:1.7.3=classpath

diff --git a/changelog.md b/changelog.md
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - upgrade: update jeromq from v0.5.3 to v0.5.4
 - upgrade: update lnd testcontainer from v0.16.2-beta to v0.17.0-beta
 - upgrade: update cln testcontainer from v23.05 to v23.08
+- upgrade: update lombok from v1.18.26 to v1.18.30
 
 ## [0.10.0] - 2023-06-27
 ### Breaking

diff --git a/...ava/org/tbk/bitcoin/autodca/example/BitcoinAutoDcaExampleApplicationWebMvcConfigurer.java b/...ava/org/tbk/bitcoin/autodca/example/BitcoinAutoDcaExampleApplicationWebMvcConfigurer.java
@@ -77,7 +77,6 @@ private static void configureObjectMapper(ObjectMapper objectMapper) {
                 .enable(SerializationFeature.INDENT_OUTPUT)
                 .enable(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN)
                 .enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
-                .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
                 .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
     }
 

diff --git a/...src/main/java/org/tbk/bitcoin/autodca/example/BitcoinAutoDcaExampleWebSecurityConfig.java b/...src/main/java/org/tbk/bitcoin/autodca/example/BitcoinAutoDcaExampleWebSecurityConfig.java
@@ -83,7 +83,6 @@ private static void configureObjectMapper(ObjectMapper objectMapper) {
                 .enable(SerializationFeature.INDENT_OUTPUT)
                 .enable(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN)
                 .enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
-                .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
                 .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
     }
 

diff --git a/...g/tbk/bitcoin/exchange/example/BitcoinExchangeRateExampleApplicationWebMvcConfigurer.java b/...g/tbk/bitcoin/exchange/example/BitcoinExchangeRateExampleApplicationWebMvcConfigurer.java
@@ -75,7 +75,6 @@ private static void configureObjectMapper(ObjectMapper objectMapper) {
                 .enable(SerializationFeature.INDENT_OUTPUT)
                 .enable(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN)
                 .enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
-                .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
                 .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
     }
 

diff --git a/...a/org/tbk/electrum/gateway/example/ElectrumGatewayExampleApplicationWebMvcConfigurer.java b/...a/org/tbk/electrum/gateway/example/ElectrumGatewayExampleApplicationWebMvcConfigurer.java
@@ -70,7 +70,6 @@ private static void configureObjectMapper(ObjectMapper objectMapper) {
                 .enable(SerializationFeature.INDENT_OUTPUT)
                 .enable(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN)
                 .enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
-                .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
                 .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
     }
 

diff --git a/...aymentExampleApplicationWebMvcConfig.java → ...ntExampleApplicationWebMvcConfigurer.java b/...aymentExampleApplicationWebMvcConfig.java → ...ntExampleApplicationWebMvcConfigurer.java
@@ -21,7 +21,7 @@
 
 @EnableWebMvc
 @Configuration(proxyBeanMethods = false)
-class BitcoinPaymentExampleApplicationWebMvcConfig implements WebMvcConfigurer {
+class BitcoinPaymentExampleApplicationWebMvcConfigurer implements WebMvcConfigurer {
 
     private static final String[] CLASSPATH_RESOURCE_LOCATIONS = {
             "classpath:/META-INF/resources/",
@@ -79,7 +79,6 @@ private static void configureObjectMapper(ObjectMapper objectMapper) {
                 .enable(SerializationFeature.INDENT_OUTPUT)
                 .enable(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN)
                 .enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
-                .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
                 .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
     }
 

diff --git a/.../org/tbk/lightning/playground/example/LnPlaygroundExampleApplicationWebMvcConfigurer.java b/.../org/tbk/lightning/playground/example/LnPlaygroundExampleApplicationWebMvcConfigurer.java
@@ -70,7 +70,6 @@ private static void configureObjectMapper(ObjectMapper objectMapper) {
                 .enable(SerializationFeature.INDENT_OUTPUT)
                 .enable(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN)
                 .enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
-                .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
                 .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
     }
 

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
@@ -2393,6 +2393,51 @@ MlEyYEHOMfyltyeS7Kyb69yjlFa2b6oZFE5Xd5Ba2O/1TbXtog==
 =X8xu
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    C7CA19B7B620D787
+uid    Stephen Connolly <stephenc@apache.org>
+
+sub    7679164AA2590985
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+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
+wRo6LpahA0hXIR/dwnekHH7Faw==
+=sl+a
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    C84125C13BF6F2F2
 uid    Andrew Oberstar (@ajoberstar) <andrew@ajoberstar.org>
 
@@ -3785,6 +3830,24 @@ d4hAEEyxBo3hnLb1
 =7o0R
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    FB2EA0369C925EE1
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQINBGUFZeEBEACl/bYA+BvSw5YyqNJ+KDzJbx2DD4i/JXYyT2Z83bE8CYBhAegm
+Ygiql4ejYhb1opWPIDopVXZ3DOyMivvS68foQ6UA+4ohOydaqTAHPRnn/+5GZFFM
+kfuA7KLZhEYRP6wkEmRNm63q9TIg4b80nssXbWKHNAar9VWk3yIKgsRsSXf1o9bh
+IrbCPh74qyFd0aWDbLUdZd1YFPT67IQbdPkioLp5TzPAHLuOp3qZuQEOu7ouRI6S
+P7eW0nkSIDcGRG41mgeveTfduIM3HxayTAiKsooBfsEtzVIsczW9qFP2wJ3ZiZt5
+iMj6WFH7J+dQYXndZF4r7iFB4M/tSOVhKUmSLoJgdF39h4WolCuICGM3DlmshPHG
+rrTNcrACDSm1bYbG1UG45cBexNflyjGHyUua9eAqjrBmH7IUHiiLY8mTx9kTy8Ne
+DK8y9XEDxv2M80k8h5JPXT3fxhNkqb5swrXx5gtR+tmfwg35tulmfKPcNvubQgOO
+5eQ0ansIc6wGgRZ6rVemcL/LNNLrCP4tok+WpzzD41bw/deEMNuTxwsOX9vMy8UM
+9RtwxBWQMdgAvxaqQvZPCzxqIlVGcYFsxyIPMNbBwb9DjX0saQzQCASZcuiTDNGe
+2YmzG7UT1ka90clfFh8a3MDTE5YtgL9xw3lpS9Zsjsbd6r8jMiGFcgrfDwARAQAB
+=9mlP
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    012579464D01C06A
 uid    Herve Boutemy <hboutemy@apache.org>
 
@@ -9106,21 +9169,3 @@ pQ9qfkmZ29fXqlz5kXWxcCbU0BU6pnxzhgL+p63JkjhHWtp0hkPl+EuRkxUQQp8j
 lzfbO7TqqjggAytCb7+LnQtRfAs6UxyyWbFB
 =8HAr
 -----END PGP PUBLIC KEY BLOCK-----
-
-pub    FB2EA0369C925EE1
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.68
-
-mQINBGUFZeEBEACl/bYA+BvSw5YyqNJ+KDzJbx2DD4i/JXYyT2Z83bE8CYBhAegm
-Ygiql4ejYhb1opWPIDopVXZ3DOyMivvS68foQ6UA+4ohOydaqTAHPRnn/+5GZFFM
-kfuA7KLZhEYRP6wkEmRNm63q9TIg4b80nssXbWKHNAar9VWk3yIKgsRsSXf1o9bh
-IrbCPh74qyFd0aWDbLUdZd1YFPT67IQbdPkioLp5TzPAHLuOp3qZuQEOu7ouRI6S
-P7eW0nkSIDcGRG41mgeveTfduIM3HxayTAiKsooBfsEtzVIsczW9qFP2wJ3ZiZt5
-iMj6WFH7J+dQYXndZF4r7iFB4M/tSOVhKUmSLoJgdF39h4WolCuICGM3DlmshPHG
-rrTNcrACDSm1bYbG1UG45cBexNflyjGHyUua9eAqjrBmH7IUHiiLY8mTx9kTy8Ne
-DK8y9XEDxv2M80k8h5JPXT3fxhNkqb5swrXx5gtR+tmfwg35tulmfKPcNvubQgOO
-5eQ0ansIc6wGgRZ6rVemcL/LNNLrCP4tok+WpzzD41bw/deEMNuTxwsOX9vMy8UM
-9RtwxBWQMdgAvxaqQvZPCzxqIlVGcYFsxyIPMNbBwb9DjX0saQzQCASZcuiTDNGe
-2YmzG7UT1ka90clfFh8a3MDTE5YtgL9xw3lpS9Zsjsbd6r8jMiGFcgrfDwARAQAB
-=9mlP
------END PGP PUBLIC KEY BLOCK-----