diff --git a/src/addons/messagelog/messagelog-addon/build.gradle b/src/addons/messagelog/messagelog-addon/build.gradle index a20e4bb95f..64e05cc85e 100644 --- a/src/addons/messagelog/messagelog-addon/build.gradle +++ b/src/addons/messagelog/messagelog-addon/build.gradle @@ -21,7 +21,7 @@ jar { tasks.register('copyGpg', Copy) { from 'src/test/gpg' - into "${layout.buildDirectory}/gpg" + into layout.buildDirectory.dir("gpg") } test.dependsOn copyGpg diff --git a/src/addons/proxymonitor/common/build.gradle b/src/addons/proxymonitor/common/build.gradle index 814a86d549..99fb1b7e9f 100644 --- a/src/addons/proxymonitor/common/build.gradle +++ b/src/addons/proxymonitor/common/build.gradle @@ -1,4 +1,4 @@ -project.ext.schemaTargetDir = new File("${layout.buildDirectory}/generated-sources") +project.ext.schemaTargetDir = layout.buildDirectory.dir("generated-sources").get().asFile configurations { xjc @@ -6,7 +6,7 @@ configurations { sourceSets { main { - java.srcDirs = ["src/main/java", "${layout.buildDirectory}/generated-sources"] + java.srcDirs = ["src/main/java", schemaTargetDir] } } diff --git a/src/addons/proxymonitor/metaservice/build.gradle b/src/addons/proxymonitor/metaservice/build.gradle index 16b880e983..8cf64dd9aa 100644 --- a/src/addons/proxymonitor/metaservice/build.gradle +++ b/src/addons/proxymonitor/metaservice/build.gradle @@ -3,11 +3,11 @@ plugins { id 'com.github.johnrengelman.shadow' } -project.ext.schemaTargetDir = new File("${layout.buildDirectory}/generated-sources") +project.ext.schemaTargetDir = layout.buildDirectory.dir("generated-sources").get().asFile sourceSets { main { - java.srcDirs = ["src/main/java", "${layout.buildDirectory}/generated-sources"] + java.srcDirs = ["src/main/java", schemaTargetDir] resources.srcDirs = ['src/main/resources', '../../../common/common-util/src/main/resources'] } } diff --git a/src/build.gradle b/src/build.gradle index db5caf11a8..8cc65dd990 100644 --- a/src/build.gradle +++ b/src/build.gradle @@ -32,7 +32,7 @@ sonarqube { property "sonar.dependencyCheck.reportPath", "build/reports/owasp-dependency-check/dependency-check-report.xml" property "sonar.dependencyCheck.htmlReportPath", "build/reports/owasp-dependency-check/dependency-check-report.html" property "sonar.exclusions", "**/build/generated-sources/**" - property "sonar.coverage.jacoco.xmlReportPaths", "${rootProject.layout.buildDirectory}/reports/jacoco/jacocoAggregatedReport/jacocoAggregatedReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${rootProject.layout.buildDirectory.get().asFile}/reports/jacoco/jacocoAggregatedReport/jacocoAggregatedReport.xml" property "sonar.issue.ignore.multicriteria", "e1" //# ignore 'Local-Variable Type Inference should be used" @@ -42,7 +42,7 @@ sonarqube { } dependencyCheck { - outputDirectory = "${project.layout.buildDirectory}/reports/owasp-dependency-check" + outputDirectory = "${project.layout.buildDirectory.get().asFile}/reports/owasp-dependency-check" suppressionFile = "${project.rootDir}/dependencycheck-suppressions.xml" format = "ALL" skipProjects = [ diff --git a/src/central-server/admin-service/application/build.gradle b/src/central-server/admin-service/application/build.gradle index a80e8a844a..0993a540c1 100644 --- a/src/central-server/admin-service/application/build.gradle +++ b/src/central-server/admin-service/application/build.gradle @@ -40,7 +40,7 @@ bootRun { tasks.register('copyUi', ProcessResources) { dependsOn(configurations.dist) from configurations.dist - into "${layout.buildDirectory}/admin-service/ui/public" + into layout.buildDirectory.dir("admin-service/ui/public") } jar { @@ -52,7 +52,7 @@ bootJar { if (!project.hasProperty('skip-frontend-build')) { dependsOn copyUi - classpath += file("${layout.buildDirectory}/admin-service/ui") + classpath += layout.buildDirectory.dir("admin-service/ui/public") } else { println("Warning: Excluding frontend from boot jar") } @@ -65,10 +65,10 @@ bootJar { } tasks.register('moveLiquibaseLibs', Copy) { - mkdir "${layout.buildDirectory}/libs/" + mkdir layout.buildDirectory.dir("libs") from configurations.liquibaseLibs - into "${layout.buildDirectory}/libs" + into layout.buildDirectory.dir("libs") } build { diff --git a/src/central-server/admin-service/core/build.gradle b/src/central-server/admin-service/core/build.gradle index 76dd2276ca..91b66b47fb 100644 --- a/src/central-server/admin-service/core/build.gradle +++ b/src/central-server/admin-service/core/build.gradle @@ -39,7 +39,7 @@ sourceSets { main { java.srcDirs = [ 'src/main/java', - "${layout.buildDirectory}/generated/sources/annotationProcessor/java/main" + layout.buildDirectory.dir("generated/sources/annotationProcessor/java/main") ] } } diff --git a/src/central-server/admin-service/infra-api-rest/build.gradle b/src/central-server/admin-service/infra-api-rest/build.gradle index a331943de0..7a84cabccb 100644 --- a/src/central-server/admin-service/infra-api-rest/build.gradle +++ b/src/central-server/admin-service/infra-api-rest/build.gradle @@ -20,7 +20,7 @@ sourceSets { main { java.srcDirs = [ 'src/main/java', - "${layout.buildDirectory}/generated/sources/annotationProcessor/java/main" + layout.buildDirectory.dir("generated/sources/annotationProcessor/java/main") ] } } diff --git a/src/central-server/openapi-model/build.gradle b/src/central-server/openapi-model/build.gradle index 87ea6c3595..f11f84bf5a 100644 --- a/src/central-server/openapi-model/build.gradle +++ b/src/central-server/openapi-model/build.gradle @@ -15,7 +15,7 @@ sourceSets { main { java.srcDirs = [ 'src/main/java', - "${layout.buildDirectory}/generated-sources/openapi/src/main/java", + layout.buildDirectory.dir("generated-sources/openapi/src/main/java"), ] } } @@ -23,7 +23,7 @@ sourceSets { openApiGenerate { generatorName = "spring" inputSpec = "$projectDir/src/main/resources/openapi-definition.yaml" - outputDir = "${layout.buildDirectory}/generated-sources/openapi" + outputDir = "${layout.buildDirectory.get().asFile}/generated-sources/openapi" apiPackage = "org.niis.xroad.cs.openapi" modelPackage = "org.niis.xroad.cs.openapi.model" modelNameSuffix = "Dto" diff --git a/src/common/common-admin-api/build.gradle b/src/common/common-admin-api/build.gradle index 0d18a5d891..10ffe025cf 100644 --- a/src/common/common-admin-api/build.gradle +++ b/src/common/common-admin-api/build.gradle @@ -58,8 +58,8 @@ jar { openApiGenerate { generatorName = "spring" - inputSpec = "$projectDir/src/main/resources/common-openapi-definition.yaml".toString() - outputDir = "${layout.buildDirectory}/generated-sources/openapi".toString() + inputSpec = "$projectDir/src/main/resources/common-openapi-definition.yaml" + outputDir = "${layout.buildDirectory.get().asFile}/generated-sources/openapi" apiPackage = "org.niis.xroad.restapi.openapi" modelPackage = "org.niis.xroad.restapi.openapi.model" globalProperties = [ diff --git a/src/common/common-util/build.gradle b/src/common/common-util/build.gradle index 0451bcd637..bf5930f657 100644 --- a/src/common/common-util/build.gradle +++ b/src/common/common-util/build.gradle @@ -5,7 +5,7 @@ plugins { id 'java-library' } -project.ext.schemaTargetDir = new File("${layout.buildDirectory}/generated-sources") +project.ext.schemaTargetDir = layout.buildDirectory.dir("generated-sources").get().asFile testJar.enabled = true configurations { @@ -14,7 +14,7 @@ configurations { sourceSets { main { - java.srcDirs = ['src/main/java', "${layout.buildDirectory}/generated-sources"] + java.srcDirs = ['src/main/java', schemaTargetDir] } } diff --git a/src/common/common-verifier/build.gradle b/src/common/common-verifier/build.gradle index a514223c44..a1efe79325 100644 --- a/src/common/common-verifier/build.gradle +++ b/src/common/common-verifier/build.gradle @@ -1,9 +1,9 @@ -project.ext.schemaTargetDir = new File("${layout.buildDirectory}/generated-sources") +project.ext.schemaTargetDir = layout.buildDirectory.dir("generated-sources").get().asFile testJar.enabled = true sourceSets { main { - java.srcDirs = ["src/main/java", "${layout.buildDirectory}/generated-sources"] + java.srcDirs = ["src/main/java", schemaTargetDir] resources.srcDirs = ['src/main/resources'] } } diff --git a/src/monitoring-conf/build.gradle b/src/monitoring-conf/build.gradle index b20651521d..3596adccd0 100644 --- a/src/monitoring-conf/build.gradle +++ b/src/monitoring-conf/build.gradle @@ -1,4 +1,4 @@ -project.ext.schemaTargetDir = new File("${layout.buildDirectory}/generated-sources") +project.ext.schemaTargetDir = layout.buildDirectory.dir("generated-sources").get().asFile configurations { xjc @@ -6,7 +6,7 @@ configurations { sourceSets { main { - java.srcDirs = ["src/main/java", "${layout.buildDirectory}/generated-sources"] + java.srcDirs = ["src/main/java", schemaTargetDir] resources.srcDirs = ['src/main/resources', '../common/common-util/src/main/resources'] resources.exclude 'version.properties' } @@ -37,8 +37,8 @@ tasks.register('xjc') { ant.xjc( destdir: project.ext.schemaTargetDir, package: 'ee.ria.xroad.common.conf.globalconf.monitoringparameters', - schema: "${layout.buildDirectory}/resources/main/monitoring-conf.xsd", - binding: "${layout.buildDirectory}/resources/main/identifiers-bindings.xml" + schema: "${layout.buildDirectory.get().asFile}/resources/main/monitoring-conf.xsd", + binding: "${layout.buildDirectory.get().asFile}/resources/main/identifiers-bindings.xml" ) } } diff --git a/src/op-monitor-daemon/build.gradle b/src/op-monitor-daemon/build.gradle index e9b0b74f4a..89f07c2de6 100644 --- a/src/op-monitor-daemon/build.gradle +++ b/src/op-monitor-daemon/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.github.johnrengelman.shadow' } -project.ext.schemaTargetDir = new File("${layout.buildDirectory}/generated-sources") +project.ext.schemaTargetDir = layout.buildDirectory.dir("generated-sources").get().asFile configurations { xjc @@ -10,7 +10,7 @@ configurations { sourceSets { main { - java.srcDirs = ['src/main/java', "${layout.buildDirectory}/generated-sources"] + java.srcDirs = ['src/main/java', schemaTargetDir] resources.srcDirs = ['src/main/resources', '../common/common-util/src/main/resources'] } } @@ -53,8 +53,8 @@ tasks.register('xjc') { ant.xjc( destdir: project.ext.schemaTargetDir, package: 'ee.ria.xroad.opmonitordaemon.message', - schema: "${layout.buildDirectory}/resources/main/op-monitoring.xsd", - binding: "${layout.buildDirectory}/resources/main/identifiers-bindings.xml" + schema: "${layout.buildDirectory.get().asFile}/resources/main/op-monitoring.xsd", + binding: "${layout.buildDirectory.get().asFile}/resources/main/identifiers-bindings.xml" ) } } diff --git a/src/security-server/admin-service/application/build.gradle b/src/security-server/admin-service/application/build.gradle index 32dece68df..7d5ac85761 100644 --- a/src/security-server/admin-service/application/build.gradle +++ b/src/security-server/admin-service/application/build.gradle @@ -63,7 +63,7 @@ dependencies { tasks.register('copyUi', ProcessResources) { dependsOn(configurations.dist) from configurations.dist - into "${layout.buildDirectory}/admin-service/ui/public" + into layout.buildDirectory.dir("admin-service/ui/public") } bootRun { @@ -82,7 +82,7 @@ bootJar { enabled = true dependsOn copyUi - classpath += file("${layout.buildDirectory}/admin-service/ui") + classpath += layout.buildDirectory.dir("admin-service/ui") manifest { attributes( @@ -93,7 +93,7 @@ bootJar { } tasks.register('copyDeps', Copy) { - into "${layout.buildDirectory}/unpacked-libs" + into layout.buildDirectory.dir("unpacked-libs") from configurations.runtimeClasspath.find { it.name.startsWith("postgresql") } } diff --git a/src/security-server/openapi-model/build.gradle b/src/security-server/openapi-model/build.gradle index faa8107149..4cee8f7025 100644 --- a/src/security-server/openapi-model/build.gradle +++ b/src/security-server/openapi-model/build.gradle @@ -16,15 +16,15 @@ sourceSets { main { java.srcDirs = [ 'src/main/java', - "${layout.buildDirectory}/generated-sources/openapi/src/main/java", + layout.buildDirectory.dir("generated-sources/openapi/src/main/java"), ] } } openApiGenerate { generatorName = "spring" - inputSpec = "$projectDir/src/main/resources/META-INF/openapi-definition.yaml".toString() - outputDir = "${layout.buildDirectory}/generated-sources/openapi".toString() + inputSpec = "$projectDir/src/main/resources/META-INF/openapi-definition.yaml" + outputDir = "${layout.buildDirectory.get().asFile}/generated-sources/openapi" apiPackage = "org.niis.xroad.securityserver.restapi.openapi" modelPackage = "org.niis.xroad.securityserver.restapi.openapi.model" globalProperties = [ diff --git a/src/serverconf/build.gradle b/src/serverconf/build.gradle index d26e877ea7..9e433aad68 100644 --- a/src/serverconf/build.gradle +++ b/src/serverconf/build.gradle @@ -8,7 +8,7 @@ configurations { sourceSets { main { - java.srcDirs = ['src/main/java', "${layout.buildDirectory}/generated-sources"] + java.srcDirs = ['src/main/java', layout.buildDirectory.dir("generated-sources")] resources.srcDirs = ['src/main/resources'] } } @@ -53,7 +53,7 @@ tasks.register('schemaExport') { pathelement(path: configurations.schema.asPath) pathelement(path: 'src/main/resources') pathelement(path: 'src/test/resources') - pathelement(path: "${layout.buildDirectory}/classes/java/main") + pathelement(path: "${layout.buildDirectory.get().asFile}/classes/java/main") } } } diff --git a/src/signer/build.gradle b/src/signer/build.gradle index 4df73ba671..9b01e435b3 100644 --- a/src/signer/build.gradle +++ b/src/signer/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.github.johnrengelman.shadow' } -project.ext.schemaTargetDir = new File("${layout.buildDirectory}/generated-sources") +project.ext.schemaTargetDir = layout.buildDirectory.dir("generated-sources").get().asFile configurations { xjc @@ -10,7 +10,7 @@ configurations { sourceSets { main { - java.srcDirs = ['src/main/java', "${layout.buildDirectory}/generated-sources"] + java.srcDirs = ['src/main/java', schemaTargetDir] } intTest { resources { @@ -94,14 +94,14 @@ tasks.register('runSignerMain', JavaExec) { jvmArgs '-Dxroad.signer.key-configuration-file=src/test/resources/keyconf.xml', '-Dxroad.signer.device-configuration-file=src/test/resources/devices.ini', '-Dxroad.common.configuration-path=../common/common-util/src/test/resources/globalconf_good_v2', - "-Dxroad.common.temp-files-path=${layout.buildDirectory}/tmp/", + "-Dxroad.common.temp-files-path=${layout.buildDirectory.get().asFile}/tmp/", '-Dxroad.proxy.configuration-anchor-file=../common/common-util/src/test/resources/configuration-anchor1.xml', '-Dlogback.configurationFile=src/test/resources/logback-signer.xml', '-Djava.library.path=../passwordstore:../libs', '-Dxroad.signer.moduleManagerImpl=ee.ria.xroad.signer.tokenmanager.module.HardwareModuleManagerImpl' mainClass = 'ee.ria.xroad.signer.SignerMain' classpath = sourceSets.main.runtimeClasspath - classpath += files("../addons/hwtoken/${layout.buildDirectory}/libs/hwtoken-1.0.jar") + classpath += files("../addons/hwtoken/${layout.buildDirectory.get().asFile}/libs/hwtoken-1.0.jar") description = "Starts signer main program.\nNote: " + "Be sure that appropriate libpkcs11wrapper.so is installed to the " +