svn commit: r944868 - in /maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus: artifact-handlers.xml components.xml

Author: bentmann Date: Sun May 16 15:47:09 2010 New Revision: 944868 URL: http://svn.apache.org/viewvc?rev=944868view=rev Log: o Formatted code Modified: maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml maven/maven-3/trunk/maven-core/src/main

svn commit: r944890 - in /maven/plugins/trunk: maven-plugins/ maven-plugins/pom.xml maven-plugins/src/ pom.xml src/

Author: bentmann Date: Sun May 16 18:01:45 2010 New Revision: 944890 URL: http://svn.apache.org/viewvc?rev=944890view=rev Log: o Moved maven-plugins into sibling directory to ease its release (cf. http://www.mail-archive.com/d...@maven.apache.org/msg84531.html) Added: maven/plugins/trunk

svn commit: r944891 - /maven/plugins/trunk/pom.xml

Author: bentmann Date: Sun May 16 18:03:08 2010 New Revision: 944891 URL: http://svn.apache.org/viewvc?rev=944891view=rev Log: o Added maven-plugins-aggregator to compensate for move of maven-plugins (cf. http://www.mail-archive.com/d...@maven.apache.org/msg84531.html) Added: maven/plugins

svn commit: r944685 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java

Author: bentmann Date: Sat May 15 17:26:43 2010 New Revision: 944685 URL: http://svn.apache.org/viewvc?rev=944685view=rev Log: o Cleaned up core artifact filter and removed exclusions pf non-existing artifacts Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven

svn commit: r944710 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java

Author: bentmann Date: Sat May 15 20:14:00 2010 New Revision: 944710 URL: http://svn.apache.org/viewvc?rev=944710view=rev Log: [MNG-4666] [regression] Plugins depending on plexus:plexus-container-default get broken runtime classpath Modified: maven/maven-3/trunk/maven-core/src/main/java

svn commit: r944714 - /maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java

Author: bentmann Date: Sat May 15 20:29:45 2010 New Revision: 944714 URL: http://svn.apache.org/viewvc?rev=944714view=rev Log: o Added method to purge specific g:a:v from local repo Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java Modified: maven

svn commit: r944715 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java

Author: bentmann Date: Sat May 15 20:34:14 2010 New Revision: 944715 URL: http://svn.apache.org/viewvc?rev=944715view=rev Log: o Stabilized IT Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java Modified

svn commit: r944470 - /maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java

Author: bentmann Date: Fri May 14 21:08:59 2010 New Revision: 944470 URL: http://svn.apache.org/viewvc?rev=944470view=rev Log: o Removed unused imports Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java Modified: maven

svn commit: r943454 - /maven/site/trunk/src/site/apt/plugins/index.apt

Author: bentmann Date: Wed May 12 11:36:21 2010 New Revision: 943454 URL: http://svn.apache.org/viewvc?rev=943454view=rev Log: o Updated plugin index to account for release of maven-clean-plugin:2.4.1 Modified: maven/site/trunk/src/site/apt/plugins/index.apt Modified: maven/site/trunk/src

svn commit: r942366 - in /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade: DefaultShader.java TempRemappingClassAdapter.java

Author: bentmann Date: Sat May 8 11:43:05 2010 New Revision: 942366 URL: http://svn.apache.org/viewvc?rev=942366view=rev Log: [MSHADE-79] Annotations are not shaded Submitted by: Brian Kramer Added: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade

svn commit: r942368 - /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java

Author: bentmann Date: Sat May 8 11:45:28 2010 New Revision: 942368 URL: http://svn.apache.org/viewvc?rev=942368view=rev Log: o Added license header o Fixed code style Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade

svn commit: r942370 - in /maven/plugins/trunk/maven-shade-plugin/src: it/reloc-anno/ it/reloc-anno/src/ it/reloc-anno/src/main/ it/reloc-anno/src/main/java/ it/reloc-anno/src/main/java/relocated/ main

Author: bentmann Date: Sat May 8 11:57:36 2010 New Revision: 942370 URL: http://svn.apache.org/viewvc?rev=942370view=rev Log: [MSHADE-79] Annotations are not shaded o Extended original patch to fix field annotations as well o Added IT Added: maven/plugins/trunk/maven-shade-plugin/src

svn commit: r942375 - /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java

Author: bentmann Date: Sat May 8 12:43:53 2010 New Revision: 942375 URL: http://svn.apache.org/viewvc?rev=942375view=rev Log: o Polished code Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java Modified: maven/plugins/trunk

svn commit: r942376 - in /maven/plugins/trunk/maven-shade-plugin: pom.xml src/main/java/org/apache/maven/plugins/shade/DefaultShader.java src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.ja

Author: bentmann Date: Sat May 8 12:52:51 2010 New Revision: 942376 URL: http://svn.apache.org/viewvc?rev=942376view=rev Log: o Inherited from maven-plugins:18 o Declared mojo as thread-safe o Made shader use per-lookup instantiation Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml

svn commit: r942385 - /maven/plugins/trunk/maven-clean-plugin/pom.xml

Author: bentmann Date: Sat May 8 13:48:01 2010 New Revision: 942385 URL: http://svn.apache.org/viewvc?rev=942385view=rev Log: o Bumped version to 2.4.1-SNAPSHOT in preparation for release Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml Modified: maven/plugins/trunk/maven-clean

svn commit: r942398 - in /maven/plugins/trunk/maven-clean-plugin/src: main/java/org/apache/maven/plugin/clean/GlobSelector.java test/java/org/apache/maven/plugin/clean/CleanMojoTest.java test/resource

Author: bentmann Date: Sat May 8 14:57:59 2010 New Revision: 942398 URL: http://svn.apache.org/viewvc?rev=942398view=rev Log: [MCLEAN-44] NullPointerException when using empty exclude to preserve base directory of fileset Modified: maven/plugins/trunk/maven-clean-plugin/src/main/java/org

svn commit: r942399 - /maven/plugins/trunk/maven-clean-plugin/pom.xml

Author: bentmann Date: Sat May 8 15:05:19 2010 New Revision: 942399 URL: http://svn.apache.org/viewvc?rev=942399view=rev Log: [maven-release-plugin] prepare release maven-clean-plugin-2.4.1 Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml Modified: maven/plugins/trunk/maven-clean

svn commit: r942400 - /maven/plugins/tags/maven-clean-plugin-2.4.1/

Author: bentmann Date: Sat May 8 15:06:00 2010 New Revision: 942400 URL: http://svn.apache.org/viewvc?rev=942400view=rev Log: [maven-scm] copy for tag maven-clean-plugin-2.4.1 Added: maven/plugins/tags/maven-clean-plugin-2.4.1/ - copied from r942399, maven/plugins/trunk/maven-clean

svn commit: r942401 - /maven/plugins/trunk/maven-clean-plugin/pom.xml

Author: bentmann Date: Sat May 8 15:06:15 2010 New Revision: 942401 URL: http://svn.apache.org/viewvc?rev=942401view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml Modified: maven/plugins/trunk/maven-clean

svn commit: r942430 - /maven/maven-3/trunk/build.xml

Author: bentmann Date: Sat May 8 18:04:28 2010 New Revision: 942430 URL: http://svn.apache.org/viewvc?rev=942430view=rev Log: o Made bootstrapper fully respect user-supplied maven home directory, including the final directory name Modified: maven/maven-3/trunk/build.xml Modified: maven

svn commit: r942440 - /maven/maven-3/trunk/build.xml

Author: bentmann Date: Sat May 8 18:43:13 2010 New Revision: 942440 URL: http://svn.apache.org/viewvc?rev=942440view=rev Log: o Made bootstrapper prompt user in case specified maven home already exists Modified: maven/maven-3/trunk/build.xml Modified: maven/maven-3/trunk/build.xml URL

svn commit: r942067 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java

Author: bentmann Date: Fri May 7 13:24:02 2010 New Revision: 942067 URL: http://svn.apache.org/viewvc?rev=942067view=rev Log: [MNG-466] Adjust the expected message string in MavenITmng2690MojoLoadingErrorsTest Submitted by: Stuart McCulloch Modified: maven/core-integration-testing/trunk

svn commit: r941657 - /maven/shared/trunk/maven-archiver/src/site/site.xml

Author: bentmann Date: Thu May 6 10:59:12 2010 New Revision: 941657 URL: http://svn.apache.org/viewvc?rev=941657view=rev Log: o Fixed site descriptor Modified: maven/shared/trunk/maven-archiver/src/site/site.xml Modified: maven/shared/trunk/maven-archiver/src/site/site.xml URL: http

svn commit: r941224 - in /maven/maven-3/trunk/maven-core/src: main/java/org/apache/maven/lifecycle/internal/ test/java/org/apache/maven/lifecycle/

Author: bentmann Date: Wed May 5 09:49:08 2010 New Revision: 941224 URL: http://svn.apache.org/viewvc?rev=941224view=rev Log: [MNG-4664] Minor patches needed to run Maven3 with the replacement Guice-Plexus container Submitted by: Stuart McCulloch Modified: maven/maven-3/trunk/maven-core

svn commit: r941233 - /maven/site/trunk/src/site/apt/plugins/index.apt

Author: bentmann Date: Wed May 5 10:36:34 2010 New Revision: 941233 URL: http://svn.apache.org/viewvc?rev=941233view=rev Log: o Updated plugin index to account for release of maven-plugin-plugin:2.6 Modified: maven/site/trunk/src/site/apt/plugins/index.apt Modified: maven/site/trunk/src

