Skip to content

Commit a7b5a3b

Browse files
author
Tara Drwenski
committed
Gradle whitespace fixes
1 parent 0f799c5 commit a7b5a3b

File tree

8 files changed

+99
-99
lines changed

8 files changed

+99
-99
lines changed

Diff for: dap4/d4servlet/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apply from: "$rootDir/gradle/any/dependencies.gradle"
22
apply from: "$rootDir/gradle/any/java-published.gradle"
33

44
dependencies {
5-
implementation enforcedPlatform(project(':tds-platform'))
5+
implementation enforcedPlatform(project(':tds-platform'))
66

7-
implementation 'edu.ucar:dap4'
8-
implementation 'edu.ucar:httpservices'
9-
implementation 'edu.ucar:cdm-core'
7+
implementation 'edu.ucar:dap4'
8+
implementation 'edu.ucar:httpservices'
9+
implementation 'edu.ucar:cdm-core'
1010

11-
compileOnly 'jakarta.servlet:jakarta.servlet-api'
12-
compileOnly 'org.slf4j:slf4j-api'
11+
compileOnly 'jakarta.servlet:jakarta.servlet-api'
12+
compileOnly 'org.slf4j:slf4j-api'
1313
}

Diff for: dap4/d4ts/build.gradle

+13-13
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ apply from: "$rootDir/gradle/any/war-published.gradle"
33
apply from: "$rootDir/gradle/any/gretty.gradle"
44

55
dependencies {
6-
implementation enforcedPlatform(project(':tds-platform'))
6+
implementation enforcedPlatform(project(':tds-platform'))
77

8-
implementation 'edu.ucar:dap4'
9-
implementation project(":dap4:d4servlet")
8+
implementation 'edu.ucar:dap4'
9+
implementation project(":dap4:d4servlet")
1010

11-
providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.javaxServletApi}"
11+
providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.javaxServletApi}"
1212

13-
compileOnly 'org.slf4j:slf4j-api'
13+
compileOnly 'org.slf4j:slf4j-api'
1414

15-
runtime 'org.apache.logging.log4j:log4j-slf4j-impl'
16-
runtime 'org.apache.logging.log4j:log4j-web'
15+
runtime 'org.apache.logging.log4j:log4j-slf4j-impl'
16+
runtime 'org.apache.logging.log4j:log4j-web'
1717

18-
compileOnly 'org.slf4j:slf4j-api'
18+
compileOnly 'org.slf4j:slf4j-api'
1919
}
2020

2121
// This specifies the resources from ":dap4" that we need to include in the d4ts war and inplaceWebapp.
@@ -57,10 +57,10 @@ war {
5757
}
5858

5959
gretty {
60-
httpPort = 8083
61-
contextPath = '/d4ts'
60+
httpPort = 8083
61+
contextPath = '/d4ts'
6262

63-
afterEvaluate {
64-
prepareInplaceWebAppFolder.with d4testsResourcesCopySpec
65-
}
63+
afterEvaluate {
64+
prepareInplaceWebAppFolder.with d4testsResourcesCopySpec
65+
}
6666
}

Diff for: gradle/root/publishing.gradle

