Downgrade Gradle version #1661

peternied · 2022-03-02T21:13:19Z

Description

BWC tooling is built with gradle 6, which has breaking changes that are
not compatible with gradle 7. In order to support BWC tests we need to
align with the OpenSearch's gradle version for the 1.3 release.

NOTE: Merging this change into main and backporting to 1.3 so for the 2.0 release we will be at the same cadence as other plugins to avoid merge conflicts

Issues Resolved

Gradle 7 PR in OpenSearch [Backport] [1.x] Support Gradle 7 (#1609) OpenSearch#1622
Distribution build bugs encountered by plugins [Distribution Build Break] Related to upgrade to Gradle 7 opensearch-build#1247
Revert of Gradle 7 PR in OpenSearch Revert "Support Gradle 7 (#1609) (#1622)" OpenSearch#1657
Needed for Add backwards compatibility tests for automation #1417
Resolves Default CI Java Version to Java 11, run tests on 8, 14 and 17 #1502

Check List

~~New functionality includes testing~~
~~New functionality has been documented~~
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.

BWC tooling is built with gradle 6, which has breaking changes that are not compatiable with gradle 7. In order to support BWC tests we need to align with the OpenSearch's gradle version for the 1.3 release. See Also: * Gradle 7 PR in OpenSearch opensearch-project/OpenSearch#1622 * Distribution build bugs encountered by plugins opensearch-project/opensearch-build#1247 * Revert of Gradle 7 PR in OpenSearch opensearch-project/OpenSearch#1657 Signed-off-by: Peter Nied <[email protected]>

peternied · 2022-03-02T21:14:08Z

Big thanks for @VachaShah for setting me on this path to get the BWC tests working

Following example from: opensearch-project/common-utils#121 Signed-off-by: Peter Nied <[email protected]>

Signed-off-by: Peter Nied <[email protected]>

…ssion syntax Signed-off-by: Peter Nied <[email protected]>

cliu123 · 2022-03-02T23:16:26Z

Do we want to downgrade Gradle in both 1.3 and 2.0?

codecov-commenter · 2022-03-03T00:16:42Z

Codecov Report

Merging #1661 (3de18de) into main (920701e) will increase coverage by 0.02%.
The diff coverage is n/a.

❗ Current head 3de18de differs from pull request most recent head e825c26. Consider uploading reports for the commit e825c26 to get more accurate results

@@             Coverage Diff              @@
##               main    #1661      +/-   ##
============================================
+ Coverage     62.92%   62.94%   +0.02%     
- Complexity     3259     3261       +2     
============================================
  Files           253      253              
  Lines         18127    18126       -1     
  Branches       3258     3258              
============================================
+ Hits          11406    11410       +4     
+ Misses         5072     5067       -5     
  Partials       1649     1649

Impacted Files	Coverage Δ
...ecurity/ssl/rest/SecuritySSLReloadCertsAction.java	`84.78% <0.00%> (-0.33%)`	⬇️
.../dlic/auth/ldap2/LDAPConnectionFactoryFactory.java	`57.25% <0.00%> (+0.76%)`	⬆️
...ecurity/configuration/ConfigurationRepository.java	`75.27% <0.00%> (+2.19%)`	⬆️

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 920701e...e825c26. Read the comment docs.

Signed-off-by: Peter Nied <[email protected]>

peternied · 2022-03-03T23:52:36Z

Do we want to downgrade Gradle in both 1.3 and 2.0?

@cliu123 Yes - there are gradle files for tests that need to be migrated to gradle 7 before they can be pulled in. This will keep the 2.0 branch stable until those dependent changes have been done.

peternied · 2022-03-03T23:57:10Z

@opensearch-project/security Could I get another look at this PR?

cliu123 · 2022-03-04T19:09:25Z

.github/workflows/ci.yml

@@ -16,11 +16,19 @@ jobs:

    steps:

-    - name: Set up JDK
+    - name: Set up JDK for build and test
+      if: matrix.jdk != 17 


Does JDK17 not support Gradle 6.9?

No it does not

Following the example from opensearch-project/common-utils#121

cliu123 · 2022-03-04T19:26:33Z

build.gradle

@@ -224,6 +224,21 @@ test {
        maxFailures = 30
        maxRetries = 5
    }
+    jacoco {
+        excludes = [


Why these dependencies need to be excluded from Jacoco?

In JDK17 these class files are not instrumentable (I don't have the background just dealt with the error), had to remove them to prevent test failures.

None of these exclusions are classes that we implement in our code, and thus do not need to be instrumented for our coverage statistics

peternied · 2022-03-04T20:19:58Z

This change also resolves #1502

peternied · 2022-03-07T20:11:44Z

@opensearch-project/security Can I get another look at this PR?

Signed-off-by: Peter Nied <[email protected]>

peternied · 2022-03-15T15:08:07Z

This missed the 1.3 release, removed those labels. @DarshitChanpura @cliu123 please review and provide feedback so we can move forward with this PR

peternied · 2022-03-15T15:17:07Z

Addressing the @whitesource-for-github-com WhiteSource Security Check Failing in PR #1679

DarshitChanpura

White-source check fails can you please check it?

peternied · 2022-03-15T16:50:52Z

White-source check fails can you please check it?

Addressing the @whitesource-for-github-com WhiteSource Security Check Failing in PR #1679

davidlago · 2022-03-15T17:41:38Z

Wondering if we can retrigger whitesource check after that PR just merged... or perhaps just use admin to override-merge

peternied · 2022-03-15T18:17:12Z

@davidlago I just merged, when I attempted to re-run the tests it didn't retry the merge from main :/ If I was a more patient person I think rebasing + force push would be the way to go.

* Downgrade gradle version BWC tooling is built with gradle 6, which has breaking changes that are not compatiable with gradle 7. In order to support BWC tests we need to align with the OpenSearch's gradle version for the 1.3 release. See Also: * Gradle 7 PR in OpenSearch opensearch-project/OpenSearch#1622 * Distribution build bugs encountered by plugins opensearch-project/opensearch-build#1247 * Revert of Gradle 7 PR in OpenSearch opensearch-project/OpenSearch#1657 Signed-off-by: Peter Nied <[email protected]>

peternied added v1.3.0 backport 1.3 backport to 1.3 branch labels Mar 2, 2022

peternied requested a review from a team March 2, 2022 21:13

peternied self-assigned this Mar 2, 2022

davidlago previously approved these changes Mar 2, 2022

View reviewed changes

Use adoptjdk and support building in one jdk and testing in another

1eb32b9

Following example from: opensearch-project/common-utils#121 Signed-off-by: Peter Nied <[email protected]>

peternied dismissed davidlago’s stale review via 1eb32b9 March 2, 2022 22:53

peternied added 3 commits March 2, 2022 22:59

Java 14 isn't avaliable from temurin, falling back to generic

b195cce

Signed-off-by: Peter Nied <[email protected]>

Only setup jdk on non-17 versions for test

4b3d30e

Signed-off-by: Peter Nied <[email protected]>

When you use expressions in an if conditional, you may omit the expre…

ee0ef66

…ssion syntax Signed-off-by: Peter Nied <[email protected]>

Exclude un-instrumentable resources

1cf6394

Signed-off-by: Peter Nied <[email protected]>

davidlago previously approved these changes Mar 4, 2022

View reviewed changes

cliu123 reviewed Mar 4, 2022

View reviewed changes

This was referenced Mar 4, 2022

Remove support for sect571k1 as it is no longer supported by Java-17 #1620

Closed

Backwards Compatibility Tests Draft #1666

Closed

DarshitChanpura mentioned this pull request Mar 7, 2022

Default CI Java Version to Java 11, run tests on 8, 14 and 17 #1502

Closed

3 tasks

peternied removed v1.3.0 backport 1.3 backport to 1.3 branch labels Mar 15, 2022

peternied dismissed davidlago’s stale review via 3de18de March 15, 2022 15:06

Merge branch 'main' into downgrade-gradle

e825c26

Signed-off-by: Peter Nied <[email protected]>

peternied force-pushed the downgrade-gradle branch from 3de18de to e825c26 Compare March 15, 2022 15:07

DarshitChanpura approved these changes Mar 15, 2022

View reviewed changes

davidlago approved these changes Mar 15, 2022

View reviewed changes

peternied merged commit 714067e into opensearch-project:main Mar 15, 2022

peternied deleted the downgrade-gradle branch March 15, 2022 18:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Downgrade Gradle version #1661

Downgrade Gradle version #1661

peternied commented Mar 2, 2022 •

edited

Loading

peternied commented Mar 2, 2022

cliu123 commented Mar 2, 2022

codecov-commenter commented Mar 3, 2022 •

edited

Loading

peternied commented Mar 3, 2022 •

edited

Loading

peternied commented Mar 3, 2022

cliu123 Mar 4, 2022

peternied Mar 4, 2022

peternied Mar 4, 2022 •

edited

Loading

cliu123 Mar 4, 2022

peternied Mar 4, 2022 •

edited

Loading

peternied commented Mar 4, 2022

peternied commented Mar 7, 2022

peternied commented Mar 15, 2022

peternied commented Mar 15, 2022

DarshitChanpura left a comment

peternied commented Mar 15, 2022

davidlago commented Mar 15, 2022

peternied commented Mar 15, 2022

Downgrade Gradle version #1661

Downgrade Gradle version #1661

Conversation

peternied commented Mar 2, 2022 • edited Loading

Description

Issues Resolved

Check List

peternied commented Mar 2, 2022

cliu123 commented Mar 2, 2022

codecov-commenter commented Mar 3, 2022 • edited Loading

Codecov Report

peternied commented Mar 3, 2022 • edited Loading

peternied commented Mar 3, 2022

cliu123 Mar 4, 2022

Choose a reason for hiding this comment

peternied Mar 4, 2022

Choose a reason for hiding this comment

peternied Mar 4, 2022 • edited Loading

Choose a reason for hiding this comment

cliu123 Mar 4, 2022

Choose a reason for hiding this comment

peternied Mar 4, 2022 • edited Loading

Choose a reason for hiding this comment

peternied commented Mar 4, 2022

peternied commented Mar 7, 2022

peternied commented Mar 15, 2022

peternied commented Mar 15, 2022

DarshitChanpura left a comment

Choose a reason for hiding this comment

peternied commented Mar 15, 2022

davidlago commented Mar 15, 2022

peternied commented Mar 15, 2022

peternied commented Mar 2, 2022 •

edited

Loading

codecov-commenter commented Mar 3, 2022 •

edited

Loading

peternied commented Mar 3, 2022 •

edited

Loading

peternied Mar 4, 2022 •

edited

Loading

peternied Mar 4, 2022 •

edited

Loading