svn commit: r941235 - /maven/site/trunk/src/site/apt/plugins/index.apt

Author: bentmann Date: Wed May 5 10:37:43 2010 New Revision: 941235 URL: http://svn.apache.org/viewvc?rev=941235view=rev Log: o Fixed typo Modified: maven/site/trunk/src/site/apt/plugins/index.apt Modified: maven/site/trunk/src/site/apt/plugins/index.apt URL: http://svn.apache.org/viewvc

svn commit: r941241 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-0956/ resources/mng-0956/repo/org/apache/maven/its/it0081/ resources/mng-

Author: bentmann Date: Wed May 5 10:59:47 2010 New Revision: 941241 URL: http://svn.apache.org/viewvc?rev=941241view=rev Log: o Renamed artifact to match issue number Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956

svn commit: r941249 - /maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/Compo

Author: bentmann Date: Wed May 5 11:14:14 2010 New Revision: 941249 URL: http://svn.apache.org/viewvc?rev=941249view=rev Log: [MNG-4665] Missing component test class from maven-it-plugin-class-loader project? Submitted by: Stuart McCulloch Added: maven/core-integration-testing/trunk/core

svn commit: r941252 - /maven/maven-3/trunk/build.xml

Author: bentmann Date: Wed May 5 11:21:42 2010 New Revision: 941252 URL: http://svn.apache.org/viewvc?rev=941252view=rev Log: o Removed cruft Modified: maven/maven-3/trunk/build.xml Modified: maven/maven-3/trunk/build.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/build.xml?rev

svn commit: r940789 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/IntegrationTestSuite.java java/org/apache/maven/it/MavenITmng4418ReservedRepoIdLocalTest

Author: bentmann Date: Tue May 4 09:56:22 2010 New Revision: 940789 URL: http://svn.apache.org/viewvc?rev=940789view=rev Log: [MNG-4658] Relax validation of repository ids and only warn upon conflict with local o Removed obsolete IT Removed: maven/core-integration-testing/trunk/core

svn commit: r940790 - in /maven/maven-3/trunk: maven-core/src/main/java/org/apache/maven/settings/validation/ maven-model-builder/src/main/java/org/apache/maven/model/validation/ maven-model-builder/s

Author: bentmann Date: Tue May 4 09:57:46 2010 New Revision: 940790 URL: http://svn.apache.org/viewvc?rev=940790view=rev Log: [MNG-4658] Relax validation of repository ids and only warn upon conflict with local Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven

svn commit: r940810 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java

Author: bentmann Date: Tue May 4 11:41:32 2010 New Revision: 940810 URL: http://svn.apache.org/viewvc?rev=940810view=rev Log: o Fixed error message Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java Modified: maven

svn commit: r940409 - /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml

Author: bentmann Date: Mon May 3 10:18:15 2010 New Revision: 940409 URL: http://svn.apache.org/viewvc?rev=940409view=rev Log: o Adjusted IT to compensate for MEV-658 Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml Modified: maven/plugins

svn commit: r940414 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java test/java/org/apache/maven/plugin/assembly/io/DefaultA

Author: bentmann Date: Mon May 3 10:53:06 2010 New Revision: 940414 URL: http://svn.apache.org/viewvc?rev=940414view=rev Log: [MASSEMBLY-486] ComponentDescriptors to support absolute paths Submitted by: Michael Lawler o Applied with minor formatting/modifications Modified: maven/plugins

svn commit: r940415 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path: ./ assembly.xml component.xml goals.txt pom.xml verify.bsh

Author: bentmann Date: Mon May 3 10:54:58 2010 New Revision: 940415 URL: http://svn.apache.org/viewvc?rev=940415view=rev Log: [MASSEMBLY-486] ComponentDescriptors to support absolute paths o Added IT Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter

svn commit: r940419 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

Author: bentmann Date: Mon May 3 11:25:25 2010 New Revision: 940419 URL: http://svn.apache.org/viewvc?rev=940419view=rev Log: o Inherited from maven-plugins:17 o Updated to plexus-utils:2.0.5 o Updated to plexus-io:1.0 Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml Modified

svn commit: r939983 - /maven/plugin-tools/trunk/pom.xml

Author: bentmann Date: Sat May 1 11:53:33 2010 New Revision: 939983 URL: http://svn.apache.org/viewvc?rev=939983view=rev Log: o Updated to plexus-utils:2.0.5 Modified: maven/plugin-tools/trunk/pom.xml Modified: maven/plugin-tools/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven

svn commit: r939992 - in /maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic: src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java verify.groovy

Author: bentmann Date: Sat May 1 12:19:13 2010 New Revision: 939992 URL: http://svn.apache.org/viewvc?rev=939992view=rev Log: o Extended ITs Added: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java (with props

