You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/02/14 15:33:06 UTC
[tomcat] branch master updated (892353a -> 6732d6a)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 892353a A couple of places where the 10.0.x version style needs to be restored
new 75ecd18 Increment version for next dev cycle
new 6732d6a Fix TLS 1.3 tests after removing deprecated Connector setters
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 | 2 +-
res/maven/mvn.properties.default | 2 +-
test/org/apache/tomcat/util/net/TestClientCertTls13.java | 11 +++++++++--
webapps/docs/changelog.xml | 4 +++-
4 files changed, 14 insertions(+), 5 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Fix TLS 1.3 tests after removing deprecated
Connector setters
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6732d6aca2c9d84480e7a9d2a2a1f1a1d08430e6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Feb 14 15:32:44 2020 +0000
Fix TLS 1.3 tests after removing deprecated Connector setters
---
test/org/apache/tomcat/util/net/TestClientCertTls13.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TestClientCertTls13.java b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
index 19f2e5e..7444ae2 100644
--- a/test/org/apache/tomcat/util/net/TestClientCertTls13.java
+++ b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
@@ -75,9 +75,16 @@ public class TestClientCertTls13 extends TomcatBaseTest {
TesterSupport.configureClientCertContext(tomcat);
// Need to override some of the previous settings
- Assert.assertTrue(tomcat.getConnector().setProperty("sslEnabledProtocols", Constants.SSL_PROTO_TLSv1_3));
+ SSLHostConfig[] sslHostConfigs = connector.findSslHostConfigs();
+ Assert.assertNotNull(sslHostConfigs);
+ Assert.assertEquals(1, sslHostConfigs.length);
+
+ SSLHostConfig sslHostConfig = sslHostConfigs[0];
+
+ // TLS 1.3 support
+ sslHostConfig.setProtocols(Constants.SSL_PROTO_TLSv1_3);
// And add force authentication to occur on the initial handshake
- Assert.assertTrue(tomcat.getConnector().setProperty("clientAuth", "required"));
+ sslHostConfig.setCertificateVerification("required");
TesterSupport.configureClientSsl();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Increment version for next dev cycle
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 75ecd18fdaf4860faa0878bac0b91ad3d42a058a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Feb 14 15:32:19 2020 +0000
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 8986247..58688ec 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
version.minor=0
version.build=0
version.patch=0
-version.suffix=-dev
+version.suffix=-M2-dev
# ----- Source control flags -----
git.branch=master
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 66a4ee3..e294888 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.0.0
+maven.asf.release.deploy.version=10.0.0-M2
#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 cb08195..713b05b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
They eventually become mixed with the numbered issues (i.e., numbered
issues do not "pop up" wrt. others).
-->
-<section name="Tomcat 10.0.0-M1 (markt)" rtext="in development">
+<section name="Tomcat 10.0.0-M2 (markt)" rtext="in development">
+</section>
+<section name="Tomcat 10.0.0-M1 (markt)" rtext="release in progress">
<subsection name="General">
<scode>
This release contains all of the changes upto and including those in
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org