diff --git a/.asf.yaml b/.asf.yaml index 8641d24..1644b0e 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -50,6 +50,13 @@ github: del_branch_on_merge: true + # Enforce squashing while merging PRs. + # Otherwise, the git log gets polluted severely. + enabled_merge_buttons: + squash: true + merge: false + rebase: false + features: issues: true diff --git a/.github/workflows/deploy-site.yaml b/.github/workflows/deploy-site.yaml index 7925016..8d2e580 100644 --- a/.github/workflows/deploy-site.yaml +++ b/.github/workflows/deploy-site.yaml @@ -46,6 +46,7 @@ jobs: profile: ~ whoami: ${{ github.ref_name }}-site-stg-out subdir: content/log4j/kotlin + install-required: true target-branch: ${{ github.ref_name }}-site-stg-out deploy-site-pro: @@ -63,6 +64,7 @@ jobs: profile: ~ whoami: ${{ github.ref_name }}-out subdir: content/log4j/kotlin + install-required: true target-branch: ${{ github.ref_name }}-out export-version: @@ -92,4 +94,5 @@ jobs: profile: ~ whoami: ${{ github.ref_name }}-site-stg-out subdir: content/log4j/kotlin-${{ needs.export-version.outputs.version }} + install-required: true target-branch: ${{ github.ref_name }}-site-stg-out diff --git a/log4j-api-kotlin-benchmark/pom.xml b/log4j-api-kotlin-benchmark/pom.xml index 6b64a0a..698be16 100644 --- a/log4j-api-kotlin-benchmark/pom.xml +++ b/log4j-api-kotlin-benchmark/pom.xml @@ -28,13 +28,14 @@ log4j-api-kotlin-benchmark + Apache Log4j Kotlin API benchmarks + true true true true true - default benchmarks @@ -77,19 +78,28 @@ + - + + + org.jetbrains.kotlin kotlin-maven-plugin - process-sources + compile compile - generate-sources + process-sources ${project.basedir}/src/main/kotlin @@ -99,7 +109,7 @@ - + org.codehaus.mojo exec-maven-plugin @@ -112,45 +122,48 @@ + generate-JMH-sources java - generate-resources + process-resources true org.openjdk.jmh.generators.bytecode.JmhBytecodeGenerator - ${project.basedir}/target/classes/ - ${project.basedir}/target/generated-sources/jmh/ - ${project.basedir}/target/classes/ - ${jmh.generator} + + ${project.build.directory}/classes + + ${project.build.directory}/generated-sources/jmh + + ${project.build.directory}/classes - + org.codehaus.mojo build-helper-maven-plugin - add-source + add-JMH-sources add-source process-resources - ${project.basedir}/target/generated-sources/jmh + ${project.build.directory}/generated-sources/jmh - + org.apache.maven.plugins maven-compiler-plugin @@ -167,6 +180,7 @@ package + false ${uberjar.name} diff --git a/pom.xml b/pom.xml index 9e16bed..e86847a 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ - 1.5.0-SNAPSHOT + 1.5.0 - 2023-12-18T18:39:10Z + 2024-08-03T16:55:56Z true diff --git a/src/changelog/.1.x.x/update_org_apache_logging_logging_parent.xml b/src/changelog/.1.x.x/update_org_apache_logging_logging_parent.xml deleted file mode 100644 index 6129106..0000000 --- a/src/changelog/.1.x.x/update_org_apache_logging_logging_parent.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - Update `org.apache.logging:logging-parent` to version `11.1.0` - diff --git a/src/changelog/1.5.0/.release-notes.adoc.ftl b/src/changelog/1.5.0/.release-notes.adoc.ftl new file mode 100644 index 0000000..9374dfe --- /dev/null +++ b/src/changelog/1.5.0/.release-notes.adoc.ftl @@ -0,0 +1,43 @@ +//// + 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. +//// + +//// + ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██ + ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██ + ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██ + ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ + ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██ + + IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT! + + Version-specific release notes (`7.8.0.adoc`, etc.) are generated from `src/changelog/*/.release-notes.adoc.ftl`. + Auto-generation happens during `generate-sources` phase of Maven. + Hence, you must always + + 1. Find and edit the associated `.release-notes.adoc.ftl` + 2. Run `./mvnw generate-sources` + 3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc` +//// + +[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}] +== ${release.version} + +<#if release.date?has_content>Release date:: ${release.date} + +This release contains improvements to Kotlin coroutine integration. + +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/1.5.0/.release.xml b/src/changelog/1.5.0/.release.xml new file mode 100644 index 0000000..2f01cdb --- /dev/null +++ b/src/changelog/1.5.0/.release.xml @@ -0,0 +1,21 @@ + + + diff --git a/src/changelog/.1.x.x/add-coroutine-context-convenience-functions.xml b/src/changelog/1.5.0/add-coroutine-context-convenience-functions.xml similarity index 100% rename from src/changelog/.1.x.x/add-coroutine-context-convenience-functions.xml rename to src/changelog/1.5.0/add-coroutine-context-convenience-functions.xml diff --git a/src/changelog/.1.x.x/antora.xml b/src/changelog/1.5.0/antora.xml similarity index 100% rename from src/changelog/.1.x.x/antora.xml rename to src/changelog/1.5.0/antora.xml diff --git a/src/changelog/.1.x.x/update_org_apache_logging_log4j_log4j_bom.xml b/src/changelog/1.5.0/update_org_apache_logging_log4j_log4j_bom.xml similarity index 100% rename from src/changelog/.1.x.x/update_org_apache_logging_log4j_log4j_bom.xml rename to src/changelog/1.5.0/update_org_apache_logging_log4j_log4j_bom.xml