From c32adefa9f08ea53a83f96a86a67b10303122538 Mon Sep 17 00:00:00 2001 From: Emmanuel Venisse Date: Thu, 10 Mar 2005 09:44:49 +0000 Subject: [PATCH] Add all dependencies with runtime scope in Class-Path manifest attribute if addClasspath is true in plugin configuration git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163517 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/archiver/MavenArchiver.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java index 2616b1d2ce..0eac629125 100644 --- a/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java +++ b/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java @@ -76,28 +76,27 @@ public Manifest getManifest( PluginExecutionRequest request ) if ( addClasspath ) { StringBuffer classpath = new StringBuffer(); - List dependencies = project.getDependencies(); + Set artifacts = project.getArtifacts(); - for ( Iterator iter = dependencies.iterator(); iter.hasNext(); ) + for ( Iterator iter = artifacts.iterator(); iter.hasNext(); ) { - Dependency dependency = (Dependency) iter.next(); -/* TODO: need to add to jar plugin config - Properties properties = dependency.getProperties(); - if ( Boolean.valueOf(properties.getProperty("manifest.classpath")).booleanValue()) + Artifact artifact = (Artifact) iter.next(); + if ( "jar".equals( artifact.getType() ) && Artifact.SCOPE_RUNTIME.equals( artifact.getScope() ) ) { - if (classpath.length() > 0 ) + if ( classpath.length() > 0 ) { classpath.append( " " ); } - // TODO replace dependency by artifact - classpath.append( dependency.getArtifactId() + "-" + dependency.getVersion() + ".jar"); + classpath.append( artifact.getArtifactId() + "-" + artifact.getVersion() + ".jar"); } -*/ } - Manifest.Attribute classpathAttr = new Manifest.Attribute( "Class-Path", classpath.toString() ); - m.addConfiguredAttribute( classpathAttr ); + if ( classpath.length() > 0 ) + { + Manifest.Attribute classpathAttr = new Manifest.Attribute( "Class-Path", classpath.toString() ); + m.addConfiguredAttribute( classpathAttr ); + } } // Added supplementary entries