Commit Graph

4176 Commits

Author SHA1 Message Date
Brett Leslie Porter 6dea6cfe21 upgrade plexus-utils
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332260 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 10:08:15 +00:00
Brett Leslie Porter 47788f3930 roll back r332220 as it broke it0063
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332234 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 06:35:25 +00:00
Brett Leslie Porter 03d12b26be PR: MNG-1472
Submitted by: Dan Tran
add starteam support to the release plugin


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332226 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 05:35:19 +00:00
John Dennis Casey 9ceeebc868 PR: MNG-1363
o Disabled version-range checking for system-scoped dependencies...will use recommendedVersion where available, if a concrete version is not available.

o Disabled collection of the transitive deps of a system-scoped dep.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332220 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 04:26:14 +00:00
John Dennis Casey 1bdeecccad PR: MNG-1205
o Fixed unit test for resolving direct optional dependencies.
o Added isChildOfRootNode() method in ResolutionNode, to check whether the parent node's parent is null.
o Added check in the artifact collector to include optional artifacts if they are direct dependencies of the root node.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332213 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 03:14:08 +00:00
John Dennis Casey ed7cc01b88 PR: MNG-699
Submitted By: Piotr Bzdyl
Reviewed By: John Casey

Applied portions of the patch that pertained to the lifecycle mappings and artifact handlers for ejb3/par. The implementations of these plugins is in the sandbox (or soon will be).

Thanks for the patch, Piotr!



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332151 13f79535-47bb-0310-9956-ffa450edef68
2005-11-09 21:36:10 +00:00
Stephane Nicoll 19ab81b689 - MNG-1461: custom application.xml can now be specified properly. Overrides any other file found in the source directories
- MNG-1444: added directory scanner to exclude common directories (subversion, CVS files, etc). Added earSourceIncludes and earSourceExcludes properties to specify the list of tokens to include and exclude respectively.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332123 13f79535-47bb-0310-9956-ffa450edef68
2005-11-09 19:40:29 +00:00
Emmanuel Venisse 4efd043d82 PR: MNG-990
Submitted by Johnny R. Ruiz III
Add basic positional configuration

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332027 13f79535-47bb-0310-9956-ffa450edef68
2005-11-09 12:42:16 +00:00
Carlos Sanchez Gonzalez 52b457411e Moved update poms section outside to be triggered by svn commits
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@331929 13f79535-47bb-0310-9956-ffa450edef68
2005-11-09 00:35:28 +00:00
John Dennis Casey 56a2d33505 Forgot to open up these two methods via the interface...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@331872 13f79535-47bb-0310-9956-ffa450edef68
2005-11-08 19:48:57 +00:00
John Dennis Casey 6f562d4c87 PR: MNG-1320
o Modified private resolveAlways(..) method to throw TransferFailedException, after blacklisting the repository.

