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
The following commit(s) were added to refs/heads/10.1.x by this push:
new 78d6f53b7e Update migration tool to 1.0.5
78d6f53b7e is described below
commit 78d6f53b7ea17287b4ae8dbf71c009b69f0887fd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Nov 8 18:37:09 2022 +0000
Update migration tool to 1.0.5
---
build.properties.default | 6 +++---
java/org/apache/catalina/loader/WebappLoader.java | 3 ++-
webapps/docs/changelog.xml | 8 ++++++--
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9d12e6db6a..6660ad5184 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -305,12 +305,12 @@ bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
# ----- Tomcat Migration Tool for Jakarta EE -----
-migration-lib.version=1.0.4
+migration-lib.version=1.0.5
-# checksums for jakartaee-migration-1.0.4-shaded.jar
+# checksums for jakartaee-migration-1.0.5-shaded.jar
migration-lib.checksum.enabled=true
migration-lib.checksum.algorithm=MD5|SHA-1
-migration-lib.checksum.value=2768a18586512c4713fe7bd9c67bc290|b71110ec32fc77893c98014690a6bbdb49a2be2a
+migration-lib.checksum.value=5af798dda8c3945635fba7a4bbfa1803|f7c41841a5bb28c058b106ae4b40082f1199c42f
migration-lib.home=${base.path}/migration-${migration-lib.version}
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.version}-shaded.jar
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index a50944c7b6..a8fe3cf806 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -41,6 +41,7 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.jakartaee.ClassConverter;
import org.apache.tomcat.jakartaee.EESpecProfile;
+import org.apache.tomcat.jakartaee.EESpecProfiles;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.compat.JreCompat;
@@ -368,7 +369,7 @@ public class WebappLoader extends LifecycleMBeanBase
implements Loader{
if (getJakartaConverter() != null) {
EESpecProfile profile = null;
try {
- profile = EESpecProfile.valueOf(getJakartaConverter());
+ profile = EESpecProfiles.valueOf(getJakartaConverter());
} catch (IllegalArgumentException ignored) {
// Use default value
log.warn(sm.getString("webappLoader.unknownProfile",
getJakartaConverter()));
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 924a1d0521..9df5bbcaab 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -204,8 +204,12 @@
Sébastien Deleuze. (markt)
</fix>
<update>
- Update the packaged version of the Tomcat Native Library to 2.0.2 to
- pick up the Windows binaries built with with OpenSSL 3.0.7. (markt)
+ Update the packaged version of the Apache Tomcat Native Library to
2.0.2
+ to pick up the Windows binaries built with with OpenSSL 3.0.7. (markt)
+ </update>
+ <update>
+ Update the packaged version of the Apache Tomcat Migration Tool for
+ Jakarta EE to 1.0.5. (markt)
</update>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
