Merge pull request #3 from alvasw/use_jackson_libs_from_dao_node

Use jackson-core (2.13.1) libraries from dao-node
HenrikJannsen · Jul 13, 2023 · 28570b0 · 28570b0
2 parents 6ca153f + 22b47c7
commit 28570b0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/bisq b/bisq
diff --git a/build.gradle b/build.gradle
@@ -38,7 +38,11 @@ dependencies {
 
     implementation 'bisq:assets'
     implementation 'bisq:common'
-    implementation 'bisq:core'
+    implementation('bisq:core') {
+        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
+        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
+        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
+    }
     implementation 'bisq:p2p'
 
     implementation libs.chimp.jsocks

diff --git a/platform/build.gradle b/platform/build.gradle
@@ -6,8 +6,9 @@ dependencies {
     constraints {
         api 'org.apache.commons:commons-lang3:3.11'
 
-        api 'com.fasterxml.jackson.core:jackson-annotations:2.12.1'
-        api 'com.fasterxml.jackson.core:jackson-core:2.12.1'
-        api 'com.fasterxml.jackson.core:jackson-databind:2.12.1'
+        api 'com.fasterxml.jackson.core:jackson-annotations:2.13.1'
+        api 'com.fasterxml.jackson.core:jackson-core:2.13.1'
+        api 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
+        api 'com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.12.7'
     }
 }
+24 −2		.github/workflows/build.yml
+4 −11		apitest/dao-setup.gradle
+20 −11		apitest/src/main/java/bisq/apitest/Scaffold.java
+11 −0		apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java
+4 −2		apitest/src/main/java/bisq/apitest/linux/BisqProcess.java
+1 −2		apitest/src/test/java/bisq/apitest/ApiTestCase.java
+0 −1		apitest/src/test/java/bisq/apitest/method/CallRateMeteringInterceptorTest.java
+2 −7		apitest/src/test/java/bisq/apitest/method/MethodTest.java
+0 −5		apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java
+0 −4		apitest/src/test/java/bisq/apitest/method/offer/BsqSwapOfferTest.java
+26 −6		apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java
+0 −4		apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java
+1 −1		apitest/src/test/java/bisq/apitest/method/trade/TakeSellXMROfferTest.java
+0 −1		apitest/src/test/java/bisq/apitest/method/wallet/BsqWalletTest.java
+0 −1		apitest/src/test/java/bisq/apitest/method/wallet/BtcTxFeeRateTest.java
+0 −1		apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java
+0 −5		apitest/src/test/java/bisq/apitest/scenario/OfferTest.java
+0 −1		apitest/src/test/java/bisq/apitest/scenario/StartupTest.java
+0 −1		apitest/src/test/java/bisq/apitest/scenario/WalletTest.java
+8 −5		build-logic/commons/src/main/groovy/bisq.java-conventions.gradle
+6 −12		build.gradle
+26 −0		code-coverage-report/build.gradle
+13 −0		core/src/main/java/bisq/core/dao/burningman/BurningManPresentationService.java
+9 −0		core/src/main/java/bisq/core/dao/burningman/accounting/BurningManAccountingService.java
+7 −6		core/src/main/java/bisq/core/dao/burningman/accounting/node/AccountingNodeProvider.java
+10 −0		core/src/main/java/bisq/core/dao/burningman/accounting/storage/BurningManAccountingStore.java
+21 −0		core/src/main/java/bisq/core/dao/burningman/accounting/storage/BurningManAccountingStoreService.java
+18 −3		core/src/main/java/bisq/core/user/Preferences.java
+8 −2		core/src/main/java/bisq/core/user/PreferencesPayload.java
+22 −0		core/src/main/resources/i18n/displayStrings.properties
+1 −1		core/src/test/java/bisq/core/user/PreferencesTest.java
+8 −5		desktop/src/main/java/bisq/desktop/main/dao/burnbsq/burningman/BurningManView.java
+41 −0		desktop/src/main/java/bisq/desktop/main/dao/burnbsq/proofofburn/ProofOfBurnView.java
+16 −30		desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java
+12 −7		desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
+112 −19		desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
+1 −1		desktop/src/test/java/bisq/desktop/maker/PreferenceMakers.java
+69 −0		gradle/verification-metadata.xml
+9 −0		platform/build.gradle
+5 −8		proto/build.gradle
+1 −0		proto/src/main/proto/pb.proto
+2 −0		settings.gradle