From 9c8ba5d8d967e951dfad685708c8ff990e2aae6b Mon Sep 17 00:00:00 2001
From: Christopher Tubbs <ctubbsii@apache.org>
Date: Thu, 11 Jul 2024 16:36:22 -0400
Subject: [PATCH] Fix release dates on website

* Fix dates in release notes to match release dates
* Fix dates in doap to match reporter.apache.org (dates are UTC+0000)
* Fix 1.5.2 release year in release notes filename
* Add doap for accumulo-access subproject
* Reorder doap releases to match reporter.apache.org and chronological
  ordering of releases
* Update gems
* Rename draft notes with more recent date for 2.1.3
---
 Gemfile.lock                                  | 18 ++--
 ...-1.5.2.md => 2014-09-19-accumulo-1.5.2.md} |  0
 ...-1.6.6.md => 2016-09-19-accumulo-1.6.6.md} |  0
 ...-1.8.1.md => 2017-02-27-accumulo-1.8.1.md} |  0
 ...-1.7.3.md => 2017-03-26-accumulo-1.7.3.md} |  0
 ...-1.9.0.md => 2018-04-18-accumulo-1.9.0.md} |  0
 ...-2.1.3.md => 2024-07-10-accumulo-2.1.3.md} |  0
 doap/accumulo-access.rdf                      | 53 +++++++++++
 doap/accumulo.rdf                             | 94 +++++++++----------
 9 files changed, 109 insertions(+), 56 deletions(-)
 rename _posts/release/{2015-09-19-accumulo-1.5.2.md => 2014-09-19-accumulo-1.5.2.md} (100%)
 rename _posts/release/{2016-09-18-accumulo-1.6.6.md => 2016-09-19-accumulo-1.6.6.md} (100%)
 rename _posts/release/{2017-02-26-accumulo-1.8.1.md => 2017-02-27-accumulo-1.8.1.md} (100%)
 rename _posts/release/{2017-04-06-accumulo-1.7.3.md => 2017-03-26-accumulo-1.7.3.md} (100%)
 rename _posts/release/{2018-04-23-accumulo-1.9.0.md => 2018-04-18-accumulo-1.9.0.md} (100%)
 rename _posts/release/{2023-09-20-accumulo-2.1.3.md => 2024-07-10-accumulo-2.1.3.md} (100%)
 create mode 100644 doap/accumulo-access.rdf

diff --git a/Gemfile.lock b/Gemfile.lock
index 007ccd00e..184ca7b55 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,18 +1,18 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     bigdecimal (3.1.8)
     colorator (1.1.0)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.3)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
     ffi (1.17.0-x86_64-linux-gnu)
     forwardable-extended (2.6.0)
-    google-protobuf (4.27.0-x86_64-linux)
+    google-protobuf (4.27.2-x86_64-linux)
       bigdecimal
       rake (>= 13)
     http_parser.rb (0.8.0)
@@ -51,16 +51,16 @@ GEM
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.5)
+    public_suffix (6.0.0)
     rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
-    rouge (4.2.1)
+    rexml (3.3.1)
+      strscan
+    rouge (4.3.0)
     safe_yaml (1.0.5)
-    sass-embedded (1.77.4-x86_64-linux-gnu)
+    sass-embedded (1.77.5-x86_64-linux-gnu)
       google-protobuf (>= 3.25, < 5.0)
     strscan (3.1.0)
     terminal-table (3.0.2)
diff --git a/_posts/release/2015-09-19-accumulo-1.5.2.md b/_posts/release/2014-09-19-accumulo-1.5.2.md
similarity index 100%
rename from _posts/release/2015-09-19-accumulo-1.5.2.md
rename to _posts/release/2014-09-19-accumulo-1.5.2.md
diff --git a/_posts/release/2016-09-18-accumulo-1.6.6.md b/_posts/release/2016-09-19-accumulo-1.6.6.md
similarity index 100%
rename from _posts/release/2016-09-18-accumulo-1.6.6.md
rename to _posts/release/2016-09-19-accumulo-1.6.6.md
diff --git a/_posts/release/2017-02-26-accumulo-1.8.1.md b/_posts/release/2017-02-27-accumulo-1.8.1.md
similarity index 100%
rename from _posts/release/2017-02-26-accumulo-1.8.1.md
rename to _posts/release/2017-02-27-accumulo-1.8.1.md
diff --git a/_posts/release/2017-04-06-accumulo-1.7.3.md b/_posts/release/2017-03-26-accumulo-1.7.3.md
similarity index 100%
rename from _posts/release/2017-04-06-accumulo-1.7.3.md
rename to _posts/release/2017-03-26-accumulo-1.7.3.md
diff --git a/_posts/release/2018-04-23-accumulo-1.9.0.md b/_posts/release/2018-04-18-accumulo-1.9.0.md
similarity index 100%
rename from _posts/release/2018-04-23-accumulo-1.9.0.md
rename to _posts/release/2018-04-18-accumulo-1.9.0.md
diff --git a/_posts/release/2023-09-20-accumulo-2.1.3.md b/_posts/release/2024-07-10-accumulo-2.1.3.md
similarity index 100%
rename from _posts/release/2023-09-20-accumulo-2.1.3.md
rename to _posts/release/2024-07-10-accumulo-2.1.3.md
diff --git a/doap/accumulo-access.rdf b/doap/accumulo-access.rdf
new file mode 100644
index 000000000..b7a8f5bff
--- /dev/null
+++ b/doap/accumulo-access.rdf
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl"?>
+<rdf:RDF xmlns="http://usefulinc.com/ns/doap#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:asfext="http://projects.apache.org/ns/asfext#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xml:lang="en">
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    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
+
+    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.
+-->
+  <Project rdf:about="https://accumulo.apache.org">
+    <created>2012-03-26</created>
+    <license rdf:resource="http://usefulinc.com/doap/licenses/asl20"/>
+    <name>Apache Accumulo Access Control Library</name>
+    <homepage rdf:resource="https://accumulo.apache.org"/>
+    <asfext:pmc rdf:resource="https://accumulo.apache.org"/>
+    <description>A library of utilities for managing access controls for use
+      with Apache Accumulo and similar projects.</description>
+    <bug-database rdf:resource="https://github.com/apache/accumulo-access/issues"/>
+    <mailing-list rdf:resource="https://accumulo.apache.org/contact-us"/>
+    <download-page rdf:resource="https://accumulo.apache.org/downloads"/>
+    <programming-language>Java</programming-language>
+    <category rdf:resource="http://projects.apache.org/category/big-data"/>
+    <release>
+      <Version>
+        <name>Apache Accumulo Access Control Library</name>
+        <created>2024-02-17</created>
+        <revision>1.0.0-beta</revision>
+      </Version>
+    </release>
+    <repository>
+      <GitRepository>
+        <location rdf:resource="https://gitbox.apache.org/repos/asf/accumulo-access.git"/>
+        <browse rdf:resource="https://gitbox.apache.org/repos/asf?p=accumulo-access.git"/>
+      </GitRepository>
+    </repository>
+    <maintainer>
+      <foaf:Person>
+        <foaf:name>Apache Accumulo PMC</foaf:name>
+        <foaf:mbox rdf:resource="mailto:dev@accumulo.apache.org"/>
+      </foaf:Person>
+    </maintainer>
+  </Project>
+</rdf:RDF>
diff --git a/doap/accumulo.rdf b/doap/accumulo.rdf
index c59fe91d4..e70eba523 100644
--- a/doap/accumulo.rdf
+++ b/doap/accumulo.rdf
@@ -45,14 +45,14 @@
       <Version>
         <name>Apache Accumulo</name>
         <created>2023-08-21</created>
