Include Java in the @github/copilot version-bump workflow (#1576)

* Resume iterating Phase 04 and 06-01

Copy from Phase -4 branch

Define Phase 06-01

WIP Phase 06-01

Phase 06-01

About to ask for creation of yolo ready plan

Ready to execute Phase 04 plan

Ensure never to push to upstream/main

Add Java to update-copilot-dependency workflow and create agentic fix workflow

Phase One Lane: Add Java codegen, .lastmerge, POM property update, and
compile validation steps to the existing dependency bump workflow.

Phase Two Lanes:
- Lane 01: Include Java Handwritten Code Adaptation Plan in the PR body.
- Lane 02: Create java-adapt-handwritten-code-to-accept-upgrade-changes.md
  agentic workflow for automated handwritten code fixes.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Fix: fetch PR branch before existence check in update workflow

The shallow clone from actions/checkout on a feature branch does not
include remote refs for other branches. Move git fetch before the
rev-parse check so --force-with-lease push succeeds.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Fix: stash changes before checkout of existing PR branch

When the update-copilot-\ branch already exists remotely,
git checkout fails because earlier workflow steps left uncommitted
changes (package-lock.json, .lastmerge). Stash before checkout and
pop after reset to preserve the dependency/codegen work.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Prompt to generate Phase 04 plan

Ask plan generation to include remediation for gh aw hang

Separate clean and verify due to test harness clean flakiness

Bump the java-maven-deps group in /java with 7 updates (#1568)

Bumps the java-maven-deps group in /java with 7 updates:

| Package | From | To |
| --- | --- | --- |
| [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) | `2.21.3` | `2.22.0` |
| [com.fasterxml.jackson.core:jackson-annotations](https://github.com/FasterXML/jackson) | `2.21` | `2.22` |
| com.fasterxml.jackson.datatype:jackson-datatype-jsr310 | `2.21.3` | `2.22.0` |
| [org.apache.maven.plugins:maven-clean-plugin](https://github.com/apache/maven-clean-plugin) | `3.4.1` | `3.5.0` |
| [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) | `3.5.5` | `3.5.6` |
| [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) | `3.5.5` | `3.5.6` |
| [org.apache.maven.plugins:maven-enforcer-plugin](https://github.com/apache/maven-enforcer) | `3.5.0` | `3.6.3` |

Updates `com.fasterxml.jackson.core:jackson-databind` from 2.21.3 to 2.22.0
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.21 to 2.22
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.21.3 to 2.22.0

Updates `org.apache.maven.plugins:maven-clean-plugin` from 3.4.1 to 3.5.0
- [Release notes](https://github.com/apache/maven-clean-plugin/releases)
- [Commits](apache/maven-clean-plugin@maven-clean-plugin-3.4.1...maven-clean-plugin-3.5.0)

Updates `org.apache.maven.plugins:maven-failsafe-plugin` from 3.5.5 to 3.5.6
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.5.5...surefire-3.5.6)

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.5.5 to 3.5.6
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.5.5...surefire-3.5.6)

Updates `org.apache.maven.plugins:maven-enforcer-plugin` from 3.5.0 to 3.6.3
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](apache/maven-enforcer@enforcer-3.5.0...enforcer-3.6.3)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-version: 2.22.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-maven-deps
- dependency-name: com.fasterxml.jackson.core:jackson-annotations
  dependency-version: '2.22'
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-maven-deps
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
  dependency-version: 2.22.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-maven-deps
- dependency-name: org.apache.maven.plugins:maven-clean-plugin
  dependency-version: 3.5.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: java-maven-deps
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-version: 3.5.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: java-maven-deps
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-version: 3.5.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-maven-deps
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
  dependency-version: 3.6.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-maven-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

fix: move .lastmerge update after no-changes check

Relocate the java/.lastmerge write from an unconditional early step into the
PR creation step, after the 'git diff --cached --quiet' guard. This prevents
a spurious diff when the requested @github/copilot version is already current,
preserving the no-op skip path.

Also exclude java/.lastmerge from the initial 'git add -A' so it doesn't
participate in the no-changes detection, then add it explicitly after
confirming real changes exist.

Signed-off-by: Ed Burns <edburns@microsoft.com>

commit 9215a3bc9f0903a0f7e1fd5c9cdf178baa00f154
Author: Ed Burns <edburns@microsoft.com>
Date:   Thu Jun 4 14:10:10 2026 -0700

    fix: move .lastmerge update after no-changes check

    Relocate the java/.lastmerge write from an unconditional early step into the
    PR creation step, after the 'git diff --cached --quiet' guard. This prevents
    a spurious diff when the requested @github/copilot version is already current,
    preserving the no-op skip path.

    Also exclude java/.lastmerge from the initial 'git add -A' so it doesn't
    participate in the no-changes detection, then add it explicitly after
    confirming real changes exist.

    Signed-off-by: Ed Burns <edburns@microsoft.com>

* Fix: guard git stash/pop against clean working tree

When the working tree has no uncommitted changes, 'git stash' is a
no-op that creates no refs/stash entry. A subsequent 'git stash pop'
then fails under set -e, aborting the workflow step. Guard with a
diff check so we only stash/pop when there are actual changes.

Addresses review comment on PR #1576.

* Fix: write .lastmerge after commit so it points to the bumped version

java/.lastmerge must contain the SHA of a commit that includes the
updated nodejs/package.json. Previously it was written before the
commit, so it pointed to the parent (old version). Now we commit
first, then write HEAD into .lastmerge and amend.

Addresses review comment on PR #1576.

* Remove accidental pom.xml changes from this PR

The Jackson/plugin version bumps and metadata edits were already
merged to main via PRs #1568 and #1574. They appeared in this branch
due to an accidental rebase picking them up, creating spurious diffs.

Restores java/pom.xml to match main exactly.

* Fix: use grep -F for POM version verification

npm version strings contain regex metacharacters ('^' for caret
ranges, '.' in semver). Plain grep interprets these as regex
operators, causing false negatives. Switch to fixed-string
matching (-F) so the verification is reliable for any version.

Addresses review comment on PR #1576.

Author: edburns