Commit Graph

309 Commits

Author SHA1 Message Date
Brett Leslie Porter 7aa60e32d4 PR: MNG-644
remove unused method

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293348 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:37:12 +00:00
Brett Leslie Porter f328ad0f63 PR: MNG-644
remove unused method

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293347 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:36:30 +00:00
Brett Leslie Porter 21350c840b PR: MNG-644
remove deprecated settings and profile settings

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293326 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 12:49:40 +00:00
Brett Leslie Porter 56d55b8f8e PR: MNG-932
add a goal for creating a jar from the test sources


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293227 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 03:53:48 +00:00
Brett Leslie Porter 4ff4c02fd5 PR: MNG-1041
conflict id should include classifier


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293226 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 03:52:30 +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 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
Brett Leslie Porter 3f7dafbb03 PR: MNG-932
add test-jar artifact type in case we decide to allow this in future via a plugin.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292587 13f79535-47bb-0310-9956-ffa450edef68
2005-09-30 00:29:55 +00:00
Brett Leslie Porter 04de595b24 PR: MNG-1039
Submitted by: Matthew Inger
Reviewed by:  Brett Porter
filter based on dependency type

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292392 13f79535-47bb-0310-9956-ffa450edef68
2005-09-29 05:50:50 +00:00
Brett Leslie Porter 826f3e2a86 PR: MNG-916
ensure RELEASE is not selected as is

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292172 13f79535-47bb-0310-9956-ffa450edef68
2005-09-28 13:07:53 +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 fe929c8a62 PR: MNG-1007
confirm this is fixed

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291627 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 14:07:09 +00:00
Brett Leslie Porter 19ebd621e7 PR: MNG-614
don't select RELEASE - use the version information

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291575 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 07:16:52 +00:00
Brett Leslie Porter 5637c28498 report those evicted too
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291566 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 06:15:39 +00:00
Brett Leslie Porter d955fbef5c PR: MNG-820
ensure only the right dependencies are used when two different versions have different deps.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291563 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 05:52:36 +00:00
Brett Leslie Porter fba77cb146 PR: MNG-787
add tests to ensure version in current POM is always used

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291511 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 01:56:37 +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
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 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
John Dennis Casey 5038a4d249 Resolving: MNG-876. Versions are incremented correctly again.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289348 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 23:36:29 +00:00
John Dennis Casey 8efd4bce77 modding ArtifactUtils.isSnapshot(version) to also check for SNAPSHOT suffix.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289313 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 20:54:09 +00:00
John Dennis Casey 75ac363378 Resolving: MNG-879. Now, all isSnapshot() stuff for the release plugin is handled by ArtifactUtils, so it's possible to reuse the logic rather than replicate it.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289311 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 20:40:43 +00:00
Brett Leslie Porter 8cad4f0854 correct parsing of versions that appear to have a build number, but don't otherwise match the format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280509 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 05:44:07 +00:00
Brett Leslie Porter e62f7b0956 always use the nearest as that is the defined strategy for now. If we change the strategy to newest, a different approach is needed than just adjusting the node range as it doesn't take into account the right children.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280489 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 04:20:44 +00:00
Brett Leslie Porter 6d41274595 clean up unused code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280237 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 02:11:12 +00:00
Brett Leslie Porter 3a4b91b310 PR: MNG-613
push shared code into metadata manager

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280232 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 01:23:23 +00:00
Brett Leslie Porter 27ad44e116 PR: MNG-613
refactoring to a more consistent interface for metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280186 13f79535-47bb-0310-9956-ffa450edef68
2005-09-11 22:01:47 +00:00
Brett Leslie Porter 285d97d93c PR: MNG-847
merge metadata if it is duplicated

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280086 13f79535-47bb-0310-9956-ffa450edef68
2005-09-11 07:08:55 +00:00
Brett Leslie Porter 9c060b192a PR: MNG-613
Completion of the version selection from a range.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279720 13f79535-47bb-0310-9956-ffa450edef68
2005-09-09 06:49:59 +00:00
Brett Leslie Porter ba35fd5965 PR: MNG-613
use new metadata in bootstrap

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279535 13f79535-47bb-0310-9956-ffa450edef68
2005-09-08 08:28:06 +00:00
Brett Leslie Porter 3a4efa1029 PR: MNG-613
make sure versions are aggregated

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278961 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 09:52:37 +00:00
Brett Leslie Porter cb2370199b PR: MNG-613
deploy snapshot information to the correct directory and fix some other minor issues

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278930 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 06:58:44 +00:00
Brett Leslie Porter 00e365d2ce PR: MNG-613
merge all metadata fields on update

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278898 13f79535-47bb-0310-9956-ffa450edef68
2005-09-06 01:55:04 +00:00
Brett Leslie Porter 8f3c207194 PR: MNG-613
changes versioning to use repository metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278881 13f79535-47bb-0310-9956-ffa450edef68
2005-09-05 23:12:55 +00:00
Trygve Laugstol 488cac14ff o Adding newline at end of file.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@278605 13f79535-47bb-0310-9956-ffa450edef68
2005-09-04 15:56:52 +00:00
Brett Leslie Porter 6a5e89785e PR: MNG-639
Separate local metadata by repository to ensure it remains consistent

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267466 13f79535-47bb-0310-9956-ffa450edef68
2005-09-03 14:38:13 +00:00
Brett Leslie Porter abd4ae6018 PR: MNG-613
make repository metadata behave more like snapshots with daily updates.
next step is to move the version checking to use that instead and fallback to the old files

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@266298 13f79535-47bb-0310-9956-ffa450edef68
2005-09-02 07:16:16 +00:00
Brett Leslie Porter a3a73ebaec allow a version of "02", for example
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@266297 13f79535-47bb-0310-9956-ffa450edef68
2005-09-02 07:06:45 +00:00
Brett Leslie Porter 9b6a7939db rename group metadata
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@265618 13f79535-47bb-0310-9956-ffa450edef68
2005-09-01 01:56:04 +00:00
Brett Leslie Porter c991b41571 refactoring towards similar pattern of artifact metadata
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264967 13f79535-47bb-0310-9956-ffa450edef68
2005-08-31 08:11:47 +00:00
John Dennis Casey 8201bb9d18 Adding system scope...uses scope == 'system' and systemPath in dependency. SystemPath was chosen over mappings inside the setings.xml for scalability, heritability, and injectability (via managed deps).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264960 13f79535-47bb-0310-9956-ffa450edef68
2005-08-31 07:39:01 +00:00
Brett Leslie Porter e0457b0204 PR: MNG-613
reorganise in preparation for generalised repository metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264091 13f79535-47bb-0310-9956-ffa450edef68
2005-08-29 06:37:33 +00:00
Brett Leslie Porter 0481c45fc9 repair snapshot build numbering (previous code makes it get stuck at 1).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240405 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 11:42:30 +00:00
Brett Leslie Porter 22748d4e0d PR: MNG-634
add a "useScope" attribute to the dependencies task so that you can determine what dependency set you want

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239682 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 15:06:54 +00:00
John Dennis Casey 146e022327 Resolving: MNG-251
o Added transformation manager
o snapshot timestamp/buildnumber is now managed from the transformation rather than the metadata
o maven-archiver now clones the MavenProject and resolves snapshot versions for introduction into manifest and exported pom.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239219 13f79535-47bb-0310-9956-ffa450edef68
2005-08-22 19:00:51 +00:00
Brett Leslie Porter 932caa362a PR: MNG-729
fix artifact handler instantiation when the plugin extension is declared in a project that uses that packaging itself

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233480 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 13:15:07 +00:00
Brett Leslie Porter 441219f137 remove plexus definitions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233436 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 06:13:28 +00:00
John Dennis Casey 659a1f4736 Fixing some things:
o Artifact attachment via MavenProjectHelper was using string literals of the variables I was trying to use to fill in type and classifier (dumb, I know!)

o Source plugin didn't have an @phase for the JarSourceMojo...added, then added the goal configuration in the release profile in the super-pom

o Removed the source plugin bindings for the lifecycle mappings in maven-core

o Re-added [deprecated] method MavenProjectBuilder.build( File, ArtifactRepository, List )...you should use MavenProjectBuilder.build( File, ArtifactRepository, ProfileManager ) instead.

o Added profile handling/injection for the super-pom in two places: in buildStandaloneSuperPom() and in private build(..). This enables injection of the release profile which is provided in the super-pom.

o Added integration test to verify that using -DperformRelease=true results in the sources being attached...to override this behavior, another profile keyed on -DperformRelease could turn the 'attach' param for the source plugin off.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233245 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 19:23:45 +00:00