From a7b5a3b0a34dbf74000a1464d0ff3424f52e3330 Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Wed, 10 Apr 2024 16:22:50 -0500 Subject: [PATCH] Gradle whitespace fixes --- dap4/d4servlet/build.gradle | 12 ++++---- dap4/d4ts/build.gradle | 26 ++++++++-------- gradle/root/publishing.gradle | 56 +++++++++++++++++------------------ opendap/dtswar/build.gradle | 20 ++++++------- opendap/server/build.gradle | 20 ++++++------- tdm/build.gradle | 36 +++++++++++----------- tds-test-utils/build.gradle | 16 +++++----- tds-ui/build.gradle | 12 ++++---- 8 files changed, 99 insertions(+), 99 deletions(-) diff --git a/dap4/d4servlet/build.gradle b/dap4/d4servlet/build.gradle index e5c57fec19..56700bf7d5 100644 --- a/dap4/d4servlet/build.gradle +++ b/dap4/d4servlet/build.gradle @@ -2,12 +2,12 @@ apply from: "$rootDir/gradle/any/dependencies.gradle" apply from: "$rootDir/gradle/any/java-published.gradle" dependencies { - implementation enforcedPlatform(project(':tds-platform')) + implementation enforcedPlatform(project(':tds-platform')) - implementation 'edu.ucar:dap4' - implementation 'edu.ucar:httpservices' - implementation 'edu.ucar:cdm-core' + implementation 'edu.ucar:dap4' + implementation 'edu.ucar:httpservices' + implementation 'edu.ucar:cdm-core' - compileOnly 'jakarta.servlet:jakarta.servlet-api' - compileOnly 'org.slf4j:slf4j-api' + compileOnly 'jakarta.servlet:jakarta.servlet-api' + compileOnly 'org.slf4j:slf4j-api' } diff --git a/dap4/d4ts/build.gradle b/dap4/d4ts/build.gradle index 23ca998d68..7b02b113e3 100644 --- a/dap4/d4ts/build.gradle +++ b/dap4/d4ts/build.gradle @@ -3,19 +3,19 @@ apply from: "$rootDir/gradle/any/war-published.gradle" apply from: "$rootDir/gradle/any/gretty.gradle" dependencies { - implementation enforcedPlatform(project(':tds-platform')) + implementation enforcedPlatform(project(':tds-platform')) - implementation 'edu.ucar:dap4' - implementation project(":dap4:d4servlet") + implementation 'edu.ucar:dap4' + implementation project(":dap4:d4servlet") - providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.javaxServletApi}" + providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.javaxServletApi}" - compileOnly 'org.slf4j:slf4j-api' + compileOnly 'org.slf4j:slf4j-api' - runtime 'org.apache.logging.log4j:log4j-slf4j-impl' - runtime 'org.apache.logging.log4j:log4j-web' + runtime 'org.apache.logging.log4j:log4j-slf4j-impl' + runtime 'org.apache.logging.log4j:log4j-web' - compileOnly 'org.slf4j:slf4j-api' + compileOnly 'org.slf4j:slf4j-api' } // This specifies the resources from ":dap4" that we need to include in the d4ts war and inplaceWebapp. @@ -57,10 +57,10 @@ war { } gretty { - httpPort = 8083 - contextPath = '/d4ts' + httpPort = 8083 + contextPath = '/d4ts' - afterEvaluate { - prepareInplaceWebAppFolder.with d4testsResourcesCopySpec - } + afterEvaluate { + prepareInplaceWebAppFolder.with d4testsResourcesCopySpec + } } diff --git a/gradle/root/publishing.gradle b/gradle/root/publishing.gradle index e38dfe2744..507b3cebd0 100644 --- a/gradle/root/publishing.gradle +++ b/gradle/root/publishing.gradle @@ -114,39 +114,39 @@ def publishDownloadsTask = tasks.register('publishDownloads', PublishToRawRepoTa publish.dependsOn publishDownloadsTask def publishReleaseInfoAndLatestTask = tasks.register('publishReleaseInfoAndLatest', PublishToRawRepoTask) { - group = 'publishing' - description = 'Publish release_info.json and startup/latest.xml to Nexus downloads.' - host = 'https://artifacts.unidata.ucar.edu/' - repoName = 'downloads-tds' - - publishSrc = new File(rootProject.getProjectDir(), "project-files/downloads/") - - onlyIf { - // Will be evaluated at task execution time, not during configuration. - // Fails the build if the specified properties haven't been provided. - username = getPropertyOrFailBuild NEXUS_USERNAME_KEY - password = getPropertyOrFailBuild NEXUS_PASSWORD_KEY - return true - } + group = 'publishing' + description = 'Publish release_info.json and startup/latest.xml to Nexus downloads.' + host = 'https://artifacts.unidata.ucar.edu/' + repoName = 'downloads-tds' + + publishSrc = new File(rootProject.getProjectDir(), "project-files/downloads/") + + onlyIf { + // Will be evaluated at task execution time, not during configuration. + // Fails the build if the specified properties haven't been provided. + username = getPropertyOrFailBuild NEXUS_USERNAME_KEY + password = getPropertyOrFailBuild NEXUS_PASSWORD_KEY + return true + } } publish.dependsOn publishReleaseInfoAndLatestTask def publishVersionInfoTask = tasks.register('publishVersionInfo', PublishToRawRepoTask) { - group = 'publishing' - description = 'Publish version-info.json to Nexus docs.' - host = 'https://artifacts.unidata.ucar.edu/' - repoName = 'docs-tds' - - publishSrc = new File(rootProject.getProjectDir(), "project-files/docs/") - - onlyIf { - // Will be evaluated at task execution time, not during configuration. - // Fails the build if the specified properties haven't been provided. - username = getPropertyOrFailBuild NEXUS_USERNAME_KEY - password = getPropertyOrFailBuild NEXUS_PASSWORD_KEY - return true - } + group = 'publishing' + description = 'Publish version-info.json to Nexus docs.' + host = 'https://artifacts.unidata.ucar.edu/' + repoName = 'docs-tds' + + publishSrc = new File(rootProject.getProjectDir(), "project-files/docs/") + + onlyIf { + // Will be evaluated at task execution time, not during configuration. + // Fails the build if the specified properties haven't been provided. + username = getPropertyOrFailBuild NEXUS_USERNAME_KEY + password = getPropertyOrFailBuild NEXUS_PASSWORD_KEY + return true + } } publish.dependsOn publishVersionInfoTask diff --git a/opendap/dtswar/build.gradle b/opendap/dtswar/build.gradle index 9eb52bced3..4c8a399d81 100644 --- a/opendap/dtswar/build.gradle +++ b/opendap/dtswar/build.gradle @@ -5,20 +5,20 @@ apply from: "$rootDir/gradle/any/dependencies.gradle" apply from: "$rootDir/gradle/any/war-published.gradle" dependencies { - implementation enforcedPlatform(project(':tds-platform')) + implementation enforcedPlatform(project(':tds-platform')) - compile project(':opendap:opendap-servlet') + compile project(':opendap:opendap-servlet') - compile 'edu.ucar:cdm-core' - compile 'edu.ucar:opendap' - compile 'org.slf4j:slf4j-api' + compile 'edu.ucar:cdm-core' + compile 'edu.ucar:opendap' + compile 'org.slf4j:slf4j-api' - providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.javaxServletApi}" + providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.javaxServletApi}" - runtime 'org.apache.taglibs:taglibs-standard-spec' - runtime 'org.apache.taglibs:taglibs-standard-impl' + runtime 'org.apache.taglibs:taglibs-standard-spec' + runtime 'org.apache.taglibs:taglibs-standard-impl' - runtime 'org.apache.logging.log4j:log4j-slf4j-impl' - runtime 'org.apache.logging.log4j:log4j-web' + runtime 'org.apache.logging.log4j:log4j-slf4j-impl' + runtime 'org.apache.logging.log4j:log4j-web' } diff --git a/opendap/server/build.gradle b/opendap/server/build.gradle index 88400ab6f0..f7ebe02d2c 100644 --- a/opendap/server/build.gradle +++ b/opendap/server/build.gradle @@ -5,17 +5,17 @@ apply from: "$rootDir/gradle/any/dependencies.gradle" apply from: "$rootDir/gradle/any/java-published.gradle" dependencies { - implementation enforcedPlatform(project(':tds-platform')) - testImplementation enforcedPlatform (project(':tds-testing-platform')) + implementation enforcedPlatform(project(':tds-platform')) + testImplementation enforcedPlatform (project(':tds-testing-platform')) - compile 'edu.ucar:cdm-core' - compile 'edu.ucar:opendap' - compile 'org.slf4j:slf4j-api' + compile 'edu.ucar:cdm-core' + compile 'edu.ucar:opendap' + compile 'org.slf4j:slf4j-api' - compileOnly 'jakarta.servlet:jakarta.servlet-api' + compileOnly 'jakarta.servlet:jakarta.servlet-api' - testImplementation project(':tds-test-utils'); - testImplementation 'junit:junit' - testImplementation 'com.google.truth:truth' - testRuntimeOnly 'ch.qos.logback:logback-classic' + testImplementation project(':tds-test-utils'); + testImplementation 'junit:junit' + testImplementation 'com.google.truth:truth' + testRuntimeOnly 'ch.qos.logback:logback-classic' } diff --git a/tdm/build.gradle b/tdm/build.gradle index 51537c6bfe..324744740e 100644 --- a/tdm/build.gradle +++ b/tdm/build.gradle @@ -11,24 +11,24 @@ apply from: "$rootDir/gradle/any/java-published.gradle" apply plugin: 'com.github.johnrengelman.shadow' dependencies { - implementation enforcedPlatform(project(':tds-platform')) - - compile project(':tdcommon') - compile 'edu.ucar:httpservices' - compile 'edu.ucar:cdm-core' - compile 'edu.ucar:grib' - - compile 'org.apache.httpcomponents:httpclient' - compile 'org.jdom:jdom2' - compile 'org.springframework:spring-beans' - compile 'org.springframework:spring-core' - compile 'org.springframework:spring-context' - compile 'com.google.protobuf:protobuf-java' - compile 'com.beust:jcommander' - compile 'com.google.guava:guava' - - compile 'org.slf4j:slf4j-api' - runtime 'org.apache.logging.log4j:log4j-slf4j-impl' + implementation enforcedPlatform(project(':tds-platform')) + + compile project(':tdcommon') + compile 'edu.ucar:httpservices' + compile 'edu.ucar:cdm-core' + compile 'edu.ucar:grib' + + compile 'org.apache.httpcomponents:httpclient' + compile 'org.jdom:jdom2' + compile 'org.springframework:spring-beans' + compile 'org.springframework:spring-core' + compile 'org.springframework:spring-context' + compile 'com.google.protobuf:protobuf-java' + compile 'com.beust:jcommander' + compile 'com.google.guava:guava' + + compile 'org.slf4j:slf4j-api' + runtime 'org.apache.logging.log4j:log4j-slf4j-impl' } shadowJar { diff --git a/tds-test-utils/build.gradle b/tds-test-utils/build.gradle index 6600ba50b3..6033d3f8f5 100644 --- a/tds-test-utils/build.gradle +++ b/tds-test-utils/build.gradle @@ -5,15 +5,15 @@ apply from: "$rootDir/gradle/any/dependencies.gradle" apply from: "$rootDir/gradle/any/java-internal.gradle" dependencies { - implementation enforcedPlatform(project(':tds-testing-platform')) - implementation enforcedPlatform(project(':tds-platform')) + implementation enforcedPlatform(project(':tds-testing-platform')) + implementation enforcedPlatform(project(':tds-platform')) - implementation 'edu.ucar:cdm-core' - implementation 'edu.ucar:httpservices' - implementation 'edu.ucar:cdm-test-utils' + implementation 'edu.ucar:cdm-core' + implementation 'edu.ucar:httpservices' + implementation 'edu.ucar:cdm-test-utils' - implementation project(':tdcommon') + implementation project(':tdcommon') - implementation 'org.slf4j:slf4j-api' - implementation 'junit:junit' + implementation 'org.slf4j:slf4j-api' + implementation 'junit:junit' } diff --git a/tds-ui/build.gradle b/tds-ui/build.gradle index 7dc9d3ef3e..ec26ca56e0 100644 --- a/tds-ui/build.gradle +++ b/tds-ui/build.gradle @@ -8,14 +8,14 @@ apply from: "$rootDir/gradle/any/dependencies.gradle" apply plugin: 'application' dependencies { - implementation enforcedPlatform(project(':tds-platform')) - testCompile enforcedPlatform(project(':tds-testing-platform')) + implementation enforcedPlatform(project(':tds-platform')) + testCompile enforcedPlatform(project(':tds-testing-platform')) - runtime 'edu.ucar:uicdm' - runtime 'edu.ucar:cdm-s3' - runtime project(':tds-ugrid') + runtime 'edu.ucar:uicdm' + runtime 'edu.ucar:cdm-s3' + runtime project(':tds-ugrid') } application { - mainClass.set("ucar.nc2.ui.ToolsUI") + mainClass.set("ucar.nc2.ui.ToolsUI") }