From 5847d118cb847aeab6f8754357b93b558083ff4f Mon Sep 17 00:00:00 2001 From: James Netherton Date: Fri, 11 Aug 2023 13:15:41 +0100 Subject: [PATCH] Unban com.google.code.findbugs:jsr305 for gRPC extension Fixes #5167 --- extensions/grpc/deployment/pom.xml | 6 --- extensions/grpc/pom.xml | 48 +++++++++++++++++++++++ extensions/grpc/runtime/pom.xml | 6 --- integration-tests/grpc/pom.xml | 43 ++++++++++++++++++++ tooling/enforcer-rules/allow-findbugs.xsl | 33 ++++++++++++++++ 5 files changed, 124 insertions(+), 12 deletions(-) create mode 100644 tooling/enforcer-rules/allow-findbugs.xsl diff --git a/extensions/grpc/deployment/pom.xml b/extensions/grpc/deployment/pom.xml index c72f7a5dc5c6..bd471510df51 100644 --- a/extensions/grpc/deployment/pom.xml +++ b/extensions/grpc/deployment/pom.xml @@ -33,12 +33,6 @@ io.quarkus quarkus-grpc-common-deployment - - - com.google.code.findbugs - jsr305 - - org.apache.camel.quarkus diff --git a/extensions/grpc/pom.xml b/extensions/grpc/pom.xml index ad3545f953c2..b9958962b6c5 100644 --- a/extensions/grpc/pom.xml +++ b/extensions/grpc/pom.xml @@ -34,4 +34,52 @@ deployment 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 + + + + + + + + diff --git a/extensions/grpc/runtime/pom.xml b/extensions/grpc/runtime/pom.xml index ea022e6006ec..76d178564121 100644 --- a/extensions/grpc/runtime/pom.xml +++ b/extensions/grpc/runtime/pom.xml @@ -38,12 +38,6 @@ io.quarkus quarkus-grpc-common - - - com.google.code.findbugs - jsr305 - - org.apache.camel.quarkus diff --git a/integration-tests/grpc/pom.xml b/integration-tests/grpc/pom.xml index d9e234f98737..c2e4dfee39f8 100644 --- a/integration-tests/grpc/pom.xml +++ b/integration-tests/grpc/pom.xml @@ -84,6 +84,49 @@ + + 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 + + + + + + kr.motd.maven os-maven-plugin diff --git a/tooling/enforcer-rules/allow-findbugs.xsl b/tooling/enforcer-rules/allow-findbugs.xsl new file mode 100644 index 000000000000..1629e98685c7 --- /dev/null +++ b/tooling/enforcer-rules/allow-findbugs.xsl @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + +