Commit Graph

83 Commits

Author SHA1 Message Date
Emmanuel Venisse 78de36fa72 We use now the new modello.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163160 13f79535-47bb-0310-9956-ffa450edef68
2004-09-26 13:29:06 +00:00
Emmanuel Venisse 9eccf7e139 Fix parent field.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163159 13f79535-47bb-0310-9956-ffa450edef68
2004-09-24 15:34:11 +00:00
Emmanuel Venisse bea17db376 The new model for the new modello. Not tested for the moment.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163158 13f79535-47bb-0310-9956-ffa450edef68
2004-09-24 14:57:07 +00:00
Brett Leslie Porter cd6f43bcf1 add type to key in v3
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163130 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 13:48:47 +00:00
Brett Leslie Porter 1f36126287 crappy temporary build stuff for the maven 1.1 model
should be replaced really soon with:
- correction of properties bug in modello
- addition of a --package command to modello
- maven plugin for modello


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163129 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 11:05:54 +00:00
Brett Leslie Porter 425d44a54b clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163128 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 10:57:57 +00:00
Brett Leslie Porter 5d4897ddba add equals/hashcode for dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163118 13f79535-47bb-0310-9956-ffa450edef68
2004-09-19 06:12:37 +00:00
Brett Leslie Porter e25114e87f remove handling done inside project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163117 13f79535-47bb-0310-9956-ffa450edef68
2004-09-19 04:12:46 +00:00
Brett Leslie Porter 2fbbfa6274 add some legacy dependency stuff for v3.0.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163115 13f79535-47bb-0310-9956-ffa450edef68
2004-09-19 01:30:53 +00:00
Brett Leslie Porter 7b0fdd7222 v3 consistency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163095 13f79535-47bb-0310-9956-ffa450edef68
2004-09-17 21:42:40 +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 24ce8263d9 o Changed to depend on plexus-0.17 instead of -0.16
o Changed the embedder/container used to be the new artifact-aware container (plexus-artifact-container-1.0-alpha-1)
o Added new dependency to maven-core for artifact-container.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163006 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 01:18:19 +00:00
Trygve Laugstol 57922db9c9 o Making it easier to change the model file.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162913 13f79535-47bb-0310-9956-ffa450edef68
2004-08-09 15:40:26 +00:00
Trygve Laugstol 4f12e1cfa6 o Adding the new modello model using associations.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162911 13f79535-47bb-0310-9956-ffa450edef68
2004-08-08 02:49:38 +00:00
Trygve Laugstol 560f659099 o Adding the pre associations modello model as a reference.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162910 13f79535-47bb-0310-9956-ffa450edef68
2004-08-08 02:49:08 +00:00
Emmanuel Venisse 2ef9ee0656 Rollback default Value of tests includes, It's now inherited from parent if it isn't define.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162896 13f79535-47bb-0310-9956-ffa450edef68
2004-07-27 15:40:04 +00:00
Emmanuel Venisse 94418f0102 Add **/*Test.java as default value of test includes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162891 13f79535-47bb-0310-9956-ffa450edef68
2004-07-27 11:49:27 +00:00
John Dennis Casey 10b6aaaed6 added maven.xsd to ignored list for maven-model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162862 13f79535-47bb-0310-9956-ffa450edef68
2004-07-19 02:26:15 +00:00
Brett Leslie Porter cf719faeda make most scripts exit on error
tested only on cygwin - if it causes issues on linux, feel free to rollback


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162859 13f79535-47bb-0310-9956-ffa450edef68
2004-07-18 01:22:49 +00:00
Trygve Laugstol cb0c6ad6c4 o Adding <modelVersion> to the poms.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162855 13f79535-47bb-0310-9956-ffa450edef68
2004-07-05 20:12:50 +00:00
Trygve Laugstol 44530d6430 o Adding type+version to the dependency id so that it matches the project.id
o Changed the ArtifactCollector so that it resolves version conflicts again.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162847 13f79535-47bb-0310-9956-ffa450edef68
2004-06-29 15:08:22 +00:00
Trygve Laugstol 848a7dd433 o Adding the type to getId() of a pom v4.0.0.
o Changing the artifact list in MavenProject to a Set.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162845 13f79535-47bb-0310-9956-ffa450edef68
2004-06-27 18:46:52 +00:00
Trygve Laugstol 472d180a19 o Adding nagEmailAddress to the ciManagement part.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162841 13f79535-47bb-0310-9956-ffa450edef68
2004-06-27 07:03:31 +00:00
Michal Maczka 27c0d5f0cc Pushing back my changes to model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162834 13f79535-47bb-0310-9956-ffa450edef68
2004-06-23 18:03:06 +00:00
Jason van Zyl 4c5fcb62d4 o rolling back changes that are breaking the build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162833 13f79535-47bb-0310-9956-ffa450edef68
2004-06-23 15:13:53 +00:00
Michal Maczka d313ec01db removed conflicted code (my fault!)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162832 13f79535-47bb-0310-9956-ffa450edef68
2004-06-22 19:53:33 +00:00
Michal Maczka 61ead8784f more excludes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162831 13f79535-47bb-0310-9956-ffa450edef68
2004-06-22 19:28:54 +00:00
Michal Maczka dac191ef44 reorganization of some elements of POM
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162830 13f79535-47bb-0310-9956-ffa450edef68
2004-06-22 19:25:54 +00:00
Emmanuel Venisse 2fe989371b Add some default excludes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162817 13f79535-47bb-0310-9956-ffa450edef68
2004-06-20 14:01:19 +00:00
Emmanuel Venisse afba825dbb Add toString method for dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162816 13f79535-47bb-0310-9956-ffa450edef68
2004-06-20 12:48:23 +00:00
Jason van Zyl bb5ec46562 o we now have distributionManagement so we don't want the old crap in
the v4 POM.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162811 13f79535-47bb-0310-9956-ffa450edef68
2004-06-19 18:58:59 +00:00
Jason van Zyl 302c0c9c64 o adding distributionManagement element to the project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162810 13f79535-47bb-0310-9956-ffa450edef68
2004-06-19 18:55:16 +00:00
Jason van Zyl 944b65451b o added project.build.output which takes a default value of
target/classes and is the location for compiled application classes

o added project.build.testOutput which takes a default value of
  target/test-classes and is the location for compiled test classes

  After chatting with Michal we decided that we want a single place
  where we can control these values and provide a single place for
  a user to override them if they wish to.

  The build directory, the directory where compiled app classes go, and
  the directory where compiled test classes go can now all be accessed
  in a consistent fashion.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162756 13f79535-47bb-0310-9956-ffa450edef68
2004-06-14 23:21:23 +00:00
Jason van Zyl 8430b7b9cf o the addition the the build.directory element
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162743 13f79535-47bb-0310-9956-ffa450edef68
2004-06-11 22:04:26 +00:00
Jason van Zyl dd4fc3384f o moving core deps into top-level pom.xml to be shared by all the
component builds.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162741 13f79535-47bb-0310-9956-ffa450edef68
2004-06-10 20:27:50 +00:00
Jason van Zyl 60af082ea2 o doing the pom.xml thing
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162739 13f79535-47bb-0310-9956-ffa450edef68
2004-06-09 03:10:50 +00:00
Michal Maczka 62659b716c Added support for repositories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162738 13f79535-47bb-0310-9956-ffa450edef68
2004-06-07 18:16:53 +00:00
Jason van Zyl fa1c1cdf4d o generate the sources for the v3 model
o generate the sources for the v3 xpp3 reader/writer

  both of these necessary in order to adapt the v3 POM into a v4 POM
  so that m2 can slurp up v3 POMs to build m1 projects transparently.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162736 13f79535-47bb-0310-9956-ffa450edef68
2004-06-06 05:52:30 +00:00
Jason van Zyl 1a13142117 o tweak the model for v3 and v4 generation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162735 13f79535-47bb-0310-9956-ffa450edef68
2004-06-06 05:50:24 +00:00
Jason van Zyl ec786ecb3c o give 3.0.0 Branch.tag a version.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162734 13f79535-47bb-0310-9956-ffa450edef68
2004-06-06 05:26:37 +00:00
Jason van Zyl d9d92a0dfb o nuke the target directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162733 13f79535-47bb-0310-9956-ffa450edef68
2004-06-06 04:49:37 +00:00
Jason van Zyl 555932d95f o generate sources to target/generated-sources
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162730 13f79535-47bb-0310-9956-ffa450edef68
2004-05-30 16:55:51 +00:00
Jason van Zyl 87c56fd58b *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162727 13f79535-47bb-0310-9956-ffa450edef68
2004-05-30 15:05:24 +00:00
Jason van Zyl 15d5de1217 o information for continuous integration, pretty much the same
format as the issueManagement element.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162685 13f79535-47bb-0310-9956-ffa450edef68
2004-04-29 22:39:05 +00:00
Jason van Zyl 84092036cd *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162682 13f79535-47bb-0310-9956-ffa450edef68
2004-04-17 17:15:58 +00:00
Jason van Zyl 2256dae4cf o add versions so that the 4.0.0 version of the model is used to
output the source, xpp3 reader/writer, xdoc and XSD.

o more tweaks to the model for correct output.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162680 13f79535-47bb-0310-9956-ffa450edef68
2004-04-17 15:13:31 +00:00
Jason van Zyl 2b42e39161 o cleaning up all the versions
o can now generate distinct versions of the model


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162679 13f79535-47bb-0310-9956-ffa450edef68
2004-04-17 04:22:52 +00:00
Jason van Zyl a7c579dabf o adding versions to all fields and elements so that I can output distinct
versions of the model.

o adding required elements where appropriate so the generated XSD is
  correct.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162678 13f79535-47bb-0310-9956-ffa450edef68
2004-04-16 21:48:24 +00:00
Jason van Zyl 065edb8918 o url will do
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162669 13f79535-47bb-0310-9956-ffa450edef68
2004-04-15 14:31:27 +00:00
Jason van Zyl 96b61b2000 o adding some versions to elements to experiment with output for a specific version. Working on the v3 -> v4 converter.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162668 13f79535-47bb-0310-9956-ffa450edef68
2004-04-15 02:03:54 +00:00