Commit Graph

125 Commits

Author SHA1 Message Date
twogee 6c92f32eda More code cleanup 2017-05-27 19:37:44 +02:00
twogee fbbf092e49 A few loose bits in JUnit 4 migration 2017-05-26 14:00:16 +02:00
twogee 36e99429c2 fail() means an expected exception or an assertion 2017-05-26 08:17:10 +02:00
twogee 1543f52896 Convert tests to JUnit 4, clean up code 2017-05-25 17:25:59 +02:00
Nicolas Lalevée 6b5b674cdc IVY-1531: Translation of POM to Ivy XML with * exclusion is removing main artifact
This closes #10
2017-05-16 22:26:29 +02:00
Matt Benson 8ff6e5a90f [IVY-1558] support dependencies in active profiles 2017-04-21 09:15:07 -05:00
Matt Benson 539e1ee1d6 address failing tests 2017-04-19 14:45:08 -05:00
Jaikiran Pai d19212c03e IVY-1531 Fix translation of * for groupid and artifactid, in pom.xml exclusion, for implying transitive=false in ivy 2016-12-07 22:50:33 +05:30
Nicolas Lalevée 2d7c6f5ff4 setup proper loggers in unit tests and factorize the creation and the cleaning of the cache folder 2015-09-06 20:01:25 +02:00
Jaikiran Pai da7d5df6de IVY-1526 Use parent pom's license (if any) if the child pom doesn't explicitly have licenses of its own 2015-08-30 15:51:44 +02:00
Nicolas Lalevée 03542311e2 use XMLUnit to abstract the order of the XML elements 2014-12-27 15:03:49 +01:00
Maarten Coene baa1e2b139 IMPROVEMENT: Generate POMs with /xsd/maven-4.0.0.xsd reference instead of old /maven-v4_0_0.xsd (IVY-1491) (thanks to Hervé Boutemy) 2014-10-21 00:01:20 +02:00
Maarten Coene f1d68f9c0a junit test fix: the order of the extra-info elements has changed from undefined (from Map) to predictable (from List)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1596972 13f79535-47bb-0310-9956-ffa450edef68
2014-05-22 21:29:06 +00:00
Jean-Louis Boudart 2902a9a3c0 Fix broken unit test, force publication date on testExtraInfosWithNestedElement as PomParsing can generate a publication date based on file modification date
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1592662 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 06:16:30 +00:00
Maarten Coene e484646c60 IMPROVEMENT: ivy:makepom will generate an exclusion when transitive=false on a dependency (IVY-1470)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1592628 13f79535-47bb-0310-9956-ffa450edef68
2014-05-05 20:56:51 +00:00
Jean-Louis Boudart 8d85139073 FIX: regression introduced by IVY-1457, dependency management wasn't properly handled introducing lots of resolution failures
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1592624 13f79535-47bb-0310-9956-ffa450edef68
2014-05-05 19:52:53 +00:00
Jean-Louis Boudart 1e30aa9479 Apply organize import on whole project
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1557969 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 08:34:28 +00:00
Jean-Louis Boudart bd7a375e37 Apply code formatting on whole project
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1557968 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 08:27:37 +00:00
Jean-Louis Boudart 5db07bdccc fix IVY-1457 XmlModuleDescriptorWritter doesn't support fully extra infos elements
ModuleDescriptor.getExtraInfo() is now deprecated as name of the tag was used as key. Tag name can't be used as key as extra info elements can be non unique.

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1557557 13f79535-47bb-0310-9956-ffa450edef68
2014-01-12 16:53:40 +00:00
Maarten Coene d6c57d547c FIX: Ivy descriptors are merged incorrectly when there is an <exclude> element (IVY-1356)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1376738 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 22:21:00 +00:00
Nicolas Lalevee ac11ad3593 Fix the buggy use to File.toURL()
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375715 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 18:55:01 +00:00
Maarten Coene 0b873b95a8 Log a bit more in a junit test to see what's going wrong on unix...
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1374859 13f79535-47bb-0310-9956-ffa450edef68
2012-08-19 21:46:25 +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