Commit Graph

295 Commits

Author SHA1 Message Date
Emmanuel Venisse 23b0c1d4fb Fix settings finder for windows.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163595 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 06:07:46 +00:00
Brett Leslie Porter dbe55b7d83 another issue with re-initialising the phases in the reactor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163590 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 02:26:19 +00:00
Brett Leslie Porter 829e2051f6 PR: MNG-207
scope must be considered globally - redefining it weaker must not win.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163589 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 02:04:35 +00:00
Brett Leslie Porter 08df9d163d PR: MNG-209
re-initialise lifecycle on each execution. Make it threadsafe.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163586 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 23:19:00 +00:00
John Dennis Casey 1cc2abaaa4 o Added duplicate declaration of settings builder and artifact repo factory, to allow embedding of maven inside plexus-based apps that already have a plexus.xml (and therefore cannot use maven's plexus.xml).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163584 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 19:06:08 +00:00
Brett Leslie Porter 143f33b701 comment on placement issue
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163582 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 07:36:01 +00:00
Brett Leslie Porter fea9f2ac53 project cache repairs - must not cache models that are already interpolated, translated, etc.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163581 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 06:56:03 +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
Brett Leslie Porter de262b4236 o refactor usage of build methods
o do not do path resolution for repository POMs
o source poms override repository poms in the cache


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163577 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 05:08:50 +00:00
Brett Leslie Porter c865afbae9 project sorting can be a static method
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163576 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 04:28:34 +00:00
Brett Leslie Porter 64eb3c2ddd project sorting can be a static method
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163575 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 04:21:03 +00:00
Brett Leslie Porter 83c5474b1f super project never has dependencies to resolve
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163574 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 04:18:06 +00:00
Brett Leslie Porter e616a7b1c9 PR: MNG-204
DAG needs to account for the project's inherited parent


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163573 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 03:58:18 +00:00
Brett Leslie Porter ba992be685 PR: MNG-205
Add a non-recursive mode to disable processing of modules


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163572 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 03:48:30 +00:00
Brett Leslie Porter dda9fa50fb cache POMs within the reactor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163571 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 03:39:54 +00:00
Brett Leslie Porter 38add00ed4 cleanup
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163570 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 01:43:09 +00:00
Brett Leslie Porter b342ded8de complete inheritence of distributionManagement
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163565 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 01:00:32 +00:00
Brett Leslie Porter 88b5c0ee66 PR: MNG-187
add getCollectedProjects to MavenProject for post processing


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163564 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 23:36:28 +00:00
Brett Leslie Porter e5ab9191bd PR: MNG-191
collect proejcts and modules first, then execute reactor


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163563 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 23:31:23 +00:00
Brett Leslie Porter 5c1f5b1e57 PR: MNG-52
change type of maven plugins to "maven-plugin" instead of plugin.
This should allow other products to have different plugin types, if necessary.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163562 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 22:31:54 +00:00
Brett Leslie Porter fae1470d47 fix error reporting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163560 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 21:48:55 +00:00
John Dennis Casey 4d1ca8da33 o Removed AuthenticationInfoProvider stuff
o Added ArtifactRepositoryFactory stuff to construct with AuthenticationInfo if possible.
o Added UserModelBuilder stuff for componentizing UserModel construction.
  -> DefaultUserModelBuilder has a configuration point 'userModelPath' which can redirect where it reads user.xml from (${user.home} is substitutable here).
o Added warning message to deployment plugin when deployment repo has no authentication info available.
o Added warning message for repos with null <id/> (auth info cannot be assigned here).
o Added a couple of debug-level messages for aid in debugging repo- and userModel-related problems.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163558 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 21:41:06 +00:00
John Dennis Casey 56708f7983 Removed artifactId and modelVersion from inheritance assembly, as these should always be supplied by a pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163557 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 21:37:56 +00:00
Brett Leslie Porter ba06a10501 some clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163552 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 02:50:58 +00:00
Jason van Zyl 8f754f2bb1 o need the path translator in the core until we allow the processing of multiple plexus.xml files.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163549 13f79535-47bb-0310-9956-ffa450edef68
2005-03-14 06:31:25 +00:00
Jason van Zyl 9d2c2d6d51 o fixing construction of mojo descriptor id
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163548 13f79535-47bb-0310-9956-ffa450edef68
2005-03-13 23:52:43 +00:00
Jason van Zyl a501f4c08a o cleaning up the path translator and adding a method to allow arbitrary
path translation given a path and basedir

o moved the component configuration for the path translator into the
  plexus.xml so that the DefaultPluginManager can use it as a dependency

o DefaultPluginManager.createParameters() will now look for parameters with
  the type = java.io.File and translate the path to the basedir of the
  project.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163543 13f79535-47bb-0310-9956-ffa450edef68
2005-03-13 01:45:38 +00:00
Jason van Zyl e6d8aeb6c0 o allowing the selective execution of a set of mojos inside a plugins by
specifying a <goals/> section inside a <plugin/> configuration.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163539 13f79535-47bb-0310-9956-ffa450edef68
2005-03-12 21:54:21 +00:00
Brett Leslie Porter d179db8752 fix plugin configuration discovery
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163536 13f79535-47bb-0310-9956-ffa450edef68
2005-03-12 06:10:57 +00:00
Jason van Zyl f0a20e0bcd o not needed anymore
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163534 13f79535-47bb-0310-9956-ffa450edef68
2005-03-12 05:18:28 +00:00
Brett Leslie Porter 25be5d900a don't inherit name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163533 13f79535-47bb-0310-9956-ffa450edef68
2005-03-11 23:51:00 +00:00
Brett Leslie Porter 9b9df37a1c refactor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163532 13f79535-47bb-0310-9956-ffa450edef68
2005-03-11 23:25:00 +00:00
Brett Leslie Porter 5f424a5ac0 multi-module support
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163528 13f79535-47bb-0310-9956-ffa450edef68
2005-03-11 01:06:48 +00:00
John Dennis Casey f6c2684903 o Moved the default plugin stuff to <pluginManagement/>. Plugin config will be pulled from here and injected into <plugins/> as needed to satisfy type-handlers at runtime.
o Added the ability for DefaultMaven to load only the super-pom in the event that no pom.xml exists to initiate the assembly.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163527 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 23:01:38 +00:00
John Dennis Casey a8cb7de0b0 o Added plugin version management/enforcement through the POM's build section.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163525 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 21:36:58 +00:00
John Dennis Casey 5dc8cb4f33 o Added default of ~/.m2/repository for users who don't have ~/.m2/user.xml specified.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163519 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 16:35:04 +00:00
Emmanuel Venisse 97ad0f7800 A little fix for build correctly m2.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163514 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 09:19:53 +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
John Dennis Casey 8d74f0acc4 o Added user.xml as the central point of config for local repository, both in MBoot2 and maven proper.
o Added proxy-profile support to user.xml


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163510 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 22:13:07 +00:00
John Dennis Casey 7f6f4452f2 o Changed Set to List for remote repo handling so that we can maintain declarative ordering in remote repos we use.
o Added UserModel support, integrated with maven-artifact and wagon via AuthenticationInfoProvider implementation.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163501 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 05:48:31 +00:00
Brett Leslie Porter 1fe8c76a3d move all artifact creation to artifact factory - further refactoring planned
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163499 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 02:39:10 +00:00
Brett Leslie Porter e8a0f65e58 actually, test deps are transitive, just not for other test deps
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163496 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 07:11:43 +00:00
John Dennis Casey 77d3e6c5f5 o Added (pom|project)? to the eval pattern in the regex param extractor, to trim ${project.artifactid} to mean the same as ${artifactId} within the pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163490 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:06:22 +00:00
Brett Leslie Porter ba74921b31 formatting fix
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163489 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:05:50 +00:00
Brett Leslie Porter b5f8943edf transitive test dependencies should be ignored
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163488 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:01:43 +00:00
Brett Leslie Porter b31db60bff tests and repairs for scope
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163486 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 05:34:52 +00:00
Brett Leslie Porter a8e6af5ff9 GoalWalker was deleted
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163485 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 02:26:00 +00:00
Trygve Laugstol 9bebbc1023 o Improving some error reporting.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163484 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 01:55:22 +00:00
Brett Leslie Porter eb1ba08fac getRuntimeClasspathElements
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163483 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 01:51:20 +00:00
Brett Leslie Porter 0d7111f7ba gone to maven-artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163479 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 01:38:51 +00:00