Commit Graph

2404 Commits

Author SHA1 Message Date
Brett Leslie Porter b42c7d3c66 PR: MNG-479
child repositories have precedence over parents with the same ID

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225465 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 06:20:40 +00:00
Brett Leslie Porter 740f7ad838 clean up and reformatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225464 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 06:14:59 +00:00
Brett Leslie Porter 8b01ca10f7 PR: MNG-226
implement extension mechanism

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225463 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 06:14:20 +00:00
Brett Leslie Porter 527c6b4990 ignore target
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225462 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 06:10:00 +00:00
Vincent Siveton 7670af82a1 Fix a typo for bottom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225450 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 04:09:34 +00:00
Vincent Siveton 5125817f61 MNG-599: Using the organization name and the inception year in the Velocity template
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225446 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 03:12:55 +00:00
John Dennis Casey 31ac06f7e2 Working on: MNG-521
o Cleaned up output from discovery of MavenProjectBuilder instance in MavenProjectTestCase.
o Added <relativePath/> to parent in maven.mdo (default value is '../pom.xml')
o Added filesystem parent-POM search using <relativePath/>...if discovered pom doesn't match the parent specification (g🅰️v), then it's not used - the parent is resolved - and search for ancestor POMs on disk goes no further.

NOTE: Next thing is to reactor-ize the release plugin, then MNG-521 should be implemented.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225379 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 19:45:45 +00:00
Emmanuel Venisse 5a23f868e9 move plexus packaging back
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225376 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 19:12:01 +00:00
Brett Leslie Porter 3cb2e3e2ec these use the it plugin, also need plugin repository setting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225332 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 15:42:33 +00:00
Brett Leslie Porter c577901fb4 cleanup
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225326 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 15:24:35 +00:00
Brett Leslie Porter 971fdc43b0 fix in case of a non-existant local repo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225322 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 15:11:21 +00:00
John Dennis Casey 89371bb7fd Adding null checks for lists of artifacts before mapping them...now methods will simply return empty Map instances if null lists are passed in.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225321 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 15:00:36 +00:00
Brett Leslie Porter 17991ceea7 cleanup
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225317 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 14:41:35 +00:00
Brett Leslie Porter eeafd40d9e snapshots have moved
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225316 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 14:24:38 +00:00
Brett Leslie Porter 3c68ec366c no need for the manager - it is stored in the artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225315 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 14:22:13 +00:00
Brett Leslie Porter 2d666f57a7 move main J2EE packaging definitions back to being built in
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225311 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 14:00:23 +00:00
Brett Leslie Porter 443a67df1d better error message for missing deployment repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225296 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 12:51:04 +00:00
Vincent Siveton cbb5657526 MNG-588: Throw an exception if two index files already exist
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225290 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 12:33:12 +00:00
Brett Leslie Porter 4b36d0a017 remove deprecation that was intended to happen, but the other changes got backed out
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225285 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 12:14:27 +00:00
Vincent Massol 9f5fbe1f72 MNG-628: No more clover.html + no more site resources generated. Done this time by extending AbstractMavenReport and overriding it's main methods (generate() and execute()). AbstractMavenReport would need to add native support for external reports to have something clean (see MNG-645)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225271 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 10:44:31 +00:00
Vincent Siveton 524a4602c4 MNG-477: Trying to unpack none jar file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225270 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 10:44:06 +00:00
Vincent Massol c692568a42 Do not extend AbstractMavenReport as it does not support externally generated HTML report files (see MNG-645). Indeed, in our case it is Clover which generates the report files.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225267 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 09:48:04 +00:00
Brett Leslie Porter e78bef0429 PR: MNG-598
implement ability to retrieve packaging handlers (lifecycle mappings) from extension plugins. Remove plugin mapping
metadata for the same
integration tests are in place for type handlers but commented out until implemented (41)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225263 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 09:04:32 +00:00
Brett Leslie Porter 999f9393eb more ignores
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225243 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 06:39:02 +00:00
Brett Leslie Porter e55dfab2c9 ignore!
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225242 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 06:38:10 +00:00
Brett Leslie Porter d948fb0322 doesn't accept -D args
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225237 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 06:11:52 +00:00
Brett Leslie Porter 8aeb62e580 use a file that has to be there :)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225236 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 05:57:26 +00:00
Brett Leslie Porter 26f56f9f99 allow passing of integration test numbers to run from the CLI
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225235 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 05:56:35 +00:00
John Dennis Casey 73e549b231 o Fixing resolution of LATEST in plugin-versions, when <useLatest/> is enabled in plugin-registry.xml, or when --check-plugin-latest is specified on the command line.
o Fixing core-library resolution for expression: ${plugin.artifacts} and ${plugin.artifactMap} (latter is keyed by g:a)

o Modified maven-core-it-plugin to accept something like "-DartifactToFile=org.apache.maven:maven-artifact"...it'll lookup that artifact in ${plugin.artifactMap}, and touch a file that's a mutation of the abs. path for that artifact.

