From 0fa04a4620d2508711a577e5df2daec4187e3547 Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Tue, 24 Mar 2026 11:14:30 +0300 Subject: [PATCH 1/5] Update OpenAM dependency version to 16.0.6-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 547b2e4d..624e2030 100644 --- a/pom.xml +++ b/pom.xml @@ -1059,7 +1059,7 @@ org.openidentityplatform.openam openam - 16.0.5 + 16.0.6-SNAPSHOT pom import From 545f4465fcc4233488992eb167ac6bfeeb6a35a9 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Tue, 24 Mar 2026 17:09:46 +0300 Subject: [PATCH 2/5] FIX ambiguous references to assertThat in MdcScheduledExecutorServiceDelegateTest.java --- .../thread/MdcScheduledExecutorServiceDelegateTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/openig-core/src/test/java/org/forgerock/openig/thread/MdcScheduledExecutorServiceDelegateTest.java b/openig-core/src/test/java/org/forgerock/openig/thread/MdcScheduledExecutorServiceDelegateTest.java index 0326edd6..64c153d0 100644 --- a/openig-core/src/test/java/org/forgerock/openig/thread/MdcScheduledExecutorServiceDelegateTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/thread/MdcScheduledExecutorServiceDelegateTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems,LLC */ package org.forgerock.openig.thread; @@ -84,7 +85,7 @@ public void shouldScheduleWithRunnableLongTimeUnit() throws Exception { doReturn(scheduledFuture).when(delegate()) .schedule(nullable(Runnable.class), eq(1L), eq(TimeUnit.SECONDS)); - assertThat(executorService().schedule(runnable, 1, TimeUnit.SECONDS)).isSameAs(scheduledFuture); + assertThat((Object)executorService().schedule(runnable, 1, TimeUnit.SECONDS)).isSameAs(scheduledFuture); verify(delegate()).schedule(runnableCapture.capture(), eq(1L), eq(TimeUnit.SECONDS)); assertThatCapturedRunnableIsMdcAware(); @@ -96,7 +97,7 @@ public void shouldScheduleWithCallableLongTimeUnit() throws Exception { doReturn(scheduledFuture).when(delegate()) .schedule(nullable(Callable.class), eq(1L), eq(TimeUnit.SECONDS)); - assertThat(executorService().schedule(callable, 1, TimeUnit.SECONDS)).isSameAs(scheduledFuture); + assertThat((Object)executorService().schedule(callable, 1, TimeUnit.SECONDS)).isSameAs(scheduledFuture); verify(delegate()).schedule(callableCapture.capture(), eq(1L), eq(TimeUnit.SECONDS)); assertThatCaptureCallableIsMdcAware(); @@ -107,7 +108,7 @@ public void shouldScheduleAtFixedRateWithRunnableLongTimeUnit() throws Exception doReturn(scheduledFuture).when(delegate()) .scheduleAtFixedRate(nullable(Runnable.class), eq(1L), eq(2L), eq(TimeUnit.SECONDS)); - assertThat(executorService().scheduleAtFixedRate(runnable, 1, 2, TimeUnit.SECONDS)).isSameAs(scheduledFuture); + assertThat((Object)executorService().scheduleAtFixedRate(runnable, 1, 2, TimeUnit.SECONDS)).isSameAs(scheduledFuture); verify(delegate()).scheduleAtFixedRate(runnableCapture.capture(), eq(1L), eq(2L), eq(TimeUnit.SECONDS)); assertThatCapturedRunnableIsMdcAware(); @@ -118,7 +119,7 @@ public void shouldScheduleWithFixedDelayWithRunnableLongTimeUnit() throws Except doReturn(scheduledFuture).when(delegate()) .scheduleWithFixedDelay(nullable(Runnable.class), eq(1L), eq(2L), eq(TimeUnit.SECONDS)); - assertThat(executorService().scheduleWithFixedDelay(runnable, 1, 2, TimeUnit.SECONDS)) + assertThat((Object)executorService().scheduleWithFixedDelay(runnable, 1, 2, TimeUnit.SECONDS)) .isSameAs(scheduledFuture); verify(delegate()).scheduleWithFixedDelay(runnableCapture.capture(), eq(1L), eq(2L), eq(TimeUnit.SECONDS)); From f0dd0d5ee0d40a716263f990f78ce64763b362ba Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Tue, 24 Mar 2026 17:18:13 +0300 Subject: [PATCH 3/5] FIX test failure in ClientRegistrationFilterTest.shouldPerformDynamicRegistration --- .../filter/oauth2/client/ClientRegistrationFilterTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/ClientRegistrationFilterTest.java b/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/ClientRegistrationFilterTest.java index 121d386c..ad45b7cb 100644 --- a/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/ClientRegistrationFilterTest.java +++ b/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/ClientRegistrationFilterTest.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC */ package org.forgerock.openig.filter.oauth2.client; @@ -149,7 +150,7 @@ public void shouldPerformDynamicRegistration() throws Exception { verify(handler).handle(eq(context), captor.capture()); Request request = captor.getValue(); assertThat(request.getMethod()).isEqualTo("POST"); - assertThat(request.getEntity().toString()).containsSequence("redirect_uris", "contact", "scopes"); + assertThat(request.getEntity().toString()).contains("redirect_uris", "contact", "scopes"); } @Test(expectedExceptions = RegistrationException.class) From 355c371090f9e3619e59734d2ca6a3af7bc04886 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Tue, 24 Mar 2026 17:23:56 +0300 Subject: [PATCH 4/5] FIX test failure in PolicyEnforcementFilterTest.shouldSucceedToCreateBaseUri --- .../forgerock/openig/openam/PolicyEnforcementFilterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openig-openam/src/test/java/org/forgerock/openig/openam/PolicyEnforcementFilterTest.java b/openig-openam/src/test/java/org/forgerock/openig/openam/PolicyEnforcementFilterTest.java index 31a0ffaf..a465a9bc 100644 --- a/openig-openam/src/test/java/org/forgerock/openig/openam/PolicyEnforcementFilterTest.java +++ b/openig-openam/src/test/java/org/forgerock/openig/openam/PolicyEnforcementFilterTest.java @@ -393,7 +393,7 @@ private static Object[][] realms() { public static void shouldSucceedToCreateBaseUri(final String realm) throws Exception { assertThat(normalizeToJsonEndpoint(new URI("http://www.example.com:8090/openam/"), realm).toASCIIString()) .endsWith("/") - .containsSequence("http://www.example.com:8090/openam/json/", + .contains("http://www.example.com:8090/openam/json/", realm != null ? realm.trim() : ""); } From 10804a4e402fd95088a9fe1156275726b77b5bfe Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Tue, 24 Mar 2026 18:56:54 +0300 Subject: [PATCH 5/5] Bump org.openidentityplatform.openam 16.0.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 624e2030..4fc6f048 100644 --- a/pom.xml +++ b/pom.xml @@ -1059,7 +1059,7 @@ org.openidentityplatform.openam openam - 16.0.6-SNAPSHOT + 16.0.6 pom import