svn commit: r939993 - in /maven/plugin-tools/trunk: maven-plugin-plugin/pom.xml maven-plugin-tools-java/pom.xml maven-plugin-tools-javadoc/pom.xml

Author: bentmann Date: Sat May 1 12:20:51 2010 New Revision: 939993 URL: http://svn.apache.org/viewvc?rev=939993view=rev Log: o Updated to plexus-utils:2.0.5 o Updated to qdox:1.11 o Updated to maven-invoker-plugin:1.5 Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml maven

svn commit: r940004 - in /maven/plugin-tools/trunk: maven-plugin-plugin/src/it/help-package/ maven-plugin-plugin/src/it/help-package/src/ maven-plugin-plugin/src/it/help-package/src/main/ maven-plugin

Author: bentmann Date: Sat May 1 12:54:30 2010 New Revision: 940004 URL: http://svn.apache.org/viewvc?rev=940004view=rev Log: [MPLUGIN-168] Provide ability to set package of HelpMojo Added: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/ maven/plugin-tools/trunk/maven

svn commit: r940009 - in /maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin: AbstractGeneratorMojo.java metadata/AddPluginArtifactMetadataMojo.java

Author: bentmann Date: Sat May 1 13:32:37 2010 New Revision: 940009 URL: http://svn.apache.org/viewvc?rev=940009view=rev Log: o Polished code Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java maven/plugin

svn commit: r940010 - /maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java

Author: bentmann Date: Sat May 1 13:35:33 2010 New Revision: 940010 URL: http://svn.apache.org/viewvc?rev=940010view=rev Log: [MPLUGIN-146] Implement pluginXml parameter for maven-plugin-plugin o Added a skip parameter instead which simply allows usage of src/main/resources/META-INF/maven

svn commit: r940014 - in /maven/plugin-tools/trunk: ./ maven-plugin-plugin/ maven-plugin-tools-ant/ maven-plugin-tools-api/ maven-plugin-tools-beanshell/ maven-plugin-tools-java/ maven-plugin-tools-ja

Author: bentmann Date: Sat May 1 13:47:12 2010 New Revision: 940014 URL: http://svn.apache.org/viewvc?rev=940014view=rev Log: [maven-release-plugin] prepare release maven-plugin-tools-2.6 Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml maven/plugin-tools/trunk/maven

svn commit: r940015 - /maven/plugin-tools/tags/maven-plugin-tools-2.6/

Author: bentmann Date: Sat May 1 13:47:41 2010 New Revision: 940015 URL: http://svn.apache.org/viewvc?rev=940015view=rev Log: [maven-scm] copy for tag maven-plugin-tools-2.6 Added: maven/plugin-tools/tags/maven-plugin-tools-2.6/ - copied from r940014, maven/plugin-tools/trunk/

svn commit: r940017 - in /maven/plugin-tools/trunk: ./ maven-plugin-plugin/ maven-plugin-tools-ant/ maven-plugin-tools-api/ maven-plugin-tools-beanshell/ maven-plugin-tools-java/ maven-plugin-tools-ja

Author: bentmann Date: Sat May 1 13:48:14 2010 New Revision: 940017 URL: http://svn.apache.org/viewvc?rev=940017view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml maven/plugin-tools/trunk/maven

svn commit: r940018 - /maven/plugins/trunk/pom.xml

Author: bentmann Date: Sat May 1 13:55:59 2010 New Revision: 940018 URL: http://svn.apache.org/viewvc?rev=940018view=rev Log: o Updated to (staged) maven-plugin-plugin:2.6 in preparation for release Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http

svn commit: r940020 - /maven/plugins/trunk/pom.xml

Author: bentmann Date: Sat May 1 13:57:46 2010 New Revision: 940020 URL: http://svn.apache.org/viewvc?rev=940020view=rev Log: [maven-release-plugin] prepare release maven-plugins-18 Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org

svn commit: r940021 - /maven/plugins/tags/maven-plugins-18/

Author: bentmann Date: Sat May 1 13:58:10 2010 New Revision: 940021 URL: http://svn.apache.org/viewvc?rev=940021view=rev Log: [maven-scm] copy for tag maven-plugins-18 Added: maven/plugins/tags/maven-plugins-18/ - copied from r940020, maven/plugins/trunk/

svn commit: r940022 - /maven/plugins/trunk/pom.xml

Author: bentmann Date: Sat May 1 13:58:53 2010 New Revision: 940022 URL: http://svn.apache.org/viewvc?rev=940022view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http

svn commit: r940050 - /maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt

Author: bentmann Date: Sat May 1 14:52:21 2010 New Revision: 940050 URL: http://svn.apache.org/viewvc?rev=940050view=rev Log: o Added dependency source aggregating example to index page Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt Modified: maven/plugins/trunk

