Issue #5357 - Updating to https://eclipse.org/ (#5358)

* Issue #5357 - Updating to https://eclipse.org/

 - Removing redundant <url> refs in pom.xml
 - Correcting bad indenting from merge
 - Correcting mailing list references
 - Correcting bugs.eclipse.org references
 - Correcting text file references
 - Correcting html references
 - Correcting further references
 - Correcting download.eclipse.org reference
 - Adding test for demo-base /proxy/current/
 - Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

aggregates/jetty-all-compact3/pom.xml

@@ -9,7 +9,6 @@
   <groupId>org.eclipse.jetty.aggregate</groupId>
   <artifactId>jetty-all-compact3</artifactId>
   <name>Jetty :: Aggregate :: All core Jetty suitable for Java 8 compact 3 profile</name>
-  <url>http://www.eclipse.org/jetty</url>
   <properties>
     <bundle-symbolic-name>${project.groupId}.all.compact3</bundle-symbolic-name>
   </properties>

aggregates/jetty-all/pom.xml

@@ -11,7 +11,6 @@
   <name>Jetty :: Aggregate :: All core Jetty</name>
   <description>UberJar for Core Jetty features</description>
   <packaging>pom</packaging>
-  <url>http://www.eclipse.org/jetty</url>
   <properties>
     <uber-jar>${project.build.directory}/${project.artifactId}-${project.version}-uber.jar</uber-jar>
     <gen-resources-dir>${project.build.directory}/gen-resources</gen-resources-dir>

aggregates/jetty-websocket-all/pom.xml

@@ -9,7 +9,6 @@
   <groupId>org.eclipse.jetty.aggregate</groupId>
   <artifactId>jetty-websocket-all</artifactId>
   <name>Jetty :: Aggregate :: All WebSocket Server + Client Classes</name>
-  <url>http://www.eclipse.org/jetty</url>
   <build>
     <sourceDirectory>${project.build.directory}/sources</sourceDirectory>
     <plugins>
@@ -66,7 +65,7 @@
                 <manifest></manifest>
                 <manifestEntries>
                   <mode>development</mode>
-                  <url>http://eclipse.org/jetty</url>
+                  <url>https://eclipse.org/jetty</url>
                   <Built-By>${user.name}</Built-By>
                   <package>org.eclipse.jetty</package>
                   <Bundle-License>https://raw.githubusercontent.com/eclipse/jetty.project/master/NOTICE.txt</Bundle-License>

apache-jsp/pom.xml

@@ -7,7 +7,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>apache-jsp</artifactId>
   <name>Jetty :: Apache JSP Implementation</name>
-  <url>http://www.eclipse.org/jetty</url>
   <packaging>jar</packaging>
   <properties>
     <bundle-symbolic-name>${project.groupId}.apache-jsp</bundle-symbolic-name>

examples/embedded/pom.xml

@@ -10,7 +10,6 @@
   <artifactId>example-jetty-embedded</artifactId>
   <name>Example :: Jetty Embedded</name>
   <description>Jetty Embedded Examples</description>
-  <url>http://www.eclipse.org/jetty</url>
   <properties>
     <bundle-symbolic-name>${project.groupId}.embedded</bundle-symbolic-name>
   </properties>

jetty-annotations/pom.xml

@@ -8,7 +8,6 @@
   <artifactId>jetty-annotations</artifactId>
   <name>Jetty :: Servlet Annotations</name>
   <description>Annotation support for deploying servlets in jetty.</description>
-  <url>http://www.eclipse.org/jetty</url>
   <properties>
     <bundle-symbolic-name>${project.groupId}.annotations</bundle-symbolic-name>
   </properties>

jetty-bom/pom.xml

@@ -3,7 +3,7 @@
   <artifactId>jetty-bom</artifactId>
   <name>Jetty :: Bom</name>
   <description>Jetty BOM artifact</description>
-  <url>http://www.eclipse.org/jetty</url>
+  <url>https://eclipse.org/jetty</url>
   <packaging>pom</packaging>
 
   <parent>

jetty-cdi/pom.xml

@@ -8,7 +8,6 @@
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>jetty-cdi</artifactId>
   <name>Jetty :: CDI</name>
-  <url>http://www.eclipse.org/jetty</url>
   <packaging>jar</packaging>
   <properties>
     <bundle-symbolic-name>${project.groupId}.cdi</bundle-symbolic-name>

jetty-client/pom.xml

@@ -8,7 +8,6 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-client</artifactId>
   <name>Jetty :: Asynchronous HTTP Client</name>
-  <url>http://www.eclipse.org/jetty</url>
   <properties>
     <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
     <jetty.test.policy.loc>target/test-policy</jetty.test.policy.loc>

jetty-continuation/pom.xml

@@ -8,7 +8,6 @@
   <artifactId>jetty-continuation</artifactId>
   <name>Jetty :: Continuation</name>
   <description>Asynchronous API</description>
