Skip to content

Commit 702b202

Browse files
authored
27.x : dependency cleanup (helidon-io#12093)
* Remove management of unused dependencie * Suppress micrometer false positive
1 parent f43f135 commit 702b202

4 files changed

Lines changed: 21 additions & 179 deletions

File tree

dependencies/pom.xml

Lines changed: 3 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,12 @@
5050
<version.lib.graphql-java>22.1</version.lib.graphql-java>
5151
<version.lib.graphql-java.extended.scalars>22.0</version.lib.graphql-java.extended.scalars>
5252
<version.lib.grpc>1.73.0</version.lib.grpc>
53-
<version.lib.google-findbugs-jsr305>3.0.2</version.lib.google-findbugs-jsr305>
5453
<version.lib.guava>33.3.1-jre</version.lib.guava>
5554
<version.lib.h2>2.4.240</version.lib.h2>
5655
<version.lib.hamcrest>1.3</version.lib.hamcrest>
5756
<version.lib.handlebars>4.5.1</version.lib.handlebars>
5857
<version.lib.hibernate.family>6.3</version.lib.hibernate.family>
5958
<version.lib.hibernate>${version.lib.hibernate.family}.1.Final</version.lib.hibernate>
60-
<version.lib.hibernate-validator>8.0.2.Final</version.lib.hibernate-validator>
6159
<version.lib.hikaricp>5.0.1</version.lib.hikaricp>
6260
<version.lib.jackson>2.21.3</version.lib.jackson>
6361
<version.lib.jakarta.activation-api>2.1.3</version.lib.jakarta.activation-api>
@@ -80,9 +78,6 @@
8078
<!-- Jetbrains annotations: dependency convergence requirement, we never use this directly -->
8179
<version.lib.jetbrains.annotations>17.0.0</version.lib.jetbrains.annotations>
8280
<version.lib.junit>5.12.2</version.lib.junit>
83-
<version.lib.kafka>3.9.2</version.lib.kafka>
84-
<!-- Kotlin: dependency convergence requirement, we never use this directly -->
85-
<version.lib.kotlin>1.9.10</version.lib.kotlin>
8681
<version.lib.log4j>2.25.4</version.lib.log4j>
8782
<version.lib.micrometer>1.15.2</version.lib.micrometer>
8883
<version.lib.micrometer-prometheus>1.15.2</version.lib.micrometer-prometheus>
@@ -91,13 +86,8 @@
9186
<version.lib.narayana>7.1.0.Final</version.lib.narayana>
9287
<version.lib.ojdbc.family>23</version.lib.ojdbc.family>
9388
<version.lib.ojdbc>${version.lib.ojdbc.family}.26.1.0.0</version.lib.ojdbc>
94-
<!-- Force upgrade of okio for dependency convergence -->
95-
<version.lib.okio>3.6.0</version.lib.okio>
96-
<!-- Force upgrade okhttp3 for dependency convergence -->
97-
<version.lib.okhttp3>4.12.0</version.lib.okhttp3>
9889
<version.lib.opentelemetry.semconv>1.37.0</version.lib.opentelemetry.semconv>
9990
<version.lib.opentelemetry>1.58.0</version.lib.opentelemetry>
100-
<version.lib.opentelemetry.instrumentation.annotations>2.24.0</version.lib.opentelemetry.instrumentation.annotations>
10191
<version.lib.parsson>1.1.7</version.lib.parsson>
10292
<version.lib.postgresql>42.7.11</version.lib.postgresql>
10393
<version.lib.prometheus>0.16.0</version.lib.prometheus>
@@ -107,7 +97,6 @@
10797
<version.lib.testcontainers>1.21.4</version.lib.testcontainers>
10898
<version.lib.typesafe-config>1.4.8</version.lib.typesafe-config>
10999
<version.lib.yasson>3.0.4</version.lib.yasson>
110-
<version.lib.zookeeper>3.5.7</version.lib.zookeeper>
111100
</properties>
112101

113102
<dependencyManagement>
@@ -161,17 +150,6 @@
161150
</exclusion>
162151
</exclusions>
163152
</dependency>
164-
<!-- -->
165-
<dependency>
166-
<groupId>io.opentelemetry.instrumentation</groupId>
167-
<artifactId>opentelemetry-instrumentation-annotations</artifactId>
168-
<version>${version.lib.opentelemetry.instrumentation.annotations}</version>
169-
</dependency>
170-
<dependency>
171-
<groupId>io.opentelemetry.instrumentation</groupId>
172-
<artifactId>opentelemetry-instrumentation-api</artifactId>
173-
<version>${version.lib.opentelemetry}</version>
174-
</dependency>
175153
<!--
176154
"Jakarta XML Binding API". (See
177155
https://github.com/jakartaee/jaxb-api/blob/d8a68e76a5391cb2462f540c9e4c5c81d0a91942/jaxb-api/pom.xml#L23-L25)
@@ -248,11 +226,6 @@
248226
<artifactId>parsson</artifactId>
249227
<version>${version.lib.parsson}</version>
250228
</dependency>
251-
<dependency>
252-
<groupId>org.eclipse.parsson</groupId>
253-
<artifactId>parsson-media</artifactId>
254-
<version>${version.lib.parsson}</version>
255-
</dependency>
256229
<dependency>
257230
<groupId>org.eclipse</groupId>
258231
<artifactId>yasson</artifactId>
@@ -276,16 +249,6 @@
276249
<version>${version.lib.snakeyaml}</version>
277250
</dependency>
278251
<!-- Webserver related -->
279-
<dependency>
280-
<groupId>io.prometheus</groupId>
281-
<artifactId>simpleclient</artifactId>
282-
<version>${version.lib.prometheus}</version>
283-
</dependency>
284-
<dependency>
285-
<groupId>io.prometheus</groupId>
286-
<artifactId>simpleclient_common</artifactId>
287-
<version>${version.lib.prometheus}</version>
288-
</dependency>
289252
<dependency>
290253
<groupId>io.prometheus</groupId>
291254
<artifactId>simpleclient_tracer_common</artifactId>
@@ -330,12 +293,6 @@
330293
<version>${version.lib.micrometer}</version>
331294
</dependency>
332295

333-
<dependency>
334-
<groupId>io.smallrye</groupId>
335-
<artifactId>jandex</artifactId>
336-
<version>${version.lib.jandex}</version>
337-
</dependency>
338-
339296
<!-- Integrations related -->
340297
<dependency>
341298
<groupId>jakarta.persistence</groupId>
@@ -388,11 +345,6 @@
388345
<artifactId>hibernate-core</artifactId>
389346
<version>${version.lib.hibernate}</version>
390347
</dependency>
391-
<dependency>
392-
<groupId>org.hibernate.validator</groupId>
393-
<artifactId>hibernate-validator</artifactId>
394-
<version>${version.lib.hibernate-validator}</version>
395-
</dependency>
396348
<dependency>
397349
<groupId>org.jboss.narayana.jta</groupId>
398350
<artifactId>narayana-jta</artifactId>
@@ -423,27 +375,6 @@
423375
</exclusion>
424376
</exclusions>
425377
</dependency>
426-
<!-- Kafka support -->
427-
<dependency>
428-
<groupId>org.apache.kafka</groupId>
429-
<artifactId>kafka-clients</artifactId>
430-
<version>${version.lib.kafka}</version>
431-
</dependency>
432-
<dependency>
433-
<groupId>org.jetbrains.kotlin</groupId>
434-
<artifactId>kotlin-stdlib</artifactId>
435-
<version>${version.lib.kotlin}</version>
436-
</dependency>
437-
<dependency>
438-
<groupId>org.jetbrains.kotlin</groupId>
439-
<artifactId>kotlin-stdlib-common</artifactId>
440-
<version>${version.lib.kotlin}</version>
441-
</dependency>
442-
<dependency>
443-
<groupId>org.jetbrains.kotlin</groupId>
444-
<artifactId>kotlin-stdlib-jdk8</artifactId>
445-
<version>${version.lib.kotlin}</version>
446-
</dependency>
447378
<dependency>
448379
<groupId>org.jetbrains</groupId>
449380
<artifactId>annotations</artifactId>
@@ -460,17 +391,13 @@
460391
<artifactId>reactive-streams</artifactId>
461392
<version>${version.lib.reactivestreams}</version>
462393
</dependency>
463-
<dependency>
464-
<groupId>org.reactivestreams</groupId>
465-
<artifactId>reactive-streams-tck</artifactId>
466-
<version>${version.lib.reactivestreams}</version>
467-
</dependency>
468394
<!-- END OF Section 1: direct third party dependencies -->
469395

470396
<!-- Section 2: third party dependencies used by examples (obsolete) -->
471397
<!-- END OF Section 2: third party dependencies used by examples -->
472398

473399
<!-- Section 3: transitive dependencies we manage the version of for convergence/upgrade -->
400+
<!-- For dependency convergence -->
474401
<dependency>
475402
<groupId>com.google.guava</groupId>
476403
<artifactId>guava</artifactId>
@@ -488,40 +415,19 @@
488415
<artifactId>commons-lang3</artifactId>
489416
<version>${version.lib.commons-lang}</version>
490417
</dependency>
491-
<dependency>
492-
<!-- Force upgrade okhttp3 for dependency convergence -->
493-
<groupId>com.squareup.okhttp3</groupId>
494-
<artifactId>okhttp</artifactId>
495-
<version>${version.lib.okhttp3}</version>
496-
</dependency>
497-
<dependency>
498-
<!-- For dependency convergence -->
499-
<groupId>com.squareup.okio</groupId>
500-
<artifactId>okio</artifactId>
501-
<version>${version.lib.okio}</version>
502-
</dependency>
503-
<dependency>
504-
<!-- For dependency convergence -->
505-
<groupId>com.squareup.okio</groupId>
506-
<artifactId>okio-jvm</artifactId>
507-
<version>${version.lib.okio}</version>
508-
</dependency>
509418
<!-- For dependency convergence -->
510419
<dependency>
511420
<groupId>com.google.errorprone</groupId>
512421
<artifactId>error_prone_annotations</artifactId>
513422
<version>${version.lib.google-error-prone-annotations}</version>
514423
</dependency>
515-
<dependency>
516-
<groupId>com.google.code.findbugs</groupId>
517-
<artifactId>jsr305</artifactId>
518-
<version>${version.lib.google-findbugs-jsr305}</version>
519-
</dependency>
424+
<!-- For dependency convergence -->
520425
<dependency>
521426
<groupId>com.google.code.gson</groupId>
522427
<artifactId>gson</artifactId>
523428
<version>${version.lib.google-gson}</version>
524429
</dependency>
430+
<!-- For dependency convergence -->
525431
<dependency>
526432
<groupId>com.google.j2objc</groupId>
527433
<artifactId>j2objc-annotations</artifactId>
@@ -550,11 +456,6 @@
550456
<artifactId>testcontainers</artifactId>
551457
<version>${version.lib.testcontainers}</version>
552458
</dependency>
553-
<dependency>
554-
<groupId>org.testcontainers</groupId>
555-
<artifactId>mongodb</artifactId>
556-
<version>${version.lib.testcontainers}</version>
557-
</dependency>
558459
<dependency>
559460
<groupId>org.testcontainers</groupId>
560461
<artifactId>mysql</artifactId>
@@ -565,16 +466,6 @@
565466
<artifactId>jdbc</artifactId>
566467
<version>${version.lib.testcontainers}</version>
567468
</dependency>
568-
<dependency>
569-
<groupId>org.testcontainers</groupId>
570-
<artifactId>oracle-xe</artifactId>
571-
<version>${version.lib.testcontainers}</version>
572-
</dependency>
573-
<dependency>
574-
<groupId>org.slf4j</groupId>
575-
<artifactId>slf4j-simple</artifactId>
576-
<version>${version.lib.slf4j}</version>
577-
</dependency>
578469
<!-- END OF Section 4: Testing -->
579470

580471
<!-- imported boms -->

etc/dependency-check-suppression.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,24 @@
311311
<cve>CVE-2023-28867</cve>
312312
</suppress>
313313

314+
<!-- False Positive
315+
These CVEs are against micrometer server, not clinet libraries
316+
-->
317+
<suppress>
318+
<notes><![CDATA[
319+
file name: micrometer-core-1.15.2.jar
320+
]]></notes>
321+
<packageUrl regex="true">^pkg:maven/io\.micrometer/micrometer-core@.*$</packageUrl>
322+
<vulnerabilityName>CVE-2026-40983</vulnerabilityName>
323+
</suppress>
324+
<suppress>
325+
<notes><![CDATA[
326+
file name: micrometer-core-1.15.2.jar
327+
]]></notes>
328+
<packageUrl regex="true">^pkg:maven/io\.micrometer/micrometer-core@.*$</packageUrl>
329+
<vulnerabilityName>CVE-2026-40984</vulnerabilityName>
330+
</suppress>
331+
314332

315333

316334
</suppressions>

pom.xml

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,11 @@
7070
<version.lib.restito>0.9.1</version.lib.restito>
7171
<version.lib.rxjava2-jdk9-interop>0.1.0</version.lib.rxjava2-jdk9-interop>
7272
<version.lib.rxjava>2.2.10</version.lib.rxjava>
73-
<version.lib.scala>2.12.10</version.lib.scala>
74-
<!-- This is to force upgrade of transitive dep from arquillian -->
75-
<!-- 2.x versions used http (not https) to access maven central -->
76-
<version.lib.shrinkwrap-resolver>3.0.1</version.lib.shrinkwrap-resolver>
77-
<version.lib.spotbugs-annotations>3.1.12</version.lib.spotbugs-annotations>
7873
<version.lib.testng>7.8.0</version.lib.testng>
7974
<version.lib.bedrock>7.0.1</version.lib.bedrock>
8075
<version.lib.awaitility>3.1.6</version.lib.awaitility>
8176
<version.lib.jmh>1.23</version.lib.jmh>
8277
<version.lib.vertx-core>4.3.8</version.lib.vertx-core>
83-
<version.lib.commons-text>1.15.0</version.lib.commons-text>
8478
<version.lib.classgraph>4.8.165</version.lib.classgraph>
8579
<version.lib.maven.plugin.annotations>3.15.1</version.lib.maven.plugin.annotations>
8680
<version.lib.maven.plugin.api>3.9.15</version.lib.maven.plugin.api>
@@ -912,17 +906,6 @@
912906

913907
<dependencyManagement>
914908
<dependencies>
915-
<dependency>
916-
<groupId>org.apache.zookeeper</groupId>
917-
<artifactId>zookeeper</artifactId>
918-
<version>${version.lib.zookeeper}</version>
919-
</dependency>
920-
<dependency>
921-
<groupId>org.scala-lang</groupId>
922-
<artifactId>scala-library</artifactId>
923-
<scope>test</scope>
924-
<version>${version.lib.scala}</version>
925-
</dependency>
926909
<dependency>
927910
<groupId>com.github.akarnokd</groupId>
928911
<artifactId>rxjava2-jdk9-interop</artifactId>
@@ -953,11 +936,6 @@
953936
<artifactId>bedrock-testing-support</artifactId>
954937
<version>${version.lib.bedrock}</version>
955938
</dependency>
956-
<dependency>
957-
<groupId>com.github.spotbugs</groupId>
958-
<artifactId>spotbugs-annotations</artifactId>
959-
<version>${version.lib.spotbugs-annotations}</version>
960-
</dependency>
961939
<dependency>
962940
<groupId>org.reactivestreams</groupId>
963941
<artifactId>reactive-streams-tck-flow</artifactId>
@@ -973,23 +951,6 @@
973951
<artifactId>vertx-web-client</artifactId>
974952
<version>${version.lib.vertx-core}</version>
975953
</dependency>
976-
<dependency>
977-
<!-- for dependency convergence with handlebars and force upgrade -->
978-
<groupId>org.apache.commons</groupId>
979-
<artifactId>commons-text</artifactId>
980-
<version>${version.lib.commons-text}</version>
981-
</dependency>
982-
<dependency>
983-
<!--
984-
Required for dependency convergence
985-
Used by both
986-
io.rest-assured:rest-assured (from metrics rest TCK)
987-
hamcrest-integration (from metrics API TCK)
988-
-->
989-
<groupId>org.hamcrest</groupId>
990-
<artifactId>hamcrest-library</artifactId>
991-
<version>${version.lib.hamcrest}</version>
992-
</dependency>
993954
<dependency>
994955
<groupId>org.testng</groupId>
995956
<artifactId>testng</artifactId>
@@ -1001,17 +962,6 @@
1001962
</exclusion>
1002963
</exclusions>
1003964
</dependency>
1004-
<!-- Force update of shrinkwrap version used by arquillian -->
1005-
<dependency>
1006-
<groupId>org.jboss.shrinkwrap.resolver</groupId>
1007-
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
1008-
<version>${version.lib.shrinkwrap-resolver}</version>
1009-
</dependency>
1010-
<dependency>
1011-
<groupId>org.jboss.shrinkwrap.resolver</groupId>
1012-
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
1013-
<version>${version.lib.shrinkwrap-resolver}</version>
1014-
</dependency>
1015965
<dependency>
1016966
<groupId>org.awaitility</groupId>
1017967
<artifactId>awaitility</artifactId>
@@ -1033,12 +983,6 @@
1033983
<artifactId>classgraph</artifactId>
1034984
<version>${version.lib.classgraph}</version>
1035985
</dependency>
1036-
<!-- Injection TCK tests -->
1037-
<dependency>
1038-
<groupId>jakarta.inject</groupId>
1039-
<artifactId>jakarta.inject-tck</artifactId>
1040-
<version>${version.lib.jakarta.inject}</version>
1041-
</dependency>
1042986
<!-- Maven plugin -->
1043987
<dependency>
1044988
<groupId>org.apache.maven</groupId>

tracing/providers/opentelemetry/pom.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,6 @@
9696
<artifactId>grpc-okhttp</artifactId>
9797
<scope>runtime</scope>
9898
</dependency>
99-
<dependency>
100-
<groupId>com.google.guava</groupId>
101-
<artifactId>guava</artifactId>
102-
<exclusions>
103-
<exclusion>
104-
<groupId>com.google.code.findbugs</groupId>
105-
<artifactId>jsr305</artifactId>
106-
</exclusion>
107-
</exclusions>
108-
</dependency>
109-
<!-- -->
11099
<dependency>
111100
<groupId>io.opentelemetry</groupId>
112101
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>

0 commit comments

Comments
 (0)