Commit Graph

6771 Commits

Author SHA1 Message Date
Benjamin Bentmann cb1d2917fa o Synced UT with MNG-3838
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728660 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 12:23:52 +00:00
Benjamin Bentmann 3ce9917532 o Created UT from MNG-3821
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728654 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 11:48:10 +00:00
Benjamin Bentmann edb695cff5 o Fixed svn:keywords
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728647 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 11:13:43 +00:00
Benjamin Bentmann c64d5b2bd5 o Set svn:eol-style=native
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728644 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 11:08:33 +00:00
Benjamin Bentmann 922ace51f8 [MNG-3930] mvn.bat doesn't handle ampersand in Windows user name properly
o Merged from r728264

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728267 13f79535-47bb-0310-9956-ffa450edef68
2008-12-20 11:08:27 +00:00
Benjamin Bentmann 088b7c6241 o Fixed typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728100 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 18:30:34 +00:00
Britton Isbell 807bb6ddc7 Fix: Unable to resolve parent pom that is a snapshot. Added policies from config during build. Also fixed bug in ArtifactPolicySnapshots, allowed override of default policies with a null value.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728090 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 18:21:37 +00:00
Jason van Zyl 30dbc6db99 o fix typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728071 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 17:14:15 +00:00
Jason van Zyl 434431ec8d o restore the plugin registry cli option for compat with the verifier
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728066 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 17:05:15 +00:00
Benjamin Bentmann 2bbb812470 [MNG-3451] [MNG-3790] German localization for maven-core
Submitted by: Christian Schulte