svn commit: r940051 - /maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate-dependency-sources.apt.vm

Author: bentmann Date: Sat May 1 14:55:11 2010 New Revision: 940051 URL: http://svn.apache.org/viewvc?rev=940051view=rev Log: o Improved example to use non-forking goals during lifecycle phases Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate-dependency

svn commit: r940066 - in /maven/maven-3/trunk/maven-plugin-api/src/test: java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java resources/plugin.xml

Author: bentmann Date: Sat May 1 16:04:39 2010 New Revision: 940066 URL: http://svn.apache.org/viewvc?rev=940066view=rev Log: o Extended tests Modified: maven/maven-3/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java maven/maven-3

svn commit: r940092 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4654/ resources/mng-4654/repo/ resources/mng-4654/repo/org/ resources/mng

Author: bentmann Date: Sat May 1 18:38:16 2010 New Revision: 940092 URL: http://svn.apache.org/viewvc?rev=940092view=rev Log: [MNG-4654] Maven erroneously selects artifact handler contributed by extension plugin for use with project main artifact based on the handler's packaging rather than

svn commit: r939608 - in /maven/plugins/trunk/maven-invoker-plugin/src: it/install-extra-artifacts/ it/install-extra-artifacts/src/ it/install-extra-artifacts/src/it/ it/install-extra-artifacts/src/it

Author: bentmann Date: Fri Apr 30 09:45:55 2010 New Revision: 939608 URL: http://svn.apache.org/viewvc?rev=939608view=rev Log: [MINVOKER-102] Provide a way to install Extra dependencies Submitted by: Marvin Froeder Added: maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra

svn commit: r939618 - /maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java

Author: bentmann Date: Fri Apr 30 10:24:21 2010 New Revision: 939618 URL: http://svn.apache.org/viewvc?rev=939618view=rev Log: o Polished code Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java Modified: maven/plugins/trunk

svn commit: r939628 - in /maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts: pom.xml src/ verify.bsh

Author: bentmann Date: Fri Apr 30 10:47:16 2010 New Revision: 939628 URL: http://svn.apache.org/viewvc?rev=939628view=rev Log: o Polished IT Removed: maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/src/ Modified: maven/plugins/trunk/maven-invoker-plugin/src

svn commit: r939631 - /maven/plugins/trunk/maven-invoker-plugin/pom.xml

Author: bentmann Date: Fri Apr 30 10:51:05 2010 New Revision: 939631 URL: http://svn.apache.org/viewvc?rev=939631view=rev Log: [MINVOKER-103] Update to plexus-utils:2.0.4+ to eliminate deadlock potential during forked Maven executions Modified: maven/plugins/trunk/maven-invoker-plugin

svn commit: r939868 - in /maven/plugins/trunk/maven-invoker-plugin/src: it/install-extra-artifacts/pom.xml it/install-extra-artifacts/verify.bsh main/java/org/apache/maven/plugin/invoker/InstallMojo.j

Author: bentmann Date: Fri Apr 30 22:58:30 2010 New Revision: 939868 URL: http://svn.apache.org/viewvc?rev=939868view=rev Log: [MINVOKER-102] Provide a way to install Extra dependencies o Added support for relocation of root artifact Modified: maven/plugins/trunk/maven-invoker-plugin/src

svn commit: r939034 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java

Author: bentmann Date: Wed Apr 28 18:04:12 2010 New Revision: 939034 URL: http://svn.apache.org/viewvc?rev=939034view=rev Log: o Formatted code Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java Modified: maven/maven-3/trunk

svn commit: r938352 - /maven/plugins/trunk/maven-remote-resources-plugin/pom.xml

Author: bentmann Date: Tue Apr 27 08:21:43 2010 New Revision: 938352 URL: http://svn.apache.org/viewvc?rev=938352view=rev Log: [MRRESOURCES-49] bump parent to org.apache.maven.plugins:maven-plugins:17 Submitted by: jieryn Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml

svn commit: r938354 - /maven/plugins/trunk/pom.xml

Author: bentmann Date: Tue Apr 27 08:23:27 2010 New Revision: 938354 URL: http://svn.apache.org/viewvc?rev=938354view=rev Log: o Included maven-remote-resources-plugin in reactor for Maven 3.x Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http

svn commit: r938367 - in /maven/plugins/trunk: maven-ant-plugin/ maven-clean-plugin/ maven-compiler-plugin/ maven-dependency-plugin/ maven-deploy-plugin/ maven-install-plugin/ maven-invoker-plugin/ ma

Author: bentmann Date: Tue Apr 27 09:16:11 2010 New Revision: 938367 URL: http://svn.apache.org/viewvc?rev=938367view=rev Log: o Inherited from maven-plugins:17 Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml maven/plugins/trunk/maven-clean-plugin/pom.xml maven/plugins/trunk

svn commit: r938393 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java

Author: bentmann Date: Tue Apr 27 10:15:27 2010 New Revision: 938393 URL: http://svn.apache.org/viewvc?rev=938393view=rev Log: o Made programming errors show up as internal errors to the user Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal

svn commit: r938410 - in /maven/maven-3/trunk/maven-model-builder/src: main/java/org/apache/maven/model/validation/ test/java/org/apache/maven/model/validation/ test/resources/poms/validation/

Author: bentmann Date: Tue Apr 27 11:09:54 2010 New Revision: 938410 URL: http://svn.apache.org/viewvc?rev=938410view=rev Log: [MNG-4648] NullPointerException thrown from DefaultPluginRealmCache#pluginHashCode method if project-level plugin dependency misses version Added: maven/maven-3

svn commit: r938411 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

Author: bentmann Date: Tue Apr 27 11:11:49 2010 New Revision: 938411 URL: http://svn.apache.org/viewvc?rev=938411view=rev Log: o Polished log output Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Modified: maven/maven-3/trunk/maven-core/src/main

svn commit: r938420 - /maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo

Author: bentmann Date: Tue Apr 27 12:33:00 2010 New Revision: 938420 URL: http://svn.apache.org/viewvc?rev=938420view=rev Log: o Extended documentation Modified: maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo Modified: maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo URL

svn commit: r938491 - /maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java

Author: bentmann Date: Tue Apr 27 15:00:34 2010 New Revision: 938491 URL: http://svn.apache.org/viewvc?rev=938491view=rev Log: o Simplfied code Modified: maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java Modified: maven

svn commit: r938155 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4644/

Author: bentmann Date: Mon Apr 26 17:56:55 2010 New Revision: 938155 URL: http://svn.apache.org/viewvc?rev=938155view=rev Log: [MNG-4644] Misplaced text contents in root element of POM is not rejected by parser o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test

svn commit: r938250 - in /maven/plugin-tools/trunk: maven-plugin-plugin/pom.xml pom.xml

Author: bentmann Date: Mon Apr 26 21:51:25 2010 New Revision: 938250 URL: http://svn.apache.org/viewvc?rev=938250view=rev Log: o Inherited from maven-plugins:17 and maven-parent:16 Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml maven/plugin-tools/trunk/pom.xml Modified

svn commit: r938255 - in /maven/plugin-tools/trunk: ./ maven-plugin-plugin/ maven-plugin-tools-ant/ maven-plugin-tools-api/ maven-plugin-tools-beanshell/ maven-plugin-tools-java/ maven-plugin-tools-ja

Author: bentmann Date: Mon Apr 26 21:57:50 2010 New Revision: 938255 URL: http://svn.apache.org/viewvc?rev=938255view=rev Log: o Bumped version to 2.6-SNAPSHOT to account for recent feature additions Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml maven/plugin-tools/trunk

svn commit: r938263 - in /maven/plugin-tools/trunk: maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/ maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/ ma

Author: bentmann Date: Mon Apr 26 22:48:25 2010 New Revision: 938263 URL: http://svn.apache.org/viewvc?rev=938263view=rev Log: o Polished code Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/ExtendedMojoDescriptor.java maven/plugin

svn commit: r937218 - /maven/maven-3/trunk/pom.xml

Author: bentmann Date: Fri Apr 23 09:50:50 2010 New Revision: 937218 URL: http://svn.apache.org/viewvc?rev=937218view=rev Log: o Disabled cobertura-maven-plugin to get site generation working Modified: maven/maven-3/trunk/pom.xml Modified: maven/maven-3/trunk/pom.xml URL: http

svn commit: r937234 - in /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model: building/DefaultModelProblem.java interpolation/AbstractStringBasedModelInterpolator.java

Author: bentmann Date: Fri Apr 23 10:29:12 2010 New Revision: 937234 URL: http://svn.apache.org/viewvc?rev=937234view=rev Log: o Fixed javadoc Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java maven/maven-3/trunk

svn commit: r937263 - in /maven/site/trunk: pom.xml src/site/apt/docs/3.0-beta-1/ src/site/apt/docs/3.0-beta-1/release-notes.apt.vm src/site/apt/docs/3.0-beta-1/release-notes.txt

Author: bentmann Date: Fri Apr 23 11:52:53 2010 New Revision: 937263 URL: http://svn.apache.org/viewvc?rev=937263view=rev Log: o Added release notes for apache-maven:3.0-beta-1 Added: maven/site/trunk/src/site/apt/docs/3.0-beta-1/ - copied from r937218, maven/site/trunk/src/site/apt

