Merge branch '1.11.x'

build.gradle

@@ -275,25 +275,6 @@ subprojects {
         }
     }
 
-    dependencyLocking {
-        lockAllConfigurations()
-    }
-
-    tasks.register('resolveAndLockAll') {
-        description = 'Resolves dependencies of all configurations and writes them into the lock file.'
-        outputs.upToDateWhen { false }
-        doFirst {
-            assert gradle.startParameter.writeDependencyLocks || gradle.startParameter.lockedDependenciesToUpdate: 'Execute resolveAndLockAll --write-locks or --update-locks <dependencies>'
-        }
-        doLast {
-            project.configurations.findAll { it.canBeResolved }*.resolve()
-        }
-    }
-
-    task deleteLockFiles(type: Delete) {
-        delete fileTree(dir: '.', include: '**/gradle.lockfile')
-    }
-
     tasks.register('downloadDependencies') {
         outputs.upToDateWhen { false }
         doLast {