Skip to content

Commit 0b794ba

Browse files
nscuronscuro
committed
Address dependency convergence using Maven BOMs
Import Maven BOMs of those projects that offer it. This provides a central place where versions of a certain library or framework can be updated, and helps in preventing dependency convergence issues. It also keeps our POMs simpler. Signed-off-by: nscuro <nscuro@protonmail.com>
1 parent af2a26f commit 0b794ba

4 files changed

Lines changed: 69 additions & 131 deletions

File tree

‎alpine/alpine-executable-war/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030

3131
<properties>
3232
<maven.uuidgenerator.plugin.version>1.0.1</maven.uuidgenerator.plugin.version>
33-
34-
<!-- Dependency Versions -->
35-
<lib.jetty.version>12.0.22</lib.jetty.version>
3633
</properties>
3734

3835
<dependencies>
@@ -43,17 +40,14 @@
4340
<dependency>
4441
<groupId>org.eclipse.jetty</groupId>
4542
<artifactId>jetty-server</artifactId>
46-
<version>${lib.jetty.version}</version>
4743
</dependency>
4844
<dependency>
4945
<groupId>org.eclipse.jetty.ee10</groupId>
5046
<artifactId>jetty-ee10-webapp</artifactId>
51-
<version>${lib.jetty.version}</version>
5247
</dependency>
5348
<dependency>
5449
<groupId>org.eclipse.jetty</groupId>
5550
<artifactId>jetty-deploy</artifactId>
56-
<version>${lib.jetty.version}</version>
5751
</dependency>
5852
<dependency>
5953
<groupId>org.slf4j</groupId>

‎alpine/pom.xml‎

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,8 @@
8383
<lib.h2.version>2.3.232</lib.h2.version>
8484
<lib.hikaricp.version>6.3.0</lib.hikaricp.version>
8585
<lib.javassist.version>3.30.2-GA</lib.javassist.version>
86-
<lib.jackson.version>2.19.1</lib.jackson.version>
87-
<lib.jackson-databind.version>2.19.1</lib.jackson-databind.version>
88-
<lib.jakarta-json-api.version>2.1.3</lib.jakarta-json-api.version>
89-
<lib.jakarta-mail-api.version>2.1.3</lib.jakarta-mail-api.version>
90-
<lib.jakarta-servlet-api.version>6.1.0</lib.jakarta-servlet-api.version>
91-
<lib.jakarta-xml-bind-api.version>4.0.2</lib.jakarta-xml-bind-api.version>
9286
<lib.jaxb-runtime.version>4.0.5</lib.jaxb-runtime.version>
9387
<lib.jdo.api.version>3.2.1</lib.jdo.api.version>
94-
<lib.jersey.version>3.1.10</lib.jersey.version>
9588
<lib.json-unit.version>4.1.1</lib.json-unit.version>
9689
<lib.jsonwebtoken.version>0.12.6</lib.jsonwebtoken.version>
9790
<lib.jsr305.version>3.0.2</lib.jsr305.version>
@@ -128,59 +121,13 @@
128121
<artifactId>commons-collections4</artifactId>
129122
<version>${lib.commons.collections4.version}</version>
130123
</dependency>
131-
<dependency>
132-
<groupId>org.glassfish.jersey.core</groupId>
133-
<artifactId>jersey-client</artifactId>
134-
<version>${lib.jersey.version}</version>
135-
</dependency>
136-
<!-- Server architecture -->
137-
<dependency>
138-
<groupId>jakarta.servlet</groupId>
139-
<artifactId>jakarta.servlet-api</artifactId>
140-
<version>${lib.jakarta-servlet-api.version}</version>
141-
</dependency>
142-
<dependency>
143-
<groupId>org.glassfish.jersey.containers</groupId>
144-
<artifactId>jersey-container-servlet</artifactId>
145-
<version>${lib.jersey.version}</version>
146-
</dependency>
147-
<dependency>
148-
<groupId>org.glassfish.jersey.media</groupId>
149-
<artifactId>jersey-media-json-jackson</artifactId>
150-
<version>${lib.jersey.version}</version>
151-
</dependency>
152-
<dependency>
153-
<groupId>org.glassfish.jersey.media</groupId>
154-
<artifactId>jersey-media-multipart</artifactId>
155-
<version>${lib.jersey.version}</version>
156-
</dependency>
157-
<dependency>
158-
<groupId>org.glassfish.jersey.ext</groupId>
159-
<artifactId>jersey-bean-validation</artifactId>
160-
<version>${lib.jersey.version}</version>
161-
</dependency>
162-
<dependency>
163-
<groupId>org.glassfish.jersey.inject</groupId>
164-
<artifactId>jersey-hk2</artifactId>
165-
<version>${lib.jersey.version}</version>
166-
</dependency>
167124
<!-- JAXB -->
168-
<dependency>
169-
<groupId>jakarta.xml.bind</groupId>
170-
<artifactId>jakarta.xml.bind-api</artifactId>
171-
<version>${lib.jakarta-xml-bind-api.version}</version>
172-
</dependency>
173125
<dependency>
174126
<groupId>org.glassfish.jaxb</groupId>
175127
<artifactId>jaxb-runtime</artifactId>
176128
<version>${lib.jaxb-runtime.version}</version>
177129
</dependency>
178130
<!-- JSON API specification and default implementation -->
179-
<dependency>
180-
<groupId>jakarta.json</groupId>
181-
<artifactId>jakarta.json-api</artifactId>
182-
<version>${lib.jakarta-json-api.version}</version>
183-
</dependency>
184131
<dependency>
185132
<groupId>org.eclipse.parsson</groupId>
186133
<artifactId>jakarta.json</artifactId>
@@ -224,37 +171,6 @@
224171
<artifactId>oauth2-oidc-sdk</artifactId>
225172
<version>${lib.nimbus-oauth2-oidc-sdk.version}</version>
226173
</dependency>
227-
<!-- JAX-RS JSON -->
228-
<dependency>
229-
<groupId>com.fasterxml.jackson.core</groupId>
230-
<artifactId>jackson-core</artifactId>
231-
<version>${lib.jackson.version}</version>
232-
</dependency>
233-
<dependency>
234-
<groupId>com.fasterxml.jackson.core</groupId>
235-
<artifactId>jackson-databind</artifactId>
236-
<version>${lib.jackson-databind.version}</version>
237-
</dependency>
238-
<dependency>
239-
<groupId>com.fasterxml.jackson.core</groupId>
240-
<artifactId>jackson-annotations</artifactId>
241-
<version>${lib.jackson.version}</version>
242-
</dependency>
243-
<dependency>
244-
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
245-
<artifactId>jackson-jakarta-rs-base</artifactId>
246-
<version>${lib.jackson.version}</version>
247-
</dependency>
248-
<dependency>
249-
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
250-
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
251-
<version>${lib.jackson.version}</version>
252-
</dependency>
253-
<dependency>
254-
<groupId>com.fasterxml.jackson.datatype</groupId>
255-
<artifactId>jackson-datatype-jdk8</artifactId>
256-
<version>${lib.jackson.version}</version>
257-
</dependency>
258174
<!-- Metrics -->
259175
<dependency>
260176
<groupId>io.micrometer</groupId>
@@ -311,11 +227,6 @@
311227
<version>${lib.owasp.encoder.version}</version>
312228
</dependency>
313229
<!-- JavaMail API -->
314-
<dependency>
315-
<groupId>jakarta.mail</groupId>
316-
<artifactId>jakarta.mail-api</artifactId>
317-
<version>${lib.jakarta-mail-api.version}</version>
318-
</dependency>
319230
<dependency>
320231
<groupId>org.eclipse.angus</groupId>
321232
<artifactId>angus-mail</artifactId>
@@ -350,12 +261,6 @@
350261
</exclusion>
351262
</exclusions>
352263
</dependency>
353-
<dependency>
354-
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
355-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
356-
<version>${lib.jersey.version}</version>
357-
<scope>test</scope>
358-
</dependency>
359264
<dependency>
360265
<groupId>org.mockito</groupId>
361266
<artifactId>mockito-core</artifactId>

‎apiserver/pom.xml‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,13 @@
1919

