svn commit: r772827 [1/3] - in /maven/components/branches/MNG-2766: maven-core/src/test/java/org/apache/maven/project/ maven-model-builder/src/main/java/org/apache/maven/model/ maven-model-builder/src

2009-05-07 Thread bentmann
Author: bentmann Date: Fri May 8 01:28:10 2009 New Revision: 772827 URL: http://svn.apache.org/viewvc?rev=772827&view=rev Log: o Re-introduced 2.x like inheritance assembler and profile injector components which mostly delegate to a common model merger class. First of all, the merger only deals

svn commit: r772827 [3/3] - in /maven/components/branches/MNG-2766: maven-core/src/test/java/org/apache/maven/project/ maven-model-builder/src/main/java/org/apache/maven/model/ maven-model-builder/src

2009-05-07 Thread bentmann
Propchange: maven/components/branches/MNG-2766/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java -- svn:eol-style = native Propchange: maven/components/branches/MNG-2766/maven-model/src/main/jav

svn commit: r772778 - /maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt

2009-05-07 Thread dennisl
Author: dennisl Date: Thu May 7 21:23:42 2009 New Revision: 772778 URL: http://svn.apache.org/viewvc?rev=772778&view=rev Log: o Fix typos. Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0

svn commit: r772772 - in /maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt: examples/dependencies.apt reference.apt

2009-05-07 Thread pgier
Author: pgier Date: Thu May 7 21:00:11 2009 New Revision: 772772 URL: http://svn.apache.org/viewvc?rev=772772&view=rev Log: [MANTTASKS-147] Some minor formatting changes. Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt maven/ant-tasks/bran

svn commit: r772768 - in /maven/ant-tasks/branches/maven-ant-tasks-2.0.x: sample.build.xml src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java src/site/apt/examples/dependencies.apt src/

2009-05-07 Thread pgier
Author: pgier Date: Thu May 7 20:49:18 2009 New Revision: 772768 URL: http://svn.apache.org/viewvc?rev=772768&view=rev Log: [MANTTASKS-147] Preserve original behaviour of useScope and add new scope option. Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml maven/

svn commit: r772760 - /maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo

2009-05-07 Thread bentmann
Author: bentmann Date: Thu May 7 20:10:38 2009 New Revision: 772760 URL: http://svn.apache.org/viewvc?rev=772760&view=rev Log: o Fixed typo and restored proper default value Modified: maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo Modified: maven/components/branches/M

svn commit: r772758 - in /maven/components/branches/MNG-2766: maven-model-builder/src/main/java/org/apache/maven/model/processors/ maven-model/src/main/mdo/

2009-05-07 Thread bentmann
Author: bentmann Date: Thu May 7 20:06:41 2009 New Revision: 772758 URL: http://svn.apache.org/viewvc?rev=772758&view=rev Log: o Changed boolean fiels to String to enable both filtering and three-valued logic for proper merging Modified: maven/components/branches/MNG-2766/maven-model-build

svn commit: r772728 - in /maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project: DefaultMavenProjectBuilder.java MavenProject.java artifact/MavenMetadataSource.java

2009-05-07 Thread jvanzyl
Author: jvanzyl Date: Thu May 7 17:58:15 2009 New Revision: 772728 URL: http://svn.apache.org/viewvc?rev=772728&view=rev Log: o starting to collapse the methods in the project builder o rebuilder the maven metadata source Modified: maven/components/branches/MNG-2766/maven-core/src/main/jav

svn commit: r772727 - /maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/sha/SHA512Verifier.java

2009-05-07 Thread ogusakov
Author: ogusakov Date: Thu May 7 17:56:59 2009 New Revision: 772727 URL: http://svn.apache.org/viewvc?rev=772727&view=rev Log: [MERCURY-128] - added SHA-512 stream verifier impl Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/sha/SHA512Verifier.java

svn commit: r772724 - in /maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/sha: AbstractSHAVerifier.java SHA1Verifier.java SHA512Verifier.java SHA512VerifierFactory.java

2009-05-07 Thread ogusakov
Author: ogusakov Date: Thu May 7 17:50:30 2009 New Revision: 772724 URL: http://svn.apache.org/viewvc?rev=772724&view=rev Log: [MERCURY-128] - added SHA-512 stream verifier impl Added: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/crypto/sha/AbstractSHAVerifier.jav

svn commit: r772694 - in /maven/ant-tasks/branches/maven-ant-tasks-2.0.x: ./ src/main/java/org/apache/maven/artifact/ant/ src/site/ src/site/apt/ src/site/apt/examples/ src/test/

2009-05-07 Thread pgier
Author: pgier Date: Thu May 7 16:17:01 2009 New Revision: 772694 URL: http://svn.apache.org/viewvc?rev=772694&view=rev Log: [MANTTASKS-147] Make scope filtering more intuitive for ant users. Added: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Sp

svn commit: r772675 - /maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

2009-05-07 Thread jvanzyl
Author: jvanzyl Date: Thu May 7 15:20:32 2009 New Revision: 772675 URL: http://svn.apache.org/viewvc?rev=772675&view=rev Log: o restore the functionality that m2eclipse needs to read projects with dependencies Modified: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/ap

svn commit: r772618 - /maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java

2009-05-07 Thread vsiveton
Author: vsiveton Date: Thu May 7 11:25:23 2009 New Revision: 772618 URL: http://svn.apache.org/viewvc?rev=772618&view=rev Log: o readingness Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java Modified: maven/plugins/trunk/maven-pdf-p

svn commit: r772617 - in /maven/plugins/trunk/maven-pdf-plugin/src/test: java/org/apache/maven/plugins/pdf/ java/org/apache/maven/plugins/pdf/stubs/ resources/unit/pdf/ resources/unit/pdf/src/site/

2009-05-07 Thread vsiveton
Author: vsiveton Date: Thu May 7 11:23:50 2009 New Revision: 772617 URL: http://svn.apache.org/viewvc?rev=772617&view=rev Log: MPDF-1: Ability to use pom properties in pdf.xml o added a test case Added: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/

svn commit: r772616 - in /maven/plugins/trunk/maven-pdf-plugin/src/test/resources/unit/pdf: iText_pom.xml pom.xml

2009-05-07 Thread vsiveton
Author: vsiveton Date: Thu May 7 11:21:34 2009 New Revision: 772616 URL: http://svn.apache.org/viewvc?rev=772616&view=rev Log: o added license header Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/resources/unit/pdf/iText_pom.xml maven/plugins/trunk/maven-pdf-plugin/src/test/re

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

2009-05-07 Thread vsiveton
Author: vsiveton Date: Thu May 7 11:19:51 2009 New Revision: 772615 URL: http://svn.apache.org/viewvc?rev=772615&view=rev Log: o generate serialVersionUID Modified: maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java Modified: maven/plugins/trunk/m