Merge pull request apache#40 from vinooganesh/staging

Updating Staging

.github/workflows/deploy.yml

@@ -6,11 +6,11 @@ on:
 
 jobs:
   Build_and_Deploy_Site:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
           fetch-depth: 0
@@ -21,12 +21,12 @@ jobs:
           hugo-version: 'latest'
           extended: true
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '20'
 
       - name: Cache dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

.gitmodules

@@ -1,4 +0,0 @@
-
-[submodule "themes/docsy"]
-	path = themes/docsy
-	url = https://github.com/google/docsy

config.toml

@@ -10,9 +10,6 @@ enableMissingTranslationPlaceholders = true
 
 enableRobotsTXT = true
 
-# Base theme for website
-theme = ["docsy"]
-
 # Will give values to .Lastmod etc.
 enableGitInfo = true
 
@@ -47,9 +44,13 @@ anchor = "smart"
 
 [languages]
 [languages.en]
+languageName ="English"
+# Weight used for sorting.
+weight = 1
+[languages.en.params]
 title = "Apache Parquet"
 description = "The Apache Parquet Website"
-languageName ="English"
+
 contentDir = "content/en"
 # Weight used for sorting.
 weight = 1
@@ -103,9 +104,6 @@ github_branch= "staging"
 # Comment out to disable search.
 gcs_engine_id = "7e3f91e3eadecceaa"
 
-# Enable Algolia DocSearch
-algolia_docsearch = false
-
 # Enable Lunr.js offline search
 offlineSearch = false
 
@@ -118,7 +116,7 @@ prism_syntax_highlighting = false
 #  Set to true to disable breadcrumb navigation.
 breadcrumb_disable = false
 # Set to true to disable the About link in the site footer
-footer_about_disable = false
+footer_about_enable = true
 # Set to false if you don't want to display a logo (/assets/icons/logo.svg) in the top navbar
 navbar_logo = true
 # Set to true if you don't want the top navbar to be translucent when over a `block/cover`, like on the homepage.
@@ -182,3 +180,13 @@ enable = false
   url = "https://issues.apache.org/jira/projects/PARQUET/issues"
   icon = "fas fa-bug"
   desc = "File/Track Open Bugs"
+
+[module]
+  # Uncomment the next line to build and serve using local docsy clone declared in the named Hugo workspace:
+  # workspace = "docsy.work"
+  [module.hugoVersion]
+    extended = true
+    min = "0.110.0"
+  [[module.imports]]
+    path = "github.com/google/docsy"
+    disable = false

content/en/_index.html → content/en/_index.md

@@ -1,29 +1,24 @@
-+++
-title = "Apache Parquet"
-linkTitle = "Parquet"
-
-+++
-
-{{< blocks/cover title="Apache Parquet" image_anchor="top" height="full" color="blue" >}}
-<div class="mx-auto">
-	<a class="btn btn-lg btn-primary mr-3 mb-4" href="{{< relref "/docs" >}}">
-		Documentation <i class="fas fa-arrow-alt-circle-right ml-2"></i>
-	</a>
-	<a class="btn btn-lg btn-secondary mr-3 mb-4" href="{{< relref "/blog" >}}">
-		Download <i class="fas fa-download ml-2 "></i>
-	</a>
-	<p class="lead mt-5">Apache Parquet is a columnar storage format available to any project in the Hadoop ecosystem, regardless of the choice of data processing framework, data model or programming language.</p>
-	{{< blocks/link-down color="info" >}}
-</div>
+---
+title: Parquet
+---
+
+{{< blocks/cover title="Apache Parquet" image_anchor="top" height="full" >}}
+<a class="btn btn-lg btn-primary me-3 mb-4" href="/docs/">
+  Documentation <i class="fas fa-arrow-alt-circle-right ms-2"></i>
+</a>
+<a class="btn btn-lg btn-secondary me-3 mb-4" href="/blog/">
+  Download <i class="fab fa-github ms-2 "></i>
+</a>
+<p class="lead mt-5">Apache Parquet is a columnar storage format available to any project in the Hadoop ecosystem, regardless of the choice of data processing framework, data model or programming language.</p>
+{{< blocks/link-down color="info" >}}
 {{< /blocks/cover >}}
 
 
