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 1325 to 2.5 #1375

Merged
merged 2 commits into from
Mar 14, 2024
Merged

Conversation

engechas
Copy link
Collaborator

Issue #, if available: opensearch-project/security-analytics#718

Description of changes:
Manually resolves backport of #1325

CheckList:

  • 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.

engechas and others added 2 commits January 16, 2024 14:24
Signed-off-by: Chase Engelbrecht <engechas@amazon.com>
Signed-off-by: Chase Engelbrecht <engechas@amazon.com>
@riysaxen-amzn
Copy link
Collaborator

let's check the failed tests

@engechas
Copy link
Collaborator Author

let's check the failed tests

Unrelated failures, example:

* What went wrong:
Execution failed for task ':alerting:compileTestKotlin'.
> Error while evaluating property 'filteredArgumentsMap' of task ':alerting:compileTestKotlin'
   > Could not resolve all dependencies for configuration ':alerting:testCompileClasspath'.

      > Conflict(s) found for the following module(s):
          - org.mockito:mockito-core between versions 5.1.0 and 4.7.0
Deprecated Gradle features were used in this build, making it incompatible with Gradle 8.0.

        Run with:
            --scan or
You can use '--warning-mode all' to show the individual deprecation warnings and determine if they come from your own scripts or plugins.
            :alerting:dependencyInsight --configuration testCompileClasspath --dependency org.mockito:mockito-core
        to get more insight on how to solve the conflict.

@engechas
Copy link
Collaborator Author

Build failures will be fixed by #1470

@engechas engechas merged commit 1c0db4c into opensearch-project:2.5 Mar 14, 2024
3 of 14 checks passed
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.

5 participants