Skip to content

Commit 3f2e642

Browse files
committed
Upgrade the compiler version to Java 17, yet still target Java 8
1 parent f3862fa commit 3f2e642

File tree

6 files changed

+19
-7
lines changed

6 files changed

+19
-7
lines changed

.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ jobs:
4545
- name: Checkout repository
4646
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # 3.3.0
4747

48-
- name: Setup JDK 11
48+
- name: Set up Java
4949
uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # 3.7.0
5050
with:
5151
distribution: temurin
52-
java-version: 11
52+
java-version: 17
5353
java-package: jdk
5454
architecture: x64
5555
cache: maven
@@ -118,11 +118,11 @@ jobs:
118118
- name: Checkout repository
119119
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # 3.3.0
120120

121-
- name: Setup Java & GPG
121+
- name: Set up Java & GPG
122122
uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # 3.7.0
123123
with:
124124
distribution: temurin
125-
java-version: 11
125+
java-version: 17
126126
java-package: jdk
127127
architecture: x64
128128
cache: maven

.java-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
11
1+
17

.mvn/jvm.config

+10
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
11
-Djava.awt.headless=true
2+
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
3+
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
4+
--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
5+
--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
6+
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
7+
--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
8+
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
9+
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
10+
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
11+
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED

CHANGELOG.adoc

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ limitations under the License.
1717
1818
== 0.x.x
1919
20+
* Upgrade the compiler version to Java 17, yet still target Java 8 (by Volkan Yazıcı)
21+
2022
* Support multiple and formatting-agnostic template files (for https://github.com/apache/logging-log4j-tools/issues/44[#44] by Volkan Yazıcı)
2123
2224
* 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ı)

log4j-tools-parent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<!-- `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.
4242
`minimalJavaBuildVersion` is used for enforcing the compiler version.
4343
We will use `java.version` to enforce the target JVM byte code, which is 8. -->
44-
<minimalJavaBuildVersion>[11,12)</minimalJavaBuildVersion>
44+
<minimalJavaBuildVersion>[17,18)</minimalJavaBuildVersion>
4545
<java.version>8</java.version>
4646

4747
<!-- `project.build.outputTimestamp` is required for reproducible builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<!-- `minimalJavaBuildVersion` is employed by `org.apache:apache`, which is the parent of `org.apache.logging:logging-parent`, which is the parent of us.
6161
`minimalJavaBuildVersion` is used for enforcing the compiler version.
6262
We will use `java.version` to enforce the target JVM byte code, which is 8. -->
63-
<minimalJavaBuildVersion>[11,12)</minimalJavaBuildVersion>
63+
<minimalJavaBuildVersion>[17,18)</minimalJavaBuildVersion>
6464
<java.version>8</java.version>
6565

6666
<!-- `project.build.outputTimestamp` is required for reproducible builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->

0 commit comments

Comments
 (0)