This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 02b7e5ec1b Ban com.github.spotbugs:spotbugs-annotations
02b7e5ec1b is described below
commit 02b7e5ec1bd1bc1586333ee9cf48b4e8bc346a70
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Fri May 26 07:20:35 2023 +0100
Ban com.github.spotbugs:spotbugs-annotations
Fixes #4914
---
extensions/cassandraql/runtime/pom.xml | 24 ----------------------
poms/bom/pom.xml | 8 ++++++--
poms/bom/src/main/generated/flattened-full-pom.xml | 12 +++++++++++
.../src/main/generated/flattened-reduced-pom.xml | 12 +++++++++++
.../generated/flattened-reduced-verbose-pom.xml | 12 +++++++++++
.../camel-quarkus-banned-dependencies.xml | 1 +
6 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/extensions/cassandraql/runtime/pom.xml
b/extensions/cassandraql/runtime/pom.xml
index 613318a952..65a9db2c5a 100644
--- a/extensions/cassandraql/runtime/pom.xml
+++ b/extensions/cassandraql/runtime/pom.xml
@@ -52,30 +52,6 @@
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-client</artifactId>
</dependency>
- <dependency>
- <groupId>com.datastax.oss</groupId>
- <artifactId>java-driver-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.stephenc.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.datastax.oss</groupId>
- <artifactId>java-driver-query-builder</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.github.stephenc.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 4c528d5052..b6b7bae3df 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -575,6 +575,10 @@
<artifactId>camel-cassandraql</artifactId>
<version>${camel.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
@@ -6757,11 +6761,11 @@
<autogeneratedBomEntryTransformations>
<autogeneratedBomEntryTransformation>
<gavPattern>com.datastax.oss:java-driver-core</gavPattern>
-
<addExclusions>com.github.stephenc.jcip:jcip-annotations,com.google.code.findbugs:jsr305</addExclusions>
+
<addExclusions>com.github.spotbugs:spotbugs-annotations,com.github.stephenc.jcip:jcip-annotations,com.google.code.findbugs:jsr305</addExclusions>
</autogeneratedBomEntryTransformation>
<autogeneratedBomEntryTransformation>
<gavPattern>com.datastax.oss:java-driver-query-builder</gavPattern>
-
<addExclusions>com.github.stephenc.jcip:jcip-annotations,com.google.code.findbugs:jsr305</addExclusions>
+
<addExclusions>com.github.spotbugs:spotbugs-annotations,com.github.stephenc.jcip:jcip-annotations,com.google.code.findbugs:jsr305</addExclusions>
</autogeneratedBomEntryTransformation>
<autogeneratedBomEntryTransformation>
<gavPattern>org.apache.cxf:cxf-rt-transports-http-hc5</gavPattern>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 79f45cd26f..2281d930f6 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -513,6 +513,10 @@
<artifactId>camel-cassandraql</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.0.0-M3</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
+ <exclusion>
+ <groupId>com.github.spotbugs</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>spotbugs-annotations</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
<exclusion>
<groupId>com.github.stephenc.jcip</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jcip-annotations</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -20532,6 +20536,10 @@
<artifactId>java-driver-core</artifactId><!--
com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0 -->
<version>4.15.0</version><!--
com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0 -->
<exclusions>
+ <exclusion>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
@@ -20626,6 +20634,10 @@
<artifactId>java-driver-query-builder</artifactId><!--
com.datastax.oss:java-driver-bom:4.15.0 -->
<version>4.15.0</version><!-- com.datastax.oss:java-driver-bom:4.15.0
-->
<exclusions>
+ <exclusion>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 90007fc0f1..88d1772595 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -513,6 +513,10 @@
<artifactId>camel-cassandraql</artifactId>
<version>4.0.0-M3</version>
<exclusions>
+ <exclusion>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
@@ -7350,6 +7354,10 @@
<artifactId>java-driver-core</artifactId>
<version>4.15.0</version>
<exclusions>
+ <exclusion>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
@@ -7383,6 +7391,10 @@
<artifactId>java-driver-query-builder</artifactId>
<version>4.15.0</version>
<exclusions>
+ <exclusion>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 977f43ee1f..69d147e205 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -513,6 +513,10 @@
<artifactId>camel-cassandraql</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.0.0-M3</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
+ <exclusion>
+ <groupId>com.github.spotbugs</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>spotbugs-annotations</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
<exclusion>
<groupId>com.github.stephenc.jcip</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jcip-annotations</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7350,6 +7354,10 @@
<artifactId>java-driver-core</artifactId><!--
com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0 -->
<version>4.15.0</version><!--
com.datastax.oss.quarkus:cassandra-quarkus-bom:1.2.0 -->
<exclusions>
+ <exclusion>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
@@ -7383,6 +7391,10 @@
<artifactId>java-driver-query-builder</artifactId><!--
com.datastax.oss:java-driver-bom:4.15.0 -->
<version>4.15.0</version><!-- com.datastax.oss:java-driver-bom:4.15.0
-->
<exclusions>
+ <exclusion>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
diff --git a/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
b/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
index 5ed567ee2e..5a0874211f 100644
--- a/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
+++ b/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml
@@ -22,6 +22,7 @@
<bannedDependencies>
<excludes>
<exclude>com.github.fge:*</exclude><!-- Use
com.github.java-json-tools:* instead -->
+
<exclude>com.github.spotbugs:spotbugs-annotations</exclude><!-- Similar to
findbugs. Not needed for compilation or at runtime -->
<exclude>com.github.stephenc.jcip:jcip-annotations</exclude><!-- Should not be
needed for compilation nor at runtime -->
<exclude>com.google.code.findbugs:jsr305</exclude>
<exclude>com.sun.activation:javax.activation</exclude><!-- use
jakarta.activation:jakarta.activation-api and angus-activation instead -->
