This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a commit to branch 3.15.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.15.x by this push:
new 9fb994108b Fix #6754 to remove exlusion of findbugs when depends on
quarkus-grpc-common (#6757)
9fb994108b is described below
commit 9fb994108b9444e767152f4e0e8a0fd312f12c98
Author: Zheng Feng <[email protected]>
AuthorDate: Fri Nov 8 06:50:19 2024 +0800
Fix #6754 to remove exlusion of findbugs when depends on
quarkus-grpc-common (#6757)
---
extensions/google-bigquery/deployment/pom.xml | 10 -----
extensions/google-bigquery/pom.xml | 4 ++
extensions/google-bigquery/runtime/pom.xml | 4 --
extensions/google-pubsub/deployment/pom.xml | 10 -----
extensions/google-pubsub/pom.xml | 4 ++
extensions/google-pubsub/runtime/pom.xml | 4 --
extensions/grpc/deployment/pom.xml | 22 ---------
extensions/grpc/pom.xml | 63 ++------------------------
extensions/pinecone/deployment/pom.xml | 6 ---
extensions/pinecone/pom.xml | 4 ++
extensions/pinecone/runtime/pom.xml | 6 ---
extensions/qdrant/deployment/pom.xml | 10 -----
extensions/qdrant/pom.xml | 4 ++
extensions/qdrant/runtime/pom.xml | 6 ---
extensions/salesforce/pom.xml | 64 +++------------------------
extensions/salesforce/runtime/pom.xml | 4 --
integration-tests/google-bigquery/pom.xml | 4 ++
integration-tests/google-pubsub/pom.xml | 4 ++
integration-tests/grpc/pom.xml | 60 ++-----------------------
integration-tests/pinecone/pom.xml | 4 ++
integration-tests/qdrant/pom.xml | 4 ++
integration-tests/salesforce/pom.xml | 60 ++-----------------------
pom.xml | 36 +++++++++++++--
tooling/enforcer-rules/allow-findbugs.xsl | 8 +++-
24 files changed, 88 insertions(+), 317 deletions(-)
diff --git a/extensions/google-bigquery/deployment/pom.xml
b/extensions/google-bigquery/deployment/pom.xml
index eb8731bdb6..74eabdbca5 100644
--- a/extensions/google-bigquery/deployment/pom.xml
+++ b/extensions/google-bigquery/deployment/pom.xml
@@ -33,16 +33,6 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common-deployment</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/extensions/google-bigquery/pom.xml
b/extensions/google-bigquery/pom.xml
index bac61874b5..a71a684545 100644
--- a/extensions/google-bigquery/pom.xml
+++ b/extensions/google-bigquery/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Google BigQuery</name>
<packaging>pom</packaging>
+ <properties>
+ <allow-findbugs>true</allow-findbugs>
+ </properties>
+
<modules>
<module>deployment</module>
<module>runtime</module>
diff --git a/extensions/google-bigquery/runtime/pom.xml
b/extensions/google-bigquery/runtime/pom.xml
index f6c2190454..61eec6773c 100644
--- a/extensions/google-bigquery/runtime/pom.xml
+++ b/extensions/google-bigquery/runtime/pom.xml
@@ -40,10 +40,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common</artifactId>
<exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>listenablefuture</artifactId>
diff --git a/extensions/google-pubsub/deployment/pom.xml
b/extensions/google-pubsub/deployment/pom.xml
index 15fe812506..8166e4a570 100644
--- a/extensions/google-pubsub/deployment/pom.xml
+++ b/extensions/google-pubsub/deployment/pom.xml
@@ -37,16 +37,6 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common-deployment</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/extensions/google-pubsub/pom.xml b/extensions/google-pubsub/pom.xml
index 6aeb6d1a90..88e3e1d99e 100644
--- a/extensions/google-pubsub/pom.xml
+++ b/extensions/google-pubsub/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Google Pubsub</name>
<packaging>pom</packaging>
+ <properties>
+ <allow-findbugs>true</allow-findbugs>
+ </properties>
+
<modules>
<module>deployment</module>
<module>runtime</module>
diff --git a/extensions/google-pubsub/runtime/pom.xml
b/extensions/google-pubsub/runtime/pom.xml
index d98ce38ef0..a0c8406c6f 100644
--- a/extensions/google-pubsub/runtime/pom.xml
+++ b/extensions/google-pubsub/runtime/pom.xml
@@ -59,10 +59,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common</artifactId>
<exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>listenablefuture</artifactId>
diff --git a/extensions/grpc/deployment/pom.xml
b/extensions/grpc/deployment/pom.xml
index 21edd90e6a..20f6dea5c3 100644
--- a/extensions/grpc/deployment/pom.xml
+++ b/extensions/grpc/deployment/pom.xml
@@ -30,28 +30,6 @@
<name>Camel Quarkus :: gRPC :: Deployment</name>
<dependencies>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-grpc-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>io.vertx</groupId>
- <artifactId>vertx-grpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.vertx</groupId>
- <artifactId>vertx-grpc-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.vertx</groupId>
- <artifactId>vertx-grpc-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common-deployment</artifactId>
diff --git a/extensions/grpc/pom.xml b/extensions/grpc/pom.xml
index 334d24d6f7..9525d33e21 100644
--- a/extensions/grpc/pom.xml
+++ b/extensions/grpc/pom.xml
@@ -30,68 +30,13 @@
<name>Camel Quarkus :: gRPC</name>
<packaging>pom</packaging>
+ <properties>
+ <allow-findbugs>true</allow-findbugs>
+ </properties>
+
<modules>
<module>codegen</module>
<module>deployment</module>
<module>runtime</module>
</modules>
-
- <profiles>
- <profile>
- <!-- Pass '-Dquickly' to skip enforcer and some further sanity
checks -->
- <id>full</id>
- <activation>
- <property>
- <name>!quickly</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-enforcer-rules</artifactId>
- <version>${quarkus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.l2x6.cq</groupId>
-
<artifactId>cq-filtered-external-enforcer-rules</artifactId>
- <version>${cq-plugin.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>camel-quarkus-enforcer-rules</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <dependencyConvergence />
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-require-maven-version.xml</location>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml</location>
- </filteredExternalRules>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/extensions/pinecone/deployment/pom.xml
b/extensions/pinecone/deployment/pom.xml
index da8f93c80e..043da31ad6 100644
--- a/extensions/pinecone/deployment/pom.xml
+++ b/extensions/pinecone/deployment/pom.xml
@@ -37,12 +37,6 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common-deployment</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/extensions/pinecone/pom.xml b/extensions/pinecone/pom.xml
index a8f745019d..8b7e415b8c 100644
--- a/extensions/pinecone/pom.xml
+++ b/extensions/pinecone/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Pinecone</name>
<packaging>pom</packaging>
+ <properties>
+ <allow-findbugs>true</allow-findbugs>
+ </properties>
+
<modules>
<module>deployment</module>
<module>runtime</module>
diff --git a/extensions/pinecone/runtime/pom.xml
b/extensions/pinecone/runtime/pom.xml
index 1b33051a7e..ad6c2e4af9 100644
--- a/extensions/pinecone/runtime/pom.xml
+++ b/extensions/pinecone/runtime/pom.xml
@@ -44,12 +44,6 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/extensions/qdrant/deployment/pom.xml
b/extensions/qdrant/deployment/pom.xml
index 47fe720117..e73a2750ce 100644
--- a/extensions/qdrant/deployment/pom.xml
+++ b/extensions/qdrant/deployment/pom.xml
@@ -37,16 +37,6 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common-deployment</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/qdrant/pom.xml b/extensions/qdrant/pom.xml
index 8616711ce1..f54c67042a 100644
--- a/extensions/qdrant/pom.xml
+++ b/extensions/qdrant/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Qdrant</name>
<packaging>pom</packaging>
+ <properties>
+ <allow-findbugs>true</allow-findbugs>
+ </properties>
+
<modules>
<module>deployment</module>
<module>runtime</module>
diff --git a/extensions/qdrant/runtime/pom.xml
b/extensions/qdrant/runtime/pom.xml
index e71d3a0ba2..bb0a747c9f 100644
--- a/extensions/qdrant/runtime/pom.xml
+++ b/extensions/qdrant/runtime/pom.xml
@@ -39,12 +39,6 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/salesforce/pom.xml b/extensions/salesforce/pom.xml
index 5cd1182619..60655adbbb 100644
--- a/extensions/salesforce/pom.xml
+++ b/extensions/salesforce/pom.xml
@@ -31,67 +31,13 @@
<artifactId>camel-quarkus-salesforce-parent</artifactId>
<name>Camel Quarkus :: Salesforce</name>
<packaging>pom</packaging>
+
+ <properties>
+ <allow-findbugs>true</allow-findbugs>
+ </properties>
+
<modules>
<module>deployment</module>
<module>runtime</module>
</modules>
-
- <profiles>
- <profile>
- <!-- Pass '-Dquickly' to skip enforcer and some further sanity
checks -->
- <id>full</id>
- <activation>
- <property>
- <name>!quickly</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-enforcer-rules</artifactId>
- <version>${quarkus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.l2x6.cq</groupId>
-
<artifactId>cq-filtered-external-enforcer-rules</artifactId>
- <version>${cq-plugin.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>camel-quarkus-enforcer-rules</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <dependencyConvergence />
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-require-maven-version.xml</location>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml</location>
- </filteredExternalRules>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/extensions/salesforce/runtime/pom.xml
b/extensions/salesforce/runtime/pom.xml
index 4f039e06e2..8068aab445 100644
--- a/extensions/salesforce/runtime/pom.xml
+++ b/extensions/salesforce/runtime/pom.xml
@@ -46,10 +46,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common</artifactId>
<exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>listenablefuture</artifactId>
diff --git a/integration-tests/google-bigquery/pom.xml
b/integration-tests/google-bigquery/pom.xml
index f9c266be22..92ba376d3a 100644
--- a/integration-tests/google-bigquery/pom.xml
+++ b/integration-tests/google-bigquery/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: Google BigQuery</name>
<description>Integration tests for Camel Quarkus Google BigQuery
extension</description>
+ <properties>
+ <allow-findbugs>true</allow-findbugs>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/integration-tests/google-pubsub/pom.xml
b/integration-tests/google-pubsub/pom.xml
index 9d9dd06e6f..97595d282c 100644
--- a/integration-tests/google-pubsub/pom.xml
+++ b/integration-tests/google-pubsub/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: Google Pubsub</name>
<description>Integration tests for Camel Quarkus Google Pubsub
extension</description>
+ <properties>
+ <allow-findbugs>true</allow-findbugs>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/integration-tests/grpc/pom.xml b/integration-tests/grpc/pom.xml
index 990312731e..d39411c90d 100644
--- a/integration-tests/grpc/pom.xml
+++ b/integration-tests/grpc/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: gRPC</name>
<description>Integration tests for Camel Quarkus gRPC
extension</description>
+ <properties>
+ <allow-findbugs>true</allow-findbugs>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -109,62 +113,6 @@
</build>
<profiles>
- <profile>
- <!-- Pass '-Dquickly' to skip enforcer and some further sanity
checks -->
- <id>full</id>
- <activation>
- <property>
- <name>!quickly</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-enforcer-rules</artifactId>
- <version>${quarkus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.l2x6.cq</groupId>
-
<artifactId>cq-filtered-external-enforcer-rules</artifactId>
- <version>${cq-plugin.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>camel-quarkus-enforcer-rules</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <dependencyConvergence />
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-require-maven-version.xml</location>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml</location>
- </filteredExternalRules>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>native</id>
<activation>
diff --git a/integration-tests/pinecone/pom.xml
b/integration-tests/pinecone/pom.xml
index 934bebaa48..2247a4603d 100644
--- a/integration-tests/pinecone/pom.xml
+++ b/integration-tests/pinecone/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: Pinecone</name>
<description>Integration tests for Camel Quarkus Pinecone
extension</description>
+ <properties>
+ <allow-findbugs>true</allow-findbugs>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/integration-tests/qdrant/pom.xml b/integration-tests/qdrant/pom.xml
index 4c9418d4c7..b699b9fbe2 100644
--- a/integration-tests/qdrant/pom.xml
+++ b/integration-tests/qdrant/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: Qdrant</name>
<description>Integration tests for Camel Quarkus Qdrant
extension</description>
+ <properties>
+ <allow-findbugs>true</allow-findbugs>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/integration-tests/salesforce/pom.xml
b/integration-tests/salesforce/pom.xml
index 0369ffd4cc..be6a0441d8 100644
--- a/integration-tests/salesforce/pom.xml
+++ b/integration-tests/salesforce/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Integration Tests :: Salesforce</name>
<description>The camel integration tests</description>
+ <properties>
+ <allow-findbugs>true</allow-findbugs>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -78,62 +82,6 @@
</dependencies>
<profiles>
- <profile>
- <!-- Pass '-Dquickly' to skip enforcer and some further sanity
checks -->
- <id>full</id>
- <activation>
- <property>
- <name>!quickly</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-enforcer-rules</artifactId>
- <version>${quarkus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.l2x6.cq</groupId>
-
<artifactId>cq-filtered-external-enforcer-rules</artifactId>
- <version>${cq-plugin.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>camel-quarkus-enforcer-rules</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <dependencyConvergence />
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-require-maven-version.xml</location>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml</location>
- </filteredExternalRules>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>native</id>
<activation>
diff --git a/pom.xml b/pom.xml
index b4b6eae7ab..081fa6b7b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,6 +279,9 @@
<!-- camel-quarkus-maven-plugin -->
<camel-quarkus.extension.finder.strict>true</camel-quarkus.extension.finder.strict>
+
+ <!-- allow findbugs dependency in the enforcer -->
+ <allow-findbugs>false</allow-findbugs>
</properties>
<!-- Core modules -->
@@ -424,11 +427,10 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${maven-resources-plugin.version}</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin.version}</version>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
@@ -761,6 +763,31 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-camel-quarkus-enforcer-rules-xslt</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/enforcer-rules</outputDirectory>
+ <resources>
+ <resource>
+
<directory>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules</directory>
+ <includes>
+
<include>allow-findbugs.xsl</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -797,6 +824,7 @@
</filteredExternalRules>
<filteredExternalRules>
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml</location>
+
<xsltLocation>${project.build.directory}/enforcer-rules/allow-findbugs.xsl</xsltLocation>
</filteredExternalRules>
<filteredExternalRules>
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml</location>
diff --git a/tooling/enforcer-rules/allow-findbugs.xsl
b/tooling/enforcer-rules/allow-findbugs.xsl
index 9abd298970..7ea9ceef66 100644
--- a/tooling/enforcer-rules/allow-findbugs.xsl
+++ b/tooling/enforcer-rules/allow-findbugs.xsl
@@ -21,6 +21,8 @@
<xsl:output omit-xml-declaration="yes"/>
+ <xsl:param name="findbugs" select="'${allow-findbugs}'"/>
+
<xsl:template match="node()|@*">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
@@ -29,5 +31,9 @@
<!-- Allows findbugs usage in extensions that use quarkus-grpc-common -->
<!-- https://github.com/apache/camel-quarkus/issues/5167 -->
- <xsl:template
match="//bannedDependencies/excludes/exclude[contains(text(),
'com.google.code.findbugs:jsr305')]"/>
+ <xsl:template
match="//bannedDependencies/excludes/exclude[contains(text(),
'com.google.code.findbugs:jsr305')]">
+ <xsl:if test="$findbugs != 'true'">
+ <xsl:copy-of select="."/>
+ </xsl:if>
+ </xsl:template>
</xsl:stylesheet>
