From 0fac502a930a7e32edd70c0a7667ee5e4bb96303 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Thu, 1 Aug 2024 18:37:40 +0200 Subject: [PATCH 1/2] Move all enforcer invocations to the full profile --- extensions/grpc/pom.xml | 105 +++++++++++++++------------ extensions/salesforce/pom.xml | 105 +++++++++++++++------------ integration-tests/grpc/pom.xml | 99 ++++++++++++++----------- integration-tests/salesforce/pom.xml | 104 ++++++++++++++------------ 4 files changed, 228 insertions(+), 185 deletions(-) diff --git a/extensions/grpc/pom.xml b/extensions/grpc/pom.xml index 2fd05e6a43c8..a2017f0bdcfd 100644 --- a/extensions/grpc/pom.xml +++ b/extensions/grpc/pom.xml @@ -36,51 +36,62 @@ runtime - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - io.quarkus - quarkus-enforcer-rules - ${quarkus.version} - - - org.l2x6.cq - cq-filtered-external-enforcer-rules - ${cq-plugin.version} - - - - - camel-quarkus-enforcer-rules - - enforce - - - - - - classpath:enforcer-rules/quarkus-require-maven-version.xml - - - classpath:enforcer-rules/quarkus-banned-dependencies.xml - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl - - - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl - - - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml - - - - - - - - + + + + full + + + !quickly + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + io.quarkus + quarkus-enforcer-rules + ${quarkus.version} + + + org.l2x6.cq + cq-filtered-external-enforcer-rules + ${cq-plugin.version} + + + + + camel-quarkus-enforcer-rules + + enforce + + + + + + classpath:enforcer-rules/quarkus-require-maven-version.xml + + + classpath:enforcer-rules/quarkus-banned-dependencies.xml + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl + + + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl + + + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml + + + + + + + + + + diff --git a/extensions/salesforce/pom.xml b/extensions/salesforce/pom.xml index 17c851fc1160..359c74d5c8a1 100644 --- a/extensions/salesforce/pom.xml +++ b/extensions/salesforce/pom.xml @@ -36,51 +36,62 @@ runtime - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - io.quarkus - quarkus-enforcer-rules - ${quarkus.version} - - - org.l2x6.cq - cq-filtered-external-enforcer-rules - ${cq-plugin.version} - - - - - camel-quarkus-enforcer-rules - - enforce - - - - - - classpath:enforcer-rules/quarkus-require-maven-version.xml - - - classpath:enforcer-rules/quarkus-banned-dependencies.xml - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl - - - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl - - - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml - - - - - - - - + + + + full + + + !quickly + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + io.quarkus + quarkus-enforcer-rules + ${quarkus.version} + + + org.l2x6.cq + cq-filtered-external-enforcer-rules + ${cq-plugin.version} + + + + + camel-quarkus-enforcer-rules + + enforce + + + + + + classpath:enforcer-rules/quarkus-require-maven-version.xml + + + classpath:enforcer-rules/quarkus-banned-dependencies.xml + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl + + + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl + + + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml + + + + + + + + + + diff --git a/integration-tests/grpc/pom.xml b/integration-tests/grpc/pom.xml index 5e4ba3675819..3bb8b8721dc9 100644 --- a/integration-tests/grpc/pom.xml +++ b/integration-tests/grpc/pom.xml @@ -90,49 +90,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - io.quarkus - quarkus-enforcer-rules - ${quarkus.version} - - - org.l2x6.cq - cq-filtered-external-enforcer-rules - ${cq-plugin.version} - - - - - camel-quarkus-enforcer-rules - - enforce - - - - - - classpath:enforcer-rules/quarkus-require-maven-version.xml - - - classpath:enforcer-rules/quarkus-banned-dependencies.xml - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl - - - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl - - - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml - - - - - - ${quarkus.platform.group-id} quarkus-maven-plugin @@ -152,6 +109,62 @@ + + + full + + + !quickly + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + io.quarkus + quarkus-enforcer-rules + ${quarkus.version} + + + org.l2x6.cq + cq-filtered-external-enforcer-rules + ${cq-plugin.version} + + + + + camel-quarkus-enforcer-rules + + enforce + + + + + + classpath:enforcer-rules/quarkus-require-maven-version.xml + + + classpath:enforcer-rules/quarkus-banned-dependencies.xml + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl + + + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl + + + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml + + + + + + + + + native diff --git a/integration-tests/salesforce/pom.xml b/integration-tests/salesforce/pom.xml index b67a4ded6c2d..f73eaf9e79a8 100644 --- a/integration-tests/salesforce/pom.xml +++ b/integration-tests/salesforce/pom.xml @@ -77,55 +77,63 @@ - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - io.quarkus - quarkus-enforcer-rules - ${quarkus.version} - - - org.l2x6.cq - cq-filtered-external-enforcer-rules - ${cq-plugin.version} - - - - - camel-quarkus-enforcer-rules - - enforce - - - - - - classpath:enforcer-rules/quarkus-require-maven-version.xml - - - classpath:enforcer-rules/quarkus-banned-dependencies.xml - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl - - - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl - - - ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml - - - - - - - - - + + + full + + + !quickly + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + io.quarkus + quarkus-enforcer-rules + ${quarkus.version} + + + org.l2x6.cq + cq-filtered-external-enforcer-rules + ${cq-plugin.version} + + + + + camel-quarkus-enforcer-rules + + enforce + + + + + + classpath:enforcer-rules/quarkus-require-maven-version.xml + + + classpath:enforcer-rules/quarkus-banned-dependencies.xml + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl + + + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl + + + ${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml + + + + + + + + + native From 2caa59d33b4c087a067fa6d921d576652de6e749 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Thu, 1 Aug 2024 23:02:21 +0200 Subject: [PATCH 2/2] Do not rely on quarkus-bom to exclude listenablefuture and jsr305 from guava --- extensions/google-bigquery/runtime/pom.xml | 4 ++++ extensions/google-pubsub/runtime/pom.xml | 8 ++++++++ extensions/kudu/runtime/pom.xml | 8 ++++++++ extensions/opentelemetry/runtime/pom.xml | 4 ++++ extensions/salesforce/runtime/pom.xml | 10 ++++++++++ integration-tests/cassandraql/pom.xml | 8 ++++++++ poms/bom-test/pom.xml | 4 ++++ 7 files changed, 46 insertions(+) diff --git a/extensions/google-bigquery/runtime/pom.xml b/extensions/google-bigquery/runtime/pom.xml index ac3f64022fd2..334d995a03cd 100644 --- a/extensions/google-bigquery/runtime/pom.xml +++ b/extensions/google-bigquery/runtime/pom.xml @@ -44,6 +44,10 @@ com.google.code.findbugs jsr305 + + com.google.guava + listenablefuture + diff --git a/extensions/google-pubsub/runtime/pom.xml b/extensions/google-pubsub/runtime/pom.xml index accefcffe28e..98e4cf4ddda8 100644 --- a/extensions/google-pubsub/runtime/pom.xml +++ b/extensions/google-pubsub/runtime/pom.xml @@ -63,6 +63,10 @@ com.google.code.findbugs jsr305 + + com.google.guava + listenablefuture + @@ -101,6 +105,10 @@ com.google.code.findbugs jsr305 + + com.google.guava + listenablefuture + commons-logging commons-logging diff --git a/extensions/kudu/runtime/pom.xml b/extensions/kudu/runtime/pom.xml index 178e81e8d627..a32110037bbe 100644 --- a/extensions/kudu/runtime/pom.xml +++ b/extensions/kudu/runtime/pom.xml @@ -59,6 +59,14 @@ com.google.guava guava + + com.google.code.findbugs + jsr305 + + + com.google.guava + listenablefuture + org.checkerframework checker-qual diff --git a/extensions/opentelemetry/runtime/pom.xml b/extensions/opentelemetry/runtime/pom.xml index d09ab313a506..e36b74bd7a72 100644 --- a/extensions/opentelemetry/runtime/pom.xml +++ b/extensions/opentelemetry/runtime/pom.xml @@ -44,6 +44,10 @@ com.google.code.findbugs jsr305 + + com.google.guava + listenablefuture + diff --git a/extensions/salesforce/runtime/pom.xml b/extensions/salesforce/runtime/pom.xml index 27dbfb385b63..1d47b07032ba 100644 --- a/extensions/salesforce/runtime/pom.xml +++ b/extensions/salesforce/runtime/pom.xml @@ -45,6 +45,16 @@ io.quarkus quarkus-grpc-common + + + com.google.code.findbugs + jsr305 + + + com.google.guava + listenablefuture + + diff --git a/integration-tests/cassandraql/pom.xml b/integration-tests/cassandraql/pom.xml index 3fbb3ef9fc98..0baa07fa4f20 100644 --- a/integration-tests/cassandraql/pom.xml +++ b/integration-tests/cassandraql/pom.xml @@ -42,6 +42,14 @@ com.github.stephenc.jcip jcip-annotations + + com.google.code.findbugs + jsr305 + + + com.google.guava + listenablefuture + org.checkerframework checker-qual diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml index 24b14dddc613..7a7a048b19eb 100644 --- a/poms/bom-test/pom.xml +++ b/poms/bom-test/pom.xml @@ -396,6 +396,10 @@ com.google.code.findbugs jsr305 + + com.google.guava + listenablefuture + org.apache.httpcomponents httpmime