You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/03/24 13:50:57 UTC
svn commit: r640400 - in /maven/plugins/trunk/maven-assembly-plugin/src:
functional-tests/java/org/apache/maven/plugin/assembly/
functional-tests/java/org/apache/maven/plugin/assembly/stubs/
functional-tests/plugin-configs/assembly/ functional-tests/pl...
Author: bentmann
Date: Mon Mar 24 05:50:50 2008
New Revision: 640400
URL: http://svn.apache.org/viewvc?rev=640400&view=rev
Log:
o Added svn:eol-style=native
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/DirectoryInlineMojoTest.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/UnpackMojoTest.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerWithExceptionStub.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArtifactStub.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/DirectoryArchiverStub.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/JarArchiverStub.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithArtifactsStub.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ReactorMavenProjectStub.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverStub.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverWithException.java (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/assembly/depSet-default-plugin-config.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-plugin-config.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/assembly/depSet-scoped-plugin-config.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/assembly/depSet-unpack-plugin-config.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/assembly/fileSet-plugin-config.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/assembly/min-plugin-config.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml (contents, props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml (contents, props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml (contents, props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml (contents, props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config.xml (contents, props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/unpack/archiver-manager-exception-plugin-config.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/unpack/min-plugin-config.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/unpack/unpack-exception-plugin-config.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/unpack/with-reactor-projects-plugin-config.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/assemblies/dependencySet-default.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/assemblies/dependencySet-filename-mapping.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/assemblies/dependencySet-scoped.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/assemblies/dependencySet-unpack.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/assemblies/fileSet.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/assemblies/simple.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-nonTransitive/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-artifact/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-attachments/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-232/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/pom.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/prebuild.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/main/aspect/org/apache/maven/plugin/assembly/aspect/log/PhaseTracingAspect.aj (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/main/aspect/org/apache/maven/plugin/assembly/aspect/perf/TimingAspect.aj (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/main/aspect/org/apache/maven/plugin/assembly/aspect/stats/ArchiverStatsAspect.aj (props changed)
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt (contents, props changed)
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/DirectoryInlineMojoTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/DirectoryMojoTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/UnpackMojoTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArchiverManagerWithExceptionStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ArtifactStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/DirectoryArchiverStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/JarArchiverStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/MavenProjectWithArtifactsStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/ReactorMavenProjectStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverStub.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/java/org/apache/maven/plugin/assembly/stubs/UnArchiverWithException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/assembly/depSet-default-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/assembly/depSet-filename-mapping-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/assembly/depSet-scoped-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/assembly/depSet-unpack-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/assembly/fileSet-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/assembly/min-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml?rev=640400&r1=640399&r2=640400&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml Mon Mar 24 05:50:50 2008
@@ -1,33 +1,33 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
- <basedir>${basedir}</basedir>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <outputDirectory>${basedir}/target/test-harness/directory-inline/min/target</outputDirectory>
- <finalName>directory-inline-min</finalName>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
+ <basedir>${basedir}</basedir>
+ <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <outputDirectory>${basedir}/target/test-harness/directory-inline/min/target</outputDirectory>
+ <finalName>directory-inline-min</finalName>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory-inline/min-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml?rev=640400&r1=640399&r2=640400&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml Mon Mar 24 05:50:50 2008
@@ -1,35 +1,35 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>${basedir}/src/test/resources/assemblies/dependencySet-default.xml</descriptor>
- <basedir>${basedir}</basedir>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <outputDirectory>${basedir}/target/test-harness/directory/appendAssemblyId-false/target</outputDirectory>
- <finalName>directory-appendAssemblyId-false</finalName>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <appendAssemblyId>false</appendAssemblyId>
- <classifier>classifier</classifier>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptor>${basedir}/src/test/resources/assemblies/dependencySet-default.xml</descriptor>
+ <basedir>${basedir}</basedir>
+ <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
+ <outputDirectory>${basedir}/target/test-harness/directory/appendAssemblyId-false/target</outputDirectory>
+ <finalName>directory-appendAssemblyId-false</finalName>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <appendAssemblyId>false</appendAssemblyId>
+ <classifier>classifier</classifier>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/appendAssemblyId-false-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml?rev=640400&r1=640399&r2=640400&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml Mon Mar 24 05:50:50 2008
@@ -1,34 +1,34 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>${basedir}/src/test/resources/assemblies/dependencySet-default.xml</descriptor>
- <basedir>${basedir}</basedir>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
- <outputDirectory>${basedir}/target/test-harness/directory/dependency-set/target</outputDirectory>
- <finalName>directory-dependency-set</finalName>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptor>${basedir}/src/test/resources/assemblies/dependencySet-default.xml</descriptor>
+ <basedir>${basedir}</basedir>
+ <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.MavenProjectWithArtifactsStub" />
+ <outputDirectory>${basedir}/target/test-harness/directory/dependency-set/target</outputDirectory>
+ <finalName>directory-dependency-set</finalName>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/dependency-set-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml?rev=640400&r1=640399&r2=640400&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml Mon Mar 24 05:50:50 2008
@@ -1,33 +1,33 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
- <basedir>${basedir}</basedir>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <outputDirectory>${basedir}/target/test-harness/directory-inline/min/target</outputDirectory>
- <finalName>directory-inline-min</finalName>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerWithExceptionStub" />
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptor>${basedir}/src/test/resources/assemblies/simple.xml</descriptor>
+ <basedir>${basedir}</basedir>
+ <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <outputDirectory>${basedir}/target/test-harness/directory-inline/min/target</outputDirectory>
+ <finalName>directory-inline-min</finalName>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerWithExceptionStub" />
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config-with-exceptions.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config.xml?rev=640400&r1=640399&r2=640400&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config.xml Mon Mar 24 05:50:50 2008
@@ -1,34 +1,34 @@
-<!--
- ~ Copyright 2001-2006 The Apache Software Foundation.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>${basedir}/src/test/resources/assemblies/fileSet.xml</descriptor>
- <basedir>${basedir}</basedir>
- <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
- <outputDirectory>${basedir}/target/test-harness/directory/min/target</outputDirectory>
- <finalName>directory-min</finalName>
- <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptor>${basedir}/src/test/resources/assemblies/fileSet.xml</descriptor>
+ <basedir>${basedir}</basedir>
+ <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <outputDirectory>${basedir}/target/test-harness/directory/min/target</outputDirectory>
+ <finalName>directory-min</finalName>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/directory/min-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/unpack/archiver-manager-exception-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/unpack/min-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/unpack/unpack-exception-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/plugin-configs/unpack/with-reactor-projects-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/assemblies/dependencySet-default.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/assemblies/dependencySet-filename-mapping.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/assemblies/dependencySet-scoped.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/assemblies/dependencySet-unpack.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/assemblies/fileSet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/functional-tests/resources/assemblies/simple.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-matchScope/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-nonTransitive/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-notUnpacked/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpacked/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-artifact/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-attachments/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-provided/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-232/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/file-set-fileMode/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-modes/fileItem-fileMode/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/prebuild.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/main/aspect/org/apache/maven/plugin/assembly/aspect/log/PhaseTracingAspect.aj
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/main/aspect/org/apache/maven/plugin/assembly/aspect/perf/TimingAspect.aj
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/main/aspect/org/apache/maven/plugin/assembly/aspect/stats/ArchiverStatsAspect.aj
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt?rev=640400&r1=640399&r2=640400&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt Mon Mar 24 05:50:50 2008
@@ -1,74 +1,74 @@
- ---
- Including and Excluding Artifacts
- ---
- Barrie Treloar
- ---
- 31-July-2006
- ---
-
-~~ Copyright 2006 The Apache Software Foundation.
-~~
-~~ Licensed under the Apache License, Version 2.0 (the "License");
-~~ you may not use this file except in compliance with the License.
-~~ You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing, software
-~~ distributed under the License is distributed on an "AS IS" BASIS,
-~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~~ See the License for the specific language governing permissions and
-~~ limitations under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/guides/mini/guide-apt-format.html
-
-
-Including and Excluding Artifacts
-
- Currently the include/exclude format is based upon the dependency conflict id
- which has a form of: <<<groupId:artifactId:type:classifier>>>. A shortened
- form of the dependency conflict id may also be used <<<groupId:artifactId>>>.
-
- The check for inclusion/exclusion is done based on either the dependency
- conflict id or the shortened form as a <<<String.equals()>>> so it must
- be an identical match for it to be included or excluded. At present there is
- no support for regular expressions.
-
- This example excludes the log4j and commons-lang jar files from the assembly.
- This would be useful when you are building a super distribution assembly which
- contained sub distributions (i.e. other already assembled zips or tars) where
- in your pom you are depenedent upon those distributions. But because the
- distributions transitively depend upon the project's dependencies the assembly
- also includes the jar files (which are already in the assemblies and don't
- need to be duplicated)
-
- Your pom might include something like:
-
------
- <dependencies>
- <dependency>
- <groupId>YOUR GROUP</groupId>
- <artifactId>YOUR ARTIFACT</artifactId>
- <version>YOUR VERSION</version>
- <classifier>bin</classifier>
- <type>zip</type>
- </dependency>
------
-
- And then in your assembly you exclude all the jar dependencies pulled in
- from the binary assembly. In this example the commons-lang and log4j jars
- are included unnecessarily (as they are in the bin.zip file already)
-
------
- <dependencySets>
- <dependencySet>
- ....
- <excludes>
- <exclude>commons-lang:commons-lang</exclude>
- <exclude>log4j:log4j</exclude>
- </excludes>
- </dependencySet>
- ....
- </dependencySets>
------
+ ---
+ Including and Excluding Artifacts
+ ---
+ Barrie Treloar
+ ---
+ 31-July-2006
+ ---
+
+~~ Copyright 2006 The Apache Software Foundation.
+~~
+~~ Licensed under the Apache License, Version 2.0 (the "License");
+~~ you may not use this file except in compliance with the License.
+~~ You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing, software
+~~ distributed under the License is distributed on an "AS IS" BASIS,
+~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~~ See the License for the specific language governing permissions and
+~~ limitations under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
+
+Including and Excluding Artifacts
+
+ Currently the include/exclude format is based upon the dependency conflict id
+ which has a form of: <<<groupId:artifactId:type:classifier>>>. A shortened
+ form of the dependency conflict id may also be used <<<groupId:artifactId>>>.
+
+ The check for inclusion/exclusion is done based on either the dependency
+ conflict id or the shortened form as a <<<String.equals()>>> so it must
+ be an identical match for it to be included or excluded. At present there is
+ no support for regular expressions.
+
+ This example excludes the log4j and commons-lang jar files from the assembly.
+ This would be useful when you are building a super distribution assembly which
+ contained sub distributions (i.e. other already assembled zips or tars) where
+ in your pom you are depenedent upon those distributions. But because the
+ distributions transitively depend upon the project's dependencies the assembly
+ also includes the jar files (which are already in the assemblies and don't
+ need to be duplicated)
+
+ Your pom might include something like:
+
+-----
+ <dependencies>
+ <dependency>
+ <groupId>YOUR GROUP</groupId>
+ <artifactId>YOUR ARTIFACT</artifactId>
+ <version>YOUR VERSION</version>
+ <classifier>bin</classifier>
+ <type>zip</type>
+ </dependency>
+-----
+
+ And then in your assembly you exclude all the jar dependencies pulled in
+ from the binary assembly. In this example the commons-lang and log4j jars
+ are included unnecessarily (as they are in the bin.zip file already)
+
+-----
+ <dependencySets>
+ <dependencySet>
+ ....
+ <excludes>
+ <exclude>commons-lang:commons-lang</exclude>
+ <exclude>log4j:log4j</exclude>
+ </excludes>
+ </dependencySet>
+ ....
+ </dependencySets>
+-----
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt
------------------------------------------------------------------------------
svn:eol-style = native