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
commit 98083f46bd3c656a8073120a2b876577f4c99068
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 8 09:32:11 2025 +0000
Fix issue that `matchExcludesAgainstPathName` didn't work for files.
Part of PR #60 provided by Semiao Marco
---
CHANGES.md | 1 +
src/main/java/org/apache/tomcat/jakartaee/Migration.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 597f385..54f44e8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@
- Update Commons BCEL to 6.9.0. (markt)
- Update Commons Compress to 1.26.2. (markt)
- Update Commons IO to 2.16.1. (markt)
+- Fix issue that `matchExcludesAgainstPathName` didn't work for files. Part of
PR[#60](https://github.com/apache/tomcat-jakartaee-migration/pull/42) provided
by Semiao Marco. (markt)
## 1.0.8
- Include `.ear` files in list of recognised archives.
PR[#50](https://github.com/apache/tomcat-jakartaee-migration/pull/50) provided
by Sammy Chu. (markt)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 5c99f4d..45190a5 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -283,13 +283,13 @@ public class Migration {
if (!inplace) {
try (InputStream is = new FileInputStream(src);
OutputStream os = new FileOutputStream(dest)) {
- migrateStream(src.getName(), is, os);
+ migrateStream(src.getAbsolutePath(), is, os);
}
} else {
ByteArrayOutputStream buffer = new ByteArrayOutputStream((int)
(src.length() * 1.05));
try (InputStream is = new FileInputStream(src)) {
- migrateStream(src.getName(), is, buffer);
+ migrateStream(src.getAbsolutePath(), is, buffer);
}
try (OutputStream os = new FileOutputStream(dest)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
