Skip to content

Commit 2f5b0ba

Browse files
authored
Merge pull request wolfSSL#319 from cconlon/jdk24_25
Add Java 24 and 25 tests to GitHub actions workflows
2 parents 312c0fe + a205fbd commit 2f5b0ba

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [ 'ubuntu-latest', 'macos-latest' ]
15-
jdk_version: [ '17', '21' ]
15+
jdk_version: [ '17', '21', '24', '25' ]
1616
wolfssl_configure: [ '--enable-jni' ]
1717
name: ${{ matrix.os }} (Oracle JDK ${{ matrix.jdk_version }}, ${{ matrix.wolfssl_configure}})
1818
uses: ./.github/workflows/linux-common.yml
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
matrix:
2929
os: [ 'ubuntu-latest', 'macos-latest' ]
30-
jdk_version: [ '8', '11', '17', '21' ]
30+
jdk_version: [ '8', '11', '17', '21', '24', '25' ]
3131
wolfssl_configure: [ '--enable-jni' ]
3232
name: ${{ matrix.os }} (Zulu JDK ${{ matrix.jdk_version }}, ${{ matrix.wolfssl_configure}})
3333
uses: ./.github/workflows/linux-common.yml
@@ -42,7 +42,7 @@ jobs:
4242
strategy:
4343
matrix:
4444
os: [ 'ubuntu-latest', 'macos-latest' ]
45-
jdk_version: [ '8', '11', '17', '21' ]
45+
jdk_version: [ '8', '11', '17', '21', '24', '25' ]
4646
wolfssl_configure: [ '--enable-jni' ]
4747
name: ${{ matrix.os }} (Corretto JDK ${{ matrix.jdk_version }}, ${{ matrix.wolfssl_configure}})
4848
uses: ./.github/workflows/linux-common.yml
@@ -57,7 +57,7 @@ jobs:
5757
strategy:
5858
matrix:
5959
os: [ 'ubuntu-24.04-arm' ]
60-
jdk_version: [ '8', '11', '17', '21' ]
60+
jdk_version: [ '8', '11', '17', '21', '24', '25' ]
6161
wolfssl_configure: [ '--enable-jni --enable-armasm' ]
6262
name: ${{ matrix.os }} (Corretto JDK Aarch64 armasm ${{ matrix.jdk_version }}, ${{ matrix.wolfssl_configure}})
6363
uses: ./.github/workflows/linux-common.yml
@@ -74,7 +74,7 @@ jobs:
7474
strategy:
7575
matrix:
7676
os: [ 'ubuntu-latest', 'macos-latest' ]
77-
jdk_version: [ '11', '17', '21' ]
77+
jdk_version: [ '11', '17', '21', '24', '25' ]
7878
wolfssl_configure: [ '--enable-jni' ]
7979
name: ${{ matrix.os }} (Temurin JDK ${{ matrix.jdk_version }}, ${{ matrix.wolfssl_configure}})
8080
uses: ./.github/workflows/linux-common.yml
@@ -89,7 +89,7 @@ jobs:
8989
strategy:
9090
matrix:
9191
os: [ 'ubuntu-latest', 'macos-latest' ]
92-
jdk_version: [ '11.0.19', '17.0.7', '21.0.0' ]
92+
jdk_version: [ '11.0.19', '17.0.7', '21.0.0', '25.0.0' ]
9393
wolfssl_configure: [ '--enable-jni' ]
9494
name: ${{ matrix.os }} (Microsoft JDK ${{ matrix.jdk_version }}, ${{ matrix.wolfssl_configure}})
9595
uses: ./.github/workflows/linux-common.yml

src/java/com/wolfssl/WolfSSLDebug.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,12 @@ public String toString() {
113113
*/
114114
private static WolfSSLNativeLoggingCallback nativeLogCb = null;
115115

116+
/**
117+
* Default private constructor, utility class with static methods.
118+
*/
119+
private WolfSSLDebug() {
120+
}
121+
116122
static {
117123
configureLoggers();
118124
}

0 commit comments

Comments
 (0)