This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 885fda427d05e47a7705083abb353481c2b9018d Author: Volkan Yazıcı <[email protected]> AuthorDate: Fri Mar 17 18:40:18 2023 +0100 Adapt the changelog to `log4j-tools` 0.3.0 release --- CHANGELOG.adoc | 55 +++------------------- pom.xml | 13 ++++- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ...ngelog-entries.adoc.ftl => .changelog.adoc.ftl} | 0 src/changelog/.index.adoc.ftl | 2 +- .../.release-notes.adoc.ftl} | 2 +- .../.release-notes.adoc.ftl} | 2 +- .../.release-notes.adoc.ftl} | 2 +- .../.release-notes.adoc.ftl} | 2 +- src/changelog/2.0-beta3/.changelog.adoc.ftl | 20 -------- .../.release-notes.adoc.ftl} | 2 +- src/changelog/2.0-beta4/.changelog.adoc.ftl | 20 -------- .../.release-notes.adoc.ftl} | 2 +- src/changelog/2.0-beta5/.changelog.adoc.ftl | 20 -------- .../.release-notes.adoc.ftl} | 2 +- src/changelog/2.0-beta6/.changelog.adoc.ftl | 20 -------- .../.release-notes.adoc.ftl} | 2 +- src/changelog/2.0-beta7/.changelog.adoc.ftl | 20 -------- .../.release-notes.adoc.ftl} | 2 +- src/changelog/2.0-beta8/.changelog.adoc.ftl | 20 -------- .../.release-notes.adoc.ftl} | 2 +- src/changelog/2.0-beta9/.changelog.adoc.ftl | 20 -------- .../.release-notes.adoc.ftl} | 2 +- src/changelog/2.0-rc1/.changelog.adoc.ftl | 20 -------- .../.release-notes.adoc.ftl} | 2 +- src/changelog/2.0-rc2/.changelog.adoc.ftl | 20 -------- .../.release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- ....changelog.adoc.ftl => .release-notes.adoc.ftl} | 2 +- 65 files changed, 71 insertions(+), 283 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 588838909b..de064181f5 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -15,63 +15,20 @@ limitations under the License. //// -:log4j-changelog-ref: https://github.com/apache/logging-log4j-tools/tree/master/log4j-changelog[log4j-changelog] +:log4j-changelog-uri: https://github.com/apache/logging-log4j-tools/tree/master/log4j-changelog +:log4j-changelog-ref: {log4j-changelog-uri}[log4j-changelog] == Where are changelogs stored? Changelogs are stored in xref:src/changelog[`src/changelog`] directory. -{log4j-changelog-ref} is used to generate AsciiDoc-formatted changelog files during Maven `pre-site` phase and export them to xref:target/generated-sources/site/asciidoc/changelog[`target/generated-sources/site/asciidoc/changelog`] directory. +{log4j-changelog-ref} is used to generate AsciiDoc-formatted release notes during Maven `pre-site` phase and export them to xref:target/generated-sources/site/asciidoc/changelog[`target/generated-sources/site/asciidoc/changelog`] directory. These exported AsciiDoc files are not committed, since they are only relevant for the website, and they cause merge-conflicts between feature branches. `./mvnw site` command can be used to manually generate these files. See {log4j-changelog-ref} project for further details; how to use this changelog system, what steps are needed while making a new release, etc. -== I am about to deploy a new release. What shall I do? +== How can I create a changelog entry? -Just before a release, three things need to happen in the changelog sources: - -. *changelog entry files needs to be moved* from the _upcoming_ release changelog directory `src/changelog/.<releaseVersionMajor>.x.x` to the _new_ release changelog directory `src/changelog/<releaseVersion>` -. *`.changelog.adoc.ftl` needs to be copied* from the _upcoming_ release changelog directory to the _new_ release changelog directory, unless it already exists in the target -. *`.release.xml` needs to be created* in the _new_ release changelog directory - -Due to the nature of release candidates, above steps might need to be repeated multiple times. - -[TIP] -==== -Log4j _releases_ and _release candidates_ all get deployed to the same https://repository.apache.org/#stagingRepositories[_staging repository_]. -Their `pom.xml` files all contain the same release version, e.g., `2.19.0`. -There are no `-rc1`, `-rc2`, etc. suffixes in the version of a release candidate. -Once a release candidate voting reaches to a consensus for release, associated artifacts simply get promoted from the _staging_ to the _public_ repository. -Hence, there are no differences between releases and release candidates. -==== - -How to carry out aforementioned changes are explained below in steps: - -. Populate the `src/changelog/<releaseVersion>` directory (e.g., `src/changelog/2.19.0`) from the upcoming release changelog directory (e.g., `src/changelog/.2.x.x`): -+ -[source,bash] ----- -./mvnw -N -P changelog-releaser ----- -+ -[IMPORTANT] -==== -`changelog-releaser` Maven profile obtains the new release version from `Log4jReleaseVersion` property. -If needed, you can override it to point to another release version: - -[source,bash] ----- -./mvnw -N -P changelog-releaser -DLog4jReleaseVersion=6.6.6 ----- -==== -. Verify that all changelog entry files are moved from `src/changelog/.<releaseVersionMajor>.x.x` directory (e.g., `src/changelog/.2.x.x`) -. Verify that `src/changelog/<releaseVersion>` directory (e.g., `src/changelog/2.19.0`) is created, and it contains `.changelog.adoc.ftl`, `.release.xml`, and changelog entry files -+ -[IMPORTANT] -==== -If `src/changelog/<releaseVersion>` directory (e.g., `src/changelog/2.19.0`) already exists with certain content, `changelog-releaser` profile will only move new changelog entry files and override `.release.xml`; `.changelog.adoc.ftl` will not be touched, if it already exists. -This allows one to run `changelog-releaser` profile multiple times, e.g., to incorporate changes added to a release candidate. -==== -. Edit the populated `.changelog.adoc.ftl` -. `git add` the changes in `src/changelog` and commit them +For the impatient, simply copy one of the existing `<issueId>_<summary>.xml` files in xref:src/changelog/.2.x.x[`src/changelog/.2.x.x`] directory and adapt to your needs. +See {log4j-changelog-uri}/README.adoc#changelog-entry-file[the official documentation] for details. diff --git a/pom.xml b/pom.xml index 634f60fade..312abffe64 100644 --- a/pom.xml +++ b/pom.xml @@ -352,7 +352,7 @@ <docker-maven-plugin.version>0.42.0</docker-maven-plugin.version> <exam-maven-plugin.version>4.13.5</exam-maven-plugin.version> <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version> - <log4j-tools.version>0.2.0</log4j-tools.version> + <log4j-tools.version>0.3.0</log4j-tools.version> <maven-artifact-plugin.version>3.4.0</maven-artifact-plugin.version> <maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version> <maven-checkstyle-plugin.version>3.2.0</maven-checkstyle-plugin.version> @@ -1751,6 +1751,17 @@ <inherited>false</inherited> <configuration> <outputDirectory>${project.build.directory}/generated-sources/site/asciidoc/release-notes</outputDirectory> + <indexTemplates> + <template> + <source>.index.adoc.ftl</source> + </template> + </indexTemplates> + <changelogTemplates> + <template> + <source>.release-notes.adoc.ftl</source> + <target>%v.adoc</target> + </template> + </changelogTemplates> </configuration> <executions> <execution> diff --git a/src/changelog/.2.x.x/.changelog.adoc.ftl b/src/changelog/.2.x.x/.release-notes.adoc.ftl similarity index 95% rename from src/changelog/.2.x.x/.changelog.adoc.ftl rename to src/changelog/.2.x.x/.release-notes.adoc.ftl index 55dd1ed8bd..1b4c82529c 100644 --- a/src/changelog/.2.x.x/.changelog.adoc.ftl +++ b/src/changelog/.2.x.x/.release-notes.adoc.ftl @@ -19,4 +19,4 @@ Changes staged for the next 2.x.x version that is yet to be released. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/.changelog-entries.adoc.ftl b/src/changelog/.changelog.adoc.ftl similarity index 100% rename from src/changelog/.changelog-entries.adoc.ftl rename to src/changelog/.changelog.adoc.ftl diff --git a/src/changelog/.index.adoc.ftl b/src/changelog/.index.adoc.ftl index f6819e0a58..45e788373d 100644 --- a/src/changelog/.index.adoc.ftl +++ b/src/changelog/.index.adoc.ftl @@ -18,5 +18,5 @@ = Release Notes <#list releases as release> -* xref:${release.changelogFileName}[${release.version}]<#if release.date?has_content> (${release.date})</#if> +* xref:${release.version}.adoc[${release.version}]<#if release.date?has_content> (${release.date})</#if> </#list> diff --git a/src/changelog/2.0-beta1/.changelog.adoc.ftl b/src/changelog/2.0-alpha1/.release-notes.adoc.ftl similarity index 95% copy from src/changelog/2.0-beta1/.changelog.adoc.ftl copy to src/changelog/2.0-alpha1/.release-notes.adoc.ftl index d7dfdf788f..964912504a 100644 --- a/src/changelog/2.0-beta1/.changelog.adoc.ftl +++ b/src/changelog/2.0-alpha1/.release-notes.adoc.ftl @@ -17,4 +17,4 @@ = ${release.version}<#if release.date?has_content> (${release.date})</#if> -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0-alpha1/.changelog.adoc.ftl b/src/changelog/2.0-alpha2/.release-notes.adoc.ftl similarity index 95% rename from src/changelog/2.0-alpha1/.changelog.adoc.ftl rename to src/changelog/2.0-alpha2/.release-notes.adoc.ftl index d7dfdf788f..964912504a 100644 --- a/src/changelog/2.0-alpha1/.changelog.adoc.ftl +++ b/src/changelog/2.0-alpha2/.release-notes.adoc.ftl @@ -17,4 +17,4 @@ = ${release.version}<#if release.date?has_content> (${release.date})</#if> -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0-beta2/.changelog.adoc.ftl b/src/changelog/2.0-beta1/.release-notes.adoc.ftl similarity index 95% rename from src/changelog/2.0-beta2/.changelog.adoc.ftl rename to src/changelog/2.0-beta1/.release-notes.adoc.ftl index d7dfdf788f..964912504a 100644 --- a/src/changelog/2.0-beta2/.changelog.adoc.ftl +++ b/src/changelog/2.0-beta1/.release-notes.adoc.ftl @@ -17,4 +17,4 @@ = ${release.version}<#if release.date?has_content> (${release.date})</#if> -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0-alpha2/.changelog.adoc.ftl b/src/changelog/2.0-beta2/.release-notes.adoc.ftl similarity index 95% rename from src/changelog/2.0-alpha2/.changelog.adoc.ftl rename to src/changelog/2.0-beta2/.release-notes.adoc.ftl index d7dfdf788f..964912504a 100644 --- a/src/changelog/2.0-alpha2/.changelog.adoc.ftl +++ b/src/changelog/2.0-beta2/.release-notes.adoc.ftl @@ -17,4 +17,4 @@ = ${release.version}<#if release.date?has_content> (${release.date})</#if> -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0-beta3/.changelog.adoc.ftl b/src/changelog/2.0-beta3/.changelog.adoc.ftl deleted file mode 100644 index d7dfdf788f..0000000000 --- a/src/changelog/2.0-beta3/.changelog.adoc.ftl +++ /dev/null @@ -1,20 +0,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 - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - 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. -//// - -= ${release.version}<#if release.date?has_content> (${release.date})</#if> - -<#include "../.changelog-entries.adoc.ftl"> diff --git a/src/changelog/2.0-beta1/.changelog.adoc.ftl b/src/changelog/2.0-beta3/.release-notes.adoc.ftl similarity index 95% copy from src/changelog/2.0-beta1/.changelog.adoc.ftl copy to src/changelog/2.0-beta3/.release-notes.adoc.ftl index d7dfdf788f..964912504a 100644 --- a/src/changelog/2.0-beta1/.changelog.adoc.ftl +++ b/src/changelog/2.0-beta3/.release-notes.adoc.ftl @@ -17,4 +17,4 @@ = ${release.version}<#if release.date?has_content> (${release.date})</#if> -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0-beta4/.changelog.adoc.ftl b/src/changelog/2.0-beta4/.changelog.adoc.ftl deleted file mode 100644 index d7dfdf788f..0000000000 --- a/src/changelog/2.0-beta4/.changelog.adoc.ftl +++ /dev/null @@ -1,20 +0,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 - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - 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. -//// - -= ${release.version}<#if release.date?has_content> (${release.date})</#if> - -<#include "../.changelog-entries.adoc.ftl"> diff --git a/src/changelog/2.0-beta1/.changelog.adoc.ftl b/src/changelog/2.0-beta4/.release-notes.adoc.ftl similarity index 95% copy from src/changelog/2.0-beta1/.changelog.adoc.ftl copy to src/changelog/2.0-beta4/.release-notes.adoc.ftl index d7dfdf788f..964912504a 100644 --- a/src/changelog/2.0-beta1/.changelog.adoc.ftl +++ b/src/changelog/2.0-beta4/.release-notes.adoc.ftl @@ -17,4 +17,4 @@ = ${release.version}<#if release.date?has_content> (${release.date})</#if> -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0-beta5/.changelog.adoc.ftl b/src/changelog/2.0-beta5/.changelog.adoc.ftl deleted file mode 100644 index d7dfdf788f..0000000000 --- a/src/changelog/2.0-beta5/.changelog.adoc.ftl +++ /dev/null @@ -1,20 +0,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 - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - 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. -//// - -= ${release.version}<#if release.date?has_content> (${release.date})</#if> - -<#include "../.changelog-entries.adoc.ftl"> diff --git a/src/changelog/2.0-beta1/.changelog.adoc.ftl b/src/changelog/2.0-beta5/.release-notes.adoc.ftl similarity index 95% copy from src/changelog/2.0-beta1/.changelog.adoc.ftl copy to src/changelog/2.0-beta5/.release-notes.adoc.ftl index d7dfdf788f..964912504a 100644 --- a/src/changelog/2.0-beta1/.changelog.adoc.ftl +++ b/src/changelog/2.0-beta5/.release-notes.adoc.ftl @@ -17,4 +17,4 @@ = ${release.version}<#if release.date?has_content> (${release.date})</#if> -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0-beta6/.changelog.adoc.ftl b/src/changelog/2.0-beta6/.changelog.adoc.ftl deleted file mode 100644 index d7dfdf788f..0000000000 --- a/src/changelog/2.0-beta6/.changelog.adoc.ftl +++ /dev/null @@ -1,20 +0,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 - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - 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. -//// - -= ${release.version}<#if release.date?has_content> (${release.date})</#if> - -<#include "../.changelog-entries.adoc.ftl"> diff --git a/src/changelog/2.0-beta1/.changelog.adoc.ftl b/src/changelog/2.0-beta6/.release-notes.adoc.ftl similarity index 95% copy from src/changelog/2.0-beta1/.changelog.adoc.ftl copy to src/changelog/2.0-beta6/.release-notes.adoc.ftl index d7dfdf788f..964912504a 100644 --- a/src/changelog/2.0-beta1/.changelog.adoc.ftl +++ b/src/changelog/2.0-beta6/.release-notes.adoc.ftl @@ -17,4 +17,4 @@ = ${release.version}<#if release.date?has_content> (${release.date})</#if> -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0-beta7/.changelog.adoc.ftl b/src/changelog/2.0-beta7/.changelog.adoc.ftl deleted file mode 100644 index d7dfdf788f..0000000000 --- a/src/changelog/2.0-beta7/.changelog.adoc.ftl +++ /dev/null @@ -1,20 +0,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 - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - 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. -//// - -= ${release.version}<#if release.date?has_content> (${release.date})</#if> - -<#include "../.changelog-entries.adoc.ftl"> diff --git a/src/changelog/2.0-beta1/.changelog.adoc.ftl b/src/changelog/2.0-beta7/.release-notes.adoc.ftl similarity index 95% copy from src/changelog/2.0-beta1/.changelog.adoc.ftl copy to src/changelog/2.0-beta7/.release-notes.adoc.ftl index d7dfdf788f..964912504a 100644 --- a/src/changelog/2.0-beta1/.changelog.adoc.ftl +++ b/src/changelog/2.0-beta7/.release-notes.adoc.ftl @@ -17,4 +17,4 @@ = ${release.version}<#if release.date?has_content> (${release.date})</#if> -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0-beta8/.changelog.adoc.ftl b/src/changelog/2.0-beta8/.changelog.adoc.ftl deleted file mode 100644 index d7dfdf788f..0000000000 --- a/src/changelog/2.0-beta8/.changelog.adoc.ftl +++ /dev/null @@ -1,20 +0,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 - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - 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. -//// - -= ${release.version}<#if release.date?has_content> (${release.date})</#if> - -<#include "../.changelog-entries.adoc.ftl"> diff --git a/src/changelog/2.0-beta1/.changelog.adoc.ftl b/src/changelog/2.0-beta8/.release-notes.adoc.ftl similarity index 95% copy from src/changelog/2.0-beta1/.changelog.adoc.ftl copy to src/changelog/2.0-beta8/.release-notes.adoc.ftl index d7dfdf788f..964912504a 100644 --- a/src/changelog/2.0-beta1/.changelog.adoc.ftl +++ b/src/changelog/2.0-beta8/.release-notes.adoc.ftl @@ -17,4 +17,4 @@ = ${release.version}<#if release.date?has_content> (${release.date})</#if> -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0-beta9/.changelog.adoc.ftl b/src/changelog/2.0-beta9/.changelog.adoc.ftl deleted file mode 100644 index d7dfdf788f..0000000000 --- a/src/changelog/2.0-beta9/.changelog.adoc.ftl +++ /dev/null @@ -1,20 +0,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 - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - 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. -//// - -= ${release.version}<#if release.date?has_content> (${release.date})</#if> - -<#include "../.changelog-entries.adoc.ftl"> diff --git a/src/changelog/2.0-beta1/.changelog.adoc.ftl b/src/changelog/2.0-beta9/.release-notes.adoc.ftl similarity index 95% copy from src/changelog/2.0-beta1/.changelog.adoc.ftl copy to src/changelog/2.0-beta9/.release-notes.adoc.ftl index d7dfdf788f..964912504a 100644 --- a/src/changelog/2.0-beta1/.changelog.adoc.ftl +++ b/src/changelog/2.0-beta9/.release-notes.adoc.ftl @@ -17,4 +17,4 @@ = ${release.version}<#if release.date?has_content> (${release.date})</#if> -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0-rc1/.changelog.adoc.ftl b/src/changelog/2.0-rc1/.changelog.adoc.ftl deleted file mode 100644 index d7dfdf788f..0000000000 --- a/src/changelog/2.0-rc1/.changelog.adoc.ftl +++ /dev/null @@ -1,20 +0,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 - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - 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. -//// - -= ${release.version}<#if release.date?has_content> (${release.date})</#if> - -<#include "../.changelog-entries.adoc.ftl"> diff --git a/src/changelog/2.0-beta1/.changelog.adoc.ftl b/src/changelog/2.0-rc1/.release-notes.adoc.ftl similarity index 95% copy from src/changelog/2.0-beta1/.changelog.adoc.ftl copy to src/changelog/2.0-rc1/.release-notes.adoc.ftl index d7dfdf788f..964912504a 100644 --- a/src/changelog/2.0-beta1/.changelog.adoc.ftl +++ b/src/changelog/2.0-rc1/.release-notes.adoc.ftl @@ -17,4 +17,4 @@ = ${release.version}<#if release.date?has_content> (${release.date})</#if> -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0-rc2/.changelog.adoc.ftl b/src/changelog/2.0-rc2/.changelog.adoc.ftl deleted file mode 100644 index d7dfdf788f..0000000000 --- a/src/changelog/2.0-rc2/.changelog.adoc.ftl +++ /dev/null @@ -1,20 +0,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 - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - 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. -//// - -= ${release.version}<#if release.date?has_content> (${release.date})</#if> - -<#include "../.changelog-entries.adoc.ftl"> diff --git a/src/changelog/2.0-beta1/.changelog.adoc.ftl b/src/changelog/2.0-rc2/.release-notes.adoc.ftl similarity index 95% rename from src/changelog/2.0-beta1/.changelog.adoc.ftl rename to src/changelog/2.0-rc2/.release-notes.adoc.ftl index d7dfdf788f..964912504a 100644 --- a/src/changelog/2.0-beta1/.changelog.adoc.ftl +++ b/src/changelog/2.0-rc2/.release-notes.adoc.ftl @@ -17,4 +17,4 @@ = ${release.version}<#if release.date?has_content> (${release.date})</#if> -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0.1/.changelog.adoc.ftl b/src/changelog/2.0.1/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.0.1/.changelog.adoc.ftl rename to src/changelog/2.0.1/.release-notes.adoc.ftl index 0dfdff541e..4641447b3d 100644 --- a/src/changelog/2.0.1/.changelog.adoc.ftl +++ b/src/changelog/2.0.1/.release-notes.adoc.ftl @@ -26,4 +26,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0.2/.changelog.adoc.ftl b/src/changelog/2.0.2/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.0.2/.changelog.adoc.ftl rename to src/changelog/2.0.2/.release-notes.adoc.ftl index bba6cc1226..efe44f87b8 100644 --- a/src/changelog/2.0.2/.changelog.adoc.ftl +++ b/src/changelog/2.0.2/.release-notes.adoc.ftl @@ -26,4 +26,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.0/.changelog.adoc.ftl b/src/changelog/2.0/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.0/.changelog.adoc.ftl rename to src/changelog/2.0/.release-notes.adoc.ftl index 2cf64ac5b7..ec587e273f 100644 --- a/src/changelog/2.0/.changelog.adoc.ftl +++ b/src/changelog/2.0/.release-notes.adoc.ftl @@ -26,4 +26,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.1/.changelog.adoc.ftl b/src/changelog/2.1/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.1/.changelog.adoc.ftl rename to src/changelog/2.1/.release-notes.adoc.ftl index b3a16d7745..8a22f2da35 100644 --- a/src/changelog/2.1/.changelog.adoc.ftl +++ b/src/changelog/2.1/.release-notes.adoc.ftl @@ -28,4 +28,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.10.0/.changelog.adoc.ftl b/src/changelog/2.10.0/.release-notes.adoc.ftl similarity index 99% rename from src/changelog/2.10.0/.changelog.adoc.ftl rename to src/changelog/2.10.0/.release-notes.adoc.ftl index 5005c2ecc2..95f03e6a94 100644 --- a/src/changelog/2.10.0/.changelog.adoc.ftl +++ b/src/changelog/2.10.0/.release-notes.adoc.ftl @@ -84,4 +84,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.11.0/.changelog.adoc.ftl b/src/changelog/2.11.0/.release-notes.adoc.ftl similarity index 99% rename from src/changelog/2.11.0/.changelog.adoc.ftl rename to src/changelog/2.11.0/.release-notes.adoc.ftl index 2e8d831d27..a5a693e951 100644 --- a/src/changelog/2.11.0/.changelog.adoc.ftl +++ b/src/changelog/2.11.0/.release-notes.adoc.ftl @@ -107,4 +107,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.11.1/.changelog.adoc.ftl b/src/changelog/2.11.1/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.11.1/.changelog.adoc.ftl rename to src/changelog/2.11.1/.release-notes.adoc.ftl index f7562833ff..b76ee84149 100644 --- a/src/changelog/2.11.1/.changelog.adoc.ftl +++ b/src/changelog/2.11.1/.release-notes.adoc.ftl @@ -76,4 +76,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.11.2/.changelog.adoc.ftl b/src/changelog/2.11.2/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.11.2/.changelog.adoc.ftl rename to src/changelog/2.11.2/.release-notes.adoc.ftl index 1ead0dbc2c..f123c6473f 100644 --- a/src/changelog/2.11.2/.changelog.adoc.ftl +++ b/src/changelog/2.11.2/.release-notes.adoc.ftl @@ -80,4 +80,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.12.0/.changelog.adoc.ftl b/src/changelog/2.12.0/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.12.0/.changelog.adoc.ftl rename to src/changelog/2.12.0/.release-notes.adoc.ftl index 7a1bcc2aa7..f147e1c74b 100644 --- a/src/changelog/2.12.0/.changelog.adoc.ftl +++ b/src/changelog/2.12.0/.release-notes.adoc.ftl @@ -39,4 +39,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.12.1/.changelog.adoc.ftl b/src/changelog/2.12.1/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.12.1/.changelog.adoc.ftl rename to src/changelog/2.12.1/.release-notes.adoc.ftl index 00ae324669..12de1c3ede 100644 --- a/src/changelog/2.12.1/.changelog.adoc.ftl +++ b/src/changelog/2.12.1/.release-notes.adoc.ftl @@ -38,4 +38,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.13.0/.changelog.adoc.ftl b/src/changelog/2.13.0/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.13.0/.changelog.adoc.ftl rename to src/changelog/2.13.0/.release-notes.adoc.ftl index 5e716c3469..8a4f17705d 100644 --- a/src/changelog/2.13.0/.changelog.adoc.ftl +++ b/src/changelog/2.13.0/.release-notes.adoc.ftl @@ -44,4 +44,4 @@ Log4j 2.3 was the last release that supported Java 6 and Log4j 2.11.2 is the las For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.13.1/.changelog.adoc.ftl b/src/changelog/2.13.1/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.13.1/.changelog.adoc.ftl rename to src/changelog/2.13.1/.release-notes.adoc.ftl index 05b47252e3..f7096b0bd8 100644 --- a/src/changelog/2.13.1/.changelog.adoc.ftl +++ b/src/changelog/2.13.1/.release-notes.adoc.ftl @@ -31,4 +31,4 @@ Log4j 2.3 was the last release that supported Java 6 and Log4j 2.11.2 is the las For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.13.2/.changelog.adoc.ftl b/src/changelog/2.13.2/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.13.2/.changelog.adoc.ftl rename to src/changelog/2.13.2/.release-notes.adoc.ftl index 4d1570badc..be35fc2adb 100644 --- a/src/changelog/2.13.2/.changelog.adoc.ftl +++ b/src/changelog/2.13.2/.release-notes.adoc.ftl @@ -31,4 +31,4 @@ Log4j 2.3 was the last release that supported Java 6 and Log4j 2.11.2 is the las For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.13.3/.changelog.adoc.ftl b/src/changelog/2.13.3/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.13.3/.changelog.adoc.ftl rename to src/changelog/2.13.3/.release-notes.adoc.ftl index 7bd48b21b9..5c7e40ba6d 100644 --- a/src/changelog/2.13.3/.changelog.adoc.ftl +++ b/src/changelog/2.13.3/.release-notes.adoc.ftl @@ -31,4 +31,4 @@ Log4j 2.3 was the last release that supported Java 6 and Log4j 2.11.2 is the las For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.14.0/.changelog.adoc.ftl b/src/changelog/2.14.0/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.14.0/.changelog.adoc.ftl rename to src/changelog/2.14.0/.release-notes.adoc.ftl index d624846aff..cf083bf0b2 100644 --- a/src/changelog/2.14.0/.changelog.adoc.ftl +++ b/src/changelog/2.14.0/.release-notes.adoc.ftl @@ -35,4 +35,4 @@ Log4j 2.12.1 is the last release to support Java 7. For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.14.1/.changelog.adoc.ftl b/src/changelog/2.14.1/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.14.1/.changelog.adoc.ftl rename to src/changelog/2.14.1/.release-notes.adoc.ftl index b9be3456b0..16e6829457 100644 --- a/src/changelog/2.14.1/.changelog.adoc.ftl +++ b/src/changelog/2.14.1/.release-notes.adoc.ftl @@ -30,4 +30,4 @@ Log4j 2.12.1 is the last release to support Java 7. For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.15.0/.changelog.adoc.ftl b/src/changelog/2.15.0/.release-notes.adoc.ftl similarity index 99% rename from src/changelog/2.15.0/.changelog.adoc.ftl rename to src/changelog/2.15.0/.release-notes.adoc.ftl index ae547d242b..526744bb34 100644 --- a/src/changelog/2.15.0/.changelog.adoc.ftl +++ b/src/changelog/2.15.0/.release-notes.adoc.ftl @@ -64,4 +64,4 @@ Java 7 is no longer supported by the Log4j team. For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.16.0/.changelog.adoc.ftl b/src/changelog/2.16.0/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.16.0/.changelog.adoc.ftl rename to src/changelog/2.16.0/.release-notes.adoc.ftl index 29675e9c57..df1de56316 100644 --- a/src/changelog/2.16.0/.changelog.adoc.ftl +++ b/src/changelog/2.16.0/.release-notes.adoc.ftl @@ -43,4 +43,4 @@ Java 7 is no longer supported by the Log4j team. For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.17.0/.changelog.adoc.ftl b/src/changelog/2.17.0/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.17.0/.changelog.adoc.ftl rename to src/changelog/2.17.0/.release-notes.adoc.ftl index a6fe9f7575..8be02c2671 100644 --- a/src/changelog/2.17.0/.changelog.adoc.ftl +++ b/src/changelog/2.17.0/.release-notes.adoc.ftl @@ -34,4 +34,4 @@ Java 7 is no longer supported by the Log4j team. For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.17.1/.changelog.adoc.ftl b/src/changelog/2.17.1/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.17.1/.changelog.adoc.ftl rename to src/changelog/2.17.1/.release-notes.adoc.ftl index 230c57acaa..97e33f22e0 100644 --- a/src/changelog/2.17.1/.changelog.adoc.ftl +++ b/src/changelog/2.17.1/.release-notes.adoc.ftl @@ -32,4 +32,4 @@ Java 7 is no longer supported by the Log4j team. For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.17.2/.changelog.adoc.ftl b/src/changelog/2.17.2/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.17.2/.changelog.adoc.ftl rename to src/changelog/2.17.2/.release-notes.adoc.ftl index d32f334fce..bc0ffc47c9 100644 --- a/src/changelog/2.17.2/.changelog.adoc.ftl +++ b/src/changelog/2.17.2/.release-notes.adoc.ftl @@ -44,4 +44,4 @@ Java 6 and Java 7 are no longer supported by the Log4j team. For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.18.0/.changelog.adoc.ftl b/src/changelog/2.18.0/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.18.0/.changelog.adoc.ftl rename to src/changelog/2.18.0/.release-notes.adoc.ftl index 5fa0ffa694..a388c95d47 100644 --- a/src/changelog/2.18.0/.changelog.adoc.ftl +++ b/src/changelog/2.18.0/.release-notes.adoc.ftl @@ -33,4 +33,4 @@ Java 6 and Java 7 are no longer supported by the Log4j team. For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.19.0/.changelog.adoc.ftl b/src/changelog/2.19.0/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.19.0/.changelog.adoc.ftl rename to src/changelog/2.19.0/.release-notes.adoc.ftl index fba2c2adec..a0cac1e34c 100644 --- a/src/changelog/2.19.0/.changelog.adoc.ftl +++ b/src/changelog/2.19.0/.release-notes.adoc.ftl @@ -33,4 +33,4 @@ Java 6 and Java 7 are no longer supported by the Log4j team. For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.2/.changelog.adoc.ftl b/src/changelog/2.2/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.2/.changelog.adoc.ftl rename to src/changelog/2.2/.release-notes.adoc.ftl index 696db1ae84..dc12f76d5d 100644 --- a/src/changelog/2.2/.changelog.adoc.ftl +++ b/src/changelog/2.2/.release-notes.adoc.ftl @@ -29,4 +29,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.20.0/.changelog.adoc.ftl b/src/changelog/2.20.0/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.20.0/.changelog.adoc.ftl rename to src/changelog/2.20.0/.release-notes.adoc.ftl index ee165083f2..27bf7a5a26 100644 --- a/src/changelog/2.20.0/.changelog.adoc.ftl +++ b/src/changelog/2.20.0/.release-notes.adoc.ftl @@ -33,4 +33,4 @@ Java 6 and Java 7 are no longer supported by the Log4j team. For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.3/.changelog.adoc.ftl b/src/changelog/2.3/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.3/.changelog.adoc.ftl rename to src/changelog/2.3/.release-notes.adoc.ftl index 261ca6ab44..6c5437280a 100644 --- a/src/changelog/2.3/.changelog.adoc.ftl +++ b/src/changelog/2.3/.release-notes.adoc.ftl @@ -30,4 +30,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.4.1/.changelog.adoc.ftl b/src/changelog/2.4.1/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.4.1/.changelog.adoc.ftl rename to src/changelog/2.4.1/.release-notes.adoc.ftl index 75e7123b1f..d458f60807 100644 --- a/src/changelog/2.4.1/.changelog.adoc.ftl +++ b/src/changelog/2.4.1/.release-notes.adoc.ftl @@ -30,4 +30,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.4/.changelog.adoc.ftl b/src/changelog/2.4/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.4/.changelog.adoc.ftl rename to src/changelog/2.4/.release-notes.adoc.ftl index 1998623c4c..dd49f504c0 100644 --- a/src/changelog/2.4/.changelog.adoc.ftl +++ b/src/changelog/2.4/.release-notes.adoc.ftl @@ -30,4 +30,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.5/.changelog.adoc.ftl b/src/changelog/2.5/.release-notes.adoc.ftl similarity index 97% rename from src/changelog/2.5/.changelog.adoc.ftl rename to src/changelog/2.5/.release-notes.adoc.ftl index 5bfb536a8b..947cf4d897 100644 --- a/src/changelog/2.5/.changelog.adoc.ftl +++ b/src/changelog/2.5/.release-notes.adoc.ftl @@ -32,4 +32,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.6.1/.changelog.adoc.ftl b/src/changelog/2.6.1/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.6.1/.changelog.adoc.ftl rename to src/changelog/2.6.1/.release-notes.adoc.ftl index 1e81cf5bce..bf6c915117 100644 --- a/src/changelog/2.6.1/.changelog.adoc.ftl +++ b/src/changelog/2.6.1/.release-notes.adoc.ftl @@ -55,4 +55,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.6.2/.changelog.adoc.ftl b/src/changelog/2.6.2/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.6.2/.changelog.adoc.ftl rename to src/changelog/2.6.2/.release-notes.adoc.ftl index 0e060ad57d..5b0098a810 100644 --- a/src/changelog/2.6.2/.changelog.adoc.ftl +++ b/src/changelog/2.6.2/.release-notes.adoc.ftl @@ -55,4 +55,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.6/.changelog.adoc.ftl b/src/changelog/2.6/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.6/.changelog.adoc.ftl rename to src/changelog/2.6/.release-notes.adoc.ftl index 17c8a0bc81..14f37ca2f4 100644 --- a/src/changelog/2.6/.changelog.adoc.ftl +++ b/src/changelog/2.6/.release-notes.adoc.ftl @@ -56,4 +56,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.7/.changelog.adoc.ftl b/src/changelog/2.7/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.7/.changelog.adoc.ftl rename to src/changelog/2.7/.release-notes.adoc.ftl index e942db87b5..345604c764 100644 --- a/src/changelog/2.7/.changelog.adoc.ftl +++ b/src/changelog/2.7/.release-notes.adoc.ftl @@ -57,4 +57,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.8.1/.changelog.adoc.ftl b/src/changelog/2.8.1/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.8.1/.changelog.adoc.ftl rename to src/changelog/2.8.1/.release-notes.adoc.ftl index 5eeaced204..7b898d4b8c 100644 --- a/src/changelog/2.8.1/.changelog.adoc.ftl +++ b/src/changelog/2.8.1/.release-notes.adoc.ftl @@ -54,4 +54,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.8.2/.changelog.adoc.ftl b/src/changelog/2.8.2/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.8.2/.changelog.adoc.ftl rename to src/changelog/2.8.2/.release-notes.adoc.ftl index fb675243ea..5c4637f2e9 100644 --- a/src/changelog/2.8.2/.changelog.adoc.ftl +++ b/src/changelog/2.8.2/.release-notes.adoc.ftl @@ -54,4 +54,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.8/.changelog.adoc.ftl b/src/changelog/2.8/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.8/.changelog.adoc.ftl rename to src/changelog/2.8/.release-notes.adoc.ftl index 096dd0e125..6a71daa0b4 100644 --- a/src/changelog/2.8/.changelog.adoc.ftl +++ b/src/changelog/2.8/.release-notes.adoc.ftl @@ -55,4 +55,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.9.0/.changelog.adoc.ftl b/src/changelog/2.9.0/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.9.0/.changelog.adoc.ftl rename to src/changelog/2.9.0/.release-notes.adoc.ftl index 34c6a72ae8..58b1561bca 100644 --- a/src/changelog/2.9.0/.changelog.adoc.ftl +++ b/src/changelog/2.9.0/.release-notes.adoc.ftl @@ -70,4 +70,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/2.9.1/.changelog.adoc.ftl b/src/changelog/2.9.1/.release-notes.adoc.ftl similarity index 98% rename from src/changelog/2.9.1/.changelog.adoc.ftl rename to src/changelog/2.9.1/.release-notes.adoc.ftl index a5c84e5acf..ca0a38693b 100644 --- a/src/changelog/2.9.1/.changelog.adoc.ftl +++ b/src/changelog/2.9.1/.release-notes.adoc.ftl @@ -71,4 +71,4 @@ The package names and Maven `groupId` have been changed to `org.apache.logging.l For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. -<#include "../.changelog-entries.adoc.ftl"> +<#include "../.changelog.adoc.ftl">
