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 nebula-publishing-plugin to 19.2.0 #5704

Merged
merged 1 commit into from
Jan 6, 2023

Conversation

reta
Copy link
Collaborator

@reta reta commented Jan 4, 2023

Signed-off-by: Andriy Redko andriy.redko@aiven.io

Description

Update nebula-publishing-plugin to 19.2.0

Issues Resolved

Closes #5702

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

github-actions bot commented Jan 4, 2023

Gradle Check (Jenkins) Run Completed with:

@reta
Copy link
Collaborator Author

reta commented Jan 4, 2023

@tlfeng FYI :)

@github-actions
Copy link
Contributor

github-actions bot commented Jan 4, 2023

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Jan 4, 2023

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Jan 4, 2023

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@github-actions
Copy link
Contributor

github-actions bot commented Jan 5, 2023

Gradle Check (Jenkins) Run Completed with:

@reta reta requested a review from xuezhou25 as a code owner January 5, 2023 14:19
@@ -108,8 +109,12 @@ public String call() throws Exception {
// Here we manually add any project dependencies in the "shadow" configuration to our generated POM
publication.getPom().withXml(xml -> {
Node root = xml.asNode();
root.appendNode("name", project.getName());
root.appendNode("description", project.getDescription());
if (((NodeList) root.get("name")).isEmpty()) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

May conflict with com.netflix.nebula.maven-base-publish which adds name and description properties

@github-actions
Copy link
Contributor

github-actions bot commented Jan 5, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.indices.replication.SegmentReplicationIT.testStartReplicaAfterPrimaryIndexesDocs

@codecov-commenter
Copy link

Codecov Report

Merging #5704 (ea512e3) into main (28e9b11) will increase coverage by 0.08%.
The diff coverage is 56.66%.

@@             Coverage Diff              @@
##               main    #5704      +/-   ##
============================================
+ Coverage     70.98%   71.07%   +0.08%     
- Complexity    58669    58675       +6     
============================================
  Files          4763     4764       +1     
  Lines        279945   279969      +24     
  Branches      40418    40423       +5     
============================================
+ Hits         198731   198998     +267     
+ Misses        64988    64705     -283     
- Partials      16226    16266      +40     
Impacted Files Coverage Δ
.../opensearch/gradle/plugin/PluginBuildPlugin.groovy 36.28% <0.00%> (ø)
...a/org/opensearch/test/OpenSearchIntegTestCase.java 56.35% <0.00%> (-0.32%) ⬇️
...main/java/org/opensearch/gradle/PublishPlugin.java 43.13% <33.33%> (-0.30%) ⬇️
...pensearch/common/settings/FeatureFlagSettings.java 50.00% <50.00%> (ø)
.../java/org/opensearch/common/util/FeatureFlags.java 80.00% <88.88%> (+30.00%) ⬆️
.../java/org/opensearch/gradle/pluginzip/Publish.java 11.62% <100.00%> (ø)
...org/opensearch/common/settings/SettingsModule.java 85.81% <100.00%> (+0.29%) ⬆️
server/src/main/java/org/opensearch/node/Node.java 87.17% <100.00%> (+0.01%) ⬆️
...main/java/org/opensearch/ingest/ProcessorInfo.java 21.05% <0.00%> (-47.37%) ⬇️
...pensearch/indices/breaker/CircuitBreakerStats.java 27.77% <0.00%> (-41.67%) ⬇️
... and 501 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@mch2
Copy link
Member

mch2 commented Jan 5, 2023

Muting this SR test - #5714

@reta reta merged commit 3b51bc5 into opensearch-project:main Jan 6, 2023
@reta reta added the backport 2.x Backport to 2.x branch label Jan 6, 2023
@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-5704-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3b51bc5bead2fde9674f8f989a8a390f9ecfa451
# Push it to GitHub
git push --set-upstream origin backport/backport-5704-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-5704-to-2.x.

reta added a commit to reta/OpenSearch that referenced this pull request Jan 6, 2023
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
reta added a commit that referenced this pull request Jan 10, 2023
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
kotwanikunal pushed a commit that referenced this pull request Jan 25, 2023
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@mch2 mch2 added backport 1.x backport 1.3 Backport to 1.3 branch labels May 8, 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-5704-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3b51bc5bead2fde9674f8f989a8a390f9ecfa451
# Push it to GitHub
git push --set-upstream origin backport/backport-5704-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-5704-to-1.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-5704-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3b51bc5bead2fde9674f8f989a8a390f9ecfa451
# Push it to GitHub
git push --set-upstream origin backport/backport-5704-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-5704-to-1.3.

mch2 pushed a commit to mch2/OpenSearch that referenced this pull request May 8, 2023
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 3b51bc5)
mch2 pushed a commit to mch2/OpenSearch that referenced this pull request May 8, 2023
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 3b51bc5)
Signed-off-by: Marc Handalian <handalm@amazon.com>
mch2 pushed a commit to mch2/OpenSearch that referenced this pull request May 8, 2023
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 3b51bc5)
Signed-off-by: Marc Handalian <handalm@amazon.com>
mch2 pushed a commit to mch2/OpenSearch that referenced this pull request May 8, 2023
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 3b51bc5)
Signed-off-by: Marc Handalian <handalm@amazon.com>
mch2 pushed a commit to mch2/OpenSearch that referenced this pull request May 8, 2023
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 3b51bc5)
Signed-off-by: Marc Handalian <handalm@amazon.com>
kotwanikunal pushed a commit to kotwanikunal/OpenSearch that referenced this pull request Jun 22, 2023
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 3b51bc5)
kotwanikunal pushed a commit to kotwanikunal/OpenSearch that referenced this pull request Jun 22, 2023
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 3b51bc5)
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update nebula-publishing-plugin to 19.2.0
4 participants