rebased + conflict + generated poms

apache · Nov 21, 2024 · ea04322 · ea04322
1 parent 8012b05
commit ea04322
Show file tree

Hide file tree

Showing 4 changed files with 350 additions and 314 deletions.
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
@@ -319,6 +319,10 @@
                 <artifactId>camel-aws2-kinesis</artifactId>
                 <version>${camel.version}</version>
                 <exclusions>
+                    <exclusion>
+                        <groupId>com.google.code.findbugs</groupId>
+                        <artifactId>jsr305</artifactId>
+                    </exclusion>
                     <exclusion>
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>