o Applied with minor modifications
o Merged from r727998

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728001 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 10:57:30 +00:00
Jason van Zyl 0ab54cf0c7 o imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727857 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 23:49:48 +00:00
Britton Isbell e24f7564f7 Fix: there was a problem with pom construction if there were two or more plugins with dependencies elements.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727855 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 23:35:31 +00:00
Brett Leslie Porter 77c278e5d1 [MNG-3795] Add example <pluginGroups> snippet to conf/settings.xml in distribution
Submitted by: Benjamin Bentmann


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727688 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 10:36:02 +00:00
Brett Leslie Porter 385888d545 [MNG-3757] avoid deleting M2_HOME if it is empty
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727671 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 07:59:58 +00:00
Jason van Zyl e0cdbdc475 o notes on how to improve the test so that it's easy to get others involved in adding/correcting the spec and accompanying tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727638 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 04:29:15 +00:00
Jason van Zyl cce3456998 o get rid of debug information
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727637 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 04:24:27 +00:00
Jason van Zyl 854a44adf0 o testing ThatExecutionsWithoutIdsAreMergedAndTheChildWins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727635 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 04:23:35 +00:00
Jason van Zyl 4dcf7797bb o another concrete example of executions inheritance
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727627 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 03:27:17 +00:00
Jason van Zyl 2560c1e0bb o don't let inherited executions from plugin management containers be appended, they need to be overridden if there is no execution id
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727623 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 03:16:52 +00:00
Britton Isbell 61a5d19c4e Artifacts containers now will inherit versions. This will occur before management rules are applied.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727614 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 01:45:13 +00:00
Jason van Zyl f67099266e o adding a way to get a value from an xpath expression
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727585 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 23:48:07 +00:00
Jason van Zyl 730b56bb9c o using jxpath to simplify the queries for testing the spec.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727584 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 23:47:30 +00:00
Britton Isbell 1ab2db1205 Test Wrapper for domain model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727574 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 23:17:47 +00:00
Benjamin Bentmann 04b358629c [MNG-3921] Extensions are subject to NPEs in their hashCode() impl
o Merged from r727548

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727561 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 22:45:30 +00:00
Jason van Zyl 9002e05de5 MNG-3916: fixing the joining of executions in plugin containers.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727516 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 21:25:46 +00:00
Jason van Zyl 1ba8aa4479 o need to set the lineage count on the transformed model
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727463 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 18:38:45 +00:00
Jason van Zyl 306d70f8f5 o adding some test code to share with shane
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727460 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 18:32:01 +00:00
Jason van Zyl 699640f2ec o notes about the testing
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727330 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 09:53:09 +00:00
Jason van Zyl 2b808a15d1 o start of harness for validating the spec, i have my first error expressed in a test where plugin executions are
not joined properly. and the journey begins ...


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727322 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 09:34:16 +00:00
Jason van Zyl 9f5976a871 o trying to flip over to confluence, mathml support seems to not be so great
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727314 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 08:39:07 +00:00
Jason van Zyl a175bd170d o super model construction moved into the project builder so that all pure inheritance can be handled therein. Then the only thing we're left with is the mixins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727311 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 08:08:56 +00:00
Jason van Zyl 7d3040a73e o collapsing more of the project builder, trying to turn it back into one component -- we have the old and the new with the old wrapper the new -- so that I can have an interface for compatibility and then all our new stuff in another component.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727299 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 06:27:16 +00:00
Brett Leslie Porter 4dfe959d63 fix typos
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727298 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 06:27:05 +00:00
Jason van Zyl 7bfda74cad o get rid of the duplicate super pom, it can be shared from the project builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727293 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 05:45:11 +00:00
Jason van Zyl c03100b344 o keep a single copy of the super pom here, this can be shared outside of maven more easily
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727292 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 05:40:56 +00:00
Jason van Zyl 0b867c0c29 o move the super pom to the project builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727291 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 05:40:25 +00:00
Jason van Zyl f869413e44 o actually put a valid GAV in the super pom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727290 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 05:39:18 +00:00
Jason van Zyl 084d0b3ed4 o add snippets which can be used in http://maven.apache.org/guides/development/guide-building-m2.html
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727270 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 04:08:44 +00:00
Jason van Zyl 8e8f3d4c6a o you need java 1.5 now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727269 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 04:03:39 +00:00
Jason van Zyl 6b040ab2f9 o remove some superfluous reader creation in the project builder
o remove profile handling from the construction of the super project, there are no profiles in it anymore (and shouldn't be in the future)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727267 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 04:01:59 +00:00
Jason van Zyl ff3548a6b4 o we don't need to deal with import models right now, all we care about in the near future are mixins. this is an attempt
to simplify the API enabling me to more easily create the specification tests


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727210 13f79535-47bb-0310-9956-ffa450edef68
2008-12-16 23:12:01 +00:00
Jason van Zyl ee9e67af9b o we don't need to pass in the project builder configuration when we just want the domain model
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726972 13f79535-47bb-0310-9956-ffa450edef68
2008-12-16 05:59:36 +00:00
Jason van Zyl 0638d3d8a0 o passing in the file, we don't need the parent directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726961 13f79535-47bb-0310-9956-ffa450edef68
2008-12-16 05:19:39 +00:00
Jason van Zyl 75456d77ba o use new signature for the project builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726958 13f79535-47bb-0310-9956-ffa450edef68
2008-12-16 05:06:29 +00:00
Jason van Zyl 38e6b15ebc o validation is now done elsewhere
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726956 13f79535-47bb-0310-9956-ffa450edef68
2008-12-16 04:55:21 +00:00
Jason van Zyl 9a13ec793c o add the method to read in a file and return the data model
o remove the ROLE field

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726953 13f79535-47bb-0310-9956-ffa450edef68
2008-12-16 04:44:18 +00:00
Jason van Zyl 2dc15dda49 o project builder takes a file now and not an input stream
o separated the construction of the domain model from the maven project


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726951 13f79535-47bb-0310-9956-ffa450edef68
2008-12-16 04:40:59 +00:00
Jason van Zyl ff09f5beb7 o remove MissingRepositoryElementException from the core and just leave in compat
o make the project builder's read from path use a file instead of a input stream


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726942 13f79535-47bb-0310-9956-ffa450edef68
2008-12-16 04:10:14 +00:00
Jason van Zyl 805b15fea2 o we need the exception used by ProjectUtils as well ...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726937 13f79535-47bb-0310-9956-ffa450edef68
2008-12-16 03:52:21 +00:00
Jason van Zyl 7d00c7923c o adding ProjectUtils to the list of things required in the wild
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726936 13f79535-47bb-0310-9956-ffa450edef68
2008-12-16 03:32:44 +00:00