diff --git a/build.gradle b/build.gradle index 2055e5f..29bc5eb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,10 @@ +buildscript { + repositories { + mavenCentral() + maven { url "https://jfrog.bintray.com/jfrog-jars/" } + } +} + plugins { id 'java' id 'java-gradle-plugin' diff --git a/src/main/java/org/devopsmindset/gradle/DependencyManager.java b/src/main/java/org/devopsmindset/gradle/DependencyManager.java index 0184181..644d2c5 100644 --- a/src/main/java/org/devopsmindset/gradle/DependencyManager.java +++ b/src/main/java/org/devopsmindset/gradle/DependencyManager.java @@ -44,6 +44,7 @@ public class DependencyManager extends DefaultTask { * Target attribute */ public static final String TARGET = "target"; + public static final String FILENAME = "fileName"; static final String DEFAULT_LOCATION = "dependency-manager"; static final String DEFAULT_DEPENDENCY_BASE_FILE = "base.dependencies"; static final String BASE_CONFIGURATION = "base"; @@ -162,7 +163,8 @@ private DownloadedDependency copyDependency(ResolvedArtifact artifact, if (dependencyFromArtifact != null) { downloadedDependency.setReason(dependencyFromArtifact.getReason()); if (downloadedDependency.getReasons().containsKey(TARGET)) { - final String location = Paths.get(getProject().getBuildDir().toString(), DEFAULT_LOCATION, TARGET, downloadedDependency.getReasons().get(TARGET), downloadedDependency.getProcessedArtifactName()).toString(); + final String fileName = downloadedDependency.getReasons().containsKey(FILENAME) ? downloadedDependency.getReasons().get(FILENAME)+"."+downloadedDependency.getExtension() : downloadedDependency.getProcessedArtifactName(); + final String location = Paths.get(getProject().getBuildDir().toString(), DEFAULT_LOCATION, TARGET, downloadedDependency.getReasons().get(TARGET), fileName).toString(); getProject().getLogger().debug("moving to custom location: {}", location); downloadedDependency.setLocation(location); if (downloadedDependency.getReasons().containsKey(DECOMPRESS)) {