Author: jdcasey
Date: Thu Feb 14 12:26:09 2008
New Revision: 627864
URL: http://svn.apache.org/viewvc?rev=627864&view=rev
Log:
Stop binding assembly:attached to the build lifecycle...it's an aggregator, and
this is an incorrect use of it.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/child2/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><project>
+<?xml version='1.0'?>
+<project>
<parent>
<artifactId>dependencySet-matchScope</artifactId>
<groupId>test</groupId>
@@ -26,7 +27,8 @@
<build>
<plugins>
<plugin>
-
<artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
@@ -37,7 +39,7 @@
</descriptors>
</configuration>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
@@ -45,3 +47,4 @@
</plugins>
</build>
</project>
+
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/child2/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><project>
+<?xml version='1.0'?>
+<project>
<parent>
<artifactId>dependencySet-notUnpacked</artifactId>
<groupId>test</groupId>
@@ -26,7 +27,8 @@
<build>
<plugins>
<plugin>
-
<artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
@@ -37,7 +39,7 @@
</descriptors>
</configuration>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
@@ -45,3 +47,4 @@
</plugins>
</build>
</project>
+
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/child2/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><project>
+<?xml version='1.0'?>
+<project>
<parent>
<artifactId>dependencySet-unpacked</artifactId>
<groupId>test</groupId>
@@ -26,7 +27,8 @@
<build>
<plugins>
<plugin>
-
<artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
@@ -37,7 +39,7 @@
</descriptors>
</configuration>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
@@ -45,3 +47,4 @@
</plugins>
</build>
</project>
+
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><project>
+<?xml version='1.0'?>
+<project>
<parent>
<artifactId>dependencySet-unpackedExcludingMetaInf</artifactId>
<groupId>test</groupId>
@@ -26,7 +27,8 @@
<build>
<plugins>
<plugin>
-
<artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
@@ -37,7 +39,7 @@
</descriptors>
</configuration>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
@@ -45,3 +47,4 @@
</plugins>
</build>
</project>
+
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/child2/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><project>
+<?xml version='1.0'?>
+<project>
<parent>
<artifactId>dependencySet-unpackedSubsetsTwice</artifactId>
<groupId>test</groupId>
@@ -24,7 +25,8 @@
<build>
<plugins>
<plugin>
-
<artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
@@ -35,7 +37,7 @@
</descriptors>
</configuration>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
@@ -43,3 +45,4 @@
</plugins>
</build>
</project>
+
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/child2/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><project>
+<?xml version='1.0'?>
+<project>
<parent>
<artifactId>include-provided</artifactId>
<groupId>test</groupId>
@@ -27,7 +28,8 @@
<build>
<plugins>
<plugin>
-
<artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
@@ -38,7 +40,7 @@
</descriptors>
</configuration>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
@@ -46,3 +48,4 @@
</plugins>
</build>
</project>
+
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,5 +1,4 @@
-<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";>
+<project 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'
xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
<groupId>test</groupId>
<artifactId>jars-in-archive-root</artifactId>
@@ -18,13 +17,14 @@
<build>
<plugins>
<plugin>
-
<artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
<executions>
<execution>
<id>assembly</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptorRefs>
@@ -37,3 +37,4 @@
</plugins>
</build>
</project>
+
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/child2/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><project>
+<?xml version='1.0'?>
+<project>
<parent>
<artifactId>component-descriptors-merged</artifactId>
<groupId>test</groupId>
@@ -26,7 +27,8 @@
<build>
<plugins>
<plugin>
-
<artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
@@ -37,7 +39,7 @@
</descriptorRefs>
</configuration>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
@@ -45,3 +47,4 @@
</plugins>
</build>
</project>
+
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><project>
+<?xml version='1.0'?>
+<project>
<parent>
<artifactId>jar-with-dependencies-unpacked-to-root-dir</artifactId>
<groupId>test</groupId>
@@ -26,7 +27,8 @@
<build>
<plugins>
<plugin>
-
<artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
<executions>
<execution>
<id>attach-binary-assembly</id>
@@ -37,7 +39,7 @@
</descriptorRefs>
</configuration>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
@@ -45,3 +47,4 @@
</plugins>
</build>
</project>
+
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,5 +1,5 @@
-<?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";>
+<?xml version='1.0' encoding='UTF-8'?>
+<project 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'
xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
<groupId>test</groupId>
<artifactId>multimodule-sources-copied</artifactId>
@@ -22,13 +22,14 @@
<build>
<plugins>
<plugin>
-
<artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
<executions>
<execution>
<id>assembly</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptorRefs>
@@ -41,3 +42,4 @@
</plugins>
</build>
</project>
+
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,30 +1,30 @@
-<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>test</groupId>
- <artifactId>sources-copied</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+<project 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'
xmlns='http://maven.apache.org/POM/4.0.0'>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>sources-copied</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Maven Quick Start Archetype</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
-
<artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
<executions>
<execution>
<id>assembly</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptorRefs>
@@ -36,4 +36,5 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
+
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,30 +1,30 @@
-<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>test</groupId>
- <artifactId>src-dir-copied</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+<project 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'
xmlns='http://maven.apache.org/POM/4.0.0'>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>src-dir-copied</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Maven Quick Start Archetype</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
-
<artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
<executions>
<execution>
<id>assembly</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptorRefs>
@@ -36,4 +36,5 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
+
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,5 +1,4 @@
-<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";>
+<project 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'
xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.plugin.assembly.test</groupId>
@@ -29,7 +28,7 @@
<id>assembly</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptorRefs>
@@ -50,3 +49,4 @@
</plugins>
</build>
</project>
+
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml?rev=627864&r1=627863&r2=627864&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml
Thu Feb 14 12:26:09 2008
@@ -1,5 +1,4 @@
-<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";>
+<project 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'
xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.plugin.assembly.test</groupId>
@@ -24,13 +23,14 @@
<build>
<plugins>
<plugin>
-
<artifactId>maven-assembly-plugin</artifactId><version>testing</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>testing</version>
<executions>
<execution>
<id>assembly</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptorRefs>
@@ -48,3 +48,4 @@
</plugins>
</build>
</project>
+
