You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2022/12/19 10:21:09 UTC

[logging-log4j2] 03/33: LOG4J2-3628 Use only the version in generated changelog files.

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

vy pushed a commit to branch mvn-site-simplified
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit b0e6fcf2e439c314c8f026034ebef8211e6a2e45
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Nov 21 22:56:03 2022 +0100

    LOG4J2-3628 Use only the version in generated changelog files.
---
 .../util/changelog/exporter/AsciiDocExporter.java  | 27 +++++++++++++---------
 .../{20120729-2.0-alpha1.adoc => 2.0-alpha1.adoc}  | 21 +++++++++++------
 .../{20120824-2.0-alpha2.adoc => 2.0-alpha2.adoc}  | 21 +++++++++++------
 .../{20120918-2.0-beta1.adoc => 2.0-beta1.adoc}    | 21 +++++++++++------
 .../{20121007-2.0-beta2.adoc => 2.0-beta2.adoc}    | 21 +++++++++++------
 .../{20121111-2.0-beta3.adoc => 2.0-beta3.adoc}    | 21 +++++++++++------
 .../{20130128-2.0-beta4.adoc => 2.0-beta4.adoc}    | 19 ++++++++++-----
 .../{20130420-2.0-beta5.adoc => 2.0-beta5.adoc}    | 19 ++++++++++-----
 .../{20130505-2.0-beta6.adoc => 2.0-beta6.adoc}    | 21 +++++++++++------
 .../{20130601-2.0-beta7.adoc => 2.0-beta7.adoc}    | 21 +++++++++++------
 .../{20130710-2.0-beta8.adoc => 2.0-beta8.adoc}    | 21 +++++++++++------
 .../{20130914-2.0-beta9.adoc => 2.0-beta9.adoc}    | 19 ++++++++++-----
 .../{20140216-2.0-rc1.adoc => 2.0-rc1.adoc}        | 19 ++++++++++-----
 .../{20140621-2.0-rc2.adoc => 2.0-rc2.adoc}        | 19 ++++++++++-----
 .../changelog/{20140729-2.0.1.adoc => 2.0.1.adoc}  | 19 ++++++++++-----
 .../changelog/{20140816-2.0.2.adoc => 2.0.2.adoc}  | 21 +++++++++++------
 .../changelog/{20140712-2.0.adoc => 2.0.adoc}      | 19 ++++++++++-----
 .../changelog/{20141019-2.1.adoc => 2.1.adoc}      | 19 ++++++++++-----
 .../{20171118-2.10.0.adoc => 2.10.0.adoc}          | 21 +++++++++++------
 .../{20180311-2.11.0.adoc => 2.11.0.adoc}          | 21 +++++++++++------
 .../{20180722-2.11.1.adoc => 2.11.1.adoc}          | 21 +++++++++++------
 .../{20190204-2.11.2.adoc => 2.11.2.adoc}          | 21 +++++++++++------
 .../{20190623-2.12.0.adoc => 2.12.0.adoc}          | 21 +++++++++++------
 .../{20190806-2.12.1.adoc => 2.12.1.adoc}          | 21 +++++++++++------
 .../{20191211-2.13.0.adoc => 2.13.0.adoc}          | 21 +++++++++++------
 .../{20200225-2.13.1.adoc => 2.13.1.adoc}          | 21 +++++++++++------
 .../{20200423-2.13.2.adoc => 2.13.2.adoc}          | 21 +++++++++++------
 .../{20200510-2.13.3.adoc => 2.13.3.adoc}          | 21 +++++++++++------
 .../{20201106-2.14.0.adoc => 2.14.0.adoc}          | 21 +++++++++++------
 .../{20210306-2.14.1.adoc => 2.14.1.adoc}          | 21 +++++++++++------
 .../{20211206-2.15.0.adoc => 2.15.0.adoc}          | 21 +++++++++++------
 .../{20211213-2.16.0.adoc => 2.16.0.adoc}          | 19 ++++++++++-----
 .../{20211217-2.17.0.adoc => 2.17.0.adoc}          | 21 +++++++++++------
 .../{20211227-2.17.1.adoc => 2.17.1.adoc}          | 21 +++++++++++------
 .../{20220223-2.17.2.adoc => 2.17.2.adoc}          | 21 +++++++++++------
 .../{20220628-2.18.0.adoc => 2.18.0.adoc}          | 21 +++++++++++------
 .../{20220909-2.19.0.adoc => 2.19.0.adoc}          | 21 +++++++++++------
 .../changelog/{20150222-2.2.adoc => 2.2.adoc}      | 19 ++++++++++-----
 .../changelog/{20150509-2.3.adoc => 2.3.adoc}      | 19 ++++++++++-----
 .../changelog/{20151008-2.4.1.adoc => 2.4.1.adoc}  | 19 ++++++++++-----
 .../changelog/{20150920-2.4.adoc => 2.4.adoc}      | 21 +++++++++++------
 .../changelog/{20151206-2.5.adoc => 2.5.adoc}      | 19 ++++++++++-----
 .../changelog/{20160605-2.6.1.adoc => 2.6.1.adoc}  | 21 +++++++++++------
 .../changelog/{20160705-2.6.2.adoc => 2.6.2.adoc}  | 21 +++++++++++------
 .../changelog/{20160525-2.6.adoc => 2.6.adoc}      | 21 +++++++++++------
 .../changelog/{20161002-2.7.adoc => 2.7.adoc}      | 21 +++++++++++------
 .../changelog/{20170226-2.8.1.adoc => 2.8.1.adoc}  | 21 +++++++++++------
 .../changelog/{20170402-2.8.2.adoc => 2.8.2.adoc}  | 21 +++++++++++------
 .../changelog/{20170121-2.8.adoc => 2.8.adoc}      | 21 +++++++++++------
 .../changelog/{20170826-2.9.0.adoc => 2.9.0.adoc}  | 21 +++++++++++------
 .../changelog/{20170917-2.9.1.adoc => 2.9.1.adoc}  | 21 +++++++++++------
 51 files changed, 703 insertions(+), 348 deletions(-)

