You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/27 20:25:11 UTC
svn commit: r1517906 [4/24] - in /maven/plugins/trunk:
maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/
maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/
maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/
maven-antru...
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -6,7 +6,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
+ <artifactId>child2</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
@@ -22,7 +22,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>multimodule-sources-copied</artifactId>
<groupId>test</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
+ <artifactId>child1</artifactId>
<name>Maven Quick Start Archetype</name>
<version>1.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/child2/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>multimodule-sources-copied</artifactId>
<groupId>test</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
+ <artifactId>child2</artifactId>
<name>Maven Quick Start Archetype</name>
<version>1.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,14 +1,13 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>multimodule-sources-copied</artifactId>
<groupId>test</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
+ <artifactId>child1</artifactId>
<version>1.0-SNAPSHOT</version>
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>multimodule-sources-copied</artifactId>
<groupId>test</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
+ <artifactId>child2</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,6 +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">
+<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>
<parent>
<groupId>org.test</groupId>
@@ -8,6 +7,6 @@
<version>1.0</version>
</parent>
<name>Child</name>
- <artifactId>child</artifactId>
+ <artifactId>child</artifactId>
<version>1.0</version>
</project>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/child/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/child/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/child/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>include-parent-dir</artifactId>
<groupId>test</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child</artifactId>
+ <artifactId>child</artifactId>
<name>Maven Quick Start Archetype</name>
<version>1.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>massembly-298</artifactId>
<groupId>org.test</groupId>
<version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
+ <artifactId>child1</artifactId>
<name>Child 1</name>
<version>1.0</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/child2/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>massembly-298</artifactId>
<groupId>org.test</groupId>
<version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
+ <artifactId>child2</artifactId>
<name>Child 2</name>
<version>1.0</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/child1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/child1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/child1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>parent</artifactId>
<groupId>org.test</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
+ <artifactId>child1</artifactId>
<name>Child 1</name>
<version>1.0</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/child2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/child2/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>parent</artifactId>
<groupId>org.test</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
+ <artifactId>child2</artifactId>
<name>Child 2</name>
<version>1.0</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/child3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/child3/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/child3/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/child3/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>parent</artifactId>
<groupId>org.test</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child3</artifactId>
+ <artifactId>child3</artifactId>
<name>Child 3</name>
<version>1.0</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/child1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>parent</artifactId>
<groupId>org.test</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
+ <artifactId>child1</artifactId>
<name>Child 1</name>
<version>1.0</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/child2/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>parent</artifactId>
<groupId>org.test</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
+ <artifactId>child2</artifactId>
<name>Child 2</name>
<version>1.0</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/child3/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>parent</artifactId>
<groupId>org.test</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child3</artifactId>
+ <artifactId>child3</artifactId>
<name>Child 3</name>
<version>1.0</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>parent</artifactId>
<groupId>org.test</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child1</artifactId>
+ <artifactId>child1</artifactId>
<name>Child 1</name>
<version>1.0</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child2/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>parent</artifactId>
<groupId>org.test</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child2</artifactId>
+ <artifactId>child2</artifactId>
<name>Child 2</name>
<version>1.0</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child3/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>parent</artifactId>
<groupId>org.test</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child3</artifactId>
+ <artifactId>child3</artifactId>
<name>Child 3</name>
<version>1.0</version>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child4/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child4/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-wholeReactorFromChild/child4/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>parent</artifactId>
<groupId>org.test</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child4</artifactId>
+ <artifactId>child4</artifactId>
<name>Child 4 - Assembler</name>
<version>1.0</version>
@@ -29,7 +28,7 @@
<version>1.0</version>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<groupId>test</groupId>
<artifactId>two-level-multimodule</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project1</artifactId>
+ <artifactId>child-level1-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/child-level2-project1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>child-level1-project2</artifactId>
<groupId>test</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level2-project1</artifactId>
+ <artifactId>child-level2-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/child-level1-project2/pom.xml Tue Aug 27 18:25:03 2013
@@ -6,7 +6,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project2</artifactId>
+ <artifactId>child-level1-project2</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<groupId>test</groupId>
<artifactId>two-level-multimodule</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project1</artifactId>
+ <artifactId>child-level1-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/child-level2-project1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>child-level1-project2</artifactId>
<groupId>test</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level2-project1</artifactId>
+ <artifactId>child-level2-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/child-level1-project2/pom.xml Tue Aug 27 18:25:03 2013
@@ -6,7 +6,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project2</artifactId>
+ <artifactId>child-level1-project2</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<groupId>test</groupId>
<artifactId>two-levels-includeBaseDir-withBin</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project1</artifactId>
+ <artifactId>child-level1-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/child-level2-project1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>child-level1-project2</artifactId>
<groupId>test</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level2-project1</artifactId>
+ <artifactId>child-level2-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/child-level1-project2/pom.xml Tue Aug 27 18:25:03 2013
@@ -6,7 +6,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project2</artifactId>
+ <artifactId>child-level1-project2</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<groupId>test</groupId>
<artifactId>two-levels-includeBaseDir-withSrc</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project1</artifactId>
+ <artifactId>child-level1-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>child-level1-project2</artifactId>
<groupId>test</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level2-project1</artifactId>
+ <artifactId>child-level2-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml Tue Aug 27 18:25:03 2013
@@ -6,7 +6,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project2</artifactId>
+ <artifactId>child-level1-project2</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<groupId>test</groupId>
<artifactId>two-level-multimodule</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project1</artifactId>
+ <artifactId>child-level1-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>child-level1-project2</artifactId>
<groupId>test</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level2-project1</artifactId>
+ <artifactId>child-level2-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml Tue Aug 27 18:25:03 2013
@@ -6,7 +6,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project2</artifactId>
+ <artifactId>child-level1-project2</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<groupId>test</groupId>
<artifactId>two-level-multimodule</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project1</artifactId>
+ <artifactId>child-level1-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0"?><project>
<parent>
<artifactId>child-level1-project2</artifactId>
<groupId>test</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level2-project1</artifactId>
+ <artifactId>child-level2-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml Tue Aug 27 18:25:03 2013
@@ -6,7 +6,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>child-level1-project2</artifactId>
+ <artifactId>child-level1-project2</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,5 +1,5 @@
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.plugin.assembly.test</groupId>
@@ -7,7 +7,7 @@
<version>1</version>
</parent>
- <artifactId>repository-assembly</artifactId>
+ <artifactId>repository-assembly</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Maven Quick Start Archetype</name>
@@ -26,7 +26,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptor>src/assemble/bin.xml</descriptor>
- <finalName>assembly</finalName>
+ <finalName>assembly</finalName>
</configuration>
<executions>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml Tue Aug 27 18:25:03 2013
@@ -1,5 +1,5 @@
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.plugin.assembly.test</groupId>
@@ -7,10 +7,10 @@
<version>1</version>
</parent>
- <artifactId>repo-with-snapshot-parents</artifactId>
+ <artifactId>repo-with-snapshot-parents</artifactId>
<packaging>pom</packaging>
<version>1-SNAPSHOT</version>
-
+
<modules>
<module>child</module>
</modules>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java Tue Aug 27 18:25:03 2013
@@ -82,7 +82,7 @@ import org.codehaus.plexus.util.xml.pull
* locating and configuring {@link Archiver} instances, executing multiple {@link AssemblyArchiverPhase} instances to
* interpret the various sections of the assembly descriptor and determine which files to add, and other associated
* activities.
- *
+ *
* @version $Id$
*/
@Component( role = AssemblyArchiver.class )
@@ -159,8 +159,9 @@ public class DefaultAssemblyArchiver
if ( specifiedBasedir != null )
{
- basedir = AssemblyFormatUtils.getOutputDirectory( specifiedBasedir, configSource.getProject(), null,
- finalName, configSource );
+ basedir =
+ AssemblyFormatUtils.getOutputDirectory( specifiedBasedir, configSource.getProject(), null,
+ finalName, configSource );
}
final List<ContainerDescriptorHandler> containerHandlers =
@@ -185,24 +186,23 @@ public class DefaultAssemblyArchiver
}
catch ( final ArchiverException e )
{
- throw new ArchiveCreationException(
- "Error creating assembly archive " + assembly.getId() + ": " + e.getMessage(), e );
+ throw new ArchiveCreationException( "Error creating assembly archive " + assembly.getId() + ": "
+ + e.getMessage(), e );
}
catch ( final IOException e )
{
- throw new ArchiveCreationException(
- "Error creating assembly archive " + assembly.getId() + ": " + e.getMessage(), e );
+ throw new ArchiveCreationException( "Error creating assembly archive " + assembly.getId() + ": "
+ + e.getMessage(), e );
}
catch ( final NoSuchArchiverException e )
{
- throw new ArchiveCreationException(
- "Unable to obtain archiver for extension '" + format + "', for assembly: '" + assembly.getId() + "'",
- e );
+ throw new ArchiveCreationException( "Unable to obtain archiver for extension '" + format
+ + "', for assembly: '" + assembly.getId() + "'", e );
}
catch ( final DependencyResolutionException e )
{
- throw new ArchiveCreationException(
- "Unable to resolve dependencies for assembly '" + assembly.getId() + "'", e );
+ throw new ArchiveCreationException( "Unable to resolve dependencies for assembly '" + assembly.getId()
+ + "'", e );
}
return destFile;
@@ -217,14 +217,13 @@ public class DefaultAssemblyArchiver
}
}
- private List<ContainerDescriptorHandler> selectContainerDescriptorHandlers(
- List<ContainerDescriptorHandlerConfig> requestedContainerDescriptorHandlers,
- final AssemblerConfigurationSource configSource )
+ private List<ContainerDescriptorHandler> selectContainerDescriptorHandlers( List<ContainerDescriptorHandlerConfig> requestedContainerDescriptorHandlers,
+ final AssemblerConfigurationSource configSource )
throws InvalidAssemblerConfigurationException
{
- getLogger().debug( "All known ContainerDescriptorHandler components: " + ( containerDescriptorHandlers == null
- ? "none; map is null."
- : "" + containerDescriptorHandlers.keySet() ) );
+ getLogger().debug( "All known ContainerDescriptorHandler components: "
+ + ( containerDescriptorHandlers == null ? "none; map is null." : ""
+ + containerDescriptorHandlers.keySet() ) );
if ( requestedContainerDescriptorHandlers == null )
{
@@ -234,31 +233,29 @@ public class DefaultAssemblyArchiver
final List<ContainerDescriptorHandler> handlers = new ArrayList<ContainerDescriptorHandler>();
final List<String> hints = new ArrayList<String>();
- if ( !requestedContainerDescriptorHandlers.isEmpty() )
+ if (!requestedContainerDescriptorHandlers.isEmpty())
{
- for ( final ContainerDescriptorHandlerConfig config : requestedContainerDescriptorHandlers )
- {
+ for (final ContainerDescriptorHandlerConfig config : requestedContainerDescriptorHandlers) {
final String hint = config.getHandlerName();
- final ContainerDescriptorHandler handler = containerDescriptorHandlers.get( hint );
+ final ContainerDescriptorHandler handler = containerDescriptorHandlers.get(hint);
- if ( handler == null )
- {
+ if (handler == null) {
throw new InvalidAssemblerConfigurationException(
- "Cannot find ContainerDescriptorHandler with hint: " + hint );
+ "Cannot find ContainerDescriptorHandler with hint: "
+ + hint);
}
- getLogger().debug(
- "Found container descriptor handler with hint: " + hint + " (component: " + handler + ")" );
+ getLogger().debug("Found container descriptor handler with hint: " + hint + " (component: " + handler
+ + ")");
- if ( config.getConfiguration() != null )
- {
- getLogger().debug( "Configuring handler with:\n\n" + config.getConfiguration() + "\n\n" );
+ if (config.getConfiguration() != null) {
+ getLogger().debug("Configuring handler with:\n\n" + config.getConfiguration() + "\n\n");
- configureContainerDescriptorHandler( handler, (Xpp3Dom) config.getConfiguration(), configSource );
+ configureContainerDescriptorHandler(handler, (Xpp3Dom) config.getConfiguration(), configSource);
}
- handlers.add( handler );
- hints.add( hint );
+ handlers.add(handler);
+ hints.add(hint);
}
}
@@ -272,8 +269,8 @@ public class DefaultAssemblyArchiver
/**
* Creates the necessary archiver to build the distribution file.
- *
- * @param format Archive format
+ *
+ * @param format Archive format
* @param includeBaseDir
* @param finalName
* @param configSource
@@ -281,9 +278,7 @@ public class DefaultAssemblyArchiver
* @param recompressZippedFiles
* @return archiver Archiver generated
* @throws org.codehaus.plexus.archiver.ArchiverException
- *
* @throws org.codehaus.plexus.archiver.manager.NoSuchArchiverException
- *
*/
protected Archiver createArchiver( final String format, final boolean includeBaseDir, final String finalName,
final AssemblerConfigurationSource configSource,
@@ -316,9 +311,9 @@ public class DefaultAssemblyArchiver
{
extraSelectors.add( new JarSecurityFileSelector() );
- extraFinalizers.add(
- new ManifestCreationFinalizer( configSource.getMavenSession(), configSource.getProject(),
- configSource.getJarArchiveConfiguration() ) );
+ extraFinalizers.add( new ManifestCreationFinalizer( configSource.getMavenSession(),
+ configSource.getProject(),
+ configSource.getJarArchiveConfiguration() ) );
}
@@ -333,9 +328,9 @@ public class DefaultAssemblyArchiver
prefix = finalName;
}
- archiver = new AssemblyProxyArchiver( prefix, archiver, containerHandlers, extraSelectors, extraFinalizers,
- configSource.getWorkingDirectory(), getLogger(),
- configSource.isDryRun() );
+ archiver =
+ new AssemblyProxyArchiver( prefix, archiver, containerHandlers, extraSelectors, extraFinalizers,
+ configSource.getWorkingDirectory(), getLogger(), configSource.isDryRun() );
archiver.setUseJvmChmod( configSource.isUpdateOnly() );
archiver.setIgnorePermissions( configSource.isIgnorePermissions() );
@@ -356,13 +351,13 @@ public class DefaultAssemblyArchiver
}
catch ( final ComponentConfigurationException e )
{
- throw new InvalidAssemblerConfigurationException(
- "Failed to configure handler: " + handler.getClass().getName(), e );
+ throw new InvalidAssemblerConfigurationException( "Failed to configure handler: "
+ + handler.getClass().getName(), e );
}
catch ( final ComponentLookupException e )
{
- throw new InvalidAssemblerConfigurationException(
- "Failed to lookup configurator for setup of handler: " + handler.getClass().getName(), e );
+ throw new InvalidAssemblerConfigurationException( "Failed to lookup configurator for setup of handler: "
+ + handler.getClass().getName(), e );
}
getLogger().debug( "-- end configuration --" );
@@ -378,12 +373,14 @@ public class DefaultAssemblyArchiver
}
catch ( final XmlPullParserException e )
{
- throw new ArchiverException( "Failed to parse archiver configuration for: " + archiver.getClass().getName(),
+ throw new ArchiverException(
+ "Failed to parse archiver configuration for: " + archiver.getClass().getName(),
e );
}
catch ( final IOException e )
{
- throw new ArchiverException( "Failed to parse archiver configuration for: " + archiver.getClass().getName(),
+ throw new ArchiverException(
+ "Failed to parse archiver configuration for: " + archiver.getClass().getName(),
e );
}
@@ -399,8 +396,8 @@ public class DefaultAssemblyArchiver
}
catch ( final ComponentLookupException e )
{
- throw new ArchiverException(
- "Failed to lookup configurator for setup of archiver: " + archiver.getClass().getName(), e );
+ throw new ArchiverException( "Failed to lookup configurator for setup of archiver: "
+ + archiver.getClass().getName(), e );
}
getLogger().debug( "-- end configuration --" );
@@ -427,15 +424,13 @@ public class DefaultAssemblyArchiver
*/
try
{
- final Method configureComponent = ComponentConfigurator.class.getMethod( "configureComponent",
- new Class[]{ Object.class,
- PlexusConfiguration.class,
- ExpressionEvaluator.class,
- (Class<?>) containerRealm[1],
- ConfigurationListener.class } );
+ final Method configureComponent =
+ ComponentConfigurator.class.getMethod( "configureComponent", new Class[] { Object.class,
+ PlexusConfiguration.class, ExpressionEvaluator.class, (Class<?>) containerRealm[1],
+ ConfigurationListener.class } );
- configureComponent.invoke( configurator, component, configuration, expressionEvaluator, containerRealm[0],
- listener );
+ configureComponent.invoke( configurator, component, configuration, expressionEvaluator,
+ containerRealm[0], listener);
}
catch ( final NoSuchMethodException e )
{
@@ -464,7 +459,7 @@ public class DefaultAssemblyArchiver
try
{
final Method getContainerRealm = container.getClass().getMethod( "getContainerRealm" );
- return new Object[]{ getContainerRealm.invoke( container ), getContainerRealm.getReturnType() };
+ return new Object[] { getContainerRealm.invoke( container ), getContainerRealm.getReturnType() };
}
catch ( final NoSuchMethodException e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java Tue Aug 27 18:25:03 2013
@@ -39,7 +39,7 @@ import org.codehaus.plexus.logging.Abstr
/**
* Handles the top-level <files/> section of the assembly descriptor.
- *
+ *
* @version $Id$
*/
@Component( role = AssemblyArchiverPhase.class, hint = "file-items" )
@@ -59,60 +59,49 @@ public class FileItemAssemblyPhase
final File basedir = configSource.getBasedir();
final FileFormatter fileFormatter = new FileFormatter( configSource, getLogger() );
- for ( final FileItem fileItem : fileList )
- {
+ for (final FileItem fileItem : fileList) {
final String sourcePath = fileItem.getSource();
// ensure source file is in absolute path for reactor build to work
- File source = new File( sourcePath );
+ File source = new File(sourcePath);
// save the original sourcefile's name, because filtration may
// create a temp file with a different name.
final String sourceName = source.getName();
- if ( !source.isAbsolute() )
- {
- source = new File( basedir, sourcePath );
+ if (!source.isAbsolute()) {
+ source = new File(basedir, sourcePath);
}
- source = fileFormatter.format( source, fileItem.isFiltered(), fileItem.getLineEnding(),
- configSource.getEncoding() );
+ source =
+ fileFormatter.format(source, fileItem.isFiltered(), fileItem.getLineEnding(),
+ configSource.getEncoding());
String destName = fileItem.getDestName();
- if ( destName == null )
- {
+ if (destName == null) {
destName = sourceName;
}
final String outputDirectory =
- AssemblyFormatUtils.getOutputDirectory( fileItem.getOutputDirectory(), configSource.getProject(), null,
- configSource.getFinalName(), configSource );
+ AssemblyFormatUtils.getOutputDirectory(fileItem.getOutputDirectory(), configSource.getProject(), null,
+ configSource.getFinalName(), configSource);
String target;
// omit the last char if ends with / or \\
- if ( outputDirectory.endsWith( "/" ) || outputDirectory.endsWith( "\\" ) )
- {
+ if (outputDirectory.endsWith("/") || outputDirectory.endsWith("\\")) {
target = outputDirectory + destName;
- }
- else if ( outputDirectory.length() < 1 )
- {
+ } else if (outputDirectory.length() < 1) {
target = destName;
- }
- else
- {
+ } else {
target = outputDirectory + "/" + destName;
}
- try
- {
- archiver.addFile( source, target,
- TypeConversionUtils.modeToInt( fileItem.getFileMode(), getLogger() ) );
- }
- catch ( final ArchiverException e )
- {
- throw new ArchiveCreationException( "Error adding file to archive: " + e.getMessage(), e );
+ try {
+ archiver.addFile(source, target, TypeConversionUtils.modeToInt(fileItem.getFileMode(), getLogger()));
+ } catch (final ArchiverException e) {
+ throw new ArchiveCreationException("Error adding file to archive: " + e.getMessage(), e);
}
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java Tue Aug 27 18:25:03 2013
@@ -61,7 +61,7 @@ import org.codehaus.plexus.logging.Logge
/**
* Handles the <moduleSets/> top-level section of the assembly descriptor.
- *
+ *
* @version $Id$
*/
@Component( role = AssemblyArchiverPhase.class, hint = "module-sets" )
@@ -96,17 +96,16 @@ public class ModuleSetAssemblyPhase
{
final List<ModuleSet> moduleSets = assembly.getModuleSets();
- for ( final ModuleSet moduleSet : moduleSets )
- {
- validate( moduleSet, configSource );
+ for (final ModuleSet moduleSet : moduleSets) {
+ validate(moduleSet, configSource);
- final Set<MavenProject> moduleProjects = getModuleProjects( moduleSet, configSource, getLogger() );
+ final Set<MavenProject> moduleProjects = getModuleProjects(moduleSet, configSource, getLogger());
final ModuleSources sources = moduleSet.getSources();
- addModuleSourceFileSets( sources, moduleProjects, archiver, configSource );
+ addModuleSourceFileSets(sources, moduleProjects, archiver, configSource);
final ModuleBinaries binaries = moduleSet.getBinaries();
- addModuleBinaries( binaries, moduleProjects, archiver, configSource, context );
+ addModuleBinaries(binaries, moduleProjects, archiver, configSource, context);
}
}
@@ -181,75 +180,65 @@ public class ModuleSetAssemblyPhase
final Map<MavenProject, Artifact> chosenModuleArtifacts = new HashMap<MavenProject, Artifact>();
- for ( final MavenProject project : moduleProjects )
- {
+ for (final MavenProject project : moduleProjects) {
Artifact artifact = null;
- if ( classifier == null )
- {
- getLogger().debug( "Processing binary artifact for module project: " + project.getId() );
+ if (classifier == null) {
+ getLogger().debug("Processing binary artifact for module project: " + project.getId());
artifact = project.getArtifact();
- }
- else
- {
- getLogger().debug(
- "Processing binary attachment: " + classifier + " for module project: " + project.getId() );
+ } else {
+ getLogger().debug("Processing binary attachment: " + classifier + " for module project: "
+ + project.getId());
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
final List<Artifact> attachments = project.getAttachedArtifacts();
- if ( ( attachments != null ) && !attachments.isEmpty() )
- {
- for ( final Artifact attachment : attachments )
- {
- if ( classifier.equals( attachment.getClassifier() ) )
- {
+ if ((attachments != null) && !attachments.isEmpty()) {
+ for (final Artifact attachment : attachments) {
+ if (classifier.equals(attachment.getClassifier())) {
artifact = attachment;
break;
}
}
}
- if ( artifact == null )
- {
- throw new InvalidAssemblerConfigurationException(
- "Cannot find attachment with classifier: " + classifier + " in module project: "
- + project.getId() + ". Please exclude this module from the module-set." );
+ if (artifact == null) {
+ throw new InvalidAssemblerConfigurationException("Cannot find attachment with classifier: "
+ + classifier + " in module project: " + project.getId()
+ + ". Please exclude this module from the module-set.");
}
}
- chosenModuleArtifacts.put( project, artifact );
- addModuleArtifact( artifact, project, archiver, configSource, binaries );
+ chosenModuleArtifacts.put(project, artifact);
+ addModuleArtifact(artifact, project, archiver, configSource, binaries);
}
final List<DependencySet> depSets = getDependencySets( binaries );
if ( depSets != null )
{
- for ( final DependencySet ds : depSets )
- {
+ for (final DependencySet ds : depSets) {
// NOTE: Disabling useProjectArtifact flag, since module artifact has already been handled!
- ds.setUseProjectArtifact( false );
+ ds.setUseProjectArtifact(false);
}
// FIXME: This will produce unpredictable results when module dependencies have a version conflict.
getLogger().warn( "NOTE: Currently, inclusion of module dependencies may produce unpredictable "
+ "results if a version conflict occurs." );
- for ( final MavenProject moduleProject : moduleProjects )
- {
- getLogger().debug( "Processing binary dependencies for module project: " + moduleProject.getId() );
+ for (final MavenProject moduleProject : moduleProjects) {
+ getLogger().debug("Processing binary dependencies for module project: " + moduleProject.getId());
final AddDependencySetsTask task =
- new AddDependencySetsTask( depSets, context.getResolvedArtifacts(), moduleProject, projectBuilder,
- archiverManager, getLogger() );
+ new AddDependencySetsTask(depSets, context.getResolvedArtifacts(), moduleProject, projectBuilder,
+ archiverManager, getLogger());
- task.setModuleProject( moduleProject );
- task.setModuleArtifact( chosenModuleArtifacts.get( moduleProject ) );
- task.setDefaultOutputDirectory( binaries.getOutputDirectory() );
- task.setDefaultOutputFileNameMapping( binaries.getOutputFileNameMapping() );
+ task.setModuleProject(moduleProject);
+ task.setModuleArtifact(chosenModuleArtifacts.get(moduleProject));
+ task.setDefaultOutputDirectory(binaries.getOutputDirectory());
+ task.setDefaultOutputFileNameMapping(binaries.getOutputFileNameMapping());
- task.execute( archiver, configSource );
+ task.execute(archiver, configSource);
}
}
}
@@ -305,9 +294,9 @@ public class ModuleSetAssemblyPhase
{
if ( artifact.getFile() == null )
{
- throw new ArchiveCreationException(
- "Artifact: " + artifact.getId() + " (included by module) does not have an artifact with a file. "
- + "Please ensure the package phase is run before the assembly is generated." );
+ throw new ArchiveCreationException( "Artifact: " + artifact.getId()
+ + " (included by module) does not have an artifact with a file. "
+ + "Please ensure the package phase is run before the assembly is generated." );
}
final AddArtifactTask task = new AddArtifactTask( artifact, getLogger() );
@@ -375,24 +364,22 @@ public class ModuleSetAssemblyPhase
fileSets.addAll( subFileSets );
- for ( final MavenProject moduleProject : moduleProjects )
- {
- getLogger().info( "Processing sources for module project: " + moduleProject.getId() );
+ for (final MavenProject moduleProject : moduleProjects) {
+ getLogger().info("Processing sources for module project: " + moduleProject.getId());
final List<FileSet> moduleFileSets = new ArrayList<FileSet>();
- for ( final FileSet fileSet : fileSets )
- {
- moduleFileSets.add( createFileSet( fileSet, sources, moduleProject, configSource ) );
+ for (final FileSet fileSet : fileSets) {
+ moduleFileSets.add(createFileSet(fileSet, sources, moduleProject, configSource));
}
- final AddFileSetsTask task = new AddFileSetsTask( moduleFileSets );
+ final AddFileSetsTask task = new AddFileSetsTask(moduleFileSets);
- task.setProject( moduleProject );
- task.setModuleProject( moduleProject );
- task.setLogger( getLogger() );
+ task.setProject(moduleProject);
+ task.setModuleProject(moduleProject);
+ task.setLogger(getLogger());
- task.execute( archiver, configSource );
+ task.execute(archiver, configSource);
}
}
@@ -458,9 +445,8 @@ public class ModuleSetAssemblyPhase
{
@SuppressWarnings( "unchecked" )
final List<String> modules = moduleProject.getModules();
- for ( final String moduleSubPath : modules )
- {
- excludes.add( moduleSubPath + "/**" );
+ for (final String moduleSubPath : modules) {
+ excludes.add(moduleSubPath + "/**");
}
}
@@ -473,11 +459,11 @@ public class ModuleSetAssemblyPhase
String destPathPrefix = "";
if ( sources.isIncludeModuleDirectory() )
{
- destPathPrefix = AssemblyFormatUtils.evaluateFileNameMapping( sources.getOutputDirectoryMapping(),
- moduleProject.getArtifact(),
- configSource.getProject(), moduleProject,
- moduleProject.getArtifact(), moduleProject,
- configSource );
+ destPathPrefix =
+ AssemblyFormatUtils.evaluateFileNameMapping( sources.getOutputDirectoryMapping(),
+ moduleProject.getArtifact(), configSource.getProject(),
+ moduleProject, moduleProject.getArtifact(), moduleProject,
+ configSource );
if ( !destPathPrefix.endsWith( "/" ) )
{
@@ -530,13 +516,14 @@ public class ModuleSetAssemblyPhase
{
try
{
- moduleProjects = ProjectUtils.getProjectModules( project, configSource.getReactorProjects(),
- moduleSet.isIncludeSubModules(), logger );
+ moduleProjects =
+ ProjectUtils.getProjectModules( project, configSource.getReactorProjects(),
+ moduleSet.isIncludeSubModules(), logger );
}
catch ( final IOException e )
{
- throw new ArchiveCreationException(
- "Error retrieving module-set for project: " + project.getId() + ": " + e.getMessage(), e );
+ throw new ArchiveCreationException( "Error retrieving module-set for project: " + project.getId()
+ + ": " + e.getMessage(), e );
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java Tue Aug 27 18:25:03 2013
@@ -78,48 +78,40 @@ public class RepositoryAssemblyPhase
final File tempRoot = configSource.getTemporaryRootDirectory();
- for ( final Repository repository : repositoriesList )
- {
+ for (final Repository repository : repositoriesList) {
final String outputDirectory =
- AssemblyFormatUtils.getOutputDirectory( repository.getOutputDirectory(), configSource.getProject(),
- null, configSource.getFinalName(), configSource );
+ AssemblyFormatUtils.getOutputDirectory(repository.getOutputDirectory(), configSource.getProject(),
+ null, configSource.getFinalName(), configSource);
- final File repositoryDirectory = new File( tempRoot, outputDirectory );
+ final File repositoryDirectory = new File(tempRoot, outputDirectory);
- if ( !repositoryDirectory.exists() )
- {
+ if (!repositoryDirectory.exists()) {
repositoryDirectory.mkdirs();
}
- try
- {
- getLogger().debug( "Assembling repository to: " + repositoryDirectory );
- repositoryAssembler.buildRemoteRepository( repositoryDirectory, wrap( repository ),
- wrap( configSource ) );
- getLogger().debug( "Finished assembling repository to: " + repositoryDirectory );
- }
- catch ( final RepositoryAssemblyException e )
- {
- throw new ArchiveCreationException( "Failed to assemble repository: " + e.getMessage(), e );
+ try {
+ getLogger().debug("Assembling repository to: " + repositoryDirectory);
+ repositoryAssembler.buildRemoteRepository(repositoryDirectory, wrap(repository), wrap(configSource));
+ getLogger().debug("Finished assembling repository to: " + repositoryDirectory);
+ } catch (final RepositoryAssemblyException e) {
+ throw new ArchiveCreationException("Failed to assemble repository: " + e.getMessage(), e);
}
- final AddDirectoryTask task = new AddDirectoryTask( repositoryDirectory );
+ final AddDirectoryTask task = new AddDirectoryTask(repositoryDirectory);
- final int dirMode = TypeConversionUtils.modeToInt( repository.getDirectoryMode(), getLogger() );
- if ( dirMode != -1 )
- {
- task.setDirectoryMode( dirMode );
+ final int dirMode = TypeConversionUtils.modeToInt(repository.getDirectoryMode(), getLogger());
+ if (dirMode != -1) {
+ task.setDirectoryMode(dirMode);
}
- final int fileMode = TypeConversionUtils.modeToInt( repository.getFileMode(), getLogger() );
- if ( fileMode != -1 )
- {
- task.setFileMode( fileMode );
+ final int fileMode = TypeConversionUtils.modeToInt(repository.getFileMode(), getLogger());
+ if (fileMode != -1) {
+ task.setFileMode(fileMode);
}
- task.setOutputDirectory( outputDirectory );
+ task.setOutputDirectory(outputDirectory);
- task.execute( archiver, configSource );
+ task.execute(archiver, configSource);
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java Tue Aug 27 18:25:03 2013
@@ -57,9 +57,8 @@ public class RepoInfoWrapper
final List<GroupVersionAlignmentWrapper> l =
new ArrayList<GroupVersionAlignmentWrapper>( alignments.size() );
- for ( final GroupVersionAlignment alignment : alignments )
- {
- l.add( new GroupVersionAlignmentWrapper( alignment ) );
+ for (final GroupVersionAlignment alignment : alignments) {
+ l.add(new GroupVersionAlignmentWrapper(alignment));
}
convertedAlignments = l;