Commit Graph

263 Commits

Author SHA1 Message Date
Jason van Zyl 38269cca84 o A change that eliminates the use of System.properties from the core in an
attempt to move toward true embeddability. 

 - System properties are still populated in the CLI to make sure that the 
   system property profile activator functions and the settings are dealt with
   correctly. I will look at each of those shortly but this is a first step.
   


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293504 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 03:31:35 +00:00
John Dennis Casey 53ccb4ffb0 Resolving: MNG-1021
o Added AttachedArtifact, and changed the DefaultMavenProjectHelper to create and attach artifacts of this type. AttachedArtifact uses a parent artifact (constructor parameter) for versioning and basic identity attributes, but requires the user to specify a type and classifier specific to the new artifact. We may want to add flexibility for artifactId, too...though I have reservations on that score.

o See it0079 for a test.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293497 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 02:54:49 +00:00
John Dennis Casey def783e4cf Resolving: MNG-934, MNG-669
o Changed default value for usePluginRegistry to 'false' in settings.mdo
o Changed default value for updateInterval to 'never' in plugin-registry.mdo
o Added ActivationOS in settings.mdo, profiles.mdo, maven.mdo
o Added code to the conversion utilities for Settings and Profiles to corresponding maven-model classes for ActivationOS
o Added OS activator for profiles which allows architecture, name, family, and version (with '!' negation of any of these)
o Added ActivationFile to settings.mdo, along with conversion code in the Settings->Model conversion utility
o Added packageWithVersion configuration to the modello plugin definition in maven-settings (this is apparently required now)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293479 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 01:07:36 +00:00
John Dennis Casey 805a5952eb Resolving: MNG-1052
o Added pluginManagement injection to MavenProject.addPlugin(..) so that no Plugin definition added to the project can go without having managed info injected into it.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293454 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 21:38:35 +00:00
Brett Leslie Porter 9f52ee0fcf PR: MNG-644
put back code that was hiding in a method with a name unrelated to it

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293357 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 14:16:16 +00:00
Brett Leslie Porter c532572152 PR: MNG-644
remove deprecated methods

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293341 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:28:25 +00:00
Brett Leslie Porter 4afb4ba351 PR: MNG-644
remove deprecated method

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293340 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:27:48 +00:00
Brett Leslie Porter fa65152c43 PR: MNG-644
remove deprecated repository settings

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293335 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:20:49 +00:00
Brett Leslie Porter 4b6babfbf7 PR: MNG-644
remove deprecated goal syntax

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293332 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:13:44 +00:00
Brett Leslie Porter 85fe459856 PR: MNG-644
remove deprecated goal syntax

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293328 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:10:39 +00:00
Brett Leslie Porter cc96c2bc38 PR: MNG-1041
don't use active project if it is not the same dependency


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293225 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 03:51:48 +00:00
Brett Leslie Porter 598cd29727 PR: MNG-895
revert to previous inheritence behaviour - only do it for profiles

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293213 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 02:34:41 +00:00
Brett Leslie Porter 41c129e593 PR: MNG-895
merge resource lists

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293205 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 02:09:04 +00:00
Brett Leslie Porter a922450b0b PR: MNG-1045
ensure parent always come first, but doesn't introduce a cycle


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293200 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 01:34:26 +00:00
Brett Leslie Porter c5acaded88 upgrade to plexus 1.0-alpha-7 container, switching to new group ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293193 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 00:54:01 +00:00
Brett Leslie Porter 09a35f3c38 PR: MNG-1060
fix basedir translation on windows

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293190 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 00:42:27 +00:00
Brett Leslie Porter 9382b9c8d9 PR: MNG-1060, 1061
corrections to the model used for the release plugin

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293076 13f79535-47bb-0310-9956-ffa450edef68
2005-10-02 06:12:03 +00:00
John Dennis Casey 47d9a60537 Working on: MNG-786
o Changed the profile activation in it0075 to use a system property which is not always present

