From 52eddd13ba822553590de10c3cc4bccf97c82f73 Mon Sep 17 00:00:00 2001 From: Gino Augustine Date: Tue, 26 Sep 2023 20:56:55 +0530 Subject: [PATCH 01/12] jdk17 support --- .github/workflows/build.yml | 6 ++--- Dockerfile | 4 ++-- docker/README.md | 2 +- opengrok-indexer/pom.xml | 6 ++++- .../indexer/framework/PluginFramework.java | 4 +--- .../logger/formatter/LogFormatter.java | 2 +- opengrok-web/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 23 +++---------------- suggester/pom.xml | 8 ++++++- 10 files changed, 25 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a2e794f635..7fb209a662b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ on: jobs: build: - name: ${{ matrix.os }} with Java 11 + name: ${{ matrix.os }} with Java 17 runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -22,10 +22,10 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Cache Maven packages uses: actions/cache@v2 with: diff --git a/Dockerfile b/Dockerfile index bfc58b82a82..4a078c89f13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:jammy as build # hadolint ignore=DL3008 -RUN apt-get update && apt-get install --no-install-recommends -y openjdk-11-jdk python3 python3-venv && \ +RUN apt-get update && apt-get install --no-install-recommends -y openjdk-17-jdk python3 python3-venv && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* @@ -41,7 +41,7 @@ RUN cp `ls -t distribution/target/*.tar.gz | head -1` /opengrok.tar.gz # Store the version in a file so that the tools can report it. RUN /mvn/mvnw help:evaluate -Dexpression=project.version -q -DforceStdout > /mvn/VERSION -FROM tomcat:10.1-jdk11 +FROM tomcat:10.1.13-jdk17 LABEL maintainer="https://github.com/oracle/opengrok" # Add Perforce apt source. diff --git a/docker/README.md b/docker/README.md index f2945d9fa82..5e4048dfdb1 100644 --- a/docker/README.md +++ b/docker/README.md @@ -26,7 +26,7 @@ image based on the official one. ## Additional info about the image * Tomcat 10 -* JRE 11 +* JRE 17 * Configurable mirroring/reindexing (default every 10 min) The mirroring step works by going through all projects and attempting to diff --git a/opengrok-indexer/pom.xml b/opengrok-indexer/pom.xml index cce12a1b4b0..16ca0534624 100644 --- a/opengrok-indexer/pom.xml +++ b/opengrok-indexer/pom.xml @@ -377,10 +377,14 @@ Portions Copyright (c) 2020-2020, Lubos Kosco . @{surefireArgLine} - --illegal-access=permit + + + org.apache.maven.plugins + maven-compiler-plugin + diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java index 63e130e1d72..661d3b6a0b8 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java @@ -26,8 +26,6 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; -import java.security.AccessController; -import java.security.PrivilegedAction; import java.util.Arrays; import java.util.Enumeration; import java.util.LinkedList; @@ -382,7 +380,7 @@ public final void reload() { // trashing out the old instance of the loader enables us // to reload the stack at runtime - loader = AccessController.doPrivileged((PrivilegedAction) () -> new PluginClassLoader(pluginDirectory)); + loader = new PluginClassLoader(pluginDirectory); // notify the implementing class that the reload is about to begin beforeReload(); diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/logger/formatter/LogFormatter.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/logger/formatter/LogFormatter.java index 6b03dbb6468..f418cf4de84 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/logger/formatter/LogFormatter.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/logger/formatter/LogFormatter.java @@ -93,7 +93,7 @@ public String format(LogRecord record) { record.getSourceClassName(), //%7 record.getSourceMethodName(), //%8 className(record.getSourceClassName()), //%9 - record.getThreadID(), //%10 + record.getLongThreadID(), //%10 record.getMessage(), //%11 version ); diff --git a/opengrok-web/pom.xml b/opengrok-web/pom.xml index 771e407c0e4..84854f05e8d 100644 --- a/opengrok-web/pom.xml +++ b/opengrok-web/pom.xml @@ -253,7 +253,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire . @{surefireArgLine} -Djna.nosys=true - --illegal-access=permit + --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED diff --git a/plugins/pom.xml b/plugins/pom.xml index 5bdbbc1ee82..74703184e5a 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -119,7 +119,7 @@ Portions Copyright (c) 2020, Chris Fraire . @{surefireArgLine} - --illegal-access=permit + diff --git a/pom.xml b/pom.xml index 506866120d9..6aec687b1bb 100644 --- a/pom.xml +++ b/pom.xml @@ -62,9 +62,8 @@ Portions Copyright (c) 2018, 2020, Chris Fraire . 9.8.0 3.2.0 - - 11 - 11 + 17 + 17 UTF-8 3.1.0 - 2.14.1 - 5.7.2 + 2.15.2 + 5.10.0 2.2 3.0.0-M5 - 3.12.0 - 1.8.2 + 3.13.0 + 1.11.4 3.12.4 - 1.3.2 + 2.14.0 From 76d03e3969d5fc0863458db30d37f7afef4d9bfd Mon Sep 17 00:00:00 2001 From: Gino Augustine Date: Tue, 3 Oct 2023 18:04:19 +0530 Subject: [PATCH 11/12] Revert Minimum Build Version to JDK11 Signed-off-by: Gino Augustine --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b5f9085436e..5f2bae474d5 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire . 9.8.0 3.6.0 - 17 + 11 UTF-8 3.1.3