Fix flaky test in parallel mode

The test was non deterministic in parallel mode.
However fixing that made something else strange surface, which
required some changes in the test setup that I cannot explain.

subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/DependencySubstitutionRulesIntegrationTest.groovy

@@ -1393,7 +1393,13 @@ Required by:
                 maven { url "${mavenRepo.uri}" }
             }
 
-            task jar(type: Jar) { baseName = project.name }
+            task jar(type: Jar) { 
+                baseName = project.name
+                // TODO LJA: No idea why I have to do this
+                if (project.version != 'unspecified') {
+                    archiveName = "\${project.name}-\${project.version}.jar"
+                }
+            }
             artifacts { conf jar }
         }
 
@@ -1450,13 +1456,13 @@ Required by:
     def 'substitution with project does not trigger failOnVersionConflict'() {
         settingsFile << 'include "sub"'
         buildFile << """
-$common
-
-project(':sub') {
-    version = '0.0.1'
+subprojects {
+    it.version = '0.0.1'
     group = 'org.test'
 }
 
+$common
+
 dependencies {
     conf 'foo:bar:1'
     conf project(':sub')
@@ -1474,11 +1480,16 @@ configurations.all {
 """
 
         when:
-        succeeds 'checkDeps'
+        succeeds ':checkDeps'
 
         then:
         resolve.expectGraph {
-            root(":sub", "org.test:sub:0.0.1") {}
+            root(":", ":depsub:") {
+                project(':sub', 'org.test:sub:0.0.1') {
+                    configuration = 'default'
+                }
+                edge('foo:bar:1', 'org.test:sub:0.0.1')
+            }
         }
     }
 }