Skip to content

Commit 50f325b

Browse files
maximthomasmaximthomas
authored
[#980] Remove duplicated and redundant dependencies, use OpenDJ embedded slim package (#983)
1 parent 657c11e commit 50f325b

12 files changed

Lines changed: 89 additions & 77 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build
22

33
on:
44
push:
5-
branches: [ 'sustaining/15.2.x','master' ]
5+
branches: [ 'sustaining/15.2.x','master','issues/**','features/**' ]
66
pull_request:
77
jobs:
88
build-maven:

‎openam-authentication/openam-auth-ntlmv2/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* information: "Portions Copyrighted [year] [name of copyright owner]".
1414
*
1515
* Copyright 2023 Open Identity Platform Community.
16-
* Portions copyright 2025 3A Systems LLC.
16+
* Portions copyright 2025-2026 3A Systems LLC.
1717
-->
1818
<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">
1919
<modelVersion>4.0.0</modelVersion>
@@ -52,6 +52,12 @@
5252
<groupId>ch.poweredge.ntlmv2-auth</groupId>
5353
<artifactId>ntlmv2-lib</artifactId>
5454
<version>1.0.5</version>
55+
<exclusions>
56+
<exclusion>
57+
<groupId>javax.servlet</groupId>
58+
<artifactId>servlet-api</artifactId>
59+
</exclusion>
60+
</exclusions>
5561
</dependency>
5662
</dependencies>
5763

‎openam-cassandra/openam-cassandra-cts/pom.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
1515
* Copyright 2019 Open Identity Platform Community.
16-
* Portions copyright 2025 3A Systems LLC.
16+
* Portions copyright 2025-2026 3A Systems LLC.
1717
-->
1818
<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">
1919
<modelVersion>4.0.0</modelVersion>
@@ -33,12 +33,7 @@
3333
<scope>provided</scope>
3434
</dependency>
3535
<dependency>
36-
<groupId>org.javassist</groupId>
37-
<artifactId>javassist</artifactId>
38-
<version>3.19.0-GA</version>
39-
</dependency>
40-
<dependency>
41-
<groupId>com.datastax.oss</groupId>
36+
<groupId>org.apache.cassandra</groupId>
4237
<artifactId>java-driver-query-builder</artifactId>
4338
</dependency>
4439
<dependency>

‎openam-cassandra/openam-cassandra-datastore/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Header, with the fields enclosed by brackets [] replaced by your own identifying
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
15-
* Copyright 2019-2025 3A Systems LLC.
15+
* Copyright 2019-2026 3A Systems LLC.
1616
-->
1717
<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">
1818
<modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
3131
<artifactId>commons-lang3</artifactId>
3232
</dependency>
3333
<dependency>
34-
<groupId>com.datastax.oss</groupId>
34+
<groupId>org.apache.cassandra</groupId>
3535
<artifactId>java-driver-core</artifactId>
3636
</dependency>
3737
<dependency>

‎openam-cassandra/openam-cassandra-embedded/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Header, with the fields enclosed by brackets [] replaced by your own identifying
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
15-
* Copyright 2019-2025 3A Systems LLC.
15+
* Copyright 2019-2026 3A Systems LLC.
1616
-->
1717
<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">
1818
<modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
2828
<description>OpenAM Embedded Cassandra</description>
2929
<dependencies>
3030
<dependency>
31-
<groupId>com.datastax.oss</groupId>
31+
<groupId>org.apache.cassandra</groupId>
3232
<artifactId>java-driver-core</artifactId>
3333
</dependency>
3434
<dependency>

‎openam-cassandra/pom.xml‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Header, with the fields enclosed by brackets [] replaced by your own identifying
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
15-
* Copyright 2019-2025 3A Systems LLC.
15+
* Copyright 2019-2026 3A Systems LLC.
1616
-->
1717
<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">
1818
<modelVersion>4.0.0</modelVersion>
@@ -36,27 +36,6 @@
3636
</modules>
3737
<dependencyManagement>
3838
<dependencies>
39-
<dependency>
40-
<groupId>com.datastax.oss</groupId>
41-
<artifactId>java-driver-core</artifactId>
42-
<version>4.17.0</version>
43-
</dependency>
44-
<dependency>
45-
<groupId>com.datastax.oss</groupId>
46-
<artifactId>java-driver-query-builder</artifactId>
47-
<version>4.17.0</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.apache.cassandra</groupId>
51-
<artifactId>cassandra-all</artifactId>
52-
<version>4.0.20</version>
53-
<exclusions>
54-
<exclusion>
55-
<groupId>org.lz4</groupId>
56-
<artifactId>lz4-java</artifactId>
57-
</exclusion>
58-
</exclusions>
59-
</dependency>
6039
<dependency>
6140
<groupId>at.yawk.lz4</groupId>
6241
<artifactId>lz4-java</artifactId>
@@ -122,6 +101,25 @@
122101
</plugins>
123102
</build>
124103
</profile>
104+
<profile>
105+
<id>skip-cassandra-tests-on-windows</id>
106+
<activation>
107+
<os>
108+
<family>windows</family>
109+
</os>
110+
</activation>
111+
<build>
112+
<plugins>
113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-surefire-plugin</artifactId>
116+
<configuration>
117+
<skipTests>true</skipTests>
118+
</configuration>
119+
</plugin>
120+
</plugins>
121+
</build>
122+
</profile>
125123
</profiles>
126124
</project>
127125

‎openam-console/pom.xml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
1515
* Copyright 2012-2016 ForgeRock AS.
16-
* Portions copyright 2017-2025 3A Systems, LLC
16+
* Portions copyright 2017-2026 3A Systems, LLC
1717
-->
1818
<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">
1919
<modelVersion>4.0.0</modelVersion>
@@ -169,6 +169,16 @@
169169
<dependency>
170170
<groupId>org.openidentityplatform.openam</groupId>
171171
<artifactId>openam-core</artifactId>
172+
<exclusions>
173+
<exclusion>
174+
<groupId>com.google.errorprone</groupId>
175+
<artifactId>error_prone_annotations</artifactId>
176+
</exclusion>
177+
<exclusion>
178+
<groupId>org.glassfish.jersey.bundles</groupId>
179+
<artifactId>jaxrs-ri</artifactId>
180+
</exclusion>
181+
</exclusions>
172182
</dependency>
173183
<dependency>
174184
<groupId>org.openidentityplatform.openam</groupId>
@@ -177,6 +187,12 @@
177187
<dependency>
178188
<groupId>org.openidentityplatform.openam</groupId>
179189
<artifactId>OpenFM</artifactId>
190+
<exclusions>
191+
<exclusion>
192+
<groupId>org.glassfish.gmbal</groupId>
193+
<artifactId>gmbal</artifactId>
194+
</exclusion>
195+
</exclusions>
180196
</dependency>
181197
<dependency>
182198
<groupId>org.openidentityplatform.openam</groupId>

‎openam-oauth2/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* information: "Portions copyright [year] [name of copyright owner]".
1414
*
1515
* Copyright 2012-2016 ForgeRock AS.
16-
* Portions copyright 2025 3A Systems LLC.
16+
* Portions copyright 2025-2026 3A Systems LLC.
1717
-->
1818
<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">
1919
<modelVersion>4.0.0</modelVersion>
@@ -171,11 +171,6 @@
171171
<artifactId>openam-notifications-integration</artifactId>
172172
<scope>test</scope>
173173
</dependency>
174-
175-
<dependency>
176-
<groupId>javassist</groupId>
177-
<artifactId>javassist</artifactId>
178-
</dependency>
179174
<dependency>
180175
<groupId>org.openidentityplatform.opendj</groupId>
181176
<artifactId>opendj-server-legacy</artifactId>

‎openam-schema/openam-idsvcs-schema/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,6 @@
127127
<artifactId>javax.xml.soap-api</artifactId>
128128
<version>1.4.0</version>
129129
</dependency>
130-
131-
<dependency>
132-
<groupId>jakarta.xml.soap</groupId>
133-
<artifactId>jakarta.xml.soap-api</artifactId>
134-
</dependency>
135-
136130
<dependency>
137131
<groupId>org.openidentityplatform.openam.jakarta</groupId>
138132
<artifactId>jaxrpc-impl</artifactId>

‎openam-server-only/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
<artifactItem>
6666
<groupId>org.openidentityplatform.opendj</groupId>
6767
<artifactId>opendj-server-legacy</artifactId>
68-
<version>${opendj.server.legacy}</version>
6968
<type>zip</type>
69+
<classifier>slim</classifier>
7070
</artifactItem>
7171
</artifactItems>
7272

0 commit comments

Comments
 (0)