svn commit: r1833989 [1/2] - in /tomcat/trunk: ./ bin/ java/org/apache/catalina/ant/ java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/manager/ java/org/apache/catalina/realm/ ja...

Thu, 21 Jun 2018 02:16:22 -0700 

Author: ebourg
Date: Thu Jun 21 09:16:08 2018
New Revision: 1833989

URL: http://svn.apache.org/viewvc?rev=1833989&view=rev
Log:
Use https URLs in the documentation when possible

Modified:
    tomcat/trunk/BUILDING.txt
    tomcat/trunk/CONTRIBUTING.md
    tomcat/trunk/NOTICE
    tomcat/trunk/README.md
    tomcat/trunk/RELEASE-NOTES
    tomcat/trunk/RUNNING.txt
    tomcat/trunk/bin/service.bat
    tomcat/trunk/build.properties.default
    tomcat/trunk/build.xml
    tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html
    tomcat/trunk/java/org/apache/catalina/ant/package.html
    tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
    tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
    tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
    tomcat/trunk/java/org/apache/catalina/manager/Constants.java
    tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
    tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
    tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
    
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
    tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
    tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
    tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
    tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
    tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
    tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
    tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
    tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/package.html
    tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
    tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
    tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
    tomcat/trunk/java/org/apache/tomcat/util/digester/package.html
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java
    
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java
    tomcat/trunk/modules/jdbc-pool/build.properties.default
    tomcat/trunk/modules/jdbc-pool/build.xml
    tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
    tomcat/trunk/modules/jdbc-pool/doc/package.xsl
    tomcat/trunk/modules/jdbc-pool/pom.xml
    
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
    tomcat/trunk/res/maven/tomcat-annotations-api.pom
    tomcat/trunk/res/maven/tomcat-api.pom
    tomcat/trunk/res/maven/tomcat-catalina-ant.pom
    tomcat/trunk/res/maven/tomcat-catalina-ha.pom
    tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom
    tomcat/trunk/res/maven/tomcat-catalina-ws.pom
    tomcat/trunk/res/maven/tomcat-catalina.pom
    tomcat/trunk/res/maven/tomcat-coyote.pom
    tomcat/trunk/res/maven/tomcat-dbcp.pom
    tomcat/trunk/res/maven/tomcat-el-api.pom
    tomcat/trunk/res/maven/tomcat-embed-core.pom
    tomcat/trunk/res/maven/tomcat-embed-el.pom
    tomcat/trunk/res/maven/tomcat-embed-jasper.pom
    tomcat/trunk/res/maven/tomcat-embed-websocket.pom
    tomcat/trunk/res/maven/tomcat-i18n-es.pom
    tomcat/trunk/res/maven/tomcat-i18n-fr.pom
    tomcat/trunk/res/maven/tomcat-i18n-ja.pom
    tomcat/trunk/res/maven/tomcat-jasper-el.pom
    tomcat/trunk/res/maven/tomcat-jasper.pom
    tomcat/trunk/res/maven/tomcat-jaspic-api.pom
    tomcat/trunk/res/maven/tomcat-jdbc.pom
    tomcat/trunk/res/maven/tomcat-jni.pom
    tomcat/trunk/res/maven/tomcat-jsp-api.pom
    tomcat/trunk/res/maven/tomcat-juli.pom
    tomcat/trunk/res/maven/tomcat-servlet-api.pom
    tomcat/trunk/res/maven/tomcat-storeconfig.pom
    tomcat/trunk/res/maven/tomcat-tribes.pom
    tomcat/trunk/res/maven/tomcat-util-scan.pom
    tomcat/trunk/res/maven/tomcat-util.pom
    tomcat/trunk/res/maven/tomcat-websocket-api.pom
    tomcat/trunk/res/maven/tomcat-websocket.pom
    tomcat/trunk/res/maven/tomcat.pom
    tomcat/trunk/res/rat/rat-excludes.txt
    tomcat/trunk/res/tomcat.nsi
    tomcat/trunk/res/welcome.bin.html
    tomcat/trunk/res/welcome.main.html
    tomcat/trunk/webapps/ROOT/index.jsp
    tomcat/trunk/webapps/docs/api/index.html
    tomcat/trunk/webapps/docs/appdev/installation.xml
    tomcat/trunk/webapps/docs/appdev/introduction.xml
    tomcat/trunk/webapps/docs/appdev/processes.xml
    tomcat/trunk/webapps/docs/appdev/project.xml
    tomcat/trunk/webapps/docs/appdev/source.xml
    tomcat/trunk/webapps/docs/apr.xml
    tomcat/trunk/webapps/docs/architecture/project.xml
    tomcat/trunk/webapps/docs/building.xml
    tomcat/trunk/webapps/docs/class-loader-howto.xml
    tomcat/trunk/webapps/docs/cluster-howto.xml
    tomcat/trunk/webapps/docs/comments.xml
    tomcat/trunk/webapps/docs/config/ajp.xml
    tomcat/trunk/webapps/docs/config/context.xml
    tomcat/trunk/webapps/docs/config/filter.xml
    tomcat/trunk/webapps/docs/config/jaspic.xml
    tomcat/trunk/webapps/docs/config/project.xml
    tomcat/trunk/webapps/docs/config/realm.xml
    tomcat/trunk/webapps/docs/config/server.xml
    tomcat/trunk/webapps/docs/config/systemprops.xml
    tomcat/trunk/webapps/docs/config/valve.xml
    tomcat/trunk/webapps/docs/deployer-howto.xml
    tomcat/trunk/webapps/docs/developers.xml
    tomcat/trunk/webapps/docs/elapi/index.html
    tomcat/trunk/webapps/docs/funcspecs/fs-admin-apps.xml
    tomcat/trunk/webapps/docs/funcspecs/fs-default.xml
    tomcat/trunk/webapps/docs/funcspecs/project.xml
    tomcat/trunk/webapps/docs/index.xml
    tomcat/trunk/webapps/docs/introduction.xml
    tomcat/trunk/webapps/docs/jasper-howto.xml
    tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
    tomcat/trunk/webapps/docs/jndi-resources-howto.xml
    tomcat/trunk/webapps/docs/jspapi/index.html
    tomcat/trunk/webapps/docs/logging.xml
    tomcat/trunk/webapps/docs/manager-howto.xml
    tomcat/trunk/webapps/docs/maven-jars.xml
    tomcat/trunk/webapps/docs/project.xml
    tomcat/trunk/webapps/docs/realm-howto.xml
    tomcat/trunk/webapps/docs/servletapi/index.html
    tomcat/trunk/webapps/docs/ssi-howto.xml
    tomcat/trunk/webapps/docs/ssl-howto.xml
    tomcat/trunk/webapps/docs/tomcat-docs.xsl
    tomcat/trunk/webapps/docs/tribes/project.xml
    tomcat/trunk/webapps/docs/web-socket-howto.xml
    tomcat/trunk/webapps/docs/websocketapi/index.html
    tomcat/trunk/webapps/docs/windows-auth-howto.xml
    tomcat/trunk/webapps/docs/windows-service-howto.xml
    tomcat/trunk/webapps/examples/jsp/index.html

