diff --git a/dist/plugin.jelly b/dist/plugin.jelly index 36ab9484..2119bac1 100644 --- a/dist/plugin.jelly +++ b/dist/plugin.jelly @@ -92,6 +92,8 @@ +-------------------------------------------------------+ + ${maven.dist.src.include} + @@ -100,6 +102,9 @@ + + + diff --git a/dist/src/plugin-test/custom.txt b/dist/src/plugin-test/custom.txt new file mode 100644 index 00000000..1fb37c6b --- /dev/null +++ b/dist/src/plugin-test/custom.txt @@ -0,0 +1 @@ +custom file included in source distribution build diff --git a/dist/src/plugin-test/maven.xml b/dist/src/plugin-test/maven.xml index 47da546c..a9a149c9 100644 --- a/dist/src/plugin-test/maven.xml +++ b/dist/src/plugin-test/maven.xml @@ -19,7 +19,7 @@ xmlns:util="jelly:util" xmlns:j="jelly:core"> - + @@ -29,4 +29,10 @@ + + + + + + \ No newline at end of file diff --git a/dist/src/plugin-test/project.properties b/dist/src/plugin-test/project.properties new file mode 100644 index 00000000..ed254827 --- /dev/null +++ b/dist/src/plugin-test/project.properties @@ -0,0 +1 @@ +maven.dist.src.include=custom.txt,doesntexists.txt diff --git a/dist/src/plugin-test/project.xml b/dist/src/plugin-test/project.xml index 2d9f4261..4da36e60 100644 --- a/dist/src/plugin-test/project.xml +++ b/dist/src/plugin-test/project.xml @@ -55,4 +55,10 @@ src/main + + + + maven-license-plugin + + diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml index 370dee5d..f4565d33 100644 --- a/dist/xdocs/changes.xml +++ b/dist/xdocs/changes.xml @@ -25,6 +25,7 @@ + New maven.dist.src.include property. Allow to configure to which files should use CRLF/LF line endings in archives. dist:prepare-src-filesystem doesn't recognize maven.ant.generatebuild.file. Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : diff --git a/dist/xdocs/properties.xml b/dist/xdocs/properties.xml index 869b553e..921d73e4 100644 --- a/dist/xdocs/properties.xml +++ b/dist/xdocs/properties.xml @@ -51,7 +51,12 @@ maven.dist.src.assembly.dir yes - default is ${maven.dist.assembly.dir}/src/${maven.final.name} The directory where the sources are copied to so that it can be archived - + + + maven.dist.src.include + yes + Comma delimited list of additional files which should be included in the source distribution + maven.dist.dir yes - default is ${maven.build.dir}/distributions