root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Support for explicit module path in dependency 

Instead of *always* needing to pull auto-import dependencies
from the master parent pom, we now allow normal @Grab-style
module specifications, e.g. "io.ratpack:ratpack-groovy:0.9.2"
This commit is contained in:
Dave Syer 2014-03-29 19:18:40 +00:00
parent 6bdc229c84
commit b71f07932e
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java
View File

@ -205,7 +205,8 @@ public class DependencyCustomizer {
ArtifactCoordinatesResolver artifactCoordinatesResolver = this.dependencyResolutionContext ArtifactCoordinatesResolver artifactCoordinatesResolver = this.dependencyResolutionContext
.getArtifactCoordinatesResolver(); .getArtifactCoordinatesResolver();
this.classNode.addAnnotation(createGrabAnnotation( this.classNode.addAnnotation(createGrabAnnotation(
artifactCoordinatesResolver.getGroupId(module), module, artifactCoordinatesResolver.getGroupId(module),
artifactCoordinatesResolver.getArtifactId(module),
artifactCoordinatesResolver.getVersion(module), transitive)); artifactCoordinatesResolver.getVersion(module), transitive));
} }
return this; return this;

26
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ArtifactCoordinatesResolver.java
View File

@ -25,18 +25,26 @@ package org.springframework.boot.cli.compiler.dependencies;
public interface ArtifactCoordinatesResolver { public interface ArtifactCoordinatesResolver {
/** /**
* Gets the group id of the artifact identified by the given {@code artifactId}. * Gets the group id of the artifact identified by the given {@code module}. Returns
* Returns {@code null} if the artifact is unknown to the resolver. * {@code null} if the artifact is unknown to the resolver.
* @param artifactId The id of the artifact * @param module The id of the module
* @return The group id of the artifact * @return The group id of the module
*/ */
String getGroupId(String artifactId); String getGroupId(String module);
/** /**
* Gets the version of the artifact identified by the given {@code artifactId}. * Gets the artifact id of the artifact identified by the given {@code module}.
* Returns {@code null} if the artifact is unknown to the resolver. * Returns {@code null} if the artifact is unknown to the resolver.
* @param artifactId The id of the artifact * @param module The id of the module
* @return The version of the artifact * @return The group id of the module
*/ */
String getVersion(String artifactId); String getArtifactId(String module);
/**
* Gets the version of the artifact identified by the given {@code module}. Returns
* {@code null} if the artifact is unknown to the resolver.
* @param module The id of the module
* @return The version of the module
*/
String getVersion(String module);
} }

11
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ManagedDependenciesArtifactCoordinatesResolver.java
View File

@ -19,6 +19,7 @@ package org.springframework.boot.cli.compiler.dependencies;
import org.springframework.boot.dependency.tools.Dependency; import org.springframework.boot.dependency.tools.Dependency;
import org.springframework.boot.dependency.tools.ManagedDependencies; import org.springframework.boot.dependency.tools.ManagedDependencies;
import org.springframework.boot.dependency.tools.VersionManagedDependencies; import org.springframework.boot.dependency.tools.VersionManagedDependencies;
import org.springframework.util.StringUtils;
/** /**
* {@link ArtifactCoordinatesResolver} backed by {@link ManagedDependencies}. * {@link ArtifactCoordinatesResolver} backed by {@link ManagedDependencies}.
@ -50,7 +51,17 @@ public class ManagedDependenciesArtifactCoordinatesResolver implements
return (dependency == null ? null : dependency.getVersion()); return (dependency == null ? null : dependency.getVersion());
} }
@Override
public String getArtifactId(String artifactId) {
Dependency dependency = find(artifactId);
return (dependency == null ? null : dependency.getArtifactId());
}
private Dependency find(String artifactId) { private Dependency find(String artifactId) {
if (StringUtils.countOccurrencesOf(artifactId, ":") == 2) {
String[] tokens = artifactId.split(":");
return new Dependency(tokens[0], tokens[1], tokens[2]);
}
if (artifactId != null) { if (artifactId != null) {
if (artifactId.startsWith("spring-boot")) { if (artifactId.startsWith("spring-boot")) {
return new Dependency("org.springframework.boot", artifactId, return new Dependency("org.springframework.boot", artifactId,