Modified: tomcat/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
 
 This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
 implements the Servlet 4.0, JSP 2.3, EL 3.0, WebSocket 1.1 and JASPIC 1.1
-specifications from the Java Community Process <http://www.jcp.org/>.
+specifications from the Java Community Process <https://www.jcp.org/>.
 
 Note: If you just need to run Apache Tomcat, it is not necessary to build
 it. You may simply download a binary distribution. It is cross-platform.
@@ -56,7 +56,7 @@ source distribution, do the following:
       See Apache Commons DBCP project web site for more details on
       available versions of the library and its requirements,
 
-        http://commons.apache.org/dbcp/
+        https://commons.apache.org/dbcp/
 
  3. Install the JDK according to the instructions included with the release.
 
@@ -71,7 +71,7 @@ source distribution, do the following:
 
  2. Download a binary distribution of Ant from:
 
-        http://ant.apache.org/bindownload.cgi
+        https://ant.apache.org/bindownload.cgi
 
  3. Unpack the binary distribution into a convenient location so that the
     Ant release resides in its own directory (conventionally named
@@ -99,11 +99,11 @@ package.
 
  *  Tomcat SVN repository URL:
 
-        http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/trunk/
+        
https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/trunk/
 
  *  Source packages can be downloaded from:
 
-        http://tomcat.apache.org/download-@version_ma...@0.cgi
+        https://tomcat.apache.org/download-@version_ma...@0.cgi
 
 The location where the source has been placed will be further referred as
 ${tomcat.source}.

Modified: tomcat/trunk/CONTRIBUTING.md
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/CONTRIBUTING.md?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/CONTRIBUTING.md (original)
+++ tomcat/trunk/CONTRIBUTING.md Thu Jun 21 09:16:08 2018
@@ -4,17 +4,17 @@ Firstly, thanks for your interest in con
 pleasant first experience for you, and that you will return to continue
 contributing.
 
-Please visit our [Get Involved page](http://tomcat.apache.org/getinvolved.html)
+Please visit our [Get Involved 
page](https://tomcat.apache.org/getinvolved.html)
 for more information on how to contribute.
 
 ## Code of Conduct
 
 This project and everyone participating in it is governed by the Apache
 software Foundation's
-[Code of Conduct](http://www.apache.org/foundation/policies/conduct.html). By
+[Code of Conduct](https://www.apache.org/foundation/policies/conduct.html). By
 participating, you are expected to adhere to this code. If you are aware of
 unacceptable behavior, please visit the
-[Reporting Guidelines 
page](http://www.apache.org/foundation/policies/conduct.html#reporting-guidelines)
+[Reporting Guidelines 
page](https://www.apache.org/foundation/policies/conduct.html#reporting-guidelines)
 and follow the instructions there.
 
 ## How Can I Contribute?
@@ -25,7 +25,7 @@ for us to fix.
 
 ### Reporting Bugs
 
-Please review our [guide](http://tomcat.apache.org/bugreport.html) on how to
+Please review our [guide](https://tomcat.apache.org/bugreport.html) on how to
 submit a bug report. This page also has links to other resources to assist
 you.
 
@@ -36,7 +36,7 @@ you.
 Unsure where to begin contributing to Tomcat? You can start by taking a look at
 the issues marked 'Beginner', link below. Please note that the Beginner keyword
 is pretty new to the project, so if there aren't any issues in the filter feel
-free to ask on the [dev list](http://tomcat.apache.org/lists.html#tomcat-dev).
+free to ask on the [dev list](https://tomcat.apache.org/lists.html#tomcat-dev).
 
 * [Beginner 
issues](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=Beginner&keywords_type=allwords&list_id=160824&product=Tomcat%207&product=Tomcat%208&product=Tomcat%209&query_format=advanced)
 -
 issues which should only require a few lines of code, and a test or two to
@@ -84,7 +84,7 @@ can download the sources from the "Sourc
 If you have chosen to attach a patch to the Bugzilla issue (or email
 one), then you'll need to checkout the SVN version. Instructions for new
 committers to learn how to do this are found
-[here](http://www.apache.org/dev/contributors.html#svnbasics). However, in the
+[here](https://www.apache.org/dev/contributors.html#svnbasics). However, in the
 interest of a fast ramp up, the short version is below. Note that the root of
 the SVN repository is
 [tomcat/trunk](https://svn.apache.org/repos/asf/tomcat/trunk),

Modified: tomcat/trunk/NOTICE
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/NOTICE?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/NOTICE (original)
+++ tomcat/trunk/NOTICE Thu Jun 21 09:16:08 2018
@@ -2,11 +2,11 @@ Apache Tomcat
 Copyright 1999-2018 The Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (https://www.apache.org/).
 
 This software contains code derived from netty-native
 developed by the Netty project
-(http://netty.io, https://github.com/netty/netty-tcnative/)
+(https://netty.io, https://github.com/netty/netty-tcnative/)
 and from finagle-native developed at Twitter
 (https://github.com/twitter/finagle).
 
@@ -19,7 +19,7 @@ http://nsis.sourceforge.net.
 Java compilation software for JSP pages is provided by the Eclipse
 JDT Core Batch Compiler component, which is open source software.
 The original software and related information is available at
-http://www.eclipse.org/jdt/core/.
+https://www.eclipse.org/jdt/core/.
 
 For portions of the Tomcat JNI OpenSSL API and the OpenSSL JSSE integration
 The org.apache.tomcat.jni and the org.apache.tomcat.net.openssl packages

Modified: tomcat/trunk/README.md
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/README.md?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/README.md (original)
+++ tomcat/trunk/README.md Thu Jun 21 09:16:08 2018
@@ -6,20 +6,20 @@ The Apache Tomcat® software is an ope
 Servlet, JavaServer Pages, Java Expression Language and Java WebSocket
 technologies. The Java Servlet, JavaServer Pages, Java Expression Language and
 Java WebSocket specifications are developed under the
-[Java Community Process](http://jcp.org/en/introduction/overview).
+[Java Community Process](https://jcp.org/en/introduction/overview).
 
 The Apache Tomcat software is developed in an open and participatory
 environment and released under the
-[Apache License version 2](http://www.apache.org/licenses/). The Apache Tomcat
+[Apache License version 2](https://www.apache.org/licenses/). The Apache Tomcat
 project is intended to be a collaboration of the best-of-breed developers from
 around the world. We invite you to participate in this open development
 project. To learn more about getting involved,
-[click here](http://tomcat.apache.org/getinvolved.html) or keep reading.
+[click here](https://tomcat.apache.org/getinvolved.html) or keep reading.
 
 Apache Tomcat software powers numerous large-scale, mission-critical web
 applications across a diverse range of industries and organizations. Some of
 these users and their stories are listed on the
-[PoweredBy wiki page](http://wiki.apache.org/tomcat/PoweredBy).
+[PoweredBy wiki page](https://wiki.apache.org/tomcat/PoweredBy).
 
 Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
 project logo are trademarks of the Apache Software Foundation.
@@ -34,7 +34,7 @@ The documentation available as of the da
 included in the docs webapp which ships with tomcat. You can access that webapp
 by starting tomcat and visiting http://localhost:8080/docs/ in your browser.
 The most up-to-date documentation can be found at
-http://tomcat.apache.org/tomcat-9.0-doc/.
+https://tomcat.apache.org/tomcat-9.0-doc/.
 
 ### Installation
 
@@ -47,22 +47,22 @@ Please see [LICENSE](LICENSE) for more i
 ### Support and Mailing List Information
 
 * Free community support is available through the
-[tomcat-users](http://tomcat.apache.org/lists.html#tomcat-users) email list and
-a dedicated [IRC channel](http://tomcat.apache.org/irc.html) (#tomcat on
+[tomcat-users](https://tomcat.apache.org/lists.html#tomcat-users) email list 
and
+a dedicated [IRC channel](https://tomcat.apache.org/irc.html) (#tomcat on
 Freenode).
 
 * If you want freely available support for running Apache Tomcat, please see 
the
-resources page [here](http://tomcat.apache.org/findhelp.html).
+resources page [here](https://tomcat.apache.org/findhelp.html).
 
 * If you want to be informed about new code releases, bug fixes,
 security fixes, general news and information about Apache Tomcat, please
 subscribe to the
-[tomcat-announce](http://tomcat.apache.org/lists.html#tomcat-announce) email
+[tomcat-announce](https://tomcat.apache.org/lists.html#tomcat-announce) email
 list.
 
 * If you have a concrete bug report for Apache Tomcat, please see the
 instructions for reporting a bug
-[here](http://tomcat.apache.org/bugreport.html).
+[here](https://tomcat.apache.org/bugreport.html).
 
 ### Contributing
 

Modified: tomcat/trunk/RELEASE-NOTES
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Thu Jun 21 09:16:08 2018
@@ -134,7 +134,7 @@ the check.
 ==============================
 Viewing the Tomcat Change Log:
 ==============================
-The full change log is available from http://tomcat.apache.org and is also
+The full change log is available from https://tomcat.apache.org and is also
 included in the documentation web application.
 
 
@@ -170,4 +170,4 @@ software:
 When all else fails:
 ====================
 See the FAQ
-http://tomcat.apache.org/faq/
+https://tomcat.apache.org/faq/

Modified: tomcat/trunk/RUNNING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/RUNNING.txt?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/RUNNING.txt (original)
+++ tomcat/trunk/RUNNING.txt Thu Jun 21 09:16:08 2018
@@ -43,7 +43,7 @@ Running With JRE 8 Or Later
 
 (2.1) Download a binary distribution of Tomcat from:
 
-      http://tomcat.apache.org/
+      https://tomcat.apache.org/
 
 (2.2) Unpack the binary distribution so that it resides in its own
       directory (conventionally named "apache-tomcat-[version]").
@@ -203,7 +203,7 @@ launches Java directly and does not use
 (4.3) Further information about configuring and running Tomcat can be found in
       the documentation included here, as well as on the Tomcat web site:
 
-      http://tomcat.apache.org/
+      https://tomcat.apache.org/
 
 
 (5) Shut Down Tomcat
@@ -393,32 +393,32 @@ For further reading:
 
     * Documentation for APR/Native library in the Tomcat User's Guide
 
-      http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/apr.html
+      https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/apr.html
 
     * Documentation for the HTTP and AJP protocol connectors in the Tomcat
       Configuration Reference
 
-      
http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/http.html
+      
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/http.html
 
-      http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/ajp.html
+      
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/ajp.html
 
  - Apache Tomcat Native project home
 
-      http://tomcat.apache.org/native-doc/
+      https://tomcat.apache.org/native-doc/
 
  - Other projects
 
     * OpenSSL
 
-      http://openssl.org/
+      https://www.openssl.org/
 
     * Apache Portable Runtime
 
-      http://apr.apache.org/
+      https://apr.apache.org/
 
     * Apache HTTP Server
 
-      http://httpd.apache.org/
+      https://httpd.apache.org/
 
 To disable Apache Tomcat Native library:
 
@@ -449,17 +449,17 @@ For further reading:
 
  - Apache Commons Daemon project
 
-      http://commons.apache.org/daemon/
+      https://commons.apache.org/daemon/
 
  - Apache Tomcat documentation
 
     * Installing Apache Tomcat
 
-      http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/setup.html
+      https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/setup.html
 
     * Windows service HOW-TO
 
-      
http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/windows-service-howto.html
+      
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/windows-service-howto.html
 
 The binary files of Apache Commons Daemon in Apache Tomcat distributions
 for Windows are named:

Modified: tomcat/trunk/bin/service.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/service.bat?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/bin/service.bat (original)
+++ tomcat/trunk/bin/service.bat Thu Jun 21 09:16:08 2018
@@ -164,7 +164,7 @@ if "%JvmMs%" == "" set JvmMs=128
 if "%JvmMx%" == "" set JvmMx=256
 
 "%EXECUTABLE%" //IS//%SERVICE_NAME% ^
-    --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/"; 
^
+    --Description "Apache Tomcat @VERSION@ Server - 
https://tomcat.apache.org/"; ^
     --DisplayName "%DISPLAYNAME%" ^
     --Install "%EXECUTABLE%" ^
     --LogPath "%CATALINA_BASE%\logs" ^

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Jun 21 09:16:08 2018
@@ -89,8 +89,8 @@ compile.debug=true
 # Do not pass -deprecation (-Xlint:deprecation) flag to javac
 compile.deprecation=false
 
-base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download&filename=
-base-apache.loc.2=http://archive.apache.org/dist
+base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download&filename=
+base-apache.loc.2=https://archive.apache.org/dist
 base-commons.loc.1=${base-apache.loc.1}/commons
 base-commons.loc.2=${base-apache.loc.2}/commons
 base-tomcat.loc.1=${base-apache.loc.1}/tomcat

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Jun 21 09:16:08 2018
@@ -1925,7 +1925,7 @@ Apache Tomcat ${version} native binaries
       <link href="../elapi"/>
       <link href="../websocketapi"/>
       <link href="http://docs.oracle.com/javase/8/docs/api/"/>
-      <link 
href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+      <link 
href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
       <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
       <packageset dir="${tomcat.dist}/src/java/">
         <include name="org/**"/>

Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html Thu Jun 21 
09:16:08 2018
@@ -20,8 +20,8 @@
 <em>Ant (version 1.6 or later)</em> that can be used to interact with the
 Remote JMX JSR 160 RMI Adaptor to get/set attributes, invoke MBean operations
 and query for Mbeans inside a running instance of Tomcat.  For more 
information, see
-<a href="http://tomcat.apache.org/tomcat-7.0-doc/monitoring.html";>
-http://tomcat.apache.org/tomcat-7.0-doc/monitoring.html</a>.</p>
+<a href="https://tomcat.apache.org/tomcat-7.0-doc/monitoring.html";>
+https://tomcat.apache.org/tomcat-7.0-doc/monitoring.html</a>.</p>
 
 <p>Each task element can open a new jmx connection or reference an
 existing one. The following attribute are exists in every tasks:</p>

Modified: tomcat/trunk/java/org/apache/catalina/ant/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/package.html?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/package.html (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/package.html Thu Jun 21 09:16:08 
2018
@@ -20,8 +20,8 @@
 <em>Ant (version 1.6.x or later)</em> that can be used to interact with the
 Manager application to deploy, undeploy, list, reload, start and stop web 
applications
 from a running instance of Tomcat.  For more information, see
-<a href="http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html";>
-http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html</a>.</p>
+<a href="https://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html";>
+https://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html</a>.</p>
 
 <p>The attributes of each task element correspond
 exactly to the request parameters that are included with an HTTP request

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Thu Jun 21 
09:16:08 2018
@@ -1041,7 +1041,7 @@ public class StandardWrapper extends Con
                 unavailable(null);
 
                 // Added extra log statement for Bugzilla 36630:
-                // http://bz.apache.org/bugzilla/show_bug.cgi?id=36630
+                // https://bz.apache.org/bugzilla/show_bug.cgi?id=36630
                 if(log.isDebugEnabled()) {
                     log.debug(sm.getString("standardWrapper.instantiate", 
servletClass), e);
                 }

Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Thu Jun 21 
09:16:08 2018
@@ -47,7 +47,7 @@ import org.apache.juli.logging.LogFactor
 /**
  * <p>
  * ExpiresFilter is a Java Servlet API port of <a
- * href="http://httpd.apache.org/docs/2.2/mod/mod_expires.html";>Apache
+ * href="https://httpd.apache.org/docs/2.2/mod/mod_expires.html";>Apache
  * mod_expires</a> to add '{@code Expires}' and
  * '{@code Cache-Control: max-age=}' headers to HTTP response according to its
  * '{@code Content-Type}'.
@@ -55,7 +55,7 @@ import org.apache.juli.logging.LogFactor
  *
  * <p>
  * Following documentation is inspired by <a
- * href="http://httpd.apache.org/docs/2.2/mod/mod_expires.html";>mod_expires</a>
+ * 
href="https://httpd.apache.org/docs/2.2/mod/mod_expires.html";>mod_expires</a>
  * </p>
  * <h1>Summary</h1>
  * <p>
@@ -75,7 +75,7 @@ import org.apache.juli.logging.LogFactor
  * To modify {@code Cache-Control} directives other than {@code max-age} (see
  * <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9"; 
>RFC
  * 2616 section 14.9</a>), you can use other servlet filters or <a
- * href="http://httpd.apache.org/docs/2.2/mod/mod_headers.html"; >Apache Httpd
+ * href="https://httpd.apache.org/docs/2.2/mod/mod_headers.html"; >Apache Httpd
  * mod_headers</a> module.
  * </p>
  * <h1>Filter Configuration</h1><h2>Basic configuration to add

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Thu Jun 
21 09:16:08 2018
@@ -56,7 +56,7 @@ import org.apache.juli.logging.LogFactor
  * </p>
  * <p>
  * Most of the design of this Servlet Filter is a port of <a
- * 
href="http://httpd.apache.org/docs/trunk/mod/mod_remoteip.html";>mod_remoteip</a>,
 this servlet filter replaces the apparent client remote
+ * 
href="https://httpd.apache.org/docs/trunk/mod/mod_remoteip.html";>mod_remoteip</a>,
 this servlet filter replaces the apparent client remote
  * IP address and hostname for the request with the IP address list presented 
by a proxy or a load balancer via a request headers (e.g.
  * "X-Forwarded-For").
  * </p>
@@ -171,7 +171,7 @@ import org.apache.juli.logging.LogFactor
  * <strong>Regular expression vs. IP address blocks:</strong> 
<code>mod_remoteip</code> allows to use address blocks (e.g.
  * <code>192.168/16</code>) to configure <code>RemoteIPInternalProxy</code> 
and <code>RemoteIPTrustedProxy</code> ; as the JVM doesn't have a
  * library similar to <a
- * 
href="http://apr.apache.org/docs/apr/1.3/group__apr__network__io.html#gb74d21b8898b7c40bf7fd07ad3eb993d";>apr_ipsubnet_test</a>,
 we rely on
+ * 
href="https://apr.apache.org/docs/apr/1.3/group__apr__network__io.html#gb74d21b8898b7c40bf7fd07ad3eb993d";>apr_ipsubnet_test</a>,
 we rely on
  * regular expressions.
  * </p>
  * <hr>

Modified: tomcat/trunk/java/org/apache/catalina/manager/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/Constants.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/Constants.java Thu Jun 21 
09:16:08 2018
@@ -118,11 +118,11 @@ public class Constants {
             "<table cellspacing=\"4\" border=\"0\">\n" +
             " <tr>\n" +
             "  <td colspan=\"2\">\n" +
-            "   <a href=\"http://tomcat.apache.org/\";>\n" +
+            "   <a href=\"https://tomcat.apache.org/\";>\n" +
             "    <img border=\"0\" alt=\"The Tomcat Servlet/JSP Container\"\n" 
+
             "         align=\"left\" src=\"{0}/images/tomcat.gif\">\n" +
             "   </a>\n" +
-            "   <a href=\"http://www.apache.org/\";>\n" +
+            "   <a href=\"https://www.apache.org/\";>\n" +
             "    <img border=\"0\" alt=\"The Apache Software Foundation\" 
align=\"right\"\n" +
             "         src=\"{0}/images/asf-logo.svg\" style=\"width: 266px; 
height: 83px;\">\n" +
             "   </a>\n" +

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Thu Jun 21 
09:16:08 2018
@@ -173,7 +173,7 @@ import org.ietf.jgss.GSSCredential;
  * <p><strong>WARNING</strong> - There is a reported bug against the Netscape
  * provider code (com.netscape.jndi.ldap.LdapContextFactory) with respect to
  * successfully authenticated a non-existing user. The
- * report is here: http://bz.apache.org/bugzilla/show_bug.cgi?id=11210 .
+ * report is here: https://bz.apache.org/bugzilla/show_bug.cgi?id=11210 .
  * With luck, Netscape has updated their provider code and this is not an
  * issue. </p>
  *

Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu Jun 21 
09:16:08 2018
@@ -125,7 +125,7 @@ import org.apache.tomcat.util.res.String
  * or an instance where the specification cited differs from Best
  * Community Practice (BCP).
  * Such instances should be well-documented here.  Please email the
- * <a href="http://tomcat.apache.org/lists.html";>Tomcat group</a>
+ * <a href="https://tomcat.apache.org/lists.html";>Tomcat group</a>
  * with amendments.
  *
  * </p>

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Jun 21 
09:16:08 2018
@@ -134,7 +134,7 @@ import org.apache.tomcat.util.res.String
  * see setters for doc. It can be used for simple tests and
  * demo.
  *
- * @see <a 
href="http://svn.apache.org/repos/asf/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java";>TestTomcat</a>
+ * @see <a 
href="https://svn.apache.org/repos/asf/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java";>TestTomcat</a>
  * @author Costin Manolache
  */
 public class Tomcat {

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
 Thu Jun 21 09:16:08 2018
@@ -118,8 +118,8 @@ import org.apache.juli.logging.LogFactor
  * Maybe I'll do a state diagram :)
  * </p>
  * <h2>State Diagrams</h2>
- * <a 
href="http://people.apache.org/~fhanik/tribes/docs/leader-election-initiate-election.jpg";>Initiate
 an election</a><br><br>
- * <a 
href="http://people.apache.org/~fhanik/tribes/docs/leader-election-message-arrives.jpg";>Receive
 an election message</a><br><br>
+ * <a 
href="https://people.apache.org/~fhanik/tribes/docs/leader-election-initiate-election.jpg";>Initiate
 an election</a><br><br>
+ * <a 
href="https://people.apache.org/~fhanik/tribes/docs/leader-election-message-arrives.jpg";>Receive
 an election message</a><br><br>
  *
  * @version 1.0
  *

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
Thu Jun 21 09:16:08 2018
@@ -59,7 +59,7 @@ import org.apache.tomcat.util.net.IPv6Ut
  * <p>Abstract implementation of the <b>Valve</b> interface that generates a 
web
  * server access log with the detailed line contents matching a configurable
  * pattern. The syntax of the available patterns is similar to that supported 
by
- * the <a href="http://httpd.apache.org/";>Apache HTTP Server</a>
+ * the <a href="https://httpd.apache.org/";>Apache HTTP Server</a>
  * <code>mod_log_config</code> module.</p>
  *
  * <p>Patterns for the logged message may include constant text or any of the
@@ -109,7 +109,7 @@ import org.apache.tomcat.util.net.IPv6Ut
  * There is also support to write information from the cookie, incoming
  * header, the Session or something else in the ServletRequest.<br>
  * It is modeled after the
- * <a href="http://httpd.apache.org/";>Apache HTTP Server</a> log configuration
+ * <a href="https://httpd.apache.org/";>Apache HTTP Server</a> log configuration
  * syntax:</p>
  * <ul>
  * <li><code>%{xxx}i</code> for incoming headers

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java 
Thu Jun 21 09:16:08 2018
@@ -56,7 +56,7 @@ import org.apache.catalina.util.SessionC
  * authentication valves, as the redirection should take place before an
  * authentication valve would save a request to a protected resource.</p>
  *
- * @see <a 
href="http://tomcat.apache.org/connectors-doc/generic_howto/loadbalancers.html";>Load
+ * @see <a 
href="https://tomcat.apache.org/connectors-doc/generic_howto/loadbalancers.html";>Load
  *      balancer documentation</a>
  */
 public class LoadBalancerDrainingValve

Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Thu Jun 21 
09:16:08 2018
@@ -35,7 +35,7 @@ import org.apache.tomcat.util.http.MimeH
 
 /**
  * <p>
- * Tomcat port of <a 
href="http://httpd.apache.org/docs/trunk/mod/mod_remoteip.html";>mod_remoteip</a>,
 this valve replaces the apparent
+ * Tomcat port of <a 
href="https://httpd.apache.org/docs/trunk/mod/mod_remoteip.html";>mod_remoteip</a>,
 this valve replaces the apparent
  * client remote IP address and hostname for the request with the IP address 
list presented by a proxy or a load balancer via a request
  * headers (e.g. "X-Forwarded-For").
  * </p>
@@ -152,7 +152,7 @@ import org.apache.tomcat.util.http.MimeH
  * <strong>Regular expression vs. IP address blocks:</strong> 
<code>mod_remoteip</code> allows to use address blocks (e.g.
  * <code>192.168/16</code>) to configure <code>RemoteIPInternalProxy</code> 
and <code>RemoteIPTrustedProxy</code> ; as Tomcat doesn't have a
  * library similar to <a
- * 
href="http://apr.apache.org/docs/apr/1.3/group__apr__network__io.html#gb74d21b8898b7c40bf7fd07ad3eb993d";>apr_ipsubnet_test</a>,
+ * 
href="https://apr.apache.org/docs/apr/1.3/group__apr__network__io.html#gb74d21b8898b7c40bf7fd07ad3eb993d";>apr_ipsubnet_test</a>,
  * <code>RemoteIpValve</code> uses regular expression to configure 
<code>internalProxies</code> and <code>trustedProxies</code> in the same
  * fashion as {@link RequestFilterValve} does.
  * </p>

Modified: tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java Thu 
Jun 21 09:16:08 2018
@@ -227,7 +227,7 @@ public class FileResource extends Abstra
             // Workaround for certain files on platforms that use
             // EBCDIC encoding, when they are read through FileInputStream.
             // See commit message of rev.303915 for original details
-            // http://svn.apache.org/viewvc?view=revision&revision=303915
+            // https://svn.apache.org/viewvc?view=revision&revision=303915
             String str = new String(result);
             try {
                 result = str.getBytes(StandardCharsets.UTF_8);

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java 
Thu Jun 21 09:16:08 2018
@@ -157,7 +157,7 @@ public class IdentityInputFilter impleme
                 if (maxSwallowSizeExceeded && swallowed > maxSwallowSize) {
                     // Note: We do not fail early so the client has a chance to
                     // read the response before the connection is closed. See:
-                    // 
http://httpd.apache.org/docs/2.0/misc/fin_wait_2.html#appendix
+                    // 
https://httpd.apache.org/docs/2.0/misc/fin_wait_2.html#appendix
                     throw new 
IOException(sm.getString("inputFilter.maxSwallow"));
                 }
             } else { // errors are handled higher up.

Modified: tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java Thu Jun 
21 09:16:08 2018
@@ -26,7 +26,7 @@ import javax.xml.stream.XMLStreamReader;
 
 /*
  * The BoM detection is derived from:
- * 
http://svn.us.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?annotate=1742248
+ * 
https://svn.us.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?annotate=1742248
  *
  * The prolog is always at least as specific as the BOM therefore any encoding
  * specified in the prolog should take priority over the BOM.

Modified: tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java Thu Jun 21 
09:16:08 2018
@@ -214,7 +214,7 @@ class PageDataImpl extends PageData impl
                         continue;
                     }
 
-                    // Bugzilla 35252: 
http://bz.apache.org/bugzilla/show_bug.cgi?id=35252
+                    // Bugzilla 35252: 
https://bz.apache.org/bugzilla/show_bug.cgi?id=35252
                     if(rootAttrs.getIndex(qName) == -1) {
                         rootAttrs.addAttribute(attrs.getURI(i),
                                                attrs.getLocalName(i),

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Thu Jun 
21 09:16:08 2018
@@ -532,7 +532,7 @@ public class JspServletWrapper {
      * number in the generated servlet that originated the exception to a line
      * number in the JSP.  Then constructs an exception containing that
      * information, and a snippet of the JSP to help debugging.
-     * Please see http://bz.apache.org/bugzilla/show_bug.cgi?id=37062 and
+     * Please see https://bz.apache.org/bugzilla/show_bug.cgi?id=37062 and
      * http://www.tfenne.com/jasper/ for more details.
      *</p>
      *

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/package.html?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/package.html (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/package.html Thu Jun 21 
09:16:08 2018
@@ -21,7 +21,7 @@
 <body bgcolor="white">
 <p>
 This package contains basic classes for the
-<a href="http://commons.apache.org/bcel/";>Byte Code Engineering Library</a>
+<a href="https://commons.apache.org/bcel/";>Byte Code Engineering Library</a>
  and constants defined by the
 <a href="http://docs.oracle.com/javase/specs/";>
  JVM specification</a>.

Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java Thu Jun 
21 09:16:08 2018
@@ -76,7 +76,7 @@ public class Base64 extends BaseNCodec {
      * equivalents as specified in Table 1 of RFC 2045.
      *
      * Thanks to "commons" project in ws.apache.org for this code.
-     * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
+     * https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
      */
     private static final byte[] STANDARD_ENCODE_TABLE = {
             'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
@@ -108,7 +108,7 @@ public class Base64 extends BaseNCodec {
      * URL_SAFE and STANDARD base64. (The encoder, on the other hand, needs to 
know ahead of time what to emit).
      *
      * Thanks to "commons" project in ws.apache.org for this code.
-     * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
+     * https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
      */
     private static final byte[] DECODE_TABLE = {
         //   0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
@@ -315,7 +315,7 @@ public class Base64 extends BaseNCodec {
      * <p><b>Note: no padding is added when encoding using the URL-safe 
alphabet.</b></p>
      * <p>
      * Thanks to "commons" project in ws.apache.org for the bitwise 
operations, and general approach.
-     * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
+     * https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
      * </p>
      *
      * @param in
@@ -412,7 +412,7 @@ public class Base64 extends BaseNCodec {
      * </p>
      * <p>
      * Thanks to "commons" project in ws.apache.org for the bitwise 
operations, and general approach.
-     * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
+     * https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
      * </p>
      *
      * @param in

Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Thu Jun 
21 09:16:08 2018
@@ -315,7 +315,7 @@ public class WebXml extends XmlEncodingB
 
     // servlet-mapping
     // Note: URLPatterns from web.xml may be URL encoded
-    //       (http://svn.apache.org/r285186)
+    //       (https://svn.apache.org/r285186)
     private final Map<String,String> servletMappings = new HashMap<>();
     private final Set<String> servletMappingNames = new HashSet<>();
     public void addServletMapping(String urlPattern, String servletName) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java Thu 
Jun 21 09:16:08 2018
@@ -34,7 +34,7 @@ import org.xml.sax.Attributes;
  * </p>
  *
  * <p>This rule now uses
- * <a 
href="http://commons.apache.org/beanutils/apidocs/org/apache/commons/beanutils/MethodUtils.html";>
+ * <a 
href="https://commons.apache.org/beanutils/apidocs/org/apache/commons/beanutils/MethodUtils.html";>
  * org.apache.commons.beanutils.MethodUtils#invokeMethod
  * </a> by default.
  * This increases the kinds of methods successfully and allows primitives

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/package.html?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/package.html (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/package.html Thu Jun 21 
09:16:08 2018
@@ -544,7 +544,7 @@ and configures the Digester to be used,
 method for where the parsing actually takes place.</p>
 
 <p>(Struts binary and source distributions can be acquired at
-<a href="http://struts.apache.org/";>http://struts.apache.org/</a>.)</p>
+<a href="https://struts.apache.org/";>http://struts.apache.org/</a>.)</p>
 
 <p>The following discussion highlights a few of the matching patterns and
 processing rules that are configured, to illustrate the use of some of the
@@ -874,8 +874,8 @@ the way that <code>RegexRules</code> is
 </p>
 <p>
 There are many good regex libraries available. (For example
-<a href='http://jakarta.apache.org/oro/index.html'>Jakarta ORO</a>,
-<a href='http://jakarta.apache.org/regexp/index.html'>Jakarta Regex</a>,
+<a href='https://jakarta.apache.org/oro/index.html'>Jakarta ORO</a>,
+<a href='https://jakarta.apache.org/regexp/index.html'>Jakarta Regex</a>,
 <a href='http://www.cacas.org/java/gnu/regexp/'>GNU Regex</a> and
 <a 
href='http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/package-summary.html'>
 Java 1.4 Regex</a>)
@@ -1176,7 +1176,7 @@ It works but we have no plans to add sup
 <p>
 We would consider donations of standard digester applications but it's 
unlikely that
 these would ever be shipped with the base digester distribution.
-If you want to discuss this, please post to <a 
href='http://commons.apache.org/mail-lists.html'>
+If you want to discuss this, please post to <a 
href='https://commons.apache.org/mail-lists.html'>
 commons dev mailing list</a>
 </p>
 </li>

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java 
Thu Jun 21 09:16:08 2018
@@ -81,7 +81,7 @@
  * </p>
  * <p>
  * Please see the FileUpload
- * <a href="http://commons.apache.org/fileupload/using.html"; 
target="_top">User Guide</a>
+ * <a href="https://commons.apache.org/fileupload/using.html"; 
target="_top">User Guide</a>
  * for further details and examples of how to use this package.
  * </p>
  */

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java
 Thu Jun 21 09:16:08 2018
@@ -38,7 +38,7 @@
  * </pre>
  *    <p>
  *      Please see the FileUpload
- *      <a href="http://commons.apache.org/fileupload/using.html"; 
target="_top">User Guide</a>
+ *      <a href="https://commons.apache.org/fileupload/using.html"; 
target="_top">User Guide</a>
  *      for further details and examples of how to use this package.
  *    </p>
  */

Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Thu Jun 21 09:16:08 
2018
@@ -67,13 +67,13 @@ testdb.validationQuery=SELECT 1
 junit.version=4.11
 junit.home=${base.path}/junit-${junit.version}
 junit.jar=${junit.home}/junit-${junit.version}.jar
-junit.loc=http://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar
+junit.loc=https://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar
 
 # Hamcrest Library, used by JUnit
 hamcrest.version=1.3
 hamcrest.home=${base.path}/hamcrest-${hamcrest.version}
 hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar
-hamcrest.loc=http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
+hamcrest.loc=https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
 
 mysql.home=${base.path}/mysql-connector-java-5.1.12
 mysql.jar=${mysql.home}/mysql-connector-java-5.1.12-bin.jar
@@ -83,19 +83,19 @@ tomcat.version=8.0.14
 tomcat.home=${base.path}/apache-tomcat-${tomcat.version}
 tomcat.dbcp.jar=${tomcat.home}/lib/tomcat-dbcp.jar
 tomcat.juli.jar=${tomcat.home}/bin/tomcat-juli.jar
-tomcat.loc=http://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip
+tomcat.loc=https://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip
 
-tomcat.project.loc=http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/project.xml
+tomcat.project.loc=https://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/project.xml
 tomcat.project.dest=${base.path}/project.xml
 
-tomcat.xsl.loc=http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/tomcat-docs.xsl
+tomcat.xsl.loc=https://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/tomcat-docs.xsl
 tomcat.xsl.dest=${base.path}/tomcat-docs.xsl
 
 derby.home=${base.path}/db-derby-10.5.1.1-bin
-derby.loc=http://archive.apache.org/dist/db/derby/db-derby-10.5.1.1/db-derby-10.5.1.1-bin.tar.gz
+derby.loc=https://archive.apache.org/dist/db/derby/db-derby-10.5.1.1/db-derby-10.5.1.1-bin.tar.gz
 derby.jar=${derby.home}/lib/derby.jar
 
 h2.version=1.2.129
 h2.home=${base.path}/h2-${h2.version}
-h2.loc=http://repo.maven.apache.org/maven2/com/h2database/h2/1.2.129/h2-1.2.129.jar
+h2.loc=https://repo.maven.apache.org/maven2/com/h2database/h2/1.2.129/h2-1.2.129.jar
 h2.jar=${h2.home}/h2-1.2.129.jar

Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Thu Jun 21 09:16:08 2018
@@ -118,7 +118,7 @@
           style="${basedir}/doc/package.xsl"
           excludes="build.xml"
           includes="jdbc-pool.xml">
-      <param name="relative-path" 
expression="http://tomcat.apache.org/tomcat-6.0-doc"/>
+      <param name="relative-path" 
expression="https://tomcat.apache.org/tomcat-6.0-doc"/>
       <param name="apache-logo" expression="/images/asf-logo.svg"/>
     </xslt>
     <move 
tofile="${basedir}/src/main/java/org/apache/tomcat/jdbc/pool/package.html"
@@ -240,7 +240,7 @@
           style="${tomcat.xsl.dest}"
           excludes="build.xml project.xml"
           includes="*.xml">
-      <param name="relative-path" 
expression="http://tomcat.apache.org/tomcat-6.0-doc"/>
+      <param name="relative-path" 
expression="https://tomcat.apache.org/tomcat-6.0-doc"/>
       <param name="apache-logo" expression="/images/asf-logo.svg"/>
     </xslt>
   </target>

Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Thu Jun 21 09:16:08 2018
@@ -36,7 +36,7 @@
 <section name="Introduction">
 
   <p>The <strong>JDBC Connection Pool 
<code>org.apache.tomcat.jdbc.pool</code></strong>
-  is a replacement or an alternative to the <a 
href="http://commons.apache.org/dbcp/";>Apache Commons DBCP</a>
+  is a replacement or an alternative to the <a 
href="https://commons.apache.org/dbcp/";>Apache Commons DBCP</a>
   connection pool.</p>
 
   <p>So why do we need a new connection pool?</p>
@@ -752,7 +752,7 @@
 </section>
 
 <section name="Code Example">
-  <p>Other examples of Tomcat configuration for JDBC usage can be found <a 
href="http://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html";>in
 the Tomcat documentation</a>. </p>
+  <p>Other examples of Tomcat configuration for JDBC usage can be found <a 
href="https://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html";>in
 the Tomcat documentation</a>. </p>
   <subsection name="Plain Ol' Java">
     <p>Here is a simple example of how to create and use a data source.</p>
 <source><![CDATA[  import java.sql.Connection;
@@ -959,7 +959,7 @@
 
 <section name="Building">
   <p>We build the JDBC pool code with 1.6, but it is backwards compatible down 
to 1.5 for runtime environment. For unit test, we use 1.6 and higher</p>
-  <p>Other examples of Tomcat configuration for JDBC usage can be found <a 
href="http://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html";>in
 the Tomcat documentation</a>. </p>
+  <p>Other examples of Tomcat configuration for JDBC usage can be found <a 
href="https://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html";>in
 the Tomcat documentation</a>. </p>
   <subsection name="Building from source">
     <p>Building is pretty simple. The pool has a dependency on 
<code>tomcat-juli.jar</code> and in case you want the 
<code>SlowQueryReportJmx</code></p>
 <source><![CDATA[  javac -classpath tomcat-juli.jar \
@@ -968,7 +968,7 @@
         org/apache/tomcat/jdbc/pool/interceptor/*.java \
         org/apache/tomcat/jdbc/pool/jmx/*.java]]></source>
     <p>
-       A build file can be found in the Tomcat <a 
href="http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/";>source 
repository</a>.
+       A build file can be found in the Tomcat <a 
href="https://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/";>source 
repository</a>.
     </p>
     <p>
       As a convenience, a build file is also included where a simple build 
command will generate all files needed.

Modified: tomcat/trunk/modules/jdbc-pool/doc/package.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/package.xsl?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/package.xsl (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/package.xsl Thu Jun 21 09:16:08 2018
@@ -36,8 +36,8 @@
   <xsl:param    name="relative-path"    select="'.'"/>
   <xsl:param    name="void-image"       select="'/images/void.gif'"/>
   <xsl:param    name="standalone"       select="''"/>
-  <xsl:param    name="buglink"          
select="'http://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
-  <xsl:param    name="revlink"          
select="'http://svn.apache.org/viewvc?view=rev&amp;rev='"/>
+  <xsl:param    name="buglink"          
select="'https://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
+  <xsl:param    name="revlink"          
select="'https://svn.apache.org/viewvc?view=rev&amp;rev='"/>
 
   <!-- Defined variables (non-overrideable) -->
   <xsl:variable name="body-bg"          select="'#ffffff'"/>

Modified: tomcat/trunk/modules/jdbc-pool/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/pom.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/pom.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/pom.xml Thu Jun 21 09:16:08 2018
@@ -32,7 +32,7 @@
   <packaging>jar</packaging>
 
   <name>jdbc-pool</name>
-  <url>http://people.apache.org/~fhanik/jdbc-pool/</url>
+  <url>https://people.apache.org/~fhanik/jdbc-pool/</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -56,7 +56,7 @@
   <scm>
     
<connection>scm:svn:https://svn.apache.org/repos/asf/tomcat/trunk/modules/jdbc-pool</connection>
     
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/trunk/modules/jdbc-pool</developerConnection>
-    <url>http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool</url>
+    <url>https://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool</url>
   </scm>
 
   <dependencies>

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
 Thu Jun 21 09:16:08 2018
@@ -42,7 +42,7 @@ import org.apache.juli.logging.LogFactor
  * <code>BasicDataSource</code> bean properties.</p>
  * <br>
  * Properties available for configuration:<br>
- * <a href="http://commons.apache.org/dbcp/configuration.html";>Commons DBCP 
properties</a><br>
+ * <a href="https://commons.apache.org/dbcp/configuration.html";>Commons DBCP 
properties</a><br>
  *<ol>
  *  <li>initSQL - A query that gets executed once, right after the connection 
is established.</li>
  *  <li>testOnConnect - run validationQuery after connection has been 
established.</li>

Modified: tomcat/trunk/res/maven/tomcat-annotations-api.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-annotations-api.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-annotations-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-annotations-api.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-annotations-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Annotations Package</description>
-    <url>http://tomcat.apache.org/</url>
+    <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-api.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-api.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-api.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Definition of interfaces shared by Catalina and 
Jasper</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-catalina-ant.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-ant.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina-ant.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-ant.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-catalina-ant</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Ant tasks for remote management</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-catalina-ha.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-ha.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina-ha.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-ha.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-catalina-ha</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat High Availability Implementation</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom Thu Jun 21 09:16:08 
2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-catalina-jmx-remote</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Remote JMX listener</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-catalina-ws.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-ws.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina-ws.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-ws.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-catalina-ws</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat JNDI Factory for Web Services</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-catalina.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-catalina</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Servlet Engine Core Classes and Standard 
implementations</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-coyote.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-coyote.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-coyote.pom (original)
+++ tomcat/trunk/res/maven/tomcat-coyote.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-coyote</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Connectors and HTTP parser</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-dbcp.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-dbcp.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-dbcp.pom (original)
+++ tomcat/trunk/res/maven/tomcat-dbcp.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-dbcp</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Database Connection Pooling package</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-el-api.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-el-api.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-el-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-el-api.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-el-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Expression language package</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-embed-core.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-core.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-core.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-core.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-embed-core</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Core Tomcat implementation</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-embed-el.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-el.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-el.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-el.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-embed-el</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Core Tomcat implementation</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-embed-jasper.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-jasper.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-jasper.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-embed-jasper</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Core Tomcat implementation</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-embed-websocket.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-websocket.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-websocket.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-websocket.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-embed-websocket</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Core Tomcat implementation</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-i18n-es.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-i18n-es.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-i18n-es.pom (original)
+++ tomcat/trunk/res/maven/tomcat-i18n-es.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-i18n-es</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Spanish translations</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-i18n-fr.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-i18n-fr.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-i18n-fr.pom (original)
+++ tomcat/trunk/res/maven/tomcat-i18n-fr.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-i18n-fr</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>French translations</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-i18n-ja.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-i18n-ja.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-i18n-ja.pom (original)
+++ tomcat/trunk/res/maven/tomcat-i18n-ja.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-i18n-ja</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Japanese translations</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-jasper-el.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper-el.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jasper-el.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper-el.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-jasper-el</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Jasper Expression Language Impl</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-jasper.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-jasper</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcats JSP Parser</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-jaspic-api.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jaspic-api.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jaspic-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jaspic-api.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-jaspic-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>javax.security.auth.message package</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-jdbc.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jdbc.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jdbc.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jdbc.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-jdbc</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat JDBC Pool Package</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-jni.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jni.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jni.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jni.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-jni</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Interface code to the native connector</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-jsp-api.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jsp-api.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jsp-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jsp-api.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-jsp-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>JSP package</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-juli.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-juli.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-juli.pom (original)
+++ tomcat/trunk/res/maven/tomcat-juli.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-juli</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Core Logging Package</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-servlet-api.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-servlet-api.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-servlet-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-servlet-api.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-servlet-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>javax.servlet package</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>

Modified: tomcat/trunk/res/maven/tomcat-storeconfig.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-storeconfig.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-storeconfig.pom (original)
+++ tomcat/trunk/res/maven/tomcat-storeconfig.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-storeconfig</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat storeconfig component</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-tribes.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-tribes.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-tribes.pom (original)
+++ tomcat/trunk/res/maven/tomcat-tribes.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-tribes</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat Group Communication Package</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-util-scan.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-util-scan.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-util-scan.pom (original)
+++ tomcat/trunk/res/maven/tomcat-util-scan.pom Thu Jun 21 09:16:08 2018
@@ -24,7 +24,7 @@
     Common code shared by Catalina and Jasper for scanning JARS and processing
     XML descriptors
   </description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-util.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-util.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-util.pom (original)
+++ tomcat/trunk/res/maven/tomcat-util.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-util</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Common code shared by multiple Tomcat components</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-websocket-api.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-websocket-api.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-websocket-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-websocket-api.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-websocket-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>WebSocket (JSR356) API</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat-websocket.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-websocket.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-websocket.pom (original)
+++ tomcat/trunk/res/maven/tomcat-websocket.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat-websocket</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Tomcat WebSocket (JSR356) implementation</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

Modified: tomcat/trunk/res/maven/tomcat.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat.pom?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat.pom (original)
+++ tomcat/trunk/res/maven/tomcat.pom Thu Jun 21 09:16:08 2018
@@ -21,7 +21,7 @@
   <artifactId>tomcat</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Binary distribution of Apache Tomcat</description>
-  <url>http://tomcat.apache.org/</url>
+  <url>https://tomcat.apache.org/</url>
   <packaging>pom</packaging>
   <licenses>
     <license>

Modified: tomcat/trunk/res/rat/rat-excludes.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/rat/rat-excludes.txt?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/rat/rat-excludes.txt (original)
+++ tomcat/trunk/res/rat/rat-excludes.txt Thu Jun 21 09:16:08 2018
@@ -15,7 +15,7 @@
 
 
   This is excludes file for Apache RAT tool run by ASF Buildbot,
-  http://creadur.apache.org/rat/
+  https://creadur.apache.org/rat/
 
   The following files are excluded:
 

Modified: tomcat/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Jun 21 09:16:08 2018
@@ -219,11 +219,11 @@ Section "Core" SecTomcatCore
   FileSeek $ServiceInstallLog 0 END
 
   InstallRetry:
-  FileWrite $ServiceInstallLog '"$INSTDIR\bin\$TomcatServiceFileName" 
//IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR_MINOR@ 
$TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server - 
http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install 
"$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR" 
--StopPath "$INSTDIR"'
+  FileWrite $ServiceInstallLog '"$INSTDIR\bin\$TomcatServiceFileName" 
//IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR_MINOR@ 
$TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server - 
https://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install 
"$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR" 
--StopPath "$INSTDIR"'
   FileWrite $ServiceInstallLog "$\r$\n"
   ClearErrors
   DetailPrint "Installing $TomcatServiceName service"
-  nsExec::ExecToStack '"$INSTDIR\bin\$TomcatServiceFileName" 
//IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR_MINOR@ 
$TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server - 
http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install 
"$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR" 
--StopPath "$INSTDIR"'
+  nsExec::ExecToStack '"$INSTDIR\bin\$TomcatServiceFileName" 
//IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR_MINOR@ 
$TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server - 
https://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install 
"$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR" 
--StopPath "$INSTDIR"'
   Pop $0
   Pop $1
   StrCmp $0 "0" InstallOk
@@ -1121,7 +1121,7 @@ Function createShortcuts
   SetOutPath "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ 
$TomcatServiceName"
 
   CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ 
$TomcatServiceName\Tomcat Home Page.lnk" \
-                 "http://tomcat.apache.org/";
+                 "https://tomcat.apache.org/";
 
   CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@ 
$TomcatServiceName\Welcome.lnk" \
                  "http://127.0.0.1:$TomcatPortHttp/";



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to