diff --git a/build.gradle b/build.gradle index d2fba84e..16b642ee 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,8 @@ plugins { id 'java' id("org.jetbrains.gradle.plugin.idea-ext") version "1.0" + id "io.freefair.lombok" version "8.3" + id "me.champeau.jmh" version "0.6.6" } group 'marginalia' @@ -9,6 +11,30 @@ version 'SNAPSHOT' compileJava.options.encoding = "UTF-8" compileTestJava.options.encoding = "UTF-8" +// Enable preview features for the entire project +subprojects.forEach {it -> + it.tasks.withType(JavaCompile).configureEach { + options.compilerArgs += ['--enable-preview'] + } + it.tasks.withType(Test).configureEach { + jvmArgs += ['--enable-preview'] + } +} + +allprojects { + apply plugin: 'java' + apply plugin: 'io.freefair.lombok' + + dependencies { + implementation libs.lombok + testImplementation libs.lombok + annotationProcessor libs.lombok + + lombok libs.lombok // prevent plugin from downgrading the version to something incompatible with '19 + } + +} + tasks.register('dist', Copy) { from subprojects.collect { it.tasks.withType(Tar) } into "$buildDir/dist" @@ -61,6 +87,6 @@ idea { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/code/api/assistant-api/build.gradle b/code/api/assistant-api/build.gradle index 6908e348..30f6c338 100644 --- a/code/api/assistant-api/build.gradle +++ b/code/api/assistant-api/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { @@ -16,8 +16,6 @@ dependencies { implementation project(':code:common:service-discovery') implementation project(':code:common:service-client') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.prometheus diff --git a/code/api/index-api/build.gradle b/code/api/index-api/build.gradle index 1414cdc8..bd3e9fa3 100644 --- a/code/api/index-api/build.gradle +++ b/code/api/index-api/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -19,8 +19,6 @@ dependencies { implementation project(':code:libraries:message-queue') implementation project(':code:features-index:index-query') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.prometheus diff --git a/code/api/process-mqapi/build.gradle b/code/api/process-mqapi/build.gradle index 812873fc..893516fe 100644 --- a/code/api/process-mqapi/build.gradle +++ b/code/api/process-mqapi/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/code/api/search-api/build.gradle b/code/api/search-api/build.gradle index 6680f13b..2f46f5c4 100644 --- a/code/api/search-api/build.gradle +++ b/code/api/search-api/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -18,8 +18,6 @@ dependencies { implementation project(':code:common:service-discovery') implementation project(':code:common:service-client') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.prometheus diff --git a/code/common/config/build.gradle b/code/common/config/build.gradle index 1ac662ae..353c1bd5 100644 --- a/code/common/config/build.gradle +++ b/code/common/config/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/code/common/db/build.gradle b/code/common/db/build.gradle index fa46e82b..d8fe747a 100644 --- a/code/common/db/build.gradle +++ b/code/common/db/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' id "org.flywaydb.flyway" version "8.2.0" } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -18,8 +18,6 @@ configurations { dependencies { implementation project(':code:common:model') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.guice diff --git a/code/common/linkdb/build.gradle b/code/common/linkdb/build.gradle index 19caa529..441a024e 100644 --- a/code/common/linkdb/build.gradle +++ b/code/common/linkdb/build.gradle @@ -1,12 +1,12 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -17,8 +17,6 @@ configurations { dependencies { implementation project(':code:common:model') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.guice diff --git a/code/common/model/build.gradle b/code/common/model/build.gradle index df3c58ab..4b7dfd24 100644 --- a/code/common/model/build.gradle +++ b/code/common/model/build.gradle @@ -1,12 +1,12 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -16,8 +16,6 @@ dependencies { implementation project(':code:libraries:big-string') implementation project(':code:libraries:braille-block-punch-cards') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.guice diff --git a/code/common/process/build.gradle b/code/common/process/build.gradle index 0092522f..2e1288e4 100644 --- a/code/common/process/build.gradle +++ b/code/common/process/build.gradle @@ -1,19 +1,17 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { implementation libs.notnull - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j testImplementation libs.bundles.slf4j.test diff --git a/code/common/renderer/build.gradle b/code/common/renderer/build.gradle index 961c3b65..0991e385 100644 --- a/code/common/renderer/build.gradle +++ b/code/common/renderer/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } @@ -8,12 +8,10 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.bundles.handlebars diff --git a/code/common/service-client/build.gradle b/code/common/service-client/build.gradle index 7510c8c1..400d2779 100644 --- a/code/common/service-client/build.gradle +++ b/code/common/service-client/build.gradle @@ -1,22 +1,18 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" id "de.undercouch.download" version "5.1.0" id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { implementation project(':code:common:service-discovery') - - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.commons.lang3 diff --git a/code/common/service-discovery/build.gradle b/code/common/service-discovery/build.gradle index 333cb38a..d0214416 100644 --- a/code/common/service-discovery/build.gradle +++ b/code/common/service-discovery/build.gradle @@ -10,7 +10,7 @@ repositories { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { diff --git a/code/common/service/build.gradle b/code/common/service/build.gradle index 5437b084..e26900cc 100644 --- a/code/common/service/build.gradle +++ b/code/common/service/build.gradle @@ -5,7 +5,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -15,9 +15,6 @@ dependencies { implementation project(':code:libraries:message-queue') implementation project(':code:common:db') - implementation libs.lombok - annotationProcessor libs.lombok - implementation libs.spark implementation libs.guice implementation libs.rxjava diff --git a/code/common/service/src/main/java/nu/marginalia/service/module/ConfigurationModule.java b/code/common/service/src/main/java/nu/marginalia/service/module/ConfigurationModule.java index 62d1f9ce..400c173b 100644 --- a/code/common/service/src/main/java/nu/marginalia/service/module/ConfigurationModule.java +++ b/code/common/service/src/main/java/nu/marginalia/service/module/ConfigurationModule.java @@ -24,7 +24,7 @@ public class ConfigurationModule extends AbstractModule { int basePort = descriptors.forId(id).port; int prometheusPort = basePort + 1000; - String host = Objects.requireNonNull(System.getProperty("service-host", "127.0.0.1")); + String host = System.getProperty("service-host", "127.0.0.1"); var configObject = new ServiceConfiguration(id, 0, host, basePort, prometheusPort, UUID.randomUUID()); bind(ServiceConfiguration.class).toInstance(configObject); diff --git a/code/features-convert/adblock/build.gradle b/code/features-convert/adblock/build.gradle index 7dcc5135..141c7bbc 100644 --- a/code/features-convert/adblock/build.gradle +++ b/code/features-convert/adblock/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id "de.undercouch.download" version "5.1.0" @@ -9,16 +9,13 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { implementation project(':code:common:config') - implementation libs.lombok - annotationProcessor libs.lombok - implementation libs.bundles.slf4j implementation libs.guice implementation libs.notnull diff --git a/code/features-convert/keyword-extraction/build.gradle b/code/features-convert/keyword-extraction/build.gradle index d387a20a..cb9eac40 100644 --- a/code/features-convert/keyword-extraction/build.gradle +++ b/code/features-convert/keyword-extraction/build.gradle @@ -1,12 +1,12 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -17,8 +17,6 @@ dependencies { implementation project(':code:libraries:language-processing') implementation project(':code:libraries:term-frequency-dict') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/features-convert/pubdate/build.gradle b/code/features-convert/pubdate/build.gradle index ee256ebf..8fe1e69a 100644 --- a/code/features-convert/pubdate/build.gradle +++ b/code/features-convert/pubdate/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id "de.undercouch.download" version "5.1.0" @@ -9,16 +9,13 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { implementation project(':code:common:model') - implementation libs.lombok - annotationProcessor libs.lombok - implementation libs.bundles.slf4j implementation libs.guice implementation libs.notnull diff --git a/code/features-convert/stackexchange-xml/build.gradle b/code/features-convert/stackexchange-xml/build.gradle index 1f924521..8c774f90 100644 --- a/code/features-convert/stackexchange-xml/build.gradle +++ b/code/features-convert/stackexchange-xml/build.gradle @@ -1,18 +1,16 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation 'org.tukaani:xz:1.8' diff --git a/code/features-convert/summary-extraction/build.gradle b/code/features-convert/summary-extraction/build.gradle index e2e843f9..922910e5 100644 --- a/code/features-convert/summary-extraction/build.gradle +++ b/code/features-convert/summary-extraction/build.gradle @@ -1,18 +1,16 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/features-convert/topic-detection/build.gradle b/code/features-convert/topic-detection/build.gradle index 692223b4..ee84437f 100644 --- a/code/features-convert/topic-detection/build.gradle +++ b/code/features-convert/topic-detection/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id "de.undercouch.download" version "5.1.0" @@ -9,7 +9,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -18,9 +18,6 @@ dependencies { implementation project(':code:libraries:language-processing') implementation project(':third-party:porterstemmer') - implementation libs.lombok - annotationProcessor libs.lombok - implementation libs.bundles.slf4j implementation libs.guice implementation libs.notnull diff --git a/code/features-crawl/crawl-blocklist/build.gradle b/code/features-crawl/crawl-blocklist/build.gradle index 2ef08165..6e567246 100644 --- a/code/features-crawl/crawl-blocklist/build.gradle +++ b/code/features-crawl/crawl-blocklist/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -17,8 +17,6 @@ dependencies { implementation project(':code:libraries:guarded-regex') implementation libs.notnull - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.gson implementation libs.rxjava diff --git a/code/features-crawl/link-parser/build.gradle b/code/features-crawl/link-parser/build.gradle index 423f24ba..b64fb0ae 100644 --- a/code/features-crawl/link-parser/build.gradle +++ b/code/features-crawl/link-parser/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -15,8 +15,6 @@ dependencies { implementation project(':code:common:model') implementation libs.notnull - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.gson implementation libs.bundles.slf4j diff --git a/code/features-index/domain-ranking/build.gradle b/code/features-index/domain-ranking/build.gradle index f77a4f4c..d3a4ae80 100644 --- a/code/features-index/domain-ranking/build.gradle +++ b/code/features-index/domain-ranking/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id "de.undercouch.download" version "5.1.0" @@ -9,7 +9,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -18,9 +18,6 @@ dependencies { implementation project(':code:common:model') implementation project(':code:common:service') - implementation libs.lombok - annotationProcessor libs.lombok - implementation libs.bundles.slf4j implementation libs.bundles.mariadb implementation libs.guice diff --git a/code/features-index/index-forward/build.gradle b/code/features-index/index-forward/build.gradle index 8dd3e788..70d8d11f 100644 --- a/code/features-index/index-forward/build.gradle +++ b/code/features-index/index-forward/build.gradle @@ -1,12 +1,12 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -21,8 +21,6 @@ dependencies { implementation project(':third-party:uppend') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.prometheus diff --git a/code/features-index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexConverter.java b/code/features-index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexConverter.java index a1b59b07..ccf7cc77 100644 --- a/code/features-index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexConverter.java +++ b/code/features-index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexConverter.java @@ -92,8 +92,8 @@ public class ForwardIndexConverter { docFileData.force(); docsFileId.force(); - docFileData.advice(NativeIO.Advice.DontNeed); - docsFileId.advice(NativeIO.Advice.DontNeed); + docFileData.close(); + docsFileId.close(); progress.progress(TaskSteps.FINISHED); } catch (IOException ex) { diff --git a/code/features-index/index-journal/build.gradle b/code/features-index/index-journal/build.gradle index b20d7157..7429dc18 100644 --- a/code/features-index/index-journal/build.gradle +++ b/code/features-index/index-journal/build.gradle @@ -1,12 +1,12 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -14,8 +14,6 @@ dependencies { implementation project(':code:libraries:array') implementation project(':code:common:model') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.prometheus diff --git a/code/features-index/index-query/build.gradle b/code/features-index/index-query/build.gradle index a601571b..5aef9940 100644 --- a/code/features-index/index-query/build.gradle +++ b/code/features-index/index-query/build.gradle @@ -1,21 +1,19 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { implementation project(':code:libraries:array') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.prometheus diff --git a/code/features-index/index-reverse/build.gradle b/code/features-index/index-reverse/build.gradle index 76c382a2..55357956 100644 --- a/code/features-index/index-reverse/build.gradle +++ b/code/features-index/index-reverse/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -22,8 +22,6 @@ dependencies { implementation project(':code:common:process') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.fastutil diff --git a/code/features-search/query-parser/build.gradle b/code/features-search/query-parser/build.gradle index 33fcd854..c551c411 100644 --- a/code/features-search/query-parser/build.gradle +++ b/code/features-search/query-parser/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } @@ -8,7 +8,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { @@ -20,8 +20,6 @@ dependencies { implementation project(':third-party:porterstemmer') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.bundles.nlp diff --git a/code/features-search/random-websites/build.gradle b/code/features-search/random-websites/build.gradle index f32d0225..0f8593c1 100644 --- a/code/features-search/random-websites/build.gradle +++ b/code/features-search/random-websites/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -16,8 +16,6 @@ dependencies { implementation project(':code:common:db') implementation project(':code:common:service') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.guice diff --git a/code/features-search/result-ranking/build.gradle b/code/features-search/result-ranking/build.gradle index a0709e51..1d23fa50 100644 --- a/code/features-search/result-ranking/build.gradle +++ b/code/features-search/result-ranking/build.gradle @@ -1,15 +1,12 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" - id "de.undercouch.download" version "5.1.0" - id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -18,9 +15,6 @@ dependencies { implementation project(':code:common:service') implementation project(':code:api:index-api') - implementation libs.lombok - annotationProcessor libs.lombok - implementation libs.bundles.slf4j implementation libs.guice implementation libs.notnull diff --git a/code/features-search/screenshots/build.gradle b/code/features-search/screenshots/build.gradle index 9c02154e..3821fb9c 100644 --- a/code/features-search/screenshots/build.gradle +++ b/code/features-search/screenshots/build.gradle @@ -1,12 +1,12 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -15,8 +15,6 @@ dependencies { implementation project(':code:common:db') implementation project(':code:common:service') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/libraries/array/build.gradle b/code/libraries/array/build.gradle index 408bb939..ecf84807 100644 --- a/code/libraries/array/build.gradle +++ b/code/libraries/array/build.gradle @@ -5,15 +5,13 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { implementation project(':third-party:uppend') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull @@ -27,6 +25,17 @@ dependencies { testImplementation libs.mockito } +jmh { + jvmArgs = [ "--enable-preview" ] +} +tasks.withType(me.champeau.jmh.WithJavaToolchain).configureEach { + javaLauncher.set(javaToolchains.launcherFor { + languageVersion.set(JavaLanguageVersion.of(21)) + }) +} +tasks.withType(me.champeau.jmh.JmhBytecodeGeneratorTask).configureEach { + jvmArgs = ["--enable-preview"] +} test { useJUnitPlatform() } diff --git a/code/libraries/big-string/build.gradle b/code/libraries/big-string/build.gradle index 1a0fe03b..c769bc12 100644 --- a/code/libraries/big-string/build.gradle +++ b/code/libraries/big-string/build.gradle @@ -4,13 +4,11 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/libraries/blocking-thread-pool/build.gradle b/code/libraries/blocking-thread-pool/build.gradle index 657954e6..e716f1c8 100644 --- a/code/libraries/blocking-thread-pool/build.gradle +++ b/code/libraries/blocking-thread-pool/build.gradle @@ -4,13 +4,11 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/libraries/braille-block-punch-cards/build.gradle b/code/libraries/braille-block-punch-cards/build.gradle index 657954e6..e716f1c8 100644 --- a/code/libraries/braille-block-punch-cards/build.gradle +++ b/code/libraries/braille-block-punch-cards/build.gradle @@ -4,13 +4,11 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/libraries/btree/build.gradle b/code/libraries/btree/build.gradle index 588ba56f..d39af03c 100644 --- a/code/libraries/btree/build.gradle +++ b/code/libraries/btree/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -12,8 +12,6 @@ dependencies { implementation project(':code:libraries:array') implementation project(':code:libraries:next-prime') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j testImplementation libs.bundles.slf4j.test diff --git a/code/libraries/easy-lsh/build.gradle b/code/libraries/easy-lsh/build.gradle index b10b5f66..e8b11046 100644 --- a/code/libraries/easy-lsh/build.gradle +++ b/code/libraries/easy-lsh/build.gradle @@ -4,13 +4,11 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j testImplementation libs.bundles.slf4j.test diff --git a/code/libraries/guarded-regex/build.gradle b/code/libraries/guarded-regex/build.gradle index d24a235b..8640776d 100644 --- a/code/libraries/guarded-regex/build.gradle +++ b/code/libraries/guarded-regex/build.gradle @@ -4,13 +4,11 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/libraries/language-processing/build.gradle b/code/libraries/language-processing/build.gradle index e548487f..7b635de0 100644 --- a/code/libraries/language-processing/build.gradle +++ b/code/libraries/language-processing/build.gradle @@ -1,13 +1,11 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" - id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -20,8 +18,6 @@ dependencies { implementation project(':code:libraries:easy-lsh') implementation project(':code:libraries:term-frequency-dict') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/libraries/message-queue/build.gradle b/code/libraries/message-queue/build.gradle index c85a1d02..3cdb5e1d 100644 --- a/code/libraries/message-queue/build.gradle +++ b/code/libraries/message-queue/build.gradle @@ -5,14 +5,11 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - implementation libs.lombok - annotationProcessor libs.lombok - implementation libs.spark implementation libs.guice implementation libs.gson diff --git a/code/libraries/next-prime/build.gradle b/code/libraries/next-prime/build.gradle index 657954e6..e716f1c8 100644 --- a/code/libraries/next-prime/build.gradle +++ b/code/libraries/next-prime/build.gradle @@ -4,13 +4,11 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/libraries/random-write-funnel/build.gradle b/code/libraries/random-write-funnel/build.gradle index 92e24b42..e8b11046 100644 --- a/code/libraries/random-write-funnel/build.gradle +++ b/code/libraries/random-write-funnel/build.gradle @@ -4,14 +4,11 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j testImplementation libs.bundles.slf4j.test diff --git a/code/libraries/term-frequency-dict/build.gradle b/code/libraries/term-frequency-dict/build.gradle index 77413eb8..3fb03f68 100644 --- a/code/libraries/term-frequency-dict/build.gradle +++ b/code/libraries/term-frequency-dict/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -20,8 +20,6 @@ dependencies { implementation project(':code:libraries:easy-lsh') implementation project(':code:libraries:array') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/process-models/crawl-spec/build.gradle b/code/process-models/crawl-spec/build.gradle index 96c68a60..fb0d2c34 100644 --- a/code/process-models/crawl-spec/build.gradle +++ b/code/process-models/crawl-spec/build.gradle @@ -1,18 +1,16 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation project(':third-party:parquet-floor') diff --git a/code/process-models/crawling-model/build.gradle b/code/process-models/crawling-model/build.gradle index 38da53e9..c30a3a4d 100644 --- a/code/process-models/crawling-model/build.gradle +++ b/code/process-models/crawling-model/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } @@ -8,7 +8,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -22,8 +22,6 @@ dependencies { implementation project(':code:common:service-client') implementation project(':code:libraries:language-processing') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/process-models/processed-data/build.gradle b/code/process-models/processed-data/build.gradle index 5159bc8b..e91fde47 100644 --- a/code/process-models/processed-data/build.gradle +++ b/code/process-models/processed-data/build.gradle @@ -1,18 +1,16 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation project(':third-party:parquet-floor') diff --git a/code/process-models/work-log/build.gradle b/code/process-models/work-log/build.gradle index 507621c8..6d3253ef 100644 --- a/code/process-models/work-log/build.gradle +++ b/code/process-models/work-log/build.gradle @@ -1,18 +1,16 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/processes/converting-process/build.gradle b/code/processes/converting-process/build.gradle index ff8133ca..54a3624b 100644 --- a/code/processes/converting-process/build.gradle +++ b/code/processes/converting-process/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -61,8 +61,6 @@ dependencies { testImplementation project(':code:libraries:term-frequency-dict') testImplementation project(':code:process-models:crawl-spec') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/processes/crawling-process/build.gradle b/code/processes/crawling-process/build.gradle index aa70079e..3a3d80e0 100644 --- a/code/processes/crawling-process/build.gradle +++ b/code/processes/crawling-process/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -40,8 +40,6 @@ dependencies { implementation project(':code:features-crawl:crawl-blocklist') implementation project(':code:features-crawl:link-parser') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/processes/index-constructor-process/build.gradle b/code/processes/index-constructor-process/build.gradle index b96b245f..bc09b483 100644 --- a/code/processes/index-constructor-process/build.gradle +++ b/code/processes/index-constructor-process/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -31,9 +31,6 @@ dependencies { implementation project(':code:features-index:index-journal') implementation project(':code:features-index:domain-ranking') - implementation libs.lombok - annotationProcessor libs.lombok - implementation libs.bundles.slf4j implementation libs.guice implementation libs.bundles.mariadb diff --git a/code/processes/loading-process/build.gradle b/code/processes/loading-process/build.gradle index a890ec23..b64ea999 100644 --- a/code/processes/loading-process/build.gradle +++ b/code/processes/loading-process/build.gradle @@ -1,12 +1,12 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -37,12 +37,8 @@ dependencies { implementation project(':code:process-models:crawling-model') implementation project(':code:process-models:processed-data') implementation project(':code:process-models:work-log') - implementation project(':code:features-convert:keyword-extraction') - - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.guice diff --git a/code/processes/test-data/build.gradle b/code/processes/test-data/build.gradle index 02b215e5..462be8c3 100644 --- a/code/processes/test-data/build.gradle +++ b/code/processes/test-data/build.gradle @@ -1,11 +1,11 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/code/services-core/assistant-service/build.gradle b/code/services-core/assistant-service/build.gradle index 102a014f..c12bf07f 100644 --- a/code/services-core/assistant-service/build.gradle +++ b/code/services-core/assistant-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'jvm-test-suite' id 'com.palantir.docker' version '0.35.0' @@ -17,7 +17,7 @@ apply from: "$rootProject.projectDir/docker-service.gradle" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -35,8 +35,6 @@ dependencies { implementation project(':code:libraries:language-processing') implementation project(':code:libraries:term-frequency-dict') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.prometheus diff --git a/code/services-core/control-service/build.gradle b/code/services-core/control-service/build.gradle index 0a8d4e9d..f655ccbe 100644 --- a/code/services-core/control-service/build.gradle +++ b/code/services-core/control-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'com.palantir.docker' version '0.35.0' id 'jvm-test-suite' @@ -8,7 +8,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -39,8 +39,6 @@ dependencies { implementation project(':code:features-index:index-journal') implementation project(':code:process-models:crawl-spec') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.prometheus diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/process/ProcessService.java b/code/services-core/control-service/src/main/java/nu/marginalia/control/process/ProcessService.java index 7e36fd6c..ff45f20a 100644 --- a/code/services-core/control-service/src/main/java/nu/marginalia/control/process/ProcessService.java +++ b/code/services-core/control-service/src/main/java/nu/marginalia/control/process/ProcessService.java @@ -132,7 +132,7 @@ public class ProcessService { } opts.add(env2str("WMSA_HOME", WMSA_HOME)); - opts.add(env2str("JAVA_OPTS", "")); // We explicitly empty this to avoid inheriting the parent process' JAVA_OPTS + opts.add(env2str("JAVA_OPTS", "--enable-preview")); // for (String envKey : propagatedEnvironmentVariables) { String envValue = System.getenv(envKey); diff --git a/code/services-core/index-service/build.gradle b/code/services-core/index-service/build.gradle index 7d90cdfa..3f2152c3 100644 --- a/code/services-core/index-service/build.gradle +++ b/code/services-core/index-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'com.palantir.docker' version '0.35.0' id 'application' id 'jvm-test-suite' @@ -17,7 +17,7 @@ apply from: "$rootProject.projectDir/docker-service.gradle" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { @@ -38,12 +38,9 @@ dependencies { implementation project(':code:features-index:domain-ranking') implementation project(':code:features-search:result-ranking') implementation project(':third-party:commons-codec') - - - implementation libs.lombok testImplementation project(path: ':code:services-core:control-service') testImplementation project(':code:common:process') - annotationProcessor libs.lombok + implementation libs.bundles.slf4j implementation libs.prometheus diff --git a/code/services-core/search-service/build.gradle b/code/services-core/search-service/build.gradle index ae0288be..23a9bfa8 100644 --- a/code/services-core/search-service/build.gradle +++ b/code/services-core/search-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'com.palantir.docker' version '0.35.0' id 'application' id 'jvm-test-suite' @@ -17,7 +17,7 @@ apply from: "$rootProject.projectDir/docker-service.gradle" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { @@ -45,9 +45,6 @@ dependencies { implementation project(':code:features-search:query-parser') implementation project(':code:features-search:result-ranking') - - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.prometheus diff --git a/code/services-satellite/api-service/build.gradle b/code/services-satellite/api-service/build.gradle index b13660fc..6b465de1 100644 --- a/code/services-satellite/api-service/build.gradle +++ b/code/services-satellite/api-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'com.palantir.docker' version '0.35.0' id 'jvm-test-suite' @@ -8,7 +8,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -30,9 +30,6 @@ dependencies { implementation project(':code:common:service-client') implementation project(':code:api:search-api') - - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.prometheus diff --git a/code/services-satellite/dating-service/build.gradle b/code/services-satellite/dating-service/build.gradle index 1aefb959..718a4067 100644 --- a/code/services-satellite/dating-service/build.gradle +++ b/code/services-satellite/dating-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'com.palantir.docker' version '0.35.0' id 'jvm-test-suite' @@ -17,7 +17,7 @@ apply from: "$rootProject.projectDir/docker-service.gradle" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { @@ -31,9 +31,6 @@ dependencies { implementation project(':code:features-search:random-websites') implementation project(':code:libraries:language-processing') - - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.prometheus diff --git a/code/services-satellite/explorer-service/build.gradle b/code/services-satellite/explorer-service/build.gradle index 9286ce17..3ed06dff 100644 --- a/code/services-satellite/explorer-service/build.gradle +++ b/code/services-satellite/explorer-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'com.palantir.docker' version '0.35.0' id 'jvm-test-suite' @@ -17,7 +17,7 @@ apply from: "$rootProject.projectDir/docker-service.gradle" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } dependencies { @@ -29,9 +29,6 @@ dependencies { implementation project(':code:features-search:random-websites') - - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.prometheus diff --git a/code/tools/experiment-runner/build.gradle b/code/tools/experiment-runner/build.gradle index 3eb4c244..4dae2d5a 100644 --- a/code/tools/experiment-runner/build.gradle +++ b/code/tools/experiment-runner/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'jvm-test-suite' @@ -8,7 +8,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -37,8 +37,6 @@ dependencies { implementation project(':code:features-convert:topic-detection') implementation project(':code:features-convert:keyword-extraction') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/tools/load-test/build.gradle b/code/tools/load-test/build.gradle index eb74f276..2adb1144 100644 --- a/code/tools/load-test/build.gradle +++ b/code/tools/load-test/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -15,8 +15,6 @@ dependencies { implementation project(':code:common:config') implementation project(':code:common:model') implementation project(':code:libraries:term-frequency-dict') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull } diff --git a/code/tools/screenshot-capture-tool/build.gradle b/code/tools/screenshot-capture-tool/build.gradle index b6dbb511..93dd196d 100644 --- a/code/tools/screenshot-capture-tool/build.gradle +++ b/code/tools/screenshot-capture-tool/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'jvm-test-suite' } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -23,8 +23,6 @@ dependencies { implementation project(':code:features-search:screenshots') implementation project(':code:common:service') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.bundles.selenium implementation libs.bundles.mariadb diff --git a/code/tools/stackexchange-converter/build.gradle b/code/tools/stackexchange-converter/build.gradle index 7590cccd..f5b1c111 100644 --- a/code/tools/stackexchange-converter/build.gradle +++ b/code/tools/stackexchange-converter/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'jvm-test-suite' @@ -8,7 +8,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -22,8 +22,6 @@ tasks.distZip.enabled = false dependencies { implementation project(':code:features-convert:stackexchange-xml') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/tools/term-frequency-extractor/build.gradle b/code/tools/term-frequency-extractor/build.gradle index 9419ba2c..18055fa4 100644 --- a/code/tools/term-frequency-extractor/build.gradle +++ b/code/tools/term-frequency-extractor/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'jvm-test-suite' @@ -8,7 +8,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -32,8 +32,6 @@ dependencies { implementation project(':code:processes:converting-process') implementation project(':code:process-models:crawling-model') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/tools/website-adjacencies-calculator/build.gradle b/code/tools/website-adjacencies-calculator/build.gradle index 77e3cd1b..503001d2 100644 --- a/code/tools/website-adjacencies-calculator/build.gradle +++ b/code/tools/website-adjacencies-calculator/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "io.freefair.lombok" version "8.2.2" + id 'application' id 'jvm-test-suite' } @@ -12,7 +12,7 @@ application { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -22,8 +22,6 @@ dependencies { implementation project(':code:common:process') implementation project(':code:common:service') - implementation libs.lombok - annotationProcessor libs.lombok implementation libs.bundles.slf4j implementation libs.guice diff --git a/docker-service.gradle b/docker-service.gradle index 65db7a16..b51787e2 100644 --- a/docker-service.gradle +++ b/docker-service.gradle @@ -1,7 +1,7 @@ ext { - dockerImage='openjdk:20-slim' - serviceJvmOpts='-Dservice-host=0.0.0.0 -ea ${wmsa_jvm_param} -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=4000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false' - serviceToolOpts='-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5000' + dockerImage='openjdk:21-slim' + serviceJvmOpts='--enable-preview -ea ${wmsa_jvm_param} -Dservice-host=0.0.0.0 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=4000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false' + serviceToolOpts='--enable-preview -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5000' } tasks.register('dockerFile') { diff --git a/run/readme.md b/run/readme.md index 8e209011..d9f5ee7d 100644 --- a/run/readme.md +++ b/run/readme.md @@ -12,7 +12,8 @@ or podman. These are 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. -The system requires JDK20+. +The system requires JDK21+, and +uses preview features. ## Set up To go from a clean check out of the git repo to a running search engine, diff --git a/settings.gradle b/settings.gradle index cfd13d33..f33cf767 100644 --- a/settings.gradle +++ b/settings.gradle @@ -113,7 +113,7 @@ dependencyResolutionManagement { versionCatalogs { libs { - library('lombok', 'org.projectlombok', 'lombok').version('1.18.28') + library('lombok', 'org.projectlombok', 'lombok').version('1.18.30') library('mariadb-client', 'org.mariadb.jdbc', 'mariadb-java-client').version('3.0.6') library('hikaricp', 'com.zaxxer:HikariCP:5.0.1') @@ -205,4 +205,5 @@ dependencyResolutionManagement { } + } diff --git a/third-party/commons-codec/build.gradle b/third-party/commons-codec/build.gradle index 3ebfdaf3..9fbe9a5d 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(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/third-party/count-min-sketch/build.gradle b/third-party/count-min-sketch/build.gradle index 08901c27..b49a1ccd 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(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/third-party/monkey-patch-gson/build.gradle b/third-party/monkey-patch-gson/build.gradle index 8c698cd7..6ae59c6b 100644 --- a/third-party/monkey-patch-gson/build.gradle +++ b/third-party/monkey-patch-gson/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/third-party/monkey-patch-opennlp/build.gradle b/third-party/monkey-patch-opennlp/build.gradle index 9543d435..1e63117b 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(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/third-party/openzim/build.gradle b/third-party/openzim/build.gradle index 2ec0f87b..08f91136 100644 --- a/third-party/openzim/build.gradle +++ b/third-party/openzim/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/third-party/parquet-floor/build.gradle b/third-party/parquet-floor/build.gradle index 05277c51..c7cafc81 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(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/third-party/porterstemmer/build.gradle b/third-party/porterstemmer/build.gradle index 08901c27..b49a1ccd 100644 --- a/third-party/porterstemmer/build.gradle +++ b/third-party/porterstemmer/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/third-party/rdrpostagger/build.gradle b/third-party/rdrpostagger/build.gradle index 9a7d0e50..39308e53 100644 --- a/third-party/rdrpostagger/build.gradle +++ b/third-party/rdrpostagger/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/third-party/symspell/build.gradle b/third-party/symspell/build.gradle index 08901c27..b49a1ccd 100644 --- a/third-party/symspell/build.gradle +++ b/third-party/symspell/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/third-party/uppend/build.gradle b/third-party/uppend/build.gradle index 6d090d88..7d069b18 100644 --- a/third-party/uppend/build.gradle +++ b/third-party/uppend/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/third-party/xz/build.gradle b/third-party/xz/build.gradle index 08901c27..b49a1ccd 100644 --- a/third-party/xz/build.gradle +++ b/third-party/xz/build.gradle @@ -4,7 +4,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(20)) + languageVersion.set(JavaLanguageVersion.of(21)) } }