[tomcat] branch main updated: Add a note
This is an automated email from the ASF dual-hosted git repository.
remm 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 22d06ed Add a note
22d06ed is described below
commit 22d06ed6c72cd8964b6f5314535cf31cbcdadd4f
Author: remm
AuthorDate: Mon Nov 8 23:48:09 2021 +0100
Add a note
After comparing the code with the panama-foreign API, which allows
writing to an address.
---
.../java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index 374c808..f976432 100644
---
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -826,6 +826,8 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
//const unsigned char *in, unsigned int inlen, void *arg)
public int openSSLCallbackAlpnSelectProto(MemoryAddress ssl, MemoryAddress
out, MemoryAddress outlen,
MemoryAddress in, int inlen, MemoryAddress arg) {
+// It would be better to read byte by byte as the ALPN data is very
small
+// However, the Java 17 API forces use of a scope later on, so create
one for everything
try (ResourceScope scope = ResourceScope.newConfinedScope()) {
byte[] advertisedBytes = in.asSegment(inlen, scope).toByteArray();
ArrayList negotiableProtocolsBytes = new
ArrayList<>(negotiableProtocols.size() + 1);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Tighten up some uses of scope
This is an automated email from the ASF dual-hosted git repository.
remm 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 e88f5c8 Tighten up some uses of scope
e88f5c8 is described below
commit e88f5c8384aab73ea7fcbe94e225f795db40ac1f
Author: remm
AuthorDate: Mon Nov 8 23:35:20 2021 +0100
Tighten up some uses of scope
The engine should always use its scope if possible (it is tied to a
connection). However, the context should avoid it (it will almost never
be closed).
Also add a sync in the context's openSSLCallbackVerify, just in case it
is actually used.
---
.../util/net/openssl/panama/OpenSSLContext.java| 47 +++---
.../util/net/openssl/panama/OpenSSLEngine.java | 46 ++---
2 files changed, 45 insertions(+), 48 deletions(-)
diff --git
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index 7a4dd35..374c808 100644
---
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -826,37 +826,38 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
//const unsigned char *in, unsigned int inlen, void *arg)
public int openSSLCallbackAlpnSelectProto(MemoryAddress ssl, MemoryAddress
out, MemoryAddress outlen,
MemoryAddress in, int inlen, MemoryAddress arg) {
-// No scope, so byte by byte read, the ALPN data is small
-byte[] advertisedBytes = in.asSegment(inlen,
state.scope).toByteArray();
-ArrayList negotiableProtocolsBytes = new
ArrayList<>(negotiableProtocols.size() + 1);
-for (String negotiableProtocol : negotiableProtocols) {
-negotiableProtocolsBytes.add(negotiableProtocol.getBytes());
-}
-negotiableProtocolsBytes.add(HTTP_11_PROTOCOL);
-for (byte[] negotiableProtocolBytes : negotiableProtocolsBytes) {
-for (int i = 0; i <= advertisedBytes.length -
negotiableProtocolBytes.length; i++) {
-if (advertisedBytes[i] == negotiableProtocolBytes[0]) {
-for (int j = 0; j < negotiableProtocolBytes.length; j++) {
-if (advertisedBytes[i + j] ==
negotiableProtocolBytes[j]) {
-if (j == negotiableProtocolBytes.length - 1) {
-MemorySegment outSegment =
out.asSegment(CLinker.C_POINTER.byteSize(), state.scope);
-MemorySegment outlenSegment =
outlen.asSegment(CLinker.C_CHAR.byteSize(), state.scope);
-// Match
-MemoryAccess.setAddress(outSegment,
in.addOffset(i));
-MemoryAccess.setByte(outlenSegment, (byte)
negotiableProtocolBytes.length);
-return SSL_TLSEXT_ERR_OK();
+try (ResourceScope scope = ResourceScope.newConfinedScope()) {
+byte[] advertisedBytes = in.asSegment(inlen, scope).toByteArray();
+ArrayList negotiableProtocolsBytes = new
ArrayList<>(negotiableProtocols.size() + 1);
+for (String negotiableProtocol : negotiableProtocols) {
+negotiableProtocolsBytes.add(negotiableProtocol.getBytes());
+}
+negotiableProtocolsBytes.add(HTTP_11_PROTOCOL);
+for (byte[] negotiableProtocolBytes : negotiableProtocolsBytes) {
+for (int i = 0; i <= advertisedBytes.length -
negotiableProtocolBytes.length; i++) {
+if (advertisedBytes[i] == negotiableProtocolBytes[0]) {
+for (int j = 0; j < negotiableProtocolBytes.length;
j++) {
+if (advertisedBytes[i + j] ==
negotiableProtocolBytes[j]) {
+if (j == negotiableProtocolBytes.length - 1) {
+MemorySegment outSegment =
out.asSegment(CLinker.C_POINTER.byteSize(), scope);
+MemorySegment outlenSegment =
outlen.asSegment(CLinker.C_CHAR.byteSize(), scope);
+// Match
+MemoryAccess.setAddress(outSegment,
in.addOffset(i));
+MemoryAccess.setByte(outlenSegment, (byte)
negotiableProtocolBytes.length);
+return SSL_TLSEXT_ERR_OK();
+}
+} else {
+break;
}
-} else {
-break;
[tomcat] branch 10.0.x updated: Switch from Cobertura to JaCoCo for code coverage
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 5864ce2 Switch from Cobertura to JaCoCo for code coverage
5864ce2 is described below
commit 5864ce2598275ed8ccd782cd665cdd19789491cb
Author: Mark Thomas
AuthorDate: Mon Nov 8 12:41:36 2021 +
Switch from Cobertura to JaCoCo for code coverage
---
build.properties.default | 23 ++--
build.xml | 324 ++---
webapps/docs/changelog.xml | 9 ++
3 files changed, 151 insertions(+), 205 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 37e3b42..dff0e11 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -62,12 +62,11 @@ test.verbose=true
# Number of parallel threads to use for testing. The recommended value is one
# thread per core.
-# Note: Cobertura code coverage currently requires this to be set to 1. Setting
-# a value above one will disable code coverage if enabled.
test.threads=1
-# Note the Cobertura code coverage tool is GPLv2 licensed
-test.cobertura=false
+# Note the JaCoCo code coverage tool is EPLv2 licensed
+# Enabling code coverage extends the time taken to run the tests by ~50%
+test.coverage=false
# Note the FindBugs is LGPL licensed
execute.findbugs=false
@@ -275,14 +274,14 @@
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
-# - Cobertura code coverage tool -
-cobertura.version=2.1.1
-cobertura.checksum.enabled=true
-cobertura.checksum.algorithm=MD5|SHA-1
-cobertura.checksum.value=4f46638aa8e4d89565c038092398ea06|99cb44d36555feedcedc46263c23c2f5394ef342
-cobertura.home=${base.path}/cobertura-${cobertura.version}
-cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar
-cobertura.loc=${base-sf.loc}/cobertura/cobertura-${cobertura.version}-bin.tar.gz
+# - JaCoCo code coverage tool -
+jacoco.version=0.8.7
+jacoco.checksum.enabled=true
+jacoco.checksum.algorithm=MD5|SHA-1
+jacoco.checksum.value=174fde230d1090a5622119d5096bce07|983a52a030f4123b671840a27426ed73479f45cc
+jacoco.home=${base.path}/jacoco-${jacoco.version}
+jacoco.jar=${jacoco.home}/lib/jacocoant.jar
+jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
findbugs.version=4.2.3
diff --git a/build.xml b/build.xml
index a98f4e1..3909a9c 100644
--- a/build.xml
+++ b/build.xml
@@ -16,7 +16,10 @@
limitations under the License.
-->
+ xmlns:if="ant:if"
+ xmlns:unless="ant:unless"
+ xmlns:jacoco="antlib:org.jacoco.ant"
+ >
@@ -181,11 +184,9 @@
-
-
-
-
-
+
+
+
@@ -1866,10 +1867,7 @@
-
-
+
depends="setup-jacoco,test-nio,test-nio2,test-apr,coverage-report,test-status"
/>
@@ -1907,42 +1905,24 @@
-
-
-
-
+ depends="test-compile,deploy,test-openssl-exists"
if="${execute.test.nio}">
-
-
-
-
+ depends="test-compile,deploy,test-openssl-exists"
if="${execute.test.nio2}">
-
-
-
-
@@ -1974,164 +1954,108 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
[tomcat] branch main updated: Increment version for next dev cycle
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 1a7679a Increment version for next dev cycle 1a7679a is described below commit 1a7679ae964e5f38f6a18f8569ee137087f6269c Author: Mark Thomas AuthorDate: Mon Nov 8 22:00:32 2021 + Increment version for next dev cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index 2620cb3..fbbcaad 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=10 version.minor=1 version.build=0 version.patch=0 -version.suffix=-M7-dev +version.suffix=-M8-dev # - Reproducible builds - # Uncomment and set to current time for reproducible builds diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index b81a8e0..78ab938 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=10.1.0-M7 +maven.asf.release.deploy.version=10.1.0-M8 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 7d5570b..42c92bd 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - 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-M7
The proposed Apache Tomcat 10.1.0-M7 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-M6 are: - Servlet API updates for Servlet 6 including refactoring HttpServlet.doHead(), support for generic attributes on Cookies, more consistent URI handling including an option to reject 'suspicious' URIs - EL API updates for EL 5.0 including changes to ELResolver.getType() - Experimental OpenSSL support through the Panama API incubating in Java 17, with support for OpenSSL 1.1+ For full details, see the changelog: https://ci.apache.org/projects/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-M7/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1338 The tag is: https://github.com/apache/tomcat/tree/10.1.0-M7 0f3f1e439a040068b741d7766722e4420ad6 The proposed 10.1.0-M7 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 10.1.0-M7 (alpha) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r50848 - in /dev/tomcat/tomcat-10/v10.1.0-M7: ./ bin/ bin/embed/ src/
Author: markt Date: Mon Nov 8 20:51:50 2021 New Revision: 50848 Log: Upload 10.1.0-M7 for voting Added: dev/tomcat/tomcat-10/v10.1.0-M7/ dev/tomcat/tomcat-10/v10.1.0-M7/KEYS dev/tomcat/tomcat-10/v10.1.0-M7/README.html dev/tomcat/tomcat-10/v10.1.0-M7/RELEASE-NOTES dev/tomcat/tomcat-10/v10.1.0-M7/bin/ dev/tomcat/tomcat-10/v10.1.0-M7/bin/README.html dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-deployer.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-deployer.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-deployer.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-deployer.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-deployer.zip.asc dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-deployer.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-fulldocs.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-fulldocs.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-windows-x64.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-windows-x64.zip.asc dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-windows-x64.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-windows-x86.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-windows-x86.zip.asc dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7-windows-x86.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7.exe (with props) dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7.exe.asc dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7.exe.sha512 dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7.zip.asc dev/tomcat/tomcat-10/v10.1.0-M7/bin/apache-tomcat-10.1.0-M7.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M7/bin/embed/ dev/tomcat/tomcat-10/v10.1.0-M7/bin/embed/apache-tomcat-10.1.0-M7-embed.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M7/bin/embed/apache-tomcat-10.1.0-M7-embed.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M7/bin/embed/apache-tomcat-10.1.0-M7-embed.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M7/bin/embed/apache-tomcat-10.1.0-M7-embed.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M7/bin/embed/apache-tomcat-10.1.0-M7-embed.zip.asc dev/tomcat/tomcat-10/v10.1.0-M7/bin/embed/apache-tomcat-10.1.0-M7-embed.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M7/src/ dev/tomcat/tomcat-10/v10.1.0-M7/src/apache-tomcat-10.1.0-M7-src.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M7/src/apache-tomcat-10.1.0-M7-src.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M7/src/apache-tomcat-10.1.0-M7-src.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M7/src/apache-tomcat-10.1.0-M7-src.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M7/src/apache-tomcat-10.1.0-M7-src.zip.asc dev/tomcat/tomcat-10/v10.1.0-M7/src/apache-tomcat-10.1.0-M7-src.zip.sha512 Added: dev/tomcat/tomcat-10/v10.1.0-M7/KEYS == --- dev/tomcat/tomcat-10/v10.1.0-M7/KEYS (added) +++ dev/tomcat/tomcat-10/v10.1.0-M7/KEYS Mon Nov 8 20:51:50 2021 @@ -0,0 +1,453 @@ +This file contains the PGP 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/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF
[tomcat] 01/01: Tag 10.1.0-M7
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to tag 10.1.0-M7 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 0f3f1e439a040068b741d7766722e4420ad6 Author: Mark Thomas AuthorDate: Mon Nov 8 20:33:38 2021 + Tag 10.1.0-M7 --- build.properties.default | 2 +- webapps/docs/changelog.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index 2620cb3..450bd01 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=10 version.minor=1 version.build=0 version.patch=0 -version.suffix=-M7-dev +version.suffix=-M7 # - Reproducible builds - # Uncomment and set to current time for reproducible builds diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 7d5570b..de69a43 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,7 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] tag 10.1.0-M7 created (now 0f3f1e4)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 10.1.0-M7 in repository https://gitbox.apache.org/repos/asf/tomcat.git. at 0f3f1e4 (commit) This tag includes the following new commits: new 0f3f1e4 Tag 10.1.0-M7 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
RE: November releases
Thanks! Dream * Excel * Explore * Inspire Jon McAlexander Infrastructure Engineer Asst Vice President Middleware Product Engineering Enterprise CIO | EAS | Middleware | Infrastructure Solutions 8080 Cobblestone Rd | Urbandale, IA 50322 MAC: F4469-010 Tel 515-988-2508 | Cell 515-988-2508 jonmcalexan...@wellsfargo.com This message may contain confidential and/or privileged information. If you are not the addressee or authorized to receive this for the addressee, you must not use, copy, disclose, or take any action based on this message or any information herein. If you have received this message in error, please advise the sender immediately by reply e-mail and delete this message. Thank you for your cooperation. > -Original Message- > From: Mark Thomas > Sent: Monday, November 8, 2021 1:36 PM > To: dev@tomcat.apache.org > Subject: Re: November releases > > On 08/11/2021 18:15, jonmcalexan...@wellsfargo.com.INVALID wrote: > >> -Original Message- > >> From: Mark Thomas > >> Sent: Monday, November 8, 2021 8:02 AM > >> To: dev@tomcat.apache.org > >> Subject: Re: November releases > > > > >> I am therefore going to tag 10.1.0-M7 and 10.0.12 once my local test > >> runs complete (assuming there are no test failures). > >> > >> Mark > >> > >> - > >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For > >> additional commands, e-mail: dev-h...@tomcat.apache.org > > > > 10.0.12? But this is already released, or am I missing something? > > Typo. I meant 10.0.13. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional > commands, e-mail: dev-h...@tomcat.apache.org
Re: November releases
On 08/11/2021 18:15, jonmcalexan...@wellsfargo.com.INVALID wrote: -Original Message- From: Mark Thomas Sent: Monday, November 8, 2021 8:02 AM To: dev@tomcat.apache.org Subject: Re: November releases I am therefore going to tag 10.1.0-M7 and 10.0.12 once my local test runs complete (assuming there are no test failures). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org 10.0.12? But this is already released, or am I missing something? Typo. I meant 10.0.13. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: November releases
> -Original Message- > From: Mark Thomas > Sent: Monday, November 8, 2021 8:02 AM > To: dev@tomcat.apache.org > Subject: Re: November releases > > On 05/11/2021 08:37, Mark Thomas wrote: > > On 02/11/2021 16:58, Christopher Schultz wrote: > >> Mark, > >> > >> On 11/2/21 07:45, Mark Thomas wrote: > >>> Hi all, > >>> > >>> There doesn't seem to be much in the changelogs at the moment and > >>> the code signing is currently unavailable as the renewal process is > >>> taking longer than expected. Therefore, my current thinking is to > >>> delay the release process and review the situation towards the end > >>> of the week. > >>> > >>> Thoughts? > >> > >> +1 > >> > >> I was thinking the same thing (not much to release). > > > > The code signing service is now back up and running. > > > > I'd like to configure the code signing service to use a certificate > > that includes "Tomcat" in the name (currently we have a dedicated cert > > for Tomcat but it names the ASF as a whole). That should be fairly quick. > > > > I'd also like to iron out the wrinkles in the new CI service. As far > > as I can tell, the Tomcat jobs have been migrated but there are a few > > small issues to resolve. > > > > I plan to work on the above today and - if make sufficient progress - > > intend to tag towards the end of today although that might slip to > > over the weekend / early next week. > > The cert change is currently pending the request for new certificate being > approved by the CA. I think this can wait until next time. > > The migrated BuildBot service is pretty much there. I need to update the > links on the web site, confirm the APR tests run correctly now the native > library is available on the worker and iron out any other wrinkles. > > I am therefore going to tag 10.1.0-M7 and 10.0.12 once my local test runs > complete (assuming there are no test failures). > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional > commands, e-mail: dev-h...@tomcat.apache.org 10.0.12? But this is already released, or am I missing something? Dream * Excel * Explore * Inspire Jon McAlexander Infrastructure Engineer Asst Vice President Middleware Product Engineering Enterprise CIO | EAS | Middleware | Infrastructure Solutions 8080 Cobblestone Rd | Urbandale, IA 50322 MAC: F4469-010 Tel 515-988-2508 | Cell 515-988-2508 jonmcalexan...@wellsfargo.com This message may contain confidential and/or privileged information. If you are not the addressee or authorized to receive this for the addressee, you must not use, copy, disclose, or take any action based on this message or any information herein. If you have received this message in error, please advise the sender immediately by reply e-mail and delete this message. Thank you for your cooperation.
Re: [tomcat] branch main updated: Switch from Cobertura to JaCoCo for code coverage
On 08/11/2021 15:17, Rémy Maucherat wrote: On Mon, Nov 8, 2021 at 2:56 PM Mark Thomas wrote: On 08/11/2021 12:42, ma...@apache.org wrote: 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 b15b713 Switch from Cobertura to JaCoCo for code coverage b15b713 is described below commit b15b7130ced07cfe36961531dad4642a422e9500 Author: Mark Thomas AuthorDate: Mon Nov 8 12:41:36 2021 + Switch from Cobertura to JaCoCo for code coverage Thoughts on back-porting this? We don't need to back-port it. The primary benefit I see is consistency. Yes, no problem, but you make it sound like there's some risk involved (?). No risk I am aware of. Just wanted to give others a chance to speak up if they could see a reason not to backport. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: November releases
Am 2021-11-08 um 15:01 schrieb Mark Thomas: On 05/11/2021 08:37, Mark Thomas wrote: On 02/11/2021 16:58, Christopher Schultz wrote: Mark, On 11/2/21 07:45, Mark Thomas wrote: Hi all, There doesn't seem to be much in the changelogs at the moment and the code signing is currently unavailable as the renewal process is taking longer than expected. Therefore, my current thinking is to delay the release process and review the situation towards the end of the week. Thoughts? +1 I was thinking the same thing (not much to release). The code signing service is now back up and running. I'd like to configure the code signing service to use a certificate that includes "Tomcat" in the name (currently we have a dedicated cert for Tomcat but it names the ASF as a whole). That should be fairly quick. I'd also like to iron out the wrinkles in the new CI service. As far as I can tell, the Tomcat jobs have been migrated but there are a few small issues to resolve. I plan to work on the above today and - if make sufficient progress - intend to tag towards the end of today although that might slip to over the weekend / early next week. The cert change is currently pending the request for new certificate being approved by the CA. I think this can wait until next time. The migrated BuildBot service is pretty much there. I need to update the links on the web site, confirm the APR tests run correctly now the native library is available on the worker and iron out any other wrinkles. Good news! I am still considering to log a warning when a LifecycleListener is used within a lifecycle object it is not intended to run. As done wrong in Spring Boot with the AprLifecycleListener. M - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Switch from Cobertura to JaCoCo for code coverage
On Mon, Nov 8, 2021 at 2:56 PM Mark Thomas wrote: > > On 08/11/2021 12:42, ma...@apache.org wrote: > > 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 b15b713 Switch from Cobertura to JaCoCo for code coverage > > b15b713 is described below > > > > commit b15b7130ced07cfe36961531dad4642a422e9500 > > Author: Mark Thomas > > AuthorDate: Mon Nov 8 12:41:36 2021 + > > > > Switch from Cobertura to JaCoCo for code coverage > > Thoughts on back-porting this? We don't need to back-port it. The > primary benefit I see is consistency. Yes, no problem, but you make it sound like there's some risk involved (?). Rémy Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Avoid copying useless bytes using asSlice
This is an automated email from the ASF dual-hosted git repository.
remm 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 f3ebf6b Avoid copying useless bytes using asSlice
f3ebf6b is described below
commit f3ebf6beef5520780d5be54e4ebd24a0db3bfea2
Author: remm
AuthorDate: Mon Nov 8 16:06:16 2021 +0100
Avoid copying useless bytes using asSlice
---
.../org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index 68ffe30..d8d827f 100644
---
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -401,8 +401,8 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
MemorySegment bufSegment =
allocator.allocateArray(CLinker.C_CHAR, len);
final int sslRead = SSL_read(ssl, bufSegment, len);
if (sslRead > 0) {
-byte[] buf = bufSegment.toByteArray();
-dst.put(buf, 0, sslRead);
+
MemorySegment.ofByteBuffer(dst).copyFrom(bufSegment.asSlice(0, sslRead));
+dst.position(dst.position() + sslRead);
return sslRead;
} else {
checkLastError();
@@ -419,8 +419,8 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
*/
private int readEncryptedData(final MemoryAddress networkBIO, final
ByteBuffer dst, final int pending) throws SSLException {
clearLastError();
+final int pos = dst.position();
if (dst.isDirect()) {
-final int pos = dst.position();
final int bioRead = BIO_read(networkBIO,
MemorySegment.ofByteBuffer(dst), pending);
if (bioRead > 0) {
dst.position(pos + bioRead);
@@ -436,7 +436,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
if (bioRead > 0) {
buf.limit(bioRead);
int oldLimit = dst.limit();
-dst.limit(dst.position() + bioRead);
+dst.limit(pos + bioRead);
dst.put(buf);
dst.limit(oldLimit);
return bioRead;
-
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: Optimize the comment about class loader
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 75a822a Optimize the comment about class loader
75a822a is described below
commit 75a822a0b14f86129af50238ac2bc08f80668830
Author: Poison
AuthorDate: Tue Oct 19 15:51:33 2021 +0800
Optimize the comment about class loader
In HotSpot JVM, javaseClassLoader is actually Extension ClassLoader, The
comment of javaseClassLoader mentioned:
```java
/**
* The bootstrap class loader used to load the JavaSE classes. In some
* implementations this class loader is always null and in
* those cases {@link ClassLoader#getParent()} will be called
recursively on
* the system class loader and the last non-null result used.
*/
private ClassLoader javaseClassLoader;
```
So I think it is more appropriate to use bootstrap classLoader in the
comments.
---
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 288d26e..a806a35 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -87,7 +87,7 @@ import org.apache.tomcat.util.security.PermissionCheck;
* behavior may be completely different.
*
* IMPLEMENTATION NOTE - By default, this class loader follows
- * the delegation model required by the specification. The system class
+ * the delegation model required by the specification. The bootstrap class
* loader will be queried first, then the local repositories, and only then
* delegation to the parent class loader will occur. This allows the web
* application to override any shared class except the classes from J2SE.
@@ -1277,7 +1277,7 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
return clazz;
}
-// (0.2) Try loading the class with the system class loader, to
prevent
+// (0.2) Try loading the class with the bootstrap class loader, to
prevent
// the webapp from overriding Java SE classes. This
implements
// SRV.10.7.2
String resourceName = binaryNameToPath(name, false);
-
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: Optimize the comment about class loader
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 e94cb97 Optimize the comment about class loader
e94cb97 is described below
commit e94cb974adff25c9fc3e25755d758033120d3d0a
Author: Poison
AuthorDate: Tue Oct 19 15:51:33 2021 +0800
Optimize the comment about class loader
In HotSpot JVM, javaseClassLoader is actually Extension ClassLoader, The
comment of javaseClassLoader mentioned:
```java
/**
* The bootstrap class loader used to load the JavaSE classes. In some
* implementations this class loader is always null and in
* those cases {@link ClassLoader#getParent()} will be called
recursively on
* the system class loader and the last non-null result used.
*/
private ClassLoader javaseClassLoader;
```
So I think it is more appropriate to use bootstrap classLoader in the
comments.
---
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 16043b5..6a1c618 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -87,7 +87,7 @@ import org.apache.tomcat.util.security.PermissionCheck;
* behavior may be completely different.
*
* IMPLEMENTATION NOTE - By default, this class loader follows
- * the delegation model required by the specification. The system class
+ * the delegation model required by the specification. The bootstrap class
* loader will be queried first, then the local repositories, and only then
* delegation to the parent class loader will occur. This allows the web
* application to override any shared class except the classes from J2SE.
@@ -1285,7 +1285,7 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
return clazz;
}
-// (0.2) Try loading the class with the system class loader, to
prevent
+// (0.2) Try loading the class with the bootstrap class loader, to
prevent
// the webapp from overriding Java SE classes. This
implements
// SRV.10.7.2
String resourceName = binaryNameToPath(name, false);
-
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: Optimize the comment about class loader
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 38aec51 Optimize the comment about class loader
38aec51 is described below
commit 38aec51e92d2077ba0483f972b77936634236558
Author: Poison
AuthorDate: Tue Oct 19 15:51:33 2021 +0800
Optimize the comment about class loader
In HotSpot JVM, javaseClassLoader is actually Extension ClassLoader, The
comment of javaseClassLoader mentioned:
```java
/**
* The bootstrap class loader used to load the JavaSE classes. In some
* implementations this class loader is always null and in
* those cases {@link ClassLoader#getParent()} will be called
recursively on
* the system class loader and the last non-null result used.
*/
private ClassLoader javaseClassLoader;
```
So I think it is more appropriate to use bootstrap classLoader in the
comments.
---
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 49e0025..5122d4e 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -89,7 +89,7 @@ import org.apache.tomcat.util.security.PermissionCheck;
* behavior may be completely different.
*
* IMPLEMENTATION NOTE - By default, this class loader follows
- * the delegation model required by the specification. The system class
+ * the delegation model required by the specification. The bootstrap class
* loader will be queried first, then the local repositories, and only then
* delegation to the parent class loader will occur. This allows the web
* application to override any shared class except the classes from J2SE.
@@ -1314,7 +1314,7 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
return clazz;
}
-// (0.2) Try loading the class with the system class loader, to
prevent
+// (0.2) Try loading the class with the bootstrap class loader, to
prevent
// the webapp from overriding Java SE classes. This
implements
// SRV.10.7.2
String resourceName = binaryNameToPath(name, false);
-
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 #455: Optimize the comment about class loader
markt-asf commented on pull request #455: URL: https://github.com/apache/tomcat/pull/455#issuecomment-963226821 Thanks for the PR. I agree bootstrap is a better description of the class loader being used. -- 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: Optimize the comment about class loader
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 b84dc38 Optimize the comment about class loader
b84dc38 is described below
commit b84dc386296ff62fbf42234b032b4c5eac767b16
Author: Poison
AuthorDate: Tue Oct 19 15:51:33 2021 +0800
Optimize the comment about class loader
In HotSpot JVM, javaseClassLoader is actually Extension ClassLoader, The
comment of javaseClassLoader mentioned:
```java
/**
* The bootstrap class loader used to load the JavaSE classes. In some
* implementations this class loader is always null and in
* those cases {@link ClassLoader#getParent()} will be called
recursively on
* the system class loader and the last non-null result used.
*/
private ClassLoader javaseClassLoader;
```
So I think it is more appropriate to use bootstrap classLoader in the
comments.
---
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index bb5ae0b..8649c5c 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -90,7 +90,7 @@ import org.apache.tomcat.util.security.PermissionCheck;
* behavior may be completely different.
*
* IMPLEMENTATION NOTE - By default, this class loader follows
- * the delegation model required by the specification. The system class
+ * the delegation model required by the specification. The bootstrap class
* loader will be queried first, then the local repositories, and only then
* delegation to the parent class loader will occur. This allows the web
* application to override any shared class except the classes from J2SE.
@@ -1315,7 +1315,7 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
return clazz;
}
-// (0.2) Try loading the class with the system class loader, to
prevent
+// (0.2) Try loading the class with the bootstrap class loader, to
prevent
// the webapp from overriding Java SE classes. This
implements
// SRV.10.7.2
String resourceName = binaryNameToPath(name, false);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf merged pull request #455: Optimize the comment about class loader
markt-asf merged pull request #455: URL: https://github.com/apache/tomcat/pull/455 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: November releases
On 05/11/2021 08:37, Mark Thomas wrote: On 02/11/2021 16:58, Christopher Schultz wrote: Mark, On 11/2/21 07:45, Mark Thomas wrote: Hi all, There doesn't seem to be much in the changelogs at the moment and the code signing is currently unavailable as the renewal process is taking longer than expected. Therefore, my current thinking is to delay the release process and review the situation towards the end of the week. Thoughts? +1 I was thinking the same thing (not much to release). The code signing service is now back up and running. I'd like to configure the code signing service to use a certificate that includes "Tomcat" in the name (currently we have a dedicated cert for Tomcat but it names the ASF as a whole). That should be fairly quick. I'd also like to iron out the wrinkles in the new CI service. As far as I can tell, the Tomcat jobs have been migrated but there are a few small issues to resolve. I plan to work on the above today and - if make sufficient progress - intend to tag towards the end of today although that might slip to over the weekend / early next week. The cert change is currently pending the request for new certificate being approved by the CA. I think this can wait until next time. The migrated BuildBot service is pretty much there. I need to update the links on the web site, confirm the APR tests run correctly now the native library is available on the worker and iron out any other wrinkles. I am therefore going to tag 10.1.0-M7 and 10.0.12 once my local test runs complete (assuming there are no test failures). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Switch from Cobertura to JaCoCo for code coverage
On 08/11/2021 12:42, ma...@apache.org wrote: 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 b15b713 Switch from Cobertura to JaCoCo for code coverage b15b713 is described below commit b15b7130ced07cfe36961531dad4642a422e9500 Author: Mark Thomas AuthorDate: Mon Nov 8 12:41:36 2021 + Switch from Cobertura to JaCoCo for code coverage Thoughts on back-porting this? We don't need to back-port it. The primary benefit I see is consistency. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch 9.0.x updated: Provide a little more control over resource caching
On 08/11/2021 13:24, Rémy Maucherat wrote: On Mon, Nov 8, 2021 at 1:02 PM Mark Thomas wrote: On 04/11/2021 11:11, Mark Thomas wrote: On 04/11/2021 10:53, ma...@apache.org wrote: 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 9cf432c Provide a little more control over resource caching 9cf432c is described below commit 9cf432cecde096f10ea19ff78d49b03307f85099 Author: Mark Thomas AuthorDate: Thu Nov 4 10:52:06 2021 + Provide a little more control over resource caching Do we want to back-port this to 8.5.x? Because we can't use default methods it will break any custom WebResourceRoot implementations. Ping (as the releases are approaching). I gave up a backport for that reason previously, so I considered I should not be breaking the 8.5 API. Ack. I was leaning the same way so I won't back-port this. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch 9.0.x updated: Provide a little more control over resource caching
On Mon, Nov 8, 2021 at 1:02 PM Mark Thomas wrote: > > On 04/11/2021 11:11, Mark Thomas wrote: > > On 04/11/2021 10:53, ma...@apache.org wrote: > >> 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 9cf432c Provide a little more control over resource caching > >> 9cf432c is described below > >> > >> commit 9cf432cecde096f10ea19ff78d49b03307f85099 > >> Author: Mark Thomas > >> AuthorDate: Thu Nov 4 10:52:06 2021 + > >> > >> Provide a little more control over resource caching > > > > Do we want to back-port this to 8.5.x? Because we can't use default > > methods it will break any custom WebResourceRoot implementations. > > Ping (as the releases are approaching). I gave up a backport for that reason previously, so I considered I should not be breaking the 8.5 API. Rémy - 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: Differentiate OpenSSL implementations
This is an automated email from the ASF dual-hosted git repository.
remm 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 1da50ee Differentiate OpenSSL implementations
1da50ee is described below
commit 1da50ee8ba2936b2226884dc6d1da7647712c859
Author: remm
AuthorDate: Mon Nov 8 14:19:09 2021 +0100
Differentiate OpenSSL implementations
Most importantly avoid using "jsse" for OpenSSL with Java 17.
---
java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
b/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
index d8204a4..f8cfe05 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
@@ -38,6 +38,10 @@ public abstract class AbstractHttp11JsseProtocol
if
(OpenSSLImplementation.class.getName().equals(getSslImplementationName())) {
return "openssl";
}
+if (getSslImplementationName() != null
+&&
getSslImplementationName().endsWith(".panama.OpenSSLImplementation")) {
+return "openssljava17";
+}
return "jsse";
}
-
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: Differentiate OpenSSL implementations
This is an automated email from the ASF dual-hosted git repository.
remm 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 67a2c30 Differentiate OpenSSL implementations
67a2c30 is described below
commit 67a2c30589d4330c0355881234a0606eefae7e9f
Author: remm
AuthorDate: Mon Nov 8 14:19:09 2021 +0100
Differentiate OpenSSL implementations
Most importantly avoid using "jsse" for OpenSSL with Java 17.
---
java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
b/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
index 2998532..d988095 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
@@ -38,6 +38,10 @@ public abstract class AbstractHttp11JsseProtocol
if
(OpenSSLImplementation.class.getName().equals(getSslImplementationName())) {
return "openssl";
}
+if (getSslImplementationName() != null
+&&
getSslImplementationName().endsWith(".panama.OpenSSLImplementation")) {
+return "openssljava17";
+}
return "jsse";
}
-
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: Differentiate OpenSSL implementations
This is an automated email from the ASF dual-hosted git repository.
remm 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 1bfaba1 Differentiate OpenSSL implementations
1bfaba1 is described below
commit 1bfaba1c9415c991e551c7fa62f0ee409f595c11
Author: remm
AuthorDate: Mon Nov 8 14:19:09 2021 +0100
Differentiate OpenSSL implementations
Most importantly avoid using "jsse" for OpenSSL with Java 17.
---
java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
b/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
index 2998532..d988095 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
@@ -38,6 +38,10 @@ public abstract class AbstractHttp11JsseProtocol
if
(OpenSSLImplementation.class.getName().equals(getSslImplementationName())) {
return "openssl";
}
+if (getSslImplementationName() != null
+&&
getSslImplementationName().endsWith(".panama.OpenSSLImplementation")) {
+return "openssljava17";
+}
return "jsse";
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Differentiate OpenSSL implementations
This is an automated email from the ASF dual-hosted git repository.
remm 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 e960d3d Differentiate OpenSSL implementations
e960d3d is described below
commit e960d3d95ba6b80b2611e283e307831985cc8e55
Author: remm
AuthorDate: Mon Nov 8 14:19:09 2021 +0100
Differentiate OpenSSL implementations
Most importantly avoid using "jsse" for OpenSSL with Java 17.
---
java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
b/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
index 2998532..d988095 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
@@ -38,6 +38,10 @@ public abstract class AbstractHttp11JsseProtocol
if
(OpenSSLImplementation.class.getName().equals(getSslImplementationName())) {
return "openssl";
}
+if (getSslImplementationName() != null
+&&
getSslImplementationName().endsWith(".panama.OpenSSLImplementation")) {
+return "openssljava17";
+}
return "jsse";
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Switch from Cobertura to JaCoCo for code coverage
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 b15b713 Switch from Cobertura to JaCoCo for code coverage
b15b713 is described below
commit b15b7130ced07cfe36961531dad4642a422e9500
Author: Mark Thomas
AuthorDate: Mon Nov 8 12:41:36 2021 +
Switch from Cobertura to JaCoCo for code coverage
---
build.properties.default | 23 ++--
build.xml | 310 ++---
webapps/docs/changelog.xml | 9 ++
3 files changed, 146 insertions(+), 196 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index b177208..2620cb3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -60,12 +60,11 @@ test.verbose=true
# Number of parallel threads to use for testing. The recommended value is one
# thread per core.
-# Note: Cobertura code coverage currently requires this to be set to 1. Setting
-# a value above one will disable code coverage if enabled.
test.threads=1
-# Note the Cobertura code coverage tool is GPLv2 licensed
-test.cobertura=false
+# Note the JaCoCo code coverage tool is EPLv2 licensed
+# Enabling code coverage extends the time taken to run the tests by ~50%
+test.coverage=false
# Note the FindBugs is LGPL licensed
execute.findbugs=false
@@ -273,14 +272,14 @@
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
-# - Cobertura code coverage tool -
-cobertura.version=2.1.1
-cobertura.checksum.enabled=true
-cobertura.checksum.algorithm=MD5|SHA-1
-cobertura.checksum.value=4f46638aa8e4d89565c038092398ea06|99cb44d36555feedcedc46263c23c2f5394ef342
-cobertura.home=${base.path}/cobertura-${cobertura.version}
-cobertura.jar=${cobertura.home}/cobertura-${cobertura.version}.jar
-cobertura.loc=${base-sf.loc}/cobertura/cobertura-${cobertura.version}-bin.tar.gz
+# - JaCoCo code coverage tool -
+jacoco.version=0.8.7
+jacoco.checksum.enabled=true
+jacoco.checksum.algorithm=MD5|SHA-1
+jacoco.checksum.value=174fde230d1090a5622119d5096bce07|983a52a030f4123b671840a27426ed73479f45cc
+jacoco.home=${base.path}/jacoco-${jacoco.version}
+jacoco.jar=${jacoco.home}/lib/jacocoant.jar
+jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
findbugs.version=4.2.3
diff --git a/build.xml b/build.xml
index df0181a..fbba5d7 100644
--- a/build.xml
+++ b/build.xml
@@ -16,7 +16,10 @@
limitations under the License.
-->
+ xmlns:if="ant:if"
+ xmlns:unless="ant:unless"
+ xmlns:jacoco="antlib:org.jacoco.ant"
+ >
@@ -181,11 +184,9 @@
-
-
-
-
-
+
+
+
@@ -1837,10 +1838,7 @@
-
-
+
depends="setup-jacoco,test-nio,test-nio2,coverage-report,test-status" />
@@ -1878,25 +1876,13 @@
-
-
-
-
+ depends="test-compile,deploy,test-openssl-exists"
if="${execute.test.nio}">
-
-
-
-
+ depends="test-compile,deploy,test-openssl-exists"
if="${execute.test.nio2}">
@@ -1932,162 +1918,104 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Re: [tomcat] branch 9.0.x updated: Provide a little more control over resource caching
On 04/11/2021 11:11, Mark Thomas wrote: On 04/11/2021 10:53, ma...@apache.org wrote: 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 9cf432c Provide a little more control over resource caching 9cf432c is described below commit 9cf432cecde096f10ea19ff78d49b03307f85099 Author: Mark Thomas AuthorDate: Thu Nov 4 10:52:06 2021 + Provide a little more control over resource caching Do we want to back-port this to 8.5.x? Because we can't use default methods it will break any custom WebResourceRoot implementations. Ping (as the releases are approaching). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Improve changelog update
This is an automated email from the ASF dual-hosted git repository. remm 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 3ec02e3 Improve changelog update 3ec02e3 is described below commit 3ec02e372e93590b3f86c39acbd3f25c5078ea4c Author: remm AuthorDate: Mon Nov 8 12:08:05 2021 +0100 Improve changelog update --- webapps/docs/changelog.xml | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 6c3d869..f8c096d 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -191,8 +191,10 @@ method. -Add OpenSSL support through the Panama API incubating in Java 17, with -support for OpenSSL 1.1+. This no longer requires tomcat-native. (remm) +Add experimental OpenSSL support through the Panama API incubating in +Java 17, with support for OpenSSL 1.1+. This no longer requires +tomcat-native or APR. Please refer to the openssl-java17 +module for more details. (remm) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Revert long hack
This is an automated email from the ASF dual-hosted git repository.
remm 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 9cb0ce1 Revert long hack
9cb0ce1 is described below
commit 9cb0ce1f88f35a0b9219c479881fbd74c559dfe9
Author: remm
AuthorDate: Mon Nov 8 11:49:02 2021 +0100
Revert long hack
This branch actually supports MemoryAddress as the return type that
matches a pointer.
---
.../apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index e590a1a..7a4dd35 100644
---
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -126,7 +126,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
CLinker.C_POINTER, CLinker.C_POINTER, CLinker.C_POINTER,
CLinker.C_INT, CLinker.C_POINTER);
private static final FunctionDescriptor
openSSLCallbackTmpDHFunctionDescriptor =
-FunctionDescriptor.of(CLinker.C_LONG, CLinker.C_POINTER,
+FunctionDescriptor.of(CLinker.C_POINTER, CLinker.C_POINTER,
CLinker.C_INT, CLinker.C_INT);
static {
@@ -142,7 +142,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
MethodType.methodType(int.class, MemoryAddress.class,
MemoryAddress.class,
MemoryAddress.class, MemoryAddress.class,
int.class, MemoryAddress.class));
openSSLCallbackTmpDHHandle =
lookup.findVirtual(OpenSSLContext.class, "openSSLCallbackTmpDH",
-MethodType.methodType(long.class, MemoryAddress.class,
int.class, int.class));
+MethodType.methodType(MemoryAddress.class,
MemoryAddress.class, int.class, int.class));
} catch (Exception e) {
throw new IllegalStateException(e);
}
@@ -795,7 +795,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
}
// DH *(*tmp_dh_callback)(SSL *ssl, int is_export, int keylength)
-public long openSSLCallbackTmpDH(MemoryAddress ssl, int isExport, int
keylength) {
+public MemoryAddress openSSLCallbackTmpDH(MemoryAddress ssl, int isExport,
int keylength) {
var pkey = SSL_get_privatekey(ssl);
int type = (MemoryAddress.NULL.equals(pkey)) ? EVP_PKEY_NONE() :
EVP_PKEY_base_id(pkey);
/*
@@ -816,10 +816,10 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
}
for (int i = 0; i < dhParameters.length; i++) {
if (keylen >= dhParameters[i].min) {
-return dhParameters[i].dh.toRawLongValue();
+return dhParameters[i].dh;
}
}
-return MemoryAddress.NULL.toRawLongValue();
+return MemoryAddress.NULL;
}
// int SSL_callback_alpn_select_proto(SSL* ssl, const unsigned char **out,
unsigned char *outlen,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update changelog
This is an automated email from the ASF dual-hosted git repository. remm 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 43d47bd Update changelog 43d47bd is described below commit 43d47bd93d2df7e2f47c8cc92fb354e7c94f39a0 Author: remm AuthorDate: Mon Nov 8 11:36:43 2021 +0100 Update changelog And a cleanup. --- modules/openssl-java17/pom.xml | 1 - webapps/docs/changelog.xml | 4 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/openssl-java17/pom.xml b/modules/openssl-java17/pom.xml index 89088d7..d9180b1 100644 --- a/modules/openssl-java17/pom.xml +++ b/modules/openssl-java17/pom.xml @@ -28,7 +28,6 @@ tomcat-openssl Apache Tomcat OpenSSL support for Panama OpenSSL support using the Panama API - 0.1 jar diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index c912f3a..6c3d869 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -190,6 +190,10 @@ Servlet API. The new approach synchronizes the service() method. + +Add OpenSSL support through the Panama API incubating in Java 17, with +support for OpenSSL 1.1+. This no longer requires tomcat-native. (remm) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
