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-tck.git
The following commit(s) were added to refs/heads/main by this push:
new 6d4596e Update main to 12.0.x / Servlet 6.2-SNAPSHOT
6d4596e is described below
commit 6d4596e4f45789e393d95a7dc24c12b82b54ac14
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 28 16:18:52 2024 +0000
Update main to 12.0.x / Servlet 6.2-SNAPSHOT
---
annotations-tck/pom.xml | 2 +-
el-tck/pom.xml | 2 +-
jsp-tck/pom.xml | 2 +-
pom.xml | 10 +++++-----
servlet-tck/pom.xml | 2 +-
.../tomcat/tck/servlet/TomcatServletTckConfiguration.java | 1 +
websocket-tck/pom.xml | 2 +-
7 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/annotations-tck/pom.xml b/annotations-tck/pom.xml
index 24e0d56..50f7db1 100644
--- a/annotations-tck/pom.xml
+++ b/annotations-tck/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tomcat</groupId>
<artifactId>tck</artifactId>
- <version>11.0.0-SNAPSHOT</version>
+ <version>12.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/el-tck/pom.xml b/el-tck/pom.xml
index a9fbf45..0e025b8 100644
--- a/el-tck/pom.xml
+++ b/el-tck/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tomcat</groupId>
<artifactId>tck</artifactId>
- <version>11.0.0-SNAPSHOT</version>
+ <version>12.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/jsp-tck/pom.xml b/jsp-tck/pom.xml
index 154b722..dd5a04f 100644
--- a/jsp-tck/pom.xml
+++ b/jsp-tck/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tomcat</groupId>
<artifactId>tck</artifactId>
- <version>11.0.0-SNAPSHOT</version>
+ <version>12.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 78d9afc..3dc2cd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,15 +23,15 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>tck</artifactId>
- <version>11.0.0-SNAPSHOT</version>
+ <version>12.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
- <maven.compiler.source>17</maven.compiler.source>
- <maven.compiler.target>17</maven.compiler.target>
+ <maven.compiler.source>21</maven.compiler.source>
+ <maven.compiler.target>21</maven.compiler.target>
<!-- Tomcat version to test -->
- <tomcat.version>11.0.2-SNAPSHOT</tomcat.version>
+ <tomcat.version>12.0.0-M1-SNAPSHOT</tomcat.version>
<!-- Test run configuration -->
<fork.count>4</fork.count>
@@ -40,7 +40,7 @@
<tck.annotations.version>3.0.0</tck.annotations.version>
<tck.el.version>6.0.1</tck.el.version>
<api.el.version>6.0.0</api.el.version>
- <tck.servlet.version>6.1.0</tck.servlet.version>
+ <tck.servlet.version>6.2.0-SNAPSHOT</tck.servlet.version>
<tck.pages.version>4.0.0</tck.pages.version>
<tck.websocket.version>2.2.0</tck.websocket.version>
diff --git a/servlet-tck/pom.xml b/servlet-tck/pom.xml
index 5e5023a..b8802d1 100644
--- a/servlet-tck/pom.xml
+++ b/servlet-tck/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tomcat</groupId>
<artifactId>tck</artifactId>
- <version>11.0.0-SNAPSHOT</version>
+ <version>12.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git
a/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
b/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
index 43e2c1a..7c1ee5d 100644
---
a/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
+++
b/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
@@ -90,6 +90,7 @@ public class TomcatServletTckConfiguration implements
LoadableExtension {
// Server certificate
certificateConfig.setCertificateKeystoreFile(
this.getClass().getResource("/localhost-rsa.jks").toExternalForm());
+
certificateConfig.setCertificateKeystorePassword("changeit");
tomcat.getService().addConnector(connectorHttps);
localPort = connectorHttps.getLocalPort();
diff --git a/websocket-tck/pom.xml b/websocket-tck/pom.xml
index 7ed7c2d..bf0f0c1 100644
--- a/websocket-tck/pom.xml
+++ b/websocket-tck/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tomcat</groupId>
<artifactId>tck</artifactId>
- <version>11.0.0-SNAPSHOT</version>
+ <version>12.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
