Issue #5357 - Correcting further references

Signed-off-by: Joakim Erdfelt <[email protected]>

jetty-distribution/src/main/resources/demo-base/webapps/ROOT/index.html

@@ -16,13 +16,14 @@
     <h1>Welcome to Jetty 9</h1>
 
     <p>
-      The Jetty project is a 100% Java <a
-        href="http://en.wikipedia.org/wiki/Java_Servlet">Servlet</a>
-      Container which supports asynchronous server and client
-      implementations of the <a href="http://en.wikipedia.org/wiki/HTTP">HTTP</a>,
-      <a href="http://en.wikipedia.org/wiki/WebSocket">Websocket</a> and <a
-        href="http://en.wikipedia.org/wiki/HTTP/2">HTTP/2</a> protocols. The
-      project is 100% <a href="http://en.wikipedia.org/wiki/Open_source">Open Source</a> and hosted by the <a href="http://www.eclipse.org">Eclipse Foundation</a> at <a href="http://www.eclipse.org/jetty/">http://www.eclipse.org/jetty</a>.
+        The Jetty project is a 100% Java <a
+            href="http://en.wikipedia.org/wiki/Java_Servlet">Servlet</a>
+        Container which supports asynchronous server and client
+        implementations of the <a href="http://en.wikipedia.org/wiki/HTTP">HTTP</a>,
+        <a href="http://en.wikipedia.org/wiki/WebSocket">Websocket</a> and <a
+            href="http://en.wikipedia.org/wiki/HTTP/2">HTTP/2</a> protocols. The
+        project is 100% <a href="http://en.wikipedia.org/wiki/Open_source">Open Source</a> and hosted by the
+        <a href="http://www.eclipse.org">Eclipse Foundation</a> at <a href="https://www.eclipse.org/jetty/">https://www.eclipse.org/jetty/</a>.
     </p>
   </div>
 
@@ -42,13 +43,13 @@ <h2>tests ...</h2>
         </td>
         <td>
           <h2>information ...</h2>
-          <ul>
-            <li><a href="http://www.eclipse.org/jetty/">Jetty Homepage</a></li>
-            <li><a href="http://www.eclipse.org/jetty/documentation/current">Jetty Documentation</a></li>
-            <li><a href="/proxy/current/">Javadoc</a> (via transparent proxy)</li>
-            <li><a
-              href="http://www.eclipse.org/jetty/powered">Jetty Powered</a></li>
-          </ul>
+            <ul>
+                <li><a href="https://www.eclipse.org/jetty/">Jetty Homepage</a></li>
+                <li><a href="https://www.eclipse.org/jetty/documentation/current">Jetty Documentation</a></li>
+                <li><a href="/proxy/current/">Javadoc</a> (via transparent proxy)</li>
+                <li><a
+                        href="https://www.eclipse.org/jetty/powered">Jetty Powered</a></li>
+            </ul>
         </td>
         <td>
           <h2>getting&nbsp;help ...</h2>

jetty-distribution/src/main/resources/start.ini

@@ -7,7 +7,7 @@
 # of making changes to this {jetty.home} directory.
 #
 # See documentation about {jetty.base} at
-# http://www.eclipse.org/jetty/documentation/current/startup.html
+# https://www.eclipse.org/jetty/documentation/current/startup.html
 #
 # A demo-base directory has been provided as an example of
 # this sort of setup.

jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-deploying.adoc

@@ -40,33 +40,33 @@ If you have a standard web application, you can hot deploy it into Jetty by copy
 The demo-base/webapps directory contains the following deployable and auxiliary files:
 
 `ROOT/`::
-  A directory of static content that is deployed to the root context / due to it's name.
-  Contains the Jetty demo welcome page.
+A directory of static content that is deployed to the root context / due to it's name.
+Contains the Jetty demo welcome page.
 `test.d`::
-  A directory containing additional configuration files used by `test.xml` to inject extra configuration into `test.war`.
+A directory containing additional configuration files used by `test.xml` to inject extra configuration into `test.war`.
 `test.xml`::