diff --git a/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/changelog/exporter/AsciiDocExporter.java b/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/changelog/exporter/AsciiDocExporter.java
index 862642bcf9..aefc4b2b0d 100644
--- a/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/changelog/exporter/AsciiDocExporter.java
+++ b/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/changelog/exporter/AsciiDocExporter.java
@@ -49,13 +49,20 @@ public final class AsciiDocExporter {
     });
 
     private static final String LICENSE_HEADER_ASCIIDOC = "////\n" +
-            "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.\n" +
-            "See the `NOTICE.txt` file distributed with this work for additional information regarding copyright ownership.\n" +
-            "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.\n" +
-            "You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0].\n" +
-            '\n' +
-            "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.\n" +
-            "See the License for the specific language governing permissions and limitations under the License.\n" +
+            "    Licensed to the Apache Software Foundation (ASF) under one or more\n" +
+            "    contributor license agreements.  See the NOTICE file distributed with\n" +
+            "    this work for additional information regarding copyright ownership.\n" +
+            "    The ASF licenses this file to You under the Apache License, Version 2.0\n" +
+            "    (the \"License\"); you may not use this file except in compliance with\n" +
+            "    the License.  You may obtain a copy of the License at\n" +
+            "\n" +
+            "         http://www.apache.org/licenses/LICENSE-2.0\n" +
+            "\n" +
+            "    Unless required by applicable law or agreed to in writing, software\n" +
+            "    distributed under the License is distributed on an \"AS IS\" BASIS,\n" +
+            "    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" +
+            "    See the License for the specific language governing permissions and\n" +
+            "    limitations under the License.\n" +
             "////\n";
 
     private static final String AUTO_GENERATION_WARNING_ASCIIDOC = "////\n" +
