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 <michael@oleske.engineer>
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index ff76f83..1137ef6 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -28,7 +28,7 @@
}
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 37d62bf..61d0d2b 100644
--- a/extensions/geode-modules-session/build.gradle
+++ b/extensions/geode-modules-session/build.gradle
@@ -24,11 +24,11 @@
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 bc6796d..4668ce5 100644
--- a/extensions/session-testing-war/build.gradle
+++ b/extensions/session-testing-war/build.gradle
@@ -22,11 +22,11 @@
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 e119225..9116b1d 100644
--- a/geode-apis-compatible-with-redis/build.gradle
+++ b/geode-apis-compatible-with-redis/build.gradle
@@ -29,7 +29,7 @@
}
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 @@
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 @@
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 a92d873..a575703 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -163,7 +163,7 @@
}
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 @@
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 @@
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 @@
distributions {
src {
- baseName = 'apache-geode'
+ distributionBaseName = 'apache-geode'
contents {
from rootProject.tasks.writeBuildInfo
from (rootDir) {
@@ -534,7 +534,7 @@
}
}
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 a53fdb1..5d076ef 100755
--- a/geode-assembly/geode-assembly-test/build.gradle
+++ b/geode-assembly/geode-assembly-test/build.gradle
@@ -21,7 +21,7 @@
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 175f32b..cb44122 100644
--- a/geode-concurrency-test/build.gradle
+++ b/geode-concurrency-test/build.gradle
@@ -21,7 +21,7 @@
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 14abd8e..18a0364 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -48,7 +48,7 @@
}
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 634a182..cfb8559 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -325,7 +325,7 @@
api(project(':geode-management'))
- jcaCompile(sourceSets.main.output)
+ jcaImplementation(sourceSets.main.output)
testImplementation(project(':geode-junit')) {
exclude module: 'geode-core'
@@ -341,11 +341,11 @@
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 @@
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 ccf0233..a98394f 100755
--- a/geode-dunit/build.gradle
+++ b/geode-dunit/build.gradle
@@ -21,7 +21,7 @@
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 @@
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 c9e0580..b2b772d 100755
--- a/geode-http-service/build.gradle
+++ b/geode-http-service/build.gradle
@@ -21,7 +21,7 @@
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 a521a75..341ddff 100755
--- a/geode-junit/build.gradle
+++ b/geode-junit/build.gradle
@@ -21,7 +21,7 @@
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 @@
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 8deb82e..c0c2e02 100644
--- a/geode-logging/build.gradle
+++ b/geode-logging/build.gradle
@@ -21,7 +21,7 @@
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 @@
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 63d55be..cee95ae 100644
--- a/geode-lucene/geode-lucene-test/build.gradle
+++ b/geode-lucene/geode-lucene-test/build.gradle
@@ -21,11 +21,11 @@
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 0454690..4a45871 100755
--- a/geode-management/build.gradle
+++ b/geode-management/build.gradle
@@ -21,7 +21,7 @@
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 afa684f..8f8862f 100644
--- a/geode-membership/build.gradle
+++ b/geode-membership/build.gradle
@@ -20,7 +20,7 @@
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 @@
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 129ad7d..23ce418 100644
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -26,7 +26,7 @@
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 17cdede..d161ab6 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}/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 @@
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 ffeaed1..e5892d4 100644
--- a/geode-rebalancer/build.gradle
+++ b/geode-rebalancer/build.gradle
@@ -22,8 +22,8 @@
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 54620c7..92a79b1 100755
--- a/geode-serialization/build.gradle
+++ b/geode-serialization/build.gradle
@@ -43,7 +43,7 @@
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 7512fe3..17b74be 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -21,7 +21,7 @@
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 79daa9a..bb614d2 100644
--- a/geode-web-api/build.gradle
+++ b/geode-web-api/build.gradle
@@ -29,7 +29,7 @@
}
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 a3fbbc4..0fb77c8 100644
--- a/geode-web-management/build.gradle
+++ b/geode-web-management/build.gradle
@@ -48,7 +48,7 @@
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 7c28069..3cf3e65 100644
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -59,13 +59,13 @@
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 2742511..c95e49c 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -106,7 +106,7 @@
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 @@
// 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 7c0fb78..48dcd32 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -75,7 +75,7 @@
transitive = false
}
- testRuntime('cglib:cglib:' + DependencyConstraints.get('cglib.version')) {
+ testRuntimeOnly('cglib:cglib:' + DependencyConstraints.get('cglib.version')) {
exclude module: 'org.apache.ant'
}
}
