You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by dl...@apache.org on 2020/12/31 07:12:38 UTC

[rya-site] branch master updated: Add v4.0.1 release and notes, some incubator removals, Copyright auto-year, https most everywhere, and first TLP release.

This is an automated email from the ASF dual-hosted git repository.

dlotts pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rya-site.git


The following commit(s) were added to refs/heads/master by this push:
     new 9d87bb6  Add v4.0.1 release and notes, some incubator removals, Copyright auto-year, https most everywhere, and first TLP release.
9d87bb6 is described below

commit 9d87bb64fbb4488122f9ae86d76923b7ac793559
Author: dlotts <dl...@apache.org>
AuthorDate: Mon Dec 28 17:30:58 2020 +0000

    Add v4.0.1 release and notes, some incubator removals, Copyright auto-year, https most everywhere, and first TLP release.
---
 content/_config.yml                              |  4 +--
 content/_data/project.yml                        |  6 ++--
 content/_includes/themes/apache/_navigation.html | 10 +++---
 content/_includes/themes/apache/footer.html      |  6 ++--
 content/_posts/2016-10-28-release-3.2.10.md      |  6 ++--
 content/_posts/2017-10-10-release-3.2.11.md      |  6 ++--
 content/_posts/2018-03-04-release-3.2.12.md      |  6 ++--
 content/_posts/2019-07-27-release-4.0.0.md       |  6 ++--
 content/_posts/2020-12-22-release-4.0.1.md       | 46 ++++++++++++++++++++++++
 content/_posts/2020-12-22-relnotes-4.0.1.md      | 34 ++++++++++++++++++
 content/community-members.md                     |  4 +--
 content/documentation.md                         |  2 +-
 content/download.md                              | 30 +++++++++-------
 13 files changed, 126 insertions(+), 40 deletions(-)

diff --git a/content/_config.yml b/content/_config.yml
index 6ee3b32..960095d 100644
--- a/content/_config.yml
+++ b/content/_config.yml
@@ -17,7 +17,7 @@ markdown: kramdown
 permalink: /news/:year/:month/:day/:title/
 excerpt_separator: ""
 
-repository: https://github.com/apache/incubator-rya-site.git
+repository: https://github.com/apache/rya-site.git
 destination: target
 exclude: [README.md,Gemfile*,vendor]
 keep_files: [".git", ".svn", "apidocs"]
@@ -25,7 +25,7 @@ keep_files: [".git", ".svn", "apidocs"]
 # The base path where the website is deployed
 baseurl: /
 
-url: http://rya.apache.org
+url: https://rya.apache.org
 
 plugins:
  - jekyll-liquify
diff --git a/content/_data/project.yml b/content/_data/project.yml
index d583aba..98dd29f 100644
--- a/content/_data/project.yml
+++ b/content/_data/project.yml
@@ -27,7 +27,7 @@ download: download
 dev_list: dev@rya.apache.org
 dev_list_subscribe: dev-subscribe@rya.apache.org
 dev_list_unsubscribe: dev-unsubscribe@rya.apache.org
-dev_list_archive: http://mail-archives.apache.org/mod_mbox/rya-dev/
+dev_list_archive: https://mail-archives.apache.org/mod_mbox/rya-dev/
 dev_list_archive_mailarchive: https://www.mail-archive.com/dev@rya.apache.org/
 dev_list_archive_markmail:
 
@@ -41,14 +41,14 @@ user_list_archive_markmail:
 commits_list: commits@rya.apache.org
 commits_list_subscribe: commits-subscribe@rya.apache.org
 commits_list_unsubscribe: commits-unsubscribe@rya.apache.org
-commits_list_archive: http://mail-archives.apache.org/mod_mbox/rya-commits/
+commits_list_archive: https://mail-archives.apache.org/mod_mbox/rya-commits/
 commits_list_archive_mailarchive: https://www.mail-archive.com/commits@rya.apache.org/
 commits_list_archive_markmail:
 
 notifications_list: notifications@rya.apache.org
 notifications_list_subscribe: notifications-subscribe@rya.apache.org
 notifications_list_unsubscribe: notifications-unsubscribe@rya.apache.org
