Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #4535 - Remove Tomcat 10.x compatibility extension #4538

Merged
merged 2 commits into from
Jan 17, 2025
Merged

Fixes #4535 - Remove Tomcat 10.x compatibility extension #4538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d456c6e
Fixes #4535 - Remove Tomcat 10.x compatibility extension
mnriem Jan 17, 2025
12a696f
Merge branch 'current' into issue-4535
mnriem Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions debug/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,6 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-compat-tomcat10x</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-concurro</artifactId>
Expand Down
55 changes: 0 additions & 55 deletions extension/compat-tomcat10x/pom.xml
View file
Open in desktop

This file was deleted.

89 changes: 0 additions & 89 deletions .../compat-tomcat10x/src/main/java/cloud/piranha/extension/tomcat10x/Tomcat10xExtension.java
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions extension/compat-tomcat10x/src/main/java/module-info.java
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions ...mcat10x/src/test/java/cloud/piranha/extension/tomcat10x/tests/Tomcat10xExtensionTest.java
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions extension/compat-tomcat10x/src/test/tomcat/contextpath/META-INF/context.xml
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@
<module>annotationscan-classfile</module>
<module>angus</module>
<module>bytesstreamhandler</module>
<module>compat-tomcat10x</module>
<module>concurro</module>
<module>coreprofile</module>
<module>declared</module>
<module>declared</module>
<module>default-datasource</module>
<module>eclipselink</module>
<module>epicyro</module>
Expand Down
6 changes: 0 additions & 6 deletions extension/servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-compat-tomcat10x</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cloud.piranha.extension</groupId>
<artifactId>piranha-extension-expressly</artifactId>
Expand Down
2 changes: 0 additions & 2 deletions extension/servlet/src/main/java/cloud/piranha/extension/servlet/ServletExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import cloud.piranha.extension.security.servlet.ServletSecurityManagerExtension;
import cloud.piranha.extension.servletannotations.ServletAnnotationsExtension;
import cloud.piranha.extension.tempdir.TempDirExtension;
import cloud.piranha.extension.tomcat10x.Tomcat10xExtension;
import cloud.piranha.extension.wasp.WaspExtension;
import cloud.piranha.extension.wasp.WaspJspManagerExtension;
import cloud.piranha.extension.webxml.WebXmlExtension;
Expand Down Expand Up @@ -69,7 +68,6 @@ public void extend(WebApplicationExtensionContext context) {
context.add(WaspExtension.class); // WaSP
context.add(ServletContainerInitializerExtension.class); // ServletContainerInitializer
context.add(ServletSecurityExtension.class); // Security implementation
context.add(Tomcat10xExtension.class); // Tomcat 10x compatbility
}

private static Class<? extends WebApplicationExtension> getAnnotationScanExtensionClass() {
Expand Down
1 change: 0 additions & 1 deletion extension/servlet/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
requires cloud.piranha.extension.declared;
requires cloud.piranha.extension.fileupload;
requires cloud.piranha.extension.herring;
requires cloud.piranha.extension.tomcat10x;
requires cloud.piranha.extension.expressly;
requires cloud.piranha.extension.policy;
requires cloud.piranha.extension.scinitializer;
Expand Down
Loading