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

Incremented version to 2.1.1. #1939

Merged
merged 2 commits into from
Jul 15, 2022

Conversation

gaiksaya
Copy link
Member

Coming from opensearch-project/opensearch-build#1818 post release activities.

Signed-off-by: Sayali Rohidas Gaikawad <gaiksaya@amazon.com>
@gaiksaya gaiksaya requested a review from a team July 13, 2022 23:43
@DarshitChanpura
Copy link
Member

@cwperks Looks like this failed due to netty version mismatch. Could this be related to the netty issue that you were working on?

FAILURE: Build failed with an exception.
* What went wrong:
Execution failed for task ':test'.
> Could not resolve all dependencies for configuration ':testRuntimeClasspath'.
Downloading https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-java8/2.13.3/jackson-modules-java8-2.13.3.pom to /home/runner/.gradle/.tmp/gradle_download11647884912109613000bin
   > Conflict(s) found for the following module(s):
       - io.netty:netty-transport-native-unix-common between versions 4.1.79.Final and 4.1.76.Final
     Run with:
         --scan or
         :dependencyInsight --configuration testRuntimeClasspath --dependency io.netty:netty-transport-native-unix-common
     to get more insight on how to solve the conflict.

@cwperks
Copy link
Member

cwperks commented Jul 14, 2022

@DarshitChanpura This is related to the netty upgrade, but its an issue with transitive dependencies of another dependency.

See the output below of running:

./gradlew :dependencyInsight --configuration testRuntimeClasspath --dependency io.netty:netty-transport-native-unix-common

io.netty:netty-transport-native-unix-common:4.1.79.Final
+--- io.netty:netty-handler:4.1.79.Final
|    +--- org.opensearch.plugin:transport-netty4-client:2.1.1-SNAPSHOT:20220713.234733-3
|    |    \--- testRuntimeClasspath
|    \--- org.apache.zookeeper:zookeeper:3.7.1 (requested io.netty:netty-handler:4.1.76.Final)
|         \--- testRuntimeClasspath
\--- org.opensearch.plugin:transport-netty4-client:2.1.1-SNAPSHOT:20220713.234733-3 (*)

io.netty:netty-transport-native-unix-common:4.1.76.Final -> 4.1.79.Final
+--- io.netty:netty-transport-classes-epoll:4.1.76.Final
|    \--- io.netty:netty-transport-native-epoll:4.1.76.Final
|         \--- org.apache.zookeeper:zookeeper:3.7.1
|              \--- testRuntimeClasspath
\--- io.netty:netty-transport-native-epoll:4.1.76.Final (*)

Looking into resolutions now.

@cliu123
Copy link
Member

cliu123 commented Jul 14, 2022

@gaiksaya Please rebase this branch against 2.1 branch when #1945 gets backported to 2.1 branch. Thanks!

@peternied
Copy link
Member

@gaiksaya Could you perform that rebase, that should unblock this version bump?

@gaiksaya
Copy link
Member Author

gaiksaya commented Jul 15, 2022

@peternied Waiting for this #1947 to merge to 2.1 since the base branch is 2.1 for this PR

@peternied
Copy link
Member

peternied commented Jul 15, 2022

@gaiksaya I should have been reviewing PRs in the other order, #1947 has been merged. You should be unblocked

@codecov-commenter
Copy link

codecov-commenter commented Jul 15, 2022

Codecov Report

Merging #1939 (4e18c5d) into 2.1 (167a05d) will increase coverage by 0.05%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##                2.1    #1939      +/-   ##
============================================
+ Coverage     60.99%   61.05%   +0.05%     
- Complexity     3232     3238       +6     
============================================
  Files           256      256              
  Lines         18088    18088              
  Branches       3224     3224              
============================================
+ Hits          11033    11043      +10     
+ Misses         5471     5463       -8     
+ Partials       1584     1582       -2     
Impacted Files Coverage Δ
...a/org/opensearch/security/tools/SecurityAdmin.java 37.56% <0.00%> (+0.24%) ⬆️
...search/security/transport/SecurityInterceptor.java 76.15% <0.00%> (+0.76%) ⬆️
...iance/ComplianceIndexingOperationListenerImpl.java 62.31% <0.00%> (+1.44%) ⬆️
...security/auditlog/sink/ExternalOpenSearchSink.java 61.72% <0.00%> (+2.46%) ⬆️
...nsearch/security/dlic/rest/api/AuditApiAction.java 68.08% <0.00%> (+4.25%) ⬆️
...ecurity/configuration/StaticResourceException.java 25.00% <0.00%> (+25.00%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 167a05d...4e18c5d. Read the comment docs.

@gaiksaya
Copy link
Member Author

Hey! looks like code-ql workflow is failing with below error:

  Error: ref 'refs/heads/increment-to-2.1.1' not found in this repository
  RequestError [HttpError]: ref 'refs/heads/increment-to-2.1.1' not found in this repository

@peternied peternied merged commit f484e1a into opensearch-project:2.1 Jul 15, 2022
@gaiksaya gaiksaya deleted the increment-to-2.1.1 branch July 15, 2022 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants