Remove Pom task dependenices rewrite#4178
Merged
cwperks merged 1 commit intoopensearch-project:mainfrom Mar 27, 2024
Merged
Conversation
The underlying issue associated with Pom validation was fixed in OpenSearch [1], this causes the 'hack' that was used to unblock pom generation in security to start causing problems in the distribution builds. - [1] opensearch-project/OpenSearch#12807 Signed-off-by: Peter Nied <peternied@hotmail.com>
c67e6d4 to
a11f30e
Compare
reta
approved these changes
Mar 27, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #4178 +/- ##
==========================================
+ Coverage 65.90% 65.93% +0.02%
==========================================
Files 298 298
Lines 21425 21425
Branches 3475 3475
==========================================
+ Hits 14121 14126 +5
+ Misses 5563 5557 -6
- Partials 1741 1742 +1 |
willyborankin
approved these changes
Mar 27, 2024
cwperks
approved these changes
Mar 27, 2024
Member
|
@peternied Does this need to be backported? |
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-4178-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 dc8bd61a8df01b32805ddde0b6f6c6010eeca5cf
# Push it to GitHub
git push --set-upstream origin backport/backport-4178-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.xThen, create a pull request where the |
peternied
added a commit
to peternied/security
that referenced
this pull request
Mar 28, 2024
Backport dc8bd61 from opensearch-project#4178 Signed-off-by: Peter Nied <peternied@hotmail.com> (cherry picked from commit dc8bd61)
3 tasks
peternied
added a commit
to peternied/security
that referenced
this pull request
Mar 28, 2024
Backport dc8bd61 from opensearch-project#4178 Signed-off-by: Peter Nied <petern@amazon.com> Signed-off-by: Peter Nied <peternied@hotmail.com> (cherry picked from commit dc8bd61)
reta
pushed a commit
that referenced
this pull request
Mar 28, 2024
dlin2028
pushed a commit
to dlin2028/security
that referenced
this pull request
May 1, 2024
### Description The underlying issue associated with Pom validation was fixed in OpenSearch [1], this causes the 'hack' that was used to unblock pom generation in security to start causing problems in the distribution builds. - [1] opensearch-project/OpenSearch#12807 ### Issues Resolved - Fixes opensearch-project#4160 ### Testing Added new CI test that executes the same job used by the distribution build and checks the expected artifacts exist ### Check List - [X] New functionality includes testing - [ ] ~New functionality has been documented~ - [X] Commits are signed per the DCO using --signoff 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin). Signed-off-by: Peter Nied <peternied@hotmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
The underlying issue associated with Pom validation was fixed in OpenSearch [1], this causes the 'hack' that was used to unblock pom generation in security to start causing problems in the distribution builds.
Issues Resolved
Testing
Added new CI test that executes the same job used by the distribution build and checks the expected artifacts exist
Check List
New functionality has been documentedBy 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.