You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2017/06/19 01:58:51 UTC

[08/29] ant-ivy git commit: Merge latest master changes

Merge latest master changes


Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/32296ea3
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/32296ea3
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/32296ea3

Branch: refs/heads/master
Commit: 32296ea3915941404eb602a0c4852bb8641149bf
Parents: 5d6131a 225afb8
Author: Jaikiran Pai <ja...@gmail.com>
Authored: Thu Jun 15 13:10:12 2017 +0530
Committer: Jaikiran Pai <ja...@gmail.com>
Committed: Thu Jun 15 13:10:12 2017 +0530

----------------------------------------------------------------------
 .settings/org.eclipse.jdt.core.prefs            |  49 +-
 .settings/org.eclipse.jdt.ui.prefs              |  11 +-
 META-INF/MANIFEST.MF                            |   2 +-
 build-for-bin-distrib.xml                       |  29 +-
 build-release.xml                               | 286 +++---
 build.properties                                |   3 +-
 build.xml                                       | 589 ++++++------
 doc/compatibility.html                          |   6 +-
 doc/images/ant-group-logo.gif                   | Bin 7577 -> 0 bytes
 doc/images/ant-project-logo.gif                 | Bin 0 -> 7577 bytes
 doc/images/ant-project-logo.svg                 | 951 +++++++++++++++++++
 doc/images/apache-incubator.svg                 |  44 +
 doc/images/hibgraph.svg                         | 173 ++++
 doc/images/ivy-publish-fc.svg                   | 337 +++++++
 doc/images/ivy-terminology.odg                  | Bin 20840 -> 22331 bytes
 doc/images/ivy-terminology.svg                  | 419 ++++++++
 doc/images/main-tasks.odg                       | Bin 0 -> 12386 bytes
 doc/images/main-tasks.svg                       |  82 ++
 doc/osgi.html                                   |   4 +-
 doc/osgi/eclipse-plugin.html                    |   4 +
 doc/osgi/standard-osgi.html                     |   4 +
 doc/osgi/target-platform.html                   |   4 +
 doc/printTemplate.html                          |   2 +-
 doc/release-notes.html                          |  10 +-
 doc/template.html                               |   2 +-
 doc/use/cachefileset.html                       |   8 +-
 ivy.xml                                         |  47 +-
 src/etc/checkstyle/checkstyle-config            | 305 +++---
 src/etc/checkstyle/checkstyle-frames.xsl        |   2 +-
 src/example/bintray/build.xml                   |   6 +-
 src/example/bintray/ivy.xml                     |  10 +-
 src/example/build-a-ivy-repository/build.xml    | 118 +--
 src/example/chained-resolvers/build.xml         |  30 +-
 .../chainedresolvers-project/build.xml          |  74 +-
 .../chainedresolvers-project/ivy.xml            |   4 +-
 .../src/example/Hello.java                      |   8 +-
 .../configurations/jdbc-example/build.xml       | 101 +-
 src/example/configurations/jdbc-example/ivy.xml |  32 +-
 .../src/example/ConfigurationsExample.java      |  17 +-
 .../multi-projects/filter-framework/build.xml   | 195 ++--
 .../multi-projects/filter-framework/ivy.xml     |  20 +-
 .../src/filter/FilterProvider.java              |   8 +-
 .../src/filter/ccimpl/CCFilter.java             |  16 +-
 .../src/filter/hmimpl/HMFilter.java             |  13 +-
 .../test/filter/AbstractTestFilter.java         |  62 +-
 .../multi-projects/myapp/build.xml              |  87 +-
 .../configurations/multi-projects/myapp/ivy.xml |  12 +-
 .../multi-projects/myapp/src/myapp/Main.java    |   4 +-
 src/example/dependence/build.xml                |  32 +-
 src/example/dependence/dependee/build.xml       |  98 +-
 src/example/dependence/dependee/ivy.xml         |   4 +-
 .../dependee/src/standalone/Main.java           |   8 +-
 src/example/dependence/depender/build.xml       |  82 +-
 src/example/dependence/depender/ivy.xml         |   4 +-
 .../dependence/depender/src/depending/Main.java |   6 +-
 src/example/dual/build.xml                      |  30 +-
 src/example/dual/project/build.xml              |  74 +-
 src/example/dual/project/ivy.xml                |   4 +-
 src/example/dual/project/src/example/Hello.java |  51 -
 .../dual/project/src/example/HelloIvy.java      |  51 +
 src/example/go-ivy/build.xml                    | 171 ++--
 src/example/hello-ivy/build.xml                 |  70 +-
 src/example/hello-ivy/ivy.xml                   |   6 +-
 src/example/hello-ivy/src/example/Hello.java    |  51 -
 .../hello-ivy/src/example/HelloConsole.java     |  51 +
 src/example/multi-project/build.xml             |  89 +-
 src/example/multi-project/common/common.xml     | 313 +++---
 .../multi-project/projects/console/ivy.xml      |  12 +-
 .../projects/console/src/console/Main.java      |  16 +-
 src/example/multi-project/projects/find/ivy.xml |  14 +-
 .../projects/find/src/find/FindFile.java        |  30 +-
 .../projects/find/src/find/Main.java            |  50 +-
 src/example/multi-project/projects/list/ivy.xml |  10 +-
 .../projects/list/src/list/ListFile.java        |  24 +-
 .../projects/list/src/list/Main.java            |  39 +-
 src/example/multi-project/projects/size/ivy.xml |   8 +-
 .../projects/size/src/size/FileSize.java        |  25 +-
 .../multi-project/projects/sizewhere/ivy.xml    |  14 +-
 .../projects/sizewhere/src/sizewhere/Main.java  |  44 +-
 .../sizewhere/src/sizewhere/SizeWhere.java      |  13 +-
 .../multi-project/projects/version/ivy.xml      |   4 +-
 .../projects/version/src/version/Version.java   |  10 +-
 src/java/org/apache/ivy/Ivy.java                |  66 +-
 src/java/org/apache/ivy/Ivy14.java              |   8 +-
 src/java/org/apache/ivy/Main.java               |   7 +-
 .../org/apache/ivy/ant/AntBuildTrigger.java     |  19 +-
 src/java/org/apache/ivy/ant/AntCallTrigger.java |   8 +-
 .../org/apache/ivy/ant/AntMessageLogger.java    |  12 +-
 src/java/org/apache/ivy/ant/IvyAntSettings.java |  15 +-
 .../apache/ivy/ant/IvyAntVariableContainer.java |   8 +-
 .../org/apache/ivy/ant/IvyArtifactReport.java   |  10 +-
 src/java/org/apache/ivy/ant/IvyBuildList.java   |  18 +-
 .../org/apache/ivy/ant/IvyCacheFileset.java     | 131 ++-
 src/java/org/apache/ivy/ant/IvyCachePath.java   |   2 +-
 src/java/org/apache/ivy/ant/IvyCacheTask.java   |   2 +-
 src/java/org/apache/ivy/ant/IvyCheck.java       |   2 +-
 src/java/org/apache/ivy/ant/IvyCleanCache.java  |   6 +-
 src/java/org/apache/ivy/ant/IvyConflict.java    |   6 +-
 src/java/org/apache/ivy/ant/IvyDeliver.java     |   4 +-
 .../org/apache/ivy/ant/IvyDependencyTree.java   |  70 +-
 .../ivy/ant/IvyDependencyUpdateChecker.java     |   5 +-
 .../apache/ivy/ant/IvyExtractFromSources.java   |   4 +-
 src/java/org/apache/ivy/ant/IvyInstall.java     |   6 +-
 .../org/apache/ivy/ant/IvyPostResolveTask.java  |  14 +-
 src/java/org/apache/ivy/ant/IvyPublish.java     |   8 +-
 src/java/org/apache/ivy/ant/IvyReport.java      |   6 +-
 .../org/apache/ivy/ant/IvyRepositoryReport.java |   2 +-
 src/java/org/apache/ivy/ant/IvyResolve.java     |   7 +-
 src/java/org/apache/ivy/ant/IvyRetrieve.java    |  14 +-
 src/java/org/apache/ivy/ant/IvyTask.java        |  14 +-
 src/java/org/apache/ivy/ant/PackageMapping.java |   6 +-
 src/java/org/apache/ivy/ant/antlib.xml          |  16 +-
 src/java/org/apache/ivy/core/IvyContext.java    |  27 +-
 .../org/apache/ivy/core/IvyPatternHelper.java   |  21 +-
 src/java/org/apache/ivy/core/IvyThread.java     |   4 +-
 .../apache/ivy/core/RelativeUrlResolver.java    |  17 +-
 .../apache/ivy/core/cache/ArtifactOrigin.java   |  39 +-
 .../org/apache/ivy/core/cache/CacheUtil.java    |   4 +-
 .../cache/DefaultRepositoryCacheManager.java    | 136 ++-
 .../cache/DefaultResolutionCacheManager.java    |   6 +-
 .../core/cache/ModuleDescriptorMemoryCache.java |   6 +-
 .../ivy/core/cache/ParserSettingsMonitor.java   |   6 +-
 .../ivy/core/cache/RepositoryCacheManager.java  | 204 ++--
 .../org/apache/ivy/core/check/CheckEngine.java  |   4 +
 .../apache/ivy/core/deliver/DeliverEngine.java  |   8 +-
 .../apache/ivy/core/deliver/DeliverOptions.java |  35 +-
 .../PublishingDependencyRevisionResolver.java   |  10 +-
 .../org/apache/ivy/core/event/IvyEvent.java     |  28 +-
 .../apache/ivy/core/event/IvyEventFilter.java   |  14 +-
 .../event/publish/EndArtifactPublishEvent.java  |   3 +-
 .../ivy/core/event/publish/PublishEvent.java    |   2 +-
 .../publish/StartArtifactPublishEvent.java      |   3 +-
 .../resolve/EndResolveDependencyEvent.java      |   2 +-
 .../core/event/retrieve/EndRetrieveEvent.java   |   8 +-
 .../apache/ivy/core/install/InstallEngine.java  |   4 +-
 .../descriptor/AbstractIncludeExcludeRule.java  |   4 +-
 .../ivy/core/module/descriptor/Artifact.java    |  18 +-
 .../core/module/descriptor/Configuration.java   |  13 +-
 .../module/descriptor/ConfigurationAware.java   |   4 +-
 .../module/descriptor/ConfigurationGroup.java   |   6 +-
 .../descriptor/ConfigurationIntersection.java   |   4 +-
 .../DefaultDependencyArtifactDescriptor.java    |  14 +-
 .../descriptor/DefaultDependencyDescriptor.java |  62 +-
 .../descriptor/DefaultExtendsDescriptor.java    |   5 +-
 .../descriptor/DefaultModuleDescriptor.java     |  38 +-
 .../DependencyArtifactDescriptor.java           |  22 +-
 .../module/descriptor/DependencyDescriptor.java |  30 +-
 .../DependencyDescriptorMediator.java           |   2 +-
 .../ivy/core/module/descriptor/ExcludeRule.java |  10 +-
 .../module/descriptor/ExtendsDescriptor.java    |  32 +-
 .../ivy/core/module/descriptor/IncludeRule.java |  12 +-
 .../core/module/descriptor/InheritableItem.java |   2 +-
 .../module/descriptor/ModuleDescriptor.java     | 160 ++--
 .../OverrideDependencyDescriptorMediator.java   |   6 +-
 .../apache/ivy/core/module/id/ArtifactId.java   |   4 +-
 .../ivy/core/module/id/ArtifactRevisionId.java  |   2 +-
 .../ivy/core/module/id/MatcherLookup.java       |  24 +-
 .../org/apache/ivy/core/module/id/ModuleId.java |  24 +-
 .../ivy/core/module/id/ModuleRevisionId.java    |  26 +-
 .../apache/ivy/core/module/id/ModuleRules.java  |  20 +-
 .../org/apache/ivy/core/module/id/package.html  |   2 -
 .../ivy/core/module/status/StatusManager.java   |   2 +-
 .../apache/ivy/core/pack/OsgiBundlePacking.java |   3 +-
 .../apache/ivy/core/pack/PackagingManager.java  |   4 +-
 .../org/apache/ivy/core/pack/ZipPacking.java    |   3 +-
 .../apache/ivy/core/publish/PublishEngine.java  |  17 +-
 .../apache/ivy/core/publish/PublishOptions.java |   2 +-
 .../ivy/core/report/ArtifactDownloadReport.java |   4 +-
 .../core/report/ConfigurationResolveReport.java |  35 +-
 .../apache/ivy/core/report/DownloadStatus.java  |   3 +-
 .../report/MetadataArtifactDownloadReport.java  |   4 +-
 .../apache/ivy/core/report/ResolveReport.java   |  29 +-
 .../repository/RepositoryManagementEngine.java  |  10 +-
 .../org/apache/ivy/core/resolve/IvyNode.java    |  78 +-
 .../apache/ivy/core/resolve/IvyNodeCallers.java |  23 +-
 .../ivy/core/resolve/IvyNodeEviction.java       |  24 +-
 .../apache/ivy/core/resolve/IvyNodeUsage.java   |  12 +-
 .../apache/ivy/core/resolve/ResolveData.java    |  16 +-
 .../apache/ivy/core/resolve/ResolveEngine.java  |  68 +-
 .../apache/ivy/core/resolve/ResolveOptions.java |  17 +-
 .../core/resolve/ResolveProcessException.java   |   1 +
 .../core/resolve/ResolvedModuleRevision.java    |  19 +-
 .../ivy/core/resolve/RestartResolveProcess.java |   1 +
 .../org/apache/ivy/core/resolve/VisitNode.java  |  49 +-
 .../ivy/core/retrieve/RetrieveEngine.java       |  17 +-
 .../ivy/core/retrieve/RetrieveOptions.java      |   4 +-
 .../ivy/core/retrieve/RetrieveReport.java       |  10 +
 .../apache/ivy/core/search/SearchEngine.java    |  25 +-
 .../apache/ivy/core/settings/IvySettings.java   |  86 +-
 .../ivy/core/settings/IvyVariableContainer.java |   2 +-
 .../core/settings/IvyVariableContainerImpl.java |   4 +-
 .../apache/ivy/core/settings/Validatable.java   |   2 +-
 .../ivy/core/settings/XmlSettingsParser.java    |  86 +-
 .../core/sort/CollectionOfModulesToSort.java    |  12 +-
 .../ivy/core/sort/ModuleDescriptorSorter.java   |  14 +-
 .../org/apache/ivy/core/sort/ModuleInSort.java  |  30 +-
 .../core/sort/NonMatchingVersionReporter.java   |   4 +-
 .../org/apache/ivy/core/sort/SortEngine.java    |   4 +-
 .../org/apache/ivy/osgi/core/BundleInfo.java    |   4 +-
 .../apache/ivy/osgi/core/BundleInfoAdapter.java |  15 +-
 .../ivy/osgi/core/ManifestHeaderValue.java      |   6 +-
 .../apache/ivy/osgi/core/ManifestParser.java    |  19 +-
 .../ivy/osgi/core/OSGiManifestParser.java       |   7 +-
 .../ivy/osgi/core/OsgiLatestStrategy.java       |  11 +-
 .../ivy/osgi/core/jvm-packages.properties       |   2 +-
 .../ivy/osgi/filter/MultiOperatorFilter.java    |   2 +-
 .../ivy/osgi/filter/OSGiFilterParser.java       |  10 +-
 .../ivy/osgi/filter/UniOperatorFilter.java      |   2 +-
 .../org/apache/ivy/osgi/obr/OBRResolver.java    |   2 +-
 .../ivy/osgi/obr/xml/CapabilityAdapter.java     |   3 +-
 .../apache/ivy/osgi/obr/xml/OBRXMLParser.java   |  39 +-
 .../ivy/osgi/obr/xml/RequirementAdapter.java    |  11 +-
 .../obr/xml/UnsupportedFilterException.java     |   1 +
 .../apache/ivy/osgi/p2/P2ArtifactParser.java    |  20 +-
 .../apache/ivy/osgi/p2/P2CompositeParser.java   |   4 +-
 .../org/apache/ivy/osgi/p2/P2Descriptor.java    |   4 +-
 .../apache/ivy/osgi/p2/P2MetadataParser.java    | 103 +-
 .../apache/ivy/osgi/p2/PropertiesParser.java    |   2 +-
 .../osgi/repo/AbstractFSManifestIterable.java   |  10 +-
 .../ivy/osgi/repo/AbstractOSGiResolver.java     |  20 +-
 .../repo/ArtifactReportManifestIterable.java    |   5 +-
 .../ivy/osgi/repo/FSManifestIterable.java       |  24 +-
 .../ivy/osgi/repo/ModuleDescriptorWrapper.java  |   6 +-
 .../ivy/osgi/repo/RelativeURLRepository.java    |   2 +-
 .../apache/ivy/osgi/repo/RepoDescriptor.java    |   8 +-
 .../osgi/repo/RepositoryManifestIterable.java   |   6 +-
 .../ivy/osgi/updatesite/UpdateSiteResolver.java |   6 +-
 .../updatesite/xml/EclipseUpdateSiteParser.java |  28 +-
 .../ivy/osgi/updatesite/xml/FeatureParser.java  |  56 +-
 .../ivy/osgi/updatesite/xml/UpdateSite.java     |   2 +
 .../updatesite/xml/UpdateSiteDigestParser.java  |   2 +-
 .../apache/ivy/osgi/util/DelegatingHandler.java | 133 ++-
 .../org/apache/ivy/osgi/util/ParseUtil.java     |   2 +-
 src/java/org/apache/ivy/osgi/util/Version.java  |  52 +-
 .../org/apache/ivy/osgi/util/VersionRange.java  |  30 +-
 .../circular/CircularDependencyException.java   |   3 +-
 .../circular/CircularDependencyHelper.java      |   7 +-
 .../circular/CircularDependencyStrategy.java    |   2 +-
 .../ivy/plugins/conflict/ConflictManager.java   |   4 +-
 .../LatestCompatibleConflictManager.java        |  22 +-
 .../plugins/conflict/LatestConflictManager.java |  12 +-
 .../plugins/conflict/RegexpConflictManager.java |   8 +-
 .../conflict/StrictConflictException.java       |   1 +
 .../ivy/plugins/latest/LatestStrategy.java      |  12 +-
 .../plugins/latest/WorkspaceLatestStrategy.java |   4 +-
 .../ivy/plugins/lock/DeleteOnExitHook.java      |   4 +-
 .../ivy/plugins/lock/FileBasedLockStrategy.java |  20 +-
 .../apache/ivy/plugins/lock/LockStrategy.java   |  11 +-
 .../plugins/matcher/AbstractPatternMatcher.java |   4 +-
 .../matcher/ExactOrRegexpPatternMatcher.java    |   5 +-
 .../plugins/matcher/ExactPatternMatcher.java    |   3 +-
 .../ivy/plugins/matcher/GlobPatternMatcher.java |  15 +-
 .../org/apache/ivy/plugins/matcher/Matcher.java |   4 +-
 .../ivy/plugins/matcher/PatternMatcher.java     |   7 +-
 .../plugins/matcher/RegexpPatternMatcher.java   |   4 +-
 .../namespace/MRIDTransformationRule.java       |   6 +-
 .../parser/AbstractModuleDescriptorParser.java  |  38 +-
 .../plugins/parser/ModuleDescriptorParser.java  |  14 +-
 .../parser/ModuleDescriptorParserRegistry.java  |   2 +-
 .../ivy/plugins/parser/ParserSettings.java      |   2 +-
 .../parser/m2/PomModuleDescriptorBuilder.java   |  14 +-
 .../parser/m2/PomModuleDescriptorParser.java    |  19 +-
 .../parser/m2/PomModuleDescriptorWriter.java    |   4 +-
 .../apache/ivy/plugins/parser/m2/PomReader.java |  30 +-
 .../ivy/plugins/parser/m2/PomWriterOptions.java |   2 +-
 .../ivy/plugins/parser/xml/UpdateOptions.java   |   4 +-
 .../parser/xml/XmlModuleDescriptorParser.java   | 111 +--
 .../parser/xml/XmlModuleDescriptorUpdater.java  |  27 +-
 .../parser/xml/XmlModuleDescriptorWriter.java   |   5 +-
 .../ivy/plugins/report/XmlReportParser.java     |   8 +-
 .../ivy/plugins/repository/Repository.java      |  45 +-
 .../apache/ivy/plugins/repository/Resource.java |  28 +-
 .../ivy/plugins/repository/TransferEvent.java   |  40 +-
 .../plugins/repository/sftp/SFTPRepository.java |  17 +-
 .../ssh/AbstractSshBasedRepository.java         |  19 +-
 .../repository/ssh/RemoteScpException.java      |  10 +-
 .../apache/ivy/plugins/repository/ssh/Scp.java  |  17 +-
 .../ivy/plugins/repository/ssh/SshCache.java    |  38 +-
 .../plugins/repository/ssh/SshRepository.java   |  41 +-
 .../ivy/plugins/repository/ssh/SshResource.java |  16 +-
 .../plugins/repository/url/URLRepository.java   |   2 +-
 .../plugins/repository/vfs/VfsRepository.java   |  20 +-
 .../ivy/plugins/repository/vfs/VfsResource.java |  36 +-
 .../repository/vsftp/VsftpRepository.java       |  22 +-
 .../resolver/AbstractPatternsBasedResolver.java |   4 +-
 .../ivy/plugins/resolver/AbstractResolver.java  |  26 +-
 .../resolver/AbstractSshBasedResolver.java      |  22 +-
 .../resolver/AbstractWorkspaceResolver.java     |   2 +-
 .../ivy/plugins/resolver/BasicResolver.java     |  36 +-
 .../ivy/plugins/resolver/ChainResolver.java     |   2 +-
 .../plugins/resolver/DependencyResolver.java    |  48 +-
 .../ivy/plugins/resolver/DualResolver.java      |   2 +-
 .../plugins/resolver/FileSystemResolver.java    |   6 +-
 .../ivy/plugins/resolver/IBiblioResolver.java   |   2 +-
 .../ivy/plugins/resolver/IvyRepResolver.java    |   2 +-
 .../plugins/resolver/RepositoryResolver.java    |   6 +-
 .../ivy/plugins/resolver/SshResolver.java       |  20 +-
 .../resolver/WorkspaceChainResolver.java        |   6 +-
 .../resolver/packager/BuiltFileResource.java    |   2 +-
 .../resolver/packager/PackagerCacheEntry.java   |  12 +-
 .../resolver/packager/PackagerResolver.java     |  27 +-
 .../plugins/resolver/util/ResolverHelper.java   |   2 +-
 .../plugins/resolver/util/ResourceMDParser.java |   2 +-
 .../ivy/plugins/resolver/util/URLLister.java    |   6 +-
 .../ivy/plugins/trigger/AbstractTrigger.java    |   2 +-
 .../apache/ivy/plugins/trigger/LogTrigger.java  |  10 +-
 .../plugins/version/AbstractVersionMatcher.java |   9 +-
 .../plugins/version/ChainVersionMatcher.java    |  10 +-
 .../plugins/version/LatestVersionMatcher.java   |   7 +-
 .../org/apache/ivy/plugins/version/Match.java   |   2 +-
 .../plugins/version/PatternVersionMatcher.java  |   2 +-
 .../ivy/plugins/version/VersionMatcher.java     |  30 +-
 .../plugins/version/VersionRangeMatcher.java    |   2 +-
 .../apache/ivy/util/AbstractMessageLogger.java  |   2 +-
 src/java/org/apache/ivy/util/Checks.java        |   2 +-
 .../org/apache/ivy/util/ChecksumHelper.java     |   6 +-
 .../org/apache/ivy/util/ConfigurationUtils.java |   6 +-
 src/java/org/apache/ivy/util/Configurator.java  |   2 +-
 src/java/org/apache/ivy/util/Credentials.java   |   4 +-
 .../org/apache/ivy/util/CredentialsUtil.java    |   5 +-
 src/java/org/apache/ivy/util/DateUtil.java      |   2 +-
 .../apache/ivy/util/DefaultMessageLogger.java   |   2 +-
 .../apache/ivy/util/EncryptedProperties.java    |  66 ++
 .../org/apache/ivy/util/EncrytedProperties.java |  49 +-
 src/java/org/apache/ivy/util/FileResolver.java  |   8 +-
 src/java/org/apache/ivy/util/FileUtil.java      | 160 ++--
 src/java/org/apache/ivy/util/HostUtil.java      |   4 +-
 src/java/org/apache/ivy/util/MemoryUtil.java    |   9 +-
 src/java/org/apache/ivy/util/Message.java       |   4 +-
 src/java/org/apache/ivy/util/MessageLogger.java |  10 +-
 .../apache/ivy/util/MessageLoggerEngine.java    |   6 +-
 .../org/apache/ivy/util/PropertiesFile.java     |   1 +
 src/java/org/apache/ivy/util/StringUtils.java   |  29 +-
 src/java/org/apache/ivy/util/XMLHelper.java     |  23 +-
 .../apache/ivy/util/cli/CommandLineParser.java  |   1 +
 .../org/apache/ivy/util/cli/ParseException.java |   1 +
 .../ivy/util/extendable/ExtendableItem.java     |  10 +-
 .../util/extendable/ExtendableItemHelper.java   |   8 +-
 .../apache/ivy/util/filter/FilterHelper.java    |  18 +-
 .../apache/ivy/util/url/ApacheURLLister.java    |  16 +-
 .../apache/ivy/util/url/BasicURLHandler.java    |   5 +-
 .../apache/ivy/util/url/CredentialsStore.java   |   2 +-
 .../apache/ivy/util/url/HttpClientHandler.java  |   4 +-
 .../apache/ivy/util/url/IvyAuthenticator.java   |   5 +-
 .../org/apache/ivy/util/url/URLHandler.java     |  51 +-
 .../apache/ivy/util/url/URLHandlerRegistry.java |   4 +-
 test/java/org/apache/ivy/IvyTest.java           |  15 +-
 test/java/org/apache/ivy/MainTest.java          |  48 +-
 test/java/org/apache/ivy/TestFixture.java       |  23 +-
 test/java/org/apache/ivy/TestHelper.java        |  55 +-
 .../apache/ivy/ant/AntBuildResolverTest.java    |  35 +-
 .../org/apache/ivy/ant/AntBuildTriggerTest.java |  12 +-
 .../org/apache/ivy/ant/AntCallTriggerTest.java  |  33 +-
 .../org/apache/ivy/ant/BuildOBRTaskTest.java    |  36 +-
 test/java/org/apache/ivy/ant/FileUtilTest.java  |  92 ++
 .../org/apache/ivy/ant/FixDepsTaskTest.java     |  29 +-
 .../ivy/ant/IvyAntSettingsBuildFileTest.java    |  48 +-
 .../apache/ivy/ant/IvyArtifactPropertyTest.java |  37 +-
 .../apache/ivy/ant/IvyArtifactReportTest.java   |  16 +-
 .../org/apache/ivy/ant/IvyBuildListTest.java    |  47 +-
 .../org/apache/ivy/ant/IvyBuildNumberTest.java  |  27 +-
 .../org/apache/ivy/ant/IvyCacheFilesetTest.java | 162 +++-
 .../org/apache/ivy/ant/IvyCachePathTest.java    |  44 +-
 .../org/apache/ivy/ant/IvyCleanCacheTest.java   |  36 +-
 .../org/apache/ivy/ant/IvyConfigureTest.java    |  84 +-
 .../org/apache/ivy/ant/IvyConvertPomTest.java   |   5 +-
 .../java/org/apache/ivy/ant/IvyDeliverTest.java |  94 +-
 .../apache/ivy/ant/IvyDependencyTreeTest.java   |  52 +-
 .../ivy/ant/IvyDependencyUpdateCheckerTest.java | 136 +--
 .../org/apache/ivy/ant/IvyFindRevisionTest.java |  18 +-
 .../apache/ivy/ant/IvyInfoRepositoryTest.java   |  18 +-
 test/java/org/apache/ivy/ant/IvyInfoTest.java   |  17 +-
 .../java/org/apache/ivy/ant/IvyInstallTest.java |  63 +-
 .../org/apache/ivy/ant/IvyListModulesTest.java  |  17 +-
 .../apache/ivy/ant/IvyPostResolveTaskTest.java  |  97 +-
 .../java/org/apache/ivy/ant/IvyPublishTest.java |  87 +-
 test/java/org/apache/ivy/ant/IvyReportTest.java |  21 +-
 .../apache/ivy/ant/IvyRepositoryReportTest.java |  42 +-
 .../java/org/apache/ivy/ant/IvyResolveTest.java | 119 ++-
 .../org/apache/ivy/ant/IvyResourcesTest.java    |  43 +-
 .../org/apache/ivy/ant/IvyRetrieveBuildFile.xml |   8 +-
 .../ivy/ant/IvyRetrieveBuildFileTest.java       |  25 +-
 .../org/apache/ivy/ant/IvyRetrieveTest.java     |  86 +-
 test/java/org/apache/ivy/ant/IvyTaskTest.java   |  12 +-
 test/java/org/apache/ivy/ant/IvyVarTest.java    |  11 +-
 .../ivy/ant/testutil/AntTaskTestCase.java       |   6 +-
 .../ivy/ant/testutil/AntTestListener.java       |  12 +-
 .../ivy/core/NormalRelativeUrlResolverTest.java |  13 +-
 .../org/apache/ivy/core/TestPerformance.java    |  17 +-
 .../DefaultRepositoryCacheManagerTest.java      |  47 +-
 .../cache/ModuleDescriptorMemoryCacheTest.java  |  29 +-
 .../apache/ivy/core/deliver/DeliverTest.java    |  22 +-
 .../ivy/core/event/IvyEventFilterTest.java      |  13 +-
 .../apache/ivy/core/install/InstallTest.java    |  25 +-
 .../DefaultDependencyDescriptorTest.java        |  11 +-
 .../core/module/descriptor/IvyMakePomTest.java  | 189 ++++
 .../module/descriptor/ivy-to-pom-classifier.xml |  23 +
 .../apache/ivy/core/module/id/ModuleIdTest.java |  41 +-
 .../core/module/id/ModuleRevisionIdTest.java    |  45 +-
 .../ivy/core/module/id/ModuleRulesTest.java     |  15 +-
 .../ivy/core/publish/PublishEngineTest.java     |  17 +-
 .../ivy/core/publish/PublishEventsTest.java     |  53 +-
 .../ivy/core/report/ResolveReportTest.java      |  24 +-
 .../RepositoryManagementEngineTest.java         |  16 +-
 .../ivy/core/resolve/ResolveEngineTest.java     |  18 +-
 .../apache/ivy/core/resolve/ResolveTest.java    | 562 +++++++----
 .../apache/ivy/core/retrieve/RetrieveTest.java  |  50 +-
 .../org/apache/ivy/core/search/SearchTest.java  |  27 +-
 .../apache/ivy/core/settings/ConfigureTest.java |  12 +-
 .../ivy/core/settings/IvySettingsTest.java      |   8 +-
 .../settings/OnlineXmlSettingsParserTest.java   |  11 +-
 .../core/settings/XmlSettingsParserTest.java    |  89 +-
 .../settings/ivysettings-cache-ttl-matcher.xml  |  25 +
 .../java/org/apache/ivy/core/sort/SortTest.java | 168 ++--
 .../osgi/core/AggregatedOSGiResolverTest.java   |  15 +-
 .../ExecutionEnvironmentProfileLoaderTest.java  |   7 +-
 .../ivy/osgi/core/ManifestHeaderTest.java       |  12 +-
 .../ivy/osgi/core/ManifestParserTest.java       |  20 +-
 .../ivy/osgi/core/OSGiManifestParserTest.java   |  11 +-
 .../ivy/osgi/core/OsgiLatestStrategyTest.java   |  23 +-
 .../apache/ivy/osgi/filter/OSGiFilterTest.java  |  36 +-
 .../org/apache/ivy/osgi/obr/OBRParserTest.java  |  12 +-
 .../apache/ivy/osgi/obr/OBRResolverTest.java    |  49 +-
 .../apache/ivy/osgi/obr/OBRXMLWriterTest.java   |  25 +-
 .../apache/ivy/osgi/p2/P2DescriptorTest.java    |  24 +-
 .../apache/ivy/osgi/repo/BundleRepoTest.java    |   9 +-
 .../UpdateSiteAndIbiblioResolverTest.java       |  12 +-
 .../osgi/updatesite/UpdateSiteLoaderTest.java   |  26 +-
 .../osgi/updatesite/UpdateSiteResolverTest.java |  16 +-
 .../org/apache/ivy/osgi/util/ParseUtilTest.java |   8 +-
 .../apache/ivy/osgi/util/VersionRangeTest.java  |  10 +-
 .../org/apache/ivy/osgi/util/VersionTest.java   |   9 +-
 .../IgnoreCircularDependencyStrategyTest.java   |  42 +-
 .../WarnCircularDependencyStrategyTest.java     |  64 +-
 .../LatestCompatibleConflictManagerTest.java    |  74 +-
 .../conflict/LatestConflictManagerTest.java     |  40 +-
 .../conflict/RegexpConflictManagerTest.java     |  43 +-
 .../conflict/StrictConflictManagerTest.java     |  46 +-
 .../latest/LatestRevisionStrategyTest.java      |  27 +-
 .../plugins/lock/ArtifactLockStrategyTest.java  |  21 +-
 .../matcher/AbstractPatternMatcherTest.java     |  47 +-
 .../ExactOrRegexpPatternMatcherTest.java        |  17 +-
 .../matcher/ExactPatternMatcherTest.java        |  10 +-
 .../plugins/matcher/GlobPatternMatcherTest.java |  23 +-
 .../matcher/RegexpPatternMatcherTest.java       |  16 +-
 .../namespace/MRIDTransformationRuleTest.java   |   6 +-
 .../plugins/namespace/NameSpaceHelperTest.java  |   6 +-
 .../AbstractModuleDescriptorParserTester.java   |  66 +-
 .../ModuleDescriptorParserRegistryTest.java     |   7 +-
 .../m2/PomModuleDescriptorParserTest.java       | 175 +++-
 .../m2/PomModuleDescriptorWriterTest.java       |  24 +-
 .../parser/m2/test-system-properties.pom        |  58 ++
 .../xml/XmlModuleDescriptorParserTest.java      | 226 +++--
 .../xml/XmlModuleDescriptorWriterTest.java      |  38 +-
 .../parser/xml/XmlModuleUpdaterTest.java        |  67 +-
 .../apache/ivy/plugins/parser/xml/test-info.xml |   2 +-
 .../ivy/plugins/parser/xml/test-write-info.xml  |   2 +-
 .../ivy/plugins/report/XmlReportParserTest.java |  15 +-
 .../ivy/plugins/report/XmlReportWriterTest.java |  35 +-
 .../repository/vfs/VfsRepositoryTest.java       | 111 +--
 .../plugins/repository/vfs/VfsResourceTest.java | 205 ++--
 .../plugins/repository/vfs/VfsTestHelper.java   |  14 +-
 .../ivy/plugins/repository/vfs/VfsURI.java      |  67 +-
 .../AbstractDependencyResolverTest.java         |   4 +-
 .../plugins/resolver/BintrayResolverTest.java   |  28 +-
 .../ivy/plugins/resolver/ChainResolverTest.java | 185 ++--
 .../ivy/plugins/resolver/DualResolverTest.java  |  47 +-
 .../resolver/FileSystemResolverTest.java        | 721 +++++++-------
 .../plugins/resolver/IBiblioResolverTest.java   |  24 +-
 .../plugins/resolver/IvyRepResolverTest.java    |  38 +-
 .../ivy/plugins/resolver/JarResolverTest.java   |  17 +-
 .../ivy/plugins/resolver/Maven2LocalTest.java   |  16 +-
 .../resolver/MirroredURLResolverTest.java       |  18 +-
 .../ivy/plugins/resolver/MockResolver.java      |   6 +-
 .../plugins/resolver/PackagerResolverTest.java  |  17 +-
 .../plugins/resolver/ResolverTestHelper.java    |  73 +-
 .../ivy/plugins/resolver/URLResolverTest.java   |  22 +-
 .../ivy/plugins/resolver/VfsResolverTest.java   |  10 +
 .../resolver/util/ResolverHelperTest.java       |   8 +-
 .../ivy/plugins/trigger/LogTriggerTest.java     |  17 +-
 .../version/LatestVersionMatcherTest.java       |  21 +-
 .../version/PatternVersionMatcherTest.java      |  16 +-
 .../version/VersionRangeMatcherTest.java        |  13 +-
 test/java/org/apache/ivy/util/CacheCleaner.java |   2 +-
 .../org/apache/ivy/util/ConfiguratorTest.java   |  89 +-
 .../apache/ivy/util/IvyPatternHelperTest.java   |  24 +-
 .../org/apache/ivy/util/MockMessageLogger.java  |  37 +-
 .../org/apache/ivy/util/StringUtilsTest.java    |  15 +-
 .../java/org/apache/ivy/util/TestXmlHelper.java |  74 ++
 .../ivy/util/url/AbstractURLHandlerTest.java    |  10 +-
 .../ivy/util/url/ApacheURLListerTest.java       |  39 +-
 .../ivy/util/url/ArtifactoryListingTest.java    |   8 +-
 .../ivy/util/url/BasicURLHandlerTest.java       |  17 +-
 .../ivy/util/url/HttpclientURLHandlerTest.java  |  19 +-
 test/repositories/1/IVY-644/M1/ivys/ivy-1.0.xml |   0
 test/repositories/1/IVY-644/M2/ivys/ivy-1.0.xml |   0
 test/repositories/1/IVY-644/M3/ivys/ivy-1.0.xml |   0
 test/repositories/1/IVY-644/M4/ivys/ivy-1.0.xml |   0
 test/repositories/1/IVY-644/M4/ivys/ivy-1.1.xml |   0
 test/repositories/1/IVY-644/M4/ivys/ivy-1.2.xml |   0
 .../1/org/foo-bar/ivys/ivy-1.2.3.xml            |  28 +
 .../1/org/foo-bar/jars/foo-bar-1.2.3.jar        |   0
 test/repositories/1/org/mod1/ivys/ivy-2.0.xml   |  27 +
 test/repositories/1/org/mod1/jars/mod1-2.0.jar  |   0
 test/repositories/2/mod17.1/ivy-1.0.xml         |   0
 test/repositories/2/modpom-dbunit/ivy-2.2.xml   |   0
 test/repositories/2/modpom-junit/ivy-3.8.1.xml  |   0
 test/repositories/2/modpom-junit/ivy-3.8.2.xml  |   0
 .../ivysettings-optional-file-include.xml       |  27 +
 .../m2/org/circular/module1/1.0/module1-1.0.jar |   1 +
 .../m2/org/circular/module1/1.0/module1-1.0.pom |  35 +
 .../m2/org/circular/module2/2.0/module2-2.0.jar |   1 +
 .../m2/org/circular/module2/2.0/module2-2.0.pom |  35 +
 .../m2/org/relocated/test3/1.0/test3-1.0.pom    |   0
 .../relocated/test3full/1.1/test3full-1.1.pom   |   0
 test/test-repo/build.xml                        |   1 +
 516 files changed, 11105 insertions(+), 6378 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/32296ea3/build-release.xml
----------------------------------------------------------------------
diff --cc build-release.xml
index af39676,2364091..b540c04
--- a/build-release.xml
+++ b/build-release.xml
@@@ -154,40 -154,75 +154,40 @@@
          </pathconvert>
          <pathconvert property="ivy.jar.location" dirsep="/">
              <identitymapper/>
-             <fileset file="${artifacts.build.dir}/jars/${final.name}" />
+             <fileset file="${artifacts.build.dir}/jars/${final.name}"/>
          </pathconvert>
  
 -        <replace dir="${output.dir}" token="\" value="/"/>
 -        <replace dir="${output.dir}" token="${tutorial.root}" value="/ivy"/>
 -        <replace dir="${output.dir}" token="${tutorial.local}" value="/home/ivy/.ivy2/local"/>
 -        <replace dir="${output.dir}" token="${ivy.jar.location}" value="//home/ivy/ivy.jar"/>
 -        <replace dir="${output.dir}" token="-f build.xml " value=""/>
 -        <replace dir="${output.dir}" token="${ivy.revision}" value="working@apache"/>
 -
 -        <copy todir="${doc.tmp.dir}/tutorial/log">
 -            <fileset dir="${output.dir}"/>
 -        </copy>
 -    </target>
 -
 -    <target name="generate-doc-init" depends="release-version">
 -        <!-- copy documentation to temp dir to replace version tokens -->
 -        <property name="doc.tmp.dir" value="${build.dir}/tempdoc"/>
 -        <mkdir dir="${doc.tmp.dir}"/>
 -        <copy todir="${doc.tmp.dir}" preservelastmodified="true" overwrite="true">
 -            <fileset dir="${doc.src.dir}"/>
 -            <filterset>
 -                <filter token="version" value="${build.version}"/>
 -            </filterset>
 -        </copy>
 +        <replace dir="${output.dir}" token="\" value="/" />
 +        <replace dir="${output.dir}" token="${tutorial.root}" value="/ivy" />
 +        <replace dir="${output.dir}" token="${tutorial.local}" value="/home/ivy/.ivy2/local" />
 +        <replace dir="${output.dir}" token="${ivy.jar.location}" value="//home/ivy/ivy.jar" />
 +        <replace dir="${output.dir}" token="-f build.xml " value="" />
 +        <replace dir="${output.dir}" token="${ivy.revision}" value="working@apache" />
      </target>
  
 -    <target name="generate-doc" depends="generate-doc-init,generate-tutorial-output">
 +    <target name="generate-doc" depends="init-ivy">
 +        <ivy:cachepath pathid="asciidoctor.path">
 +            <dependency org="org.asciidoctor" name="asciidoctor-ant" rev="1.5.4" />
 +        </ivy:cachepath>
 +        <taskdef uri="antlib:org.asciidoctor.ant" resource="org/asciidoctor/ant/antlib.xml" classpathref="asciidoctor.path" />
 +        <asciidoctor:convert sourceDirectory="${doc.src.dir}" outputDirectory="${doc.build.dir}" backend="xhtml5" templateDir="${doc.src.dir}/templates" preserveDirectories="true">
 +            <attribute key="basedir" value="${doc.src.dir}" />
 +            <attribute key="imagesdir" value="" />
 +        </asciidoctor:convert>
 +        <!-- copy static resources -->
          <copy todir="${doc.build.dir}">
 -            <fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd"/>
 -            <fileset dir="${doc.tmp.dir}" includes="tutorial/log/multi-project-general-publishall.txt"/>
 +            <fileset dir="${doc.src.dir}" includes="images/**,style/**,samples/**,js/**,ivy.xsd" />
 +            <fileset dir="${doc.src.dir}" includes="tutorial/log/multi-project-general-publishall.txt" />
          </copy>
 -
 -        <!-- requires java 6 jdk in path and Apache Ant 1.7 -->
 -        <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki/antlib.xml"/>
 -        <xooki:generate destDir="${doc.build.dir}" checkUpToDate="true" xookidir="${doc.src.dir}/xooki">
 -            <fileset dir="${doc.tmp.dir}">
 -                <include name="**/*.html"/>
 -                <exclude name="template.html"/>
 -                <exclude name="*Template.html"/>
 -                <exclude name="conflict-solving-algo.html"/>
 -                <exclude name="use.html"/>
 -                <exclude name="samples/**"/>
 -                <exclude name="js/**"/>
 -                <exclude name="reports/**"/>
 -                <exclude name="xooki/**"/>
 -            </fileset>
 -        </xooki:generate>
 -
 -        <!-- generate print-friendly doc -->
 -        <!-- modify the basedir because othwise xooki.js will not be found! -->
 -        <ant antfile="../build-release.xml" target="generate-print-doc" dir="doc"/>
 -    </target>
 -
 -    <target name="generate-print-doc">
 -        <!-- requires java 6 jdk in path and Apache Ant 1.7 -->
 -        <taskdef uri="antlib:xooki" file="${doc.src.dir}/xooki/antlib.xml"/>
 -        <xooki:print src="${doc.tmp.dir}/index.html"
 -                     dest="${doc.build.dir}/book.html"
 -                     xookidir="${doc.src.dir}/xooki"/>
      </target>
  
-     <target name="all-doc" depends="javadoc, generate-doc" />
+     <target name="all-doc" depends="javadoc,generate-doc"/>
  
      <target name="init-snapshot" depends="default-version">
-         <property name="snapshot.full.name" value="apache-ivy-${build.version}" />
+         <property name="snapshot.full.name" value="apache-ivy-${build.version}"/>
      </target>
  
-     <target name="snapshot-metadata" depends="init-snapshot, resolve">
+     <target name="snapshot-metadata" depends="init-snapshot,resolve">
          <mkdir dir="${artifacts.build.dir}"/>
          <ivy:deliver
              deliverpattern="${artifacts.build.dir}/ivy.xml"

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/32296ea3/build.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/32296ea3/doc/osgi/eclipse-plugin.html
----------------------------------------------------------------------
diff --cc doc/osgi/eclipse-plugin.html
index fafb2b6,3b24d92..c08d861
--- a/doc/osgi/eclipse-plugin.html
+++ b/doc/osgi/eclipse-plugin.html
@@@ -26,9 -26,14 +26,13 @@@
  <body>
  	<textarea id="xooki-source">
  
 +<div class="tip">
+ <table class="notice">
+   <tr>
+     <td style="vertical-align: top"><svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 980.02045 886.1"><g fill="red"><path d="m972.9158,794.5l-426.1,-761.1c-10.5,-20 -31.1,-32.7 -53.7,-33.4l-1.7,0c-22,0 -42.4,11.5 -53.7,30.5l-428.9,761c-11.5,19.4 -11.8,43.3 -0.6,62.9c11.1,19.6 31.9,31.7 54.4,31.7l854.9,0c21.9,0 42.2,-11.5 53.5,-30.2s12,-42 1.9,-61.4zm-910.4,29.2l428.9,-761.1l426,761.1l-854.9,0z"/><path d="m490.3158,626.7c-36.5,0 -62.1,25.6 -62.1,62.8c0,35.8 24.9,62.8 60.7,62.8l1.4,0c37.3,0 61.5,-27 61.5,-62.8c-0.7,-37.3 -24.9,-62.8 -61.5,-62.8z"/><path d="m451.0158,592.1l78.7,0l15.2,-312.6l-109,0l15.1,312.6z"/></g></svg></td>
+     <td>
      Note that this feature is considered as <b>experimental</b>. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discussed your use case on the <a href="http://ant.apache.org/ivy/mailing-lists.html">ivy-user</a> mailing list, or discuss about implementation issues or improvement you may have found on <a href="http://ant.apache.org/ivy/mailing-lists.html">ant-dev</a>.
 -    </td>
 -  </tr>
 -</table>
 +</div>
  
  This page describes how to build an Eclipse&#153; plugin with Apache Ivy&#153; and its OSGi&#153; capabilities.
  

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/32296ea3/doc/osgi/standard-osgi.html
----------------------------------------------------------------------
diff --cc doc/osgi/standard-osgi.html
index 325353d,755affc..bf9d12b
--- a/doc/osgi/standard-osgi.html
+++ b/doc/osgi/standard-osgi.html
@@@ -26,9 -26,14 +26,13 @@@
  <body>
  	<textarea id="xooki-source">
  
 +<div class="tip">
+ <table class="notice">
+   <tr>
+     <td style="vertical-align: top"><svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 980.02045 886.1"><g fill="red"><path d="m972.9158,794.5l-426.1,-761.1c-10.5,-20 -31.1,-32.7 -53.7,-33.4l-1.7,0c-22,0 -42.4,11.5 -53.7,30.5l-428.9,761c-11.5,19.4 -11.8,43.3 -0.6,62.9c11.1,19.6 31.9,31.7 54.4,31.7l854.9,0c21.9,0 42.2,-11.5 53.5,-30.2s12,-42 1.9,-61.4zm-910.4,29.2l428.9,-761.1l426,761.1l-854.9,0z"/><path d="m490.3158,626.7c-36.5,0 -62.1,25.6 -62.1,62.8c0,35.8 24.9,62.8 60.7,62.8l1.4,0c37.3,0 61.5,-27 61.5,-62.8c-0.7,-37.3 -24.9,-62.8 -61.5,-62.8z"/><path d="m451.0158,592.1l78.7,0l15.2,-312.6l-109,0l15.1,312.6z"/></g></svg></td>
+     <td>
      Note that this feature is considered as <b>experimental</b>. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discussed your use case on the <a href="http://ant.apache.org/ivy/mailing-lists.html">ivy-user</a> mailing list, or discuss about implementation issues or improvement you may have found on <a href="http://ant.apache.org/ivy/mailing-lists.html">ant-dev</a>.
 -    </td>
 -  </tr>
 -</table>
 +</div>
  
  <hr />
  <center><b>TODO - WORK IN PROGRESS</b></center>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/32296ea3/doc/osgi/target-platform.html
