This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/main by this push:
new 0972d59 Fix YAML escaping issue, 5th time
0972d59 is described below
commit 0972d59fc763bcb85fb8a53b5c816e0da0124664
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Mon Sep 4 13:10:12 2023 +0200
Fix YAML escaping issue, 5th time
---
.github/workflows/deploy-release-reusable.yml | 2 +-
pom.xml | 42 ++++++++++++---------------
2 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/deploy-release-reusable.yml
b/.github/workflows/deploy-release-reusable.yml
index a23524c..4d84d44 100644
--- a/.github/workflows/deploy-release-reusable.yml
+++ b/.github/workflows/deploy-release-reusable.yml
@@ -104,7 +104,7 @@ jobs:
./mvnw \
--show-version --batch-mode --errors --no-transfer-progress \
--non-recursive -P distribution \
- -DattachmentFilepathPattern="${{
inputs.distribution-attachment-filepath-pattern }}" \
+ -DattachmentFilepathPattern='${{
inputs.distribution-attachment-filepath-pattern }}' \
-DattachmentCount=${{ inputs.distribution-attachment-count }}
export DIST_FILENAME_PREFIX="apache-${{ inputs.project-name }}"
export
DIST_FILENAME_VERSIONED_PREFIX="${DIST_FILENAME_PREFIX}-${PROJECT_VERSION}"
diff --git a/pom.xml b/pom.xml
index 3b574dc..45ae7f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -537,14 +537,14 @@
3. Release notes
This profile must be executed after a successful `package` phase,
since we need JARs.
- This profile is manually enabled by `.github/workflows/build.yml`
while releasing. -->
+ This profile is manually enabled by
`.github/workflows/build-release-reusable.yml` while releasing. -->
<profile>
<id>distribution</id>
<build>
- <defaultGoal>log4j-changelog:export bsh:run</defaultGoal>
+ <defaultGoal>log4j-changelog:export enforcer:enforce
bsh:run</defaultGoal>
<plugins>
@@ -574,27 +574,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-distribution-properties</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>attachmentFilepathPattern</property>
- <message>You must set an `attachmentFilepathPattern`
property for the regex pattern matched against the full filepath for
determining attachments to be included in the distribution!</message>
- </requireProperty>
- <requireProperty>
- <property>attachmentCount</property>
- <message>You must set an `attachmentCount` property for
the number of attachments expected to be found!</message>
- </requireProperty>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>attachmentFilepathPattern</property>
+ <message>You must set an `attachmentFilepathPattern`
property for the regex pattern matched against the full filepath for
determining attachments to be included in the distribution!</message>
+ </requireProperty>
+ <requireProperty>
+ <property>attachmentCount</property>
+ <message>You must set an `attachmentCount` property for the
number of attachments expected to be found!</message>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
</plugin>
<!-- Create the distribution ZIP -->
@@ -719,7 +711,7 @@
</profile>
<!-- `deploy` profile activating deployment-specific configuration.
- It is manually enabled by `.github/workflows/build.yml` while
releasing. -->
+ It is manually enabled by
`.github/workflows/build-{snapshot,release}-reusable.yml` while releasing. -->
<profile>
<id>deploy</id>
@@ -757,6 +749,8 @@
</profile>
+ <!-- `release` profile activating release-specific deployment
configuration.
+ It is manually enabled by
`.github/workflows/build-release-reusable.yml` while releasing. -->
<profile>
<id>release</id>