o Added handling for the new TransferFailedException as it's thrown from resolveAlways(..). In two cases, where it's not essential that the metadata be non-empty, this exception is ignored. I'm anticipating this will change for 2.1, but for now it's just marked TODO. In the final case (the one that prompted this MNG), the exception is used to inhibit writing of the empty metadata to the local repository when the transfer fails. NOTE: The metadata is still handled the same as before when the system encounters ResourceDoesNotExistException, to prevent re-checking the remote repo on every build.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@331836 13f79535-47bb-0310-9956-ffa450edef68
2005-11-08 16:25:20 +00:00
Brett Leslie Porter 2747d1865d that wasn't really deprecated
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@331163 13f79535-47bb-0310-9956-ffa450edef68
2005-11-06 23:47:23 +00:00
Jason van Zyl 363f82e42d o use the correct method
http://jira.codehaus.org/browse/MNG-1432
  
  Submitted By: Milos Kleint
  


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@331011 13f79535-47bb-0310-9956-ffa450edef68
2005-11-05 18:08:38 +00:00
Jason van Zyl 3edcf5dda5 o give clients an easy way to retrieve a single artifact: in this case milos
wants to be able to download a javadoc JAR.
  


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330999 13f79535-47bb-0310-9956-ffa450edef68
2005-11-05 13:57:53 +00:00
Jason van Zyl 75731b688d o adding some methods to create artifacts
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330997 13f79535-47bb-0310-9956-ffa450edef68
2005-11-05 13:53:33 +00:00
Jason van Zyl 9cacd22ae5 o updating to use the DuplicateProjectException introduced post
2.0.
  


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330996 13f79535-47bb-0310-9956-ffa450edef68
2005-11-05 13:42:23 +00:00
Jason van Zyl 7e9b4b26ef o moving main dependency version on maven forward to 2.0.1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330995 13f79535-47bb-0310-9956-ffa450edef68
2005-11-05 13:37:39 +00:00
Stephane Nicoll 332f8af8e7 PR: MNG-1402
Submitted by: Tomislav Stojcevich
Reviewed by: Stephane Nicoll
Fixed compliance of generated application.xml (display-name and description different in 1.3 and 1.4)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330981 13f79535-47bb-0310-9956-ffa450edef68
2005-11-05 07:31:29 +00:00
Fabrizio Giustina aa07bff6b7 fix missing optional dependencies in .wtpmodules, cleanup test and introduce a test using MavenEmbedder (currently disabled due to a couple of issues, but it should replace the command line test)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330946 13f79535-47bb-0310-9956-ffa450edef68
2005-11-05 00:14:50 +00:00
Jason van Zyl 398995ecb0 o just ran the release:perform again and it was fine ...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330863 13f79535-47bb-0310-9956-ffa450edef68
2005-11-04 18:31:41 +00:00
Jason van Zyl e06f5e77a7 o roll back and try again ...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330862 13f79535-47bb-0310-9956-ffa450edef68
2005-11-04 18:29:37 +00:00
Jason van Zyl 0071336a9a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330852 13f79535-47bb-0310-9956-ffa450edef68
2005-11-04 17:30:54 +00:00
Jason van Zyl a87bbebf8a [maven-release-plugin] prepare release maven-embedder-2.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330850 13f79535-47bb-0310-9956-ffa450edef68
2005-11-04 17:30:23 +00:00
Jason van Zyl 6fa5310c72 o use the released parent POM
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330849 13f79535-47bb-0310-9956-ffa450edef68
2005-11-04 17:28:45 +00:00
Jason van Zyl 92d1e4144f git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330847 13f79535-47bb-0310-9956-ffa450edef68 2005-11-04 17:24:52 +00:00
Jason van Zyl 155a9fbc78 o clean up the dependencies in the POM, i really only need to depend on the
core and everything else will come in transitively
  
o rolling things back to use the 2.0 release maven artifacts, i can
  subsequently, deploy 2.0.1-SNAPSHOTs and when 2.0.1 is released I will
  release 2.0.1 of the embedder. I think the releases of the embedder must
  follow closely on the heels of Maven itself.
  


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330845 13f79535-47bb-0310-9956-ffa450edef68
2005-11-04 17:12:29 +00:00
Jason van Zyl 86ccccf3c0 o this should really be called 2.0.1-SNAPSHOT as that's what the
dependencies are on.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330832 13f79535-47bb-0310-9956-ffa450edef68
2005-11-04 16:11:45 +00:00
John Dennis Casey 0578ed6458 Adding unit test to ensure that system-scoped artifacts are always propagated at system scope, ignoring inheritedScope from the transitive parent.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330818 13f79535-47bb-0310-9956-ffa450edef68
2005-11-04 15:00:59 +00:00
Jason van Zyl 417d4ffff0 o use the latest release of the assembly plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330807 13f79535-47bb-0310-9956-ffa450edef68
2005-11-04 13:50:10 +00:00
John Dennis Casey 223b12ba90 Adding test case for preserving system scope on transitively resolved deps.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330681 13f79535-47bb-0310-9956-ffa450edef68
2005-11-04 01:39:23 +00:00
John Dennis Casey ef942be7aa PR: MNG-1322
Submitted By: Allan Ramirez
Reviewed By: John Casey

Applied. Thanks, Allan.

Minor change I made was to throw a MojoFailureException with the offending path, rather than logging to the error message-level.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330646 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 21:56:25 +00:00
John Dennis Casey 154fa37604 PR: MNG-1345
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied Edwin's patch to create the resource-target directory if it doesn't exist. Thanks for the work, Edwin!

