Skip to content

Commit 51e8c2d

Browse files
vjovanovvjovanov
committed
Fix
1 parent fe665eb commit 51e8c2d

File tree

222 files changed

+705
-129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

222 files changed

+705
-129
lines changed

‎build.gradle‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,39 +43,39 @@ spotless {
4343
.sortByKeys()
4444
.version("2.9.0")
4545
}
46+
def noHeaderDirs = [
47+
'docs/**', // only .md files
48+
'metadata/**', // only .json files
49+
'**/build/**', // not relevant
50+
'**/.gradle/**', // not relevant
51+
'gradle/wrapper/**', // not relevant
52+
'gradle/header.java', // header itself
53+
'gradle/header.sh', // header itself
54+
]
55+
4656
java {
4757
target('**/*.java')
48-
targetExclude(
49-
'metadata/**', // only JSON there
50-
'**/build/**',
51-
'gradle/header.java')
58+
targetExclude(*noHeaderDirs)
5259
// Place header before package/import/module
5360
licenseHeaderFile("$rootDir/gradle/header.java", "package |import |module ")
5461
}
5562

56-
String[] noHeaderDirs = [
57-
'docs/**', // only .md files
58-
'metadata/**', // only .json files
59-
'**/build/**', // not relevant
60-
'gradle/wrapper/**', // not relevant
61-
]
6263
groovy {
6364
target('**/*.groovy')
64-
targetExclude(noHeaderDirs)
65+
targetExclude(*noHeaderDirs)
6566
// Place header before package/import
6667
licenseHeaderFile("$rootDir/gradle/header.java", "package |import ")
6768
}
6869
groovyGradle {
6970
// Build scripts (*.gradle)
7071
target('**/*.gradle')
71-
targetExclude(noHeaderDirs)
72-
targetExclude('tests/**')
72+
targetExclude(*noHeaderDirs)
7373
// Insert header at file start (works for any Gradle script layout)
7474
licenseHeaderFile("$rootDir/gradle/header.java", "(?m)^(import\\b|plugins\\b|buildscript\\b|apply\\b|rootProject\\b|pluginManagement\\b|dependencyResolutionManagement\\b)")
7575
}
7676
format('shell') {
7777
target('**/*.sh')
78-
targetExclude(noHeaderDirs)
78+
targetExclude(*noHeaderDirs)
7979
// Ensure header appears after shebang if present, else at the very top.
8080
def shHeader = file("$rootDir/gradle/header.sh").text
8181
// If file starts with a shebang and is missing the header, insert it after the shebang
@@ -223,9 +223,9 @@ tasks.register('testInfra') { t ->
223223
Options: -Pcoordinate or -Pcoordinates to specify the target; -Pparallelism to control the number of concurrent tasks.""")
224224

225225
doLast {
226-
def coordinateProp = ((project.findProperty('coordinate') ?: project.findProperty('coordinates')) ?: '').toString().trim()
226+
def coordinateProp = (project.findProperty('coordinates') ?: '').toString().trim()
227227
if (coordinateProp.isEmpty()) {
228-
throw new GradleException("Missing -Pcoordinate=<group:artifact:version|k/n|all> (or -Pcoordinates).")
228+
throw new GradleException("Missing -Pcoordinates=<group:artifact:version|k/n|all> (or -Pcoordinates).")
229229
}
230230

231231
def gradleCmd = System.getProperty("os.name").toLowerCase().contains("windows") ? "gradlew.bat" : "./gradlew"
@@ -284,13 +284,13 @@ tasks.register('testInfra') { t ->
284284

285285
tasks.register('testAllInfra') { t ->
286286
t.group = "verification"
287-
t.setDescription("Determines one artifact coordinate via generateInfrastructureChangedCoordinatesMatrix (or uses -Pcoordinate/-Pcoordinates if provided), then runs testInfra for that coordinate and also for 1/64. Options: -Pparallelism to control concurrency.")
287+
t.setDescription("Determines one artifact coordinate via generateInfrastructureChangedCoordinatesMatrix (or uses -Pcoordinates if provided), then runs testInfra for that coordinate and also for 1/64. Options: -Pparallelism to control concurrency.")
288288
doLast {
289289
def gradleCmd = System.getProperty("os.name").toLowerCase().contains("windows") ? "gradlew.bat" : "./gradlew"
290290
int parallelism = parsePositiveIntProp('parallelism', 4)
291291
println("Using parallelism=${parallelism} for testAllInfra.")
292292

293-
String artifactCoordinate = ((project.findProperty('coordinate') ?: project.findProperty('coordinates')) ?: '').toString().trim()
293+
String artifactCoordinate = (project.findProperty('coordinates') ?: '').toString().trim()
294294
if (artifactCoordinate.isEmpty()) {
295295
def matrixLogsDir = layout.buildDirectory.dir("command-logs").get().asFile
296296
matrixLogsDir.mkdirs()
@@ -309,7 +309,7 @@ tasks.register('testAllInfra') { t ->
309309
throw new GradleException("Failed to parse matrix output from ${matrixLog}: ${e.message}")
310310
}
311311
if (!artifactCoordinate) {
312-
throw new GradleException("No coordinates found in generateInfrastructureChangedCoordinatesMatrix output. Provide -Pcoordinate or -Pcoordinates to override.")
312+
throw new GradleException("No coordinates found in generateInfrastructureChangedCoordinatesMatrix output. Provide -Pcoordinates to override.")
313313
}
314314
}
315315
println("Selected artifact coordinate: ${artifactCoordinate}")
@@ -320,7 +320,7 @@ tasks.register('testAllInfra') { t ->
320320
def runTestInfraAndCheck = { String coordinate, String gradleCmdParam, int parallelismParam, File logsDirParam, def layoutParam ->
321321
def logFile = new File(logsDirParam, "testInfra-${sanitizeFileName(coordinate)}.log")
322322
runGradleTaskAndCheck(
323-
[gradleCmdParam, "testInfra", "-Pcoordinate=${coordinate}", "-Pparallelism=${parallelismParam}"],
323+
[gradleCmdParam, "testInfra", "-Pcoordinates=${coordinate}", "-Pparallelism=${parallelismParam}"],
324324
"testInfra (${coordinate})",
325325
logFile
326326
)

‎tests/src/ch.qos.logback.contrib/logback-jackson/0.1.5/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* You should have received a copy of the CC0 legalcode along with this
55
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
66
*/
7-
87
plugins {
98
id "org.graalvm.internal.tck"
109
}

‎tests/src/ch.qos.logback.contrib/logback-jackson/0.1.5/settings.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/*
2+
* Copyright and related rights waived via CC0
3+
*
4+
* You should have received a copy of the CC0 legalcode along with this
5+
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
6+
*/
17
pluginManagement {
28
def tckPath = Objects.requireNonNullElse(
39
System.getenv("GVM_TCK_TCKDIR"),

‎tests/src/ch.qos.logback.contrib/logback-json-classic/0.1.5/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* You should have received a copy of the CC0 legalcode along with this
55
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
66
*/
7-
87
plugins {
98
id "org.graalvm.internal.tck"
109
}

‎tests/src/ch.qos.logback.contrib/logback-json-classic/0.1.5/settings.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/*
2+
* Copyright and related rights waived via CC0
3+
*
4+
* You should have received a copy of the CC0 legalcode along with this
5+
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
6+
*/
17
pluginManagement {
28
def tckPath = Objects.requireNonNullElse(
39
System.getenv("GVM_TCK_TCKDIR"),

‎tests/src/ch.qos.logback/logback-classic/1.2.11/settings.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/*
2+
* Copyright and related rights waived via CC0
3+
*
4+
* You should have received a copy of the CC0 legalcode along with this
5+
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
6+
*/
17
pluginManagement {
28
def tckPath = Objects.requireNonNullElse(
39
System.getenv("GVM_TCK_TCKDIR"),

‎tests/src/ch.qos.logback/logback-classic/1.4.1/settings.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/*
2+
* Copyright and related rights waived via CC0
3+
*
4+
* You should have received a copy of the CC0 legalcode along with this
5+
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
6+
*/
17
pluginManagement {
28
def tckPath = Objects.requireNonNullElse(
39
System.getenv("GVM_TCK_TCKDIR"),

‎tests/src/com.ecwid.consul/consul-api/1.4.5/settings.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* You should have received a copy of the CC0 legalcode along with this
55
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
66
*/
7-
87
pluginManagement {
98
def tckPath = Objects.requireNonNullElse(
109
System.getenv("GVM_TCK_TCKDIR"),

‎tests/src/com.fasterxml.jackson.core/jackson-databind/2.15.2/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* You should have received a copy of the CC0 legalcode along with this
55
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
66
*/
7-
87
plugins {
98
id "org.graalvm.internal.tck"
109
}

‎tests/src/com.fasterxml.jackson.core/jackson-databind/2.15.2/settings.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/*
2+
* Copyright and related rights waived via CC0
3+
*
4+
* You should have received a copy of the CC0 legalcode along with this
5+
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
6+
*/
17
pluginManagement {
28
def tckPath = Objects.requireNonNullElse(
39
System.getenv("GVM_TCK_TCKDIR"),

0 commit comments

Comments
 (0)