Commit Graph

52 Commits

Author SHA1 Message Date
John Dennis Casey 4ce86c9b87 Resolving: MNG-495
o Pressing [ENTER] at a plugin update prompt should result in the plugin being registered, as indicated by the prompt.
o Use CLI switch '--no-plugin-updates' to suppress usage of the plugin registry
o Use CLI switch '--update-plugins' to force updated/resolved plugin versions to be registered
o Neither of these has a short CLI option, since we're starting to run out of sensible char options for these types of things.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191664 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 14:51:55 +00:00
Brett Leslie Porter 20e6d21710 Submitted by: Vincent Massol
allow spaces in local repository path


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191293 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 15:57:58 +00:00
John Dennis Casey 1a89a7b751 Resolving issue: MNG-480
o Added support for -Dmaven.repo.local command line override of the local repo
o Propagating local repository location (either maven.repo.local, or from settings.xml) to ITs in Verifier
o Re-enabled it0023 and it0026
o Removed warning in README.txt for maven-core-it.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191163 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 14:34:18 +00:00
Brett Leslie Porter ac2d8a7e83 PR: MNG-415
implement provided scope


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190930 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 15:02:07 +00:00
John Dennis Casey b813c3d430 Working on issue: MNG-379
Added specified stop-gap patch for issue: MNG-473 (affects settings-builder and registry-builder)

Today I've made the following progress on this so far:

- Added a new project, called maven-plugin-registry, to house the model for this new file.

- Developed/debugged/tested PluginVersionManager/DefaultPluginVersionManager to isolate the plugin-version checks/management code away from the PluginManager

- Added interactiveMode (<interactiveMode>true|false</interactiveMode> directly under the root element of settings.xml, or -B short CLI option or --batch-mode CLI option, where the CLI options turn OFF interactiveMode). This will allow things like the maven-plugins build to register new plugins (and, for now, new versions of plugins) automatically.

- Added user input handler for when interactiveMode = true, to get a yes/no on whether to use the discovered version over the installed version and/or no version at all. If there is no installed version, and the user selects 'n', then the discovered version is used FOR THAT SESSION ONLY, and won't be recorded in the registry.

- Added checks/recording rejected versions against the registry, before attempting to use the discovered version.

Pending:

- Still need to add update-policies, to determine two things:

  1. how often to check for updates
  2. what to do when updates are found (autoUpdate, etc.)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190854 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 01:50:28 +00:00
Brett Leslie Porter fc0ec82e84 allow no repo in settings.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189875 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 01:56:51 +00:00
Brett Leslie Porter 420d9a5fca remove old cvs ignore files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188697 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 05:24:51 +00:00
John Dennis Casey 9d7e54c042 o Added model and builder support for Profiles specified in settings.xml, profiles.xml, and the POM.
o Changed MBoot and Verifier accordingly.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179233 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 16:24:34 +00:00
Brett Leslie Porter 6ac1d85984 fix properties file basedir
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178051 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 23:00:20 +00:00
Emmanuel Venisse f5519934fd git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178042 13f79535-47bb-0310-9956-ffa450edef68 2005-05-23 21:55:54 +00:00
Emmanuel Venisse e166284580 Add more debug trace
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178034 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 21:27:03 +00:00
Brett Leslie Porter 68595a32c2 move system property specification to system.properties in itests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177983 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 13:37:34 +00:00
Emmanuel Venisse 1bb91a73b7 Add debug trace
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177967 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 12:39:06 +00:00
John Dennis Casey 469f96a4f1 o Added '-e' switch, to allow error stacktraces without enabling DEBUG error level throughout.
o Added listing of error messages from getCause() chain in DefaultMaven rather than simply spitting out the (often useless) aggregator Exception's message.
o Added '-e' to the IT verifier's invocation of m2.

I'm trying to get visibility to errors here...

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169230 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 04:25:56 +00:00
Brett Leslie Porter 23835350c8 fixes related to changing the path of parent poms, though the actual functionality is not implemented
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164346 13f79535-47bb-0310-9956-ffa450edef68
2005-04-23 06:24:08 +00:00
Brett Leslie Porter 0c305115a6 fix integration tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163934 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 11:22:02 +00:00
Brett Leslie Porter 567412e9a0 missed import
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163933 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 08:31:38 +00:00
Brett Leslie Porter 877eeb9a40 remove snapshot metadata too
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163932 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 08:06:19 +00:00
Brett Leslie Porter 30f07014a6 work without M2_HOME
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163777 13f79535-47bb-0310-9956-ffa450edef68
2005-04-05 06:48:46 +00:00
Brett Leslie Porter 1398ab68c4 make m2 use the local repository in the new layout
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163761 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 06:47:21 +00:00
Brett Leslie Porter b48dce7689 clean up integration tests, make them repository independent
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163758 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 06:15:04 +00:00
Brett Leslie Porter 14bb2c805a change the maven group ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163670 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 06:52:55 +00:00
John Dennis Casey e9a9323812 o Changed maven-user-model/UserModel/UserModelBuilder to maven-settings/MavenSettings/MavenSettingsBuilder.
This supports a change to a simpler local configuration file (~/.m2/settings.xml by default), which has the general format of:

<settings>
  <profiles>
    <profile>
      <active>true</active> <!-- not needed if this is the only profile -->
      <localRepository>/path/to/repo</localRepository>
    </profile>
    .
    .
    .
  </profiles>
  <servers>
    <server>
      <id>myserver</id>
      <username>me</username>
      <password>mypass</password>
      <privateKey>/path/to/key</privateKey>
      <passphrase>key-passphrase</passphrase>
    </server>
    .
    .
    .
  </servers>
  <proxies>
    <proxy>
      <active>true</active> <!-- not needed if this is the only proxy -->
      .
      .
      .
    </proxy>
    .
    .
    .
  </proxies>