-notifications_list_archive: http://mail-archives.apache.org/mod_mbox/rya-notifications/
+notifications_list_archive: https://mail-archives.apache.org/mod_mbox/rya-notifications/
 notifications_list_archive_mailarchive: https://www.mail-archive.com/notifications@rya.apache.org/
 notifications_list_archive_markmail:
 
diff --git a/content/_includes/themes/apache/_navigation.html b/content/_includes/themes/apache/_navigation.html
index 92e6e0c..588c4c2 100644
--- a/content/_includes/themes/apache/_navigation.html
+++ b/content/_includes/themes/apache/_navigation.html
@@ -26,11 +26,11 @@
              <li id="apache">
               <a href="#" data-toggle="dropdown" class="dropdown-toggle">Apache<b class="caret"></b></a>
                <ul class="dropdown-menu">
-                <li><a href="http://www.apache.org/foundation/how-it-works.html">Apache Software Foundation</a></li>
-                <li><a href="http://www.apache.org/licenses/">Apache License</a></li>
-                <li><a href="http://www.apache.org/security/">Security</a></li>
-                <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-                <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+                <li><a href="https://www.apache.org/foundation/how-it-works.html">Apache Software Foundation</a></li>
+                <li><a href="https://www.apache.org/licenses/">Apache License</a></li>
+                <li><a href="https://www.apache.org/security/">Security</a></li>
+                <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
                 </ul>
             </li>
           </ul>
diff --git a/content/_includes/themes/apache/footer.html b/content/_includes/themes/apache/footer.html
index debd3f5..b197ed5 100644
--- a/content/_includes/themes/apache/footer.html
+++ b/content/_includes/themes/apache/footer.html
@@ -13,13 +13,13 @@
             <div style="text-align:center;">
                 {% if site.data.project.podling %}
                 <div style="margin-top: 20px; margin-bottom: 20px;">
-                    <a href="http://incubator.apache.org"><img src="/assets/themes/apache/img/egg-logo.png"
+                    <a href="https://incubator.apache.org"><img src="/assets/themes/apache/img/egg-logo.png"
                                                                alt="Apache Incubator"/></a>
                 </div>
                 {% endif %}
                 <div>
-                    Copyright &copy; 2019 <a href="http://www.apache.org">The Apache Software Foundation</a>.
-                    Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version
+                    Copyright &copy; {{ site.time | date: '%Y' }} <a href="https://www.apache.org">The Apache Software Foundation</a>.
+                    Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version
                     2.0</a>.
                     <br>
                     {% if site.data.project.podling %}
diff --git a/content/_posts/2016-10-28-release-3.2.10.md b/content/_posts/2016-10-28-release-3.2.10.md
index 951acaf..f140ee4 100644
--- a/content/_posts/2016-10-28-release-3.2.10.md
+++ b/content/_posts/2016-10-28-release-3.2.10.md
@@ -12,7 +12,7 @@ tag: v3.2.10
 ---
 {% comment %}
 Some of the variables above are used on the summary page that iterates through posts where catagories=release.
-{% endcomment %}{% capture apacheDistMirror %}http://www.apache.org/dyn/closer.lua/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %}
+{% endcomment %}{% capture apacheDistMirror %}https://www.apache.org/dyn/closer.lua/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %}
 {% capture d %}https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %}
 
 
@@ -29,7 +29,7 @@ This is Rya's first release, version {{ page.version }}.  It is available as a s
 - [Release notes]({{ page.releaseNotes }})
 - [Central repository for Maven and other dependency managers](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.rya%22)
 
