[rismehta]

Description

Merge all current dev changes into master after #2017 was merged.

• Promotion merge commit: fee58aedf12f08fe0718c04f3a3d03a02e9ad213.
• First parent (master): 66f7740aef1d4f940a427574f6903882f9756885.
• Second parent (dev): 6dae19c8d387ec3fb1c629524c260ea4a6dec6b9.

The three-file net change promotes the @aemforms/af-core manifest update to ^1.0.11, its exact committed lockfile from dev (including af-core/af-formatters 1.0.11 and removal of stale extraneous local-workspace entries), and complete removal of .github/workflows/sync-pr.yml.

Conflict resolution: master had added a condition to the resync workflow, while dev deleted the file. Keep the intentional complete deletion requested in #2017. No other conflicts occurred.

Master's existing cooldown exemption, target-branch: dev, CI configuration, release history, 3.0.175-SNAPSHOT project versions, README, and version history are retained. No packages are published or auto-merged.

Merge strategy: use Create a merge commit, not squash/rebase, to preserve the integrated development-branch ancestry. Use GitHub's Update branch for future branch synchronization.

Related Issue

#2013

Promotes #2017; preserves the existing policy from #2016.

Motivation and Context

Promote the complete latest development branch after the released runtime update and resync removal were merged. This retains master-only configuration rather than replacing master with the development tree.

How Has This Been Tested?

• Passed: mvn -B -o -Pcloud,build-cypress validate on the merged tree; all 19 reactor modules validate successfully.
• Passed: git diff --cached --check before committing the merge.
• Passed: git merge-base --is-ancestor adobe/master HEAD and git merge-base --is-ancestor adobe/dev HEAD; both branch snapshots are ancestors of the merge commit.
• Passed: git diff --exit-code adobe/master HEAD -- .github/dependabot.yml pom.xml parent/pom.xml VERSIONS.md README.md; master policy, parent/reactor release configuration, and release documentation are unchanged.
• Passed: JSON/YAML merge-contract checks confirm manifest/lockfile byte equality with dev, ^1.0.11 in both manifest and lockfile root, af-core/af-formatters 1.0.11 in both lockfile representations, unchanged master cooldown configuration with PR target dev, complete resync workflow deletion, exactly three changed files, and no unresolved conflicts. Dependabot configuration also validates against its SchemaStore schema.

Not run locally: full Java unit suites, frontend build, or AEM/Cypress application suites. The promotion commit requires its own CI run; validation above is not a claim that the full new workflow has passed.

Screenshots (if appropriate):

Not applicable; branch promotion.

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• I have signed the Adobe Open Source CLA.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes and the overall coverage did not decrease.
• All unit tests pass on CircleCi.
• I ran all tests locally and they pass.

[adobe-bot]

Accessibility Violations Found

Id	Impact
aria-required-attr	critical
empty-heading	minor
label-title-only	serious
target-size	serious

[adobe-bot]

Accessibility Violations Found

Id	Impact
aria-required-attr	critical
empty-heading	minor
label-title-only	serious
page-has-heading-one	moderate
target-size	serious

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!