Merge pull request #86 from MarginaliaSearch/jdk-22

Lift JDK version to 22
This commit is contained in:
Viktor 2024-03-21 14:29:41 +01:00 committed by GitHub
commit cd8f33f830
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
90 changed files with 105 additions and 102 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -8,7 +8,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
languageVersion.set(JavaLanguageVersion.of(22))
}
}
apply from: "$rootProject.projectDir/srcsets.gradle"

View File

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

View File

@ -8,7 +8,7 @@ jar.archiveBaseName = 'execution-api'
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
languageVersion.set(JavaLanguageVersion.of(22))
}
}

View File

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

View File

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

View File

@ -6,7 +6,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
languageVersion.set(JavaLanguageVersion.of(22))
}
}
@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -7,7 +7,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
languageVersion.set(JavaLanguageVersion.of(22))
}
}
apply from: "$rootProject.projectDir/srcsets.gradle"

View File

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

View File

@ -7,7 +7,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
languageVersion.set(JavaLanguageVersion.of(22))
}
}
apply from: "$rootProject.projectDir/srcsets.gradle"

View File

@ -7,7 +7,7 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
languageVersion.set(JavaLanguageVersion.of(22))
}
}
apply from: "$rootProject.projectDir/srcsets.gradle"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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