+28-28
Original file line numberDiff line numberDiff line change
@@ -114,39 +114,39 @@ def publishDownloadsTask = tasks.register('publishDownloads', PublishToRawRepoTa
114114
publish.dependsOn publishDownloadsTask
115115

116116
def publishReleaseInfoAndLatestTask = tasks.register('publishReleaseInfoAndLatest', PublishToRawRepoTask) {
117-
group = 'publishing'
118-
description = 'Publish release_info.json and startup/latest.xml to Nexus downloads.'
119-
host = 'https://artifacts.unidata.ucar.edu/'
120-
repoName = 'downloads-tds'
121-
122-
publishSrc = new File(rootProject.getProjectDir(), "project-files/downloads/")
123-
124-
onlyIf {
125-
// Will be evaluated at task execution time, not during configuration.
126-
// Fails the build if the specified properties haven't been provided.
127-
username = getPropertyOrFailBuild NEXUS_USERNAME_KEY
128-
password = getPropertyOrFailBuild NEXUS_PASSWORD_KEY
129-
return true
130-
}
117+
group = 'publishing'
118+
description = 'Publish release_info.json and startup/latest.xml to Nexus downloads.'
119+
host = 'https://artifacts.unidata.ucar.edu/'
120+
repoName = 'downloads-tds'
121+
122+
publishSrc = new File(rootProject.getProjectDir(), "project-files/downloads/")
123+
124+
onlyIf {
125+
// Will be evaluated at task execution time, not during configuration.
126+
// Fails the build if the specified properties haven't been provided.
127+
username = getPropertyOrFailBuild NEXUS_USERNAME_KEY
128+
password = getPropertyOrFailBuild NEXUS_PASSWORD_KEY
129+
return true
130+
}
131131
}
132132

133133
publish.dependsOn publishReleaseInfoAndLatestTask
134134

135135
def publishVersionInfoTask = tasks.register('publishVersionInfo', PublishToRawRepoTask) {
136-
group = 'publishing'
137-
description = 'Publish version-info.json to Nexus docs.'
138-
host = 'https://artifacts.unidata.ucar.edu/'
139-
repoName = 'docs-tds'
140-
141-
publishSrc = new File(rootProject.getProjectDir(), "project-files/docs/")
142-
143-
onlyIf {
144-
// Will be evaluated at task execution time, not during configuration.
145-
// Fails the build if the specified properties haven't been provided.
146-
username = getPropertyOrFailBuild NEXUS_USERNAME_KEY
147-
password = getPropertyOrFailBuild NEXUS_PASSWORD_KEY
148-
return true
149-
}
136+
group = 'publishing'
137+
description = 'Publish version-info.json to Nexus docs.'
138+
host = 'https://artifacts.unidata.ucar.edu/'
139+
repoName = 'docs-tds'
140+
141+
publishSrc = new File(rootProject.getProjectDir(), "project-files/docs/")
142+
143+
onlyIf {
144+
// Will be evaluated at task execution time, not during configuration.
145+
// Fails the build if the specified properties haven't been provided.
146+
username = getPropertyOrFailBuild NEXUS_USERNAME_KEY
147+
password = getPropertyOrFailBuild NEXUS_PASSWORD_KEY
148+
return true
149+
}
150150
}
151151

152152
publish.dependsOn publishVersionInfoTask

Diff for: opendap/dtswar/build.gradle

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ apply from: "$rootDir/gradle/any/dependencies.gradle"
55
apply from: "$rootDir/gradle/any/war-published.gradle"
66

77
dependencies {
8-
implementation enforcedPlatform(project(':tds-platform'))
8+
implementation enforcedPlatform(project(':tds-platform'))
99

10-
compile project(':opendap:opendap-servlet')
10+
compile project(':opendap:opendap-servlet')
1111

12-
compile 'edu.ucar:cdm-core'
13-
compile 'edu.ucar:opendap'
14-
compile 'org.slf4j:slf4j-api'
12+
compile 'edu.ucar:cdm-core'
13+
compile 'edu.ucar:opendap'
14+
compile 'org.slf4j:slf4j-api'
1515

16-
providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.javaxServletApi}"
16+
providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.javaxServletApi}"
1717

18-
runtime 'org.apache.taglibs:taglibs-standard-spec'
19-
runtime 'org.apache.taglibs:taglibs-standard-impl'
18+
runtime 'org.apache.taglibs:taglibs-standard-spec'
19+
runtime 'org.apache.taglibs:taglibs-standard-impl'
2020

2121

22-
runtime 'org.apache.logging.log4j:log4j-slf4j-impl'
23-
runtime 'org.apache.logging.log4j:log4j-web'
22+
runtime 'org.apache.logging.log4j:log4j-slf4j-impl'
23+
runtime 'org.apache.logging.log4j:log4j-web'
2424
}

Diff for: opendap/server/build.gradle

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ apply from: "$rootDir/gradle/any/dependencies.gradle"
55
apply from: "$rootDir/gradle/any/java-published.gradle"
66

77
dependencies {
8-
implementation enforcedPlatform(project(':tds-platform'))
9-
testImplementation enforcedPlatform (project(':tds-testing-platform'))
8+
implementation enforcedPlatform(project(':tds-platform'))
9+
testImplementation enforcedPlatform (project(':tds-testing-platform'))
1010

11-
compile 'edu.ucar:cdm-core'
12-
compile 'edu.ucar:opendap'
13-
compile 'org.slf4j:slf4j-api'
11+
compile 'edu.ucar:cdm-core'
12+
compile 'edu.ucar:opendap'
13+
compile 'org.slf4j:slf4j-api'
1414

15-
compileOnly 'jakarta.servlet:jakarta.servlet-api'
15+
compileOnly 'jakarta.servlet:jakarta.servlet-api'
1616

17-
testImplementation project(':tds-test-utils');
18-
testImplementation 'junit:junit'
19-
testImplementation 'com.google.truth:truth'
20-
testRuntimeOnly 'ch.qos.logback:logback-classic'
17+
testImplementation project(':tds-test-utils');
18+
testImplementation 'junit:junit'
19+
testImplementation 'com.google.truth:truth'
20+
testRuntimeOnly 'ch.qos.logback:logback-classic'
2121
}

