Return-Path: <notifications-return-27906-archive-asf-public=cust-asf.ponee.io@ant.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 22685200C8F
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 25 May 2017 15:48:55 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 211E4160BCA; Thu, 25 May 2017 13:48:55 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id C901C160BD8
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 25 May 2017 15:48:52 +0200 (CEST)
Received: (qmail 6301 invoked by uid 500); 25 May 2017 13:48:49 -0000
Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:notifications-help@ant.apache.org>
List-Unsubscribe: <mailto:notifications-unsubscribe@ant.apache.org>
List-Post: <mailto:notifications@ant.apache.org>
List-Id: <notifications.ant.apache.org>
Reply-To: dev@ant.apache.org
Delivered-To: mailing list notifications@ant.apache.org
Received: (qmail 4613 invoked by uid 99); 25 May 2017 13:48:48 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 May 2017 13:48:48 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id A48B5DFB8A; Thu, 25 May 2017 13:48:48 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: hibou@apache.org
To: notifications@ant.apache.org
Date: Thu, 25 May 2017 13:49:36 -0000
Message-Id: <d935b78d8c69492280dac4817ee4070c@git.apache.org>
In-Reply-To: <3c1a70f166854c7aa7e5f978223d524c@git.apache.org>
References: <3c1a70f166854c7aa7e5f978223d524c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [50/50] [abbrv] ant-ivy git commit: Merge branch 'master' into
 xooki2asciidoc
archived-at: Thu, 25 May 2017 13:48:55 -0000

Merge branch 'master' into xooki2asciidoc


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

Branch: refs/heads/xooki2asciidoc
Commit: 5d6131a3012135602ecbd9b7894a622ec5f75782
Parents: 1760b26 239bc0b
Author: Nicolas Lalevée <nicolas.lalevee@hibnet.org>
Authored: Thu May 25 15:04:39 2017 +0200
Committer: Nicolas Lalevée <nicolas.lalevee@hibnet.org>
Committed: Thu May 25 15:04:39 2017 +0200

----------------------------------------------------------------------
 .classpath.default                              |  90 +--
 NOTICE                                          |   2 +-
 build-release.xml                               | 599 +++++++++----------
 build.xml                                       | 287 ++++-----
 doap_Ivy.rdf                                    |  30 +-
 doc/concept.html                                |  17 +-
 doc/ivyfile/dependencies.html                   |   3 +
 doc/printTemplate.html                          |   2 +-
 doc/release-notes.html                          |  29 +-
 doc/resolver/bintray.html                       |   2 +-
 doc/resolver/sftp.html                          |  14 +-
 doc/resolver/ssh.html                           |  11 +
 doc/settings/resolvers.html                     |   7 +
 doc/template.html                               |   2 +-
 doc/use/makepom.html                            |   2 +-
 ivy.xml                                         |  96 ++-
 src/java/org/apache/ivy/Ivy.java                |  23 +-
 .../apache/ivy/ant/AntWorkspaceResolver.java    | 236 ++++++++
 src/java/org/apache/ivy/ant/FixDepsTask.java    |  10 +-
 src/java/org/apache/ivy/ant/IvyAntSettings.java |   9 +
 src/java/org/apache/ivy/ant/IvyBuildList.java   | 123 ++--
 src/java/org/apache/ivy/ant/IvyBuildNumber.java |  18 +-
 src/java/org/apache/ivy/ant/IvyConfigure.java   |   5 +
 src/java/org/apache/ivy/ant/IvyDependency.java  |  25 +-
 .../org/apache/ivy/ant/IvyDependencyTree.java   |   5 +-
 .../ivy/ant/IvyDependencyUpdateChecker.java     |   7 +
 src/java/org/apache/ivy/ant/IvyMakePom.java     |  30 +-
 src/java/org/apache/ivy/ant/IvyPublish.java     |  29 +-
 src/java/org/apache/ivy/ant/IvyResolve.java     |  27 +-
 src/java/org/apache/ivy/ant/IvyTask.java        |   2 +
 src/java/org/apache/ivy/ant/antlib.xml          |   1 +
 .../ivy/core/cache/CacheMetadataOptions.java    |  11 +
 .../cache/DefaultRepositoryCacheManager.java    | 201 ++++---
 .../cache/DefaultResolutionCacheManager.java    |  12 +-
 .../ivy/core/cache/ParserSettingsMonitor.java   |   4 +
 .../ivy/core/cache/RepositoryCacheManager.java  |  15 +
 .../core/module/descriptor/Configuration.java   |  20 +-
 .../descriptor/DefaultModuleDescriptor.java     | 119 ++--
 .../DefaultWorkspaceModuleDescriptor.java       |  42 ++
 .../descriptor/WorkspaceModuleDescriptor.java   |  26 +
 .../ivy/core/module/id/MatcherLookup.java       |  38 +-
 .../org/apache/ivy/core/module/id/ModuleId.java |  25 +-
 .../ivy/core/module/id/ModuleRevisionId.java    |  46 +-
 .../apache/ivy/core/module/id/ModuleRules.java  |  72 +--
 .../ivy/core/module/status/StatusManager.java   |  23 +-
 .../apache/ivy/core/pack/PackagingManager.java  |  14 +-
 .../apache/ivy/core/publish/PublishEngine.java  |  38 +-
 .../ivy/core/report/ArtifactDownloadReport.java |  10 +
 .../apache/ivy/core/report/ResolveReport.java   | 166 +++--
 .../org/apache/ivy/core/resolve/IvyNode.java    | 117 ++--
 .../apache/ivy/core/resolve/IvyNodeUsage.java   |   5 +
 .../apache/ivy/core/resolve/ResolveData.java    |  48 +-
 .../apache/ivy/core/resolve/ResolveEngine.java  | 107 ++--
 .../apache/ivy/core/resolve/ResolveOptions.java |   7 +-
 .../org/apache/ivy/core/resolve/VisitData.java  |  10 +-
 .../org/apache/ivy/core/resolve/VisitNode.java  |  43 +-
 .../ivy/core/retrieve/RetrieveEngine.java       |  28 +-
 .../apache/ivy/core/search/SearchEngine.java    | 196 +++---
 .../apache/ivy/core/settings/IvySettings.java   | 239 ++++----
 .../ivy/osgi/core/OSGiManifestParser.java       |  18 +-
 .../org/apache/ivy/osgi/filter/AndFilter.java   |   1 +
 .../apache/ivy/osgi/filter/CompareFilter.java   |  20 +-
 .../ivy/osgi/filter/MultiOperatorFilter.java    |   3 +
 .../org/apache/ivy/osgi/filter/NotFilter.java   |   1 +
 .../org/apache/ivy/osgi/filter/OSGiFilter.java  |   1 +
 .../ivy/osgi/filter/OSGiFilterParser.java       |  36 +-
 .../org/apache/ivy/osgi/filter/OrFilter.java    |   1 +
 .../ivy/osgi/filter/UniOperatorFilter.java      |   3 +
 .../org/apache/ivy/osgi/obr/OBRResolver.java    |   6 +-
 .../apache/ivy/osgi/obr/xml/OBRXMLParser.java   |  20 +-
 .../apache/ivy/osgi/p2/P2ArtifactParser.java    |   8 +
 .../apache/ivy/osgi/p2/P2CompositeParser.java   |   4 +
 .../apache/ivy/osgi/p2/P2MetadataParser.java    |  30 +
 .../apache/ivy/osgi/p2/PropertiesParser.java    |   3 +
 .../ivy/osgi/repo/AbstractOSGiResolver.java     |  75 ++-
 .../updatesite/xml/EclipseUpdateSiteParser.java |   7 +-
 .../ivy/osgi/updatesite/xml/FeatureParser.java  |  15 +-
 .../updatesite/xml/UpdateSiteDigestParser.java  |   6 +-
 .../apache/ivy/osgi/util/DelegatingHandler.java |  19 +-
 .../conflict/AbstractConflictManager.java       |   5 +-
 .../ivy/plugins/conflict/ConflictManager.java   |   5 +-
 .../plugins/conflict/FixedConflictManager.java  |  13 +-
 .../LatestCompatibleConflictManager.java        |  67 ++-
 .../plugins/conflict/LatestConflictManager.java |  24 +-
 .../ivy/plugins/conflict/NoConflictManager.java |   2 +-
 .../plugins/conflict/RegexpConflictManager.java |   6 +-
 .../plugins/conflict/StrictConflictManager.java |   7 +-
 .../plugins/latest/AbstractLatestStrategy.java  |   7 +-
 .../latest/ComparatorLatestStrategy.java        |  12 +-
 .../latest/LatestLexicographicStrategy.java     |   8 +-
 .../plugins/latest/LatestRevisionStrategy.java  |  36 +-
 .../ivy/plugins/latest/LatestStrategy.java      |   2 +-
 .../ivy/plugins/latest/LatestTimeStrategy.java  |   8 +-
 .../plugins/latest/WorkspaceLatestStrategy.java |  57 ++
 .../plugins/matcher/AbstractPatternMatcher.java |   1 +
 .../matcher/ExactOrRegexpPatternMatcher.java    |   1 +
 .../plugins/matcher/ExactPatternMatcher.java    |   1 +
 .../ivy/plugins/matcher/GlobPatternMatcher.java |   1 +
 .../apache/ivy/plugins/matcher/MapMatcher.java  |  25 +-
 .../plugins/matcher/RegexpPatternMatcher.java   |   1 +
 .../parser/AbstractModuleDescriptorParser.java  |   9 +-
 .../parser/ModuleDescriptorParserRegistry.java  |   9 +-
 .../ivy/plugins/parser/ParserSettings.java      |   3 +-
 .../ivy/plugins/parser/m2/PomDependencyMgt.java |   4 +-
 .../parser/m2/PomModuleDescriptorBuilder.java   | 146 ++---
 .../parser/m2/PomModuleDescriptorParser.java    | 230 ++++---
 .../parser/m2/PomModuleDescriptorWriter.java    |   5 +-
 .../apache/ivy/plugins/parser/m2/PomReader.java | 245 +++++---
 .../ivy/plugins/parser/m2/PomWriterOptions.java |  17 +-
 .../parser/xml/XmlModuleDescriptorParser.java   |  46 +-
 .../plugins/repository/AbstractRepository.java  |   1 +
 .../ivy/plugins/repository/Repository.java      |   4 +-
 .../ssh/AbstractSshBasedRepository.java         |  42 +-
 .../resolver/AbstractPatternsBasedResolver.java | 137 +++--
 .../ivy/plugins/resolver/AbstractResolver.java  |  20 +-
 .../resolver/AbstractSshBasedResolver.java      |  12 +
 .../resolver/AbstractWorkspaceResolver.java     | 239 ++++++++
 .../ivy/plugins/resolver/BasicResolver.java     | 199 +++---
 .../ivy/plugins/resolver/BintrayResolver.java   |   2 -
 .../ivy/plugins/resolver/CacheResolver.java     |  14 +-
 .../ivy/plugins/resolver/ChainResolver.java     |  74 +--
 .../plugins/resolver/DependencyResolver.java    |   6 +-
 .../ivy/plugins/resolver/DualResolver.java      |   7 +
 .../plugins/resolver/FileSystemResolver.java    |  28 +-
 .../ivy/plugins/resolver/IBiblioResolver.java   |  55 +-
 .../ivy/plugins/resolver/IvyRepResolver.java    |  29 +-
 .../ivy/plugins/resolver/JarResolver.java       |   2 +
 .../plugins/resolver/MirroredURLResolver.java   |  16 +-
 .../plugins/resolver/RepositoryResolver.java    |  24 +-
 .../ivy/plugins/resolver/ResolverSettings.java  |   2 +-
 .../ivy/plugins/resolver/SFTPResolver.java      |   1 +
 .../ivy/plugins/resolver/SshResolver.java       |   1 +
 .../ivy/plugins/resolver/URLResolver.java       |   1 +
 .../ivy/plugins/resolver/VfsResolver.java       |   2 +
 .../ivy/plugins/resolver/VsftpResolver.java     |   1 +
 .../resolver/WorkspaceChainResolver.java        |  37 ++
 .../resolver/util/ApacheHttpURLLister.java      |   3 +-
 .../plugins/resolver/util/FileURLLister.java    |   7 +-
 .../plugins/resolver/util/ResolvedResource.java |   1 +
 .../plugins/resolver/util/ResolverHelper.java   |  34 +-
 .../ivy/plugins/resolver/util/URLLister.java    |   2 +-
 .../bouncycastle/OpenPGPSignatureGenerator.java |  43 +-
 .../plugins/version/LatestVersionMatcher.java   |   9 +-
 .../apache/ivy/util/AbstractMessageLogger.java  |  82 +--
 .../org/apache/ivy/util/ChecksumHelper.java     |  25 +
 .../apache/ivy/util/ContextualSAXHandler.java   |   9 +-
 .../apache/ivy/util/MessageLoggerEngine.java    |  29 +-
 .../apache/ivy/util/cli/CommandLineParser.java  |  29 +-
 .../ivy/util/extendable/ExtendableItem.java     |   6 +-
 .../util/extendable/ExtendableItemHelper.java   |  22 +-
 .../extendable/UnmodifiableExtendableItem.java  |  34 +-
 .../apache/ivy/util/url/ApacheURLLister.java    |  10 +-
 .../apache/ivy/util/url/BasicURLHandler.java    |   1 +
 .../apache/ivy/util/url/IvyAuthenticator.java   |  38 +-
 test/java/org/apache/ivy/IvyTest.java           |   4 +-
 test/java/org/apache/ivy/MainTest.java          |   4 +-
 test/java/org/apache/ivy/TestHelper.java        |  30 +-
 .../apache/ivy/ant/AntBuildResolverTest.java    | 193 ++++++
 .../org/apache/ivy/ant/AntBuildTriggerTest.java |   4 +-
 .../org/apache/ivy/ant/AntCallTriggerTest.java  |   4 +-
 test/java/org/apache/ivy/ant/AntTestHelper.java |  34 --
 .../org/apache/ivy/ant/BuildOBRTaskTest.java    |  31 +-
 .../org/apache/ivy/ant/FixDepsTaskTest.java     |  28 +-
 .../apache/ivy/ant/IvyArtifactPropertyTest.java |  27 +-
 .../apache/ivy/ant/IvyArtifactReportTest.java   |  27 +-
 .../org/apache/ivy/ant/IvyBuildListTest.java    |   7 +-
 .../org/apache/ivy/ant/IvyBuildNumberTest.java  |  29 +-
 .../org/apache/ivy/ant/IvyCacheFilesetTest.java |  25 +-
 .../org/apache/ivy/ant/IvyCachePathTest.java    |  30 +-
 .../org/apache/ivy/ant/IvyCleanCacheTest.java   |   7 +-
 .../org/apache/ivy/ant/IvyConfigureTest.java    |  11 +-
 .../org/apache/ivy/ant/IvyConvertPomTest.java   |   6 +-
 .../java/org/apache/ivy/ant/IvyDeliverTest.java |  28 +-
 .../apache/ivy/ant/IvyDependencyTreeTest.java   |  28 +-
 .../ivy/ant/IvyDependencyUpdateCheckerTest.java |  21 +-
 .../org/apache/ivy/ant/IvyFindRevisionTest.java |  25 +-
 .../apache/ivy/ant/IvyInfoRepositoryTest.java   |  25 +-
 test/java/org/apache/ivy/ant/IvyInfoTest.java   |   7 +-
 .../java/org/apache/ivy/ant/IvyInstallTest.java |   7 +-
 .../org/apache/ivy/ant/IvyListModulesTest.java  |  25 +-
 .../apache/ivy/ant/IvyPostResolveTaskTest.java  |   9 +-
 .../java/org/apache/ivy/ant/IvyPublishTest.java |   7 +-
 test/java/org/apache/ivy/ant/IvyReportTest.java |  61 +-
 .../apache/ivy/ant/IvyRepositoryReportTest.java |  39 +-
 .../java/org/apache/ivy/ant/IvyResolveTest.java |  30 +-
 .../org/apache/ivy/ant/IvyResourcesTest.java    |  33 +-
 .../org/apache/ivy/ant/IvyRetrieveTest.java     |  12 +-
 test/java/org/apache/ivy/ant/IvyTaskTest.java   |  11 +-
 test/java/org/apache/ivy/ant/IvyVarTest.java    |  14 +-
 test/java/org/apache/ivy/ant/ivy-empty.xml      |  26 +
 .../ivy/ant/testutil/AntTaskTestCase.java       |   8 +-
 .../org/apache/ivy/core/TestPerformance.java    |  19 +-
 .../DefaultRepositoryCacheManagerTest.java      |  85 ++-
 .../cache/ModuleDescriptorMemoryCacheTest.java  |   6 +-
 .../apache/ivy/core/deliver/DeliverTest.java    |   7 +-
 .../ivy/core/event/IvyEventFilterTest.java      |   4 +-
 .../apache/ivy/core/install/InstallTest.java    |  23 +-
 .../apache/ivy/core/module/id/ModuleIdTest.java |  13 -
 .../ivy/core/module/id/ModuleRulesTest.java     |   4 +-
 .../ivy/core/publish/PublishEngineTest.java     |   4 +-
 .../ivy/core/publish/PublishEventsTest.java     |   4 +-
 .../ivy/core/report/ResolveReportTest.java      |  64 +-
 .../RepositoryManagementEngineTest.java         |   4 +-
 .../ivy/core/resolve/ResolveEngineTest.java     |   4 +-
 .../apache/ivy/core/resolve/ResolveTest.java    | 230 +++----
 .../apache/ivy/core/retrieve/RetrieveTest.java  |  54 +-
 .../org/apache/ivy/core/search/SearchTest.java  |   4 +-
 .../apache/ivy/core/settings/ConfigureTest.java |   4 +-
 .../ivy/core/settings/IvySettingsTest.java      |   4 +-
 .../settings/OnlineXmlSettingsParserTest.java   |   4 +-
 .../core/settings/XmlSettingsParserTest.java    |   4 +-
 .../java/org/apache/ivy/core/sort/SortTest.java |   6 +-
 .../osgi/core/AggregatedOSGiResolverTest.java   |   4 +-
 .../ivy/osgi/core/ManifestParserTest.java       |   4 +-
 .../ivy/osgi/core/OSGiManifestParserTest.java   |  23 +
 .../ivy/osgi/core/OsgiLatestStrategyTest.java   |   4 +-
 .../apache/ivy/osgi/filter/OSGiFilterTest.java  |   4 +-
 .../org/apache/ivy/osgi/obr/OBRParserTest.java  |   4 +-
 .../apache/ivy/osgi/obr/OBRResolverTest.java    |   6 +-
 .../apache/ivy/osgi/obr/OBRXMLWriterTest.java   |   4 +-
 .../apache/ivy/osgi/p2/P2DescriptorTest.java    |   4 +-
 .../apache/ivy/osgi/repo/BundleRepoTest.java    |   4 +-
 .../UpdateSiteAndIbiblioResolverTest.java       |   4 +-
 .../osgi/updatesite/UpdateSiteLoaderTest.java   |   4 +-
 .../osgi/updatesite/UpdateSiteResolverTest.java |   4 +-
 .../IgnoreCircularDependencyStrategyTest.java   |   4 +-
 .../WarnCircularDependencyStrategyTest.java     |   4 +-
 .../LatestCompatibleConflictManagerTest.java    |   4 +-
 .../conflict/LatestConflictManagerTest.java     |   4 +-
 .../conflict/RegexpConflictManagerTest.java     |   4 +-
 .../conflict/StrictConflictManagerTest.java     |   4 +-
 .../plugins/lock/ArtifactLockStrategyTest.java  |   4 +-
 .../namespace/MRIDTransformationRuleTest.java   |   4 +-
 .../plugins/namespace/NameSpaceHelperTest.java  |   4 +-
 .../AbstractModuleDescriptorParserTester.java   |   4 +-
 .../ModuleDescriptorParserRegistryTest.java     |   4 +-
 .../m2/PomModuleDescriptorParserTest.java       | 184 +++++-
 .../m2/PomModuleDescriptorWriterTest.java       |   4 +-
 .../apache/ivy/plugins/parser/m2/depmgt/bom.pom |  52 ++
 .../ivy/plugins/parser/m2/depmgt/child.pom      |  36 ++
 .../ivy/plugins/parser/m2/depmgt/grandchild.pom |  36 ++
 .../ivy/plugins/parser/m2/depmgt/parent.pom     |  38 ++
 .../parser/m2/depmgt/profile-parent-child.pom   |  36 ++
 .../plugins/parser/m2/depmgt/profile-parent.pom |  46 ++
 .../ivy/plugins/parser/m2/test-exclusion.pom    |  11 +
 .../parser/m2/test-parent-with-licenses.pom     |  36 ++
 .../test-project-with-overridden-licenses.pom   |  43 ++
 .../m2/test-project-with-parent-licenses.pom    |  34 ++
 .../parser/xml/XmlModuleUpdaterTest.java        |   4 +-
 .../xml/test-write-extrainfo-from-maven.xml     |   2 +-
 .../ivy/plugins/report/XmlReportParserTest.java |  34 +-
 .../ivy/plugins/report/XmlReportWriterTest.java |   4 +-
 .../repository/vfs/VfsRepositoryTest.java       |   4 +-
 .../plugins/repository/vfs/VfsResourceTest.java |   4 +-
 .../AbstractDependencyResolverTest.java         |   4 +-
 .../plugins/resolver/BintrayResolverTest.java   |  16 +-
 .../ivy/plugins/resolver/ChainResolverTest.java |  17 +-
 .../resolver/FileSystemResolverTest.java        |  58 ++
 .../ivy/plugins/resolver/IBiblioHelper.java     |   8 +-
 .../plugins/resolver/IBiblioResolverTest.java   |  16 +-
 .../plugins/resolver/IvyRepResolverTest.java    |  15 +-
 .../ivy/plugins/resolver/JarResolverTest.java   |   4 +-
 .../ivy/plugins/resolver/Maven2LocalTest.java   |   4 +-
 .../resolver/MirroredURLResolverTest.java       |  21 +-
 .../plugins/resolver/ResolverTestHelper.java    |   4 +-
 .../ivy/plugins/resolver/URLResolverTest.java   |  15 +-
 .../resolver/util/ResolverHelperTest.java       |   4 +-
 .../ivy/plugins/trigger/LogTriggerTest.java     |   4 +-
 .../version/LatestVersionMatcherTest.java       |  46 +-
 .../version/PatternVersionMatcherTest.java      |   4 +-
 .../version/VersionRangeMatcherTest.java        |   4 +-
 .../apache/ivy/util/IvyPatternHelperTest.java   |   4 +-
 .../ivy/util/url/AbstractURLHandlerTest.java    |   4 +-
 .../ivy/util/url/BasicURLHandlerTest.java       |  15 +-
 .../ivy/util/url/HttpclientURLHandlerTest.java  |   4 +-
 .../repositories/1/org2/mod2.9/ivys/ivy-0.6.xml |  32 +
 .../1/packaging/module10/ivys/ivy-1.0.xml       |  27 +
 .../1/packaging/module9/ivys/ivy-1.0.xml        |  27 +
 .../module9/jars/module9-1.0.jar.pack.gz        | Bin 0 -> 274 bytes
 .../1/usecacheonly/mod4/ivys/ivy-1.0.xml        |  27 +
 .../1/usecacheonly/mod4/jars/mod4-1.0.jar       |   1 +
 .../mod5/ivys/ivy-1.0.0-SNAPSHOT.xml            |  24 +
 .../mod5/jars/mod5-1.0.0-SNAPSHOT.jar           |   1 +
 test/repositories/checksums/.gitattributes      |   2 +
 .../checksums/allright/2.0/allright-2.0.jar     |   1 +
 .../allright/2.0/allright-2.0.jar.SHA-256       |   1 +
 .../checksums/allright/2.0/ivy-2.0.xml          |  28 +
 .../checksums/allright/2.0/ivy-2.0.xml.SHA-256  |   1 +
 .../checksums/allright/3.0/allright-3.0.jar     |   1 +
 .../allright/3.0/allright-3.0.jar.SHA-512       |   1 +
 .../checksums/allright/3.0/ivy-3.0.xml          |  28 +
 .../checksums/allright/3.0/ivy-3.0.xml.SHA-512  |   1 +
 .../osgi/module1/META-INF/MANIFEST.MF           |   3 +
 test/workspace/ivysettings.xml                  |  30 +
 test/workspace/project1/ivy.xml                 |  24 +
 test/workspace/project2/ivy.xml                 |  24 +
 test/workspace/project3/ivy.xml                 |  26 +
 .../workspace/repo/org.acme/module1/1.1/ivy.xml |  21 +
 .../repo/org.acme/module1/1.1/module1.jar       |   0
 .../workspace/repo/org.acme/module2/1.2/ivy.xml |  21 +
 .../repo/org.acme/module2/1.2/module2.jar       |   0
 301 files changed, 5514 insertions(+), 3347 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5d6131a3/build-release.xml
----------------------------------------------------------------------
diff --cc build-release.xml
index 65c13c5,752e8d2..af39676
--- a/build-release.xml
+++ b/build-release.xml
@@@ -17,75 -17,75 +17,75 @@@
     under the License.    
  -->
  <project name="IvyRelease" default="snapshot" 
- 		xmlns:ivy="antlib:org.apache.ivy.ant"
+         xmlns:ivy="antlib:org.apache.ivy.ant"
          xmlns:ivy2="antlib:org.apache.ivy.ant_2"
 -        xmlns:xooki="antlib:xooki"
 +        xmlns:asciidoctor="antlib:org.asciidoctor.ant"
- 		xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
- 	<import file="build.xml"/>
- 	
- 	<macrodef name="run-tutorial">
- 		<attribute name="antfile" />
- 		<attribute name="output" />
- 		<attribute name="target" default="" />
- 		<attribute name="failonerror" default="true" />
- 		<sequential>
- 			<echo>Running @{antfile} @{target} > @{output}</echo>
- 			
+         xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
+     <import file="build.xml"/>
+ 
+     <macrodef name="run-tutorial">
+         <attribute name="antfile" />
+         <attribute name="output" />
+         <attribute name="target" default="" />
+         <attribute name="failonerror" default="true" />
+         <sequential>
+             <echo>Running @{antfile} @{target} > @{output}</echo>
+ 
              <local name="antfile.dir" />
              <dirname property="antfile.dir" file="@{antfile}" />
- 			
- 			<local name="antfile.name" />
- 			<basename property="antfile.name" file="@{antfile}" />
- 
- 			<echo file="@{output}">[ivy@apache:${antfile.dir}]$ ant -f ${antfile.name} @{target}${line.separator}</echo>
- 	        <java classname="org.apache.tools.ant.launch.Launcher"
- 	              fork="true"
- 	              failonerror="@{failonerror}"
- 	        	  logerror="true"
- 	        	  append="true"
- 	              output="@{output}">
- 	            <classpath>
- 	                <fileset file="${artifacts.build.dir}/jars/${final.name}" />
- 	                
- 	                <!-- 
- 	                  We need to set the classpath like this, otherwise the invoked
- 	                  build scripts are not capable of compiling sources ???
- 	                  -->
- 	                <path path="${java.class.path}" />
- 	            </classpath>
- 	        	<sysproperty key="ivy.cache.dir" value="${tutorial.cache}" />
- 	        	<sysproperty key="ivy.local.default.root" value="${tutorial.local-repo}" />
+ 
+             <local name="antfile.name" />
+             <basename property="antfile.name" file="@{antfile}" />
+ 
+             <echo file="@{output}">[ivy@apache:${antfile.dir}]$ ant -f ${antfile.name} @{target}${line.separator}</echo>
+             <java classname="org.apache.tools.ant.launch.Launcher"
+                   fork="true"
+                   failonerror="@{failonerror}"
+                   logerror="true"
+                   append="true"
+                   output="@{output}">
+                 <classpath>
+                     <fileset file="${artifacts.build.dir}/jars/${final.name}" />
+ 
+                     <!--
+                       We need to set the classpath like this, otherwise the invoked
+                       build scripts are not capable of compiling sources ???
+                       -->
+                     <path path="${java.class.path}" />
+                 </classpath>
+                 <sysproperty key="ivy.cache.dir" value="${tutorial.cache}" />
+                 <sysproperty key="ivy.local.default.root" value="${tutorial.local-repo}" />
                  <sysproperty key="ivy.cache.ttl.default" value="1s" />
- 	        	<sysproperty key="skip.download" value="true" />
- 	            <arg line="-f @{antfile}" />
- 	        	<arg line="@{target}" />
- 	        </java>
- 		</sequential>
- 	</macrodef>
- 	
- 	<target name="generate-tutorial-output" depends="jar" unless="skip.generate-tutorial-output">
+                 <sysproperty key="skip.download" value="true" />
+                 <arg line="-f @{antfile}" />
+                 <arg line="@{target}" />
+             </java>
+         </sequential>
+     </macrodef>
+ 
 -    <target name="generate-tutorial-output" depends="jar, generate-doc-init">
 -        <property name="output.dir" value="${build.dir}/output" />
++    <target name="generate-tutorial-output" depends="jar" unless="skip.generate-tutorial-output">
 +        <property name="output.dir" value="${basedir}/asciidoc/tutorial/log" />
- 		<delete dir="${output.dir}" />
+         <delete dir="${output.dir}" />
          <mkdir dir="${output.dir}" />
- 		
- 		<!-- create a copy of the tutorials so we can easily get rid of the generated files -->
- 		<property name="tutorial.src.dir" value="${build.dir}/examples" />
- 		<delete dir="${tutorial.src.dir}" />
- 		<mkdir dir="${tutorial.src.dir}" />
- 		<copy todir="${tutorial.src.dir}">
- 			<fileset dir="src/example" />
- 		</copy>
- 		
- 		<!-- create a cache and local-repository for the tutorials -->
- 		<property name="tutorial.build.dir" value="${build.dir}/tutorial" />
- 		<property name="tutorial.cache" value="${tutorial.build.dir}/cache" />
- 		<property name="tutorial.local-repo" value="${tutorial.build.dir}/local" />
- 		
- 		<!-- go-ivy : not logged, but run in order to check if it still run -->
- 		<run-tutorial antfile="${tutorial.src.dir}/go-ivy/build.xml" output="${output.dir}/dummy.txt" />
+ 
+         <!-- create a copy of the tutorials so we can easily get rid of the generated files -->
+         <property name="tutorial.src.dir" value="${build.dir}/examples" />
+         <delete dir="${tutorial.src.dir}" />
+         <mkdir dir="${tutorial.src.dir}" />
+         <copy todir="${tutorial.src.dir}">
+             <fileset dir="src/example" />
+         </copy>
+ 
+         <!-- create a cache and local-repository for the tutorials -->
+         <property name="tutorial.build.dir" value="${build.dir}/tutorial" />
+         <property name="tutorial.cache" value="${tutorial.build.dir}/cache" />
+         <property name="tutorial.local-repo" value="${tutorial.build.dir}/local" />
+ 
+         <!-- go-ivy : not logged, but run in order to check if it still run -->
+         <run-tutorial antfile="${tutorial.src.dir}/go-ivy/build.xml" output="${output.dir}/dummy.txt" />
          <delete file="${output.dir}/dummy.txt" />
          <delete dir="${tutorial.build.dir}" />
