diff --git a/build.gradle b/build.gradle index 9ff9dffa39..88af72a5f9 100644 --- a/build.gradle +++ b/build.gradle @@ -100,19 +100,22 @@ allprojects { // Configure JUnit tests tasks.withType(Test) { - reports.junitXml.destination = project.file("${->project.buildDir}/test-results") + reports.junitXml.outputLocation = project.file("${->project.buildDir}/test-results") } + def projectName = it.name + def projectVersion = it.version + // Configure JAR generation tasks.jar.configure { description = "Produces a Jar with the main classes in .out/." manifest { attributes "Built-JDK": System.getProperty("java.version"), - "Specification-Title": project.name, - "Specification-Version": "${-> project.version}", + "Specification-Title": projectName, + "Specification-Version": "${-> projectVersion}", "Specification-Vendor": "Apple Inc.", - "Implementation-Title": project.name, - "Implementation-Version": "${-> project.version}", + "Implementation-Title": projectName, + "Implementation-Version": "${-> projectVersion}", "Implementation-Vendor": "Apple Inc." } doFirst { @@ -182,8 +185,10 @@ allprojects { subprojects { apply from: rootProject.file('gradle/testing.gradle') - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } def publishBuild = Boolean.parseBoolean(findProperty('publishBuild') ?: 'false') def autoServiceVersion = publishBuild ? libs.versions.autoService.asProvider().get() : libs.versions.autoService.development.get() diff --git a/examples/examples.gradle b/examples/examples.gradle index 0864e221e4..91e4310e93 100644 --- a/examples/examples.gradle +++ b/examples/examples.gradle @@ -30,5 +30,7 @@ dependencies { runtimeOnly(libs.log4j.core) // library } -mainClassName = 'com.apple.foundationdb.record.sample.Main' -applicationDefaultJvmArgs = ["-Dlog4j.configurationFile=${projectDir}/src/main/resources/log4j2.properties"] +application { + mainClass = 'com.apple.foundationdb.record.sample.Main' + applicationDefaultJvmArgs = ["-Dlog4j.configurationFile=${projectDir}/src/main/resources/log4j2.properties"] +} diff --git a/fdb-relational-api/fdb-relational-api.gradle b/fdb-relational-api/fdb-relational-api.gradle index a694cfa7c8..7521bd69d0 100644 --- a/fdb-relational-api/fdb-relational-api.gradle +++ b/fdb-relational-api/fdb-relational-api.gradle @@ -30,16 +30,19 @@ task createVersionPropertiesFile() { // Write a file of version and build info for the java processes to read // from their classpaths. def versionsFile = new File(projectDir, "src/gen/main/resources/version.properties") + def projectVersion = project.version + def rootProjectName = rootProject.name def gitDetails = versionDetails() + outputs.file versionsFile doLast { println "Writing ${versionsFile}" versionsFile.text = """# Generated by fdb-relational-api build. # Returned by RelationalDatabaseMetaData#getDatabaseProductName() -name=${rootProject.name} +name=${rootProjectName} # Returned by RelationalDatabaseMetaData#getDatabaseProductVersion() # and by RelationalDatabaseMetaData#getDriverVersion() -version=${project.version} +version=${projectVersion} gitHash=${gitDetails.gitHashFull} branch=${gitDetails.branchName} # Returned as RelationalDatabaseMetaData#getUrl() diff --git a/fdb-relational-cli/fdb-relational-cli.gradle b/fdb-relational-cli/fdb-relational-cli.gradle index 0aef3da15c..42eab4d48e 100644 --- a/fdb-relational-cli/fdb-relational-cli.gradle +++ b/fdb-relational-cli/fdb-relational-cli.gradle @@ -74,7 +74,7 @@ dependencies { } jar { - duplicatesStrategy "exclude" + duplicatesStrategy = "exclude" manifest { attributes( 'Main-Class': 'com.apple.foundationdb.relational.cli.sqlline.RelationalSQLLine', diff --git a/fdb-relational-jdbc/fdb-relational-jdbc.gradle b/fdb-relational-jdbc/fdb-relational-jdbc.gradle index d2096bae7f..3754f6ec51 100644 --- a/fdb-relational-jdbc/fdb-relational-jdbc.gradle +++ b/fdb-relational-jdbc/fdb-relational-jdbc.gradle @@ -52,7 +52,7 @@ serviceLoader { } jar { - duplicatesStrategy "exclude" + duplicatesStrategy = "exclude" } // Task to build a fat jar, one w/ all dependencies; good for handing out as the 'jdbc' jar. diff --git a/fdb-relational-server/fdb-relational-server.gradle b/fdb-relational-server/fdb-relational-server.gradle index 88816f84b8..93006e99ae 100644 --- a/fdb-relational-server/fdb-relational-server.gradle +++ b/fdb-relational-server/fdb-relational-server.gradle @@ -56,7 +56,9 @@ jar { // Task to build a fat jar, one w/ all dependencies shadowJar { - mainClassName = mainServerClass + application { + mainClass = mainServerClass + } mergeServiceFiles() } diff --git a/gradle/testing.gradle b/gradle/testing.gradle index 48080a6acb..26562211f1 100644 --- a/gradle/testing.gradle +++ b/gradle/testing.gradle @@ -40,7 +40,7 @@ task destructiveTest(type: Test) { maxParallelForks = 1 } reports { - junitXml.destination = file("${buildDir}/test-results/destructive") + junitXml.outputLocation = file("${buildDir}/test-results/destructive") } } diff --git a/yaml-tests/yaml-tests.gradle b/yaml-tests/yaml-tests.gradle index 037478fec9..28716a85a1 100644 --- a/yaml-tests/yaml-tests.gradle +++ b/yaml-tests/yaml-tests.gradle @@ -33,7 +33,7 @@ project.tasks.named("processTestResources") { } tasks.named("sourcesJar") { - duplicatesStrategy('include') + duplicatesStrategy = 'include' // classifier('sources') from sourceSets.main.allSource }