-        <revision>3.0.0</revision>
+        <revision>2.1.2</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
         <created>2023-08-21</created>
-        <revision>2.1.2</revision>
+        <revision>3.0.0</revision>
       </Version>
     </release>
     <release>
@@ -156,57 +156,50 @@
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2017-02-26</created>
-        <revision>1.8.1</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Accumulo</name>
-        <created>2016-09-06</created>
-        <revision>1.8.0</revision>
+        <created>2018-03-23</created>
+        <revision>1.7.4</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2018-03-23</created>
-        <revision>1.7.4</revision>
+        <created>2017-03-26</created>
+        <revision>1.7.3</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2017-03-26</created>
-        <revision>1.7.3</revision>
+        <created>2017-02-27</created>
+        <revision>1.8.1</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2016-06-22</created>
-        <revision>1.7.2</revision>
+        <created>2016-09-19</created>
+        <revision>1.6.6</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2016-02-26</created>
-        <revision>1.7.1</revision>
+        <created>2016-09-06</created>
+        <revision>1.8.0</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2015-05-18</created>
-        <revision>1.7.0</revision>
+        <created>2016-06-22</created>
+        <revision>1.7.2</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2016-09-18</created>
-        <revision>1.6.6</revision>
+        <created>2016-02-26</created>
+        <revision>1.7.1</revision>
       </Version>
     </release>
     <release>
@@ -226,43 +219,43 @@
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2015-07-04</created>
-        <revision>1.6.3</revision>
+        <created>2015-09-21</created>
+        <revision>1.5.4</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2015-02-16</created>
-        <revision>1.6.2</revision>
+        <created>2015-07-04</created>
+        <revision>1.6.3</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2014-09-25</created>
-        <revision>1.6.1</revision>
+        <created>2015-06-25</created>
+        <revision>1.5.3</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2014-05-02</created>
-        <revision>1.6.0</revision>
+        <created>2015-05-18</created>
+        <revision>1.7.0</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2015-09-21</created>
-        <revision>1.5.4</revision>
+        <created>2015-02-16</created>
+        <revision>1.6.2</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2015-06-25</created>
-        <revision>1.5.3</revision>
+        <created>2014-09-25</created>
+        <revision>1.6.1</revision>
       </Version>
     </release>
     <release>
@@ -275,22 +268,22 @@
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2014-03-06</created>
-        <revision>1.5.1</revision>
+        <created>2014-05-02</created>
+        <revision>1.6.0</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2013-05-25</created>
-        <revision>1.5.0</revision>
+        <created>2014-04-04</created>
+        <revision>1.4.5</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2014-04-04</created>
-        <revision>1.4.5</revision>
+        <created>2014-03-06</created>
+        <revision>1.5.1</revision>
       </Version>
     </release>
     <release>
@@ -300,6 +293,13 @@
         <revision>1.4.4</revision>
       </Version>
     </release>
+    <release>
+      <Version>
+        <name>Apache Accumulo</name>
+        <created>2013-05-25</created>
+        <revision>1.5.0</revision>
+      </Version>
+    </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
@@ -317,22 +317,22 @@
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2012-07-03</created>
-        <revision>1.4.1</revision>
+        <created>2012-07-06</created>
+        <revision>1.3.6</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2012-03-30</created>
-        <revision>1.4.0</revision>
+        <created>2012-07-03</created>
+        <revision>1.4.1</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Apache Accumulo</name>
-        <created>2012-07-06</created>
-        <revision>1.3.6</revision>
+        <created>2012-03-30</created>
+        <revision>1.4.0</revision>
       </Version>
     </release>
     <release>