You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jh...@apache.org on 2017/06/03 16:17:12 UTC
[17/18] ant-ivy git commit: Merge branch 'PR-41'
Merge branch 'PR-41'
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/59a7dfa3
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/59a7dfa3
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/59a7dfa3
Branch: refs/heads/master
Commit: 59a7dfa3d6b1647e737acc648dbfd8c49e6ebd2a
Parents: 95a524e 7dc1b93
Author: Jan Matèrne <jh...@apache.org>
Authored: Sat Jun 3 18:14:19 2017 +0200
Committer: Jan Matèrne <jh...@apache.org>
Committed: Sat Jun 3 18:14:19 2017 +0200
----------------------------------------------------------------------
build-release.xml | 266 +++---
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 | 2 +-
doc/osgi/standard-osgi.html | 2 +-
doc/osgi/target-platform.html | 2 +-
doc/printTemplate.html | 2 +-
doc/template.html | 2 +-
.../src/example/Hello.java | 8 +-
.../src/example/ConfigurationsExample.java | 8 +-
.../src/filter/FilterProvider.java | 4 +-
.../src/filter/ccimpl/CCFilter.java | 2 +-
.../src/filter/hmimpl/HMFilter.java | 2 +-
.../test/filter/AbstractTestFilter.java | 4 +-
.../multi-projects/myapp/src/myapp/Main.java | 4 +-
.../dependee/src/standalone/Main.java | 8 +-
.../dependence/depender/src/depending/Main.java | 6 +-
src/example/dual/project/src/example/Hello.java | 14 +-
src/example/hello-ivy/src/example/Hello.java | 10 +-
.../projects/console/src/console/Main.java | 10 +-
.../projects/find/src/find/FindFile.java | 8 +-
.../projects/find/src/find/Main.java | 14 +-
.../projects/list/src/list/ListFile.java | 8 +-
.../projects/list/src/list/Main.java | 14 +-
.../projects/size/src/size/FileSize.java | 6 +-
.../projects/sizewhere/src/sizewhere/Main.java | 14 +-
.../sizewhere/src/sizewhere/SizeWhere.java | 4 +-
.../projects/version/src/version/Version.java | 6 +-
src/java/org/apache/ivy/Main.java | 2 +-
src/java/org/apache/ivy/ant/AntCallTrigger.java | 6 +-
.../org/apache/ivy/ant/AntMessageLogger.java | 4 +-
.../apache/ivy/ant/IvyAntVariableContainer.java | 4 +-
.../org/apache/ivy/ant/IvyCacheFileset.java | 4 +-
src/java/org/apache/ivy/ant/IvyCheck.java | 2 +-
src/java/org/apache/ivy/ant/IvyCleanCache.java | 4 +-
src/java/org/apache/ivy/core/IvyThread.java | 2 +-
.../apache/ivy/core/cache/ArtifactOrigin.java | 4 +-
.../org/apache/ivy/core/cache/CacheUtil.java | 4 +-
.../cache/DefaultResolutionCacheManager.java | 4 +-
.../core/cache/ModuleDescriptorMemoryCache.java | 2 +-
.../ivy/core/cache/RepositoryCacheManager.java | 65 +-
.../PublishingDependencyRevisionResolver.java | 2 +-
.../event/publish/EndArtifactPublishEvent.java | 2 +-
.../ivy/core/event/publish/PublishEvent.java | 2 +-
.../publish/StartArtifactPublishEvent.java | 2 +-
.../resolve/EndResolveDependencyEvent.java | 2 +-
.../core/event/retrieve/EndRetrieveEvent.java | 8 +-
.../descriptor/AbstractIncludeExcludeRule.java | 2 +-
.../ivy/core/module/descriptor/Artifact.java | 18 +-
.../core/module/descriptor/Configuration.java | 6 +-
.../module/descriptor/ConfigurationAware.java | 4 +-
.../module/descriptor/ConfigurationGroup.java | 4 +-
.../descriptor/ConfigurationIntersection.java | 4 +-
.../DefaultDependencyArtifactDescriptor.java | 2 +-
.../descriptor/DefaultDependencyDescriptor.java | 11 +-
.../descriptor/DefaultModuleDescriptor.java | 5 +-
.../DependencyDescriptorMediator.java | 2 +-
.../ivy/core/module/descriptor/ExcludeRule.java | 6 +-
.../ivy/core/module/descriptor/IncludeRule.java | 6 +-
.../core/module/descriptor/InheritableItem.java | 2 +-
.../module/descriptor/ModuleDescriptor.java | 10 +-
.../OverrideDependencyDescriptorMediator.java | 6 +-
.../ivy/core/module/id/ArtifactRevisionId.java | 2 +-
.../org/apache/ivy/core/module/id/ModuleId.java | 22 +-
.../ivy/core/module/id/ModuleRevisionId.java | 8 +-
.../apache/ivy/core/module/id/ModuleRules.java | 20 +-
.../apache/ivy/core/publish/PublishOptions.java | 2 +-
.../ivy/core/report/ArtifactDownloadReport.java | 4 +-
.../report/MetadataArtifactDownloadReport.java | 4 +-
.../repository/RepositoryManagementEngine.java | 8 +-
.../apache/ivy/core/resolve/ResolveData.java | 10 +-
.../core/resolve/ResolvedModuleRevision.java | 14 +-
.../ivy/core/retrieve/RetrieveOptions.java | 2 +-
.../apache/ivy/core/settings/IvySettings.java | 4 +
.../ivy/core/settings/IvyVariableContainer.java | 2 +-
.../core/settings/IvyVariableContainerImpl.java | 4 +-
.../apache/ivy/core/settings/Validatable.java | 2 +-
.../org/apache/ivy/core/sort/ModuleInSort.java | 10 +-
.../core/sort/NonMatchingVersionReporter.java | 2 +-
.../org/apache/ivy/core/sort/SortEngine.java | 4 +-
.../org/apache/ivy/osgi/core/BundleInfo.java | 4 +-
.../ivy/osgi/core/ManifestHeaderValue.java | 6 +-
.../apache/ivy/osgi/core/ManifestParser.java | 4 +-
.../ivy/osgi/filter/MultiOperatorFilter.java | 2 +-
.../ivy/osgi/filter/OSGiFilterParser.java | 6 +-
.../ivy/osgi/filter/UniOperatorFilter.java | 2 +-
.../osgi/repo/AbstractFSManifestIterable.java | 8 +-
.../ivy/osgi/repo/AbstractOSGiResolver.java | 2 +-
.../ivy/osgi/repo/FSManifestIterable.java | 4 +-
.../apache/ivy/osgi/repo/RepoDescriptor.java | 8 +-
.../osgi/repo/RepositoryManifestIterable.java | 2 +-
.../apache/ivy/osgi/util/DelegatingHandler.java | 6 +-
.../org/apache/ivy/osgi/util/ParseUtil.java | 2 +-
src/java/org/apache/ivy/osgi/util/Version.java | 2 +-
.../org/apache/ivy/osgi/util/VersionRange.java | 4 +-
.../ivy/plugins/conflict/ConflictManager.java | 4 +-
.../plugins/conflict/LatestConflictManager.java | 5 +-
.../plugins/conflict/RegexpConflictManager.java | 6 +-
.../ivy/plugins/latest/LatestStrategy.java | 4 +-
.../ivy/plugins/lock/DeleteOnExitHook.java | 2 +-
.../plugins/matcher/AbstractPatternMatcher.java | 4 +-
.../org/apache/ivy/plugins/matcher/Matcher.java | 4 +-
.../plugins/matcher/RegexpPatternMatcher.java | 2 +-
.../parser/AbstractModuleDescriptorParser.java | 2 +-
.../plugins/parser/ModuleDescriptorParser.java | 6 +-
.../parser/ModuleDescriptorParserRegistry.java | 2 +-
.../parser/m2/PomModuleDescriptorBuilder.java | 2 +-
.../ivy/plugins/parser/m2/PomWriterOptions.java | 2 +-
.../parser/xml/XmlModuleDescriptorWriter.java | 4 +-
.../apache/ivy/plugins/repository/Resource.java | 14 +-
.../plugins/repository/sftp/SFTPRepository.java | 6 +-
.../apache/ivy/plugins/repository/ssh/Scp.java | 10 +-
.../plugins/repository/ssh/SshRepository.java | 5 +
.../ivy/plugins/repository/ssh/SshResource.java | 8 +-
.../plugins/repository/vfs/VfsRepository.java | 2 +
.../resolver/AbstractPatternsBasedResolver.java | 2 +-
.../ivy/plugins/resolver/AbstractResolver.java | 11 +-
.../resolver/AbstractWorkspaceResolver.java | 2 +-
.../ivy/plugins/resolver/BasicResolver.java | 8 +-
.../ivy/plugins/resolver/DualResolver.java | 2 +-
.../plugins/resolver/FileSystemResolver.java | 2 +-
.../ivy/plugins/resolver/IBiblioResolver.java | 2 +-
.../ivy/plugins/resolver/IvyRepResolver.java | 2 +-
.../plugins/resolver/RepositoryResolver.java | 2 +-
.../plugins/resolver/util/ResourceMDParser.java | 2 +-
.../ivy/plugins/resolver/util/URLLister.java | 2 +-
.../ivy/plugins/trigger/AbstractTrigger.java | 2 +-
.../apache/ivy/plugins/trigger/LogTrigger.java | 10 +-
.../plugins/version/AbstractVersionMatcher.java | 5 +
.../plugins/version/ChainVersionMatcher.java | 6 +-
.../plugins/version/LatestVersionMatcher.java | 5 +
.../org/apache/ivy/plugins/version/Match.java | 2 +-
.../plugins/version/PatternVersionMatcher.java | 2 +-
.../apache/ivy/util/AbstractMessageLogger.java | 2 +-
src/java/org/apache/ivy/util/Checks.java | 2 +-
.../org/apache/ivy/util/ChecksumHelper.java | 4 +-
.../org/apache/ivy/util/ConfigurationUtils.java | 4 +-
src/java/org/apache/ivy/util/Configurator.java | 2 +-
src/java/org/apache/ivy/util/Credentials.java | 4 +-
src/java/org/apache/ivy/util/FileResolver.java | 6 +-
src/java/org/apache/ivy/util/FileUtil.java | 16 +-
src/java/org/apache/ivy/util/HostUtil.java | 4 +-
src/java/org/apache/ivy/util/MemoryUtil.java | 6 +-
src/java/org/apache/ivy/util/Message.java | 4 +-
src/java/org/apache/ivy/util/MessageLogger.java | 8 +-
.../apache/ivy/util/MessageLoggerEngine.java | 6 +-
src/java/org/apache/ivy/util/StringUtils.java | 14 +-
.../ivy/util/extendable/ExtendableItem.java | 10 +-
.../util/extendable/ExtendableItemHelper.java | 2 +-
.../apache/ivy/util/filter/FilterHelper.java | 2 +-
.../apache/ivy/util/url/ApacheURLLister.java | 8 +-
.../apache/ivy/util/url/BasicURLHandler.java | 4 +-
.../apache/ivy/util/url/CredentialsStore.java | 2 +-
.../apache/ivy/util/url/IvyAuthenticator.java | 2 +-
163 files changed, 2589 insertions(+), 525 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59a7dfa3/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
----------------------------------------------------------------------
diff --cc src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
index 11bce97,fcb97a6..81da01a
--- a/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
+++ b/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
@@@ -39,10 -39,10 +39,10 @@@ public abstract class AbstractTestFilte
getIFilter().filter(null, "test");
}
- @Test(expected = NullPointerException.class)
+ @Test
public void testFilterNullPrefix() {
getIFilter().filter(new String[]{"test"}, null);
- }
+ }
@Test
public void testFilter() {