Re: [I] Migration of defaultNamespaceRemap / com.sun.xml.bind references [tomcat-jakartaee-migration]
markt-asf commented on issue #62:
URL:
https://github.com/apache/tomcat-jakartaee-migration/issues/62#issuecomment-2577142902
Hmm. The migration tool is designed on the basis that it "just" needs to
rename some packages from `javax. ...` to `jakarta. ...`. What you are trying
to do looks a little more complicated than that.
If you can express your requirements in terms of package renames i.e. rename
`.` to `.$1` then you
could do this with a profile (or maybe several profiles). Something like
(untested):
```
JAXB("com.sun.xml.bind","org.glassfish.jaxb","com[/\\.]sun[/\\.]xml[/\\.]bind([/\\.].*")
```
although that is almost certainly be too broad. You'll likely need something
more specific than `.*`. Then run the EE followed by JAXB profiles.
The migration tool should be easy to build from source. I suspect
experimenting along the lines I suggest above and when you have a new profile
that works, create a PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Create dependabot.yml
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 0a7d7cd Create dependabot.yml 0a7d7cd is described below commit 0a7d7cd989b30ca6b0483a71af3064dd365d6dc8 Author: Mark Thomas AuthorDate: Wed Jan 8 09:26:32 2025 + Create dependabot.yml --- .github/dependabot.yml | 11 +++ 1 file changed, 11 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000..fa9b443 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "maven" +directory: "/" # Location of package manifests +schedule: + interval: "weekly" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Bump org.apache.bcel:bcel from 6.9.0 to 6.10.0 [tomcat-jakartaee-migration]
dependabot[bot] opened a new pull request, #63: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/63 Bumps [org.apache.bcel:bcel](https://github.com/apache/commons-bcel) from 6.9.0 to 6.10.0. Changelog Sourced from https://github.com/apache/commons-bcel/blob/master/RELEASE-NOTES.txt";>org.apache.bcel:bcel's changelog. Apache Commons BCEL Version 6.10.0 RELEASE NOTES Introduction The Apache Commons BCEL team is pleased to announce the release of Apache Commons BCEL 6.10.0. The Byte Code Engineering Library (BCEL) is intended to give users a convenient way to analyze, create, and manipulate compiled .class files. Classes are represented by objects containing all the symbolic information of the given class: methods, fields, and byte code instructions. Maintenance and bug fix release. Requires a minimum of Java 8. Changes Fix PMD UnnecessaryFullyQualifiedName. Thanks to Gary Gregory. Fix PMD EmptyCatchBlock by allowing commented blocks. Thanks to Gary Gregory. Fix PMD EmptyControlStatement by allowing commented blocks. Thanks to Gary Gregory. Fix SpotBugs RV_RETURN_VALUE_IGNORED_BAD_PRACTICE in JasminVisitor. Thanks to Gary Gregory. SpotBugs checks should ignore code generated by JavaCC. Thanks to Gary Gregory. Fix SpotBugs URF_UNREAD_FIELD in ClassDumper. Thanks to Gary Gregory. Fix SpotBugs DM_DEFAULT_ENCODING in JasminVisitor. Thanks to Gary Gregory. Fix SpotBugs RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE in ASTFunAppl. Thanks to Gary Gregory. Fix SpotBugs RV_ABSOLUTE_VALUE_OF_HASHCODE in Mini.Environment. Thanks to Gary Gregory. Fix SpotBugs DM_DEFAULT_ENCODING in Mini.MiniC. Thanks to Gary Gregory. Fix SpotBugs WMI_WRONG_MAP_ITERATOR in Package.go(String[]). Thanks to Gary Gregory. Deprecate TransitiveHull.INGORED in favor of TransitiveHull.getIgnored(). Thanks to Gary Gregory. Add accessors to model and unit tests, Javadoc [#183](https://github.com/apache/commons-bcel/issues/183). Thanks to nbauma109, Gary Gregory, Mark Roberts. Add Const.MAJOR_22. Thanks to Gary Gregory. Add Const.MINOR_22. Thanks to Gary Gregory. Add Const.MAJOR_23. Thanks to Gary Gregory. Add Const.MINOR_23. Thanks to Gary Gregory. Add Const.MAJOR_24. Thanks to Gary Gregory. Add Const.MINOR_24. Thanks to Gary Gregory. Bump tests from org.assertj:assertj-core 3.25.3 to 3.26.3 [#322](https://github.com/apache/commons-bcel/issues/322), [#332](https://github.com/apache/commons-bcel/issues/332). Thanks to Dependabot. Bump tests from org.jetbrains.kotlin:kotlin-stdlib 1.9.23 to 2.0.0 [#309](https://github.com/apache/commons-bcel/issues/309), [#318](https://github.com/apache/commons-bcel/issues/318). Thanks to Dependabot. Bump tests from org.apache.commons:commons-collections4 4.4 to 4.5.0-M2. Thanks to Gary Gregory. Bump org.apache.commons:commons-parent from 69 to 71. Thanks to Gary Gregory. Bump org.codehaus.mojo:taglist-maven-plugin from 3.0.0 to 3.1.0 [#331](https://github.com/apache/commons-bcel/issues/331). Thanks to Gary Gregory. Historical list of changes: https://commons.apache.org/proper/commons-bcel/changes-report.html";>https://commons.apache.org/proper/commons-bcel/changes-report.html For complete information on Apache Commons BCEL, including instructions on how to submit bug reports, patches, or suggestions for improvement, see the Apache Commons BCEL website: https://commons.apache.org/proper/commons-bcel";>https://commons.apache.org/proper/commons-bcel ... (truncated) Commits https://github.com/apache/commons-bcel/commit/907c61da34258b8ab70081056443818312e404f6";>907c61d Prepare for the next release candidate https://github.com/apache/commons-bcel/commit/a7333c089bd27d87fc472eebb6ee9cbb58218f47";>a7333c0 Prepare for the next release candidate https://github.com/apache/commons-bcel/commit/2d95820fa2a34f6a38edfb9f838195c68b39f6c0";>2d95820 Add Const.MAJOR_24 https://github.com/apache/commons-bcel/commit/8f87b819d3b00831b1e62ac2659dfeb7bc9a0897";>8f87b81 Add Const.MAJOR_23 https://github.com/apache/commons-bcel/commit/e9aa06834d3b654713df056a84d4ef008227f7b9";>e9aa068 Add Const.MAJOR_22 https://github.com/apache/commons-bcel/commit/9818c8929c9c3e85f85e1518d4d74bed9d245e50";>9818c89 Bump org.assertj:assertj-core from 3.26.0 to 3.26.3 https://redirect.github.com/apache/commons-bcel/issues/332";>#332 https://github.com/apache/commons-bcel/commit/10f5191069d88e28d5a08652e
[PR] Bump commons-io:commons-io from 2.16.1 to 2.18.0 [tomcat-jakartaee-migration]
dependabot[bot] opened a new pull request, #66: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/66 Bumps commons-io:commons-io from 2.16.1 to 2.18.0. [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/maven/org.apache.commons-commons-compress-1.27.1 created (now 43ea67e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.commons-commons-compress-1.27.1 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at 43ea67e Bump org.apache.commons:commons-compress from 1.26.2 to 1.27.1 No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/maven/org.jacoco-jacoco-maven-plugin-0.8.12 created (now 9fc7977)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.jacoco-jacoco-maven-plugin-0.8.12 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at 9fc7977 Bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12 No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Bump org.apache.commons:commons-compress from 1.26.2 to 1.27.1 [tomcat-jakartaee-migration]
dependabot[bot] opened a new pull request, #67: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/67 Bumps org.apache.commons:commons-compress from 1.26.2 to 1.27.1. [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12 [tomcat-jakartaee-migration]
dependabot[bot] opened a new pull request, #65: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/65 Bumps [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.11 to 0.8.12. Release notes Sourced from https://github.com/jacoco/jacoco/releases";>org.jacoco:jacoco-maven-plugin's releases. 0.8.12 New Features JaCoCo now officially supports Java 22 (GitHub https://redirect.github.com/jacoco/jacoco/issues/1596";>#1596). Experimental support for Java 23 class files (GitHub https://redirect.github.com/jacoco/jacoco/issues/1553";>#1553). Fixed bugs Branches added by the Kotlin compiler for functions with default arguments and having more than 32 parameters are filtered out during generation of report (GitHub https://redirect.github.com/jacoco/jacoco/issues/1556";>#1556). Branch added by the Kotlin compiler version 1.5.0 and above for reading from lateinit property is filtered out during generation of report (GitHub https://redirect.github.com/jacoco/jacoco/issues/1568";>#1568). Non-functional Changes JaCoCo now depends on ASM 9.7 (GitHub https://redirect.github.com/jacoco/jacoco/issues/1600";>#1600). Commits https://github.com/jacoco/jacoco/commit/dbfb6f2ad904158b5b40a93fea222e263aeaf9ab";>dbfb6f2 Prepare release 0.8.12 https://github.com/jacoco/jacoco/commit/a50585b9e0770c363c56d887a8f639dc05411073";>a50585b Upgrade maven-plugin-plugin to 3.6.4 (https://redirect.github.com/jacoco/jacoco/issues/1604";>#1604) https://github.com/jacoco/jacoco/commit/fd63cc5478bcd7b32e2070d93ead8c879b423841";>fd63cc5 Configure labels that Dependabot assigns to PRs (https://redirect.github.com/jacoco/jacoco/issues/1603";>#1603) https://github.com/jacoco/jacoco/commit/03a53334c1e3a28ed587feb5adbfa3c0aa536990";>03a5333 Add configuration for Dependabot to simplify updates of ASM (https://redirect.github.com/jacoco/jacoco/issues/1601";>#1601) https://github.com/jacoco/jacoco/commit/40ff9fb3b13bb484344936dde4a90b083b79cdbd";>40ff9fb Upgrade ASM to 9.7 (https://redirect.github.com/jacoco/jacoco/issues/1600";>#1600) https://github.com/jacoco/jacoco/commit/907717832435f5085b67d02e1eeec5b63b0f415b";>9077178 Happy birthday Java 22! (https://redirect.github.com/jacoco/jacoco/issues/1596";>#1596) https://github.com/jacoco/jacoco/commit/7edd1b511a174a663f633c34ae8c951a0ae77d20";>7edd1b5 Bump actions/setup-java from 4.1.0 to 4.2.1 (https://redirect.github.com/jacoco/jacoco/issues/1594";>#1594) https://github.com/jacoco/jacoco/commit/e50b547bc26ff198acfd16311c028f340af38699";>e50b547 Upgrade ECJ to 3.37.0 (https://redirect.github.com/jacoco/jacoco/issues/1590";>#1590) https://github.com/jacoco/jacoco/commit/a1144d02ff0f89d6603214676730a2d5616cf466";>a1144d0 Upgrade maven-site-plugin to 3.12.1 (https://redirect.github.com/jacoco/jacoco/issues/1586";>#1586) https://github.com/jacoco/jacoco/commit/04b0141d6ae5e6d1f00f15341b29dd4734ab778a";>04b0141 Bump actions/setup-java from 4.0.0 to 4.1.0 (https://redirect.github.com/jacoco/jacoco/issues/1587";>#1587) Additional commits viewable in https://github.com/jacoco/jacoco/compare/v0.8.11...v0.8.12";>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for thi
(tomcat-jakartaee-migration) branch dependabot/maven/org.apache.bcel-bcel-6.10.0 created (now 8beb077)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.bcel-bcel-6.10.0 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at 8beb077 Bump org.apache.bcel:bcel from 6.9.0 to 6.10.0 No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Bump org.apache.ant:ant from 1.10.14 to 1.10.15 [tomcat-jakartaee-migration]
dependabot[bot] opened a new pull request, #64: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/64 Bumps org.apache.ant:ant from 1.10.14 to 1.10.15. [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Update upload-artifact action
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 a67e5bb Update upload-artifact action
a67e5bb is described below
commit a67e5bbdd8dbf003fccbdf2184e33a9eb0398ef9
Author: Mark Thomas
AuthorDate: Wed Jan 8 09:36:55 2025 +
Update upload-artifact action
---
.github/workflows/ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d56883c..2b37e39 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
continue-on-error:
true
- name: Upload logs
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v4
with:
name: JDK${{ matrix.java }}-${{ matrix.os }}-logs
path: output/build/logs/TEST*.txt
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Bump org.apache.bcel:bcel from 6.9.0 to 6.10.0 [tomcat-jakartaee-migration]
markt-asf merged PR #63: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/63 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) 01/02: Fix typo
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 2f6850c3d03b32de7c2b8f4802d5110d210d5b8d Author: Mark Thomas AuthorDate: Wed Jan 8 09:12:25 2025 + Fix typo --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index ade05dd..597f385 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,7 +18,7 @@ ## 1.0.7 - When converting directories, rename files according to the chosen profile. (fschumacher) -- Add configuration option, `matchExcludesAgainstPathName` that can be used to configure exclusions base don path name rather than just file name. PR[#38](https://github.com/apache/tomcat-jakartaee-migration/pull/38) provided by Réda Housni Alaoui. (markt) +- Add configuration option, `matchExcludesAgainstPathName` that can be used to configure exclusions based on path name rather than just file name. PR[#38](https://github.com/apache/tomcat-jakartaee-migration/pull/38) provided by Réda Housni Alaoui. (markt) - Update OSGI servlet specification versions if present in manifest file. PR[#42](https://github.com/apache/tomcat-jakartaee-migration/pull/42) provided by Ivan Furnadjiev. (markt) - Update Commons BCEL to 6.7.0. (markt) - Update Commons Compress to 1.23.0. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated (0a7d7cd -> 98083f4)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git from 0a7d7cd Create dependabot.yml new 2f6850c Fix typo new 98083f4 Fix issue that `matchExcludesAgainstPathName` didn't work for files. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.md | 3 ++- src/main/java/org/apache/tomcat/jakartaee/Migration.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) 02/02: Fix issue that `matchExcludesAgainstPathName` didn't work for files.
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
AuthorDate: Wed Jan 8 09:32:11 2025 +
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
Re: [PR] Bump commons-io:commons-io from 2.16.1 to 2.18.0 [tomcat-jakartaee-migration]
markt-asf merged PR #66: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/66 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/maven/commons-io-commons-io-2.18.0 deleted (was f0a4fa6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/commons-io-commons-io-2.18.0 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git was f0a4fa6 Bump commons-io:commons-io from 2.16.1 to 2.18.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12
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 4d9f56f Bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12 4d9f56f is described below commit 4d9f56f2c3435827a1a85779cfe9aadada33f58e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jan 8 09:27:24 2025 + Bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12 Bumps [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.11 to 0.8.12. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.11...v0.8.12) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78e1682..004f77d 100644 --- a/pom.xml +++ b/pom.xml @@ -301,7 +301,7 @@ org.jacoco jacoco-maven-plugin -0.8.11 +0.8.12 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Bump commons-io:commons-io from 2.16.1 to 2.18.0
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 0269957 Bump commons-io:commons-io from 2.16.1 to 2.18.0 0269957 is described below commit 026995745dbb77c2a7e0826570c786748849fe3b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jan 8 09:27:26 2025 + Bump commons-io:commons-io from 2.16.1 to 2.18.0 Bumps commons-io:commons-io from 2.16.1 to 2.18.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 004f77d..2cdec47 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ commons-io commons-io - 2.16.1 + 2.18.0 org.apache.ant - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Maintain spacing
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 1b70070 Maintain spacing 1b70070 is described below commit 1b7007003c9be9a31fbf0e00d7574b1205dc3402 Author: Mark Thomas AuthorDate: Wed Jan 8 10:02:59 2025 + Maintain spacing --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index da4dd1d..7e93e47 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,7 @@ - Update ASF parent POM to 33. (markt) - Added a new profile, `SERVLET` that only migrates the `javax.servlet` package and sub-packages. PR[#57](https://github.com/apache/tomcat-jakartaee-migration/pull/57) provided by Ralf Wiebicke. (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) - Update Commons BCEL to 6.8.1. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.9
The proposed Apache Tomcat migration tool for Jakarta EE 1.0.9 is now available for voting. The significant changes since 1.0.8 are: - Fix issue that matchExcludesAgainstPathName didn't work for files. Part of PR#60 provided by Semiao Marco. - Added a new profile, SERVLET that only migrates the javax.servlet package and sub-packages. PR#57 provided by Ralf Wiebicke - Update dependencies It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.9/ The Maven staging repository is: https://repository.apache.org/content/repositories/orgapachetomcat-1527/ The tag is: https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.9 573937360dc78edbc8474662b1fadf24bb22e87b The proposed 1.0.9 release is: [ ] -1: Broken. Do not release because... [ ] +1: Acceptable. Go ahead and release. Thanks, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-9.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/1227 Blamelist: Mark Thomas , Rainer Jung , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 9.0.x] 66b9831a8bb05bbab8f54a4c2d4d2dfea63b0f05 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.9
On Wed, Jan 8, 2025 at 11:32 AM Mark Thomas wrote: > > The proposed Apache Tomcat migration tool for Jakarta EE 1.0.9 is now > available for voting. > > The significant changes since 1.0.8 are: > > - Fix issue that matchExcludesAgainstPathName didn't work for files. >Part of PR#60 provided by Semiao Marco. > > - Added a new profile, SERVLET that only migrates the javax.servlet >package and sub-packages. PR#57 provided by Ralf Wiebicke > > - Update dependencies > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.9/ > > The Maven staging repository is: > https://repository.apache.org/content/repositories/orgapachetomcat-1527/ > > The tag is: > https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.9 > 573937360dc78edbc8474662b1fadf24bb22e87b > > The proposed 1.0.9 release is: > > [ ] -1: Broken. Do not release because... > [X] +1: Acceptable. Go ahead and release. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69338] Overhead in El processing (AST*)
https://bz.apache.org/bugzilla/show_bug.cgi?id=69338 --- Comment #8 from John Engebretson --- These changes reached production and behaved as expected - the following Ast combinations are eliminated: - AstNot -> AstEmpty - AstAnd -> AstAnd - AstOr -> AstOr Our application's EL-related work appears to have decreased around 20%, although that number's dirty because of multiple optimizations in the same release. At any rate, this is good. :) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69528] archiveIndexStrategy=bloom causes class from multi-release jar to not be found
https://bz.apache.org/bugzilla/show_bug.cgi?id=69528 --- Comment #1 from Remy Maucherat --- Looking at the code, it's because the JarContents simply goes over the entries in the JAR. There's no special code for /META-INF/versions/Y/ and so the entries in there are simply ignored. As a result, the entry io/opentelemetry/sdk/internal/Java9VersionSpecific which is not present in the main is simply reported as not present. So there are two options: - Document that multi release JARs are not supported for the bloom mode - Add specific processing for /META-INF/versions/Y/ (which is rather ugly of course but I don't see another way) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.9
On 08/01/2025 10:32, Mark Thomas wrote: The proposed 1.0.9 release is: [ ] -1: Broken. Do not release because... [X] +1: Acceptable. Go ahead and release. Tested by packaging the Tomcat 9 examples was a WAR and deploying that WAR to a Tomcat 12 (HEAD) instance using the 1.0.9 shaded JAR. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/03: Correct description
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit f01e6f74378e8022f005a025a5b9219b2e1c2083 Author: Mark Thomas AuthorDate: Wed Jan 8 16:25:47 2025 + Correct description --- webapps/docs/config/resources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/config/resources.xml b/webapps/docs/config/resources.xml index 738122a37d..012d4b450f 100644 --- a/webapps/docs/config/resources.xml +++ b/webapps/docs/config/resources.xml @@ -138,7 +138,7 @@ If the value of this flag is true, then writing will -be enabled on the main resource set. The default value is +be disabled on the main resource set. The default value is false. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated (3f28fa05b2 -> 6574756a30)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 3f28fa05b2 Revert "BZ69521: Allow more non latin languages in EL" new c0090302cf Alphabetical order new f01e6f7437 Correct description new 6574756a30 Suppress false positive warning The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../catalina/webresources/DirResourceSet.java | 1 + webapps/docs/config/resources.xml | 30 +++--- 2 files changed, 16 insertions(+), 15 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/03: Alphabetical order
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit c0090302cf09e8a17554eb5fdf98d40c884f5aae Author: Mark Thomas AuthorDate: Wed Jan 8 16:25:13 2025 + Alphabetical order --- webapps/docs/config/resources.xml | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/webapps/docs/config/resources.xml b/webapps/docs/config/resources.xml index ef6a3aec37..738122a37d 100644 --- a/webapps/docs/config/resources.xml +++ b/webapps/docs/config/resources.xml @@ -77,6 +77,20 @@ disclosure, among other security problems. + +If this is simple then a hash map will be used for +JAR archive lookups, unless useBloomFilterForArchives in +Context is explicitly defined. +If this is bloom then a bloom filter will be used to +speed up archive lookups. This can be beneficial to the deployment +speed to web applications that contain very large amount of JARs. +If this is purged then a bloom filter will be used to +speed up archive lookups, but can be purged at runtime. It is recommended +to use bloom to avoid reinitializing the bloom filters. +If not specified, the default value of simple will be +used. + + The maximum size of the static resource cache in kilobytes. If not specified, the default value is 10240 @@ -148,20 +162,6 @@ used. - -If this is simple then a hash map will be used for -JAR archive lookups, unless useBloomFilterForArchives in -Context is explicitly defined. -If this is bloom then a bloom filter will be used to -speed up archive lookups. This can be beneficial to the deployment -speed to web applications that contain very large amount of JARs. -If this is purged then a bloom filter will be used to -speed up archive lookups, but can be purged at runtime. It is recommended -to use bloom to avoid reinitializing the bloom filters. -If not specified, the default value of simple will be -used. - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Suppress false positive warning
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6574756a3034baa744c1dd8a177119bc1ea6445b
Author: Mark Thomas
AuthorDate: Wed Jan 8 16:33:44 2025 +
Suppress false positive warning
---
java/org/apache/catalina/webresources/DirResourceSet.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 026c61a065..512adf8b8a 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -96,6 +96,7 @@ public class DirResourceSet extends AbstractFileResourceSet
implements WebResour
}
+@SuppressWarnings("null") // lock can never be null when lock.key is read
@Override
public WebResource getResource(String path) {
checkPath(path);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/03: Correct description
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 415a65e49c3fa91102a9694d863b2d3ec446320e Author: Mark Thomas AuthorDate: Wed Jan 8 16:25:47 2025 + Correct description --- webapps/docs/config/resources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/config/resources.xml b/webapps/docs/config/resources.xml index 738122a37d..012d4b450f 100644 --- a/webapps/docs/config/resources.xml +++ b/webapps/docs/config/resources.xml @@ -138,7 +138,7 @@ If the value of this flag is true, then writing will -be enabled on the main resource set. The default value is +be disabled on the main resource set. The default value is false. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (cd99777010 -> cce258602b)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from cd99777010 Revert "BZ69521: Allow more non latin languages in EL" new 2679a04e99 Alphabetical order new 2c0f7161c3 Correct description new cce258602b Suppress false positive warning The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../catalina/webresources/DirResourceSet.java | 1 + webapps/docs/config/resources.xml | 30 +++--- 2 files changed, 16 insertions(+), 15 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Suppress false positive warning
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.git
commit cce258602b6082835e668b35a35bde8a2ddd4d5b
Author: Mark Thomas
AuthorDate: Wed Jan 8 16:33:44 2025 +
Suppress false positive warning
---
java/org/apache/catalina/webresources/DirResourceSet.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 026c61a065..512adf8b8a 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -96,6 +96,7 @@ public class DirResourceSet extends AbstractFileResourceSet
implements WebResour
}
+@SuppressWarnings("null") // lock can never be null when lock.key is read
@Override
public WebResource getResource(String path) {
checkPath(path);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/03: Correct description
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.git commit 2c0f7161c363901c1f95264361149a78ed3012d0 Author: Mark Thomas AuthorDate: Wed Jan 8 16:25:47 2025 + Correct description --- webapps/docs/config/resources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/config/resources.xml b/webapps/docs/config/resources.xml index 738122a37d..012d4b450f 100644 --- a/webapps/docs/config/resources.xml +++ b/webapps/docs/config/resources.xml @@ -138,7 +138,7 @@ If the value of this flag is true, then writing will -be enabled on the main resource set. The default value is +be disabled on the main resource set. The default value is false. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/03: Alphabetical order
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.git commit 2679a04e990ee29edd920624b203eb6c33e0e388 Author: Mark Thomas AuthorDate: Wed Jan 8 16:25:13 2025 + Alphabetical order --- webapps/docs/config/resources.xml | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/webapps/docs/config/resources.xml b/webapps/docs/config/resources.xml index ef6a3aec37..738122a37d 100644 --- a/webapps/docs/config/resources.xml +++ b/webapps/docs/config/resources.xml @@ -77,6 +77,20 @@ disclosure, among other security problems. + +If this is simple then a hash map will be used for +JAR archive lookups, unless useBloomFilterForArchives in +Context is explicitly defined. +If this is bloom then a bloom filter will be used to +speed up archive lookups. This can be beneficial to the deployment +speed to web applications that contain very large amount of JARs. +If this is purged then a bloom filter will be used to +speed up archive lookups, but can be purged at runtime. It is recommended +to use bloom to avoid reinitializing the bloom filters. +If not specified, the default value of simple will be +used. + + The maximum size of the static resource cache in kilobytes. If not specified, the default value is 10240 @@ -148,20 +162,6 @@ used. - -If this is simple then a hash map will be used for -JAR archive lookups, unless useBloomFilterForArchives in -Context is explicitly defined. -If this is bloom then a bloom filter will be used to -speed up archive lookups. This can be beneficial to the deployment -speed to web applications that contain very large amount of JARs. -If this is purged then a bloom filter will be used to -speed up archive lookups, but can be purged at runtime. It is recommended -to use bloom to avoid reinitializing the bloom filters. -If not specified, the default value of simple will be -used. - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/03: Alphabetical order
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 212da3a016599037a872d87462562c98c7ed444a Author: Mark Thomas AuthorDate: Wed Jan 8 16:25:13 2025 + Alphabetical order --- webapps/docs/config/resources.xml | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/webapps/docs/config/resources.xml b/webapps/docs/config/resources.xml index ef6a3aec37..738122a37d 100644 --- a/webapps/docs/config/resources.xml +++ b/webapps/docs/config/resources.xml @@ -77,6 +77,20 @@ disclosure, among other security problems. + +If this is simple then a hash map will be used for +JAR archive lookups, unless useBloomFilterForArchives in +Context is explicitly defined. +If this is bloom then a bloom filter will be used to +speed up archive lookups. This can be beneficial to the deployment +speed to web applications that contain very large amount of JARs. +If this is purged then a bloom filter will be used to +speed up archive lookups, but can be purged at runtime. It is recommended +to use bloom to avoid reinitializing the bloom filters. +If not specified, the default value of simple will be +used. + + The maximum size of the static resource cache in kilobytes. If not specified, the default value is 10240 @@ -148,20 +162,6 @@ used. - -If this is simple then a hash map will be used for -JAR archive lookups, unless useBloomFilterForArchives in -Context is explicitly defined. -If this is bloom then a bloom filter will be used to -speed up archive lookups. This can be beneficial to the deployment -speed to web applications that contain very large amount of JARs. -If this is purged then a bloom filter will be used to -speed up archive lookups, but can be purged at runtime. It is recommended -to use bloom to avoid reinitializing the bloom filters. -If not specified, the default value of simple will be -used. - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Suppress false positive warning
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a33dc8af06c79b6092e9ccd67bda59a1c400a90c
Author: Mark Thomas
AuthorDate: Wed Jan 8 16:33:44 2025 +
Suppress false positive warning
---
java/org/apache/catalina/webresources/DirResourceSet.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 026c61a065..512adf8b8a 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -96,6 +96,7 @@ public class DirResourceSet extends AbstractFileResourceSet
implements WebResour
}
+@SuppressWarnings("null") // lock can never be null when lock.key is read
@Override
public WebResource getResource(String path) {
checkPath(path);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated (33028fb8a5 -> a33dc8af06)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 33028fb8a5 Revert "BZ69521: Allow more non latin languages in EL" new 212da3a016 Alphabetical order new 415a65e49c Correct description new a33dc8af06 Suppress false positive warning The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../catalina/webresources/DirResourceSet.java | 1 + webapps/docs/config/resources.xml | 30 +++--- 2 files changed, 16 insertions(+), 15 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated (0732915438 -> 66b9831a8b)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 0732915438 Revert "BZ69521: Allow more non latin languages in EL" new 5d5e2a66b7 Alphabetical order new dc43091b5a Correct description new 66b9831a8b Suppress false positive warning The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../catalina/webresources/DirResourceSet.java | 1 + webapps/docs/config/resources.xml | 30 +++--- 2 files changed, 16 insertions(+), 15 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/03: Correct description
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit dc43091b5a35eaf15fae7a53cd03cde6a2a65e43 Author: Mark Thomas AuthorDate: Wed Jan 8 16:25:47 2025 + Correct description --- webapps/docs/config/resources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/config/resources.xml b/webapps/docs/config/resources.xml index 738122a37d..012d4b450f 100644 --- a/webapps/docs/config/resources.xml +++ b/webapps/docs/config/resources.xml @@ -138,7 +138,7 @@ If the value of this flag is true, then writing will -be enabled on the main resource set. The default value is +be disabled on the main resource set. The default value is false. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Suppress false positive warning
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 66b9831a8bb05bbab8f54a4c2d4d2dfea63b0f05
Author: Mark Thomas
AuthorDate: Wed Jan 8 16:33:44 2025 +
Suppress false positive warning
---
java/org/apache/catalina/webresources/DirResourceSet.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 026c61a065..512adf8b8a 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -96,6 +96,7 @@ public class DirResourceSet extends AbstractFileResourceSet
implements WebResour
}
+@SuppressWarnings("null") // lock can never be null when lock.key is read
@Override
public WebResource getResource(String path) {
checkPath(path);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/03: Alphabetical order
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 5d5e2a66b7fcdfdcbcb4f9be941918dc80012a1c Author: Mark Thomas AuthorDate: Wed Jan 8 16:25:13 2025 + Alphabetical order --- webapps/docs/config/resources.xml | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/webapps/docs/config/resources.xml b/webapps/docs/config/resources.xml index ef6a3aec37..738122a37d 100644 --- a/webapps/docs/config/resources.xml +++ b/webapps/docs/config/resources.xml @@ -77,6 +77,20 @@ disclosure, among other security problems. + +If this is simple then a hash map will be used for +JAR archive lookups, unless useBloomFilterForArchives in +Context is explicitly defined. +If this is bloom then a bloom filter will be used to +speed up archive lookups. This can be beneficial to the deployment +speed to web applications that contain very large amount of JARs. +If this is purged then a bloom filter will be used to +speed up archive lookups, but can be purged at runtime. It is recommended +to use bloom to avoid reinitializing the bloom filters. +If not specified, the default value of simple will be +used. + + The maximum size of the static resource cache in kilobytes. If not specified, the default value is 10240 @@ -148,20 +162,6 @@ used. - -If this is simple then a hash map will be used for -JAR archive lookups, unless useBloomFilterForArchives in -Context is explicitly defined. -If this is bloom then a bloom filter will be used to -speed up archive lookups. This can be beneficial to the deployment -speed to web applications that contain very large amount of JARs. -If this is purged then a bloom filter will be used to -speed up archive lookups, but can be purged at runtime. It is recommended -to use bloom to avoid reinitializing the bloom filters. -If not specified, the default value of simple will be -used. - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69285] Performance improvement to ApplicationHttpRequest.parseParameters()
https://bz.apache.org/bugzilla/show_bug.cgi?id=69285 John Engebretson changed: What|Removed |Added Resolution|FIXED |--- Status|RESOLVED|REOPENED --- Comment #5 from John Engebretson --- This code reached production and was ineffective; investigation shows that the caller (ApplicationHttpRequest.parseParameters) is still calling the old constructor, based on Map rather than ParameterMap. Specifically: parameters = new ParameterMap<>(getRequest().getParameterMap()); At compile time, this resolves to calling ParameterMap.(Map). The new constructor must be accessed by casting the parameter, such as this: parameters = new ParameterMap<>((ParameterMap)(getRequest().getParameterMap())); Sorry, my development environment contained this change as well as the code I included previously, and I lost track of it. Curious what you think about whether we need to typecheck this before casting; it appears that all calls to getRequest().getParameterMap() will return a ParameterMap, but with some effort an application could override that. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Bump org.apache.commons:commons-compress from 1.26.2 to 1.27.1
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 c1b3041 Bump org.apache.commons:commons-compress from 1.26.2 to 1.27.1 c1b3041 is described below commit c1b3041582ec580282f641c54ca4c775a1e5bc7e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jan 8 09:27:29 2025 + Bump org.apache.commons:commons-compress from 1.26.2 to 1.27.1 Bumps org.apache.commons:commons-compress from 1.26.2 to 1.27.1. --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2cdec47..d707a05 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 commons-io - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/maven/org.jacoco-jacoco-maven-plugin-0.8.12 deleted (was 9fc7977)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.jacoco-jacoco-maven-plugin-0.8.12 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git was 9fc7977 Bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/maven/org.apache.commons-commons-compress-1.27.1 deleted (was 43ea67e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.commons-commons-compress-1.27.1 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git was 43ea67e Bump org.apache.commons:commons-compress from 1.26.2 to 1.27.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12 [tomcat-jakartaee-migration]
markt-asf merged PR #65: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/65 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] matchExcludesAgainstPathName not match with absolutePath and no rewrite file if not changed [tomcat-jakartaee-migration]
markt-asf closed pull request #60: matchExcludesAgainstPathName not match with absolutePath and no rewrite file if not changed URL: https://github.com/apache/tomcat-jakartaee-migration/pull/60 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Bump org.apache.commons:commons-compress from 1.26.2 to 1.27.1 [tomcat-jakartaee-migration]
markt-asf merged PR #67: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/67 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] matchExcludesAgainstPathName not match with absolutePath and no rewrite file if not changed [tomcat-jakartaee-migration]
markt-asf commented on PR #60: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/60#issuecomment-2577235590 I've manually applied the `matchExcludesAgainstPathName`. Please open a new PR for the modification changes. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] servlet profile added, covers javax.servlet only [tomcat-jakartaee-migration]
markt-asf commented on PR #57: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/57#issuecomment-2577262511 Note this migrates both the Servlet and the JSP APIs but given the dependency of JSP on Servlet that seems perfectly reasonable to me. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Update changelog
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 a372544 Update changelog a372544 is described below commit a372544d2fadef5010e335e46d8f01771d467088 Author: Mark Thomas AuthorDate: Wed Jan 8 09:59:14 2025 + Update changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 2b8789c..da4dd1d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,7 @@ - Update Ant to 1.10.15. (dependabot/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) - Update ASF parent POM to 33. (markt) +- Added a new profile, `SERVLET` that only migrates the `javax.servlet` package and sub-packages. PR[#57](https://github.com/apache/tomcat-jakartaee-migration/pull/57) provided by Ralf Wiebicke. (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) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) annotated tag 1.0.9 created (now 2cf49c5)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to annotated tag 1.0.9 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at 2cf49c5 (tag) tagging 573937360dc78edbc8474662b1fadf24bb22e87b (commit) replaces 1.0.8 by Mark Thomas on Wed Jan 8 10:13:51 2025 + - Log - [maven-release-plugin] copy for tag 1.0.9 --- No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: [maven-release-plugin] prepare for next development iteration
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 178bc39 [maven-release-plugin] prepare for next development iteration 178bc39 is described below commit 178bc39d2d922ca3a0d681b42e133b59dedd6033 Author: Mark Thomas AuthorDate: Wed Jan 8 10:14:01 2025 + [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f955547..8852e01 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.tomcat jakartaee-migration - 1.0.9 + 1.0.10-SNAPSHOT Apache Tomcat Migration Tool for Jakarta EE The aim of the tool is to take a web application written for Java EE 8 that @@ -62,7 +62,7 @@ scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git -1.0.9 +1.0.6 https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: [maven-release-plugin] prepare release 1.0.9
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 5739373 [maven-release-plugin] prepare release 1.0.9 5739373 is described below commit 573937360dc78edbc8474662b1fadf24bb22e87b Author: Mark Thomas AuthorDate: Wed Jan 8 10:13:29 2025 + [maven-release-plugin] prepare release 1.0.9 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d3b17fa..f955547 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.tomcat jakartaee-migration - 1.0.9-SNAPSHOT + 1.0.9 Apache Tomcat Migration Tool for Jakarta EE The aim of the tool is to take a web application written for Java EE 8 that @@ -62,7 +62,7 @@ scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git -1.0.6 +1.0.9 https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/maven/org.apache.ant-ant-1.10.15 created (now 4bd7cf4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.ant-ant-1.10.15 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at 4bd7cf4 Bump org.apache.ant:ant from 1.10.14 to 1.10.15 No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/maven/commons-io-commons-io-2.18.0 created (now f0a4fa6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/commons-io-commons-io-2.18.0 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at f0a4fa6 Bump commons-io:commons-io from 2.16.1 to 2.18.0 No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Bump org.apache.bcel:bcel from 6.9.0 to 6.10.0
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 cb0274d Bump org.apache.bcel:bcel from 6.9.0 to 6.10.0 cb0274d is described below commit cb0274d9d5468516f07766e19f8ab464f0792759 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jan 8 09:27:17 2025 + Bump org.apache.bcel:bcel from 6.9.0 to 6.10.0 Bumps [org.apache.bcel:bcel](https://github.com/apache/commons-bcel) from 6.9.0 to 6.10.0. - [Changelog](https://github.com/apache/commons-bcel/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-bcel/compare/rel/commons-bcel-6.9.0...rel/commons-bcel-6.10.0) --- updated-dependencies: - dependency-name: org.apache.bcel:bcel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 308b1b5..15bc6af 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ org.apache.bcel bcel - 6.9.0 + 6.10.0 org.apache.commons - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Bump org.apache.ant:ant from 1.10.14 to 1.10.15 [tomcat-jakartaee-migration]
markt-asf merged PR #64: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/64 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated (cb0274d -> 223b2f9)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git from cb0274d Bump org.apache.bcel:bcel from 6.9.0 to 6.10.0 add 223b2f9 Bump org.apache.ant:ant from 1.10.14 to 1.10.15 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/maven/org.apache.ant-ant-1.10.15 deleted (was 4bd7cf4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.ant-ant-1.10.15 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git was 4bd7cf4 Bump org.apache.ant:ant from 1.10.14 to 1.10.15 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch dependabot/maven/org.apache.bcel-bcel-6.10.0 deleted (was 8beb077)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.bcel-bcel-6.10.0 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git was 8beb077 Bump org.apache.bcel:bcel from 6.9.0 to 6.10.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: Correct tag version
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 0ed16c3 Correct tag version 0ed16c3 is described below commit 0ed16c35b27fcbc3651eb085bda39deb688214c0 Author: Mark Thomas AuthorDate: Wed Jan 8 10:22:08 2025 + Correct tag version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8852e01..eb7c92d 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git -1.0.6 +1.0.10 https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated (c1b3041 -> 29c2b22)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git from c1b3041 Bump org.apache.commons:commons-compress from 1.26.2 to 1.27.1 new 2ac619d Update changelog new 29c2b22 Update ASF parent POM to version 33 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.md | 10 ++ pom.xml| 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) 02/02: Update ASF parent POM to version 33
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 29c2b2280c96f53ea672ba2eb921d446fe52b96a Author: Mark Thomas AuthorDate: Wed Jan 8 09:51:48 2025 + Update ASF parent POM to version 33 --- CHANGES.md | 1 + pom.xml| 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index db6ecaf..2b8789c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,7 @@ - Update Commons IO to 2.18.0. (dependabot/markt) - Update Ant to 1.10.15. (dependabot/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) +- Update ASF parent POM to 33. (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/pom.xml b/pom.xml index d707a05..d3b17fa 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache apache -31 +33 org.apache.tomcat - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) 01/02: Update changelog
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 2ac619d4421508a28d06b5daaf98917027dfd554 Author: Mark Thomas AuthorDate: Wed Jan 8 09:47:16 2025 + Update changelog --- CHANGES.md | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 54f44e8..db6ecaf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,10 +1,11 @@ # Tomcat Migration Tool for Jakarta EE - Changelog ## 1.0.9 -- Update the JaCoCo Maven plugin to 0.8.11. (markt) -- Update Commons BCEL to 6.9.0. (markt) -- Update Commons Compress to 1.26.2. (markt) -- Update Commons IO to 2.16.1. (markt) +- Update the JaCoCo Maven plugin to 0.8.12. (dependabot/markt) +- Update Commons BCEL to 6.10.0. (dependabot/markt) +- Update Commons Compress to 1.27.1. (dependabot/markt) +- Update Commons IO to 2.18.0. (dependabot/markt) +- Update Ant to 1.10.15. (dependabot/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 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: add profile covering javax.servlet only
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 84c789f add profile covering javax.servlet only
84c789f is described below
commit 84c789f1bbed53b58e6855ec4df305aab5f47417
Author: Ralf Wiebicke
AuthorDate: Fri Jun 28 13:38:09 2024 +0200
add profile covering javax.servlet only
For my application I'd like to migrate javax.servlet only.
Other packages, such as javax.mail are part of my web application,
thus no affected by the tomcat upgrade.
---
.../apache/tomcat/jakartaee/EESpecProfiles.java| 6 +++
.../tomcat/jakartaee/LocalStrings.properties | 1 +
.../apache/tomcat/jakartaee/EESpecProfileTest.java | 60 ++
3 files changed, 67 insertions(+)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfiles.java
b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfiles.java
index 054a73c..d7f0e99 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfiles.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfiles.java
@@ -25,6 +25,12 @@ import java.util.regex.Pattern;
*/
public enum EESpecProfiles implements EESpecProfile {
+/**
+ * Specification profile matching the Jakarta Servlet API only.
+ */
+SERVLET("javax", "jakarta",
+ "javax([/\\.](servlet))"),
+
/**
* Specification profile matching the packages provided with Tomcat.
*/
diff --git
a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
index 66b4285..89c373b 100644
--- a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
+++ b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
@@ -40,6 +40,7 @@ where options includes:\n\
\-profile=\n\
\TOMCAT (default) to convert Java EE APIs provided by Tomcat\n\
\EE to convert all Java EE APIs\n\
+\SERVLET to convert the Jakarta Servlet API only\n\
\JEE8 to convert back to old Java EE8 APIs. Note that the\n\
\resulting classes will not work if the classes to be\n\
\migrated use any APIs added in Jakarta EE 10 onwards.\n\
diff --git a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
index 61bc2ae..de77a08 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
@@ -23,6 +23,66 @@ import static org.junit.Assert.*;
public class EESpecProfileTest {
+@Test
+public void testProfileServlet() {
+EESpecProfile profile = EESpecProfiles.SERVLET;
+
+assertEquals("javax.annotation.PostConstruct",
profile.convert("javax.annotation.PostConstruct"));
+assertEquals("javax.annotation.security.DeclareRoles",
profile.convert("javax.annotation.security.DeclareRoles"));
+assertEquals("javax.ejb", profile.convert("javax.ejb"));
+assertEquals("javax.el", profile.convert("javax.el"));
+assertEquals("javax.mail", profile.convert("javax.mail"));
+assertEquals("javax.persistence",
profile.convert("javax.persistence"));
+assertEquals("javax.security.auth.message",
profile.convert("javax.security.auth.message"));
+assertEquals("jakarta.servlet", profile.convert("javax.servlet"));
+assertEquals("javax.transaction",
profile.convert("javax.transaction"));
+assertEquals("javax.websocket", profile.convert("javax.websocket"));
+
+// not converted EE packages
+assertEquals("javax.activation", profile.convert("javax.activation"));
+assertEquals("javax.batch", profile.convert("javax.batch"));
+assertEquals("javax.decorator", profile.convert("javax.decorator"));
+assertEquals("javax.enterprise", profile.convert("javax.enterprise"));
+assertEquals("javax.faces", profile.convert("javax.faces"));
+assertEquals("javax.jms", profile.convert("javax.jms"));
+assertEquals("javax.json", profile.convert("javax.json"));
+assertEquals("javax.jws", profile.convert("javax.jws"));
+assertEquals("javax.interceptor",
profile.convert("javax.interceptor"));
+assertEquals("javax.inject", profile.convert("javax.inject"));
+assertEquals("javax.management.j2ee",
profile.convert("javax.management.j2ee"));
+assertEquals("javax.resource", profile.convert("javax.resource"));
+assertEquals("javax.security.enterprise",
profile.convert("javax.security.enterprise"));
+assertEquals("javax.security.jacc",
profile.convert("javax.security.jacc"));
+assertEquals("javax.validation", profile.convert("
Re: [PR] servlet profile added, covers javax.servlet only [tomcat-jakartaee-migration]
markt-asf merged PR #57: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/57 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r74040 - in /dev/tomcat/jakartaee-migration/v1.0.9: ./ binaries/ source/
Author: markt Date: Wed Jan 8 10:28:09 2025 New Revision: 74040 Log: Upload migration tool 1.0.9 for voting Added: dev/tomcat/jakartaee-migration/v1.0.9/ dev/tomcat/jakartaee-migration/v1.0.9/binaries/ dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.tar.gz (with props) dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.tar.gz.asc dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.tar.gz.sha512 dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.zip (with props) dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.zip.asc dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.zip.sha512 dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-shaded.jar (with props) dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-shaded.jar.asc dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-shaded.jar.sha512 dev/tomcat/jakartaee-migration/v1.0.9/source/ dev/tomcat/jakartaee-migration/v1.0.9/source/jakartaee-migration-1.0.9-src.tar.gz (with props) dev/tomcat/jakartaee-migration/v1.0.9/source/jakartaee-migration-1.0.9-src.tar.gz.asc dev/tomcat/jakartaee-migration/v1.0.9/source/jakartaee-migration-1.0.9-src.tar.gz.sha512 dev/tomcat/jakartaee-migration/v1.0.9/source/jakartaee-migration-1.0.9-src.zip (with props) dev/tomcat/jakartaee-migration/v1.0.9/source/jakartaee-migration-1.0.9-src.zip.asc dev/tomcat/jakartaee-migration/v1.0.9/source/jakartaee-migration-1.0.9-src.zip.sha512 Added: dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.tar.gz == Binary file - no diff available. Propchange: dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.tar.gz.asc == --- dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.tar.gz.asc (added) +++ dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.tar.gz.asc Wed Jan 8 10:28:09 2025 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmd+Uu4ACgkQEMAcWi9g +WefCExAA6zXX9cdyFdBJRDWRvZLxeN9Ub76R6WZCDr9BzLtds2pfP4+myVhAi2yx +mW5Lh/VLxJVHENuRPL42aa6qjr5zLkLBAapbmjDN/EHWrDhwCohGSuMBkv+ma3AI +WpIH3xEWMYq9H/6OvWDI0le6sr1m/2Mxg43NrBB8X0xKgULu6x9YSoJhCiCtSjZD +M7Wtb/sbzWkTv+EF0J51k4zUPWjgrwkoR+pxmSfumRlurxqMWqhrLh7RrolyY5c4 +pt3GNHkhgeKQ5gUPnooklPde/CP9s5Zx+V+ojkOJfZ1ascsEUuJZL4MHjxf/RoKc +AQLIOnMtD6uKU55oONus0m6AUSvIs2nUpymNt86LHsUuDyOraKxnyFfdo45LvQiM +QRyaaDnO8YAc6mIv7nXCGjrz73ZEbgHxyhaD1jhKm3jIMNVCsl5zoNjkkBQVl3G4 +HRc34azu4gjpviCcwNrIm0Dg6W+Cr7YZGZqfs5hQw/fxJRLb97l9pEpBSQ8Uc6Ni +56NQQwKPlh20ez4DBrfLez0piNr4SLm+TdFUzVaT3isSduuZ2C0n6Pdszm8hrqTG +ZmvqAf01YUSNFrHl3kgYlDCAPVCDG5A2vpIbX2BPMzcXWo2dJgJHTfcyGj33oFMf +h5CYGMZaNVImAF+kwMTeGFqIcgyJ3qCLKF56/jJdvo3KO9+tdjQ= +=peE7 +-END PGP SIGNATURE- Added: dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.tar.gz.sha512 == --- dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.tar.gz.sha512 (added) +++ dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.tar.gz.sha512 Wed Jan 8 10:28:09 2025 @@ -0,0 +1 @@ +1757723e3289074b6ae80edf86a153bd18826041971e0187780bab2de14ccf8928ee6d6670a14749c5cc5700d7a59a885bb7611d468f255d488d2119648d4e9a *jakartaee-migration-1.0.9-bin.tar.gz \ No newline at end of file Added: dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.zip.asc == --- dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.zip.asc (added) +++ dev/tomcat/jakartaee-migration/v1.0.9/binaries/jakartaee-migration-1.0.9-bin.zip.asc Wed Jan 8 10:28:09 2025 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmd+Uu8ACgkQEMAcWi9g +Weeqgg/+LKtxuURzMfF0w1hC0AiVpXg86+bW8xnWqBkrv1Al/tveDuvUMFemw6E
