Clarify spring-cloud-task entry

This commit provides a complete entry for Spring Cloud task and clarify
that no more customization is required as of 1.4. Previously, the entry
did not have any groupId/artifactId pair, leading to a default (wrong)
groupId/artifactId to be generated.

Closes gh-341

initializr-generator/src/main/java/io/spring/initializr/metadata/Dependency.java

@@ -122,7 +122,7 @@ public class Dependency extends MetadataElement implements Describable {
 	 * Specify if the dependency has its coordinates set, i.e. {@code groupId} and
 	 * {@code artifactId}.
 	 */
-	public boolean hasCoordinates() {
+	private boolean hasCoordinates() {
 		return groupId != null && artifactId != null;
 	}
 
@@ -392,6 +392,14 @@ public class Dependency extends MetadataElement implements Describable {
 		return versionRange;
 	}
 
+	@Override
+	public String toString() {
+		return "Dependency{" + "id='" + getId() + '\'' +
+				", groupId='" + groupId + '\'' +
+				", artifactId='" + artifactId + '\'' +
+				", version='" + version + '\'' + '}';
+	}
+
 	/**
 	 * Map several attribute of the dependency for a given version range.
 	 */

initializr-generator/src/test/java/io/spring/initializr/metadata/DependencyTests.java

@@ -256,16 +256,36 @@ public class DependencyTests {
 				"org.springframework.boot", "spring-boot-starter-web", "0.3.0.RELEASE"); // default
 	}
 
+	@Test
+	public void resolveMatchingWithCustomGroupId() {
+		Dependency dependency = Dependency.withId("foo", "com.acme", "foo",
+				"0.3.0.RELEASE");
+		dependency.getMappings().add(Dependency.Mapping
+				.create("[1.1.0.RELEASE, 1.2.0.RELEASE)", null, null, "1.0.0.RELEASE"));
+		dependency.getMappings().add(Dependency.Mapping
+				.create("[1.2.0.RELEASE, 1.3.0.RELEASE)", null, "bar", null));
+		dependency.resolve();
+		validateResolvedDependency(dependency.resolve(Version.parse("1.1.5.RELEASE")),
+				"foo", "com.acme", "foo", "1.0.0.RELEASE");
+		validateResolvedDependency(dependency.resolve(Version.parse("1.2.5.RELEASE")),
+				"foo", "com.acme", "bar", "0.3.0.RELEASE");
+	}
+
 	private static void validateResolvedWebDependency(Dependency dependency,
 			String expectedGroupId, String expectedArtifactId, String expectedVersion) {
-		assertEquals(expectedVersion, dependency.getVersion());
-		assertEquals("web", dependency.getId());
-		assertEquals(expectedGroupId, dependency.getGroupId());
-		assertEquals(expectedArtifactId, dependency.getArtifactId());
+		validateResolvedDependency(dependency, "web", expectedGroupId,
+				expectedArtifactId, expectedVersion);
 		assertEquals(2, dependency.getKeywords().size());
 		assertEquals(1, dependency.getAliases().size());
 		assertEquals(1, dependency.getFacets().size());
+	}
 
+	private static void validateResolvedDependency(Dependency dependency, String id,
+			String expectedGroupId, String expectedArtifactId, String expectedVersion) {
+		assertEquals(id, dependency.getId());
+		assertEquals(expectedGroupId, dependency.getGroupId());
+		assertEquals(expectedArtifactId, dependency.getArtifactId());
+		assertEquals(expectedVersion, dependency.getVersion());
 	}
 
 }

initializr-service/src/main/resources/application.yml

@@ -620,15 +620,13 @@ initializr:
           id: cloud-task
           description: Task result tracking along with integration with batch and streams
           groupId: org.springframework.cloud
+          artifactId: spring-cloud-starter-task
           versionRange: 1.3.0.RELEASE
           bom: cloud-task-bom
           mappings:
             - versionRange: "[1.3.0.RELEASE,1.3.x.RELEASE]"
-              groupId: org.springframework.cloud
               artifactId: spring-cloud-task-starter
             - versionRange: "1.4.0.RELEASE"
-              groupId: org.springframework.cloud
-              artifactId: spring-cloud-starter-task
     - name: Cloud Config
       bom: cloud-bom
       versionRange: 1.2.3.RELEASE