Use HTTPS links to Apache.

Gary Gregory · Gary Gregory · commit f79e8335ebd4 · 2019-07-04T09:47:45.000-04:00
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -14,7 +14,7 @@ previous versions, except for the OptionValidator class that is no longer public
 (change introduced in v1.2). Commons CLI 1.4 at least requires Java 5.0.
 
 More information can be found on the project site at
-http://commons.apache.org/cli.
+https://commons.apache.org/cli.
 
 
 NEW FEATURES
@@ -239,13 +239,13 @@ o CLI-135: Backwards compatibility between 1.1 and 1.0 broken due to
            Option.addValue removal.
 
 
-Historical list of changes: http://commons.apache.org/cli/changes-report.html
+Historical list of changes: https://commons.apache.org/cli/changes-report.html
 
 For complete information on Commons CLI, including instructions on how to
 submit bug reports, patches, or suggestions for improvement, see the
 Apache Commons CLI website:
 
-http://commons.apache.org/cli/
+https://commons.apache.org/cli/
 
 Have fun!
 -Apache Commons CLI team
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
     Apache Commons CLI provides a simple API for presenting, processing and validating a command line interface.
   </description>
 
-  <url>http://commons.apache.org/proper/commons-cli/</url>
+  <url>https://commons.apache.org/proper/commons-cli/</url>
 
   <issueManagement>
     <system>jira</system>
diff --git a/src/main/java/org/apache/commons/cli/overview.html b/src/main/java/org/apache/commons/cli/overview.html
@@ -39,5 +39,5 @@
 
 
     <p>The homepage for the project is
-    <a href="http://commons.apache.org">Apache Commons/</a>
+    <a href="https://commons.apache.org">Apache Commons/</a>
 </body>
diff --git a/src/site/site.xml b/src/site/site.xml
@@ -25,7 +25,7 @@
     <body>
         <menu name="Commons CLI">
             <item name="Overview"             href="/index.html"/>
-            <item name="Download"             href="http://commons.apache.org/cli/download_cli.cgi"/>
+            <item name="Download"             href="https://commons.apache.org/cli/download_cli.cgi"/>
             <item name="Changes Report"       href="/changes-report.html"/>
             <item name="Mailing Lists"        href="/mail-lists.html"/>
             <item name="Issue Tracking"       href="/issue-tracking.html"/>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
@@ -94,7 +94,7 @@ usage: ls
     <section name="Releases">
       <p>
         The latest version is v1.4 -
-        <a href="http://commons.apache.org/cli/download_cli.cgi">Download now!</a>
+        <a href="https://commons.apache.org/cli/download_cli.cgi">Download now!</a>
         <br/>
         The <a href="release_1_4.html">release notes</a> are also available.
       </p>
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
@@ -49,7 +49,7 @@ limitations under the License.
     <section name="Overview">
       <p>
         <a href="index.html">Commons CLI</a> shares mailing lists with all the other 
-        <a href="http://commons.apache.org/components.html">Commons Components</a>.
+        <a href="https://commons.apache.org/components.html">Commons Components</a>.
         To make it easier for people to only read messages related to components they are interested in,
         the convention in Commons is to prefix the subject line of messages with the component's name,
         for example:
diff --git a/src/site/xdoc/release_1_0.xml b/src/site/xdoc/release_1_0.xml
@@ -36,7 +36,7 @@ This is the first release of the CLI component, therefore all features are new,
 there are no bug-fixes, nothing is deprecated and there are no changes.
 
 For more information, read the documentation on the project site at 
-http://commons.apache.org/cli/
+https://commons.apache.org/cli/
 </source>
 </p>
 </section>
diff --git a/src/site/xdoc/release_1_2.xml b/src/site/xdoc/release_1_2.xml
@@ -44,7 +44,7 @@ Commons CLI 1.2 is a bugfix release. The following notable changes were made:
 Commons CLI 1.2 is binary compatible with the previous versions, except for
 the OptionValidator class that is no longer public.
 
-More information can be found on the project site at http://commons.apache.org/cli
+More information can be found on the project site at https://commons.apache.org/cli
 
 
 NEW FEATURES:
diff --git a/src/site/xdoc/release_1_3.xml b/src/site/xdoc/release_1_3.xml
@@ -38,7 +38,7 @@ previous versions, except for the OptionValidator class that is no longer public
 (change introduced in v1.2). Commons CLI 1.3 at least requires Java 5.0.
 
 More information can be found on the project site at
