From 13968da7de81224266f551a45b350ec44af25cc2 Mon Sep 17 00:00:00 2001
From: Farah Juma <fjuma@redhat.com>
Date: Wed, 14 Jun 2023 14:16:04 -0400
Subject: [PATCH] Merge branch '1.x' into 2.x

---
 http/oidc/pom.xml                                           | 2 +-
 .../security/http/oidc/TypClaimValidationBaseTest.java      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/http/oidc/pom.xml b/http/oidc/pom.xml
index cc344c99825..367ebd92d21 100644
--- a/http/oidc/pom.xml
+++ b/http/oidc/pom.xml
@@ -165,7 +165,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
+            <artifactId>jakarta.json</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/http/oidc/src/test/java/org/wildfly/security/http/oidc/TypClaimValidationBaseTest.java b/http/oidc/src/test/java/org/wildfly/security/http/oidc/TypClaimValidationBaseTest.java
index f665e220606..0dd0f28a152 100644
--- a/http/oidc/src/test/java/org/wildfly/security/http/oidc/TypClaimValidationBaseTest.java
+++ b/http/oidc/src/test/java/org/wildfly/security/http/oidc/TypClaimValidationBaseTest.java
@@ -26,13 +26,13 @@
 import com.nimbusds.jose.Payload;
 import com.nimbusds.jose.crypto.RSASSASigner;
 
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.PrivateKey;
 
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-
 import mockit.Mock;
 import mockit.MockUp;