From febda082bc58445e40c33213b931f2104fa6ef96 Mon Sep 17 00:00:00 2001 From: Arun Venmany Date: Wed, 22 Jan 2025 11:23:20 +0530 Subject: [PATCH] gradle deprecation fixes testing Signed-off-by: Arun Venmany --- build.gradle | 6 +++--- .../tools/gradle/tasks/AbstractServerTask.groovy | 5 +++-- .../tools/gradle/tasks/CleanTask.groovy | 6 +++--- .../tools/gradle/tasks/CompileJSPTask.groovy | 6 +++--- .../tools/gradle/tasks/CreateTask.groovy | 6 +++--- .../tools/gradle/tasks/DeployTask.groovy | 12 ++++++------ .../openliberty/tools/gradle/tasks/DevTask.groovy | 6 +++--- .../openliberty/tools/gradle/tasks/DevcTask.groovy | 6 +++--- .../openliberty/tools/gradle/tasks/DumpTask.groovy | 6 +++--- .../tools/gradle/tasks/GenerateFeaturesTask.groovy | 6 +++--- .../tools/gradle/tasks/InstallFeatureTask.groovy | 6 +++--- .../tools/gradle/tasks/InstallLibertyTask.groovy | 6 +++--- .../tools/gradle/tasks/JavaDumpTask.groovy | 6 +++--- .../tools/gradle/tasks/PackageTask.groovy | 6 +++--- .../tools/gradle/tasks/PrepareFeatureTask.groovy | 6 +++--- .../openliberty/tools/gradle/tasks/RunTask.groovy | 6 +++--- .../tools/gradle/tasks/StartTask.groovy | 6 +++--- .../tools/gradle/tasks/StatusTask.groovy | 6 +++--- .../openliberty/tools/gradle/tasks/StopTask.groovy | 6 +++--- .../tools/gradle/tasks/UndeployTask.groovy | 6 +++--- .../tools/gradle/tasks/UninstallFeatureTask.groovy | 6 +++--- .../arquillian/ConfigureArquillianTask.groovy | 6 +++--- .../tools/gradle/AbstractIntegrationTest.groovy | 4 ++++ .../test-maven-war/build.gradle | 6 ++++-- .../test-maven-war/build.gradle | 6 ++++-- .../test-maven-war/build.gradle | 6 ++++-- src/test/resources/arquillian-tests/build.gradle | 12 ++++++------ .../dev-test/basic-dev-project/build.gradle | 6 ++++-- .../resources/dev-test/dev-container/build.gradle | 6 ++++-- .../dev-test/dev-skip-feature-install/build.gradle | 6 ++++-- .../buildInstallLiberty.gradle | 6 ++++-- .../basic-dev-project/build.gradle | 6 ++++-- .../generate-features-test/restful/build.gradle | 6 ++++-- .../installDir-full-lifecycle/build.gradle | 2 +- .../installDir-missing-wlp/build.gradle | 2 +- .../installDir-plus-create-server/build.gradle | 2 +- .../liberty-package-defaultOutputDir.gradle | 4 ++-- .../liberty-package-looseApplication.gradle | 10 ++++++---- .../getAppNamesFromConfigTest.gradle | 10 ++++++---- .../testAppListsWithObjects.gradle | 14 ++++++++------ .../testWarTasksWithDifferentDependencies.gradle | 10 ++++++---- .../verifyTimeoutSuccessListsOfAppsTest.gradle | 10 ++++++---- .../sample.servlet/TestStripVersion.gradle | 10 ++++++---- .../resources/sample.servlet/testAppConfig.gradle | 10 ++++++---- .../sample.servlet/testAppConfigFail.gradle | 10 ++++++---- .../testAppendServerEnvWithConfigServerEnv.gradle | 10 ++++++---- .../testAppendServerEnvWithEnvProps.gradle | 10 ++++++---- .../testAppendServerEnvWithNoEnvProps.gradle | 10 ++++++---- .../testAppendServerEnvWithOnlyEnvProps.gradle | 10 ++++++---- .../sample.servlet/testConfigDropinsApp.gradle | 10 ++++++---- .../sample.servlet/testEtcOutputDir.gradle | 10 ++++++---- .../sample.servlet/testLooseApplication.gradle | 10 ++++++---- .../testLooseApplicationWithWarTask.gradle | 10 ++++++---- .../resources/sample.servlet/testOutputDirs.gradle | 10 ++++++---- .../sample.servlet/testPluginConfigFile.gradle | 10 ++++++---- .../verifyLooseAppTestTimeoutSuccess.gradle | 10 ++++++---- .../verifyTimeoutSuccessAppsTest.gradle | 10 ++++++---- .../verifyTimeoutSuccessDropinsTest.gradle | 10 ++++++---- .../test_spring_boot_apps_30.gradle | 4 +++- .../test_spring_boot_classifier_apps_30.gradle | 4 +++- ...pring_boot_classifier_apps_30_no_feature.gradle | 4 +++- .../test_spring_boot_dropins_30.gradle | 4 +++- .../test_spring_boot_plugins_dsl_apps_30.gradle | 4 +++- .../test_spring_boot_war_apps_30.gradle | 4 +++- .../test_spring_boot_war_classifier_apps_30.gradle | 4 +++- ..._boot_with_springbootapplication_apps_30.gradle | 4 +++- ...with_springbootapplication_nodes_apps_30.gradle | 4 +++- ...ingbootapplication_nodes_apps_include_30.gradle | 4 +++- .../sampleJSP.servlet/testCompileJSP.gradle | 10 ++++++---- .../sampleJSP.servlet/testCompileJSP17.gradle | 4 ++-- .../testCreateLibertyFiles.gradle | 14 ++++++++------ .../testCreateLibertyInlineProperties.gradle | 14 ++++++++------ .../testCreateLibertyDefaultConfigDir.gradle | 14 ++++++++------ .../server-config/testCreateUpToDate.gradle | 4 ++-- 74 files changed, 312 insertions(+), 219 deletions(-) diff --git a/build.gradle b/build.gradle index beecbf4e2..2d733f0c0 100644 --- a/build.gradle +++ b/build.gradle @@ -13,10 +13,10 @@ repositories { mavenLocal() mavenCentral() maven { - url 'https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/repository/' + url = 'https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/repository/' } maven { - url 'https://oss.sonatype.org/content/repositories/snapshots/' + url = 'https://oss.sonatype.org/content/repositories/snapshots/' } } @@ -24,7 +24,7 @@ buildscript { repositories { mavenLocal() maven { - url "https://plugins.gradle.org/m2/" + url = "https://plugins.gradle.org/m2/" } } dependencies { diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractServerTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractServerTask.groovy index 0ffd43876..1a9e3b061 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractServerTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractServerTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2017, 2024. + * (C) Copyright IBM Corporation 2017, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -677,7 +677,8 @@ abstract class AbstractServerTask extends AbstractLibertyTask { application.appendNode('applicationFilename', appObj.getArchiveFileName().get()) } if (appObj instanceof War) { - application.appendNode('warSourceDirectory', project.webAppDirName) + War war=appObj + application.appendNode('warSourceDirectory', war.webAppDirectory.getAsFile().get()) } } else if (appObj instanceof File) { application.appendNode('appsDirectory', appDir) diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/CleanTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/CleanTask.groovy index 659e235a9..20f0e99d3 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/CleanTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/CleanTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2015, 2023. + * (C) Copyright IBM Corporation 2015, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ import org.gradle.api.logging.LogLevel class CleanTask extends AbstractServerTask { CleanTask() { configure({ - description 'Deletes files from some directories from the Liberty server' - group 'Liberty' + description = 'Deletes files from some directories from the Liberty server' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/CompileJSPTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/CompileJSPTask.groovy index 93caae73c..cbca1acf9 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/CompileJSPTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/CompileJSPTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2017, 2024. + * (C) Copyright IBM Corporation 2017, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,8 +29,8 @@ class CompileJSPTask extends AbstractFeatureTask { CompileJSPTask() { configure({ - description 'Compile the JSP files in the src/main/webapp directory. ' - group 'Liberty' + description = 'Compile the JSP files in the src/main/webapp directory. ' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/CreateTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/CreateTask.groovy index 4c88e88b0..971c5197b 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/CreateTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/CreateTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2014, 2024. + * (C) Copyright IBM Corporation 2014, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,8 +29,8 @@ class CreateTask extends AbstractServerTask { CreateTask() { configure({ - description 'Creates a Liberty server.' - group 'Liberty' + description = 'Creates a Liberty server.' + group = 'Liberty' }) outputs.upToDateWhen { getServerDir(project).exists() && (new File(getServerDir(project), 'server.xml')).exists() && !isServerDirChanged(project) diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/DeployTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/DeployTask.groovy index 584a979aa..808708166 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/DeployTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/DeployTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2014, 2024. + * (C) Copyright IBM Corporation 2014, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,8 +57,8 @@ class DeployTask extends AbstractServerTask { DeployTask() { configure({ - description "Copy applications generated by the Gradle project to a Liberty server's dropins or apps directory." - group 'Liberty' + description = "Copy applications generated by the Gradle project to a Liberty server's dropins or apps directory." + group = 'Liberty' project.afterEvaluate { springBootVersion = findSpringBootVersion(project) springBootTask = findSpringBootTask(project, springBootVersion) @@ -133,7 +133,7 @@ class DeployTask extends AbstractServerTask { } else { archiveBaseName = task.getArchiveBaseName().get() fileName = getArchiveName(task) - Files.copy(task.archivePath.toPath(), new File(getServerDir(project), "/" + appsDir + "/" + getArchiveName(task)).toPath(), StandardCopyOption.REPLACE_EXISTING) + Files.copy(task.archiveFile.get().getAsFile().toPath(), new File(getServerDir(project), "/" + appsDir + "/" + getArchiveName(task)).toPath(), StandardCopyOption.REPLACE_EXISTING) validateAppConfig(getArchiveName(task), archiveBaseName, appsDir) } validateAppConfig(fileName, archiveBaseName, appsDir) @@ -167,10 +167,10 @@ class DeployTask extends AbstractServerTask { String archiveOutputPath; if (isSpringBoot2plus(springBootVersion)) { - archiveOutputPath = springBootTask.archivePath.getAbsolutePath() + archiveOutputPath = springBootTask.archiveFile.get().getAsFile().getAbsolutePath() } else if(isSpringBoot1(springBootVersion)) { - archiveOutputPath = springBootTask.archivePath.getAbsolutePath() + archiveOutputPath = springBootTask.archiveFile.get().getAsFile().getAbsolutePath() if (project.bootRepackage.classifier != null && !project.bootRepackage.classifier.isEmpty()) { archiveOutputPath = archiveOutputPath.substring(0, archiveOutputPath.lastIndexOf(".")) + "-" + project.bootRepackage.classifier + "." + springBootTask.getArchiveExtension().get() } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/DevTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/DevTask.groovy index d040b29e6..d81ac0708 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/DevTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/DevTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2019, 2024. + * (C) Copyright IBM Corporation 2019, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -68,8 +68,8 @@ class DevTask extends AbstractFeatureTask { DevTask() { configure({ - description 'Runs a Liberty server in dev mode' - group 'Liberty' + description = 'Runs a Liberty server in dev mode' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/DevcTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/DevcTask.groovy index 247ef9070..5cc27716d 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/DevcTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/DevcTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2020. + * (C) Copyright IBM Corporation 2020, 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ class DevcTask extends DevTask { DevcTask() { configure({ - description 'Runs a Liberty server in dev mode inside of a Docker container' - group 'Liberty' + description = 'Runs a Liberty server in dev mode inside of a Docker container' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/DumpTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/DumpTask.groovy index 2245688c3..4d00896bb 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/DumpTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/DumpTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2015, 2019. + * (C) Copyright IBM Corporation 2015, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ class DumpTask extends AbstractServerTask { DumpTask() { configure({ - description 'Dumps diagnostic information from the Liberty server into an archive.' - group 'Liberty' + description = 'Dumps diagnostic information from the Liberty server into an archive.' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/GenerateFeaturesTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/GenerateFeaturesTask.groovy index c7e1b5c56..e4e7a03d7 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/GenerateFeaturesTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/GenerateFeaturesTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2021, 2024. + * (C) Copyright IBM Corporation 2021, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,8 +49,8 @@ class GenerateFeaturesTask extends AbstractFeatureTask { GenerateFeaturesTask() { configure({ - description 'Generate the features used by an application and add to the configuration of a Liberty server' - group 'Liberty' + description = 'Generate the features used by an application and add to the configuration of a Liberty server' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/InstallFeatureTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/InstallFeatureTask.groovy index 5b61a0f6c..4a90a816a 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/InstallFeatureTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/InstallFeatureTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2014, 2024. + * (C) Copyright IBM Corporation 2014, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,8 +33,8 @@ class InstallFeatureTask extends AbstractFeatureTask { InstallFeatureTask() { configure({ - description 'Install a new feature to the Liberty server' - group 'Liberty' + description = 'Install a new feature to the Liberty server' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/InstallLibertyTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/InstallLibertyTask.groovy index 99ce1d4b6..b80d08369 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/InstallLibertyTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/InstallLibertyTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2014, 2024. + * (C) Copyright IBM Corporation 2014, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,8 +42,8 @@ class InstallLibertyTask extends AbstractLibertyTask { InstallLibertyTask() { configure({ - description 'Installs Liberty from a repository' - group 'Liberty' + description = 'Installs Liberty from a repository' + group = 'Liberty' }) outputs.upToDateWhen { // ensure a Liberty installation exists at the install directory diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/JavaDumpTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/JavaDumpTask.groovy index 05b245de4..3125de098 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/JavaDumpTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/JavaDumpTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2015, 2019. + * (C) Copyright IBM Corporation 2015, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ class JavaDumpTask extends AbstractServerTask { JavaDumpTask() { configure({ - description 'Dumps diagnostic information from the Liberty server JVM.' - group 'Liberty' + description = 'Dumps diagnostic information from the Liberty server JVM.' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/PackageTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/PackageTask.groovy index 420c97c17..b0aae79aa 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/PackageTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/PackageTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2014, 2024. + * (C) Copyright IBM Corporation 2014, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,8 +62,8 @@ class PackageTask extends AbstractServerTask { PackageTask() { configure({ - description 'Generates a Liberty server archive.' - group 'Liberty' + description = 'Generates a Liberty server archive.' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/PrepareFeatureTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/PrepareFeatureTask.groovy index 705c4e91f..70e4111dc 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/PrepareFeatureTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/PrepareFeatureTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2021. + * (C) Copyright IBM Corporation 2021, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,8 @@ class PrepareFeatureTask extends AbstractPrepareTask { PrepareFeatureTask() { configure({ - description 'Prepare a user feature for upload to a maven repository' - group 'Liberty' + description = 'Prepare a user feature for upload to a maven repository' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/RunTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/RunTask.groovy index be34e5aef..859f5f0bf 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/RunTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/RunTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2014, 2023. + * (C) Copyright IBM Corporation 2014, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,8 @@ class RunTask extends AbstractServerTask { RunTask() { configure({ - description "Runs a Liberty server under the Gradle process." - group 'Liberty' + description = "Runs a Liberty server under the Gradle process." + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/StartTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/StartTask.groovy index cfad8a811..ca7c93108 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/StartTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/StartTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2014, 2024. + * (C) Copyright IBM Corporation 2014, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,8 +27,8 @@ class StartTask extends AbstractServerTask { StartTask() { configure({ - description 'Starts the Liberty server.' - group 'Liberty' + description = 'Starts the Liberty server.' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/StatusTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/StatusTask.groovy index 5f597d0f7..039599835 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/StatusTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/StatusTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2014, 2023. + * (C) Copyright IBM Corporation 2014, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ class StatusTask extends AbstractServerTask { StatusTask() { configure({ - description 'Checks if the Liberty server is running.' - group 'Liberty' + description = 'Checks if the Liberty server is running.' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/StopTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/StopTask.groovy index 3522b38b1..cdf1dd6e1 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/StopTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/StopTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2014, 2023. + * (C) Copyright IBM Corporation 2014, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,8 @@ class StopTask extends AbstractServerTask { StopTask() { configure({ - description 'Stops the Liberty server.' - group 'Liberty' + description = 'Stops the Liberty server.' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/UndeployTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/UndeployTask.groovy index ab1334f57..0a5886607 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/UndeployTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/UndeployTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2014, 2024. + * (C) Copyright IBM Corporation 2014, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,8 +32,8 @@ class UndeployTask extends AbstractServerTask { UndeployTask() { configure({ - description 'Removes an application from the Liberty server.' - group 'Liberty' + description = 'Removes an application from the Liberty server.' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/UninstallFeatureTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/UninstallFeatureTask.groovy index e11cb8db0..a6e2fe912 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/UninstallFeatureTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/UninstallFeatureTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2015, 2020. + * (C) Copyright IBM Corporation 2015, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,8 @@ class UninstallFeatureTask extends AbstractServerTask { UninstallFeatureTask() { configure({ - description 'Uninstall a feature from the Liberty server' - group 'Liberty' + description = 'Uninstall a feature from the Liberty server' + group = 'Liberty' }) } diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/arquillian/ConfigureArquillianTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/arquillian/ConfigureArquillianTask.groovy index c89ca254c..bd43639d9 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/arquillian/ConfigureArquillianTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/arquillian/ConfigureArquillianTask.groovy @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corporation 2017, 2021. + * (C) Copyright IBM Corporation 2017, 2025. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,8 +43,8 @@ class ConfigureArquillianTask extends AbstractServerTask { ConfigureArquillianTask() { configure({ - description "Automatically generates arquillian.xml for projects that use Arquillian Liberty Managed or Remote containers." - group 'Liberty' + description = "Automatically generates arquillian.xml for projects that use Arquillian Liberty Managed or Remote containers." + group = 'Liberty' }) } diff --git a/src/test/groovy/io/openliberty/tools/gradle/AbstractIntegrationTest.groovy b/src/test/groovy/io/openliberty/tools/gradle/AbstractIntegrationTest.groovy index 89907adf4..7e6cc6fbc 100644 --- a/src/test/groovy/io/openliberty/tools/gradle/AbstractIntegrationTest.groovy +++ b/src/test/groovy/io/openliberty/tools/gradle/AbstractIntegrationTest.groovy @@ -115,6 +115,7 @@ abstract class AbstractIntegrationTest { tasks.each { args.add(it) } + args.add("--warning-mode=all") args.add("-i") args.add("-s") @@ -137,6 +138,7 @@ abstract class AbstractIntegrationTest { tasks.each { args.add(it) } + args.add("--warning-mode=all") args.add("-i") args.add("-s") @@ -156,6 +158,7 @@ abstract class AbstractIntegrationTest { for (String task: tasks) { args.add(task); } + args.add("--warning-mode=all") args.add("-i"); args.add("-s"); @@ -172,6 +175,7 @@ abstract class AbstractIntegrationTest { List args = new ArrayList() args.add(task) args.add(argument) + args.add("--warning-mode=all") args.add("-i") args.add("-s") diff --git a/src/test/resources/app-configuration-include-test/test-maven-war/build.gradle b/src/test/resources/app-configuration-include-test/test-maven-war/build.gradle index c28fc1eb1..705cb5654 100644 --- a/src/test/resources/app-configuration-include-test/test-maven-war/build.gradle +++ b/src/test/resources/app-configuration-include-test/test-maven-war/build.gradle @@ -4,8 +4,10 @@ apply plugin: 'maven-publish' group = 'test' version = '1.0-SNAPSHOT' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} tasks.withType(JavaCompile) { options.encoding = 'UTF-8' diff --git a/src/test/resources/app-configuration-m2-default-test/test-maven-war/build.gradle b/src/test/resources/app-configuration-m2-default-test/test-maven-war/build.gradle index c28fc1eb1..705cb5654 100644 --- a/src/test/resources/app-configuration-m2-default-test/test-maven-war/build.gradle +++ b/src/test/resources/app-configuration-m2-default-test/test-maven-war/build.gradle @@ -4,8 +4,10 @@ apply plugin: 'maven-publish' group = 'test' version = '1.0-SNAPSHOT' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} tasks.withType(JavaCompile) { options.encoding = 'UTF-8' diff --git a/src/test/resources/app-configuration-m2-test/test-maven-war/build.gradle b/src/test/resources/app-configuration-m2-test/test-maven-war/build.gradle index da375a7da..62cd43ddf 100644 --- a/src/test/resources/app-configuration-m2-test/test-maven-war/build.gradle +++ b/src/test/resources/app-configuration-m2-test/test-maven-war/build.gradle @@ -4,8 +4,10 @@ apply plugin: 'maven-publish' group = 'test' version = '1.0-SNAPSHOT' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} tasks.withType(JavaCompile) { options.encoding = 'UTF-8' diff --git a/src/test/resources/arquillian-tests/build.gradle b/src/test/resources/arquillian-tests/build.gradle index 0fb1d2163..744977ce8 100644 --- a/src/test/resources/arquillian-tests/build.gradle +++ b/src/test/resources/arquillian-tests/build.gradle @@ -91,13 +91,13 @@ check.dependsOn 'verifyMainAppManaged' test.enabled = false tasks.withType(Test) { - group 'Verification' + group = 'Verification' testLogging.showStandardStreams = true dependsOn 'deploy', 'testClasses', 'war' } task verifyMainAppManaged (type:Test) { - description 'Tests that the main app is ready before the test app when verifyApps is set properly' + description = 'Tests that the main app is ready before the test app when verifyApps is set properly' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/verify-main-app-managed") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/verify-main-app-managed") include '**/GreeterIT*' @@ -116,7 +116,7 @@ task verifyMainAppManagedValidation (type:Test) { } task skipWithXmlManaged (type:Test) { - description 'For the managed container, tests the task is skipped when the skipIfArquillianXmlExists flag is set to true and arquillian.xml exists in src/test/resources.' + description = 'For the managed container, tests the task is skipped when the skipIfArquillianXmlExists flag is set to true and arquillian.xml exists in src/test/resources.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/skip-with-xml-managed") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/skip-with-xml-managed") include '**/SkipWithXmlIT*' @@ -135,7 +135,7 @@ task skipWithXmlManagedRestEndpointIT (type:Test) { } task skipWithoutXmlManaged (type:Test) { - description 'For the managed container, tests the task is run when the skipIfArquillianXmlExists flag is set to true and arquillian.xml does not exist in src/test/resources' + description = 'For the managed container, tests the task is run when the skipIfArquillianXmlExists flag is set to true and arquillian.xml does not exist in src/test/resources' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/skip-without-xml-managed") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/skip-without-xml-managed") include '**/SkipWithoutXmlIT*' @@ -155,7 +155,7 @@ task skipWithoutXmlManagedRestEndpointIT (type:Test) { } task skipWithXmlRemote (type:Test) { - description 'For the remote container, tests the task is run when the skipIfArquillianXmlExists flag is set to true and arquillian.xml does not exist in src/test/resources' + description = 'For the remote container, tests the task is run when the skipIfArquillianXmlExists flag is set to true and arquillian.xml does not exist in src/test/resources' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/skip-with-xml-remote") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/skip-with-xml-remote") include '**/SkipWithXmlIT*' @@ -165,7 +165,7 @@ task skipWithXmlRemote (type:Test) { } task skipWithoutXmlRemote (type:Test) { - description 'For the remote container, tests the task is run when the skipIfArquillianXmlExists flag is set to true and arquillian.xml does not exist in src/test/resources' + description = 'For the remote container, tests the task is run when the skipIfArquillianXmlExists flag is set to true and arquillian.xml does not exist in src/test/resources' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/skip-without-xml-remote") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/skip-without-xml-remote") include '**/SkipWithoutXmlIT*' diff --git a/src/test/resources/dev-test/basic-dev-project/build.gradle b/src/test/resources/dev-test/basic-dev-project/build.gradle index ed1fa7c40..74a76d947 100644 --- a/src/test/resources/dev-test/basic-dev-project/build.gradle +++ b/src/test/resources/dev-test/basic-dev-project/build.gradle @@ -1,8 +1,10 @@ apply plugin: "liberty" apply plugin: "war" -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} tasks.withType(JavaCompile) { options.encoding = "UTF-8" } diff --git a/src/test/resources/dev-test/dev-container/build.gradle b/src/test/resources/dev-test/dev-container/build.gradle index 6b7d42020..a940200e3 100644 --- a/src/test/resources/dev-test/dev-container/build.gradle +++ b/src/test/resources/dev-test/dev-container/build.gradle @@ -1,8 +1,10 @@ apply plugin: "liberty" apply plugin: "war" -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} tasks.withType(JavaCompile) { options.encoding = "UTF-8" } diff --git a/src/test/resources/dev-test/dev-skip-feature-install/build.gradle b/src/test/resources/dev-test/dev-skip-feature-install/build.gradle index be05830fa..8b947b9a7 100644 --- a/src/test/resources/dev-test/dev-skip-feature-install/build.gradle +++ b/src/test/resources/dev-test/dev-skip-feature-install/build.gradle @@ -1,8 +1,10 @@ apply plugin: "liberty" apply plugin: "war" -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} tasks.withType(JavaCompile) { options.encoding = "UTF-8" } diff --git a/src/test/resources/dev-test/dev-skip-feature-install/buildInstallLiberty.gradle b/src/test/resources/dev-test/dev-skip-feature-install/buildInstallLiberty.gradle index e7d02b432..078354746 100644 --- a/src/test/resources/dev-test/dev-skip-feature-install/buildInstallLiberty.gradle +++ b/src/test/resources/dev-test/dev-skip-feature-install/buildInstallLiberty.gradle @@ -1,8 +1,10 @@ apply plugin: "liberty" apply plugin: "war" -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} tasks.withType(JavaCompile) { options.encoding = "UTF-8" } diff --git a/src/test/resources/generate-features-test/basic-dev-project/build.gradle b/src/test/resources/generate-features-test/basic-dev-project/build.gradle index c3619c43a..787dd02dc 100644 --- a/src/test/resources/generate-features-test/basic-dev-project/build.gradle +++ b/src/test/resources/generate-features-test/basic-dev-project/build.gradle @@ -1,8 +1,10 @@ apply plugin: "liberty" apply plugin: "war" -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} tasks.withType(JavaCompile) { options.encoding = "UTF-8" } diff --git a/src/test/resources/generate-features-test/restful/build.gradle b/src/test/resources/generate-features-test/restful/build.gradle index fe13ae88f..6639711bf 100644 --- a/src/test/resources/generate-features-test/restful/build.gradle +++ b/src/test/resources/generate-features-test/restful/build.gradle @@ -1,8 +1,10 @@ apply plugin: "liberty" apply plugin: "war" -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} tasks.withType(JavaCompile) { options.encoding = "UTF-8" } diff --git a/src/test/resources/install-dir-property-test/installDir-full-lifecycle/build.gradle b/src/test/resources/install-dir-property-test/installDir-full-lifecycle/build.gradle index d34426a01..3d506c083 100644 --- a/src/test/resources/install-dir-property-test/installDir-full-lifecycle/build.gradle +++ b/src/test/resources/install-dir-property-test/installDir-full-lifecycle/build.gradle @@ -16,7 +16,7 @@ buildscript { apply plugin: 'liberty' liberty { - installDir = file("${project(':prebuild').buildDir}/wlp") + installDir = file("${project(':prebuild').getLayout().getBuildDirectory().getAsFile().get()}/wlp") server{ name = 'test' diff --git a/src/test/resources/install-dir-property-test/installDir-missing-wlp/build.gradle b/src/test/resources/install-dir-property-test/installDir-missing-wlp/build.gradle index dc6657cd4..2ec3571f8 100644 --- a/src/test/resources/install-dir-property-test/installDir-missing-wlp/build.gradle +++ b/src/test/resources/install-dir-property-test/installDir-missing-wlp/build.gradle @@ -16,7 +16,7 @@ buildscript { apply plugin: 'liberty' liberty { - installDir = file("${project(':installDir-valid-install').buildDir}") + installDir = file("${project(':installDir-valid-install').getLayout().getBuildDirectory().getAsFile().get()}") server{ name = 'test' diff --git a/src/test/resources/install-dir-property-test/installDir-plus-create-server/build.gradle b/src/test/resources/install-dir-property-test/installDir-plus-create-server/build.gradle index 98737c65c..683fee6dd 100644 --- a/src/test/resources/install-dir-property-test/installDir-plus-create-server/build.gradle +++ b/src/test/resources/install-dir-property-test/installDir-plus-create-server/build.gradle @@ -16,7 +16,7 @@ buildscript { apply plugin: 'liberty' liberty { - installDir = file("${project(':prebuild').buildDir}/wlp") + installDir = file("${project(':prebuild').getLayout().getBuildDirectory().getAsFile().get()}/wlp") server{ name = 'test' diff --git a/src/test/resources/liberty-package-test/liberty-package-defaultOutputDir.gradle b/src/test/resources/liberty-package-test/liberty-package-defaultOutputDir.gradle index 5cee92330..f7ced293f 100644 --- a/src/test/resources/liberty-package-test/liberty-package-defaultOutputDir.gradle +++ b/src/test/resources/liberty-package-test/liberty-package-defaultOutputDir.gradle @@ -20,8 +20,8 @@ apply plugin: 'liberty' repositories { mavenCentral() maven { - name 'liberty-starter-maven-repo' - url 'https://liberty-starter.wasdev.developer.ibm.com/start/api/v1/repo' + name = 'liberty-starter-maven-repo' + url = 'https://liberty-starter.wasdev.developer.ibm.com/start/api/v1/repo' } } diff --git a/src/test/resources/liberty-package-test/liberty-package-looseApplication.gradle b/src/test/resources/liberty-package-test/liberty-package-looseApplication.gradle index d6eb2d67f..646bb4078 100644 --- a/src/test/resources/liberty-package-test/liberty-package-looseApplication.gradle +++ b/src/test/resources/liberty-package-test/liberty-package-looseApplication.gradle @@ -21,8 +21,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -98,8 +100,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet-noWebAppConfig/getAppNamesFromConfigTest.gradle b/src/test/resources/sample.servlet-noWebAppConfig/getAppNamesFromConfigTest.gradle index 01d2f87b2..2d4323acc 100644 --- a/src/test/resources/sample.servlet-noWebAppConfig/getAppNamesFromConfigTest.gradle +++ b/src/test/resources/sample.servlet-noWebAppConfig/getAppNamesFromConfigTest.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -94,8 +96,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet-noWebAppConfig/testAppListsWithObjects.gradle b/src/test/resources/sample.servlet-noWebAppConfig/testAppListsWithObjects.gradle index 3433f6a7b..a88d73d6c 100644 --- a/src/test/resources/sample.servlet-noWebAppConfig/testAppListsWithObjects.gradle +++ b/src/test/resources/sample.servlet-noWebAppConfig/testAppListsWithObjects.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -65,8 +67,8 @@ liberty { } looseApplication = false deploy { - apps = [war2, file(war3.archivePath)] - dropins = [war, file(war4.archivePath)] + apps = [war2, file(war3.archiveFile.get())] + dropins = [war, file(war4.archiveFile.get())] } verifyAppStartTimeout = 30 @@ -94,8 +96,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet-noWebAppConfig/testWarTasksWithDifferentDependencies.gradle b/src/test/resources/sample.servlet-noWebAppConfig/testWarTasksWithDifferentDependencies.gradle index ca9576247..fdcd67926 100644 --- a/src/test/resources/sample.servlet-noWebAppConfig/testWarTasksWithDifferentDependencies.gradle +++ b/src/test/resources/sample.servlet-noWebAppConfig/testWarTasksWithDifferentDependencies.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -100,8 +102,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet-noWebAppConfig/verifyTimeoutSuccessListsOfAppsTest.gradle b/src/test/resources/sample.servlet-noWebAppConfig/verifyTimeoutSuccessListsOfAppsTest.gradle index 71369049f..624082b4c 100644 --- a/src/test/resources/sample.servlet-noWebAppConfig/verifyTimeoutSuccessListsOfAppsTest.gradle +++ b/src/test/resources/sample.servlet-noWebAppConfig/verifyTimeoutSuccessListsOfAppsTest.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -92,8 +94,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/TestStripVersion.gradle b/src/test/resources/sample.servlet/TestStripVersion.gradle index 279751ba2..a9ce939b4 100644 --- a/src/test/resources/sample.servlet/TestStripVersion.gradle +++ b/src/test/resources/sample.servlet/TestStripVersion.gradle @@ -22,8 +22,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -69,8 +71,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/testAppConfig.gradle b/src/test/resources/sample.servlet/testAppConfig.gradle index cd40cf7bb..cef89f03a 100644 --- a/src/test/resources/sample.servlet/testAppConfig.gradle +++ b/src/test/resources/sample.servlet/testAppConfig.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -73,8 +75,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/testAppConfigFail.gradle b/src/test/resources/sample.servlet/testAppConfigFail.gradle index eb2fac158..e9a9f932b 100644 --- a/src/test/resources/sample.servlet/testAppConfigFail.gradle +++ b/src/test/resources/sample.servlet/testAppConfigFail.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -74,8 +76,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/testAppendServerEnvWithConfigServerEnv.gradle b/src/test/resources/sample.servlet/testAppendServerEnvWithConfigServerEnv.gradle index 0e5b96809..ae1cc043e 100644 --- a/src/test/resources/sample.servlet/testAppendServerEnvWithConfigServerEnv.gradle +++ b/src/test/resources/sample.servlet/testAppendServerEnvWithConfigServerEnv.gradle @@ -22,8 +22,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -71,8 +73,8 @@ test { } task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/testAppendServerEnvWithEnvProps.gradle b/src/test/resources/sample.servlet/testAppendServerEnvWithEnvProps.gradle index 04110f8db..edc02586c 100644 --- a/src/test/resources/sample.servlet/testAppendServerEnvWithEnvProps.gradle +++ b/src/test/resources/sample.servlet/testAppendServerEnvWithEnvProps.gradle @@ -22,8 +22,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -73,8 +75,8 @@ test { } task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/testAppendServerEnvWithNoEnvProps.gradle b/src/test/resources/sample.servlet/testAppendServerEnvWithNoEnvProps.gradle index 01bf6875e..6d6b015e2 100644 --- a/src/test/resources/sample.servlet/testAppendServerEnvWithNoEnvProps.gradle +++ b/src/test/resources/sample.servlet/testAppendServerEnvWithNoEnvProps.gradle @@ -22,8 +22,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -70,8 +72,8 @@ test { } task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/testAppendServerEnvWithOnlyEnvProps.gradle b/src/test/resources/sample.servlet/testAppendServerEnvWithOnlyEnvProps.gradle index 237fdd911..f4e9318e9 100644 --- a/src/test/resources/sample.servlet/testAppendServerEnvWithOnlyEnvProps.gradle +++ b/src/test/resources/sample.servlet/testAppendServerEnvWithOnlyEnvProps.gradle @@ -22,8 +22,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -71,8 +73,8 @@ test { } task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/testConfigDropinsApp.gradle b/src/test/resources/sample.servlet/testConfigDropinsApp.gradle index 0a032dd7c..04b731d9f 100644 --- a/src/test/resources/sample.servlet/testConfigDropinsApp.gradle +++ b/src/test/resources/sample.servlet/testConfigDropinsApp.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -82,8 +84,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/testEtcOutputDir.gradle b/src/test/resources/sample.servlet/testEtcOutputDir.gradle index b549148c6..584e87278 100644 --- a/src/test/resources/sample.servlet/testEtcOutputDir.gradle +++ b/src/test/resources/sample.servlet/testEtcOutputDir.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -95,8 +97,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/testLooseApplication.gradle b/src/test/resources/sample.servlet/testLooseApplication.gradle index 543ce1e9c..680aa8509 100644 --- a/src/test/resources/sample.servlet/testLooseApplication.gradle +++ b/src/test/resources/sample.servlet/testLooseApplication.gradle @@ -22,8 +22,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -72,8 +74,8 @@ test { } task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/testLooseApplicationWithWarTask.gradle b/src/test/resources/sample.servlet/testLooseApplicationWithWarTask.gradle index 3efc853ce..1bcfeb610 100644 --- a/src/test/resources/sample.servlet/testLooseApplicationWithWarTask.gradle +++ b/src/test/resources/sample.servlet/testLooseApplicationWithWarTask.gradle @@ -23,8 +23,10 @@ apply plugin: 'java' apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -85,8 +87,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/testOutputDirs.gradle b/src/test/resources/sample.servlet/testOutputDirs.gradle index 243dce830..9159758a9 100644 --- a/src/test/resources/sample.servlet/testOutputDirs.gradle +++ b/src/test/resources/sample.servlet/testOutputDirs.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -90,8 +92,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/testPluginConfigFile.gradle b/src/test/resources/sample.servlet/testPluginConfigFile.gradle index 5e790ebda..07484d8c8 100644 --- a/src/test/resources/sample.servlet/testPluginConfigFile.gradle +++ b/src/test/resources/sample.servlet/testPluginConfigFile.gradle @@ -21,8 +21,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -70,8 +72,8 @@ test { } task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/verifyLooseAppTestTimeoutSuccess.gradle b/src/test/resources/sample.servlet/verifyLooseAppTestTimeoutSuccess.gradle index cb1a4a80d..458512e58 100644 --- a/src/test/resources/sample.servlet/verifyLooseAppTestTimeoutSuccess.gradle +++ b/src/test/resources/sample.servlet/verifyLooseAppTestTimeoutSuccess.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -77,8 +79,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/verifyTimeoutSuccessAppsTest.gradle b/src/test/resources/sample.servlet/verifyTimeoutSuccessAppsTest.gradle index 79ca5d2a1..70c8914e5 100644 --- a/src/test/resources/sample.servlet/verifyTimeoutSuccessAppsTest.gradle +++ b/src/test/resources/sample.servlet/verifyTimeoutSuccessAppsTest.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'liberty' apply plugin: 'war' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -76,8 +78,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.servlet/verifyTimeoutSuccessDropinsTest.gradle b/src/test/resources/sample.servlet/verifyTimeoutSuccessDropinsTest.gradle index 3621d604e..a22c6a0ce 100644 --- a/src/test/resources/sample.servlet/verifyTimeoutSuccessDropinsTest.gradle +++ b/src/test/resources/sample.servlet/verifyTimeoutSuccessDropinsTest.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -80,8 +82,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sample.springboot3/test_spring_boot_apps_30.gradle b/src/test/resources/sample.springboot3/test_spring_boot_apps_30.gradle index 83a380d6f..ef29e5624 100644 --- a/src/test/resources/sample.springboot3/test_spring_boot_apps_30.gradle +++ b/src/test/resources/sample.springboot3/test_spring_boot_apps_30.gradle @@ -21,7 +21,9 @@ apply plugin: 'liberty' group = 'liberty.gradle' version = '1.0-SNAPSHOT' -sourceCompatibility = 17 +java { + sourceCompatibility = 17 +} repositories { mavenCentral() diff --git a/src/test/resources/sample.springboot3/test_spring_boot_classifier_apps_30.gradle b/src/test/resources/sample.springboot3/test_spring_boot_classifier_apps_30.gradle index 569db154b..5f17c1980 100644 --- a/src/test/resources/sample.springboot3/test_spring_boot_classifier_apps_30.gradle +++ b/src/test/resources/sample.springboot3/test_spring_boot_classifier_apps_30.gradle @@ -21,7 +21,9 @@ apply plugin: 'liberty' group = 'liberty.gradle' version = '1.0-SNAPSHOT' -sourceCompatibility = 17 +java { + sourceCompatibility = 17 +} repositories { mavenCentral() diff --git a/src/test/resources/sample.springboot3/test_spring_boot_classifier_apps_30_no_feature.gradle b/src/test/resources/sample.springboot3/test_spring_boot_classifier_apps_30_no_feature.gradle index 40801aba5..a1b966bdb 100644 --- a/src/test/resources/sample.springboot3/test_spring_boot_classifier_apps_30_no_feature.gradle +++ b/src/test/resources/sample.springboot3/test_spring_boot_classifier_apps_30_no_feature.gradle @@ -21,7 +21,9 @@ apply plugin: 'liberty' group = 'liberty.gradle' version = '1.0-SNAPSHOT' -sourceCompatibility = 17 +java { + sourceCompatibility = 17 +} repositories { mavenCentral() diff --git a/src/test/resources/sample.springboot3/test_spring_boot_dropins_30.gradle b/src/test/resources/sample.springboot3/test_spring_boot_dropins_30.gradle index bac019e86..737a20c74 100644 --- a/src/test/resources/sample.springboot3/test_spring_boot_dropins_30.gradle +++ b/src/test/resources/sample.springboot3/test_spring_boot_dropins_30.gradle @@ -21,7 +21,9 @@ apply plugin: 'liberty' group = 'liberty.gradle' version = '1.0-SNAPSHOT' -sourceCompatibility = 17 +java { + sourceCompatibility = 17 +} repositories { mavenCentral() diff --git a/src/test/resources/sample.springboot3/test_spring_boot_plugins_dsl_apps_30.gradle b/src/test/resources/sample.springboot3/test_spring_boot_plugins_dsl_apps_30.gradle index c6e15a99f..c51f63819 100644 --- a/src/test/resources/sample.springboot3/test_spring_boot_plugins_dsl_apps_30.gradle +++ b/src/test/resources/sample.springboot3/test_spring_boot_plugins_dsl_apps_30.gradle @@ -7,7 +7,9 @@ plugins { group = 'liberty.gradle' version = '1.0-SNAPSHOT' -sourceCompatibility = 17 +java { + sourceCompatibility = 17 +} repositories { mavenCentral() diff --git a/src/test/resources/sample.springboot3/test_spring_boot_war_apps_30.gradle b/src/test/resources/sample.springboot3/test_spring_boot_war_apps_30.gradle index 2b0150509..2eb0cfea9 100644 --- a/src/test/resources/sample.springboot3/test_spring_boot_war_apps_30.gradle +++ b/src/test/resources/sample.springboot3/test_spring_boot_war_apps_30.gradle @@ -21,7 +21,9 @@ apply plugin: 'liberty' group = 'liberty.gradle' version = '1.0-SNAPSHOT' -sourceCompatibility = 17 +java { + sourceCompatibility = 17 +} repositories { mavenCentral() diff --git a/src/test/resources/sample.springboot3/test_spring_boot_war_classifier_apps_30.gradle b/src/test/resources/sample.springboot3/test_spring_boot_war_classifier_apps_30.gradle index be3382a2f..18bfb69ff 100644 --- a/src/test/resources/sample.springboot3/test_spring_boot_war_classifier_apps_30.gradle +++ b/src/test/resources/sample.springboot3/test_spring_boot_war_classifier_apps_30.gradle @@ -21,7 +21,9 @@ apply plugin: 'liberty' group = 'liberty.gradle' version = '1.0-SNAPSHOT' -sourceCompatibility = 17 +java { + sourceCompatibility = 17 +} repositories { mavenCentral() diff --git a/src/test/resources/sample.springboot3/test_spring_boot_with_springbootapplication_apps_30.gradle b/src/test/resources/sample.springboot3/test_spring_boot_with_springbootapplication_apps_30.gradle index c907413fb..22a01227e 100644 --- a/src/test/resources/sample.springboot3/test_spring_boot_with_springbootapplication_apps_30.gradle +++ b/src/test/resources/sample.springboot3/test_spring_boot_with_springbootapplication_apps_30.gradle @@ -21,7 +21,9 @@ apply plugin: 'liberty' group = 'liberty.gradle' version = '1.0-SNAPSHOT' -sourceCompatibility = 17 +java { + sourceCompatibility = 17 +} repositories { mavenCentral() diff --git a/src/test/resources/sample.springboot3/test_spring_boot_with_springbootapplication_nodes_apps_30.gradle b/src/test/resources/sample.springboot3/test_spring_boot_with_springbootapplication_nodes_apps_30.gradle index 2a48b78b4..2c2819115 100644 --- a/src/test/resources/sample.springboot3/test_spring_boot_with_springbootapplication_nodes_apps_30.gradle +++ b/src/test/resources/sample.springboot3/test_spring_boot_with_springbootapplication_nodes_apps_30.gradle @@ -21,7 +21,9 @@ apply plugin: 'liberty' group = 'liberty.gradle' version = '1.0-SNAPSHOT' -sourceCompatibility = 17 +java { + sourceCompatibility = 17 +} repositories { mavenCentral() diff --git a/src/test/resources/sample.springboot3/test_spring_boot_with_springbootapplication_nodes_apps_include_30.gradle b/src/test/resources/sample.springboot3/test_spring_boot_with_springbootapplication_nodes_apps_include_30.gradle index d23c9727a..f9c42e67f 100644 --- a/src/test/resources/sample.springboot3/test_spring_boot_with_springbootapplication_nodes_apps_include_30.gradle +++ b/src/test/resources/sample.springboot3/test_spring_boot_with_springbootapplication_nodes_apps_include_30.gradle @@ -21,7 +21,9 @@ apply plugin: 'liberty' group = 'liberty.gradle' version = '1.0-SNAPSHOT' -sourceCompatibility = 17 +java { + sourceCompatibility = 17 +} repositories { mavenCentral() diff --git a/src/test/resources/sampleJSP.servlet/testCompileJSP.gradle b/src/test/resources/sampleJSP.servlet/testCompileJSP.gradle index 1109c75f4..856f4a9e6 100644 --- a/src/test/resources/sampleJSP.servlet/testCompileJSP.gradle +++ b/src/test/resources/sampleJSP.servlet/testCompileJSP.gradle @@ -21,8 +21,10 @@ buildscript { apply plugin: 'war' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -75,8 +77,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/sampleJSP.servlet/testCompileJSP17.gradle b/src/test/resources/sampleJSP.servlet/testCompileJSP17.gradle index 453038677..aebcfba5d 100644 --- a/src/test/resources/sampleJSP.servlet/testCompileJSP17.gradle +++ b/src/test/resources/sampleJSP.servlet/testCompileJSP17.gradle @@ -74,8 +74,8 @@ test { task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/server-config-files/testCreateLibertyFiles.gradle b/src/test/resources/server-config-files/testCreateLibertyFiles.gradle index d3867d5bb..8fd251d1c 100644 --- a/src/test/resources/server-config-files/testCreateLibertyFiles.gradle +++ b/src/test/resources/server-config-files/testCreateLibertyFiles.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'java' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -42,8 +44,8 @@ liberty { repositories { mavenCentral() maven { - name 'liberty-starter-maven-repo' - url 'https://liberty-starter.wasdev.developer.ibm.com/start/api/v1/repo' + name = 'liberty-starter-maven-repo' + url = 'https://liberty-starter.wasdev.developer.ibm.com/start/api/v1/repo' } } @@ -53,8 +55,8 @@ dependencies { } task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/server-config-files/testCreateLibertyInlineProperties.gradle b/src/test/resources/server-config-files/testCreateLibertyInlineProperties.gradle index abfbfd9c6..b6487bf16 100644 --- a/src/test/resources/server-config-files/testCreateLibertyInlineProperties.gradle +++ b/src/test/resources/server-config-files/testCreateLibertyInlineProperties.gradle @@ -18,8 +18,10 @@ buildscript { apply plugin: 'java' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' @@ -48,8 +50,8 @@ ext { repositories { mavenCentral() maven { - name 'liberty-starter-maven-repo' - url 'https://liberty-starter.wasdev.developer.ibm.com/start/api/v1/repo' + name = 'liberty-starter-maven-repo' + url = 'https://liberty-starter.wasdev.developer.ibm.com/start/api/v1/repo' } } @@ -59,8 +61,8 @@ dependencies { } task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/server-config/testCreateLibertyDefaultConfigDir.gradle b/src/test/resources/server-config/testCreateLibertyDefaultConfigDir.gradle index d65ecf3d9..afbeeeb2a 100644 --- a/src/test/resources/server-config/testCreateLibertyDefaultConfigDir.gradle +++ b/src/test/resources/server-config/testCreateLibertyDefaultConfigDir.gradle @@ -18,16 +18,18 @@ buildscript { apply plugin: 'java' apply plugin: 'liberty' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} compileJava.options.encoding = 'UTF-8' repositories { mavenCentral() maven { - name 'liberty-starter-maven-repo' - url 'https://liberty-starter.wasdev.developer.ibm.com/start/api/v1/repo' + name = 'liberty-starter-maven-repo' + url = 'https://liberty-starter.wasdev.developer.ibm.com/start/api/v1/repo' } } @@ -37,8 +39,8 @@ dependencies { } task integrationTest(type: Test) { - group 'Verification' - description 'Runs the integration tests.' + group = 'Verification' + description = 'Runs the integration tests.' reports.html.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/reports/it") reports.junitXml.outputLocation = file("${project.getLayout().getBuildDirectory().getAsFile().get()}/test-results/it") include '**/it/**' diff --git a/src/test/resources/server-config/testCreateUpToDate.gradle b/src/test/resources/server-config/testCreateUpToDate.gradle index 2b893241b..916fccfa0 100644 --- a/src/test/resources/server-config/testCreateUpToDate.gradle +++ b/src/test/resources/server-config/testCreateUpToDate.gradle @@ -20,8 +20,8 @@ apply plugin: 'liberty' repositories { mavenCentral() maven { - name 'liberty-starter-maven-repo' - url 'https://liberty-starter.wasdev.developer.ibm.com/start/api/v1/repo' + name = 'liberty-starter-maven-repo' + url = 'https://liberty-starter.wasdev.developer.ibm.com/start/api/v1/repo' } }