Author: khmarbaise
Date: Tue Aug 19 17:27:43 2014
New Revision: 1618908
URL: http://svn.apache.org/r1618908
Log:
[MASSEMBLY-704]
- Undone the following revisions
r1618277, r1618255 to move onto separate branch.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/
- copied from r1618276,
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java
- copied unchanged from r1618254,
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryInlineMojo.java
- copied unchanged from r1618254,
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryInlineMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryMojo.java
- copied unchanged from r1618254,
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectorySingleMojo.java
- copied unchanged from r1618254,
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectorySingleMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java
- copied unchanged from r1618254,
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/invoker.properties
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:attached
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:attached
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean package
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean package assembly:assembly
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-462/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean package
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean package
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean package
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean package
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single! | update
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=install
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=install
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=install
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=install
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:attached
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=install
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=install
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean package
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean package
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=package
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=package
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=package
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=package
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean package
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean package
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/invoker.properties?rev=1618908&r1=1618907&r2=1618908&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/invoker.properties
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/invoker.properties
Tue Aug 19 17:27:43 2014
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