-         
+ 
          <!-- hello-ivy : Quick Start - start.html -->
          <run-tutorial antfile="${tutorial.src.dir}/hello-ivy/build.xml" output="${output.dir}/hello-ivy-1.txt" />
          <run-tutorial antfile="${tutorial.src.dir}/hello-ivy/build.xml" output="${output.dir}/hello-ivy-2.txt" />
@@@ -158,195 -158,223 +158,188 @@@
          </pathconvert>
  
          <replace dir="${output.dir}" token="\" value="/" />
- 		<replace dir="${output.dir}" token="${tutorial.root}" value="/ivy" />
+         <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>
- 	
+         <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>
+     </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" />
++            <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>
-         <!-- the basedir seems to fuck up the path to the output directory, let's fix that manually >
-         <delete dir="${doc.build.dir}" />
-         <mkdir dir="${doc.build.dir}" />
-         <copy todir="${doc.build.dir}">
-             <fileset dir="${doc.src.dir}/${doc.build.dir}" />
-         </copy-->
 +        <!-- 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="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="init-snapshot" depends="default-version">
- 		<property name="snapshot.full.name" value="apache-ivy-${build.version}" />
- 	</target>
- 
- 	<target name="snapshot-metadata" depends="init-snapshot, resolve">
- 		<mkdir dir="${artifacts.build.dir}"/>
- 		<ivy:deliver 
- 			deliverpattern="${artifacts.build.dir}/ivy.xml" 
- 			pubrevision="${build.version}" 
- 			pubdate="${pubdate}"
- 		    status="${status}"/>
- 	</target>
- 	
- 	<target name="snapshot-src" depends="init-snapshot">
- 	    <delete dir="${build.dir}/snapshot-src" failonerror="false" />
- 	    <exec executable="git" failonerror="true">
- 	        <arg line="clone ${basedir} ${build.dir}/snapshot-src" />
- 	    </exec>
- 	    <exec dir="${build.dir}/snapshot-src" executable="git" failonerror="true">
- 	        <arg line="clean -d -x -f" />
- 	    </exec>
- 		<mkdir dir="${distrib.dir}/dist/${build.version}"/>
- 		<zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.zip">
- 			<zipfileset dir="${build.dir}/snapshot-src" prefix="${snapshot.full.name}" />
- 		</zip>
- 		<tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.tar.gz" 
- 			compression="gzip" longfile="gnu">
- 			<zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.zip"/>
- 		</tar>
- 	</target>
- 	
- 	<target name="snapshot-bin-without-dependencies" depends="snapshot-metadata, jar, all-doc">
- 		<mkdir dir="${distrib.dir}/dist/${build.version}"/>
- 		<zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.zip">
- 			<zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc" excludes="**/reports/coverage/**,**/reports/test/**"/>
- 			<zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
- 			<zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
- 			<zipfileset dir="${basedir}" includes="README" prefix="${snapshot.full.name}"/>
- 			<zipfileset dir="${basedir}" includes="LICENSE*" prefix="${snapshot.full.name}"/>
- 			<zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="${snapshot.full.name}/CHANGES.txt"/>
- 			<zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
- 			<zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
- 			<zipfileset dir="${artifacts.build.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
- 			<zipfileset dir="${basedir}" includes="build-for-bin-distrib.xml" fullpath="${snapshot.full.name}/build.xml"/>
- 
- 			<zipfileset dir="${artifacts.build.dir}/jars" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
- 		</zip>
- 		<tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.tar.gz" 
- 			compression="gzip" longfile="gnu">
- 			<zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.zip"/>
- 		</tar>
- 	</target>
- 
- 	<target name="snapshot-bin-with-dependencies" depends="snapshot-metadata, jar, all-doc">
- 		<mkdir dir="${distrib.dir}/dist/${build.version}"/>
- 		<delete dir="${build.dir}/lib" />
- 		<ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]" />
- 		<zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.zip">
- 			<zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc" excludes="**/reports/coverage/**,**/reports/test/**"/>
- 			<zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
- 			<zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
- 			<zipfileset dir="${basedir}" includes="README" prefix="${snapshot.full.name}"/>
- 			<zipfileset dir="${basedir}" includes="LICENSE*" prefix="${snapshot.full.name}"/>
- 			<zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="${snapshot.full.name}/CHANGES.txt"/>
- 			<zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
- 			<zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
- 			<zipfileset dir="${artifacts.build.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
- 	
- 			<zipfileset dir="${artifacts.build.dir}/jars" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
- 
- 			<zipfileset dir="${build.dir}/lib" prefix="${snapshot.full.name}/lib" excludes="ant-*.jar,bcpg-*.jar,bcprov*.jar" />
- 		</zip>
- 		<tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.tar.gz" 
- 			compression="gzip" longfile="gnu">
- 			<zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.zip"/>
- 		</tar>
- 	</target>
- 
- 	<target name="snapshot-bin" 
- 			depends="snapshot-bin-with-dependencies, snapshot-bin-without-dependencies" />
- 	
- 	<target name="release-xsd" depends="init-snapshot">
- 		<!-- copies current ivy xml schema to doc source, so that it will be available from web site -->
- 		<copy file="${src.dir}/org/apache/ivy/plugins/parser/xml/ivy.xsd" todir="${doc.src.dir}" />
- 	</target>
- 	
- 
- 	<target name="snapshot-maven2" depends="init-snapshot, snapshot-metadata, jar, sources, javadoc">
- 		<property name="m2.distrib.dir" value="${distrib.dir}/maven2/${build.version}" />
- 		<ivy:makepom ivyfile="${artifacts.build.dir}/ivy.xml" 
- 	                 pomfile="${m2.distrib.dir}/ivy-${build.version}.pom"
- 			         templatefile="${basedir}/src/etc/makepom/pom.template">
- 			<mapping conf="core" scope="compile"/>
- 			<mapping conf="test" scope="test"/>
- 		</ivy:makepom>
- 		<copy file="${artifacts.build.dir}/jars/${final.name}" 
- 				tofile="${m2.distrib.dir}/ivy-${build.version}.jar" />
- 		<!-- jar javadocs -->
- 	    <jar destfile="${m2.distrib.dir}/ivy-${build.version}-javadoc.jar">
- 	        <fileset dir="${javadoc.build.dir}" />
- 	    </jar>
- 		<!-- copy sources jar -->
- 		<copy file="${artifacts.build.dir}/sources/${final.name}" 
- 				tofile="${m2.distrib.dir}/ivy-${build.version}-sources.jar" />
- 
- 		<checksum algorithm="md5">
- 			<fileset dir="${m2.distrib.dir}">
- 				<include name="*.pom"/>
- 				<include name="*.jar"/>
- 			</fileset>
- 		</checksum>
- 		<checksum algorithm="sha1">
- 			<fileset dir="${m2.distrib.dir}">
- 				<include name="*.pom"/>
- 				<include name="*.jar"/>
- 			</fileset>
- 		</checksum>
- 	</target>
- 	
- 
- 	<target name="snapshot-checksums">
- 		<checksum algorithm="md5">
- 			<fileset dir="${distrib.dir}/dist/${build.version}">
- 				<include name="*.pom"/>
- 				<include name="*.jar"/>
- 				<include name="*.zip"/>
- 				<include name="*.gz"/>
- 			</fileset>
- 		</checksum>
- 		<checksum algorithm="sha">
- 			<fileset dir="${distrib.dir}/dist/${build.version}">
- 				<include name="*.pom"/>
- 				<include name="*.jar"/>
- 				<include name="*.zip"/>
- 				<include name="*.gz"/>
- 			</fileset>
- 		</checksum>
- 	</target>
- 	
- 	<target name="snapshot-version">
- 		<property name="version.prefix" value="${target.ivy.version}-dev-"/>
- 	</target>
- 	
- 	<target name="release-version">
- 		<property name="build.version" value="${target.ivy.version}" />
- 		<echo>Setting version to ${build.version}</echo>
- 		<condition property="status" value="release">
- 			<matches pattern="^\d+\.\d+\.\d+$" string="${build.version}"/>
- 		</condition>
- 		<condition property="status" value="milestone">
- 			<matches pattern="^\d+\.\d+\.\d+-(alpha|beta|rc)\d+$" string="${build.version}"/>
- 		</condition>
- 		<property name="status" value="integration" />
- 		<echo>Setting status to ${status}</echo>
- 	</target>
- 	
- 	<target name="sign" depends="init-ivy">
+     <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}" />
+     </target>
+ 
+     <target name="snapshot-metadata" depends="init-snapshot, resolve">
+         <mkdir dir="${artifacts.build.dir}"/>
+         <ivy:deliver
+             deliverpattern="${artifacts.build.dir}/ivy.xml"
+             pubrevision="${build.version}"
+             pubdate="${pubdate}"
+             status="${status}"/>
+     </target>
+ 
+     <target name="snapshot-src" depends="init-snapshot">
+         <delete dir="${build.dir}/snapshot-src" failonerror="false" />
+         <exec executable="git" failonerror="true">
+             <arg line="clone ${basedir} ${build.dir}/snapshot-src" />
+         </exec>
+         <exec dir="${build.dir}/snapshot-src" executable="git" failonerror="true">
+             <arg line="clean -d -x -f" />
+         </exec>
+         <mkdir dir="${distrib.dir}/dist/${build.version}"/>
+         <zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.zip">
+             <zipfileset dir="${build.dir}/snapshot-src" prefix="${snapshot.full.name}" />
+         </zip>
+         <tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.tar.gz"
+             compression="gzip" longfile="gnu">
+             <zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.zip"/>
+         </tar>
+     </target>
+ 
+     <target name="snapshot-bin-without-dependencies" depends="snapshot-metadata, jar, all-doc">
+         <mkdir dir="${distrib.dir}/dist/${build.version}"/>
+         <zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.zip">
+             <zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc" excludes="**/reports/coverage/**,**/reports/test/**"/>
+             <zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
+             <zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
+             <zipfileset dir="${basedir}" includes="README" prefix="${snapshot.full.name}"/>
+             <zipfileset dir="${basedir}" includes="LICENSE*" prefix="${snapshot.full.name}"/>
+             <zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="${snapshot.full.name}/CHANGES.txt"/>
+             <zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
+             <zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
+             <zipfileset dir="${artifacts.build.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
+             <zipfileset dir="${basedir}" includes="build-for-bin-distrib.xml" fullpath="${snapshot.full.name}/build.xml"/>
+ 
+             <zipfileset dir="${artifacts.build.dir}/jars" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
+         </zip>
+         <tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.tar.gz"
+             compression="gzip" longfile="gnu">
+             <zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.zip"/>
+         </tar>
+     </target>
+ 
+     <target name="snapshot-bin-with-dependencies" depends="snapshot-metadata, jar, all-doc">
+         <mkdir dir="${distrib.dir}/dist/${build.version}"/>
+         <delete dir="${build.dir}/lib" />
+         <ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]" />
+         <zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.zip">
+             <zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc" excludes="**/reports/coverage/**,**/reports/test/**"/>
+             <zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
+             <zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
+             <zipfileset dir="${basedir}" includes="README" prefix="${snapshot.full.name}"/>
+             <zipfileset dir="${basedir}" includes="LICENSE*" prefix="${snapshot.full.name}"/>
+             <zipfileset dir="${basedir}" includes="CHANGES.txt" fullpath="${snapshot.full.name}/CHANGES.txt"/>
+             <zipfileset dir="${basedir}" includes="RELEASE_NOTES" fullpath="${snapshot.full.name}/RELEASE_NOTES"/>
+             <zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
+             <zipfileset dir="${artifacts.build.dir}" includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
+ 
+             <zipfileset dir="${artifacts.build.dir}/jars" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
+ 
+             <zipfileset dir="${build.dir}/lib" prefix="${snapshot.full.name}/lib" excludes="ant-*.jar,bcpg-*.jar,bcprov*.jar" />
+         </zip>
+         <tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.tar.gz"
+             compression="gzip" longfile="gnu">
+             <zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.zip"/>
+         </tar>
+     </target>
+ 
+     <target name="snapshot-bin"
+             depends="snapshot-bin-with-dependencies, snapshot-bin-without-dependencies" />
+ 
+     <target name="release-xsd" depends="init-snapshot">
+         <!-- copies current ivy xml schema to doc source, so that it will be available from web site -->
+         <copy file="${src.dir}/org/apache/ivy/plugins/parser/xml/ivy.xsd" todir="${doc.src.dir}" />
+     </target>
+ 
+ 
+     <target name="snapshot-maven2" depends="init-snapshot, snapshot-metadata, jar, sources, javadoc">
+         <property name="m2.distrib.dir" value="${distrib.dir}/maven2/${build.version}" />
+         <ivy:makepom ivyfile="${artifacts.build.dir}/ivy.xml"
+                      pomfile="${m2.distrib.dir}/ivy-${build.version}.pom"
+                      templatefile="${basedir}/src/etc/makepom/pom.template">
+             <mapping conf="core" scope="compile"/>
+             <mapping conf="test" scope="test"/>
+         </ivy:makepom>
+         <copy file="${artifacts.build.dir}/jars/${final.name}"
+                 tofile="${m2.distrib.dir}/ivy-${build.version}.jar" />
+         <!-- jar javadocs -->
+         <jar destfile="${m2.distrib.dir}/ivy-${build.version}-javadoc.jar">
+             <fileset dir="${javadoc.build.dir}" />
+         </jar>
+         <!-- copy sources jar -->
+         <copy file="${artifacts.build.dir}/sources/${final.name}"
+                 tofile="${m2.distrib.dir}/ivy-${build.version}-sources.jar" />
+ 
+         <checksum algorithm="md5">
+             <fileset dir="${m2.distrib.dir}">
+                 <include name="*.pom"/>
+                 <include name="*.jar"/>
+             </fileset>
+         </checksum>
+         <checksum algorithm="sha1">
+             <fileset dir="${m2.distrib.dir}">
+                 <include name="*.pom"/>
+                 <include name="*.jar"/>
+             </fileset>
+         </checksum>
+     </target>
+ 
+ 
+     <target name="snapshot-checksums">
+         <checksum algorithm="md5">
+             <fileset dir="${distrib.dir}/dist/${build.version}">
+                 <include name="*.pom"/>
+                 <include name="*.jar"/>
+                 <include name="*.zip"/>
+                 <include name="*.gz"/>
+             </fileset>
+         </checksum>
+         <checksum algorithm="sha">
+             <fileset dir="${distrib.dir}/dist/${build.version}">
+                 <include name="*.pom"/>
+                 <include name="*.jar"/>
+                 <include name="*.zip"/>
+                 <include name="*.gz"/>
+             </fileset>
+         </checksum>
+     </target>
+ 
+     <target name="snapshot-version">
+         <property name="version.prefix" value="${target.ivy.version}-dev-"/>
+     </target>
+ 
+     <target name="release-version">
+         <property name="build.version" value="${target.ivy.version}" />
+         <echo>Setting version to ${build.version}</echo>
+         <condition property="status" value="release">
+             <matches pattern="^\d+\.\d+\.\d+$" string="${build.version}"/>
+         </condition>
+         <condition property="status" value="milestone">
+             <matches pattern="^\d+\.\d+\.\d+-(alpha|beta|rc)\d+$" string="${build.version}"/>
+         </condition>
+         <property name="status" value="integration" />
+         <echo>Setting status to ${status}</echo>
+     </target>
+ 
+     <target name="sign" depends="init-ivy">
          <property file="${user.home}/ivybuild.properties" />
          <input message="please enter your PGP password: " addproperty="pgp.password"/>
          <input message="please enter your PGP keyId: " addproperty="pgp.keyId"/>