Skip to content

Conversation

@joakime
Copy link
Contributor

@joakime joakime commented Mar 17, 2025

This is a minimal commit version of PR #12583 with an eye on preserving git history via manual move/renames.

Fixes #10437

@joakime joakime requested a review from gregw March 17, 2025 19:08
@joakime joakime requested a review from sbordet March 17, 2025 19:17
@joakime joakime self-assigned this Mar 17, 2025
@joakime joakime changed the title Simplify jetty-deploy with eye on Environment use Issue #10437 - Simplify jetty-deploy with eye on Environment use Mar 17, 2025
@joakime joakime moved this to 👀 In review in Jetty 12.1.0 - (FROZEN) Mar 17, 2025
@joakime joakime linked an issue Mar 17, 2025 that may be closed by this pull request
@joakime
Copy link
Contributor Author

joakime commented Mar 17, 2025

I have been comparing the HEAD of the two branches with the following technique...

I have 2 git clones.
One clone directory called 12.1.x with checkout of branch fix/12.1.x/unify-deploy
Other clone directory called 12.1.x.alt with checkout of branch fix/12.1.x/deploy-refactor-minimal-commits
Then run the following command line from the parent directory of both.

$ cat diff-exclude.log 
target
*.iml
.idea
.git
*.log
*.versionsBackup
*.orig
*.rej
reports
*.swp
*.patch
*.diff
$ diff -u -r --exclude-from=diff-exclude.log 12.1.x 12.1.x.alt

@joakime joakime merged commit b05a2d0 into jetty-12.1.x Mar 18, 2025
10 checks passed
@github-project-automation github-project-automation bot moved this from 👀 In review to ✅ Done in Jetty 12.1.0 - (FROZEN) Mar 18, 2025
@joakime joakime deleted the fix/12.1.x/deploy-refactor-minimal-commits branch March 18, 2025 11:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

No open projects
Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

Review DeploymentManager and ScanningAppProvider

3 participants