You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by dj...@apache.org on 2010/02/27 01:32:21 UTC
svn commit: r916883 - in
/incubator/aries/trunk/application/eba-maven-plugin/src:
main/java/org/apache/aries/plugin/eba/EbaMojo.java
test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub.java
Author: djencks
Date: Sat Feb 27 00:32:20 2010
New Revision: 916883
URL: http://svn.apache.org/viewvc?rev=916883&view=rev
Log:
ARIES-120 add flag (default false) for following transitive dependencies
Modified:
incubator/aries/trunk/application/eba-maven-plugin/src/main/java/org/apache/aries/plugin/eba/EbaMojo.java
incubator/aries/trunk/application/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub.java
Modified: incubator/aries/trunk/application/eba-maven-plugin/src/main/java/org/apache/aries/plugin/eba/EbaMojo.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/eba-maven-plugin/src/main/java/org/apache/aries/plugin/eba/EbaMojo.java?rev=916883&r1=916882&r2=916883&view=diff
==============================================================================
--- incubator/aries/trunk/application/eba-maven-plugin/src/main/java/org/apache/aries/plugin/eba/EbaMojo.java (original)
+++ incubator/aries/trunk/application/eba-maven-plugin/src/main/java/org/apache/aries/plugin/eba/EbaMojo.java Sat Feb 27 00:32:20 2010
@@ -139,17 +139,24 @@
/**
* Include or not empty directories
*
- * @parameter expression="${zip.includeEmptyDirs}" default-value="true"
+ * @parameter expression="${includeEmptyDirs}" default-value="true"
*/
private boolean includeEmptyDirs;
/**
* Whether creating the archive should be forced.
*
- * @parameter expression="${zip.forceCreation}" default-value="false"
+ * @parameter expression="${forceCreation}" default-value="false"
*/
private boolean forceCreation;
+ /**
+ * Whether to follow transitive dependencies or use explicit dependencies.
+ *
+ * @parameter expression="${useTransitiveDependencies}" default-value="false"
+ */
+ private boolean useTransitiveDependencies;
+
private File buildDir;
@@ -188,17 +195,19 @@
// Copy dependencies
try
{
- Set artifacts = project.getArtifacts();
- for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
- {
- Artifact artifact = (Artifact) iter.next();
+ Set<Artifact> artifacts;
+ if (useTransitiveDependencies) {
+ artifacts = project.getArtifacts();
+ } else {
+ artifacts = project.getDependencyArtifacts();
+ }
+ for (Artifact artifact : artifacts) {
- ScopeArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
- if ( !artifact.isOptional() && filter.include( artifact ) )
- {
+ ScopeArtifactFilter filter = new ScopeArtifactFilter(Artifact.SCOPE_RUNTIME);
+ if (!artifact.isOptional() && filter.include(artifact)) {
getLog().info("Copying artifact[" + artifact.getGroupId() + ", " + artifact.getId() + ", " +
- artifact.getScope() + "]");
- zipArchiver.addFile(artifact.getFile(), artifact.getArtifactId() + "-" + artifact.getVersion() + "." + (artifact.getType() == null? "jar": artifact.getType()));
+ artifact.getScope() + "]");
+ zipArchiver.addFile(artifact.getFile(), artifact.getArtifactId() + "-" + artifact.getVersion() + "." + (artifact.getType() == null ? "jar" : artifact.getType()));
}
}
}
Modified: incubator/aries/trunk/application/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub.java?rev=916883&r1=916882&r2=916883&view=diff
==============================================================================
--- incubator/aries/trunk/application/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub.java (original)
+++ incubator/aries/trunk/application/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub.java Sat Feb 27 00:32:20 2010
@@ -117,7 +117,12 @@
return artifacts;
}
-
+
+ @Override
+ public Set getDependencyArtifacts() {
+ return getArtifacts();
+ }
+
public List getAttachedArtifacts()
{
if ( attachedArtifacts == null )