On Tue, Jan 19, 2021 at 7:55 PM Mark Thomas <ma...@apache.org> wrote:
> On 19/01/2021 17:26, Christopher Schultz wrote: > > Mark, > > > > It seems like this could be easier if we defined a string constant or > > two somewhere and referenced it from everywhere. > > Another of life's constants appears to be that there is an XKCD for > every situation: > > https://xkcd.com/1205/ > > Given how easy the IDE makes find and replace, I'm happy with the manual > approach at the moment. But I won't complain if someone wants to make it > easier. > > > For the JSP files, perhaps the Manager web application could stuff the > > copyright notice into the servlet (application) context on startup and > > the JSP could pull the values out and into the <meta> elements. > > Apart from the NOTICE files (which I think would have to stay manual) > the rest are in strings so I think source code filtering might be > another option. > Or just use LocalDate.now().getYear() ? > > Mark > > > > > -chris > > > > On 1/17/21 12:51, ma...@apache.org wrote: > >> 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 > >> > >> > >> The following commit(s) were added to refs/heads/master by this push: > >> new c58fe9a Happy New Year 2021 > >> c58fe9a is described below > >> > >> commit c58fe9a378bb23ad202f91780b4cd936e6e8a3c5 > >> Author: Mark Thomas <ma...@apache.org> > >> AuthorDate: Sun Jan 17 17:49:51 2021 +0000 > >> > >> Happy New Year 2021 > >> --- > >> 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 7480ff4..43bc6be 100644 > >> --- a/NOTICE > >> +++ b/NOTICE > >> @@ -1,5 +1,5 @@ > >> Apache Tomcat > >> -Copyright 1999-2020 The Apache Software Foundation > >> +Copyright 1999-2021 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 c17eafc..c92998b 100644 > >> --- a/java/org/apache/catalina/manager/Constants.java > >> +++ b/java/org/apache/catalina/manager/Constants.java > >> @@ -131,7 +131,7 @@ public class Constants { > >> HTML_TAIL_SECTION = > >> "<hr size=\"1\" noshade=\"noshade\">\n" + > >> "<center><font size=\"-1\" color=\"#525D76\">\n" + > >> - " <em>Copyright © 1999-2020, Apache Software > >> Foundation</em>" + > >> + " <em>Copyright © 1999-2021, Apache Software > >> Foundation</em>" + > >> "</font></center>\n" + > >> "\n" + > >> "</body>\n" + > >> diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java > >> b/java/org/apache/catalina/manager/HTMLManagerServlet.java > >> index c2e5179..749ab83 100644 > >> --- a/java/org/apache/catalina/manager/HTMLManagerServlet.java > >> +++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java > >> @@ -798,7 +798,7 @@ public final class HTMLManagerServlet extends > >> ManagerServlet { > >> */ > >> @Override > >> public String getServletInfo() { > >> - return "HTMLManagerServlet, Copyright (c) 1999-2020, The > >> Apache Software Foundation"; > >> + return "HTMLManagerServlet, Copyright (c) 1999-2021, The > >> Apache Software Foundation"; > >> } > >> /** > >> diff --git a/java/org/apache/catalina/manager/host/Constants.java > >> b/java/org/apache/catalina/manager/host/Constants.java > >> index eccdead..3d768c1 100644 > >> --- a/java/org/apache/catalina/manager/host/Constants.java > >> +++ b/java/org/apache/catalina/manager/host/Constants.java > >> @@ -81,7 +81,7 @@ public class Constants { > >> public static final String HTML_TAIL_SECTION = > >> "<hr size=\"1\" noshade=\"noshade\">\n" + > >> "<center><font size=\"-1\" color=\"#525D76\">\n" + > >> - " <em>Copyright © 1999-2020, Apache Software > >> Foundation</em>" + > >> + " <em>Copyright © 1999-2021, Apache Software > >> Foundation</em>" + > >> "</font></center>\n" + > >> "\n" + > >> "</body>\n" + > >> diff --git a/modules/jdbc-pool/NOTICE b/modules/jdbc-pool/NOTICE > >> index 0767528..ad8a327 100644 > >> --- a/modules/jdbc-pool/NOTICE > >> +++ b/modules/jdbc-pool/NOTICE > >> @@ -1,5 +1,5 @@ > >> Apache Tomcat JDBC Pool > >> -Copyright 2008-2020 The Apache Software Foundation > >> +Copyright 2008-2021 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 d9347e4..9d86a46 100644 > >> --- a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp > >> +++ b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp > >> @@ -32,7 +32,7 @@ > >> <meta http-equiv="cache-control" > >> content="no-cache,must-revalidate"/><!-- HTTP 1.1 --> > >> <meta http-equiv="expires" content="0"/><!-- 0 is an invalid > >> value and should be treated as 'now' --> > >> <meta http-equiv="content-language" content="en"/> > >> - <meta name="copyright" content="copyright 2005-2020 the Apache > >> Software Foundation"/> > >> + <meta name="copyright" content="copyright 2005-2021 the Apache > >> Software Foundation"/> > >> <meta name="robots" content="noindex,nofollow,noarchive"/> > >> <title>Configured certificate chains per Connector</title> > >> </head> > >> diff --git a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp > >> b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp > >> index 18ac26f..8c0f940 100644 > >> --- a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp > >> +++ b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp > >> @@ -32,7 +32,7 @@ > >> <meta http-equiv="cache-control" > >> content="no-cache,must-revalidate"/><!-- HTTP 1.1 --> > >> <meta http-equiv="expires" content="0"/><!-- 0 is an invalid > >> value and should be treated as 'now' --> > >> <meta http-equiv="content-language" content="en"/> > >> - <meta name="copyright" content="copyright 2005-2020 the Apache > >> Software Foundation"/> > >> + <meta name="copyright" content="copyright 2005-2021 the Apache > >> Software Foundation"/> > >> <meta name="robots" content="noindex,nofollow,noarchive"/> > >> <title>Configured ciphers per Connector</title> > >> </head> > >> diff --git a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp > >> b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp > >> index 85225c2..a9ec0e0 100644 > >> --- a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp > >> +++ b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp > >> @@ -32,7 +32,7 @@ > >> <meta http-equiv="cache-control" > >> content="no-cache,must-revalidate"/><!-- HTTP 1.1 --> > >> <meta http-equiv="expires" content="0"/><!-- 0 is an invalid > >> value and should be treated as 'now' --> > >> <meta http-equiv="content-language" content="en"/> > >> - <meta name="copyright" content="copyright 2005-2020 the Apache > >> Software Foundation"/> > >> + <meta name="copyright" content="copyright 2005-2021 the Apache > >> Software Foundation"/> > >> <meta name="robots" content="noindex,nofollow,noarchive"/> > >> <title>Trusted certificates per Connector</title> > >> </head> > >> diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp > >> b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp > >> index c24d337..d4c5fbc 100644 > >> --- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp > >> +++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp > >> @@ -51,7 +51,7 @@ > >> <meta http-equiv="expires" content="0"/><!-- 0 is an invalid > >> value and should be treated as 'now' --> > >> <meta http-equiv="content-language" content="en"/> > >> <meta name="author" content="Cedrik LIME"/> > >> - <meta name="copyright" content="copyright 2005-2020 the Apache > >> Software Foundation"/> > >> + <meta name="copyright" content="copyright 2005-2021 the Apache > >> Software Foundation"/> > >> <meta name="robots" content="noindex,nofollow,noarchive"/> > >> <title>Sessions Administration: details for <%= currentSessionId > >> %></title> > >> </head> > >> diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp > >> b/webapps/manager/WEB-INF/jsp/sessionsList.jsp > >> index c163141..44c2e22 100644 > >> --- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp > >> +++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp > >> @@ -42,7 +42,7 @@ > >> <meta http-equiv="expires" content="0"/><!-- 0 is an invalid > >> value and should be treated as 'now' --> > >> <meta http-equiv="content-language" content="en"/> > >> <meta name="author" content="Cedrik LIME"/> > >> - <meta name="copyright" content="copyright 2005-2020 the Apache > >> Software Foundation"/> > >> + <meta name="copyright" content="copyright 2005-2021 the Apache > >> Software Foundation"/> > >> <meta name="robots" content="noindex,nofollow,noarchive"/> > >> <title>Sessions Administration for <%= > >> JspHelper.escapeXml(cn.getDisplayName()) %></title> > >> </head> > >> > >> > >> --------------------------------------------------------------------- > >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > >> For additional commands, e-mail: dev-h...@tomcat.apache.org > >> > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > > For additional commands, e-mail: dev-h...@tomcat.apache.org > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
