Skip to content

Conversation

@l-trotta
Copy link
Contributor

@l-trotta l-trotta commented May 2, 2025

Multiple fixes for gradle build:

  • Adds back the commons-logging dependency (previously transitive from rest-client)
  • Removes code that synchronized the rest-client version (no longer needed)
  • Updates rest-client (optional) version to current minor version (9.0.0)
  • Updates httpclient5 dependency from 5.4 to 5.4.4 because of a security issue
@l-trotta l-trotta merged commit 00676a8 into main May 2, 2025
9 checks passed
@l-trotta l-trotta deleted the dependency-fixes branch May 2, 2025 15:47
@github-actions
Copy link

github-actions bot commented May 2, 2025

The backport to 9.0 failed:

The process '/usr/bin/git' failed with exit code 1 

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-9.0 9.0 # Navigate to the new working tree cd .worktrees/backport-9.0 # Create a new branch git switch --create backport-1010-to-9.0 # Cherry-pick the merged commit of this pull request and resolve the conflicts git cherry-pick --mainline 1 00676a8e041d5d64d90ca9e5289739754c571126 # Push it to GitHub git push --set-upstream origin backport-1010-to-9.0 # Go back to the original working tree cd ../.. # Delete the working tree git worktree remove .worktrees/backport-9.0

Then, create a pull request where the base branch is 9.0 and the compare/head branch is backport-1010-to-9.0.

l-trotta added a commit that referenced this pull request May 2, 2025
* fix dependencies + pom building * add spdx
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

2 participants