From d6ced6ef30a70c285e817d36c98070335a714e1c Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Wed, 23 Oct 2024 16:13:50 -0700
Subject: [PATCH 01/21] Update update versions workflow to use aepsdk-commons
 reusable workflow

---
 .github/workflows/update-version.yml | 74 +++++++++++++++-------------
 1 file changed, 39 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index 5df722a7..2b4afcf2 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -1,48 +1,52 @@
-#
-# Copyright 2024 Adobe. All rights reserved.
-# This file is licensed 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 REPRESENTATIONS
-# OF ANY KIND, either express or implied. See the License for the specific language
-# governing permissions and limitations under the License.
-#
+name: Update Versions
 
-name: Update Version
 on:
   workflow_dispatch:
     inputs:
-      version: 
-        description: 'New version to use for the Edge extension. Example: 3.0.0'
+      version:
+        description: 'New version to use for the extension (ex: 3.0.1).'
         required: true
+        type: string
+        default: ''
+
+      branch:
+        description: 'The target branch where the version update will be applied and the pull request will be merged into.'
+        required: true
+        type: string
+        default: ''
 
       core-dependency:
-        description: '[Optional] Update Core dependency in pom.xml. Example: 3.0.0'
+        description: 'If a version is provided, update AEPCore dependency in gradle.properties (ex: 3.0.1).'
         required: false
+        type: string
+        default: ''
 
-      identity-dependency:
-        description: '[Optional] Update Edge Identity dependency in pom.xml. Example: 3.0.0'
+      edge-identity-dependency:
+        description: 'If a version is provided, update AEPEdgeIdentity dependency in gradle.properties (ex: 3.0.1).'
         required: false
+        type: string
+        default: ''
 
-jobs:
-  update-version:
-    runs-on: ubuntu-latest
+      edge-consent-dependency:
+        description: 'If a version is provided, update AEPEdgeConsent dependency in gradle.properties (ex: 3.0.1).'
+        required: false
+        type: string
+        default: ''
 
-    steps:    
-    - name: Checkout
-      uses: actions/checkout@v3
-    
-    - name: Update Edge
-      run: (./scripts/version.sh -u -v ${{ github.event.inputs.version }} -d "Core ${{ github.event.inputs.core-dependency }}, EdgeIdentity ${{ github.event.inputs.identity-dependency }}")
+      testutils-dependency:
+        description: 'If a version is provided, update AEPTestUtils dependency in gradle.properties (ex: 3.0.1).'
+        required: false
+        type: string
+        default: ''
 
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5
-      with:
-        token: ${{ github.token }}
-        commit-message: Updating version to ${{ github.event.inputs.version }}.
-        branch: version-${{ github.event.inputs.version }}-update
-        delete-branch: true
-        title: Updating version to ${{ github.event.inputs.version }}
-        body: Updating version to ${{ github.event.inputs.version }}
+jobs:
+  update-versions:
+    permissions:
+      contents: write
+    uses: timkimadobe/aepsdk-commons/.github/workflows/versions.yml@version-script-update
+    with:
+      version: ${{ github.event.inputs.version }}
+      branch: ${{ github.event.inputs.branch }}
+      dependencies: AEPCore ${{ github.event.inputs.core-dependency }}, AEPEdgeIdentity ${{ github.event.inputs.edge-identity-dependency }}, AEPEdgeConsent ${{ github.event.inputs.edge-consent-dependency }}, AEPTestUtils ${{ github.event.inputs.testutils-dependency }}
+      paths: code/edge/src/main/java/com/adobe/marketing/mobile/EdgeConstants.java, code/gradle.properties
+      update: true
\ No newline at end of file

From 9386c9335ecdffa2c95ce85354e8cecc32bd3b34 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Wed, 23 Oct 2024 17:57:42 -0700
Subject: [PATCH 02/21] Update maven release and snapshot workflows to use
 reusable workflows

---
 .github/workflows/maven-release.yml  | 75 ++++++++--------------------
 .github/workflows/maven-snapshot.yml | 36 ++-----------
 2 files changed, 26 insertions(+), 85 deletions(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index f3f4cd34..63a7ceb4 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -15,62 +15,29 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'tag/version'
+        description: 'The existing tag (version) to be released (ex: 5.0.1).'
         required: true        
 
-      action_tag:
-        description: 'Create tag? ("no" to skip)'
+      create-github-release:
+        description: 'Create GitHub release with tag? ("false" to skip)'
+        type: boolean
         required: true
-        default: 'yes'
+        default: true
+
+      edge-identity-dependency:
+        description: 'The AEPEdgeIdentity dependency version in gradle.properties to be validated (ex: 3.0.1).'
+        required: true
+        type: string
+        default: ''
 jobs:
   publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
-
-      - name: Verify version        
-        run: |
-          set -eo pipefail
-          echo Release version: ${{ github.event.inputs.tag }}
-          (./scripts/version.sh -v ${{ github.event.inputs.tag }})
-
-      - name: Create GH Release
-        id: create_release
-        uses: release-drafter/release-drafter@v5
-        if: ${{ github.event.inputs.action_tag == 'yes' }}
-        with:
-          name: v${{ github.event.inputs.tag }}
-          tag: v${{ github.event.inputs.tag }}
-          version: v${{ github.event.inputs.tag }}
-          publish: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
-    
-      - name: Import GPG key
-        env:
-          GPG_SECRET_KEYS: ${{ secrets.GPG_SECRET_KEYS }}
-          GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
-        run: |
-          echo $GPG_SECRET_KEYS | base64 --decode | gpg --import --no-tty --batch --yes
-          echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust --no-tty --batch --yes
-
-      - name: Publish to Maven Central Repository
-        run: make ci-publish
-        env:
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
\ No newline at end of file
+    permissions:
+        contents: write
+    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-android-1.0.0
+    with:
+      tag: ${{ github.event.inputs.tag }}
+      create-github-release: ${{ github.event.inputs.create-github-release == 'true' }}
+      version-verify-paths: code/gradle.properties, code/edge/src/main/java/com/adobe/marketing/mobile/EdgeConstants.java
+      version-verify-dependencies: AEPEdgeIdentity ${{ github.event.inputs.edge-identity-dependency }}
+      workflow_tag: gha-android-1.0.0
+    secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/maven-snapshot.yml b/.github/workflows/maven-snapshot.yml
index a7036653..3ac6d2dd 100644
--- a/.github/workflows/maven-snapshot.yml
+++ b/.github/workflows/maven-snapshot.yml
@@ -11,38 +11,12 @@
 #
 
 name: Publish Snapshot
-on:
+on: 
   workflow_dispatch:
 
 jobs:
   publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
-      - name: Import GPG key
-        env:
-          GPG_SECRET_KEYS: ${{ secrets.GPG_SECRET_KEYS }}
-          GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
-        run: |
-          echo $GPG_SECRET_KEYS | base64 --decode | gpg --import --no-tty --batch --yes
-          echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust --no-tty --batch --yes
-      - name: Publish to Maven Snapshot Repository
-        run: make ci-publish-staging
-        env:
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
-        
+    permissions:
+        contents: write
+    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-snapshot.yml@gha-android-1.0.0
+    secrets: inherit
\ No newline at end of file

From 260ff4c3a2e80fc716b67ac6193efab0eb1bcaad Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Wed, 23 Oct 2024 18:05:06 -0700
Subject: [PATCH 03/21] Add workflow_tag input

---
 .github/workflows/update-version.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index 2b4afcf2..bb419850 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -49,4 +49,5 @@ jobs:
       branch: ${{ github.event.inputs.branch }}
       dependencies: AEPCore ${{ github.event.inputs.core-dependency }}, AEPEdgeIdentity ${{ github.event.inputs.edge-identity-dependency }}, AEPEdgeConsent ${{ github.event.inputs.edge-consent-dependency }}, AEPTestUtils ${{ github.event.inputs.testutils-dependency }}
       paths: code/edge/src/main/java/com/adobe/marketing/mobile/EdgeConstants.java, code/gradle.properties
-      update: true
\ No newline at end of file
+      update: true
+      workflow_tag: gha-android-1.0.0

From c50df5d56c28f30bcd8b837a2cdd8cf7849afed8 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Wed, 23 Oct 2024 18:07:05 -0700
Subject: [PATCH 04/21] Add pr permissions

---
 .github/workflows/update-version.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index bb419850..e823ccf3 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -43,6 +43,7 @@ jobs:
   update-versions:
     permissions:
       contents: write
+      pull-requests: write
     uses: timkimadobe/aepsdk-commons/.github/workflows/versions.yml@version-script-update
     with:
       version: ${{ github.event.inputs.version }}

From 4b873eaad39a940ce27df5a7e1c674b28aef5472 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Wed, 23 Oct 2024 18:11:00 -0700
Subject: [PATCH 05/21] Update config to prod

---
 .github/workflows/maven-release.yml  | 2 +-
 .github/workflows/maven-snapshot.yml | 2 +-
 .github/workflows/update-version.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index 63a7ceb4..b4bef0ab 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -33,7 +33,7 @@ jobs:
   publish:
     permissions:
         contents: write
-    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-android-1.0.0
+    uses: adobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-android-1.0.0
     with:
       tag: ${{ github.event.inputs.tag }}
       create-github-release: ${{ github.event.inputs.create-github-release == 'true' }}
diff --git a/.github/workflows/maven-snapshot.yml b/.github/workflows/maven-snapshot.yml
index 3ac6d2dd..a7109994 100644
--- a/.github/workflows/maven-snapshot.yml
+++ b/.github/workflows/maven-snapshot.yml
@@ -18,5 +18,5 @@ jobs:
   publish:
     permissions:
         contents: write
-    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-snapshot.yml@gha-android-1.0.0
+    uses: adobe/aepsdk-commons/.github/workflows/android-maven-snapshot.yml@gha-android-1.0.0
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index e823ccf3..05e2bcc0 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -44,7 +44,7 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    uses: timkimadobe/aepsdk-commons/.github/workflows/versions.yml@version-script-update
+    uses: adobe/aepsdk-commons/.github/workflows/versions.yml@version-script-update
     with:
       version: ${{ github.event.inputs.version }}
       branch: ${{ github.event.inputs.branch }}

From 036833ce74d64ffcc5555d3b492e5cce075b1595 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Thu, 24 Oct 2024 14:10:52 -0700
Subject: [PATCH 06/21] Apply testing config

---
 .github/workflows/maven-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index b4bef0ab..63a7ceb4 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -33,7 +33,7 @@ jobs:
   publish:
     permissions:
         contents: write
-    uses: adobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-android-1.0.0
+    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-android-1.0.0
     with:
       tag: ${{ github.event.inputs.tag }}
       create-github-release: ${{ github.event.inputs.create-github-release == 'true' }}

From a35eb5a971f1c3ccaa5731d5e21fb661a82606a2 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Thu, 24 Oct 2024 16:24:01 -0700
Subject: [PATCH 07/21] Revert "Apply testing config"

This reverts commit 036833ce74d64ffcc5555d3b492e5cce075b1595.
---
 .github/workflows/maven-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index 63a7ceb4..b4bef0ab 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -33,7 +33,7 @@ jobs:
   publish:
     permissions:
         contents: write
-    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-android-1.0.0
+    uses: adobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-android-1.0.0
     with:
       tag: ${{ github.event.inputs.tag }}
       create-github-release: ${{ github.event.inputs.create-github-release == 'true' }}

From 1f355bf88ef9168f6dcee6050609d18bc04055c6 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Thu, 24 Oct 2024 16:38:02 -0700
Subject: [PATCH 08/21] Update example versions to 1.2.3 for consistency

---
 .github/workflows/maven-release.yml  |  4 ++--
 .github/workflows/update-version.yml | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index b4bef0ab..35d60b40 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'The existing tag (version) to be released (ex: 5.0.1).'
+        description: 'The existing tag (version) to be released (ex: 1.2.3).'
         required: true        
 
       create-github-release:
@@ -25,7 +25,7 @@ on:
         default: true
 
       edge-identity-dependency:
-        description: 'The AEPEdgeIdentity dependency version in gradle.properties to be validated (ex: 3.0.1).'
+        description: 'The AEPEdgeIdentity dependency version in gradle.properties to be validated (ex: 1.2.3).'
         required: true
         type: string
         default: ''
diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index 05e2bcc0..ca7f7cb5 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'New version to use for the extension (ex: 3.0.1).'
+        description: 'New version to use for the extension (ex: 1.2.3).'
         required: true
         type: string
         default: ''
@@ -16,25 +16,25 @@ on:
         default: ''
 
       core-dependency:
-        description: 'If a version is provided, update AEPCore dependency in gradle.properties (ex: 3.0.1).'
+        description: 'If a version is provided, update AEPCore dependency in gradle.properties (ex: 1.2.3).'
         required: false
         type: string
         default: ''
 
       edge-identity-dependency:
-        description: 'If a version is provided, update AEPEdgeIdentity dependency in gradle.properties (ex: 3.0.1).'
+        description: 'If a version is provided, update AEPEdgeIdentity dependency in gradle.properties (ex: 1.2.3).'
         required: false
         type: string
         default: ''
 
       edge-consent-dependency:
-        description: 'If a version is provided, update AEPEdgeConsent dependency in gradle.properties (ex: 3.0.1).'
+        description: 'If a version is provided, update AEPEdgeConsent dependency in gradle.properties (ex: 1.2.3).'
         required: false
         type: string
         default: ''
 
       testutils-dependency:
-        description: 'If a version is provided, update AEPTestUtils dependency in gradle.properties (ex: 3.0.1).'
+        description: 'If a version is provided, update AEPTestUtils dependency in gradle.properties (ex: 1.2.3).'
         required: false
         type: string
         default: ''

From ded116894715d15fcd208c871208dc56c5bade48 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Thu, 24 Oct 2024 16:41:23 -0700
Subject: [PATCH 09/21] Update input ordering for consistency

---
 .github/workflows/maven-release.yml  |  6 ++++--
 .github/workflows/update-version.yml | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index 35d60b40..aa81f14b 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -16,7 +16,9 @@ on:
     inputs:
       tag:
         description: 'The existing tag (version) to be released (ex: 1.2.3).'
-        required: true        
+        type: string
+        required: true
+        default: ''
 
       create-github-release:
         description: 'Create GitHub release with tag? ("false" to skip)'
@@ -26,8 +28,8 @@ on:
 
       edge-identity-dependency:
         description: 'The AEPEdgeIdentity dependency version in gradle.properties to be validated (ex: 1.2.3).'
-        required: true
         type: string
+        required: true
         default: ''
 jobs:
   publish:
diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index ca7f7cb5..2fb99be9 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -5,38 +5,38 @@ on:
     inputs:
       version:
         description: 'New version to use for the extension (ex: 1.2.3).'
-        required: true
         type: string
+        required: true
         default: ''
 
       branch:
         description: 'The target branch where the version update will be applied and the pull request will be merged into.'
-        required: true
         type: string
+        required: true
         default: ''
 
       core-dependency:
         description: 'If a version is provided, update AEPCore dependency in gradle.properties (ex: 1.2.3).'
-        required: false
         type: string
+        required: false
         default: ''
 
       edge-identity-dependency:
         description: 'If a version is provided, update AEPEdgeIdentity dependency in gradle.properties (ex: 1.2.3).'
-        required: false
         type: string
+        required: false
         default: ''
 
       edge-consent-dependency:
         description: 'If a version is provided, update AEPEdgeConsent dependency in gradle.properties (ex: 1.2.3).'
-        required: false
         type: string
+        required: false
         default: ''
 
       testutils-dependency:
         description: 'If a version is provided, update AEPTestUtils dependency in gradle.properties (ex: 1.2.3).'
-        required: false
         type: string
+        required: false
         default: ''
 
 jobs:

From 2b7b5c712a0ed24cf1b75cfdc85198d79dd6d0fd Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Thu, 24 Oct 2024 16:50:45 -0700
Subject: [PATCH 10/21] Update doc styling

---
 .github/workflows/maven-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index aa81f14b..0c8416b8 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -21,7 +21,7 @@ on:
         default: ''
 
       create-github-release:
-        description: 'Create GitHub release with tag? ("false" to skip)'
+        description: 'Create GitHub release using tag (`false` to skip).'
         type: boolean
         required: true
         default: true

From e21e4987ed9340ab76d5bca16d42a68c5c4fbfe5 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Thu, 24 Oct 2024 17:49:07 -0700
Subject: [PATCH 11/21] Fix tagged version used for update version workflow

Add code documentation to explicitly mention tags must match
---
 .github/workflows/maven-release.yml  | 4 +++-
 .github/workflows/update-version.yml | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index 0c8416b8..9aea9dba 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -35,11 +35,13 @@ jobs:
   publish:
     permissions:
         contents: write
+    # @<workflow-version-tag> refers to the tag (version) of the reusable workflow in the aepsdk-commons repository.
+    # When updating the tag here, the `workflow_tag` input to the workflow must match this value.
     uses: adobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-android-1.0.0
     with:
       tag: ${{ github.event.inputs.tag }}
       create-github-release: ${{ github.event.inputs.create-github-release == 'true' }}
       version-verify-paths: code/gradle.properties, code/edge/src/main/java/com/adobe/marketing/mobile/EdgeConstants.java
       version-verify-dependencies: AEPEdgeIdentity ${{ github.event.inputs.edge-identity-dependency }}
-      workflow_tag: gha-android-1.0.0
+      workflow_tag: gha-android-1.0.0 # This tag must match the tag used for the reusable workflow.
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index 2fb99be9..629081cc 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -44,11 +44,13 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    uses: adobe/aepsdk-commons/.github/workflows/versions.yml@version-script-update
+    # @<workflow-version-tag> refers to the tag (version) of the reusable workflow in the aepsdk-commons repository.
+    # When updating the tag here, the `workflow_tag` input to the workflow must match this value.
+    uses: adobe/aepsdk-commons/.github/workflows/versions.yml@gha-android-1.0.0
     with:
       version: ${{ github.event.inputs.version }}
       branch: ${{ github.event.inputs.branch }}
       dependencies: AEPCore ${{ github.event.inputs.core-dependency }}, AEPEdgeIdentity ${{ github.event.inputs.edge-identity-dependency }}, AEPEdgeConsent ${{ github.event.inputs.edge-consent-dependency }}, AEPTestUtils ${{ github.event.inputs.testutils-dependency }}
       paths: code/edge/src/main/java/com/adobe/marketing/mobile/EdgeConstants.java, code/gradle.properties
       update: true
-      workflow_tag: gha-android-1.0.0
+      workflow_tag: gha-android-1.0.0 # This tag must match the tag used for the reusable workflow.

From f80795b0fad28e7473c92d11d8cc04ef74073705 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:59:30 -0700
Subject: [PATCH 12/21] Add license header back to update version workflow

---
 .github/workflows/update-version.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index 629081cc..f62ae90b 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -1,3 +1,15 @@
+#
+# Copyright 2024 Adobe. All rights reserved.
+# This file is licensed 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 REPRESENTATIONS
+# OF ANY KIND, either express or implied. See the License for the specific language
+# governing permissions and limitations under the License.
+#
+
 name: Update Versions
 
 on:

From fd32eb0a09840d1ba80f8d044697b64fc99b0b21 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Tue, 29 Oct 2024 16:04:17 -0700
Subject: [PATCH 13/21] Update update version workflow input descriptions to
 better describe dependency context

---
 .github/workflows/update-version.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index f62ae90b..8f70197e 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -28,25 +28,33 @@ on:
         default: ''
 
       core-dependency:
-        description: 'If a version is provided, update AEPCore dependency in gradle.properties (ex: 1.2.3).'
+        description: > 
+          If a version is provided, update AEPCore dependency in gradle.properties (ex: 1.2.3).
+          This is a published dependency in the pom.xml file.
         type: string
         required: false
         default: ''
 
       edge-identity-dependency:
-        description: 'If a version is provided, update AEPEdgeIdentity dependency in gradle.properties (ex: 1.2.3).'
+        description: > 
+          If a version is provided, update AEPEdgeIdentity dependency in gradle.properties (ex: 1.2.3).
+          This is a published dependency in the pom.xml file.
         type: string
         required: false
         default: ''
 
       edge-consent-dependency:
-        description: 'If a version is provided, update AEPEdgeConsent dependency in gradle.properties (ex: 1.2.3).'
+        description: > 
+          If a version is provided, update AEPEdgeConsent dependency in gradle.properties (ex: 1.2.3).
+          This is a testing-only dependency.
         type: string
         required: false
         default: ''
 
       testutils-dependency:
-        description: 'If a version is provided, update AEPTestUtils dependency in gradle.properties (ex: 1.2.3).'
+        description: >
+          If a version is provided, update AEPTestUtils dependency in gradle.properties (ex: 1.2.3).
+          This is a testing-only dependency.
         type: string
         required: false
         default: ''

From 07bd89699a0cac97a48547fad9f937f77ddacf8f Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Wed, 30 Oct 2024 16:59:16 -0700
Subject: [PATCH 14/21] Update parameter name to latest

---
 .github/workflows/maven-release.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index 9aea9dba..3a3f3176 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -18,10 +18,9 @@ on:
         description: 'The existing tag (version) to be released (ex: 1.2.3).'
         type: string
         required: true
-        default: ''
 
       create-github-release:
-        description: 'Create GitHub release using tag (`false` to skip).'
+        description: 'Create GitHub release using tag.'
         type: boolean
         required: true
         default: true
@@ -30,7 +29,7 @@ on:
         description: 'The AEPEdgeIdentity dependency version in gradle.properties to be validated (ex: 1.2.3).'
         type: string
         required: true
-        default: ''
+
 jobs:
   publish:
     permissions:
@@ -41,7 +40,7 @@ jobs:
     with:
       tag: ${{ github.event.inputs.tag }}
       create-github-release: ${{ github.event.inputs.create-github-release == 'true' }}
-      version-verify-paths: code/gradle.properties, code/edge/src/main/java/com/adobe/marketing/mobile/EdgeConstants.java
-      version-verify-dependencies: AEPEdgeIdentity ${{ github.event.inputs.edge-identity-dependency }}
+      version-validation-paths: code/gradle.properties, code/edge/src/main/java/com/adobe/marketing/mobile/EdgeConstants.java
+      version-validation-dependencies: AEPEdgeIdentity ${{ github.event.inputs.edge-identity-dependency }}
       workflow_tag: gha-android-1.0.0 # This tag must match the tag used for the reusable workflow.
     secrets: inherit
\ No newline at end of file

From b44f528ed6eccf7411dd215792a704e641e463a5 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Wed, 30 Oct 2024 16:59:28 -0700
Subject: [PATCH 15/21] Switch description multiline type

---
 .github/workflows/update-version.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index 8f70197e..4859b2fb 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -28,7 +28,7 @@ on:
         default: ''
 
       core-dependency:
-        description: > 
+        description: | 
           If a version is provided, update AEPCore dependency in gradle.properties (ex: 1.2.3).
           This is a published dependency in the pom.xml file.
         type: string
@@ -36,7 +36,7 @@ on:
         default: ''
 
       edge-identity-dependency:
-        description: > 
+        description: | 
           If a version is provided, update AEPEdgeIdentity dependency in gradle.properties (ex: 1.2.3).
           This is a published dependency in the pom.xml file.
         type: string
@@ -44,7 +44,7 @@ on:
         default: ''
 
       edge-consent-dependency:
-        description: > 
+        description: | 
           If a version is provided, update AEPEdgeConsent dependency in gradle.properties (ex: 1.2.3).
           This is a testing-only dependency.
         type: string
@@ -52,7 +52,7 @@ on:
         default: ''
 
       testutils-dependency:
-        description: >
+        description: |
           If a version is provided, update AEPTestUtils dependency in gradle.properties (ex: 1.2.3).
           This is a testing-only dependency.
         type: string

From 8739d7e4f21d72af64894e95de18f819891cf808 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Wed, 30 Oct 2024 17:03:28 -0700
Subject: [PATCH 16/21] Remove default from mandatory fields to trigger error
 on empty submit

---
 .github/workflows/update-version.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index 4859b2fb..33acbd5b 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -19,13 +19,11 @@ on:
         description: 'New version to use for the extension (ex: 1.2.3).'
         type: string
         required: true
-        default: ''
 
       branch:
         description: 'The target branch where the version update will be applied and the pull request will be merged into.'
         type: string
         required: true
-        default: ''
 
       core-dependency:
         description: | 

From 6bb8b95d5e8c8496ff750649acb1c29452c68879 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Wed, 30 Oct 2024 18:10:35 -0700
Subject: [PATCH 17/21] Update to latest version of reusable workflow format

---
 .github/workflows/maven-release.yml  | 5 +----
 .github/workflows/maven-snapshot.yml | 2 +-
 .github/workflows/update-version.yml | 5 +----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index 3a3f3176..3411ec24 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -34,13 +34,10 @@ jobs:
   publish:
     permissions:
         contents: write
-    # @<workflow-version-tag> refers to the tag (version) of the reusable workflow in the aepsdk-commons repository.
-    # When updating the tag here, the `workflow_tag` input to the workflow must match this value.
-    uses: adobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-android-1.0.0
+    uses: adobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-1.0.0
     with:
       tag: ${{ github.event.inputs.tag }}
       create-github-release: ${{ github.event.inputs.create-github-release == 'true' }}
       version-validation-paths: code/gradle.properties, code/edge/src/main/java/com/adobe/marketing/mobile/EdgeConstants.java
       version-validation-dependencies: AEPEdgeIdentity ${{ github.event.inputs.edge-identity-dependency }}
-      workflow_tag: gha-android-1.0.0 # This tag must match the tag used for the reusable workflow.
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/maven-snapshot.yml b/.github/workflows/maven-snapshot.yml
index a7109994..5b06dfca 100644
--- a/.github/workflows/maven-snapshot.yml
+++ b/.github/workflows/maven-snapshot.yml
@@ -18,5 +18,5 @@ jobs:
   publish:
     permissions:
         contents: write
-    uses: adobe/aepsdk-commons/.github/workflows/android-maven-snapshot.yml@gha-android-1.0.0
+    uses: adobe/aepsdk-commons/.github/workflows/android-maven-snapshot.yml@gha-1.0.0
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index 33acbd5b..1b5f29cd 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -62,13 +62,10 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    # @<workflow-version-tag> refers to the tag (version) of the reusable workflow in the aepsdk-commons repository.
-    # When updating the tag here, the `workflow_tag` input to the workflow must match this value.
-    uses: adobe/aepsdk-commons/.github/workflows/versions.yml@gha-android-1.0.0
+    uses: adobe/aepsdk-commons/.github/workflows/versions.yml@gha-1.0.0
     with:
       version: ${{ github.event.inputs.version }}
       branch: ${{ github.event.inputs.branch }}
       dependencies: AEPCore ${{ github.event.inputs.core-dependency }}, AEPEdgeIdentity ${{ github.event.inputs.edge-identity-dependency }}, AEPEdgeConsent ${{ github.event.inputs.edge-consent-dependency }}, AEPTestUtils ${{ github.event.inputs.testutils-dependency }}
       paths: code/edge/src/main/java/com/adobe/marketing/mobile/EdgeConstants.java, code/gradle.properties
       update: true
-      workflow_tag: gha-android-1.0.0 # This tag must match the tag used for the reusable workflow.

From 768a41240060ee2e0c3e3290cfd1d9be71e10c20 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Wed, 30 Oct 2024 18:11:04 -0700
Subject: [PATCH 18/21] Apply testing config

---
 .github/workflows/maven-release.yml  | 2 +-
 .github/workflows/maven-snapshot.yml | 2 +-
 .github/workflows/update-version.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index 3411ec24..f60f9b50 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -34,7 +34,7 @@ jobs:
   publish:
     permissions:
         contents: write
-    uses: adobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-1.0.0
+    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-1.0.0
     with:
       tag: ${{ github.event.inputs.tag }}
       create-github-release: ${{ github.event.inputs.create-github-release == 'true' }}
diff --git a/.github/workflows/maven-snapshot.yml b/.github/workflows/maven-snapshot.yml
index 5b06dfca..ebb73460 100644
--- a/.github/workflows/maven-snapshot.yml
+++ b/.github/workflows/maven-snapshot.yml
@@ -18,5 +18,5 @@ jobs:
   publish:
     permissions:
         contents: write
-    uses: adobe/aepsdk-commons/.github/workflows/android-maven-snapshot.yml@gha-1.0.0
+    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-snapshot.yml@gha-1.0.0
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index 1b5f29cd..d2318285 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -62,7 +62,7 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    uses: adobe/aepsdk-commons/.github/workflows/versions.yml@gha-1.0.0
+    uses: timkimadobe/aepsdk-commons/.github/workflows/versions.yml@gha-1.0.0
     with:
       version: ${{ github.event.inputs.version }}
       branch: ${{ github.event.inputs.branch }}

From 4cbe66c7388c0637b83ca10427a7fa2d47ae03b0 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Wed, 30 Oct 2024 18:13:14 -0700
Subject: [PATCH 19/21] Update input descriptions

---
 .github/workflows/maven-release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index f60f9b50..a4abdeda 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -15,12 +15,12 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'The existing tag (version) to be released (ex: 1.2.3).'
+        description: 'The tag (version) to be released (ex: 1.2.3).'
         type: string
         required: true
 
       create-github-release:
-        description: 'Create GitHub release using tag.'
+        description: 'Create GitHub release using tag. If the provided `tag` does not exist, it will be created.'
         type: boolean
         required: true
         default: true

From 678b39b8a6faa55348f33c2a48a8ead63a8394e9 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Fri, 8 Nov 2024 13:51:53 -0800
Subject: [PATCH 20/21] Update to production tag

---
 .github/workflows/maven-release.yml  | 2 +-
 .github/workflows/maven-snapshot.yml | 2 +-
 .github/workflows/update-version.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index a4abdeda..75b648fe 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -34,7 +34,7 @@ jobs:
   publish:
     permissions:
         contents: write
-    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-1.0.0
+    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-android-3.0.0
     with:
       tag: ${{ github.event.inputs.tag }}
       create-github-release: ${{ github.event.inputs.create-github-release == 'true' }}
diff --git a/.github/workflows/maven-snapshot.yml b/.github/workflows/maven-snapshot.yml
index ebb73460..0525d06a 100644
--- a/.github/workflows/maven-snapshot.yml
+++ b/.github/workflows/maven-snapshot.yml
@@ -18,5 +18,5 @@ jobs:
   publish:
     permissions:
         contents: write
-    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-snapshot.yml@gha-1.0.0
+    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-snapshot.yml@gha-android-3.0.0
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index d2318285..d996b52d 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -62,7 +62,7 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    uses: timkimadobe/aepsdk-commons/.github/workflows/versions.yml@gha-1.0.0
+    uses: timkimadobe/aepsdk-commons/.github/workflows/versions.yml@gha-android-3.0.0
     with:
       version: ${{ github.event.inputs.version }}
       branch: ${{ github.event.inputs.branch }}

From 3f25594d317adfcbddf4c4cd2c93689ecfac2482 Mon Sep 17 00:00:00 2001
From: timkimadobe <95260439+timkimadobe@users.noreply.github.com>
Date: Fri, 8 Nov 2024 14:26:12 -0800
Subject: [PATCH 21/21] Update to final production config

---
 .github/workflows/maven-release.yml  | 2 +-
 .github/workflows/maven-snapshot.yml | 2 +-
 .github/workflows/update-version.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index 75b648fe..878451e5 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -34,7 +34,7 @@ jobs:
   publish:
     permissions:
         contents: write
-    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-android-3.0.0
+    uses: adobe/aepsdk-commons/.github/workflows/android-maven-release.yml@gha-android-3.0.0
     with:
       tag: ${{ github.event.inputs.tag }}
       create-github-release: ${{ github.event.inputs.create-github-release == 'true' }}
diff --git a/.github/workflows/maven-snapshot.yml b/.github/workflows/maven-snapshot.yml
index 0525d06a..d0dc834d 100644
--- a/.github/workflows/maven-snapshot.yml
+++ b/.github/workflows/maven-snapshot.yml
@@ -18,5 +18,5 @@ jobs:
   publish:
     permissions:
         contents: write
-    uses: timkimadobe/aepsdk-commons/.github/workflows/android-maven-snapshot.yml@gha-android-3.0.0
+    uses: adobe/aepsdk-commons/.github/workflows/android-maven-snapshot.yml@gha-android-3.0.0
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index d996b52d..c46d5e7e 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -62,7 +62,7 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    uses: timkimadobe/aepsdk-commons/.github/workflows/versions.yml@gha-android-3.0.0
+    uses: adobe/aepsdk-commons/.github/workflows/versions.yml@gha-android-3.0.0
     with:
       version: ${{ github.event.inputs.version }}
       branch: ${{ github.event.inputs.branch }}