This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 3f2e642 Upgrade the compiler version to Java 17, yet still target
Java 8
3f2e642 is described below
commit 3f2e642166b331f66b2f26d9ff7570c19d6342ff
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Tue Mar 14 21:05:25 2023 +0100
Upgrade the compiler version to Java 17, yet still target Java 8
---
.github/workflows/build.yml | 8 ++++----
.java-version | 2 +-
.mvn/jvm.config | 10 ++++++++++
CHANGELOG.adoc | 2 ++
log4j-tools-parent/pom.xml | 2 +-
pom.xml | 2 +-
6 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4d51889..d223d3f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,11 +45,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #
3.3.0
- - name: Setup JDK 11
+ - name: Set up Java
uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 #
3.7.0
with:
distribution: temurin
- java-version: 11
+ java-version: 17
java-package: jdk
architecture: x64
cache: maven
@@ -118,11 +118,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #
3.3.0
- - name: Setup Java & GPG
+ - name: Set up Java & GPG
uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 #
3.7.0
with:
distribution: temurin
- java-version: 11
+ java-version: 17
java-package: jdk
architecture: x64
cache: maven
diff --git a/.java-version b/.java-version
index b4de394..98d9bcb 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-11
+17
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
index 2a2667e..6f7d1c8 100644
--- a/.mvn/jvm.config
+++ b/.mvn/jvm.config
@@ -1 +1,11 @@
-Djava.awt.headless=true
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 39b760a..e374567 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -17,6 +17,8 @@ limitations under the License.
== 0.x.x
+* Upgrade the compiler version to Java 17, yet still target Java 8 (by Volkan
Yazıcı)
+
* Support multiple and formatting-agnostic template files (for
https://github.com/apache/logging-log4j-tools/issues/44[#44] by Volkan Yazıcı)
* The changelog release models passed to the index template file
(`.index.adoc.ftl`) is enriched with `changelogEntryCount` fields (for
https://github.com/apache/logging-log4j-tools/issues/37[#37] by Volkan Yazıcı)
diff --git a/log4j-tools-parent/pom.xml b/log4j-tools-parent/pom.xml
index dfcd9f8..74e1ea5 100644
--- a/log4j-tools-parent/pom.xml
+++ b/log4j-tools-parent/pom.xml
@@ -41,7 +41,7 @@
<!-- `minimalJavaBuildVersion` is employed by `org.apache:apache`, which
parents `org.apache.logging:logging-parent`, which parents
`org.apache.logging.log4j:log4j-tools-bom`, which parents us.
`minimalJavaBuildVersion` is used for enforcing the compiler version.
We will use `java.version` to enforce the target JVM byte code, which
is 8. -->
- <minimalJavaBuildVersion>[11,12)</minimalJavaBuildVersion>
+ <minimalJavaBuildVersion>[17,18)</minimalJavaBuildVersion>
<java.version>8</java.version>
<!-- `project.build.outputTimestamp` is required for reproducible builds:
https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
diff --git a/pom.xml b/pom.xml
index aef08e7..2d17d51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
<!-- `minimalJavaBuildVersion` is employed by `org.apache:apache`, which
is the parent of `org.apache.logging:logging-parent`, which is the parent of us.
`minimalJavaBuildVersion` is used for enforcing the compiler version.
We will use `java.version` to enforce the target JVM byte code, which
is 8. -->
- <minimalJavaBuildVersion>[11,12)</minimalJavaBuildVersion>
+ <minimalJavaBuildVersion>[17,18)</minimalJavaBuildVersion>
<java.version>8</java.version>
<!-- `project.build.outputTimestamp` is required for reproducible builds:
https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
