711eb8c416
Add get/setParentContainer to the configuration, and use it in
...
the embedder.
If the classrealm that's passed in has a parent realm,
then only the resources from the realm are scanned (getRealmResources).
This was done to re-use components from parent realms.
However, when embedding maven within another plexus container,
providing a new dummy classworld with the current classloader
as the parent, no components will be found. Since there's no
parent container, it won't be checked for components.
So, allowing a parent realm to be set in classworlds also
requires a parent container to be set, so that when no components
are found (since they're present in the parent container),
there is a parent container available to delegate lookups to.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@563173 13f79535-47bb-0310-9956-ffa450edef68
2007-08-06 15:38:57 +00:00
0ceae1b648
o Minor adjustment to error message.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@562096 13f79535-47bb-0310-9956-ffa450edef68
2007-08-02 12:34:04 +00:00
b01b42f89e
o using container configuration to setup plexus container
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561204 13f79535-47bb-0310-9956-ffa450edef68
2007-07-31 01:14:42 +00:00
1ec554f6da
o updating to the releases of plexus-utils, plexus, and modello
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561196 13f79535-47bb-0310-9956-ffa450edef68
2007-07-31 00:25:39 +00:00
19ba741d4d
we have to keep classwords in a separate jar and boot it by itself or we end up with everythign in the primordial classloade
...
which sucks ass. I didn't notice that until I ran a big slew of tests and the realm out put was entirely different. We defin
definitely want to boot up with just classworlds in the primordial loader so we can do what we like with the rest
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561194 13f79535-47bb-0310-9956-ffa450edef68
2007-07-31 00:24:55 +00:00
69a491ba0b
o don't ever let the components-api jar through as we have one jar now and this JAR causes CCE all over the place, this will p protect against it ever getting pulled in.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561193 13f79535-47bb-0310-9956-ffa450edef68
2007-07-31 00:21:04 +00:00
335a6fd250
fix the build - replacing project.file with a file in another dir fscks' up the alignment
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561177 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 22:55:13 +00:00
5ec1f2d3cc
Fix it0088 / MNG-2124 etc.. (regression)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561173 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 22:49:24 +00:00
6583991465
o updating to the new version of plexus which is the unified JAR once again. I can now move on
...
to doxia and attempt to use the same container for the trunk and branch.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@560496 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 04:57:37 +00:00
a87abe2d26
more formats.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559218 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 21:20:40 +00:00
9c8011386d
formatting for the message...
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559216 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 21:18:05 +00:00
8fab1c218a
Fixing NPE.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559215 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 21:17:20 +00:00
aaba2df26c
Fixing error message coming from a plugin phase-binding that cannot be resolved, or is unspecified.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559209 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 21:02:25 +00:00
77567c1123
Cleanup unit tests to make them more readable; add more tests for snapshots; failures are commented out (see table at http://docs.codehaus.org/display/MAVEN/Versioning )
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559053 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 13:59:54 +00:00
b8bdaaaae8
Check that a snapshot is included in a range
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559052 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 13:59:04 +00:00
e87621fa6c
PR: MNG-3118
...
Description: test classes dir comes before classes dir
Submitted by: Paul Gier
Reviewed by: /me
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559042 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 13:14:50 +00:00
d78ddd4fed
Restoring backward compatibility and deprecating old methods, so plugins and shared utilities can still use them without having to release new versions or suffer incompatibilities.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@555839 13f79535-47bb-0310-9956-ffa450edef68
2007-07-13 02:30:50 +00:00
844e17d4b5
Don't check for the distribution status building MavenProjects
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@555428 13f79535-47bb-0310-9956-ffa450edef68
2007-07-11 22:54:30 +00:00
407dd26f32
Fixing r553253 merge.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@554098 13f79535-47bb-0310-9956-ffa450edef68
2007-07-07 00:38:10 +00:00
947d587899
o merged from 554043 (beautified the renderer with a line separator)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@554044 13f79535-47bb-0310-9956-ffa450edef68
2007-07-06 20:35:02 +00:00
a7a3f55f18
fix the super-pom - this caused all the warnings about deprecated expressions. Should be pretty quiet now ;)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@553283 13f79535-47bb-0310-9956-ffa450edef68
2007-07-04 17:56:49 +00:00
8f292315e4
Merged r553210 from 2.0.x:
...
Refactored createArtifact methods to createArtifactSpec to make way for some real createArtifact methods.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@553253 13f79535-47bb-0310-9956-ffa450edef68
2007-07-04 16:19:29 +00:00
ef22e43b64
reduced warning-noise: only print warnings for SNAPSHOT models, and removed deprecation for project.* expressions, see comment in code
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@553144 13f79535-47bb-0310-9956-ffa450edef68
2007-07-04 09:48:06 +00:00
5da9d28906
[MNG-2919] Add fix for depMan scope overwriting to the trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@552182 13f79535-47bb-0310-9956-ffa450edef68
2007-06-30 17:31:45 +00:00
f3f3c70321
Fixing infinite recursion when a mojo bound to the lifecycle forks a new phase that contains implies another phase that contains the bound mojo. This was triggered by the assembly:assembly mojo, and should look familiar.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@551696 13f79535-47bb-0310-9956-ffa450edef68
2007-06-28 20:53:55 +00:00
407f924f83
Adding target to svn:ignore
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@550772 13f79535-47bb-0310-9956-ffa450edef68
2007-06-26 10:59:11 +00:00
e54695ddba
Move osgi bundle manifest generation to osgi profile.
...
The generated manifests are incorrect, for instance, maven-project's manifest
misses the package-import org.apache.maven.artifact.transform which should come from
maven-artifact CacheAware*.java.
Further, this doesn't work in an osgi environment, since if each artifact
is a bundle, then maven-embedder must have access to all component.xml files
in all maven core artifacts, and in all dependencies (which aren't bundles
but that can be fixed).
Osgi import/exports for packages work for resources too, but META-INF/ isn't
a package so this doesn't work. This may work with 'Require-Bundle'
(it does in my implementation although i don't think i follow the spec entirely ;)).
The next problem you get is classcasts for wagon (httplightweightwagon). This
has to be included in a bundle too and get proper exports. The same goes
for all other dependencies (plexus-*).
Maven and plexus are not suited for osgi yet - too much changing is required
in both the metadata structure, the code, and all dependencies and/or
packaging and binary inclusion of dependencies to make this work.
The best bet is to use the one-artifact embedder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549982 13f79535-47bb-0310-9956-ffa450edef68
2007-06-22 23:54:45 +00:00
f479a38620
Adding a small comment about managed artifact versions in here.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549970 13f79535-47bb-0310-9956-ffa450edef68
2007-06-22 22:09:22 +00:00
fda3badc24
Accumulate remote repositories when scanning for extensions, down the model lineage, starting with the original remote repositories passed in from outside.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549968 13f79535-47bb-0310-9956-ffa450edef68
2007-06-22 22:02:10 +00:00
99ba1e7e85
PR: MNG-2339 - ${project.*} evaluated badly
...
This commit makes sure that pom.* and project.* are resolved using the model reflector,
but if the prefix isn't pom or project, context and model properties are consulted.
If the value still isn't found, the model reflector is used as a legacy fallback,
and a warning is printed.
Also, project.* is deprecated in favour of pom.*.
TODO: env.*.
N.B.: there's loads of warnings about ${artifactId}. I can turn these off,
but if you specify -DartifactId on the commandline, all hell breaks loose.
See http://docs.codehaus.org/display/MAVEN/Refactoring+Interpolation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549786 13f79535-47bb-0310-9956-ffa450edef68
2007-06-22 11:34:53 +00:00
87f98299ac
Merged r549509 from 2.0.x:
...
Update OMIT_FOR_NEARER event to correctly reflect which node was actually omitted.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549510 13f79535-47bb-0310-9956-ffa450edef68
2007-06-21 15:21:49 +00:00
de13a61f46
Merged r549437 from 2.0.x:
...
Only log omit-for-nearer debug message if versions differ - required after removing restriction from DefaultArtifactCollector in r548797.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549438 13f79535-47bb-0310-9956-ffa450edef68
2007-06-21 09:23:20 +00:00
db111e752a
Merging r548797 from 2.0.x:
...
Make DefaultArtifactCollector fire OMIT_FOR_NEARER events to listeners even if the artifact versions do not differ. This allows interested listeners to be able to track omitted duplicate artifacts.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@548799 13f79535-47bb-0310-9956-ffa450edef68
2007-06-19 16:54:44 +00:00
b79759f338
[MNG-3039] mvn.bat fails
...
Fixing same problem for trunk.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@548789 13f79535-47bb-0310-9956-ffa450edef68
2007-06-19 16:32:57 +00:00
fc40bd04a6
MNG-3059 Make sure that dependencies listed in plugins are obeyed
...
Submitted by: Eric Redmond
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@548228 13f79535-47bb-0310-9956-ffa450edef68
2007-06-18 06:10:00 +00:00
c3272e9284
o put the shader in the package phase and order the plugins so that the shading happens first and then the assembly
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@548224 13f79535-47bb-0310-9956-ffa450edef68
2007-06-18 05:38:33 +00:00
3d1a1ca9cf
o using 6-SNAPSHOT -> using the new remote-resources plugin causes a CCE so rolling back to 5 until I can test it
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@548048 13f79535-47bb-0310-9956-ffa450edef68
2007-06-17 15:53:18 +00:00
811de4eb41
Added some tests; also add test for MNG-3001 where it's claimed that [1.0,) includes 1.0-SNAPSHOT, which it doesn't.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547874 13f79535-47bb-0310-9956-ffa450edef68
2007-06-16 07:20:35 +00:00
3efdafe6a8
produce a source assembly as part of the release
...
Merged from: r547502,547498 from maven-2.0.x branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547505 13f79535-47bb-0310-9956-ffa450edef68
2007-06-15 03:10:55 +00:00
aca2e17b72
ignore
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547504 13f79535-47bb-0310-9956-ffa450edef68
2007-06-15 03:09:01 +00:00
aa9368044a
Fix test that fails on windows
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547488 13f79535-47bb-0310-9956-ffa450edef68
2007-06-15 02:17:38 +00:00
6618c01021
Remove redundant argument - doesn't compile. I hope this is the right fix.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547172 13f79535-47bb-0310-9956-ffa450edef68
2007-06-14 08:42:26 +00:00
a441f3d28a
o exclude the rest of the xml classes
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547149 13f79535-47bb-0310-9956-ffa450edef68
2007-06-14 06:58:56 +00:00
9d341d66f1
add required snapshot repo
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547110 13f79535-47bb-0310-9956-ffa450edef68
2007-06-14 04:19:32 +00:00
19311574e1
Try to assume that a plugin bound in the POM but not resolved during build-plan-building will be resolvable later.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545558 13f79535-47bb-0310-9956-ffa450edef68
2007-06-08 16:46:20 +00:00
17e4709531
Fixing plexus-utils version.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545546 13f79535-47bb-0310-9956-ffa450edef68
2007-06-08 16:20:54 +00:00
6312592e56
Forgot a requirement in the component descriptor.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545545 13f79535-47bb-0310-9956-ffa450edef68
2007-06-08 16:19:58 +00:00
f6416573fa
Bumping surefire plugin version to fix problem with wrong plexus-utils version in ModelUtilsTest (in maven-project).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545535 13f79535-47bb-0310-9956-ffa450edef68
2007-06-08 15:43:35 +00:00
182220d00c
Fixing per Mark Hobson's suggestion.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545519 13f79535-47bb-0310-9956-ffa450edef68
2007-06-08 14:26:57 +00:00
b4ce07fec5
Add Zip artifact handler.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545398 13f79535-47bb-0310-9956-ffa450edef68
2007-06-08 04:09:39 +00:00
Kenney Westerhof
Dennis Lundberg
Jason van Zyl
John Dennis Casey
Carlos Sanchez Gonzalez
Mark Hobson
Vincent Siveton
Patrick Schneider
Brett Leslie Porter