[tomcat] 04/04: Move to javax

[re...@apache.org]

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

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e092977e08ceda0401efd3af9f14e468ccd73fc6
Author: remm <re...@apache.org>
AuthorDate: Wed May 5 15:25:25 2021 +0200

    Move to javax
---
 test/org/apache/tomcat/util/scan/FooSCI.java                        | 6 +++---
 ...ntainerInitializer => javax.servlet.ServletContainerInitializer} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/org/apache/tomcat/util/scan/FooSCI.java b/test/org/apache/tomcat/util/scan/FooSCI.java
index be45d4f..51deec4 100644
--- a/test/org/apache/tomcat/util/scan/FooSCI.java
+++ b/test/org/apache/tomcat/util/scan/FooSCI.java
@@ -18,9 +18,9 @@ package org.apache.tomcat.util.scan;
 
 import java.util.Set;
 
-import jakarta.servlet.ServletContainerInitializer;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.annotation.HandlesTypes;
+import javax.servlet.ServletContainerInitializer;
+import javax.servlet.ServletContext;
+import javax.servlet.annotation.HandlesTypes;
 
 import org.apache.tomcat.util.scan.TestClassParser.Foo;
 
diff --git a/test/webapp-sci/WEB-INF/classes/META-INF/services/jakarta.servlet.ServletContainerInitializer b/test/webapp-sci/WEB-INF/classes/META-INF/services/javax.servlet.ServletContainerInitializer
similarity index 100%
rename from test/webapp-sci/WEB-INF/classes/META-INF/services/jakarta.servlet.ServletContainerInitializer
rename to test/webapp-sci/WEB-INF/classes/META-INF/services/javax.servlet.ServletContainerInitializer

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