You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/02/07 17:22:46 UTC
[8/8] camel git commit: Camel connector should support SNAPSHOT jars
Camel connector should support SNAPSHOT jars
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/063bd57f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/063bd57f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/063bd57f
Branch: refs/heads/master
Commit: 063bd57f35df7447e7fba61e644a55c3618071fb
Parents: d6a1e53
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Feb 7 14:24:50 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 7 18:22:26 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/maven/connector/ConnectorMojo.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/063bd57f/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
----------------------------------------------------------------------
diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
index 2266b07..dbda8ac 100644
--- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
+++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
@@ -354,7 +354,8 @@ public class ConnectorMojo extends AbstractJarMojo {
for (Object obj : getProject().getDependencyArtifacts()) {
Artifact artifact = (Artifact) obj;
if ("jar".equals(artifact.getType())) {
- if (groupId.equals(artifact.getGroupId()) && artifactId.equals(artifact.getArtifactId()) && version.equals(artifact.getVersion())) {
+ // use baseVersion so we can support SNAPSHOT versions that are based on a base version
+ if (groupId.equals(artifact.getGroupId()) && artifactId.equals(artifact.getArtifactId()) && version.equals(artifact.getBaseVersion())) {
// load the component file inside the file
URL url = new URL("file:" + artifact.getFile());
URLClassLoader child = new URLClassLoader(new URL[]{url}, this.getClass().getClassLoader());