-  A context configuration file that configures and deploys `test.war.`
-  The additional configuration includes the context path as well as setting additional descriptors found in the `test.d` directory.
+A context configuration file that configures and deploys `test.war.`
+The additional configuration includes the context path as well as setting additional descriptors found in the `test.d` directory.
 `test.war`::
-  The demonstration web application that is configured and deployed by `test.xml`.
+The demonstration web application that is configured and deployed by `test.xml`.
 `async-rest.war`::
-  A web application demonstration of asynchronous REST to eBay, automatically deployed to /async-rest based on the file name.
+A web application demonstration of asynchronous REST to eBay, automatically deployed to /async-rest based on the file name.
 `test-jaas.war`::
-  A demonstration web application utilizing link:#jaas-support[JAAS] for authentication.
+A demonstration web application utilizing link:#jaas-support[JAAS] for authentication.
 `test-jaas.xml`::
-  A context configuration file that configures `test-jaas.war`.
-  Additional configuration includes setting up the link:#configuring-login-service[LoginService] for authentication and authorization.
+A context configuration file that configures `test-jaas.war`.
+Additional configuration includes setting up the link:#configuring-login-service[LoginService] for authentication and authorization.
 `test-jndi.war`::
-  A demonstration web application showing the use of link:#jndi[JNDI].
+A demonstration web application showing the use of link:#jndi[JNDI].
 `test-jndi.xml`::
-  A context configuration file that configures `test-jndi.war`.
-  Additional configuration includes defining objects in the naming space that can be referenced from the webapp.
+A context configuration file that configures `test-jndi.war`.
+Additional configuration includes defining objects in the naming space that can be referenced from the webapp.
 `test-spec.war`::
-  A demonstration web application that shows the use of annotations, fragments, `ServletContainerInitializers` and other Servlet Specification 3.0/3.1 features.
+A demonstration web application that shows the use of annotations, fragments, `ServletContainerInitializers` and other Servlet Specification 3.0/3.1 features.
 `test-spec.xml`::
-  A context configuration file that configures `test-spec.war`.
-  Additional configuration includes setting up some objects in the naming space that can be referenced by annotations.
+A context configuration file that configures `test-spec.war`.
+Additional configuration includes setting up some objects in the naming space that can be referenced by annotations.
 `javadoc-proxy.war`::
-  A demonstration web application that uses a transparent proxy to serve the Jetty source link:{JDURL}/[Javadoc] from the http://www.eclipse.org/jetty[Eclipse Jetty website].
+A demonstration web application that uses a transparent proxy to serve the Jetty source link:{JDURL}/[Javadoc] from the https://www.eclipse.org/jetty/[Eclipse Jetty website].
 `example-moved.xml`::
-  A demonstration context configuration file that shows how to use the link:#moved-context-handler[`MovedContextHandler`] to redirect from one path to another.
+A demonstration context configuration file that shows how to use the link:#moved-context-handler[`MovedContextHandler`] to redirect from one path to another.

jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc

@@ -25,11 +25,11 @@ Jetty has no GUI (Graphical User Interface), so running the server and performin
 Once you have access to your system's command line, navigate to the directory where you unpacked your copy of the Jetty distribution.
 To start Jetty on the default port of 8080, run the following command:
 
-[source, screen, subs="{sub-order}"]
+[source,screen,subs="{sub-order}"]
 ----
 $ java -jar start.jar
 2017-09-20 15:45:11.986:INFO::main: Logging initialized @683ms to org.eclipse.jetty.util.log.StdErrLog
-2017-09-20 15:45:12.197:WARN:oejs.HomeBaseWarning:main: This instance of Jetty is not running from a separate {jetty.base} directory, this is not recommended.  See documentation at http://www.eclipse.org/jetty/documentation/current/startup.html
+2017-09-20 15:45:12.197:WARN:oejs.HomeBaseWarning:main: This instance of Jetty is not running from a separate {jetty.base} directory, this is not recommended.  See documentation at https://www.eclipse.org/jetty/documentation/current/startup.html
 2017-09-20 15:45:12.243:INFO:oejs.Server:main: {VERSION}
 2017-09-20 15:45:12.266:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:///installs/repository/jetty/webapps/] at interval 1
 2017-09-20 15:45:12.298:INFO:oejs.AbstractConnector:main: Started ServerConnector@39c0f4a{HTTP/1.1,[http/1.1]}{0.0.0.0:8080}

jetty-documentation/src/main/asciidoc/reference/contributing/releasing-jetty.adoc

@@ -230,28 +230,28 @@ These files will then be visible from http://download.eclipse.org/jetty/updates/
 [[releasing-documentation]]
 ==== Release Documentation
 
-There are two git repositories you need to be aware of for releasing jetty-documentation. The jetty-documentation is located in our github repository and the jetty-website is located at eclipse.
+There are two git repositories you need to be aware of for releasing jetty-documentation.The jetty-documentation is located in our github repository and the jetty-website is located at eclipse.
 
 jetty-documentation::
-  https://github.com/jetty-project/jetty-documentation
+https://github.com/jetty-project/jetty-documentation
 jetty-website::
-  http://git.eclipse.org/c/www.eclipse.org/jetty.git
+http://git.eclipse.org/c/www.eclipse.org/jetty.git
 
 Do the following steps to publish documentation for the release:
 
-1.  Checkout the jetty-documentation repository.
-2.  Edit the <version> of the jetty-documentation pom.xml and change it _locally_ to be the release number, eg 9.2.6.v20141205
-3.  Build the documentation with mvn clean install
-4.  Checkout the jetty-website
-5.  Inside the documentation/ directory, make a directory named the same as the release number, eg 9.2.6.v20141205/
-6.  Copy the built `documentation` from jetty-documentation/target/docbkx/html/jetty into the new directory
-7.  Edit the `index.html` file in the `documentation` directory and add the newly released documentation url.
+1. Checkout the jetty-documentation repository.
+2. Edit the <version> of the jetty-documentation pom.xml and change it _locally_ to be the release number, eg 9.2.6.v20141205
+3. Build the documentation with mvn clean install
+4. Checkout the jetty-website
+5. Inside the documentation/ directory, make a directory named the same as the release number, eg 9.2.6.v20141205/
+6. Copy the built `documentation` from jetty-documentation/target/docbkx/html/jetty into the new directory
+7. Edit the `index.html` file in the `documentation` directory and add the newly released documentation url.
 Make sure you follow the other examples and include the `rel="nofollow"` attribute on the link so that search engines do not crawl newly created documentation, otherwise we are subject to duplicate content penalties in SEO.
-8.  Commit the changes to the jetty-website project
+8. Commit the changes to the jetty-website project
 
 ____
 [NOTE]
-There is a separate Jenkins build job that publishes documentation to http://www.eclipse.org/jetty/documentation/current triggered by a push of changed files to the jetty-documentation project.
+There is a separate Jenkins build job that publishes documentation to https://www.eclipse.org/jetty/documentation/current triggered by a push of changed files to the jetty-documentation project.
 If you commit your change to the <version> number from step 2, then these builds will use the same release version number.
 It is preferable if you _don't_ commit that version number change, or better yet, ensure that it is set to the next -SNAPSHOT version number for your jetty major release number.
 ____

jetty-documentation/src/main/docbkx-stylesheet/html/docbook.xsl

@@ -1,19 +1,16 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-xmlns:jfetch="java:org.eclipse.jetty.xslt.tools.JavaSourceFetchExtension"
-xmlns:fetch="java:org.eclipse.jetty.xslt.tools.SourceFetchExtension"
-xmlns:d="http://docbook.org/ns/docbook"
-xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-xmlns:xslthl="http://xslthl.sf.net"
-xmlns:gcse="http://www.google.com"
-xmlns:date="http://exslt.org/dates-and-times"
+  xmlns:d="http://docbook.org/ns/docbook"
+  xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
+  xmlns:xslthl="http://xslthl.sf.net"
+  xmlns:date="http://exslt.org/dates-and-times"
 >
 
   <!-- imports the original docbook stylesheet -->
-  <xsl:import href="urn:docbkx:stylesheet"/>
+  <xsl:import href="urn:docbkx:stylesheet" />
 
   <!-- set bellow all your custom xsl configuration -->
-  <xsl:import href="urn:docbkx:stylesheet/highlight.xsl"/>
-  <xsl:param name="highlight.source" select="1"/>
+  <xsl:import href="urn:docbkx:stylesheet/highlight.xsl" />
+  <xsl:param name="highlight.source" select="1" />
 
   <!-- use the xml:id on the chapter and sections when rendering chunked output" -->
   <xsl:param name="use.id.as.filename" select="1"/>
@@ -120,7 +117,9 @@ xmlns:date="http://exslt.org/dates-and-times"
     <table>
       <tr>
         <td style="width: 25%">
-          <a href="http://www.eclipse.org/jetty"><img src="images/jetty-header-logo.png" alt="Jetty Logo"></img></a>
+          <a href="https://www.eclipse.org/jetty/">
+            <img src="images/jetty-header-logo.png" alt="Jetty Logo"></img>
+          </a>
           <br/>
 
           <span style="font-size: small">

jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyEffectiveWebXml.java

@@ -39,7 +39,7 @@
  * files. By default, the web.xml is generated to the console output only. Use the <b>effectiveWebXml</b> parameter
  * to provide a file name into which to save the output.
  *
- * See <a href="http://www.eclipse.org/jetty/documentation/">http://www.eclipse.org/jetty/documentation</a> for more information on this and other jetty plugins.
+ * See <a href="https://www.eclipse.org/jetty/documentation/">https://www.eclipse.org/jetty/documentation</a> for more information on this and other jetty plugins.
  *
  * Runs jetty on the unassembled webapp to generate the effective web.xml
  */

jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunDistro.java

@@ -78,7 +78,7 @@
  *
  * This goal does NOT support the <b>scanIntervalSeconds</b> parameter: the webapp will be deployed only once.
  *
- * See <a href="http://www.eclipse.org/jetty/documentation/">http://www.eclipse.org/jetty/documentation</a> for more information on this and other jetty plugins.
+ * See <a href="https://www.eclipse.org/jetty/documentation/">https://www.eclipse.org/jetty/documentation</a> for more information on this and other jetty plugins.
  *
  * Runs unassembled webapp in a locally installed jetty distro
  */

jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java

@@ -62,7 +62,7 @@
  * By setting the configuration element <b>waitForChild</b> to <b>false</b>, the plugin will terminate after having forked the jetty process. In this case
  * you can use the <b>jetty:stop</b> goal to terminate the process.
  * <p>
- * See <a href="http://www.eclipse.org/jetty/documentation/">http://www.eclipse.org/jetty/documentation</a> for more information on this and other jetty plugins.
+ * See <a href="https://www.eclipse.org/jetty/documentation/">https://www.eclipse.org/jetty/documentation</a> for more information on this and other jetty plugins.
  *
  * Runs Jetty in forked JVM on an unassembled webapp
  */

jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java

@@ -25,7 +25,6 @@
 import java.nio.file.PathMatcher;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -40,7 +39,6 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.project.MavenProject;
 import org.eclipse.jetty.maven.plugin.utils.MavenProjectHelper;
 import org.eclipse.jetty.util.IncludeExcludeSet;
 import org.eclipse.jetty.util.StringUtil;
@@ -63,7 +61,7 @@
  * You may also specify the location of a jetty.xml file whose contents will be applied before any plugin configuration.
  * This can be used, for example, to deploy a static webapp that is not part of your maven build.
  * <p>
- * There is a <a href="http://www.eclipse.org/jetty/documentation/current/maven-and-jetty.html">reference guide</a> to the configuration parameters for this plugin.
+ * There is a <a href="https://www.eclipse.org/jetty/documentation/current/maven-and-jetty.html">reference guide</a> to the configuration parameters for this plugin.
  *
  * Runs jetty directly from a maven project
  */

jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java

@@ -68,7 +68,7 @@ public HomeBaseWarning()
         {
             StringBuilder warn = new StringBuilder();
             warn.append("This instance of Jetty is not running from a separate {jetty.base} directory");
-            warn.append(", this is not recommended.  See documentation at http://www.eclipse.org/jetty/documentation/current/startup.html");
+            warn.append(", this is not recommended.  See documentation at https://www.eclipse.org/jetty/documentation/current/startup.html");
             LOG.warn("{}", warn.toString());
         }
     }

jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java

@@ -65,7 +65,7 @@ public void setupBaseHome() throws IOException
     public void testGetCoordinateNotMaven()
     {
         MavenLocalRepoFileInitializer repo = new MavenLocalRepoFileInitializer(baseHome);
-        String ref = "http://www.eclipse.org/jetty";
+        String ref = "https://www.eclipse.org/jetty/";
         Coordinates coords = repo.getCoordinates(URI.create(ref));
         assertThat("Coords", coords, nullValue());
     }

jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java

@@ -1501,12 +1501,12 @@ public void testGetGenericListInput()
         uris.add(URI.create("http://www.mortbay.org/"));
         uris.add(URI.create("http://jetty.codehaus.org/jetty/"));
         uris.add(URI.create("http://www.intalio.com/jetty/"));
-        uris.add(URI.create("http://www.eclipse.org/jetty/"));
+        uris.add(URI.create("https://www.eclipse.org/jetty/"));
 
         // Make sure that Generics pass through the 'get' routine safely.
         // We should be able to call this without casting the result to URI
         URI eclipseUri = LazyList.get(uris, 3);
-        assertEquals("http://www.eclipse.org/jetty/", eclipseUri.toASCIIString());
+        assertEquals("https://www.eclipse.org/jetty/", eclipseUri.toASCIIString());
     }
 
     /**

jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java

@@ -223,7 +223,7 @@ public void testNonAbsoluteURI(Class resourceClass)
     public void testNotFileURI(Class resourceClass)
     {
         assertThrows(IllegalArgumentException.class,
-            () -> newResource(resourceClass, new URI("http://www.eclipse.org/jetty/")));
+            () -> newResource(resourceClass, new URI("https://www.eclipse.org/jetty/")));
     }
 
     @ParameterizedTest

jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java

@@ -689,7 +689,7 @@ public void addServerClass(String classOrPackageOrLocation)
      *
      * @param classOrPackage A pattern.
      * @see #setServerClasses(String[])
-     * @see <a href="http://www.eclipse.org/jetty/documentation/current/jetty-classloading.html">Jetty Documentation: Classloading</a>
+     * @see <a href="https://www.eclipse.org/jetty/documentation/current/jetty-classloading.html">Jetty Documentation: Classloading</a>
      * @deprecated Use {@link #getServerClasspathPattern()}.{@link ClasspathPattern#add(String)}
      */
     @Deprecated
@@ -743,7 +743,7 @@ public void addSystemClass(String classOrPackage)
      *
      * @param classOrPackage A pattern.
      * @see #setSystemClasses(String[])
-     * @see <a href="http://www.eclipse.org/jetty/documentation/current/jetty-classloading.html">Jetty Documentation: Classloading</a>
+     * @see <a href="https://www.eclipse.org/jetty/documentation/current/jetty-classloading.html">Jetty Documentation: Classloading</a>
      * @deprecated Use {@link #getSystemClasspathPattern()}.{@link ClasspathPattern#add(String)}
      */
     @Deprecated

jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java

@@ -1942,7 +1942,9 @@ private ConfigurationParser(Pool<ConfigurationParser>.Entry entry)
             redirectEntity("configure_9_3.dtd", config93);
             redirectEntity("http://jetty.mortbay.org/configure.dtd", config93);
             redirectEntity("http://jetty.eclipse.org/configure.dtd", config93);
+            redirectEntity("https://jetty.eclipse.org/configure.dtd", config93);
             redirectEntity("http://www.eclipse.org/jetty/configure.dtd", config93);
+            redirectEntity("https://www.eclipse.org/jetty/configure.dtd", config93);
             redirectEntity("-//Mort Bay Consulting//DTD Configure//EN", config93);
             redirectEntity("-//Jetty//Configure//EN", config93);
         }