This is an automated email from the ASF dual-hosted git repository.
yqm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 422d7326aac Revert java 17 compiler (#18831)
422d7326aac is described below
commit 422d7326aacbc5be28c96dc4d81aecf4aff6c9be
Author: Cece Mei <[email protected]>
AuthorDate: Fri Dec 12 15:18:34 2025 -0800
Revert java 17 compiler (#18831)
* revert-17
* revert
* java-17
* note
---
.github/workflows/static-checks.yml | 3 ++-
embedded-tests/pom.xml | 11 +++++++++++
pom.xml | 7 ++++++-
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/static-checks.yml
b/.github/workflows/static-checks.yml
index ae5bd6438a4..50f9af29a20 100644
--- a/.github/workflows/static-checks.yml
+++ b/.github/workflows/static-checks.yml
@@ -121,7 +121,8 @@ jobs:
- name: (openjdk17) strict compilation
# errorprone requires JDK 11+
# Strict compilation requires more than 2 GB
- run: ${MVN} clean -DstrictCompile compile test-compile --fail-at-end
${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} -T1C
+ # safe to exclude embedded-tests, it's not in distribution
+ run: ${MVN} clean -DstrictCompile -pl '!embedded-tests' compile
test-compile --fail-at-end ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} -T1C
openrewrite:
runs-on: ubuntu-latest
diff --git a/embedded-tests/pom.xml b/embedded-tests/pom.xml
index 39d311f2ac6..0a3b5c1b392 100644
--- a/embedded-tests/pom.xml
+++ b/embedded-tests/pom.xml
@@ -29,6 +29,9 @@
<properties>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
+ <!-- Hadoop relies upon JDK 11 language level which breaks when upgraded
to anything higher, but we can use 17 in \
+ embedded-tests, which supports more features such as multiline text block
literal delimiter (""") -->
+ <maven.compiler.release>17</maven.compiler.release>
</properties>
<parent>
@@ -551,6 +554,14 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.11.0</version>
+ <configuration>
+ <release>${maven.compiler.release}</release> <!-- forced for this
module -->
+ </configuration>
+ </plugin>
<!-- Skip this module from jacoco coverage as it contains only tests -->
<plugin>
<groupId>org.jacoco</groupId>
diff --git a/pom.xml b/pom.xml
index d36c1e7eac9..7f1328cd41b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,12 @@
</scm>
<properties>
- <java.version>17</java.version>
+ <!-- java 11 is no longer supported, but for backward compatibility
reasons we plan to stay on 11 until druid37, see
https://github.com/apache/druid/pull/18759.
+ Note for upgrade:
+ - remove the maven-compiler-plugin in embedded-tests
+ - remove exclusion of embedded-tests in strict compilation check
+ -->
+ <java.version>11</java.version>
<maven.compiler.release>${java.version}</maven.compiler.release>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<aether.version>0.9.0.M2</aether.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
