diff --git a/.circleci/config.yml b/.circleci/config.yml index 1d526ca..738ddc8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: build: docker: # specify the version you desire here - - image: cimg/openjdk:17.0.8 + - image: cimg/openjdk:8.0 working_directory: ~/repo diff --git a/README.md b/README.md index c041f36..de4fe99 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # Requirements -- **Java Version:** This SDK requires **Java 17** or higher. +- **Java Version:** This SDK requires **Java 8** or higher. # Usage See the [documentation](https://docs.castle.io) for how to use this SDK with the Castle APIs @@ -15,7 +15,7 @@ When using Maven, add the following dependency to your `pom.xml` file: ```xml io.castle - castle-java + castle-java-8 2.6.1 ``` diff --git a/pom.xml b/pom.xml index a3561f0..3fcc81b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.castle - castle-java + castle-java-8 jar 2.6.1 @@ -49,8 +49,8 @@ UTF-8 - 17 - 17 + 1.8 + 1.8 0.8.10 @@ -109,9 +109,9 @@ 1.6.11 - jakarta.servlet - jakarta.servlet-api - 6.0.0 + javax.servlet + javax.servlet-api + 4.0.1 provided @@ -132,7 +132,7 @@ ch.qos.logback logback-classic - 1.4.12 + 1.2.13 test @@ -165,7 +165,7 @@ org.mockito mockito-core - 5.4.0 + 4.11.0 test @@ -177,13 +177,13 @@ org.springframework spring-web - 6.1.21 + 5.3.39 test org.springframework spring-test - 6.0.11 + 5.3.39 test @@ -218,10 +218,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.11.0 - 17 - 17 + 1.8 + 1.8 true true diff --git a/src/main/java/io/castle/client/Castle.java b/src/main/java/io/castle/client/Castle.java index 61cc4ee..0018903 100644 --- a/src/main/java/io/castle/client/Castle.java +++ b/src/main/java/io/castle/client/Castle.java @@ -14,7 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; /** * Creates an instance of the Castle SDK diff --git a/src/main/java/io/castle/client/internal/CastleApiImpl.java b/src/main/java/io/castle/client/internal/CastleApiImpl.java index aaa9652..0a0a13b 100644 --- a/src/main/java/io/castle/client/internal/CastleApiImpl.java +++ b/src/main/java/io/castle/client/internal/CastleApiImpl.java @@ -15,7 +15,7 @@ import io.castle.client.internal.utils.VerdictBuilder; import io.castle.client.model.*; import io.castle.client.model.generated.*; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import javax.annotation.Nullable; import java.lang.reflect.Type; diff --git a/src/main/java/io/castle/client/internal/utils/CastleContextBuilder.java b/src/main/java/io/castle/client/internal/utils/CastleContextBuilder.java index 2f8c153..44ad0db 100644 --- a/src/main/java/io/castle/client/internal/utils/CastleContextBuilder.java +++ b/src/main/java/io/castle/client/internal/utils/CastleContextBuilder.java @@ -7,8 +7,8 @@ import io.castle.client.model.CastleHeader; import io.castle.client.model.CastleHeaders; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Enumeration; diff --git a/src/test/java/io/castle/client/CastleAuthenticateHttpTest.java b/src/test/java/io/castle/client/CastleAuthenticateHttpTest.java index 4e57ce4..1cef0de 100644 --- a/src/test/java/io/castle/client/CastleAuthenticateHttpTest.java +++ b/src/test/java/io/castle/client/CastleAuthenticateHttpTest.java @@ -17,7 +17,7 @@ import com.google.common.collect.ImmutableMap; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import java.util.concurrent.atomic.AtomicReference; import static okhttp3.mockwebserver.SocketPolicy.NO_RESPONSE; diff --git a/src/test/java/io/castle/client/CastleDeviceApproveHttpTest.java b/src/test/java/io/castle/client/CastleDeviceApproveHttpTest.java index 6809d28..6ce1453 100644 --- a/src/test/java/io/castle/client/CastleDeviceApproveHttpTest.java +++ b/src/test/java/io/castle/client/CastleDeviceApproveHttpTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import static okhttp3.mockwebserver.SocketPolicy.NO_RESPONSE; diff --git a/src/test/java/io/castle/client/CastleDeviceHttpTest.java b/src/test/java/io/castle/client/CastleDeviceHttpTest.java index 8ac91f2..1bf9d9b 100644 --- a/src/test/java/io/castle/client/CastleDeviceHttpTest.java +++ b/src/test/java/io/castle/client/CastleDeviceHttpTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import static okhttp3.mockwebserver.SocketPolicy.NO_RESPONSE; diff --git a/src/test/java/io/castle/client/CastleDeviceReportHttpTest.java b/src/test/java/io/castle/client/CastleDeviceReportHttpTest.java index d927a4c..8c03b05 100644 --- a/src/test/java/io/castle/client/CastleDeviceReportHttpTest.java +++ b/src/test/java/io/castle/client/CastleDeviceReportHttpTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import static okhttp3.mockwebserver.SocketPolicy.NO_RESPONSE; diff --git a/src/test/java/io/castle/client/CastleDevicesHttpTest.java b/src/test/java/io/castle/client/CastleDevicesHttpTest.java index 68be962..6be52d7 100644 --- a/src/test/java/io/castle/client/CastleDevicesHttpTest.java +++ b/src/test/java/io/castle/client/CastleDevicesHttpTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import static okhttp3.mockwebserver.SocketPolicy.NO_RESPONSE; diff --git a/src/test/java/io/castle/client/CastleFilterHttpTest.java b/src/test/java/io/castle/client/CastleFilterHttpTest.java index 8c2fd85..0178bf0 100644 --- a/src/test/java/io/castle/client/CastleFilterHttpTest.java +++ b/src/test/java/io/castle/client/CastleFilterHttpTest.java @@ -5,7 +5,7 @@ import io.castle.client.model.AuthenticateAction; import io.castle.client.model.AuthenticateFailoverStrategy; import io.castle.client.model.generated.*; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.RecordedRequest; import org.junit.Assert; diff --git a/src/test/java/io/castle/client/CastleGenericAPIHttpTest.java b/src/test/java/io/castle/client/CastleGenericAPIHttpTest.java index a510c88..5c81208 100644 --- a/src/test/java/io/castle/client/CastleGenericAPIHttpTest.java +++ b/src/test/java/io/castle/client/CastleGenericAPIHttpTest.java @@ -20,7 +20,7 @@ import org.skyscreamer.jsonassert.JSONAssert; import org.springframework.mock.web.MockHttpServletRequest; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import java.util.concurrent.atomic.AtomicReference; import static okhttp3.mockwebserver.SocketPolicy.NO_RESPONSE; diff --git a/src/test/java/io/castle/client/CastleImpersonateEndHttpTest.java b/src/test/java/io/castle/client/CastleImpersonateEndHttpTest.java index 8474d69..4b85f6b 100644 --- a/src/test/java/io/castle/client/CastleImpersonateEndHttpTest.java +++ b/src/test/java/io/castle/client/CastleImpersonateEndHttpTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import static okhttp3.mockwebserver.SocketPolicy.NO_RESPONSE; diff --git a/src/test/java/io/castle/client/CastleImpersonateStartHttpTest.java b/src/test/java/io/castle/client/CastleImpersonateStartHttpTest.java index f2cb0eb..5bc9b07 100644 --- a/src/test/java/io/castle/client/CastleImpersonateStartHttpTest.java +++ b/src/test/java/io/castle/client/CastleImpersonateStartHttpTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import static okhttp3.mockwebserver.SocketPolicy.NO_RESPONSE; diff --git a/src/test/java/io/castle/client/CastleListItemsTest.java b/src/test/java/io/castle/client/CastleListItemsTest.java index a3c91e9..bdf7d37 100644 --- a/src/test/java/io/castle/client/CastleListItemsTest.java +++ b/src/test/java/io/castle/client/CastleListItemsTest.java @@ -4,7 +4,6 @@ import io.castle.client.model.AuthenticateFailoverStrategy; import io.castle.client.model.CastleResponse; import io.castle.client.model.generated.*; -import jakarta.servlet.http.HttpServletRequest; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.RecordedRequest; import org.junit.Assert; @@ -12,6 +11,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.threeten.bp.OffsetDateTime; +import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/test/java/io/castle/client/CastleListsHttpTest.java b/src/test/java/io/castle/client/CastleListsHttpTest.java index 548be6f..ad0ab9e 100644 --- a/src/test/java/io/castle/client/CastleListsHttpTest.java +++ b/src/test/java/io/castle/client/CastleListsHttpTest.java @@ -5,7 +5,7 @@ import io.castle.client.model.AuthenticateAction; import io.castle.client.model.AuthenticateFailoverStrategy; import io.castle.client.model.generated.*; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.RecordedRequest; import org.junit.Assert; diff --git a/src/test/java/io/castle/client/CastleLogHttpTest.java b/src/test/java/io/castle/client/CastleLogHttpTest.java index d3d1a57..ef6b58e 100644 --- a/src/test/java/io/castle/client/CastleLogHttpTest.java +++ b/src/test/java/io/castle/client/CastleLogHttpTest.java @@ -14,7 +14,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.threeten.bp.OffsetDateTime; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashMap; diff --git a/src/test/java/io/castle/client/CastleMergeHttpTest.java b/src/test/java/io/castle/client/CastleMergeHttpTest.java index 8323ad5..6712ccf 100644 --- a/src/test/java/io/castle/client/CastleMergeHttpTest.java +++ b/src/test/java/io/castle/client/CastleMergeHttpTest.java @@ -14,7 +14,7 @@ import com.google.common.collect.ImmutableMap; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import java.util.concurrent.atomic.AtomicReference; import io.castle.client.model.AsyncCallbackHandler; import org.assertj.core.api.Assertions; diff --git a/src/test/java/io/castle/client/CastleNoTrackOptionTest.java b/src/test/java/io/castle/client/CastleNoTrackOptionTest.java index 144a03f..90a61d6 100644 --- a/src/test/java/io/castle/client/CastleNoTrackOptionTest.java +++ b/src/test/java/io/castle/client/CastleNoTrackOptionTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import java.util.concurrent.atomic.AtomicReference; public class CastleNoTrackOptionTest extends AbstractCastleHttpLayerTest { diff --git a/src/test/java/io/castle/client/CastleRecoverHttpTest.java b/src/test/java/io/castle/client/CastleRecoverHttpTest.java index cdc76bd..ca04ac5 100644 --- a/src/test/java/io/castle/client/CastleRecoverHttpTest.java +++ b/src/test/java/io/castle/client/CastleRecoverHttpTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import static okhttp3.mockwebserver.SocketPolicy.NO_RESPONSE; diff --git a/src/test/java/io/castle/client/CastleRemoveUserHttpTest.java b/src/test/java/io/castle/client/CastleRemoveUserHttpTest.java index 06233e8..4f559e1 100644 --- a/src/test/java/io/castle/client/CastleRemoveUserHttpTest.java +++ b/src/test/java/io/castle/client/CastleRemoveUserHttpTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; public class CastleRemoveUserHttpTest extends AbstractCastleHttpLayerTest { diff --git a/src/test/java/io/castle/client/CastleRiskHttpTest.java b/src/test/java/io/castle/client/CastleRiskHttpTest.java index a3bb7a2..b3aedce 100644 --- a/src/test/java/io/castle/client/CastleRiskHttpTest.java +++ b/src/test/java/io/castle/client/CastleRiskHttpTest.java @@ -5,7 +5,7 @@ import io.castle.client.model.AuthenticateAction; import io.castle.client.model.AuthenticateFailoverStrategy; import io.castle.client.model.generated.*; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.RecordedRequest; import org.junit.Assert; diff --git a/src/test/java/io/castle/client/CastleThrowStrategyTest.java b/src/test/java/io/castle/client/CastleThrowStrategyTest.java index c5c7df0..daac311 100644 --- a/src/test/java/io/castle/client/CastleThrowStrategyTest.java +++ b/src/test/java/io/castle/client/CastleThrowStrategyTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import java.util.concurrent.atomic.AtomicReference; import static okhttp3.mockwebserver.SocketPolicy.NO_RESPONSE; diff --git a/src/test/java/io/castle/client/CastleTrackHttpTest.java b/src/test/java/io/castle/client/CastleTrackHttpTest.java index 9fb036d..db5ec32 100644 --- a/src/test/java/io/castle/client/CastleTrackHttpTest.java +++ b/src/test/java/io/castle/client/CastleTrackHttpTest.java @@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableMap; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import java.util.concurrent.atomic.AtomicReference; public class CastleTrackHttpTest extends AbstractCastleHttpLayerTest { diff --git a/src/test/java/io/castle/client/internal/utils/CastleContextBuilderTest.java b/src/test/java/io/castle/client/internal/utils/CastleContextBuilderTest.java index 34c5a62..ba2053e 100644 --- a/src/test/java/io/castle/client/internal/utils/CastleContextBuilderTest.java +++ b/src/test/java/io/castle/client/internal/utils/CastleContextBuilderTest.java @@ -11,8 +11,8 @@ import org.skyscreamer.jsonassert.JSONAssert; import org.springframework.mock.web.MockHttpServletRequest; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Arrays; import java.util.List;