Commit Graph

175 Commits

Author SHA1 Message Date
Brett Leslie Porter f2e5866c33 utilise MAVEN_OPTS
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163461 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 07:23:11 +00:00
Emmanuel Venisse c4cab3edfa Reserve an it number for war plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163450 13f79535-47bb-0310-9956-ffa450edef68
2005-03-03 09:08:47 +00:00
John Dennis Casey 90ab124653 o Adding debug statements for testing on windows.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163445 13f79535-47bb-0310-9956-ffa450edef68
2005-03-02 02:41:09 +00:00
Brett Leslie Porter cdd2cd212a plugin:descriptor not required - implicit due to type
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163440 13f79535-47bb-0310-9956-ffa450edef68
2005-03-01 05:15:23 +00:00
John Dennis Casey d8aa8cea76 o Adding files excluded by default by eclipse CVS plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163436 13f79535-47bb-0310-9956-ffa450edef68
2005-03-01 02:54:54 +00:00
John Dennis Casey 8e82989334 o Refactored the plugin extractors to accept a MavenProject only, and pull the information they need from it in order to extract the mojos they're responsible for.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163435 13f79535-47bb-0310-9956-ffa450edef68
2005-03-01 02:43:22 +00:00
Brett Leslie Porter 8fc9a29003 integration test updates relating to phases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163434 13f79535-47bb-0310-9956-ffa450edef68
2005-02-28 23:37:19 +00:00
Brett Leslie Porter b70904c7a3 make sure it0013 fails even under a non-clean repo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163431 13f79535-47bb-0310-9956-ffa450edef68
2005-02-28 22:47:19 +00:00
John Dennis Casey 95d01ff572 o Completed marmalade-mojo support, tested with m2 bootstrap with empty local repo and maven-core pegged at 2/26/2005.
Will resolve CI issues as soon as lifecycle is fixed for IT0013.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163430 13f79535-47bb-0310-9956-ffa450edef68
2005-02-28 18:29:47 +00:00
Brett Leslie Porter c25b29fe28 add description of it0014
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163418 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 05:37:31 +00:00
John Dennis Casey db65155072 o Working on getting it0015 (marmalade-mojo support) working...nearly there, it0015 is still disabled.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163415 13f79535-47bb-0310-9956-ffa450edef68
2005-02-25 05:09:14 +00:00
John Dennis Casey 30e2a5af92 o Starting on a mmld-mojo IT...committing to save this IT number.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163411 13f79535-47bb-0310-9956-ffa450edef68
2005-02-25 02:34:42 +00:00
John Dennis Casey 52de04e862 Retrying commit after updating maven-core to HEAD.
o Fixed problems with plugin-plugin (had to do with refactored plugin-tools stuff)
o Added marmalade-mojo support, although without an integration test (verified it doesn't get in the way of 'normal' functionality, though)
o Added code in mboot2 to copy marmalade-mojo support libs to ${maven.home}/lib


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163405 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 05:12:30 +00:00
Brett Leslie Porter cf55279551 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163402 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 04:52:04 +00:00
Brett Leslie Porter 5ed8a1306f add it0013
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163396 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 02:51:00 +00:00
Brett Leslie Porter 34c16816ec Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163393 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 02:50:16 +00:00
Brett Leslie Porter 72979f9d51 amend interpolation IT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163382 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 03:56:44 +00:00
Jason van Zyl 1432ed959d o updating tests to reflect the addition of the lifecyle
in most cases this amounts to changing

  "jar:jar" -> "package"
  "jar:install" -> "install"
  "compiler:compile" -> "compile"

  and I also disabled the tests for pre/post goals as we aren't going
  to use those anymore (hopefully).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163358 13f79535-47bb-0310-9956-ffa450edef68
2005-02-16 07:11:14 +00:00
John Dennis Casey 4f8225545e o Added pom interpolation based on regex search-and-replacement with ReflectionValueExtractor pom lookups.
o Moved ReflectionProjectValueExtractor into o.a.m.util package and renamed to ReflectionValueExtractor
o Added unit tests for interpolation
o Added integration test for interpolation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163335 13f79535-47bb-0310-9956-ffa450edef68
2005-02-03 20:54:15 +00:00
John Dennis Casey 2e187a4237 o Fixed formats.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163332 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 22:16:33 +00:00
John Dennis Casey da47c49f4f o Revised the defaults section to <dependencyManagement>, all builds and is happy.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163325 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 02:23:12 +00:00
John Dennis Casey e687cfed61 o Added dependencyDefaults section to POM.
The nested <dependencyDefault> element closely mirrors the <dependency> element specification.
  It provides the ability to set url, artifact, properties, version for a dependency that matches on
  {groupId, artifactId, type}. Url, artifact, and version will only override the dependency's values if
  the dependency doesn't provide the value, and (in the case of url and artifact) the dependency
  doesn't provide a version (url and artifact are assumed to be version-specific).

  Properties will only be overwritten, and only in the case where the dependency
  doesn't specify them.

  Dependencies are validated after merging with defaults, since version is not required
  on either <dependency> or <dependencyDefault> but is required between the two.

o Added component interface/default impl for injecting project defaults.
o Added unit and integration tests.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163323 13f79535-47bb-0310-9956-ffa450edef68
2005-02-01 22:43:03 +00:00
Brett Leslie Porter af10f52f64 temporary fix for cygwin - need CommandLine to somehow call the cygwin m2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163251 13f79535-47bb-0310-9956-ffa450edef68
2004-12-15 11:27:43 +00:00
Emmanuel Venisse 4a505b6841 Add log.txt
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163246 13f79535-47bb-0310-9956-ffa450edef68
2004-12-06 10:51:58 +00:00
John Dennis Casey cf2354fee5 o Added it0010 integration test.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163230 13f79535-47bb-0310-9956-ffa450edef68
2004-11-03 22:54:46 +00:00
John Dennis Casey ca071d67e5 o New integration test to check that parent poms of dependency poms are resolved.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163229 13f79535-47bb-0310-9956-ffa450edef68
2004-11-03 22:54:24 +00:00
Emmanuel Venisse c894f62970 MNG-86. Fix bootstrap failures when M2_HOME contains spaces.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163167 13f79535-47bb-0310-9956-ffa450edef68
2004-09-30 08:49:20 +00:00
Jason van Zyl 8eba14b8e1 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163155 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:10:03 +00:00
Jason van Zyl 6691c4403a Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163152 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:09:22 +00:00
Jason van Zyl a059bd147f fixing artifact id
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163151 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:04:53 +00:00
Jason van Zyl 7d50ca4e22 o active it0008
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163150 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:01:40 +00:00
Jason van Zyl 71895f7201 o adding it0008 to test preGoals where the preGoal exists in a plugin
that must be downloaded before it is executed.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163149 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:01:31 +00:00
Jason van Zyl c9bf7d2052 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163146 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:00:41 +00:00
Brett Leslie Porter 1a509138ef windows batch updates
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163070 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 23:42:49 +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
John Dennis Casey a949eb66de o Removed GoalDecorationPhase, since goal decoration is now a part of the model
o Removed PluginDownloadPhase, since plugin resolution/download has to be a part of the prereq and pre/postGoal resolution, too
o Changed DefaultMaven to execute the session lifecycle, and the component wiring to likewise wire the DefaultMaven with a session lifecycle manager
o Removed the org.apache.maven.decoration package and its contents, since this is all in the model now
o Fixed the GoalResolutionPhase to verify each goal's plugin in turn as it resolves prereqs, preGoals and postGoals
o Fixed the GoalResolutionPhaseTest to work with the new resolution model
o Added a new createGoalExecutionContext to the MavenTestCase base class, to allow me to inject a MavenProject directly rather than a pom file
o Fixed the MavenLifecycleManagerTest to only expect 4 lifecycle phases, now than the plugin resolution and goal decoration phases are obsoleted
o All builds on local machine, but will depend on plexus-0.17.jar/pom and plexus-artifact-container-1.0-alpha-1.jar/pom to build on beaver
o I uploaded plexus-artifact-container-1.0-alpha-1.jar to ${plexus.home}/dist, but cannot upload POMs due to priveleges problem in poms dir.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163007 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 04:40:02 +00:00
Brett Leslie Porter 17887dbea6 ignore logs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162986 13f79535-47bb-0310-9956-ffa450edef68
2004-08-17 20:50:42 +00:00
Jason van Zyl 125b833abc o toss out the log of the build if something goes wrong, otherwise just
indicate things went OK.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162984 13f79535-47bb-0310-9956-ffa450edef68
2004-08-15 16:52:07 +00:00
Jason van Zyl bf3c8b0576 o the pom should definitely be installed but how snapshots are handled
vs releases needs to be clarified as the use of snapshots I'm trying to
  encapsulate into a single class which i haven't fully resolved. doing

  if ( SNAPSHOT )
  { ... }

  is not what we want ...


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162981 13f79535-47bb-0310-9956-ffa450edef68
2004-08-15 16:18:21 +00:00
Brett Leslie Porter d303a99fa5 ignore commented lines, fail script on failure of any test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162975 13f79535-47bb-0310-9956-ffa450edef68
2004-08-15 04:28:31 +00:00
Jason van Zyl 9a4a42199c o the verifier will now be built by mboot.jar
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162960 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 18:58:45 +00:00
John Dennis Casey 3ca11e44b6 o Added comment to integration tests README describing it0006 (goal decoration integration test)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162956 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 18:03:39 +00:00
Jason van Zyl d65f17e823 o adding explanation for it0007
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162953 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 17:58:27 +00:00
Jason van Zyl f4e5f175f5 adding it0007
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162952 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 17:56:23 +00:00
Jason van Zyl f91d0c06fc fixing name of expected result
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162951 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 17:54:40 +00:00
Jason van Zyl 488781d726 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162948 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 17:53:36 +00:00
Emmanuel Venisse 06021194bf Add description for it0004 and it0005.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162909 13f79535-47bb-0310-9956-ffa450edef68
2004-08-03 16:16:33 +00:00
Emmanuel Venisse 459ea80166 Use maven.properties in all code instead of build.properties.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162895 13f79535-47bb-0310-9956-ffa450edef68
2004-07-27 13:23:36 +00:00
John Dennis Casey 0cf96effb2 o Added unit tests for goal decoration/resolution.
o Added integration test featuring a decorated goal.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162861 13f79535-47bb-0310-9956-ffa450edef68
2004-07-19 00:58:14 +00:00
Jason van Zyl a3045ff0eb o using sh to invoke the hooks so that they don't need to be set +x
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162856 13f79535-47bb-0310-9956-ffa450edef68
2004-07-06 11:56:46 +00:00
Emmanuel Venisse a44adcbbb5 Add integration tests for pom:install
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162854 13f79535-47bb-0310-9956-ffa450edef68
2004-07-05 16:53:16 +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
Jason van Zyl 6f1d0020cf o another note
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162828 13f79535-47bb-0310-9956-ffa450edef68
2004-06-20 20:44:38 +00:00
Jason van Zyl f9e2d61a7f o take the groupId out for the test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162812 13f79535-47bb-0310-9956-ffa450edef68
2004-06-19 19:58:49 +00:00
Jason van Zyl 4f5cd541f0 o use relative paths all the way and cygwin is happy as well as unix
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162809 13f79535-47bb-0310-9956-ffa450edef68
2004-06-19 18:13:25 +00:00
Jason van Zyl 9c66979376 o cygwin stuff is breaking build on linux
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162808 13f79535-47bb-0310-9956-ffa450edef68
2004-06-19 16:24:56 +00:00
Emmanuel Venisse 403a1c570f Support cygwin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162807 13f79535-47bb-0310-9956-ffa450edef68
2004-06-19 13:36:23 +00:00
Jason van Zyl a607e92a46 o fixing POMs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162804 13f79535-47bb-0310-9956-ffa450edef68
2004-06-19 00:46:29 +00:00
Jason van Zyl 1280414001 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162802 13f79535-47bb-0310-9956-ffa450edef68
2004-06-18 11:59:01 +00:00
Jason van Zyl aa2501b1b7 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162799 13f79535-47bb-0310-9956-ffa450edef68
2004-06-18 11:56:03 +00:00
Jason van Zyl 9860371d4b o sketching out details on integration tests that have intentional errors
to we can make sure we deal with problems correctly.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162797 13f79535-47bb-0310-9956-ffa450edef68
2004-06-18 11:53:26 +00:00
Jason van Zyl 196e328086 o adding goals.txt to integration tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162795 13f79535-47bb-0310-9956-ffa450edef68
2004-06-18 02:13:16 +00:00
Jason van Zyl 004bb53b3e o let the goals be customizable for each integration test.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162794 13f79535-47bb-0310-9956-ffa450edef68
2004-06-18 02:12:49 +00:00
Jason van Zyl bfb88f0bbd o descriptions of the added integration tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162793 13f79535-47bb-0310-9956-ffa450edef68
2004-06-18 02:12:29 +00:00
Jason van Zyl 484fca802a This commit was generated by cvs2svn to compensate for changes in r300,
which included commits to RCS files with non-trunk default branches.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162790 13f79535-47bb-0310-9956-ffa450edef68
2004-06-18 02:08:23 +00:00
Jason van Zyl c273735623 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162788 13f79535-47bb-0310-9956-ffa450edef68
2004-06-18 02:08:22 +00:00
Jason van Zyl 362bd3866d build the verifier if it is missing
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162787 13f79535-47bb-0310-9956-ffa450edef68
2004-06-17 20:47:36 +00:00
Jason van Zyl 3d085c9ca8 o add a prebuild and postbuild hook
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162782 13f79535-47bb-0310-9956-ffa450edef68
2004-06-17 19:36:44 +00:00
Jason van Zyl 84647e0f22 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162779 13f79535-47bb-0310-9956-ffa450edef68
2004-06-17 19:36:01 +00:00
Jason van Zyl 01ec7a61cf o updating integration tests, going to hook them up to the ci mechanism.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162754 13f79535-47bb-0310-9956-ffa450edef68
2004-06-14 22:15:15 +00:00
Jason van Zyl ee1231e28c o adding a couple more integration tests i want to see before the alpha
is released.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162715 13f79535-47bb-0310-9956-ffa450edef68
2004-05-25 12:49:13 +00:00
Jason van Zyl fe2c7f73fc *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162714 13f79535-47bb-0310-9956-ffa450edef68
2004-05-21 17:28:07 +00:00
Jason van Zyl 34b0e98e97 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162710 13f79535-47bb-0310-9956-ffa450edef68
2004-05-21 17:25:02 +00:00