[tomcat] branch 8.5.x updated: Need to update OPenSSL version too
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 086c10af5e Need to update OPenSSL version too
086c10af5e is described below
commit 086c10af5e681ca6928ae9ad2ad233a733f43b1c
Author: Mark Thomas
AuthorDate: Wed Jul 13 23:05:20 2022 +0100
Need to update OPenSSL version too
---
build.properties.default | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index dcc23e6924..aa7f2fac35 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -172,8 +172,8 @@
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1o-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1o-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1q-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1q-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.08
-
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: Need to update OPenSSL version too
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 7815759b6a Need to update OPenSSL version too
7815759b6a is described below
commit 7815759b6a9b8627be8c6e26aacf5dbbf1879d42
Author: Mark Thomas
AuthorDate: Wed Jul 13 23:05:20 2022 +0100
Need to update OPenSSL version too
---
build.properties.default | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 6175b50246..2330ddeeba 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -168,8 +168,8 @@
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1o-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1o-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1q-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1q-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.08
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Need to update OPenSSL version too
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new f1caffd96b Need to update OPenSSL version too
f1caffd96b is described below
commit f1caffd96b9bfc3629e79345354f5b149b397d8e
Author: Mark Thomas
AuthorDate: Wed Jul 13 23:05:20 2022 +0100
Need to update OPenSSL version too
---
build.properties.default | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 4c5d000eea..f84235d0ce 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -168,8 +168,8 @@
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1o-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1o-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1q-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1q-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.08
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 10.1.0-M17
The proposed Apache Tomcat 10.1.0-M17 release is now available for voting. Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory. The notable changes compared to 10.1.0-M16 are: - Implement support for repeatable builds - Update the packaged version of the Tomcat Native Library to 2.0.1. This includes Windows binaries built with with OpenSSL 3.0.5. - Update experimental Panama modules with support for OpenSSL 3.0+. OpenSSL 1.1 remains supported. For full details, see the change log: https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M17/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1382 The tag is: https://github.com/apache/tomcat/tree/10.1.0-M17 7a261dff58bc9581317c400b5c0fa4f7ae371fda The proposed 10.1.0-M17 release is: [ ] Broken - do not release [ ] Beta - go ahead and release as 10.1.0-M17 (beta) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r55726 - in /dev/tomcat/tomcat-10/v10.1.0-M17: ./ bin/ bin/embed/ src/
Author: markt Date: Wed Jul 13 21:09:33 2022 New Revision: 55726 Log: Upload 10.1.0-M17 for voting Added: dev/tomcat/tomcat-10/v10.1.0-M17/ dev/tomcat/tomcat-10/v10.1.0-M17/KEYS dev/tomcat/tomcat-10/v10.1.0-M17/README.html dev/tomcat/tomcat-10/v10.1.0-M17/RELEASE-NOTES dev/tomcat/tomcat-10/v10.1.0-M17/bin/ dev/tomcat/tomcat-10/v10.1.0-M17/bin/README.html dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-deployer.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-deployer.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-deployer.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-deployer.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-deployer.zip.asc dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-deployer.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-fulldocs.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-fulldocs.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-windows-x64.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-windows-x64.zip.asc dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-windows-x64.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-windows-x86.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-windows-x86.zip.asc dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17-windows-x86.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17.exe (with props) dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17.exe.asc dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17.exe.sha512 dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17.zip.asc dev/tomcat/tomcat-10/v10.1.0-M17/bin/apache-tomcat-10.1.0-M17.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M17/bin/embed/ dev/tomcat/tomcat-10/v10.1.0-M17/bin/embed/apache-tomcat-10.1.0-M17-embed.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M17/bin/embed/apache-tomcat-10.1.0-M17-embed.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M17/bin/embed/apache-tomcat-10.1.0-M17-embed.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M17/bin/embed/apache-tomcat-10.1.0-M17-embed.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M17/bin/embed/apache-tomcat-10.1.0-M17-embed.zip.asc dev/tomcat/tomcat-10/v10.1.0-M17/bin/embed/apache-tomcat-10.1.0-M17-embed.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M17/src/ dev/tomcat/tomcat-10/v10.1.0-M17/src/apache-tomcat-10.1.0-M17-src.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M17/src/apache-tomcat-10.1.0-M17-src.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M17/src/apache-tomcat-10.1.0-M17-src.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M17/src/apache-tomcat-10.1.0-M17-src.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M17/src/apache-tomcat-10.1.0-M17-src.zip.asc dev/tomcat/tomcat-10/v10.1.0-M17/src/apache-tomcat-10.1.0-M17-src.zip.sha512 Added: dev/tomcat/tomcat-10/v10.1.0-M17/KEYS == --- dev/tomcat/tomcat-10/v10.1.0-M17/KEYS (added) +++ dev/tomcat/tomcat-10/v10.1.0-M17/KEYS Wed Jul 13 21:09:33 2022 @@ -0,0 +1,453 @@ +This file contains the PGP&GPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Comment: GPGTools - http://gpgtools.org + +mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX +pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t +6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K +GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz +4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M +UVviQcy29y/RlLSDTTYoVlCZ1ni14qF
[tomcat] branch 8.5.x updated: Fix typos
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new f37937116d Fix typos
f37937116d is described below
commit f37937116df42ae58a58b4fb606d7e2b230ac10f
Author: Mark Thomas
AuthorDate: Wed Jul 13 21:38:16 2022 +0100
Fix typos
---
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 3700162006..ad33010644 100644
--- a/build.xml
+++ b/build.xml
@@ -2274,7 +2274,7 @@ skip.installer property in build.properties" />
-
+
@@ -2352,7 +2352,7 @@ ant.tstamp.now.iso=${tstamp.iso.release}
# This file was auto-generated by the pre-release Ant target
-# Remove version-dev to from the version since this is not a development
release.
+# Remove "-dev" from the version since this is not a development release.
maven.asf.release.deploy.version=${version.major}.${version.minor}.${version.build}${version.suffix}
# Re-use the same GPG executable
-
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: Fix typos
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 598b59e202 Fix typos
598b59e202 is described below
commit 598b59e2021f44074b085bdef67489d938183206
Author: Mark Thomas
AuthorDate: Wed Jul 13 21:38:16 2022 +0100
Fix typos
---
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 3edd814c61..f0d5bdbbd0 100644
--- a/build.xml
+++ b/build.xml
@@ -2575,7 +2575,7 @@ skip.installer property in build.properties" />
-
+
@@ -2653,7 +2653,7 @@ ant.tstamp.now.iso=${tstamp.iso.release}
# This file was auto-generated by the pre-release Ant target
-# Remove version-dev to from the version since this is not a development
release.
+# Remove "-dev" from the version since this is not a development release.
maven.asf.release.deploy.version=${version.major}.${version.minor}.${version.build}${version.suffix}
# Re-use the same GPG executable
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Fix typos
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 8f3be985fc Fix typos
8f3be985fc is described below
commit 8f3be985fc88b0ff8f7f8dfb905dbba18e230635
Author: Mark Thomas
AuthorDate: Wed Jul 13 21:38:16 2022 +0100
Fix typos
---
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 24e589707f..157292d3e7 100644
--- a/build.xml
+++ b/build.xml
@@ -2593,7 +2593,7 @@ skip.installer property in build.properties" />
-
+
@@ -2671,7 +2671,7 @@ ant.tstamp.now.iso=${tstamp.iso.release}
# This file was auto-generated by the pre-release Ant target
-# Remove version-dev to from the version since this is not a development
release.
+# Remove "-dev" from the version since this is not a development release.
maven.asf.release.deploy.version=${version.major}.${version.minor}.${version.build}${version.suffix}
# Re-use the same GPG executable
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typos
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
The following commit(s) were added to refs/heads/main by this push:
new 2145fdecfa Fix typos
2145fdecfa is described below
commit 2145fdecfa659e72fdb16c7c9b072684f88cb249
Author: Mark Thomas
AuthorDate: Wed Jul 13 21:38:16 2022 +0100
Fix typos
---
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 86684d3a73..e78581c9f6 100644
--- a/build.xml
+++ b/build.xml
@@ -2632,7 +2632,7 @@ skip.installer property in build.properties" />
-
+
@@ -2710,7 +2710,7 @@ ant.tstamp.now.iso=${tstamp.iso.release}
# This file was auto-generated by the pre-release Ant target
-# Remove version-dev to from the version since this is not a development
release.
+# Remove "-dev" from the version since this is not a development release.
maven.asf.release.deploy.version=${version.major}.${version.minor}.${version.build}${version.suffix}
# Re-use the same GPG executable
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Update Tomcat Native to 1.2.35
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 9315099b94 Update Tomcat Native to 1.2.35
9315099b94 is described below
commit 9315099b94500fc1ab63f72f2b406bf18371f29f
Author: Mark Thomas
AuthorDate: Wed Jul 13 21:32:27 2022 +0100
Update Tomcat Native to 1.2.35
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 4
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f32feba333..dcc23e6924 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -161,13 +161,13 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.34
+tomcat-native.version=1.2.35
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=03b167fdfaa16db6a0f3acd849b9dfed33aedad2316de6a2aba57b6b11ef4055790e8d96a66f14e6d5ce2200fafdf80b3e8ca0e8f206e4f28de841d8b217787f
+tomcat-native.src.checksum.value=a290eb0cd940e1f8de0caba72517dd4e9c96f1a19e0ef7ccdabf039ba86b48d1c6f554f59decd87e2ef03ec3e3bfcce694a92e1db130966987c1e37b5c8d
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=ea0489c33f2741f2b7cbc26bfd7fc500583bf62bf7564c4798205c7395bc1d2c000914b30cb492a33614ae45b030ba5952e70956a79ee16ac4019b80c5627282
+tomcat-native.win.checksum.value=03d53bb61bcdf3d67d9cccb7ef4fe09f341cd4900d38b7661bb019260e320c231e07092f8063a2811adcf2eb7b64325cfbfcdf008cb8d7ea73ffc1a00c751de3
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 21f23000c5..50e066e9ae 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -159,6 +159,10 @@
Improvements to Japanese translations contributed by tak7iji. (markt)
+
+Update the packaged version of the Tomcat Native Library to 1.2.35 to
+pick up Windows binaries built with OpenSSL 1.1.1q.(markt)
+
-
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: Update Tomcat Native to 1.2.35
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 97bb004baf Update Tomcat Native to 1.2.35
97bb004baf is described below
commit 97bb004bafb64638cfb72ecf2a973e38a0706b43
Author: Mark Thomas
AuthorDate: Wed Jul 13 21:32:27 2022 +0100
Update Tomcat Native to 1.2.35
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 4
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 8dc66c9246..6175b50246 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -157,13 +157,13 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.34
+tomcat-native.version=1.2.35
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=03b167fdfaa16db6a0f3acd849b9dfed33aedad2316de6a2aba57b6b11ef4055790e8d96a66f14e6d5ce2200fafdf80b3e8ca0e8f206e4f28de841d8b217787f
+tomcat-native.src.checksum.value=a290eb0cd940e1f8de0caba72517dd4e9c96f1a19e0ef7ccdabf039ba86b48d1c6f554f59decd87e2ef03ec3e3bfcce694a92e1db130966987c1e37b5c8d
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=ea0489c33f2741f2b7cbc26bfd7fc500583bf62bf7564c4798205c7395bc1d2c000914b30cb492a33614ae45b030ba5952e70956a79ee16ac4019b80c5627282
+tomcat-native.win.checksum.value=03d53bb61bcdf3d67d9cccb7ef4fe09f341cd4900d38b7661bb019260e320c231e07092f8063a2811adcf2eb7b64325cfbfcdf008cb8d7ea73ffc1a00c751de3
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ba0c5a1090..b7a3988de9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -215,6 +215,10 @@
Improvements to Japanese translations contributed by tak7iji. (markt)
+
+Update the packaged version of the Tomcat Native Library to 1.2.35 to
+pick up Windows binaries built with OpenSSL 1.1.1q.(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Update Tomcat Native to 1.2.35
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new d191607208 Update Tomcat Native to 1.2.35
d191607208 is described below
commit d191607208d59dcb6997c22d51d227a05e5382f7
Author: Mark Thomas
AuthorDate: Wed Jul 13 21:32:27 2022 +0100
Update Tomcat Native to 1.2.35
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 4
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index e20277cea6..4c5d000eea 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -157,13 +157,13 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.34
+tomcat-native.version=1.2.35
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=03b167fdfaa16db6a0f3acd849b9dfed33aedad2316de6a2aba57b6b11ef4055790e8d96a66f14e6d5ce2200fafdf80b3e8ca0e8f206e4f28de841d8b217787f
+tomcat-native.src.checksum.value=a290eb0cd940e1f8de0caba72517dd4e9c96f1a19e0ef7ccdabf039ba86b48d1c6f554f59decd87e2ef03ec3e3bfcce694a92e1db130966987c1e37b5c8d
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=ea0489c33f2741f2b7cbc26bfd7fc500583bf62bf7564c4798205c7395bc1d2c000914b30cb492a33614ae45b030ba5952e70956a79ee16ac4019b80c5627282
+tomcat-native.win.checksum.value=03d53bb61bcdf3d67d9cccb7ef4fe09f341cd4900d38b7661bb019260e320c231e07092f8063a2811adcf2eb7b64325cfbfcdf008cb8d7ea73ffc1a00c751de3
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b5e984188f..722abd538f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -219,6 +219,10 @@
Improvements to Japanese translations contributed by tak7iji. (markt)
+
+Update the packaged version of the Tomcat Native Library to 1.2.35 to
+pick up Windows binaries built with OpenSSL 1.1.1q.(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] tag 10.1.0-M17 created (now 7a261dff58)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 10.1.0-M17 in repository https://gitbox.apache.org/repos/asf/tomcat.git at 7a261dff58 (commit) This tag includes the following new commits: new 7a261dff58 Tag 10.1.0-M17 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] 01/01: Tag 10.1.0-M17
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to tag 10.1.0-M17 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 7a261dff58bc9581317c400b5c0fa4f7ae371fda Author: Mark Thomas AuthorDate: Wed Jul 13 21:27:02 2022 +0100 Tag 10.1.0-M17 --- build.properties.release | 43 +++ res/install-win/Uninstall.exe.sig| Bin 0 -> 10289 bytes res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10289 bytes res/maven/mvn.properties.release | 27 +++ webapps/docs/changelog.xml | 2 +- 5 files changed, 71 insertions(+), 1 deletion(-) diff --git a/build.properties.release b/build.properties.release new file mode 100644 index 00..797c09a7f2 --- /dev/null +++ b/build.properties.release @@ -0,0 +1,43 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target + +# Set the version-dev to "" (empty string) as this is not a development release. +version.dev= + +# Ensure consistent timestamps for reproducible builds +ant.tstamp.now.iso=2022-07-13T18:51:03Z + +# Reproducible builds require the use of the build tools defined below. The +# vendors (where appropriate) and versions must match exactly for a reproducible +# build since this data is embedded in various files, particularly JAR file +# manifests, as part of the build process +# +# Apache Ant: Apache Ant(TM) version 1.10.12 compiled on October 13 2021 +# +# Java Name: OpenJDK 64-Bit Server VM +# Java Vendor: Eclipse Adoptium +# Java Version:11.0.15+10 + +# The following is provided for information only. Builds will be repeatable +# whether or not the build ennvironment in consistent with this information +# +# OS: amd64 Windows Server 2022 10.0 +# File encoding: Cp1252 +# +# Release Manager: markt diff --git a/res/install-win/Uninstall.exe.sig b/res/install-win/Uninstall.exe.sig new file mode 100644 index 00..1adef45d01 Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ diff --git a/res/install-win/tomcat-installer.exe.sig b/res/install-win/tomcat-installer.exe.sig new file mode 100644 index 00..dee8c5c643 Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release new file mode 100644 index 00..57502f38f0 --- /dev/null +++ b/res/maven/mvn.properties.release @@ -0,0 +1,27 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target + +# Remove version-dev to from the version since this is not a development release. +maven.asf.release.deploy.version=10.1.0-M17 + +# Re-use the same GPG executable +gpg.exec=/path/to/gpg + +# Set the user name to use to upload the artefacts to Nexus +asf.ldap.username=markt diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4bce2710b5..0e8819e28e 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,7 @@ They eventually become mixed with the numbered
[Bug 66120] j_security_check returns 408 if j_security_check request lands on different tomcat server from original server
https://bz.apache.org/bugzilla/show_bug.cgi?id=66120 --- Comment #3 from Mark Thomas --- My current thinking is that make this behaviour optional depending on the setting of the "persistAuthentication" attribute of the Manager. If we do this that way, the change to the session serialization format can be handled in a backwards compatible manner. If there are no objections, I intend to implement this in time for the August release round. -- 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] markt-asf commented on pull request #524: Dir redirect use301
markt-asf commented on PR #524: URL: https://github.com/apache/tomcat/pull/524#issuecomment-1183461695 I've added a test case. My initial idea isn't going to work because `sendRedirect()` commits the response. Adding a method to the Servlet API looks like the cleanest solution. But that only helps Tomcat 11 onwards. I have some ideas how this could work but they are all fairly ugly hacks. More thought required. -- 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] branch main updated: Add test case for PR #524
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
The following commit(s) were added to refs/heads/main by this push:
new e3298caedb Add test case for PR #524
e3298caedb is described below
commit e3298caedb58032ffa1445c3c59c605618e035d6
Author: Mark Thomas
AuthorDate: Wed Jul 13 17:52:41 2022 +0100
Add test case for PR #524
---
.../servlets/TestDefaultServletRedirect.java | 133 +
1 file changed, 133 insertions(+)
diff --git a/test/org/apache/catalina/servlets/TestDefaultServletRedirect.java
b/test/org/apache/catalina/servlets/TestDefaultServletRedirect.java
new file mode 100644
index 00..60e75d9ac8
--- /dev/null
+++ b/test/org/apache/catalina/servlets/TestDefaultServletRedirect.java
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.servlets;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+
+@RunWith(Parameterized.class)
+public class TestDefaultServletRedirect extends TomcatBaseTest {
+
+@Parameterized.Parameters(name = "{index} redirectStatus [{0}]")
+public static Collection parameters() {
+List parameterSets = new ArrayList<>();
+
+parameterSets.add(new Object[] {
Integer.valueOf(HttpServletResponse.SC_MOVED_PERMANENTLY) });
+parameterSets.add(new Object[] {
Integer.valueOf(HttpServletResponse.SC_FOUND) });
+parameterSets.add(new Object[] {
Integer.valueOf(HttpServletResponse.SC_TEMPORARY_REDIRECT) });
+parameterSets.add(new Object[] { Integer.valueOf(308) });
+
+return parameterSets;
+}
+
+@Parameter(0)
+public int redirectStatus;
+
+@Ignore // See PR #524
+@Test
+public void testRedirect() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+tomcat.setAddDefaultWebXmlToWebapp(false);
+
+File appDir = new File("test/webapp");
+Context ctx = tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
+Wrapper defaultServlet = Tomcat.addServlet(ctx, "default", new
DefaultServlet());
+defaultServlet.addMapping("/");
+
+defaultServlet.addInitParameter("redirectStatusCode",
Integer.toString(redirectStatus));
+
+tomcat.start();
+
+ByteChunk out = new ByteChunk();
+Map> headers = new HashMap<>();
+// Should be redirected
+int rc = methodUrl("http://localhost:"; + getPort() + "/test/jsp", out,
DEFAULT_CLIENT_TIMEOUT_MS,
+null, headers, "GET", false);
+
+Assert.assertEquals("Unexpected status code", redirectStatus, rc);
+}
+
+
+@Test
+public void testIncludeThenRedirect() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+tomcat.setAddDefaultWebXmlToWebapp(false);
+
+File appDir = new File("test/webapp");
+Context ctx = tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
+Wrapper defaultServlet = Tomcat.addServlet(ctx, "default", new
DefaultServlet());
+defaultServlet.addMapping("/");
+
+defaultServlet.addInitParameter("redirectStatusCode",
Integer.toString(redirectStatus));
+
+Wrapper includeServlet = Tomcat.addServlet(ctx, "include", new
IncludeServlet());
+includeServlet.addMapping("/include");
+
+tomcat.start();
+
+ByteChunk out = new Byte
[tomcat] branch 8.5.x updated: Improvements to Japanese translations contributed by tak7iji
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 28c2b2649e Improvements to Japanese translations contributed by tak7iji
28c2b2649e is described below
commit 28c2b2649e2a5b72b71cf5d68c18e47180f76be3
Author: Mark Thomas
AuthorDate: Wed Jul 13 16:32:15 2022 +0100
Improvements to Japanese translations contributed by tak7iji
---
java/org/apache/catalina/core/LocalStrings_ja.properties | 1 +
java/org/apache/tomcat/util/compat/LocalStrings_ja.properties | 2 ++
webapps/docs/changelog.xml| 3 +++
3 files changed, 6 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index d7c1a6b737..9ad6677eb2 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -83,6 +83,7 @@ aprListener.initializingFIPS=FIPSモードを初期化しています...
aprListener.requireNotInFIPSMode=AprLifecycleListenerはライブラリが既にFIPSモードになっている必要があるように設定されていますが、FIPSモードではありませんでした。
aprListener.skipFIPSInitialization=すでにFIPSモードになっています。FIPS初期化をスキップします。
aprListener.sslInit=SSLEngineの初期化に失敗しました。
+aprListener.sslRequired=バージョン 2.x以降ではSSLが必要なため、バージョン [{1}] のTomcat Native
ライブラリを使用する場合、 [{0}] はSSLEngineの有効な値ではありません。
aprListener.tcnInvalid=APRベースのApache
Tomcatネイティブライブラリの互換性のないバージョン[{0}]がインストールされていますが、Tomcatにはバージョン[{1}]が必要です。
aprListener.tcnValid=APRバージョン[{1}]を使用してAPRベースのApache
Tomcatネイティブライブラリ[{0}]をロードしました。
aprListener.tcnVersion=インストールされた Apache Tomcat ネイティブライブラリの APR バージョンは [{0}]
ですが、推奨する最小バージョンは [{1}] です。
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
index 019c6c4db8..9b13f60654 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+jre19Compat.javaPre19=クラスが見つからないため、Java 19より前のJVMでコードが実行されていると仮定します
+
jre9Compat.invalidModuleUri=モジュール URI [{0}] を JarScanner で処理する URL に変換できませんでした。
jre9Compat.javaPre9=クラスが見つからないため Java 9 以前の JVM 上でコードが実行されていると仮定します
jre9Compat.unexpected=Java9 クラスやメソッドへの参照の生成に失敗しました
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a7dacaacae..21f23000c5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -156,6 +156,9 @@
Improvements to French translations. (remm)
+
+Improvements to Japanese translations contributed by tak7iji. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix unnecessary escaping
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 13da7fa755 Fix unnecessary escaping
13da7fa755 is described below
commit 13da7fa755d714609e1666f72c802715aa4104a1
Author: Mark Thomas
AuthorDate: Wed Jul 13 16:30:15 2022 +0100
Fix unnecessary escaping
---
java/org/apache/catalina/tribes/util/LocalStrings_ko.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
b/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
index c8e6694726..713fea3399 100644
--- a/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
@@ -15,7 +15,7 @@
arrays.keyoffset.outOfBounds=keyoffset이 범위를 초과합니다.
arrays.length.outOfBounds=키 내에 충분한 데이터 엘리먼트들이 존재하지 않습니다. 길이가 범위 밖에 있습니다.
-arrays.malformed.arrays=바이트 배열은 반드시 ''{1,3,4,5,6}''과 같이 표현되어야 합니다.
+arrays.malformed.arrays=바이트 배열은 반드시 '{1,3,4,5,6}'과 같이 표현되어야 합니다.
arrays.srcoffset.outOfBounds=srcoffset이 범위 밖입니다.
executorFactory.not.running=Executor가 실행 중이 아닙니다. 명령을 강제로 큐에 넣을 수 없습니다.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Improvements to French translations. (remm)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 207594a3fe Improvements to French translations. (remm)
207594a3fe is described below
commit 207594a3fe611900e680b8da6509632ca2925f4f
Author: Mark Thomas
AuthorDate: Wed Jul 13 16:29:39 2022 +0100
Improvements to French translations. (remm)
---
java/org/apache/catalina/core/LocalStrings_fr.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml| 3 +++
4 files changed, 7 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 2b93332ecf..00f3895bd5 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -83,6 +83,7 @@ aprListener.initializingFIPS=Initialisation du mode FIPS...
aprListener.requireNotInFIPSMode=AprLifecycleListener est configuré pour
demander que la librarie soit déjà en mode FIPS et elle ne l'était pas
aprListener.skipFIPSInitialization=Déjà en mode FIPS, l'initialisation de FIPS
n'est pas effectuée
aprListener.sslInit=Impossible d'initialiser le SSLEngine
+aprListener.sslRequired=[{0}] n''est pas une valeur valide pour SSLEngine
quand la version [{1}] de la librairie Tomcat Native est utilisée car SSL est
nécessaire à partir de la version 2.x
aprListener.tcnInvalid=Une version incompatible [{0}] de la librairie Apache
Tomcat Native basée sur APR est installée, alors que Tomcat nécessite la
version [{1}]
aprListener.tcnValid=Chargement de la librairie Apache Tomcat Native [{0}] en
utilisant APR version [{1}]
aprListener.tcnVersion=Un version ancienne [{0}] de la bibliothèque Apache
Tomcat Native basée sur APR est installée, alors que Tomcat recommande au
minimum la version [{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 1902a6912a..4b0ab14d84 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -49,6 +49,7 @@ jsp.error.cannotAddResolver=Impossible d'appeler
addELResolver après qu'une pre
jsp.error.classname=Impossible de déterminer le nom de classe d'après le
fichier .class
jsp.error.coerce_to_type=Impossible de convertir la valeur [{2}] de
l''attribut [{0}] vers le type [{1}]
jsp.error.compilation=Erreur de compilation du fichier : [{0}] [{1}]
+jsp.error.compilation.dependent=Erreur de chargement de la classe [{0}]
jsp.error.compilation.jdt=Erreur de compilation
jsp.error.compilation.jdtProblemError=Erreur lors du traitement de la liste
des problèmes renvoyée par JDT
jsp.error.compilation.source=Erreur lors du chargement du fichier source [{0}]
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
index 998e08ba6b..c74503eb37 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+jre19Compat.javaPre19=Classe non trouvée donc le code est exécutée sur une JVM
antérieure à Java 19
+
jre9Compat.invalidModuleUri=L''URI du module fournie [{0}] n''a pas pu être
convertie en URL pour être traitée par le JarScanner
jre9Compat.javaPre9=Le code est considéré être exécuté sur une JVM antérieure
à Java 9 car la classe n'a pas été trouvée
jre9Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 9
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b7ce0ee2cd..a7dacaacae 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -153,6 +153,9 @@
Update the packaged version of the Tomcat Native Library to 1.2.34 to
improve the support for building with OpenSSL 3.0.x.(markt)
+
+Improvements to French translations. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix order
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new fd6f59b3c9 Fix order
fd6f59b3c9 is described below
commit fd6f59b3c99cd87b64384eac141a13345e0b61a0
Author: Mark Thomas
AuthorDate: Wed Jul 13 16:27:24 2022 +0100
Fix order
---
java/org/apache/catalina/core/LocalStrings.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index d267329fc3..fef134d38a 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -69,6 +69,7 @@
applicationServletRegistration.setServletSecurity.ise=Security constraints can''
applicationSessionCookieConfig.ise=Property [{0}] cannot be added to
SessionCookieConfig for context [{1}] as the context has been initialised
+aprListener.FIPSProviderNotDefault=The FIPS provider must be configured as the
default provider when the AprLifecycleListener is configured with FIPS mode
[{0}]
aprListener.aprDestroy=Failed shutdown of the Apache Tomcat Native library
aprListener.aprInit=The Apache Tomcat Native library which allows using
OpenSSL was not found on the java.library.path: [{0}]
aprListener.aprInitDebug=The Apache Tomcat Native library could not be found
using names [{0}] on the java.library.path [{1}]. The errors reported were [{2}]
@@ -77,7 +78,6 @@ aprListener.config=APR/OpenSSL configuration: useAprConnector
[{0}], useOpenSSL
aprListener.currentFIPSMode=Current FIPS mode: [{0}]
aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force
entering FIPS mode, but library is already in FIPS mode [{0}]
aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters
[{2}], random [{3}], UDS [{4}].
-aprListener.FIPSProviderNotDefault=The FIPS provider must be configured as the
default provider when the AprLifecycleListener is configured with FIPS mode
[{0}]
aprListener.initializeFIPSFailed=Failed to enter FIPS mode
aprListener.initializeFIPSSuccess=Successfully entered FIPS mode
aprListener.initializedOpenSSL=OpenSSL successfully initialized [{0}]
-
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: Improvements to Japanese translations contributed by tak7iji
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 733866904b Improvements to Japanese translations contributed by tak7iji
733866904b is described below
commit 733866904bc83e9c3b412d7660ea34d0144998d0
Author: Mark Thomas
AuthorDate: Wed Jul 13 16:26:30 2022 +0100
Improvements to Japanese translations contributed by tak7iji
---
java/org/apache/catalina/core/LocalStrings_ja.properties | 1 +
java/org/apache/tomcat/util/compat/LocalStrings_ja.properties | 2 ++
webapps/docs/changelog.xml| 3 +++
3 files changed, 6 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 03587a4cb7..6240d9b3d1 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -83,6 +83,7 @@ aprListener.initializingFIPS=FIPSモードを初期化しています...
aprListener.requireNotInFIPSMode=AprLifecycleListenerはライブラリが既にFIPSモードになっている必要があるように設定されていますが、FIPSモードではありませんでした。
aprListener.skipFIPSInitialization=すでにFIPSモードになっています。FIPS初期化をスキップします。
aprListener.sslInit=SSLEngineの初期化に失敗しました。
+aprListener.sslRequired=バージョン 2.x以降ではSSLが必要なため、バージョン [{1}] のTomcat Native
ライブラリを使用する場合、 [{0}] はSSLEngineの有効な値ではありません。
aprListener.tcnInvalid=APRベースのApache
Tomcatネイティブライブラリの互換性のないバージョン[{0}]がインストールされていますが、Tomcatにはバージョン[{1}]が必要です。
aprListener.tcnValid=APRバージョン[{1}]を使用してAPRベースのApache
Tomcatネイティブライブラリ[{0}]をロードしました。
aprListener.tcnVersion=インストールされた Apache Tomcat ネイティブライブラリの APR バージョンは [{0}]
ですが、推奨する最小バージョンは [{1}] です。
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
index 38dc858c04..321daf4657 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
@@ -16,6 +16,8 @@
jre16Compat.javaPre16=クラスが見つからないため、コードがJava 16未満のJVMで実行されていると仮定します
jre16Compat.unexpected=Java 16クラスおよびメソッドへの参照の作成に失敗しました
+jre19Compat.javaPre19=クラスが見つからないため、Java 19より前のJVMでコードが実行されていると仮定します
+
jre9Compat.invalidModuleUri=モジュール URI [{0}] を JarScanner で処理する URL に変換できませんでした。
jre9Compat.javaPre9=クラスが見つからないため Java 9 以前の JVM 上でコードが実行されていると仮定します
jre9Compat.unexpected=Java9 クラスやメソッドへの参照の生成に失敗しました
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7069979709..ba0c5a1090 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -212,6 +212,9 @@
Improvements to French translations. (remm)
+
+Improvements to Japanese translations contributed by tak7iji. (markt)
+
-
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: Fix unnecessary escaping
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 733f331d17 Fix unnecessary escaping
733f331d17 is described below
commit 733f331d1773199beea9f063ee6eaff1d8e1ad38
Author: Mark Thomas
AuthorDate: Wed Jul 13 16:25:31 2022 +0100
Fix unnecessary escaping
---
java/org/apache/catalina/tribes/util/LocalStrings_ko.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
b/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
index c8e6694726..713fea3399 100644
--- a/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
@@ -15,7 +15,7 @@
arrays.keyoffset.outOfBounds=keyoffset이 범위를 초과합니다.
arrays.length.outOfBounds=키 내에 충분한 데이터 엘리먼트들이 존재하지 않습니다. 길이가 범위 밖에 있습니다.
-arrays.malformed.arrays=바이트 배열은 반드시 ''{1,3,4,5,6}''과 같이 표현되어야 합니다.
+arrays.malformed.arrays=바이트 배열은 반드시 '{1,3,4,5,6}'과 같이 표현되어야 합니다.
arrays.srcoffset.outOfBounds=srcoffset이 범위 밖입니다.
executorFactory.not.running=Executor가 실행 중이 아닙니다. 명령을 강제로 큐에 넣을 수 없습니다.
-
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: Improvements to French translations (remm)
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 1fe9ad84c5 Improvements to French translations (remm)
1fe9ad84c5 is described below
commit 1fe9ad84c5d2f08a835d66f0e8269876a28777fc
Author: Mark Thomas
AuthorDate: Wed Jul 13 16:25:14 2022 +0100
Improvements to French translations (remm)
---
java/org/apache/catalina/core/LocalStrings_fr.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml| 3 +++
4 files changed, 7 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index efbc6bc3af..6b427c11d1 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -83,6 +83,7 @@ aprListener.initializingFIPS=Initialisation du mode FIPS...
aprListener.requireNotInFIPSMode=AprLifecycleListener est configuré pour
demander que la librarie soit déjà en mode FIPS et elle ne l'était pas
aprListener.skipFIPSInitialization=Déjà en mode FIPS, l'initialisation de FIPS
n'est pas effectuée
aprListener.sslInit=Impossible d'initialiser le SSLEngine
+aprListener.sslRequired=[{0}] n''est pas une valeur valide pour SSLEngine
quand la version [{1}] de la librairie Tomcat Native est utilisée car SSL est
nécessaire à partir de la version 2.x
aprListener.tcnInvalid=Une version incompatible [{0}] de la librairie Apache
Tomcat Native basée sur APR est installée, alors que Tomcat nécessite la
version [{1}]
aprListener.tcnValid=Chargement de la librairie Apache Tomcat Native [{0}] en
utilisant APR version [{1}]
aprListener.tcnVersion=Un version ancienne [{0}] de la bibliothèque Apache
Tomcat Native basée sur APR est installée, alors que Tomcat recommande au
minimum la version [{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 45d3c77651..5ca7d917a2 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -49,6 +49,7 @@ jsp.error.cannotAddResolver=Impossible d'appeler
addELResolver après qu'une pre
jsp.error.classname=Impossible de déterminer le nom de classe d'après le
fichier .class
jsp.error.coerce_to_type=Impossible de convertir la valeur [{2}] de
l''attribut [{0}] vers le type [{1}]
jsp.error.compilation=Erreur de compilation du fichier : [{0}] [{1}]
+jsp.error.compilation.dependent=Erreur de chargement de la classe [{0}]
jsp.error.compilation.jdt=Erreur de compilation
jsp.error.compilation.jdtProblemError=Erreur lors du traitement de la liste
des problèmes renvoyée par JDT
jsp.error.compilation.source=Erreur lors du chargement du fichier source [{0}]
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
index cfb8a966ba..5a621ff532 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
@@ -16,6 +16,8 @@
jre16Compat.javaPre16=Le code est considéré être exécuté sur une JVM
antérieure à Java 16 car la classe n'a pas été trouvée
jre16Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 16
+jre19Compat.javaPre19=Classe non trouvée donc le code est exécutée sur une JVM
antérieure à Java 19
+
jre9Compat.invalidModuleUri=L''URI du module fournie [{0}] n''a pas pu être
convertie en URL pour être traitée par le JarScanner
jre9Compat.javaPre9=Le code est considéré être exécuté sur une JVM antérieure
à Java 9 car la classe n'a pas été trouvée
jre9Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 9
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 97f0ae196a..7069979709 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -209,6 +209,9 @@
Update the CXF module to Apache CXF 3.5.3. (remm)
+
+Improvements to French translations. (remm)
+
-
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: Correct schemas used by JSPC
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 The following commit(s) were added to refs/heads/9.0.x by this push: new 6a47c8791f Correct schemas used by JSPC 6a47c8791f is described below commit 6a47c8791f62ec9b6e9c34cc40ca7e288f51e354 Author: Mark Thomas AuthorDate: Wed Jul 13 16:22:28 2022 +0100 Correct schemas used by JSPC --- .../apache/jasper/resources/LocalStrings.properties| 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties index dfe77e42db..4339d968da 100644 --- a/java/org/apache/jasper/resources/LocalStrings.properties +++ b/java/org/apache/jasper/resources/LocalStrings.properties @@ -361,11 +361,11 @@ jspc.webfrg.footer=\n\ \n\ \n jspc.webfrg.header=\n\ -https://jakarta.ee/xml/ns/jakartaee"\n\ +http://xmlns.jcp.org/xml/ns/javaee"\n\ \ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\ -\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\ -\ https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"\n\ -\ version="5.0"\n\ +\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\ +\ http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\ +\ version="4.0"\n\ \ metadata-complete="true">\n\ \ org_apache_jasper.jspc\n\ \ \n\ @@ -389,11 +389,11 @@ jspc.webxml.footer=\n\ \n\ \n jspc.webxml.header=\n\ -https://jakarta.ee/xml/ns/jakartaee"\n\ -\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\ -\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\ -\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\ -\ version="5.0"\n\ +http://xmlns.jcp.org/xml/ns/javaee"\n\ +\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\ +\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\ +\ http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\ +\ version="4.0"\n\ \ metadata-complete="false">\n\
[tomcat] branch main updated: Remove unnecessary back-port exclusion
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
The following commit(s) were added to refs/heads/main by this push:
new e59e181437 Remove unnecessary back-port exclusion
e59e181437 is described below
commit e59e181437649e52b5ad45037e5a94e1266fe3c2
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:51:47 2022 +0100
Remove unnecessary back-port exclusion
---
java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index 292635a71e..100cf67fdf 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -38,9 +38,6 @@ public class BackportEnglish extends BackportBase {
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");
-// Exclude keys known to be different between 10.0.x and 9.0.x
-
keysToExclude.add("java.org.apache.catalina.connector.zzz.coyoteConnector.notAsciiSuperset");
-
BackportEnglish backport = new BackportEnglish(args);
backport.execute();
}
-
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: Add a couple of keys to back-port exclusion list
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 18a133ba5f Add a couple of keys to back-port exclusion list
18a133ba5f is described below
commit 18a133ba5f8a6bd947fb50a9555b98f18c2d055f
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:49:56 2022 +0100
Add a couple of keys to back-port exclusion list
---
java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index 45faab3bb3..8548ae93ac 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -33,13 +33,15 @@ public class BackportEnglish extends BackportBase {
public static void main(String... args) throws IOException {
+// Exclude keys known to be different between all versions
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.jsproot.version.invalid");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");
+
// Exclude keys known to be different between 9.0.x and 8.5.x
keysToExclude.add("java.org.apache.catalina.manager.zzz.htmlManagerServlet.deployPath");
keysToExclude.add("java.org.apache.catalina.startup.zzz.catalina.stopServer.connectException");
-
keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.jsproot.version.invalid");
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.usage");
-
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
-
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");
BackportEnglish backport = new BackportEnglish(args);
backport.execute();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Add a couple of keys to back-port exclusion list
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 7e7e7b687e Add a couple of keys to back-port exclusion list
7e7e7b687e is described below
commit 7e7e7b687e2f712c3be63b00f285dc10554a8400
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:49:56 2022 +0100
Add a couple of keys to back-port exclusion list
---
java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index 618e46bbff..292635a71e 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -33,9 +33,13 @@ public class BackportEnglish extends BackportBase {
public static void main(String... args) throws IOException {
+// Exclude keys known to be different between all versions
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.jsproot.version.invalid");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");
+
// Exclude keys known to be different between 10.0.x and 9.0.x
keysToExclude.add("java.org.apache.catalina.connector.zzz.coyoteConnector.notAsciiSuperset");
-
keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.jsproot.version.invalid");
BackportEnglish backport = new BackportEnglish(args);
backport.execute();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Add a couple of keys to back-port exclusion list
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
The following commit(s) were added to refs/heads/main by this push:
new 7a0c8f1f9c Add a couple of keys to back-port exclusion list
7a0c8f1f9c is described below
commit 7a0c8f1f9cfcdd3acccfd670778325bb56288fad
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:49:56 2022 +0100
Add a couple of keys to back-port exclusion list
---
java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index 618e46bbff..292635a71e 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -33,9 +33,13 @@ public class BackportEnglish extends BackportBase {
public static void main(String... args) throws IOException {
+// Exclude keys known to be different between all versions
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.jsproot.version.invalid");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");
+
// Exclude keys known to be different between 10.0.x and 9.0.x
keysToExclude.add("java.org.apache.catalina.connector.zzz.coyoteConnector.notAsciiSuperset");
-
keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.jsproot.version.invalid");
BackportEnglish backport = new BackportEnglish(args);
backport.execute();
-
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: Fix 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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 17c6a886c5 Fix order
17c6a886c5 is described below
commit 17c6a886c5ff0d27a2b52722bb9565feafdffc5a
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:27:10 2022 +0100
Fix order
---
java/org/apache/catalina/core/LocalStrings.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 475f4e8641..a37fcf0fc4 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -68,6 +68,7 @@
applicationServletRegistration.setServletSecurity.ise=Security constraints can''
applicationSessionCookieConfig.ise=Property [{0}] cannot be added to
SessionCookieConfig for context [{1}] as the context has been initialised
+aprListener.FIPSProviderNotDefault=The FIPS provider must be configured as the
default provider when the AprLifecycleListener is configured with FIPS mode
[{0}]
aprListener.aprDestroy=Failed shutdown of the Apache Tomcat Native library
aprListener.aprInit=The Apache Tomcat Native library which allows using
OpenSSL was not found on the java.library.path: [{0}]
aprListener.aprInitDebug=The Apache Tomcat Native library could not be found
using names [{0}] on the java.library.path [{1}]. The errors reported were [{2}]
@@ -76,7 +77,6 @@ aprListener.config=APR/OpenSSL configuration: useAprConnector
[{0}], useOpenSSL
aprListener.currentFIPSMode=Current FIPS mode: [{0}]
aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force
entering FIPS mode, but library is already in FIPS mode [{0}]
aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters
[{2}], random [{3}], UDS [{4}].
-aprListener.FIPSProviderNotDefault=The FIPS provider must be configured as the
default provider when the AprLifecycleListener is configured with FIPS mode
[{0}]
aprListener.initializeFIPSFailed=Failed to enter FIPS mode
aprListener.initializeFIPSSuccess=Successfully entered FIPS mode
aprListener.initializedOpenSSL=OpenSSL successfully initialized [{0}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Improvements to Japanese translations contributed by tak7iji
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new b2074589e9 Improvements to Japanese translations contributed by tak7iji
b2074589e9 is described below
commit b2074589e944b640ef2b565121f543b71f37f276
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:25:50 2022 +0100
Improvements to Japanese translations contributed by tak7iji
---
java/org/apache/catalina/core/LocalStrings_ja.properties | 1 +
java/org/apache/tomcat/util/compat/LocalStrings_ja.properties | 2 ++
webapps/docs/changelog.xml| 3 +++
3 files changed, 6 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index c42c7ff456..7db42f6b04 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -82,6 +82,7 @@ aprListener.initializingFIPS=FIPSモードを初期化しています...
aprListener.requireNotInFIPSMode=AprLifecycleListenerはライブラリが既にFIPSモードになっている必要があるように設定されていますが、FIPSモードではありませんでした。
aprListener.skipFIPSInitialization=すでにFIPSモードになっています。FIPS初期化をスキップします。
aprListener.sslInit=SSLEngineの初期化に失敗しました。
+aprListener.sslRequired=バージョン 2.x以降ではSSLが必要なため、バージョン [{1}] のTomcat Native
ライブラリを使用する場合、 [{0}] はSSLEngineの有効な値ではありません。
aprListener.tcnInvalid=APRベースのApache
Tomcatネイティブライブラリの互換性のないバージョン[{0}]がインストールされていますが、Tomcatにはバージョン[{1}]が必要です。
aprListener.tcnValid=APRバージョン[{1}]を使用してAPRベースのApache
Tomcatネイティブライブラリ[{0}]をロードしました。
aprListener.tcnVersion=インストールされた Apache Tomcat ネイティブライブラリの APR バージョンは [{0}]
ですが、推奨する最小バージョンは [{1}] です。
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
index 38dc858c04..321daf4657 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
@@ -16,6 +16,8 @@
jre16Compat.javaPre16=クラスが見つからないため、コードがJava 16未満のJVMで実行されていると仮定します
jre16Compat.unexpected=Java 16クラスおよびメソッドへの参照の作成に失敗しました
+jre19Compat.javaPre19=クラスが見つからないため、Java 19より前のJVMでコードが実行されていると仮定します
+
jre9Compat.invalidModuleUri=モジュール URI [{0}] を JarScanner で処理する URL に変換できませんでした。
jre9Compat.javaPre9=クラスが見つからないため Java 9 以前の JVM 上でコードが実行されていると仮定します
jre9Compat.unexpected=Java9 クラスやメソッドへの参照の生成に失敗しました
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 55525603db..b5e984188f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -216,6 +216,9 @@
Improvements to French translations. (remm)
+
+Improvements to Japanese translations contributed by tak7iji. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Fix unnecessary escaping
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 6796406a60 Fix unnecessary escaping
6796406a60 is described below
commit 6796406a60850f1e7eb9e806dc7c22ffecb25887
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:25:12 2022 +0100
Fix unnecessary escaping
---
java/org/apache/catalina/tribes/util/LocalStrings_ko.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
b/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
index c8e6694726..713fea3399 100644
--- a/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
@@ -15,7 +15,7 @@
arrays.keyoffset.outOfBounds=keyoffset이 범위를 초과합니다.
arrays.length.outOfBounds=키 내에 충분한 데이터 엘리먼트들이 존재하지 않습니다. 길이가 범위 밖에 있습니다.
-arrays.malformed.arrays=바이트 배열은 반드시 ''{1,3,4,5,6}''과 같이 표현되어야 합니다.
+arrays.malformed.arrays=바이트 배열은 반드시 '{1,3,4,5,6}'과 같이 표현되어야 합니다.
arrays.srcoffset.outOfBounds=srcoffset이 범위 밖입니다.
executorFactory.not.running=Executor가 실행 중이 아닙니다. 명령을 강제로 큐에 넣을 수 없습니다.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Improvements to French translations (remm)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 642ff9b390 Improvements to French translations (remm)
642ff9b390 is described below
commit 642ff9b39035992316cd0cf770a300cda89ff202
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:24:41 2022 +0100
Improvements to French translations (remm)
---
java/org/apache/catalina/core/LocalStrings_fr.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml| 3 +++
4 files changed, 7 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 28e23cccf5..63a7cdf78c 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -82,6 +82,7 @@ aprListener.initializingFIPS=Initialisation du mode FIPS...
aprListener.requireNotInFIPSMode=AprLifecycleListener est configuré pour
demander que la librarie soit déjà en mode FIPS et elle ne l'était pas
aprListener.skipFIPSInitialization=Déjà en mode FIPS, l'initialisation de FIPS
n'est pas effectuée
aprListener.sslInit=Impossible d'initialiser le SSLEngine
+aprListener.sslRequired=[{0}] n''est pas une valeur valide pour SSLEngine
quand la version [{1}] de la librairie Tomcat Native est utilisée car SSL est
nécessaire à partir de la version 2.x
aprListener.tcnInvalid=Une version incompatible [{0}] de la librairie Apache
Tomcat Native basée sur APR est installée, alors que Tomcat nécessite la
version [{1}]
aprListener.tcnValid=Chargement de la librairie Apache Tomcat Native [{0}] en
utilisant APR version [{1}]
aprListener.tcnVersion=Un version ancienne [{0}] de la bibliothèque Apache
Tomcat Native basée sur APR est installée, alors que Tomcat recommande au
minimum la version [{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 19dd49f571..059b066da6 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -49,6 +49,7 @@ jsp.error.cannotAddResolver=Impossible d'appeler
addELResolver après qu'une pre
jsp.error.classname=Impossible de déterminer le nom de classe d'après le
fichier .class
jsp.error.coerce_to_type=Impossible de convertir la valeur [{2}] de
l''attribut [{0}] vers le type [{1}]
jsp.error.compilation=Erreur de compilation du fichier : [{0}] [{1}]
+jsp.error.compilation.dependent=Erreur de chargement de la classe [{0}]
jsp.error.compilation.jdt=Erreur de compilation
jsp.error.compilation.jdtProblemError=Erreur lors du traitement de la liste
des problèmes renvoyée par JDT
jsp.error.compilation.source=Erreur lors du chargement du fichier source [{0}]
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
index cfb8a966ba..5a621ff532 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
@@ -16,6 +16,8 @@
jre16Compat.javaPre16=Le code est considéré être exécuté sur une JVM
antérieure à Java 16 car la classe n'a pas été trouvée
jre16Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 16
+jre19Compat.javaPre19=Classe non trouvée donc le code est exécutée sur une JVM
antérieure à Java 19
+
jre9Compat.invalidModuleUri=L''URI du module fournie [{0}] n''a pas pu être
convertie en URL pour être traitée par le JarScanner
jre9Compat.javaPre9=Le code est considéré être exécuté sur une JVM antérieure
à Java 9 car la classe n'a pas été trouvée
jre9Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 9
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5153204057..55525603db 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -213,6 +213,9 @@
Update the Apache Tomcat migration tool for Jakarta EE library to
1.0.1.
(markt)
+
+Improvements to French translations. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove unused translation
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
The following commit(s) were added to refs/heads/main by this push:
new 38196da6cc Remove unused translation
38196da6cc is described below
commit 38196da6cc3c2d02fe7ee56634066897fdde2d5a
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:18:56 2022 +0100
Remove unused translation
---
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
index 08ec8f7f21..f06c775b51 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -153,7 +153,6 @@ sslUtilBase.aliasIgnored=FIPS已启用所以别名[{0}]将被忽略。如果key
sslUtilBase.alias_no_key_entry=别名[{0}]不标识密钥项
sslUtilBase.invalidTrustManagerClassName=提供的trustManagerClassName[{0}]未实现javax.net.ssl.TrustManager
sslUtilBase.keystore_load_failed=由于{2}，无法加载路径为{1}]的密钥库类型{0}]
-sslUtilBase.noCertFile=使用SSL连接器时必须定义SSLHostConfig属性certificateFile
sslUtilBase.noCrlSupport=truststoreProvider
[{0}]不支持certificateRevocationFile配置选项
sslUtilBase.noKeys=在密钥存储中找不到私钥的别名
sslUtilBase.noVerificationDepth=truststoreProvider[{0}]不支持CertificationDepth配置选项
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Clean up Korean translations
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
The following commit(s) were added to refs/heads/main by this push:
new 3d8d5fbf9b Clean up Korean translations
3d8d5fbf9b is described below
commit 3d8d5fbf9bf16aafbc84667195badb543d0b
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:18:37 2022 +0100
Clean up Korean translations
---
java/org/apache/catalina/tribes/util/LocalStrings_ko.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_ko.properties | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
b/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
index c8e6694726..713fea3399 100644
--- a/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties
@@ -15,7 +15,7 @@
arrays.keyoffset.outOfBounds=keyoffset이 범위를 초과합니다.
arrays.length.outOfBounds=키 내에 충분한 데이터 엘리먼트들이 존재하지 않습니다. 길이가 범위 밖에 있습니다.
-arrays.malformed.arrays=바이트 배열은 반드시 ''{1,3,4,5,6}''과 같이 표현되어야 합니다.
+arrays.malformed.arrays=바이트 배열은 반드시 '{1,3,4,5,6}'과 같이 표현되어야 합니다.
arrays.srcoffset.outOfBounds=srcoffset이 범위 밖입니다.
executorFactory.not.running=Executor가 실행 중이 아닙니다. 명령을 강제로 큐에 넣을 수 없습니다.
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
index 342304180e..4497247d79 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
@@ -155,7 +155,6 @@ sslUtilBase.aliasIgnored=FIPS이 활성화되어 있어, 별칭 [{0}]은(는)
sslUtilBase.alias_no_key_entry=별칭 이름 [{0}]을(를) 사용하여 키 엔트리를 식별해낼 수 없습니다.
sslUtilBase.invalidTrustManagerClassName=trustManagerClassName에 의해 제공된 클래스
[{0}]은(는) javax.net.ssl.TrustManager를 구현하지 않았습니다.
sslUtilBase.keystore_load_failed=[{2}](으)로 인하여, 경로 [{1}]에 있고 타입이 [{0}]인 키 저장소를
로드하지 못했습니다.
-sslUtilBase.noCertFile=SSLHostConfig의 속성인 certificateFile은, 반드시 SSL connector를
사용할 때에만 정의되어야 합니다.
sslUtilBase.noCrlSupport=truststoreProvider [{0}]은(는)
certificateRevocationFile 설정 옵션을 지원하지 않습니다.
sslUtilBase.noKeys=개인 키들에 대한 별칭들이 키 저장소에 없습니다.
sslUtilBase.noVerificationDepth=truststoreProvider [{0}]은(는)
certificateVerificationDepth 설정 옵션을 지원하지 않습니다.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Improvements to Japanese translations contributed tak7iji
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
The following commit(s) were added to refs/heads/main by this push:
new 9df45833f1 Improvements to Japanese translations contributed tak7iji
9df45833f1 is described below
commit 9df45833f1c0a37e0831a9cadbdfa776db706276
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:17:31 2022 +0100
Improvements to Japanese translations contributed tak7iji
---
java/org/apache/catalina/core/LocalStrings_ja.properties | 1 +
java/org/apache/tomcat/util/compat/LocalStrings_ja.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings_ja.properties| 1 -
webapps/docs/changelog.xml| 9 ++---
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 041b633ac5..7276a5373e 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -81,6 +81,7 @@ aprListener.initializingFIPS=FIPSモードを初期化しています...
aprListener.requireNotInFIPSMode=AprLifecycleListenerはライブラリが既にFIPSモードになっている必要があるように設定されていますが、FIPSモードではありませんでした。
aprListener.skipFIPSInitialization=すでにFIPSモードになっています。FIPS初期化をスキップします。
aprListener.sslInit=SSLEngineの初期化に失敗しました。
+aprListener.sslRequired=バージョン 2.x以降ではSSLが必要なため、バージョン [{1}] のTomcat Native
ライブラリを使用する場合、 [{0}] はSSLEngineの有効な値ではありません。
aprListener.tcnInvalid=APRベースのApache
Tomcatネイティブライブラリの互換性のないバージョン[{0}]がインストールされていますが、Tomcatにはバージョン[{1}]が必要です。
aprListener.tcnValid=APRバージョン[{1}]を使用してAPRベースのApache
Tomcatネイティブライブラリ[{0}]をロードしました。
aprListener.tcnVersion=インストールされた Apache Tomcat ネイティブライブラリの APR バージョンは [{0}]
ですが、推奨する最小バージョンは [{1}] です。
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
index d2beacc615..77b94c3136 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ja.properties
@@ -16,4 +16,6 @@
jre16Compat.javaPre16=クラスが見つからないため、コードがJava 16未満のJVMで実行されていると仮定します
jre16Compat.unexpected=Java 16クラスおよびメソッドへの参照の作成に失敗しました
+jre19Compat.javaPre19=クラスが見つからないため、Java 19より前のJVMでコードが実行されていると仮定します
+
jreCompat.noUnixDomainSocket=Java実行環境はUnixドメインソケットに対応していません。 この機能を使用するには、Java
16を使用する必要があります。
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
index 0121306b16..3df44e3624 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
@@ -155,7 +155,6 @@ sslUtilBase.aliasIgnored=FIPSが有効になっているため、エイリアス
sslUtilBase.alias_no_key_entry=別名 [{0}] はキーエントリを発見できません
sslUtilBase.invalidTrustManagerClassName=[{0}]が提供するtrustManagerClassNameはjavax.net.ssl.TrustManagerを実装していません。
sslUtilBase.keystore_load_failed=[{0}] のキーストア [{1}] の読み込みは [{2}] により失敗しました。
-sslUtilBase.noCertFile=SSLコネクタを使用する場合は、SSLHostConfigのcertificateFile属性を定義する必要があります。
sslUtilBase.noCrlSupport=トラストストアプロバイダー [{0}] は設定項目 certificateRevocationFile
に対応していません。
sslUtilBase.noKeys=キーストアで見つかった秘密キーのエイリアスがありません。
sslUtilBase.noVerificationDepth=トラストストアプロバイダー [{0}] は設定項目
certificateVerificationDepth に未対応です。
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b1b01d88ab..4bce2710b5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -249,6 +249,12 @@
Update the packaged version of the Tomcat Native Library to 2.0.1 to
pick up the Windows binaries built with with OpenSSL 3.0.5. (markt)
+
+Improvements to French translations. (remm)
+
+
+Improvements to Japanese translations contributed tak7iji. (markt)
+
@@ -378,9 +384,6 @@
Improvements to Chinese translations contributed by Dingzi2012. (markt)
-
-Improvements to French translations. (remm)
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Improvements to French translations
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
The following commit(s) were added to refs/heads/main by this push:
new 577b8d6af1 Improvements to French translations
577b8d6af1 is described below
commit 577b8d6af14fbe54d2e3a3591e67ee3d90cac82e
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:15:30 2022 +0100
Improvements to French translations
---
java/org/apache/catalina/core/LocalStrings_fr.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_fr.properties | 6 ++
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings_fr.properties| 1 -
webapps/docs/changelog.xml| 3 +++
5 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 4b4f6783ca..f92e6f1612 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -81,6 +81,7 @@ aprListener.initializingFIPS=Initialisation du mode FIPS...
aprListener.requireNotInFIPSMode=AprLifecycleListener est configuré pour
demander que la librarie soit déjà en mode FIPS et elle ne l'était pas
aprListener.skipFIPSInitialization=Déjà en mode FIPS, l'initialisation de FIPS
n'est pas effectuée
aprListener.sslInit=Impossible d'initialiser le SSLEngine
+aprListener.sslRequired=[{0}] n''est pas une valeur valide pour SSLEngine
quand la version [{1}] de la librairie Tomcat Native est utilisée car SSL est
nécessaire à partir de la version 2.x
aprListener.tcnInvalid=Une version incompatible [{0}] de la librairie Apache
Tomcat Native basée sur APR est installée, alors que Tomcat nécessite la
version [{1}]
aprListener.tcnValid=Chargement de la librairie Apache Tomcat Native [{0}] en
utilisant APR version [{1}]
aprListener.tcnVersion=Un version ancienne [{0}] de la bibliothèque Apache
Tomcat Native basée sur APR est installée, alors que Tomcat recommande au
minimum la version [{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 1a42f053b4..ccd403dfca 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -49,6 +49,7 @@ jsp.error.cannotAddResolver=Impossible d'appeler
addELResolver après qu'une pre
jsp.error.classname=Impossible de déterminer le nom de classe d'après le
fichier .class
jsp.error.coerce_to_type=Impossible de convertir la valeur [{2}] de
l''attribut [{0}] vers le type [{1}]
jsp.error.compilation=Erreur de compilation du fichier : [{0}] [{1}]
+jsp.error.compilation.dependent=Erreur de chargement de la classe [{0}]
jsp.error.compilation.jdt=Erreur de compilation
jsp.error.compilation.jdtProblemError=Erreur lors du traitement de la liste
des problèmes renvoyée par JDT
jsp.error.compilation.source=Erreur lors du chargement du fichier source [{0}]
@@ -143,6 +144,7 @@ jsp.error.page.conflict.autoflush=Directive de page : il
est illégal d''avoir p
jsp.error.page.conflict.buffer=Directive de page : il est illégal d''avoir
plusieurs occurrences de "buffer" avec des valeurs différentes (ancienne :
[{0}], nouvelle [{1}])
jsp.error.page.conflict.contenttype=Directive de page : il est illégal
d''avoir plusieurs occurrences de ''contentType'' avec des valeurs différentes
(ancienne : [{0}], nouvelle : [{1}])
jsp.error.page.conflict.deferredsyntaxallowedasliteral=Directive de page : il
est illégal d''avoir plusieurs occurrences de "deferedSyntaxAllowedAsLiteral"
avec des valeurs différentes (ancienne : [{0}], nouvelle [{1}])
+jsp.error.page.conflict.errorOnELNotFound=Directive de page: il est illégal
d''avoir plusieurs occurences de ''errorOnELNotFound'' avec des valeurs
différentes (ancienne: [{0}], nouvelle: [{1}])
jsp.error.page.conflict.errorpage=Directive de page : il est illégal d''avoir
plusieurs occurrences de "errorPage" avec des valeurs différentes (ancienne :
[{0}], nouvelle [{1}])
jsp.error.page.conflict.extends=Directive de page : il est illégal d''avoir
plusieurs occurrences de "extends" avec des valeurs différentes (ancienne :
[{0}], nouvelle [{1}])
jsp.error.page.conflict.info=Directive de page : il est illégal d''avoir
plusieurs occurrences de "info" avec des valeurs différentes (ancienne : [{0}],
nouvelle [{1}])
@@ -154,6 +156,7 @@ jsp.error.page.conflict.session=Directive de page : il est
illégal d''avoir plu
jsp.error.page.conflict.trimdirectivewhitespaces=Directive de page : il est
illégal d''avoir plusieurs occurrences de "trimDirectiveWhitespaces" avec des
valeurs différentes (ancienne : [{0}], nouvelle [{1}])
jsp.error.page.invalid.buffer=Directive de Page : valeur incorrecte pour
"buf
[GitHub] [tomcat] markt-asf commented on pull request #524: Dir redirect use301
markt-asf commented on PR #524: URL: https://github.com/apache/tomcat/pull/524#issuecomment-1183279698 I was thinking of calling `sendRedirect()` and then explicitly setting the status if a different one was required. Possibly checking the location header to determine if the call to `sendRedirect()` was successful or not. Haven't tested it though. Which reminds me, we might want to add some test cases. -- 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] funkman commented on pull request #524: Dir redirect use301
funkman commented on PR #524: URL: https://github.com/apache/tomcat/pull/524#issuecomment-1183274376 Looking at `org.apache.catalina.connector.Response` - Yes `sendRedirect()` does quite a few safety checks first. So yeah - this might have bad side effects with those missing checks. (such as isCommitted ) I do notice a `sendRedirect(String location, int status)` in `org.apache.catalina.connector.Response` which would be convenient to call instead and I just (re) checked https://javaee.github.io/javaee-spec/javadocs/javax/servlet/http/HttpServletResponse.html optimistically hoping `status` was a new option I missed. -- 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] branch 8.5.x updated: Automate handing of POEditor's over zealous escaping
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 45390f8a81 Automate handing of POEditor's over zealous escaping
45390f8a81 is described below
commit 45390f8a81f11f48e4ae54a7eba6a5c78b00b8ac
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:07:30 2022 +0100
Automate handing of POEditor's over zealous escaping
---
.../apache/tomcat/buildutil/translate/Import.java | 5 -
.../apache/tomcat/buildutil/translate/Utils.java | 25 ++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java
b/java/org/apache/tomcat/buildutil/translate/Import.java
index 1dcdd12375..0c02e69a9a 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -78,7 +78,10 @@ public class Import {
w.write(System.lineSeparator());
}
-w.write(cKey.key + "=" + Utils.formatValueImport(value));
+value = Utils.formatValueImport(value);
+value = Utils.fixUnnecessaryEscaping(cKey.key, value);
+
+w.write(cKey.key + "=" + value);
w.write(System.lineSeparator());
}
if (w != null) {
diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java
b/java/org/apache/tomcat/buildutil/translate/Utils.java
index 88d75c669a..63be4e0b44 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -22,16 +22,27 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
+import java.util.HashSet;
import java.util.Properties;
+import java.util.Set;
import java.util.regex.Pattern;
public class Utils {
private static final Pattern ESCAPE_LEADING_SPACE =
Pattern.compile("^(\\s)", Pattern.MULTILINE);
+private static final Set KEYS_WITH_UNNECESSARY_ESCAPING = new
HashSet<>();
+
// Package private so it is visible to tests
static final String PADDING = "POEDITOR_EXPORT_PADDING_DO_NOT_DELETE";
+static {
+KEYS_WITH_UNNECESSARY_ESCAPING.add("arrays.malformed.arrays");
+KEYS_WITH_UNNECESSARY_ESCAPING.add("jsp.error.attribute.deferredmix");
+KEYS_WITH_UNNECESSARY_ESCAPING.add("jsp.error.el.template.deferred");
+}
+
+
private Utils() {
// Utility class. Hide default constructor.
}
@@ -68,6 +79,20 @@ public class Utils {
}
+/*
+ * Values containing "[{n}]" and "'" need to have the "'" escaped as "''".
+ * POEditor attempts to do this automatically but does it for any value
+ * containing "{" or "}" leading to some unnecessary escaping. This method
+ * undoes the unnecessary escaping.
+ */
+static String fixUnnecessaryEscaping(String key, String value) {
+if (KEYS_WITH_UNNECESSARY_ESCAPING.contains(key)) {
+return value.replace("''", "'");
+}
+return value;
+}
+
+
/*
* Common formatting to convert a String for storage as a value in a
* property file.
-
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: Automate handing of POEditor's over zealous escaping
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 88634b3411 Automate handing of POEditor's over zealous escaping
88634b3411 is described below
commit 88634b3411c83adfd846b569a136e95902a42e93
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:07:30 2022 +0100
Automate handing of POEditor's over zealous escaping
---
.../apache/tomcat/buildutil/translate/Import.java | 5 -
.../apache/tomcat/buildutil/translate/Utils.java | 25 ++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java
b/java/org/apache/tomcat/buildutil/translate/Import.java
index 1dcdd12375..0c02e69a9a 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -78,7 +78,10 @@ public class Import {
w.write(System.lineSeparator());
}
-w.write(cKey.key + "=" + Utils.formatValueImport(value));
+value = Utils.formatValueImport(value);
+value = Utils.fixUnnecessaryEscaping(cKey.key, value);
+
+w.write(cKey.key + "=" + value);
w.write(System.lineSeparator());
}
if (w != null) {
diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java
b/java/org/apache/tomcat/buildutil/translate/Utils.java
index 80a7756a23..03d8b91cdb 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -26,17 +26,28 @@ import java.io.Reader;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import java.util.regex.Pattern;
public class Utils {
private static final Pattern ESCAPE_LEADING_SPACE =
Pattern.compile("^(\\s)", Pattern.MULTILINE);
+private static final Set KEYS_WITH_UNNECESSARY_ESCAPING = new
HashSet<>();
+
// Package private so it is visible to tests
static final String PADDING = "POEDITOR_EXPORT_PADDING_DO_NOT_DELETE";
+static {
+KEYS_WITH_UNNECESSARY_ESCAPING.add("arrays.malformed.arrays");
+KEYS_WITH_UNNECESSARY_ESCAPING.add("jsp.error.attribute.deferredmix");
+KEYS_WITH_UNNECESSARY_ESCAPING.add("jsp.error.el.template.deferred");
+}
+
+
private Utils() {
// Utility class. Hide default constructor.
}
@@ -86,6 +97,20 @@ public class Utils {
}
+/*
+ * Values containing "[{n}]" and "'" need to have the "'" escaped as "''".
+ * POEditor attempts to do this automatically but does it for any value
+ * containing "{" or "}" leading to some unnecessary escaping. This method
+ * undoes the unnecessary escaping.
+ */
+static String fixUnnecessaryEscaping(String key, String value) {
+if (KEYS_WITH_UNNECESSARY_ESCAPING.contains(key)) {
+return value.replace("''", "'");
+}
+return value;
+}
+
+
/*
* Common formatting to convert a String for storage as a value in a
* property file.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Automate handing of POEditor's over zealous escaping
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 1089def3c0 Automate handing of POEditor's over zealous escaping
1089def3c0 is described below
commit 1089def3c0dab5ea1e021392af40722ca765fe7a
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:07:30 2022 +0100
Automate handing of POEditor's over zealous escaping
---
.../apache/tomcat/buildutil/translate/Import.java | 5 -
.../apache/tomcat/buildutil/translate/Utils.java | 25 ++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java
b/java/org/apache/tomcat/buildutil/translate/Import.java
index e1fe9a3ead..d26c45e980 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -82,7 +82,10 @@ public class Import {
w.write(System.lineSeparator());
}
-w.write(cKey.key + "=" + Utils.formatValueImport(value));
+value = Utils.formatValueImport(value);
+value = Utils.fixUnnecessaryEscaping(cKey.key, value);
+
+w.write(cKey.key + "=" + value);
w.write(System.lineSeparator());
}
if (w != null) {
diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java
b/java/org/apache/tomcat/buildutil/translate/Utils.java
index 4550448ef1..8b12f38d79 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -26,17 +26,28 @@ import java.io.Reader;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import java.util.regex.Pattern;
public class Utils {
private static final Pattern ESCAPE_LEADING_SPACE =
Pattern.compile("^(\\s)", Pattern.MULTILINE);
+private static final Set KEYS_WITH_UNNECESSARY_ESCAPING = new
HashSet<>();
+
// Package private so it is visible to tests
static final String PADDING = "POEDITOR_EXPORT_PADDING_DO_NOT_DELETE";
+static {
+KEYS_WITH_UNNECESSARY_ESCAPING.add("arrays.malformed.arrays");
+KEYS_WITH_UNNECESSARY_ESCAPING.add("jsp.error.attribute.deferredmix");
+KEYS_WITH_UNNECESSARY_ESCAPING.add("jsp.error.el.template.deferred");
+}
+
+
private Utils() {
// Utility class. Hide default constructor.
}
@@ -86,6 +97,20 @@ public class Utils {
}
+/*
+ * Values containing "[{n}]" and "'" need to have the "'" escaped as "''".
+ * POEditor attempts to do this automatically but does it for any value
+ * containing "{" or "}" leading to some unnecessary escaping. This method
+ * undoes the unnecessary escaping.
+ */
+static String fixUnnecessaryEscaping(String key, String value) {
+if (KEYS_WITH_UNNECESSARY_ESCAPING.contains(key)) {
+return value.replace("''", "'");
+}
+return value;
+}
+
+
/*
* Common formatting to convert a String for storage as a value in a
* property file.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Automate handing of POEditor's over zealous escaping
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
The following commit(s) were added to refs/heads/main by this push:
new 45b979bb0f Automate handing of POEditor's over zealous escaping
45b979bb0f is described below
commit 45b979bb0f34bf863b722568ada05bee9b3d7de7
Author: Mark Thomas
AuthorDate: Wed Jul 13 15:07:30 2022 +0100
Automate handing of POEditor's over zealous escaping
---
.../apache/tomcat/buildutil/translate/Import.java | 5 -
.../apache/tomcat/buildutil/translate/Utils.java | 25 ++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java
b/java/org/apache/tomcat/buildutil/translate/Import.java
index e1fe9a3ead..d26c45e980 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -82,7 +82,10 @@ public class Import {
w.write(System.lineSeparator());
}
-w.write(cKey.key + "=" + Utils.formatValueImport(value));
+value = Utils.formatValueImport(value);
+value = Utils.fixUnnecessaryEscaping(cKey.key, value);
+
+w.write(cKey.key + "=" + value);
w.write(System.lineSeparator());
}
if (w != null) {
diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java
b/java/org/apache/tomcat/buildutil/translate/Utils.java
index 4550448ef1..8b12f38d79 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -26,17 +26,28 @@ import java.io.Reader;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import java.util.regex.Pattern;
public class Utils {
private static final Pattern ESCAPE_LEADING_SPACE =
Pattern.compile("^(\\s)", Pattern.MULTILINE);
+private static final Set KEYS_WITH_UNNECESSARY_ESCAPING = new
HashSet<>();
+
// Package private so it is visible to tests
static final String PADDING = "POEDITOR_EXPORT_PADDING_DO_NOT_DELETE";
+static {
+KEYS_WITH_UNNECESSARY_ESCAPING.add("arrays.malformed.arrays");
+KEYS_WITH_UNNECESSARY_ESCAPING.add("jsp.error.attribute.deferredmix");
+KEYS_WITH_UNNECESSARY_ESCAPING.add("jsp.error.el.template.deferred");
+}
+
+
private Utils() {
// Utility class. Hide default constructor.
}
@@ -86,6 +97,20 @@ public class Utils {
}
+/*
+ * Values containing "[{n}]" and "'" need to have the "'" escaped as "''".
+ * POEditor attempts to do this automatically but does it for any value
+ * containing "{" or "}" leading to some unnecessary escaping. This method
+ * undoes the unnecessary escaping.
+ */
+static String fixUnnecessaryEscaping(String key, String value) {
+if (KEYS_WITH_UNNECESSARY_ESCAPING.contains(key)) {
+return value.replace("''", "'");
+}
+return value;
+}
+
+
/*
* Common formatting to convert a String for storage as a value in a
* property file.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #524: Dir redirect use301
markt-asf commented on PR #524: URL: https://github.com/apache/tomcat/pull/524#issuecomment-1183239156 I like the look of the current diff. My only concern is by not calling `sendRedirect()` we bypass a bunch of checks. My plan is to see if there is an easy way around that. If there is, I'll merge this with whatever that fix is. If there isn't, I think we'll need to postpone merging to the next release round while we think about 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] branch 8.5.x updated: Fix recommended version in log message
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new a0d21a4bcf Fix recommended version in log message
a0d21a4bcf is described below
commit a0d21a4bcff5d04dd3d5f3cb9b330ee44af40e8f
Author: Mark Thomas
AuthorDate: Wed Jul 13 11:12:25 2022 +0100
Fix recommended version in log message
---
java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 88b27c83ef..301e3623e2 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -256,7 +256,7 @@ public class AprLifecycleListener implements
LifecycleListener {
if (tcnVersion < rcver) {
initInfoLogMessages.add(sm.getString("aprListener.tcnVersion",
Library.versionString(),
-TCN_REQUIRED_MAJOR + "." +
+TCN_RECOMMENDED_MAJOR + "." +
TCN_RECOMMENDED_MINOR + "." +
TCN_RECOMMENDED_PV));
}
-
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: Fix recommended version in log message
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 134483cbb9 Fix recommended version in log message
134483cbb9 is described below
commit 134483cbb9a22fab61176aaeffe7c284a906076b
Author: Mark Thomas
AuthorDate: Wed Jul 13 11:12:25 2022 +0100
Fix recommended version in log message
---
java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 6f7d280202..af126ea24e 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -250,7 +250,7 @@ public class AprLifecycleListener implements
LifecycleListener {
if (tcnVersion < rcver) {
initInfoLogMessages.add(sm.getString("aprListener.tcnVersion",
Library.versionString(),
-TCN_REQUIRED_MAJOR + "." +
+TCN_RECOMMENDED_MAJOR + "." +
TCN_RECOMMENDED_MINOR + "." +
TCN_RECOMMENDED_PV));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Fix recommended version in log message
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new d8582df92a Fix recommended version in log message
d8582df92a is described below
commit d8582df92a2397e9b0121098cd6d069f995095ad
Author: Mark Thomas
AuthorDate: Wed Jul 13 11:12:25 2022 +0100
Fix recommended version in log message
---
java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 7038af8ae7..59f4973773 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -250,7 +250,7 @@ public class AprLifecycleListener implements
LifecycleListener {
if (tcnVersion < rcver) {
initInfoLogMessages.add(sm.getString("aprListener.tcnVersion",
Library.versionString(),
-TCN_REQUIRED_MAJOR + "." +
+TCN_RECOMMENDED_MAJOR + "." +
TCN_RECOMMENDED_MINOR + "." +
TCN_RECOMMENDED_PV));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Fix recommended version in log message
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 f15f8ad870cb63e9573f65ff3da4de97eba2a928
Author: Mark Thomas
AuthorDate: Wed Jul 13 11:12:25 2022 +0100
Fix recommended version in log message
---
java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index f596795806..ca31e01a38 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -249,7 +249,7 @@ public class AprLifecycleListener implements
LifecycleListener {
if (tcnVersion < rcver) {
initInfoLogMessages.add(sm.getString("aprListener.tcnVersion",
Library.versionString(),
-TCN_REQUIRED_MAJOR + "." +
+TCN_RECOMMENDED_MAJOR + "." +
TCN_RECOMMENDED_MINOR + "." +
TCN_RECOMMENDED_PV));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update the Tomcat Native Library to 2.0.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.git
commit cb1b9683eb073ec99c11bc69e0c8dd12f5d155ee
Author: Mark Thomas
AuthorDate: Wed Jul 13 11:07:30 2022 +0100
Update the Tomcat Native Library to 2.0.1
---
build.properties.default| 10 +-
java/org/apache/catalina/core/AprLifecycleListener.java | 6 +++---
webapps/docs/changelog.xml | 12
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 97ecc7fd59..acdfb5dc02 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -152,19 +152,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.34
+tomcat-native.version=2.0.1
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=03b167fdfaa16db6a0f3acd849b9dfed33aedad2316de6a2aba57b6b11ef4055790e8d96a66f14e6d5ce2200fafdf80b3e8ca0e8f206e4f28de841d8b217787f
+tomcat-native.src.checksum.value=c56e4e739e74fbf627e6f503a0cb40a7b502663e2bed19468fac8d11bab3ce36a117eae41b3f0a19ebeef537123b7eb7d3346fc182f2e142f8c829df884c6f08
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=ea0489c33f2741f2b7cbc26bfd7fc500583bf62bf7564c4798205c7395bc1d2c000914b30cb492a33614ae45b030ba5952e70956a79ee16ac4019b80c5627282
+tomcat-native.win.checksum.value=9e727bd66db299058de647ab33c0612e184f6c05976e5b6cc330172588aab537f6e19f01129429039cb2516398850a5ceec0739993c226ab20f99b9677acf948
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1o-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1o-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-3.0.5-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-3.0.5-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.08
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 60e6d1036b..f596795806 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -69,9 +69,9 @@ public class AprLifecycleListener implements
LifecycleListener {
protected static final int TCN_REQUIRED_MAJOR = 1;
protected static final int TCN_REQUIRED_MINOR = 2;
protected static final int TCN_REQUIRED_PATCH = 34;
-protected static final int TCN_RECOMMENDED_MAJOR = 1;
-protected static final int TCN_RECOMMENDED_MINOR = 2;
-protected static final int TCN_RECOMMENDED_PV = 34;
+protected static final int TCN_RECOMMENDED_MAJOR = 2;
+protected static final int TCN_RECOMMENDED_MINOR = 0;
+protected static final int TCN_RECOMMENDED_PV = 1;
// -- Properties
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f31debc1f6..658ca78de1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -154,6 +154,10 @@
API updates and fixes. Improves memory session usage and avoids some
allocations. Review from Maurizio Cimadamore. (remm)
+
+Update the minimum recommended version of the Tomcat Native Library to
+2.0.1. (markt)
+
@@ -213,10 +217,6 @@
information is embedded in a number of build outputs such as JAR file
manifests. (markt)
-
-Update the packaged version of the Tomcat Native Library to 1.2.34 to
-improve the support for building with OpenSSL 3.0.x.(markt)
-
Update the minimum supported version of Tomcat Native to 1.2.34 to
allow
the removal of the deprecated Java API associated with features that
@@ -245,6 +245,10 @@
[tomcat] branch main updated (ec4002ea51 -> f15f8ad870)
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 ec4002ea51 Update Tomcat migration tool for Jakarta EE to 1.0.1 new cb1b9683eb Update the Tomcat Native Library to 2.0.1 new f15f8ad870 Fix recommended version in log message 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: build.properties.default| 10 +- java/org/apache/catalina/core/AprLifecycleListener.java | 8 webapps/docs/changelog.xml | 12 3 files changed, 17 insertions(+), 13 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r55718 - /release/tomcat/tomcat-connectors/native/1.2.34/
Author: markt Date: Wed Jul 13 09:54:16 2022 New Revision: 55718 Log: Drop Tomcat Native 1.2.34 from mirror system Removed: release/tomcat/tomcat-connectors/native/1.2.34/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1902700 - in /tomcat/site/trunk: docs/download-native.html docs/index.html docs/oldnews.html xdocs/download-native.xml xdocs/index.xml xdocs/oldnews.xml
Author: markt Date: Wed Jul 13 09:52:43 2022 New Revision: 1902700 URL: http://svn.apache.org/viewvc?rev=1902700&view=rev Log: Update site for release of Apache Tomcat Native 1.2.35 Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/xdocs/download-native.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1902700&r1=1902699&r2=1902700&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Wed Jul 13 09:52:43 2022 @@ -11,9 +11,9 @@ Quick Navigation [define v]2.0.1[end] -[define w]1.2.34[end] +[define w]1.2.35[end] [define y]3.0.5[end] -[define z]1.1.1o[end] +[define z]1.1.1q[end] https://downloads.apache.org/tomcat/tomcat-connectors/KEYS";>KEYS | [v] | [w] | Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1902700&r1=1902699&r2=1902700&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Wed Jul 13 09:52:43 2022 @@ -52,6 +52,20 @@ changes compared to the 1.2x branch incl https://tomcat.apache.org/download-native.cgi";>Download | ChangeLog for 2.0.1 +2022-07-12 Tomcat Native 1.2.35 Released + +The Apache Tomcat Project is proud to announce the release of version 1.2.35 of +Tomcat Native. The notable changes since 1.2.34 include: + + +Windows binaries built with OpenSSL 1.1.1q. +Document TLS renegotiation behaviour +Document the release process + + +https://tomcat.apache.org/download-native.cgi";>Download | +ChangeLog for 1.2.35 + 2022-07-11 Tomcat Migration Tool for Jakarta EE 1.0.1 Released The Apache Tomcat Project is proud to announce the release of 1.0.1 of the @@ -71,22 +85,6 @@ Full details of these changes, and all t https://tomcat.apache.org/download-migration.cgi";>Download -2022-06-14 Tomcat Native 1.2.34 Released - -The Apache Tomcat Project is proud to announce the release of version 1.2.34 of -Tomcat Native. The notable changes since 1.2.33 include: - - -Refactor the initialization of the native code so it is compatible -with Tomcat 10.1.x where deprecated Java classes will be removed. -Map the OpenSSL 3.0.x FIPS behaviour to the 1.1.1 API to allow clients -to determine if the FIPS provider is being used when Tomcat Native is -compiled against OpenSSL 3.0.x. - - -https://tomcat.apache.org/download-native.cgi";>Download | -ChangeLog for 1.2.34 - 2022-06-11 Tomcat 8.5.81 Released The Apache Tomcat Project is proud to announce the release of version 8.5.81. Modified: tomcat/site/trunk/docs/oldnews.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1902700&r1=1902699&r2=1902700&view=diff == --- tomcat/site/trunk/docs/oldnews.html (original) +++ tomcat/site/trunk/docs/oldnews.html Wed Jul 13 09:52:43 2022 @@ -16,6 +16,22 @@ year 2011 year 2010 +2022-06-14 Tomcat Native 1.2.34 Released + +The Apache Tomcat Project is proud to announce the release of version 1.2.34 of +Tomcat Native. The notable changes since 1.2.33 include: + + +Refactor the initialization of the native code so it is compatible +with Tomcat 10.1.x where deprecated Java classes will be removed. +Map the OpenSSL 3.0.x FIPS behaviour to the 1.1.1 API to allow clients +to determine if the FIPS provider is being used when Tomcat Native is +compiled against OpenSSL 3.0.x. + + +https://tomcat.apache.org/download-native.cgi";>Download | +ChangeLog for 1.2.34 + 2022-05-23 Tomcat 8.5.79 Released The Apache Tomcat Project is proud to announce the release of version 8.5.79 Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1902700&r1=1902699&r2=1902700&view=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Wed Jul 13 09:52:43 2022 @@ -23,9 +23,9 @@ Documentation for ezt.py: https://code.google.com/p/ezt/wiki/Syntax --> [define v]2.0.1[end] -[define w]1.2.34[end] +[define w]1.2.35[end] [define y]3.0.5[end] -[define z]1.1.1o[end] +[define z]1.1.1q[end] https://downloads.apache.org/tomcat/tomcat-connectors/KEYS";>KEYS | [v] | [w] | Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1902700&r1=1902699&r2=1902700&view=diff
svn commit: r1902699 - /tomcat/site/trunk/native-1.2-xdocs/
Author: markt Date: Wed Jul 13 09:48:44 2022 New Revision: 1902699 URL: http://svn.apache.org/viewvc?rev=1902699&view=rev Log: Ignore all Modified: tomcat/site/trunk/native-1.2-xdocs/ (props changed) Propchange: tomcat/site/trunk/native-1.2-xdocs/ -- --- svn:ignore (added) +++ svn:ignore Wed Jul 13 09:48:44 2022 @@ -0,0 +1 @@ +* - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1902698 - in /tomcat/site/trunk/docs/native-1.2-doc: ./ miscellaneous/ news/
Author: markt Date: Wed Jul 13 09:46:35 2022 New Revision: 1902698 URL: http://svn.apache.org/viewvc?rev=1902698&view=rev Log: Update docs for Tomcat Native 1.2.35 release Added: tomcat/site/trunk/docs/native-1.2-doc/miscellaneous/tls-renegotiation.html Modified: tomcat/site/trunk/docs/native-1.2-doc/index.html tomcat/site/trunk/docs/native-1.2-doc/miscellaneous/changelog.html tomcat/site/trunk/docs/native-1.2-doc/news/2008.html tomcat/site/trunk/docs/native-1.2-doc/news/2009.html tomcat/site/trunk/docs/native-1.2-doc/news/2010.html tomcat/site/trunk/docs/native-1.2-doc/news/2011.html tomcat/site/trunk/docs/native-1.2-doc/news/2012.html tomcat/site/trunk/docs/native-1.2-doc/news/2013.html tomcat/site/trunk/docs/native-1.2-doc/news/2014.html tomcat/site/trunk/docs/native-1.2-doc/news/2015.html tomcat/site/trunk/docs/native-1.2-doc/news/2016.html tomcat/site/trunk/docs/native-1.2-doc/news/2017.html tomcat/site/trunk/docs/native-1.2-doc/news/2018.html tomcat/site/trunk/docs/native-1.2-doc/news/2019.html tomcat/site/trunk/docs/native-1.2-doc/news/2020.html tomcat/site/trunk/docs/native-1.2-doc/news/2021.html tomcat/site/trunk/docs/native-1.2-doc/news/2022.html Modified: tomcat/site/trunk/docs/native-1.2-doc/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-1.2-doc/index.html?rev=1902698&r1=1902697&r2=1902698&view=diff == --- tomcat/site/trunk/docs/native-1.2-doc/index.html (original) +++ tomcat/site/trunk/docs/native-1.2-doc/index.html Wed Jul 13 09:46:35 2022 @@ -1,5 +1,5 @@ -Apache Tomcat Native Library - Documentation Indexhttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">Apache Tomcat Native LibraryLinksDocs HomeMiscellaneous DocumentationChangelogNews202220212020201920182017201620152014201320122011201020092008Documentation IndexIntroduction +Apache Tomcat Native Library - Documentation Indexhttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">Apache Tomcat Native LibraryLinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews202220212020201920182017201620152014201320122011201020092008Documentation IndexIntroduction The Apache Tomcat Native Library is an optional component for use with @@ -28,10 +28,10 @@ Headlines -14 June 2022 - TC-Native-1.2.34 +12 July 2022 - TC-Native-1.2.35 released The Apache Tomcat team is proud to announce the immediate availability of -Tomcat Native 1.2.34 Stable. +Tomcat Native 1.2.35 Stable. The sources and the binaries for selected platforms are available from the Download page. Modified: tomcat/site/trunk/docs/native-1.2-doc/miscellaneous/changelog.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-1.2-doc/miscellaneous/changelog.html?rev=1902698&r1=1902697&r2=1902698&view=diff == --- tomcat/site/trunk/docs/native-1.2-doc/miscellaneous/changelog.html (original) +++ tomcat/site/trunk/docs/native-1.2-doc/miscellaneous/changelog.html Wed Jul 13 09:46:35 2022 @@ -1,8 +1,20 @@ -The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - Miscellaneous Documentation LinksDocs HomeMiscellaneous DocumentationChangelogNews202220212020201920182017201620152014201320122011201020092008Preface +The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - Miscellaneous DocumentationLinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews202220212020201920182017201620152014201320122011201020092008< /div>Preface This is the Changelog for Tomcat Native 1.2. +Changes in 1.2.35 + + + Document the TLS rengotiation behaviour. (markt) + + + Add HOWTO-RELEASE.txt that describes the release process. (markt) + + + Update recommended OpenSSL version to 1.1.1q or later. (markt) + + Changes in 1.2.34 Added: tomcat/site/trunk/docs/native-1.2-doc/miscellaneous/tls-renegotiation.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-1.2-doc/miscellaneous/tls-renegotiation.html?rev=1902698&view=auto == --- tomcat/site/trunk/docs/native-1.2-doc/miscellaneous/tls-renegotiation.html (added) +++ tomcat/site/trunk/docs/native-1.2-doc/miscellaneous/tls-renegotiation.html Wed Jul 13 09:46:35 2022 @@ -0,0 +1,22 @@ + +The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - Miscellaneous DocumentationLinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews2022202120202019201820172016201520
svn commit: r1902697 - in /tomcat/site/trunk/docs/native-doc: ./ miscellaneous/ news/
Author: markt Date: Wed Jul 13 09:43:18 2022 New Revision: 1902697 URL: http://svn.apache.org/viewvc?rev=1902697&view=rev Log: Update Native 2.0 docs Removed: tomcat/site/trunk/docs/native-doc/news/2008.html tomcat/site/trunk/docs/native-doc/news/2009.html tomcat/site/trunk/docs/native-doc/news/2010.html tomcat/site/trunk/docs/native-doc/news/2011.html tomcat/site/trunk/docs/native-doc/news/2012.html tomcat/site/trunk/docs/native-doc/news/2013.html tomcat/site/trunk/docs/native-doc/news/2014.html tomcat/site/trunk/docs/native-doc/news/2015.html tomcat/site/trunk/docs/native-doc/news/2016.html tomcat/site/trunk/docs/native-doc/news/2017.html tomcat/site/trunk/docs/native-doc/news/2018.html tomcat/site/trunk/docs/native-doc/news/2019.html tomcat/site/trunk/docs/native-doc/news/2020.html tomcat/site/trunk/docs/native-doc/news/2021.html Modified: tomcat/site/trunk/docs/native-doc/index.html tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html tomcat/site/trunk/docs/native-doc/miscellaneous/tls-renegotiation.html tomcat/site/trunk/docs/native-doc/news/2022.html Modified: tomcat/site/trunk/docs/native-doc/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1902697&r1=1902696&r2=1902697&view=diff == --- tomcat/site/trunk/docs/native-doc/index.html (original) +++ tomcat/site/trunk/docs/native-doc/index.html Wed Jul 13 09:43:18 2022 @@ -1,5 +1,5 @@ -Apache Tomcat Native Library - Documentation Indexhttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">Apache Tomcat Native LibraryLinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews202220212020201920182017201620152014201320122011201020092008Documentation IndexIntroduction +Apache Tomcat Native Library - Documentation Indexhttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">Apache Tomcat Native LibraryLinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews2022Documentation IndexIntroduction The Apache Tomcat Native Library is an optional component for use with Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1902697&r1=1902696&r2=1902697&view=diff == --- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original) +++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Wed Jul 13 09:43:18 2022 @@ -1,5 +1,5 @@ -The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - Miscellaneous DocumentationLinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews202220212020201920182017201620152014201320122011201020092008< /div>Preface +The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - Miscellaneous DocumentationLinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews2022Preface This is the Changelog for Apache Tomcat Native 2.0.x. The Tomcat Native 2.0.x branch started from the 1.2.33 tag. Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/tls-renegotiation.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/tls-renegotiation.html?rev=1902697&r1=1902696&r2=1902697&view=diff == --- tomcat/site/trunk/docs/native-doc/miscellaneous/tls-renegotiation.html (original) +++ tomcat/site/trunk/docs/native-doc/miscellaneous/tls-renegotiation.html Wed Jul 13 09:43:18 2022 @@ -1,5 +1,5 @@ -The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - Miscellaneous DocumentationLinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews202220212020201920182017201620152014201320122011201020092008< /div>Introduction +The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - Miscellaneous DocumentationLinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews2022Introduction Historically there have been security issues associated with TLS renegotiation. This page describes the renegotiation behaviour of the Tomcat Modified: tomcat/site/trunk/docs/native-doc/news/2022.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2022.html?rev=1902697&r1=1902696&r2=1902697&view=diff == --- tomcat/site/tru
[tomcat-native] branch 1.2.x updated: Add release date for 1.2.35
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new bce1a73aa Add release date for 1.2.35 bce1a73aa is described below commit bce1a73aafeab1d61725dcd1c521e324819fdaab Author: Mark Thomas AuthorDate: Wed Jul 13 10:39:12 2022 +0100 Add release date for 1.2.35 --- xdocs/index.xml | 4 ++-- xdocs/news/2022.xml | 5 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xdocs/index.xml b/xdocs/index.xml index cc2d51821..13a576651 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -60,10 +60,10 @@ -14 June 2022 - TC-Native-1.2.34 +12 July 2022 - TC-Native-1.2.35 released The Apache Tomcat team is proud to announce the immediate availability of -Tomcat Native 1.2.34 Stable. +Tomcat Native 1.2.35 Stable. The sources and the binaries for selected platforms are available from the Download page. diff --git a/xdocs/news/2022.xml b/xdocs/news/2022.xml index 0d27c5571..c3ef6eac8 100644 --- a/xdocs/news/2022.xml +++ b/xdocs/news/2022.xml @@ -29,6 +29,11 @@ + + The Apache Tomcat team is proud to announce the immediate availability of + Tomcat Native 1.2.35. This is a bugfix release. + + The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.2.34. This is a bugfix release. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated: Remove 1.2.x news from 2.0.x branch
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 eff76a472 Remove 1.2.x news from 2.0.x branch eff76a472 is described below commit eff76a47230ff7e4eaa5eb1a6d4dfcde4ae3095d Author: Mark Thomas AuthorDate: Wed Jul 13 10:37:42 2022 +0100 Remove 1.2.x news from 2.0.x branch --- xdocs/miscellaneous/project.xml | 14 xdocs/news/2008.xml | 57 xdocs/news/2009.xml | 41 --- xdocs/news/2010.xml | 46 -- xdocs/news/2011.xml | 42 xdocs/news/2012.xml | 52 - xdocs/news/2013.xml | 55 --- xdocs/news/2014.xml | 52 - xdocs/news/2015.xml | 59 - xdocs/news/2016.xml | 72 - xdocs/news/2017.xml | 55 --- xdocs/news/2018.xml | 55 --- xdocs/news/2019.xml | 44 - xdocs/news/2020.xml | 49 xdocs/news/2021.xml | 54 --- xdocs/news/2022.xml | 27 xdocs/news/project.xml | 14 xdocs/project.xml | 14 18 files changed, 13 insertions(+), 789 deletions(-) diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml index 1153ee1ea..786b2113b 100644 --- a/xdocs/miscellaneous/project.xml +++ b/xdocs/miscellaneous/project.xml @@ -36,20 +36,6 @@ - - - - - - - - - - - - - - diff --git a/xdocs/news/2008.xml b/xdocs/news/2008.xml deleted file mode 100644 index 20e2d466a..0 --- a/xdocs/news/2008.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - -]> - - - &project; - - -2008 News and Status - - - - - - -The Apache Tomcat team is proud to announce the immediate availability -of Tomcat Native 1.1.16. This is a stable release adding some bug fixes. - - - -The Apache Tomcat team is proud to announce the immediate availability -of Tomcat Native 1.1.15. This is a stable release adding some bug fixes. - - - -The Apache Tomcat team is proud to announce the immediate availability -of Tomcat Native 1.1.14. This is a stable release adding some bug fixes. - - - -The Apache Tomcat team is proud to announce the immediate availability -of Tomcat Native 1.1.13. This is a stable release adding few new features -and some bug fixes. - - Please see the ChangeLog for a full list of changes. - - - - - diff --git a/xdocs/news/2009.xml b/xdocs/news/2009.xml deleted file mode 100644 index 7bd0592aa..0 --- a/xdocs/news/2009.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - -]> - - - &project; - - -2009 News and Status - - - - - - -The Apache Tomcat team is proud to announce the immediate availability -of Tomcat Native 1.1.18. This is a stable release adding some bug fixes. - - Please see the ChangeLog for a full list of changes. - - - - - diff --git a/xdocs/news/2010.xml b/xdocs/news/2010.xml deleted file mode 100644 index e407bd78c..0 --- a/xdocs/news/2010.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - -]> - - - &project; - - -2010 News and Status - - - - - - -The Apache Tomcat team is proud to announce the immediate availability -of Tomcat Native 1.1.20. This is a stable release adding some bug fixes. - - - -The Apache Tomcat team is proud to announce the immediate availability -of Tomcat Native 1.1.19. This is a stable release adding some bug fixes. - - Please see the ChangeLog for a full list of changes. - - - - - diff --git a/xdocs/news/2011.xml b/xdocs/news/2011.xml deleted file mode 100644 index e24720167..0 --- a/xdocs/news/2011.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - -]> - - - &project; - - -2011 News and Status - - - - - - -The Apache Tomcat team is proud to announce the immediate availability -of Tomcat Native 1.1.22. This is a stable release adding some bug fixes. - - - Please see the ChangeLog for a full list of changes. - - - - - diff --git a/xdocs/news/2012.xml b/xdocs/news/2012.xml deleted file mode 100644 index 902d48f04..0 --- a/xdocs/news/2012.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - -]> - - - &project; - - -2012 News and Status - - - - - - -The Apache Tomcat team is proud to announce the immediate availability -of Tomcat Native 1.1.24. This is a feature-add release adding support for -per-socket Poller timeouts. - - - Please see the ChangeLog for a full list of changes. - - - -The Apache
[ANN] Apache Tomcat Native 2.0.1 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat Native 2.0.1 stable. The key features of this release are: - 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. - The minimum supported versions have been increased to OpenSSL 3.0.x, Apache APR 1.7.x, Java 11, Windows 7 / Server 2008 R2 - The windows binaries in this release have been built with OpenSSL 3.0.5 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. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/native-doc/miscellaneous/changelog.html Downloads: http://tomcat.apache.org/download-native.cgi The Apache Tomcat Native Library 2.0.x provides an API for using OpenSSL for SSL networking with Apache Tomcat. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1902696 - in /tomcat/site/trunk: docs/bugreport.html xdocs/bugreport.xml
Author: markt Date: Wed Jul 13 09:16:07 2022 New Revision: 1902696 URL: http://svn.apache.org/viewvc?rev=1902696&view=rev Log: Add entry for Tomcat Native 1.2.x Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/xdocs/bugreport.xml Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1902696&r1=1902695&r2=1902696&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Wed Jul 13 09:16:07 2022 @@ -233,7 +233,7 @@ problem you are having before reporting - Tomcat Native + Tomcat Native 2.0 https://tomcat.apache.org/native-doc/miscellaneous/changelog.html";>changelog.html @@ -241,6 +241,16 @@ problem you are having before reporting https://github.com/apache/tomcat-native/blob/main/xdocs/miscellaneous/changelog.xml";>changelog.xml + + + Tomcat Native 1.2 + +https://tomcat.apache.org/native-1.2-doc/miscellaneous/changelog.html";>changelog.html + + +https://github.com/apache/tomcat-native/blob/1.2.x/xdocs/miscellaneous/changelog.xml";>changelog.xml + + Modified: tomcat/site/trunk/xdocs/bugreport.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/bugreport.xml?rev=1902696&r1=1902695&r2=1902696&view=diff == --- tomcat/site/trunk/xdocs/bugreport.xml (original) +++ tomcat/site/trunk/xdocs/bugreport.xml Wed Jul 13 09:16:07 2022 @@ -249,7 +249,7 @@ problem you are having before reporting - Tomcat Native + Tomcat Native 2.0 https://tomcat.apache.org/native-doc/miscellaneous/changelog.html";>changelog.html @@ -257,6 +257,16 @@ problem you are having before reporting https://github.com/apache/tomcat-native/blob/main/xdocs/miscellaneous/changelog.xml";>changelog.xml + + + Tomcat Native 1.2 + +https://tomcat.apache.org/native-1.2-doc/miscellaneous/changelog.html";>changelog.html + + +https://github.com/apache/tomcat-native/blob/1.2.x/xdocs/miscellaneous/changelog.xml";>changelog.xml + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1902695 - in /tomcat/site/trunk: docs/ xdocs/
Author: markt Date: Wed Jul 13 09:14:41 2022 New Revision: 1902695 URL: http://svn.apache.org/viewvc?rev=1902695&view=rev Log: Update changelog links Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews-2012.html tomcat/site/trunk/docs/oldnews-2013.html tomcat/site/trunk/docs/oldnews-2014.html tomcat/site/trunk/docs/oldnews-2015.html tomcat/site/trunk/docs/oldnews-2016.html tomcat/site/trunk/docs/oldnews-2017.html tomcat/site/trunk/docs/oldnews-2018.html tomcat/site/trunk/docs/oldnews-2019.html tomcat/site/trunk/docs/oldnews-2020.html tomcat/site/trunk/docs/oldnews-2021.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews-2012.xml tomcat/site/trunk/xdocs/oldnews-2013.xml tomcat/site/trunk/xdocs/oldnews-2014.xml tomcat/site/trunk/xdocs/oldnews-2015.xml tomcat/site/trunk/xdocs/oldnews-2016.xml tomcat/site/trunk/xdocs/oldnews-2017.xml tomcat/site/trunk/xdocs/oldnews-2018.xml tomcat/site/trunk/xdocs/oldnews-2019.xml tomcat/site/trunk/xdocs/oldnews-2020.xml tomcat/site/trunk/xdocs/oldnews-2021.xml tomcat/site/trunk/xdocs/oldnews.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1902695&r1=1902694&r2=1902695&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Wed Jul 13 09:14:41 2022 @@ -85,7 +85,7 @@ Tomcat Native. The notable changes since https://tomcat.apache.org/download-native.cgi";>Download | -ChangeLog for 1.2.34 +ChangeLog for 1.2.34 2022-06-11 Tomcat 8.5.81 Released Modified: tomcat/site/trunk/docs/oldnews-2012.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2012.html?rev=1902695&r1=1902694&r2=1902695&view=diff == --- tomcat/site/trunk/docs/oldnews-2012.html (original) +++ tomcat/site/trunk/docs/oldnews-2012.html Wed Jul 13 09:14:41 2022 @@ -209,7 +209,7 @@ Tomcat Native. https://tomcat.apache.org/download-native.cgi";>Download | -ChangeLog for 1.1.24 +ChangeLog for 1.1.24 2012-05-31 Tomcat Connectors 1.2.37 Released @@ -288,7 +288,7 @@ This version is principally a bugfix rel https://tomcat.apache.org/download-native.cgi";>Download | -ChangeLog for 1.1.23 +ChangeLog for 1.1.23 2012-02-21 Tomcat 7.0.26 Released Modified: tomcat/site/trunk/docs/oldnews-2013.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2013.html?rev=1902695&r1=1902694&r2=1902695&view=diff == --- tomcat/site/trunk/docs/oldnews-2013.html (original) +++ tomcat/site/trunk/docs/oldnews-2013.html Wed Jul 13 09:14:41 2022 @@ -138,7 +138,7 @@ Tomcat Native. https://tomcat.apache.org/download-native.cgi";>Download | -ChangeLog for 1.1.29 +ChangeLog for 1.1.29 2013-09-23 Tomcat 8.0.0-RC3 (alpha) Released Modified: tomcat/site/trunk/docs/oldnews-2014.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2014.html?rev=1902695&r1=1902694&r2=1902695&view=diff == --- tomcat/site/trunk/docs/oldnews-2014.html (original) +++ tomcat/site/trunk/docs/oldnews-2014.html Wed Jul 13 09:14:41 2022 @@ -94,7 +94,7 @@ Tomcat Native. The notable changes since https://tomcat.apache.org/download-native.cgi";>Download | -ChangeLog for 1.1.32 +ChangeLog for 1.1.32 2014-10-06 Tomcat 7.0.56 Released @@ -229,7 +229,7 @@ Tomcat Native. The notable changes since https://tomcat.apache.org/download-native.cgi";>Download | -ChangeLog for 1.1.31 +ChangeLog for 1.1.31 2014-06-25 Tomcat 8.0.9 Released @@ -366,7 +366,7 @@ Tomcat Native. The notable changes since https://tomcat.apache.org/download-native.cgi";>Download | -ChangeLog for 1.1.30 +ChangeLog for 1.1.30 2014-04-15 Tomcat Connectors 1.2.40 Released Modified: tomcat/site/trunk/docs/oldnews-2015.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2015.html?rev=1902695&r1=1902694&r2=1902695&view=diff == --- tomcat/site/trunk/docs/oldnews-2015.html (original) +++ tomcat/site/trunk/docs/oldnews-2015.html Wed Jul 13 09:14:41 2022 @@ -30,7 +30,7 @@ Tomcat Native. The notable changes since using 1.2.x in preference to 1.1.x. https://tomcat.apache.org/download-native.cgi";>Download | -ChangeLog for 1.2.3 +ChangeLog for 1.2.3 2015-12-15 Tomcat Native 1.1.34 Released @@ -164,7 +164,7 @@ Tomcat Native. The notable changes since https://tomcat.apache.org/download-native.cgi";>Download | -ChangeLog for 1.2.2 +ChangeLog for 1.2.2 2015-10-28 Tomcat Native 1.2.0 Released @@ -180,7 +180,7 @@ Tomcat Native
svn commit: r1902694 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: markt Date: Wed Jul 13 09:10:45 2022 New Revision: 1902694 URL: http://svn.apache.org/viewvc?rev=1902694&view=rev Log: Add 2.0.1 release to main index Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1902694&r1=1902693&r2=1902694&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Wed Jul 13 09:10:45 2022 @@ -34,6 +34,24 @@ wiki page. Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. +2022-07-12 Tomcat Native 2.0.1 Released + +The Apache Tomcat Project is proud to announce the release of version 2.0.1 of +Tomcat Native. This is the first release of the 2.0.x branch. The notable +changes compared to the 1.2x branch include: + + +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 the 2.0.x branch. +The minimum supported versions have been increased to OpenSSL 3.0.x, Apache +APR 1.7.x, Java 11, Windows 7 / Server 2008 R2. +The windows binaries in this release have been built with OpenSSL 3.0.5 + + +https://tomcat.apache.org/download-native.cgi";>Download | +ChangeLog for 2.0.1 + 2022-07-11 Tomcat Migration Tool for Jakarta EE 1.0.1 Released The Apache Tomcat Project is proud to announce the release of 1.0.1 of the Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1902694&r1=1902693&r2=1902694&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Wed Jul 13 09:10:45 2022 @@ -55,6 +55,26 @@ project logo are trademarks of the Apach + + +The Apache Tomcat Project is proud to announce the release of version 2.0.1 of +Tomcat Native. This is the first release of the 2.0.x branch. The notable +changes compared to the 1.2x branch include: + + +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 the 2.0.x branch. +The minimum supported versions have been increased to OpenSSL 3.0.x, Apache +APR 1.7.x, Java 11, Windows 7 / Server 2008 R2. +The windows binaries in this release have been built with OpenSSL 3.0.5 + + +Download | +ChangeLog for 2.0.1 + + + The Apache Tomcat Project is proud to announce the release of 1.0.1 of the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] rmaucher commented on pull request #28: Additional Profile to Migrate Back to JEE8 from Jakarta EE
rmaucher commented on PR #28: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/28#issuecomment-1182938991 That's an interesting idea. However, it's also even riskier than the other way around: deprecated features that are removed in new EE versions are usually rather forgotten, but if you ever start using any of the new EE features, which sounds more likely to me, you will no longer be able to go backwards. -- 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: r1902692 - in /tomcat/site/trunk: docs/download-native.html xdocs/download-native.xml
Author: markt Date: Wed Jul 13 08:25:21 2022 New Revision: 1902692 URL: http://svn.apache.org/viewvc?rev=1902692&view=rev Log: Fix same issues for 1.2.x section Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/xdocs/download-native.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1902692&r1=1902691&r2=1902692&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Wed Jul 13 08:25:21 2022 @@ -113,10 +113,10 @@ https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.tar.gz.sha512";>SHA512) -tar.gz +zip - e.g. Windows -(https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.zip.asc";>PGP, -https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.zip.sha512";>SHA512) +(https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-win32-src.zip.asc";>PGP, +https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-win32-src.zip.sha512";>SHA512) Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1902692&r1=1902691&r2=1902692&view=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Wed Jul 13 08:25:21 2022 @@ -136,10 +136,10 @@ https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.tar.gz.sha512";>SHA512) -tar.gz +zip - e.g. Windows -(https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.zip.asc";>PGP, -https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-src.zip.sha512";>SHA512) +(https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-win32-src.zip.asc";>PGP, +https://downloads.apache.org/tomcat/tomcat-connectors/native/[w]/source/tomcat-native-[w]-win32-src.zip.sha512";>SHA512) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1902691 - in /tomcat/site/trunk: docs/download-native.html xdocs/download-native.xml
Author: markt Date: Wed Jul 13 08:23:47 2022 New Revision: 1902691 URL: http://svn.apache.org/viewvc?rev=1902691&view=rev Log: Fix copy/paste error - Windows src disto includes 'win32' in name Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/xdocs/download-native.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1902691&r1=1902690&r2=1902691&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Wed Jul 13 08:23:47 2022 @@ -62,10 +62,10 @@ https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.tar.gz.sha512";>SHA512) -zip +zip - e.g. Windows -(https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip.asc";>PGP, -https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip.sha512";>SHA512) +(https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-win32-src.zip.asc";>PGP, +https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-win32-src.zip.sha512";>SHA512) Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1902691&r1=1902690&r2=1902691&view=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Wed Jul 13 08:23:47 2022 @@ -83,10 +83,10 @@ https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.tar.gz.sha512";>SHA512) -zip +zip - e.g. Windows -(https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip.asc";>PGP, -https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip.sha512";>SHA512) +(https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-win32-src.zip.asc";>PGP, +https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-win32-src.zip.sha512";>SHA512) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1902690 - in /tomcat/site/trunk: docs/download-native.html xdocs/download-native.xml
Author: markt Date: Wed Jul 13 08:22:32 2022 New Revision: 1902690 URL: http://svn.apache.org/viewvc?rev=1902690&view=rev Log: Fix minor copy/paste error Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/xdocs/download-native.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1902690&r1=1902689&r2=1902690&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Wed Jul 13 08:22:32 2022 @@ -62,7 +62,7 @@ https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.tar.gz.sha512";>SHA512) -tar.gz +zip - e.g. Windows (https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip.asc";>PGP, https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip.sha512";>SHA512) Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1902690&r1=1902689&r2=1902690&view=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Wed Jul 13 08:22:32 2022 @@ -83,7 +83,7 @@ https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.tar.gz.sha512";>SHA512) -tar.gz +zip - e.g. Windows (https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip.asc";>PGP, https://downloads.apache.org/tomcat/tomcat-connectors/native/[v]/source/tomcat-native-[v]-src.zip.sha512";>SHA512) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1902689 - in /tomcat/site/trunk: docs/download-native.html xdocs/download-native.xml
Author: markt Date: Wed Jul 13 08:20:41 2022 New Revision: 1902689 URL: http://svn.apache.org/viewvc?rev=1902689&view=rev Log: First attempt to update Apache Tomcat Native download page for 2 versions Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/xdocs/download-native.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1902689&r1=1902688&r2=1902689&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Wed Jul 13 08:20:41 2022 @@ -1,130 +1,152 @@ -Apache Tomcat® - Tomcat Native Downloadshttp://tomcat.apache.org/";>Apache Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-lef t">https://www.google.com/search"; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apach e.org/download-migration.cgi">Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 10.1 (beta)Tomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat ConnectorsTomcat Native 2Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration Guide Presentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blo gs.apache.org/tomcat/">BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html";>Privacyhttps://www.apache.org/foundation/contributing.html";>Support Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentTom cat Native Downloads - - Use the links below to download the Apache Tomcat® Native software - from one of our mirrors. You must - verify the integrity of - the downloaded files using signatures downloaded from our main - distribution directory. - +Apache Tomcat® - Tomcat Native Downloadshttp://tomcat.apache.org/";>Apache Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-lef t">https://www.google.com/search"; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apach e.org/download-migration.cgi">Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 10.1 (beta)Tomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat ConnectorsTomcat Native 2Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration Guide Presentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blo gs.apache.org/tomcat/">BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html";>Privacyhttps://www.apache.org/foundation/contributing.html";>Support Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache
