Commit Graph

1033 Commits

Author SHA1 Message Date
Brett Leslie Porter 403255afc4 remove prereq
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163591 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 02:48:40 +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
Trygve Laugstol 764181f925 o Adding modello goals.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163588 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 01:34:24 +00:00
Brett Leslie Porter 2628261b75 PR: MNG-207
fix scope issue in a conflict


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163587 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 00:17:26 +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
Brett Leslie Porter e32b20b5cf make debug bootstrap work
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163585 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 23:17:38 +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
John Dennis Casey 9363c35399 o Adding junit dependency to enable building with m2.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163583 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 17:40:02 +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
Brett Leslie Porter d880a9520a put plugins in the right place
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163580 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 06:55:36 +00:00
Brett Leslie Porter abe5a2ce99 set the correct packaging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163579 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 06:55:21 +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 4eb5de7cc8 correct modello plugin reference for building outside of mboot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163569 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 01:42:22 +00:00
Brett Leslie Porter 2f89f1e94d handle POMs correctly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163568 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 01:27:37 +00:00
Brett Leslie Porter 39e571068d handle POM properly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163567 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 01:26:32 +00:00
Brett Leslie Porter 0f42ee716d updated to match deploy plugin, until it can be removed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163566 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 01:19:19 +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
Trygve Laugstol 5914d6c19b o Removing unused dependency and adding project name.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163561 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 21:57:45 +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 ea6124092c o Removed maven-it-support from build-list (creeped in during testing).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163559 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 21:44:22 +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
John Dennis Casey a0365bc54f o Added file-based test reporting to mboot process, since console reporter doesn't do a good job with test failures/errors.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163556 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 21:35:06 +00:00
Trygve Laugstol a82bda0aac o Adding a Plexus service handler.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163555 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 07:35:18 +00:00
Trygve Laugstol 50a0b02bad o POM cleanup.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163554 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 07:33:58 +00:00
Brett Leslie Porter f9c6aa0f9d missed a commit
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163553 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 03:09:42 +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
Brett Leslie Porter 9fb34fca1b remove test inclusion
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163551 13f79535-47bb-0310-9956-ffa450edef68
2005-03-14 23:32:56 +00:00
Jason van Zyl 105288fee4 o change the signature of the filter so that the filter has full access to
the artifact for basing decisions.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163550 13f79535-47bb-0310-9956-ffa450edef68
2005-03-14 07:24:23 +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
Trygve Laugstol 915f5c77e0 o POM cleanup.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163547 13f79535-47bb-0310-9956-ffa450edef68
2005-03-13 23:44:33 +00:00
Jason van Zyl d0fcf456e6 o updating readme for it0008
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163546 13f79535-47bb-0310-9956-ffa450edef68
2005-03-13 21:12:03 +00:00
Jason van Zyl 4bc8170a68 o adding to expected results to check that mojo parameter basedir
alignment is working correctly.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163545 13f79535-47bb-0310-9956-ffa450edef68
2005-03-13 21:07:45 +00:00
Jason van Zyl 03b746ab46 o added mojo parameter which states that its type is "java.io.File" to test
the basedir alignment of mojo parameters.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163544 13f79535-47bb-0310-9956-ffa450edef68
2005-03-13 21:06:06 +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
Brett Leslie Porter c1d51c88c1 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163540 13f79535-47bb-0310-9956-ffa450edef68
2005-03-13 01:37:58 +00:00