-http://commons.apache.org/cli.
+https://commons.apache.org/cli.
 
 NOTES
 =====
diff --git a/src/site/xdoc/release_1_3_1.xml b/src/site/xdoc/release_1_3_1.xml
@@ -38,7 +38,7 @@ previous versions, except for the OptionValidator class that is no longer public
 (change introduced in v1.2). Commons CLI 1.3.1 at least requires Java 5.0.
 
 More information can be found on the project site at
-http://commons.apache.org/cli.
+https://commons.apache.org/cli.
 
 BUG FIXES
 =========
diff --git a/src/site/xdoc/release_1_4.xml b/src/site/xdoc/release_1_4.xml
@@ -38,7 +38,7 @@ previous versions, except for the OptionValidator class that is no longer public
 (change introduced in v1.2). Commons CLI 1.4 at least requires Java 5.0.
 
 More information can be found on the project site at
-http://commons.apache.org/cli.
+https://commons.apache.org/cli.
 
 
 NEW FEATURES
diff --git a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
@@ -43,7 +43,7 @@ public class PatternOptionBuilderTest
     public void testSimplePattern() throws Exception
     {
         final Options options = PatternOptionBuilder.parsePattern("a:b@cde>f+n%t/m*z#");
-        final String[] args = new String[] {"-c", "-a", "foo", "-b", "java.util.Vector", "-e", "build.xml", "-f", "java.util.Calendar", "-n", "4.5", "-t", "http://commons.apache.org", "-z", "Thu Jun 06 17:48:57 EDT 2002", "-m", "test*"};
+        final String[] args = new String[] {"-c", "-a", "foo", "-b", "java.util.Vector", "-e", "build.xml", "-f", "java.util.Calendar", "-n", "4.5", "-t", "https://commons.apache.org", "-z", "Thu Jun 06 17:48:57 EDT 2002", "-m", "test*"};
 
         final CommandLineParser parser = new PosixParser();
         final CommandLine line = parser.parse(options, args);
@@ -56,7 +56,7 @@ public void testSimplePattern() throws Exception
         assertEquals("file flag e", new File("build.xml"), line.getOptionObject("e"));
         assertEquals("class flag f", Calendar.class, line.getOptionObject("f"));
         assertEquals("number flag n", new Double(4.5), line.getOptionObject("n"));
-        assertEquals("url flag t", new URL("http://commons.apache.org"), line.getOptionObject("t"));
+        assertEquals("url flag t", new URL("https://commons.apache.org"), line.getOptionObject("t"));
 
         // tests the char methods of CommandLine that delegate to the String methods
         assertEquals("flag a", "foo", line.getOptionValue('a'));
@@ -67,7 +67,7 @@ public void testSimplePattern() throws Exception
         assertEquals("file flag e", new File("build.xml"), line.getOptionObject('e'));
         assertEquals("class flag f", Calendar.class, line.getOptionObject('f'));
         assertEquals("number flag n", new Double(4.5), line.getOptionObject('n'));
-        assertEquals("url flag t", new URL("http://commons.apache.org"), line.getOptionObject('t'));
+        assertEquals("url flag t", new URL("https://commons.apache.org"), line.getOptionObject('t'));
 
         // FILES NOT SUPPORTED YET
         try {
@@ -152,9 +152,9 @@ public void testURLPattern() throws Exception
     {
         final Options options = PatternOptionBuilder.parsePattern("u/v/");
         final CommandLineParser parser = new PosixParser();
-        final CommandLine line = parser.parse(options, new String[] { "-u", "http://commons.apache.org", "-v", "foo://commons.apache.org" });
+        final CommandLine line = parser.parse(options, new String[] { "-u", "https://commons.apache.org", "-v", "foo://commons.apache.org" });
 
-        assertEquals("u value", new URL("http://commons.apache.org"), line.getOptionObject("u"));
+        assertEquals("u value", new URL("https://commons.apache.org"), line.getOptionObject("u"));
         assertNull("v value", line.getOptionObject("v"));
     }
 
diff --git a/src/test/java/org/apache/commons/cli/TypeHandlerTest.java b/src/test/java/org/apache/commons/cli/TypeHandlerTest.java
@@ -136,7 +136,7 @@ public void testCreateValueFiles()
     public void testCreateValueURL()
             throws Exception
     {
-        String urlString = "http://commons.apache.org";
+        String urlString = "https://commons.apache.org";
         URL result = TypeHandler.createValue(urlString, PatternOptionBuilder.URL_VALUE);
         assertEquals(urlString, result.toString());
     }
