Skip to content

Commit

Permalink
Fix #6754 to remove exlusion of findbugs when depends on quarkus-grpc…
Browse files Browse the repository at this point in the history 
…-common
  • Loading branch information
@zhfeng @ppalaga
zhfeng authored and ppalaga committed Nov 7, 2024
1 parent 6223d71 commit e97a134
Show file tree
Hide file tree
Showing 24 changed files with 88 additions and 317 deletions.
10 changes: 0 additions & 10 deletions extensions/google-bigquery/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions extensions/google-bigquery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions extensions/google-bigquery/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 0 additions & 10 deletions extensions/google-pubsub/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions extensions/google-pubsub/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions extensions/google-pubsub/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
22 changes: 0 additions & 22 deletions extensions/grpc/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
63 changes: 4 additions & 59 deletions extensions/grpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 0 additions & 6 deletions extensions/pinecone/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions extensions/pinecone/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 0 additions & 6 deletions extensions/pinecone/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 0 additions & 10 deletions extensions/qdrant/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions extensions/qdrant/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 0 additions & 6 deletions extensions/qdrant/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
64 changes: 5 additions & 59 deletions extensions/salesforce/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 0 additions & 4 deletions extensions/salesforce/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/google-bigquery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/google-pubsub/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading

0 comments on commit e97a134

Please sign in to comment.