svn commit: r418769 - /incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractJbiMojo.java

[pd...@apache.org]

Author: pdodds
Date: Mon Jul  3 06:52:49 2006
New Revision: 418769

URL: http://svn.apache.org/viewvc?rev=418769&view=rev
Log:
Updated to make clear the reason for the version problem

Modified:
    incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractJbiMojo.java

Modified: incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractJbiMojo.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractJbiMojo.java?rev=418769&r1=418768&r2=418769&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractJbiMojo.java (original)
+++ incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractJbiMojo.java Mon Jul  3 06:52:49 2006
@@ -165,26 +165,26 @@
 		Set filteredArtifacts = getArtifacts(listener.getRootNode(),
 				new HashSet());
 		for (Iterator iter = includes.iterator(); iter.hasNext();) {
-			Artifact artifact = (Artifact) iter.next();
-			getLog().debug(
-					"Checking to determine whether to include " + artifact);
+			Artifact artifact = (Artifact) iter.next();			
 			for (Iterator iter2 = filteredArtifacts.iterator(); iter2.hasNext();) {
 				Artifact filteredArtifact = (Artifact) iter2.next();
 				if (filteredArtifact.getArtifactId().equals(
-						artifact.getArtifactId())) {
-					getLog().info("Initial match for "+artifact+" to "+filteredArtifact);
+						artifact.getArtifactId())
+						&& filteredArtifact.getType()
+								.equals(artifact.getType())
+						&& filteredArtifact.getGroupId().equals(
+								artifact.getGroupId())) {
+					if (!filteredArtifact.getVersion().equals(
+							artifact.getVersion())) {
+						getLog()
+								.warn(
+										"Resolved artifact "
+												+ artifact
+												+ " has a different version from that in dependency management "
+												+ filteredArtifact
+												+ ", overriding dependency management");
+					}
 					finalIncludes.add(artifact);
-					// XXX Something is wrong with the versions??
-//					if (filteredArtifact.getArtifactId().equals(
-//							artifact.getArtifactId())
-//							&& filteredArtifact.getVersion().equals(
-//									artifact.getVersion())
-//							&& filteredArtifact.getType().equals(
-//									artifact.getType())) {
-//						getLog().debug(
-//								"Found in filtered artifacts, including!");
-//						finalIncludes.add(artifact);
-//					}
 				}
 			}