svn commit: r655034 - in /maven/plugins/trunk/maven-invoker-plugin: ./ src/main/java/org/apache/maven/plugin/invoker/ src/site/apt/ src/site/apt/examples/
Author: bentmann Date: Sat May 10 02:30:28 2008 New Revision: 655034 URL: http://svn.apache.org/viewvc?rev=655034&view=rev Log: [MINVOKER-22] Add feature to install plugin to a local repository. o Refactored functionality into distinct mojo Added: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java (with props) Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=655034&r1=655033&r2=655034&view=diff == --- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sat May 10 02:30:28 2008 @@ -71,6 +71,11 @@ org.apache.maven + maven-artifact + 2.0 + + + org.apache.maven maven-settings 2.0 Added: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java?rev=655034&view=auto == --- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java (added) +++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java Sat May 10 02:30:28 2008 @@ -0,0 +1,176 @@ +package org.apache.maven.plugin.invoker; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; +import java.util.Collection; +import java.util.Iterator; + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.factory.ArtifactFactory; +import org.apache.maven.artifact.installer.ArtifactInstallationException; +import org.apache.maven.artifact.installer.ArtifactInstaller; +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.project.MavenProject; + +/** + * Installs the project artifacts into the local repository as a preparation to run the integration tests. + * + * @goal install + * @phase pre-integration-test + * @since 1.2 + * + * @author Paul Gier + * @author Benjamin Bentmann + * @version $Id$ + */ +public class InstallMojo +extends AbstractMojo +{ + +/** + * Maven artifact install component to copy artifacts to the local repository. + * + * @component + */ +private ArtifactInstaller installer; + +/** + * The component used to create artifacts. + * + * @component + */ +private ArtifactFactory artifactFactory; + +/** + * The component used to create artifacts. + * + * @component + */ +private ArtifactRepositoryFactory repositoryFactory; + +/** + * @parameter expression="${localRepository}" + * @required + * @readonly + */ +protected ArtifactRepository localRepository; + +/** + * The path to the local repository into which the project artifacts should be installed for the integration tests. + * If not set, the regular local repository will be used. + * + * @parameter expression="${invoker.localRepositoryPath}" + */ +private File localRepositoryPath; + +/** + * The current Maven project. + * + * @parameter expression="${project}" + * @required + * @readonly + */ +private MavenProject project; + +/** + * Performs this mojo's tasks. + */ +public void execute() +throws MojoExecutionException,
svn commit: r655036 - in /maven/plugins/trunk/maven-invoker-plugin/src/site: apt/advance-usage.apt apt/examples/access-test-classes.apt apt/examples/clone-projects.apt apt/examples/fast-use.apt apt/ex
Author: bentmann Date: Sat May 10 03:07:45 2008 New Revision: 655036 URL: http://svn.apache.org/viewvc?rev=655036&view=rev Log: o Polished site Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt?rev=655036&r1=655035&r2=655036&view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt Sat May 10 03:07:45 2008 @@ -32,5 +32,5 @@ used in the parameter. See this example command line: +--- - mvn -Dinvoker.test=*MWAR*,simple* + mvn invoker:run -Dinvoker.test=*MWAR*,simple* +--- Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt?rev=655036&r1=655035&r2=655036&view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/access-test-classes.apt Sat May 10 03:07:45 2008 @@ -21,7 +21,6 @@ integration-test -integration-test run @@ -37,6 +36,8 @@ + Setting <<>> to <<>> will prepend the directory <<<$\{project.build.testOutputDirectory\}>>> - and all dependencies of your project to the class path of the script interpreter. Of course, this requires your test - classes to be compiled before running the integration tests but this is usually the case if you employ the Invoker - Plugin during the lifecycle phase <<>>. + and all dependencies of your project to the class path of the script interpreter. Among others, this allows you to + create some utility classes in your test source tree and use this code for the integration tests. + + Of course, this requires your test classes to be compiled before running the integration tests but this is + usually the case if you employ the Invoker Plugin during the lifecycle phase <<>>. Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt?rev=655036&r1=655035&r2=655036&view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt Sat May 10 03:07:45 2008 @@ -25,7 +25,6 @@ integration-test -integration-test run Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt?rev=655036&r1=655035&r2=655036&view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt Sat May 10 03:07:45 2008 @@ -8,14 +8,16 @@ Fast Invoker Plugin Configuration - The plugin use an empty to launch it test. This means by default, the plugin will - download all artifacts from the central repo. - <> + If you follow the recommended approach and use a dedicated local repository for the integration tests (e.g. + <<>>), you will likely encounter long build times. If the test repository has been cleaned, the + plugin needs to re-download all artifacts from the central repo and the resulting network traffic slows the test + execution down. + But you can configure the plugin to download released artifacts from your local repo. - NOTE : this will works without optionnal settings with maven >= 2.0.9 because all plugins - versions are locked in the super pom. For older version, you have to lock plugins versions. + This will work without opt
svn commit: r655037 - /maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt
Author: bentmann Date: Sat May 10 03:08:38 2008 New Revision: 655037 URL: http://svn.apache.org/viewvc?rev=655037&view=rev Log: o Removed svn:executable Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt (props changed) Propchange: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt ('svn:executable' removed)
svn commit: r655038 - in /maven/plugins/trunk/maven-invoker-plugin/src: main/java/org/apache/maven/plugin/invoker/ site/ site/apt/ site/apt/examples/ site/fml/ test/java/org/apache/maven/plugin/invoke
Author: bentmann Date: Sat May 10 03:12:02 2008 New Revision: 655038 URL: http://svn.apache.org/viewvc?rev=655038&view=rev Log: o Fixed svn:keywords Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java (props changed) maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java (props changed) maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java (props changed) maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt (props changed) maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt (props changed) maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt (props changed) maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt (props changed) maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml (props changed) maven/plugins/trunk/maven-invoker-plugin/src/site/site.xml (props changed) maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/ExtendedMavenProjectStub.java (props changed) maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java (props changed) maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerMojoTest.java (props changed) maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/dummy/pom.xml (props changed) maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/goals-from-file/goals.txt (props changed) maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/goals-from-file/pom.xml (props changed) maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/goals-from-file/validate-goal.txt (props changed) maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/goals-from-file/verify.bsh (props changed) maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/interpolation/goals.txt (props changed) maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/interpolation/pom.xml (props changed) maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/profiles-from-file/emptyProfiles.txt (props changed) maven/plugins/trunk/maven-invoker-plugin/src/test/resources/unit/profiles-from-file/profiles.txt (props changed) Propchange: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java -- --- svn:keywords (original) +++ svn:keywords Sat May 10 03:12:02 2008 @@ -1 +1 @@ -URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id +Author Date Id Revision Propchange: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java -- --- svn:keywords (original) +++ svn:keywords Sat May 10 03:12:02 2008 @@ -1 +1 @@ -"Author Date Id Revision" +Author Date Id Revision Propchange: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java -- --- svn:keywords (original) +++ svn:keywords Sat May 10 03:12:02 2008 @@ -1 +1 @@ -"Author Date Id Revision" +Author Date Id Revision Propchange: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/advance-usage.apt -- --- svn:keywords (original) +++ svn:keywords Sat May 10 03:12:02 2008 @@ -1 +1 @@ -"Author Date Id Revision" +Author Date Id Revision Propchange: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt -- --- svn:keywords (original) +++ svn:keywords Sat May 10 03:12:02 2008 @@ -1 +1 @@ -"Author Date Id Revision" +Author Date Id Revision Propchange: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt -- --- svn:keywords (original) +++ svn:keywords Sat May 10 03:12:02 2008 @@ -1 +1 @@ -"Author Date Id Revision" +Author Date Id Revision Propchange: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt -- --- svn:keywords (original) +++ svn:keywords Sat May 10 03:12:02 2008 @@ -1 +1 @@ -"Author Date Id Revision" +Author Date Id Revision Propchange: maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml -- --- svn:keywords (original) +++ svn:keywords Sat May 10 03:12:02 2008 @@ -1 +1
svn commit: r655062 - /maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
Author: vsiveton Date: Sat May 10 05:12:24 2008 New Revision: 655062 URL: http://svn.apache.org/viewvc?rev=655062&view=rev Log: o bumped to maven-plugin-plugin:2.4.1 Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=655062&r1=655061&r2=655062&view=diff == --- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Sat May 10 05:12:24 2008 @@ -186,7 +186,7 @@ org.apache.maven.plugins maven-plugin-plugin - 2.3 + 2.4.1 org.apache.maven.plugins @@ -195,7 +195,6 @@ - - org.codehaus.modello modello-maven-plugin
svn commit: r655082 - /maven/plugins/trunk/maven-jar-plugin/pom.xml
Author: olamy Date: Sat May 10 06:28:39 2008 New Revision: 655082 URL: http://svn.apache.org/viewvc?rev=655082&view=rev Log: adapt to last maven-invoker-plugin changes [MINVOKER-22] Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=655082&r1=655081&r2=655082&view=diff == --- maven/plugins/trunk/maven-jar-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-jar-plugin/pom.xml Sat May 10 06:28:39 2008 @@ -180,6 +180,7 @@ integration-test integration-test + install run
svn commit: r655084 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: olamy Date: Sat May 10 06:33:25 2008 New Revision: 655084 URL: http://svn.apache.org/viewvc?rev=655084&view=rev Log: adapt to last maven-invoker-plugin changes [MINVOKER-22] Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=655084&r1=655083&r2=655084&view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Sat May 10 06:33:25 2008 @@ -206,6 +206,7 @@ integration-test integration-test + install run
svn commit: r655086 - /maven/sandbox/trunk/shared/maven-filtering/pom.xml
Author: olamy Date: Sat May 10 06:47:16 2008 New Revision: 655086 URL: http://svn.apache.org/viewvc?rev=655086&view=rev Log: use last parent Modified: maven/sandbox/trunk/shared/maven-filtering/pom.xml Modified: maven/sandbox/trunk/shared/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/pom.xml?rev=655086&r1=655085&r2=655086&view=diff == --- maven/sandbox/trunk/shared/maven-filtering/pom.xml (original) +++ maven/sandbox/trunk/shared/maven-filtering/pom.xml Sat May 10 06:47:16 2008 @@ -22,7 +22,7 @@ org.apache.maven.shared maven-shared-components -8 +9
svn commit: r655088 - in /maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering: CompositeMap.java DefaultMavenFileFilter.java MavenFileFilter.java
Author: olamy Date: Sat May 10 06:53:31 2008 New Revision: 655088 URL: http://svn.apache.org/viewvc?rev=655088&view=rev Log: remove unused imports and checkstyle error Modified: maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/CompositeMap.java maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java Modified: maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/CompositeMap.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/CompositeMap.java?rev=655088&r1=655087&r2=655088&view=diff == --- maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/CompositeMap.java (original) +++ maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/CompositeMap.java Sat May 10 06:53:31 2008 @@ -19,7 +19,6 @@ * under the License. */ -import java.io.IOException; import java.util.AbstractMap; import java.util.ArrayList; import java.util.Iterator; Modified: maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java?rev=655088&r1=655087&r2=655088&view=diff == --- maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java (original) +++ maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java Sat May 10 06:53:31 2008 @@ -166,7 +166,7 @@ for ( Iterator iterator = propertiesFilePaths.iterator(); iterator.hasNext(); ) { String filterFile = (String) iterator.next(); -if (StringUtils.isEmpty( filterFile )) +if ( StringUtils.isEmpty( filterFile ) ) { // skip empty file name continue; Modified: maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java?rev=655088&r1=655087&r2=655088&view=diff == --- maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java (original) +++ maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java Sat May 10 06:53:31 2008 @@ -20,7 +20,6 @@ */ import java.io.File; -import java.io.IOException; import java.util.List; import org.apache.maven.execution.MavenSession; @@ -43,7 +42,7 @@ * @param filtering enable or not filering * @param mavenProject the mavenproject * @param filters [EMAIL PROTECTED] List} of String which are path to a Property file - * @throws IOException + * @throws MavenFilteringException */ void copyFile( File from, final File to, boolean filtering, MavenProject mavenProject, List filters, boolean escapedBackslashesInFilePath, String encoding, MavenSession mavenSession )
svn commit: r655120 - /maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt
Author: wsmoak Date: Sat May 10 09:11:43 2008 New Revision: 655120 URL: http://svn.apache.org/viewvc?rev=655120&view=rev Log: Fix mailing list name and link to the Atom feed. Modified: maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt Modified: maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt?rev=655120&r1=655119&r2=655120&view=diff == --- maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt Sat May 10 09:11:43 2008 @@ -184,7 +184,9 @@ If you are using ssh in your own server you need to add the {{{http://www.ibiblio.org/maven/id_dsa.pub}maven public key}} to the authorized ones to allow us to log in the machine. - Remember to subscribe to {{{mailto:[EMAIL PROTECTED] mailing list}}. + Remember to {{{mailto:[EMAIL PROTECTED] to the + {{{http://mail-archives.apache.org/mod_mbox/maven-repo-maintainers/}repo-maintainers mailing list}}. (Or watch the + {{{http://mail-archives.apache.org/mod_mbox/maven-repo-maintainers/?format=atom}Atom feed}}.) <>: nothing is deleted or changed in the Central Repository after it is synced (except maven-metadata.xml files)