You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/06/17 10:44:41 UTC
svn commit: r191113 - in
/maven/components/trunk/maven-plugins/maven-source-plugin: pom.xml
src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java
src/main/java/org/apache/maven/plugin/source/SourceBundler.java
Author: brett
Date: Fri Jun 17 01:44:39 2005
New Revision: 191113
URL: http://svn.apache.org/viewcvs?rev=191113&view=rev
Log:
- fix issues with source mojo
- attach source artifact for install/deploy
Modified:
maven/components/trunk/maven-plugins/maven-source-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java
maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceBundler.java
Modified: maven/components/trunk/maven-plugins/maven-source-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-source-plugin/pom.xml?rev=191113&r1=191112&r2=191113&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-source-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-source-plugin/pom.xml Fri Jun 17 01:44:39 2005
@@ -21,5 +21,15 @@
<version>1.0-alpha-4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Modified: maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java?rev=191113&r1=191112&r2=191113&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java Fri Jun 17 01:44:39 2005
@@ -16,8 +16,11 @@
* limitations under the License.
*/
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import java.io.File;
@@ -35,11 +38,16 @@
extends AbstractMojo
{
/**
- * @parameter expression="${project.version}"
+ * @parameter expression="${project}"
* @readonly
* @required
*/
- private String version;
+ private MavenProject project;
+
+ /**
+ * @parameter expression="${component.org.apache.maven.artifact.factory.ArtifactFactory}
+ */
+ private ArtifactFactory artifactFactory;
/**
* @parameter expression="${project.build.finalName}"
@@ -54,7 +62,7 @@
private List compileSourceRoots;
/**
- * @parameter expression="${project.build.outputDirectory}"
+ * @parameter expression="${project.build.directory}"
* @required
*/
private File outputDirectory;
@@ -63,7 +71,7 @@
throws MojoExecutionException
{
// TODO: this should be via a release profile instead
- if ( version.indexOf( "SNAPSHOT" ) < 0 )
+ if ( project.getVersion().indexOf( "SNAPSHOT" ) < 0 )
{
// TODO: use a component lookup?
JarArchiver archiver = new JarArchiver();
@@ -87,6 +95,14 @@
{
throw new MojoExecutionException( "Error building source JAR", e );
}
+
+ // TODO: these introduced dependencies on the project are going to become problematic - can we export it
+ // through metadata instead?
+ Artifact artifact = artifactFactory.createArtifactWithClassifier( project.getGroupId(),
+ project.getArtifactId(),
+ project.getVersion(), null, "java-source",
+ "sources" );
+ project.addAttachedArtifact( artifact );
}
else
{
Modified: maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceBundler.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceBundler.java?rev=191113&r1=191112&r2=191113&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceBundler.java (original)
+++ maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceBundler.java Fri Jun 17 01:44:39 2005
@@ -1,23 +1,18 @@
package org.apache.maven.plugin.source;
-import java.io.File;
-
import org.codehaus.plexus.archiver.Archiver;
+import java.io.File;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
*/
public class SourceBundler
{
- private final static String[] DEFAULT_INCLUDES = new String[]{
- "**/*",
- };
-
- private final static String[] DEFAULT_EXCLUDES = new String[]{
- "**/CVS/**",
- "**/.svn/**",
- };
+ private final static String[] DEFAULT_INCLUDES = new String[]{"**/*",};
+
+ private final static String[] DEFAULT_EXCLUDES = new String[]{"**/CVS/**", "**/.svn/**",};
public void makeSourceBundle( File outputFile, File[] sourceDirectories, Archiver archiver )
throws Exception
@@ -28,7 +23,10 @@
for ( int i = 0; i < sourceDirectories.length; i++ )
{
- archiver.addDirectory( sourceDirectories[ i ], includes, excludes );
+ if ( sourceDirectories[i].exists() )
+ {
+ archiver.addDirectory( sourceDirectories[i], includes, excludes );
+ }
}
archiver.setDestFile( outputFile );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org