Fixes related to Gradle 7.0. Upgrade some dependencies.

donbeave · donbeave · commit 32cc97b8c697 · 2021-04-15T22:15:35.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -24,8 +24,8 @@ plugins {
     id "com.jfrog.bintray" version "$LIB_BINTRAY_PLUGIN_VER" apply false
     id 'net.researchgate.release' version "$LIB_RELEASE_PLUGIN_VER"
     id "org.springframework.boot" version "$LIB_SPRING_BOOT_VER" apply false
-    id "com.jfrog.artifactory" version "4.15.1" apply false
-    id "org.sonarqube" version "3.0"
+    id "com.jfrog.artifactory" version "4.21.0" apply false
+    id "org.sonarqube" version "3.1.1"
     id "jacoco"
 }
 
@@ -147,7 +147,6 @@ subprojects {
                     }
 
                     pom {
-                        resolveStrategy = DELEGATE_FIRST
                         name = PROJECT_NAME
                         description = PROJECT_DESC
                         url = PROJECT_GIT_REPO_URL
diff --git a/example-graphql-subscription/build.gradle b/example-graphql-subscription/build.gradle
@@ -13,6 +13,6 @@ dependencies {
 }
 
 jar.enabled = false
-uploadArchives.enabled = false
+publish.enabled = false
 bintrayUpload.enabled = false
 publishToMavenLocal.enabled = false
diff --git a/example-graphql-tools/build.gradle b/example-graphql-tools/build.gradle
@@ -32,6 +32,6 @@ dependencies {
 }
 
 jar.enabled = false
-uploadArchives.enabled = false
+publish.enabled = false
 bintrayUpload.enabled = false
 publishToMavenLocal.enabled = false
diff --git a/example-request-scoped-dataloader/build.gradle b/example-request-scoped-dataloader/build.gradle
@@ -12,6 +12,6 @@ dependencies {
 }
 
 jar.enabled = false
-uploadArchives.enabled = false
+publish.enabled = false
 bintrayUpload.enabled = false
 publishToMavenLocal.enabled = false
diff --git a/example-spring-common/build.gradle b/example-spring-common/build.gradle
@@ -33,6 +33,6 @@ dependencies {
 }
 
 jar.enabled = false
-uploadArchives.enabled = false
+publish.enabled = false
 bintrayUpload.enabled = false
 publishToMavenLocal.enabled = false
diff --git a/example-webflux/build.gradle b/example-webflux/build.gradle
@@ -29,6 +29,6 @@ dependencies {
 }
 
 jar.enabled = false
-uploadArchives.enabled = false
+publish.enabled = false
 bintrayUpload.enabled = false
 publishToMavenLocal.enabled = false
diff --git a/example/build.gradle b/example/build.gradle
@@ -31,6 +31,6 @@ dependencies {
 }
 
 jar.enabled = false
-uploadArchives.enabled = false
+publish.enabled = false
 bintrayUpload.enabled = false
 publishToMavenLocal.enabled = false

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ dependencies {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`jar.enabled = false`
`16`		`-uploadArchives.enabled = false`
	`16`	`+publish.enabled = false`
`17`	`17`	`bintrayUpload.enabled = false`
`18`	`18`	`publishToMavenLocal.enabled = false`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@ dependencies {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`jar.enabled = false`
`35`		`-uploadArchives.enabled = false`
	`35`	`+publish.enabled = false`
`36`	`36`	`bintrayUpload.enabled = false`
`37`	`37`	`publishToMavenLocal.enabled = false`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ dependencies {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`jar.enabled = false`
`15`		`-uploadArchives.enabled = false`
	`15`	`+publish.enabled = false`
`16`	`16`	`bintrayUpload.enabled = false`
`17`	`17`	`publishToMavenLocal.enabled = false`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ dependencies {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`jar.enabled = false`
`36`		`-uploadArchives.enabled = false`
	`36`	`+publish.enabled = false`
`37`	`37`	`bintrayUpload.enabled = false`
`38`	`38`	`publishToMavenLocal.enabled = false`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ dependencies {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`jar.enabled = false`
`32`		`-uploadArchives.enabled = false`
	`32`	`+publish.enabled = false`
`33`	`33`	`bintrayUpload.enabled = false`
`34`	`34`	`publishToMavenLocal.enabled = false`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@ dependencies {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`jar.enabled = false`
`34`		`-uploadArchives.enabled = false`
	`34`	`+publish.enabled = false`
`35`	`35`	`bintrayUpload.enabled = false`
`36`	`36`	`publishToMavenLocal.enabled = false`