From 5d87ea7254b7cc3830f6c2fed257b970ac961f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Nie=C3=9Fing?=
 <36885591+zUniQueX@users.noreply.github.com>
Date: Tue, 20 Jun 2023 02:54:16 +0200
Subject: [PATCH] Fix spotbugs packages (#9929)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix spotbugs packages

Signed-off-by: Steffen Nießing <zuniquex@protonmail.com>

* remove jdk17 profile which disable spotbugs

---------

Signed-off-by: Steffen Nießing <zuniquex@protonmail.com>
Co-authored-by: Olivier Lamy <olamy@apache.org>
---
 jetty-core/jetty-alpn/jetty-alpn-client/pom.xml |  2 +-
 jetty-core/jetty-alpn/jetty-alpn-server/pom.xml |  2 +-
 jetty-core/jetty-client/pom.xml                 |  2 +-
 jetty-core/jetty-deploy/pom.xml                 |  2 +-
 jetty-ee10/jetty-ee10-annotations/pom.xml       |  2 +-
 jetty-ee10/jetty-ee10-jaspi/pom.xml             |  2 +-
 jetty-ee10/jetty-ee10-plus/pom.xml              |  2 +-
 jetty-ee10/jetty-ee10-servlet/pom.xml           |  2 +-
 jetty-ee8/jetty-ee8-annotations/pom.xml         |  2 +-
 jetty-ee8/jetty-ee8-nested/pom.xml              |  2 +-
 jetty-ee8/jetty-ee8-openid/pom.xml              |  2 +-
 jetty-ee8/jetty-ee8-plus/pom.xml                |  2 +-
 jetty-ee8/jetty-ee8-security/pom.xml            |  2 +-
 jetty-ee8/jetty-ee8-servlet/pom.xml             |  2 +-
 jetty-ee9/jetty-ee9-annotations/pom.xml         |  2 +-
 jetty-ee9/jetty-ee9-jaspi/pom.xml               |  2 +-
 jetty-ee9/jetty-ee9-nested/pom.xml              |  2 +-
 jetty-ee9/jetty-ee9-openid/pom.xml              |  2 +-
 jetty-ee9/jetty-ee9-plus/pom.xml                |  2 +-
 jetty-ee9/jetty-ee9-proxy/pom.xml               |  2 +-
 jetty-ee9/jetty-ee9-security/pom.xml            |  2 +-
 jetty-ee9/jetty-ee9-servlet/pom.xml             |  2 +-
 pom.xml                                         | 11 -----------
 23 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml
index 15fe0581305..6d704c1d41e 100644
--- a/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml
+++ b/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml
@@ -9,7 +9,7 @@
   <name>Core :: ALPN :: Client</name>
   <properties>
     <bundle-symbolic-name>${project.groupId}.alpn.client</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.alpn.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.alpn.*</spotbugs.onlyAnalyze>
   </properties>
   <build>
     <plugins>
diff --git a/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml
index 2d753a0ffb3..f1b437678c8 100644
--- a/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml
+++ b/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml
@@ -9,7 +9,7 @@
   <name>Core :: ALPN :: Server</name>
   <properties>
     <bundle-symbolic-name>${project.groupId}.alpn.server</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.alpn.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.alpn.*</spotbugs.onlyAnalyze>
   </properties>
   <build>
     <plugins>
diff --git a/jetty-core/jetty-client/pom.xml b/jetty-core/jetty-client/pom.xml
index a7a22380ca3..65916cd1016 100644
--- a/jetty-core/jetty-client/pom.xml
+++ b/jetty-core/jetty-client/pom.xml
@@ -11,7 +11,7 @@
   <properties>
     <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
     <jetty.test.policy.loc>target/test-policy</jetty.test.policy.loc>
-    <spotbugs.onlyAnalyze>org.eclipse.client.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.client.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-core/jetty-deploy/pom.xml b/jetty-core/jetty-deploy/pom.xml
index 976b1fc413b..2f142de6d8b 100644
--- a/jetty-core/jetty-deploy/pom.xml
+++ b/jetty-core/jetty-deploy/pom.xml
@@ -12,7 +12,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.deploy</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.deploy.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.deploy.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee10/jetty-ee10-annotations/pom.xml b/jetty-ee10/jetty-ee10-annotations/pom.xml
index 55c5bd4fb5c..7a79741986c 100644
--- a/jetty-ee10/jetty-ee10-annotations/pom.xml
+++ b/jetty-ee10/jetty-ee10-annotations/pom.xml
@@ -11,7 +11,7 @@
   <description>Annotation support for deploying servlets in jetty.</description>
   <properties>
     <bundle-symbolic-name>${project.groupId}.annotations</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.annotations.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee10.annotations.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee10/jetty-ee10-jaspi/pom.xml b/jetty-ee10/jetty-ee10-jaspi/pom.xml
index bbc24c6d851..f6657b54db1 100644
--- a/jetty-ee10/jetty-ee10-jaspi/pom.xml
+++ b/jetty-ee10/jetty-ee10-jaspi/pom.xml
@@ -12,7 +12,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.security.jaspi</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.jaspi.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee10.security.jaspi.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee10/jetty-ee10-plus/pom.xml b/jetty-ee10/jetty-ee10-plus/pom.xml
index 2c0f5384568..6c10c5426aa 100644
--- a/jetty-ee10/jetty-ee10-plus/pom.xml
+++ b/jetty-ee10/jetty-ee10-plus/pom.xml
@@ -12,7 +12,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.plus</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.plus.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee10.plus.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee10/jetty-ee10-servlet/pom.xml b/jetty-ee10/jetty-ee10-servlet/pom.xml
index c7a9aae1122..7d1d56287e6 100644
--- a/jetty-ee10/jetty-ee10-servlet/pom.xml
+++ b/jetty-ee10/jetty-ee10-servlet/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.servlet</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee10.servlet.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee8/jetty-ee8-annotations/pom.xml b/jetty-ee8/jetty-ee8-annotations/pom.xml
index cb1fc57f202..c506c388efb 100644
--- a/jetty-ee8/jetty-ee8-annotations/pom.xml
+++ b/jetty-ee8/jetty-ee8-annotations/pom.xml
@@ -12,7 +12,7 @@
   <properties>
     <ee9.module>jetty-ee9-annotations</ee9.module>
     <bundle-symbolic-name>${project.groupId}.annotations</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.annotations.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee8.annotations.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee8/jetty-ee8-nested/pom.xml b/jetty-ee8/jetty-ee8-nested/pom.xml
index 5c0da52caef..3c22450b00c 100644
--- a/jetty-ee8/jetty-ee8-nested/pom.xml
+++ b/jetty-ee8/jetty-ee8-nested/pom.xml
@@ -13,7 +13,7 @@
   <properties>
     <ee9.module>jetty-ee9-nested</ee9.module>
     <bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.server.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee8.server.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee8/jetty-ee8-openid/pom.xml b/jetty-ee8/jetty-ee8-openid/pom.xml
index 7940f790f40..0e654195038 100644
--- a/jetty-ee8/jetty-ee8-openid/pom.xml
+++ b/jetty-ee8/jetty-ee8-openid/pom.xml
@@ -13,7 +13,7 @@
   <properties>
     <ee9.module>jetty-ee9-openid</ee9.module>
     <bundle-symbolic-name>${project.groupId}.openid</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.security.openid.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee8.security.openid.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee8/jetty-ee8-plus/pom.xml b/jetty-ee8/jetty-ee8-plus/pom.xml
index d2d026518d8..0ca7bdc7faf 100644
--- a/jetty-ee8/jetty-ee8-plus/pom.xml
+++ b/jetty-ee8/jetty-ee8-plus/pom.xml
@@ -13,7 +13,7 @@
   <properties>
     <ee9.module>jetty-ee9-plus</ee9.module>
     <bundle-symbolic-name>${project.groupId}.plus</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.plus.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee8.plus.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee8/jetty-ee8-security/pom.xml b/jetty-ee8/jetty-ee8-security/pom.xml
index 8e98c7c8ba8..c13962d9493 100644
--- a/jetty-ee8/jetty-ee8-security/pom.xml
+++ b/jetty-ee8/jetty-ee8-security/pom.xml
@@ -13,7 +13,7 @@
   <properties>
     <ee9.module>jetty-ee9-security</ee9.module>
     <bundle-symbolic-name>${project.groupId}.security</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.security.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee8.security.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee8/jetty-ee8-servlet/pom.xml b/jetty-ee8/jetty-ee8-servlet/pom.xml
index af9f63d4418..767a666dd28 100644
--- a/jetty-ee8/jetty-ee8-servlet/pom.xml
+++ b/jetty-ee8/jetty-ee8-servlet/pom.xml
@@ -14,7 +14,7 @@
   <properties>
     <ee9.module>jetty-ee9-servlet</ee9.module>
     <bundle-symbolic-name>${project.groupId}.servlet</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee8.servlet.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee9/jetty-ee9-annotations/pom.xml b/jetty-ee9/jetty-ee9-annotations/pom.xml
index d2b2b435d2d..45ebb476faf 100644
--- a/jetty-ee9/jetty-ee9-annotations/pom.xml
+++ b/jetty-ee9/jetty-ee9-annotations/pom.xml
@@ -11,7 +11,7 @@
   <description>Annotation support for deploying servlets in jetty.</description>
   <properties>
     <bundle-symbolic-name>${project.groupId}.annotations</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.annotations.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee9.annotations.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee9/jetty-ee9-jaspi/pom.xml b/jetty-ee9/jetty-ee9-jaspi/pom.xml
index 4fc3d1ccc61..a72509eca14 100644
--- a/jetty-ee9/jetty-ee9-jaspi/pom.xml
+++ b/jetty-ee9/jetty-ee9-jaspi/pom.xml
@@ -12,7 +12,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.security.jaspi</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.jaspi.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee9.security.jaspi.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee9/jetty-ee9-nested/pom.xml b/jetty-ee9/jetty-ee9-nested/pom.xml
index 4c30208cee4..bbe41748ad6 100644
--- a/jetty-ee9/jetty-ee9-nested/pom.xml
+++ b/jetty-ee9/jetty-ee9-nested/pom.xml
@@ -12,7 +12,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.server.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee9.nested.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee9/jetty-ee9-openid/pom.xml b/jetty-ee9/jetty-ee9-openid/pom.xml
index 006fc9bef8f..8a19ee7ec03 100644
--- a/jetty-ee9/jetty-ee9-openid/pom.xml
+++ b/jetty-ee9/jetty-ee9-openid/pom.xml
@@ -12,7 +12,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.openid</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.security.openid.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee9.security.openid.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee9/jetty-ee9-plus/pom.xml b/jetty-ee9/jetty-ee9-plus/pom.xml
index 28d7ff98d48..21d5306aafd 100644
--- a/jetty-ee9/jetty-ee9-plus/pom.xml
+++ b/jetty-ee9/jetty-ee9-plus/pom.xml
@@ -12,7 +12,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.plus</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.plus.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee9.plus.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee9/jetty-ee9-proxy/pom.xml b/jetty-ee9/jetty-ee9-proxy/pom.xml
index fd643c0154f..d31b02db568 100644
--- a/jetty-ee9/jetty-ee9-proxy/pom.xml
+++ b/jetty-ee9/jetty-ee9-proxy/pom.xml
@@ -12,7 +12,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.proxy</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.proxy.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee9.proxy.*</spotbugs.onlyAnalyze>
   </properties>
   <build>
     <plugins>
diff --git a/jetty-ee9/jetty-ee9-security/pom.xml b/jetty-ee9/jetty-ee9-security/pom.xml
index 1cf8dedb965..efa9a133d11 100644
--- a/jetty-ee9/jetty-ee9-security/pom.xml
+++ b/jetty-ee9/jetty-ee9-security/pom.xml
@@ -12,7 +12,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.security</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.security.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee9.security.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/jetty-ee9/jetty-ee9-servlet/pom.xml b/jetty-ee9/jetty-ee9-servlet/pom.xml
index 8a748af8690..08d2a61fb76 100644
--- a/jetty-ee9/jetty-ee9-servlet/pom.xml
+++ b/jetty-ee9/jetty-ee9-servlet/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.servlet</bundle-symbolic-name>
-    <spotbugs.onlyAnalyze>org.eclipse.jetty.*</spotbugs.onlyAnalyze>
+    <spotbugs.onlyAnalyze>org.eclipse.jetty.ee9.servlet.*</spotbugs.onlyAnalyze>
   </properties>
 
   <build>
diff --git a/pom.xml b/pom.xml
index d14253ea24d..9d75d3a2347 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2099,17 +2099,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>jdk17</id>
-      <activation>
-        <jdk>[17,)</jdk>
-      </activation>
-      <properties>
-        <!-- disable plugins known not to work with JDK 17 (yet) -->
-        <spotbugs.skip>true</spotbugs.skip>
-        <jacoco.skip>true</jacoco.skip>
-      </properties>
-    </profile>
     <profile>
       <id>update-version</id>
       <build>