Downgrade Jetty server to version 9.x

For compatibility with Java 8.
Yubico · May 2, 2022 · 012c356 · 012c356
1 parent 9edc343
commit 012c356
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/webauthn-server-attestation/build.gradle b/webauthn-server-attestation/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     'com.fasterxml.jackson.datatype:jackson-datatype-jdk8',
     'junit:junit',
     'org.bouncycastle:bcpkix-jdk15on',
-    'org.eclipse.jetty:jetty-server:11.0.7',
+    'org.eclipse.jetty:jetty-server:[9.4.9.v20180320,10)',
     'org.mockito:mockito-core',
     'org.scala-lang:scala-library',
     'org.scalacheck:scalacheck_2.13',

diff --git a/...rver-attestation/src/test/scala/com/yubico/fido/metadata/FidoMetadataDownloaderSpec.scala b/...rver-attestation/src/test/scala/com/yubico/fido/metadata/FidoMetadataDownloaderSpec.scala
@@ -8,8 +8,6 @@ import com.yubico.internal.util.JacksonCodecs
 import com.yubico.webauthn.TestAuthenticator
 import com.yubico.webauthn.data.ByteArray
 import com.yubico.webauthn.data.COSEAlgorithmIdentifier
-import jakarta.servlet.http.HttpServletRequest
-import jakarta.servlet.http.HttpServletResponse
 import org.bouncycastle.asn1.x500.X500Name
 import org.eclipse.jetty.server.HttpConfiguration
 import org.eclipse.jetty.server.HttpConnectionFactory
@@ -46,6 +44,8 @@ import java.time.Instant
 import java.time.LocalDate
 import java.time.ZoneOffset
 import java.util.Optional
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
 import scala.jdk.CollectionConverters.ListHasAsScala
 import scala.jdk.CollectionConverters.SeqHasAsJava
 import scala.jdk.CollectionConverters.SetHasAsJava