From cb69ead94eadce90fd0616b5af263603feee78ba Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@3a-systems.ru>
Date: Mon, 23 Oct 2023 16:38:29 +0000
Subject: [PATCH] Add JDK 21 support (#310)
---
opendj-ldap-toolkit/pom.xml | 4 +++-
.github/workflows/build.yml | 2 +-
opendj-config/pom.xml | 3 +--
pom.xml | 6 +++---
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b70df88..fa6c9cb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@
runs-on: ${{ matrix.os }}
strategy:
matrix:
- java: [ '8','11','17','19']
+ java: [ '8','11','17','21']
os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
fail-fast: false
steps:
diff --git a/opendj-config/pom.xml b/opendj-config/pom.xml
index a6362a6..da05092 100644
--- a/opendj-config/pom.xml
+++ b/opendj-config/pom.xml
@@ -187,8 +187,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <parallel>methods</parallel>
- <threadCount>1</threadCount>
+ <reuseForks>false</reuseForks>
</configuration>
</plugin>
<plugin>
diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml
index 122c8d7..4fd2cb1 100644
--- a/opendj-ldap-toolkit/pom.xml
+++ b/opendj-ldap-toolkit/pom.xml
@@ -132,7 +132,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M4</version>
+ <configuration>
+ <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
+ </configuration>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index 031ca1a..42d564d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -353,7 +353,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>3.11.0</version>
<configuration>
<fork>true</fork>
<compilerArgs>
@@ -365,7 +365,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.6.0</version>
</plugin>
<plugin>
@@ -446,7 +446,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M4</version> <!-- M6 DecodeException but got java.nio.BufferOverflowException -->
+ <version>3.1.2</version> <!-- M6 DecodeException but got java.nio.BufferOverflowException -->
<configuration>
<properties>
<property>
--
Gitblit v1.10.0