From fe8d583fdde27b101f46d36e3f04d5416e668bda Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Thu, 21 Mar 2024 12:09:24 +0100 Subject: [PATCH 1/3] (sys) Upgrade to JDK22 This also entails upgrading JIB to 3.4.1 and Lombok to 1.18.32. --- build.gradle | 6 +++--- code/common/config/build.gradle | 2 +- code/common/db/build.gradle | 2 +- code/common/linkdb/build.gradle | 2 +- code/common/model/build.gradle | 2 +- code/common/process/build.gradle | 2 +- code/common/renderer/build.gradle | 2 +- code/common/service/build.gradle | 2 +- code/execution/api/build.gradle | 2 +- code/execution/build.gradle | 2 +- code/features-convert/adblock/build.gradle | 2 +- code/features-convert/anchor-keywords/build.gradle | 2 +- code/features-convert/data-extractors/build.gradle | 2 +- code/features-convert/keyword-extraction/build.gradle | 2 +- code/features-convert/pubdate/build.gradle | 2 +- code/features-convert/reddit-json/build.gradle | 2 +- code/features-convert/stackexchange-xml/build.gradle | 2 +- code/features-convert/summary-extraction/build.gradle | 2 +- code/features-convert/topic-detection/build.gradle | 2 +- code/features-crawl/content-type/build.gradle | 2 +- code/features-crawl/crawl-blocklist/build.gradle | 2 +- code/features-crawl/link-parser/build.gradle | 2 +- code/features-search/feedlot-client/build.gradle | 2 +- code/features-search/random-websites/build.gradle | 2 +- code/features-search/screenshots/build.gradle | 2 +- code/functions/domain-info/api/build.gradle | 2 +- code/functions/domain-info/build.gradle | 2 +- code/functions/link-graph/aggregate/build.gradle | 2 +- code/functions/link-graph/api/build.gradle | 2 +- code/functions/link-graph/partition/build.gradle | 2 +- code/functions/math/api/build.gradle | 2 +- code/functions/math/build.gradle | 2 +- code/functions/search-query/api/build.gradle | 2 +- code/functions/search-query/build.gradle | 2 +- code/index/api/build.gradle | 2 +- code/index/build.gradle | 2 +- code/index/index-forward/build.gradle | 2 +- code/index/index-journal/build.gradle | 2 +- code/index/index-reverse/build.gradle | 2 +- code/index/query/build.gradle | 2 +- code/libraries/array/build.gradle | 4 ++-- code/libraries/big-string/build.gradle | 2 +- code/libraries/blocking-thread-pool/build.gradle | 2 +- code/libraries/braille-block-punch-cards/build.gradle | 2 +- code/libraries/btree/build.gradle | 2 +- code/libraries/easy-lsh/build.gradle | 2 +- code/libraries/geo-ip/build.gradle | 2 +- code/libraries/guarded-regex/build.gradle | 2 +- code/libraries/language-processing/build.gradle | 2 +- code/libraries/message-queue/build.gradle | 2 +- code/libraries/next-prime/build.gradle | 2 +- code/libraries/random-write-funnel/build.gradle | 2 +- code/libraries/term-frequency-dict/build.gradle | 2 +- code/libraries/test-helpers/build.gradle | 2 +- code/process-models/crawl-spec/build.gradle | 2 +- code/process-models/crawling-model/build.gradle | 2 +- code/process-models/processed-data/build.gradle | 2 +- code/process-models/work-log/build.gradle | 2 +- code/process-mqapi/build.gradle | 2 +- code/processes/converting-process/build.gradle | 2 +- code/processes/crawling-process/build.gradle | 2 +- code/processes/index-constructor-process/build.gradle | 2 +- code/processes/loading-process/build.gradle | 2 +- code/processes/test-data/build.gradle | 2 +- code/processes/website-adjacencies-calculator/build.gradle | 2 +- code/services-application/api-service/build.gradle | 4 ++-- code/services-application/dating-service/build.gradle | 4 ++-- code/services-application/explorer-service/build.gradle | 4 ++-- code/services-application/search-service/build.gradle | 4 ++-- code/services-core/assistant-service/build.gradle | 4 ++-- code/services-core/control-service/build.gradle | 4 ++-- code/services-core/executor-service/build.gradle | 4 ++-- code/services-core/index-service/build.gradle | 4 ++-- code/services-core/query-service/build.gradle | 4 ++-- code/tools/crawl-data-unfcker/build.gradle | 2 +- code/tools/experiment-runner/build.gradle | 2 +- code/tools/load-test/build.gradle | 2 +- code/tools/screenshot-capture-tool/build.gradle | 4 ++-- settings.gradle | 2 +- third-party/commons-codec/build.gradle | 2 +- third-party/count-min-sketch/build.gradle | 2 +- third-party/encyclopedia-marginalia-nu/build.gradle | 2 +- third-party/monkey-patch-opennlp/build.gradle | 2 +- third-party/openzim/build.gradle | 2 +- third-party/parquet-floor/build.gradle | 2 +- third-party/porterstemmer/build.gradle | 2 +- third-party/rdrpostagger/build.gradle | 2 +- third-party/symspell/build.gradle | 2 +- 88 files changed, 101 insertions(+), 101 deletions(-) diff --git a/build.gradle b/build.gradle index 8b76efda..9559cfc2 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { // This is a workaround for a bug in the Jib plugin that causes it to stall randomly // https://github.com/GoogleContainerTools/jib/issues/3347 - id 'com.google.cloud.tools.jib' version '3.4.0' apply(false) + id 'com.google.cloud.tools.jib' version '3.4.1' apply(false) } group 'marginalia' @@ -43,7 +43,7 @@ subprojects.forEach {it -> } ext { - dockerImageBase='container-registry.oracle.com/graalvm/jdk:21@sha256:1fd33d4d4eba3a9e1a41a728e39ea217178d257694eea1214fec68d2ed4d3d9b' + dockerImageBase='container-registry.oracle.com/graalvm/jdk:22@sha256:22d2ca0d4fb378f50306ec2fda3178cce4523c4fe64e869108571c3c6e7026c8\n' dockerImageTag='latest' dockerImageRegistry='marginalia' } @@ -66,7 +66,7 @@ idea { } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/common/config/build.gradle b/code/common/config/build.gradle index 0ceb00ae..74fdf702 100644 --- a/code/common/config/build.gradle +++ b/code/common/config/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/common/db/build.gradle b/code/common/db/build.gradle index 85ab7dba..7e85c3de 100644 --- a/code/common/db/build.gradle +++ b/code/common/db/build.gradle @@ -17,7 +17,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/common/linkdb/build.gradle b/code/common/linkdb/build.gradle index 811aa577..14c7f056 100644 --- a/code/common/linkdb/build.gradle +++ b/code/common/linkdb/build.gradle @@ -6,7 +6,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/common/model/build.gradle b/code/common/model/build.gradle index 6d27b375..1e6c7566 100644 --- a/code/common/model/build.gradle +++ b/code/common/model/build.gradle @@ -6,7 +6,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/common/process/build.gradle b/code/common/process/build.gradle index 7fcff1ab..908bfae1 100644 --- a/code/common/process/build.gradle +++ b/code/common/process/build.gradle @@ -6,7 +6,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/common/renderer/build.gradle b/code/common/renderer/build.gradle index 83957546..fa79e153 100644 --- a/code/common/renderer/build.gradle +++ b/code/common/renderer/build.gradle @@ -8,7 +8,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } apply from: "$rootProject.projectDir/srcsets.gradle" diff --git a/code/common/service/build.gradle b/code/common/service/build.gradle index fa109b0e..57342fa1 100644 --- a/code/common/service/build.gradle +++ b/code/common/service/build.gradle @@ -5,7 +5,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/execution/api/build.gradle b/code/execution/api/build.gradle index 5102b613..02e8100e 100644 --- a/code/execution/api/build.gradle +++ b/code/execution/api/build.gradle @@ -8,7 +8,7 @@ jar.archiveBaseName = 'execution-api' java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/execution/build.gradle b/code/execution/build.gradle index 8c8fd70b..74449214 100644 --- a/code/execution/build.gradle +++ b/code/execution/build.gradle @@ -5,7 +5,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-convert/adblock/build.gradle b/code/features-convert/adblock/build.gradle index f28fe998..11a7c5ea 100644 --- a/code/features-convert/adblock/build.gradle +++ b/code/features-convert/adblock/build.gradle @@ -9,7 +9,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-convert/anchor-keywords/build.gradle b/code/features-convert/anchor-keywords/build.gradle index 23e415b9..9d6c08b6 100644 --- a/code/features-convert/anchor-keywords/build.gradle +++ b/code/features-convert/anchor-keywords/build.gradle @@ -6,7 +6,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-convert/data-extractors/build.gradle b/code/features-convert/data-extractors/build.gradle index 6fd5671d..73aebd49 100644 --- a/code/features-convert/data-extractors/build.gradle +++ b/code/features-convert/data-extractors/build.gradle @@ -9,7 +9,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-convert/keyword-extraction/build.gradle b/code/features-convert/keyword-extraction/build.gradle index 7912e246..c63fc263 100644 --- a/code/features-convert/keyword-extraction/build.gradle +++ b/code/features-convert/keyword-extraction/build.gradle @@ -6,7 +6,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-convert/pubdate/build.gradle b/code/features-convert/pubdate/build.gradle index bebd3d8e..1a33a4a7 100644 --- a/code/features-convert/pubdate/build.gradle +++ b/code/features-convert/pubdate/build.gradle @@ -9,7 +9,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-convert/reddit-json/build.gradle b/code/features-convert/reddit-json/build.gradle index a9aa3bd6..afbc6961 100644 --- a/code/features-convert/reddit-json/build.gradle +++ b/code/features-convert/reddit-json/build.gradle @@ -6,7 +6,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-convert/stackexchange-xml/build.gradle b/code/features-convert/stackexchange-xml/build.gradle index d693047b..bda05817 100644 --- a/code/features-convert/stackexchange-xml/build.gradle +++ b/code/features-convert/stackexchange-xml/build.gradle @@ -6,7 +6,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-convert/summary-extraction/build.gradle b/code/features-convert/summary-extraction/build.gradle index bf6a87c5..189b317b 100644 --- a/code/features-convert/summary-extraction/build.gradle +++ b/code/features-convert/summary-extraction/build.gradle @@ -6,7 +6,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-convert/topic-detection/build.gradle b/code/features-convert/topic-detection/build.gradle index 49661c25..622d422b 100644 --- a/code/features-convert/topic-detection/build.gradle +++ b/code/features-convert/topic-detection/build.gradle @@ -9,7 +9,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-crawl/content-type/build.gradle b/code/features-crawl/content-type/build.gradle index c807b86e..16ecddd1 100644 --- a/code/features-crawl/content-type/build.gradle +++ b/code/features-crawl/content-type/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-crawl/crawl-blocklist/build.gradle b/code/features-crawl/crawl-blocklist/build.gradle index a6fc4f91..98741b80 100644 --- a/code/features-crawl/crawl-blocklist/build.gradle +++ b/code/features-crawl/crawl-blocklist/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-crawl/link-parser/build.gradle b/code/features-crawl/link-parser/build.gradle index 2dd04a5c..f69a255b 100644 --- a/code/features-crawl/link-parser/build.gradle +++ b/code/features-crawl/link-parser/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-search/feedlot-client/build.gradle b/code/features-search/feedlot-client/build.gradle index c62182fe..ef42210b 100644 --- a/code/features-search/feedlot-client/build.gradle +++ b/code/features-search/feedlot-client/build.gradle @@ -5,7 +5,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-search/random-websites/build.gradle b/code/features-search/random-websites/build.gradle index ec4201ec..fb0dd3ed 100644 --- a/code/features-search/random-websites/build.gradle +++ b/code/features-search/random-websites/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/features-search/screenshots/build.gradle b/code/features-search/screenshots/build.gradle index 52572e91..54eb6542 100644 --- a/code/features-search/screenshots/build.gradle +++ b/code/features-search/screenshots/build.gradle @@ -6,7 +6,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/functions/domain-info/api/build.gradle b/code/functions/domain-info/api/build.gradle index 0c4264ec..3ac3428e 100644 --- a/code/functions/domain-info/api/build.gradle +++ b/code/functions/domain-info/api/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/functions/domain-info/build.gradle b/code/functions/domain-info/build.gradle index afb2b358..c968b0ed 100644 --- a/code/functions/domain-info/build.gradle +++ b/code/functions/domain-info/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/functions/link-graph/aggregate/build.gradle b/code/functions/link-graph/aggregate/build.gradle index 41f89bef..213790b9 100644 --- a/code/functions/link-graph/aggregate/build.gradle +++ b/code/functions/link-graph/aggregate/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/functions/link-graph/api/build.gradle b/code/functions/link-graph/api/build.gradle index 99dd4a36..a16163b2 100644 --- a/code/functions/link-graph/api/build.gradle +++ b/code/functions/link-graph/api/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/functions/link-graph/partition/build.gradle b/code/functions/link-graph/partition/build.gradle index faca528f..766ed56c 100644 --- a/code/functions/link-graph/partition/build.gradle +++ b/code/functions/link-graph/partition/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/functions/math/api/build.gradle b/code/functions/math/api/build.gradle index 6811a06d..90c536b0 100644 --- a/code/functions/math/api/build.gradle +++ b/code/functions/math/api/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/functions/math/build.gradle b/code/functions/math/build.gradle index c1fe528d..814f57bc 100644 --- a/code/functions/math/build.gradle +++ b/code/functions/math/build.gradle @@ -5,7 +5,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/functions/search-query/api/build.gradle b/code/functions/search-query/api/build.gradle index 5339cbf4..727b5b86 100644 --- a/code/functions/search-query/api/build.gradle +++ b/code/functions/search-query/api/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/functions/search-query/build.gradle b/code/functions/search-query/build.gradle index 86cafefa..dc1f9c4c 100644 --- a/code/functions/search-query/build.gradle +++ b/code/functions/search-query/build.gradle @@ -5,7 +5,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/index/api/build.gradle b/code/index/api/build.gradle index 50b3d726..d07a24eb 100644 --- a/code/index/api/build.gradle +++ b/code/index/api/build.gradle @@ -5,7 +5,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/index/build.gradle b/code/index/build.gradle index 7d34bab4..37275b0a 100644 --- a/code/index/build.gradle +++ b/code/index/build.gradle @@ -5,7 +5,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/index/index-forward/build.gradle b/code/index/index-forward/build.gradle index daf9bc0b..96526205 100644 --- a/code/index/index-forward/build.gradle +++ b/code/index/index-forward/build.gradle @@ -6,7 +6,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/index/index-journal/build.gradle b/code/index/index-journal/build.gradle index c6186cf7..988ce618 100644 --- a/code/index/index-journal/build.gradle +++ b/code/index/index-journal/build.gradle @@ -6,7 +6,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/index/index-reverse/build.gradle b/code/index/index-reverse/build.gradle index a9523656..36367546 100644 --- a/code/index/index-reverse/build.gradle +++ b/code/index/index-reverse/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/index/query/build.gradle b/code/index/query/build.gradle index 7977ad73..615d9fb7 100644 --- a/code/index/query/build.gradle +++ b/code/index/query/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/libraries/array/build.gradle b/code/libraries/array/build.gradle index 88e27107..d7858a21 100644 --- a/code/libraries/array/build.gradle +++ b/code/libraries/array/build.gradle @@ -5,7 +5,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } @@ -30,7 +30,7 @@ jmh { } tasks.withType(me.champeau.jmh.WithJavaToolchain).configureEach { javaLauncher.set(javaToolchains.launcherFor { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) }) } tasks.withType(me.champeau.jmh.JmhBytecodeGeneratorTask).configureEach { diff --git a/code/libraries/big-string/build.gradle b/code/libraries/big-string/build.gradle index 2f67aa7f..c6d4c00f 100644 --- a/code/libraries/big-string/build.gradle +++ b/code/libraries/big-string/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/libraries/blocking-thread-pool/build.gradle b/code/libraries/blocking-thread-pool/build.gradle index 8c5609a5..0a513f92 100644 --- a/code/libraries/blocking-thread-pool/build.gradle +++ b/code/libraries/blocking-thread-pool/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/libraries/braille-block-punch-cards/build.gradle b/code/libraries/braille-block-punch-cards/build.gradle index 673d944f..d6b8c6e6 100644 --- a/code/libraries/braille-block-punch-cards/build.gradle +++ b/code/libraries/braille-block-punch-cards/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/libraries/btree/build.gradle b/code/libraries/btree/build.gradle index 99917255..37060dd5 100644 --- a/code/libraries/btree/build.gradle +++ b/code/libraries/btree/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/libraries/easy-lsh/build.gradle b/code/libraries/easy-lsh/build.gradle index 74fd976e..6c66bdde 100644 --- a/code/libraries/easy-lsh/build.gradle +++ b/code/libraries/easy-lsh/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/libraries/geo-ip/build.gradle b/code/libraries/geo-ip/build.gradle index a47f64a5..4fd467aa 100644 --- a/code/libraries/geo-ip/build.gradle +++ b/code/libraries/geo-ip/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/libraries/guarded-regex/build.gradle b/code/libraries/guarded-regex/build.gradle index 6faa6f3c..f310116e 100644 --- a/code/libraries/guarded-regex/build.gradle +++ b/code/libraries/guarded-regex/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/libraries/language-processing/build.gradle b/code/libraries/language-processing/build.gradle index 56abe731..cc745397 100644 --- a/code/libraries/language-processing/build.gradle +++ b/code/libraries/language-processing/build.gradle @@ -5,7 +5,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/libraries/message-queue/build.gradle b/code/libraries/message-queue/build.gradle index 5931a76e..d2618d95 100644 --- a/code/libraries/message-queue/build.gradle +++ b/code/libraries/message-queue/build.gradle @@ -5,7 +5,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/libraries/next-prime/build.gradle b/code/libraries/next-prime/build.gradle index 8c5609a5..0a513f92 100644 --- a/code/libraries/next-prime/build.gradle +++ b/code/libraries/next-prime/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/libraries/random-write-funnel/build.gradle b/code/libraries/random-write-funnel/build.gradle index 9d23af16..a7acb1fa 100644 --- a/code/libraries/random-write-funnel/build.gradle +++ b/code/libraries/random-write-funnel/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/libraries/term-frequency-dict/build.gradle b/code/libraries/term-frequency-dict/build.gradle index 0fe311b6..901fd2e0 100644 --- a/code/libraries/term-frequency-dict/build.gradle +++ b/code/libraries/term-frequency-dict/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/libraries/test-helpers/build.gradle b/code/libraries/test-helpers/build.gradle index 0066220f..875e636d 100644 --- a/code/libraries/test-helpers/build.gradle +++ b/code/libraries/test-helpers/build.gradle @@ -6,7 +6,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/process-models/crawl-spec/build.gradle b/code/process-models/crawl-spec/build.gradle index 551f2c6e..70850445 100644 --- a/code/process-models/crawl-spec/build.gradle +++ b/code/process-models/crawl-spec/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } apply from: "$rootProject.projectDir/srcsets.gradle" diff --git a/code/process-models/crawling-model/build.gradle b/code/process-models/crawling-model/build.gradle index 9b846502..5926e03d 100644 --- a/code/process-models/crawling-model/build.gradle +++ b/code/process-models/crawling-model/build.gradle @@ -8,7 +8,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/process-models/processed-data/build.gradle b/code/process-models/processed-data/build.gradle index 910cecc6..9668d0b8 100644 --- a/code/process-models/processed-data/build.gradle +++ b/code/process-models/processed-data/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } apply from: "$rootProject.projectDir/srcsets.gradle" diff --git a/code/process-models/work-log/build.gradle b/code/process-models/work-log/build.gradle index fbade272..c56174ca 100644 --- a/code/process-models/work-log/build.gradle +++ b/code/process-models/work-log/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } apply from: "$rootProject.projectDir/srcsets.gradle" diff --git a/code/process-mqapi/build.gradle b/code/process-mqapi/build.gradle index b1313c62..514ca034 100644 --- a/code/process-mqapi/build.gradle +++ b/code/process-mqapi/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/processes/converting-process/build.gradle b/code/processes/converting-process/build.gradle index 77b0b025..20532994 100644 --- a/code/processes/converting-process/build.gradle +++ b/code/processes/converting-process/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/processes/crawling-process/build.gradle b/code/processes/crawling-process/build.gradle index 0bc95a4c..6ed789c6 100644 --- a/code/processes/crawling-process/build.gradle +++ b/code/processes/crawling-process/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/processes/index-constructor-process/build.gradle b/code/processes/index-constructor-process/build.gradle index 5e48deea..ccec9b30 100644 --- a/code/processes/index-constructor-process/build.gradle +++ b/code/processes/index-constructor-process/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/processes/loading-process/build.gradle b/code/processes/loading-process/build.gradle index b44c27fa..c396c52f 100644 --- a/code/processes/loading-process/build.gradle +++ b/code/processes/loading-process/build.gradle @@ -6,7 +6,7 @@ plugins { } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/processes/test-data/build.gradle b/code/processes/test-data/build.gradle index 4f184c80..4c2fef49 100644 --- a/code/processes/test-data/build.gradle +++ b/code/processes/test-data/build.gradle @@ -5,7 +5,7 @@ plugins { } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/processes/website-adjacencies-calculator/build.gradle b/code/processes/website-adjacencies-calculator/build.gradle index a6e63d1f..63e56286 100644 --- a/code/processes/website-adjacencies-calculator/build.gradle +++ b/code/processes/website-adjacencies-calculator/build.gradle @@ -6,7 +6,7 @@ plugins { } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/services-application/api-service/build.gradle b/code/services-application/api-service/build.gradle index 726f703d..9fa51a9f 100644 --- a/code/services-application/api-service/build.gradle +++ b/code/services-application/api-service/build.gradle @@ -3,12 +3,12 @@ plugins { id 'application' id 'jvm-test-suite' - id 'com.google.cloud.tools.jib' version '3.4.0' + id 'com.google.cloud.tools.jib' version '3.4.1' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/services-application/dating-service/build.gradle b/code/services-application/dating-service/build.gradle index 2435383c..a8cfd6e1 100644 --- a/code/services-application/dating-service/build.gradle +++ b/code/services-application/dating-service/build.gradle @@ -3,7 +3,7 @@ plugins { id 'application' id 'jvm-test-suite' - id 'com.google.cloud.tools.jib' version '3.4.0' + id 'com.google.cloud.tools.jib' version '3.4.1' } application { @@ -18,7 +18,7 @@ apply from: "$rootProject.projectDir/docker.gradle" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } apply from: "$rootProject.projectDir/srcsets.gradle" diff --git a/code/services-application/explorer-service/build.gradle b/code/services-application/explorer-service/build.gradle index 0cac3ad4..da7e8a2e 100644 --- a/code/services-application/explorer-service/build.gradle +++ b/code/services-application/explorer-service/build.gradle @@ -3,7 +3,7 @@ plugins { id 'application' id 'jvm-test-suite' - id 'com.google.cloud.tools.jib' version '3.4.0' + id 'com.google.cloud.tools.jib' version '3.4.1' } application { @@ -18,7 +18,7 @@ apply from: "$rootProject.projectDir/docker.gradle" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } apply from: "$rootProject.projectDir/srcsets.gradle" diff --git a/code/services-application/search-service/build.gradle b/code/services-application/search-service/build.gradle index 561073d0..d1a64e2e 100644 --- a/code/services-application/search-service/build.gradle +++ b/code/services-application/search-service/build.gradle @@ -5,7 +5,7 @@ plugins { id 'application' id 'jvm-test-suite' - id 'com.google.cloud.tools.jib' version '3.4.0' + id 'com.google.cloud.tools.jib' version '3.4.1' } application { @@ -18,7 +18,7 @@ tasks.distZip.enabled = false java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } sass { diff --git a/code/services-core/assistant-service/build.gradle b/code/services-core/assistant-service/build.gradle index f1a25b0f..3f51937f 100644 --- a/code/services-core/assistant-service/build.gradle +++ b/code/services-core/assistant-service/build.gradle @@ -3,7 +3,7 @@ plugins { id 'application' id 'jvm-test-suite' - id 'com.google.cloud.tools.jib' version '3.4.0' + id 'com.google.cloud.tools.jib' version '3.4.1' } application { @@ -15,7 +15,7 @@ tasks.distZip.enabled = false java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/services-core/control-service/build.gradle b/code/services-core/control-service/build.gradle index 2f34648f..787e3740 100644 --- a/code/services-core/control-service/build.gradle +++ b/code/services-core/control-service/build.gradle @@ -2,12 +2,12 @@ plugins { id 'java' id 'application' id 'jvm-test-suite' - id 'com.google.cloud.tools.jib' version '3.4.0' + id 'com.google.cloud.tools.jib' version '3.4.1' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/services-core/executor-service/build.gradle b/code/services-core/executor-service/build.gradle index 435e5ec6..08d80ff5 100644 --- a/code/services-core/executor-service/build.gradle +++ b/code/services-core/executor-service/build.gradle @@ -3,7 +3,7 @@ plugins { id 'application' id 'jvm-test-suite' - id 'com.google.cloud.tools.jib' version '3.4.0' + id 'com.google.cloud.tools.jib' version '3.4.1' } application { @@ -17,7 +17,7 @@ tasks.distZip.enabled = false java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/services-core/index-service/build.gradle b/code/services-core/index-service/build.gradle index 73913d45..63b2ca5a 100644 --- a/code/services-core/index-service/build.gradle +++ b/code/services-core/index-service/build.gradle @@ -3,7 +3,7 @@ plugins { id 'application' id 'jvm-test-suite' - id 'com.google.cloud.tools.jib' version '3.4.0' + id 'com.google.cloud.tools.jib' version '3.4.1' } application { @@ -18,7 +18,7 @@ apply from: "$rootProject.projectDir/docker.gradle" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } apply from: "$rootProject.projectDir/srcsets.gradle" diff --git a/code/services-core/query-service/build.gradle b/code/services-core/query-service/build.gradle index 6857e5e8..7e80ac81 100644 --- a/code/services-core/query-service/build.gradle +++ b/code/services-core/query-service/build.gradle @@ -3,7 +3,7 @@ plugins { id 'application' id 'jvm-test-suite' - id 'com.google.cloud.tools.jib' version '3.4.0' + id 'com.google.cloud.tools.jib' version '3.4.1' } application { @@ -18,7 +18,7 @@ apply from: "$rootProject.projectDir/docker.gradle" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/tools/crawl-data-unfcker/build.gradle b/code/tools/crawl-data-unfcker/build.gradle index 40ec3bcb..755fba5e 100644 --- a/code/tools/crawl-data-unfcker/build.gradle +++ b/code/tools/crawl-data-unfcker/build.gradle @@ -8,7 +8,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/tools/experiment-runner/build.gradle b/code/tools/experiment-runner/build.gradle index 1923d4dd..d2cbc29b 100644 --- a/code/tools/experiment-runner/build.gradle +++ b/code/tools/experiment-runner/build.gradle @@ -8,7 +8,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/tools/load-test/build.gradle b/code/tools/load-test/build.gradle index 744333c8..ca14347e 100644 --- a/code/tools/load-test/build.gradle +++ b/code/tools/load-test/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/code/tools/screenshot-capture-tool/build.gradle b/code/tools/screenshot-capture-tool/build.gradle index 75aef932..27b7ee89 100644 --- a/code/tools/screenshot-capture-tool/build.gradle +++ b/code/tools/screenshot-capture-tool/build.gradle @@ -3,12 +3,12 @@ plugins { id 'application' id 'jvm-test-suite' - id 'com.google.cloud.tools.jib' version '3.4.0' + id 'com.google.cloud.tools.jib' version '3.4.1' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/settings.gradle b/settings.gradle index 06dc71e2..cfee1a8b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -128,7 +128,7 @@ dependencyResolutionManagement { versionCatalogs { libs { - library('lombok', 'org.projectlombok', 'lombok').version('1.18.30') + library('lombok', 'org.projectlombok', 'lombok').version('1.18.32') library('mariadb-client', 'org.mariadb.jdbc', 'mariadb-java-client').version('3.0.6') library('hikaricp', 'com.zaxxer:HikariCP:5.0.1') diff --git a/third-party/commons-codec/build.gradle b/third-party/commons-codec/build.gradle index 9fbe9a5d..d5974fb9 100644 --- a/third-party/commons-codec/build.gradle +++ b/third-party/commons-codec/build.gradle @@ -5,7 +5,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/third-party/count-min-sketch/build.gradle b/third-party/count-min-sketch/build.gradle index b49a1ccd..52becdd0 100644 --- a/third-party/count-min-sketch/build.gradle +++ b/third-party/count-min-sketch/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/third-party/encyclopedia-marginalia-nu/build.gradle b/third-party/encyclopedia-marginalia-nu/build.gradle index faf794ec..f104b712 100644 --- a/third-party/encyclopedia-marginalia-nu/build.gradle +++ b/third-party/encyclopedia-marginalia-nu/build.gradle @@ -5,7 +5,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/third-party/monkey-patch-opennlp/build.gradle b/third-party/monkey-patch-opennlp/build.gradle index 1e63117b..a8aa4366 100644 --- a/third-party/monkey-patch-opennlp/build.gradle +++ b/third-party/monkey-patch-opennlp/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/third-party/openzim/build.gradle b/third-party/openzim/build.gradle index 2a1c9da0..12a35aa1 100644 --- a/third-party/openzim/build.gradle +++ b/third-party/openzim/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/third-party/parquet-floor/build.gradle b/third-party/parquet-floor/build.gradle index c7cafc81..0e9ed00e 100644 --- a/third-party/parquet-floor/build.gradle +++ b/third-party/parquet-floor/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/third-party/porterstemmer/build.gradle b/third-party/porterstemmer/build.gradle index b49a1ccd..52becdd0 100644 --- a/third-party/porterstemmer/build.gradle +++ b/third-party/porterstemmer/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/third-party/rdrpostagger/build.gradle b/third-party/rdrpostagger/build.gradle index 39308e53..1b076c14 100644 --- a/third-party/rdrpostagger/build.gradle +++ b/third-party/rdrpostagger/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } diff --git a/third-party/symspell/build.gradle b/third-party/symspell/build.gradle index b49a1ccd..52becdd0 100644 --- a/third-party/symspell/build.gradle +++ b/third-party/symspell/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(22)) } } From 9e8138f853420e20551a5cfbd371554b65a32688 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Thu, 21 Mar 2024 12:12:05 +0100 Subject: [PATCH 2/3] (docs) Upgrade to JDK22 --- run/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/readme.md b/run/readme.md index 0a890feb..5d87e93f 100644 --- a/run/readme.md +++ b/run/readme.md @@ -11,7 +11,7 @@ documentation. **Docker** - It is a bit of a pain to install, but if you follow [this guide](https://docs.docker.com/engine/install/ubuntu/#install-using-the-repository) you're on the right track for ubuntu-like systems. -**JDK 21** - The code uses Java 21 preview features. +**JDK 22** - The code uses Java 22 preview features. The civilized way of installing this is to use [SDKMAN](https://sdkman.io/); graalce is a good distribution choice but it doesn't matter too much. From 824765b1eee106194162e04987bb800a1b1f7003 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Thu, 21 Mar 2024 14:24:25 +0100 Subject: [PATCH 3/3] (*) Fix JDK22 migration issues A few bizarre build errors cropped up when migrating to JDK22. Not at all sure what caused them, but they were easy to mitigate. --- code/features-convert/anchor-keywords/build.gradle | 1 + .../nu/marginalia/converting/writer/ConverterBatchWriter.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/code/features-convert/anchor-keywords/build.gradle b/code/features-convert/anchor-keywords/build.gradle index 9d6c08b6..880ce467 100644 --- a/code/features-convert/anchor-keywords/build.gradle +++ b/code/features-convert/anchor-keywords/build.gradle @@ -23,6 +23,7 @@ dependencies { implementation libs.bundles.slf4j implementation libs.guice + implementation libs.trove implementation libs.bundles.mariadb implementation libs.duckdb implementation libs.notnull diff --git a/code/processes/converting-process/java/nu/marginalia/converting/writer/ConverterBatchWriter.java b/code/processes/converting-process/java/nu/marginalia/converting/writer/ConverterBatchWriter.java index 73333320..14972693 100644 --- a/code/processes/converting-process/java/nu/marginalia/converting/writer/ConverterBatchWriter.java +++ b/code/processes/converting-process/java/nu/marginalia/converting/writer/ConverterBatchWriter.java @@ -2,6 +2,7 @@ package nu.marginalia.converting.writer; import gnu.trove.list.TLongList; import gnu.trove.list.array.TLongArrayList; +import lombok.SneakyThrows; import nu.marginalia.converting.model.ProcessedDocument; import nu.marginalia.converting.model.ProcessedDomain; import nu.marginalia.converting.sideload.SideloadSource; @@ -61,6 +62,7 @@ public class ConverterBatchWriter implements AutoCloseable, ConverterBatchWriter } @Override + @SneakyThrows public void writeProcessedDomain(ProcessedDomain domain) { var results = ForkJoinPool.commonPool().invokeAll( writeTasks(domain)