2020
<!-- Dependency Versions -->
2121
<lib.awaitility.version>4.3.0</lib.awaitility.version>
22-
<lib.cel-tools.version>0.5.3</lib.cel-tools.version>
2322
<lib.cloud-sql-postgres-socket-factory.version>1.25.1</lib.cloud-sql-postgres-socket-factory.version>
2423
<lib.commons-compress.version>1.27.1</lib.commons-compress.version>
2524
<lib.cpe-parser.version>3.0.0</lib.cpe-parser.version>
2625
<lib.cvss-calculator.version>1.4.3</lib.cvss-calculator.version>
2726
<lib.owasp-rr-calculator.version>1.0.1</lib.owasp-rr-calculator.version>
2827
<lib.cyclonedx-java.version>10.2.1</lib.cyclonedx-java.version>
2928
<lib.jaxb.runtime.version>4.0.5</lib.jaxb.runtime.version>
30-
<lib.jackson.version>2.19.1</lib.jackson.version>
31-
<lib.jackson-databind.version>2.18.3</lib.jackson-databind.version>
32-
<lib.jersey.version>3.1.10</lib.jersey.version>
33-
<lib.jdbi.version>3.49.5</lib.jdbi.version>
3429
<lib.json-unit.version>4.1.0</lib.json-unit.version>
3530
<lib.junit.version>4.13.2</lib.junit.version>
3631
<lib.kafka.version>3.9.0</lib.kafka.version>
@@ -137,7 +132,6 @@
137132
<dependency>
138133
<groupId>org.projectnessie.cel</groupId>
139134
<artifactId>cel-tools</artifactId>
140-
<version>${lib.cel-tools.version}</version>
141135
</dependency>
142136
<!-- CVSS Calculator -->
143137
<dependency>
@@ -148,32 +142,26 @@
148142
<dependency>
149143
<groupId>org.jdbi</groupId>
150144
<artifactId>jdbi3-core</artifactId>
151-
<version>${lib.jdbi.version}</version>
152145
</dependency>
153146
<dependency>
154147
<groupId>org.jdbi</groupId>
155148
<artifactId>jdbi3-jackson2</artifactId>
156-
<version>${lib.jdbi.version}</version>
157149
</dependency>
158150
<dependency>
159151
<groupId>org.jdbi</groupId>
160152
<artifactId>jdbi3-sqlobject</artifactId>
161-
<version>${lib.jdbi.version}</version>
162153
</dependency>
163154
<dependency>
164155
<groupId>org.jdbi</groupId>
165156
<artifactId>jdbi3-postgres</artifactId>
166-
<version>${lib.jdbi.version}</version>
167157
</dependency>
168158
<dependency>
169159
<groupId>org.jdbi</groupId>
170160
<artifactId>jdbi3-freemarker</artifactId>
171-
<version>${lib.jdbi.version}</version>
172161
</dependency>
173162
<dependency>
174163
<groupId>org.glassfish.jersey.ext</groupId>
175164
<artifactId>jersey-micrometer</artifactId>
176-
<version>${lib.jersey.version}</version>
177165
</dependency>
178166
<!-- OWASP Risk Rating calculator -->
179167
<dependency>
@@ -197,7 +185,6 @@
197185
<dependency>
198186
<groupId>jakarta.activation</groupId>
199187
<artifactId>jakarta.activation-api</artifactId>
200-
<version>2.1.3</version>
201188
</dependency>
202189
<dependency>
203190
<groupId>jakarta.servlet</groupId>
@@ -233,12 +220,10 @@
233220
<dependency>
234221
<groupId>com.fasterxml.jackson.datatype</groupId>
235222
<artifactId>jackson-datatype-json-org</artifactId>
236-
<version>${lib.jackson.version}</version>
237223
</dependency>
238224
<dependency>
239225
<groupId>com.fasterxml.jackson.datatype</groupId>
240226
<artifactId>jackson-datatype-jsr310</artifactId>
241-
<version>${lib.jackson.version}</version>
242227
</dependency>
243228

244229
<!-- Package URL -->
@@ -372,7 +357,6 @@
372357
<dependency>
373358
<groupId>com.fasterxml.jackson.dataformat</groupId>
374359
<artifactId>jackson-dataformat-yaml</artifactId>
375-
<version>${lib.jackson.version}</version>
376360
</dependency>
377361

378362
<dependency>
@@ -397,13 +381,11 @@
397381
<dependency>
398382
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
399383
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
400-
<version>${lib.jersey.version}</version>
401384
<scope>test</scope>
402385
</dependency>
403386
<dependency>
404387
<groupId>org.glassfish.jersey.connectors</groupId>
405388
<artifactId>jersey-grizzly-connector</artifactId>
406-
<version>${lib.jersey.version}</version>
407389
<scope>test</scope>
408390
</dependency>
409391
<dependency>
@@ -458,17 +440,14 @@
458440
<dependency>
459441
<groupId>com.fasterxml.jackson.core</groupId>
460442
<artifactId>jackson-core</artifactId>
461-
<version>${lib.jackson.version}</version>
462443
</dependency>
463444
<dependency>
464445
<groupId>com.fasterxml.jackson.core</groupId>
465446
<artifactId>jackson-databind</artifactId>
466-
<version>${lib.jackson.version}</version>
467447
</dependency>
468448
<dependency>
469449
<groupId>com.fasterxml.jackson.core</groupId>
470450
<artifactId>jackson-annotations</artifactId>
471-
<version>${lib.jackson.version}</version>
472451
</dependency>
473452
<dependency>
474453
<groupId>org.owasp</groupId>
@@ -727,7 +706,7 @@
727706
<plugin>
728707
<groupId>org.eclipse.jetty.ee10</groupId>
729708
<artifactId>jetty-ee10-maven-plugin</artifactId>
730-
<version>12.0.22</version>
709+
<version>${lib.jetty.version}</version>
731710
<configuration>
732711
<webApp>
733712
<!-- Disable classpath scanning. -->

0 commit comments

Comments
 (0)