You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ma...@apache.org on 2007/10/13 15:03:01 UTC
svn commit: r584397 - in /maven/plugins/trunk/maven-jar-plugin/src: it/
main/java/org/apache/maven/plugin/jar/
Author: mauro
Date: Sat Oct 13 06:03:00 2007
New Revision: 584397
URL: http://svn.apache.org/viewvc?rev=584397&view=rev
Log:
MJAR-83: applied patch.
Added:
maven/plugins/trunk/maven-jar-plugin/src/it/ (with props)
maven/plugins/trunk/maven-jar-plugin/src/it/pom.xml
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
Propchange: maven/plugins/trunk/maven-jar-plugin/src/it/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Oct 13 06:03:00 2007
@@ -0,0 +1 @@
+target
Added: maven/plugins/trunk/maven-jar-plugin/src/it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/it/pom.xml?rev=584397&view=auto
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/it/pom.xml (added)
+++ maven/plugins/trunk/maven-jar-plugin/src/it/pom.xml Sat Oct 13 06:03:00 2007
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin-it</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>compile</scope>
+ <version>1.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>runtime</scope>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>provided</scope>
+ <version>2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ <version>1.0.4</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!--
+ Create an empty jar with a manifest classpath pointing to the libraries declared as runtime dependencies (ie not provided or test)
+ -->
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <finalName>runtimeLibs</finalName>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java?rev=584397&r1=584396&r2=584397&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java Sat Oct 13 06:03:00 2007
@@ -26,6 +26,7 @@
* @goal jar
* @phase package
* @requiresProject
+ * @requiresDependencyResolution runtime
*/
public class JarMojo
extends AbstractJarMojo
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java?rev=584397&r1=584396&r2=584397&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java Sat Oct 13 06:03:00 2007
@@ -45,6 +45,7 @@
* @phase package
* @requiresProject
* @todo refactor the common code with javadoc plugin
+ * @requiresDependencyResolution runtime
*/
public class JarSignMojo
extends AbstractMojo
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java?rev=584397&r1=584396&r2=584397&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java Sat Oct 13 06:03:00 2007
@@ -46,6 +46,7 @@
* @phase package
* @requiresProject
* @todo refactor the common code with javadoc plugin
+ * @requiresDependencyResolution runtime
*/
public class JarSignVerifyMojo
extends AbstractMojo
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java?rev=584397&r1=584396&r2=584397&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java Sat Oct 13 06:03:00 2007
@@ -26,6 +26,7 @@
* @goal test-jar
* @phase package
* @requiresProject
+ * @requiresDependencyResolution test
*/
public class TestJarMojo
extends AbstractJarMojo