Merge pull request #1446 from amvanbaren/java-25

Upgrade to Java 25

Author: amvanbaren

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 25
     - name: Install Yarn
       run: |
         corepack enable

.github/workflows/sonar.yml

@@ -68,7 +68,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 25
     - name: Generate JaCoCo test report
       run: server/gradlew --no-daemon -p server jacocoTestReport
     - name: Make server libraries directory

.gitpod.dockerfile

@@ -8,7 +8,7 @@ ENV DOCKER_BUMP=2
 USER gitpod
 
 RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh \
-    && sdk install java 17.0.7-tem"
+    && sdk install java 25-tem"
 
 RUN curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.7.1-linux-x86_64.tar.gz --output elasticsearch-linux-x86_64.tar.gz \
     && tar -xzf elasticsearch-linux-x86_64.tar.gz \

doc/development.md

@@ -82,13 +82,13 @@ To run the Open VSX registry in a development environment, you can use `docker c
 
   - [https://docs.microsoft.com/en-us/windows/dev-environment/javascript/nodejs-on-wsl](https://docs.microsoft.com/en-us/windows/dev-environment/javascript/nodejs-on-wsl)
 
-- Set up JDK 17
+- Set up JDK 25
   - sudo apt install -y wget apt-transport-https
   - mkdir -p /etc/apt/keyrings
   - wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc
   - echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
   - sudo apt update
-  - sudo apt install temurin-17-jdk
+  - sudo apt install temurin-25-jdk
 
 - Install docker
 
@@ -120,15 +120,15 @@ To run the Open VSX registry in a development environment, you can use `docker c
 
 - Make sure the correct Java version is being used
 
-  - Download Java 17 if you don't have it already: https://adoptium.net/temurin/releases/
+  - Download Java 25 if you don't have it already: https://adoptium.net/temurin/releases/
 
   - Run the command `/usr/libexec/java_home –V` to see your matching Java virtual machines
 
-  - Pick Java 17 accordingly
+  - Pick Java 25 accordingly
 
-  - export JAVA_HOME='/usr/libexec/java_home –v 17.0.7+7'
+  - export JAVA_HOME='/usr/libexec/java_home –v 25.0.1+8'
 
-  - Run `java –version` to check if Java 17 is indeed being used
+  - Run `java –version` to check if Java 25 is indeed being used
 
   - https://stackoverflow.com/questions/21964709/how-to-set-or-change-the-default-java-jdk-version-on-macos
 

docker-compose.yml

@@ -199,7 +199,7 @@ services:
       - redisinsight
 
   server:
-    image: openjdk:17
+    image: eclipse-temurin:25-jdk
     working_dir: /app
     command: sh -c 'scripts/generate-properties.sh --docker && ./gradlew assemble && ./gradlew runServer'
     volumes:

server/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM gradle:jdk17 AS builder
+FROM gradle:jdk-25-and-25 AS builder
 
 # Copy sources
 WORKDIR /home/gradle
@@ -13,7 +13,7 @@ ENV CI=true
 RUN --mount=type=secret,id=dv-key,env=DEVELOCITY_ACCESS_KEY \
     ./gradlew --no-daemon assemble
 
-FROM eclipse-temurin:17.0.7_7-jdk
+FROM eclipse-temurin:25-jdk
 
 # Create user openvsx and set up home directory
 RUN groupadd -r openvsx && useradd --no-log-init -r -g openvsx openvsx

server/build.gradle

@@ -9,7 +9,7 @@ buildscript {
 }
 plugins {
     id 'jacoco'
-    id 'nu.studer.jooq' version '8.2.1'
+    id 'org.jooq.jooq-codegen-gradle' version '3.19.26'
     id 'de.undercouch.download' version '5.4.0'
     id 'org.springframework.boot' version '3.5.6'
     id 'io.spring.dependency-management' version '1.1.0'
@@ -22,7 +22,7 @@ apply plugin: 'com.adarshr.test-logger'
 
 def jooqSrcDir = 'src/main/jooq-gen'
 def versions = [
-    java: '17',
+    java: '25',
     flyway: '9.19.1',
     springdoc: '2.8.13',
     gcloud: '2.50.0',
@@ -45,7 +45,9 @@ def versions = [
     jedis: '6.2.0'
 ]
 ext['junit-jupiter.version'] = versions.junit
-sourceCompatibility = versions.java
+java {
+    sourceCompatibility = versions.java
+}
 
 repositories {
     mavenCentral()
@@ -122,7 +124,7 @@ dependencies {
     implementation "io.opentelemetry:opentelemetry-exporter-zipkin"
     runtimeOnly "io.micrometer:micrometer-registry-prometheus"
     runtimeOnly "org.postgresql:postgresql"
-    jooqGenerator "org.postgresql:postgresql"
+    jooqCodegen "org.postgresql:postgresql"
 
     devRuntimeOnly "org.springframework.boot:spring-boot-devtools"
 
@@ -142,39 +144,37 @@ dependencies {
 }
 
 jooq {
-    // use jOOQ version defined in Spring Boot
-    version = dependencyManagement.importedProperties['jooq.version']
-    edition = nu.studer.gradle.jooq.JooqEdition.OSS
-    configurations {
-        main {
-            generateSchemaSourceOnCompilation = false
-            generationTool {
-                logging = org.jooq.meta.jaxb.Logging.WARN
-                jdbc {
-                    driver = 'org.postgresql.Driver'
-                    url = 'jdbc:postgresql://localhost:5432/postgres'
-                    user = 'gitpod'
-                    password = 'gitpod'
-                }
-                generator {
-                    name = 'org.jooq.codegen.DefaultGenerator'
-                    database {
-                        name = 'org.jooq.meta.postgres.PostgresDatabase'
-                        inputSchema = 'public'
-                        includes = '.*'
-                        excludes = ''
-                    }
-                    target {
-                        packageName = 'org.eclipse.openvsx.jooq'
-                        directory = jooqSrcDir
-                    }
-                }
+    configuration {
+        logging = "WARN"
+        jdbc {
+            driver = 'org.postgresql.Driver'
+            url = 'jdbc:postgresql://localhost:5432/postgres'
+            user = 'openvsx'
+            password = 'openvsx'
+        }
+        generator {
+            name = 'org.jooq.codegen.DefaultGenerator'
+            database {
+                name = 'org.jooq.meta.postgres.PostgresDatabase'
+                inputSchema = 'public'
+                includes = '.*'
+                excludes = ''
+            }
+            target {
+                packageName = 'org.eclipse.openvsx.jooq'
+                directory = jooqSrcDir
+            }
+            generate {
+                implicitJoinPathsToOne = false
+                implicitJoinPathsToMany = false
+                implicitJoinPathUnusedConstructors = false
+                implicitJoinPathsUseTableNameForUnambiguousFKs = false
+                implicitJoinPathsAsKotlinProperties = false
             }
         }
     }
 }
 
-
 publishing {
     publications {
         maven(MavenPublication) {
@@ -213,13 +213,11 @@ task s3IntegrationTests(type: Test) {
     classpath = sourceSets.test.runtimeClasspath
     useJUnitPlatform()
     include 'org/eclipse/openvsx/storage/AwsStorageServiceIntegrationTest.class'
-    
+
     // Set system properties for test configuration
     systemProperty 'spring.profiles.active', 's3-integration'
 }
 
-
-
 jacocoTestReport {
     reports {
         xml.required = true

server/gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists