You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/01/13 10:39:55 UTC
[4/5] karaf git commit: Support for inline repositories and wrong urls ending with ‘/’
Support for inline repositories and wrong urls ending with ‘/’
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5ab1c916
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5ab1c916
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5ab1c916
Branch: refs/heads/master
Commit: 5ab1c91661d6b9eedb0e2e49d98a1b087bd33551
Parents: d241f9f
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Jan 12 18:14:11 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Jan 12 18:14:11 2015 +0100
----------------------------------------------------------------------
.../karaf/tooling/features/Dependency30Helper.java | 11 +++++++++++
.../karaf/tooling/features/Dependency31Helper.java | 11 +++++++++++
2 files changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/5ab1c916/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Dependency30Helper.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Dependency30Helper.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Dependency30Helper.java
index 1fd20dd..e7b439d 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Dependency30Helper.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Dependency30Helper.java
@@ -299,6 +299,14 @@ public class Dependency30Helper implements DependencyHelper {
@Override
public File resolveById(String id, Log log) throws MojoFailureException {
+ if (id.startsWith("mvn:")) {
+ if (id.contains("!")) {
+ id = id.substring(0, "mvn:".length()) + id.substring(id.indexOf("!") + 1);
+ }
+ if (id.endsWith("/")) {
+ id = id.substring(0, id.length() - 1);
+ }
+ }
id = MavenUtil.mvnToAether(id);
ArtifactRequest request = new ArtifactRequest();
request.setArtifact(new DefaultArtifact(id));
@@ -353,6 +361,9 @@ public class Dependency30Helper implements DependencyHelper {
if (name.indexOf(':') == -1) {
return name;
}
+ if (name.endsWith("/")) {
+ name = name.substring(0, name.length() - 1);
+ }
name = MavenUtil.mvnToAether(name);
return pathFromAether(name);
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/5ab1c916/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Dependency31Helper.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Dependency31Helper.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Dependency31Helper.java
index 8d6888d..55a714c 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Dependency31Helper.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/Dependency31Helper.java
@@ -306,6 +306,14 @@ public class Dependency31Helper implements DependencyHelper {
@Override
public File resolveById(String id, Log log) throws MojoFailureException {
+ if (id.startsWith("mvn:")) {
+ if (id.contains("!")) {
+ id = id.substring(0, "mvn:".length()) + id.substring(id.indexOf("!") + 1);
+ }
+ if (id.endsWith("/")) {
+ id = id.substring(0, id.length() - 1);
+ }
+ }
id = MavenUtil.mvnToAether(id);
ArtifactRequest request = new ArtifactRequest();
request.setArtifact(new DefaultArtifact(id));
@@ -378,6 +386,9 @@ public class Dependency31Helper implements DependencyHelper {
if (name.indexOf(':') == -1) {
return name;
}
+ if (name.endsWith("/")) {
+ name = name.substring(0, name.length() - 1);
+ }
name = MavenUtil.mvnToAether(name);
return pathFromAether(name);
}