Commit Graph

357 Commits

Author SHA1 Message Date
Brett Leslie Porter 9d6fad725a change @requiresDependencyResolution to take a scope (default is "runtime" if no scope specified, none if tag not specified at all).
This still means ALL tests get the test dependencies of their compile time dependencies. Check if there is really a valid use case for that.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163780 13f79535-47bb-0310-9956-ffa450edef68
2005-04-05 08:17:28 +00:00
Brett Leslie Porter 29d70b8f7d work with spaces in path on Windows NT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163778 13f79535-47bb-0310-9956-ffa450edef68
2005-04-05 06:48:51 +00:00
Brett Leslie Porter 935cda15da clean up dependencies.
Still need to clean up ~/maven2/lib and some large dependencies from marmalade that
shouldn't be needed in general - but down to about a 3Mb repository.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163775 13f79535-47bb-0310-9956-ffa450edef68
2005-04-05 04:11:03 +00:00
John Dennis Casey fcb7a1c14b o Simplified the ResourcesMojo to eliminate the need for a ResourceEntry class, which is easily replaced by usage of a TreeMap (avoid the NoClassDefFoundError from before SEE MNG-243)
o Changed the references to repo1.maven.org for central repository to repo1.maven.org/maven2 in preparation for switchover to ibiblio.org

    This will allow us to transparently switch between redirects and CNAME changes for referencing ibiblio.org, since ibiblio will not allow a
    vhost for m2 or a rewrite rule...switching the URL for the repo will allow changes to the CNAME (satisfy ibiblio's pathing) while at the same
    time allowing the use of redirects (redirect can be at /maven2/index.html rather than /index.html, f.e.).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163772 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 21:32:53 +00:00
John Dennis Casey 1940becc59 o Adding checklist for deploying the repository layout/pom style changes in advance of a m2 alpha-1 rollout.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163770 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 20:45:24 +00:00
Brett Leslie Porter 5984f13c02 handle spaces in $M2_HOME
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163769 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 16:16:34 +00:00
Brett Leslie Porter d60fd2d736 make m2 script more like Maven 1.x which is better tested
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163767 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 15:37:26 +00:00
Brett Leslie Porter 2e3e41fddf transitive deps in mboot. Will now proceed to trim up the POMs. Still need to trim ~/maven2/lib also.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163764 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 14:35:06 +00:00
Brett Leslie Porter 1398ab68c4 make m2 use the local repository in the new layout
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163761 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 06:47:21 +00:00
Brett Leslie Porter baca1f7841 make surefire and rest of m2 independent of repo layout
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163751 13f79535-47bb-0310-9956-ffa450edef68
2005-04-04 03:48:01 +00:00
Brett Leslie Porter 97eb92041d treat empty expressions as non-existant
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163742 13f79535-47bb-0310-9956-ffa450edef68
2005-04-01 16:14:30 +00:00
Brett Leslie Porter 49593155d0 update poms for releases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163741 13f79535-47bb-0310-9956-ffa450edef68
2005-04-01 16:03:43 +00:00
Brett Leslie Porter 3cd42b2ee0 put back default test includes/excludes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163740 13f79535-47bb-0310-9956-ffa450edef68
2005-04-01 05:47:29 +00:00
Brett Leslie Porter 67f300571a add comment
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163737 13f79535-47bb-0310-9956-ffa450edef68
2005-04-01 02:53:10 +00:00
Brett Leslie Porter 369eb05569 refactor plugin configuration finding and mergine into MavenProject
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163724 13f79535-47bb-0310-9956-ffa450edef68
2005-03-31 09:32:43 +00:00
Brett Leslie Porter 92600f4e55 don't override existing fields with a null value
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163717 13f79535-47bb-0310-9956-ffa450edef68
2005-03-30 08:15:36 +00:00
Brett Leslie Porter 8fc9b6db13 make the offline switch set a global snapshot policy of "never" for now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163712 13f79535-47bb-0310-9956-ffa450edef68
2005-03-30 04:52:01 +00:00
Brett Leslie Porter eabafcc093 implement snapshot policies: default is to only check once a day (after crossing midnight), or if --update-snapshots (-U) is specified on the command line
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163711 13f79535-47bb-0310-9956-ffa450edef68
2005-03-30 03:30:08 +00:00
Emmanuel Venisse 9cf7d63d25 Fix settings file path for windows.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163708 13f79535-47bb-0310-9956-ffa450edef68
2005-03-29 19:53:27 +00:00
Trygve Laugstol 80b1b94fd3 o Moving the logging statement to initialize() to make the component less
verbose.
o Moving the default settings path value to plexus.xml (and components.xml).
o Setting the correct license and adding @version tags.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163707 13f79535-47bb-0310-9956-ffa450edef68
2005-03-29 17:06:30 +00:00
Brett Leslie Porter d3781103e8 change resolve() methods to not return Artifact - but instead modify the original. Artifact is immutable except for version so it is safe - but will it cost flexibility later. Currently, this makes it much simpler as less copying vigilance is required.
This has ironed out most wrinkles. Still need to implement the snapshot checking cache, and special case the use of installed snapshots over deployed ones.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163706 13f79535-47bb-0310-9956-ffa450edef68
2005-03-29 16:41:13 +00:00
Brett Leslie Porter 16ea34c8c1 snapshot resolution working, with glitches. committing working copy that is only enabled by a sys property until other features are in place.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163705 13f79535-47bb-0310-9956-ffa450edef68
2005-03-29 15:44:28 +00:00
Brett Leslie Porter 4a065a33db create parent directories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163704 13f79535-47bb-0310-9956-ffa450edef68
2005-03-29 07:12:50 +00:00
Brett Leslie Porter 2fb808c703 fix repository inheritence
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163703 13f79535-47bb-0310-9956-ffa450edef68
2005-03-29 07:02:29 +00:00
Trygve Laugstol 16ea6ce332 o Fixing a NullPointerException in the value extractor if the specified getter
didn't exists. The value extractor will now return null if the getter doesn't
  exists.
o Properly implemented the method caching in the value exctrator.
o Changed the RegexBasedModelInterpolator so it would properly handle null
  values. It used to convert null to "null" and then insert that, now it will
  leave the expression as is.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163696 13f79535-47bb-0310-9956-ffa450edef68
2005-03-28 14:37:41 +00:00
Brett Leslie Porter 39a96456cd can't do this yet
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163695 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 16:16:49 +00:00
Brett Leslie Porter ff261cd131 more bug fixes for artifact cloning
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163694 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 16:08:48 +00:00
Brett Leslie Porter 004c6cbdf3 snapshot resolution. commented out due to issues surrounding pom/artifact pairing
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163692 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 14:52:25 +00:00
Brett Leslie Porter 895de57874 clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163691 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 13:05:36 +00:00
Brett Leslie Porter 5db2c4cf56 rewrite POM with new version on deployment
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163689 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 12:22:05 +00:00
Brett Leslie Porter 7573893dac fix goal configuration again
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163686 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 09:20:04 +00:00
Brett Leslie Porter 3f0f786e67 transform deployment of SNAPSHOT.
Currently, the POM and artifact are deployed separately, causing an inconsistent version to be written out.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163684 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 08:45:37 +00:00
Brett Leslie Porter 886d787bf4 fix NPE when there is no goal configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163683 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 07:54:34 +00:00
Brett Leslie Porter ee15019eb8 refactor maven-artifact: first pass, reduce the usage of setPath()
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163681 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 05:01:06 +00:00
Brett Leslie Porter d0e15a1f37 remove unused class
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163680 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 04:44:41 +00:00
Brett Leslie Porter 9532b897aa make abstract - contains no tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163679 13f79535-47bb-0310-9956-ffa450edef68
2005-03-24 04:44:12 +00:00
Brett Leslie Porter 5e2caf89c7 o put all of the path functions back into the artifact handler manager - that class likely needs a rename.
o Removed AbstractArtifactComponent as it was simply delegating to the class and prevented other inheritence for the resolver which seems more appropriate.
o fixed test failure in ProjectClasspathTest due to incorrectly constructed component - using plexus even though still working around the problem with a hack


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163675 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 08:42:57 +00:00
Brett Leslie Porter 14bb2c805a change the maven group ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163670 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 06:52:55 +00:00
Brett Leslie Porter 1468ecbbad reformat
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163667 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 01:16:49 +00:00
Brett Leslie Porter b84d4bc35e revert <includes> and <excludes> in MDO to old format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163666 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 14:26:28 +00:00
Brett Leslie Porter 32416cf540 check super classes for fields to set
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163655 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 12:28:36 +00:00
Brett Leslie Porter d9a6576761 don't aggregate plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163654 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 11:42:23 +00:00
Brett Leslie Porter 3a1e4f0199 clean up plugin configuration handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163653 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 11:29:55 +00:00
Brett Leslie Porter e0e405fe68 clean up plugin configuration handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163652 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 10:46:55 +00:00
Brett Leslie Porter 336fa855be close file handle
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163651 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 10:07:01 +00:00
Brett Leslie Porter 297f542553 remove extension from artifact - it is the sole reponsibility of the artifact handler. This prevents the error of plugins getting the extension "maven-plugin"
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163647 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 07:23:17 +00:00
John Dennis Casey 590e952f02 CHANGES
------------------------

o Factored the layout for a repository into a separate set of components in o.a.m.a.repository.layout

o Added new DefaultRepositoryLayout that uses the repo layout in http://docs.codehaus.org/pages/viewpage.action?pageId=22230 (it is not used by default until we get the repo1 conversion done)

o Added command-line switches to force legacy local-repo or new format (-a/-A, I know, but try to find something that makes more sense!)

o Added path formatting to the repository itself, which is now constructed with a ArtifactRepositoryLayout instance (since layout should be tied to the repository)

o Removed path formatting altogether from the DefaultArtifactHandlerManager.

o Changed the AbstractArtifactBasedComponent (or whatever it's called) to use the repository formatting in the path() and localPath() methods.

o Moved the plugin repo construction (still intact as a hard-coded singleton list) into the DefaultMavenProjectBuilder, where it will eventually build from POM info.

o Added a new method to build an artifact repository for a <distributionManagement/> section, if possible. This reduced the strain on mojos to construct an ArtifactRepository on demand.

o Refactored all *DeployMojo to use #project.distributionManagementArtifactRepository instead of the #settings, #component..ArtifactRepositoryFactory, ... that it used to require. This is a big simplifying step.

o Removed remote artifact repository construction from DefaultMaven, and changed the MavenSession to delegate to MavenProject for remoteArtifactRepositories, just as it does for pluginRepositories.

o Added remoteArtifactRepositories, pluginArtifactRepositories, distributionManagementArtifactRepository to MavenProject as a cache for the higher-level repos used throughout the system. This is project info, so it belongs here.

o Fixed all the tests in maven-core and maven-artifact which I broke. :)

o Dropped what is probably a big format-bomb, since the Eclipse formatter doesn't really handle 'throws Exception' wrapping the right way.

o Added MavenProject to the MavenSession constructor, since there should always be a MavenProject associated with a build, even if it's just the super-pom.

TODO:
--------------------------

- Write an integration/unit test to ensure that the new repo format works with $classifier (was: $extra) and $groupId[0]/../$groupId[n]. This is a simple adaptation of the old layout, but still needs testing.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163638 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 08:18:34 +00:00
Brett Leslie Porter 3bd980bdb1 hack in a dom so we can use plexus configuration. more to do...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163635 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 07:23:07 +00:00
Brett Leslie Porter 847e6b8852 improve error handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163629 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 04:24:45 +00:00
Brett Leslie Porter f5bd920140 make the detection cleaner to make it easier to clean up later
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163628 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 04:00:46 +00:00