(*) Upgrade to JDK21 with preview enabled.

... also move some common configuration into the root build.gradle-file.

Support for JDK21 in lombok is a bit sketchy at the moment, but it seems to work.  This upgrade is kind of important as the new index construction really benefits from Arena based lifecycle control over off-heap memory.
This commit is contained in:
Viktor Lofgren 2023-09-23 11:01:43 +02:00
parent d78569986b
commit dbe9235f3a
82 changed files with 174 additions and 278 deletions

View File

@ -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))
}
}

View File

@ -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

View File

@ -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

View File

@ -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))
}
}

View File

@ -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

View File

@ -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))
}
}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -10,7 +10,7 @@ repositories {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(20))
languageVersion.set(JavaLanguageVersion.of(21))
}
}
dependencies {

View File

@ -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

View File

@ -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);

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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'

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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) {

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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()
}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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')

View File

@ -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

View File

@ -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')

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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))
}
}

View File

@ -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

View File

@ -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

View File

@ -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);

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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
}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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') {

View File

@ -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,

View File

@ -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 {
}
}

View File

@ -5,7 +5,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(20))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

View File

@ -4,7 +4,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(20))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

View File

@ -4,7 +4,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(20))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

View File

@ -4,7 +4,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(20))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

View File

@ -4,7 +4,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(20))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

View File

@ -4,7 +4,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(20))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

View File

@ -4,7 +4,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(20))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

View File

@ -4,7 +4,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(20))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

View File

@ -4,7 +4,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(20))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

View File

@ -4,7 +4,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(20))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

View File

@ -4,7 +4,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(20))
languageVersion.set(JavaLanguageVersion.of(21))
}
}