Commit Graph

540 Commits

Author SHA1 Message Date
Maarten Coene e73f1b0069 FIX: Maven2: resolve failure when parent has <dependencyManagement> with dependency in 'import' scope (IVY-1376) (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1419772 13f79535-47bb-0310-9956-ffa450edef68
2012-12-10 21:13:43 +00:00
Jean-Louis Boudart 0393da7c84 IVY-1391 - IvyPublish fails when using extend tags with no explicit location attribute
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1412668 13f79535-47bb-0310-9956-ffa450edef68
2012-11-22 20:41:38 +00:00
Maarten Coene 4176df287a reverted ...
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1399836 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 20:30:55 +00:00
Maarten Coene e759e80d87 fixed junit test errors using the 2.3 Ivy api.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1399832 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 20:27:15 +00:00
Maarten Coene 26244879b9 Reverted previous commit + fixed test compilation errors using the 2.3 Ivy api.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1399827 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 20:13:40 +00:00
Maarten Coene 8e0358065b Merged changes for IVY-1036 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1399811 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 19:32:08 +00:00
Maarten Coene 107ade4cfb FIX: Resolve does not deliver all dependent artifacts (IVY-1366) (thanks to Wolfgang Frank) (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1378988 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 15:28:25 +00:00
Nicolas Lalevee 20db37fc6e merge r1378164: Fix global exclude rule in root ivy files
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1378166 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 15:11:38 +00:00
Maarten Coene de976b00e9 FIX: Ivy descriptors are merged incorrectly when there is an <exclude> element (IVY-1356) (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1376745 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 22:32:04 +00:00
Maarten Coene 79b03f56d0 - FIX: Unnecessary warning when parent ivy.xml is not found (IVY-1346) (merged from trunk)
- FIX: StackOverflowError when using <extends> and ../ivy.xml is not the parent ivy.xml (IVY-1437) (merged from trunk)


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1376406 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 08:39:46 +00:00
Nicolas Lalevee cea09edde3 merging IVY-1363,IVY-1359,IVY-1364: r1364410,1372594
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1372609 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 20:56:52 +00:00
Nicolas Lalevee ec4e0bf4dd merge of r1342465 and r1342466:
IVY-1300: Delivered ivy descriptor inconsistent with resolve report / retrieve and other post-resolve actions (thanks to Ed Burcher)


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1342467 13f79535-47bb-0310-9956-ffa450edef68
2012-05-24 22:35:56 +00:00
Nicolas Lalevee b9059448ca merge r 1329663:
IVY-1343: fix for a NullPointerExeption in AbstractOSGiResolver (thanks to Thomas Kurpick)


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1329671 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 12:27:50 +00:00
Maarten Coene 0407058fca Merged latest changes from trunk.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1326424 13f79535-47bb-0310-9956-ffa450edef68
2012-04-15 21:01:43 +00:00
Maarten Coene 4e878fb710 junit test fix caused by ivyde release (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1311150 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 07:16:40 +00:00
Maarten Coene 90870ae137 Removed unused import.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1305654 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 22:52:57 +00:00
Maarten Coene 9fcd616fe5 FIX: Impossible to get artifacts when data has not been loaded for multiple dynamic revisions (IVY-1333)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1305644 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 22:45:10 +00:00
Maarten Coene e8633715a1 removed commented code
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1304653 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 23:15:00 +00:00
Maarten Coene e83ea3998d renamed fields beginning with '_'
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1304652 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 23:14:04 +00:00
Maarten Coene 63b85e9c14 FIX: Ivy didn't properly handle some file: URLs (IVY-1340)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1304651 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 23:11:41 +00:00
Maarten Coene 65a2a7da3e FIX: Infinite loop in latest-compatible conflict manager (IVY-1233) (thanks to Payam Hekmat and Sven Zethelius)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1304633 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 22:27:47 +00:00
Maarten Coene eb2824c490 IMPROVEMENT: ivy:install task does not allow specification of conf (IVY-1313) (thanks to Nihal Sinha)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1299482 13f79535-47bb-0310-9956-ffa450edef68
2012-03-11 23:11:00 +00:00
Maarten Coene 815fa4b995 Attempt to fix failing tests on vmgump.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1296761 13f79535-47bb-0310-9956-ffa450edef68
2012-03-04 06:39:54 +00:00
Maarten Coene 58588fd7b8 Another attempt to fix the failing tests on vmgump and jenkins
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1245872 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 06:53:20 +00:00
Maarten Coene 425c28f75c FIX: [originalname] not expanded for source and javadoc types during publish in ivy:install (IVY-1324)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1244251 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 22:40:53 +00:00
Nicolas Lalevee 935b93acaa Fix the fs iterator so it properly handle Windows paths: stick with java.io.File rather than playing with java.lang.String
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1231729 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 19:07:16 +00:00
Nicolas Lalevee bd0aac4761 Fix the tests: listing modules does include packages capabilities
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1231727 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 19:04:01 +00:00
Nicolas Lalevee 2db4eb59d4 IVY-1329: fix the parse of ! (NOT) in the OSGi requirement filter
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1231711 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 17:51:24 +00:00
Maarten Coene 187236482a Fixed some outdated junit tests...
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1226319 13f79535-47bb-0310-9956-ffa450edef68
2012-01-02 00:02:38 +00:00
Maarten Coene 84fd1dd099 FIX: extra attributes lost from info when ivy file is merged with parent (IVY-1206)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1226251 13f79535-47bb-0310-9956-ffa450edef68
2012-01-01 14:25:49 +00:00
Nicolas Lalevee 965ab18ee1 Fix composite P2 respotory parsing
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1201498 13f79535-47bb-0310-9956-ffa450edef68
2011-11-13 19:55:21 +00:00
Nicolas Lalevee f1dab54918 Fix setter for RequirementStrategy
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1201495 13f79535-47bb-0310-9956-ffa450edef68
2011-11-13 19:52:37 +00:00
Nicolas Lalevee 0f794328d8 - fix the JarResolver when used with an URL
- fix the unit tests: the settings are the last set on the resolver


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1201254 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 12:29:50 +00:00
Nicolas Lalevee e9b9844fce IVY-1312:
- implementation, test and documentation of the jar resolver


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1165117 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 21:33:39 +00:00
Nicolas Lalevee 069faaa38e - add some tests on the updatesite resolver
- fix the way artifact location is handled so at the end we have a proper URL


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1165100 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 19:37:03 +00:00
Maarten Coene 2b720c7df0 FIX: Infinite loop in latest-compatible conflict manager (IVY-1233) (thanks to Payam Hekmat)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1163390 13f79535-47bb-0310-9956-ffa450edef68
2011-08-30 21:15:03 +00:00
Maarten Coene cd68dcc15a Corrected unit test to actually test that the 2 configuration have the same dependencies (copy/paste error)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1163368 13f79535-47bb-0310-9956-ffa450edef68
2011-08-30 20:41:17 +00:00
Maarten Coene 9c7f6d4212 IMPROVEMENT: ivy:makepom ignores the artifact type in generated dependencies (IVY-1229) (thanks to Douglas Palmer)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1156840 13f79535-47bb-0310-9956-ffa450edef68
2011-08-11 21:32:39 +00:00
Matthew Jason Benson 72b9a7f373 [IVY-1301] Ivy does not apply overridden properties to parent dependency versions specified using dependencyManagement properties
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1133126 13f79535-47bb-0310-9956-ffa450edef68
2011-06-07 18:34:01 +00:00
Matthew Jason Benson 3b91cc1d78 test overriding grandparent properties also
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1132750 13f79535-47bb-0310-9956-ffa450edef68
2011-06-06 20:30:47 +00:00
Matthew Jason Benson 020f71e5fb [IVY-1299] Ivy does not apply overridden properties to parent dependency versions specified using properties
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1132472 13f79535-47bb-0310-9956-ffa450edef68
2011-06-05 18:24:31 +00:00
Matthew Jason Benson 0419ecf691 parent dependency management includes version management; child pom doesn't need to declare parent-managed version
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1131239 13f79535-47bb-0310-9956-ffa450edef68
2011-06-03 21:00:31 +00:00
Maarten Coene b2b0c36ee6 Removed old non-working maven mirrors.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1097644 13f79535-47bb-0310-9956-ffa450edef68
2011-04-28 22:30:37 +00:00
Nicolas Lalevee e0aedbbca4 fix the tests regarding the previous commit r1097628
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1097631 13f79535-47bb-0310-9956-ffa450edef68
2011-04-28 21:51:30 +00:00
Maarten Coene 2e027a4d3d - IMPROVEMENT: Added support for dynamic revisions in <extends> tag (IVY-1281) (thanks to Jean-Louis Boudart)
- FIX: extends section of ivy.xml info does not replace variable in location tag (IVY-1287) (thanks to Jean-Louis Boudart)


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1097612 13f79535-47bb-0310-9956-ffa450edef68
2011-04-28 21:16:35 +00:00
Nicolas Lalevee d413bf2e74 - improving support for composite p2 repository
- add a unit test to load the eclipse repository, disabled as it download too much stuff and there is no cache support (yet)

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1092303 13f79535-47bb-0310-9956-ffa450edef68
2011-04-14 14:48:59 +00:00
Nicolas Lalevee 087f54a170 Add support for a composite P2 repository
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1091577 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 21:30:14 +00:00
Nicolas Lalevee c765837f17 Add a mirror capable url resolver. Far from perfect but a nice first working version.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1087396 13f79535-47bb-0310-9956-ffa450edef68
2011-03-31 18:19:24 +00:00
Nicolas Lalevee 4420519291 Add a unit test on a class imported from Bushel (see IVY-1208) (thanks to John Gibson)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1084394 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 22:43:50 +00:00
Nicolas Lalevee f0c59d736f IVY-1272:
- use an java empty iterator rather than having an exclude-all filset which might still read the filesystem

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1079735 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 10:42:45 +00:00