Commit Graph

75 Commits

Author SHA1 Message Date
Brett Leslie Porter 56f566e79e clean some imports and unused code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327885 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 23:50:38 +00:00
Brett Leslie Porter d003003af6 update eol-style
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327853 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 20:19:50 +00:00
Brett Leslie Porter 4c8f23c0a0 PR: MNG-937
Submitted by: Johnny R. Ruiz III
fix incorrect JRE classpath entry in eclipse .classpath file

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327852 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 20:14:59 +00:00
Brett Leslie Porter 7f635f887c PR: MNG-1093
Submitted by: Edwin Punzalan
use the more standard basedir notation

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327840 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 19:40:14 +00:00
John Dennis Casey 9eb9a4682b Resolving: MNG-1076 Added ability to detect system scoped dependencies, and add them as external jar references rather than kind=var references. Included some new messages for handling this case, as well.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@325905 13f79535-47bb-0310-9956-ffa450edef68
2005-10-17 14:59:47 +00:00
Brett Leslie Porter c2498523b8 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321401 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 18:16:07 +00:00
Brett Leslie Porter 569e413939 [maven-release-plugin] prepare release maven-eclipse-plugin-2.0-beta-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321399 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 18:15:47 +00:00
Brett Leslie Porter 6e0d411886 PR: MNG-1196
Submitted by: Johnny R. Ruiz III
rename variable to avoid conflict with m1


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321336 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 13:31:20 +00:00
Brett Leslie Porter 92de4af9fa PR: MNG-793
Submitted by: Allan Ramirez
only write properties when changed to avoid unnecessary diffs


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321324 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 12:37:14 +00:00
Brett Leslie Porter cc6092fca1 PR: MNG-578
only add classpath dependencies

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321308 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 07:46:56 +00:00
Brett Leslie Porter d095c64b00 update versions in plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321048 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 08:08:16 +00:00
Brett Leslie Porter 665759970a PR: MNG-578
use test artifacts - its the widest scope so includes everything, but also does a "isAddedToClasspath" check so only jar, ejb, etc are added.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320794 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 16:30:48 +00:00
Fabrizio Giustina 9769ca45a5 also delete .wtpmodules files + some code cleanup
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@315062 13f79535-47bb-0310-9956-ffa450edef68
2005-10-12 22:26:50 +00:00
Brett Leslie Porter 14db4338c1 clean up eclipse plugin exception handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@314944 13f79535-47bb-0310-9956-ffa450edef68
2005-10-12 15:21:42 +00:00
Brett Leslie Porter 510de4fe54 upgrade plexus utils to 1.0.4-SNAPSHOT.
The group ID has changed, so add a bunch of exclusions to ensure the old is not picked up
fix bugs in mboot that wasn't honoring excludes.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307294 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 14:13:31 +00:00
Brett Leslie Porter 245d512c4a PR: MNG-1110
differentiate between an artifact that is not found, and failure to obtain an artifact

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307034 13f79535-47bb-0310-9956-ffa450edef68
2005-10-07 06:44:59 +00:00
Brett Leslie Porter c4b203dd62 use released versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293592 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 12:29:10 +00:00
Brett Leslie Porter cfa8ba1eff line up test and used version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293543 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 05:47:09 +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 78e74cd7fe lining up versions. still use beta-1 where appropriate
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291803 13f79535-47bb-0310-9956-ffa450edef68
2005-09-27 00:56:40 +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 190b1f077c Resolving: MNG-907.
Patch applied, thanks Hiram!



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290778 13f79535-47bb-0310-9956-ffa450edef68
2005-09-21 18:36:16 +00:00
Brett Leslie Porter df44d4ed84 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289506 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 12:06:37 +00:00
Brett Leslie Porter 118ab4ee2c [maven-release-plugin] prepare release maven-eclipse-plugin-2.0-beta-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289504 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 12:06:18 +00:00
Brett Leslie Porter c44890b92c update dependency and parent versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289378 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 04:30:44 +00:00
Brett Leslie Porter e3899c9cbc fix eclipse plugin tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289359 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 01:37:39 +00:00
Kenney Westerhof c9bf147e29 o EclipsePlugin now does NOT download sources by default.
Specify -Declipse.downloadSources=true to do so.

o WarMojo produces an artifact, even if exploded is specified. This makes sure
  that the install phase doesn't fail because there's no artifact.

o DependenciesReport: add caught exception to the new thrown exception
  for better messages.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289353 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 00:37:58 +00:00
Kenney Westerhof 334b952859 o Did some refactoring: moving utility methods to EclipseUtils so there's no
confusion as to which project is used.

o Use executedProject everywhere except for acquiring the artifact list; the 
  executedProject misses that list (that's because no deps are resolved in
  the forked lifecycle execution; it's delayed until the plugin is encountered
  and it's requiresDependencyResolution is seen.)

o Added flag -Declipse.downloadSources=true|false to skip source downloading


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289188 13f79535-47bb-0310-9956-ffa450edef68
2005-09-15 10:14:32 +00:00
Brett Leslie Porter 6b229cd09a PR: MNG-824
Submitted by: Edwin Punzalan
Reviewed by:  Brett Porter
add goals that are in the m1 version


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280260 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 05:32:22 +00:00
Brett Leslie Porter fe3df1bd1d PR: MNG-760
Submitted by: Fabrizio Giustina
Reviewed by:  Brett Porter
m2 eclipse plugin improvements (source download and attachment, customization of natures/builders/conclasspath, flexible project dupport) and refactoring
(applied with modifications)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280259 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 05:27:40 +00:00
Kenney Westerhof 9da1858237 Fixed IndexOutOfBouds when <sourceDirectory></sourceDirectory> is specified.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267278 13f79535-47bb-0310-9956-ffa450edef68
2005-09-02 19:15:27 +00:00
Brett Leslie Porter b380d0e2d4 make the ordering predictable by sorting the key set.
Switched the key to be the simpler eclipse source root link name.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240187 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 08:05:47 +00:00
Brett Leslie Porter 22365aeefe fix tests:
- ordering of link elements was wrong
- windows path separator was wrong


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240180 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 07:46:12 +00:00
Kenney Westerhof a98961eeed o Fix MNG-410 (and MNG-769, MNG-738). Added testcase project-3 to demonstrate this.
o Added testcase to check generation of eclipse files in
  different location; modified the testcase to support this,
  and deal with the absolute paths.

o Neatified the addSourceLinks/addResourceLinks: using
  a map to keep track of duplicate source folders has the side
  effect of only needing one of those methods; it should
  also be faster :)

o Tried to add support for includes/excludes, but eclipse only
  supports unique source directories; this is typically not the
  case in maven, filters are used to split one resourcedir
  up. Left the code in for future reference.
  TODO: find a way to merge includes/excludes. If only
  the dir where in/excludes are specified is unique, they
  could be written without problem. This requires a preprocessing
  pass.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240143 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 21:28:30 +00:00
Kenney Westerhof ca3882cde6 o Fix MNG-781 (skip null configurations).
That issue is now renamed to the more general problem.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239964 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 23:26:32 +00:00
Kenney Westerhof d6bd62e537 o Fixed MNG-772: applied Jesse McConnell's patch with minor style adjustments,
and did some more code cleanup.

o Tracking with projects have been referenced in order to stop adding the same
  project twice if there's a dep on more than one artifact attachment from a
  project.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239392 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 11:31:46 +00:00
Kenney Westerhof 3dcf43d418 Added support for custom project settings. Currenly only source/target/compliance level
is supported. It is extracted from the maven-compiler-plugin configuration and only
written when the settings deviate from the default.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233267 13f79535-47bb-0310-9956-ffa450edef68
2005-08-17 22:31:48 +00:00
John Dennis Casey fe5a91b0d6 Working on: MNG-483
Fixing profile application to separate profiles discovered in and around POM from those in settings.xml, and apply them separately in the order: 

for-each-project-in-inheritance:{POM, profiles.xml}, settings.xml