----------------------------------------------------------------------
diff --cc doc/osgi/target-platform.html
index 8c791e7,863df9d..0aed5a2
--- a/doc/osgi/target-platform.html
+++ b/doc/osgi/target-platform.html
@@@ -26,9 -26,14 +26,13 @@@
  <body>
  	<textarea id="xooki-source">
  
 +<div class="tip">
+ <table class="notice">
+   <tr>
+     <td style="vertical-align: top"><svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 980.02045 886.1"><g fill="red"><path d="m972.9158,794.5l-426.1,-761.1c-10.5,-20 -31.1,-32.7 -53.7,-33.4l-1.7,0c-22,0 -42.4,11.5 -53.7,30.5l-428.9,761c-11.5,19.4 -11.8,43.3 -0.6,62.9c11.1,19.6 31.9,31.7 54.4,31.7l854.9,0c21.9,0 42.2,-11.5 53.5,-30.2s12,-42 1.9,-61.4zm-910.4,29.2l428.9,-761.1l426,761.1l-854.9,0z"/><path d="m490.3158,626.7c-36.5,0 -62.1,25.6 -62.1,62.8c0,35.8 24.9,62.8 60.7,62.8l1.4,0c37.3,0 61.5,-27 61.5,-62.8c-0.7,-37.3 -24.9,-62.8 -61.5,-62.8z"/><path d="m451.0158,592.1l78.7,0l15.2,-312.6l-109,0l15.1,312.6z"/></g></svg></td>
+     <td>
      Note that this feature is considered as <b>experimental</b>. It should work with simple configuration but may not in complex ones. If you have any issue with that feature, you are welcomed to come discussed your use case on the <a href="http://ant.apache.org/ivy/mailing-lists.html">ivy-user</a> mailing list, or discuss about implementation issues or improvement you may have found on <a href="http://ant.apache.org/ivy/mailing-lists.html">ant-dev</a>.
 -    </td>
 -  </tr>
 -</table>
 +</div>
  
  The concept of "target platform" is a concept introduced by Eclipse&#153; to describe the set of bundle which will run together in an OSGi&#153; environement. Then when developping an OSGi bundle, we expect it to run in a such "target platform".