diff --git a/.github/workflows/java-ci.yml b/.github/workflows/java-ci.yml index b3a4c22..95e677c 100644 --- a/.github/workflows/java-ci.yml +++ b/.github/workflows/java-ci.yml @@ -14,7 +14,13 @@ jobs: strategy: matrix: - java-version: [8, 11, 17, 21] + include: + - { java-version: 8, distribution: temurin } + - { java-version: 11, distribution: temurin } + - { java-version: 17, distribution: temurin } + - { java-version: 21, distribution: temurin } + # Adoptium has not published Temurin 27 yet, so the 27 legs use Zulu + - { java-version: 27, distribution: zulu } steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -22,7 +28,7 @@ jobs: - name: Set up Java uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0 with: - distribution: 'temurin' + distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java-version }} - name: Build and test SDK @@ -41,7 +47,10 @@ jobs: strategy: matrix: - java-version: [17, 21] + include: + - { java-version: 17, distribution: temurin } + - { java-version: 21, distribution: temurin } + - { java-version: 27, distribution: zulu } steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -49,7 +58,7 @@ jobs: - name: Set up Java uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0 with: - distribution: 'temurin' + distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java-version }} - name: Inject dummy example config diff --git a/duo-universal-sdk/pom.xml b/duo-universal-sdk/pom.xml index fad2833..80e2b04 100644 --- a/duo-universal-sdk/pom.xml +++ b/duo-universal-sdk/pom.xml @@ -31,6 +31,16 @@ + + + jdk8 + + 1.8 + + + 4.11.0 + + release @@ -109,6 +119,13 @@ com.squareup.retrofit2 converter-jackson 2.11.0 + + + + net.bytebuddy + byte-buddy + + com.auth0 @@ -124,13 +141,22 @@ org.mockito mockito-core - 3.11.2 + ${mockito.version} test + net.bytebuddy byte-buddy - 1.15.4 + 1.17.7 + test + + + net.bytebuddy + byte-buddy-agent + 1.17.7 + test @@ -144,7 +170,7 @@ org.apache.maven.plugins maven-assembly-plugin - 2.5.4 + 3.8.0 jar-with-dependencies @@ -155,7 +181,7 @@ make-assembly package - attached + single @@ -184,19 +210,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.1 - - - org.junit.platform - junit-platform-surefire-provider - 1.2.0-M1 - - - org.junit.jupiter - junit-jupiter-engine - 5.2.0-M1 - - + 3.6.0 org.cyclonedx @@ -220,5 +234,8 @@ 1.8 1.8 + + 5.23.0 diff --git a/duo-universal-sdk/src/test/java/com/duosecurity/ClientTest.java b/duo-universal-sdk/src/test/java/com/duosecurity/ClientTest.java index 5f167b6..3b3510a 100644 --- a/duo-universal-sdk/src/test/java/com/duosecurity/ClientTest.java +++ b/duo-universal-sdk/src/test/java/com/duosecurity/ClientTest.java @@ -19,8 +19,8 @@ import java.net.URL; import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; class ClientTest {