diff --git a/build.gradle b/build.gradle
index 4dbce3331..0dac98f83 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,8 +48,10 @@ pluginManager.withPlugin('biz.aQute.bnd.builder') { // if plugin applied, execut
         baseline
     }
     dependencies {
-        baseline('group': group, 'name': jar.baseName, 'version': "(,${jar.version}[") {
-            force = true
+        baseline('group': group, 'name': jar.archiveBaseName) {
+            version {
+                strictly "(,${jar.archiveVersion}["
+            }
             transitive = false
         }
     }
@@ -146,7 +148,7 @@ allprojects {
     }
     distributions {
         main {
-            baseName = "$archivesBaseName-all"
+            distributionBaseName = "$archivesBaseName-all"
             contents {
                 from jar
                 from sourcesJar
@@ -207,10 +209,10 @@ jar {
     manifest {
         attributes 'Specification-Title'   : 'picocli',
                    'Specification-Vendor'  : 'Remko Popma',
-                   'Specification-Version' : version,
+                   'Specification-Version' : archiveVersion,
                    'Implementation-Title'  : 'picocli',
                    'Implementation-Vendor' : 'Remko Popma',
-                   'Implementation-Version': version,
+                   'Implementation-Version': archiveVersion,
                    'Main-Class'            : 'picocli.AutoComplete'
     }
     // copy module-info.class to META-INF/versions/9
diff --git a/picocli-annotation-processing-tests/build.gradle b/picocli-annotation-processing-tests/build.gradle
index 5ea4bff9d..b29c5095e 100644
--- a/picocli-annotation-processing-tests/build.gradle
+++ b/picocli-annotation-processing-tests/build.gradle
@@ -25,10 +25,10 @@ jar {
     manifest {
         attributes 'Specification-Title': 'Picocli Annotation Processing Tests',
                 'Specification-Vendor'  : 'Remko Popma',
-                'Specification-Version' : version,
+                'Specification-Version' : archiveVersion,
                 'Implementation-Title'  : 'Picocli Annotation Processing Tests',
                 'Implementation-Vendor' : 'Remko Popma',
-                'Implementation-Version': version,
+                'Implementation-Version': archiveVersion,
                 'Automatic-Module-Name' : 'info.picocli.annotation.processing.tests'
     }
 }
diff --git a/picocli-codegen/build.gradle b/picocli-codegen/build.gradle
index 2ce6305c8..2cb45406a 100644
--- a/picocli-codegen/build.gradle
+++ b/picocli-codegen/build.gradle
@@ -36,10 +36,10 @@ jar {
     manifest {
         attributes 'Specification-Title'   : 'Picocli Code Generation',
                    'Specification-Vendor'  : 'Remko Popma',
-                   'Specification-Version' : version,
+                   'Specification-Version' : archiveVersion,
                    'Implementation-Title'  : 'Picocli Code Generation',
                    'Implementation-Vendor' : 'Remko Popma',
-                   'Implementation-Version': version,
+                   'Implementation-Version': archiveVersion,
                    'Automatic-Module-Name' : 'info.picocli.codegen'
     }
 }
diff --git a/picocli-groovy/build.gradle b/picocli-groovy/build.gradle
index bddd155bc..d665ca595 100644
--- a/picocli-groovy/build.gradle
+++ b/picocli-groovy/build.gradle
@@ -36,10 +36,10 @@ jar {
     manifest {
         attributes  'Specification-Title'   : 'Picocli Groovy',
                     'Specification-Vendor'  : 'Remko Popma',
-                    'Specification-Version' : version,
+                    'Specification-Version' : archiveVersion,
                     'Implementation-Title'  : 'Picocli Groovy',
                     'Implementation-Vendor' : 'Remko Popma',
-                    'Implementation-Version': version,
+                    'Implementation-Version': archiveVersion,
                     'Automatic-Module-Name' : 'info.picocli.groovy'
     }
 }
diff --git a/picocli-shell-jline2/build.gradle b/picocli-shell-jline2/build.gradle
index 63245e4d0..70f3a410e 100644
--- a/picocli-shell-jline2/build.gradle
+++ b/picocli-shell-jline2/build.gradle
@@ -19,10 +19,10 @@ jar {
     manifest {
         attributes  'Specification-Title'   : 'Picocli Shell JLine2',
                     'Specification-Vendor'  : 'Remko Popma',
-                    'Specification-Version' : version,
+                    'Specification-Version' : archiveVersion,
                     'Implementation-Title'  : 'Picocli Shell JLine2',
                     'Implementation-Vendor' : 'Remko Popma',
-                    'Implementation-Version': version,
+                    'Implementation-Version': archiveVersion,
                     'Automatic-Module-Name' : 'info.picocli.shell.jline2'
     }
 }
diff --git a/picocli-shell-jline3/build.gradle b/picocli-shell-jline3/build.gradle
index 40fb1928a..f0bed18a8 100644
--- a/picocli-shell-jline3/build.gradle
+++ b/picocli-shell-jline3/build.gradle
@@ -22,10 +22,10 @@ jar {
     manifest {
         attributes  'Specification-Title'   : 'Picocli Shell JLine3',
                     'Specification-Vendor'  : 'Remko Popma',
-                    'Specification-Version' : version,
+                    'Specification-Version' : archiveVersion,
                     'Implementation-Title'  : 'Picocli Shell JLine3',
                     'Implementation-Vendor' : 'Remko Popma',
-                    'Implementation-Version': version,
+                    'Implementation-Version': archiveVersion,
                     'Automatic-Module-Name' : 'info.picocli.shell.jline3'
     }
 }
diff --git a/picocli-spring-boot-starter/build.gradle b/picocli-spring-boot-starter/build.gradle
index 1be54b068..68c794527 100644
--- a/picocli-spring-boot-starter/build.gradle
+++ b/picocli-spring-boot-starter/build.gradle
@@ -25,10 +25,10 @@ jar {
     manifest {
         attributes  'Specification-Title'   : 'Picocli Spring Boot Starter',
                     'Specification-Vendor'  : 'Remko Popma',
-                    'Specification-Version' : version,
+                    'Specification-Version' : archiveVersion,
                     'Implementation-Title'  : 'Picocli Spring Boot Starter',
                     'Implementation-Vendor' : 'Remko Popma',
-                    'Implementation-Version': version,
+                    'Implementation-Version': archiveVersion,
                     'Automatic-Module-Name' : 'info.picocli.spring'
     }
 }