From a2d9df381107bef0faf430154391c97deb9ab9a3 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Mon, 4 Nov 2024 16:56:45 -0500 Subject: [PATCH] chore: revert exclude commons logging from artifacts. (#3366) --- spring-cloud-gcp-autoconfigure/pom.xml | 18 ------------------ spring-cloud-gcp-bigquery/pom.xml | 6 ------ spring-cloud-gcp-data-datastore/pom.xml | 6 ------ spring-cloud-gcp-data-firestore/pom.xml | 6 ------ spring-cloud-gcp-data-spanner/pom.xml | 7 +------ spring-cloud-gcp-kms/pom.xml | 6 ------ spring-cloud-gcp-logging/pom.xml | 7 +------ spring-cloud-gcp-pubsub/pom.xml | 14 ++------------ spring-cloud-gcp-secretmanager/pom.xml | 6 ------ spring-cloud-gcp-security-iap/pom.xml | 6 ------ .../spring-cloud-gcp-starter-firestore/pom.xml | 7 +------ .../spring-cloud-gcp-starter-metrics/pom.xml | 7 +------ .../spring-cloud-gcp-starter-sql-mysql/pom.xml | 7 +------ .../pom.xml | 6 ------ .../pom.xml | 6 ------ .../spring-cloud-gcp-starter-trace/pom.xml | 7 +------ spring-cloud-gcp-vision/pom.xml | 7 +------ 17 files changed, 9 insertions(+), 120 deletions(-) diff --git a/spring-cloud-gcp-autoconfigure/pom.xml b/spring-cloud-gcp-autoconfigure/pom.xml index 30c850cb04..92768f9a3c 100644 --- a/spring-cloud-gcp-autoconfigure/pom.xml +++ b/spring-cloud-gcp-autoconfigure/pom.xml @@ -231,12 +231,6 @@ com.google.cloud google-cloud-firestore true - - - commons-logging - commons-logging - - @@ -269,12 +263,6 @@ com.google.cloud google-cloud-vision true - - - commons-logging - commons-logging - - @@ -302,12 +290,6 @@ com.google.cloud google-cloud-monitoring true - - - commons-logging - commons-logging - - diff --git a/spring-cloud-gcp-bigquery/pom.xml b/spring-cloud-gcp-bigquery/pom.xml index 6c57088740..dc0249f543 100644 --- a/spring-cloud-gcp-bigquery/pom.xml +++ b/spring-cloud-gcp-bigquery/pom.xml @@ -23,12 +23,6 @@ com.google.cloud google-cloud-bigquery - - - commons-logging - commons-logging - - diff --git a/spring-cloud-gcp-data-datastore/pom.xml b/spring-cloud-gcp-data-datastore/pom.xml index 1988ae5838..6df0451093 100644 --- a/spring-cloud-gcp-data-datastore/pom.xml +++ b/spring-cloud-gcp-data-datastore/pom.xml @@ -20,12 +20,6 @@ com.google.cloud google-cloud-datastore - - - commons-logging - commons-logging - - org.springframework.data diff --git a/spring-cloud-gcp-data-firestore/pom.xml b/spring-cloud-gcp-data-firestore/pom.xml index d3c8f18ca7..ff1c946553 100644 --- a/spring-cloud-gcp-data-firestore/pom.xml +++ b/spring-cloud-gcp-data-firestore/pom.xml @@ -18,12 +18,6 @@ com.google.cloud google-cloud-firestore - - - commons-logging - commons-logging - - diff --git a/spring-cloud-gcp-data-spanner/pom.xml b/spring-cloud-gcp-data-spanner/pom.xml index 750bd4b0f2..882e4f04c3 100644 --- a/spring-cloud-gcp-data-spanner/pom.xml +++ b/spring-cloud-gcp-data-spanner/pom.xml @@ -20,12 +20,7 @@ com.google.cloud google-cloud-spanner - - - commons-logging - commons-logging - - + org.springframework.data diff --git a/spring-cloud-gcp-kms/pom.xml b/spring-cloud-gcp-kms/pom.xml index 3e9d99f837..48ed893ac7 100644 --- a/spring-cloud-gcp-kms/pom.xml +++ b/spring-cloud-gcp-kms/pom.xml @@ -23,12 +23,6 @@ com.google.cloud google-cloud-kms - - - commons-logging - commons-logging - - diff --git a/spring-cloud-gcp-logging/pom.xml b/spring-cloud-gcp-logging/pom.xml index 78262778d8..c84d0c0995 100644 --- a/spring-cloud-gcp-logging/pom.xml +++ b/spring-cloud-gcp-logging/pom.xml @@ -28,12 +28,7 @@ com.google.cloud google-cloud-logging-logback - - - commons-logging - commons-logging - - + jakarta.servlet diff --git a/spring-cloud-gcp-pubsub/pom.xml b/spring-cloud-gcp-pubsub/pom.xml index bddd9714b7..161912c584 100644 --- a/spring-cloud-gcp-pubsub/pom.xml +++ b/spring-cloud-gcp-pubsub/pom.xml @@ -16,23 +16,13 @@ com.google.cloud google-cloud-pubsub - - - commons-logging - commons-logging - - + com.google.cloud google-cloud-monitoring true - - - commons-logging - commons-logging - - + com.google.cloud diff --git a/spring-cloud-gcp-secretmanager/pom.xml b/spring-cloud-gcp-secretmanager/pom.xml index b14802b478..f70aaf06b4 100644 --- a/spring-cloud-gcp-secretmanager/pom.xml +++ b/spring-cloud-gcp-secretmanager/pom.xml @@ -29,12 +29,6 @@ com.google.cloud google-cloud-secretmanager - - - commons-logging - commons-logging - - diff --git a/spring-cloud-gcp-security-iap/pom.xml b/spring-cloud-gcp-security-iap/pom.xml index 3f51064457..327cb3f449 100644 --- a/spring-cloud-gcp-security-iap/pom.xml +++ b/spring-cloud-gcp-security-iap/pom.xml @@ -25,12 +25,6 @@ com.google.cloud google-cloud-resourcemanager - - - commons-logging - commons-logging - - com.google.cloud diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-firestore/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-firestore/pom.xml index f67ddd216a..dcecf2a040 100644 --- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-firestore/pom.xml +++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-firestore/pom.xml @@ -24,12 +24,7 @@ com.google.cloud google-cloud-firestore - - - commons-logging - commons-logging - - + diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-metrics/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-metrics/pom.xml index 1701dcc1b4..e302c87ac1 100644 --- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-metrics/pom.xml +++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-metrics/pom.xml @@ -21,12 +21,7 @@ io.micrometer micrometer-registry-stackdriver - - - commons-logging - commons-logging - - + org.springframework.boot diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql/pom.xml index 5467a437af..aad8c751b8 100644 --- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql/pom.xml +++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql/pom.xml @@ -25,12 +25,7 @@ com.google.cloud.sql mysql-socket-factory-connector-j-8 - - - commons-logging - commons-logging - - + com.mysql diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgres-r2dbc/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgres-r2dbc/pom.xml index 212c4ff920..5b729c5da8 100644 --- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgres-r2dbc/pom.xml +++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgres-r2dbc/pom.xml @@ -27,12 +27,6 @@ com.google.cloud.sql cloud-sql-connector-r2dbc-postgres - - - commons-logging - commons-logging - - org.postgresql diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql/pom.xml index 37d0fae7e7..e585504d18 100644 --- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql/pom.xml +++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql/pom.xml @@ -25,12 +25,6 @@ com.google.cloud.sql postgres-socket-factory - - - commons-logging - commons-logging - - org.postgresql diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace/pom.xml index 15d0b9558e..9bd068bc20 100644 --- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace/pom.xml +++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace/pom.xml @@ -63,12 +63,7 @@ com.google.cloud google-cloud-core-grpc - - - commons-logging - commons-logging - - + io.zipkin.reporter2 diff --git a/spring-cloud-gcp-vision/pom.xml b/spring-cloud-gcp-vision/pom.xml index b9e1673b68..5b762f1c1a 100644 --- a/spring-cloud-gcp-vision/pom.xml +++ b/spring-cloud-gcp-vision/pom.xml @@ -18,12 +18,7 @@ com.google.cloud google-cloud-vision - - - commons-logging - commons-logging - - +