Skip to content

[#980] Remove duplicated and redundant dependencies, use OpenDJ embedded slim package #983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
maximthomas wants to merge 7 commits into
base: master
Choose a base branch
from
+65 −58
Draft

[#980] Remove duplicated and redundant dependencies, use OpenDJ embedded slim package #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de0ae59
Reorganize depenencies
maximthomas Apr 6, 2026
0434c52
Merge remote-tracking branch 'origin/master' into issues/980-multiple…
maximthomas Apr 9, 2026
0770912
In openam-cassandra/openam-cassandra-embedded/pom.xml, add a profile …
maximthomas Apr 9, 2026
5db70bc
In openam-cassandra/pom.xml, add a profile that skips tests on Windows
maximthomas Apr 9, 2026
1ea4204
Add slim OpenDJ version to dependencies & remove jakarta.xml.soap-api
maximthomas Apr 10, 2026
bccdd5a
Update pom.xml
maximthomas Apr 10, 2026
0ca03e5
omit opendj-server-legacy slim zip version
maximthomas Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 7 additions & 1 deletion openam-authentication/openam-auth-ntlmv2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -52,6 +52,12 @@
<groupId>ch.poweredge.ntlmv2-auth</groupId>
<artifactId>ntlmv2-lib</artifactId>
<version>1.0.5</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions openam-cassandra/openam-cassandra-cts/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand All @@ -38,7 +38,7 @@
<version>3.19.0-GA</version>
</dependency>
<dependency>
<groupId>com.datastax.oss</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>java-driver-query-builder</artifactId>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions openam-cassandra/openam-cassandra-datastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand All @@ -31,7 +31,7 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>com.datastax.oss</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>java-driver-core</artifactId>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions openam-cassandra/openam-cassandra-embedded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand All @@ -28,7 +28,7 @@
<description>OpenAM Embedded Cassandra</description>
<dependencies>
<dependency>
<groupId>com.datastax.oss</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>java-driver-core</artifactId>
</dependency>
<dependency>
Expand Down
42 changes: 20 additions & 22 deletions openam-cassandra/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand All @@ -36,27 +36,6 @@
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.datastax.oss</groupId>
<artifactId>java-driver-core</artifactId>
<version>4.17.0</version>
</dependency>
<dependency>
<groupId>com.datastax.oss</groupId>
<artifactId>java-driver-query-builder</artifactId>
<version>4.17.0</version>
</dependency>
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
<version>4.0.20</version>
<exclusions>
<exclusion>
<groupId>org.lz4</groupId>
<artifactId>lz4-java</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>at.yawk.lz4</groupId>
<artifactId>lz4-java</artifactId>
Expand Down Expand Up @@ -122,6 +101,25 @@
</plugins>
</build>
</profile>
<profile>
<id>skip-cassandra-tests-on-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

6 changes: 0 additions & 6 deletions openam-schema/openam-idsvcs-schema/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,6 @@
<artifactId>javax.xml.soap-api</artifactId>
<version>1.4.0</version>
</dependency>

<dependency>
<groupId>jakarta.xml.soap</groupId>
<artifactId>jakarta.xml.soap-api</artifactId>
</dependency>

<dependency>
<groupId>org.openidentityplatform.openam.jakarta</groupId>
<artifactId>jaxrpc-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion openam-server-only/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
<artifactItem>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-server-legacy</artifactId>
<version>${opendj.server.legacy}</version>
<type>zip</type>
<classifier>slim</classifier>
</artifactItem>
</artifactItems>

Expand Down
51 changes: 30 additions & 21 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<maven.compiler.source>11</maven.compiler.source>
<!-- Supress checkstyle errors on legacy com.iplanet and com.sun.identity packages -->
<checkstyleUnitTestSuppressionsLocation>checkstyle/suppressions.xml</checkstyleUnitTestSuppressionsLocation>
<opendj.version>5.0.4</opendj.version>
<opendj.version>5.0.5-SNAPSHOT</opendj.version>
<javadoc-utils.version>1.0.0</javadoc-utils.version>
<ant.contrib.version>1.0b3</ant.contrib.version>
<guice.version>7.0.0</guice.version>
Expand Down Expand Up @@ -1314,21 +1314,29 @@
<!-- <version>${opendj.server.version}</version> -->
<!-- </dependency> -->
<!-- OpenDJ Server -->
<!-- <dependency> -->
<!-- <groupId>org.openidentityplatform.opendj</groupId> -->
<!-- <artifactId>opendj-server-legacy</artifactId> -->
<!-- <version>${opendj.server.legacy}</version> -->
<!-- <exclusions> -->
<!-- <exclusion> -->
<!-- <groupId>org.slf4j</groupId> -->
<!-- <artifactId>slf4j-jdk14</artifactId> -->
<!-- </exclusion> -->
<!-- <exclusion> -->
<!-- <groupId>javax.servlet</groupId> -->
<!-- <artifactId>javax.servlet-api</artifactId> -->
<!-- </exclusion> -->
<!-- </exclusions> -->
<!-- </dependency> -->
<dependency>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-server-legacy</artifactId>
<version>${opendj.version}</version>
<exclusions>
<exclusion>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</exclusion>
<exclusion>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
</exclusion>
<exclusion>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
</exclusion>
<exclusion>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency> -->
<!-- <groupId>org.openidentityplatform.opendj</groupId> -->
<!-- <artifactId>opendj-server-legacy</artifactId> -->
Expand Down Expand Up @@ -1416,6 +1424,12 @@
<groupId>org.restlet.jee</groupId>
<artifactId>org.restlet.ext.freemarker</artifactId>
<version>${restlet.version}</version>
<exclusions>
<exclusion>
<groupId>org.restlet.jee</groupId>
<artifactId>org.restlet</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.restlet.jee</groupId>
Expand Down Expand Up @@ -1700,11 +1714,6 @@
<artifactId>woodstox-core</artifactId>
<version>6.4.0</version>
</dependency>
<dependency>
<groupId>org.owasp.antisamy</groupId>
<artifactId>antisamy</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-posix</artifactId>
Expand Down