Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GeoTools 32.0 update and JTS 1.20.0 update #8485

Merged
merged 1 commit into from
Nov 6, 2024
Merged

Conversation

jodygarnett
Copy link
Contributor

@jodygarnett jodygarnett commented Nov 5, 2024

This PR resolves #8183 (in response to CVE-2024-36404 ).

Checklist

  • I have read the contribution guidelines
  • Pull request provided for main branch, backports managed with label
  • Good housekeeping of code, cleaning up comments, tests, and documentation
  • Clean commit history broken into understandable chucks, avoiding big commits with hundreds of files, cautious of reformatting and whitespace changes
  • 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 manual
  • 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

This change is to support GeoCat Find catalogue.

Copy link
Contributor

@jahow jahow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I tried out several map-related features on this branch and had no issue.

Copy link
Member

@josegar74 josegar74 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've done some testing and it seems working fine, but the commit message seems not accurate: GeoTools 30.0 update

It's an update to version 32.0.

@jodygarnett can you update it?

@jodygarnett jodygarnett changed the title GeoTools 30.0 update GeoTools 32.0 update Nov 6, 2024
@jodygarnett jodygarnett changed the title GeoTools 32.0 update GeoTools 32.0 update and JTS 1.20.0 update Nov 6, 2024
@jodygarnett jodygarnett merged commit 052be18 into main Nov 6, 2024
7 checks passed
@geonetworkbuild
Copy link
Collaborator

The backport to 4.2.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply f9abda23dc... GeoTools 32.0 update and JTS 1.20.0 update
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".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging pom.xml
CONFLICT (content): Merge conflict in pom.xml

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-8485-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick f9abda23dc56ed3ef74af230a9ea031ac9ca3abe
# Push it to GitHub
git push --set-upstream origin backport-8485-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-8485-to-4.2.x.

@jodygarnett
Copy link
Contributor Author

See related #8490

Copy link

sonarcloud bot commented Nov 6, 2024

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update latest branch GeoTools 30.4 / stable branch GeoTools 29.6
4 participants