Commit Graph

2588 Commits

Author SHA1 Message Date
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
Brett Leslie Porter 64399eb8e3 TODOs and cleanup
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220314 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 12:50:26 +00:00
Brett Leslie Porter 9c4c5e57ff use prebuilt artifact lists
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220308 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 12:29:50 +00:00
Brett Leslie Porter 418f58e393 fix typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220253 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 07:05:14 +00:00
Brett Leslie Porter 70f2351610 PR: MNG-461
warn, but don't fail, when a POM is not in the repository

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220250 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 06:32:06 +00:00
Brett Leslie Porter ff94d454fa test dud dep
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220249 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 06:28:20 +00:00
Brett Leslie Porter eab42822ef various straightening up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220244 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 05:58:50 +00:00
Brett Leslie Porter b82151f013 PR: MNG-479
Submitted by: Rahul Thakur
Reviewed by:  Brett Porter
if you define a repository it should override anything in the parent with the same ID
Also, cleaned up logic in assembler based on intentions

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220240 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 05:24:19 +00:00
Brett Leslie Porter a4343cf767 PR: MNG-625
allow a plugin to specify the minimum Maven version (will apply for both building and its execution - this should be separated later).

If you are running an older version then it will not prompt to update when found, and will fail if it is encountered with a hardcoded version.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220239 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 05:07:47 +00:00
Brett Leslie Porter dc4c119d76 ignore
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220229 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 02:47:51 +00:00
Brett Leslie Porter a7bae20ee8 add a little more space
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220225 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 01:02:15 +00:00
Brett Leslie Porter bcc5a09105 show relocation in ant, update for beta-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220224 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:59:52 +00:00
Brett Leslie Porter 196919bc07 update component descriptors inline with core changes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220223 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:46:42 +00:00
Brett Leslie Porter 229118d4a1 package before assembly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220222 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:46:15 +00:00
Brett Leslie Porter bc2211c160 actually output the warning message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220221 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:37:22 +00:00
Brett Leslie Porter aa59559efb PR: MNG-507
implement repository relocation of an artifact


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220220 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:31:44 +00:00
Brett Leslie Porter df0009594c use a more normal IT test style for artifact resolution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220219 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:21:57 +00:00