Diff for: tdm/build.gradle

+18-18
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@ apply from: "$rootDir/gradle/any/java-published.gradle"
1111
apply plugin: 'com.github.johnrengelman.shadow'
1212

1313
dependencies {
14-
implementation enforcedPlatform(project(':tds-platform'))
15-
16-
compile project(':tdcommon')
17-
compile 'edu.ucar:httpservices'
18-
compile 'edu.ucar:cdm-core'
19-
compile 'edu.ucar:grib'
20-
21-
compile 'org.apache.httpcomponents:httpclient'
22-
compile 'org.jdom:jdom2'
23-
compile 'org.springframework:spring-beans'
24-
compile 'org.springframework:spring-core'
25-
compile 'org.springframework:spring-context'
26-
compile 'com.google.protobuf:protobuf-java'
27-
compile 'com.beust:jcommander'
28-
compile 'com.google.guava:guava'
29-
30-
compile 'org.slf4j:slf4j-api'
31-
runtime 'org.apache.logging.log4j:log4j-slf4j-impl'
14+
implementation enforcedPlatform(project(':tds-platform'))
15+
16+
compile project(':tdcommon')
17+
compile 'edu.ucar:httpservices'
18+
compile 'edu.ucar:cdm-core'
19+
compile 'edu.ucar:grib'
20+
21+
compile 'org.apache.httpcomponents:httpclient'
22+
compile 'org.jdom:jdom2'
23+
compile 'org.springframework:spring-beans'
24+
compile 'org.springframework:spring-core'
25+
compile 'org.springframework:spring-context'
26+
compile 'com.google.protobuf:protobuf-java'
27+
compile 'com.beust:jcommander'
28+
compile 'com.google.guava:guava'
29+
30+
compile 'org.slf4j:slf4j-api'
31+
runtime 'org.apache.logging.log4j:log4j-slf4j-impl'
3232
}
3333

3434
shadowJar {

Diff for: tds-test-utils/build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ apply from: "$rootDir/gradle/any/dependencies.gradle"
55
apply from: "$rootDir/gradle/any/java-internal.gradle"
66

77
dependencies {
8-
implementation enforcedPlatform(project(':tds-testing-platform'))
9-
implementation enforcedPlatform(project(':tds-platform'))
8+
implementation enforcedPlatform(project(':tds-testing-platform'))
9+
implementation enforcedPlatform(project(':tds-platform'))
1010

11-
implementation 'edu.ucar:cdm-core'
12-
implementation 'edu.ucar:httpservices'
13-
implementation 'edu.ucar:cdm-test-utils'
11+
implementation 'edu.ucar:cdm-core'
12+
implementation 'edu.ucar:httpservices'
13+
implementation 'edu.ucar:cdm-test-utils'
1414

15-
implementation project(':tdcommon')
15+
implementation project(':tdcommon')
1616

17-
implementation 'org.slf4j:slf4j-api'
18-
implementation 'junit:junit'
17+
implementation 'org.slf4j:slf4j-api'
18+
implementation 'junit:junit'
1919
}

Diff for: tds-ui/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ apply from: "$rootDir/gradle/any/dependencies.gradle"
88
apply plugin: 'application'
99

1010
dependencies {
11-
implementation enforcedPlatform(project(':tds-platform'))
12-
testCompile enforcedPlatform(project(':tds-testing-platform'))
11+
implementation enforcedPlatform(project(':tds-platform'))
12+
testCompile enforcedPlatform(project(':tds-testing-platform'))
1313

14-
runtime 'edu.ucar:uicdm'
15-
runtime 'edu.ucar:cdm-s3'
16-
runtime project(':tds-ugrid')
14+
runtime 'edu.ucar:uicdm'
15+
runtime 'edu.ucar:cdm-s3'
16+
runtime project(':tds-ugrid')
1717
}
1818

1919
application {
20-
mainClass.set("ucar.nc2.ui.ToolsUI")
20+
mainClass.set("ucar.nc2.ui.ToolsUI")
2121
}

0 commit comments

Comments
 (0)