[gradle] 02/02: Merge tag 'upstream/1.5'

Emmanuel Bourg ebourg-guest at alioth.debian.org
Wed Oct 2 23:13:19 UTC 2013


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository gradle.

commit 17d413092cba1832b53af174303b49dee5e759b6
Merge: ea813a8 70461f2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 3 00:55:10 2013 +0200

    Merge tag 'upstream/1.5'
    
    Upstream version 1.5

 .../main/groovy/org/gradle/build/BuildTypes.groovy |   16 +-
 .../docs/dsl/docbook/JavadocLinkConverter.java     |    8 +
 .../build/docs/dsl/docbook/LinkRenderer.java       |   15 +
 .../build/docs/dsl/links/ClassLinkMetaData.java    |   20 +
 .../docs/dsl/source/SourceMetaDataVisitor.java     |   22 +-
 .../build/docs/dsl/source/model/ClassMetaData.java |   38 +-
 .../dsl/source/model/EnumConstantMetaData.java     |   43 +
 .../groovy/org/gradle/plugins/jsoup/Jsoup.groovy   |   59 --
 .../gradle/plugins/jsoup/JsoupCopyExtension.groovy |   84 ++
 .../gradle/plugins/jsoup/JsoupFilterReader.groovy  |   56 ++
 .../org/gradle/plugins/jsoup/JsoupPlugin.groovy    |    9 +-
 .../plugins/jsoup/JsoupTransformTarget.groovy      |   32 +
 .../dsl/docbook/JavadocLinkConverterTest.groovy    |   21 +-
 .../dsl/source/ExtractDslMetaDataTaskTest.groovy   |   17 +-
 config/checkstyle/checkstyle.xml                   |    6 +-
 gradle/buildReceipt.gradle                         |   10 +-
 gradle/dependencies.gradle                         |    5 +-
 gradle/versioning.gradle                           |    2 -
 gradle/wrapper/gradle-wrapper.properties           |    4 +-
 .../plugins/announce/internal/NotifySend.groovy    |    1 +
 .../java/org/gradle/api/internal/IoActions.java    |   16 +-
 .../org/gradle/internal/CompositeStoppable.java    |   24 -
 .../java/org/gradle/internal/SystemProperties.java |   10 +-
 .../main/java/org/gradle/util/CollectionUtils.java |   14 +-
 .../org/gradle/api/internal/ActionsTest.groovy     |   13 +
 .../org/gradle/api/internal/IoActionsTest.groovy   |   20 +-
 .../org/gradle/util/CollectionUtilsTest.groovy     |   15 +
 .../build-comparison/build-comparison.gradle       |    2 +-
 .../gradle/BuildComparisonIntegrationSpec.groovy   |    6 +-
 ...Pre12CompareGradleBuildsCrossVersionSpec.groovy |    4 +-
 .../gradle/internal/GradleBuildComparison.java     |    2 +-
 .../quality/PmdPluginIntegrationTest.groovy        |   79 +-
 .../quality/PmdPluginVersionIntegrationTest.groovy |   62 ++
 .../org/gradle/api/plugins/quality/FindBugs.groovy |    8 +
 .../org/gradle/api/plugins/quality/Pmd.groovy      |   60 +-
 .../gradle/api/plugins/quality/PmdExtension.groovy |   15 +-
 .../gradle/api/plugins/quality/PmdPlugin.groovy    |   33 +-
 .../org/gradle/api/plugins/quality/TargetJdk.java  |   71 ++
 .../quality/internal/findbugs/FindBugsSpec.java    |   10 +-
 .../internal/findbugs/FindBugsSpecBuilder.java     |   10 +-
 .../internal/findbugs/FindBugsWorkerManager.groovy |    1 +
 .../api/plugins/quality/PmdPluginTest.groovy       |   30 +-
 .../api/plugins/quality/TargetJdkSpec.groovy       |  103 +++
 .../ArtifactDependenciesIntegrationTest.groovy     |   16 +-
 .../ArtifactOnlyResolutionIntegrationTest.groovy   |    2 +-
 .../resolve/CacheResolveIntegrationTest.groovy     |    4 +-
 .../DependenciesResolveIntegrationTest.java        |   46 --
 .../DependencyResolveRulesIntegrationTest.groovy   |  180 ++++-
 .../resolve/ForcedModulesIntegrationTest.groovy    |  320 ++++++++
 .../ProjectDependenciesIntegrationTest.groovy      |   95 +++
 ...ResolutionStrategySamplesIntegrationTest.groovy |   24 +-
 ...VersionConflictResolutionIntegrationTest.groovy |  556 ++++---------
 ...AliasedArtifactResolutionIntegrationTest.groovy |    2 +-
 .../M3CacheReuseCrossVersionIntegrationTest.groovy |    2 +-
 .../MavenM2CacheReuseIntegrationTest.groovy        |    5 +-
 .../ResolutionOverrideIntegrationTest.groovy       |    5 +-
 .../custom/IvySFtpResolverIntegrationTest.groovy   |    2 +-
 .../custom/IvyUrlResolverIntegrationTest.groovy    |    2 +-
 .../AbstractHttpsRepoResolveIntegrationTest.groovy |    2 +-
 ...ationDependencyResolutionIntegrationTest.groovy |   14 +-
 .../IvyBrokenRemoteResolveIntegrationTest.groovy   |    9 +-
 .../ivy/IvyDescriptorResolveIntegrationTest.groovy |   91 +++
 .../ivy/IvyHttpRepoResolveIntegrationTest.groovy   |   70 +-
 .../resolve/ivy/IvyResolveIntegrationTest.groovy   |  161 +++-
 .../MavenHttpRepoResolveIntegrationTest.groovy     |    2 +-
 .../MavenLocalRepoResolveIntegrationTest.groovy    |   21 +-
 .../artifacts/ArtifactDependencyResolver.java      |    5 +-
 .../internal/artifacts/ConfigurationResolver.java  |   26 +
 .../artifacts/DefaultDependencyFactory.java        |   13 +-
 .../DefaultDependencyManagementServices.java       |  124 +--
 .../artifacts/DefaultProjectDependencyFactory.java |   47 ++
 .../configurations/DefaultConfiguration.java       |   11 +-
 .../DefaultConfigurationContainer.java             |   14 +-
 .../api/internal/artifacts/dsl/ArtifactFile.java   |   78 ++
 .../dsl/DefaultPublishArtifactFactory.java         |  140 ----
 .../artifacts/dsl/ForcedModuleNotationParser.java  |   97 ---
 .../dsl/ModuleVersionSelectorParsers.java          |   93 +++
 .../dsl/PublishArtifactNotationParserFactory.java  |  100 +++
 .../BuildableModuleVersionResolveResult.java       |   14 +-
 .../CacheLockingArtifactDependencyResolver.java    |    7 +-
 ...DefaultBuildableModuleVersionResolveResult.java |   43 +-
 .../ivyservice/DefaultConfigurationResolver.java   |   44 +
 .../DefaultDependencyResolveDetails.java           |    6 +
 .../ivyservice/DefaultLenientConfiguration.java    |    4 +
 .../ivyservice/DefaultResolvedConfiguration.java   |   15 +-
 .../ivyservice/DefaultSettingsConverter.java       |    5 +-
 .../ivyservice/DefaultUnresolvedDependency.java    |    9 +-
 .../ivyservice/DependencyToModuleResolver.java     |    4 +-
 .../DependencyToModuleVersionIdResolver.java       |    4 +-
 .../ErrorHandlingArtifactDependencyResolver.java   |    6 +-
 .../ivyservice/IvyBackedArtifactPublisher.java     |   10 +-
 .../ivyservice/IvyXmlModuleDescriptorWriter.java   |   12 +-
 .../ivyservice/ModuleVersionNotFoundException.java |    4 +
 .../ivyservice/ModuleVersionResolveException.java  |    4 +-
 .../ivyservice/ModuleVersionResolveResult.java     |    6 +-
 .../SelfResolvingDependencyResolver.java           |    6 +-
 .../artifacts/ivyservice/SettingsConverter.java    |    2 +-
 ...cuitEmptyConfigsArtifactDependencyResolver.java |    6 +-
 .../VersionForcingDependencyToModuleResolver.java  |   17 +-
 .../clientmodule/ClientModuleResolver.java         |   12 +-
 .../DefaultCachedModuleResolution.java             |    5 +-
 .../ForceChangeDependencyDescriptor.java           |   40 -
 .../AbstractDependencyResolverAdapter.java         |   11 +-
 .../BuildableModuleVersionDescriptor.java          |   65 --
 .../ivyresolve/BuildableModuleVersionMetaData.java |   78 ++
 .../CacheLockingModuleVersionRepository.java       |   11 +-
 .../ivyresolve/CachingModuleVersionRepository.java |   46 +-
 .../DefaultBuildableModuleVersionDescriptor.java   |  105 ---
 .../DefaultBuildableModuleVersionMetaData.java     |  137 ++++
 .../ivyresolve/DefaultDependencyMetaData.java      |   88 ++
 .../ivyservice/ivyresolve/DependencyMetaData.java  |   43 +
 .../ExternalResourceResolverAdapter.java           |   14 +-
 .../IvyAwareModuleVersionRepository.java           |   28 +
 .../ivyresolve/IvyDependencyResolverAdapter.java   |    9 +-
 .../IvyDynamicResolveModuleVersionRepository.java  |   65 ++
 .../ivyresolve/LazyDependencyToModuleResolver.java |   95 +--
 .../LocalAwareModuleVersionRepository.java         |    8 +-
 .../ivyresolve/LocalModuleVersionRepository.java   |   11 +-
 .../ivyresolve/LoopbackDependencyResolver.java     |   21 +-
 .../ivyresolve/ModuleVersionDescriptor.java        |   28 -
 .../ivyresolve/ModuleVersionMetaData.java          |   34 +
 .../ivyresolve/ModuleVersionRepository.java        |    6 +-
 .../ivyservice/ivyresolve/ResolveIvyFactory.java   |   48 +-
 .../ivyresolve/RestrictedDependencyResolver.java   |    2 +-
 .../StartParameterResolutionOverride.java          |    7 +-
 .../ivyservice/ivyresolve/UserResolverChain.java   |   57 +-
 .../parser/DisconnectedParserSettings.java         |  110 +++
 .../parser/GradlePomModuleDescriptorBuilder.java   |   18 +-
 .../parser/GradlePomModuleDescriptorParser.java    |   44 +-
 .../parser/IvyXmlModuleDescriptorParser.java       |  755 ++++++------------
 .../modulecache/DefaultModuleDescriptorCache.java  |    1 -
 .../PublishModuleDescriptorConverter.java          |    9 +
 .../ResolveModuleDescriptorConverter.java          |   13 +
 ...bstractDependencyDescriptorFactoryInternal.java |   94 ---
 .../AbstractIvyDependencyDescriptorFactory.java    |   80 ++
 .../ClientModuleDependencyDescriptorFactory.java   |   65 --
 ...ClientModuleIvyDependencyDescriptorFactory.java |   65 ++
 ...ultDependenciesToModuleDescriptorConverter.java |    2 +-
 .../DefaultDependencyDescriptorFactory.java        |   51 ++
 .../dependencies/DependencyDescriptorFactory.java  |   13 +-
 .../DependencyDescriptorFactoryDelegate.java       |   63 --
 .../DependencyDescriptorFactoryInternal.java       |   25 -
 .../ExternalModuleDependencyDescriptorFactory.java |   57 --
 ...ternalModuleIvyDependencyDescriptorFactory.java |   57 ++
 .../IvyDependencyDescriptorFactory.java            |   25 +
 .../ProjectDependencyDescriptorFactory.java        |   52 --
 .../ProjectIvyDependencyDescriptorFactory.java     |   52 ++
 .../ReflectiveDependencyDescriptorFactory.java     |   82 ++
 .../DefaultProjectModuleRegistry.java              |    9 +-
 .../projectmodule/ProjectDependencyResolver.java   |   18 +-
 .../projectmodule/ProjectModuleRegistry.java       |    4 +-
 .../DefaultResolutionStrategy.java                 |   21 +-
 .../resolveengine/DefaultDependencyResolver.java   |   21 +-
 .../resolveengine/DependencyGraphBuilder.java      |  157 ++--
 .../resolveengine/ModuleRevisionResolveState.java  |    6 +
 .../resolveengine/ModuleVersionSpec.java           |    4 +-
 .../VersionSelectionReasonResolver.java            |   39 +
 .../result/VersionSelectionReasons.java            |   18 +-
 .../repositories/AbstractArtifactRepository.java   |   42 +
 .../repositories/DefaultBaseRepositoryFactory.java |    2 +-
 .../DefaultFlatDirArtifactRepository.java          |   14 +-
 .../repositories/DefaultIvyArtifactRepository.java |   49 +-
 .../DefaultMavenArtifactRepository.java            |   23 +-
 .../FixedResolverArtifactRepository.java           |   57 ++
 .../repositories/LegacyDependencyResolver.java     |  284 +++++++
 .../repositories/LegacyMavenResolver.java          |   62 ++
 .../repositories/ResolutionAwareRepository.java    |   23 +
 .../AbstractRepositoryCacheManager.java            |    3 +-
 .../resolver/ExternalResourceResolver.java         |    8 +-
 .../repositories/resolver/MavenResolver.java       |   10 +-
 .../notations/ClientModuleNotationParser.java      |   48 --
 .../ClientModuleNotationParserFactory.java         |   43 +
 .../notations/DependencyNotationParser.java        |    5 +-
 .../notations/DependencyProjectNotationParser.java |   16 +-
 .../notations/ProjectDependencyFactory.java        |   46 +-
 .../DefaultDependencyManagementServicesTest.groovy |    2 +
 .../DefaultModuleVersionSelectorTest.groovy        |   59 ++
 .../DefaultConfigurationContainerSpec.groovy       |   23 +-
 .../DefaultConfigurationContainerTest.groovy       |    6 +-
 .../configurations/DefaultConfigurationSpec.groovy |   22 +-
 .../configurations/DefaultConfigurationTest.java   |   66 +-
 .../internal/artifacts/dsl/ArtifactFileTest.groovy |   77 ++
 .../dsl/DefaultPublishArtifactFactoryTest.groovy   |  251 ------
 .../dsl/ForcedModuleNotationParserSpec.groovy      |  126 ---
 .../dsl/ModuleVersionSelectorParsersTest.groovy    |  155 ++++
 ...PublishArtifactNotationParserFactoryTest.groovy |  113 +++
 ...cheLockingArtifactDependencyResolverTest.groovy |    6 +-
 ...tBuildableModuleVersionResolveResultTest.groovy |   44 +-
 .../DefaultDependencyResolveDetailsSpec.groovy     |   34 +
 .../ivyservice/DefaultSettingsConverterTest.groovy |   38 +-
 .../DefaultUnresolvedDependencySpec.groovy         |    4 +-
 ...orHandlingArtifactDependencyResolverTest.groovy |   14 +-
 .../ivyservice/IvyBackedArtifactPublisherTest.java |   25 +-
 .../IvyXmlModuleDescriptorWriterTest.groovy        |   28 -
 .../SelfResolvingDependencyResolverTest.groovy     |   14 +-
 ...ptyConfigsArtifactDependencyResolverSpec.groovy |    8 +-
 ...ionForcingDependencyToModuleResolverSpec.groovy |    9 +-
 .../clientmodule/ClientModuleResolverTest.groovy   |   26 +-
 ...aultBuildableModuleVersionDescriptorTest.groovy |  166 ----
 ...efaultBuildableModuleVersionMetaDataTest.groovy |  244 ++++++
 .../DefaultDependencyMetaDataTest.groovy           |   77 ++
 .../DependencyResolverIdentifierTest.groovy        |   11 +-
 ...ynamicResolveModuleVersionRepositoryTest.groovy |   65 ++
 .../LazyDependencyToModuleResolverTest.groovy      |   15 +-
 .../ivyresolve/UserResolverChainTest.groovy        |  131 +--
 .../parser/IvyXmlModuleDescriptorParserTest.groovy |   34 -
 .../ResolveModuleDescriptorConverterTest.groovy    |    3 +
 ...actDependencyDescriptorFactoryInternalTest.java |   15 +-
 ...lientModuleDependencyDescriptorFactoryTest.java |   11 +-
 ...ependenciesToModuleDescriptorConverterTest.java |   13 +-
 .../DefaultDependencyDescriptorFactoryTest.groovy  |   61 ++
 ...ModuleDescriptorFactoryForClientModuleTest.java |   16 +-
 .../DependencyDescriptorFactoryDelegateTest.java   |   67 --
 ...ernalModuleDependencyDescriptorFactoryTest.java |   12 +-
 .../ProjectDependencyDescriptorFactoryTest.java    |  129 ++-
 ...eflectiveDependencyDescriptorFactoryTest.groovy |   93 +++
 .../ProjectDependencyResolverTest.groovy           |   35 +-
 .../DefaultResolutionStrategySpec.groovy           |   42 +-
 .../DependencyGraphBuilderTest.groovy              |   67 +-
 .../VersionSelectionReasonResolverTest.groovy      |   47 ++
 .../result/VersionSelectionReasonsTest.groovy      |   44 +
 .../DefaultFlatDirArtifactRepositoryTest.groovy    |    4 +-
 .../DefaultIvyArtifactRepositoryTest.groovy        |   76 +-
 .../DefaultMavenArtifactRepositoryTest.groovy      |   35 +-
 .../notations/DependencyNotationParserTest.groovy  |    2 +-
 .../notations/ProjectDependencyFactoryTest.groovy  |   29 +-
 subprojects/core/core.gradle                       |    3 +-
 .../ConfigurationOnDemandIntegrationTest.groovy    |  125 ++-
 .../api/ProjectConfigurationIntegrationTest.groovy |   38 +
 .../gradle/api/tasks/ArchiveIntegrationTest.groovy |   77 +-
 .../api/tasks/CopyTaskIntegrationTest.groovy       |    2 +-
 .../api/tasks/FileTreeCopyIntegrationTest.groovy   |    2 +-
 .../scripts/StatementLabelsIntegrationTest.groovy  |    1 -
 .../src/main/groovy/org/gradle/StartParameter.java |  107 +--
 ...ExtensiblePolymorphicDomainObjectContainer.java |   37 +
 .../org/gradle/api/NamedDomainObjectContainer.java |    9 +
 .../api/PolymorphicDomainObjectContainer.java      |   59 ++
 .../src/main/groovy/org/gradle/api/Project.java    |   28 +-
 .../src/main/groovy/org/gradle/api/Script.java     |   18 +-
 .../api/artifacts/ArtifactRepositoryContainer.java |    2 +
 .../api/artifacts/ConfigurablePublishArtifact.java |    2 +-
 .../api/artifacts/DependencyResolveDetails.java    |   22 +-
 .../gradle/api/artifacts/ResolutionStrategy.java   |   18 +-
 .../api/artifacts/dsl/RepositoryHandler.java       |   10 +-
 .../FlatDirectoryArtifactRepository.java           |    6 +-
 .../repositories/IvyArtifactRepository.java        |   13 +-
 .../IvyArtifactRepositoryMetaDataProvider.java     |   37 +
 .../repositories/MavenArtifactRepository.java      |    6 +-
 .../gradle/api/execution/TaskExecutionAdapter.java |   32 +
 .../api/file/ConfigurableFileCollection.java       |   12 +-
 .../org/gradle/api/file/ConfigurableFileTree.java  |    8 +-
 .../org/gradle/api/file/CopyProcessingSpec.java    |    2 +-
 .../groovy/org/gradle/api/file/CopySourceSpec.java |    4 +-
 .../main/groovy/org/gradle/api/file/CopySpec.java  |    2 +-
 .../org/gradle/api/file/SourceDirectorySet.java    |    8 +-
 .../AbstractNamedDomainObjectContainer.java        |    8 +
 .../AbstractPolymorphicDomainObjectContainer.java  |  138 ++++
 .../org/gradle/api/internal/ConfigureDelegate.java |   56 +-
 .../gradle/api/internal/ConventionAwareHelper.java |   29 +-
 .../DefaultPolymorphicDomainObjectContainer.java   |   69 ++
 ...amedDomainObjectContainerConfigureDelegate.java |   16 +-
 ...phicDomainObjectContainerConfigureDelegate.java |   44 +
 .../api/internal/artifacts/ArtifactPublisher.java  |    4 +-
 .../internal/artifacts/BaseRepositoryFactory.java  |    7 +-
 .../DefaultArtifactRepositoryContainer.java        |    1 +
 .../ProjectDependenciesBuildInstruction.java       |   50 --
 .../artifacts/configurations/ResolverProvider.java |   27 -
 .../dependencies/DefaultProjectDependency.java     |   30 +-
 .../artifacts/dsl/DefaultRepositoryHandler.java    |    6 +-
 .../ivyservice/IvyModuleDescriptorWriter.java      |    5 -
 .../ivyservice/ModuleDescriptorConverter.java      |    6 +
 .../repositories/AbstractArtifactRepository.java   |   42 -
 .../repositories/ArtifactRepositoryInternal.java   |    5 +-
 .../FixedResolverArtifactRepository.java           |   44 -
 .../repositories/PublicationAwareRepository.java   |   23 +
 .../component/SoftwareComponentInternal.java       |    8 +-
 .../org/gradle/api/internal/component/Usage.java   |   28 +
 .../api/internal/file/AbstractFileResolver.java    |   16 +
 .../org/gradle/api/internal/file/FileResolver.java |    3 +
 .../api/internal/file/archive/TarCopyAction.java   |   23 -
 .../internal/file/archive/TarCopySpecVisitor.java  |    5 +-
 .../api/internal/file/archive/ZipCopyAction.java   |   24 +
 .../internal/file/archive/ZipCopySpecVisitor.java  |    6 +-
 .../compression/ArchiveOutputStreamFactory.java    |   33 +
 .../file/archive/compression/Bzip2Archiver.java    |    8 +-
 .../file/archive/compression/Compressor.java       |   33 -
 .../file/archive/compression/GzipArchiver.java     |    8 +-
 .../file/archive/compression/SimpleCompressor.java |    4 +-
 .../internal/file/copy/AbstractZipCompressor.java  |   37 +
 .../api/internal/file/copy/ArchiveCopyAction.java  |    3 +
 .../api/internal/file/copy/ZipCompressor.java      |   26 +
 .../internal/file/copy/ZipDeflatedCompressor.java  |   31 +
 .../internal/file/copy/ZipStoredCompressor.java    |   28 +
 .../gradle/api/internal/html/SimpleHtmlWriter.java |   41 +
 .../notations/api/TopLevelNotationParser.java      |   24 -
 .../notations/parsers/CompositeNotationParser.java |    5 -
 .../parsers/ErrorHandlingNotationParser.java       |   16 +-
 .../notations/parsers/MapNotationParser.java       |    2 +
 .../notations/parsers/NormalizedTimeUnit.java      |   45 ++
 .../notations/parsers/TimeUnitsParser.java         |   46 ++
 .../api/internal/plugins/DefaultConvention.java    |    5 +
 .../api/internal/plugins/ExtensionsStorage.java    |  147 +++-
 .../api/internal/project/AbstractProject.java      |    8 -
 .../project/DefaultProjectAccessListener.java      |   33 +
 .../project/GradleInternalServiceRegistry.java     |   17 +-
 .../api/internal/project/ProjectInternal.java      |    4 +-
 .../project/ProjectInternalServiceRegistry.java    |    6 +-
 .../internal/project/TaskExecutionServices.java    |    3 +-
 .../project/TopLevelBuildServiceRegistry.java      |    9 +-
 .../api/internal/tasks/DefaultTaskContainer.java   |   17 +-
 .../tasks/DefaultTaskContainerFactory.java         |    9 +-
 .../api/internal/xml/SimpleMarkupWriter.java       |  415 ++++++++++
 .../gradle/api/internal/xml/SimpleXmlWriter.java   |  395 +--------
 .../gradle/api/internal/xml/XmlTransformer.java    |   27 +-
 .../groovy/org/gradle/api/invocation/Gradle.java   |   89 ++-
 .../gradle/api/plugins/DeferredConfigurable.java   |   32 +
 .../org/gradle/api/plugins/ExtensionContainer.java |   11 +
 .../api/plugins/ObjectConfigurationAction.java     |    2 +-
 .../org/gradle/api/resources/ResourceHandler.java  |    8 +-
 .../main/groovy/org/gradle/api/tasks/Delete.java   |    2 +-
 .../groovy/org/gradle/api/tasks/SourceTask.java    |    4 +-
 .../groovy/org/gradle/api/tasks/TaskInputs.java    |   12 +-
 .../groovy/org/gradle/api/tasks/TaskOutputs.java   |    6 +-
 .../groovy/org/gradle/api/tasks/TaskState.java     |    4 +
 .../main/groovy/org/gradle/api/tasks/Upload.java   |   15 +-
 .../api/tasks/bundling/AbstractArchiveTask.java    |    4 +-
 .../groovy/org/gradle/api/tasks/bundling/Tar.java  |   11 +-
 .../groovy/org/gradle/api/tasks/bundling/Zip.java  |   52 +-
 .../api/tasks/bundling/ZipEntryCompression.java    |   27 +
 .../configuration/DefaultBuildConfigurer.java      |   24 +-
 .../configuration/ImplicitTasksConfigurer.java     |    7 +-
 .../configuration/LifecycleProjectEvaluator.java   |    3 +-
 .../ProjectDependencies2TaskResolver.java          |    9 +-
 .../configuration/ProjectEvaluationConfigurer.java |   25 -
 .../execution/OnlyWhenConfigureOnDemand.java       |   39 -
 .../gradle/execution/ProjectEvaluatingAction.java  |   13 +-
 .../gradle/execution/ProjectFinderByTaskPath.java  |   71 --
 .../gradle/execution/TaskPathProjectEvaluator.java |   18 +-
 .../groovy/org/gradle/execution/TaskSelector.java  |   27 +-
 .../taskgraph/DefaultTaskExecutionPlan.java        |   40 +
 .../taskgraph/ParallelTaskPlanExecutor.java        |   46 +-
 .../execution/taskgraph/TaskExecutionPlan.java     |    3 +
 .../taskgraph/TaskPlanExecutorFactory.java         |   16 +-
 .../taskpath/ProjectFinderByTaskPath.java          |   61 ++
 .../execution/taskpath/ResolvedTaskPath.java       |   57 ++
 .../execution/taskpath/TaskPathResolver.java       |   60 ++
 .../initialization/BuildLayoutParameters.java      |   56 ++
 .../gradle/initialization/BuildSourceBuilder.java  |   14 +-
 .../DefaultCommandLineConverter.java               |   33 +-
 .../initialization/DefaultGradleLauncher.java      |    3 +-
 .../DefaultGradleLauncherFactory.java              |    7 +-
 .../initialization/DependencyResolutionLogger.java |   32 +-
 .../initialization/LayoutCommandLineConverter.java |   62 ++
 .../initialization/ProjectAccessListener.java      |   29 +
 .../org/gradle/listener/ActionBroadcast.java       |    6 +
 .../org/gradle/process/ProcessForkOptions.java     |    4 +-
 .../gradle/process/internal/DefaultExecHandle.java |    1 -
 .../gradle/process/internal/ExecHandleRunner.java  |    1 +
 .../org/gradle/profile/EvalutationOperation.java   |   31 +
 .../org/gradle/profile/HTMLProfileReport.groovy    |   42 -
 .../org/gradle/profile/ProfileReportRenderer.java  |  166 +++-
 .../groovy/org/gradle/profile/ProjectProfile.java  |    7 +-
 .../org/gradle/reporting/CodePanelRenderer.java    |   14 +-
 .../org/gradle/reporting/DomReportRenderer.java    |   55 --
 .../org/gradle/reporting/HtmlReportRenderer.java   |   42 +-
 .../org/gradle/reporting/ReportRenderer.java       |   26 +
 .../org/gradle/reporting/TabbedPageRenderer.java   |   66 +-
 .../groovy/org/gradle/reporting/TabsRenderer.java  |   47 +-
 .../gradle/reporting/TextDomReportRenderer.java    |   50 --
 .../org/gradle/reporting/TextReportRenderer.java   |    2 +-
 .../groovy/org/gradle/util/DeprecationLogger.java  |  218 +----
 .../org/gradle/util/SingleMessageLogger.java       |  249 ++++++
 .../main/groovy/org/gradle/util/VersionNumber.java |    2 +
 .../org/gradle/configuration/default-imports.txt   |    2 +
 .../org/gradle/profile/ProfileTemplate.html        |  115 ---
 .../groovy/org/gradle/StartParameterTest.groovy    |  325 +++++---
 .../AbstractNamedDomainObjectContainerTest.groovy  |    9 +
 .../api/internal/ConfigureByMapActionTest.groovy   |   12 +
 ...tPolymorphicDomainObjectContainerDslTest.groovy |  110 +++
 ...aultPolymorphicDomainObjectContainerTest.groovy |  161 ++++
 .../DefaultArtifactRepositoryContainerTest.groovy  |   36 +-
 .../ModuleVersionSelectorStrictSpecTest.groovy     |   44 -
 .../ProjectDependenciesBuildInstructionTest.java   |   58 --
 .../AbstractModuleDependencySpec.groovy            |  101 +++
 .../dependencies/AbstractModuleDependencyTest.java |   15 +-
 .../dependencies/DefaultClientModuleTest.java      |   10 +-
 .../DefaultExternalModuleDependencyTest.java       |    5 -
 .../DefaultProjectDependencyTest.groovy            |  190 +++++
 .../dependencies/DefaultProjectDependencyTest.java |  260 ------
 .../dsl/DefaultRepositoryHandlerTest.groovy        |   28 +-
 .../file/archive/TarCopySpecVisitorTest.java       |    7 +-
 .../file/archive/ZipCopySpecVisitorTest.java       |   35 +-
 .../api/internal/html/SimpleHtmlWriterTest.groovy  |   40 +
 .../parsers/ErrorHandlingNotationParserTest.groovy |    8 +-
 .../notations/parsers/TimeUnitsParserTest.groovy   |   54 ++
 .../internal/plugins/ExtensionsStorageTest.groovy  |  147 ++++
 .../api/internal/project/DefaultProjectTest.groovy |   44 +-
 .../GradleInternalServiceRegistryTest.groovy       |    5 +-
 .../internal/project/NewDefaultProjectTest.groovy  |   69 ++
 .../ProjectInternalServiceRegistryTest.java        |    3 +
 .../internal/tasks/DefaultTaskContainerTest.groovy |  309 ++++++++
 .../internal/tasks/DefaultTaskContainerTest.java   |  337 --------
 .../api/internal/xml/XmlTransformerTest.groovy     |   62 +-
 .../DefaultBuildConfigurerTest.groovy              |   30 +-
 .../ImplicitTasksConfigurerTest.groovy             |    8 -
 .../LifecycleProjectEvaluatorTest.groovy           |   90 +++
 .../LifecycleProjectEvaluatorTest.java             |  127 ---
 .../ProjectDependencies2TaskResolverTest.groovy    |   34 +-
 .../execution/OnlyWhenConfigureOnDemandTest.groovy |   63 --
 .../execution/ProjectEvaluatingActionTest.groovy   |    3 +-
 .../execution/ProjectFinderByTaskPathTest.groovy   |   73 --
 .../execution/TaskPathProjectEvaluatorTest.groovy  |   24 +-
 .../taskgraph/DefaultTaskExecutionPlanTest.groovy  |    8 +-
 .../taskgraph/ParallelTaskExecutionPlanTest.groovy |   26 +
 .../taskgraph/TaskPlanExecutorFactoryTest.groovy   |    6 +-
 .../taskpath/ProjectFinderByTaskPathTest.groovy    |   64 ++
 .../execution/taskpath/ResolvedTaskPathTest.groovy |   33 +
 .../execution/taskpath/TaskPathResolverTest.groovy |   98 +++
 .../initialization/BuildSourceBuilderTest.groovy   |    6 +-
 .../DefaultCommandLineConverterTest.java           |    9 +-
 .../DependencyResolutionLoggerTest.groovy          |   56 +-
 .../LayoutCommandLineConverterTest.groovy          |   45 ++
 .../org/gradle/listener/ListenerBroadcastTest.java |   51 --
 .../gradle/reporting/HtmlReportRendererTest.groovy |   18 +-
 .../org/gradle/reporting/TabsRendererTest.groovy   |   30 +-
 .../reporting/TextDomReportRendererTest.groovy     |   47 --
 .../org/gradle/util/DeprecationLoggerTest.groovy   |   83 --
 .../org/gradle/util/SingleMessageLoggerTest.groovy |   83 ++
 .../groovy/org/gradle/util/HelperUtil.groovy       |   38 +-
 .../groovy/org/gradle/util/Matchers.java           |   13 +-
 .../plugins/cpp/CppSamplesIntegrationTest.groovy   |    6 +-
 ...pendencyInsightReportTaskIntegrationTest.groovy |    4 +-
 .../DependencyReportTaskIntegrationTest.groovy     |    8 +-
 .../nodes/AbstractRenderableDependencyResult.java  |    5 +-
 .../AbstractRenderableDependencyResultSpec.groovy  |   11 +-
 .../nodes/RenderableDependencyResultTest.groovy    |    4 +-
 ...RenderableUnresolvedDependencyResultTest.groovy |    2 +-
 subprojects/docs/docs.gradle                       |   24 +-
 subprojects/docs/release-notes-transform.gradle    |  222 ------
 subprojects/docs/src/docs/css/release-notes.css    |   97 ++-
 subprojects/docs/src/docs/dsl/dsl.xml              |   21 +
 ....gradle.api.artifacts.dsl.RepositoryHandler.xml |   56 ++
 ...rtifacts.repositories.IvyArtifactRepository.xml |   53 ++
 ...ories.IvyArtifactRepositoryMetaDataProvider.xml |   41 +
 ...ifacts.repositories.MavenArtifactRepository.xml |   47 ++
 ...dle.api.distribution.DistributionContainer.xml} |    0
 ...rg.gradle.api.plugins.DistributionExtension.xml |   24 -
 ...pi.plugins.MavenRepositoryHandlerConvention.xml |   44 +
 .../org.gradle.api.plugins.quality.FindBugs.xml    |    6 +-
 .../dsl/org.gradle.api.plugins.quality.Pmd.xml     |    4 +
 ...org.gradle.api.plugins.quality.PmdExtension.xml |    4 +
 ...org.gradle.api.publish.PublicationContainer.xml |    3 +
 .../dsl/org.gradle.api.publish.ivy.IvyArtifact.xml |   59 ++
 .../org.gradle.api.publish.ivy.IvyArtifactSet.xml  |   41 +
 .../org.gradle.api.publish.maven.MavenArtifact.xml |   34 +
 ...g.gradle.api.publish.maven.MavenArtifactSet.xml |   41 +
 ...g.gradle.api.publish.maven.MavenPublication.xml |   12 +
 ...le.api.publish.maven.tasks.GenerateMavenPom.xml |   40 +
 ...gradle.api.reporting.GenerateBuildDashboard.xml |   50 ++
 .../docs/dsl/org.gradle.api.tasks.bundling.Zip.xml |    6 +-
 ...g.gradle.plugins.ide.idea.model.IdeaProject.xml |    5 +
 subprojects/docs/src/docs/dsl/plugins.xml          |    5 +-
 .../docs/src/docs/release/content/script.js        |  115 ++-
 subprojects/docs/src/docs/release/notes.md         |  731 +++++++----------
 .../docs/src/docs/userguide/artifactMngmt.xml      |    6 +-
 .../docs/src/docs/userguide/bootstrapPlugin.xml    |   20 +-
 .../docs/userguide/buildAnnouncementsPlugin.xml    |    2 +-
 .../src/docs/userguide/buildDashboardPlugin.xml    |   76 ++
 .../docs/src/docs/userguide/buildEnvironment.xml   |   12 +
 .../docs/src/docs/userguide/commandLine.xml        |   14 +-
 .../docs/src/docs/userguide/comparingBuilds.xml    |    2 +-
 subprojects/docs/src/docs/userguide/depMngmt.xml   |  837 +++++++++++---------
 .../docs/src/docs/userguide/distributionPlugin.xml |  123 +++
 .../docs/src/docs/userguide/featureLifecycle.xml   |   15 +-
 .../docs/src/docs/userguide/gradleDaemon.xml       |    2 +-
 .../docs/src/docs/userguide/groovyPlugin.xml       |    2 +-
 .../docs/src/docs/userguide/installation.xml       |    8 -
 .../userguide/javaLibraryDistributionPlugin.xml    |   16 +-
 subprojects/docs/src/docs/userguide/javaPlugin.xml |   20 +-
 .../docs/src/docs/userguide/mavenPlugin.xml        |    2 +-
 .../docs/src/docs/userguide/multiproject.xml       |   64 +-
 .../docs/src/docs/userguide/organizeBuildLogic.xml |    2 +-
 subprojects/docs/src/docs/userguide/overview.xml   |    4 +-
 .../docs/src/docs/userguide/publishingIvy.xml      |  291 ++++---
 .../docs/src/docs/userguide/publishingMaven.xml    |  239 ++++--
 .../docs/src/docs/userguide/scalaPlugin.xml        |   16 +
 .../docs/src/docs/userguide/signingPlugin.xml      |    2 +-
 .../docs/src/docs/userguide/sonarPlugin.xml        |   90 ++-
 .../docs/src/docs/userguide/sonarRunnerPlugin.xml  |  320 ++++++++
 .../docs/src/docs/userguide/standardPlugins.xml    |   47 +-
 subprojects/docs/src/docs/userguide/userguide.xml  |    3 +
 .../docs/src/docs/userguide/workingWithFiles.xml   |    2 +-
 .../docs/src/samples/buildDashboard/build.gradle   |   30 +
 .../buildDashboard/config/codenarc/codenarc.xml    |   20 +
 .../docs/src/samples/buildDashboard/readme.xml     |   18 +
 .../groovy/org/gradle/sample/GroovyPerson.groovy   |    5 +
 .../groovy/org/gradle/sample/PersonTest.groovy     |   13 +
 .../docs/src/samples/dependencies/build.gradle     |  178 -----
 .../repo/sea.fish/ivy-billfish-1.0.xml             |   13 -
 .../dependencies/repo/sea.fish/ivy-shark-1.0.xml   |   15 -
 .../dependencies/repo/sea.fish/ivy-tuna-1.0.xml    |   15 -
 .../dependencies/repo/sea.mammals/ivy-orca-1.0.xml |   13 -
 .../docs/src/samples/dependencies/settings.gradle  |    1 -
 .../descriptor-customization/build.gradle          |   30 +
 .../ivy-publish/java-multi-project/build.gradle    |   61 ++
 .../ivy-publish/java-multi-project/output-ivy.xml  |   21 +
 .../ivy-publish/java-multi-project/settings.gradle |    2 +
 .../samples/ivy-publish/quickstart/build.gradle    |   25 +
 .../docs/src/samples/ivypublish-new/build.gradle   |   65 --
 .../docs/src/samples/ivypublish-new/output-ivy.xml |   21 -
 .../src/samples/ivypublish-new/settings.gradle     |   18 -
 .../src/main/java/org/gradle/SomeClass.java        |    4 -
 .../samples/maven-publish/javaProject/build.gradle |   40 +
 .../javaProject}/subproject/build.gradle           |    0
 .../src/main/java/org/gradle/shared/Person.java    |    0
 .../maven-publish/pomCustomization/build.gradle    |   30 +
 .../samples/maven-publish/quickstart/build.gradle  |   25 +
 .../quickstart}/src/main/java/org/MyClass.java     |    0
 .../src/samples/maven/publish-new/build.gradle     |   39 -
 .../docs/src/samples/sonar/advanced/build.gradle   |   18 +-
 .../src/samples/sonarRunner/advanced/build.gradle  |   24 +
 .../samples/sonarRunner/multiProject/build.gradle  |   43 +
 .../sonarRunner/multiProject/settings.gradle       |    1 +
 .../samples/sonarRunner/quickstart/build.gradle    |   26 +
 .../src/main/java/org/gradle/Person.java           |   16 +
 .../src/test/java/org/gradle/PersonTest.java       |   12 +
 .../artifacts/defineRepository/build.gradle        |   38 +-
 .../artifacts/resolutionStrategy/build.gradle      |   20 +-
 .../samples/userguide/distribution/build.gradle    |   51 ++
 .../src/samples/userguide/distribution/readme.xml  |    3 +
 .../userguide/javaLibraryDistribution/build.gradle |   20 +-
 .../publishingIvyGenerateDescriptor.out            |    5 +
 .../publishingIvyPublishLifecycle.out              |   13 +-
 .../userguideOutput/publishingIvyPublishSingle.out |   13 +-
 .../userguideOutput/publishingMavenGeneratePom.out |    5 +
 .../publishingMavenPublishLocal.out                |    3 +-
 .../publishingMavenPublishMinimal.out              |    3 +-
 .../releasenotes/FunctionalReleaseNotesTest.groovy |    2 +-
 .../docs/src/transforms/release-notes.gradle       |  216 +++++
 .../ear/descriptor/DeploymentDescriptor.java       |    4 +-
 .../internal/DefaultDeploymentDescriptor.groovy    |   11 +-
 .../DefaultDeploymentDescriptorTest.groovy         |   20 +-
 .../eclipse/AbstractEclipseIntegrationTest.groovy  |    3 +-
 .../eclipse/EclipseClasspathIntegrationTest.groovy |    2 +-
 ...ClasspathRemoteResolutionIntegrationTest.groovy |    2 +-
 .../EclipseClasspathResolveIntegrationTest.groovy  |    2 +-
 .../ide/eclipse/EclipseIntegrationTest.groovy      |    2 +-
 .../EclipseMultiModuleIntegrationTest.groovy       |    4 +-
 .../eclipse/EclipseProjectIntegrationTest.groovy   |    2 +-
 .../eclipse/EclipseWtpModelIntegrationTest.groovy  |   54 +-
 .../idea/ConfigurationHooksIntegrationTest.groovy  |    2 +-
 .../plugins/ide/idea/IdeaIntegrationTest.groovy    |   17 +-
 .../ide/idea/IdeaModuleIntegrationTest.groovy      |    2 +-
 .../ide/idea/IdeaMultiModuleIntegrationTest.groovy |    2 +-
 .../ide/idea/IdeaProjectIntegrationTest.groovy     |    2 +-
 .../build.gradle                                   |    3 +
 .../expectedFiles/project1/project1.iml.xml        |   32 +
 .../expectedFiles/project2/project2.iml.xml        |   32 +
 .../expectedFiles/project3/project3.iml.xml        |   32 +
 .../expectedFiles/root.ipr.xml                     |  123 +++
 .../project1/build.gradle                          |    9 +
 .../project2/build.gradle                          |    9 +
 .../project3/build.gradle                          |    9 +
 .../settings.gradle                                |    3 +
 .../model/internal/WtpComponentFactory.groovy      |   19 +-
 .../org/gradle/plugins/ide/idea/IdeaPlugin.groovy  |   12 +-
 .../ide/idea/internal/IdeaScalaConfigurer.groovy   |  129 +++
 .../plugins/ide/idea/model/IdeaModule.groovy       |    5 +-
 .../plugins/ide/idea/model/IdeaProject.groovy      |   14 +-
 .../gradle/plugins/ide/idea/model/Module.groovy    |    2 +-
 .../plugins/ide/idea/model/ModuleLibrary.groovy    |   21 +-
 .../org/gradle/plugins/ide/idea/model/Path.groovy  |    6 +-
 .../gradle/plugins/ide/idea/model/Project.groovy   |   55 +-
 .../plugins/ide/idea/model/ProjectLibrary.groovy   |  105 +++
 .../ide/internal/IdeDependenciesExtractor.groovy   |   79 +-
 .../internal/JavadocAndSourcesDownloader.groovy    |  125 +++
 .../internal/provider/BuildModelAction.java        |   11 +
 .../internal/provider/IdeaModelBuilder.java        |    1 -
 .../ide/idea/model/ProjectLibraryTest.groovy       |   86 ++
 .../plugins/ide/idea/model/ProjectTest.groovy      |   16 +-
 .../plugins/ide/idea/model/customProject.xml       |   11 +
 subprojects/integ-test/integ-test.gradle           |    2 +-
 .../integtests/CacheProjectIntegrationTest.groovy  |    2 +-
 .../integtests/CharacterEncodingIntegTest.groovy   |    3 -
 .../integtests/CommandLineIntegrationTest.groovy   |    6 +-
 .../gradle/integtests/ExecIntegrationTest.groovy   |    4 +-
 .../IncrementalBuildIntegrationTest.groovy         |    2 +-
 .../IncrementalTestIntegrationTest.groovy          |   10 +-
 .../InitScriptExecutionIntegrationTest.groovy      |   24 +-
 .../integtests/JavaProjectIntegrationTest.groovy   |    3 +
 .../MultiProjectDependencyIntegrationTest.groovy   |    5 +-
 .../OsgiProjectSampleIntegrationTest.groovy        |    2 +-
 .../ParallelProjectExecutionIntegrationTest.groovy |    1 +
 .../integtests/ProfilingIntegrationTest.groovy     |   23 +-
 .../integtests/ProjectLayoutIntegrationTest.groovy |    6 +-
 .../integtests/WaterProjectIntegrationTest.groovy  |    2 +-
 .../BuildEnvironmentIntegrationTest.groovy         |    4 +-
 .../logging/LoggerIsEnabledIntegrationTest.groovy  |    2 +-
 .../logging/LoggingIntegrationTest.groovy          |   12 +-
 .../ivy/IvyHttpPublishIntegrationTest.groovy       |    2 +-
 .../IvyJavaProjectPublishIntegrationTest.groovy    |    8 +-
 .../ivy/IvySFtpPublishIntegrationTest.groovy       |    2 +-
 .../ivy/SamplesIvyPublishIntegrationTest.groovy    |    2 +-
 .../MavenJavaProjectPublishIntegrationTest.groovy  |    4 +-
 .../MavenMultiProjectPublishIntegrationTest.groovy |    8 +-
 .../MavenPublishIgnoresMavenSettingsTest.groovy    |   68 ++
 .../maven/MavenPublishIntegrationTest.groovy       |    2 +-
 ...MavenPublishRespectsPomConfigurationTest.groovy |    2 +-
 ...SamplesMavenPomGenerationIntegrationTest.groovy |    2 +-
 .../SamplesMavenQuickstartIntegrationTest.groovy   |    2 +-
 .../samples/SamplesAnnounceIntegrationTest.groovy  |    2 +-
 .../samples/SamplesAntlrIntegrationTest.groovy     |    6 +-
 .../SamplesApplicationIntegrationTest.groovy       |    2 +-
 ...sClientModuleDependenciesIntegrationTest.groovy |    2 +-
 .../SamplesCodeQualityIntegrationTest.groovy       |    4 +-
 ...amplesCustomBuildLanguageIntegrationTest.groovy |    2 +-
 .../SamplesCustomPluginIntegrationTest.groovy      |    6 +-
 ...lesExcludesAndClassifiersIntegrationTest.groovy |    2 +-
 ...lesGroovyCustomizedLayoutIntegrationTest.groovy |    6 +-
 ...SamplesGroovyMultiProjectIntegrationTest.groovy |    2 +-
 .../SamplesGroovyQuickstartIntegrationTest.groovy  |    6 +-
 .../SamplesJavaApiAndImplIntegrationTest.groovy    |    8 +-
 .../samples/SamplesJavaBaseIntegrationTest.groovy  |    6 +-
 ...mplesJavaCustomizedLayoutIntegrationTest.groovy |    6 +-
 .../SamplesJavaMultiProjectIntegrationTest.groovy  |   10 +-
 .../SamplesJavaOnlyIfIntegrationTest.groovy        |    2 +-
 ...esJavaProjectWithIntTestsIntegrationTest.groovy |    6 +-
 .../SamplesJavaQuickstartIntegrationTest.groovy    |    6 +-
 ...SamplesMixedJavaAndGroovyIntegrationTest.groovy |    6 +-
 .../SamplesMixedJavaAndScalaIntegrationTest.groovy |    6 +-
 ...mplesMultiProjectBuildSrcIntegrationTest.groovy |    2 +-
 .../SamplesRepositoriesIntegrationTest.groovy      |    2 +-
 ...plesScalaCustomizedLayoutIntegrationTest.groovy |    6 +-
 .../SamplesScalaQuickstartIntegrationTest.groovy   |    6 +-
 .../samples/SamplesScalaZincIntegrationTest.groovy |    2 +-
 .../SamplesWebProjectIntegrationTest.groovy        |    2 +-
 .../SamplesWebQuickstartIntegrationTest.groovy     |    2 +-
 .../AbstractDependencyResolutionTest.groovy        |    9 +-
 .../fixtures/AbstractIntegrationSpec.groovy        |   13 -
 .../fixtures/AutoTestedSamplesUtil.groovy          |    9 +-
 .../org/gradle/integtests/fixtures/Sample.java     |   11 +-
 .../gradle/integtests/fixtures/TestResources.java  |   12 +-
 .../fixtures/UserGuideSamplesRunner.groovy         |    2 +-
 .../fixtures/executer/AbstractGradleExecuter.java  |  209 +++--
 .../executer/BuildServerGradleDistribution.groovy  |   41 +
 .../fixtures/executer/DaemonGradleExecuter.java    |    4 +-
 .../executer/DefaultGradleDistribution.java        |    4 +
 .../executer/DependencyResolutionFailure.groovy    |    9 +-
 .../executer/DownloadableGradleDistribution.groovy |   75 ++
 .../fixtures/executer/ExecutionFailure.java        |    2 +-
 .../fixtures/executer/ExecutionResult.java         |    5 -
 .../fixtures/executer/ForkingGradleExecuter.java   |   73 +-
 .../fixtures/executer/ForkingGradleHandle.java     |   10 +-
 .../fixtures/executer/GradleDistribution.java      |    5 +
 .../fixtures/executer/GradleExecuter.java          |   54 +-
 .../fixtures/executer/InProcessGradleExecuter.java |   48 +-
 .../executer/InitScriptExecuterFixture.groovy      |   58 ++
 .../executer/IntegrationTestBuildContext.java      |    3 +
 .../fixtures/executer/OutputScraper.groovy         |   64 --
 .../executer/OutputScrapingExecutionFailure.java   |    4 +-
 .../executer/OutputScrapingExecutionResult.java    |    6 -
 .../executer/ParallelForkingGradleExecuter.java    |    5 +-
 .../executer/ParallelForkingGradleHandle.java      |   14 +-
 .../executer/ProgressLoggingFixture.groovy         |   87 +-
 .../executer/ProjectLifecycleFixture.groovy        |   57 ++
 .../executer/ReleasedGradleDistribution.groovy     |   57 +-
 .../gradle/test/fixtures/ivy/IvyDescriptor.groovy  |   70 +-
 .../test/fixtures/ivy/IvyDescriptorArtifact.groovy |   21 +
 .../fixtures/ivy/IvyDescriptorDependency.groovy    |   29 +
 .../IvyDescriptorDependencyConfiguration.groovy    |   32 -
 .../gradle/test/fixtures/ivy/IvyFileModule.groovy  |   76 +-
 .../gradle/test/fixtures/ivy/IvyHttpModule.groovy  |    5 +
 .../org/gradle/test/fixtures/ivy/IvyModule.java    |    2 +
 .../test/fixtures/maven/M2Installation.groovy      |    5 +-
 .../test/fixtures/maven/MavenDependency.groovy     |   30 +
 .../test/fixtures/maven/MavenFileModule.groovy     |   54 +-
 .../org/gradle/test/fixtures/maven/MavenPom.groovy |   11 +-
 .../gradle/test/fixtures/maven/MavenScope.groovy   |   29 +-
 .../gradle/test/fixtures/publish/Identifier.java   |  101 +++
 .../fixtures/executer/OutputScraperTest.groovy     |  100 ---
 .../internal-testing/internal-testing.gradle       |    1 +
 .../fixtures/DefaultTestExecutionResult.groovy     |  186 ++---
 .../fixtures/HtmlTestExecutionResult.groovy        |  146 ++++
 .../fixtures/JUnitXmlTestExecutionResult.groovy    |  184 +++++
 .../file/TestDirectoryProviderFinder.groovy        |   35 -
 .../main/groovy/org/gradle/util/RuleHelper.java    |   57 --
 .../groovy/org/gradle/util/TestPrecondition.groovy |    4 +
 .../api/AutoTestedSamplesIvyIntegrationTest.groovy |   29 +
 .../publish/ivy/AbstractIvyPublishIntegTest.groovy |   67 ++
 .../ivy/AutoTestedSamplesIvyIntegrationTest.groovy |   29 -
 .../ivy/IvyCustomPublishIntegrationTest.groovy     |  111 ---
 .../ivy/IvyEarProjectPublishIntegrationTest.groovy |   64 --
 .../ivy/IvyHttpPublishIntegrationTest.groovy       |  349 --------
 .../IvyJavaProjectPublishIntegrationTest.groovy    |   62 --
 .../ivy/IvyLocalPublishIntegrationTest.groovy      |  177 -----
 ...IvyPublishArtifactCustomisationIntegTest.groovy |  321 ++++++++
 .../publish/ivy/IvyPublishBasicIntegTest.groovy    |  158 ++++
 .../IvyPublishCrossVersionIntegrationTest.groovy   |  128 +++
 ...yPublishDescriptorCustomisationIntegTest.groovy |  147 ++++
 ...vyPublishDescriptorModificationIntegTest.groovy |  103 ---
 .../api/publish/ivy/IvyPublishEarIntegTest.groovy  |   82 ++
 .../api/publish/ivy/IvyPublishHttpIntegTest.groovy |  378 +++++++++
 .../IvyPublishIdentifierValidationIntegTest.groovy |  155 ++++
 .../publish/ivy/IvyPublishIssuesIntegTest.groovy   |   64 ++
 .../api/publish/ivy/IvyPublishJavaIntegTest.groovy |  150 ++++
 .../ivy/IvyPublishMultiProjectIntegTest.groovy     |  157 ++++
 .../IvyPublishMultipleReposIntegrationTest.groovy  |   87 --
 .../IvyPublishMultipleRepositoriesIntegTest.groovy |   88 ++
 .../publish/ivy/IvyPublishPluginIntegTest.groovy   |   32 -
 .../api/publish/ivy/IvyPublishWarIntegTest.groovy  |   78 ++
 .../IvySingleProjectPublishIntegrationTest.groovy  |   76 --
 .../ivy/IvyWarProjectPublishIntegrationTest.groovy |   60 --
 .../ivy/SamplesIvyPublishIntegrationTest.groovy    |   74 +-
 .../ivy/plugins/IvyPublishPluginIntegTest.groovy   |   32 +
 .../ivy/InvalidIvyPublicationException.java        |   40 +
 .../org/gradle/api/publish/ivy/IvyArtifact.java    |  105 +++
 .../org/gradle/api/publish/ivy/IvyArtifactSet.java |   62 ++
 .../gradle/api/publish/ivy/IvyConfiguration.java   |   48 ++
 .../api/publish/ivy/IvyConfigurationContainer.java |   42 +
 .../org/gradle/api/publish/ivy/IvyDependency.java  |   36 +
 .../api/publish/ivy/IvyModuleDescriptor.java       |    2 +-
 .../org/gradle/api/publish/ivy/IvyPublication.java |  269 +++++--
 .../ivy/internal/DefaultIvyModuleDescriptor.java   |   53 --
 .../ivy/internal/DefaultIvyPublication.java        |  130 ---
 .../ivy/internal/IvyModuleDescriptorInternal.java  |   35 -
 .../ivy/internal/IvyNormalizedPublication.java     |   49 --
 .../ivy/internal/IvyPublicationInternal.java       |   40 -
 .../api/publish/ivy/internal/IvyPublisher.java     |   40 -
 .../ivy/internal/artifact/DefaultIvyArtifact.java  |   96 +++
 .../internal/artifact/DefaultIvyArtifactSet.java   |   90 +++
 .../artifact/IvyArtifactNotationParserFactory.java |  147 ++++
 .../internal/dependency/DefaultIvyDependency.java  |   37 +
 .../dependency/DefaultIvyDependencySet.java        |   25 +
 .../internal/dependency/IvyDependencyInternal.java |   24 +
 ...tionDynamicDescriptorGenerationTaskCreator.java |   73 ++
 .../plugins/IvyPublishDynamicTaskCreator.java      |   90 +++
 .../publication/DefaultIvyConfiguration.java       |   43 +
 .../DefaultIvyConfigurationContainer.java          |   34 +
 .../publication/DefaultIvyModuleDescriptor.java    |   71 ++
 .../publication/DefaultIvyPublication.java         |  156 ++++
 .../publication/DefaultIvyPublicationIdentity.java |   55 ++
 .../publication/IvyModuleDescriptorInternal.java   |   44 +
 .../publication/IvyPublicationInternal.java        |   40 +
 .../publisher/DependencyResolverIvyPublisher.java  |   70 ++
 .../publisher/IvyDescriptorFileGenerator.java      |  213 +++++
 .../publisher/IvyNormalizedPublication.java        |   53 ++
 .../internal/publisher/IvyPublicationIdentity.java |   31 +
 .../ivy/internal/publisher/IvyPublisher.java       |   23 +
 .../internal/publisher/ValidatingIvyPublisher.java |  162 ++++
 .../api/publish/ivy/plugins/IvyPublishPlugin.java  |   91 ++-
 .../publish/ivy/tasks/GenerateIvyDescriptor.java   |  100 +--
 .../publish/ivy/tasks/PublishToIvyRepository.java  |   23 +-
 ...tionDynamicDescriptorGenerationTaskCreator.java |   83 --
 .../internal/IvyPublishDynamicTaskCreator.java     |   90 ---
 .../ivy/internal/DefaultIvyPublicationTest.groovy  |  114 ---
 .../IvyArtifactNotationParserFactoryTest.groovy    |  176 ++++
 ...namicDescriptorGenerationTaskCreatorTest.groovy |   88 ++
 .../IvyPublishDynamicTaskCreatorTest.groovy        |  104 +++
 .../publication/DefaultIvyPublicationTest.groovy   |  247 ++++++
 .../IvyDescriptorFileGeneratorTest.groovy          |  265 +++++++
 .../publisher/ValidatingIvyPublisherTest.groovy    |  259 ++++++
 .../ivy/plugins/IvyPublishPluginTest.groovy        |   65 +-
 .../ivy/tasks/PublishToIvyRepositoryTest.groovy    |    4 +-
 ...namicDescriptorGenerationTaskCreatorTest.groovy |   89 ---
 .../IvyPublishDynamicTaskCreatorTest.groovy        |  105 ---
 .../ConfigurationOnDemandIntegrationTest.groovy    |   52 ++
 ...EnablingParallelExecutionIntegrationTest.groovy |   49 ++
 .../daemon/DaemonFeedbackIntegrationSpec.groovy    |    2 +-
 .../launcher/daemon/DaemonLifecycleSpec.groovy     |    1 -
 .../daemon/SingleUseDaemonIntegrationTest.groovy   |    4 +-
 .../daemon/StoppingDaemonIntegrationSpec.groovy    |    2 +-
 .../gradle/launcher/cli/BuildActionsFactory.java   |   29 +-
 .../daemon/client/DaemonClientConnection.java      |    1 -
 .../daemon/configuration/DaemonParameters.java     |  110 +--
 .../daemon/configuration/GradleProperties.java     |  201 +++++
 .../configuration/GradlePropertiesConfigurer.java  |   48 ++
 .../daemon/server/exec/DaemonCommandExecution.java |   12 -
 .../server/exec/EstablishBuildEnvironment.java     |    4 +-
 .../internal/provider/ConfiguringBuildAction.java  |    7 +-
 .../DaemonGradleLauncherActionExecuter.java        |    5 +-
 .../internal/provider/DefaultConnection.java       |   28 +-
 .../provider/connection/BuildLogLevelMixIn.java    |    5 +-
 .../launcher/cli/BuildActionsFactoryTest.groovy    |  110 +--
 .../configuration/DaemonParametersTest.groovy      |  242 ++----
 .../GradlePropertiesConfigurerTest.groovy          |   77 ++
 .../configuration/GradlePropertiesTest.groovy      |  218 +++++
 .../provider/ConfiguringBuildActionTest.groovy     |   12 +
 .../connection/BuildLogLevelMixInTest.groovy       |   70 ++
 subprojects/maven/maven.gradle                     |    2 +
 .../maven/MavenConversionIntegrationTest.groovy    |    8 +-
 .../maven/AbstractMavenPublishIntegTest.groovy     |  107 +++
 ...venPublishArtifactCustomisationIntegTest.groovy |  228 ++++++
 .../maven/MavenPublishBasicIntegTest.groovy        |  159 +++-
 .../MavenPublishCrossVersionIntegrationTest.groovy |   37 +-
 .../publish/maven/MavenPublishEarIntegTest.groovy  |   72 ++
 .../publish/maven/MavenPublishHttpIntegTest.groovy |    7 +-
 ...avenPublishIdentifierValidationIntegTest.groovy |  149 ++++
 .../maven/MavenPublishIssuesIntegTest.groovy       |  111 +++
 .../publish/maven/MavenPublishJavaIntegTest.groovy |  114 ++-
 .../maven/MavenPublishMultiProjectIntegTest.groovy |  129 ++-
 .../MavenPublishPomCustomisationIntegTest.groovy   |   94 ++-
 .../maven/MavenPublishWarProjectIntegTest.groovy   |  144 ++++
 .../SamplesMavenPublishIntegrationTest.groovy      |   72 +-
 .../gradle/api/plugins/MavenPluginConvention.java  |    2 +-
 .../plugins/MavenRepositoryHandlerConvention.java  |   39 +-
 .../api/plugins/maven/ConvertMaven2Gradle.groovy   |   23 +-
 .../maven/internal/MavenProjectXmlWriter.java      |   11 +-
 .../maven/internal/DefaultMavenPom.java            |    2 +-
 .../maven/internal/ant/AbstractMavenResolver.java  |   47 +-
 .../maven/internal/ant/CustomDeployTask.java       |   12 -
 .../ant/DefaultPomDependenciesConverter.java       |    6 +-
 .../internal/ant/NoInstallDeployTaskFactory.java   |    6 +
 .../maven/InvalidMavenPublicationException.java    |   40 +
 .../gradle/api/publish/maven/MavenArtifact.java    |   65 ++
 .../gradle/api/publish/maven/MavenArtifactSet.java |   62 ++
 .../org/gradle/api/publish/maven/MavenPom.java     |    7 +-
 .../gradle/api/publish/maven/MavenPublication.java |  187 ++++-
 .../publish/maven/internal/DefaultMavenPom.java    |   36 -
 .../maven/internal/DefaultMavenPublication.java    |   68 --
 .../maven/internal/MavenDeployerConfigurer.java    |   55 --
 .../maven/internal/MavenNormalizedPublication.java |   65 --
 .../publish/maven/internal/MavenPomInternal.java   |   27 -
 .../maven/internal/MavenProjectIdentity.java       |   29 -
 .../MavenProjectIdentityModuleAdapter.java         |   44 -
 .../maven/internal/MavenPublicationInternal.java   |   34 -
 .../internal/MavenPublishDynamicTaskCreator.java   |   85 --
 .../MavenPublishLocalDynamicTaskCreator.java       |   64 --
 .../api/publish/maven/internal/MavenPublisher.java |  111 ---
 .../internal/ModuleBackedMavenProjectIdentity.java |   44 -
 .../internal/artifact/DefaultMavenArtifact.java    |   66 ++
 .../internal/artifact/DefaultMavenArtifactSet.java |   89 +++
 .../MavenArtifactNotationParserFactory.java        |  137 ++++
 .../internal/plugins/GeneratePomTaskCreator.java   |   71 ++
 .../plugins/MavenPublishDynamicTaskCreator.java    |   86 ++
 .../MavenPublishLocalDynamicTaskCreator.java       |   65 ++
 .../internal/publication/DefaultMavenPom.java      |   56 ++
 .../publication/DefaultMavenProjectIdentity.java   |   55 ++
 .../publication/DefaultMavenPublication.java       |  145 ++++
 .../internal/publication/MavenPomInternal.java     |   36 +
 .../publication/MavenPublicationInternal.java      |   45 ++
 .../publisher/AntTaskBackedMavenPublisher.java     |  127 +++
 .../publisher/MavenDeployerConfigurer.java         |   55 ++
 .../publisher/MavenNormalizedPublication.java      |   53 ++
 .../internal/publisher/MavenProjectIdentity.java   |   33 +
 .../maven/internal/publisher/MavenPublisher.java   |   22 +
 .../publisher/StaticLockingMavenPublisher.java     |   43 +
 .../publisher/ValidatingMavenPublisher.java        |  156 ++++
 .../internal/tasks/MavenPomFileGenerator.java      |  124 +++
 .../publish/maven/plugins/MavenPublishPlugin.java  |  102 +--
 .../api/publish/maven/tasks/GenerateMavenPom.java  |  114 +++
 .../publish/maven/tasks/PublishToMavenLocal.java   |    7 +-
 .../maven/tasks/PublishToMavenRepository.java      |   50 +-
 .../internal/MavenProjectXmlWriterTest.groovy      |   34 +
 ...ectDependencyArtifactIdExtractorHackTest.groovy |    2 +-
 .../ModuleBackedMavenProjectIdentityTest.groovy    |   57 --
 .../MavenArtifactNotationParserFactoryTest.groovy  |  162 ++++
 .../publication/DefaultMavenPublicationTest.groovy |  233 ++++++
 .../publisher/ValidatingMavenPublisherTest.groovy  |  236 ++++++
 .../tasks/MavenPomFileGeneratorTest.groovy         |  204 +++++
 .../maven/plugins/MavenPublishPluginTest.groovy    |   94 +--
 .../inet/TcpConnectorConcurrencyTest.groovy        |   85 --
 .../jna/AbstractProcessEnvironment.java            |   92 ---
 .../gradle/internal/nativeplatform/jna/LibC.java   |    1 -
 .../jna/LibCBackedProcessEnvironment.java          |    1 +
 .../jna/WindowsProcessEnvironment.java             |    1 +
 .../AbstractProcessEnvironment.java                |   92 +++
 .../NativePlatformBackedProcessEnvironment.java    |   51 ++
 .../nativeplatform/services/NativeServices.java    |   40 +-
 .../jna/ProcessEnvironmentTest.groovy              |   79 --
 .../ProcessEnvironmentTest.groovy                  |   79 ++
 ...CrossVersionCompatibilityIntegrationTest.groovy |    2 +-
 .../integtests/openapi/GradleRunnerTest.groovy     |    2 +-
 .../gradle/integtests/openapi/OpenApiFixture.java  |    8 +-
 .../gradle/integtests/openapi/OpenApiUiTest.groovy |    4 +-
 .../integtests/openapi/OutputUILordTest.groovy     |    4 +-
 subprojects/performance/performance.gradle         |   11 +-
 .../performance/CleanBuildPerformanceTest.groovy   |   25 +-
 .../DependencyReportPerformanceTest.groovy         |   26 +-
 .../DependencyResolutionStressTest.groovy          |    2 +-
 .../IdeIntegrationPerformanceTest.groovy           |   55 +-
 .../TestExecutionPerformanceTest.groovy            |   30 +-
 .../UpToDateBuildPerformanceTest.groovy            |   24 +-
 .../fixture/AbstractPerformanceTest.groovy         |   27 +
 .../gradle/performance/fixture/DataReporter.groovy |   21 +
 .../fixture/PerformanceTestRunner.groovy           |   31 +-
 .../fixture/TextFileDataReporter.groovy            |   30 +
 subprojects/plugins/plugins.gradle                 |    2 +-
 .../api/plugins/BasePluginIntegrationTest.groovy   |    2 +-
 .../DistributionPluginIntegrationTest.groovy       |  351 ++++++++
 .../JavaLibraryDistributionIntegrationTest.groovy  |  156 ++--
 .../ParallelCompilerDaemonIntegrationTest.groovy   |    2 +-
 ...ntInProcessGroovyCompilerIntegrationTest.groovy |    2 +-
 .../ApiGroovyCompilerIntegrationSpec.groovy        |    4 +-
 .../BasicGroovyCompilerIntegrationSpec.groovy      |    7 +-
 .../IncrementalGroovyCompileIntegrationTest.groovy |    2 +-
 .../IncrementalJavaCompileIntegrationTest.groovy   |    2 +-
 .../gradle/javadoc/JavadocIntegrationTest.groovy   |    2 +-
 .../testing/TestEnvironmentIntegrationTest.groovy  |   12 +-
 .../TestOutputListenerIntegrationTest.groovy       |    8 +-
 .../testing/TestReportIntegrationTest.groovy       |   17 +-
 .../gradle/testing/TestingIntegrationTest.groovy   |    4 +-
 .../junit/JUnitCrossVersionIntegrationSpec.groovy  |    8 +-
 .../testing/junit/JUnitIntegrationTest.groovy      |   50 +-
 .../junit/JUnitLoggingIntegrationTest.groovy       |    8 +-
 .../testng/SampleTestNGIntegrationTest.groovy      |    6 +-
 .../testing/testng/TestNGIntegrationTest.groovy    |   29 +-
 .../testng/TestNGLoggingIntegrationTest.groovy     |    4 +-
 ...NGProducesJUnitXmlResultsIntegrationTest.groovy |  184 -----
 .../TestNGProducesOldReportsIntegrationTest.groovy |    8 +-
 ...tNGXmlResultAndHtmlReportIntegrationTest.groovy |  199 +++++
 .../src/test/java/org/gradle/Junit4Test.java       |    9 +
 .../src/test/java/org/gradle/NoTest.java           |   22 +
 .../supportsJunit3Suites/build.gradle              |   26 +
 .../src/test/java/org/gradle/SomeSuite.java        |   45 ++
 .../src/test/java/org/gradle/SomeTest1.java        |   24 +
 .../src/test/java/org/gradle/SomeTest2.java        |   24 +
 .../build.gradle                                   |    7 +
 .../test/java/org/gradle/SomeOtherTestSuite.java   |   25 +
 .../src/test/java/org/gradle/SomeTest.java         |   23 +
 .../src/test/java/org/gradle/SomeTestSuite.java    |   24 +
 .../supportsTestFactory/build.gradle               |   31 +
 .../test/java/org/gradle/factory/FactoryTest.java  |   33 +
 .../java/org/gradle/factory/TestNGFactory.java     |   29 +
 .../org/gradle/api/distribution/Distribution.java  |   55 ++
 .../api/distribution/DistributionContainer.java    |   26 +
 .../distribution/internal/DefaultDistribution.java |   59 ++
 .../internal/DefaultDistributionContainer.java     |   40 +
 .../org/gradle/api/distribution/package-info.java  |   20 +
 .../distribution/plugins/DistributionPlugin.groovy |  133 ++++
 .../org/gradle/api/internal/java/JavaLibrary.java  |   37 +-
 .../gradle/api/internal/java/WebApplication.java   |   57 ++
 .../internal/tasks/DefaultBinariesContainer.java   |   27 +
 .../tasks/DefaultClassDirectoryBinary.java         |  109 +++
 .../api/internal/tasks/DefaultClasspath.java       |   38 +
 .../internal/tasks/DefaultFunctionalSourceSet.java |   34 +
 .../api/internal/tasks/DefaultJavaSourceSet.java   |   72 ++
 .../internal/tasks/DefaultJvmBinaryContainer.java  |   36 +
 .../internal/tasks/DefaultProjectSourceSet.java    |   32 +
 .../api/internal/tasks/DefaultResourceSet.java     |   53 ++
 .../internal/tasks/SourceSetCompileClasspath.java  |   35 +
 .../compile/daemon/CompilerDaemonManager.java      |    5 +-
 .../tasks/testing/DecoratingTestDescriptor.java    |   12 +-
 .../junit/IgnoredTestDescriptorProvider.java       |   42 +
 .../tasks/testing/junit/JUnitTestEventAdapter.java |   34 +-
 .../testing/junit/report/ClassPageRenderer.java    |  117 ++-
 .../testing/junit/report/DefaultTestReport.java    |    1 +
 .../testing/junit/report/OverviewPageRenderer.java |  107 +--
 .../testing/junit/report/PackagePageRenderer.java  |   68 +-
 .../tasks/testing/junit/report/PageRenderer.java   |  145 ++--
 .../junit/result/AbstractTestResultProvider.java   |   70 --
 .../junit/result/AggregateTestResultsProvider.java |    4 +
 .../BinaryResultBackedTestResultsProvider.java     |   21 +-
 .../testing/junit/result/CachingFileWriter.java    |   12 +-
 .../testing/junit/result/TestOutputSerializer.java |   90 +++
 .../junit/result/TestReportDataCollector.java      |   38 +-
 .../testing/junit/result/TestResultsProvider.java  |    2 +
 .../internal/tasks/testing/testng/TestNGSpec.java  |   97 +++
 .../testing/testng/TestNGTestClassProcessor.java   |   21 +-
 .../tasks/testing/testng/TestNGTestFramework.java  |   12 +-
 .../testing/testng/TestNGTestMethodDetecter.java   |    1 +
 .../org/gradle/api/java/archives/Manifest.java     |    2 +-
 .../api/java/archives/ManifestMergeSpec.java       |    2 +-
 .../java/archives/internal/DefaultManifest.java    |    2 +-
 .../api/plugins/DistributionExtension.groovy       |   46 --
 .../org/gradle/api/plugins/JavaBasePlugin.java     |   52 +-
 .../org/gradle/api/plugins/JavaLanguagePlugin.java |   76 ++
 .../plugins/JavaLibraryDistributionPlugin.groovy   |   36 +-
 .../groovy/org/gradle/api/plugins/JavaPlugin.java  |   20 +-
 .../org/gradle/api/plugins/JvmLanguagePlugin.java  |  128 +++
 .../org/gradle/api/plugins/LanguageBasePlugin.java |   60 ++
 .../groovy/org/gradle/api/plugins/WarPlugin.java   |   10 +-
 .../org/gradle/api/tasks/BinariesContainer.java    |   27 +
 .../org/gradle/api/tasks/ClassDirectoryBinary.java |   49 ++
 .../groovy/org/gradle/api/tasks/Classpath.java     |   28 +
 .../org/gradle/api/tasks/FunctionalSourceSet.java  |   27 +
 .../groovy/org/gradle/api/tasks/JavaSourceSet.java |   24 +
 .../org/gradle/api/tasks/JvmBinaryContainer.java   |   27 +
 .../org/gradle/api/tasks/JvmLanguageSourceSet.java |   26 +
 .../org/gradle/api/tasks/LanguageSourceSet.java    |   33 +
 .../org/gradle/api/tasks/ProjectSourceSet.java     |   26 +
 .../groovy/org/gradle/api/tasks/ResourceSet.java   |   24 +
 .../groovy/org/gradle/api/tasks/SourceSet.java     |    4 +-
 .../org/gradle/api/tasks/bundling/War.groovy       |    2 +-
 .../api/tasks/testing/testng/TestNGOptions.groovy  |    4 +-
 .../javadoc/internal/JavadocOptionFileWriter.java  |    2 +-
 .../gradle-plugins/distribution.properties         |   17 +
 .../META-INF/gradle-plugins/java-lang.properties   |    1 +
 .../META-INF/gradle-plugins/jvm-lang.properties    |    1 +
 .../META-INF/gradle-plugins/lang-base.properties   |    1 +
 .../plugins/DistributionPluginTest.groovy          |  136 ++++
 .../junit/JUnitTestClassProcessorTest.groovy       |   61 +-
 .../junit/report/DefaultTestReportTest.groovy      |   76 +-
 .../junit/result/TestOutputSerializerTest.groovy   |   72 ++
 .../result/TestReportDataCollectorSpec.groovy      |   56 +-
 .../testng/TestNGTestClassProcessorTest.groovy     |   13 +-
 .../gradle/api/plugins/JavaBasePluginTest.groovy   |   59 +-
 .../api/plugins/JavaLanguagePluginTest.groovy      |   39 +
 .../JavaLibraryDistributionPluginTest.groovy       |   29 +-
 .../org/gradle/api/plugins/JavaPluginTest.groovy   |   13 +-
 .../api/plugins/JvmLanguagePluginTest.groovy       |   63 ++
 .../api/plugins/LanguageBasePluginTest.groovy      |   51 ++
 subprojects/publish/publish.gradle                 |    3 +
 .../org/gradle/api/publish/Publication.java        |    0
 .../gradle/api/publish/PublicationContainer.java   |   77 ++
 .../gradle/api/publish/PublishingExtension.java    |  111 +++
 .../internal/CompositePublicationFactory.java      |   39 +
 .../internal/DefaultPublicationContainer.java      |   53 ++
 .../internal/DefaultPublishingExtension.java       |   50 ++
 .../internal/GroovyPublicationContainer.groovy     |   35 +
 .../internal/PublicationContainerInternal.java     |   23 +
 .../api/publish/internal/PublicationFactory.java   |   22 +
 .../internal/PublicationFieldValidator.java        |   77 ++
 .../api/publish/internal/PublishOperation.java     |    0
 .../org/gradle/api/publish/package-info.java       |    0
 .../api/publish/plugins/PublishingPlugin.java      |   65 ++
 .../gradle/api/publish/plugins/package-info.java   |    0
 .../gradle/api/publish/PublicationContainer.java   |   46 --
 .../gradle/api/publish/PublishingExtension.java    |  100 ---
 .../api/publish/UnknownPublicationException.java   |   32 -
 .../internal/DefaultPublicationContainer.java      |   36 -
 .../internal/DefaultPublishingExtension.java       |   49 --
 .../api/publish/plugins/PublishingPlugin.java      |   58 --
 .../DefaultPublicationContainerTest.groovy         |  104 ++-
 subprojects/reporting/reporting.gradle             |    4 +
 .../BuildDashboardPluginIntegrationTest.groovy     |  151 ++++
 .../api/reporting/BuildDashboardReports.java       |   32 +
 .../api/reporting/GenerateBuildDashboard.java      |  132 +++
 .../groovy/org/gradle/api/reporting/Report.java    |    7 +
 .../internal/BuildDashboardGenerator.java          |   97 +++
 .../internal/DefaultBuildDashboardReports.java     |   34 +
 .../api/reporting/internal/SimpleReport.java       |    8 +-
 .../reporting/internal/TaskGeneratedReport.java    |    6 +-
 .../reporting/plugins/BuildDashboardPlugin.groovy  |   58 ++
 .../gradle/api/reporting/plugins/package-info.java |   20 +
 .../gradle-plugins/build-dashboard.properties      |    1 +
 .../reporting/GenerateBuildDashboardSpec.groovy    |   35 +
 .../internal/BuildDashboardGeneratorSpec.groovy    |   95 +++
 .../internal/DefaultReportContainerTest.groovy     |    4 +-
 subprojects/scala/scala.gradle                     |    2 +-
 .../IncrementalScalaCompileIntegrationTest.groovy  |    2 +-
 ...tForkingScalaCompilerJdk6IntegrationTest.groovy |    3 +-
 ...nProcessScalaCompilerJdk6IntegrationTest.groovy |    2 +-
 .../ZincScalaCompilerJdk6IntegrationTest.groovy    |    4 +-
 .../scala/test/ScalaTestIntegrationTest.groovy     |    6 +-
 .../internal/tasks/scala/AntScalaCompiler.groovy   |    8 +-
 .../tasks/scala/jdk6/ZincScalaCompiler.java        |    2 +-
 .../api/plugins/scala/ScalaBasePlugin.groovy       |  111 ++-
 .../api/plugins/scala/ScalaBasePluginTest.groovy   |   67 ++
 .../plugins/signing/SigningIntegrationSpec.groovy  |    3 +-
 .../plugins/signing/SigningSamplesSpec.groovy      |    9 +-
 subprojects/sonar/sonar.gradle                     |   19 +-
 .../plugins/sonar/SonarSmokeIntegrationTest.groovy |   10 +-
 .../runner/SonarRunnerSmokeIntegrationTest.groovy  |   84 ++
 .../SonarSmokeIntegrationTest/shared/build.gradle  |   14 +-
 .../shared/customizedProject/build.gradle          |   14 +
 .../gradle/test/customizedProject/Production1.java |   14 +
 .../org/gradle/test/customizedProject/Test1.java   |   12 +
 .../shared/gradle.properties                       |    1 +
 .../shared/javaProject/build.gradle                |    2 +
 .../org/gradle/test/javaProject/Production1.java   |   14 +
 .../org/gradle/test/javaProject/Production10.java  |   14 +
 .../org/gradle/test/javaProject/Production2.java   |   14 +
 .../org/gradle/test/javaProject/Production3.java   |   14 +
 .../org/gradle/test/javaProject/Production4.java   |   14 +
 .../org/gradle/test/javaProject/Production5.java   |   14 +
 .../org/gradle/test/javaProject/Production6.java   |   14 +
 .../org/gradle/test/javaProject/Production7.java   |   14 +
 .../org/gradle/test/javaProject/Production8.java   |   14 +
 .../org/gradle/test/javaProject/Production9.java   |   14 +
 .../gradle/test/javaProject/productionResource.xml |    6 +
 .../java/org/gradle/test/javaProject/Test1.java    |   12 +
 .../java/org/gradle/test/javaProject/Test10.java   |   12 +
 .../java/org/gradle/test/javaProject/Test2.java    |   12 +
 .../java/org/gradle/test/javaProject/Test3.java    |   12 +
 .../java/org/gradle/test/javaProject/Test4.java    |   12 +
 .../java/org/gradle/test/javaProject/Test5.java    |   12 +
 .../java/org/gradle/test/javaProject/Test6.java    |   12 +
 .../java/org/gradle/test/javaProject/Test7.java    |   12 +
 .../java/org/gradle/test/javaProject/Test8.java    |   12 +
 .../java/org/gradle/test/javaProject/Test9.java    |   12 +
 .../org/gradle/test/javaProject/testResource.xml   |    6 +
 .../nested/nested2/nestedProject/build.gradle      |    1 +
 .../org/gradle/test/nestedProject/Production1.java |   14 +
 .../java/org/gradle/test/nestedProject/Test1.java  |   12 +
 .../shared/settings.gradle                         |    3 +
 .../shared/skippedProject/build.gradle             |    3 +
 .../gradle/test/skippedProject/Production1.java    |   14 +
 .../java/org/gradle/test/skippedProject/Test1.java |   12 +
 .../shared/build.gradle                            |   20 +
 .../shared/customizedProject/build.gradle          |   14 +
 .../gradle/test/customizedProject/Production1.java |   14 +
 .../org/gradle/test/customizedProject/Test1.java   |   12 +
 .../shared/gradle.properties                       |    1 +
 .../shared/groovyProject/build.gradle              |   14 +
 .../test/groovyProject/ProductionGroovy1.groovy    |   13 +
 .../test/groovyProject/ProductionGroovy10.groovy   |   13 +
 .../test/groovyProject/ProductionGroovy2.groovy    |   13 +
 .../test/groovyProject/ProductionGroovy3.groovy    |   13 +
 .../test/groovyProject/ProductionGroovy4.groovy    |   13 +
 .../test/groovyProject/ProductionGroovy5.groovy    |   13 +
 .../test/groovyProject/ProductionGroovy6.groovy    |   13 +
 .../test/groovyProject/ProductionGroovy7.groovy    |   13 +
 .../test/groovyProject/ProductionGroovy8.groovy    |   13 +
 .../test/groovyProject/ProductionGroovy9.groovy    |   13 +
 .../gradle/test/groovyProject/TestGroovy1.groovy   |   12 +
 .../gradle/test/groovyProject/TestGroovy10.groovy  |   12 +
 .../gradle/test/groovyProject/TestGroovy2.groovy   |   12 +
 .../gradle/test/groovyProject/TestGroovy3.groovy   |   12 +
 .../gradle/test/groovyProject/TestGroovy4.groovy   |   12 +
 .../gradle/test/groovyProject/TestGroovy5.groovy   |   12 +
 .../gradle/test/groovyProject/TestGroovy6.groovy   |   12 +
 .../gradle/test/groovyProject/TestGroovy7.groovy   |   12 +
 .../gradle/test/groovyProject/TestGroovy8.groovy   |   12 +
 .../gradle/test/groovyProject/TestGroovy9.groovy   |   12 +
 .../shared/javaProject/build.gradle                |    2 +
 .../org/gradle/test/javaProject/Production1.java   |   14 +
 .../org/gradle/test/javaProject/Production10.java  |   14 +
 .../org/gradle/test/javaProject/Production2.java   |   14 +
 .../org/gradle/test/javaProject/Production3.java   |   14 +
 .../org/gradle/test/javaProject/Production4.java   |   14 +
 .../org/gradle/test/javaProject/Production5.java   |   14 +
 .../org/gradle/test/javaProject/Production6.java   |   14 +
 .../org/gradle/test/javaProject/Production7.java   |   14 +
 .../org/gradle/test/javaProject/Production8.java   |   14 +
 .../org/gradle/test/javaProject/Production9.java   |   14 +
 .../gradle/test/javaProject/productionResource.xml |    6 +
 .../java/org/gradle/test/javaProject/Test1.java    |   12 +
 .../java/org/gradle/test/javaProject/Test10.java   |   12 +
 .../java/org/gradle/test/javaProject/Test2.java    |   12 +
 .../java/org/gradle/test/javaProject/Test3.java    |   12 +
 .../java/org/gradle/test/javaProject/Test4.java    |   12 +
 .../java/org/gradle/test/javaProject/Test5.java    |   12 +
 .../java/org/gradle/test/javaProject/Test6.java    |   12 +
 .../java/org/gradle/test/javaProject/Test7.java    |   12 +
 .../java/org/gradle/test/javaProject/Test8.java    |   12 +
 .../java/org/gradle/test/javaProject/Test9.java    |   12 +
 .../org/gradle/test/javaProject/testResource.xml   |    6 +
 .../nested/nested2/nestedProject/build.gradle      |    1 +
 .../org/gradle/test/nestedProject/Production1.java |   14 +
 .../java/org/gradle/test/nestedProject/Test1.java  |   12 +
 .../shared/settings.gradle                         |    3 +
 .../shared/skippedProject/build.gradle             |    3 +
 .../gradle/test/skippedProject/Production1.java    |   14 +
 .../java/org/gradle/test/skippedProject/Test1.java |   12 +
 .../gradle/api/sonar/runner/SonarProperties.groovy |   56 ++
 .../org/gradle/api/sonar/runner/SonarRunner.groovy |   54 ++
 .../api/sonar/runner/SonarRunnerExtension.groovy   |   78 ++
 .../api/sonar/runner/SonarRunnerPlugin.groovy      |  222 ++++++
 .../gradle-plugins/sonar-runner.properties         |    1 +
 .../api/sonar/runner/SonarPropertiesTest.groovy    |   48 ++
 .../sonar/runner/SonarRunnerExtensionTest.groovy   |   43 +
 .../api/sonar/runner/SonarRunnerPluginTest.groovy  |  373 +++++++++
 .../SamplesToolingApiIntegrationTest.groovy        |    2 +-
 .../tooling/ToolingApiIntegrationTest.groovy       |    7 +-
 .../tooling/fixture/ConfigurableOperation.groovy   |   24 +-
 .../tooling/fixture/ToolingApiSpecification.groovy |   18 +
 ...ToolingApiBuildExecutionCrossVersionSpec.groovy |   15 +-
 .../m5/ToolingApiModelCrossVersionSpec.groovy      |   15 +-
 .../m8/GradlePropertiesCrossVersionSpec.groovy     |   72 --
 ...adlePropertiesToolingApiCrossVersionSpec.groovy |   72 ++
 .../m8/ToolingApiLoggingCrossVersionSpec.groovy    |   26 +-
 ...singCommandLineArgumentsCrossVersionSpec.groovy |   15 +-
 ...ApiInitScriptCrossVersionIntegrationTest.groovy |    7 +-
 ...ningCommandLineArgumentsCrossVersionSpec.groovy |   55 ++
 ...ApiConfigurationOnDemandCrossVersionSpec.groovy |   66 ++
 .../org/gradle/tooling/LongRunningOperation.java   |    4 +-
 .../tooling/internal/idea/DefaultIdeaModule.java   |   12 -
 .../integtests/LiveOutputIntegrationTest.groovy    |    2 +-
 ...projectProjectAndTaskListIntegrationTest.groovy |    2 +-
 .../gradleplugin/foundation/GradlePluginLord.java  |    3 +-
 .../userinterface/swing/generic/tabs/SetupTab.java |    2 +-
 .../swing/standalone/Application.java              |    3 +-
 version.txt                                        |    2 +-
 1173 files changed, 36248 insertions(+), 15616 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git



More information about the pkg-java-commits mailing list