@@ -385,10 +392,8 @@ public final class AsciiDocExporter {
     }
 
     private static String changelogReleaseAsciiDocFilename(final ChangelogRelease changelogRelease) {
-        return String.format(
-                "%s-%s.adoc",
-                changelogRelease.date.replaceAll("-", ""),
-                changelogRelease.version);
+        // Using only the version (that is, avoiding the date) in the filename so that one can determine the link to the changelog of a particular release with only version information.
+        return String.format("%s.adoc", changelogRelease.version);
     }
 
 }
diff --git a/src/site/asciidoc/changelog/20120729-2.0-alpha1.adoc b/src/site/asciidoc/changelog/2.0-alpha1.adoc
similarity index 55%
rename from src/site/asciidoc/changelog/20120729-2.0-alpha1.adoc
rename to src/site/asciidoc/changelog/2.0-alpha1.adoc
index af0b936ddf..7241dd471e 100644
--- a/src/site/asciidoc/changelog/20120729-2.0-alpha1.adoc
+++ b/src/site/asciidoc/changelog/2.0-alpha1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20120824-2.0-alpha2.adoc b/src/site/asciidoc/changelog/2.0-alpha2.adoc
similarity index 57%
rename from src/site/asciidoc/changelog/20120824-2.0-alpha2.adoc
rename to src/site/asciidoc/changelog/2.0-alpha2.adoc
index 9fd8659fc0..a048257535 100644
--- a/src/site/asciidoc/changelog/20120824-2.0-alpha2.adoc
+++ b/src/site/asciidoc/changelog/2.0-alpha2.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20120918-2.0-beta1.adoc b/src/site/asciidoc/changelog/2.0-beta1.adoc
similarity index 78%
rename from src/site/asciidoc/changelog/20120918-2.0-beta1.adoc
rename to src/site/asciidoc/changelog/2.0-beta1.adoc
index 3bee88a6c6..7ab208038d 100644
--- a/src/site/asciidoc/changelog/20120918-2.0-beta1.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20121007-2.0-beta2.adoc b/src/site/asciidoc/changelog/2.0-beta2.adoc
similarity index 80%
rename from src/site/asciidoc/changelog/20121007-2.0-beta2.adoc
rename to src/site/asciidoc/changelog/2.0-beta2.adoc
index 9b666bc48e..280a384e8a 100644
--- a/src/site/asciidoc/changelog/20121007-2.0-beta2.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta2.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20121111-2.0-beta3.adoc b/src/site/asciidoc/changelog/2.0-beta3.adoc
similarity index 80%
rename from src/site/asciidoc/changelog/20121111-2.0-beta3.adoc
rename to src/site/asciidoc/changelog/2.0-beta3.adoc
index 7081e27d68..c5f686e619 100644
--- a/src/site/asciidoc/changelog/20121111-2.0-beta3.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta3.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20130128-2.0-beta4.adoc b/src/site/asciidoc/changelog/2.0-beta4.adoc
similarity index 87%
rename from src/site/asciidoc/changelog/20130128-2.0-beta4.adoc
rename to src/site/asciidoc/changelog/2.0-beta4.adoc
index 0e26552a64..7b8814218c 100644
--- a/src/site/asciidoc/changelog/20130128-2.0-beta4.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta4.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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].
+    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
 
-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.
+         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/src/site/asciidoc/changelog/20130420-2.0-beta5.adoc b/src/site/asciidoc/changelog/2.0-beta5.adoc
similarity index 87%
rename from src/site/asciidoc/changelog/20130420-2.0-beta5.adoc
rename to src/site/asciidoc/changelog/2.0-beta5.adoc
index 23f442b384..84235d4fe9 100644
--- a/src/site/asciidoc/changelog/20130420-2.0-beta5.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta5.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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].
+    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
 
