svn commit: r999673 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-enum-vs-wildcard: ./ enum/ enum/src/ enum/src/main/ enum/src/main/assembly/ wildcard/ wildcar

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 22:30:48 2010 New Revision: 999673 URL: http://svn.apache.org/viewvc?rev=999673&view=rev Log: [MASSEMBLY-220] Verify that wildcard vs. enumerated includes in a dependencySet render the same results. Added: maven/plugins/trunk/maven-assembly-plugin/src/it/pro

svn commit: r999639 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/filter/ test/java/org/apache/maven/plugin/assembly/testutils/

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 21:01:44 2010 New Revision: 999639 URL: http://svn.apache.org/viewvc?rev=999639&view=rev Log: Fixing copyrights. Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java

svn commit: r999629 - /maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:42:16 2010 New Revision: 999629 URL: http://svn.apache.org/viewvc?rev=999629&view=rev Log: forgot to add tracking archiver stub. Added: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.

svn commit: r999628 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/archive/ main/java/org/apache/maven/plugin/assembly/archive/archiver/ test/java/org/

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:41:59 2010 New Revision: 999628 URL: http://svn.apache.org/viewvc?rev=999628&view=rev Log: [MASSEMBLY-187] Prevent infinite recursion by excluding location patterns matching the assembly working directory (which is a temp workspace for archive creation). Modi

svn commit: r999627 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/dependency-sets/depSet-byDepVersion/ it/projects/dependency-sets/depSet-byDepVersion/child1/ it/projects/dependency

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:41:29 2010 New Revision: 999627 URL: http://svn.apache.org/viewvc?rev=999627&view=rev Log: [MASSEMBLY-435] Provide access to artifact properties for dependency artifacts and current module, for calculating both outputDirectory and outputFileNameMapping Added:

svn commit: r999625 - in /maven/plugins/trunk/maven-assembly-plugin/src/main: java/org/apache/maven/plugin/assembly/archive/task/ java/org/apache/maven/plugin/assembly/mojos/ mdo/

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:40:39 2010 New Revision: 999625 URL: http://svn.apache.org/viewvc?rev=999625&view=rev Log: deprecate all mojos except single, since the others are redundant or can lead to non-standard build processes with undesirable effects when used during the lifecycle. Al

svn commit: r999624 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/dependency-sets/dependencySet-unpacked-filtered/ it/projects/dependency-sets/dependencySet-unpacked-filtered/child1

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:40:03 2010 New Revision: 999624 URL: http://svn.apache.org/viewvc?rev=999624&view=rev Log: [MASSEMBLY-228] Enable filtering, line-ending configuration, and control of default excludes and strict filtering using unpackOptions. Added: maven/plugins/trunk/ma

svn commit: r999622 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java test/java/org/apache/maven/plugin/assemb

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:39:12 2010 New Revision: 999622 URL: http://svn.apache.org/viewvc?rev=999622&view=rev Log: removing unused constructor, and cleaning up formats. Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/arch

svn commit: r999621 - in /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly: archive/phase/ archive/task/ artifact/ mojos/ utils/

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:38:46 2010 New Revision: 999621 URL: http://svn.apache.org/viewvc?rev=999621&view=rev Log: switched to using LinkedHashSet to preserve ordering of dependecy / module / project sets. Ordering may not be easy to predict in some places, but at least they should b

svn commit: r999619 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-filteredFileSet: ./ child/ child/src/ child/src/config/ child/src/config/a/ src/ src/assembl

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:38:22 2010 New Revision: 999619 URL: http://svn.apache.org/viewvc?rev=999619&view=rev Log: [MASSEMBLY-206] IT verifying that fileSets within moduleSet/sources get filtered correctly. Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimo

svn commit: r999618 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/files/filtered-sysprop: ./ pom.xml src/ src/assemble/ src/assemble/bin.xml src/config/ src/config/a/ src/config/a/fi

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:38:04 2010 New Revision: 999618 URL: http://svn.apache.org/viewvc?rev=999618&view=rev Log: [MASSEMBLY-167] IT to verify that systems properties are available for filtering. Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/files/filtered-sy

svn commit: r999617 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:37:49 2010 New Revision: 999617 URL: http://svn.apache.org/viewvc?rev=999617&view=rev Log: [MASSEMBLY-272] Mark methods corresponding to deprecated fields as deprecated, too. Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/mav

svn commit: r999616 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/files/ it/projects/files/multimodule-relativePath/ it/projects/files/multimodule-relativePath/child/ it/projects/fi

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:37:32 2010 New Revision: 999616 URL: http://svn.apache.org/viewvc?rev=999616&view=rev Log: [MASSEMBLY-150] Make AssemblerConfigurationSource.getBasedir() return basedir OF THAT PROJECT, so relative paths of files and such are correct. Added: maven/plugins/

svn commit: r999614 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depMgmt-override: ./ child/ child/pom.xml child/src/ child/src/assembly/ child/src/assembly/bundle.x

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:36:43 2010 New Revision: 999614 URL: http://svn.apache.org/viewvc?rev=999614&view=rev Log: [MASSEMBLY-432] IT verifying this is fixed. Dependency-management now correctly applied when creating an assembly with binaries included. Added: maven/plugins/trunk

svn commit: r999613 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/container-descriptors/metaInf-services-aggregation/ it/projects/container-descriptors/metaInf-services-aggregation/

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:36:24 2010 New Revision: 999613 URL: http://svn.apache.org/viewvc?rev=999613&view=rev Log: [MASSEMBLY-360] adding files I missed last commit, and adding an IT for spring-file aggregation. Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/co

svn commit: r999612 [10/10] - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/main/java/org/apache/maven/plugin/assembly/ src/main/java/org/apache/maven/plugin/assembly/archive/ src/main/java/or

2010-09-21 Thread jdcasey
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java?rev=999612&r1=99961

svn commit: r999611 - /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/src/assemble/src.xml

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:33:17 2010 New Revision: 999611 URL: http://svn.apache.org/viewvc?rev=999611&view=rev Log: fixing incorrect assembly descriptor. Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-sourceNotBinaries/src/assemble/src.

svn commit: r999610 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/main/java/org/apache/maven/plugin/assembly/archive/ src/main/java/org/apache/maven/plugin/assembly/filter/

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:33:04 2010 New Revision: 999610 URL: http://svn.apache.org/viewvc?rev=999610&view=rev Log: [MASSEMBLY-209][MASSEMBLY-360] Adding line-oriented aggregators for spring files in META-INF and META-INF/services/* ...these still need tests. Added: maven/plugins

svn commit: r999605 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-allReactorProjectsUsedFromChild: ./ child1/ child1/src/ child1/src/main/ child1/src/main/java/ ch

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:28:26 2010 New Revision: 999605 URL: http://svn.apache.org/viewvc?rev=999605&view=rev Log: [MASSEMBLY-501] Adding integration test. Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-allReactorProjectsUsedFromChild/ ma

svn commit: r999604 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:27:34 2010 New Revision: 999604 URL: http://svn.apache.org/viewvc?rev=999604&view=rev Log: small formatting change. Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java

svn commit: r999603 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java test/java/org/apache/maven/plugin/assembly

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:27:19 2010 New Revision: 999603 URL: http://svn.apache.org/viewvc?rev=999603&view=rev Log: - updating massembly-306 POM to depend on a log4j version that is available to the tests - updating the POM to depend on common-artifact-filters 1.3-SNAPSHOT to fix depT

svn commit: r999600 - /maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:26:28 2010 New Revision: 999600 URL: http://svn.apache.org/viewvc?rev=999600&view=rev Log: Simplify logger calls Modified: maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java Modified: maven/plugins/trunk/maven-pd

svn commit: r999597 - /maven/plugins/trunk/maven-ejb-plugin/pom.xml

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:25:59 2010 New Revision: 999597 URL: http://svn.apache.org/viewvc?rev=999597&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml Modified: maven/plugins/trunk/maven-ejb-plugin/p

svn commit: r999599 - /maven/plugins/trunk/maven-linkcheck-plugin/pom.xml

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:26:15 2010 New Revision: 999599 URL: http://svn.apache.org/viewvc?rev=999599&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-linkcheck-plugin/pom.xml Modified: maven/plugins/trunk/maven-linkch

svn commit: r999598 - /maven/plugins/trunk/maven-linkcheck-plugin/pom.xml

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:26:08 2010 New Revision: 999598 URL: http://svn.apache.org/viewvc?rev=999598&view=rev Log: [maven-release-plugin] prepare release maven-linkcheck-plugin-1.0.1 Modified: maven/plugins/trunk/maven-linkcheck-plugin/pom.xml Modified: maven/plugins/trunk/maven-

