Commit Graph

74 Commits

Author SHA1 Message Date
Carlos Sanchez Gonzalez 2177e3763e Use mvn command instead of deprecated m2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@350201 13f79535-47bb-0310-9956-ffa450edef68
2005-12-01 07:48:50 +00:00
Brett Leslie Porter e6b92f1b17 delete metadata files for all versions to ensure intergration test works as expected
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326389 13f79535-47bb-0310-9956-ffa450edef68
2005-10-19 04:54:57 +00:00
Brett Leslie Porter 3f2e891c1b skip unknown arguments
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321333 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 13:24:03 +00:00
Brett Leslie Porter 9b9b349811 parse system properties from the command line
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321328 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 13:10:15 +00:00
Brett Leslie Porter 355edf88bc PR: MNG-1183
Submitted by: Jerome Lacoste
Make core integration tests aware of user local directory thanks to settings file


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321323 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 12:31:19 +00:00
Brett Leslie Porter 56d55b8f8e PR: MNG-932
add a goal for creating a jar from the test sources


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293227 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 03:53:48 +00:00
John Dennis Casey 5ebaf148da Adding file-pattern matching for expected results, along with ability to suppress the default maven.repo.local specification from verifier.properties...also, adding a test case for MNG-1021, to ensure the source artifact has the same build number as the main jar...I cannot reproduce the problem using this test...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292286 13f79535-47bb-0310-9956-ffa450edef68
2005-09-28 20:14:35 +00:00
Brett Leslie Porter 687b41ede8 remove legacy metadata handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292156 13f79535-47bb-0310-9956-ffa450edef68
2005-09-28 10:12:38 +00:00
Brett Leslie Porter 6b02497ca4 use correct path in the verifier for artifact metadata, allow commas in the list of tests to run
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280088 13f79535-47bb-0310-9956-ffa450edef68
2005-09-11 07:25:33 +00:00
Brett Leslie Porter 1d6b35cc56 improve handling of metadata in verifier
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280066 13f79535-47bb-0310-9956-ffa450edef68
2005-09-11 04:15:39 +00:00
Brett Leslie Porter 8f3c207194 PR: MNG-613
changes versioning to use repository metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278881 13f79535-47bb-0310-9956-ffa450edef68
2005-09-05 23:12:55 +00:00
Brett Leslie Porter a4d46f76c1 print summary at the end
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239350 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 05:22:30 +00:00
Brett Leslie Porter 067b9b623f no latest on this, consistent with bootstrap
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225547 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 16:24:45 +00:00
Brett Leslie Porter 826413b74a PR: MNG-598
allow type handlers to be specified by plugin extensions



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225477 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 08:03:33 +00:00
Brett Leslie Porter 8aeb62e580 use a file that has to be there :)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225236 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 05:57:26 +00:00
Brett Leslie Porter 26f56f9f99 allow passing of integration test numbers to run from the CLI
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225235 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 05:56:35 +00:00
Brett Leslie Porter 96dfb0ba8f lines may have spaces - use setLine instead of setValue
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225233 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 05:13:27 +00:00
John Dennis Casey 4b1038de53 Working on: MNG-607
o Added '-f' CLI option, to allow use of non-standard pom files, or spawning of a build from outside of the project dir.
o Added preferential processing of release-pom.xml over pom.xml if it exists (assumes that the current checkout is a release of the software)
o Moved all file discovery from MavenCli to DefaultMaven, to allow embedders to have access to this logic.
o Modified MavenExecutionRequest to add a flag for reactor-activation and the name of a non-standard pom to use, if appropriate.
o Removed getFiles() and getProjectFiles() from MavenExecutionRequest, since file discovery is now done in the DefaultMaven.
o Added integration tests to check preference of release-pom.xml in standalone and '-r' mode
o Added integration tests to check usage of '-f' option within and outside of the project directory
o Added processing for cli-options.txt to maven-core-it-verifier (Verifier.java) to allow specification of '-f' and '-r' in tests


NOTE: the release plugin still doesn't correctly remove the release-pom.xml from HEAD/trunk, since I don't have access to the SCM remove command from maven-scm. I'm waiting for Emmanuel to finish some API changes before moving to the new maven-scm version, and implementing this final step.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225226 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 03:55:37 +00:00
Brett Leslie Porter 511af3d3e2 PR: MNG-596
add XSD definition to m2 poms and archetypes



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220079 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 13:58:42 +00:00
John Dennis Casey 6f81043b7b Centralized repository handling in AbstractVersionTransformation, for consistency (should fix MNG-527).
Changed download strategy for plugins.xml metadata to download only when non-existent locally or when plugin prefix cannot be located within local metadata. NOTE: This could lead to local-only installs of plugins having their prefix mappings overwritten.

Next step is to change the maven-plugin-plugin.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219615 13f79535-47bb-0310-9956-ffa450edef68
2005-07-19 04:15:26 +00:00
John Dennis Casey 3f47c60752 Cleaned up plugin-version resolution.
o Added four command-line options:

  --check-plugin-updates is a synonym for --update-plugins
  
  --no-plugin-registry turns off usage of plugin-registry.xml for plugin version resolution for the current build.
  
  --check-plugin-latest turns on usage of LATEST metadata for plugin version resolution for the current build.

  --no-plugin-latest turns off usage of LATEST metadata for plugin version resolution for the current build.

o Added settings.xml configuration <usePluginRegistry>true|false</usePluginRegistry> to en/disable the use of plugin-registry.xml for plugin version resolution. The default value is true, to use the plugin-registry.xml.

o Added plugin-registry.xml configuration <checkLatest>true|false</checkLatest> to en/disable the use of LATEST metadata when resolving plugin versions. The default value is false, or do not use LATEST.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219089 13f79535-47bb-0310-9956-ffa450edef68
2005-07-14 20:35:23 +00:00
John Dennis Casey 4b53aba3bb Fixing issues related to MNG-377, where the plugins.xml metadata was being mishandled. Separated updating of this metadata into a separate mojo, bound to the 'package' phase, and put in a validator for the POM (POM has to have distributionRepository now for maven-plugin's) which is bound to the 'validate' phase. Put together an integration test that uses modello:java as a case where the pluginGroups must be consulted. Also had to change the Verifier to check a verifier.properties for failOnErrorOutput, which will suppress IT failures based on [ERROR] log output (modello outputs one of these, and kills the IT unnecessarily).
MNG-377 should be resolved at this point.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@215890 13f79535-47bb-0310-9956-ffa450edef68
2005-07-11 22:08:58 +00:00
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