svn commit: r935534 - in /maven/maven-3/branches/MNG-1803: maven-core/src/main/java/org/apache/maven/project/ maven-model-builder/src/main/java/org/apache/maven/model/building/

Author: bentmann Date: Mon Apr 19 11:38:27 2010 New Revision: 935534 URL: http://svn.apache.org/viewvc?rev=935534view=rev Log: o Added request option to enable location tracking Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/project

svn commit: r935539 - in /maven/maven-3/branches/MNG-1803: maven-core/src/main/java/org/apache/maven/model/plugin/ maven-model-builder/src/main/java/org/apache/maven/model/building/ maven-model-builde

Author: bentmann Date: Mon Apr 19 12:05:57 2010 New Revision: 935539 URL: http://svn.apache.org/viewvc?rev=935539view=rev Log: o Extended location reporting Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java

svn commit: r935664 - in /maven/maven-3/trunk: ./ apache-maven/ maven-artifact/ maven-compat/ maven-core/ maven-embedder/ maven-model-builder/ maven-model/ maven-plugin-api/ maven-settings/

Author: bentmann Date: Mon Apr 19 16:54:05 2010 New Revision: 935664 URL: http://svn.apache.org/viewvc?rev=935664view=rev Log: [maven-release-plugin] prepare release maven-3.0-beta-1 Modified: maven/maven-3/trunk/apache-maven/pom.xml maven/maven-3/trunk/maven-artifact/pom.xml maven

svn commit: r935665 - /maven/maven-3/tags/maven-3.0-beta-1/

Author: bentmann Date: Mon Apr 19 16:54:49 2010 New Revision: 935665 URL: http://svn.apache.org/viewvc?rev=935665view=rev Log: [maven-scm] copy for tag maven-3.0-beta-1 Added: maven/maven-3/tags/maven-3.0-beta-1/ (props changed) - copied from r935664, maven/maven-3/trunk/ Propchange

svn commit: r935667 - in /maven/maven-3/trunk: ./ apache-maven/ maven-artifact/ maven-compat/ maven-core/ maven-embedder/ maven-model-builder/ maven-model/ maven-plugin-api/ maven-settings/

Author: bentmann Date: Mon Apr 19 16:55:28 2010 New Revision: 935667 URL: http://svn.apache.org/viewvc?rev=935667view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/maven-3/trunk/apache-maven/pom.xml maven/maven-3/trunk/maven-artifact/pom.xml

svn commit: r935748 - in /maven/maven-3/trunk/maven-core/src: main/java/org/apache/maven/lifecycle/ main/java/org/apache/maven/lifecycle/internal/ test/java/org/apache/maven/lifecycle/ test/java/org/a

Author: bentmann Date: Mon Apr 19 21:14:33 2010 New Revision: 935748 URL: http://svn.apache.org/viewvc?rev=935748view=rev Log: o Cleaned up license headers Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java maven/maven-3

svn commit: r935333 - /maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt

Author: bentmann Date: Sun Apr 18 11:29:35 2010 New Revision: 935333 URL: http://svn.apache.org/viewvc?rev=935333view=rev Log: o Fixed documentation about default source/target settings Modified: maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt Modified: maven/plugins/trunk

svn commit: r935165 - /maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java

Author: bentmann Date: Sat Apr 17 10:28:42 2010 New Revision: 935165 URL: http://svn.apache.org/viewvc?rev=935165view=rev Log: o Fixed compilation errors Modified: maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java

svn commit: r934853 - in /maven/maven-3/trunk/maven-model-builder/src: main/java/org/apache/maven/model/validation/DefaultModelValidator.java test/java/org/apache/maven/model/validation/DefaultModelVa

Author: bentmann Date: Fri Apr 16 12:50:18 2010 New Revision: 934853 URL: http://svn.apache.org/viewvc?rev=934853view=rev Log: o Improved validation messages Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java

svn commit: r934861 - in /maven/maven-3/trunk: maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/exception/ maven-core/src/main/java/org/apache/maven/project/ maven-

Author: bentmann Date: Fri Apr 16 13:18:48 2010 New Revision: 934861 URL: http://svn.apache.org/viewvc?rev=934861view=rev Log: o Refactored code Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven/maven-3/trunk/maven-core/src/main/java/org

svn commit: r934867 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java

Author: bentmann Date: Fri Apr 16 13:37:25 2010 New Revision: 934867 URL: http://svn.apache.org/viewvc?rev=934867view=rev Log: o Fixed format of project id Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java Modified: maven

svn commit: r935093 [2/2] - in /maven/maven-3/branches/MNG-1803: ./ maven-compat/src/main/java/org/apache/maven/profiles/ maven-compat/src/main/java/org/apache/maven/project/validation/ maven-core/src

