From 305bbb50edfccddb3bfbac959dfa830293ffdc72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volkan=20Yaz=C4=B1c=C4=B1?= <volkan@yazi.ci>
Date: Fri, 5 Apr 2024 22:10:47 +0200
Subject: [PATCH] Support parallel releases (#139)

---
 .github/workflows/deploy-release-reusable.yaml         | 10 +++++-----
 .../.10.x.x/139_add_parallel_release_support.xml       |  9 +++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 src/changelog/.10.x.x/139_add_parallel_release_support.xml

diff --git a/.github/workflows/deploy-release-reusable.yaml b/.github/workflows/deploy-release-reusable.yaml
index 1214cc3a..384bb238 100644
--- a/.github/workflows/deploy-release-reusable.yaml
+++ b/.github/workflows/deploy-release-reusable.yaml
@@ -270,12 +270,12 @@ jobs:
           cd "$SVN_DIR"
           svn up --depth files "$PROJECT_ID"
 
-          # Switch to the project folder
-          if [ \! -d "$PROJECT_ID" ]; then
-            mkdir -p "$PROJECT_ID"
-            svn add "$PROJECT_ID"
+          # Switch to the distribution folder
+          if [[ \! -d "$PROJECT_ID" ||  \! -d "$PROJECT_ID/$PROJECT_VERSION" ]]; then
+            mkdir -p "$PROJECT_ID/$PROJECT_VERSION"
+            svn add --force "$PROJECT_ID"
           fi
-          cd "$PROJECT_ID"
+          cd "$PROJECT_ID/$PROJECT_VERSION"
 
           # Clean up old files
           find . -name "${DIST_FILENAME_PREFIX}*" -type f -print0 | xargs -0 -r svn delete
diff --git a/src/changelog/.10.x.x/139_add_parallel_release_support.xml b/src/changelog/.10.x.x/139_add_parallel_release_support.xml
new file mode 100644
index 00000000..e1ee28f7
--- /dev/null
+++ b/src/changelog/.10.x.x/139_add_parallel_release_support.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd"
+       type="changed">
+  <issue id="139" link="https://github.com/apache/logging-parent/issues/139"/>
+  <description format="asciidoc"><![CDATA[Support parallel releases by uploading the distribution to `<projectId>/<version>` folders.
+This is needed for parallel Log4j 2 and 3 releases.]]></description>
+</entry>