-[Verify](http://www.apache.org/dyn/closer.cgi#verify)
+[Verify](https://www.apache.org/dyn/closer.cgi#verify)
 using the corresponding *pgp* signature (using the committer file in
 [KEYS](https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/KEYS)).
 If you cannot do that, the *md5* or *sha1* hash file may be used to check that the
@@ -37,7 +37,7 @@ download has completed okay.
 
 For fast downloads, current source distributions are hosted on mirror servers;
 older source distributions are in the
-[archive](http://archive.apache.org/dist/incubator/{{ site.data.project.unix_name }}/).
+[archive](https://archive.apache.org/dist/incubator/{{ site.data.project.unix_name }}/).
 If a download from a mirror fails, retry, and the second download will likely
 succeed.
 
diff --git a/content/_posts/2017-10-10-release-3.2.11.md b/content/_posts/2017-10-10-release-3.2.11.md
index 2db53d7..140b3ad 100644
--- a/content/_posts/2017-10-10-release-3.2.11.md
+++ b/content/_posts/2017-10-10-release-3.2.11.md
@@ -11,7 +11,7 @@ categories: [release]
 ---
 {% comment %}
 Some of the variables above are used on the summary page that iterates through posts where catagories=release.
-{% endcomment %}{% capture apacheDistMirror %}http://www.apache.org/dyn/closer.lua/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %}
+{% endcomment %}{% capture apacheDistMirror %}https://www.apache.org/dyn/closer.lua/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %}
 {% capture d %}https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %}
 
 
@@ -29,7 +29,7 @@ This is Rya's second Apache release, version {{ page.version }}.  It is availabl
 - [Release notes]({{ page.releaseNotes | liquify }})
 - [Central repository for Maven and other dependency managers](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.rya%22)
 
-[Verify](http://www.apache.org/dyn/closer.cgi#verify)
+[Verify](https://www.apache.org/dyn/closer.cgi#verify)
 using the corresponding *pgp* signature (using the committer file in
 [KEYS](https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/KEYS)).
 If you cannot do that, the *md5* or *sha1* hash file may be used to check that the
@@ -37,7 +37,7 @@ download has completed okay.
 
 For fast downloads, current source distributions are hosted on mirror servers;
 older source distributions are in the
-[archive](http://archive.apache.org/dist/incubator/{{ site.data.project.unix_name }}/).
+[archive](https://archive.apache.org/dist/incubator/{{ site.data.project.unix_name }}/).
 If a download from a mirror fails, retry, and the second download will likely
 succeed.
 
diff --git a/content/_posts/2018-03-04-release-3.2.12.md b/content/_posts/2018-03-04-release-3.2.12.md
index 1940a37..454225e 100644
--- a/content/_posts/2018-03-04-release-3.2.12.md
+++ b/content/_posts/2018-03-04-release-3.2.12.md
@@ -11,7 +11,7 @@ categories: [release]
 ---
 {% comment %}
 Some of the variables above are used on the summary page that iterates through posts where catagories=release.
-{% endcomment %}{% capture apacheDistMirror %}http://www.apache.org/dyn/closer.lua/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %}
+{% endcomment %}{% capture apacheDistMirror %}https://www.apache.org/dyn/closer.lua/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %}
 {% capture d %}https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %}
 
 
@@ -29,7 +29,7 @@ This is Rya's third Apache release, version {{ page.version }}.  It is available
 - [Release notes]({{ page.releaseNotes | liquify }})
 - [Central repository for Maven and other dependency managers](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.rya%22)
 
-[Verify](http://www.apache.org/dyn/closer.cgi#verify)
+[Verify](https://www.apache.org/dyn/closer.cgi#verify)
 using the corresponding *pgp* signature (using the committer file in
 [KEYS](https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/KEYS)).
 If you cannot do that, the *md5* or *sha1* hash file may be used to check that the
@@ -37,7 +37,7 @@ download has completed okay.
 
 For fast downloads, current source distributions are hosted on mirror servers;
 older source distributions are in the
-[archive](http://archive.apache.org/dist/incubator/{{ site.data.project.unix_name }}/).
+[archive](https://archive.apache.org/dist/incubator/{{ site.data.project.unix_name }}/).
 If a download from a mirror fails, retry, and the second download will likely
 succeed.
 
diff --git a/content/_posts/2019-07-27-release-4.0.0.md b/content/_posts/2019-07-27-release-4.0.0.md
index c8b948c..c378515 100644
--- a/content/_posts/2019-07-27-release-4.0.0.md
+++ b/content/_posts/2019-07-27-release-4.0.0.md
@@ -11,7 +11,7 @@ categories: [release]
 ---
 {% comment %}
 Some of the variables above are used on the summary page that iterates through posts where catagories=release.
-{% endcomment %}{% capture apacheDistMirror %}http://www.apache.org/dyn/closer.lua/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %}
+{% endcomment %}{% capture apacheDistMirror %}https://www.apache.org/dyn/closer.lua/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %}
 {% capture d %}https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/{{ page.fullVersion }}{% endcapture %}
 
 
@@ -27,7 +27,7 @@ This is Rya's fourth Apache release, version {{ page.version }}.  It is availabl
 - [Release notes]({{ page.releaseNotes | liquify }})
 - [Central repository for Maven and other dependency managers](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.rya%22)
 
-[Verify](http://www.apache.org/dyn/closer.cgi#verify)
+[Verify](https://www.apache.org/dyn/closer.cgi#verify)
 using the corresponding *pgp* signature (using the committer file in
 [KEYS](https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/KEYS)).
 If you cannot do that, the *sha512* hash file may be used to check that the
@@ -35,7 +35,7 @@ download has completed okay.
 
 For fast downloads, current source distributions are hosted on mirror servers;
 older source distributions are in the
-[archive](http://archive.apache.org/dist/incubator/{{ site.data.project.unix_name }}/).
+[archive](https://archive.apache.org/dist/incubator/{{ site.data.project.unix_name }}/).
 If a download from a mirror fails, retry, and the second download will likely
 succeed.
 
diff --git a/content/_posts/2020-12-22-release-4.0.1.md b/content/_posts/2020-12-22-release-4.0.1.md
new file mode 100644
index 0000000..93316fb
--- /dev/null
+++ b/content/_posts/2020-12-22-release-4.0.1.md
@@ -0,0 +1,46 @@
+---
+layout: post
+date: "2020-12-22"
+title: Release 4.0.1
+description: details of the fifth release of Rya
+version: 4.0.1
+fullVersion: rya-4.0.1
+filename: rya-project-4.0.1-source-release
+releaseNotes:  "{% post_url 2020-12-22-relnotes-4.0.1 %}"
+categories: [release]
+---
+{% comment %}
+Some of the variables above are used on the summary page that iterates through posts where catagories=release.
+{% endcomment %}{% capture apacheDistMirror %}https://www.apache.org/dyn/closer.lua/rya/{{ page.fullVersion }}{% endcapture %}
+{% capture d %}https://www.apache.org/dist/rya/{{ page.fullVersion }}{% endcapture %}
+
+
+This is Rya's fifth Apache release and the **first** release as a top level project -- no longer in incubation. Version {{ page.version }} is available as a source code download:
+
+- [Source download from Apache]({{ apacheDistMirror }}/{{ page.filename }}.zip)
+- Verify: {% comment %}
+{% endcomment %} [pgp]( {{ d }}/{{ page.filename }}.zip.asc ){% comment %}
+{% endcomment %} [sha512]({{ d }}/{{ page.filename }}.zip.sha512)
+- [Release notes]({{ page.releaseNotes | liquify }})
+- [Central repository for Maven and other dependency managers](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.rya%22)
+
+[Verify](https://www.apache.org/dyn/closer.cgi#verify)
+using the corresponding *pgp* signature (using the committer file in
+[KEYS](https://www.apache.org/dist/{{ site.data.project.name }}/KEYS)).
+If you cannot do that, the *sha512* hash file may be used to check that the
+download has completed okay.
+
+For fast downloads, current source distributions are hosted on mirror servers;
+older source distributions are in the
+[archive](https://archive.apache.org/dist/{{ site.data.project.unix_name }}/).
+If a download from a mirror fails, retry, and the second download will likely
+succeed.
+
+For security, hash and signature files are always hosted at
+[Apache](https://www.apache.org/dist/{{ site.data.project.name }}).
+
+Next steps:
+- [Building from Source](https://github.com/apache/rya/blob/rel/{{ page.fullVersion }}/extras/rya.manual/src/site/markdown/build-source.md)
+- [Quick Start](https://github.com/apache/rya/blob/rel/{{ page.fullVersion }}/extras/rya.manual/src/site/markdown/quickstart.md)
+- [Typical First Steps](https://github.com/apache/rya/blob/rel/{{ page.fullVersion }}/extras/rya.manual/src/site/markdown/sm-firststeps.md)
+- [Manual -- includes documents above](https://github.com/apache/rya/blob/rel/{{ page.fullVersion }}/extras/rya.manual/src/site/markdown/index.md)
diff --git a/content/_posts/2020-12-22-relnotes-4.0.1.md b/content/_posts/2020-12-22-relnotes-4.0.1.md
new file mode 100644
index 0000000..31be44e
--- /dev/null
+++ b/content/_posts/2020-12-22-relnotes-4.0.1.md
@@ -0,0 +1,34 @@
+---
+layout: post
+date: "2020-12-22"
+title: Release Notes v4.0.1
+description: Details of what changed in v4.0.1 of Rya 
+categories: [releasenotes]
+jira: https://issues.apache.org/jira/browse/
+---
+Release Notes v4.0.1
+
+See the full [list of issues](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12319020&version=12349433) resolved in this release.
+
+Here are the release highlights:
+
+* [RYA-384]({{page.jira}}RYA-384) - Dependency updates and fixes for vagrant example VM
+    -- pull requests #309 by furkanozbay #318 by DLotts
+
+* [RYA-518]({{page.jira}}RYA-518) Don't switch on null value, instead switch on valid type, use Map.getOrDefault()
+    -- pull request #311 by rplst8
+
+* [RYA-520]({{page.jira}}RYA-520) Update year in NOTICE
+    -- pull requests #319 by wollefitz
+
+* [RYA-522]({{page.jira}}RYA-522) - Prepare exit from Incubator to TLP
+
+* [RYA-526]({{page.jira}}RYA-526) -  graduation clean-up:removed DISCLAIMER file, removed incubating name,…
+    -- pull request #321 by adinancr
+
+* [RYA-529]({{page.jira}}RYA-529) - fixed boundless and locationtech repos in main pom in Rya v4
+    -- pull requests #314 #313 by DLotts
+
+* SECURITY - Use HTTPS to resolve dependencies in Maven Build
+    -- pull request #312 by JLLeitschuh
+
diff --git a/content/community-members.md b/content/community-members.md
index 3bad8d0..725c2eb 100644
--- a/content/community-members.md
+++ b/content/community-members.md
@@ -37,10 +37,10 @@ limitations under the License.
 
     {% for member in site.data.contributors %}
         <tr>
-        <td>{% if member.githubId %}<a href="http://github.com/{{ member.githubId }}"><img width="64" src="{% unless c.avatar %}http://github.com/{{ member.githubId }}.png{% else %}{{ member.avatar }}{% endunless %}"></a>{% endif %}</td>
+        <td>{% if member.githubId %}<a href="https://github.com/{{ member.githubId }}"><img width="64" src="{% unless c.avatar %}https://github.com/{{ member.githubId }}.png{% else %}{{ member.avatar }}{% endunless %}"></a>{% endif %}</td>
         <td>{{member.name}}</td>
         <td>{{member.apacheId}}</td>
-        <td><a href="http://github.com/{{ member.githubId }}">{{ member.githubId }}</a></td>
+        <td><a href="https://github.com/{{ member.githubId }}">{{ member.githubId }}</a></td>
         <td>{{member.role}}</td>
         <td>{{member.org}}</td>
         </tr>
diff --git a/content/documentation.md b/content/documentation.md
index 7e05997..6587387 100644
--- a/content/documentation.md
+++ b/content/documentation.md
@@ -43,7 +43,7 @@ limitations under the License.
 
 ### {{ site.data.project.short_name }} Manual
 
-A copy of the {{ site.data.project.short_name }} Manual is located [here](https://github.com/apache/incubator-rya/blob/master/extras/rya.manual/src/site/markdown/index.md) 
+[The latest {{ site.data.project.short_name }} Manual](https://github.com/apache/rya/blob/master/extras/rya.manual/src/site/markdown/index.md) 
 
 
 
diff --git a/content/download.md b/content/download.md
index b0ccdff..298084f 100644
--- a/content/download.md
+++ b/content/download.md
@@ -13,7 +13,7 @@ The ASF licenses this file to you under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
 the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -35,17 +35,23 @@ If you are interested in helping out, please join our developers list [{{site.da
 Release          | Date       | Download | Notes
 :--------------- | :--------- | :------- | :----
 {% for post in site.categories.release %}{% comment %}
+
+{% endcomment %}{% if post.filename contains "incubating" %}{% comment %}
+{% endcomment %}{% assign theName = site.data.project.incubator_slash_name %}{% comment %}
+{% endcomment %}{% else %}{% comment %}
+{% endcomment %}{% assign theName = site.data.project.unix_name %}{% comment %}
+{% endcomment %}{% endif %}{% comment %}
 {% endcomment %}{% if post.fullVersion %}{% comment %}
 {% endcomment %}{% assign v = post.fullVersion %}{% comment %}
 {% endcomment %}{% else %}{% comment %}
 {% endcomment %}{% capture v %}apache-{{ site.data.project.unix_name }}-{{ post.version }}{% endcapture %}{% comment %}
 {% endcomment %}{% endif %}{% comment %}
 {% endcomment %}{% if forloop.index0 < 1 %}{% comment %}
-{% endcomment %}{% capture p %}http://www.apache.org/dyn/closer.lua/{{ site.data.project.incubator_slash_name }}/{{ v }}{% endcapture %}{% comment %}
-{% endcomment %}{% capture d %}https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/{{ v }}{% endcapture %}{% comment %}
+{% endcomment %}{% capture p %}https://www.apache.org/dyn/closer.lua/{{ theName }}/{{ v }}{% endcapture %}{% comment %}
+{% endcomment %}{% capture d %}https://www.apache.org/dist/{{ theName }}/{{ v }}{% endcapture %}{% comment %}
 {% endcomment %}{% else %}{% comment %}
-{% endcomment %}{% capture p %}http://archive.apache.org/dist/incubator/{{ site.data.project.unix_name }}/{{ v }}{% endcapture %}{% comment %}
-{% endcomment %}{% capture d %}https://archive.apache.org/dist/incubator/{{ site.data.project.unix_name}}/{{ v }}{% endcapture %}{% comment %}
+{% endcomment %}{% capture p %}https://archive.apache.org/dist/{{ theName }}/{{ v }}{% endcapture %}{% comment %}
+{% endcomment %}{% capture d %}https://archive.apache.org/dist/{{ theName}}/{{ v }}{% endcapture %}{% comment %}
 {% endcomment %}{% endif %}{% comment %}
 {% endcomment %} <a href="{{ post.url }}">{{ post.version }}</a>{% comment %}
 {% endcomment %} | {{ post.date | date_to_string }}{% comment %}
@@ -61,21 +67,21 @@ Release          | Date       | Download | Notes
 {% endfor %}
 <br>
 Download a source distribution in <!-- either *tar* or --> *zip* format,
-and [verify](http://www.apache.org/dyn/closer.cgi#verify)
-using the corresponding *pgp* signature (using the committer file in [KEYS](https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}/KEYS)).
-If you cannot do that, the *sha1* or *sha512* hash file may be used to check that the
+and [verify](https://www.apache.org/dyn/closer.cgi#verify)
+using the corresponding *pgp* signature (using the committer file in [KEYS](https://www.apache.org/dist/{{ site.data.project.unix_name }}/KEYS)).
+If you cannot do that, the *sha512* hash file may be used to check that the
 download has completed okay.
 
 
 For fast downloads, current source distributions are hosted on mirror servers;
 
-<!-- older source distributions are in the
-[archive](http://archive.apache.org/dist/{{ site.data.project.incubator_slash_name }}/).
---> 
+Older source distributions are in the
+[archive](https://archive.apache.org/dist/{{ site.data.project.unix_name }}/).
+ 
 If a download from a mirror fails, retry, and the second download will likely
 succeed.
 
 
 For security, hash and signature files are always hosted at
-[Apache](https://www.apache.org/dist/{{ site.data.project.incubator_slash_name }}).
+[Apache](https://www.apache.org/dist/{{ site.data.project.unix_name }}).