Update build to Gradle 7.0 #68506
Merged
Update build to Gradle 7.0 #68506
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
breskeby
added
:Delivery/Build
breskeby
force-pushed
the
update-gradle-wrapper-7-0
branch
from
7a76725 to
b3b8b6a
Compare
breskeby
force-pushed
the
update-gradle-wrapper-7-0
branch
2 times, most recently
from
a976292 to
4c52e0d
Compare
breskeby
force-pushed
the
update-gradle-wrapper-7-0
branch
2 times, most recently
from
2b90ae0 to
d147f9d
Compare
|
currently blocked by gradle/gradle#15566 |
breskeby
force-pushed
the
update-gradle-wrapper-7-0
branch
2 times, most recently
from
7856bff to
c2416a4
Compare
|
currently blocked by nebula-plugins/gradle-ospackage-plugin#393 |
breskeby
force-pushed
the
update-gradle-wrapper-7-0
branch
3 times, most recently
from
01720b6 to
72e31ac
Compare
breskeby
force-pushed
the
update-gradle-wrapper-7-0
branch
from
7361550 to
16bd490
Compare
|
@elasticmachine test this please |
breskeby
force-pushed
the
update-gradle-wrapper-7-0
branch
3 times, most recently
from
432c16e to
726bda6
Compare
breskeby
force-pushed
the
update-gradle-wrapper-7-0
branch
from
726bda6 to
46a92dd
Compare
breskeby
force-pushed
the
update-gradle-wrapper-7-0
branch
from
2281583 to
e9b7574
Compare
breskeby
commented
Apr 10, 2021
| @@ -283,7 +283,7 @@ allprojects { | |||
| } | |||
| } | |||
| boolean hasShadow = project.plugins.hasPlugin(ShadowPlugin) | |||
| project.configurations.compile.dependencies | |||
There was a problem hiding this comment.
deprecated compile has been removed.
This should have been replaced before but now ultimately caused the build to fail
breskeby
commented
Apr 10, 2021
| @@ -30,13 +30,13 @@ class SnippetsTask extends DefaultTask { | |||
| private static final String SCHAR = /(?:\\\/|[^\/])/ | |||
| private static final String SUBSTITUTION = /s\/($SCHAR+)\/($SCHAR*)\// | |||
| private static final String CATCH = /catch:\s*((?:\/[^\/]+\/)|[^ \]]+)/ | |||
| private static final String SKIP = /skip:([^\]]+)/ | |||
| private static final String SKIP_REGEX = /skip:([^\]]+)/ | |||
There was a problem hiding this comment.
$SKIP seems like a reserved term in Groovy 3.0 and caused trouble here. Therefore the renaming
breskeby
commented
Apr 10, 2021
| @@ -37,20 +36,6 @@ public void apply(Project project) { | |||
| * Adds repositories used by ES projects and dependencies | |||
| */ | |||
| public static void configureRepositories(Project project) { | |||
| // ensure all repositories use secure urls | |||
| // TODO: remove this with gradle 7.0, which no longer allows insecure urls | |||
There was a problem hiding this comment.
Resolving this TODO by removing the extra logic for http checks
breskeby
commented
Apr 10, 2021
| @@ -38,14 +43,19 @@ public void apply(Project project) { | |||
| t.copy("test/ssl/test-node.jks"); | |||
| t.setOutputDir(keyStoreDir); | |||
| }); | |||
|
|
|||
| project.getPlugins() | |||
There was a problem hiding this comment.
Make implicit dependencies explicit
breskeby
commented
Apr 10, 2021
| @@ -55,6 +56,13 @@ public void prepare() { | |||
| task = createDependencyLicensesTask(project); | |||
| updateShas = createUpdateShasTask(project, task); | |||
| dependency = project.getDependencies().localGroovy(); | |||
| task.configure(new Action<DependencyLicensesTask>() { | |||
There was a problem hiding this comment.
Groovy is shipped with different artefacts now
breskeby
commented
Apr 10, 2021
| @@ -163,7 +163,7 @@ subprojects { | |||
| java { | |||
| // Normally this isn't necessary, but we have Java sources in | |||
| // non-standard places | |||
| target '**/*.java' | |||
| target 'src/**/*.java' | |||
There was a problem hiding this comment.
narrow down the tasks inputs here to avoid implicit dependencies on others tasks output we do not want here (and is deprecated with gradle 7.0)
breskeby
commented
Apr 10, 2021
| @@ -68,7 +68,9 @@ dependencies { | |||
| // Set the keytab files in the classpath so that we can access them from test code without the security manager | |||
| // freaking out. | |||
| if (isEclipse == false) { | |||
| testRuntimeOnly files(project(':test:fixtures:krb5kdc-fixture').ext.krb5Keytabs("hdfs", "hdfs_hdfs.build.elastic.co.keytab").parent) | |||
| testRuntimeOnly files(project(':test:fixtures:krb5kdc-fixture').ext.krb5Keytabs("hdfs", "hdfs_hdfs.build.elastic.co.keytab").parent) { | |||
| builtBy ":test:fixtures:krb5kdc-fixture:preProcessFixture" | |||
There was a problem hiding this comment.
make task dependency explicit
breskeby
commented
Apr 10, 2021
| @@ -80,7 +80,7 @@ artifacts { | |||
|
|
|||
| tasks.register("extractNativeLicenses", Copy) { | |||
| dependsOn configurations.nativeBundle | |||
| into "${buildDir}" | |||
| into "${buildDir}/extractedNativeLicenses" | |||
There was a problem hiding this comment.
use a dedicated output folder for extracted native licenses. This avoids not having the whole buildDir considered a task output here
|
Pinging @elastic/es-delivery (Team:Delivery) |
|
@elasticmachine run elasticsearch-ci/2 |
|
I'll look into elasticsearch-hadoop build first before merging this to ensure elasticsearch-hadoop is ready to be updated to 7.0 too |
|
Elastic-hadoop PR has been created here: elastic/elasticsearch-hadoop#1641 |
mark-vieira
approved these changes
Apr 12, 2021
| maven { url 'https://jitpack.io' } | ||
| } | ||
| dependencies { | ||
| classpath "com.github.breskeby:gradle-ospackage-plugin:ddb72a9922b934033827d48d296f7f3d470ac422" |
There was a problem hiding this comment.
Why do we need to fork this?
There was a problem hiding this comment.
I'm waiting for a release of the ospackage plugin that includes my PR that fixed a stackoverflow within the plugin: nebula-plugins/gradle-ospackage-plugin#397
breskeby
added a commit
to breskeby/elasticsearch
that referenced
this pull request
Apr 13, 2021
- Update gradle wrapper to gradle 7.0 - Remove deprecated usages to make build 7.0 compatible - Fix excludes in docs snippet tasks (See gradle/gradle#16160 for details) - Fix deprecation warnings in 7.0 - Add explicit dependencies that have been missed - Make extract native licenses tasks output dir more explicit - Use a snapshot of the ospackage plugin that includes a fix for 7.0 already - fix test runtime classpath setup in repository-hdfs - Make task dependency explicit to fix further deprecation warnings - Remove manual check for http repo usages that has been deprecated in gradle 7.0 - Update spock to latest 2.0 milestone required for groovy 3
breskeby
added a commit
to breskeby/elasticsearch
that referenced
this pull request
Apr 14, 2021
- Update gradle wrapper to gradle 7.0 - Remove deprecated usages to make build 7.0 compatible - Fix excludes in docs snippet tasks (See gradle/gradle#16160 for details) - Fix deprecation warnings in 7.0 - Add explicit dependencies that have been missed - Make extract native licenses tasks output dir more explicit - Use a snapshot of the ospackage plugin that includes a fix for 7.0 already - fix test runtime classpath setup in repository-hdfs - Make task dependency explicit to fix further deprecation warnings - Remove manual check for http repo usages that has been deprecated in gradle 7.0 - Update spock to latest 2.0 milestone required for groovy 3
breskeby
added a commit
that referenced
this pull request
Apr 14, 2021
- Update gradle wrapper to gradle 7.0 - Remove deprecated usages to make build 7.0 compatible - Fix excludes in docs snippet tasks (See gradle/gradle#16160 for details) - Fix deprecation warnings in 7.0 - Add explicit dependencies that have been missed - Make extract native licenses tasks output dir more explicit - Use a snapshot of the ospackage plugin that includes a fix for 7.0 already - fix test runtime classpath setup in repository-hdfs - Make task dependency explicit to fix further deprecation warnings - Remove manual check for http repo usages that has been deprecated in gradle 7.0 - Update spock to latest 2.0 milestone required for groovy 3 - Disable module inference in Eclipse (#71649) We recently upgrade to gradle 7.0 (#69096) which turned on module inference by default. I'm sure that's lovely, but its broken eclipse. We should probably support modules one day, but that day ain't today. This turns off module inference for eclipse so it can continue compiling things just like it did yesterday. Co-authored-by: Nik Everett <nik9000@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Gradle 7.0 GA has been released. We want to stay on the latest released Gradle version for our elasticsearch builds.
This updates our build to use Gradle 7.0 and applies some required changes to make our build compatible with the latest Gradle version.
Most of the heavy lifting to support 7.0 have been merged into master already in earlier separated PRs.
As this is a bigger change I also triggered a few other CI builds to get more reassurance than usual: