[Bug 66163] New: tomcat-jakartaee-migration: conversion in "string constants"
https://bz.apache.org/bugzilla/show_bug.cgi?id=66163
Bug ID: 66163
Summary: tomcat-jakartaee-migration: conversion in "string
constants"
Product: Tomcat 10
Version: 10.0.22
Hardware: PC
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: ole.schulz-hildebra...@ppimedia.de
Target Milestone: --
Created attachment 38335
--> https://bz.apache.org/bugzilla/attachment.cgi?id=38335&action=edit
Patch that also rollback conversion of jakarta. if class does not exist
Hi,
I am trying to run a Spring5 app (which uses javax.*) in Tomcat 10.0.22. I am
using the tomcat-jakartee-migration tool by using the configuration in my context.xml
I came across a problem that could be a bug(?) in the migration tool. At some
places spring is checking for the existence of javax.* classes, basically by
using for example Class.forName("javax.persistence.EntityManagerFactory", ...),
c.f for example
https://github.com/spring-projects/spring-framework/blob/5.3.x/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
line 127ff.
Because "javax.persistence.EntityManagerFactory" is a constant it gets
converted by the ClassConverter of the migration tool. The regexp of the
EESpecProfile not only matches "jakarta/" but also "jakarta.". However the code
in the ClassConverter:101 which checks for the existence of the jakarta class
and would "roll back" the conversion only checks for "jakarta/" and not for
"jakarta.". This results in "javax.persistence.EntityManagerFactory" being
converted to "jakarta.persistence.EntityManagerFactory" which of course causes
Class.forName to fail.
The attached patch works for me but I don't know it has any negative side
effects that I don't see
Best regards
Ole
--
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 66161] EL change broke String.concat with null
https://bz.apache.org/bugzilla/show_bug.cgi?id=66161
Mark Thomas changed:
What|Removed |Added
Status|NEW |RESOLVED
Resolution|--- |INVALID
--- Comment #3 from Mark Thomas ---
The short answer is that Tomcat 9.0.60 onwards is behaving correctly in this
case.
Unfortunately, the fix introduced in
https://github.com/apache/tomcat/commit/d4050b4cc979302c5f5cc9237609e1564fa367c4
exposed an issue with EmptyNullStringResolver.
For the app's use of beans, the app wants null values to remain null (contrary
to the EL spec).
For the app's use of String.conact(), the app wants null values converted to
empty string (consistent with EL spec).
Having behaviour consistent with EL spec in one case and contrary to the spec
in another is going to require some hoop jumping.
There are lots of ways you could work-around this. My suggestion is to handle
this in EmptyNullStringResolver. If it overrides invoke() with something like
this:
@Override
public Object invoke(ELContext context, Object base, Object method,
Class[] paramTypes, Object[] params) {
if ((base instanceof String) && "concat".equals(method) &&
params.length == 1 && "".equals(params[0])) {
context.setPropertyResolved(true);
return base;
}
return super.invoke(context, base, method, paramTypes, params);
}
It can treat concat as a special case any bypass the EL type conversion when
call with null. The code above is only lightly tested and intended to give you
an ideas of how you might address this issue.
I am resolving this as invalid since Tomcat's behaviour is spec compliant in
this case.
--
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
[VOTE][CANCELLED] Release Apache Tomcat Native 2.0.0
On 04/07/2022 13:57, Rémy Maucherat wrote: On Mon, Jul 4, 2022 at 2:50 PM Mark Thomas wrote: Hi all, OpenSSL has announced a 3.0.5 release is scheduled for tomorrow that will include security fixes. Depending on the details of those fixes we may need a 2.0.1 release. (And a 1.2.x release.) We currently have 2 PMC votes for this release so we are 1 vote short. There is an argument for proceeding with this release anyway (if it gets another vote) - folks can always build 2.0.0 from source with their chosen version of OpenSSL. My current plan is wait to see if 2.0.0 gets any further votes and to wait for the details of the OpenSSL security issues and then decide what to do. Two vulnerabilities were announced: CVE-2022-2097 doesn't affect TLS so doesn't impact on Tomcat Native's use of OpenSSL. CVE-2022-2274 does affect TLS so does impact on Tomcat Native's use of OpenSSL. It only affects 3.0.4 which means the binaries for Windows included in the 2.0.0 release are affected but 1.2.x is unaffected. I have therefore cancelled this 2.0.0 release and will tag 2.0.1 shortly and start a release vote. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66161] EL change broke String.concat with null
https://bz.apache.org/bugzilla/show_bug.cgi?id=66161 --- Comment #4 from t...@silbergrau.com --- (In reply to Mark Thomas from comment #3) > The short answer is that Tomcat 9.0.60 onwards is behaving correctly in this > case. Yes, that was my guess as well after debugging. > There are lots of ways you could work-around this. My suggestion is to > handle this in EmptyNullStringResolver. If it overrides invoke() with > something like this: Thanks for the hint, I'll have a look at 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
[GitHub] [tomcat-jakartaee-migration] markt-asf commented on issue #25: java.lang.IllegalArgumentException: Unknown Entity bean class with eclipselink in tomcat 10
markt-asf commented on issue #25: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/25#issuecomment-1175051637 There is insufficient information in this issue for it to be investigated. A test case that demonstrates the issue is required. Without such a test case, this issue will eventually be closed. -- 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 (e93ad31 -> ba9f073)
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 e93ad31 Removed unused code new 59ce2a6 Rename test method new ba9f073 Fix BZ 66163. Correct class transformer handling of "jakarta." 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 + .../apache/tomcat/jakartaee/ClassConverter.java| 19 +- .../tomcat/jakartaee/ClassConverterTest.java | 67 +- .../apache/tomcat/jakartaee/TesterConstants.java | 9 +++ 4 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 src/test/java/org/apache/tomcat/jakartaee/TesterConstants.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] 01/02: Rename test method
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 59ce2a66de147a459b9a8bd8421d3c5727845159
Author: Mark Thomas
AuthorDate: Tue Jul 5 13:22:41 2022 +0100
Rename test method
---
src/test/java/org/apache/tomcat/jakartaee/ClassConverterTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/tomcat/jakartaee/ClassConverterTest.java
b/src/test/java/org/apache/tomcat/jakartaee/ClassConverterTest.java
index 7b6fa0f..c236d5f 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/ClassConverterTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/ClassConverterTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.*;
public class ClassConverterTest {
@Test
-public void testConverter() {
+public void testAccepts() {
Converter converter = new ClassConverter();
assertTrue(converter.accepts("HelloServlet.class"));
-
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 BZ 66163. Correct class transformer handling of "jakarta."
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 ba9f0737d79cba54630f82fcfddc649923705c79
Author: Mark Thomas
AuthorDate: Tue Jul 5 14:26:01 2022 +0100
Fix BZ 66163. Correct class transformer handling of "jakarta."
Correct handling of strings containing `jakarta. ...` when those
references are to classes not provided by the container.
Based on a patch by Ole Schulz-Hildebrandt.
https://bz.apache.org/bugzilla/show_bug.cgi?id=66163
---
CHANGES.md | 3 +
.../apache/tomcat/jakartaee/ClassConverter.java| 19 ++-
.../tomcat/jakartaee/ClassConverterTest.java | 65 +-
.../apache/tomcat/jakartaee/TesterConstants.java | 9 +++
4 files changed, 93 insertions(+), 3 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index d3de81b..b839ae2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,8 +4,11 @@
- Fix [#19](https://github.com/apache/tomcat-jakartaee-migration/issues/19).
Add support for converting `.groovy` files.
- Fix [#20](https://github.com/apache/tomcat-jakartaee-migration/issues/20) by
using commons-compression instead of the Java zip code (remm)
+
- Remove deprecated `-verbose` command line option (remm)
+- Fix [bug 66163](https://bz.apache.org/bugzilla/show_bug.cgi?id=66163).
Correct the handling of references of the form `jakarta. ...` when using the
class transformer when those references are to classes not provided by the
container. Based on a patch by Ole Schulz-Hildebrandt. (markt)
+
## 1.0.0
- Fix [#14](https://github.com/apache/tomcat-jakartaee-migration/issues/14).
Do not migrate `javax.xml.(registry|rpc)` namespaces. (mgrigorov)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
index ea92b1a..f6d08e2 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
@@ -101,14 +101,29 @@ public class ClassConverter implements Converter,
ClassFileTransformer {
String[] split = newString.split(";|<");
for (String current : split) {
int pos = current.indexOf("jakarta/");
+boolean dotMode = false;
+if (pos < 0) {
+pos = current.indexOf("jakarta.");
+dotMode = true;
+}
if (pos >= 0) {
-if (loader.getResource(current.substring(pos)
+ ".class") == null) {
+String resourceName = current.substring(pos);
+if (dotMode) {
+resourceName = resourceName.replace('.',
'/');
+}
+resourceName = resourceName + ".class";
+if (loader.getResource(resourceName) == null) {
if (logger.isLoggable(Level.FINE)) {
logger.log(Level.FINE,
sm.getString("classConverter.skipName",
current.substring(pos).replace('/','.')));
}
// Cancel the replacement as the
replacement does not exist
-String originalFragment =
current.replace("jakarta/", "javax/");
+String originalFragment;
+if (dotMode) {
+originalFragment =
current.replace("jakarta.", "javax.");
+} else {
+originalFragment =
current.replace("jakarta/", "javax/");
+}
newString = newString.replace(current,
originalFragment);
}
}
diff --git a/src/test/java/org/apache/tomcat/jakartaee/ClassConverterTest.java
b/src/test/java/org/apache/tomcat/jakartaee/ClassConverterTest.java
index c236d5f..bf0b29e 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/ClassConverterTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/ClassConverterTest.java
@@ -17,9 +17,22 @@
package org.apache.tomcat.jakartaee;
+import org.apache.bcel.classfile.ClassParser;
+import org.apache.bcel.classfile.Constant;
+import org.apache.bcel.classfile.ConstantUtf8;
+import org.apache.bcel.classfile.JavaClass;
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.
[Bug 66163] tomcat-jakartaee-migration: conversion in "string constants"
https://bz.apache.org/bugzilla/show_bug.cgi?id=66163 Mark Thomas changed: What|Removed |Added OS||All Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Thanks for the report and the patch. The patch looks good to me. I applied a slightly modified version that (in my view) is easier to follow. I also added a test case. The fix will be in 1.0.1 onwards. -- 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
Plan for 10.1.next / 10.0.next
Hi all, My plan for the next round of releases is as follows: - Tomcat migration tool for Jakarta EE - Fix the dependabot nags - Fix #24 - release 1.0.1 - Tomcat Native 2.0.x - Tag and release 2.0.1 - Tomcat 10.1.x - Update to migration 1.0.1 - Update to Native 2.0.1 - Tag and release - Tomcat 10.0.x - Update to migration 1.0.1 - Tag and release We could add a Tomcat Native 1.2.x release to the mix to pick up 1.1.1q. That isn't strictly necessary but might avoid some user questions. Thoughts ? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66163] tomcat-jakartaee-migration: conversion in "string constants"
https://bz.apache.org/bugzilla/show_bug.cgi?id=66163 --- Comment #2 from ole.schulz-hildebra...@ppimedia.de --- Thank you :-) -- 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
[GitHub] [tomcat-jakartaee-migration] markt-asf closed issue #24: Copyright and Derived Works
markt-asf closed issue #24: Copyright and Derived Works URL: https://github.com/apache/tomcat-jakartaee-migration/issues/24 -- 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: Fix #24. Add legal section to remind users to check 3rd party licenses.
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 183a4fa Fix #24. Add legal section to remind users to check 3rd party licenses. 183a4fa is described below commit 183a4fac186dbfcbfbfd147f5e5294bbdc3f22f4 Author: Mark Thomas AuthorDate: Tue Jul 5 16:00:45 2022 +0100 Fix #24. Add legal section to remind users to check 3rd party licenses. --- README.md | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index efc6450..419df3b 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,7 @@ ## Overview -This tool is a work in progress. - -The aim of the tool is to take a web application written for Java EE 8 that +The purpose of the tool is to take a web application written for Java EE 8 that runs on Apache Tomcat 9 and convert it automatically so it runs on Apache Tomcat 10 which implements Jakarta EE 9. @@ -68,7 +66,8 @@ in the `javax.*` namespace have moved to the `jakarta.*` namespace. Some sub-packages have also been renamed. This migration tool performs all the necessary changes to migrate an application from Java EE 8 to Jakarta EE 9 by renaming each Java EE 8 package to its Jakarta -EE 9 replacement. +EE 9 replacement. This includes package references in classes, String constants, +configuration files, JSPs, TLDs etc. Note: Not all `javax.*` packages are part of Java EE. Only those defined by Java EE have moved to the `jakarta.*` namespace. @@ -76,3 +75,11 @@ EE have moved to the `jakarta.*` namespace. Note: It is not necessary to migrate any references to XML schemas. The schemas don't directly reference javax packages and Jakarta EE 9 will continue to support the use of schemas from Java EE 8 and earlier. + +## Legal + +This tool modifies web application content as described in the previous section. +This may include modification of third-party provided content. It is strongly +recommended that you confirm that the license(s) associated with any third-party +content permit such modifications, especially if you intend to distribute the +result. \ No newline at end of file - 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 Ant to 1.10.12 (latest 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 bff510b Update Ant to 1.10.12 (latest version) bff510b is described below commit bff510b2ff1ea92a176b8c25495016e95c141e1f Author: Mark Thomas AuthorDate: Tue Jul 5 16:04:25 2022 +0100 Update Ant to 1.10.12 (latest version) --- CHANGES.md | 2 ++ pom.xml| 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index b839ae2..0f915b6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,8 @@ - Fix [bug 66163](https://bz.apache.org/bugzilla/show_bug.cgi?id=66163). Correct the handling of references of the form `jakarta. ...` when using the class transformer when those references are to classes not provided by the container. Based on a patch by Ole Schulz-Hildebrandt. (markt) +- Update Apache Ant to 1.10.12. (markt) + ## 1.0.0 - Fix [#14](https://github.com/apache/tomcat-jakartaee-migration/issues/14). Do not migrate `javax.xml.(registry|rpc)` namespaces. (mgrigorov) diff --git a/pom.xml b/pom.xml index ba299fc..43d9967 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ org.apache.ant ant - 1.10.9 + 1.10.12 provided - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] dependabot[bot] opened a new pull request, #26: Bump commons-compress from 1.20 to 1.21
dependabot[bot] opened a new pull request, #26: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/26 Bumps commons-compress from 1.20 to 1.21. [](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 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) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/tomcat-jakartaee-migration/network/alerts). -- 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.21 created (now cb50ede)
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.21 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at cb50ede Bump commons-compress from 1.20 to 1.21 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: Update Commons IO to 2.11.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 c026c77 Update Commons IO to 2.11.0 c026c77 is described below commit c026c7734b126c9cccac3a7198ecde9e56829827 Author: Mark Thomas AuthorDate: Tue Jul 5 16:10:10 2022 +0100 Update Commons IO to 2.11.0 --- CHANGES.md | 2 ++ pom.xml| 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 0f915b6..4061f73 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,8 @@ - Update Apache Ant to 1.10.12. (markt) +- Update Commons IO to 2.11.0. (markt) + ## 1.0.0 - Fix [#14](https://github.com/apache/tomcat-jakartaee-migration/issues/14). Do not migrate `javax.xml.(registry|rpc)` namespaces. (mgrigorov) diff --git a/pom.xml b/pom.xml index 43d9967..03ee479 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ commons-io commons-io - 2.8.0 + 2.11.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: Update Apache Commons Compress to 1.21
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 5cc039a Update Apache Commons Compress to 1.21 5cc039a is described below commit 5cc039ae0b38459b087d0740ed5c170cf6be31a9 Author: Mark Thomas AuthorDate: Tue Jul 5 16:11:13 2022 +0100 Update Apache Commons Compress to 1.21 --- CHANGES.md | 4 +++- pom.xml| 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4061f73..7d417db 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,7 +11,9 @@ - Update Apache Ant to 1.10.12. (markt) -- Update Commons IO to 2.11.0. (markt) +- Update Apache Commons Compress to 1.21. (markt) + +- Update Apache Commons IO to 2.11.0. (markt) ## 1.0.0 diff --git a/pom.xml b/pom.xml index 03ee479..bb48e30 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ org.apache.commons commons-compress - 1.20 + 1.21 commons-io - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66163] tomcat-jakartaee-migration: conversion in "string constants"
https://bz.apache.org/bugzilla/show_bug.cgi?id=66163 --- Comment #3 from Remy Maucherat --- I'm not 100% certain this can never cause problems. However, the class converter only does certain things, so a different caveat is ok. -- 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
[GitHub] [tomcat-jakartaee-migration] markt-asf commented on pull request #26: Bump commons-compress from 1.20 to 1.21
markt-asf commented on PR #26: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/26#issuecomment-1175181116 Change already applied. -- 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
[GitHub] [tomcat-jakartaee-migration] markt-asf closed pull request #26: Bump commons-compress from 1.20 to 1.21
markt-asf closed pull request #26: Bump commons-compress from 1.20 to 1.21 URL: https://github.com/apache/tomcat-jakartaee-migration/pull/26 -- 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
[GitHub] [tomcat-jakartaee-migration] dependabot[bot] commented on pull request #26: Bump commons-compress from 1.20 to 1.21
dependabot[bot] commented on PR #26: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/26#issuecomment-1175181175 OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting `@dependabot ignore this major version` or `@dependabot ignore this minor version`. If you change your mind, just re-open this PR and I'll resolve any conflicts on it. -- 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 Apache parent to 26
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 968d95a Update Apache parent to 26 968d95a is described below commit 968d95aa09b71062787dacceaec1415cf963623b Author: Mark Thomas AuthorDate: Tue Jul 5 19:39:25 2022 +0100 Update Apache parent to 26 --- CHANGES.md | 2 ++ pom.xml| 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 7d417db..fb814c8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,8 @@ - Update Apache Commons IO to 2.11.0. (markt) +- Update Apache Parent to 26. (markt) + ## 1.0.0 - Fix [#14](https://github.com/apache/tomcat-jakartaee-migration/issues/14). Do not migrate `javax.xml.(registry|rpc)` namespaces. (mgrigorov) diff --git a/pom.xml b/pom.xml index bb48e30..2fef16b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache apache -23 +26 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] branch main updated: Remove WIP from 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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new 96881fb Remove WIP from description 96881fb is described below commit 96881fb43fbed170488a37d2b3c718ac28bfb702 Author: Mark Thomas AuthorDate: Tue Jul 5 19:40:21 2022 +0100 Remove WIP from description --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2fef16b..209d77c 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,6 @@ 1.0.1-SNAPSHOT -This tool is a work in progress. The aim of the tool is to take a web application written for Java EE 8 that runs on Apache Tomcat 9 and convert it automatically so it runs on Apache Tomcat 10 which implements Jakarta EE 9. - 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 JUnit to 4.13.2
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 7ecfb5f Update JUnit to 4.13.2 7ecfb5f is described below commit 7ecfb5f0fa1401ccb4be6744f88fe1639498996c Author: Mark Thomas AuthorDate: Tue Jul 5 19:41:46 2022 +0100 Update JUnit to 4.13.2 --- CHANGES.md | 2 ++ pom.xml| 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index fb814c8..121255b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,8 @@ - Update Apache Parent to 26. (markt) +- Update JUnit to 4.13.2. (markt) + ## 1.0.0 - Fix [#14](https://github.com/apache/tomcat-jakartaee-migration/issues/14). Do not migrate `javax.xml.(registry|rpc)` namespaces. (mgrigorov) diff --git a/pom.xml b/pom.xml index 209d77c..5647e87 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ junit junit - 4.13.1 + 4.13.2 test - 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 Maven AntRun plugin
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 d9d2f0d Update Maven AntRun plugin d9d2f0d is described below commit d9d2f0d9a9ad6273b77e1a0ecb138da14c0a5cfb Author: Mark Thomas AuthorDate: Tue Jul 5 19:44:55 2022 +0100 Update Maven AntRun plugin --- CHANGES.md | 2 ++ pom.xml| 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 121255b..f6d1719 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -19,6 +19,8 @@ - Update JUnit to 4.13.2. (markt) +- Update Maven AntRun plugin to 3.1.0. (markt) + ## 1.0.0 - Fix [#14](https://github.com/apache/tomcat-jakartaee-migration/issues/14). Do not migrate `javax.xml.(registry|rpc)` namespaces. (mgrigorov) diff --git a/pom.xml b/pom.xml index 5647e87..7a11671 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ maven-antrun-plugin -3.0.0 +3.1.0 create-test-jars - 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 Maven Assembly plugin to 3.4.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 91ff707 Update Maven Assembly plugin to 3.4.0 91ff707 is described below commit 91ff7071472e78f115567d87cb85ecb9ec4f1450 Author: Mark Thomas AuthorDate: Tue Jul 5 19:46:25 2022 +0100 Update Maven Assembly plugin to 3.4.0 --- CHANGES.md | 2 ++ pom.xml| 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index f6d1719..e9536ae 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,6 +21,8 @@ - Update Maven AntRun plugin to 3.1.0. (markt) +- Update Maven Assembly plugin to 3.4.0. (markt) + ## 1.0.0 - Fix [#14](https://github.com/apache/tomcat-jakartaee-migration/issues/14). Do not migrate `javax.xml.(registry|rpc)` namespaces. (mgrigorov) diff --git a/pom.xml b/pom.xml index 7a11671..93d8797 100644 --- a/pom.xml +++ b/pom.xml @@ -224,7 +224,7 @@ org.apache.maven.plugins ...which is assumed by default. --> maven-assembly-plugin -3.2.0 +3.4.0 make-assembly - 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.1 created (now 21ef60c)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to annotated tag 1.0.1 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at 21ef60c (tag) tagging acf10c08b41c6ce8fa4965fd975420b6e9e2b038 (commit) replaces 1.0.0 by Mark Thomas on Tue Jul 5 20:26:14 2022 +0100 - Log - [maven-release-plugin] copy for tag 1.0.1 --- This annotated tag includes the following new commits: new acf10c0 [maven-release-plugin] prepare release 1.0.1 The 1 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. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] 01/01: [maven-release-plugin] prepare release 1.0.1
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to annotated tag 1.0.1 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git commit acf10c08b41c6ce8fa4965fd975420b6e9e2b038 Author: Mark Thomas AuthorDate: Tue Jul 5 19:54:10 2022 +0100 [maven-release-plugin] prepare release 1.0.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 93d8797..483c2b1 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache.tomcat jakartaee-migration Apache Tomcat Migration Tool for Jakarta EE - 1.0.1-SNAPSHOT + 1.0.1 The aim of the tool is to take a web application written for Java EE 8 that @@ -102,7 +102,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 https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git -HEAD +1.0.1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] 01/01: [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 commit 76ebdce6d131d3441969e35ebba72085024d3e2e Author: Mark Thomas AuthorDate: Tue Jul 5 20:26:44 2022 +0100 [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 483c2b1..76c8cce 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache.tomcat jakartaee-migration Apache Tomcat Migration Tool for Jakarta EE - 1.0.1 + 1.0.2-SNAPSHOT The aim of the tool is to take a web application written for Java EE 8 that - 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 (91ff707 -> 76ebdce)
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 91ff707 Update Maven Assembly plugin to 3.4.0 add acf10c0 [maven-release-plugin] prepare release 1.0.1 new 76ebdce [maven-release-plugin] prepare for next development iteration The 1 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: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r55476 - in /dev/tomcat/jakartaee-migration/v1.0.1: ./ binaries/ source/
Author: markt Date: Tue Jul 5 19:41:03 2022 New Revision: 55476 Log: Upload Tomcat Migtation Tool for Jakarta EE 1.0.1 Added: dev/tomcat/jakartaee-migration/v1.0.1/ dev/tomcat/jakartaee-migration/v1.0.1/binaries/ dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.tar.gz (with props) dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.tar.gz.asc dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.tar.gz.sha512 dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.zip (with props) dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.zip.asc dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.zip.sha512 dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-shaded.jar (with props) dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-shaded.jar.asc dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-shaded.jar.sha512 dev/tomcat/jakartaee-migration/v1.0.1/source/ dev/tomcat/jakartaee-migration/v1.0.1/source/jakartaee-migration-1.0.1-src.tar.gz (with props) dev/tomcat/jakartaee-migration/v1.0.1/source/jakartaee-migration-1.0.1-src.tar.gz.asc dev/tomcat/jakartaee-migration/v1.0.1/source/jakartaee-migration-1.0.1-src.tar.gz.sha512 dev/tomcat/jakartaee-migration/v1.0.1/source/jakartaee-migration-1.0.1-src.zip (with props) dev/tomcat/jakartaee-migration/v1.0.1/source/jakartaee-migration-1.0.1-src.zip.asc dev/tomcat/jakartaee-migration/v1.0.1/source/jakartaee-migration-1.0.1-src.zip.sha512 Added: dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.tar.gz == Binary file - no diff available. Propchange: dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.tar.gz.asc == --- dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.tar.gz.asc (added) +++ dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.tar.gz.asc Tue Jul 5 19:41:03 2022 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmLEk54ACgkQEMAcWi9g +Wecdmw//XHcG0e6CVZ3x4lwg/lywcxsYTLvXQ7HFtMZsgjAH4mP5irbkis98FzD8 +eMK6aJ8DIFervPCuIvLj+rm/f6jT0t/+BsMsEYGPMamlai9CFuIw4uWLwtPfKIFC +PuhnwkkyBTl/Gn5DdXpJRS6aLe3ETxktYPVcrq0ERYYyHZZvKt231CyPnallXNs0 +V1PA/9UOwnXYjuyG5WfHepyw+p8c0OutWh62NcDeqANnP4LzuWwVscALtt1IB3v0 +RTtkP104CfwSMATcR+6pJ9stWtxh4lyrnbFmqWMufIaKG6dk7yMjBzAsdUpflLRf +YVYxboByAlWysQ2/T0VCtvAJ+RWz9Zj8LISP7/ajZJijhaikVp58LOD/MFnnJdGA +d+Tik+MR7TNhKazoVCeFI5/d87f+Drr2iOvJf+DYa4TVKSZMJ9HUfNLBvxkRunhU +wvPx1c+C/gJALQOmjah5g1ZygOSHQx490m8sSk79VZ907ebXvW824eYhYpDTBze+ +WlTtcSkUNO6iVOurzfpTazqWRh2mZWjXji9hxg4LHDIJQIEFe8pSIKv+7NBAM/U4 +4zZe/42b0U3KBaKv2wLUL8VDHQP2/G/QDRWBOArCW1cXhNf9sT4E0ut9BUwFgXLI +q1qLrynhaohHUKoiR4byodpnULK2R73pQxvkX5BkNvmw5wxASXc= +=XnqO +-END PGP SIGNATURE- Added: dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.tar.gz.sha512 == --- dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.tar.gz.sha512 (added) +++ dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.tar.gz.sha512 Tue Jul 5 19:41:03 2022 @@ -0,0 +1 @@ +5d9189fcb059ed456de7f95f7774cf1d9ca20635c657cee6dbf312cc5ebb831fd5f673141fd294d2a58b3535d05c5f852b6b309b6087f71655db9876781a85bc *jakartaee-migration-1.0.1-bin.tar.gz \ No newline at end of file Added: dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.zip.asc == --- dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.zip.asc (added) +++ dev/tomcat/jakartaee-migration/v1.0.1/binaries/jakartaee-migration-1.0.1-bin.zip.asc Tue Jul 5 19:41:03 2022 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAc
[tomcat-jakartaee-migration] branch main updated: Prep changelog for next 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 f671135 Prep changelog for next version f671135 is described below commit f671135089e8cd8288ccd03af0b2e7242f486275 Author: Mark Thomas AuthorDate: Tue Jul 5 20:43:22 2022 +0100 Prep changelog for next version --- CHANGES.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index e9536ae..2a6786b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,8 @@ # Tomcat Migration Tool for Jakarta EE - Changelog -## 1.0.1 (in progress) +## 1.0.2 (in progress) + +## 1.0.1 - Fix [#19](https://github.com/apache/tomcat-jakartaee-migration/issues/19). Add support for converting `.groovy` files. - Fix [#20](https://github.com/apache/tomcat-jakartaee-migration/issues/20) by using commons-compression instead of the Java zip code (remm) - 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: Consistent format
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 3e78939 Consistent format 3e78939 is described below commit 3e7893931462eb73bf7843ff4e0482b3c1c84ab4 Author: Mark Thomas AuthorDate: Tue Jul 5 20:43:58 2022 +0100 Consistent format --- CHANGES.md | 10 -- 1 file changed, 10 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2a6786b..1db82aa 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,25 +4,15 @@ ## 1.0.1 - Fix [#19](https://github.com/apache/tomcat-jakartaee-migration/issues/19). Add support for converting `.groovy` files. - - Fix [#20](https://github.com/apache/tomcat-jakartaee-migration/issues/20) by using commons-compression instead of the Java zip code (remm) - - Remove deprecated `-verbose` command line option (remm) - - Fix [bug 66163](https://bz.apache.org/bugzilla/show_bug.cgi?id=66163). Correct the handling of references of the form `jakarta. ...` when using the class transformer when those references are to classes not provided by the container. Based on a patch by Ole Schulz-Hildebrandt. (markt) - - Update Apache Ant to 1.10.12. (markt) - - Update Apache Commons Compress to 1.21. (markt) - - Update Apache Commons IO to 2.11.0. (markt) - - Update Apache Parent to 26. (markt) - - Update JUnit to 4.13.2. (markt) - - Update Maven AntRun plugin to 3.1.0. (markt) - - Update Maven Assembly plugin to 3.4.0. (markt) ## 1.0.0 - 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.1
The proposed Apache Tomcat migration tool for Jakarta EE 1.0.1 is now available for voting. The significant changes since 1.0.0 are: - Add support for .groovy files - Better support for non-standard archives - Numerous library updates It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.1/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1381/ The tag is: https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.1 acf10c08b41c6ce8fa4965fd975420b6e9e2b038 The proposed 1.0.1 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
[tomcat-native] branch main updated: Increment version number for next development cycle
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-native.git
The following commit(s) were added to refs/heads/main by this push:
new ea89eea99 Increment version number for next development cycle
ea89eea99 is described below
commit ea89eea99442fcb41bea540c4fae4245997f3153
Author: Mark Thomas
AuthorDate: Tue Jul 5 20:56:57 2022 +0100
Increment version number for next development cycle
---
HOWTO-RELEASE.txt | 2 +-
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
native/os/win32/libtcnative.rc| 6 +++---
xdocs/miscellaneous/changelog.xml | 2 ++
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index d590cffc5..0c3e7c15a 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -38,7 +38,7 @@ Ensure dates and/or version numbers are up to date:
- build.properties.default
- native/build/rpm/tcnative.spec.in
- native/include/tcn_version.h
-- native/os/win32/libtcnative.rc
+- native/os/win32/libtcnative.rc x3
- xdocs/miscellaneous/changelog.xml
Run the release script to check the Java code is aligned with the current
10.1.x
diff --git a/build.properties.default b/build.properties.default
index 62427b0bc..d7677bec1 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -18,7 +18,7 @@
# - Version Control Flags -
version.major=2
version.minor=0
-version.build=0
+version.build=1
version.patch=0
version.suffix=-dev
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index e6a7d636c..009cfc975 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 0
/** patch level */
-#define TCN_PATCH_VERSION 0
+#define TCN_PATCH_VERSION 1
/**
* This symbol is defined for internal, "development" copies of TCN. This
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index f9ea95975..1851916d5 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -19,7 +19,7 @@ LANGUAGE 0x9,0x1
"See the License for the specific language governing " \
"permissions and limitations under the License."
-#define TCN_VERSION "2.0.0"
+#define TCN_VERSION "2.0.1"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -35,8 +35,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 2,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION 2,0,1,0
+ PRODUCTVERSION 2,0,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 219f841d9..835e44fc5 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -31,6 +31,8 @@
branch started from the 1.2.33 tag.
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated: Update recommended OpenSSL version to 3.0.5
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-native.git The following commit(s) were added to refs/heads/main by this push: new 2f505b138 Update recommended OpenSSL version to 3.0.5 2f505b138 is described below commit 2f505b13840340d0e47c3da03e50cbeba724ac16 Author: Mark Thomas AuthorDate: Tue Jul 5 20:58:39 2022 +0100 Update recommended OpenSSL version to 3.0.5 --- native/srclib/VERSIONS| 2 +- xdocs/miscellaneous/changelog.xml | 5 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS index 671153aa0..06e346db8 100644 --- a/native/srclib/VERSIONS +++ b/native/srclib/VERSIONS @@ -5,7 +5,7 @@ The current minimum versions are: The following version of the libraries are recommended: - APR 1.7.0 or later, http://apr.apache.org -- OpenSSL 3.0.3 or later, http://www.openssl.org +- OpenSSL 3.0.5 or later, http://www.openssl.org Older versions should also work but are not as thoroughly tested by the Tomcat Native team diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 835e44fc5..c23208408 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -32,6 +32,11 @@ + + + Update recommended OpenSSL version to 3.0.5 or later. (markt) + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 2.0.0
Mark, On 7/4/22 07:23, Mark Thomas wrote: On 30/06/2022 17:55, Christopher Schultz wrote: Mark, On 6/30/22 09:58, Mark Thomas wrote: This is the first release of the Tomcat Native 2.0.x branch. The major differences compared to the 1.2.x branch are: - JNI API has been reduced to just that required to support the use of OpenSSL rather than JSSE for TLS connections. The APR/native connector is not supported. This statement is confusing. I think it should say "JNI API has been reduced to just that required to support OpenSSL as a JSSE provider for TLS connections. The API/native connector is no longer supported in this branch." The confusion is over JSSE versus OpenSSL which are not mutually-exclusive. What we are doing AIUI is specifically using OpenSSL through JSSE, instead of going around JSSE and using OpenSSL directly (well, through APR-connections). Ack. I was trying to avoid saying we were using an OpenSSL based JSSE provider as we are not doing that. How about: "The JNI API has been reduced to just that required to support Tomcat's OpenSSL based TLS implementation. The APR/native connector is no longer supported in this branch." That sounds okay. I forgot that OpenSSL isn't supported as an actual JSSE provider. - The minimum supported versions have been increased to OpenSSL 3.0.x, Apache APR 1.7.x, Java 11, Windows 7 / Server 2008 R2 How much do we continue to rely on APR at this point? Usually, the reason to use APR is to take advantage of APRs pooling and e.g. connection-handling capabilities. As we are dropping support for the APR connector, the connection-handling capabilities are no longer required, and the pooling is really only helpful when delayed-cleanup of those pools is necessary. I think we can probably drop the APR dependency -- at least over time. I'm not convinced. We are mostly using APR for the memory management and I don't rate my chances of re-writing the TLS code without it whilst avoiding both bugs and memory leaks. Given the medium / long term direction (the project Panama code Rémy has been working on) I don't think the benefit of fully removing APR is worth the effort. I generally agree with this. The 2.0.x branch is primarily intended for use with Tomcat 10.1.x but can be used with earlier versions as long as the APR/native connector is not used. The proposed release artefacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 2.0.0 release is [ ] Stable, go ahead and release [ ] Broken because of ... Thanks, Mark I will try to do some testing on 8.5.x Tx. I obviously haven't found time for this, yet. :/ -chris - 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.1
> 2022年7月6日 03:48，Mark Thomas 写道： > > The proposed Apache Tomcat migration tool for Jakarta EE 1.0.1 is now > available for voting. > > The significant changes since 1.0.0 are: > > - Add support for .groovy files > > - Better support for non-standard archives > > - Numerous library updates > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.1/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1381/ > > The tag is: > https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.1 > acf10c08b41c6ce8fa4965fd975420b6e9e2b038 > > The proposed 1.0.1 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 > Mark, The Migration unit test failed because some jar packages were missing. Is this normal? Han - 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.1
> 2022年7月6日 03:48，Mark Thomas 写道： > > The proposed Apache Tomcat migration tool for Jakarta EE 1.0.1 is now > available for voting. > > The significant changes since 1.0.0 are: > > - Add support for .groovy files > > - Better support for non-standard archives > > - Numerous library updates > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.1/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1381/ > > The tag is: > https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.1 > acf10c08b41c6ce8fa4965fd975420b6e9e2b038 > > The proposed 1.0.1 release is: > > [ ] -1: Broken. Do not release because… > [X] +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 > All unit test passed. Sorry, the previous reply is invalid.;) Han - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