</settings>

o Added special parameter named '#settings' which simply injects the current MavenSettings from the MavenSession into the request parameters.
o Adjusted the it-verifier and mboot2 accordingly.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163578 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 06:29:35 +00:00
John Dennis Casey b748d064ea o Modified to use ~/.m2/user.xml or sysprop:{maven.repo.local} or ~/.m2/repository for default.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163523 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 18:06:48 +00:00
Emmanuel Venisse cdd9f6b979 Check errors in log file.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163513 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 08:36:34 +00:00
Brett Leslie Porter a44b6f9726 flip pom format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163511 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 01:35:25 +00:00
Brett Leslie Porter d11e81173b show log file contents when verification fails
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 05:39:31 +00:00
Jason van Zyl cff31be447 o don't need these and they interfere on 1.5
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163286 13f79535-47bb-0310-9956-ffa450edef68
2004-12-29 20:20:48 +00:00
Jason van Zyl 754feeadb3 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163257 13f79535-47bb-0310-9956-ffa450edef68
2004-12-23 23:46:42 +00:00
Brett Leslie Porter 44550379b4 remove crimson dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163250 13f79535-47bb-0310-9956-ffa450edef68
2004-12-15 11:26:56 +00:00
Emmanuel Venisse 8a83719263 Close some streams.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163245 13f79535-47bb-0310-9956-ffa450edef68
2004-12-06 10:47:39 +00:00
Jason van Zyl fe59dcf689 Using Trygve's cli stuff to execute m2 and capture the output so that it can be logged for subsequent perusal.
{issue: MNG-81}


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163236 13f79535-47bb-0310-9956-ffa450edef68
2004-12-05 04:11:07 +00:00
Jason van Zyl a595eacd35 o change the reference to the location of classworlds ... this is bad,
m2 should run as it does from the command line for these tests which
  I will change. Integration tests for embedding should use the component
  which will detect some of the leakage problems found by a couple new
  users.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163200 13f79535-47bb-0310-9956-ffa450edef68
2004-10-23 13:32:39 +00:00
Emmanuel Venisse f26be7d1a5 Fix user pom filename
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163083 13f79535-47bb-0310-9956-ffa450edef68
2004-09-15 12:47:13 +00:00
Brett Leslie Porter 182d817ff1 return exit code for goal failures
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163071 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 23:43:35 +00:00
Brett Leslie Porter 62584adb1a make integration tests run under java
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163065 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 11:13:12 +00:00
John Dennis Casey 984d4644ef o Removed the parsing of ~/.m2/pom.xml using unix tools to extract the local repo
o Added the ability to specify -Dmaven.repo.local=xxx to the it shell script, and the Verifier class
o Added to the Verifier class the ability to parse ~/.m2/pom.xml and retrieve the local repo location in the event ${maven.repo.local} is unspecified


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163029 13f79535-47bb-0310-9956-ffa450edef68
2004-09-03 21:34:13 +00:00
Brett Leslie Porter c13e8c7629 PR: MNG-74
remove maven.properties use everywhere except classworlds conf


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163024 13f79535-47bb-0310-9956-ffa450edef68
2004-09-02 12:34:19 +00:00
Trygve Laugstol 368a4fec95 o Adding excludes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163009 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 10:16:28 +00:00
Trygve Laugstol 98636339cd o Removing IDEA project files.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163008 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 10:14:04 +00:00
Jason van Zyl cad4fb9326 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162983 13f79535-47bb-0310-9956-ffa450edef68
2004-08-15 16:49:32 +00:00
Jason van Zyl ea1009973e o interpolate System properties into the maven.properties values
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162917 13f79535-47bb-0310-9956-ffa450edef68
2004-08-09 18:40:50 +00:00
Emmanuel Venisse 9d6d6c514f Use maven.properties in all code instead of build.properties.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162894 13f79535-47bb-0310-9956-ffa450edef68
2004-07-27 12:40:11 +00:00
Trygve Laugstol dd7f7f2f1e o Adding <modelVersion>.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162848 13f79535-47bb-0310-9956-ffa450edef68
2004-07-01 02:11:35 +00:00
Emmanuel Venisse 581fa34537 A little fix for use it on windows
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162806 13f79535-47bb-0310-9956-ffa450edef68
2004-06-19 13:36:02 +00:00
Jason van Zyl 1ab665e885 no message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162803 13f79535-47bb-0310-9956-ffa450edef68
2004-06-18 13:21:42 +00:00
Jason van Zyl 7545511aaf o provide the path when the verification of a resource fails.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162784 13f79535-47bb-0310-9956-ffa450edef68
2004-06-17 20:05:55 +00:00
Jason van Zyl 240aaecc58 o pull in the ~/build.properties
o allow absolute paths in the expected results specifications


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162783 13f79535-47bb-0310-9956-ffa450edef68
2004-06-17 19:37:22 +00:00
Jason van Zyl 8c2f137858 make it clear it is the integration test that passed and not just the tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162772 13f79535-47bb-0310-9956-ffa450edef68
2004-06-16 12:18:24 +00:00
Jason van Zyl 64a4c000e4 o indicate things are ok with the verification
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162765 13f79535-47bb-0310-9956-ffa450edef68
2004-06-16 05:45:32 +00:00