-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.
+         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/src/site/asciidoc/changelog/20130505-2.0-beta6.adoc b/src/site/asciidoc/changelog/2.0-beta6.adoc
similarity index 79%
rename from src/site/asciidoc/changelog/20130505-2.0-beta6.adoc
rename to src/site/asciidoc/changelog/2.0-beta6.adoc
index c3452e4fc4..661a3eba49 100644
--- a/src/site/asciidoc/changelog/20130505-2.0-beta6.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta6.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20130601-2.0-beta7.adoc b/src/site/asciidoc/changelog/2.0-beta7.adoc
similarity index 82%
rename from src/site/asciidoc/changelog/20130601-2.0-beta7.adoc
rename to src/site/asciidoc/changelog/2.0-beta7.adoc
index f8c9995ee6..e6576aec05 100644
--- a/src/site/asciidoc/changelog/20130601-2.0-beta7.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta7.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20130710-2.0-beta8.adoc b/src/site/asciidoc/changelog/2.0-beta8.adoc
similarity index 85%
rename from src/site/asciidoc/changelog/20130710-2.0-beta8.adoc
rename to src/site/asciidoc/changelog/2.0-beta8.adoc
index 3e7c2f2d3c..311f585d69 100644
--- a/src/site/asciidoc/changelog/20130710-2.0-beta8.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta8.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20130914-2.0-beta9.adoc b/src/site/asciidoc/changelog/2.0-beta9.adoc
similarity index 93%
rename from src/site/asciidoc/changelog/20130914-2.0-beta9.adoc
rename to src/site/asciidoc/changelog/2.0-beta9.adoc
index 34cb25ed5f..7a34c9d362 100644
--- a/src/site/asciidoc/changelog/20130914-2.0-beta9.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta9.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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].
+    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
 
-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.
+         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/src/site/asciidoc/changelog/20140216-2.0-rc1.adoc b/src/site/asciidoc/changelog/2.0-rc1.adoc
similarity index 93%
rename from src/site/asciidoc/changelog/20140216-2.0-rc1.adoc
rename to src/site/asciidoc/changelog/2.0-rc1.adoc
index 7c3a2abac4..b86861f0d6 100644
--- a/src/site/asciidoc/changelog/20140216-2.0-rc1.adoc
+++ b/src/site/asciidoc/changelog/2.0-rc1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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].
+    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
 
-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.
+         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/src/site/asciidoc/changelog/20140621-2.0-rc2.adoc b/src/site/asciidoc/changelog/2.0-rc2.adoc
similarity index 93%
rename from src/site/asciidoc/changelog/20140621-2.0-rc2.adoc
rename to src/site/asciidoc/changelog/2.0-rc2.adoc
index 4150f6d727..b3d097fd02 100644
--- a/src/site/asciidoc/changelog/20140621-2.0-rc2.adoc
+++ b/src/site/asciidoc/changelog/2.0-rc2.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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].
+    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
 
-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.
+         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/src/site/asciidoc/changelog/20140729-2.0.1.adoc b/src/site/asciidoc/changelog/2.0.1.adoc
similarity index 85%
rename from src/site/asciidoc/changelog/20140729-2.0.1.adoc
rename to src/site/asciidoc/changelog/2.0.1.adoc
index dff2b02d78..301f96c9ca 100644
--- a/src/site/asciidoc/changelog/20140729-2.0.1.adoc
+++ b/src/site/asciidoc/changelog/2.0.1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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].
+    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
 
-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.
+         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/src/site/asciidoc/changelog/20140816-2.0.2.adoc b/src/site/asciidoc/changelog/2.0.2.adoc
similarity index 81%
rename from src/site/asciidoc/changelog/20140816-2.0.2.adoc
rename to src/site/asciidoc/changelog/2.0.2.adoc
index ded6c77199..20a2b10caf 100644
--- a/src/site/asciidoc/changelog/20140816-2.0.2.adoc
+++ b/src/site/asciidoc/changelog/2.0.2.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20140712-2.0.adoc b/src/site/asciidoc/changelog/2.0.adoc
similarity index 85%
rename from src/site/asciidoc/changelog/20140712-2.0.adoc
rename to src/site/asciidoc/changelog/2.0.adoc
index 0b90e2b70e..31980d0384 100644
--- a/src/site/asciidoc/changelog/20140712-2.0.adoc
+++ b/src/site/asciidoc/changelog/2.0.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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].
+    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
 
