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

[Backport 2.x] Bump org.apache.maven:maven-model from 3.6.2 to 3.9.1 #6769

Merged
merged 1 commit into from
Mar 21, 2023

Conversation

owaiskazi19
Copy link
Member

@owaiskazi19 owaiskazi19 commented Mar 21, 2023

Description

Backport of #6753

Issues Resolved

[List any issues this PR will resolve]

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:

@owaiskazi19
Copy link
Member Author

Gradle Check (Jenkins) Run Completed with:

* **RESULT:** FAILURE ❌

* **URL:** https://build.ci.opensearch.org/job/gradle-check/12721/

* **CommitID:** [a3b954e](https://github.com/opensearch-project/OpenSearch/commit/a3b954ea91284854b2711e090107069d9aca39e1)
  Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
  Is the failure [a flaky test](https://github.com/opensearch-project/OpenSearch/blob/main/DEVELOPER_GUIDE.md#flaky-tests) unrelated to your change?

#5958

@@ -24,6 +24,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `com.google.protobuf:protobuf-java` from 3.22.0 to 3.22.2
- Bump Netty to 4.1.90.Final ([#6677](https://github.com/opensearch-project/OpenSearch/pull/6677)
- Bump `com.diffplug.spotless` from 6.15.0 to 6.17.0
- Bump `org.apache.zookeeper:zookeeper` from 3.8.0 to 3.8.1
Copy link
Collaborator

Choose a reason for hiding this comment

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

That seems to be taking changes from other backports?

Copy link
Member Author

@owaiskazi19 owaiskazi19 Mar 21, 2023

Choose a reason for hiding this comment

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

I added this to avoid conflicts and to push the change again. That's why added in the PR description to merge this PR after #6768 is merged.

Copy link
Member Author

Choose a reason for hiding this comment

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

Got the conflict eventually. Updated it

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@owaiskazi19
Copy link
Member Author

Gradle Check (Jenkins) Run Completed with:

* **RESULT:** FAILURE ❌

* **URL:** https://build.ci.opensearch.org/job/gradle-check/12726/

* **CommitID:** [494f2ce](https://github.com/opensearch-project/OpenSearch/commit/494f2ce373efc4e36e4527d140fbf5e22b8da38d)
  Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
  Is the failure [a flaky test](https://github.com/opensearch-project/OpenSearch/blob/main/DEVELOPER_GUIDE.md#flaky-tests) unrelated to your change?

#6738

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT.test {p0=pit/10_basic/Delete all}

@codecov-commenter
Copy link

Codecov Report

Merging #6769 (714b9f7) into 2.x (3c9eeb4) will increase coverage by 0.04%.
The diff coverage is 57.77%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##                2.x    #6769      +/-   ##
============================================
+ Coverage     70.46%   70.51%   +0.04%     
- Complexity    59440    59519      +79     
============================================
  Files          4806     4806              
  Lines        285284   285283       -1     
  Branches      41470    41470              
============================================
+ Hits         201034   201175     +141     
+ Misses        67451    67340     -111     
+ Partials      16799    16768      -31     
Impacted Files Coverage Δ
...e/internal/InternalDistributionBwcSetupPlugin.java 0.00% <0.00%> (ø)
...a/org/opensearch/gradle/test/DistroTestPlugin.java 0.00% <0.00%> (ø)
...eighted/put/TransportAddWeightedRoutingAction.java 25.00% <0.00%> (ø)
...ster/metadata/MetadataCreateDataStreamService.java 60.75% <0.00%> (-0.78%) ⬇️
...rch/extensions/rest/RestSendToExtensionAction.java 26.92% <0.00%> (+0.34%) ⬆️
...rc/main/java/org/opensearch/index/IndexModule.java 81.92% <0.00%> (ø)
...rc/main/java/org/opensearch/index/IndexWarmer.java 47.14% <0.00%> (ø)
...rg/opensearch/index/analysis/AnalysisRegistry.java 84.58% <0.00%> (ø)
...n/java/org/opensearch/index/translog/Translog.java 81.25% <0.00%> (-0.83%) ⬇️
...regations/bucket/composite/DoubleValuesSource.java 83.82% <0.00%> (+1.21%) ⬆️
... and 24 more

... and 494 files with indirect coverage changes

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

@owaiskazi19 owaiskazi19 merged commit 0e5d681 into opensearch-project:2.x Mar 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants