Commit Graph

405 Commits

Author SHA1 Message Date
Maarten Coene 439ca5ed60 Merged all changes from trunk into 2.1.x branch
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.1.x@791026 13f79535-47bb-0310-9956-ffa450edef68
2009-07-03 21:41:32 +00:00
Nicolas Lalevee c55cb82fb4 IVY-1098:
- fix : hascode and equals added on ArtifactDownloadReport so that the map used in RetrieveEngine#determineArtifactsToCopy will avoid duplicates
 - unit test added


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@790534 13f79535-47bb-0310-9956-ffa450edef68
2009-07-02 10:03:31 +00:00
Maarten Coene c0c9223269 - NEW: added built-in versionmatcher: 'Version Pattern Matcher' (IVY-871)
- DOCUMENTATION: missing documentation for the 'Version Pattern Matcher' (IVY-871) (thanks to Jon Schneider)

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@789952 13f79535-47bb-0310-9956-ffa450edef68
2009-06-30 21:03:37 +00:00
Xavier Hanin dde1e2089b NEW: configuration groups (IVY-1097)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@789095 13f79535-47bb-0310-9956-ffa450edef68
2009-06-28 13:02:10 +00:00
Maarten Coene 7bedb79cd6 FIX: The Ant output wasn't always prefixed by the name of the task
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@788535 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 22:36:53 +00:00
Xavier Hanin b8161dfd9c improvement in configuration intersection support: support *->@+something (IVY-1093)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@787585 13f79535-47bb-0310-9956-ffa450edef68
2009-06-23 08:26:29 +00:00
Maarten Coene 2d5b2326b2 FIX: [originalname] not expanded during retrieve when module descriptor contains extra attributes (IVY-1096)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@786304 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 21:54:09 +00:00
Maarten Coene 1ac854b13d Why do we need to set the context here?
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@786266 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 20:59:58 +00:00
Maarten Coene 8a7d52b9a9 Removed unused imports.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@786261 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 20:55:27 +00:00
Xavier Hanin 3078aab0b2 NEW: configuration intersections (IVY-1093)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@783755 13f79535-47bb-0310-9956-ffa450edef68
2009-06-11 13:12:32 +00:00
Nicolas Lalevee afc1dbf04e IVY-983:
- make the 'callers' aggregated by the requested conf more than the conf currently resolve in the hierarchy of confs


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@780757 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 17:58:28 +00:00
Xavier Hanin 90456a4b45 IMPROVEMENT: Pre and post retrieve artifact events (IVY-1084)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@778769 13f79535-47bb-0310-9956-ffa450edef68
2009-05-26 15:50:41 +00:00
Xavier Hanin 08cf1d1fb5 FIX: transitive dependencies and conflict management (IVY-1083)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@778742 13f79535-47bb-0310-9956-ffa450edef68
2009-05-26 15:17:04 +00:00
Maarten Coene be2aa80bc3 FIX: PomModuleDescriptorBuilder does not resolve ejb type dependencies to jar extension (IVY-1058) (thanks to Andrey Lomakin)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@765366 13f79535-47bb-0310-9956-ffa450edef68
2009-04-15 21:27:17 +00:00
Maarten Coene 770fc1d470 IMPROVEMENT: Fail the retrieve when multiple artifacts of same module are mapped to same file (IVY-1050)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@755043 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 23:27:03 +00:00
Maarten Coene 0642a6f1da FIX: Ivy doesn't handle the classifier attribute of artifacts inside dependency elements (IVY-1041)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@750671 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 23:17:41 +00:00
Maarten Coene 2ebd474518 Added junit test for IVY-1037 (thanks to Martin Eigenbrodt)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@750617 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 21:54:26 +00:00
Maarten Coene 40aee3954f FIX: Dependencies don't inherit exclusions from dependencyManagement (IVY-974) (thanks to John Gibson)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@749782 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 21:56:28 +00:00
Maarten Coene d998be61d8 IMPROVEMENT: ivy initialization shouldn't fail if properties file doesn't exist (IVY-1038)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@749749 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 21:00:58 +00:00
Maarten Coene b2d6184204 IMPROVEMENT: Ability to strip revConstraint attribute from delivered Ivy files (IVY-989)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@744568 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 21:04:19 +00:00
Maarten Coene aeb410f6c2 FIX: Ivy retrieve does not honor validate="false" from ivysettings (IVY-992)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@744087 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 11:39:48 +00:00
Maarten Coene 0346981dd4 Forgot to commit the modified test for IVY-1006
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@741336 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 23:06:40 +00:00
Xavier Hanin 79535f59ac fix problems introduced with IVY-1012
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@737358 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 14:05:24 +00:00
Xavier Hanin 0309c63333 FIX: TTL does not work as expected (IVY-1012)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@737330 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 11:00:40 +00:00
Maarten Coene d6be67b284 Fixed junit test: paths are case-sensitive on unix
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@734618 13f79535-47bb-0310-9956-ffa450edef68
2009-01-15 07:16:27 +00:00
Maarten Coene db2ccbe536 FIX: Ivy deliver fails to replace dynamic revision (IVY-999) (thanks to Martin Eigenbrodt)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@734517 13f79535-47bb-0310-9956-ffa450edef68
2009-01-14 21:22:01 +00:00
Maarten Coene fb629b23fc Removed unused import.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@723467 13f79535-47bb-0310-9956-ffa450edef68
2008-12-04 22:15:30 +00:00
Maarten Coene db841bca38 FIX: NullPointerException when resolving module wihout revision in the pattern (IVY-980) + junit test
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@723065 13f79535-47bb-0310-9956-ffa450edef68
2008-12-03 20:50:45 +00:00
Maarten Coene a48f4888bb - FIX: IO problem while parsing ivy file (Resetting to invalid mark) (IVY-975)
- FIX: Cannot parse maven2 poms containing an UTF-8 BOM

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@720307 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 22:07:47 +00:00
Maarten Coene cc6ce27331 FIX: <ivy:buildnumber> returns wrong result when resolve fails (IVY-970)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@719378 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 21:21:37 +00:00
Maarten Coene 79e8ea94db FIX: NPE in LogReportOutputter (IVY-961)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@710178 13f79535-47bb-0310-9956-ffa450edef68
2008-11-03 21:50:55 +00:00
Maarten Coene c235721162 Merged changes from 2.0.0-rc2 branch back into trunk.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@709004 13f79535-47bb-0310-9956-ffa450edef68
2008-10-29 20:56:03 +00:00
Nicolas Lalevee 8031162789 IVY-953: make the tests run on every plateform
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@707070 13f79535-47bb-0310-9956-ffa450edef68
2008-10-22 13:38:40 +00:00
Nicolas Lalevee c48129bd9a IVY-953: make ivy set the basedir property on IvySettings.setBasedDir (if the property doesn't exist yet)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@707053 13f79535-47bb-0310-9956-ffa450edef68
2008-10-22 12:10:08 +00:00
Maarten Coene 4e52d16c4c FIX: Ivy doesn't throw an error when the parent POM cannot be loaded (IVY-931)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@706768 13f79535-47bb-0310-9956-ffa450edef68
2008-10-21 21:03:57 +00:00
Maarten Coene e6037c6b99 Fixed failing junit test (introduced by fixing IVY-950)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@706443 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 22:57:56 +00:00
Maarten Coene 73c4065d78 FIX: Correctly set ivy.resolved.configurations property when the conf string includes a negation operator (IVY-951) (thanks to Patrick Woodworth)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@706440 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 22:45:13 +00:00
Maarten Coene abd0b37f0a FIX: Support for passing arbitrary arguments to the -main invoked class when using the standalone mode is severely limited (IVY-952) (thanks to Patrick Woodworth)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@706432 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 22:26:49 +00:00
Maarten Coene c342635a46 FIX: Extra Attributes specified in the Dependency's Module Descriptor are not available to resolvers (IVY-929) (thanks to Scott Hebert)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@706421 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 21:47:15 +00:00
Maarten Coene 9c831fa545 FIX: Maven2 parser doesn't support POMs with <model> as root (IVY-932)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@701232 13f79535-47bb-0310-9956-ffa450edef68
2008-10-02 20:19:59 +00:00
Maarten Coene 2cbea2ac39 Added junit test for IVY-921
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@701224 13f79535-47bb-0310-9956-ffa450edef68
2008-10-02 19:46:20 +00:00
Maarten Coene 1733cf35ad Added junit test for IVY-924
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@700929 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 21:12:02 +00:00
Maarten Coene 86b9dbd025 FIX: ivy:settings doesn't work if id is a property (IVY-925)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@700920 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 21:00:57 +00:00
Maarten Coene a509b19c33 Fixed junit test failure introduced by changing junit tests for IVY-926
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@700604 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 22:18:17 +00:00
Maarten Coene cd9f86bada FIX: Maven Pom reader doesn't handle optional dependencies correctly in some instances (IVY-926) (thanks to Phil Messenger)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@700571 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 20:34:15 +00:00
Maarten Coene 89ef710719 Added missing licenses.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@698364 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 21:43:19 +00:00
Maarten Coene 821a3ddf69 FIX: Properties needed to parse version in POM (IVY-914) (thanks to Tom Widmer)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@698345 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 20:57:13 +00:00
Maarten Coene f1c7e5c7c4 FIX: Cannot configure items with java.io.File attributes (IVY-905)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@696031 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 19:56:48 +00:00
Maarten Coene eadc1e3453 FIX: ivy.cache.dir.${settingsRef} is set to default instead of the defaultCacheDir from the ivysettings.xml after ivy:resolve (IVY-898)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@694036 13f79535-47bb-0310-9956-ffa450edef68
2008-09-10 22:25:06 +00:00
Maarten Coene 951b253fc3 FIX: Ivy ibiblio resolver chokes on variables while checking descriptor consistency (IVY-818)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@692729 13f79535-47bb-0310-9956-ffa450edef68
2008-09-06 20:32:48 +00:00