Commit Graph

832 Commits

Author SHA1 Message Date
Jean-Louis Boudart 6f8302fed2 Remove unnecessary cast
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1557985 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 09:02:20 +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
Nicolas Lalevee 31b26e7456 add support for source artifacts in buildobr task
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1555479 13f79535-47bb-0310-9956-ffa450edef68
2014-01-05 10:41:19 +00:00
Nicolas Lalevee 191939dee1 embrace java 5
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1555477 13f79535-47bb-0310-9956-ffa450edef68
2014-01-05 10:38:16 +00:00
Nicolas Lalevee 5d5f09ea37 fix computation of the extension of unpacked artifacts
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1555476 13f79535-47bb-0310-9956-ffa450edef68
2014-01-05 10:37:46 +00:00
Nicolas Lalevee 08dc630011 Add support for "packed" artifacts: .pack.gz bundles in an OSGi P2 repository for instance
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1555344 13f79535-47bb-0310-9956-ffa450edef68
2014-01-04 13:06:37 +00:00
Nicolas Lalevee 51cd2f37a6 New OSGi resolver 'osgi-agg' : a chain resolver which better handle OSGi dependencies
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1553873 13f79535-47bb-0310-9956-ffa450edef68
2013-12-28 16:57:20 +00:00
Nicolas Lalevee 61e203c962 embrace Java 5
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1553872 13f79535-47bb-0310-9956-ffa450edef68
2013-12-28 16:54:23 +00:00
cduffy 70f4b55496 IVY-1423: fix revision mapping across namespaces
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1553758 13f79535-47bb-0310-9956-ffa450edef68
2013-12-27 23:07:57 +00:00
cduffy 46b15af8c5 Document that threading is unsupported, and disable test covering same
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1553747 13f79535-47bb-0310-9956-ffa450edef68
2013-12-27 21:53:12 +00:00
cduffy 5b39e09269 IVY-1455 Prevent incorrect ivy mediators from being applied during conflict resolution.
Prior to this, the mediators to be applied depended on the location where a
conflict was detected, rather than the declaration location.


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1553745 13f79535-47bb-0310-9956-ffa450edef68
2013-12-27 21:30:33 +00:00
Nicolas Lalevee 8c27540ec0 avoid copy with url resolvers configured with a 'file:/' URL if useOrigin=true
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1553739 13f79535-47bb-0310-9956-ffa450edef68
2013-12-27 21:10:19 +00:00
Nicolas Lalevee 198d448cea OSGI: new names for CDC profiles too
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1553708 13f79535-47bb-0310-9956-ffa450edef68
2013-12-27 17:56:38 +00:00
Nicolas Lalevee fc743aa9d6 Some OSGi environment seems to have been renamed: let's support both namings
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1553592 13f79535-47bb-0310-9956-ffa450edef68
2013-12-26 21:41:19 +00:00
Nicolas Lalevee a295e82baa Better support for "Bundle-RequiredExecutionEnvironment" from an OSGi MANIFEST.MF
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1553388 13f79535-47bb-0310-9956-ffa450edef68
2013-12-25 14:59:47 +00:00
cduffy fa8f024d08 IVY-1454 handle multi-threading (as opposed to only multi-process) case in locking
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1552434 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 21:14:39 +00:00
Nicolas Lalevee 18b6de93c2 IVY-1431: Also copy original metadata artifact (e.g. POM) on ivy:install (Thanks to Erwin Tratar)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1550939 13f79535-47bb-0310-9956-ffa450edef68
2013-12-14 17:06:25 +00:00
Nicolas Lalevee e1fc87d2d5 IVY-1438:
- fix the parsing of header values with space


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1520874 13f79535-47bb-0310-9956-ffa450edef68
2013-09-08 14:48:35 +00:00
Nicolas Lalevee 9b2d0e3909 - make the buildobr task a post resolve task, so that it can work with set of resolved artifacts
- document how to manage an OSGi target platform, with samples


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1519300 13f79535-47bb-0310-9956-ffa450edef68
2013-09-01 18:08:36 +00:00
Nicolas Lalevee 37787b96ab fix test of fixdeps
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1507802 13f79535-47bb-0310-9956-ffa450edef68
2013-07-28 14:25:22 +00:00
Nicolas Lalevee 39ee22556b - improve the fixdeps task to handle a multi project environment
- add tests and documentation of the task


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1507801 13f79535-47bb-0310-9956-ffa450edef68
2013-07-28 14:09:36 +00:00
Maarten Coene bca350df1f - IMPROVEMENT: New LockStrategy available based on NIO FileLocks (IVY-1424)
- FIX: NIO FileLocker released locks too early (IVY-1424) (thanks to Charles Duffy)


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1507138 13f79535-47bb-0310-9956-ffa450edef68
2013-07-25 21:35:08 +00:00
Nicolas Lalevee d6a354e203 - fix the module set gathering
- fix the tests on the online repos


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1506108 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 15:22:45 +00:00
Nicolas Lalevee e06a9f676c Performance optimisation around the OSGi resolver:
- log only if a debug level is set
 - do not retry to load a failing repo
 - compute versions once
 - convert the bundle info into module descriptors on demand


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1506076 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 14:48:40 +00:00
Jean-Louis Boudart 2b085ae342 add showTransitive attribute on dependencyUpdateChecker task
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1493256 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 21:43:15 +00:00
Jean-Louis Boudart 1f978b6387 First draft of dependency update checker task
Extract ant test listener as a reusable class for test to check log output


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1492972 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 07:15:14 +00:00
Maarten Coene 01ecd7c66d FIX: Maven2: resolve failure when parent has <dependencyManagement> with dependency in 'import' scope (IVY-1376)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1419758 13f79535-47bb-0310-9956-ffa450edef68
2012-12-10 20:56:05 +00:00
Jean-Louis Boudart fdb7591138 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/trunk@1412669 13f79535-47bb-0310-9956-ffa450edef68
2012-11-22 20:44:31 +00:00
Jean-Louis Boudart 5c715cd84d Use StringBuffer in place of StringBuilder to be 1.4 compatible
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1404486 13f79535-47bb-0310-9956-ffa450edef68
2012-11-01 07:45:33 +00:00
Jean-Louis Boudart 517b8beb06 Implement IvyDependencyTree task : display a dependency tree on the console
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1404290 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 18:42:42 +00:00
Matthew Jason Benson c28ed2e0cf [IVY-1036] latest.integration isn't resolved against a Maven snapshot repository (when uniqueVersion = true)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1398943 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 19:34:19 +00:00
Matthew Jason Benson 5904d90ade add test to show that IBiblioResolver can resolve latest.integration to a snapshot when the snapshot was deployed as uniqueVersion false
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1398531 13f79535-47bb-0310-9956-ffa450edef68
2012-10-15 21:57:21 +00:00
Maarten Coene ee6ae79be8 FIX: Resolve does not deliver all dependent artifacts (IVY-1366) (thanks to Wolfgang Frank)
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1378882 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 11:03:17 +00:00
Nicolas Lalevee 50e133fb20 Fix global exclude rule in root ivy files
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1378164 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 15:09:12 +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 a759e78d4d Fix tests: properly set the ivy settings dir url
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375823 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 22:16:06 +00:00
Nicolas Lalevee 54fdc54dd2 Properly build the url pattern
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375737 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 19:40:50 +00:00
Nicolas Lalevee 14d6a09601 Fix tests: don't urlify the pattern, only the root
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375736 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 19:34:05 +00:00
Nicolas Lalevee b9a22fb6f6 fix encoding of e with acute
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375728 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 19:28:03 +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
Nicolas Lalevee 1c4f7bde1c Fix OSGi manifest parsing
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375661 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 16:58:49 +00:00
Nicolas Lalevee 4e8b8cbe05 Add missing test files
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375654 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 16:41:24 +00:00
Nicolas Lalevee 0367064bb6 Use the word 'uncompress' every where
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375596 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 15:09:00 +00:00
Nicolas Lalevee 2d650f890f Make IvyCachePath understand OSGi classpaths with their Bundle-Classpath header
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375593 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 14:58:53 +00:00
Nicolas Lalevee faffec9020 Parse the Bundle-Classpath in an OSGi MANIFEST
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375592 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 14:58:21 +00:00
Nicolas Lalevee 535cbcd9f2 Test and fix the detection of the 'zipped' bundles
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375591 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 14:57:47 +00:00
Nicolas Lalevee f65e9aa63f Fix sync retrieve of uncompressed artifacts
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375585 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 14:49:46 +00:00
Nicolas Lalevee 53d3e8ce79 When retrieving, the uncompressed artifact should take the place of the real artifact
git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375573 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 14:28:32 +00:00