From 17735c794d7d2bf60c68a02c811f62787e83bf20 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Wed, 1 Jan 2025 10:52:16 +0100 Subject: [PATCH] Happy New Year 2025 --- NOTICE | 2 +- java/org/apache/catalina/manager/Constants.java | 2 +- java/org/apache/catalina/manager/HTMLManagerServlet.java | 2 +- java/org/apache/catalina/manager/host/Constants.java | 2 +- modules/jdbc-pool/NOTICE | 2 +- webapps/manager/WEB-INF/jsp/connectorCerts.jsp | 2 +- webapps/manager/WEB-INF/jsp/connectorCiphers.jsp | 2 +- webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp | 2 +- webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +- webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE b/NOTICE index dc7f59d9b79b..a15bad8ded9b 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Tomcat -Copyright 1999-2024 The Apache Software Foundation +Copyright 1999-2025 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/). diff --git a/java/org/apache/catalina/manager/Constants.java b/java/org/apache/catalina/manager/Constants.java index 5fd102acaa8d..97b7b759efa7 100644 --- a/java/org/apache/catalina/manager/Constants.java +++ b/java/org/apache/catalina/manager/Constants.java @@ -130,7 +130,7 @@ public class Constants { HTML_TAIL_SECTION = "
\n" + "
\n" + - " Copyright © 1999-2024, Apache Software Foundation" + + " Copyright © 1999-2025, Apache Software Foundation" + "
\n" + "\n" + "\n" + diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java b/java/org/apache/catalina/manager/HTMLManagerServlet.java index 6a8f3ffcbe15..484311f3dd6b 100644 --- a/java/org/apache/catalina/manager/HTMLManagerServlet.java +++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java @@ -730,7 +730,7 @@ protected void sslConnectorTrustedCerts(HttpServletRequest request, HttpServletR @Override public String getServletInfo() { - return "HTMLManagerServlet, Copyright (c) 1999-2024, The Apache Software Foundation"; + return "HTMLManagerServlet, Copyright (c) 1999-2025, The Apache Software Foundation"; } @Override diff --git a/java/org/apache/catalina/manager/host/Constants.java b/java/org/apache/catalina/manager/host/Constants.java index 85435fbdf14a..68f8c228a517 100644 --- a/java/org/apache/catalina/manager/host/Constants.java +++ b/java/org/apache/catalina/manager/host/Constants.java @@ -80,7 +80,7 @@ public class Constants { public static final String HTML_TAIL_SECTION = "
\n" + "
\n" + - " Copyright © 1999-2024, Apache Software Foundation" + + " Copyright © 1999-2025, Apache Software Foundation" + "
\n" + "\n" + "\n" + diff --git a/modules/jdbc-pool/NOTICE b/modules/jdbc-pool/NOTICE index b31eb1db2903..5f3d8c8114a1 100644 --- a/modules/jdbc-pool/NOTICE +++ b/modules/jdbc-pool/NOTICE @@ -1,5 +1,5 @@ Apache Tomcat JDBC Pool -Copyright 2008-2024 The Apache Software Foundation +Copyright 2008-2025 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp index 80bfc7fdf0e6..796f35a1bdca 100644 --- a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp +++ b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp @@ -32,7 +32,7 @@ - + Configured certificate chains per Connector diff --git a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp index f59e87859cee..f353c1866387 100644 --- a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp +++ b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp @@ -32,7 +32,7 @@ - + Configured ciphers per Connector diff --git a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp index f969e9a6fae1..c5d524705e40 100644 --- a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp +++ b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp @@ -32,7 +32,7 @@ - + Trusted certificates per Connector diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp index b76e6f08cc02..7e71c535074a 100644 --- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp +++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp @@ -51,7 +51,7 @@ - + Sessions Administration: details for <%= currentSessionId %> diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp b/webapps/manager/WEB-INF/jsp/sessionsList.jsp index 03346a839b47..e93c92e062fc 100644 --- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp +++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp @@ -42,7 +42,7 @@ - + Sessions Administration for <%= JspHelper.escapeXml(cn.getDisplayName()) %>