From 0eba0a991c2c00deff05f8da67dcc6e34d8a8f7e Mon Sep 17 00:00:00 2001
From: Robin Meese <39960884+robson90@users.noreply.github.com>
Date: Fri, 06 Feb 2026 15:54:21 +0000
Subject: [PATCH] Add newest version of JUnit
---
src/test/java/org/keycloak/protocol/cas/LogoutHelperTest.java | 7 ++++---
src/test/java/org/keycloak/protocol/cas/SamlResponseTest.java | 6 +++---
src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java | 4 ++--
pom.xml | 11 +++++++----
src/test/java/org/keycloak/protocol/cas/ServiceResponseTest.java | 4 ++--
5 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 292fd5b..ed280b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,11 +31,14 @@
<apache.httpcomponents.version>4.5.14</apache.httpcomponents.version>
<jboss.logging.version>3.6.1.Final</jboss.logging.version>
<jboss.logging.tools.version>3.0.4.Final</jboss.logging.tools.version>
- <junit.version>4.13.2</junit.version>
+ <junit.version>6.0.2</junit.version>
<resteasy.version>6.2.12.Final</resteasy.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.release>17</maven.compiler.release>
+ <java.version>17</java.version>
+ <maven.compiler.release>${java.version}</maven.compiler.release>
+ <maven.compiler.source>${java.version}</maven.compiler.source>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.outputTimestamp>1769244879</project.build.outputTimestamp>
</properties>
@@ -104,8 +107,8 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
diff --git a/src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java b/src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java
index bdd024a..2eb6032 100644
--- a/src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java
+++ b/src/test/java/org/keycloak/protocol/cas/ContentTypeHelperTest.java
@@ -1,10 +1,10 @@
package org.keycloak.protocol.cas;
import jakarta.ws.rs.core.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.keycloak.protocol.cas.utils.ContentTypeHelper;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.*;
public class ContentTypeHelperTest {
diff --git a/src/test/java/org/keycloak/protocol/cas/LogoutHelperTest.java b/src/test/java/org/keycloak/protocol/cas/LogoutHelperTest.java
index b8b6a40..1d922b0 100644
--- a/src/test/java/org/keycloak/protocol/cas/LogoutHelperTest.java
+++ b/src/test/java/org/keycloak/protocol/cas/LogoutHelperTest.java
@@ -3,7 +3,7 @@
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.keycloak.protocol.cas.utils.LogoutHelper;
import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
import org.keycloak.saml.common.util.DocumentUtil;
@@ -13,8 +13,9 @@
import java.util.List;
import java.util.stream.Collectors;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
public class LogoutHelperTest {
@Test
diff --git a/src/test/java/org/keycloak/protocol/cas/SamlResponseTest.java b/src/test/java/org/keycloak/protocol/cas/SamlResponseTest.java
index e5b0c33..d4c9c8c 100644
--- a/src/test/java/org/keycloak/protocol/cas/SamlResponseTest.java
+++ b/src/test/java/org/keycloak/protocol/cas/SamlResponseTest.java
@@ -1,7 +1,7 @@
package org.keycloak.protocol.cas;
import jakarta.ws.rs.core.Response;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.keycloak.dom.saml.v1.protocol.SAML11ResponseType;
import org.keycloak.protocol.cas.representations.CASErrorCode;
import org.keycloak.protocol.cas.representations.SamlResponseHelper;
@@ -10,8 +10,8 @@
import java.util.Collections;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SamlResponseTest {
@Test
diff --git a/src/test/java/org/keycloak/protocol/cas/ServiceResponseTest.java b/src/test/java/org/keycloak/protocol/cas/ServiceResponseTest.java
index 29ea43a..e8c763a 100644
--- a/src/test/java/org/keycloak/protocol/cas/ServiceResponseTest.java
+++ b/src/test/java/org/keycloak/protocol/cas/ServiceResponseTest.java
@@ -1,7 +1,7 @@
package org.keycloak.protocol.cas;
import com.jayway.jsonpath.JsonPath;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.keycloak.protocol.cas.representations.CASErrorCode;
import org.keycloak.protocol.cas.representations.CASServiceResponse;
import org.keycloak.protocol.cas.utils.ServiceResponseHelper;
@@ -13,7 +13,7 @@
import java.util.*;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.keycloak.protocol.cas.XMLValidator.parseAndValidate;
import static org.keycloak.protocol.cas.XMLValidator.schemaFromClassPath;
--
Gitblit v1.10.0