Commit Graph

104 Commits

Author SHA1 Message Date
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 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 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 88d62a6976 svn_apply_autoprops, mainly for line endings
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1049146 13f79535-47bb-0310-9956-ffa450edef68
2010-12-14 16:28:01 +00:00
Maarten Coene 2dc3e2207a FIX: Cached ivy.xml is invalid if the description contains the ampersand entity (&amp;) (IVY-1237)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1023438 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 09:02:27 +00:00
Maarten Coene b0564321b6 IMPROVEMENT: ivy:makepom now has an option to disable the generation of an extra Ivy comment block in the POM
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@983797 13f79535-47bb-0310-9956-ffa450edef68
2010-08-09 19:50:55 +00:00
Maarten Coene ab4bd72f09 Use dedicated options class to pass configuration options to PomModuleDescriptorWriter.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@983793 13f79535-47bb-0310-9956-ffa450edef68
2010-08-09 19:41:24 +00:00
Maarten Coene 6d4b512cb1 FIX: XmlModuleDescriptorWriter does not write the transitive attribute (IVY-1207) (thanks to Abel Muino)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@965284 13f79535-47bb-0310-9956-ffa450edef68
2010-07-18 20:56:30 +00:00
Maarten Coene 728ccf5a5a IMPROVEMENT: ivy:makepom now accepts a list of configurations to include (IVY-1005) (thanks to Jesper Pedersen)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@964690 13f79535-47bb-0310-9956-ffa450edef68
2010-07-16 06:18:53 +00:00
Maarten Coene 98567abad2 FIX: Ivy info/extends/extendsType attribute is misspelled by XmlModuleDescriptorWriter (IVY-1203) (thanks to Jason Trump)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@961020 13f79535-47bb-0310-9956-ffa450edef68
2010-07-06 21:40:30 +00:00
Jonathan K. Schneider 33412b485e Allow for updating the resolved branch attribute of dependencies in XmlModuleDescriptorUpdator (IVY-1200)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@958693 13f79535-47bb-0310-9956-ffa450edef68
2010-06-28 19:51:41 +00:00
Maarten Coene 0a000800ef FIX: The ivy-module version used by XmlModuleDescriptorWriter is hard coded to '1.0' (IVY-1199)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@958290 13f79535-47bb-0310-9956-ffa450edef68
2010-06-26 21:49:50 +00:00
Maarten Coene 17ff3e942e "_dest" renamed to "dest"
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@958289 13f79535-47bb-0310-9956-ffa450edef68
2010-06-26 21:39:34 +00:00
Maarten Coene 75ab5e6bca FIX: makepom ignores artifact type in ivy.xml and hardcodes 'jar' in the output pom (IVY-736) (thanks to Aaron Hachez)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@954656 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 21:49:11 +00:00
Maarten Coene 0be1e18d9e NEW: Support ivy.xml parent mechanism (IVY-742) (thanks to Jason Trump and Jean-Louis Boudart)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@942195 13f79535-47bb-0310-9956-ffa450edef68
2010-05-07 20:00:48 +00:00
Maarten Coene eac471eefe FIX: parent.groupId is not resolved in maven 2 parser (IVY-1169) (thanks to Achim Huegen)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@908664 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 22:01:29 +00:00
Maarten Coene 12060a3336 IMPROVEMENT: use defaultconf in combination with defaultconfmapping (IVY-1135) (thanks to Jon Schneider)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@828822 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 19:18:19 +00:00
Maarten Coene 62502fa48c Added missing license information
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@826849 13f79535-47bb-0310-9956-ffa450edef68
2009-10-19 22:43:17 +00:00
Maarten Coene 4d3836de33 Fixed failing junit test
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@826234 13f79535-47bb-0310-9956-ffa450edef68
2009-10-17 11:32:52 +00:00
Maarten Coene 72548f48a8 Removed System.out.println
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@800225 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 07:01:59 +00:00
Maarten Coene f7acab1f6c FIX: ivy parse exception when using <publications defaultconf> (IVY-1102)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@800224 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 06:59:10 +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 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 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 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
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 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 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 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
Xavier Hanin cfa7c5e3bb IMPROVEMENT: write home page, description and license info in XmlModuleDescriptorWriter. This is useful to be sure we don't lose information parsed in poms, license information being especially useful (related to IVY-892)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@691538 13f79535-47bb-0310-9956-ffa450edef68
2008-09-03 08:19:46 +00:00
Xavier Hanin 1f73722ffb IMPROVEMENT: Parse license information in poms (IVY-892)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@691531 13f79535-47bb-0310-9956-ffa450edef68
2008-09-03 07:52:46 +00:00
Maarten Coene aaa2583f35 FIX: Ivy Publish Task Fails When XML Comments Exist Next to Dependency Declarations (IVY-888)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@691071 13f79535-47bb-0310-9956-ffa450edef68
2008-09-01 21:52:35 +00:00
Maarten Coene 28b71bd41d FIX: Maven2 "ejb" packaging is not supported (IVY-873)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@682974 13f79535-47bb-0310-9956-ffa450edef68
2008-08-05 21:45:49 +00:00
Xavier Hanin c64eaa7994 IMPROVEMENT: Add defaultconf in publications tag of ivy file (IVY-801)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@674852 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 15:04:42 +00:00
Xavier Hanin c57b54c16e improve unit test on for branch and branch constraint handling
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@667047 13f79535-47bb-0310-9956-ffa450edef68
2008-06-12 11:28:55 +00:00
Xavier Hanin 6c7c02162f FIX: dynamic resolveMode not being dynamic on branch (IVY-825)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@662776 13f79535-47bb-0310-9956-ffa450edef68
2008-06-03 12:42:21 +00:00
Maarten Coene 6eac78a418 FIX: Type tag in poms not supported (IVY-762)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@660322 13f79535-47bb-0310-9956-ffa450edef68
2008-05-26 22:01:29 +00:00
Maarten Coene b08ebfc2aa FIX: An empty exclusion tag results in an IllegalArgumentException (IVY-821)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@660286 13f79535-47bb-0310-9956-ffa450edef68
2008-05-26 19:59:30 +00:00
Maarten Coene a3d7b48434 Fixed type error.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@659272 13f79535-47bb-0310-9956-ffa450edef68
2008-05-22 21:43:34 +00:00
Maarten Coene c4ddef0104 Added junit test for IVY-811
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@659266 13f79535-47bb-0310-9956-ffa450edef68
2008-05-22 21:40:17 +00:00
Xavier Hanin f70dc1fbdc complete IVY-784 and IVY-753:
- move override exclude and conflict directly under dependencies element
- implement override writing in module descriptor writer, to make sure dependencyManagement handling in poms are written to cache in ivy file format as they should
- update documentation

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@644236 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 09:24:54 +00:00