Skip to content

Downgrade Gradle version #1661

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.

Sign up for GitHub

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

Merged
peternied merged 7 commits into from
Mar 15, 2022
Merged

Downgrade Gradle version #1661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7d48e9a
Downgrade gradle version
peternied Mar 2, 2022
1eb32b9
Use adoptjdk and support building in one jdk and testing in another
peternied Mar 2, 2022
b195cce
Java 14 isn't avaliable from temurin, falling back to generic
peternied Mar 2, 2022
4b3d30e
Only setup jdk on non-17 versions for test
peternied Mar 2, 2022
ee0ef66
When you use expressions in an if conditional, you may omit the expre…
peternied Mar 2, 2022
1cf6394
Exclude un-instrumentable resources
peternied Mar 3, 2022
e825c26
Merge branch 'main' into downgrade-gradle
peternied Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,19 @@ jobs:

steps:

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

@cliu123 cliu123 Mar 4, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Does JDK17 not support Gradle 6.9?

@peternied peternied Mar 4, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

No it does not

@peternied peternied Mar 4, 2022 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

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

uses: actions/setup-java@v1
with:
java-version: ${{ matrix.jdk }}

- name: Set up build for JDK17 to use JKD11
if: matrix.jdk == 17
uses: actions/setup-java@v2
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 11

- name: Checkout security
uses: actions/checkout@v2

Expand All @@ -39,7 +47,7 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-

- name: Package
- name: Run Tests
run: ./gradlew clean build -Dbuild.snapshot=false -x test

- name: Perform CodeQL Analysis
Expand Down
24 changes: 20 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,21 @@ test {
maxFailures = 30
maxRetries = 5
}
jacoco {
excludes = [

@cliu123 cliu123 Mar 4, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why these dependencies need to be excluded from Jacoco?

@peternied peternied Mar 4, 2022 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

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

"com.sun.jndi.dns.*",
"com.sun.security.sasl.gsskerb.*",
"java.sql.*",
"javax.script.*",
"org.jcp.xml.dsig.internal.dom.*",
"sun.nio.cs.ext.*",
"sun.security.ec.*",
"sun.security.jgss.*",
"sun.security.pkcs11.*",
"sun.security.smartcardio.*",
"sun.util.resources.provider.*"
]
}
}

gitProperties {
Expand All @@ -246,16 +261,17 @@ gitProperties {
}

// copied from: org.opensearch.gradle.dependencies.CompileOnlyResolvePlugin
project.getConfigurations().all(configuration -> {
project.getConfigurations().all { Configuration configuration ->
if (configuration.getName().equals(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME)) {
NamedDomainObjectProvider<Configuration> resolvableCompileOnly = project.getConfigurations().register('resolveableCompileOnly');
resolvableCompileOnly.configure((c) -> {
resolvableCompileOnly.configure { c ->
c.setCanBeResolved(true);
c.setCanBeConsumed(false);
c.extendsFrom(configuration);
});
};
}
});
};



task bundle(dependsOn: jar, type: Zip) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists