diff --git a/dist/project.xml b/dist/project.xml index a23e1dd7..de858324 100644 --- a/dist/project.xml +++ b/dist/project.xml @@ -17,14 +17,12 @@ * limitations under the License. */ --> - - + ../plugins-parent/project.xml 3 maven-dist-plugin Maven Distribution Plugin - 1.7-SNAPSHOT + 1.7 Create source and binary distributions @@ -47,6 +45,11 @@ 1.6.1 MAVEN_DIST_1_6_1 + + 1.7 + 1.7 + MAVEN_DIST_1_7 + diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml index bc539a4c..c92d78a0 100644 --- a/dist/xdocs/changes.xml +++ b/dist/xdocs/changes.xml @@ -17,34 +17,51 @@ * limitations under the License. */ --> - Changes Vincent Massol - + New property maven.dist.include.dirs to include additional directories. Parent project is not included in source distribution. New property maven.dist.formats to allow creation of only zip or tar.gz archives. Allow distribution of artifact types other than jar. New property maven.dist.bin.artifact.type, deprecated property maven.dist.bin.artifact. - New property maven.dist.bin.include.site to optionally include the site docs in the binary distribution. - build-src goal does not use pom.build.sourceDirectory. + New property + maven.dist.bin.include.siteto optionally include the site docs in the binary distribution. + + build-src goal does not use + pom.build.sourceDirectory. + Fix compatibility with the version of ant plugin newer or equal to 1.10. - New maven.dist.src.include property. + New + maven.dist.src.includeproperty. + 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. + + dist:prepare-src-filesystemdoesn'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 : commons-logging v1.0.3 to v1.0.4, maven v1.0 to v1.0.2, maven-model v3.0.0 to v3.0.1 - It requires at least maven-artifact-plugin v1.7. Note that this plugin is not compatible with Maven 1.0.2! - Added multiproject analogs mirroring single project goals. Also added the abiltiy to generate combined javadocs for multiproject distribution. However multiproject consolidation might be best put into the site plugin. These fixes are associated with the following JIRA enhancement issue. - Removed unused properties: maven.dist.tar.executable and maven.dist.gunzip.executable. + It requires at least maven-artifact-plugin v1.7. + Notethat this plugin is not compatible with Maven 1.0.2! + + Added multiproject analogs mirroring single project goals. Also added the abiltiy to generate combined javadocs for multiproject distribution. However multiproject consolidation might be best put into the site plugin. These fixes are associated with the following + JIRA enhancement issue. + + Removed unused properties: + maven.dist.tar.executableand + maven.dist.gunzip.executable. + Make compatible with Maven 1.1 - Added maven.dist.bin.artifact property. + Added + maven.dist.bin.artifactproperty. + Don't generate ant build file, call maven-ant-plugin before or set a preGoal Add NOTICE file to distribution