svn commit: r999596 - /maven/plugins/trunk/maven-ejb-plugin/pom.xml

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:25:49 2010 New Revision: 999596 URL: http://svn.apache.org/viewvc?rev=999596&view=rev Log: [maven-release-plugin] prepare release maven-ejb-plugin-2.3 Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml Modified: maven/plugins/trunk/maven-ejb-plugin/pom

svn commit: r999595 - /maven/plugins/trunk/maven-ejb-plugin/pom.xml

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:25:39 2010 New Revision: 999595 URL: http://svn.apache.org/viewvc?rev=999595&view=rev Log: Next version will be 2.3. Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml URL: http://svn.apache.org/v

svn commit: r999593 - /maven/plugins/trunk/maven-antrun-plugin/pom.xml

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:25:19 2010 New Revision: 999593 URL: http://svn.apache.org/viewvc?rev=999593&view=rev Log: [maven-release-plugin] prepare release maven-antrun-plugin-1.5 Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml Modified: maven/plugins/trunk/maven-antrun-p

svn commit: r999594 - /maven/plugins/trunk/maven-antrun-plugin/pom.xml

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:25:29 2010 New Revision: 999594 URL: http://svn.apache.org/viewvc?rev=999594&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml Modified: maven/plugins/trunk/maven-antrun-pl

svn commit: r999592 - /maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java

2010-09-21 Thread jdcasey
Author: jdcasey Date: Tue Sep 21 20:25:09 2010 New Revision: 999592 URL: http://svn.apache.org/viewvc?rev=999592&view=rev Log: [MPDF-41] with maven 3 pdf failure if reporting section is not empty ignore NoSuchMethodError to prevent failure for maven 3 users. Modified: maven/plugins/trunk/mav

svn commit: r999376 - /maven/sandbox/trunk/maven/maven-plugin-enforcer/pom.xml

2010-09-21 Thread stephenc
Author: stephenc Date: Tue Sep 21 12:43:39 2010 New Revision: 999376 URL: http://svn.apache.org/viewvc?rev=999376&view=rev Log: sync with latest m3 drop Modified: maven/sandbox/trunk/maven/maven-plugin-enforcer/pom.xml Modified: maven/sandbox/trunk/maven/maven-plugin-enforcer/pom.xml URL: h

svn commit: r999270 - /maven/project/KEYS

2010-09-21 Thread markh
Author: markh Date: Tue Sep 21 08:33:12 2010 New Revision: 999270 URL: http://svn.apache.org/viewvc?rev=999270&view=rev Log: Added new PGP key for markh Modified: maven/project/KEYS Modified: maven/project/KEYS URL: http://svn.apache.org/viewvc/maven/project/KEYS?rev=999270&r1=999269&r2=999

svn commit: r999266 - in /maven/release/trunk/maven-release-manager/src/test/remote-repository/external: artifactId-release-range/ artifactId-release-range/1.0-SNAPSHOT/ artifactId-release-range/1.0/

2010-09-21 Thread brett
Author: brett Date: Tue Sep 21 08:16:37 2010 New Revision: 999266 URL: http://svn.apache.org/viewvc?rev=999266&view=rev Log: remove checksums, as they aren't essential to the tests and reduce i/o. Removed: maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifact

svn propchange: r999262 - svn:log

2010-09-21 Thread brett
Author: brett Revision: 999262 Modified property: svn:log Modified: svn:log at Tue Sep 21 07:59:23 2010 -- --- svn:log (original) +++ svn:log Tue Sep 21 07:59:23 2010 @@ -1,2 +1,4 @@ [MRELEASE-318] use the version determi

svn commit: r999262 - in /maven/release/trunk/maven-release-manager/src: main/java/org/apache/maven/shared/release/phase/ test/java/org/apache/maven/shared/release/phase/ test/remote-repository/extern

2010-09-21 Thread brett
Author: brett Date: Tue Sep 21 07:57:29 2010 New Revision: 999262 URL: http://svn.apache.org/viewvc?rev=999262&view=rev Log: [MRELEASE-318] use the version determined by the project at this instance in time to accomodate ranges. Added test to exhibit problem with resolving dependency ranges (adju