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
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
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
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
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
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
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
cc3d2ca380
o collapse all the test nexus projects under one directory, i'm using this to track down the plugin containers that don't have the executions joined correctly
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726924 13f79535-47bb-0310-9956-ffa450edef68
2008-12-16 01:55:56 +00:00
Jason van Zyl
15da8b59b0
o move the path translator to the maven-compat package
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726744 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 17:48:53 +00:00
Jason van Zyl
8d90d7cabc
o starting to add generics
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726614 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 03:51:38 +00:00
Jason van Zyl
17e8ace705
o fix formatting
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726589 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 00:47:03 +00:00
Jason van Zyl
933c30ed6b
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726588 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 00:46:47 +00:00
Jason van Zyl
3a689d4f4d
MNG-3905: merged all the artifact/repository handling bits into MavenTools
...
o clean up hand-written component descriptors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726584 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 00:20:04 +00:00
Jason van Zyl
6581960c98
o remove dead class, methods were moved to MavenTools long ago
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726582 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 23:56:01 +00:00
Jason van Zyl
e2585b1dab
o remove unused code as part of collapsing MNG-3905
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726581 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 23:54:53 +00:00
Jason van Zyl
a8924908e3
o get rid of ROLE field
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726580 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 23:54:20 +00:00
Jason van Zyl
f3d2285e2e
o remove ROLE field, use class reference
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726578 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 23:47:27 +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
6d5eab14f6
o remove aspectj
...
o update compat log with CLI changes
o update everything to release versions, we have no snapshots anymore
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726521 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 19:51:59 +00:00
Vincent Siveton
7b8a12754f
o merged from r726423 (specify unique namespace)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726425 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 12:53:21 +00:00
Jason van Zyl
ea43792cf2
MNG-3905 First pass at collecting all the repository related code and started to decouple from maven-artifact
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726383 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 06:24:01 +00:00
Jason van Zyl
4074068126
o adding test case for plugin execution container join
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726382 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 06:20:05 +00:00
Jason van Zyl
6e64aa721c
o preparing to refactor the plugin management and plugin executions calculations
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726381 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 06:17:05 +00:00
Britton Isbell
fca273b3a0
If build property starts with project.basedir, don't resolve absolute path.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726343 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 03:12:08 +00:00
Britton Isbell
fafb133780
If build property starts with another build property, don't attempt to resolve absolute path.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726334 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 02:17:02 +00:00
Jason van Zyl
444357358d
o remove dead imports
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726330 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 01:45:15 +00:00
Jason van Zyl
f06bece9f0
o execution properties are a per execution set of properties not the system properties. system properties are bad.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726320 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 00:40:07 +00:00
Jason van Zyl
37976eec7d
o remove ROLE field, will use a class reference instead.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726311 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 23:55:01 +00:00
Jason van Zyl
bcc654c709
o get rid of reference to the ROLE field, use a class reference instead.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726310 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 23:54:41 +00:00
Jason van Zyl
c94cdd6d88
o extract the interpolation capabilities into its own class
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726236 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 17:18:42 +00:00
Britton Isbell
3a61ccdc8e
Fix: MNG-3822
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@722374 13f79535-47bb-0310-9956-ffa450edef68
2008-12-02 05:03:30 +00:00
Jason van Zyl
6d841464e3
o don't need components.xml anymore
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721760 13f79535-47bb-0310-9956-ffa450edef68
2008-11-30 05:19:37 +00:00
Jason van Zyl
4f5cdce538
o using annos
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721759 13f79535-47bb-0310-9956-ffa450edef68
2008-11-30 05:18:34 +00:00
Jason van Zyl
0aa43af9f4
o dead imports
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721636 13f79535-47bb-0310-9956-ffa450edef68
2008-11-29 05:07:36 +00:00
Jason van Zyl
8b655a1456
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721616 13f79535-47bb-0310-9956-ffa450edef68
2008-11-29 02:40:55 +00:00
Britton Isbell
4d84546f7b
Fix for problems with modello plugin. Builder was not properly inheriting the goals.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721608 13f79535-47bb-0310-9956-ffa450edef68
2008-11-29 01:41:35 +00:00
Jason van Zyl
aba2b12837
MNG-3876: Add in the maven-artifact code so we can start creating facades and back it with mercury
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721307 13f79535-47bb-0310-9956-ffa450edef68
2008-11-27 22:32:16 +00:00
Britton Isbell
937014c33e
Moved validation errors to debug. This will still fail the build in critical cases.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721246 13f79535-47bb-0310-9956-ffa450edef68
2008-11-27 17:32:55 +00:00
Britton Isbell
1c779c537a
Removed default value for maven.version, caused all sorts of versioning problems.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721112 13f79535-47bb-0310-9956-ffa450edef68
2008-11-27 08:19:56 +00:00
Britton Isbell
0375b033b5
Don't fail build on invalid relocated pom.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721110 13f79535-47bb-0310-9956-ffa450edef68
2008-11-27 07:36:06 +00:00
Britton Isbell
975ebc7c0c
Fail if pom of relocated artifact is bad.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721072 13f79535-47bb-0310-9956-ffa450edef68
2008-11-27 02:32:30 +00:00
Jason van Zyl
c418d12814
o primarily refactoring in part for the preparation making room for mercury and processing events from maven-shared-model
...
o add plexus component descriptor generation to the bootstrap so we can start removing the hand-written descriptors and start
using annotations everywhere
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720432 13f79535-47bb-0310-9956-ffa450edef68
2008-11-25 07:11:35 +00:00
Britton Isbell
cca34331f3
Reduced duplicate code between PomTransformer and PomClassicTransformer. The PomTrasnformer is now a concrete base class. The PomClassicTransformer extends it, overriding how interpolation is done, to handle interpolation of values related to project directories.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720292 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 21:08:35 +00:00
Britton Isbell
0b4c2c9222
PomClassicTransformer now inheriting from PomTransformer. Removed some of the duplicate methods.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720281 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 20:35:39 +00:00
Britton Isbell
f312012e8a
PomClassicTransformer now using a factory to create domain model.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720277 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 20:25:40 +00:00
Benjamin Bentmann
39d13c66a6
[MNG-3845] Unintended inheritance of parent elements overriden by children
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719930 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 22:10:36 +00:00
Benjamin Bentmann
83440b7c01
[MNG-3843] Main/test resources are not properly inherited
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719921 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 21:18:23 +00:00
Britton Isbell
1c2df46402
Removed reference to listener.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719726 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 21:55:47 +00:00
Britton Isbell
7368eb1216
Moved out specialized methods from PomClassicTransformer to ProjectBuilder. Did this refactoring to make it easier to merge PomTransformer and PomClassicTransfomer.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719724 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 21:50:31 +00:00
Britton Isbell
c26b2d69cd
Merge of sisbell-maven-3.0-mercury branch to trunk. Includes maven-project-builder component, which breaks out some of the independent project builder classes, so that Mercury does not need to pull in the entire trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719472 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 04:49:46 +00:00
Britton Isbell
95929cf502
Some of the hard-coded URIs for profiles were outdated. This would cause improper matching of profile elements. Fixed this to use ProjectUri, which is always in sync.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719411 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 22:34:51 +00:00
Britton Isbell
6a1f04705c
Moved PathTranslator back to project module to fix class reference issue with the enforcer plugin. Added a preprocess method on the ModelTransformer to allow processing of plugin config elements. Need to add information about which elements are collections so they are not lost during a sort.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719406 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 22:19:34 +00:00
Britton Isbell
1f5a668726
Simplified nested if-rules for model container action.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719293 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 17:17:23 +00:00
Benjamin Bentmann
d12af86b03
[MNG-3863] Maven erroneously assumes "org.apache.maven.plugins" for dependencies without groupId
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719253 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 15:25:01 +00:00
Britton Isbell
e046650597
If DependencyManagement section gave a dependency a scope of provided, then it would not join with a dependency with a scope of compile, causing Nexus build to fail. Fixed this rule for scopes of provided and compile to be treated as same type for purpose of joining.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719151 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 01:31:24 +00:00
Britton Isbell
9982d6b8c7
A number of URIs were missing the #collection element. Fixed this.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719142 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 00:31:14 +00:00
Jason van Zyl
f88b524249
o using thread local lookup setting the realm to null once it's done its work with the plugin
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718656 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 17:17:26 +00:00
Britton Isbell
d9a4b136c4
Rule: Don't inherit parent relativePath
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718479 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 03:45:09 +00:00
Britton Isbell
00a0f513b1
Fix: interpolator - mavenVersion and maven.version are implicitly set.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718472 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 03:04:29 +00:00
Britton Isbell
ed4083c93f
Problem in merging artifact containers, where one container specified a default type value (jar) and the other did not. They were treated as different types. Fixed this.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718375 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 20:59:05 +00:00
Britton Isbell
629c12ae80
Configured build extension listener to only fire on poms within the build.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718176 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 06:23:46 +00:00
Jason van Zyl
eec6ed1e2c
o adding new logic to process build extensions
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718165 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 03:23:35 +00:00
Jason van Zyl
56986ca004
o use the class lookup method which will now automatically partition lookups based on the class
...
submitted by: Dain Sundstrom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@717964 13f79535-47bb-0310-9956-ffa450edef68
2008-11-16 02:38:13 +00:00
Benjamin Bentmann
0d28d1719a
[MNG-3846] Inherited URLs are not automatically extended with the child's artifactId
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@717941 13f79535-47bb-0310-9956-ffa450edef68
2008-11-15 22:35:14 +00:00
Britton Isbell
7de89c1ee9
Checked in support for plugin extension listener. Not using a configurable plexus component yet. The listener is added directly to the transform.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@714122 13f79535-47bb-0310-9956-ffa450edef68
2008-11-14 20:10:52 +00:00
Britton Isbell
1a9ef5d0e0
Added in Project Event Listeners. Still need to hook up a plexus component and a model container factory for configuring listeners.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@714109 13f79535-47bb-0310-9956-ffa450edef68
2008-11-14 19:18:09 +00:00
Britton Isbell
2881df1046
Reversing fix for MNG-3827. This causes regression in MNG-3679.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713525 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 21:51:15 +00:00
Britton Isbell
c46e4fd97c
Fix for mng-3259.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713483 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 20:01:20 +00:00
Britton Isbell
bf5d38a186
Fix for IT 3827. On joins between model containers during the applying of plugin management, transform rule was reversing the plugin config element order. Now do a reverse sort prior to join, so elements end up in correct order.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713429 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 17:31:07 +00:00
Benjamin Bentmann
07fb543422
[MNG-3831] Expressions without project/pom prefix are no longer interpolated with model values
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713052 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 14:44:19 +00:00
Benjamin Bentmann
cd04c1d85a
o Set svn:eol-style=native
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713049 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 14:35:30 +00:00
Britton Isbell
1249c89962
Fix for it0141
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@712680 13f79535-47bb-0310-9956-ffa450edef68
2008-11-10 15:44:37 +00:00
Britton Isbell
6468b08bda
Fix for IT 3821.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@712621 13f79535-47bb-0310-9956-ffa450edef68
2008-11-10 07:23:45 +00:00
Britton Isbell
9929e8101d
Add collection notation to reportSets.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@712619 13f79535-47bb-0310-9956-ffa450edef68
2008-11-10 07:05:45 +00:00
Britton Isbell
4256e417b9
If DistributionManagement site url contains a property, build was failing. This is a quick fix and will still not return the correct URL. The problem is that interpolation occurs after inheritance and resolving URLs based on a parent is an inheritance issue.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@711888 13f79535-47bb-0310-9956-ffa450edef68
2008-11-06 16:12:17 +00:00
Britton Isbell
3d85fa7874
Fix for IT 2695. Two plugins with different executions that had same id were merging. Created a different container for execution ids, so that they can be queried per plugin, rather than globally.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@711743 13f79535-47bb-0310-9956-ffa450edef68
2008-11-05 23:42:32 +00:00
Britton Isbell
824e2eefe7
Fix for IT 3134.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@711707 13f79535-47bb-0310-9956-ffa450edef68
2008-11-05 21:46:12 +00:00
Britton Isbell
e96229a165
Reverting back changes. It's building locally but breaking on Hudson.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@706231 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 11:06:03 +00:00
Britton Isbell
d733885e54
Hooked up maven-project-builder into build. Updated classes.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@706143 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 07:57:44 +00:00
Britton Isbell
360954e6bc
Fix: IT0141
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@705183 13f79535-47bb-0310-9956-ffa450edef68
2008-10-16 09:16:15 +00:00
Britton Isbell
bedc1d7a2b
Fix: IT0469 - Rule: join configs of build/plugins/plugin and reporting/plugins/plugin.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@705167 13f79535-47bb-0310-9956-ffa450edef68
2008-10-16 08:06:38 +00:00
Britton Isbell
655cda05dc
Fix for IT100. During interpolation, something with 'parent.' needs to be aliased: 'project.parent.' I'm not sure that this is good behavior, given that someone may use 'parent. in their own context.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@704423 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 09:56:13 +00:00
Jason van Zyl
779680fe7f
o silence more of the logging
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700873 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 19:10:12 +00:00
Jason van Zyl
50828967ee
o silence more of the logging
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700869 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 19:03:46 +00:00
Jason van Zyl
db4675e4bf
o get rid of warning and make it debug
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700862 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 18:40:50 +00:00
Britton Isbell
53f0a723c1
Remove println of pom on validation error.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700857 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 18:21:59 +00:00
Britton Isbell
a20f8ffee8
Fix: MNG-3392
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700837 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 16:55:35 +00:00
Britton Isbell
2efd58f1cd
Missed these classes when I merged out changes related to repository helper.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700820 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 16:10:39 +00:00
Britton Isbell
d7ae13be90
Put back in repository helper due to problems of building with clean repo.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700813 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 15:33:08 +00:00
Jason van Zyl
e8bf60f962
o start a little caching component that does nothing special now but we need to build it out after the multiple instance problem is corrected, and we decide on the interactions between the metadata layer, project building, the reactor, and workspaces in IDEs.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700758 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 13:07:26 +00:00
Britton Isbell
5fb228063a
Much better performance by making the cache static, probably due to multiple instances of ProjectBuilder.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700337 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 05:12:33 +00:00
Britton Isbell
d25a161f33
Remove repository helper.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700336 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 04:58:51 +00:00
Britton Isbell
c38db3ada7
Small perf tweak.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700331 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 04:13:08 +00:00
Britton Isbell
9220e682ec
Remove model cloning.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700325 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 01:58:20 +00:00
Britton Isbell
3af42c2f05
Removed unneeded class/methods related to extension scanner.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700300 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 23:02:15 +00:00
Britton Isbell
c208511348
Caching of models. This model is not the one returned in the MavenProject so no danger of other components modifying it.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699873 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 18:20:13 +00:00
Jason van Zyl
f9cb1579bb
o changing the caching slightly to share with shane
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699847 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 16:03:20 +00:00
Jason van Zyl
48224c4073
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699842 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 15:41:27 +00:00
Jason van Zyl
cf62d1c301
o removal of as many deprecated methods from the project builder as possible. so far i've discovered two obsolete methods used by plugins directly
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699838 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 15:31:59 +00:00
Jason van Zyl
b6c2132bc7
o merging from my branch to trunk
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699806 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 12:16:53 +00:00
Britton Isbell
53cfcc896d
Removed use of workspace from project builder. In the build of trunk, there were about 50K of calls from MavenMetadataSource to the project builder. I put a simple hashmap cache in the metadata source to reduce calls to dozens.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699773 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 04:52:53 +00:00
Jason van Zyl
1260ced4f5
o collapsing all the profile code into maven-project, now it's all in one place
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699659 13f79535-47bb-0310-9956-ffa450edef68
2008-09-27 14:52:28 +00:00
Britton Isbell
8de236d8ea
${build..., not being properly interpolated. Aliased this as ${project.build....
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699016 13f79535-47bb-0310-9956-ffa450edef68
2008-09-25 16:42:08 +00:00
Britton Isbell
6612657092
Incorrectly specified collection in ProjectUri. Fixed this.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@698007 13f79535-47bb-0310-9956-ffa450edef68
2008-09-22 21:40:06 +00:00
Britton Isbell
83c2ba498d
Fixed problem with inheriting versions of artifacts.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@697979 13f79535-47bb-0310-9956-ffa450edef68
2008-09-22 20:36:35 +00:00
Britton Isbell
e000c61519
Removed unneeded system.out.println messages from unit tests.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696739 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 17:42:40 +00:00
Britton Isbell
3caaba53ed
Fix: If the child pom found a parent pom within a local build, where the child pom project/parent/groupId[artifactId] did not match the groupId[artifactId] of the parent pom, then it would exclude the parent pom from inheritance. Now it will attempt to locate the parent pom in the local repo. If the parent pom is not found in local repo, build will fail.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696713 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 17:02:55 +00:00
Britton Isbell
12b7abf394
Improved error message when pom parent ids do not match.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696698 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 16:37:59 +00:00
Britton Isbell
1d10a62086
Improved error message when pom parent ids do not match.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696696 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 16:32:51 +00:00
Britton Isbell
3929bd0e45
Reverted back previous checkin, which broke something in the assembly plugin.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696326 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 14:42:57 +00:00
Britton Isbell
06abbabcd2
Some fixes for adding properties from active profiles to the interpolation list.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696299 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 13:52:46 +00:00
Britton Isbell
6b19072489
Fix: Added a few cases to match dependency type on inheritance.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695922 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 14:41:11 +00:00
Britton Isbell
f12437531f
Fix: If a child dependency matches a parent dependency artifactId and groupId AND both parent and child dependency versions are null AND their types are not equal, then it should not join the dependency.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695717 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 03:18:57 +00:00
Britton Isbell
9e7c8be43c
Fix: Interpolation of standalone super poms.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695615 13f79535-47bb-0310-9956-ffa450edef68
2008-09-15 20:45:04 +00:00
Britton Isbell
bc3660ec47
Detangled profile activitation dependency on realm manager. Move org.apache.maven.realm package to maven-core project.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695332 13f79535-47bb-0310-9956-ffa450edef68
2008-09-15 02:54:31 +00:00
Britton Isbell
180bf37d84
Fix: mng2562 - timestamp
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695241 13f79535-47bb-0310-9956-ffa450edef68
2008-09-14 15:36:56 +00:00
Britton Isbell
6221dfb9e6
Fix: mng3746 - Implemented proper ordering of system, user and model properties used in interpolation. this required creating a tag value, which could be used for comparing and ordering of InterpolatorProperty.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695196 13f79535-47bb-0310-9956-ffa450edef68
2008-09-14 11:34:27 +00:00
Britton Isbell
5d266e85ba
Fix: MNG2339b - If \$\{version} is not specified as a system or environment variable, then it is aliased as \$\{project.version} so that it will be interpolated.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695114 13f79535-47bb-0310-9956-ffa450edef68
2008-09-14 05:11:21 +00:00
Britton Isbell
38b9c5c25b
Fix: MNG3747 - Added three phases to interpolation: (1) interpolate properties not using build/directory(s); (2) set absolute paths; (3) interpolate using build/directories.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695110 13f79535-47bb-0310-9956-ffa450edef68
2008-09-14 04:25:49 +00:00
Britton Isbell
c993fd98d0
Fix: IT0098 - CLI properties now correctly constructed and passed to interpolator.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695022 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 20:20:25 +00:00
Britton Isbell
c5f52578f5
Some ITs were failing because of the new interpolation code. Certains code paths were failing because they did not add CDATA sections to the pom. Added CDATA support directly to ModelProperty so path doesn't matter.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694999 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 18:21:29 +00:00
Britton Isbell
9fff4c0612
Moved PathTranslator to maven-core. maven-project no longer uses it.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694912 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 10:07:23 +00:00
Britton Isbell
7dc42ed958
Replaced interpolator code.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694907 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 09:28:23 +00:00
Britton Isbell
35cb991844
Fix: IT0074. When I removed Maven20xCompatAspect.aj, I removed code that fixed mng-3012. Added the code directly back into DefaultMavenRealmManager.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694742 13f79535-47bb-0310-9956-ffa450edef68
2008-09-12 17:04:32 +00:00
Britton Isbell
d295ab3a18
Previously removed MavenProject.writeModel, but found a plugin using this method. Added it back in.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694669 13f79535-47bb-0310-9956-ffa450edef68
2008-09-12 10:01:06 +00:00
Britton Isbell
f2e9e6810a
Cleanup of code. Removed last of dynamic/concrete code.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694598 13f79535-47bb-0310-9956-ffa450edef68
2008-09-12 03:45:45 +00:00
Britton Isbell
f0b84be1ac
Removed more clone methods.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694596 13f79535-47bb-0310-9956-ffa450edef68
2008-09-12 03:12:06 +00:00
Britton Isbell
0cf4ca3be5
Removed a number of uneeded clone methods. Moved others out of ModelUtils and made them private.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694573 13f79535-47bb-0310-9956-ffa450edef68
2008-09-12 01:14:52 +00:00
Britton Isbell
727e4e7cb1
Computer a bit laggy, caught svn ci command into component.xml. Removed this.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694365 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 17:14:18 +00:00
Britton Isbell
45f10e7526
Refactored out restorer class and related MavenProjectBuilder methods.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694360 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 17:11:34 +00:00