Commit Graph

2321 Commits

Author SHA1 Message Date
Maarten Coene 3ee6e9507c Add the txt files containing the tutorial output so we can regenerate the site.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.0@1436591 13f79535-47bb-0310-9956-ffa450edef68
2013-01-21 20:21:32 +00:00
Maarten Coene b5f56cbdeb Use fixed revision in svn:externals property.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.0@1436590 13f79535-47bb-0310-9956-ffa450edef68
2013-01-21 20:17:03 +00:00
Maarten Coene b72d0c63e6 updated release notes for the 2.3.0 release
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.0@1431346 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 13:24:30 +00:00
Maarten Coene 418b73c9ee Add '2.3' as allowed version in ivy.xml files. (merged from 2.3.x branch)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.0@1427565 13f79535-47bb-0310-9956-ffa450edef68
2013-01-01 21:26:00 +00:00
Maarten Coene a83df76e6e Add '2.3' as allowed version in ivy.xml files. (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1427564 13f79535-47bb-0310-9956-ffa450edef68
2013-01-01 21:15:59 +00:00
Maarten Coene 152e036d4f 'Wei Chen' wasn't listed in the contributors list. (merged from 2.3.x branch)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.0@1427561 13f79535-47bb-0310-9956-ffa450edef68
2013-01-01 20:59:53 +00:00
Maarten Coene 17fc00e70c 'Wei Chen' wasn't listed in the contributors list.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1427560 13f79535-47bb-0310-9956-ffa450edef68
2013-01-01 20:57:19 +00:00
Maarten Coene 99640f6332 bundle qualifier should be final
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.0@1427559 13f79535-47bb-0310-9956-ffa450edef68
2013-01-01 20:52:52 +00:00
Maarten Coene ae56659255 version is 2.3.0 in this branch
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.0@1427558 13f79535-47bb-0310-9956-ffa450edef68
2013-01-01 20:51:46 +00:00
Maarten Coene 053257b6c0 git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.0@1427555 13f79535-47bb-0310-9956-ffa450edef68 2013-01-01 20:48:35 +00:00
Maarten Coene f47a967dd8 update the version
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1427554 13f79535-47bb-0310-9956-ffa450edef68
2013-01-01 20:47:40 +00:00
Maarten Coene d0c206db2e We are 2013 now... (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1427553 13f79535-47bb-0310-9956-ffa450edef68
2013-01-01 20:43:20 +00:00
Nicolas Lalevee 918de11017 merge r1426531 : fix exemple in the doc
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1426533 13f79535-47bb-0310-9956-ffa450edef68
2012-12-28 14:55:22 +00:00
Maarten Coene 6b2421e9e1 Jean-Louis is a committer...
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1424756 13f79535-47bb-0310-9956-ffa450edef68
2012-12-20 23:28:14 +00:00
Maarten Coene 99c953a63a FIX: Ivy generates wrong revision in URL for Maven snapshots (IVY-1396) (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1424748 13f79535-47bb-0310-9956-ffa450edef68
2012-12-20 23:16:22 +00:00
Nicolas Lalevee 305ae20935 merge r1422714 and r1423716:
IVY-1388
- add a shutdownhook to delete any lock which might not have been released


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1423717 13f79535-47bb-0310-9956-ffa450edef68
2012-12-18 23:39:25 +00:00
Maarten Coene 5a9e947916 Added missing changes to CHANGES.TXT + missing merge-info.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1419773 13f79535-47bb-0310-9956-ffa450edef68
2012-12-10 21:17:00 +00:00
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 6b358acb0d - Added missing license (merged from trunk)
- Make sure all properties are set before starting to upload to repository.apache.org (merged from trunk)

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1406320 13f79535-47bb-0310-9956-ffa450edef68
2012-11-06 20:50:26 +00:00
Maarten Coene ba3fdaee2b Preparing 2.3.0-rc2 release.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1402862 13f79535-47bb-0310-9956-ffa450edef68
2012-10-27 20:08:14 +00:00
Maarten Coene 16728657c4 FIX: Ivy default cache path with non-ASCII character lets it crash (IVY-1378) (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1402344 13f79535-47bb-0310-9956-ffa450edef68
2012-10-25 21:56:17 +00:00
Maarten Coene c7d2c91cfd DOCUMENTATION: Documentation and Implementation mismatch of makepom (IVY-1383) (thanks to Thomas Kurpick) (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1401082 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 21:14:48 +00:00
Maarten Coene b9cb30da15 DOCUMENTATION: added link to extra beginners guide (IVY-1381) (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1399841 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 20:47:40 +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 28b2daed3a Fixed junit tests compilation failure.
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1399819 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 19:57:14 +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 7f371a0ff8 Fixed typo in ResolutionCacheManager#getResolvedModuleDescriptor() (thanks to Mitch Gitman) (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1398486 13f79535-47bb-0310-9956-ffa450edef68
2012-10-15 19:59:51 +00:00
Nicolas Lalevee 09bfb8e872 merge of r1398334:
fix NPE: some server seems to not return any content type


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1398339 13f79535-47bb-0310-9956-ffa450edef68
2012-10-15 15:32:08 +00:00
Maarten Coene c487f40142 Re-implemented IVY-1281 because current implementation had too much issues. (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1397312 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 21:08:27 +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 8078a32bfc Fixed problem with signing the artifacts. (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1376412 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 08:59:06 +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
Maarten Coene 1e19372380 FIX: SimpleDateFormat is not thread safe (IVY-1373) (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1375271 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 21:58:12 +00:00
Maarten Coene e8d6dde98a FIX: Maven 'hk2-jar' packaging is now supported (IVY-1357) (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1374872 13f79535-47bb-0310-9956-ffa450edef68
2012-08-19 22:20:12 +00:00
Maarten Coene dd8f34117c FIX: Memory leak and infinite loop in ModuleId.java (IVY-1362) (2nd attempt) (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1374867 13f79535-47bb-0310-9956-ffa450edef68
2012-08-19 22:00:33 +00:00
Maarten Coene 423b7ab262 FIX: Maven 'orbit' and 'pear' packaging is now supported (IVY-899) (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1374787 13f79535-47bb-0310-9956-ffa450edef68
2012-08-19 16:17:22 +00:00
Maarten Coene fe96b3bb16 FIX: Memory leak and infinite loop in ModuleId.java (IVY-1362) (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1374779 13f79535-47bb-0310-9956-ffa450edef68
2012-08-19 15:58:20 +00:00
Maarten Coene 87e14bb589 Avoid error message being printed when the resolver didn't exist (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1374461 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 22:39:28 +00:00
Maarten Coene a71711d0ed Fix API backwards compatibility (merged from trunk)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1373635 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 21:27:40 +00:00
Nicolas Lalevee 441accf45b merge r1373478:
IVY-1060 : take into account the provided encoding of the page (Thanks to Robin Fernandes)


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1373479 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 15:40:18 +00:00
Nicolas Lalevee 5da3fe27ab merge r1373340:
IVY-1344: fix setting the branch attribute (Thanks to Ales Nosek)


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1373341 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 11:34:27 +00:00
Nicolas Lalevee a3158332c1 merge r1373338:
IVY-1353: fix the name of the 'ignore' circular dependency strategy (Thanks to Carl Quinn)


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1373339 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 11:30:54 +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 dc5649c60a merge of r1351277 : Add missing exported package
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1351278 13f79535-47bb-0310-9956-ffa450edef68
2012-06-18 10:29:02 +00:00
Nicolas Lalevee 406704aae8 merge of r1342548:
IVY-1300: add missing test files


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.3.x@1342549 13f79535-47bb-0310-9956-ffa450edef68
2012-05-25 09:44:39 +00:00