[tomcat] 02/03: Remove references to deleted package o.a.naming.factory.webservices

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit a32ebb7d9cb98e9a9e63ac1d4b5e91ba00cde30e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 14 11:54:48 2023 +0000

    Remove references to deleted package o.a.naming.factory.webservices
---
 modules/stuffed/tomcat-resource.json                          | 1 -
 res/bnd/catalina.jar.tmp.bnd                                  | 3 ---
 res/bnd/tomcat-embed-core.jar.tmp.bnd                         | 1 -
 res/graal/tomcat-embed-core/native-image/tomcat-resource.json | 1 -
 res/spotbugs/filter-false-positives.xml                       | 7 -------
 5 files changed, 13 deletions(-)

diff --git a/modules/stuffed/tomcat-resource.json b/modules/stuffed/tomcat-resource.json
index 0c41918d60..ff0c539734 100644
--- a/modules/stuffed/tomcat-resource.json
+++ b/modules/stuffed/tomcat-resource.json
@@ -50,7 +50,6 @@
     {"name":"org.apache.jasper.resources.LocalStrings"},
     {"name":"org.apache.naming.LocalStrings"},
     {"name":"org.apache.naming.factory.LocalStrings"},
-    {"name":"org.apache.naming.factory.webservices.LocalStrings"},
     {"name":"org.apache.tomcat.dbcp.dbcp2.LocalStrings"},
     {"name":"org.apache.tomcat.util.LocalStrings"},
     {"name":"org.apache.tomcat.util.buf.LocalStrings"},
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index 8720b37d7f..7579a233b1 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.jar.tmp.bnd
@@ -46,9 +46,6 @@ Export-Package: \
     org.apache.catalina.manager.util,\
     org.apache.catalina
 
--includepackage: \
-    org.apache.naming.factory.webservices
-
 -jpms-module-info: \
     ${module.name};\
         access=32;\
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 7e83e60f56..2c0f8e7495 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -89,7 +89,6 @@ Export-Package: \
     org.apache.tomcat.util.threads
 
 -includepackage: \
-    org.apache.naming.factory.webservices,\
     org.apache.tomcat.util.bcel,\
     org.apache.tomcat.util.http.fileupload.util.mime,\
     org.apache.tomcat.util.json,\
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json b/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
index f10d8f2785..ee0f815bcc 100644
--- a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
+++ b/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
@@ -30,7 +30,6 @@
     {"name":"org.apache.coyote.http2.LocalStrings"},
     {"name":"org.apache.naming.LocalStrings"},
     {"name":"org.apache.naming.factory.LocalStrings"},
-    {"name":"org.apache.naming.factory.webservices.LocalStrings"},
     {"name":"org.apache.tomcat.util.LocalStrings"},
     {"name":"org.apache.tomcat.util.buf.LocalStrings"},
     {"name":"org.apache.tomcat.util.codec.binary.LocalStrings"},
diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml
index e7334c58c7..ba87039f5f 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -1178,13 +1178,6 @@
     </Or>
     <Bug pattern="DE_MIGHT_IGNORE" />
   </Match>
-  <Match>
-    <!-- Simpler to catch Exception than to create dummy implementations of the
-         necessary exception hierarchy -->
-    <Class name="org.apache.naming.factory.webservices.ServiceProxy" />
-    <Method name="&lt;init&gt;"/>
-    <Bug code="ST" />
-  </Match>
   <Match>
     <!-- Class name needs to start with a lower case letter in this case -->
     <Class name="org.apache.naming.java.javaURLContextFactory" />


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org