From d9cfb9d7e59b4926415408a86773c7492627b0dd Mon Sep 17 00:00:00 2001
From: chen-zimmer-px <chen.zimmer@humansecurity.com>
Date: Tue, 26 May 2026 10:48:54 +0300
Subject: [PATCH 1/5] update cd yml

---
 .github/workflows/cd.yaml | 14 ++++++++++++--
 pom.xml                   |  7 ++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index 0cf45693..39ef15c7 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -3,6 +3,12 @@ on:
   push:
     branches:
     - master
+  workflow_dispatch:
+    inputs:
+      skip_github_release:
+        description: 'Skip creating a GitHub release'
+        type: boolean
+        default: true
 jobs:
   extract_version:
     runs-on: ubuntu-latest
@@ -24,6 +30,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: extract_version
     name: Create release on GitHub
+    # Skip when triggered manually with skip_github_release=true (default for dispatch).
+    if: ${{ github.event_name != 'workflow_dispatch' || inputs.skip_github_release == false }}
     permissions:
       contents: write
     steps:
@@ -38,7 +46,7 @@ jobs:
   publish:
     name: Deploy to maven
     needs:
-      - create_release
+      - extract_version
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -61,7 +69,9 @@ jobs:
         run: gpg --list-secret-keys --keyid-format LONG
 
       - name: Deploy a new version
-        run: mvn clean deploy -P build-extras,sign --settings deploy/mvnsettings.xml -pl perimeterx-sdk,perimeterx-sdk-jakarta -am
+        # Tests are verified on JDK 8 in ci.yml. PowerMock 1.6 is not JDK 17 compatible,
+        # so the release build on JDK 17 must skip tests.
+        run: mvn clean deploy -P build-extras,sign --settings deploy/mvnsettings.xml -pl perimeterx-sdk,perimeterx-sdk-jakarta -am -DskipTests
         env:
           GPG_KEY_NAME: ${{ vars.GPG_KEY_NAME }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/pom.xml b/pom.xml
index 8d7cc0dc..4cfcceb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,6 +115,11 @@
         </profile>
     </profiles>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    </properties>
+
     <dependencies>
 
         <dependency>
@@ -306,7 +311,7 @@
                 <configuration>
                     <forkCount>3</forkCount>
                     <reuseForks>true</reuseForks>
-                    <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
+                    <argLine>-Xmx1024m</argLine>
                 </configuration>
             </plugin>
             <plugin>

From 99060994ee8d7012aad3ab552d95f471866bdbe0 Mon Sep 17 00:00:00 2001
From: chen-zimmer-px <chen.zimmer@humansecurity.com>
Date: Tue, 26 May 2026 10:57:18 +0300
Subject: [PATCH 2/5] separate the dispatcher to another file

---
 .github/workflows/cd.yaml            | 15 +++------------
 .github/workflows/cd_dispatcher.yaml | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 12 deletions(-)
 create mode 100644 .github/workflows/cd_dispatcher.yaml

diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index 39ef15c7..39db4d51 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -2,13 +2,7 @@ name: CD
 on:
   push:
     branches:
-    - master
-  workflow_dispatch:
-    inputs:
-      skip_github_release:
-        description: 'Skip creating a GitHub release'
-        type: boolean
-        default: true
+      - master
 jobs:
   extract_version:
     runs-on: ubuntu-latest
@@ -30,7 +24,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: extract_version
     name: Create release on GitHub
-    # Skip when triggered manually with skip_github_release=true (default for dispatch).
     if: ${{ github.event_name != 'workflow_dispatch' || inputs.skip_github_release == false }}
     permissions:
       contents: write
@@ -46,7 +39,7 @@ jobs:
   publish:
     name: Deploy to maven
     needs:
-      - extract_version
+      - create_release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -69,11 +62,9 @@ jobs:
         run: gpg --list-secret-keys --keyid-format LONG
 
       - name: Deploy a new version
-        # Tests are verified on JDK 8 in ci.yml. PowerMock 1.6 is not JDK 17 compatible,
-        # so the release build on JDK 17 must skip tests.
         run: mvn clean deploy -P build-extras,sign --settings deploy/mvnsettings.xml -pl perimeterx-sdk,perimeterx-sdk-jakarta -am -DskipTests
         env:
           GPG_KEY_NAME: ${{ vars.GPG_KEY_NAME }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
           OSSRH_JIRA_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }}
-          OSSRH_JIRA_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}
+          OSSRH_JIRA_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }}
\ No newline at end of file
diff --git a/.github/workflows/cd_dispatcher.yaml b/.github/workflows/cd_dispatcher.yaml
new file mode 100644
index 00000000..fe6d77f7
--- /dev/null
+++ b/.github/workflows/cd_dispatcher.yaml
@@ -0,0 +1,19 @@
+name: CD Dispatcher (Manual)
+
+on:
+  workflow_dispatch:
+    inputs:
+      skip_github_release:
+        description: 'Skip creating a GitHub release tag'
+        type: boolean
+        default: true
+
+jobs:
+  run_cd:
+    name: Run CD pipeline
+    uses: ./.github/workflows/cd.yaml
+    with:
+      skip_github_release: ${{ inputs.skip_github_release }}
+    secrets: inherit
+    permissions:
+      contents: write

From 451546c33a062b21f6eb9bd56924e0213fbb988a Mon Sep 17 00:00:00 2001
From: chen-zimmer-px <chen.zimmer@humansecurity.com>
Date: Tue, 26 May 2026 10:57:28 +0300
Subject: [PATCH 3/5] Update cd.yaml

---
 .github/workflows/cd.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index 39db4d51..9ec43233 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -24,7 +24,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: extract_version
     name: Create release on GitHub
-    if: ${{ github.event_name != 'workflow_dispatch' || inputs.skip_github_release == false }}
     permissions:
       contents: write
     steps:

From 3be1c999be1b2f2335c9e54c861d38a491a8c79a Mon Sep 17 00:00:00 2001
From: chen-zimmer-px <chen.zimmer@humansecurity.com>
Date: Tue, 26 May 2026 10:58:55 +0300
Subject: [PATCH 4/5] Update cd.yaml

---
 .github/workflows/cd.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index 9ec43233..cd962c4b 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -2,7 +2,7 @@ name: CD
 on:
   push:
     branches:
-      - master
+    - master
 jobs:
   extract_version:
     runs-on: ubuntu-latest

From 32ba009d2cdbcf024cf3362131e513fe0efab04b Mon Sep 17 00:00:00 2001
From: chen-zimmer-px <chen.zimmer@humansecurity.com>
Date: Tue, 26 May 2026 11:03:45 +0300
Subject: [PATCH 5/5] Update cd.yaml

---
 .github/workflows/cd.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index cd962c4b..022a50c7 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -3,6 +3,12 @@ on:
   push:
     branches:
     - master
+  workflow_call:
+    inputs:
+      skip_github_release:
+        description: 'Skip creating a GitHub release'
+        type: boolean
+        default: false
 jobs:
   extract_version:
     runs-on: ubuntu-latest
@@ -24,6 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: extract_version
     name: Create release on GitHub
+    if: ${{ github.event_name == 'push' || inputs.skip_github_release == false }}
     permissions:
       contents: write
     steps:
@@ -38,7 +45,7 @@ jobs:
   publish:
     name: Deploy to maven
     needs:
-      - create_release
+      - extract_version
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code