Merge branch 'PR-43'
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/c7d4b539 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/c7d4b539 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/c7d4b539 Branch: refs/heads/master Commit: c7d4b539bd0684c22950ecf64684f0dcfe36ba7e Parents: 545536e 3b28fff Author: Jan Matèrne <j...@apache.org> Authored: Wed Jun 14 10:53:58 2017 +0200 Committer: Jan Matèrne <j...@apache.org> Committed: Wed Jun 14 10:53:58 2017 +0200 ---------------------------------------------------------------------- ivy.xml | 32 ++--- src/example/bintray/ivy.xml | 10 +- .../chainedresolvers-project/ivy.xml | 4 +- src/example/configurations/jdbc-example/ivy.xml | 32 ++--- .../src/example/ConfigurationsExample.java | 9 +- .../multi-projects/filter-framework/ivy.xml | 18 +-- .../src/filter/FilterProvider.java | 4 +- .../src/filter/ccimpl/CCFilter.java | 14 +-- .../src/filter/hmimpl/HMFilter.java | 11 +- .../test/filter/AbstractTestFilter.java | 1 - .../configurations/multi-projects/myapp/ivy.xml | 12 +- src/example/dependence/dependee/ivy.xml | 4 +- src/example/dependence/depender/ivy.xml | 4 +- 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/hello-ivy/ivy.xml | 6 +- src/example/hello-ivy/src/example/Hello.java | 51 -------- .../hello-ivy/src/example/HelloConsole.java | 51 ++++++++ .../multi-project/projects/console/ivy.xml | 12 +- .../projects/console/src/console/Main.java | 10 +- src/example/multi-project/projects/find/ivy.xml | 14 +-- .../projects/find/src/find/FindFile.java | 24 ++-- .../projects/find/src/find/Main.java | 36 +++--- src/example/multi-project/projects/list/ivy.xml | 10 +- .../projects/list/src/list/ListFile.java | 16 +-- .../projects/list/src/list/Main.java | 25 ++-- src/example/multi-project/projects/size/ivy.xml | 8 +- .../projects/size/src/size/FileSize.java | 19 +-- .../multi-project/projects/sizewhere/ivy.xml | 14 +-- .../projects/sizewhere/src/sizewhere/Main.java | 32 ++--- .../sizewhere/src/sizewhere/SizeWhere.java | 9 +- .../multi-project/projects/version/ivy.xml | 4 +- .../projects/version/src/version/Version.java | 4 +- .../ivy/core/cache/RepositoryCacheManager.java | 18 +-- .../plugins/repository/ssh/SshRepository.java | 10 +- .../ivy/plugins/repository/vfs/VfsResource.java | 8 +- src/java/org/apache/ivy/util/FileUtil.java | 2 +- test/java/org/apache/ivy/TestFixture.java | 3 +- test/java/org/apache/ivy/TestHelper.java | 43 +++---- .../apache/ivy/ant/AntBuildResolverTest.java | 12 +- .../org/apache/ivy/ant/AntCallTriggerTest.java | 11 +- .../org/apache/ivy/ant/BuildOBRTaskTest.java | 5 +- .../org/apache/ivy/ant/FixDepsTaskTest.java | 9 +- .../org/apache/ivy/ant/IvyBuildListTest.java | 7 +- .../java/org/apache/ivy/ant/IvyDeliverTest.java | 49 ++++---- .../apache/ivy/ant/IvyPostResolveTaskTest.java | 69 ++++++----- .../java/org/apache/ivy/ant/IvyResolveTest.java | 2 +- .../org/apache/ivy/ant/IvyResourcesTest.java | 11 +- .../core/module/descriptor/IvyMakePomTest.java | 13 +-- .../apache/ivy/core/module/id/ModuleIdTest.java | 1 + .../ivy/core/publish/PublishEventsTest.java | 24 ++-- .../ivy/core/report/ResolveReportTest.java | 4 +- .../apache/ivy/core/resolve/ResolveTest.java | 116 +++++++++---------- .../apache/ivy/core/retrieve/RetrieveTest.java | 2 +- .../org/apache/ivy/core/search/SearchTest.java | 18 +-- .../java/org/apache/ivy/core/sort/SortTest.java | 97 ++++++++-------- .../ivy/osgi/core/ManifestParserTest.java | 4 +- .../ivy/osgi/core/OsgiLatestStrategyTest.java | 12 +- .../apache/ivy/osgi/obr/OBRResolverTest.java | 6 +- .../apache/ivy/osgi/obr/OBRXMLWriterTest.java | 12 +- .../conflict/LatestConflictManagerTest.java | 20 +--- .../latest/LatestRevisionStrategyTest.java | 16 ++- .../plugins/lock/ArtifactLockStrategyTest.java | 6 +- .../matcher/AbstractPatternMatcherTest.java | 16 +-- .../xml/XmlModuleDescriptorParserTest.java | 36 +++--- .../parser/xml/XmlModuleUpdaterTest.java | 18 +-- .../repository/vfs/VfsRepositoryTest.java | 33 ++---- .../plugins/repository/vfs/VfsResourceTest.java | 50 +++----- .../plugins/repository/vfs/VfsTestHelper.java | 10 +- .../ivy/plugins/repository/vfs/VfsURI.java | 41 ++++--- .../ivy/plugins/resolver/ChainResolverTest.java | 16 +-- .../plugins/resolver/IBiblioResolverTest.java | 4 +- .../ivy/plugins/resolver/MockResolver.java | 2 +- .../org/apache/ivy/util/ConfiguratorTest.java | 10 +- .../org/apache/ivy/util/MockMessageLogger.java | 6 +- .../ivy/util/url/ApacheURLListerTest.java | 20 ++-- 77 files changed, 695 insertions(+), 783 deletions(-) ----------------------------------------------------------------------
