From de0ae59e638effe5d5da46dd381319327911dce7 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 6 Apr 2026 22:24:52 +0300 Subject: [PATCH 1/7] Reorganize depenencies --- .../openam-auth-ntlmv2/pom.xml | 8 ++++++- openam-cassandra/openam-cassandra-cts/pom.xml | 4 ++-- .../openam-cassandra-datastore/pom.xml | 4 ++-- .../openam-cassandra-embedded/pom.xml | 4 ++-- openam-cassandra/pom.xml | 23 +------------------ pom.xml | 13 ++++++----- 6 files changed, 21 insertions(+), 35 deletions(-) diff --git a/openam-authentication/openam-auth-ntlmv2/pom.xml b/openam-authentication/openam-auth-ntlmv2/pom.xml index e2d278fca5..8f8bb94bf6 100755 --- a/openam-authentication/openam-auth-ntlmv2/pom.xml +++ b/openam-authentication/openam-auth-ntlmv2/pom.xml @@ -13,7 +13,7 @@ * information: "Portions Copyrighted [year] [name of copyright owner]". * * Copyright 2023 Open Identity Platform Community. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. --> 4.0.0 @@ -52,6 +52,12 @@ ch.poweredge.ntlmv2-auth ntlmv2-lib 1.0.5 + + + javax.servlet + servlet-api + + diff --git a/openam-cassandra/openam-cassandra-cts/pom.xml b/openam-cassandra/openam-cassandra-cts/pom.xml index eff3ae0b13..90fd5ca89a 100644 --- a/openam-cassandra/openam-cassandra-cts/pom.xml +++ b/openam-cassandra/openam-cassandra-cts/pom.xml @@ -13,7 +13,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2019 Open Identity Platform Community. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. --> 4.0.0 @@ -38,7 +38,7 @@ 3.19.0-GA - com.datastax.oss + org.apache.cassandra java-driver-query-builder diff --git a/openam-cassandra/openam-cassandra-datastore/pom.xml b/openam-cassandra/openam-cassandra-datastore/pom.xml index 67012f5e45..e372f735ea 100644 --- a/openam-cassandra/openam-cassandra-datastore/pom.xml +++ b/openam-cassandra/openam-cassandra-datastore/pom.xml @@ -12,7 +12,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions copyright [year] [name of copyright owner]". * - * Copyright 2019-2025 3A Systems LLC. + * Copyright 2019-2026 3A Systems LLC. --> 4.0.0 @@ -31,7 +31,7 @@ commons-lang3 - com.datastax.oss + org.apache.cassandra java-driver-core diff --git a/openam-cassandra/openam-cassandra-embedded/pom.xml b/openam-cassandra/openam-cassandra-embedded/pom.xml index c0db4b6831..15c67f262b 100644 --- a/openam-cassandra/openam-cassandra-embedded/pom.xml +++ b/openam-cassandra/openam-cassandra-embedded/pom.xml @@ -12,7 +12,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions copyright [year] [name of copyright owner]". * - * Copyright 2019-2025 3A Systems LLC. + * Copyright 2019-2026 3A Systems LLC. --> 4.0.0 @@ -28,7 +28,7 @@ OpenAM Embedded Cassandra - com.datastax.oss + org.apache.cassandra java-driver-core diff --git a/openam-cassandra/pom.xml b/openam-cassandra/pom.xml index 7008c25e25..f055fc49cb 100644 --- a/openam-cassandra/pom.xml +++ b/openam-cassandra/pom.xml @@ -12,7 +12,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions copyright [year] [name of copyright owner]". * - * Copyright 2019-2025 3A Systems LLC. + * Copyright 2019-2026 3A Systems LLC. --> 4.0.0 @@ -36,27 +36,6 @@ - - com.datastax.oss - java-driver-core - 4.17.0 - - - com.datastax.oss - java-driver-query-builder - 4.17.0 - - - org.apache.cassandra - cassandra-all - 4.0.17 - - - org.lz4 - lz4-java - - - at.yawk.lz4 lz4-java diff --git a/pom.xml b/pom.xml index 1d22b488f9..40d29ed68d 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 11 checkstyle/suppressions.xml - 5.0.4 + 5.0.5-SNAPSHOT 1.0.0 1.0b3 7.0.0 @@ -1416,6 +1416,12 @@ org.restlet.jee org.restlet.ext.freemarker ${restlet.version} + + + org.restlet.jee + org.restlet + + org.restlet.jee @@ -1700,11 +1706,6 @@ woodstox-core 6.4.0 - - org.owasp.antisamy - antisamy - 1.7.5 - com.github.jnr jnr-posix From 0770912627d0bdcce4ad26c55b81e1912b66b4a6 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Thu, 9 Apr 2026 17:23:42 +0300 Subject: [PATCH 2/7] In openam-cassandra/openam-cassandra-embedded/pom.xml, add a profile that skips tests on Windows --- .github/workflows/build.yml | 2 +- .../openam-cassandra-embedded/pom.xml | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 86223c461c..d71fef5a96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build on: push: - branches: [ 'sustaining/15.2.x','master' ] + branches: [ 'sustaining/15.2.x','master','issues/**','features/**' ] pull_request: jobs: build-maven: diff --git a/openam-cassandra/openam-cassandra-embedded/pom.xml b/openam-cassandra/openam-cassandra-embedded/pom.xml index 15c67f262b..629504e21d 100644 --- a/openam-cassandra/openam-cassandra-embedded/pom.xml +++ b/openam-cassandra/openam-cassandra-embedded/pom.xml @@ -54,4 +54,25 @@ test + + + skip-cassandra-tests-on-windows + + + windows + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + \ No newline at end of file From 5db70bcb565b9c748e9ffc5373c63935a11a9750 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Thu, 9 Apr 2026 19:42:05 +0300 Subject: [PATCH 3/7] In openam-cassandra/pom.xml, add a profile that skips tests on Windows --- .../openam-cassandra-embedded/pom.xml | 21 ------------------- openam-cassandra/pom.xml | 19 +++++++++++++++++ 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/openam-cassandra/openam-cassandra-embedded/pom.xml b/openam-cassandra/openam-cassandra-embedded/pom.xml index 629504e21d..15c67f262b 100644 --- a/openam-cassandra/openam-cassandra-embedded/pom.xml +++ b/openam-cassandra/openam-cassandra-embedded/pom.xml @@ -54,25 +54,4 @@ test - - - skip-cassandra-tests-on-windows - - - windows - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - - \ No newline at end of file diff --git a/openam-cassandra/pom.xml b/openam-cassandra/pom.xml index f055fc49cb..4fb965ca9e 100644 --- a/openam-cassandra/pom.xml +++ b/openam-cassandra/pom.xml @@ -101,6 +101,25 @@ + + skip-cassandra-tests-on-windows + + + windows + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + From 1ea420439cf215c23bcd055ba357c5b9c79b67a4 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Fri, 10 Apr 2026 15:39:54 +0300 Subject: [PATCH 4/7] Add slim OpenDJ version to dependencies & remove jakarta.xml.soap-api --- openam-schema/openam-idsvcs-schema/pom.xml | 6 ---- openam-server-only/pom.xml | 3 +- pom.xml | 38 +++++++++++++--------- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/openam-schema/openam-idsvcs-schema/pom.xml b/openam-schema/openam-idsvcs-schema/pom.xml index f8a54170e0..48e27866f3 100644 --- a/openam-schema/openam-idsvcs-schema/pom.xml +++ b/openam-schema/openam-idsvcs-schema/pom.xml @@ -127,12 +127,6 @@ javax.xml.soap-api 1.4.0 - - - jakarta.xml.soap - jakarta.xml.soap-api - - org.openidentityplatform.openam.jakarta jaxrpc-impl diff --git a/openam-server-only/pom.xml b/openam-server-only/pom.xml index 99200b6796..17e45f441a 100644 --- a/openam-server-only/pom.xml +++ b/openam-server-only/pom.xml @@ -65,8 +65,9 @@ org.openidentityplatform.opendj opendj-server-legacy - ${opendj.server.legacy} + ${opendj.versionv} zip + slim diff --git a/pom.xml b/pom.xml index 40d29ed68d..4e849b3ba3 100644 --- a/pom.xml +++ b/pom.xml @@ -1314,21 +1314,29 @@ - - - - - - - - - - - - - - - + + org.openidentityplatform.opendj + opendj-server-legacy + ${opendj.version} + + + com.mysql + mysql-connector-j + + + com.oracle.database.jdbc + ojdbc8 + + + com.microsoft.sqlserver + mssql-jdbc + + + org.postgresql + postgresql + + + From bccdd5ae2647dc8b77e28815fd2b7dd12d38b732 Mon Sep 17 00:00:00 2001 From: Maxim Thomas Date: Fri, 10 Apr 2026 18:57:37 +0300 Subject: [PATCH 5/7] Update pom.xml --- openam-server-only/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openam-server-only/pom.xml b/openam-server-only/pom.xml index 17e45f441a..c519b3aab7 100644 --- a/openam-server-only/pom.xml +++ b/openam-server-only/pom.xml @@ -65,7 +65,7 @@ org.openidentityplatform.opendj opendj-server-legacy - ${opendj.versionv} + ${opendj.version} zip slim From 0ca03e55400257ebeda93f77c784cb8b87e159f0 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Fri, 10 Apr 2026 21:29:07 +0300 Subject: [PATCH 6/7] omit opendj-server-legacy slim zip version --- openam-server-only/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/openam-server-only/pom.xml b/openam-server-only/pom.xml index c519b3aab7..a0acf1bf05 100644 --- a/openam-server-only/pom.xml +++ b/openam-server-only/pom.xml @@ -65,7 +65,6 @@ org.openidentityplatform.opendj opendj-server-legacy - ${opendj.version} zip slim From 0c8443b2088466b7c301a3df13057b421d0adaf5 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 13 Apr 2026 17:28:39 +0300 Subject: [PATCH 7/7] solve duplicated dependencies issue --- openam-cassandra/openam-cassandra-cts/pom.xml | 5 ----- openam-console/pom.xml | 18 +++++++++++++++++- openam-oauth2/pom.xml | 7 +------ openam-uma/pom.xml | 3 ++- pom.xml | 10 ++++------ 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/openam-cassandra/openam-cassandra-cts/pom.xml b/openam-cassandra/openam-cassandra-cts/pom.xml index 90fd5ca89a..32d0c073bb 100644 --- a/openam-cassandra/openam-cassandra-cts/pom.xml +++ b/openam-cassandra/openam-cassandra-cts/pom.xml @@ -32,11 +32,6 @@ openam-core provided - - org.javassist - javassist - 3.19.0-GA - org.apache.cassandra java-driver-query-builder diff --git a/openam-console/pom.xml b/openam-console/pom.xml index 291f951dab..3a53782f55 100644 --- a/openam-console/pom.xml +++ b/openam-console/pom.xml @@ -13,7 +13,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2012-2016 ForgeRock AS. - * Portions copyright 2017-2025 3A Systems, LLC + * Portions copyright 2017-2026 3A Systems, LLC --> 4.0.0 @@ -169,6 +169,16 @@ org.openidentityplatform.openam openam-core + + + com.google.errorprone + error_prone_annotations + + + org.glassfish.jersey.bundles + jaxrs-ri + + org.openidentityplatform.openam @@ -177,6 +187,12 @@ org.openidentityplatform.openam OpenFM + + + org.glassfish.gmbal + gmbal + + org.openidentityplatform.openam diff --git a/openam-oauth2/pom.xml b/openam-oauth2/pom.xml index a9b31f7364..2d57456987 100644 --- a/openam-oauth2/pom.xml +++ b/openam-oauth2/pom.xml @@ -13,7 +13,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2012-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. --> 4.0.0 @@ -171,11 +171,6 @@ openam-notifications-integration test - - - javassist - javassist - org.openidentityplatform.opendj opendj-server-legacy diff --git a/openam-uma/pom.xml b/openam-uma/pom.xml index 171abe01b5..b6e795ceef 100755 --- a/openam-uma/pom.xml +++ b/openam-uma/pom.xml @@ -13,7 +13,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems LLC. --> 4.0.0 @@ -85,6 +85,7 @@ org.openidentityplatform.commons json-resource test-jar + test org.openidentityplatform.commons diff --git a/pom.xml b/pom.xml index 4e849b3ba3..377d3cde1c 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,6 +1517,10 @@ com.google.inject guice + + com.google.errorprone + error_prone_annotations + @@ -1637,12 +1641,6 @@ ${powermock.version} test - - javassist - javassist - 3.12.1.GA - test - com.h2database h2