This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-java-17 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 19e4b351a3657ab480d9ccef9939e5da369a9c71 Author: Volkan Yazıcı <[email protected]> AuthorDate: Wed Nov 29 15:32:37 2023 +0100 Bump the compiler to Java 17 --- .github/workflows/build.yaml | 6 +++--- .github/workflows/codeql-analysis.yaml | 2 +- .github/workflows/merge-dependabot.yaml | 4 ++-- .java-version | 2 +- BUILDING.adoc | 2 +- pom.xml | 2 +- src/site/_constants.adoc | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b2031dd9d9..0daa1cfe8d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -42,7 +42,7 @@ jobs: with: java-version: | 8 - 11 + 17 site-enabled: true deploy-snapshot: @@ -56,7 +56,7 @@ jobs: with: java-version: | 8 - 11 + 17 deploy-release: needs: build @@ -75,6 +75,6 @@ jobs: with: java-version: | 8 - 11 + 17 project-id: log4j site-enabled: true diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 012bb99c18..de440779f4 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -34,7 +34,7 @@ jobs: with: java-version: | 8 - 11 + 17 # Permissions required to publish Security Alerts permissions: actions: read diff --git a/.github/workflows/merge-dependabot.yaml b/.github/workflows/merge-dependabot.yaml index a8963ebf6e..83a59f12fe 100644 --- a/.github/workflows/merge-dependabot.yaml +++ b/.github/workflows/merge-dependabot.yaml @@ -34,13 +34,13 @@ jobs: with: java-version: | 8 - 11 + 17 merge-dependabot: needs: build uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main with: - java-version: 11 + java-version: 17 permissions: contents: write # to push changelog commits pull-requests: write # to close the PR diff --git a/.java-version b/.java-version index b4de394767..98d9bcb75a 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -11 +17 diff --git a/BUILDING.adoc b/BUILDING.adoc index 8f878df5e2..38b43d9d3e 100644 --- a/BUILDING.adoc +++ b/BUILDING.adoc @@ -18,7 +18,7 @@ [#requirements] == Requirements -* JDK 11+ +* JDK 17+ * A modern Linux, OSX, or Windows host [#building] diff --git a/pom.xml b/pom.xml index 9fe502d261..a255d489c0 100644 --- a/pom.xml +++ b/pom.xml @@ -312,7 +312,7 @@ <maven.compiler.release>8</maven.compiler.release> <maven.compiler.target>${maven.compiler.release}</maven.compiler.target> <!-- JDK version of the main Maven process (used in ASF parent POM) --> - <minimalJavaBuildVersion>[11,12)</minimalJavaBuildVersion> + <minimalJavaBuildVersion>[17,18)</minimalJavaBuildVersion> <module.name /> <!-- `project.build.outputTimestamp` is required to be present for reproducible builds. diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc index 8e500fa73d..d321d39568 100644 --- a/src/site/_constants.adoc +++ b/src/site/_constants.adoc @@ -38,4 +38,4 @@ :project-name: Log4j :project-id: log4j :java-target-version: 8 -:java-compiler-version: [11,12) +:java-compiler-version: [17,18)
