diff --git a/build.gradle b/build.gradle
index 4db4f10269..b0441ce0fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -229,13 +229,12 @@ subprojects {
 
     tasks.register('resolveAndLockAll') {
         description = 'Resolves dependencies of all configurations and writes them into the lock file.'
+        outputs.upToDateWhen { false }
         doFirst {
-            assert gradle.startParameter.writeDependencyLocks : 'Execute resolveAndLockAll --write-locks'
+            assert gradle.startParameter.writeDependencyLocks || gradle.startParameter.lockedDependenciesToUpdate : 'Execute resolveAndLockAll --write-locks or --update-locks <dependencies>'
         }
         doLast {
-            project.configurations
-                    .findAll { it.canBeResolved }
-                    .each { it.resolve() }
+            project.configurations.findAll { it.canBeResolved }*.resolve()
         }
     }