From 5f7abc97b0ad1626e359e36efc12734feb42f7b2 Mon Sep 17 00:00:00 2001 From: "M. Oleske" Date: Fri, 16 Apr 2021 14:59:56 -0700 Subject: [PATCH] GEODE-9161: Fix simple Gradle 7 warnings (#6315) - testRuntime to testRuntimeOnly - some compile to api - version to archiveVersion - basename to distributionbasename Authored-by: M. Oleske --- buildSrc/build.gradle | 2 +- extensions/geode-modules-session/build.gradle | 6 +++--- extensions/session-testing-war/build.gradle | 4 ++-- geode-apis-compatible-with-redis/build.gradle | 6 +++--- geode-assembly/build.gradle | 10 +++++----- geode-assembly/geode-assembly-test/build.gradle | 2 +- geode-concurrency-test/build.gradle | 2 +- geode-connectors/build.gradle | 2 +- geode-core/build.gradle | 14 +++++++------- geode-dunit/build.gradle | 4 ++-- geode-http-service/build.gradle | 2 +- geode-junit/build.gradle | 4 ++-- geode-logging/build.gradle | 4 ++-- geode-lucene/geode-lucene-test/build.gradle | 4 ++-- geode-management/build.gradle | 2 +- geode-membership/build.gradle | 4 ++-- geode-pulse/build.gradle | 2 +- geode-pulse/geode-pulse-test/build.gradle | 10 +++++----- geode-rebalancer/build.gradle | 4 ++-- geode-serialization/build.gradle | 2 +- geode-wan/build.gradle | 2 +- geode-web-api/build.gradle | 2 +- geode-web-management/build.gradle | 2 +- geode-web/build.gradle | 4 ++-- gradle/java.gradle | 4 ++-- gradle/test.gradle | 2 +- 26 files changed, 53 insertions(+), 53 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index ff76f83f0988..1137ef6cdefb 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -28,7 +28,7 @@ repositories { } dependencies { - testRuntime('org.apache.geode:geode-junit:1.3.0') { + testRuntimeOnly('org.apache.geode:geode-junit:1.3.0') { exclude group: 'org.apache.logging.log4j' } implementation(gradleApi()) diff --git a/extensions/geode-modules-session/build.gradle b/extensions/geode-modules-session/build.gradle index 37d62bf8bbdb..61d0d2b5f788 100644 --- a/extensions/geode-modules-session/build.gradle +++ b/extensions/geode-modules-session/build.gradle @@ -24,11 +24,11 @@ evaluationDependsOn(":geode-core") dependencies { - compile(platform(project(':boms:geode-all-bom'))) - compile(project(':extensions:geode-modules-session-internal')) { + api(platform(project(':boms:geode-all-bom'))) + api(project(':extensions:geode-modules-session-internal')) { exclude module: 'geode-modules' } - compile(project(':geode-core')) + api(project(':geode-core')) implementation(project(':geode-common')) integrationTestImplementation(project(':extensions:geode-modules')) diff --git a/extensions/session-testing-war/build.gradle b/extensions/session-testing-war/build.gradle index bc6796d3f80d..4668ce59c47e 100644 --- a/extensions/session-testing-war/build.gradle +++ b/extensions/session-testing-war/build.gradle @@ -22,11 +22,11 @@ apply plugin: 'war' dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) implementation('javax.servlet:javax.servlet-api') implementation(project(':geode-deployment:geode-deployment-legacy')) } war { - version = '' + archiveVersion = '' } diff --git a/geode-apis-compatible-with-redis/build.gradle b/geode-apis-compatible-with-redis/build.gradle index e119225614db..9116b1d362fb 100644 --- a/geode-apis-compatible-with-redis/build.gradle +++ b/geode-apis-compatible-with-redis/build.gradle @@ -29,7 +29,7 @@ facets { } dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) implementation(project(':geode-serialization')) implementation(project(':geode-logging')) implementation(project(':geode-core')) @@ -57,7 +57,7 @@ dependencies { integrationTestImplementation('org.apache.logging.log4j:log4j-core') // This only exists for debugging PubSubNativeRedisAcceptanceTest integrationTestImplementation('org.buildobjects:jproc:2.5.1') - integrationTestRuntime(project(':geode-log4j')) + integrationTestRuntimeOnly(project(':geode-log4j')) acceptanceTestImplementation(sourceSets.integrationTest.output) acceptanceTestImplementation(sourceSets.distributedTest.output) @@ -66,7 +66,7 @@ dependencies { acceptanceTestImplementation(project(':geode-junit')) acceptanceTestImplementation('redis.clients:jedis') acceptanceTestImplementation('org.testcontainers:testcontainers') - acceptanceTestRuntime(project(':geode-log4j')) + acceptanceTestRuntimeOnly(project(':geode-log4j')) acceptanceTestImplementation('org.springframework.boot:spring-boot-starter-web') { exclude module: 'spring-boot-starter-tomcat' } diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle index a92d8735cd4b..a5757032893d 100755 --- a/geode-assembly/build.gradle +++ b/geode-assembly/build.gradle @@ -163,7 +163,7 @@ task downloadWebServers(type:Copy) { } dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) gfshDependencies(platform(project(':boms:geode-all-bom'))) dependentProjectNames.each { @@ -217,7 +217,7 @@ dependencies { integrationTestImplementation('javax.annotation:javax.annotation-api') integrationTestImplementation('javax.servlet:javax.servlet-api') - integrationTestRuntime(project(path: ':geode-old-versions', configuration: 'testOutput')) + integrationTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput')) integrationTestRuntimeOnly('io.swagger:swagger-annotations') // these two modules are for testing only @@ -302,7 +302,7 @@ dependencies { upgradeTestRuntimeOnly(project(':extensions:session-testing-war')) upgradeTestRuntimeOnly('org.codehaus.cargo:cargo-core-uberjar') upgradeTestRuntimeOnly('org.apache.httpcomponents:httpclient') - upgradeTestRuntime files({ downloadWebServers } ) + upgradeTestRuntimeOnly files({ downloadWebServers } ) //Web servers used for session module testing webServerTomcat6('apache:tomcat:' + DependencyConstraints.get('tomcat6.version') + '@zip') @@ -494,7 +494,7 @@ tasks.register('docs', Javadoc) { distributions { src { - baseName = 'apache-geode' + distributionBaseName = 'apache-geode' contents { from rootProject.tasks.writeBuildInfo from (rootDir) { @@ -534,7 +534,7 @@ distributions { } } named('main') { - baseName = 'apache-geode' + distributionBaseName = 'apache-geode' contents { duplicatesStrategy 'exclude' exclude '*.asc' diff --git a/geode-assembly/geode-assembly-test/build.gradle b/geode-assembly/geode-assembly-test/build.gradle index a53fdb1d2a8e..5d076ef04d47 100755 --- a/geode-assembly/geode-assembly-test/build.gradle +++ b/geode-assembly/geode-assembly-test/build.gradle @@ -21,7 +21,7 @@ apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle" dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) compileOnly(project(':extensions:geode-modules-test')) compileOnly(project(':geode-core')) compileOnly(project(':geode-pulse')) diff --git a/geode-concurrency-test/build.gradle b/geode-concurrency-test/build.gradle index 175f32b9d90c..cb4412241a00 100644 --- a/geode-concurrency-test/build.gradle +++ b/geode-concurrency-test/build.gradle @@ -21,7 +21,7 @@ apply from: "${project.projectDir}/../gradle/publish-java.gradle" apply from: "${project.projectDir}/../gradle/warnings.gradle" dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) implementation('junit:junit') implementation('org.apache.logging.log4j:log4j-api') integrationTestImplementation('org.assertj:assertj-core') diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle index 14abd8e7a3f9..18a0364c76bb 100644 --- a/geode-connectors/build.gradle +++ b/geode-connectors/build.gradle @@ -48,7 +48,7 @@ task downloadJdbcJars(type:Copy) { } dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) implementation(project(':geode-logging')) implementation(project(':geode-serialization')) diff --git a/geode-core/build.gradle b/geode-core/build.gradle index 634a1824cb9c..cfb85590fbfd 100755 --- a/geode-core/build.gradle +++ b/geode-core/build.gradle @@ -325,7 +325,7 @@ dependencies { api(project(':geode-management')) - jcaCompile(sourceSets.main.output) + jcaImplementation(sourceSets.main.output) testImplementation(project(':geode-junit')) { exclude module: 'geode-core' @@ -341,11 +341,11 @@ dependencies { testImplementation(files("${System.getProperty('java.home')}/../lib/tools.jar")) - testRuntime('commons-collections:commons-collections') - testRuntime('commons-configuration:commons-configuration') - testRuntime('commons-io:commons-io') - testRuntime('commons-validator:commons-validator') - testRuntime('com.pholser:junit-quickcheck-generators') + testRuntimeOnly('commons-collections:commons-collections') + testRuntimeOnly('commons-configuration:commons-configuration') + testRuntimeOnly('commons-io:commons-io') + testRuntimeOnly('commons-validator:commons-validator') + testRuntimeOnly('com.pholser:junit-quickcheck-generators') // Needed for JDK8, not JDK11, after nebula.facet v7.0.9 integrationTestImplementation(files("${System.getProperty('java.home')}/../lib/tools.jar")) @@ -359,7 +359,7 @@ dependencies { integrationTestImplementation('pl.pragmatists:JUnitParams') integrationTestImplementation('com.tngtech.archunit:archunit-junit4') - integrationTestRuntime(project(path: ':geode-old-versions', configuration: 'testOutput')) + integrationTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput')) integrationTestRuntimeOnly('org.apache.derby:derby') integrationTestRuntimeOnly('xerces:xercesImpl') diff --git a/geode-dunit/build.gradle b/geode-dunit/build.gradle index ccf0233e97f7..a98394feb088 100755 --- a/geode-dunit/build.gradle +++ b/geode-dunit/build.gradle @@ -21,7 +21,7 @@ apply from: "${project.projectDir}/../gradle/publish-java.gradle" dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) implementation(project(':geode-logging')) implementation(project(':geode-serialization')) implementation(project(':geode-membership')) @@ -32,7 +32,7 @@ dependencies { exclude module: 'geode-core' } - compile(project(':geode-junit')) { + api(project(':geode-junit')) { exclude module: 'geode-core' } diff --git a/geode-http-service/build.gradle b/geode-http-service/build.gradle index c9e0580e9657..b2b772d6b065 100755 --- a/geode-http-service/build.gradle +++ b/geode-http-service/build.gradle @@ -21,7 +21,7 @@ apply from: "${project.projectDir}/../gradle/publish-java.gradle" apply from: "${project.projectDir}/../gradle/warnings.gradle" dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) implementation(project(':geode-logging')) implementation('org.apache.logging.log4j:log4j-api') diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle index a521a75fe20a..341ddffea8f6 100755 --- a/geode-junit/build.gradle +++ b/geode-junit/build.gradle @@ -21,7 +21,7 @@ apply from: "${project.projectDir}/../gradle/publish-java.gradle" dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) testImplementation(project(':geode-common')) compileOnly(project(':geode-core')) @@ -59,7 +59,7 @@ dependencies { testImplementation('pl.pragmatists:JUnitParams') - testRuntime(project(path: ':geode-old-versions', configuration: 'testOutput')) + testRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput')) } test { diff --git a/geode-logging/build.gradle b/geode-logging/build.gradle index 8deb82ee803f..c0c2e02f5433 100644 --- a/geode-logging/build.gradle +++ b/geode-logging/build.gradle @@ -21,7 +21,7 @@ apply from: "${project.projectDir}/../gradle/publish-java.gradle" apply from: "${project.projectDir}/../gradle/warnings.gradle" dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) // Geode-common has annotations and other pieces used by geode-logging api(project(':geode-common')) @@ -37,7 +37,7 @@ dependencies { testImplementation('junit:junit') testImplementation('org.assertj:assertj-core') - testRuntime(project(path: ':geode-old-versions', configuration: 'testOutput')) + testRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput')) integrationTestImplementation(project(':geode-junit')) { exclude module: 'geode-logging' diff --git a/geode-lucene/geode-lucene-test/build.gradle b/geode-lucene/geode-lucene-test/build.gradle index 63d55be19d0c..cee95aeb0883 100644 --- a/geode-lucene/geode-lucene-test/build.gradle +++ b/geode-lucene/geode-lucene-test/build.gradle @@ -21,11 +21,11 @@ apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle" dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) implementation('org.apache.lucene:lucene-core') implementation(project(':geode-logging')) implementation(project(':geode-serialization')) - compile(project(':geode-core')) + api(project(':geode-core')) compileOnly(project(':geode-lucene')) implementation('junit:junit') diff --git a/geode-management/build.gradle b/geode-management/build.gradle index 04546902a163..4a4587102f01 100755 --- a/geode-management/build.gradle +++ b/geode-management/build.gradle @@ -21,7 +21,7 @@ apply from: "${project.projectDir}/../gradle/publish-java.gradle" apply from: "${project.projectDir}/../gradle/warnings.gradle" dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) implementation('org.apache.commons:commons-lang3') implementation('commons-io:commons-io') implementation('com.fasterxml.jackson.core:jackson-databind') diff --git a/geode-membership/build.gradle b/geode-membership/build.gradle index afa684fd5407..8f8862f922ce 100644 --- a/geode-membership/build.gradle +++ b/geode-membership/build.gradle @@ -20,7 +20,7 @@ apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle" apply from: "${project.projectDir}/../gradle/publish-java.gradle" dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) // Geode-common has annotations and other pieces used by geode-logging api(project(':geode-common')) @@ -48,7 +48,7 @@ dependencies { testImplementation('org.assertj:assertj-core') testImplementation('com.tngtech.archunit:archunit-junit4') - testRuntime(project(path: ':geode-old-versions', configuration: 'testOutput')) + testRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput')) integrationTestImplementation(project(':geode-junit')) diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle index 129ad7dd3d3e..23ce41842a05 100644 --- a/geode-pulse/build.gradle +++ b/geode-pulse/build.gradle @@ -26,7 +26,7 @@ apply from: "${project.projectDir}/../gradle/warnings.gradle" jar.enabled = true dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) compileOnly(platform(project(':boms:geode-all-bom'))) providedCompile(platform(project(':boms:geode-all-bom'))) diff --git a/geode-pulse/geode-pulse-test/build.gradle b/geode-pulse/geode-pulse-test/build.gradle index 17cdedef6c34..d161ab62fae1 100644 --- a/geode-pulse/geode-pulse-test/build.gradle +++ b/geode-pulse/geode-pulse-test/build.gradle @@ -19,7 +19,7 @@ apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle" apply from: "${rootDir}/${scriptDir}/warnings.gradle" dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) implementation('org.awaitility:awaitility') implementation('junit:junit') implementation('org.eclipse.jetty:jetty-server') @@ -30,10 +30,10 @@ dependencies { ext.optional = true } - compile(project(':geode-core')) - compile(project(':geode-membership')) - compile(project(':geode-http-service')) - compile(project(':geode-junit')) { + api(project(':geode-core')) + api(project(':geode-membership')) + api(project(':geode-http-service')) + api(project(':geode-junit')) { exclude module: 'geode-core' } compileOnly(project(':geode-pulse')) diff --git a/geode-rebalancer/build.gradle b/geode-rebalancer/build.gradle index ffeaed178e6f..e5892d487b05 100644 --- a/geode-rebalancer/build.gradle +++ b/geode-rebalancer/build.gradle @@ -22,8 +22,8 @@ apply from: "${project.projectDir}/../gradle/warnings.gradle" dependencies { - compile(platform(project(':boms:geode-all-bom'))) - compile(project(':geode-core')) + api(platform(project(':boms:geode-all-bom'))) + api(project(':geode-core')) implementation(project(':geode-serialization')) implementation(project(':geode-logging')) integrationTestImplementation(project(':geode-junit')) { diff --git a/geode-serialization/build.gradle b/geode-serialization/build.gradle index 54620c79caf1..92a79b18a310 100755 --- a/geode-serialization/build.gradle +++ b/geode-serialization/build.gradle @@ -43,7 +43,7 @@ dependencies { testImplementation('junit:junit') testImplementation('org.assertj:assertj-core') - testRuntime(project(path: ':geode-old-versions', configuration: 'testOutput')) + testRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput')) integrationTestImplementation(project(':geode-junit')) { exclude module: 'geode-serialization' diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle index 7512fe32fdf3..17b74becd124 100644 --- a/geode-wan/build.gradle +++ b/geode-wan/build.gradle @@ -21,7 +21,7 @@ apply from: "${project.projectDir}/../gradle/publish-java.gradle" dependencies { - compile(platform(project(':boms:geode-all-bom'))) + api(platform(project(':boms:geode-all-bom'))) compileOnly(platform(project(':boms:geode-all-bom'))) diff --git a/geode-web-api/build.gradle b/geode-web-api/build.gradle index 79daa9aeaef9..bb614d2cbc07 100644 --- a/geode-web-api/build.gradle +++ b/geode-web-api/build.gradle @@ -29,7 +29,7 @@ configurations { } dependencies { - compile(platform(project(':boms:geode-all-bom'))){ + api(platform(project(':boms:geode-all-bom'))){ exclude module: "jackson-annotations" } diff --git a/geode-web-management/build.gradle b/geode-web-management/build.gradle index a3fbbc4d7f80..0fb77c839bec 100644 --- a/geode-web-management/build.gradle +++ b/geode-web-management/build.gradle @@ -48,7 +48,7 @@ configurations { war {} } dependencies { - compile(platform(project(':boms:geode-all-bom'))) { + api(platform(project(':boms:geode-all-bom'))) { exclude module: "jackson-annotations" } compileOnly(project(':geode-logging')) diff --git a/geode-web/build.gradle b/geode-web/build.gradle index 7c28069502d1..3cf3e658ad0f 100644 --- a/geode-web/build.gradle +++ b/geode-web/build.gradle @@ -59,13 +59,13 @@ dependencies { integrationTestImplementation(project(':geode-dunit')); - integrationTestRuntimeOnly(files(war.destinationDir)) + integrationTestRuntimeOnly(files(war.destinationDirectory)) distributedTestImplementation(project(':geode-common')) distributedTestImplementation(project(':geode-dunit')) distributedTestImplementation('pl.pragmatists:JUnitParams') - distributedTestRuntimeOnly(files(war.destinationDir)) + distributedTestRuntimeOnly(files(war.destinationDirectory)) upgradeTestImplementation(project(':geode-dunit')) { } diff --git a/gradle/java.gradle b/gradle/java.gradle index 2742511bb807..c95e49cf9e1c 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -106,7 +106,7 @@ gradle.taskGraph.whenReady({ graph -> attributes.put("Manifest-Version", "1.0") attributes.put("Created-By", System.getProperty("user.name")) attributes.put("Title", rootProject.name) - attributes.put("Version", version) + attributes.put("Version", archiveVersion) attributes.put("Organization", productOrg) attributes.put("Class-Path", runtimeList.join(' ')) attributes.put("Dependent-Modules", projectDependencies.collect({ "${it.name}-${it.version}" }).join(' ')) @@ -133,7 +133,7 @@ configurations { // be created as libs/foo-sources.jar instead of libs/extensions/foo-sources.jar for example. tasks.all { task -> if (task instanceof Jar) { - baseName = project.name + archiveBaseName = project.name } } diff --git a/gradle/test.gradle b/gradle/test.gradle index 7c0fb78cac98..48dcd3212d9d 100644 --- a/gradle/test.gradle +++ b/gradle/test.gradle @@ -75,7 +75,7 @@ dependencies { transitive = false } - testRuntime('cglib:cglib:' + DependencyConstraints.get('cglib.version')) { + testRuntimeOnly('cglib:cglib:' + DependencyConstraints.get('cglib.version')) { exclude module: 'org.apache.ant' } }