Modified: maven/maven-3/branches/MNG-1803/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java?rev=935093r1=935091r2=935093view=diff

svn commit: r934372 - in /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building: DefaultModelBuilder.java ModelProcessor.java

Author: bentmann Date: Thu Apr 15 11:34:55 2010 New Revision: 934372 URL: http://svn.apache.org/viewvc?rev=934372view=rev Log: o Removed redundant/superfluous option Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java

svn commit: r934381 - /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java

Author: bentmann Date: Thu Apr 15 12:04:02 2010 New Revision: 934381 URL: http://svn.apache.org/viewvc?rev=934381view=rev Log: o Refactored code Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java Modified: maven

svn commit: r934440 - in /maven/maven-3/trunk: maven-core/src/test/java/org/apache/maven/project/ maven-core/src/test/resources-project-builder/artifact-id-inheritance/ maven-core/src/test/resources-p

Author: bentmann Date: Thu Apr 15 15:09:40 2010 New Revision: 934440 URL: http://svn.apache.org/viewvc?rev=934440view=rev Log: o Fixed handling of missing project artifact id Added: maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/ (with props

svn commit: r934451 - in /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building: DefaultModelBuilder.java ModelBuildingException.java

Author: bentmann Date: Thu Apr 15 15:31:08 2010 New Revision: 934451 URL: http://svn.apache.org/viewvc?rev=934451view=rev Log: o Allowed inspection of erroneous model Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java

svn commit: r934206 - /maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java

Author: bentmann Date: Wed Apr 14 21:39:45 2010 New Revision: 934206 URL: http://svn.apache.org/viewvc?rev=934206view=rev Log: o Removed unused import Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java Modified: maven

svn commit: r933172 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java

Author: bentmann Date: Mon Apr 12 10:18:26 2010 New Revision: 933172 URL: http://svn.apache.org/viewvc?rev=933172view=rev Log: o Formatted code Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java Modified: maven/maven-3/trunk/maven

svn commit: r933174 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java

Author: bentmann Date: Mon Apr 12 10:19:24 2010 New Revision: 933174 URL: http://svn.apache.org/viewvc?rev=933174view=rev Log: o Eased migration Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java Modified: maven/maven-3/trunk/maven

svn commit: r932882 - in /maven/enforcer/trunk/maven-enforcer-plugin/src/it: require-java-version/pom.xml require-maven-version/pom.xml

Author: bentmann Date: Sun Apr 11 12:44:09 2010 New Revision: 932882 URL: http://svn.apache.org/viewvc?rev=932882view=rev Log: o Extended tests to check both version syntaxes Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/it/require-java-version/pom.xml maven/enforcer/trunk

svn commit: r932883 - /maven/enforcer/trunk/pom.xml

Author: bentmann Date: Sun Apr 11 12:46:31 2010 New Revision: 932883 URL: http://svn.apache.org/viewvc?rev=932883view=rev Log: o Fixed mailing list links Modified: maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk

svn commit: r932885 - in /maven/enforcer/trunk: maven-enforcer-plugin/pom.xml pom.xml

Author: bentmann Date: Sun Apr 11 12:56:37 2010 New Revision: 932885 URL: http://svn.apache.org/viewvc?rev=932885view=rev Log: o Inherited from maven-parent:16 o Updated to maven-plugin-plugin:2.5.1 o Updated to maven-invoker-plugin:1.5 Modified: maven/enforcer/trunk/maven-enforcer-plugin

svn commit: r933000 - in /maven/maven-3/trunk/maven-core/src: main/java/org/apache/maven/ main/java/org/apache/maven/execution/ main/java/org/apache/maven/lifecycle/ main/java/org/apache/maven/lifecyc

Author: bentmann Date: Sun Apr 11 21:41:33 2010 New Revision: 933000 URL: http://svn.apache.org/viewvc?rev=933000view=rev Log: o Refactored execution event firing Added: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java

svn commit: r933001 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java

Author: bentmann Date: Sun Apr 11 22:15:17 2010 New Revision: 933001 URL: http://svn.apache.org/viewvc?rev=933001view=rev Log: o Refactored code Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java Modified: maven/maven-3/trunk/maven

svn commit: r933005 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java resources/mng-4189/dependent-on-newer-times

Author: bentmann Date: Sun Apr 11 22:40:58 2010 New Revision: 933005 URL: http://svn.apache.org/viewvc?rev=933005view=rev Log: o Decoupled IT from production plugins Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven

svn commit: r932705 - /maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/pom.xml

Author: bentmann Date: Sat Apr 10 11:56:37 2010 New Revision: 932705 URL: http://svn.apache.org/viewvc?rev=932705view=rev Log: o Fixed IT to use proper version Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/pom.xml Modified: maven/plugins/trunk/maven-compiler

<    3   4   5   6   7   8   9   10   11   12   >