-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.
+         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/src/site/asciidoc/changelog/20141019-2.1.adoc b/src/site/asciidoc/changelog/2.1.adoc
similarity index 92%
rename from src/site/asciidoc/changelog/20141019-2.1.adoc
rename to src/site/asciidoc/changelog/2.1.adoc
index 4ed2f597d7..81348e0891 100644
--- a/src/site/asciidoc/changelog/20141019-2.1.adoc
+++ b/src/site/asciidoc/changelog/2.1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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].
+    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
 
-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.
+         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/src/site/asciidoc/changelog/20171118-2.10.0.adoc b/src/site/asciidoc/changelog/2.10.0.adoc
similarity index 93%
rename from src/site/asciidoc/changelog/20171118-2.10.0.adoc
rename to src/site/asciidoc/changelog/2.10.0.adoc
index d3113f74ce..1f8ca8fd40 100644
--- a/src/site/asciidoc/changelog/20171118-2.10.0.adoc
+++ b/src/site/asciidoc/changelog/2.10.0.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20180311-2.11.0.adoc b/src/site/asciidoc/changelog/2.11.0.adoc
similarity index 95%
rename from src/site/asciidoc/changelog/20180311-2.11.0.adoc
rename to src/site/asciidoc/changelog/2.11.0.adoc
index 5425f5f473..cecd6349e0 100644
--- a/src/site/asciidoc/changelog/20180311-2.11.0.adoc
+++ b/src/site/asciidoc/changelog/2.11.0.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20180722-2.11.1.adoc b/src/site/asciidoc/changelog/2.11.1.adoc
similarity index 93%
rename from src/site/asciidoc/changelog/20180722-2.11.1.adoc
rename to src/site/asciidoc/changelog/2.11.1.adoc
index c70e937a50..583efe24b5 100644
--- a/src/site/asciidoc/changelog/20180722-2.11.1.adoc
+++ b/src/site/asciidoc/changelog/2.11.1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20190204-2.11.2.adoc b/src/site/asciidoc/changelog/2.11.2.adoc
similarity index 94%
rename from src/site/asciidoc/changelog/20190204-2.11.2.adoc
rename to src/site/asciidoc/changelog/2.11.2.adoc
index 7339faba31..43b4446dcf 100644
--- a/src/site/asciidoc/changelog/20190204-2.11.2.adoc
+++ b/src/site/asciidoc/changelog/2.11.2.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20190623-2.12.0.adoc b/src/site/asciidoc/changelog/2.12.0.adoc
similarity index 91%
rename from src/site/asciidoc/changelog/20190623-2.12.0.adoc
rename to src/site/asciidoc/changelog/2.12.0.adoc
index c33b4ca938..649426bac9 100644
--- a/src/site/asciidoc/changelog/20190623-2.12.0.adoc
+++ b/src/site/asciidoc/changelog/2.12.0.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20190806-2.12.1.adoc b/src/site/asciidoc/changelog/2.12.1.adoc
similarity index 84%
rename from src/site/asciidoc/changelog/20190806-2.12.1.adoc
rename to src/site/asciidoc/changelog/2.12.1.adoc
index c08e5215fa..bd185a5ab5 100644
--- a/src/site/asciidoc/changelog/20190806-2.12.1.adoc
+++ b/src/site/asciidoc/changelog/2.12.1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20191211-2.13.0.adoc b/src/site/asciidoc/changelog/2.13.0.adoc
similarity index 88%
rename from src/site/asciidoc/changelog/20191211-2.13.0.adoc
rename to src/site/asciidoc/changelog/2.13.0.adoc
index 5956c69027..e1619a7a9c 100644
--- a/src/site/asciidoc/changelog/20191211-2.13.0.adoc
+++ b/src/site/asciidoc/changelog/2.13.0.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20200225-2.13.1.adoc b/src/site/asciidoc/changelog/2.13.1.adoc
similarity index 90%
rename from src/site/asciidoc/changelog/20200225-2.13.1.adoc
rename to src/site/asciidoc/changelog/2.13.1.adoc
index 67de0ac44e..3b0b997290 100644
--- a/src/site/asciidoc/changelog/20200225-2.13.1.adoc
+++ b/src/site/asciidoc/changelog/2.13.1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20200423-2.13.2.adoc b/src/site/asciidoc/changelog/2.13.2.adoc
similarity index 87%
rename from src/site/asciidoc/changelog/20200423-2.13.2.adoc
rename to src/site/asciidoc/changelog/2.13.2.adoc
index 42bd9b95d9..db5f703509 100644
--- a/src/site/asciidoc/changelog/20200423-2.13.2.adoc
+++ b/src/site/asciidoc/changelog/2.13.2.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20200510-2.13.3.adoc b/src/site/asciidoc/changelog/2.13.3.adoc
similarity index 71%
rename from src/site/asciidoc/changelog/20200510-2.13.3.adoc
rename to src/site/asciidoc/changelog/2.13.3.adoc
index d8ddce3133..a4c8fe1139 100644
--- a/src/site/asciidoc/changelog/20200510-2.13.3.adoc
+++ b/src/site/asciidoc/changelog/2.13.3.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20201106-2.14.0.adoc b/src/site/asciidoc/changelog/2.14.0.adoc
similarity index 90%
rename from src/site/asciidoc/changelog/20201106-2.14.0.adoc
rename to src/site/asciidoc/changelog/2.14.0.adoc
index 38de029483..7515fb3315 100644
--- a/src/site/asciidoc/changelog/20201106-2.14.0.adoc
+++ b/src/site/asciidoc/changelog/2.14.0.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20210306-2.14.1.adoc b/src/site/asciidoc/changelog/2.14.1.adoc
similarity index 92%
rename from src/site/asciidoc/changelog/20210306-2.14.1.adoc
rename to src/site/asciidoc/changelog/2.14.1.adoc
index 16a5dc3936..32414b6f22 100644
--- a/src/site/asciidoc/changelog/20210306-2.14.1.adoc
+++ b/src/site/asciidoc/changelog/2.14.1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20211206-2.15.0.adoc b/src/site/asciidoc/changelog/2.15.0.adoc
similarity index 96%
rename from src/site/asciidoc/changelog/20211206-2.15.0.adoc
rename to src/site/asciidoc/changelog/2.15.0.adoc
index 7c88ee378d..a6bc1b6c80 100644
--- a/src/site/asciidoc/changelog/20211206-2.15.0.adoc
+++ b/src/site/asciidoc/changelog/2.15.0.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20211213-2.16.0.adoc b/src/site/asciidoc/changelog/2.16.0.adoc
similarity index 79%
rename from src/site/asciidoc/changelog/20211213-2.16.0.adoc
rename to src/site/asciidoc/changelog/2.16.0.adoc
index 64baf24dd2..1d32b6c923 100644
--- a/src/site/asciidoc/changelog/20211213-2.16.0.adoc
+++ b/src/site/asciidoc/changelog/2.16.0.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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].
+    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
 