Added common interface for accumulating, explicitly activating and deactivating, and retrieving profiles to be applied to a given project. This manager interface (ProfileManager) is general enough to be applicable to both the project-level and settings-level profiles.

Added 'performRelease'-keyed profile to super-POM which will be used by the release plugin and anyone using a parallel process, and which will enable '-DupdateReleaseInfo=true' for the deploy mojo, along with enabling the source attachment for the project.

Added 'attach' parameter to JarSourceMojo to allow local POM to turn off source attachments, overriding release profile in super-pom.

Updated the release:perform mojo to use '-DperformRelease=true' for switching on the new release profile, rather than just using '-DupdateReleaseInfo=true'...



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233013 13f79535-47bb-0310-9956-ffa450edef68
2005-08-16 16:31:02 +00:00
Kenney Westerhof d396f24642 o Put all m2 core dependencies (plexus-container-default and plexus-utils)
under dependencyManagement of m2 and maven-plugins, and removed
  versions in all poms having either as a parent.
  Used version 1.0.2-SNAPSHOT for plexus-utils as that was used in maven-core
  and is not overridable.

o Bumped maven-archiver version to 2.0-beta-1-SNAPSHOT for maven-ear-plugin


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227084 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 21:34:54 +00:00
Kenney Westerhof 872e0972c8 Replacing all \ to / in paths - Eclipse writes windows paths with / and can't
read windows-native paths like C:\Documents and Settings\.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226987 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 11:52:22 +00:00
Kenney Westerhof e300b10792 Removed unused imports and added package declarations to maven-plugin-tools-java
test resources (to stop eclipse from complaining).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226699 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 22:12:34 +00:00
Kenney Westerhof 64887493fe o When eclipse files are created in another location, add a link to the pom;
o Fixed some coding style errors;


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226695 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 21:10:36 +00:00
Kenney Westerhof b294585343 o Project references are now written to .project, so that eclipse
can calculate the build order - no more rebuilds needed to fix this!

o Added a switch -Declipse.workpace=/path/to/workspace that allows for the
  .classpath and .project files to be written to a new directory:
  - For each project a new directory is created.
  - Eclipse 'Links' are created to the original project location for the
    sources and resources directories.
  - The target directory will be in the new workspace location, not in
    the original project tree.
  
  This offers the following advantages:
  
  - Project trees that normally couldn't be imported into eclipse
  because of the overlap error now can be imported succesfully
  (m2 works now!)

  - Projects that reside on a ClearCase SMB mounted drive (which are
  very slow) can now have a target directory on a local drive without
  modifying the pom, greatly improving build speed in eclipse.

o Fixed some minor bugs where the wrong project instance was used.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226669 13f79535-47bb-0310-9956-ffa450edef68
2005-07-31 18:00:13 +00:00
Brett Leslie Porter f9eaca7ab0 PR: MNG-549
Submitted by: Kenney Westerhof
make eclipse plugin reactor aware


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225723 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 07:33:56 +00:00
Brett Leslie Porter 511af3d3e2 PR: MNG-596
add XSD definition to m2 poms and archetypes



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220079 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 13:58:42 +00:00
John Dennis Casey 99bdd48d92 Bumping plexus-utils version to 1.0.1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219984 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 02:17:16 +00:00
Emmanuel Venisse a029d766ce Update all versions to beta-1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@202001 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 15:29:14 +00:00
John Dennis Casey 7826a7b3ca [maven-release-plugin] prepare for development 2.0-alpha-4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201543 13f79535-47bb-0310-9956-ffa450edef68
2005-06-24 02:03:20 +00:00
John Dennis Casey d0e515cbb5 [maven-release-plugin] prepare release 2.0-alpha-3
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201541 13f79535-47bb-0310-9956-ffa450edef68
2005-06-24 02:03:06 +00:00
John Dennis Casey 96bdd2c56b preparing for re-release to fix version.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201532 13f79535-47bb-0310-9956-ffa450edef68
2005-06-24 01:34:55 +00:00