Also, I modified this patch slightly per Jerome's suggestion, to fail with a message if outputDir.mkdirs() doesn't succeed. This is fine, since it's within the scope of !outputDir.exists().



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330639 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 21:17:07 +00:00
John Dennis Casey c63c860065 Fixing problem with system scope being overridden by transitive parent's scope. System scope is always preserved now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330634 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 21:09:08 +00:00
Brett Leslie Porter 726e0fda4d fix UTC calculation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330499 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 07:15:56 +00:00
Lukas Theussl 789c4808cd MNG-1400: German translation
Original submission by Michael Wechner
Reviewed and completed by Lukas Theussl


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330482 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 06:36:22 +00:00
Brett Leslie Porter 7e5631b975 start moving directories to integration-tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330474 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 05:56:24 +00:00
Brett Leslie Porter dbf917c318 remove directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330473 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 05:51:23 +00:00
Brett Leslie Porter 41fb430152 moved sandbox
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330451 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 04:59:08 +00:00
Brett Leslie Porter 58cd5a1d93 move site out of components
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330439 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 04:21:08 +00:00
Brett Leslie Porter c566d0e396 moved to ../archetype/trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330434 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 04:02:40 +00:00
Brett Leslie Porter fc3646e539 PR: MNG-1321
Submitted by:  	 Bruno Essmann
recognise file:// url's without a hostname for the license

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330394 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 00:23:03 +00:00
Brett Leslie Porter 2ed5c152fb PR: MNG-1217
Submitted by: Edwin Punzalan
Improve relocation error message

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330393 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 00:18:31 +00:00
John Dennis Casey 1be64231cf PR: MNG-1251
Submitted By: Jerome Lacoste
Reviewed By: John Casey

I did not apply this patch. A better solution was to initialize the artifact data a little more thoroughly, and only delegate those methods which must track changes to the main artifact (like version info, groupId, and artifactId...essentially, the things that determine how to locate metadata on the repository). For these delegating methods, I've disabled the corresponding setter methods with UnsupportedOperationException to indicate that these attributes must be managed via the main artifact, and why. The MavenProjectHelper will now lookup the proper ArtifactHandler for the given attachment type, and pass that on to the AttachedArtifact constructor also.

Jerome, thanks very much for the effort in exploring this issue. I appreciate the help.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330392 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 00:17:26 +00:00
Brett Leslie Porter 367d7e5a57 PR: MNG-1279
Submitted by:  	 Philipp Meier
add missing model version to generated pom

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330391 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 00:05:11 +00:00
Brett Leslie Porter bcb11b18fc PR: MNG-996
Submitted by: Johnny R. Ruiz III
add a project for the reactor root, excluding children

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330382 13f79535-47bb-0310-9956-ffa450edef68
2005-11-02 23:31:31 +00:00
John Dennis Casey 350076bdb9 Changing the location of the Artifact-cloning method from org.apache.maven.artifact.factory.ArtifactFactory.cloneArtifact(..) to org.apache.maven.artifact.ArtifactUtils.copyArtifact(..), which is now a static method. This separates the copy method from a specific artifact implementation, while at the same time avoiding embedding of this method in a component instance.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330342 13f79535-47bb-0310-9956-ffa450edef68
2005-11-02 20:10:40 +00:00
Brett Leslie Porter b9bef589d8 PR: MNG-998
link modules in the reactor

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330221 13f79535-47bb-0310-9956-ffa450edef68
2005-11-02 09:10:28 +00:00
Brett Leslie Porter 28c51a2915 PR: MNG-904
Submitted by: Allan Ramirez
exclude individual directories, but not generated sources
(applied with modifications)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330212 13f79535-47bb-0310-9956-ffa450edef68
2005-11-02 08:36:44 +00:00
Brett Leslie Porter d7addab2d0 PR: MNG-1314
Submitted by: Johnny R. Ruiz III
IDEA 5.0 compatible JDK setting

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330210 13f79535-47bb-0310-9956-ffa450edef68
2005-11-02 08:21:02 +00:00
Brett Leslie Porter d848ba2acd PR: MNG-1232
Submitted by: Jerome Lacoste
avoid NPE in error reporting under some circumstances

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330207 13f79535-47bb-0310-9956-ffa450edef68
2005-11-02 08:03:25 +00:00