-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.
+         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/src/site/asciidoc/changelog/20211217-2.17.0.adoc b/src/site/asciidoc/changelog/2.17.0.adoc
similarity index 79%
rename from src/site/asciidoc/changelog/20211217-2.17.0.adoc
rename to src/site/asciidoc/changelog/2.17.0.adoc
index e3bef219e3..8fd13e10fb 100644
--- a/src/site/asciidoc/changelog/20211217-2.17.0.adoc
+++ b/src/site/asciidoc/changelog/2.17.0.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20211227-2.17.1.adoc b/src/site/asciidoc/changelog/2.17.1.adoc
similarity index 81%
rename from src/site/asciidoc/changelog/20211227-2.17.1.adoc
rename to src/site/asciidoc/changelog/2.17.1.adoc
index 016620b7ec..2da4a30e2e 100644
--- a/src/site/asciidoc/changelog/20211227-2.17.1.adoc
+++ b/src/site/asciidoc/changelog/2.17.1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20220223-2.17.2.adoc b/src/site/asciidoc/changelog/2.17.2.adoc
similarity index 94%
rename from src/site/asciidoc/changelog/20220223-2.17.2.adoc
rename to src/site/asciidoc/changelog/2.17.2.adoc
index 7a890f19a7..9d5532d7de 100644
--- a/src/site/asciidoc/changelog/20220223-2.17.2.adoc
+++ b/src/site/asciidoc/changelog/2.17.2.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20220628-2.18.0.adoc b/src/site/asciidoc/changelog/2.18.0.adoc
similarity index 91%
rename from src/site/asciidoc/changelog/20220628-2.18.0.adoc
rename to src/site/asciidoc/changelog/2.18.0.adoc
index c404154b89..886d33157d 100644
--- a/src/site/asciidoc/changelog/20220628-2.18.0.adoc
+++ b/src/site/asciidoc/changelog/2.18.0.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20220909-2.19.0.adoc b/src/site/asciidoc/changelog/2.19.0.adoc
similarity index 86%
rename from src/site/asciidoc/changelog/20220909-2.19.0.adoc
rename to src/site/asciidoc/changelog/2.19.0.adoc
index b915e0c1fc..86f3fda77d 100644
--- a/src/site/asciidoc/changelog/20220909-2.19.0.adoc
+++ b/src/site/asciidoc/changelog/2.19.0.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20150222-2.2.adoc b/src/site/asciidoc/changelog/2.2.adoc
similarity index 88%
rename from src/site/asciidoc/changelog/20150222-2.2.adoc
rename to src/site/asciidoc/changelog/2.2.adoc
index ae67124322..0318d903be 100644
--- a/src/site/asciidoc/changelog/20150222-2.2.adoc
+++ b/src/site/asciidoc/changelog/2.2.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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].
+    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
 