o Added projecthelp:active-profiles, package, and clean:clean to the goals list, in case it was only happening with the clean plugin

o Fixed the projecthelp mojos to be aggregators where appropriate

o Changed the ordering of modules in the profile injector (used to be that profile modules were prepended; now, they're appended)

NOTE: I still cannot reproduce the described behavior. Dan: Am I missing something WRT the test setup? I changed the activation trigger to be non-inherent, and I'm not using a boolean string to trigger the profile. What am I doing wrong??



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292781 13f79535-47bb-0310-9956-ffa450edef68
2005-09-30 15:45:20 +00:00
Brett Leslie Porter 638088b075 don't need to depend on parent, it no longer needs to execute first due to reactor handling. can avoid cycles.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292419 13f79535-47bb-0310-9956-ffa450edef68
2005-09-29 11:34:02 +00:00
Brett Leslie Porter 52e8a216ef PR: MNG-1011
add default goal handling

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292411 13f79535-47bb-0310-9956-ffa450edef68
2005-09-29 09:55:25 +00:00
Brett Leslie Porter 30adf31194 PR: MNG-915
alloow plugin to include itself

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292406 13f79535-47bb-0310-9956-ffa450edef68
2005-09-29 09:11:10 +00:00
Brett Leslie Porter 36fbe930d7 PR: MNG-915
report plugins can be included in the current plugin

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292404 13f79535-47bb-0310-9956-ffa450edef68
2005-09-29 09:08:35 +00:00
John Dennis Casey 03b6c44316 Resolving: MNG-985...simply fixed merging of plugins from PluginManagement to happen on a plugin-by-plugin basis using individual merge logic from ModelUtils, rather than the wholesale merge logic for plugin lists.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292255 13f79535-47bb-0310-9956-ffa450edef68
2005-09-28 18:57:22 +00:00
Brett Leslie Porter c5d1b378f2 PR: MNG-677
default output directory should be set in reporting

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292103 13f79535-47bb-0310-9956-ffa450edef68
2005-09-28 03:14:06 +00:00
John Dennis Casey e41222abd0 Resolving: MNG-1008...DependencyManagement can now inject exclusions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291806 13f79535-47bb-0310-9956-ffa450edef68
2005-09-27 02:31:33 +00:00
John Dennis Casey b1c59f6d19 Resolving: MNG-1022...Adding TestProfileInjector to avoid injecting profiles for tests, and still guard against NPEs when profiles exist.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291751 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 21:27:00 +00:00
John Dennis Casey da33bafe84 Resolving: MNG-885
o Extracting basedir from the project instance when PluginParameterExpressionEvaluator is init'ed if project != null...otherwise, using ${user.dir} from sysprops.

o Extracting values for resolution from POM properties before POM instance during POM interpolation, and adding checks to guard against self-reference of POM elements.

o Added three ITs (one contra) to test these resolutions.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291735 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 20:29:20 +00:00
Brett Leslie Porter 27bc0aea4d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291643 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 15:30:36 +00:00
Brett Leslie Porter 80c8e188b8 [maven-release-plugin] prepare release maven-2.0-beta-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291641 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 15:18:55 +00:00
Brett Leslie Porter 883e9e53db avoid NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291582 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 08:23:08 +00:00
Brett Leslie Porter 99db09fcac PR: MNG-947
add optional attribute to a dependency

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291508 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 01:23:13 +00:00
Brett Leslie Porter f3932e47fa PR: MNG-947
add optional attribute to a dependency

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291507 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 01:17:59 +00:00
Jason van Zyl 853028dfab o adding method to the maven project builder that takes a transfer listener
as a parameter. this method is currently being used in the embedder

o see MNG-1015 for notes on where the monitor may be bested placed. if
everything eventually uses the embedder then it won't matter so much.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291499 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 00:23:33 +00:00
Brett Leslie Porter 3e264f80ba PR: MNG-208
flag project that was the root of execution

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291236 13f79535-47bb-0310-9956-ffa450edef68
2005-09-24 02:18:54 +00:00
John Dennis Casey 24a108a674 Resolving: MNG-767, MNG-768
o We should have a viable offline mode now. Plugin sensitivity updates to follow.

o See it0069 and it1014 for offline mode tests.

o Brett, building maven-plugins in offline mode with org/apache/maven/plugin/* removed will now give a nice error message. :)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291124 13f79535-47bb-0310-9956-ffa450edef68
2005-09-23 14:23:08 +00:00
Brett Leslie Porter cebbdaf1ce PR: MNG-870
MAke plugin discovery reactor aware



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290887 13f79535-47bb-0310-9956-ffa450edef68
2005-09-22 04:34:41 +00:00
Brett Leslie Porter cbcf2d48e1 PR: MNG-788
add filtering to the build element


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290877 13f79535-47bb-0310-9956-ffa450edef68
2005-09-22 02:52:39 +00:00
John Dennis Casey a67d232228 Resolving: MNG-930
o Fixed profile properties cloning in ModelUtils
o Added properties to the test profile in it2002
o Moved the checkout dir for it2002 to be under target, to make it easier to clean.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290552 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 20:05:08 +00:00
John Dennis Casey ec8d262f16 Resolving: MNG-878, MNG-921
o Verified that plugins are added to the list in the model when invoked from the command line (878)
o Reformatted ModelUtils after the profiles-cloning addition
o Added cache-flush for the plugin map in MavenProject
o Moved dependencies for subproject/subproject2 into the parent-project POM, inside a profile
o Added activation property for this new profile into the test.sh script
o Added explicit activation inside of release:perform's m2 invocation for all profile-ids active in the release-plugin's execution.
o Added code to remove the dynamic parts of the POM from the release-pom.xml...it's not meant to be a dynamic version of a POM.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290336 13f79535-47bb-0310-9956-ffa450edef68
2005-09-20 02:59:44 +00:00
John Dennis Casey 74de0709de Resolving: MNG-920, and setting the version of maven-release-plugin to a rev of -beta-1 instead of -SNAPSHOT, to allow locally installed versions to work without tweaking the version locally.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290276 13f79535-47bb-0310-9956-ffa450edef68
2005-09-19 21:24:40 +00:00
Brett Leslie Porter 386cc730ed allow creation without a file (purely repository)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290083 13f79535-47bb-0310-9956-ffa450edef68
2005-09-19 07:51:38 +00:00
Brett Leslie Porter 33dfc5fb1c PR: MNG-881
ensure resources are merged if empty.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290053 13f79535-47bb-0310-9956-ffa450edef68
2005-09-19 03:24:28 +00:00
John Dennis Casey 66dddfc944 Resolving: MNG-881. This had to do with resource-list merging when the performRelease profile was activated. See MNG-895 for full resolution (this is a stop-gap solution for now).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289599 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 16:27:33 +00:00
Brett Leslie Porter 06ab86cb54 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289368 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 02:57:16 +00:00
Brett Leslie Porter 5632e45815 [maven-release-plugin] prepare release maven-2.0-beta-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289366 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 02:50:12 +00:00
Brett Leslie Porter 139efa3bdf finish correcting spelling of prerequisites
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289355 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 01:11:42 +00:00
John Dennis Casey dca4ae4518 Resolving: MNG-886
o Added complex test case for the release plugin, called it2002.
o Added copying of reportArtifacts and extensionArtifacts sets when one MavenProject is constructed with another.
o Added some logging statements to PrepareReleaseMojo, which I will remove later when I'm done with this rash of bugfixes.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289294 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 19:21:28 +00:00
Brett Leslie Porter b0c3a2fedc PR: MNG-753
use an ordered set so that insertion order is preserved

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289259 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 15:29:02 +00:00
Brett Leslie Porter a72cf986ac updated repository ids
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289180 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 08:42:04 +00:00
Brett Leslie Porter 1863f47493 switch plugin repo back to main
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289179 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 08:36:32 +00:00