-{{< blocks/section color="white" >}}
+{{< blocks/section color="white" type="row">}}
 {{% blocks/feature icon="fab fa-jira" title="File an Issue" url="https://issues.apache.org/jira/projects/PARQUET/issues" %}}
 Or Search Open Issues
 {{% /blocks/feature %}}
 
-
 {{% blocks/feature icon="fab fa-github" title="Contributions welcome!" url="https://github.com/apache/parquet-mr" %}}
 We do a [Pull Request](https://github.com/apache/parquet-mr/pulls) contributions workflow on **GitHub**. New users are always welcome!
 {{% /blocks/feature %}}
@@ -33,5 +28,4 @@
 For announcement of latest features etc.
 {{% /blocks/feature %}}
 
-
-{{< /blocks/section >}}
+{{% /blocks/section %}}

content/en/blog/parquet-mr/1.12.3.md

@@ -0,0 +1,41 @@
+---
+title: "1.12.3"
+date: 2022-05-26
+description: >
+---
+The [latest version of parquet-mr is 1.12.3](https://www.apache.org/dyn/closer.lua/parquet/apache-parquet-1.12.3/apache-parquet-1.12.3.tar.gz).
+
+To [check the validity](https://www.apache.org/info/verification.html) of this release, use its:
+
+*   [Release manager OpenPGP key](https://downloads.apache.org/parquet/KEYS)
+*   [OpenPGP signature](https://downloads.apache.org/parquet/apache-parquet-1.12.3/apache-parquet-1.12.3.tar.gz.asc)
+*   [SHA-512](https://downloads.apache.org/parquet/apache-parquet-1.12.3/apache-parquet-1.12.3.tar.gz.sha512)
+
+The [latest version of parquet-mr on the previous minor branch is 1.11.2](https://www.apache.org/dyn/closer.lua/parquet/apache-parquet-1.11.2/apache-parquet-1.11.2.tar.gz).
+
+To [check the validity](https://www.apache.org/info/verification.html) of this release, use its:
+
+*   [Release manager OpenPGP key](https://downloads.apache.org/parquet/KEYS)
+*   [OpenPGP signature](https://downloads.apache.org/parquet/apache-parquet-1.11.2/apache-parquet-1.11.2.tar.gz.asc)
+*   [SHA-512](https://downloads.apache.org/parquet/apache-parquet-1.11.2/apache-parquet-1.11.2.tar.gz.sha512)
+
+### Downloading from the Maven central repository
+
+The Parquet team publishes its [releases to Maven Central](https://search.maven.org/search?q=g:org.apache.parquet).
+
+Add the following dependency section to your pom.xml:
+```
+    <dependencies>
+    ...
+       <dependency>
+          <groupId>org.apache.parquet</groupId>
+          <artifactId>parquet-avro</artifactId>
+          <version>1.12.3</version> <!-- or latest version -->
+       </dependency>
+    ...
+    </dependencies>
+```
+
+### Older Releases
+
+Older releases can be found in the Archives of the Apache Software Foundation: [https://archive.apache.org/dist/parquet/](https://archive.apache.org/dist/parquet/)

content/en/blog/parquet-mr/1.13.0.md

@@ -0,0 +1,41 @@
+---
+title: "1.13.0"
+date: 2023-04-06
+description: >
+---
+The [latest version of parquet-mr is 1.13.0](https://downloads.apache.org/parquet/apache-parquet-1.13.0/apache-parquet-1.13.0.tar.gz).
+
+To [check the validity](https://www.apache.org/info/verification.html) of this release, use its:
+
+*   [Release manager OpenPGP key](https://downloads.apache.org/parquet/KEYS)
+*   [OpenPGP signature](https://downloads.apache.org/parquet/apache-parquet-1.13.0/apache-parquet-1.13.0.tar.gz.asc)
+*   [SHA-512](https://downloads.apache.org/parquet/apache-parquet-1.13.0/apache-parquet-1.13.0.tar.gz.sha512)
+
+The [latest version of parquet-mr on the previous minor branch is 1.12.3](https://downloads.apache.org/parquet/apache-parquet-1.12.3/apache-parquet-1.12.3.tar.gz).
+
+To [check the validity](https://www.apache.org/info/verification.html) of this release, use its:
+
+*   [Release manager OpenPGP key](https://downloads.apache.org/parquet/KEYS)
+*   [OpenPGP signature](https://downloads.apache.org/parquet/apache-parquet-1.12.3/apache-parquet-1.12.3.tar.gz.asc)
+*   [SHA-512](https://downloads.apache.org/parquet/apache-parquet-1.12.3/apache-parquet-1.12.3.tar.gz.sha512)
+
+### Downloading from the Maven central repository
+
+The Parquet team publishes its [releases to Maven Central](https://search.maven.org/search?q=g:org.apache.parquet).
+
+Add the following dependency section to your pom.xml:
+```
+    <dependencies>
+    ...
+       <dependency>
+          <groupId>org.apache.parquet</groupId>
+          <artifactId>parquet-avro</artifactId>
+          <version>1.13.0</version> <!-- or latest version -->
+       </dependency>
+    ...
+    </dependencies>
+```
+
+### Older Releases
+
+Older releases can be found in the Archives of the Apache Software Foundation: [https://archive.apache.org/dist/parquet/](https://archive.apache.org/dist/parquet/)

content/en/blog/parquet-mr/1.13.1.md

@@ -0,0 +1,41 @@
+---
+title: "1.13.1"
+date: 2023-05-18
+description: >
+---
+The [latest version of parquet-mr is 1.13.1](https://downloads.apache.org/parquet/apache-parquet-1.13.1/apache-parquet-1.13.1.tar.gz).
+
+To [check the validity](https://www.apache.org/info/verification.html) of this release, use its:
+
+*   [Release manager OpenPGP key](https://downloads.apache.org/parquet/KEYS)
+*   [OpenPGP signature](https://downloads.apache.org/parquet/apache-parquet-1.13.1/apache-parquet-1.13.1.tar.gz.asc)
+*   [SHA-512](https://downloads.apache.org/parquet/apache-parquet-1.13.1/apache-parquet-1.13.1.tar.gz.sha512)
+
+The [latest version of parquet-mr on the previous minor branch is 1.12.3](https://downloads.apache.org/parquet/apache-parquet-1.12.3/apache-parquet-1.12.3.tar.gz).
+
+To [check the validity](https://www.apache.org/info/verification.html) of this release, use its:
+
+*   [Release manager OpenPGP key](https://downloads.apache.org/parquet/KEYS)
+*   [OpenPGP signature](https://downloads.apache.org/parquet/apache-parquet-1.12.3/apache-parquet-1.12.3.tar.gz.asc)
+*   [SHA-512](https://downloads.apache.org/parquet/apache-parquet-1.12.3/apache-parquet-1.12.3.tar.gz.sha512)
+
+### Downloading from the Maven central repository
+
+The Parquet team publishes its [releases to Maven Central](https://search.maven.org/search?q=g:org.apache.parquet).
+
+Add the following dependency section to your pom.xml:
+```
+    <dependencies>
+    ...
+       <dependency>
+          <groupId>org.apache.parquet</groupId>
+          <artifactId>parquet-avro</artifactId>
+          <version>1.13.1</version> <!-- or latest version -->
+       </dependency>
+    ...
+    </dependencies>
+```
+
+### Older Releases
+
+Older releases can be found in the Archives of the Apache Software Foundation: [https://archive.apache.org/dist/parquet/](https://archive.apache.org/dist/parquet/)

content/en/docs/Contribution Guidelines/contributing.md

@@ -9,7 +9,7 @@ description: >
 Pull Requests
 -------------
 
-We prefer to receive contributions in the form of GitHub pull requests. Please send pull requests against the [github.com/apache/parquet-mr](https://github.com/apache/parquet-mr) repository. If you’ve previously forked Parquet from its old location, you will need to add a remote or update your origin remote to [https://github.com/apache/incubator-parquet-mr.git](https://github.com/apache/incubator-parquet-mr.git) Here are a few tips to get your contribution in:
+We prefer to receive contributions in the form of GitHub pull requests. Please send pull requests against the [github.com/apache/parquet-mr](https://github.com/apache/parquet-mr) repository. If you’ve previously forked Parquet from its old location, you will need to add a remote or update your origin remote to [https://github.com/apache/parquet-mr.git](https://github.com/apache/parquet-mr.git) Here are a few tips to get your contribution in:
 
 1.  Break your work into small, single-purpose patches if possible. It’s much harder to merge in a large change with a lot of disjoint features.
 2.  Create a JIRA for your patch on the [Parquet Project JIRA](https://issues.apache.org/jira/browse/PARQUET).
@@ -95,5 +95,28 @@ For now just say `n` as we have 1 branch
 
 Website
 -------
+### Release Documentation
 
-TODO
+To create documentation for a new release of `parquet-format` create a new <releaseNumber>.md file under `content/en/blog/parquet-format`. Please see existing files in that directory as an example.
+
+To create documentation for a new release of `parquet-mr` create a new <releaseNumber>.md file under `content/en/blog/parquet-mr`. Please see existing files in that directory as an example.
+
+### Website development and deployment
+
+#### Staging
+
+To make a change to the `staging` version of the website:
+1. Make a PR against the `staging` branch in the repository
+2. Once the PR is merged, the `Build and Deploy Parquet Site`
+job in the [deployment workflow](https://github.com/apache/parquet-site/blob/staging/.github/workflows/deploy.yml) will be run, populating the `asf-staging` branch on this repo with the necessary files.
+
+**Do not directly edit the `asf-staging` branch of this repo**
+
+#### Production
+
+To make a change to the `production` version of the website:
+1. Make a PR against the `production` branch in the repository
+2. Once the PR is merged, the `Build and Deploy Parquet Site`
+job in the [deployment workflow](https://github.com/apache/parquet-site/blob/production/.github/workflows/deploy.yml) will be run, populating the `asf-site` branch on this repo with the necessary files.
+
+**Do not directly edit the `asf-site` branch of this repo**

content/en/docs/Contribution Guidelines/modules.md

@@ -10,7 +10,7 @@ The [parquet-format](https://github.com/apache/parquet-format) project contains
 
 The [parquet-mr](https://github.com/apache/parquet-mr) project contains multiple sub-modules, which implement the core components of reading and writing a nested, column-oriented data stream, map this core onto the parquet format, and provide Hadoop Input/Output Formats, Pig loaders, and other Java-based utilities for interacting with Parquet.
 
-The [parquet-cpp](https://github.com/apache/parquet-cpp) project is a C++ library to read-write Parquet files.
+The [parquet-cpp](https://arrow.apache.org/docs/cpp/parquet.html) project is a C++ library to read-write Parquet files. It is part of the [Apache Arrow](https://arrow.apache.org/) C++ implementation, with bindings to Python, R, Ruby and C/GLib.
 
 The [parquet-rs](https://github.com/apache/arrow-rs/tree/master/parquet) project is a Rust library to read-write Parquet files.
 

content/en/docs/Contribution Guidelines/releasing.md

@@ -23,13 +23,15 @@ Parquet uses the maven-release-plugin to tag a release and push binary artifacts
 
 Before you start the release process:
 
-1.  Verify that the release is finished (no planned JIRAs are pending)
-2.  Build and test the project
-3.  Update the change log
+1.  Verify that the release is finished (no planned JIRAs are pending and all patches are cherry-picked to the release branch) 
+2.  Resolve all associated JIRAs with correct target version and create the next unreleased version in the JIRA project
+3.  Build and test the project
+4.  Create a new branch for the release if this is a new minor version. For example, if the new minor version is 1.13.0, create a new branch `parquet-1.13.x`
+5.  Update the change log
     *   Go to the release notes for the release in JIRA
     *   Copy the HTML and convert it to markdown with an [online converter](https://domchristie.github.io/turndown/)
     *   Add the content to CHANGES.md and update formatting
-    *   Commit the update to CHANGES.md
+    *   Commit the update to CHANGES.md and make sure it is committed to both release and master branches
 
 #### 1\. Run the prepare script
 
@@ -120,6 +122,13 @@ This will add the final release tag to the RC tag and sets the new development v
 
 #### 2\. Release the binary repository in Nexus
 
+Releasing a binary repository publishes the binaries to [public](https://repository.apache.org/content/groups/public/org/apache/parquet/).
+
+1.  Go to [Nexus](https://repository.apache.org/).
+2.  In the menu on the left, choose “Staging Repositories”.
+3.  Select the Parquet repository.
+4.  At the top, click Release and follow the instructions. For the comment use “Apache Parquet \[Format\] ”.
+
 #### 3\. Copy the release artifacts in SVN into releases
 
 First, check out the candidates and releases locations in SVN:
@@ -144,7 +153,7 @@ Then add and commit the release artifacts:
 
 #### 4\. Update parquet.apache.org
 
-Update the downloads page on parquet.apache.org. Instructions for updating the site are on the [contribution page](http://parquet.apache.org/contribute/).
+Update the downloads page on parquet.apache.org. Instructions for updating the site are on the [contribution page](http://parquet.apache.org/docs/contribution-guidelines/contributing/).
 
 #### 5\. Send an ANNOUNCE e-mail to [announce@apache.org](mailto:announce@apache.org) and the dev list
 

content/en/docs/Learning Resources/Blog Posts/_index.md

@@ -9,3 +9,8 @@ description: >
 * [Apache Parquet: Cost Efficiency @ Scale in Big Data File Format](https://eng.uber.com/cost-efficiency-big-data/)
 
 * [One Stone, Three Birds: Finer-Grained Encryption @ Apache Parquet](https://eng.uber.com/one-stone-three-birds-finer-grained-encryption-apache-parquet/)
+<<<<<<< HEAD
+
+* [Designing a Parquet Catalog for InfluxDB IOx](https://www.influxdata.com/blog/designing-a-parquet-catalog-for-influxdb-iox/)
+=======
+>>>>>>> refs/remotes/origin/staging

go.mod

@@ -0,0 +1,5 @@
+module github.com/apache/parquet-site
+
+go 1.23
+
+require github.com/google/docsy v0.9.1 // indirect

go.sum

@@ -0,0 +1,4 @@
+github.com/FortAwesome/Font-Awesome v0.0.0-20240108205627-a1232e345536/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
+github.com/google/docsy v0.9.1 h1:+jqges1YCd+yHeuZ1BUvD8V8mEGVtPxULg5j/vaJ984=
+github.com/google/docsy v0.9.1/go.mod h1:saOqKEUOn07Bc0orM/JdIF3VkOanHta9LU5Y53bwN2U=
+github.com/twbs/bootstrap v5.2.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=

layouts/404.html

@@ -1,9 +1,6 @@
-{{ define "main"}}
-    <main id="main">
-      <div>
-       <h1 id="title">Not found</h1>
-       <p>Oops! This page doesn't exist. Try going back to our <a href="{{ "/" | relURL }}">home page</a>.</p>
-
-      </div>
-    </main>
-{{ end }}
+{{ define "main" -}}
+<div class="td-content">
+  <h1>Not found</h1>
+  <p>Oops! This page doesn't exist. Try going back to the <a href="{{ "" | relURL }}">home page</a>.</p>
+</div>
+{{- end }}