-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.
+         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/src/site/asciidoc/changelog/20150509-2.3.adoc b/src/site/asciidoc/changelog/2.3.adoc
similarity index 87%
rename from src/site/asciidoc/changelog/20150509-2.3.adoc
rename to src/site/asciidoc/changelog/2.3.adoc
index 04799fd254..5f19a7a327 100644
--- a/src/site/asciidoc/changelog/20150509-2.3.adoc
+++ b/src/site/asciidoc/changelog/2.3.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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].
+    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
 
-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.
+         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/src/site/asciidoc/changelog/20151008-2.4.1.adoc b/src/site/asciidoc/changelog/2.4.1.adoc
similarity index 86%
rename from src/site/asciidoc/changelog/20151008-2.4.1.adoc
rename to src/site/asciidoc/changelog/2.4.1.adoc
index b301ad6d82..05770e0428 100644
--- a/src/site/asciidoc/changelog/20151008-2.4.1.adoc
+++ b/src/site/asciidoc/changelog/2.4.1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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].
+    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
 
-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.
+         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/src/site/asciidoc/changelog/20150920-2.4.adoc b/src/site/asciidoc/changelog/2.4.adoc
similarity index 94%
rename from src/site/asciidoc/changelog/20150920-2.4.adoc
rename to src/site/asciidoc/changelog/2.4.adoc
index 4f08c04b22..7c7af98999 100644
--- a/src/site/asciidoc/changelog/20150920-2.4.adoc
+++ b/src/site/asciidoc/changelog/2.4.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20151206-2.5.adoc b/src/site/asciidoc/changelog/2.5.adoc
similarity index 91%
rename from src/site/asciidoc/changelog/20151206-2.5.adoc
rename to src/site/asciidoc/changelog/2.5.adoc
index 91610c5eeb..c726321090 100644
--- a/src/site/asciidoc/changelog/20151206-2.5.adoc
+++ b/src/site/asciidoc/changelog/2.5.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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].
+    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
 
