core-geonetwork
core-geonetwork copied to clipboard
Upgrade springdoc to 1.7.0
Upgrade springdoc to 1.7.0
This will be required for future changes. i.e. #7594 to be able to use
additionalProperties = Schema.AdditionalPropertiesValue.TRUE,
Checklist
- [x] I have read the contribution guidelines
- [x] Pull request provided for
main
branch, backports managed with label - [x] Good housekeeping of code, cleaning up comments, tests, and documentation
- [x] Clean commit history broken into understandable chucks, avoiding big commits with hundreds of files, cautious of reformatting and whitespace changes
- [x] Clean commit messages, longer verbose messages are encouraged
- [ ] API Changes are identified in commit messages
- [ ] Testing provided for features or enhancements using automatic tests)
- [ ] User documentation provided for new features or enhancements in mannual
- [ ] Build documentation provided for development instructions in
README.md
files - [ ] Library management using
pom.xml
dependency management. Update build documentation with intended library use and library tutorials or documentation
@ianwallen please check to fix the conflicts
The backport to 4.2.x
failed:
The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1b3427a254... Upgrade springdoc to 1.7.0
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
stdout
Auto-merging pom.xml
CONFLICT (content): Merge conflict in pom.xml
Auto-merging services/src/main/java/org/fao/geonet/api/OpenApiController.java
CONFLICT (content): Merge conflict in services/src/main/java/org/fao/geonet/api/OpenApiController.java
To backport manually, run these commands in your terminal:
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.2.x 4.2.x
# Navigate to the new working tree
cd .worktrees/backport-4.2.x
# Create a new branch
git switch --create backport-7596-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 1b3427a254939a8a0c6ae32d27294f201bb06ca1,36ad5fc102f68e27666af38b871ff037d0935036,1ad0c2dec97d864c76f5d18c073c7bca9ed9fa57,cc2e34848ba87865bf0b3236f5dd6cf79f4cd845
# Push it to GitHub
git push --set-upstream origin backport-7596-to-4.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.2.x
Then, create a pull request where the base
branch is 4.2.x
and the compare
/head
branch is backport-7596-to-4.2.x
.