Skip to content

Commit 8865e75

Browse files
opensearch-trigger-bot[bot]reta
opensearch-trigger-bot[bot]
and
reta
authored
Update Gradle to 7.4.1 (#2078) (#2645)
* Update Gradle to 7.4.1 Signed-off-by: Andriy Redko <andriy.redko@aiven.io> * Address code review comments, added @PathSensitive(PathSensitivity.RELATIVE) where applicable Signed-off-by: Andriy Redko <andriy.redko@aiven.io> (cherry picked from commit 223efe6) Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
1 parent 7d8f9ac commit 8865e75

File tree

12 files changed

+37
-4
lines changed

12 files changed

+37
-4
lines changed

‎buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ dependencies {
112112
api 'commons-io:commons-io:2.7'
113113
api "net.java.dev.jna:jna:5.10.0"
114114
api 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
115-
api 'de.thetaphi:forbiddenapis:3.2'
115+
api 'de.thetaphi:forbiddenapis:3.3'
116116
api 'com.avast.gradle:gradle-docker-compose-plugin:0.14.12'
117117
api 'org.apache.maven:maven-model:3.6.2'
118118
api 'com.networknt:json-schema-validator:1.0.67'

‎buildSrc/src/main/groovy/org/opensearch/gradle/precommit/LicenseHeadersTask.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ import org.opensearch.gradle.AntTask
3535
import org.gradle.api.file.FileCollection
3636
import org.gradle.api.tasks.Input
3737
import org.gradle.api.tasks.InputFiles
38+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
3839
import org.gradle.api.tasks.OutputFile
40+
import org.gradle.api.tasks.PathSensitive
41+
import org.gradle.api.tasks.PathSensitivity
3942
import org.gradle.api.tasks.SkipWhenEmpty
4043

4144
import java.nio.file.Files
@@ -78,6 +81,8 @@ class LicenseHeadersTask extends AntTask {
7881
*/
7982
@InputFiles
8083
@SkipWhenEmpty
84+
@IgnoreEmptyDirectories
85+
@PathSensitive(PathSensitivity.RELATIVE)
8186
List<FileCollection> getJavaFiles() {
8287
return project.sourceSets.collect({it.allJava})
8388
}

‎buildSrc/src/main/java/org/opensearch/gradle/precommit/FilePermissionsTask.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,11 @@
4646
import org.gradle.api.GradleException;
4747
import org.gradle.api.file.FileCollection;
4848
import org.gradle.api.file.FileTree;
49+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
4950
import org.gradle.api.tasks.InputFiles;
5051
import org.gradle.api.tasks.OutputFile;
52+
import org.gradle.api.tasks.PathSensitive;
53+
import org.gradle.api.tasks.PathSensitivity;
5154
import org.gradle.api.tasks.SkipWhenEmpty;
5255
import org.gradle.api.tasks.StopExecutionException;
5356
import org.gradle.api.tasks.TaskAction;
@@ -92,6 +95,8 @@ private static boolean isExecutableFile(File file) {
9295
*/
9396
@InputFiles
9497
@SkipWhenEmpty
98+
@IgnoreEmptyDirectories
99+
@PathSensitive(PathSensitivity.RELATIVE)
95100
public FileCollection getFiles() {
96101
return GradleUtils.getJavaSourceSets(getProject())
97102
.stream()

‎buildSrc/src/main/java/org/opensearch/gradle/precommit/ForbiddenPatternsTask.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,12 @@
3737
import org.gradle.api.file.FileCollection;
3838
import org.gradle.api.file.FileTree;
3939
import org.gradle.api.plugins.JavaPluginConvention;
40+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
4041
import org.gradle.api.tasks.Input;
4142
import org.gradle.api.tasks.InputFiles;
4243
import org.gradle.api.tasks.OutputFile;
44+
import org.gradle.api.tasks.PathSensitive;
45+
import org.gradle.api.tasks.PathSensitivity;
4346
import org.gradle.api.tasks.SkipWhenEmpty;
4447
import org.gradle.api.tasks.TaskAction;
4548
import org.gradle.api.tasks.util.PatternFilterable;
@@ -100,6 +103,8 @@ public ForbiddenPatternsTask() {
100103

101104
@InputFiles
102105
@SkipWhenEmpty
106+
@IgnoreEmptyDirectories
107+
@PathSensitive(PathSensitivity.RELATIVE)
103108
public FileCollection getFiles() {
104109
return getProject().getConvention()
105110
.getPlugin(JavaPluginConvention.class)

‎buildSrc/src/main/java/org/opensearch/gradle/precommit/LoggerUsageTask.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.gradle.api.plugins.JavaPluginConvention;
3838
import org.gradle.api.tasks.CacheableTask;
3939
import org.gradle.api.tasks.Classpath;
40+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
4041
import org.gradle.api.tasks.InputFiles;
4142
import org.gradle.api.tasks.PathSensitive;
4243
import org.gradle.api.tasks.PathSensitivity;
@@ -79,6 +80,7 @@ public void setClasspath(FileCollection classpath) {
7980
@InputFiles
8081
@PathSensitive(PathSensitivity.RELATIVE)
8182
@SkipWhenEmpty
83+
@IgnoreEmptyDirectories
8284
public FileCollection getClassDirectories() {
8385
return getProject().getConvention()
8486
.getPlugin(JavaPluginConvention.class)

‎buildSrc/src/main/java/org/opensearch/gradle/precommit/ThirdPartyAuditTask.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import org.gradle.api.tasks.CacheableTask;
4848
import org.gradle.api.tasks.Classpath;
4949
import org.gradle.api.tasks.CompileClasspath;
50+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
5051
import org.gradle.api.tasks.Input;
5152
import org.gradle.api.tasks.InputFile;
5253
import org.gradle.api.tasks.InputFiles;
@@ -195,6 +196,7 @@ public Set<String> getMissingClassExcludes() {
195196

196197
@Classpath
197198
@SkipWhenEmpty
199+
@IgnoreEmptyDirectories
198200
public Set<File> getJarsToScan() {
199201
// These are SelfResolvingDependency, and some of them backed by file collections, like the Gradle API files,
200202
// or dependencies added as `files(...)`, we can't be sure if those are third party or not.

‎buildSrc/src/main/java/org/opensearch/gradle/test/rest/CopyRestApiTask.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,12 @@
4343
import org.gradle.api.file.FileTree;
4444
import org.gradle.api.plugins.JavaPluginConvention;
4545
import org.gradle.api.provider.ListProperty;
46+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
4647
import org.gradle.api.tasks.Input;
4748
import org.gradle.api.tasks.InputFiles;
4849
import org.gradle.api.tasks.OutputDirectory;
50+
import org.gradle.api.tasks.PathSensitive;
51+
import org.gradle.api.tasks.PathSensitivity;
4952
import org.gradle.api.tasks.SkipWhenEmpty;
5053
import org.gradle.api.tasks.SourceSet;
5154
import org.gradle.api.tasks.TaskAction;
@@ -112,8 +115,10 @@ public boolean isSkipHasRestTestCheck() {
112115
return skipHasRestTestCheck;
113116
}
114117

118+
@IgnoreEmptyDirectories
115119
@SkipWhenEmpty
116120
@InputFiles
121+
@PathSensitive(PathSensitivity.RELATIVE)
117122
public FileTree getInputDir() {
118123
FileTree coreFileTree = null;
119124
boolean projectHasYamlRestTests = skipHasRestTestCheck || projectHasYamlRestTests();

‎buildSrc/src/main/java/org/opensearch/gradle/test/rest/CopyRestTestsTask.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,12 @@
4343
import org.gradle.api.file.FileTree;
4444
import org.gradle.api.plugins.JavaPluginConvention;
4545
import org.gradle.api.provider.ListProperty;
46+
import org.gradle.api.tasks.IgnoreEmptyDirectories;
4647
import org.gradle.api.tasks.Input;
4748
import org.gradle.api.tasks.InputFiles;
4849
import org.gradle.api.tasks.OutputDirectory;
50+
import org.gradle.api.tasks.PathSensitive;
51+
import org.gradle.api.tasks.PathSensitivity;
4952
import org.gradle.api.tasks.SkipWhenEmpty;
5053
import org.gradle.api.tasks.SourceSet;
5154
import org.gradle.api.tasks.TaskAction;
@@ -104,8 +107,10 @@ String getSourceSetName() {
104107
return sourceSetName;
105108
}
106109

110+
@IgnoreEmptyDirectories
107111
@SkipWhenEmpty
108112
@InputFiles
113+
@PathSensitive(PathSensitivity.RELATIVE)
109114
public FileTree getInputDir() {
110115
FileTree coreFileTree = null;
111116
if (includeCore.get().isEmpty() == false) {

‎buildSrc/src/main/resources/minimumGradleVersion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.6.1
1+
7.4.1

‎gradle/missing-javadoc.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
*/
88

99
import javax.annotation.Nullable
10+
import org.gradle.api.tasks.PathSensitive;
11+
import org.gradle.api.tasks.PathSensitivity;
1012
import org.gradle.internal.jvm.Jvm
1113

1214
/**
@@ -178,6 +180,8 @@ configure([
178180
class MissingJavadocTask extends DefaultTask {
179181
@InputFiles
180182
@SkipWhenEmpty
183+
@IgnoreEmptyDirectories
184+
@PathSensitive(PathSensitivity.RELATIVE)
181185
SourceDirectorySet srcDirSet;
182186

183187
@OutputDirectory

‎gradle/wrapper/gradle-wrapper.jar

285 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
distributionBase=GRADLE_USER_HOME
1313
distributionPath=wrapper/dists
14-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
14+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip
1515
zipStoreBase=GRADLE_USER_HOME
1616
zipStorePath=wrapper/dists
17-
distributionSha256Sum=c9490e938b221daf0094982288e4038deed954a3f12fb54cbf270ddf4e37d879
17+
distributionSha256Sum=a9a7b7baba105f6557c9dcf9c3c6e8f7e57e6b49889c5f1d133f015d0727e4be

0 commit comments

Comments
 (0)