Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Java 21 #1

Open
wants to merge 17 commits into
base: 2.x
Choose a base branch
from
3 changes: 1 addition & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ jobs:
DV_ACCESS_TOKEN: ${{ startsWith(github.ref_name, 'release/') && '' || secrets.GE_ACCESS_TOKEN }}
with:
java-version: |
8
17
21
site-enabled: true
reproducibility-check-enabled: ${{ startsWith(github.ref_name, 'release/') }}
develocity-enabled: ${{ ! startsWith(github.ref_name, 'release/') }}
Expand Down
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17
21
5 changes: 5 additions & 0 deletions log4j-osgi-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
</properties>

<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.6</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
Expand Down
49 changes: 47 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@

<properties>

<minimalJavaBuildVersion>[21,22)</minimalJavaBuildVersion>
<!-- project version -->
<revision>2.25.0-SNAPSHOT</revision>
<!-- Versions used on the site: no snapshots! -->
Expand Down Expand Up @@ -351,7 +352,7 @@
<site-je.version>18.3.12</site-je.version>
<site-jeromq.version>0.6.0</site-jeromq.version>
<site-kafka.version>3.8.0</site-kafka.version>
<site-logback.version>1.5.5</site-logback.version>
<site-logback.version>1.3.14</site-logback.version>
<site-slf4j.version>2.0.16</site-slf4j.version>

<!-- =====================================================
Expand Down Expand Up @@ -549,9 +550,47 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.6</version>
</dependency>

<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>9.6</version>
</dependency>

<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>9.6</version>
</dependency>

<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>9.6</version>
</dependency>

<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>9.6</version>
</dependency>

</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.openjdk.nashorn</groupId>
<artifactId>nashorn-core</artifactId>
<version>15.4</version>
</dependency>
</dependencies>

<build>

<plugins>
Expand Down Expand Up @@ -618,8 +657,14 @@
<forkCount>1C</forkCount>
<reuseForks>false</reuseForks>
<runOrder>random</runOrder>
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.net=ALL-UNNAMED
--add-opens java.base/java.io=ALL-UNNAMED
--add-opens java.base/sun.reflect=ALL-UNNAMED</argLine>
<systemPropertyVariables>
<java.awt.headless>true</java.awt.headless>
<pax.exam.waitTimeout>600000</pax.exam.waitTimeout>
</systemPropertyVariables>
</configuration>
</plugin>
Expand Down Expand Up @@ -1007,7 +1052,7 @@
<id>default-test</id>
<configuration>
<jdkToolchain>
<version>[1.8, 9)</version>
<version>21</version>
</jdkToolchain>
</configuration>
</execution>
Expand Down
4 changes: 2 additions & 2 deletions src/site/antora/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ asciidoc:
project-github-url: "https://github.com/apache/logging-log4j2/tree/2.x"
project-name: "Log4j"
project-id: "log4j"
java-target-version: "8"
java-compiler-version: "[17,18)"
java-target-version: "21"
java-compiler-version: "21"
log4j-kubernetes-url: "https://github.com/fabric8io/kubernetes-client/blob/main/doc/KubernetesLog4j.md"
logback-url: "https://logback.qos.ch"
logging-services-url: "https://logging.apache.org"
Expand Down