This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/tomcat-maven-plugin.git
The following commit(s) were added to refs/heads/trunk by this push:
new 65d7484 Drop external repo loader from the common code
65d7484 is described below
commit 65d7484e21a07f097896f292cd51074c4f2a4ed7
Author: remm <[email protected]>
AuthorDate: Thu Feb 5 15:42:27 2026 +0100
Drop external repo loader from the common code
Move it to 7, and 8 (removing some method there).
Update common to Tomcat 9 instead of 7.
---
common-tomcat-maven-plugin/pom.xml | 29 ++++-
.../tomcat/maven/common/TomcatManagerTest.java | 4 +-
pom.xml | 128 +--------------------
.../maven/plugin/tomcat7/run/AbstractRunMojo.java | 1 -
...ExternalRepositoriesReloadableWebappLoader.java | 2 +-
tomcat7-war-runner/pom.xml | 15 +++
.../maven/plugin/tomcat8/run/AbstractRunMojo.java | 1 -
...ExternalRepositoriesReloadableWebappLoader.java | 27 +----
8 files changed, 45 insertions(+), 162 deletions(-)
diff --git a/common-tomcat-maven-plugin/pom.xml
b/common-tomcat-maven-plugin/pom.xml
index eff25b3..02a7b83 100644
--- a/common-tomcat-maven-plugin/pom.xml
+++ b/common-tomcat-maven-plugin/pom.xml
@@ -62,33 +62,50 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${tomcat7Version}</version>
+ <version>${tomcat9Version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-api</artifactId>
+ <version>${tomcat9Version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ <version>${tomcat9Version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${tomcat9Version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat9Version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-juli</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
+ <version>${tomcat9Version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
+ <version>${tomcat9Version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jsp-api</artifactId>
+ <version>${tomcat9Version}</version>
<scope>test</scope>
</dependency>
diff --git
a/common-tomcat-maven-plugin/src/test/java/org/apache/tomcat/maven/common/TomcatManagerTest.java
b/common-tomcat-maven-plugin/src/test/java/org/apache/tomcat/maven/common/TomcatManagerTest.java
index e156a0c..26a0b71 100644
---
a/common-tomcat-maven-plugin/src/test/java/org/apache/tomcat/maven/common/TomcatManagerTest.java
+++
b/common-tomcat-maven-plugin/src/test/java/org/apache/tomcat/maven/common/TomcatManagerTest.java
@@ -75,7 +75,7 @@ public class TomcatManagerTest
Context context = tomcat.addContext( "", System.getProperty(
"java.io.tmpdir" ) );
uploadServlet = new UploadServlet();
tomcat.addServlet( context, "foo", uploadServlet );
- context.addServletMapping( "/*", "foo" );
+ context.addServletMappingDecoded( "/*", "foo" );
tomcat.start();
@@ -89,7 +89,7 @@ public class TomcatManagerTest
context = redirectTomcat.addContext( "", System.getProperty(
"java.io.tmpdir" ) );
redirectServlet = new RedirectServlet();
redirectTomcat.addServlet( context, "foo", redirectServlet );
- context.addServletMapping( "/*", "foo" );
+ context.addServletMappingDecoded( "/*", "foo" );
redirectTomcat.start();
redirectPort = redirectTomcat.getConnector().getLocalPort();
diff --git a/pom.xml b/pom.xml
index fa0bc24..e03696b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,7 @@
<!-- Tomcat versions non API compatible with main branch -->
<tomcat7Version>7.0.109</tomcat7Version>
<tomcat8Version>8.0.18</tomcat8Version>
+ <tomcat9Version>9.0.115</tomcat9Version>
<!-- Any Tomcat version API compatible with main branch -->
<tomcatVersion>11.0.18</tomcatVersion>
@@ -327,8 +328,8 @@
<module>tomcat7-maven-plugin</module>
<module>tomcat8-war-runner</module>
<module>tomcat8-maven-plugin</module>
- <!--<module>tomcat-war-runner</module>-->
- <!--<module>tomcat-maven-plugin</module>-->
+ <module>tomcat-main-war-runner</module>
+ <module>tomcat-main-maven-plugin</module>
<module>tomcat-maven-archetype</module>
</modules>
@@ -342,129 +343,6 @@
<version>3.26.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-util</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-coyote</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-api</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jdbc</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-dbcp</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jsp-api</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper-el</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-el-api</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-tribes</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina-ha</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-annotations-api</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-i18n-es</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-i18n-fr</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-i18n-ja</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-juli</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-log4j</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
-
<!-- end tomcat dependencies -->
<dependency>
diff --git
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
index bac462d..60e856a 100644
---
a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
+++
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
@@ -56,7 +56,6 @@ import org.apache.naming.resources.FileDirContext;
import org.apache.tomcat.JarScanner;
import org.apache.tomcat.maven.common.config.AbstractWebapp;
import org.apache.tomcat.maven.common.run.EmbeddedRegistry;
-import
org.apache.tomcat.maven.common.run.ExternalRepositoriesReloadableWebappLoader;
import org.apache.tomcat.maven.plugin.tomcat7.AbstractTomcat7Mojo;
import org.apache.tomcat.util.scan.StandardJarScanner;
import org.codehaus.plexus.archiver.ArchiverException;
diff --git
a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ExternalRepositoriesReloadableWebappLoader.java
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExternalRepositoriesReloadableWebappLoader.java
similarity index 98%
copy from
common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ExternalRepositoriesReloadableWebappLoader.java
copy to
tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExternalRepositoriesReloadableWebappLoader.java
index 7a8595a..a9f56e8 100644
---
a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ExternalRepositoriesReloadableWebappLoader.java
+++
b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExternalRepositoriesReloadableWebappLoader.java
@@ -1,4 +1,4 @@
-package org.apache.tomcat.maven.common.run;
+package org.apache.tomcat.maven.plugin.tomcat7.run;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/tomcat7-war-runner/pom.xml b/tomcat7-war-runner/pom.xml
index 3a2b734..1ea52cd 100644
--- a/tomcat7-war-runner/pom.xml
+++ b/tomcat7-war-runner/pom.xml
@@ -43,73 +43,88 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-util</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-coyote</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-api</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-dbcp</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jsp-api</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper-el</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-el-api</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-tribes</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina-ha</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-annotations-api</artifactId>
+ <version>${tomcat7Version}</version>
</dependency>
</dependencies>
diff --git
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
index d3784a4..480e3bd 100644
---
a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
+++
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
@@ -59,7 +59,6 @@ import
org.apache.maven.shared.filtering.MavenFilteringException;
import org.apache.tomcat.JarScanner;
import org.apache.tomcat.maven.common.config.AbstractWebapp;
import org.apache.tomcat.maven.common.run.EmbeddedRegistry;
-import
org.apache.tomcat.maven.common.run.ExternalRepositoriesReloadableWebappLoader;
import org.apache.tomcat.maven.plugin.tomcat8.AbstractTomcat8Mojo;
import org.apache.tomcat.util.scan.StandardJarScanner;
import org.codehaus.plexus.archiver.ArchiverException;
diff --git
a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ExternalRepositoriesReloadableWebappLoader.java
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ExternalRepositoriesReloadableWebappLoader.java
similarity index 86%
rename from
common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ExternalRepositoriesReloadableWebappLoader.java
rename to
tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ExternalRepositoriesReloadableWebappLoader.java
index 7a8595a..75a8cdc 100644
---
a/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ExternalRepositoriesReloadableWebappLoader.java
+++
b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ExternalRepositoriesReloadableWebappLoader.java
@@ -1,4 +1,4 @@
-package org.apache.tomcat.maven.common.run;
+package org.apache.tomcat.maven.plugin.tomcat8.run;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -67,31 +67,6 @@ public class ExternalRepositoriesReloadableWebappLoader
this.log = log;
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void addRepository( String repository )
- {
- super.addRepository( repository );
- try
- {
- File file = new File( new URL( repository ).getPath().replaceAll(
"%20", " " ) );
- if ( file.isDirectory() )
- {
- addClassDirectory( file );
- }
- else if ( file.isFile() && file.getName().endsWith( ".jar" ) )
- {
- addFile( file );
- }
- }
- catch ( MalformedURLException muex )
- {
- throw new RuntimeException( muex );
- }
- }
-
/**
* Tracks modification times of files in the given class directory.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
