From a39f20151d7265603d1a421d78c507c8afe95616 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Thu, 14 Mar 2024 01:44:56 +0200
Subject: [PATCH] [JAVA-30626] Clean up guava dependencies (#16098)
* [JAVA-30626] Clean up guava dependencies
* [JAVA-30626] Clean up guava dependencies
* [JAVA-30626] Clean up guava dependencies
* [JAVA-30626] Clean up guava dependencies
* [JAVA-30626] Clean up guava dependencies
---
algorithms-modules/algorithms-miscellaneous-1/pom.xml | 5 -----
algorithms-modules/algorithms-miscellaneous-5/pom.xml | 6 +-----
apache-httpclient4/pom.xml | 6 ------
apache-kafka/pom.xml | 5 -----
core-java-modules/core-java-11-2/pom.xml | 5 -----
core-java-modules/core-java-11/pom.xml | 5 -----
.../core-java-collections-array-list/pom.xml | 6 ------
core-java-modules/core-java-collections-list-6/pom.xml | 5 -----
core-java-modules/core-java-collections-maps-4/pom.xml | 5 -----
core-java-modules/core-java-collections-maps-7/pom.xml | 6 +-----
core-java-modules/core-java-collections-set-2/pom.xml | 5 -----
core-java-modules/core-java-io-4/pom.xml | 5 -----
core-java-modules/core-java-networking-3/pom.xml | 6 ------
core-java-modules/core-java-numbers-4/pom.xml | 5 -----
core-java-modules/core-java-numbers-5/pom.xml | 5 -----
core-java-modules/core-java-numbers-6/pom.xml | 5 -----
core-java-modules/core-java-numbers-7/pom.xml | 5 -----
core-java-modules/core-java-security-3/pom.xml | 5 -----
core-java-modules/core-java-streams-4/pom.xml | 5 -----
core-java-modules/core-java-streams-5/pom.xml | 6 +-----
core-java-modules/core-java-streams-6/pom.xml | 5 -----
core-java-modules/core-java-string-apis-2/pom.xml | 5 -----
core-java-modules/core-java-string-operations-8/pom.xml | 5 -----
httpclient-simple/pom.xml | 7 +------
jackson-modules/jackson-conversions/pom.xml | 5 +++++
jackson-modules/jackson-custom-conversions/pom.xml | 5 +++++
jackson-modules/pom.xml | 5 -----
libraries-2/pom.xml | 5 -----
libraries-data-2/pom.xml | 5 -----
rxjava-modules/pom.xml | 5 -----
rxjava-modules/rxjava-core/pom.xml | 8 ++++++++
spring-boot-modules/spring-boot-artifacts/pom.xml | 5 -----
spring-boot-modules/spring-boot-client/pom.xml | 6 +-----
spring-boot-modules/spring-boot-deployment/pom.xml | 6 +-----
spring-boot-modules/spring-boot-environment/pom.xml | 6 +-----
spring-boot-modules/spring-boot-properties/pom.xml | 5 -----
spring-boot-modules/spring-boot-runtime/pom.xml | 5 -----
spring-core/pom.xml | 5 -----
spring-di/pom.xml | 5 -----
testing-modules/rest-assured/pom.xml | 5 -----
40 files changed, 25 insertions(+), 189 deletions(-)
diff --git a/algorithms-modules/algorithms-miscellaneous-1/pom.xml b/algorithms-modules/algorithms-miscellaneous-1/pom.xml
index a1ac607c29..b8c900ab98 100644
--- a/algorithms-modules/algorithms-miscellaneous-1/pom.xml
+++ b/algorithms-modules/algorithms-miscellaneous-1/pom.xml
@@ -19,11 +19,6 @@
commons-math3
${commons-math3.version}
-
- com.google.guava
- guava
- ${guava.version}
-
commons-codec
commons-codec
diff --git a/algorithms-modules/algorithms-miscellaneous-5/pom.xml b/algorithms-modules/algorithms-miscellaneous-5/pom.xml
index 92b8e7d1f5..c1739e3690 100644
--- a/algorithms-modules/algorithms-miscellaneous-5/pom.xml
+++ b/algorithms-modules/algorithms-miscellaneous-5/pom.xml
@@ -29,11 +29,7 @@
tradukisto
${tradukisto.version}
-
- com.google.guava
- guava
- ${guava.version}
-
+
jakarta.xml.bind
diff --git a/apache-httpclient4/pom.xml b/apache-httpclient4/pom.xml
index 2647f977e4..48d39b0858 100644
--- a/apache-httpclient4/pom.xml
+++ b/apache-httpclient4/pom.xml
@@ -176,12 +176,6 @@
${jstl.version}
runtime
-
-
- com.google.guava
- guava
- ${guava.version}
-
org.springframework
diff --git a/apache-kafka/pom.xml b/apache-kafka/pom.xml
index 6aa5fb894a..8bdcd30ebd 100644
--- a/apache-kafka/pom.xml
+++ b/apache-kafka/pom.xml
@@ -71,11 +71,6 @@
${flink.version}
test
-
- com.google.guava
- guava
- ${guava.version}
-
org.awaitility
awaitility
diff --git a/core-java-modules/core-java-11-2/pom.xml b/core-java-modules/core-java-11-2/pom.xml
index 4647814048..371d0995ff 100644
--- a/core-java-modules/core-java-11-2/pom.xml
+++ b/core-java-modules/core-java-11-2/pom.xml
@@ -15,11 +15,6 @@
-
- com.google.guava
- guava
- ${guava.version}
-
org.mock-server
mockserver-junit-jupiter
diff --git a/core-java-modules/core-java-11/pom.xml b/core-java-modules/core-java-11/pom.xml
index 7092f4e53d..f4d0c1c099 100644
--- a/core-java-modules/core-java-11/pom.xml
+++ b/core-java-modules/core-java-11/pom.xml
@@ -15,11 +15,6 @@
-
- com.google.guava
- guava
- ${guava.version}
-
org.openjdk.jmh
jmh-core
diff --git a/core-java-modules/core-java-collections-array-list/pom.xml b/core-java-modules/core-java-collections-array-list/pom.xml
index 034b2d820d..e9367b3acd 100644
--- a/core-java-modules/core-java-collections-array-list/pom.xml
+++ b/core-java-modules/core-java-collections-array-list/pom.xml
@@ -19,12 +19,6 @@
commons-collections4
${commons-collections4.version}
-
- com.google.guava
- guava
- ${guava.version}
- test
-
diff --git a/core-java-modules/core-java-collections-list-6/pom.xml b/core-java-modules/core-java-collections-list-6/pom.xml
index 06e00e8dce..70530412c6 100644
--- a/core-java-modules/core-java-collections-list-6/pom.xml
+++ b/core-java-modules/core-java-collections-list-6/pom.xml
@@ -14,11 +14,6 @@
-
- com.google.guava
- guava
- ${guava.version}
-
io.vavr
vavr
diff --git a/core-java-modules/core-java-collections-maps-4/pom.xml b/core-java-modules/core-java-collections-maps-4/pom.xml
index 5f7b40fbf6..8fb3c3eb88 100644
--- a/core-java-modules/core-java-collections-maps-4/pom.xml
+++ b/core-java-modules/core-java-collections-maps-4/pom.xml
@@ -24,11 +24,6 @@
commons-collections4
${commons-collections4.version}
-
- com.google.guava
- guava
- ${guava.version}
-
junit
junit
diff --git a/core-java-modules/core-java-collections-maps-7/pom.xml b/core-java-modules/core-java-collections-maps-7/pom.xml
index b0f0d55c18..186096fe77 100644
--- a/core-java-modules/core-java-collections-maps-7/pom.xml
+++ b/core-java-modules/core-java-collections-maps-7/pom.xml
@@ -29,11 +29,7 @@
commons-csv
${csv.version}
-
- com.google.guava
- guava
- ${guava.version}
-
+
org.openjdk.jmh
jmh-core
diff --git a/core-java-modules/core-java-collections-set-2/pom.xml b/core-java-modules/core-java-collections-set-2/pom.xml
index 894bce86b7..b3696edb49 100644
--- a/core-java-modules/core-java-collections-set-2/pom.xml
+++ b/core-java-modules/core-java-collections-set-2/pom.xml
@@ -32,11 +32,6 @@
7.7.0
test
-
- com.google.guava
- guava
- ${guava.version}
-
diff --git a/core-java-modules/core-java-io-4/pom.xml b/core-java-modules/core-java-io-4/pom.xml
index 78511b68bb..2ab395487a 100644
--- a/core-java-modules/core-java-io-4/pom.xml
+++ b/core-java-modules/core-java-io-4/pom.xml
@@ -25,11 +25,6 @@
commons-codec
${commons-codec.version}
-
- com.google.guava
- guava
- ${guava.version}
-
diff --git a/core-java-modules/core-java-networking-3/pom.xml b/core-java-modules/core-java-networking-3/pom.xml
index 6d0374c598..238be17cd2 100644
--- a/core-java-modules/core-java-networking-3/pom.xml
+++ b/core-java-modules/core-java-networking-3/pom.xml
@@ -52,12 +52,6 @@
java-ipv6
${googlecode.ipv6.version}
-
-
- com.google.guava
- guava
- ${guava.version}
-
commons-validator
diff --git a/core-java-modules/core-java-numbers-4/pom.xml b/core-java-modules/core-java-numbers-4/pom.xml
index 4fe8b292da..6572cb8035 100644
--- a/core-java-modules/core-java-numbers-4/pom.xml
+++ b/core-java-modules/core-java-numbers-4/pom.xml
@@ -23,11 +23,6 @@
commons-lang3
${commons-lang3.version}
-
- com.google.guava
- guava
- ${guava.version}
-
diff --git a/core-java-modules/core-java-numbers-5/pom.xml b/core-java-modules/core-java-numbers-5/pom.xml
index c72ba66bff..7f0dc75f84 100644
--- a/core-java-modules/core-java-numbers-5/pom.xml
+++ b/core-java-modules/core-java-numbers-5/pom.xml
@@ -24,11 +24,6 @@
commons-lang3
${commons-lang3.version}
-
- com.google.guava
- guava
- ${guava.version}
-
diff --git a/core-java-modules/core-java-numbers-6/pom.xml b/core-java-modules/core-java-numbers-6/pom.xml
index a5ddcfc0ee..5671167e2b 100644
--- a/core-java-modules/core-java-numbers-6/pom.xml
+++ b/core-java-modules/core-java-numbers-6/pom.xml
@@ -25,11 +25,6 @@
${commons-codec}
test
-
- com.google.guava
- guava
- ${guava.version}
-
diff --git a/core-java-modules/core-java-numbers-7/pom.xml b/core-java-modules/core-java-numbers-7/pom.xml
index 3940a0b1d0..1d4ed7da72 100644
--- a/core-java-modules/core-java-numbers-7/pom.xml
+++ b/core-java-modules/core-java-numbers-7/pom.xml
@@ -19,11 +19,6 @@
${junit-jupiter.version}
test
-
- com.google.guava
- guava
- ${guava.version}
-
diff --git a/core-java-modules/core-java-security-3/pom.xml b/core-java-modules/core-java-security-3/pom.xml
index dae570e51d..37f4f17ba1 100644
--- a/core-java-modules/core-java-security-3/pom.xml
+++ b/core-java-modules/core-java-security-3/pom.xml
@@ -30,11 +30,6 @@
jaxb-api
${jaxb-api.version}
-
- com.google.guava
- guava
- ${guava.version}
-
org.springframework.security
spring-security-crypto
diff --git a/core-java-modules/core-java-streams-4/pom.xml b/core-java-modules/core-java-streams-4/pom.xml
index 79b07d0482..f9eaa7b0c3 100644
--- a/core-java-modules/core-java-streams-4/pom.xml
+++ b/core-java-modules/core-java-streams-4/pom.xml
@@ -73,11 +73,6 @@
commons-collections4
${apache.commons.collection4.version}
-
- com.google.guava
- guava
- ${guava.version}
-
com.oath.cyclops
cyclops
diff --git a/core-java-modules/core-java-streams-5/pom.xml b/core-java-modules/core-java-streams-5/pom.xml
index 3e439145cb..fa723c4a14 100644
--- a/core-java-modules/core-java-streams-5/pom.xml
+++ b/core-java-modules/core-java-streams-5/pom.xml
@@ -38,11 +38,7 @@
vavr
${vavr.version}
-
- com.google.guava
- guava
- ${guava.version}
-
+
org.apache.commons
commons-collections4
diff --git a/core-java-modules/core-java-streams-6/pom.xml b/core-java-modules/core-java-streams-6/pom.xml
index c8cff002e4..5c1312322c 100644
--- a/core-java-modules/core-java-streams-6/pom.xml
+++ b/core-java-modules/core-java-streams-6/pom.xml
@@ -43,11 +43,6 @@
vavr
${vavr.version}
-
- com.google.guava
- guava
- ${guava.version}
-
org.apache.commons
commons-collections4
diff --git a/core-java-modules/core-java-string-apis-2/pom.xml b/core-java-modules/core-java-string-apis-2/pom.xml
index c77ea7c64b..d58a147e64 100644
--- a/core-java-modules/core-java-string-apis-2/pom.xml
+++ b/core-java-modules/core-java-string-apis-2/pom.xml
@@ -14,11 +14,6 @@
-
- com.google.guava
- guava
- ${guava.version}
-
org.apache.commons
commons-lang3
diff --git a/core-java-modules/core-java-string-operations-8/pom.xml b/core-java-modules/core-java-string-operations-8/pom.xml
index 4e155a9851..b70c13d9b4 100644
--- a/core-java-modules/core-java-string-operations-8/pom.xml
+++ b/core-java-modules/core-java-string-operations-8/pom.xml
@@ -19,11 +19,6 @@
commons-lang3
${apache.commons.lang3.version}
-
- com.google.guava
- guava
- ${guava.version}
-
diff --git a/httpclient-simple/pom.xml b/httpclient-simple/pom.xml
index e0488bf0b1..50b6f0b9f2 100644
--- a/httpclient-simple/pom.xml
+++ b/httpclient-simple/pom.xml
@@ -117,12 +117,7 @@
${jstl.version}
runtime
-
-
- com.google.guava
- guava
- ${guava.version}
-
+
diff --git a/jackson-modules/jackson-conversions/pom.xml b/jackson-modules/jackson-conversions/pom.xml
index e0990ed34f..6d6af97785 100644
--- a/jackson-modules/jackson-conversions/pom.xml
+++ b/jackson-modules/jackson-conversions/pom.xml
@@ -28,6 +28,11 @@
jackson-databind
${jackson.version}
+
+ com.google.guava
+ guava
+ ${guava.version}
+
diff --git a/jackson-modules/jackson-custom-conversions/pom.xml b/jackson-modules/jackson-custom-conversions/pom.xml
index 31e460511a..c3ae4ae675 100644
--- a/jackson-modules/jackson-custom-conversions/pom.xml
+++ b/jackson-modules/jackson-custom-conversions/pom.xml
@@ -28,6 +28,11 @@
jackson-core
${jackson.version}
+
+ com.google.guava
+ guava
+ ${guava.version}
+
diff --git a/jackson-modules/pom.xml b/jackson-modules/pom.xml
index e80340a4b9..f4980445b3 100644
--- a/jackson-modules/pom.xml
+++ b/jackson-modules/pom.xml
@@ -31,11 +31,6 @@
com.fasterxml.jackson.dataformat
jackson-dataformat-xml
${jackson.version}
-
-
- com.google.guava
- guava
- ${guava.version}
commons-io
diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml
index 5086bd7390..fd1f92ec04 100644
--- a/libraries-2/pom.xml
+++ b/libraries-2/pom.xml
@@ -92,11 +92,6 @@
commons-collections4
${commons-collections4.version}
-
- com.google.guava
- guava
- ${guava.version}
-
diff --git a/libraries-data-2/pom.xml b/libraries-data-2/pom.xml
index 0d0ba2dc82..d6c910bc1b 100644
--- a/libraries-data-2/pom.xml
+++ b/libraries-data-2/pom.xml
@@ -111,11 +111,6 @@
univocity-parsers
${univocity.version}
-
- com.google.guava
- guava
- ${guava.version}
-
io.minio
minio
diff --git a/rxjava-modules/pom.xml b/rxjava-modules/pom.xml
index 7bdfd0a9c1..e7c0b88613 100644
--- a/rxjava-modules/pom.xml
+++ b/rxjava-modules/pom.xml
@@ -49,11 +49,6 @@
awaitility
${awaitility.version}
-
- com.google.guava
- guava
- ${guava.version}
-
diff --git a/rxjava-modules/rxjava-core/pom.xml b/rxjava-modules/rxjava-core/pom.xml
index 73ab98288d..247d64cc5c 100644
--- a/rxjava-modules/rxjava-core/pom.xml
+++ b/rxjava-modules/rxjava-core/pom.xml
@@ -13,4 +13,12 @@
0.0.1-SNAPSHOT
+
+
+ com.google.guava
+ guava
+ ${guava.version}
+
+
+
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-artifacts/pom.xml b/spring-boot-modules/spring-boot-artifacts/pom.xml
index e39ddb5af1..e0e745f72c 100644
--- a/spring-boot-modules/spring-boot-artifacts/pom.xml
+++ b/spring-boot-modules/spring-boot-artifacts/pom.xml
@@ -51,11 +51,6 @@
javax.persistence-api
${jpa.version}
-
- com.google.guava
- guava
- ${guava.version}
-
org.subethamail
subethasmtp
diff --git a/spring-boot-modules/spring-boot-client/pom.xml b/spring-boot-modules/spring-boot-client/pom.xml
index bbdc6cca7d..13fb780e45 100644
--- a/spring-boot-modules/spring-boot-client/pom.xml
+++ b/spring-boot-modules/spring-boot-client/pom.xml
@@ -33,11 +33,7 @@
org.springframework.boot
spring-boot-starter
-
- com.google.guava
- guava
- ${guava.version}
-
+
org.springframework
spring-websocket
diff --git a/spring-boot-modules/spring-boot-deployment/pom.xml b/spring-boot-modules/spring-boot-deployment/pom.xml
index 890a5be58f..2af3a4718e 100644
--- a/spring-boot-modules/spring-boot-deployment/pom.xml
+++ b/spring-boot-modules/spring-boot-deployment/pom.xml
@@ -56,11 +56,7 @@
javax.persistence-api
${jpa.version}
-
- com.google.guava
- guava
- ${guava.version}
-
+
org.subethamail
subethasmtp
diff --git a/spring-boot-modules/spring-boot-environment/pom.xml b/spring-boot-modules/spring-boot-environment/pom.xml
index 616a1c19cc..097c3c2175 100644
--- a/spring-boot-modules/spring-boot-environment/pom.xml
+++ b/spring-boot-modules/spring-boot-environment/pom.xml
@@ -46,11 +46,7 @@
h2
runtime
-
- com.google.guava
- guava
- ${guava.version}
-
+
org.subethamail
subethasmtp
diff --git a/spring-boot-modules/spring-boot-properties/pom.xml b/spring-boot-modules/spring-boot-properties/pom.xml
index 61892fd076..ccf276471f 100644
--- a/spring-boot-modules/spring-boot-properties/pom.xml
+++ b/spring-boot-modules/spring-boot-properties/pom.xml
@@ -37,11 +37,6 @@
org.springframework.cloud
spring-cloud-starter
-
- com.google.guava
- guava
- ${guava.version}
-
org.apache.httpcomponents
httpcore
diff --git a/spring-boot-modules/spring-boot-runtime/pom.xml b/spring-boot-modules/spring-boot-runtime/pom.xml
index 7b2ed6976b..4cffc9a311 100644
--- a/spring-boot-modules/spring-boot-runtime/pom.xml
+++ b/spring-boot-modules/spring-boot-runtime/pom.xml
@@ -72,11 +72,6 @@
javax.persistence
javax.persistence-api
-
- com.google.guava
- guava
- ${guava.version}
-
org.subethamail
subethasmtp
diff --git a/spring-core/pom.xml b/spring-core/pom.xml
index e369bc24d0..5134ad42f7 100644
--- a/spring-core/pom.xml
+++ b/spring-core/pom.xml
@@ -36,11 +36,6 @@
javax.inject
${javax.inject.version}
-
- com.google.guava
- guava
- ${guava.version}
-
org.projectlombok
lombok
diff --git a/spring-di/pom.xml b/spring-di/pom.xml
index a1be835af7..078a761f9a 100644
--- a/spring-di/pom.xml
+++ b/spring-di/pom.xml
@@ -16,11 +16,6 @@
-
- com.google.guava
- guava
- ${guava.version}
-
org.projectlombok
lombok
diff --git a/testing-modules/rest-assured/pom.xml b/testing-modules/rest-assured/pom.xml
index 47df64c56f..c5cfc79915 100644
--- a/testing-modules/rest-assured/pom.xml
+++ b/testing-modules/rest-assured/pom.xml
@@ -28,11 +28,6 @@
spring-boot-starter-test
test
-
- com.google.guava
- guava
- ${guava.version}
-
javax.servlet
javax.servlet-api