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-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push: new 4056f47 Add matchExcludesAgainstPathName support to CLI 4056f47 is described below commit 4056f47572944e8b2d5be405b6b5f69c36291916 Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Apr 17 20:42:18 2023 +0100 Add matchExcludesAgainstPathName support to CLI --- src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java | 4 ++++ .../resources/org/apache/tomcat/jakartaee/LocalStrings.properties | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java b/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java index 6c12a09..152e725 100644 --- a/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java +++ b/src/main/java/org/apache/tomcat/jakartaee/MigrationCLI.java @@ -37,6 +37,7 @@ public class MigrationCLI { private static final String LOGLEVEL_ARG = "-logLevel="; private static final String PROFILE_ARG = "-profile="; private static final String ZIPINMEMORY_ARG = "-zipInMemory"; + private static final String MATCHEXCLUDESPATH_ARG ="-matchExcludesAgainstPathName"; /** * Build the migration tool CLI instance. @@ -91,6 +92,9 @@ public class MigrationCLI { } else if (argument.equals(ZIPINMEMORY_ARG)) { iter.remove(); migration.setZipInMemory(true); + } else if (argument.equals(MATCHEXCLUDESPATH_ARG)) { + iter.remove(); + migration.setMatchExcludesAgainstPathName(true); } } diff --git a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties index 1b30a94..003ecaf 100644 --- a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties +++ b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties @@ -49,7 +49,12 @@ where options includes:\n\ \ exception while processing a zip file, enabling this option\n\ \ may workaround the issue by processing the archive in memory.\n\ \ This requires more memory than a streaming approach but is\n\ -\ able to handle a wider range of zip archive structures. +\ able to handle a wider range of zip archive structures.\n\ +\ -matchExcludesAgainstPathName\n\ +\ By default, exclusions are matched against file name. If this\n\ +\ option is enabled, exclusions will be matched against the full\n\ +\ path. + migration.warnSignatureRemoval=Removed cryptographic signature from JAR file passThroughConverter.noConversion=No conversion necessary for [{0}] --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org