-  <url>http://www.eclipse.org/jetty</url>
   <properties>
     <bundle-symbolic-name>${project.groupId}.continuation</bundle-symbolic-name>
   </properties>

jetty-deploy/pom.xml

@@ -8,7 +8,6 @@
   <artifactId>jetty-deploy</artifactId>
   <name>Jetty :: Deployers</name>
   <description>Jetty deployers</description>
-  <url>http://www.eclipse.org/jetty</url>
   <properties>
     <bundle-symbolic-name>${project.groupId}.deploy</bundle-symbolic-name>
   </properties>

jetty-distribution/src/main/resources/README.TXT

@@ -4,7 +4,7 @@ JETTY
 The Jetty project is a 100% Java HTTP Server, HTTP Client
 and Servlet Container from the eclipse foundation
 
-  http://www.eclipse.org/jetty/
+  https://www.eclipse.org/jetty/
 
 Jetty is open source and is dual licensed using the Apache 2.0 and
 Eclipse Public License 1.0.   You may choose either license when

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/pom.xml

@@ -59,8 +59,8 @@
                 <allow-uri-read>true</allow-uri-read>
                 <toc>true</toc>
                 <revnumber>${project.version}</revnumber>
-                <JDURL>http://www.eclipse.org/jetty/javadoc/${javadoc.version}</JDURL>
-                <JXURL>http://download.eclipse.org/jetty/stable-9/xref</JXURL>
+                <JDURL>https://eclipse.org/jetty/javadoc/${javadoc.version}</JDURL>
+                <JXURL>https://download.eclipse.org/jetty/stable-9/xref</JXURL>
                 <SRCDIR>${basedir}/..</SRCDIR>
                 <GITBROWSEURL>https://github.com/eclipse/jetty.project/tree/jetty-9.4.x</GITBROWSEURL>
                 <MVNCENTRAL>https://repo1.maven.org/maven2</MVNCENTRAL>
@@ -223,8 +223,8 @@
                     <allow-uri-read>true</allow-uri-read>
                     <toc>true</toc>
                     <revnumber>${project.version}</revnumber>
-                    <JDURL>http://download.eclipse.org/jetty/stable-9/apidocs</JDURL>
-                    <JXURL>http://download.eclipse.org/jetty/stable-9/xref</JXURL>
+                    <JDURL>https://download.eclipse.org/jetty/stable-9/apidocs</JDURL>
+                    <JXURL>https://download.eclipse.org/jetty/stable-9/xref</JXURL>
                     <SRCDIR>${basedir}/../jetty.project/</SRCDIR>
                     <GITBROWSEURL>https://github.com/eclipse/jetty.project/master</GITBROWSEURL>
                     <icons>font</icons>

jetty-documentation/src/main/asciidoc/administration/startup/images/modules-9.3-simplified.dot

@@ -1,7 +1,7 @@
 /*
  * GraphViz Graph of Jetty Modules
  * 
- * Jetty: http://eclipse.org/jetty/
+ * Jetty: https://eclipse.org/jetty/
  * GraphViz: http://graphviz.org/
  * 
  * To Generate Graph image using graphviz:

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/community.adoc

@@ -30,16 +30,16 @@ We have a number of options for people that wish to subscribe to our mailing lis
 
 * Jetty Developers List
 ** Join - https://dev.eclipse.org/mailman/listinfo/jetty-dev
-** Archives - http://dev.eclipse.org/mhonarc/lists/jetty-dev/
+** Archives - https://dev.eclipse.org/mhonarc/lists/jetty-dev/
 * Jetty Users List
 ** Join - https://dev.eclipse.org/mailman/listinfo/jetty-users
-** Archives - http://dev.eclipse.org/mhonarc/lists/jetty-users/
+** Archives - https://dev.eclipse.org/mhonarc/lists/jetty-users/
 * Jetty Announcements List
 ** Join - https://dev.eclipse.org/mailman/listinfo/jetty-announce
-** Archives - http://dev.eclipse.org/mhonarc/lists/jetty-announce/
+** Archives - https://dev.eclipse.org/mhonarc/lists/jetty-announce/
 * Jetty Commit List
 ** Join - https://dev.eclipse.org/mailman/listinfo/jetty-commit
-** Archives - http://dev.eclipse.org/mhonarc/lists/jetty-commit/
+** Archives - https://dev.eclipse.org/mhonarc/lists/jetty-commit/
 
 [[community-irc]]
 ==== Internet Relay Chat - IRC
@@ -48,5 +48,5 @@ Much of our conversations about Jetty occur on IRC in one location or another.
 Users are always welcome to come join our IRC channels and talk with us, other users, or just lurk.
 
 irc.freenode.org - #jetty::
-  Our primary location, we recommend that if your looking to find folks on IRC you try here.
-  We also have commit notifications coming to this channel on the bottom and top of the hour.
+Our primary location, we recommend that if your looking to find folks on IRC you try here.
+We also have commit notifications coming to this channel on the bottom and top of the hour.

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.
 ____