-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.
+         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/src/site/asciidoc/changelog/20160605-2.6.1.adoc b/src/site/asciidoc/changelog/2.6.1.adoc
similarity index 84%
rename from src/site/asciidoc/changelog/20160605-2.6.1.adoc
rename to src/site/asciidoc/changelog/2.6.1.adoc
index 6d4b64eec1..c74b0ab37b 100644
--- a/src/site/asciidoc/changelog/20160605-2.6.1.adoc
+++ b/src/site/asciidoc/changelog/2.6.1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20160705-2.6.2.adoc b/src/site/asciidoc/changelog/2.6.2.adoc
similarity index 86%
rename from src/site/asciidoc/changelog/20160705-2.6.2.adoc
rename to src/site/asciidoc/changelog/2.6.2.adoc
index 28ac98efac..0c937fec8d 100644
--- a/src/site/asciidoc/changelog/20160705-2.6.2.adoc
+++ b/src/site/asciidoc/changelog/2.6.2.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20160525-2.6.adoc b/src/site/asciidoc/changelog/2.6.adoc
similarity index 96%
rename from src/site/asciidoc/changelog/20160525-2.6.adoc
rename to src/site/asciidoc/changelog/2.6.adoc
index e4a99452e7..0b000d85d6 100644
--- a/src/site/asciidoc/changelog/20160525-2.6.adoc
+++ b/src/site/asciidoc/changelog/2.6.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20161002-2.7.adoc b/src/site/asciidoc/changelog/2.7.adoc
similarity index 96%
rename from src/site/asciidoc/changelog/20161002-2.7.adoc
rename to src/site/asciidoc/changelog/2.7.adoc
index 669848fe92..5d53821f2b 100644
--- a/src/site/asciidoc/changelog/20161002-2.7.adoc
+++ b/src/site/asciidoc/changelog/2.7.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20170226-2.8.1.adoc b/src/site/asciidoc/changelog/2.8.1.adoc
similarity index 84%
rename from src/site/asciidoc/changelog/20170226-2.8.1.adoc
rename to src/site/asciidoc/changelog/2.8.1.adoc
index 1989da7aa2..9b0301e2a7 100644
--- a/src/site/asciidoc/changelog/20170226-2.8.1.adoc
+++ b/src/site/asciidoc/changelog/2.8.1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20170402-2.8.2.adoc b/src/site/asciidoc/changelog/2.8.2.adoc
similarity index 85%
rename from src/site/asciidoc/changelog/20170402-2.8.2.adoc
rename to src/site/asciidoc/changelog/2.8.2.adoc
index 0fbb84ebfc..6e5831fe54 100644
--- a/src/site/asciidoc/changelog/20170402-2.8.2.adoc
+++ b/src/site/asciidoc/changelog/2.8.2.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20170121-2.8.adoc b/src/site/asciidoc/changelog/2.8.adoc
similarity index 96%
rename from src/site/asciidoc/changelog/20170121-2.8.adoc
rename to src/site/asciidoc/changelog/2.8.adoc
index 9992907cb5..ea4efe9d45 100644
--- a/src/site/asciidoc/changelog/20170121-2.8.adoc
+++ b/src/site/asciidoc/changelog/2.8.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20170826-2.9.0.adoc b/src/site/asciidoc/changelog/2.9.0.adoc
similarity index 95%
rename from src/site/asciidoc/changelog/20170826-2.9.0.adoc
rename to src/site/asciidoc/changelog/2.9.0.adoc
index 56e6d43006..64e349378f 100644
--- a/src/site/asciidoc/changelog/20170826-2.9.0.adoc
+++ b/src/site/asciidoc/changelog/2.9.0.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////
diff --git a/src/site/asciidoc/changelog/20170917-2.9.1.adoc b/src/site/asciidoc/changelog/2.9.1.adoc
similarity index 87%
rename from src/site/asciidoc/changelog/20170917-2.9.1.adoc
rename to src/site/asciidoc/changelog/2.9.1.adoc
index ca1801c0b7..2b5824869f 100644
--- a/src/site/asciidoc/changelog/20170917-2.9.1.adoc
+++ b/src/site/asciidoc/changelog/2.9.1.adoc
@@ -1,11 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the `NOTICE.txt` 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.
+    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.
 ////
 
 ////