Merge pull request #311 from raboof/markmail-to-lists.a.o
Replace references to markmail.org with lists.apache.org
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/README.md b/README.md
index 5b2566b..f2f37e0 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,6 @@
The website is built with [Pelican](https://blog.getpelican.com).
-You can use the [infrastructure-pelican Dockerfile](https://github.com/apache/infrastructure-pelican/blob/master/Dockerfile) build the website locally for testing.
-
Continuous Integration / Continuous Deployment (CI/CD) is via the [.asf.yaml file](https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features)
mechanism, which runs [Buildbot](https://ci2.apache.org/#/builders/3/).
@@ -87,4 +85,10 @@
If you need to test your changes, create a branch such as preview/_your-asf-id_
-Commits to it will be staged at www-_your-asf-id_.staged.apache.org
\ No newline at end of file
+Commits to it will be staged at www-_your-asf-id_.staged.apache.org
+
+=======
+
+Note: the branch name must not include any "." characters,
+or browsers will refuse to display the site due to an invalid SSL certificate.
+The underscore character should not be used either, as it is disallowed in host names.
diff --git a/asfdata.yaml b/asfdata.yaml
index 06da33f..87e7e88 100644
--- a/asfdata.yaml
+++ b/asfdata.yaml
@@ -93,15 +93,3 @@
# load, transform, and create a sequence of foundation blogs
blog: https://news.apache.org/feed/atom
count: 3
-
-# used on index.ezmd
-planet:
- # load, transform, and create a sequence of foundation blogs
- blog: https://blogs.apache.org/planet/feed/entries/atom
- count: 1
-
-# used on index.ezmd
-conferences:
- # load, transform, and create a sequence of foundation blogs
- blog: https://blogs.apache.org/conferences/feed/entries/atom
- count: 1
diff --git a/content/foundation/contact.md b/content/foundation/contact.md
index 422daff..4ca28e5 100644
--- a/content/foundation/contact.md
+++ b/content/foundation/contact.md
@@ -33,7 +33,6 @@
| Website | Issues with a specific Apache project's website should go to that project's dev@ mailing list. For issues with the foundation top-level website apache.org or news.apache.org: press@apache.org |
| DMCA Designated Agent | [DMCA Agent](/legal/dmca.html) |
| Exports | [Exports](/licenses/exports/) |
-| For questions that are not covered above | apache@apache.org |
## Mailing Address
diff --git a/content/foundation/docs/2023DEIReport.pdf b/content/foundation/docs/2023DEIReport.pdf
new file mode 100644
index 0000000..50c69bb
--- /dev/null
+++ b/content/foundation/docs/2023DEIReport.pdf
Binary files differ
diff --git a/content/foundation/docs/FY2023AnnualReport.pdf b/content/foundation/docs/FY2023AnnualReport.pdf
new file mode 100644
index 0000000..aac7e21
--- /dev/null
+++ b/content/foundation/docs/FY2023AnnualReport.pdf
Binary files differ
diff --git a/content/foundation/governance/orgchart.md b/content/foundation/governance/orgchart.md
index 679ac1c..da0382d 100644
--- a/content/foundation/governance/orgchart.md
+++ b/content/foundation/governance/orgchart.md
@@ -9,7 +9,7 @@
the PMCs report periodically to the board, and most other officers
report through the President, who reports for them to the board.
-Click in the image map to learn more about a role.
+Click in the image map below to learn more about that role, or read our [listing of various officers at the ASF](https://whimsy.apache.org/foundation/orgchart).
<map name="ApacheOrgChart-p1" id="ApacheOrgChart-p1">
<area id="board" title="Board of Directors" href="https://whimsy.apache.org/foundation/orgchart/board" shape="rect" coords="494,110,656,223" style="outline:none;" target="_self" />
diff --git a/content/foundation/images/gradle-platinum.png b/content/foundation/images/gradle-platinum.png
new file mode 100644
index 0000000..d2154f6
--- /dev/null
+++ b/content/foundation/images/gradle-platinum.png
Binary files differ
diff --git a/content/foundation/mailinglists.md b/content/foundation/mailinglists.md
index 094ec8c..61721a8 100644
--- a/content/foundation/mailinglists.md
+++ b/content/foundation/mailinglists.md
@@ -43,16 +43,16 @@
## Request addresses for [un]subscribing
If you want to subscribe
-to <code><em>list</em>@apache.org</code>, you need to send a message to
+to <code><em>list</em>@<em>project</em>.apache.org</code>, you need to send a message to
<pre>
-<em>list</em>-subscribe@apache.org
+<em>list</em>-subscribe@<em>project</em>.apache.org
</pre>
To get off a list, send a message to
<pre>
-<em>list</em>-<b>un</b>subscribe@apache.org
+<em>list</em>-<b>un</b>subscribe@<em>project</em>.apache.org
</pre>
To unsubscribe a different e-mail - e.g.
@@ -60,7 +60,7 @@
to
<pre>
-<em>list</em>-unsubscribe-<b>user=oldname.example</b>@apache.org
+<em>list</em>-unsubscribe-<b>user=oldname.example</b>@<em>project</em>.apache.org
</pre>
_The list moderators can also do this._
diff --git a/content/foundation/members.md b/content/foundation/members.md
index d7c65f2..839a1ea 100644
--- a/content/foundation/members.md
+++ b/content/foundation/members.md
@@ -391,6 +391,7 @@
| sriksun | Srikanth Sundarrajan | [falcon](http://falcon.apache.org), [lens] (http://lens.apache.org)
| srowen | Sean Owen | [Spark](http://spark.apache.org/), [Mahout](http://mahout.apache.org/) |
| sseifert | Stefan Seifert | [Sling](http://sling.apache.org/), [Felix](http://felix.apache.org/) |
+| sseth | Siddharth Seth | [Hadoop](http://hadoop.apache.org) ; [Tez](http://tez.apache.org/) ; [Hive](http://hive.apache.org/)|
| stack | Michael Stack |
| stain | [Stian Soiland-Reyes](http://orcid.org/0000-0001-9842-9718) | [Taverna](https://taverna.incubator.apache.org/) ; [Commons](https://commons.apache.org/) ; [Incubator](https://incubator.apache.org/) |
| stevehay | [Steve Hay](http://home.apache.org/~stevehay) | [mod_perl](http://perl.apache.org/) , [httpd-apreq](http://httpd.apache.org/apreq)|
diff --git a/content/foundation/reports.md b/content/foundation/reports.md
index 1f3c705..3008a52 100644
--- a/content/foundation/reports.md
+++ b/content/foundation/reports.md
@@ -1,12 +1,13 @@
Title: reports
license: https://www.apache.org/licenses/LICENSE-2.0
-### Foundation Reports and Statements
+# ASF Reports and Statements
The following contains quarterly and annual reports from the past three fiscal years, as well as select Foundation statements. Official public records, including original incorporation records, bylaws, and IRS filings and notices are also available.
-#### Annual Reports
+### Annual Reports
+* [The Apache Software Foundation - Annual Report - FY2023](/foundation/docs/FY2023AnnualReport.pdf)
* [The Apache Software Foundation - Annual Report - FY2022](/foundation/docs/FY2022AnnualReport.pdf)
* [The Apache Software Foundation - Annual Report - FY2021](/foundation/docs/FY2021AnnualReport.pdf)
* [The Apache Software Foundation - Annual Report - FY2020](https://s.apache.org/FY2020AnnualReport)
@@ -15,7 +16,7 @@
* [The Apache Software Foundation - Annual Report - FY2017](https://s.apache.org/FY2017AnnualReport)
* [The Apache Software Foundation - Annual Report - FY2016](https://s.apache.org/Ccml)
-#### Quarterly Reports
+### Quarterly Reports
* Q3 FY2021 - [The Apache Software Foundation Operations Summary: November 2020 - January 2021](https://s.apache.org/Q3FY2021)
* Q2 FY2021 - [The Apache Software Foundation Operations Summary: August - October 2020](https://s.apache.org/Q2FY2021)
@@ -33,7 +34,10 @@
* Q2 FY2017 - [The Apache Software Foundation Operations Summary: August - October 2016](https://s.apache.org/oTOF)
* Q1 FY2017 - [The Apache Software Foundation Operations Summary: May - August 2016](https://s.apache.org/1BsV)
-#### Recent Foundation Statements
+### Diversity Reports
+* [Promoting and Studying Diversity, Equity, and Inclusion in the ASF Community - 2023](/foundation/docs/2023DEIReport.pdf)
+
+### Recent Foundation Statements
* [Foundation Statement at 8 February 2022 Senate Committee hearing on Homeland Security and Government Affairs]( https://blogs.apache.org/foundation/entry/foundation-statement-at-8-february)
* [Apache Software Foundation Security Report: 2021](https://blogs.apache.org/foundation/entry/apache-software-foundation-security-report2)
diff --git a/content/foundation/sponsors.md b/content/foundation/sponsors.md
index 9cad9e3..182d379 100644
--- a/content/foundation/sponsors.md
+++ b/content/foundation/sponsors.md
@@ -56,7 +56,6 @@
<li><a target="_blank" rel="sponsored" href="https://www.didiglobal.com/"><img src="images/didi.png"/></a><p style="text-align: center; font-weight: bold;">Didi Chuxing</p></li>
<li><a target="_blank" rel="sponsored" href="https://linecorp.com/"><img src="images/LINE-silver.png"/></a><p style="text-align: center; font-weight: bold;">LINE</p></li>
<li><a target="_blank" rel="sponsored" href="http://www.redhat.com/"><img src="images/redhat-silver.png"/></a><p style="text-align: center; font-weight: bold;">Red Hat, Inc.</p></li>
- <li><a target="_blank" rel="sponsored" href="http://www.talend.com/"><img src="images/talend-silver.png"/></a><p style="text-align: center; font-weight: bold;">Talend</p></li>
<li><a target="_blank" rel="sponsored" href="http://www.target.com/"><img src="images/target-silver.png"/></a><p style="text-align: center; font-weight: bold;">Target</p></li>
</ul>
</div>
@@ -103,6 +102,7 @@
<li><a target="_blank" rel="sponsored" href="https://aws.amazon.com/"><img src="images/aws-platinum.png"></a><p style="text-align: center; font-weight: bold;">Amazon Web Services</p></li>
<li><a target="_blank" rel="sponsored" href="https://www.cloudbees.com/"><img src="images/cloudbees.png"/></a><p style="text-align: center; font-weight: bold;">CloudBees</p></li>
<li><a target="_blank" rel="sponsored" href="https://www.dlapiper.com/"><img src="images/dlapiper.png"/></a><p style="text-align: center; font-weight: bold;">DLA Piper</p></li>
+ <li><a target="_blank" rel="sponsored" href="https://gradle.com/"><img src="images/gradle-platinum.png"/></a><p style="text-align: center; font-weight: bold;">Gradle</p></li>
<li><a target="_blank" rel="sponsored" href="https://www.leaseweb.com/"><img src="images/leaseweb-platinum.png"/></a><p style="text-align: center; font-weight: bold;">LeaseWeb</p></li>
<li><a target="_blank" rel="sponsored" href="https://jfrog.com/open-source/"><img src="images/jfrog-platinum.png"/></a><p style="text-align: center; font-weight: bold;">JFrog</p></li>
<li><a target="_blank" rel="sponsored" href="https://microsoft.com/"><img src="images/microsoft.png"/></a><p style="text-align: center; font-weight: bold;">Microsoft</p></li>
@@ -130,7 +130,6 @@
<div class="sponsors">
<ul id='targetedsilver'>
<li><a target="_blank" rel="sponsored" href="https://www.instaclustr.com/?utm_source=partner&utm_medium=asf&utm_campaign=homepage"><img src="images/instaclustr-silver.png"/></a><p style="text-align: center; font-weight: bold;">Instaclustr</p></li>
- <li><a target="_blank" rel="sponsored" href="http://rackspace.com/"><img src="images/rax.jpg"/></a><p style="text-align: center; font-weight: bold;">Rackspace</p></li>
<li><a target="_blank" rel="sponsored" href="https://www.mi.com/"><img src="images/xiaomi-silver.png"/></a><p style="text-align: center; font-weight: bold;">Xiaomi</p></li>
</ul>
</div>
diff --git a/content/foundation/sponsorship.md b/content/foundation/sponsorship.md
index 3ccadb8..1a1f7dd 100644
--- a/content/foundation/sponsorship.md
+++ b/content/foundation/sponsorship.md
@@ -106,7 +106,7 @@
Targeted Sponsorship provides the ASF with non-cash contributions aimed at specific activities, projects, or programs, such as donating cloud services, providing legal services, underwriting our flagship event attendees’ expenses, funding project hackathons, and contributing documentation resources.
-Targeted Sponsorships benefit the ASF in addition to funding our general operations. We invite you to [view our guidelines](/foundation/docs/Targeted-Sponsorship-Policy.pdf) to see if Targeted Sponsorship is right for you.
+Targeted Sponsorships benefit the ASF in addition to funding our general operations. Targeted Sponsors receive the same benefits as Foundation Sponsors based on the equivalent value of the non-cash contribution. We invite you to [view our guidelines](/foundation/docs/Targeted-Sponsorship-Policy.pdf) to see if Targeted Sponsorship is right for you.
## Corporate Giving Programs
diff --git a/content/memorials/index.md b/content/memorials/index.md
index 2fd5066..798cf6b 100644
--- a/content/memorials/index.md
+++ b/content/memorials/index.md
@@ -20,6 +20,7 @@
| **Date** | **Name** |
|------------|------------|
+| 5 September 2023 | Henry Story |
| 6 July 2021 | [Patricia Shanahan](patricia_shanahan.html) |
| 29 May 2019 | [Henk Penning](henk_penning.html) |
| 30 September 2016 | [Greg Reddin](greg_reddin.html) |
diff --git a/pagefind.sh b/pagefind.sh
index e52b9d5..2f90435 100644
--- a/pagefind.sh
+++ b/pagefind.sh
@@ -29,8 +29,8 @@
if [ -z "$PAGEFIND" ] # could not find pagefind
then
echo "Download pagefind"
- PAGEFIND_VERSION='0.12.0'
- PAGEFIND_HASH='3e450176562b65359f855c04894ec2c07ffd30a8d08ef4d5812f8d3469d7a58f'
+ PAGEFIND_VERSION='1.0.3'
+ PAGEFIND_HASH='e84ec7e8cb424022aa70ca14e6735c67c9728596753321dec782a902c3bfe6f0'
BINDIR=$(mktemp -d)
TARGET=${BINDIR}/pagefind.tar.gz
wget --no-verbose -O ${TARGET} https://github.com/CloudCannon/pagefind/releases/download/v${PAGEFIND_VERSION}/pagefind-v${PAGEFIND_VERSION}-x86_64-unknown-linux-musl.tar.gz
@@ -46,4 +46,4 @@
fi
echo "Running pagefind on ${PELICAN_OUTPUT_PATH}"
-${PAGEFIND} --source ${PELICAN_OUTPUT_PATH}
+${PAGEFIND} --site ${PELICAN_OUTPUT_PATH} --output-subdir "_pagefind"
