Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gradle whitespace fixes #491

Merged
merged 1 commit into from
Apr 10, 2024
Merged

Gradle whitespace fixes #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions dap4/d4servlet/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
26 changes: 13 additions & 13 deletions dap4/d4ts/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -57,10 +57,10 @@ war {
}

gretty {
httpPort = 8083
contextPath = '/d4ts'
httpPort = 8083
contextPath = '/d4ts'

afterEvaluate {
prepareInplaceWebAppFolder.with d4testsResourcesCopySpec
}
afterEvaluate {
prepareInplaceWebAppFolder.with d4testsResourcesCopySpec
}
}
56 changes: 28 additions & 28 deletions gradle/root/publishing.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions opendap/dtswar/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
20 changes: 10 additions & 10 deletions opendap/server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
36 changes: 18 additions & 18 deletions tdm/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
16 changes: 8 additions & 8 deletions tds-test-utils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
12 changes: 6 additions & 6 deletions tds-ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Loading