Commit Graph

514 Commits

Author SHA1 Message Date
Benjamin Bentmann f19569365b [MNG-4945] Remove mergeId from public POM
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1050721 13f79535-47bb-0310-9956-ffa450edef68
2010-12-18 21:37:43 +00:00
Benjamin Bentmann cb00f26998 o Fixed target version for code segments
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1041652 13f79535-47bb-0310-9956-ffa450edef68
2010-12-02 23:48:54 +00:00
Benjamin Bentmann d79293e61e o Added toString() for InputLocation and InputSource to ease debugging
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1041649 13f79535-47bb-0310-9956-ffa450edef68
2010-12-02 23:43:47 +00:00
Benjamin Bentmann fb52cac08b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1038046 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23 10:47:01 +00:00
Benjamin Bentmann 308d4d45e5 [maven-release-plugin] prepare release maven-3.0.1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1038043 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23 10:44:18 +00:00
Benjamin Bentmann 7e57e9ea83 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1036683 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18 23:52:24 +00:00
Benjamin Bentmann 93af60e038 [maven-release-plugin] prepare release maven-3.0.1-RC1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1036681 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18 23:50:08 +00:00
Vincent Siveton 3c3459c44c MPIR-171: support "TimeZones" as a timezone
o improved timezone description in the M3 POM model (exactly timezone are between -12 and +14 or a valid timezone id)
o support timezone ids in the teamListReport
o added joda (ASF2.0) as dependency in MPIR
o updated faq


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1029846 13f79535-47bb-0310-9956-ffa450edef68
2010-11-01 21:27:56 +00:00
Benjamin Bentmann 03789c3155 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1004207 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 11:45:32 +00:00
Benjamin Bentmann eaf528f2ce [maven-release-plugin] prepare release maven-3.0
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1004204 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 11:43:40 +00:00
Benjamin Bentmann 388e659a17 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1001464 13f79535-47bb-0310-9956-ffa450edef68
2010-09-26 16:09:27 +00:00
Benjamin Bentmann 8f839aef4c [maven-release-plugin] prepare release maven-3.0-RC3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1001462 13f79535-47bb-0310-9956-ffa450edef68
2010-09-26 16:07:40 +00:00
Benjamin Bentmann 0707794c27 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1000118 13f79535-47bb-0310-9956-ffa450edef68
2010-09-22 18:18:54 +00:00
Benjamin Bentmann eecf91a606 [maven-release-plugin] prepare release maven-3.0-RC2
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1000115 13f79535-47bb-0310-9956-ffa450edef68
2010-09-22 18:17:16 +00:00
Benjamin Bentmann 62b1a5ffb0 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@997478 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 19:53:16 +00:00
Benjamin Bentmann 6da76b975a [maven-release-plugin] prepare release maven-3.0-RC1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@997476 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 19:50:30 +00:00
Benjamin Bentmann 2df157de23 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@990787 13f79535-47bb-0310-9956-ffa450edef68
2010-08-30 12:36:40 +00:00
Benjamin Bentmann 546399c38d [maven-release-plugin] prepare release maven-3.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@990785 13f79535-47bb-0310-9956-ffa450edef68
2010-08-30 12:34:49 +00:00
Benjamin Bentmann e75d39f41a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@989402 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 23:13:09 +00:00
Benjamin Bentmann 26dde61f15 [maven-release-plugin] prepare release maven-3.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@989400 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 23:11:42 +00:00
Benjamin Bentmann ae04af8e05 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@989338 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 20:14:23 +00:00
Benjamin Bentmann d04d6265e8 [maven-release-plugin] prepare release maven-3.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@989336 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 20:12:52 +00:00
Benjamin Bentmann ab39d82dd1 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@983204 13f79535-47bb-0310-9956-ffa450edef68
2010-08-07 10:53:09 +00:00
Benjamin Bentmann 99823b034e [maven-release-plugin] prepare release maven-3.0-beta-2
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@983202 13f79535-47bb-0310-9956-ffa450edef68
2010-08-07 10:51:26 +00:00
Herve Boutemy 2a5fde5cac updated Modello schema version when necessary
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@982838 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 00:12:58 +00:00
Benjamin Bentmann 2cce5d1bde o Polished code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@964708 13f79535-47bb-0310-9956-ffa450edef68
2010-07-16 08:18:05 +00:00
Herve Boutemy 5a6b42d721 fixed ambiguous relative links
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@961902 13f79535-47bb-0310-9956-ffa450edef68
2010-07-08 19:43:43 +00:00
Herve Boutemy 23f2095652 fixed errors reported by Checkstyle
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@958295 13f79535-47bb-0310-9956-ffa450edef68
2010-06-26 23:16:18 +00:00
Benjamin Bentmann 6e7b4226e7 [MNG-1803] Provide line number information when there are errors processing a pom.xml
o Merged feature branch

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@949708 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 10:24:20 +00:00
Benjamin Bentmann f46dc2a538 o Extended documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@938420 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 12:33:00 +00:00
Benjamin Bentmann b329fdb4e5 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@935667 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 16:55:28 +00:00
Benjamin Bentmann 958b6eced1 [maven-release-plugin] prepare release maven-3.0-beta-1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@935664 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 16:54:05 +00:00
Benjamin Bentmann 479e0dd366 o Updated documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@932365 13f79535-47bb-0310-9956-ffa450edef68
2010-04-09 11:46:20 +00:00
Benjamin Bentmann bfaab01874 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@921170 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 22:24:47 +00:00
Benjamin Bentmann 0c78c31304 [maven-release-plugin] prepare release maven-3.0-alpha-7
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@921168 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 22:24:22 +00:00
Benjamin Bentmann 767cc74a6b [MNG-1144] List 2 or more maven goals in the <defaultGoal> of the POM
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@920469 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 19:24:24 +00:00
Herve Boutemy 58f5740f49 use modelloVersion property instead of direct version override of the plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@901885 13f79535-47bb-0310-9956-ffa450edef68
2010-01-21 22:06:03 +00:00
Herve Boutemy 2b1d264d31 [MNG-4524] upgraded Modello plugin to 1.2 to use the configuration done in r900146
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@901562 13f79535-47bb-0310-9956-ffa450edef68
2010-01-21 06:36:26 +00:00
Herve Boutemy 8b03e32200 [MNG-4534] prepared POM XML elements order configuration, that will be effective when upgrading to Modello 1.2
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@900146 13f79535-47bb-0310-9956-ffa450edef68
2010-01-17 14:27:06 +00:00
Benjamin Bentmann 574641d86c [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@896381 13f79535-47bb-0310-9956-ffa450edef68
2010-01-06 10:49:23 +00:00
Benjamin Bentmann 9e8a9af6ad [maven-release-plugin] prepare release maven-3.0-alpha-6
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@896377 13f79535-47bb-0310-9956-ffa450edef68
2010-01-06 10:46:24 +00:00
Herve Boutemy 42b849deda [MNG-3266] make RepositoryBase override not only equals() but hashCode() too (merged from 2.2.x branch r895088)
Submitted by: Jared Roberts

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@895089 13f79535-47bb-0310-9956-ffa450edef68
2010-01-01 23:05:47 +00:00
Herve Boutemy fa6330023c reordered maven.mdo fields to better match POM Code Convention. (merged from 2.2.x branch r894080)
Note: remaining issues cannot easily be fixed since Model inherits from ModelBase, then any field in ModelBase appears at the end of Model (after build and profiles elements)

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@894092 13f79535-47bb-0310-9956-ffa450edef68
2009-12-27 18:44:25 +00:00
Benjamin Bentmann 9adfaf82b5 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@883378 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 15:46:44 +00:00
Benjamin Bentmann c23ce88074 [maven-release-plugin] prepare release maven-3.0-alpha-5
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@883375 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 15:45:11 +00:00
Benjamin Bentmann 8e826033a8 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@835944 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 18:02:13 +00:00
Benjamin Bentmann f54f1ec409 [maven-release-plugin] prepare release maven-3.0-alpha-4
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@835941 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 18:00:22 +00:00
Benjamin Bentmann c10f412029 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@834123 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 16:00:39 +00:00
Benjamin Bentmann 98ab96d19b [maven-release-plugin] prepare release maven-3.0-alpha-3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@834118 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 15:55:07 +00:00
Benjamin Bentmann 1ef9a7692b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@834106 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 15:26:12 +00:00
Benjamin Bentmann 7dd84efa0e [maven-release-plugin] prepare release maven-3.0-alpha-3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@834104 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 15:24:06 +00:00
Benjamin Bentmann 30ef86e916 o Fixed handling of releative paths
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@830357 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 21:57:59 +00:00
Benjamin Bentmann 704b29c2d4 o Fixed validation of model version
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@817609 13f79535-47bb-0310-9956-ffa450edef68
2009-09-22 11:43:11 +00:00
Herve Boutemy 0553695bcb added XML schema location for site.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@813781 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 11:34:15 +00:00
Herve Boutemy a1803e5a48 fixed errors reported by Checkstyle
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@813622 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 22:25:56 +00:00
Benjamin Bentmann c249a98408 [MNG-4345] [regression] Plugin executions contributed by default lifecycle mapping execute after other plugin executions bound to the same phase
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@812467 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 11:27:57 +00:00
Benjamin Bentmann 2b5054a347 o Updated to modello:1.1
o Used clone() methods generated by Modello for model cloning

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@806855 13f79535-47bb-0310-9956-ffa450edef68
2009-08-22 13:55:25 +00:00
Benjamin Bentmann c72b9c3098 o Added Plugin.getId()
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@804374 13f79535-47bb-0310-9956-ffa450edef68
2009-08-14 21:08:23 +00:00
Benjamin Bentmann c36b12739b [MNG-3265] maven-model Extension.equals causes NPE when any field is uninitialized
o Merged from r793311

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@793319 13f79535-47bb-0310-9956-ffa450edef68
2009-07-12 10:38:22 +00:00
Benjamin Bentmann 88062f08dd o Clarified relevance of ids
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@792073 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 08:58:02 +00:00
Benjamin Bentmann 8d6f2f1139 o Added boolean accessors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@785641 13f79535-47bb-0310-9956-ffa450edef68
2009-06-17 14:56:19 +00:00
Benjamin Bentmann 17e0405ef7 o Added toString() to ease debugging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780639 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 13:15:12 +00:00
Benjamin Bentmann 26a35db0c7 o Introduced ModelBuilder component that now hosts most of the logic from the project builder to construct the effective model. With maven-model-builder we now should have a rather slim module that tools can re-use for building models. The project builder is simply layered on top of the model builder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780627 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 12:17:53 +00:00
Benjamin Bentmann 89d7b13fd6 o Extended model with fields to track source file and project directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778494 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 20:43:01 +00:00
Benjamin Bentmann 420d44adf6 o Fixed POM (the Site Plugin is a build plugin, not a reporting plugin)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778487 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 20:04:15 +00:00
Benjamin Bentmann d8c4c800e7 o Added constants for well-known profile sources
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777958 13f79535-47bb-0310-9956-ffa450edef68
2009-05-23 16:38:36 +00:00
Benjamin Bentmann 129bcf0e1d o Extended model merger
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773688 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:53:25 +00:00
Benjamin Bentmann f48503a610 o Moved injection of plugin/dependency management into isolated component and decoupled from processors. The new component resembles the ModelDefaultsInjector from 2.x but explicitly focuses on management information. Other defaults like the lifecycle induced plugins should be handled by another component.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773323 13f79535-47bb-0310-9956-ffa450edef68
2009-05-10 10:46:05 +00:00
Benjamin Bentmann 1e303faceb o Changed boolean field to String to enable both filtering and three-valued logic for proper merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773283 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 22:58:36 +00:00
Benjamin Bentmann a5cd3ceb08 o Added boolean accessors for inherited field of plugin execution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773198 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 10:47:59 +00:00
Benjamin Bentmann ed79ce0099 o Fixed toString() to not return null
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773023 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 15:02:05 +00:00
Benjamin Bentmann 49f72c75e4 o Added some more toString()'s to ease debugging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773011 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 14:35:17 +00:00
Benjamin Bentmann c17cfb0076 o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772980 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 13:31:32 +00:00
Benjamin Bentmann 51c1cb584c o Re-introduced 2.x like inheritance assembler and profile injector components which mostly delegate to a common model merger class. First of all, the merger only deals with two models at a time, simplifying its logic compared to the current processors, hopefully allowing us to quickly/easily fix the outstanding POM tests. The ultimate goal is to generate the basic ModelMerger automatically with a new Modello plugin which could be programatically customized via a sub class like MavenModelMerger. It will be interesting to find out how much of the merging rules could be generalized via declarative options in the model. This could allow for generated documentation about how inheritance and profile injection alter the model. Last but not least, generating the merger from the MDO would ease addition of new model elements as these would automatically be considered for inheritance and profile injection.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772827 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 01:28:10 +00:00
Benjamin Bentmann 6b9ddf7bec o Fixed typo and restored proper default value
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772760 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 20:10:38 +00:00
Benjamin Bentmann 1e26baf0a1 o Changed boolean fiels to String to enable both filtering and three-valued logic for proper merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772758 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 20:06:41 +00:00
Benjamin Bentmann 9ac26fc3a2 o Restored original default value for enabled flag of repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771316 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 14:28:27 +00:00
Jason van Zyl 5d7758b358 o pull from trunky dunk dunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@767707 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 23:04:06 +00:00
Herve Boutemy c5571a0c78 used http://maven.apache.org/xsd/* for schema location
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748982 13f79535-47bb-0310-9956-ffa450edef68
2009-03-01 08:55:40 +00:00
Jason van Zyl 54da5ce53e o omit the creation of deployment specific repositories, and uniqueVersion = false isn't going to matter in 3.x. everything will be unique to match an osgi versioning scheme. the dichotomy between unique sometimes, and no versions locally is a mess.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747652 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 04:07:40 +00:00
Herve Boutemy 3d52a23b10 o upgraded Modello version to 1.0
o improved models to use Modello new features (merged from 2.1.x branch r745216)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745260 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 21:46:38 +00:00
Benjamin Bentmann fac6b97faf o Generified model/project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744572 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 21:49:23 +00:00
Jason van Zyl 8ecae9a554 o removing maven 1.x related files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742674 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 18:59:19 +00:00
Jason van Zyl ed4f594ac4 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739478 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 01:06:48 +00:00
Jason van Zyl 13fa00ea3f [maven-release-plugin] prepare release maven-3.0-alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739476 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 01:06:37 +00:00
Jason van Zyl 557f0a5373 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738777 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 07:13:04 +00:00
Jason van Zyl 7f54cfff61 [maven-release-plugin] prepare release 3.0-alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738775 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 07:12:48 +00:00
Jason van Zyl fe6d32bd6c MNG-3961: reverted the addition and we'll deal with this later properly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732936 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 06:06:32 +00:00
Jason van Zyl 481cde5756 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731333 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:28 +00:00
Jason van Zyl 6991c79e34 [maven-release-plugin] prepare release maven-3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731331 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:05 +00:00
Jason van Zyl cc38a455f7 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731271 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:29:07 +00:00
Jason van Zyl bab3480d4b [maven-release-plugin] prepare release 3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731269 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:28:42 +00:00
Benjamin Bentmann 970065b4bd [MNG-3424] Respect ordering of elements as given in POM
o Merged from r708871

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730079 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 09:33:02 +00:00
Britton Isbell a64d505aa3 Fix: MNG-3927
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730028 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 01:33:12 +00:00
Benjamin Bentmann 72a871c1b2 o Consequently used http://maven.apache.org/xsd/* for the schema locations (merged from r729738)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729741 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 14:00:38 +00:00
Herve Boutemy 35472a49f5 o Consequently used http://maven.apache.org/xsd/* for the schema locations (see r729720) (merged from 2.0.10RC branch r729731)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729734 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 13:35:32 +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
Herve Boutemy 48d853ad6e [MNG-3898] use models attribute of modello-maven-plugin instead of model (merged from 2.0.x branch r726548)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726552 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 22:07:08 +00:00
Jason van Zyl c82352832a o updating to 3.0-SNAPSHOT
o aparently when we start from scratch the bootstrap wasn't working, so the maven ant tasks will now igore trying to download the projects we
  are actually trying to build.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@684975 13f79535-47bb-0310-9956-ffa450edef68
2008-08-11 23:05:20 +00:00
Vincent Siveton cf03434a59 o merged from r673797 (MNGSITE-55: Write a document about POM code style)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@673799 13f79535-47bb-0310-9956-ffa450edef68
2008-07-03 20:55:08 +00:00
John Dennis Casey 3d6b63bc11 [MNG-3642] Adding internal-only unique id 'mergeId' to build resources, to allow back-propagation of changed resource information from plugin executions to the dynamic version of the POM build section. Also, modified the project-builder's dynamism methods (calculate*, restore*) to use mergeId.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@673417 13f79535-47bb-0310-9956-ffa450edef68
2008-07-02 15:25:22 +00:00
John Dennis Casey 116105ef35 [MNG-2318] Fixing parent id() method to match format from model id method, so relative-path POMs can be validated for correct info.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672839 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 17:51:21 +00:00
Brett Leslie Porter 134fcbfd3c [MNG-3634] revert portion of this change that caused a backwards compatibility problem
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672693 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 03:17:46 +00:00
Vincent Siveton 6f656edaba o merged r672624 (replaced logical tag to be more consistent)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672625 13f79535-47bb-0310-9956-ffa450edef68
2008-06-29 13:57:39 +00:00
Vincent Siveton 7253bd1d29 o merged r672622 (removed unnecessary CDATA in description tags)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672623 13f79535-47bb-0310-9956-ffa450edef68
2008-06-29 13:38:36 +00:00
Vincent Siveton 98f892344d o merged r672527 (MNG-3634: Improve the maven model to change the order of the POM elements)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672528 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 14:17:29 +00:00
Vincent Siveton 1a69ff6cbf o merged from r672519 (specified XML encoding UTF-8)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672520 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 13:05:23 +00:00
Vincent Siveton effc5ad73f o merged from r672517 (removed empty comment)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672518 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 13:03:05 +00:00
Vincent Siveton 3e98bddec3 o merged from r672514 (minor comments)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672515 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:50:16 +00:00
Vincent Siveton 6a54ebc92f o merged from r638671 (MNG-3469: add Resource.toString() method for debugging. patch from Wayne Fay)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672513 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:45:50 +00:00
Vincent Siveton f43ec427f0 o merged from r638669 (MNG-3468: add FileSet.toString() method for debugging. patch from Wayne Fay)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672512 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:44:00 +00:00
Vincent Siveton bd379f7e01 o merged from r638668 (MNG-3467: add toString() method for debugging. patch from Wayne Fay)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672510 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:40:45 +00:00
Vincent Siveton 64f6e7aa88 o one line for namespace
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672508 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:36:25 +00:00
Vincent Siveton a8e8c1991d o merged from r672506 (fixed typo)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672507 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:35:33 +00:00
John Dennis Casey e26974da98 [MNG-2739] Adding validation logic to DefaultMavenTools and ProjectUtils, to make sure repositories have id and url before constructing an ArtifactRepository instance...this code is used ahead of normal model validation, so it needs to be included here. Also, introducing a new exception to handle the errors when these elements are missing.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@659680 13f79535-47bb-0310-9956-ffa450edef68
2008-05-23 21:52:24 +00:00
Paul Gier 9dd2e54583 Improve description of activeByDefault.
Issue id: MNG-2609


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@657078 13f79535-47bb-0310-9956-ffa450edef68
2008-05-16 14:27:12 +00:00
Milos Kleint 12a125bcad report plugin map flushing shall be synchronized to prevent NPEs in multithreaded envs.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@650807 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 09:28:58 +00:00
Milos Kleint 02367233e1 getKey() is used many-many-many times when loading projects. it's ineffective to construct the key each time.
Ideally the cached key would get reste when groupId or artifactId gets set, I didn't figure how to do it in modello though..

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@650427 13f79535-47bb-0310-9956-ffa450edef68
2008-04-22 09:27:45 +00:00
Herve Boutemy 007fe63a03 added site descriptors to provide modules/parent links (merged from 2.0.x branch r649903)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649913 13f79535-47bb-0310-9956-ffa450edef68
2008-04-20 11:37:31 +00:00
Milos Kleint 30ea33aefb MEVENIDE-618 synchronize the flushPluginMap and getPluginsAsMap to prevent NPEs in multi thread access.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@643878 13f79535-47bb-0310-9956-ffa450edef68
2008-04-02 12:40:13 +00:00
Dennis Lundberg 6e544a5643 o Merge r611419.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@611425 13f79535-47bb-0310-9956-ffa450edef68
2008-01-12 14:36:33 +00:00
Vincent Siveton 315b258a33 o merged r608896 (MNG-3335: Improvement to "resource" / "targetPath" element in pom.xml)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@608897 13f79535-47bb-0310-9956-ffa450edef68
2008-01-04 15:52:20 +00:00
Carlos Sanchez Gonzalez b63e25a47a [MNG-3240] maven-model RepositoryBase.equals() causes ClassCastException
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@586533 13f79535-47bb-0310-9956-ffa450edef68
2007-10-19 16:52:49 +00:00
Jason van Zyl 3979ed47d3 o removing jdom from the core for the embedder and we will soon have a different tool for writing out POMs, trying to slim
down the core


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@586044 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 18:05:59 +00:00
Jason van Zyl 6db368df4e MNG-1849 Fix Extension.hashCode() throwing NPE if groupId or artifactId is null
Submitted by: David Hawkins



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543381 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 03:47:31 +00:00
Vincent Siveton b88762449b merged r541152 from branch (MNG-2461: Write JavaDoc documentation)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@541153 13f79535-47bb-0310-9956-ffa450edef68
2007-05-24 04:17:41 +00:00
Vincent Siveton cbe352c888 o merged r541141 from branch (reformat before working on MNG-2461)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@541142 13f79535-47bb-0310-9956-ffa450edef68
2007-05-24 02:44:59 +00:00
Arnaud Heritier 8f3e7a6b15 [maven-scm-plugin] prepare release 3.0.2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@532098 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 21:49:46 +00:00
Arnaud Heritier d8e729fed2 Update doc
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@530932 13f79535-47bb-0310-9956-ffa450edef68
2007-04-20 21:50:03 +00:00
Arnaud Heritier 0683008401 Maven-modello-plugin is now bundled in maven
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@530931 13f79535-47bb-0310-9956-ffa450edef68
2007-04-20 21:48:26 +00:00
Arnaud Heritier b34bd73955 Workaround for MODELLO-87
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@530929 13f79535-47bb-0310-9956-ffa450edef68
2007-04-20 21:47:25 +00:00
Arnaud Heritier 711638217b ~ character doesn't work to represent the user directory. We have to use a variable instead.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@526980 13f79535-47bb-0310-9956-ffa450edef68
2007-04-10 01:05:26 +00:00
Arnaud Heritier 0e4b19259d Use user account directory instead of full path to deploy staging site
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@526975 13f79535-47bb-0310-9956-ffa450edef68
2007-04-10 00:32:56 +00:00
Arnaud Heritier 7ef8e66ff0 revert change. jdiff report can't be used with generated classes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@526625 13f79535-47bb-0310-9956-ffa450edef68
2007-04-09 00:53:44 +00:00
Arnaud Heritier 1f17f7123c add jdiff report
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@526624 13f79535-47bb-0310-9956-ffa450edef68
2007-04-09 00:06:17 +00:00
Arnaud Heritier 528505a662 Fix site
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@522402 13f79535-47bb-0310-9956-ffa450edef68
2007-03-26 02:02:33 +00:00
Arnaud Heritier 96e9f759ca Update m1 build and generates the schema with the good namespace
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@522393 13f79535-47bb-0310-9956-ffa450edef68
2007-03-26 00:58:18 +00:00
Arnaud Heritier ea6d67bf0d Add namespace for maven 2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@522392 13f79535-47bb-0310-9956-ffa450edef68
2007-03-26 00:57:21 +00:00
Arnaud Heritier dd48e05bb0 use jar:install as default goal.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@521492 13f79535-47bb-0310-9956-ffa450edef68
2007-03-22 22:05:00 +00:00
Jason van Zyl 6ebfdbd83e updating license headers
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513030 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 22:50:48 +00:00
Jason van Zyl e93a9199d3 MNG-2846 Make the output of Model.getId() nicer
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@511339 13f79535-47bb-0310-9956-ffa450edef68
2007-02-24 20:32:36 +00:00
John Dennis Casey 086c589776 Adding default profile-id's.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@509744 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 20:51:15 +00:00
Vincent Siveton 14a8e1f5a4 MNG-967: maven.mdo, settings.mdo, and generated-sources
Merged from: r498608 (maven-2.0.x)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@498611 13f79535-47bb-0310-9956-ffa450edef68
2007-01-22 13:30:58 +00:00
John Dennis Casey dfc4a10c68 Adding the notion of a build-context, and several build-context classes that can be used: ProjectBuildContext, which contains lineage and current-project info, ExecutionBuildContext, which contains the information in the original MavenExecutionRequest, and SystemBuildContext, which contains things like System properties...these use the BuildContextManager to store and retrieve their info from the core container's Context object.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497911 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 19:15:18 +00:00
Dennis Lundberg f2201fc1be o Fix typos in descriptions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@496152 13f79535-47bb-0310-9956-ffa450edef68
2007-01-14 21:10:03 +00:00
Arnaud Heritier 9c95a9e5b5 Forgot to add the repository to find modello snapshots
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494686 13f79535-47bb-0310-9956-ffa450edef68
2007-01-10 02:08:07 +00:00
Arnaud Heritier 502703ae99 Update M1 build :
- Use the latest snapshot of modello-plugin
- Update the documentation which will be deployed here : http://maven.apache.org/maven-1.x/reference/maven-model/${pom.currentVersion}/

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494673 13f79535-47bb-0310-9956-ffa450edef68
2007-01-10 00:59:34 +00:00
Jason van Zyl 72e7a4df53 o lining up all the uses of modello and using 1.0-alpha-13 of the modello plugin everywhere
o add the generation of a JDOMWriter for use in the embedder so that working with models doesn't                                    
  completely whack the existing XML, and allow for outputting the namespace declarations                                            
o add a security manager to the embedder which is off by default but will barf if someone                                           
  tries to set system properties. you have to specifically turn this on because it will more then                                   
  likely break tons of code like xerces setting a system property named "version", nice.       



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@493811 13f79535-47bb-0310-9956-ffa450edef68
2007-01-07 19:13:33 +00:00
Arnaud Heritier f83fa2a5f2 Fix invalid XHTML in a comment
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@490092 13f79535-47bb-0310-9956-ffa450edef68
2006-12-25 00:58:23 +00:00
Brett Leslie Porter fecd771add couple of corrections. There are probably more along these lines.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@483797 13f79535-47bb-0310-9956-ffa450edef68
2006-12-08 03:12:51 +00:00