o Added pomArtifact to ResolutionGroup, since the MavenMetadataSource ALWAYS creates a new Artifact for a pom...this allows us to retrieve the resolved Artifact for that pom.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225234 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 05:54:24 +00:00
Brett Leslie Porter 96dfb0ba8f lines may have spaces - use setLine instead of setValue
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225233 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 05:13:27 +00:00
John Dennis Casey 4b1038de53 Working on: MNG-607
o Added '-f' CLI option, to allow use of non-standard pom files, or spawning of a build from outside of the project dir.
o Added preferential processing of release-pom.xml over pom.xml if it exists (assumes that the current checkout is a release of the software)
o Moved all file discovery from MavenCli to DefaultMaven, to allow embedders to have access to this logic.
o Modified MavenExecutionRequest to add a flag for reactor-activation and the name of a non-standard pom to use, if appropriate.
o Removed getFiles() and getProjectFiles() from MavenExecutionRequest, since file discovery is now done in the DefaultMaven.
o Added integration tests to check preference of release-pom.xml in standalone and '-r' mode
o Added integration tests to check usage of '-f' option within and outside of the project directory
o Added processing for cli-options.txt to maven-core-it-verifier (Verifier.java) to allow specification of '-f' and '-r' in tests


NOTE: the release plugin still doesn't correctly remove the release-pom.xml from HEAD/trunk, since I don't have access to the SCM remove command from maven-scm. I'm waiting for Emmanuel to finish some API changes before moving to the new maven-scm version, and implementing this final step.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225226 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 03:55:37 +00:00
John Dennis Casey 3251b41d8e Correcting core-library resolution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225208 13f79535-47bb-0310-9956-ffa450edef68
2005-07-25 23:50:13 +00:00
John Dennis Casey cfccde2596 Fixing minor typo in license
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225181 13f79535-47bb-0310-9956-ffa450edef68
2005-07-25 20:59:16 +00:00
Brett Leslie Porter 086463b5b4 PR: MNG-456
allow separate snapshot and release repositories
deprecate existing snapshotPolicy and checksumPolicy in favour of updatePolicy and checksumPolicy within the <releases> and <snapshots> elements in the <repository> element.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224707 13f79535-47bb-0310-9956-ffa450edef68
2005-07-25 09:51:12 +00:00
Jason van Zyl 7a2d130893 o applying a small patch by stephane to get the RAR plugin working.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224478 13f79535-47bb-0310-9956-ffa450edef68
2005-07-23 16:56:41 +00:00
John Dennis Casey 701ef520a3 Working on MNG-607
o Changed MavenMetadataSource to a component, to avoid having to lookup artifactFactory and projectBuilder in order to 
  construct it.

o Added add(..) method to ScmBean in the release plugin to allow addition of release-pom.xml

o Changed the PrepareReleaseMojo to resolve ONLY version and parent-version for the normal pom.xml, and fully resolve all
  artifacts used in the release-pom.xml, including version, parent-version, dependency closure (given by project.getArtifacts()), plugins, and reports. It will then add the release-pom.xml, and (attempt to) delete it before performing the final commit for next development version.

o Added some mapping methods to ArtifactUtils, to key by artifact.getId, and to create an Artifact.getId()-compatible string from parameters.

o Added TestProjectBuilder to remove the requirement in ProjectClasspathTest to modify the fields of the project builder directly.

o Cleaned up the AbstractReleaseMojo and PrepareReleaseMojo to avoid container lookups...they're now mojo parameters with the 'component.' prefix.

NOTE: Next step is to figure out how to use maven-scm to remove an SCM resource, to enable the prepare mojo to take the release-pom.xml back out of HEAD after the tag is complete.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224413 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 22:07:28 +00:00
Brett Leslie Porter 22282d4f24 typo caused nothing to get included
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224369 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 17:29:23 +00:00
Brett Leslie Porter 17fa8ba4ea PR: MNG-581
Submitted by: Kris Bravo
Reviewed by:  Brett Porter
add classes directory to compile classpath as some classes are produced during generate-sources to pass to the compiler for XML beans


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224367 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 17:00:22 +00:00
Brett Leslie Porter fd615cbeea PR: MNG-579
correct inclusion of tlds

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224365 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 16:51:09 +00:00
Brett Leslie Porter f313b209dd logo not in 4.0.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@221839 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 16:02:11 +00:00
Brett Leslie Porter f37561b2e3 PR: MNG-595
Submitted by: Jesse McConnell
Reviewed by:  Brett Porter
add support for -encoding flag to javac


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220765 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 15:57:10 +00:00
Brett Leslie Porter bb79e8614d tidy up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220350 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 15:42:16 +00:00
Brett Leslie Porter 67a2c243fb reenable tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220346 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 15:37:46 +00:00
Brett Leslie Porter 8c3bbcc397 PR: MNG-593
ensure there are no duplicates in the assembled model's dependency list

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220344 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 15:36:34 +00:00
Brett Leslie Porter 7073a7c7ad use type handler's classifier
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220326 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 14:18:04 +00:00
Brett Leslie Porter 235cf9a0d5 correct equals
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220324 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 14:17:24 +00:00
Brett Leslie Porter c6b4b521d7 make note
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220323 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 14:09:14 +00:00
Brett Leslie Porter c4ce488e47 reformat
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220321 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 13:52:21 +00:00
Brett Leslie Porter 6e6c12a647 general cleanup
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220319 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 13:43:45 +00:00
Brett Leslie Porter 36d0a854e1 PR: MNG-518
fix up validation

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220318 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 13:42:55 +00:00