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

Update Joda to 2.12.2 #6083

Merged
merged 1 commit into from
Jan 30, 2023
Merged

Update Joda to 2.12.2 #6083

merged 1 commit into from
Jan 30, 2023

Conversation

reta
Copy link
Collaborator

@reta reta commented Jan 30, 2023

Signed-off-by: Andriy Redko [email protected]

Description

Update Joda to 2.12.2

Issues Resolved

N/A

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@kotwanikunal
Copy link
Member

@reta I think you need to rebase/update the changelog.

Signed-off-by: Andriy Redko <[email protected]>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta reta merged commit 3e3b155 into opensearch-project:main Jan 30, 2023
@reta reta added backport 1.x backport 2.x Backport to 2.x branch backport 1.3 Backport to 1.3 branch backport 2.5 dependencies Pull requests that update a dependency file labels Jan 30, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

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

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

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-6083-to-1.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-6083-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

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

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

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.5 failed:

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

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

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

reta added a commit to reta/OpenSearch that referenced this pull request Jan 30, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 3e3b155)
reta added a commit to reta/OpenSearch that referenced this pull request Jan 30, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 3e3b155)
reta added a commit to reta/OpenSearch that referenced this pull request Jan 30, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 3e3b155)
Signed-off-by: Andriy Redko <[email protected]>
reta added a commit to reta/OpenSearch that referenced this pull request Jan 30, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 3e3b155)
Signed-off-by: Andriy Redko <[email protected]>
reta added a commit to reta/OpenSearch that referenced this pull request Jan 30, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 3e3b155)
Signed-off-by: Andriy Redko <[email protected]>
andrross pushed a commit that referenced this pull request Jan 30, 2023
(cherry picked from commit 3e3b155)

Signed-off-by: Andriy Redko <[email protected]>
reta added a commit that referenced this pull request Jan 31, 2023
(cherry picked from commit 3e3b155)

Signed-off-by: Andriy Redko <[email protected]>
reta added a commit to reta/OpenSearch that referenced this pull request Jan 31, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 3e3b155)
Signed-off-by: Andriy Redko <[email protected]>
reta added a commit to reta/OpenSearch that referenced this pull request Jan 31, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 3e3b155)
Signed-off-by: Andriy Redko <[email protected]>
reta added a commit to reta/OpenSearch that referenced this pull request Jan 31, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 3e3b155)
Signed-off-by: Andriy Redko <[email protected]>
andrross pushed a commit that referenced this pull request Jan 31, 2023
(cherry picked from commit 3e3b155)

Signed-off-by: Andriy Redko <[email protected]>
andrross pushed a commit that referenced this pull request Jan 31, 2023
(cherry picked from commit 3e3b155)

Signed-off-by: Andriy Redko <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport 1.3 Backport to 1.3 branch backport 2.x Backport to 2.x branch backport 2.5 dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants