From da91a39cddef806b88dad1d8b0ff028bf8126282 Mon Sep 17 00:00:00 2001
From: exceptionfactory <exceptionfactory@apache.org>
Date: Tue, 29 Oct 2024 12:56:18 -0500
Subject: [PATCH] NIFI-13495 Excluded FindBugs Annotations and Hibernate
 Annotations

- Added FindBugs Annotations to banned dependencies
- Added Hibernate Commons Annotations and Core to banned dependencies
- Excluded FindBugs Annotations from nifi-opentelemetry-processors
- Updated Hibernate exclusion in nifi-registry-framework
---
 .../nifi-opentelemetry-processors/pom.xml                 | 4 ++++
 .../nifi-registry-core/nifi-registry-framework/pom.xml    | 2 +-
 pom.xml                                                   | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/nifi-extension-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-processors/pom.xml b/nifi-extension-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-processors/pom.xml
index f242e31bd71e..1652a8fdba9a 100644
--- a/nifi-extension-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-processors/pom.xml
@@ -65,6 +65,10 @@
                     <groupId>com.google.protobuf</groupId>
                     <artifactId>protobuf-java-util</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>annotations</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
index f12e290895bd..f05ea3867be7 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
@@ -272,7 +272,7 @@
                     <artifactId>hibernate-entitymanager</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.hibernate</groupId>
+                    <groupId>org.hibernate.orm</groupId>
                     <artifactId>hibernate-core</artifactId>
                 </exclusion>
             </exclusions>
diff --git a/pom.xml b/pom.xml
index 5af9b0829746..a5c7de1c03a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -855,6 +855,14 @@
                                         <!-- Cat-X Deps -->
                                         <exclude>org.json:json:*:*:compile</exclude>
                                         <exclude>c3p0:c3p0:*:*:compile</exclude>
+                                        <!-- FindBugs Annotations is LGPL-2 -->
+                                        <exclude>com.google.code.findbugs:annotations:*</exclude>
+                                        <!-- Hibernate Commons Annotations is LGPL-2.1 before version 7.0.0 -->
+                                        <exclude>org.hibernate.common:hibernate-commons-annotations:[,7.0.0]</exclude>
+                                        <!-- Hibernate Core is LGPL-2.1 -->
+                                        <exclude>org.hibernate.orm:hibernate-core:*</exclude>
+                                        <!-- Hibernate Entity Manager is LGPL-2.1 -->
+                                        <exclude>org.hibernate:hibernate-entitymanager:*</exclude>
                                         <!-- Versions of JSR305 before 3.0.1 are not allowed https://github.com/findbugsproject/findbugs/issues/128 -->
                                         <exclude>com.google.code.findbugs:jsr305:[,3.0.0]:compile</exclude>
                                         <!-- SLF4J routing to Log4j 1.2 is a runtime implementation that conflicts with Logback -->