Author: rfeng
Date: Tue Oct 6 21:47:42 2009
New Revision: 822525
URL: http://svn.apache.org/viewvc?rev=822525&view=rev
Log:
Exclude the project itself from the resolution so that it can be built offline
Modified:
tuscany/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/ModuleBundlesBuildMojo.java
Modified:
tuscany/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/ModuleBundlesBuildMojo.java
URL:
http://svn.apache.org/viewvc/tuscany/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/ModuleBundlesBuildMojo.java?rev=822525&r1=822524&r2=822525&view=diff
==============================================================================
---
tuscany/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/ModuleBundlesBuildMojo.java
(original)
+++
tuscany/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/ModuleBundlesBuildMojo.java
Tue Oct 6 21:47:42 2009
@@ -765,14 +765,18 @@
artifactCollector);
CollectingDependencyNodeVisitor visitor = new
CollectingDependencyNodeVisitor();
rootNode.accept(visitor);
+
// Add included artifacts
for (Object node : visitor.getNodes()) {
DependencyNode depNode = (DependencyNode)node;
int state = depNode.getState();
if (state == DependencyNode.INCLUDED ) {
Artifact artifact = depNode.getArtifact();
- resolver.resolve(artifact, remoteRepos, local);
- artifacts.add(artifact);
+ // Exclude the project artifact to avoid offline resolution
failure
+ if (!artifact.equals(project.getArtifact())) {
+ resolver.resolve(artifact, remoteRepos, local);
+ artifacts.add(artifact);
+ }
}
}
// Scan for newer versions that are omitted
