[gradle-1.12] 104/211: Merge upstream 1.12

Kai-Chung Yan seamlik-guest at moszumanska.debian.org
Wed Jul 1 14:18:30 UTC 2015


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

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

commit 850544b214d9c2613bf35190d36857ec0eb3396f
Merge: ab3d0a0 efaf20b
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Thu May 21 15:48:19 2015 +0800

    Merge upstream 1.12

 build.gradle                                       |   35 +-
 buildSrc/build.gradle                              |    4 +-
 .../main/groovy/org/gradle/build/BuildTypes.groovy |    2 +-
 .../main/groovy/org/gradle/build/JarJarJar.groovy  |    6 +-
 .../org/gradle/build/ReleasedVersions.groovy       |   93 +
 .../gradle/build/docs/DocGenerationException.java  |    2 +-
 .../org/gradle/build/docs/Docbook2XHtml.groovy     |    2 +-
 .../build/docs/SampleElementValidator.groovy       |    2 -
 .../build/docs/UserGuideTransformTask.groovy       |    7 +-
 .../build/docs/dsl/docbook/BasicJavadocLexer.java  |   20 +
 .../build/docs/dsl/docbook/BlocksRenderer.java     |   48 +-
 .../docs/dsl/docbook/ClassDocMemberRenderer.java   |   25 +
 .../docs/dsl/docbook/ClassDocMethodsBuilder.java   |    3 +-
 .../dsl/docbook/ClassDocPropertiesBuilder.java     |   13 +-
 .../build/docs/dsl/docbook/ClassDocRenderer.java   |   34 +-
 .../docs/dsl/docbook/ClassDocSuperTypeBuilder.java |   19 +-
 .../build/docs/dsl/docbook/JavadocConverter.java   |   17 +
 .../build/docs/dsl/docbook/MethodsRenderer.java    |   48 +-
 .../build/docs/dsl/docbook/PropertiesRenderer.java |   46 +-
 .../build/docs/dsl/docbook/model/ClassDoc.groovy   |    5 +
 .../docs/dsl/source/ExtractDslMetaDataTask.groovy  |    4 +-
 .../dsl/source/GenerateDefaultImportsTask.java     |  148 +
 .../docs/model/SimpleClassMetaDataRepository.java  |   10 +-
 .../docs/dsl/docbook/BasicJavadocLexerTest.groovy  |   26 +
 .../dsl/docbook/ClassDocMethodsBuilderTest.groovy  |   12 +-
 .../docbook/ClassDocPropertiesBuilderTest.groovy   |   22 +-
 .../docs/dsl/docbook/ClassDocRendererTest.groovy   |  249 +-
 .../docs/dsl/docbook/JavadocConverterTest.groovy   |   20 +
 .../model/SimpleClassMetaDataRepositoryTest.groovy |   26 +-
 config/checkstyle/checkstyle-groovy.xml            |    3 +
 config/checkstyle/checkstyle.xml                   |    3 +
 gradle/buildReceipt.gradle                         |    1 +
 gradle/dependencies.gradle                         |   33 +-
 gradle/eclipse.gradle                              |    7 +
 gradle/groovyProject.gradle                        |   35 +-
 gradle/idea.gradle                                 |   14 +
 gradle/ideaTestSourcesWorkaround.gradle            |    3 +
 gradle/intTestImage.gradle                         |    2 +-
 gradle/integTest.gradle                            |   87 +-
 gradle/providedConfiguration.gradle                |    7 +-
 gradle/publish.gradle                              |    2 +-
 gradle/testGroupings.gradle                        |   13 +
 gradle/testSetup.gradle                            |    7 +
 gradle/versioning.gradle                           |    4 +
 gradle/wrapper.gradle                              |   30 +-
 gradle/wrapper/gradle-wrapper.jar                  |  Bin 0 -> 51365 bytes
 gradle/wrapper/gradle-wrapper.properties           |    4 +-
 settings.gradle                                    |    5 +
 subprojects/announce/announce.gradle               |    7 +-
 .../api/plugins/announce/AnnouncePlugin.groovy     |    5 +-
 .../announce/AnnouncePluginExtension.groovy        |   36 +-
 .../announce/internal/AnnouncerFactory.groovy      |    3 -
 .../internal/DefaultAnnouncerFactory.groovy        |    3 -
 .../plugins/announce/internal/NotifySend.groovy    |    3 -
 .../api/plugins/announce/internal/Twitter.groovy   |    8 +-
 .../announce/AnnouncePluginExtensionTest.groovy    |    8 +-
 .../api/plugins/announce/AnnouncePluginTest.groovy |    9 +-
 .../announce/BuildAnnouncementsPluginTest.groovy   |    4 +-
 .../internal/DefaultAnnouncerFactoryTest.groovy    |    7 +-
 subprojects/antlr/antlr.gradle                     |    2 +-
 .../org/gradle/api/plugins/antlr/AntlrPlugin.java  |    6 +-
 .../plugins/antlr/AntlrSourceVirtualDirectory.java |    2 -
 .../org/gradle/api/plugins/antlr/AntlrTask.java    |   14 +-
 .../internal/AntlrSourceVirtualDirectoryImpl.java  |    2 -
 .../api/plugins/antlr/internal/GenerationPlan.java |    2 -
 .../antlr/internal/GenerationPlanBuilder.java      |   12 +-
 .../plugins/antlr/internal/GrammarDelegate.java    |   10 +-
 .../antlr/internal/GrammarFileMetadata.java        |    6 +-
 .../plugins/antlr/internal/GrammarMetadata.java    |    8 +-
 .../plugins/antlr/internal/MetadataExtracter.java  |   10 +-
 .../gradle/api/plugins/antlr/internal/XRef.java    |    8 +-
 .../api/plugins/antlr/AntlrPluginTest.groovy       |    8 +-
 .../base-services-groovy.gradle                    |    2 +-
 .../main/groovy/org/gradle/api/specs/AndSpec.java  |    1 -
 .../api/specs/AbstractCompositeSpecTest.java       |    2 +-
 .../groovy/org/gradle/api/specs/AndSpecTest.java   |    4 +-
 subprojects/base-services/base-services.gradle     |    4 +-
 .../main/java/org/gradle/api/GradleException.java  |    2 -
 .../src/main/java/org/gradle/api/JavaVersion.java  |   26 +-
 .../main/java/org/gradle/api/internal/Actions.java |  208 -
 .../main/java/org/gradle/api/internal/Cast.java    |   46 -
 .../org/gradle/api/internal/ErroringAction.java    |   44 -
 .../main/java/org/gradle/api/internal/Factory.java |    4 +-
 .../gradle/api/internal/HasInternalProtocol.java   |   35 -
 .../java/org/gradle/api/internal/IoActions.java    |   93 -
 .../java/org/gradle/api/internal/Transformers.java |   95 -
 .../api/internal/project/ServiceRegistry.java      |    4 +-
 .../java/org/gradle/api/specs/CompositeSpec.java   |    1 -
 .../main/java/org/gradle/api/specs/NotSpec.java    |    1 -
 .../src/main/java/org/gradle/api/specs/OrSpec.java |    1 -
 .../src/main/java/org/gradle/api/specs/Spec.java   |    1 -
 .../src/main/java/org/gradle/internal/Actions.java |  208 +
 .../src/main/java/org/gradle/internal/Cast.java    |   46 +
 .../org/gradle/internal/CompositeStoppable.java    |  142 -
 .../java/org/gradle/internal/ErroringAction.java   |   43 +
 .../main/java/org/gradle/internal/Factories.java   |    8 +
 .../main/java/org/gradle/internal/FileUtils.java   |   57 +
 .../org/gradle/internal/HasInternalProtocol.java   |   35 +
 .../main/java/org/gradle/internal/IoActions.java   |  120 +
 .../java/org/gradle/internal/LazyIterable.java     |   33 -
 .../main/java/org/gradle/internal/Stoppable.java   |   28 -
 .../main/java/org/gradle/internal/Supplier.java    |   25 +
 .../main/java/org/gradle/internal/Suppliers.java   |   64 +
 .../java/org/gradle/internal/SystemProperties.java |   24 +-
 .../java/org/gradle/internal/Transformers.java     |  151 +
 .../internal/classloader/CachingClassLoader.java   |   66 +
 .../internal/classloader/ClassLoaderFactory.java   |   47 +
 .../internal/classloader/ClassLoaderHierarchy.java |   21 +
 .../internal/classloader/ClassLoaderSpec.java      |   45 +
 .../internal/classloader/ClassLoaderVisitor.java   |   52 +
 .../gradle/internal/classloader/ClasspathUtil.java |  105 +
 .../classloader/DefaultClassLoaderFactory.java     |  111 +
 .../internal/classloader/FilteringClassLoader.java |  258 ++
 .../classloader/MultiParentClassLoader.java        |  126 +
 .../classloader/MutableURLClassLoader.java         |   89 +
 .../classloader/TransformingClassLoader.java       |   63 +
 .../gradle/internal/concurrent/AsyncStoppable.java |    4 +-
 .../internal/concurrent/CompositeStoppable.java    |  133 +
 .../concurrent/DefaultExecutorFactory.java         |    2 -
 .../internal/concurrent/ServiceLifecycle.java      |  127 +
 .../org/gradle/internal/concurrent/Stoppable.java  |   28 +
 .../java/org/gradle/internal/hash/HashUtil.java    |   85 +
 .../java/org/gradle/internal/hash/HashValue.java   |   90 +
 .../gradle/internal/id/CompositeIdGenerator.java   |   12 +-
 .../internal/io/RandomAccessFileInputStream.java   |   49 +
 .../internal/io/RandomAccessFileOutputStream.java  |   43 +
 .../java/org/gradle/internal/io/TextStream.java    |   33 +
 .../org/gradle/internal/jvm/JavaHomeException.java |    3 -
 .../java/org/gradle/internal/jvm/JavaInfo.java     |    3 -
 .../src/main/java/org/gradle/internal/jvm/Jre.java |   26 +
 .../src/main/java/org/gradle/internal/jvm/Jvm.java |   80 +-
 .../org/gradle/internal/os/OperatingSystem.java    |   94 +-
 .../internal/reflect/DirectInstantiator.java       |    2 +-
 .../org/gradle/internal/reflect/Instantiator.java  |    2 +-
 .../org/gradle/internal/reflect/JavaMethod.java    |   79 +
 .../internal/reflect/JavaReflectionUtil.java       |  324 +-
 .../internal/reflect/NoSuchMethodException.java    |   26 +
 .../internal/reflect/NoSuchPropertyException.java  |   26 +
 .../gradle/internal/reflect/PropertyAccessor.java  |   25 +
 .../gradle/internal/reflect/PropertyMutator.java   |   25 +
 .../internal/service/AbstractServiceRegistry.java  |   74 -
 .../internal/service/DefaultServiceRegistry.java   |  904 +++-
 .../internal/service/ServiceCreationException.java |   30 +
 .../gradle/internal/service/ServiceLocator.java    |  106 +-
 .../internal/service/ServiceRegistration.java      |   43 +
 .../gradle/internal/service/ServiceRegistry.java   |   20 +
 .../internal/service/ServiceRegistryBuilder.java   |   56 +
 .../service/ServiceValidationException.java        |   26 +
 .../service/SynchronizedServiceRegistry.java       |   78 -
 .../internal/service/UnknownServiceException.java  |    8 +-
 .../main/java/org/gradle/util/CollectionUtils.java |  132 +-
 .../groovy/org/gradle/api/JavaVersionSpec.groovy   |   29 +-
 .../org/gradle/api/internal/ActionsTest.groovy     |  157 -
 .../groovy/org/gradle/api/internal/CastTest.groovy |   44 -
 .../gradle/api/internal/ErroringActionTest.groovy  |   52 -
 .../org/gradle/api/internal/IoActionsTest.groovy   |   92 -
 .../gradle/api/internal/TransformersTest.groovy    |   74 -
 .../groovy/org/gradle/internal/ActionsTest.groovy  |  157 +
 .../groovy/org/gradle/internal/CastTest.groovy     |   44 +
 .../gradle/internal/CompositeStoppableTest.groovy  |  145 -
 .../org/gradle/internal/ErroringActionTest.groovy  |   52 +
 .../org/gradle/internal/FileUtilsTest.groovy       |   54 +
 .../org/gradle/internal/IoActionsTest.groovy       |  167 +
 .../org/gradle/internal/LazyIterableTest.groovy    |   37 -
 .../org/gradle/internal/SuppliersTest.groovy       |   82 +
 .../org/gradle/internal/TransformersTest.groovy    |   98 +
 .../classloader/CachingClassLoaderTest.groovy      |   78 +
 .../DefaultClassLoaderFactoryTest.groovy           |   91 +
 .../DefaultClassLoaderFactoryTestHelper.java       |   35 +
 .../classloader/FilteringClassLoaderTest.groovy    |  261 ++
 .../classloader/MultiParentClassLoaderTest.groovy  |  123 +
 .../classloader/MutableURLClassLoaderTest.groovy   |   39 +
 .../concurrent/CompositeStoppableTest.groovy       |  145 +
 .../concurrent/DefaultExecutorFactorySpec.groovy   |   48 -
 .../concurrent/DefaultExecutorFactoryTest.groovy   |  181 +-
 .../concurrent/ServiceLifecycleTest.groovy         |  246 ++
 .../org/gradle/internal/hash/HashValueTest.groovy  |   64 +
 .../groovy/org/gradle/internal/jvm/JvmTest.groovy  |  224 +-
 .../gradle/internal/os/OperatingSystemTest.groovy  |   40 +
 .../internal/reflect/JavaReflectionUtilTest.groovy |  232 +-
 .../gradle/internal/reflect/JavaTestSubject.java   |  114 +
 .../internal/reflect/JavaTestSubjectSubclass.java  |   31 +
 .../DefaultServiceRegistryConcurrencyTest.groovy   |  134 +
 .../service/DefaultServiceRegistryTest.groovy      | 1239 ++++++
 .../service/DefaultServiceRegistryTest.java        |  579 ---
 .../gradle/internal/service/GenericRunnable.java   |   20 +
 .../internal/service/ProviderWithGenericType.java  |   31 +
 .../internal/service/ServiceLocatorTest.groovy     |  162 +-
 .../service/SynchronizedServiceRegistryTest.groovy |   44 -
 .../org/gradle/util/CollectionUtilsTest.groovy     |   59 +-
 .../resources/org/gradle/util/ClassLoaderTest.txt  |    0
 .../build-comparison/build-comparison.gradle       |    6 +-
 .../gradle/CompareGradleBuilds.java                |    2 +-
 .../internal/ComparableGradleBuildExecuter.java    |    2 +-
 .../internal/DefaultGradleBuildInvocationSpec.java |    3 -
 .../gradle/internal/GradleBuildComparison.java     |    4 +-
 .../internal/GradleBuildOutcomeSetInferrer.java    |   10 +-
 .../internal/GradleBuildOutcomeSetTransformer.java |   12 +-
 .../outcome/internal/FileOutcomeIdentifier.java    |   41 +
 .../archive/GeneratedArchiveBuildOutcome.java      |   10 +-
 .../tooling/DefaultGradleBuildOutcome.java         |   46 +
 .../tooling/DefaultGradleFileBuildOutcome.java     |   42 +
 .../internal/tooling/DefaultProjectOutcomes.java   |   79 +
 .../tooling/ProjectOutcomesModelBuilder.java       |   67 +
 ...blishArtifactToFileBuildOutcomeTransformer.java |   97 +
 .../tooling/ToolingRegistrationAction.java         |   27 +
 .../GradleBuildComparisonResultHtmlRenderer.groovy |    5 +-
 ...le.configuration.project.ProjectConfigureAction |    1 +
 .../DefaultGradleBuildInvocationSpecTest.groovy    |    4 +-
 .../GradleBuildOutcomeSetInferrerTest.groovy       |    2 +-
 .../GradleBuildOutcomeSetTransformerTest.groovy    |   26 +-
 ...neratedArchiveBuildOutcomeComparatorTest.groovy |    8 +-
 ...rtifactToFileBuildOutcomeTransformerTest.groovy |   87 +
 subprojects/build-init/build-init.gradle           |   86 +
 .../plugins/BuildInitPluginIntegrationTest.groovy  |  204 +
 .../GroovyLibraryInitIntegrationTest.groovy        |   76 +
 .../plugins/JavaLibraryInitIntegrationTest.groovy  |   75 +
 .../plugins/MavenConversionIntegrationTest.groovy  |  343 ++
 .../plugins/ScalaLibraryInitIntegrationTest.groovy |   78 +
 .../plugins/WrapperPluginIntegrationTest.groovy    |   35 +
 .../plugins/fixtures/WrapperTestFixture.groovy     |   50 +
 .../WrapperPluginAutoApplyActionIntegTest.groovy   |   99 +
 .../enforcerplugin/pom.xml                         |    0
 .../enforcerplugin/src/main/java/Foo.java          |    0
 .../expandProperties/pom.xml                       |   27 +
 .../expandProperties/src/main/java/Foo.java        |   10 +
 .../expandProperties/src/test/java/FooTest.java    |   10 +
 .../flatmultimodule/webinar-api/pom.xml            |    0
 .../src/main/java/webinar/Demoable.java            |    0
 .../flatmultimodule/webinar-impl/pom.xml           |    0
 .../src/main/java/webinar/Webinar.java             |    0
 .../src/test/java/webinar/WebinarTest.java         |    0
 .../flatmultimodule/webinar-parent/pom.xml         |    0
 .../flatmultimodule/webinar-war/pom.xml            |    0
 .../webinar-war/src/main/webapp/WEB-INF/web.xml    |    0
 .../webinar-war/src/main/webapp/index.jsp          |    0
 .../mavenExtensions/pom.xml                        |   47 +
 .../mavenExtensions/test-core/pom.xml              |   22 +
 .../multiModule/pom.xml                            |    0
 .../multiModule/webinar-api/pom.xml                |    0
 .../src/main/java/webinar/Demoable.java            |    0
 .../multiModule/webinar-impl/pom.xml               |    0
 .../src/main/java/webinar/Webinar.java             |    0
 .../src/test/java/webinar/WebinarTest.java         |    0
 .../multiModule/webinar-war/pom.xml                |    0
 .../webinar-war/src/main/webapp/WEB-INF/web.xml    |    0
 .../webinar-war/src/main/webapp/index.jsp          |    0
 .../nested-parent/pom.xml                          |   21 +
 .../multiModuleWithNestedParent/pom.xml            |   22 +
 .../webinar-api/pom.xml                            |    0
 .../src/main/java/webinar/Demoable.java            |    0
 .../webinar-impl/pom.xml                           |    0
 .../src/main/java/webinar/Webinar.java             |    0
 .../src/test/java/webinar/WebinarTest.java         |    0
 .../webinar-war/pom.xml                            |    0
 .../webinar-war/src/main/webapp/WEB-INF/web.xml    |    0
 .../webinar-war/src/main/webapp/index.jsp          |    0
 .../multiModuleWithRemoteParent/pom.xml            |   44 +
 .../util-parent/pom.xml                            |   13 +
 .../webinar-api/pom.xml                            |    0
 .../src/main/java/webinar/Demoable.java            |    0
 .../webinar-impl/pom.xml                           |   32 +
 .../src/main/java/webinar/Webinar.java             |    0
 .../src/test/java/webinar/WebinarTest.java         |    0
 .../webinar-war/pom.xml                            |    0
 .../webinar-war/src/main/webapp/WEB-INF/web.xml    |    0
 .../webinar-war/src/main/webapp/index.jsp          |    0
 .../providedNotWar/pom.xml                         |   30 +
 .../remoteparent/pom.xml                           |   21 +
 .../remoteparent/src/main/java/Bar.java            |    7 +
 .../maven_home/m2_home/conf/settings.xml           |   13 +
 .../util/parent/util-parent/3/util-parent-3.pom    |   17 +
 .../singleModule/pom.xml                           |    0
 .../singleModule/src/main/java/Foo.java            |    0
 .../singleModule/src/test/java/FooTest.java        |    0
 .../MavenConversionIntegrationTest/testjar/pom.xml |    0
 .../testjar/src/main/java/Foo.java                 |    0
 .../testjar/src/test/java/FooTest.java             |    0
 .../org/gradle/api/tasks/wrapper/Wrapper.java      |  279 ++
 .../org/gradle/api/tasks/wrapper/package-info.java |    0
 .../buildinit/plugins/BuildInitPlugin.groovy       |   62 +
 .../gradle/buildinit/plugins/WrapperPlugin.groovy  |   34 +
 .../BasicTemplateBasedProjectInitDescriptor.java   |   31 +
 .../plugins/internal/BuildInitAutoApplyAction.java |   33 +
 .../plugins/internal/BuildInitException.java       |   25 +
 .../plugins/internal/BuildInitServices.java        |   44 +
 .../plugins/internal/BuildInitTypeIds.java         |   29 +
 .../internal/ConditionalTemplateOperation.groovy   |   38 +
 .../DefaultTemplateLibraryVersionProvider.groovy   |   31 +
 .../GroovyLibraryProjectInitDescriptor.java        |   43 +
 .../internal/JavaLibraryProjectInitDescriptor.java |   44 +
 .../LanguageLibraryProjectInitDescriptor.java      |   49 +
 .../internal/PomProjectInitDescriptor.groovy       |   47 +
 .../plugins/internal/ProjectInitDescriptor.groovy  |   20 +
 .../internal/ProjectLayoutSetupRegistry.groovy     |   52 +
 .../ProjectLayoutSetupRegistryFactory.groovy       |   63 +
 .../ScalaLibraryProjectInitDescriptor.java         |   47 +
 .../SimpleGlobalFilesBuildSettingsDescriptor.java  |   32 +
 .../internal/SimpleTemplateOperation.groovy        |   47 +
 .../TemplateBasedProjectInitDescriptor.java        |   34 +
 .../internal/TemplateLibraryVersionProvider.groovy |   21 +
 .../plugins/internal/TemplateOperation.groovy      |   21 +
 .../plugins/internal/TemplateOperationFactory.java |  101 +
 .../buildinit/plugins/internal/TemplateValue.java  |   67 +
 .../internal/WrapperPluginAutoApplyAction.groovy   |   32 +
 .../plugins/internal/maven/Maven2Gradle.groovy     |  526 +++
 .../internal/maven/MavenConversionException.java   |   29 +
 .../internal/maven/MavenProjectXmlWriter.java      |   58 +
 .../internal/maven/MavenProjectsCreator.java       |   96 +
 .../org/gradle/buildinit/tasks/InitBuild.groovy    |   73 +
 .../META-INF/gradle-plugins/build-init.properties  |    1 +
 .../META-INF/gradle-plugins/wrapper.properties     |   17 +
 ...le.configuration.project.ProjectConfigureAction |    2 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../tasks/templates/build.gradle.template          |   32 +
 .../groovylibrary/Library.groovy.template          |   11 +
 .../groovylibrary/LibraryTest.groovy.template      |   19 +
 .../templates/groovylibrary/build.gradle.template  |   28 +
 .../templates/javalibrary/Library.java.template    |   11 +
 .../javalibrary/LibraryTest.java.template          |   15 +
 .../templates/javalibrary/build.gradle.template    |   30 +
 .../templates/scalalibrary/Library.scala.template  |    9 +
 .../scalalibrary/LibrarySuite.scala.template       |   18 +
 .../templates/scalalibrary/build.gradle.template   |   29 +
 .../tasks/templates/settings.gradle.template       |   19 +
 .../org/gradle/api/tasks/wrapper/WrapperTest.java  |  161 +
 .../buildinit/plugins/BuildInitPluginSpec.groovy   |   77 +
 .../buildinit/plugins/WrapperPluginSpec.groovy     |   36 +
 .../internal/BuildInitAutoApplyActionSpec.groovy   |   72 +
 .../ConditionalTemplateOperationSpec.groovy        |   41 +
 ...LanguageLibraryProjectInitDescriptorSpec.groovy |   77 +
 .../ProjectLayoutSetupRegistryFactoryTest.groovy   |   50 +
 .../internal/ProjectLayoutSetupRegistrySpec.groovy |   61 +
 .../internal/SimpleTemplateOperationSpec.groovy    |   58 +
 .../TemplateBasedProjectInitDescriptorSpec.groovy  |   44 +
 .../internal/TemplateOperationFactorySpec.groovy   |   84 +
 .../plugins/internal/TemplateValueTest.groovy      |   48 +
 .../maven/MavenProjectXmlWriterTest.groovy         |   31 +
 .../internal/maven/MavenProjectsCreatorSpec.groovy |  117 +
 .../gradle/buildinit/tasks/InitBuildSpec.groovy    |   67 +
 subprojects/cli/cli.gradle                         |    2 +-
 .../gradle/cli/CommandLineArgumentException.java   |    2 -
 .../java/org/gradle/cli/CommandLineConverter.java  |    3 -
 .../java/org/gradle/cli/CommandLineOption.java     |   31 +-
 .../java/org/gradle/cli/CommandLineParser.java     |   36 +-
 .../java/org/gradle/cli/ParsedCommandLine.java     |    4 +
 .../org/gradle/cli/CommandLineParserTest.groovy    |  136 +-
 .../gradle/cli/ParsedCommandLineOptionSpec.groovy  |    3 -
 .../org/gradle/cli/ParsedCommandLineTest.groovy    |    3 -
 subprojects/code-quality/code-quality.gradle       |    2 +-
 .../quality/CheckstylePluginIntegrationTest.groovy |   24 +-
 .../quality/CodeNarcPluginIntegrationTest.groovy   |   36 +-
 .../CodeQualityPluginIntegrationTest.groovy        |   18 +-
 .../quality/FindBugsPluginIntegrationTest.groovy   |  182 +-
 .../quality/PmdPluginIntegrationTest.groovy        |   22 +-
 .../quality/PmdPluginVersionIntegrationTest.groovy |    4 +-
 .../internal/FindBugsSpecBuilderTest.groovy        |   36 +-
 .../api/plugins/quality/CheckstylePlugin.groovy    |   17 +-
 .../api/plugins/quality/CheckstyleReports.java     |    7 +-
 .../org/gradle/api/plugins/quality/CodeNarc.groovy |   22 +-
 .../api/plugins/quality/CodeNarcExtension.groovy   |   15 +
 .../api/plugins/quality/CodeNarcPlugin.groovy      |   24 +-
 .../api/plugins/quality/CodeNarcReports.java       |   11 +-
 .../api/plugins/quality/FindBugsPlugin.groovy      |   18 +-
 .../api/plugins/quality/FindBugsReports.java       |   27 +-
 .../api/plugins/quality/FindBugsXmlReport.java     |   46 +
 .../org/gradle/api/plugins/quality/JDepend.groovy  |    2 +-
 .../gradle/api/plugins/quality/JDependReports.java |    9 +-
 .../quality/JavaCodeQualityPluginConvention.groovy |    3 +-
 .../gradle/api/plugins/quality/PmdExtension.groovy |    1 +
 .../gradle/api/plugins/quality/PmdPlugin.groovy    |   25 +-
 .../org/gradle/api/plugins/quality/PmdReports.java |   10 +-
 .../internal/AbstractCodeQualityPlugin.groovy      |    4 +-
 .../quality/internal/FindBugsReportsImpl.java      |   27 +-
 .../internal/findbugs/FindBugsSpecBuilder.java     |   22 +-
 .../internal/findbugs/FindBugsWorkerManager.groovy |    3 +
 .../internal/findbugs/FindBugsWorkerServer.java    |    1 +
 .../internal/findbugs/FindBugsXmlReportImpl.java   |   39 +
 .../plugins/quality/CheckstylePluginTest.groovy    |   10 +-
 .../api/plugins/quality/CheckstyleTest.groovy      |    2 +-
 .../api/plugins/quality/CodeNarcPluginTest.groovy  |   37 +-
 .../plugins/quality/CodeQualityPluginTest.groovy   |   33 +-
 .../api/plugins/quality/FindBugsPluginTest.groovy  |   11 +-
 .../gradle/api/plugins/quality/FindBugsTest.groovy |    2 +-
 .../api/plugins/quality/JDependPluginTest.groovy   |   10 +-
 .../api/plugins/quality/PmdPluginTest.groovy       |   10 +-
 subprojects/core-impl/core-impl.gradle             |    9 +-
 .../ArtifactDeclarationIntegrationTest.groovy      |   38 +
 .../ArtifactDependenciesIntegrationTest.groovy     |   40 +-
 .../ArtifactOnlyResolutionIntegrationTest.groovy   |   86 -
 .../resolve/CacheResolveIntegrationTest.groovy     |   20 +-
 ...ModuleDependenciesResolveIntegrationTest.groovy |   15 +-
 ...adataRulesChangingModulesIntegrationTest.groovy |  170 +
 .../ComponentMetadataRulesIntegrationTest.groovy   |  118 +
 ...ponentMetadataRulesStatusIntegrationTest.groovy |   45 +
 .../DependencyNotationIntegrationSpec.groovy       |   39 +-
 .../DependencyResolveRulesIntegrationTest.groovy   |   64 +-
 .../DetachedConfigurationsIntegrationTest.groovy   |   62 +
 .../ExtendingConfigurationsIntegrationTest.groovy  |   60 +
 ...LibraryArtifactResolutionIntegrationTest.groovy |  105 +
 .../resolve/ForcedModulesIntegrationTest.groovy    |    5 +-
 .../JvmLibraryArtifactResolveTestFixture.groovy    |  214 +
 .../ProjectDependenciesIntegrationTest.groovy      |    5 +-
 .../ProjectDependencyResolveIntegrationTest.groovy |  132 +-
 .../ResolutionResultApiIntegrationTest.groovy      |   80 +
 ...ResolutionStrategySamplesIntegrationTest.groovy |    7 +-
 .../ResolveCrossVersionIntegrationTest.groovy      |   20 +-
 .../integtests/resolve/ResolveTestFixture.groovy   |  333 ++
 .../ResolvedConfigurationIntegrationTest.groovy    |    6 +-
 ...VersionConflictResolutionIntegrationTest.groovy |  240 +-
 ...actCacheReuseCrossVersionIntegrationTest.groovy |    3 -
 ...AliasedArtifactResolutionIntegrationTest.groovy |   43 +-
 .../CacheReuseCrossVersionIntegrationTest.groovy   |    6 +-
 .../CachedChangingModulesIntegrationTest.groovy    |   20 +-
 ...achedDependencyResolutionIntegrationTest.groovy |   69 +-
 .../CachedMissingModulesIntegrationTest.groovy     |   51 +-
 ...ependencyMetadataInMemoryIntegrationTest.groovy |  197 +
 ...coverFromBrokenResolutionIntegrationTest.groovy |   57 +-
 .../FileSystemResolverIntegrationTest.groovy       |   12 +-
 .../custom/IvySFtpResolverIntegrationTest.groovy   |    8 +-
 .../custom/IvyUrlResolverIntegrationTest.groovy    |  176 +-
 .../ivy/IvyBrokenDescriptorIntegrationTest.groovy  |  119 +
 .../IvyBrokenRemoteResolveIntegrationTest.groovy   |   56 +-
 ...angingModuleRemoteResolveIntegrationTest.groovy |  109 +-
 ...adataRulesChangingModulesIntegrationTest.groovy |   41 +
 ...IvyComponentMetadataRulesIntegrationTest.groovy |   42 +
 ...ponentMetadataRulesStatusIntegrationTest.groovy |   98 +
 ...CustomStatusLatestVersionIntegrationTest.groovy |  107 +
 .../ivy/IvyDescriptorResolveIntegrationTest.groovy |  181 +-
 .../IvyDescriptorValidationIntegrationTest.groovy  |   54 +
 ...amicRevisionRemoteResolveIntegrationTest.groovy |  879 ++--
 ...IvyDynamicRevisionResolveIntegrationTest.groovy |  249 +-
 .../ivy/IvyHttpRepoResolveIntegrationTest.groovy   |  108 +-
 ...LibraryArtifactResolutionIntegrationTest.groovy |  325 ++
 .../ivy/IvyModuleResolveIntegrationTest.groovy     |  223 +
 .../resolve/ivy/IvyResolveIntegrationTest.groovy   |  164 +-
 .../maven/BadPomFileResolveIntegrationTest.groovy  |  148 +-
 .../LegacyMavenRepoResolveIntegrationTest.groovy   |   21 +-
 .../MavenBrokenRemoteResolveIntegrationTest.groovy |  101 +
 ...adataRulesChangingModulesIntegrationTest.groovy |   70 +
 ...venComponentMetadataRulesIntegrationTest.groovy |   42 +
 ...ponentMetadataRulesStatusIntegrationTest.groovy |   65 +
 ...venCustomPackagingResolveIntegrationTest.groovy |   68 +
 .../MavenDependencyResolveIntegrationTest.groovy   |   37 +
 .../MavenDynamicResolveIntegrationTest.groovy      |   72 +-
 .../MavenHttpRepoResolveIntegrationTest.groovy     |  156 +-
 ...nJcenterDependencyResolveIntegrationTest.groovy |   72 +
 ...LibraryArtifactResolutionIntegrationTest.groovy |  321 ++
 .../maven/MavenLatestResolveIntegrationTest.groovy |   98 +
 .../MavenLocalRepoResolveIntegrationTest.groovy    |  193 +-
 .../MavenParentPomResolveIntegrationTest.groovy    |  306 +-
 .../MavenPomPackagingResolveIntegrationTest.groovy |  245 +-
 .../maven/MavenPomResolveIntegrationTest.groovy    |   65 +
 .../MavenProfileResolveIntegrationTest.groovy      |  218 +
 .../MavenSnapshotResolveIntegrationTest.groovy     |  141 +-
 .../canNestModules/projectWithNestedModules.gradle |    2 +-
 .../projectWithConflicts.gradle                    |    2 +-
 .../artifacts/ArtifactDependencyResolver.java      |    8 +-
 .../artifacts/ArtifactPublicationServices.java     |   24 +
 .../api/internal/artifacts/ArtifactPublisher.java  |   26 +
 .../internal/artifacts/ConfigurationResolver.java  |    3 -
 .../artifacts/DefaultArtifactIdentifier.java       |  107 +
 .../artifacts/DefaultDependencyFactory.java        |   13 +-
 .../DefaultDependencyManagementServices.java       |  444 +-
 .../artifacts/DefaultModuleVersionIdentifier.java  |   15 +
 .../artifacts/DefaultModuleVersionSelector.java    |    8 +-
 .../artifacts/DefaultProjectDependencyFactory.java |    3 -
 .../artifacts/DefaultResolvedArtifact.java         |   64 +-
 .../artifacts/DefaultResolvedDependency.java       |   17 +-
 .../DependencyManagementBuildScopeServices.java    |  284 ++
 .../DependencyManagementGlobalScopeServices.java   |   86 +
 .../api/internal/artifacts/DependencyServices.java |   33 +
 .../artifacts/ModuleMetadataProcessor.java         |   22 +
 .../ModuleVersionIdentifierSerializer.java         |   26 +-
 .../internal/artifacts/ModuleVersionPublisher.java |   28 +
 .../artifacts/ModuleVersionSelectorSerializer.java |   41 +
 .../internal/artifacts/PlexusLoggerAdapter.java    |    3 -
 .../artifacts/ResolvedConfigurationIdentifier.java |    6 +-
 .../ResolvedConfigurationIdentifierSerializer.java |   39 +
 .../api/internal/artifacts/ResolverResults.java    |   48 +-
 .../component/ComponentIdentifierFactory.java      |   24 +
 .../DefaultComponentIdentifierFactory.java         |   32 +
 .../DefaultModuleComponentIdentifier.java          |   98 +
 .../component/DefaultModuleComponentSelector.java  |  107 +
 .../DefaultProjectComponentIdentifier.java         |   69 +
 .../component/DefaultProjectComponentSelector.java |   82 +
 .../artifacts/configurations/Configurations.java   |    8 -
 .../configurations/ConfigurationsProvider.java     |    3 -
 .../configurations/DefaultConfiguration.java       |    6 +-
 .../DefaultConfigurationContainer.java             |   10 +-
 .../DetachedConfigurationsProvider.java            |    3 -
 .../artifacts/dsl/DefaultArtifactHandler.groovy    |    9 +-
 .../dsl/DefaultComponentMetadataHandler.java       |   47 +
 .../dsl/ModuleVersionSelectorParsers.java          |   17 +-
 .../artifacts/dsl/ParsedModuleStringNotation.java  |    3 -
 .../dsl/PublishArtifactNotationParserFactory.java  |   20 +-
 .../ivyservice/ArtifactResolveContext.java         |   21 +
 .../artifacts/ivyservice/ArtifactResolver.java     |   12 +-
 .../ivyservice/ArtifactSetResolveResult.java       |   32 +
 .../ivyservice/ArtifactTypeResolveContext.java     |   38 +
 .../ivyservice/BuildableArtifactResolveResult.java |    6 +-
 .../BuildableArtifactSetResolveResult.java         |   29 +
 .../BuildableComponentResolveResult.java           |   42 +
 .../BuildableModuleVersionResolveResult.java       |   54 -
 .../internal/artifacts/ivyservice/CacheLayout.java |   59 +
 .../CacheLockingArtifactDependencyResolver.java    |   13 +-
 .../artifacts/ivyservice/CacheLockingManager.java  |   16 +-
 .../ivyservice/ComponentResolveResult.java         |   42 +
 .../ivyservice/ConfigurationResolveContext.java    |   41 +
 .../ivyservice/ContextualArtifactResolver.java     |   58 +
 .../DefaultBuildableArtifactResolveResult.java     |    4 +-
 .../DefaultBuildableArtifactSetResolveResult.java  |   64 +
 .../DefaultBuildableComponentResolveResult.java    |   73 +
 ...DefaultBuildableModuleVersionResolveResult.java |   95 -
 .../ivyservice/DefaultCacheLockingManager.java     |   35 +-
 .../ivyservice/DefaultConfigurationResolver.java   |   11 +-
 .../DefaultDependencyResolveDetails.java           |   11 +-
 .../ivyservice/DefaultIvyContextManager.java       |  104 +
 .../ivyservice/DefaultIvyDependencyPublisher.java  |  147 +-
 .../artifacts/ivyservice/DefaultIvyFactory.java    |   38 -
 .../ivyservice/DefaultLenientConfiguration.java    |  113 +-
 .../ivyservice/DefaultResolvedConfiguration.java   |   13 +-
 .../ivyservice/DefaultSettingsConverter.java       |   70 -
 .../ivyservice/DefaultUnresolvedDependency.java    |    3 +-
 .../ivyservice/DependencyToModuleResolver.java     |   28 -
 .../DependencyToModuleVersionIdResolver.java       |    2 +-
 .../DependencyToModuleVersionResolver.java         |   28 +
 .../ErrorHandlingArtifactDependencyResolver.java   |  120 +-
 .../ivyservice/IvyBackedArtifactPublisher.java     |   80 +-
 .../artifacts/ivyservice/IvyContextManager.java    |   39 +
 .../ivyservice/IvyDependencyPublisher.java         |   16 +-
 .../internal/artifacts/ivyservice/IvyFactory.java  |   26 -
 .../artifacts/ivyservice/IvyLoggingAdaper.java     |   18 +-
 .../ivyservice/IvyModuleDescriptorWriter.java      |    0
 .../IvyResolverBackedModuleVersionPublisher.java   |   67 +
 .../artifacts/ivyservice/IvySettingsFactory.java   |   40 -
 .../api/internal/artifacts/ivyservice/IvyUtil.java |   51 +-
 .../ivyservice/IvyXmlModuleDescriptorWriter.java   |  620 +--
 .../ivyservice/LocalComponentFactory.java          |   26 +
 .../ivyservice/ModuleToModuleVersionResolver.java  |   29 +
 .../ivyservice/ModuleVersionIdResolveResult.java   |    6 +-
 .../ivyservice/ModuleVersionNotFoundException.java |   10 +-
 .../ivyservice/ModuleVersionResolveException.java  |   24 +-
 .../ivyservice/ModuleVersionResolveResult.java     |   49 -
 .../ivyservice/ResolvedArtifactFactory.java        |   46 -
 .../ivyservice/ResolvedConfigurationBuilder.java   |   31 -
 .../SelfResolvingDependencyResolver.java           |   10 +-
 .../artifacts/ivyservice/SettingsConverter.java    |   34 -
 ...cuitEmptyConfigsArtifactDependencyResolver.java |   24 +-
 .../SubstitutedModuleVersionIdResolveResult.java   |   13 +-
 .../VersionForcingDependencyToModuleResolver.java  |    8 +-
 .../clientmodule/ClientModuleResolver.java         |   28 +-
 .../DefaultCachedModuleResolution.java             |   45 -
 .../DefaultCachedModuleVersionList.java            |   37 +
 .../DefaultResolvedModuleVersion.java              |   10 +-
 .../dynamicversions/ModuleResolutionCache.java     |   35 -
 .../ModuleResolutionCacheEntry.java                |   28 -
 .../dynamicversions/ModuleVersionsCache.java       |   33 +
 .../dynamicversions/ModuleVersionsCacheEntry.java  |   28 +
 .../SingleFileBackedModuleResolutionCache.java     |  139 -
 .../SingleFileBackedModuleVersionsCache.java       |  140 +
 .../AbstractDependencyResolverAdapter.java         |   55 -
 .../ivyresolve/ArtifactNotFoundException.java      |   14 +-
 .../ivyresolve/ArtifactResolveException.java       |   40 +-
 .../ivyresolve/BuildableModuleVersionMetaData.java |   78 -
 ...uildableModuleVersionMetaDataResolveResult.java |   72 +
 ...ildableModuleVersionSelectionResolveResult.java |   60 +
 .../CacheLockingModuleVersionRepository.java       |   39 +-
 .../ivyresolve/CachingModuleVersionRepository.java |  234 +-
 .../ivyresolve/ChangingModuleDetector.java         |   18 +-
 .../ConfiguredModuleVersionRepository.java         |   23 +
 .../DefaultBuildableModuleVersionMetaData.java     |  137 -
 ...uildableModuleVersionMetaDataResolveResult.java |   95 +
 ...ildableModuleVersionSelectionResolveResult.java |   58 +
 .../ivyresolve/DefaultDependencyMetaData.java      |   88 -
 .../ivyservice/ivyresolve/DefaultIvyAdapter.java   |   37 -
 .../ivyresolve/DefaultModuleVersionListing.java    |   94 +
 .../ivyresolve/DelegatingDependencyResolver.java   |  149 -
 .../ivyservice/ivyresolve/DependencyMetaData.java  |   43 -
 .../ivyresolve/DependencyResolverIdentifier.java   |   44 +-
 .../ivyresolve/ErrorHandlingArtifactResolver.java  |   47 +
 .../ExternalResourceResolverAdapter.java           |   47 -
 .../ivyservice/ivyresolve/IvyAdapter.java          |   25 -
 .../IvyAwareModuleVersionRepository.java           |    6 +-
 .../ivyservice/ivyresolve/IvyContextualiser.java   |   36 +-
 .../ivyresolve/IvyDependencyResolverAdapter.java   |   90 -
 .../IvyDynamicResolveModuleVersionRepository.java  |   36 +-
 .../ivyresolve/LazyDependencyToModuleResolver.java |   44 +-
 .../LocalArtifactsModuleVersionRepository.java     |   31 +
 .../LocalAwareModuleVersionRepository.java         |   19 +-
 .../ivyresolve/LocalModuleVersionRepository.java   |   33 +-
 .../ivyresolve/LoopbackDependencyResolver.java     |  120 +-
 .../ivyservice/ivyresolve/ModuleSource.java        |    8 +-
 .../ivyresolve/ModuleVersionListing.java           |   30 +
 .../ivyresolve/ModuleVersionMetaData.java          |   34 -
 .../ivyresolve/ModuleVersionRepository.java        |   18 +-
 .../ivyservice/ivyresolve/RepositoryChain.java     |   24 +
 .../RepositoryChainArtifactResolver.java           |   64 +
 .../RepositoryChainDependencyResolver.java         |  297 ++
 .../RepositoryChainModuleResolution.java           |   38 +
 .../ivyresolve/RepositoryChainModuleSource.java    |   34 +
 .../ivyservice/ivyresolve/ResolveIvyFactory.java   |  172 +-
 .../ivyresolve/RestrictedDependencyResolver.java   |   36 -
 .../StartParameterResolutionOverride.java          |   32 +-
 .../ivyservice/ivyresolve/UserResolverChain.java   |  206 +-
 .../ivyservice/ivyresolve/VersionInfo.java         |   39 +
 .../artifacts/ivyservice/ivyresolve/Versioned.java |   20 +
 .../memcache/CachedModuleVersionResult.java        |   55 +
 .../ivyresolve/memcache/CachedRepository.java      |   90 +
 .../memcache/DependencyMetadataCache.java          |  123 +
 .../memcache/DependencyMetadataCacheStats.java     |   29 +
 .../memcache/InMemoryDependencyMetadataCache.java  |   62 +
 .../parser/AbstractModuleDescriptorParser.java     |   55 +
 .../ivyresolve/parser/DescriptorParseContext.java  |   27 +
 .../parser/DisconnectedDescriptorParseContext.java |   37 +
 .../DisconnectedIvyXmlModuleDescriptorParser.java  |   65 +
 .../parser/DisconnectedParserSettings.java         |  110 -
 .../DownloadedIvyModuleDescriptorParser.java       |   17 +-
 .../parser/GradlePomModuleDescriptorBuilder.java   |  325 +-
 .../parser/GradlePomModuleDescriptorParser.java    |  392 +-
 .../parser/IvyXmlModuleDescriptorParser.java       |  583 ++-
 .../ivyresolve/parser/MetaDataParseException.java  |   32 +
 .../ivyresolve/parser/MetaDataParser.java          |   29 +
 .../parser/ModuleScopedParserSettings.java         |  102 -
 .../ivyresolve/parser/ParserRegistry.java          |   40 -
 .../ivyservice/ivyresolve/parser/PomParent.java    |   54 +
 .../ivyservice/ivyresolve/parser/PomReader.java    |  776 ++++
 .../ivyresolve/parser/RootPomParent.java           |   46 +
 .../UnresolvedDependencyVersionException.java      |   24 +
 .../ivyresolve/parser/data/MavenDependencyKey.java |   95 +
 .../ivyresolve/parser/data/PomDependencyMgt.java   |   32 +
 .../ivyresolve/parser/data/PomProfile.java         |   29 +
 .../ivyresolve/strategy/ChainVersionMatcher.java   |   64 +
 .../ivyresolve/strategy/ExactVersionMatcher.java   |  113 +
 .../ivyresolve/strategy/LatestStrategy.java        |   42 +
 .../ivyresolve/strategy/LatestVersionMatcher.java  |   47 +
 .../ivyresolve/strategy/LatestVersionStrategy.java |   65 +
 .../ivyresolve/strategy/ResolverStrategy.java      |   53 +
 .../ivyresolve/strategy/SubVersionMatcher.java     |   59 +
 .../ivyresolve/strategy/VersionMatcher.java        |   67 +
 .../ivyresolve/strategy/VersionRangeMatcher.java   |  180 +
 .../CachedModuleDescriptorParseContext.java        |   38 +
 .../modulecache/DefaultCachedMetaData.java         |   71 +
 .../modulecache/DefaultCachedModuleDescriptor.java |   70 -
 .../modulecache/DefaultModuleArtifactsCache.java   |  182 +
 .../modulecache/DefaultModuleDescriptorCache.java  |  188 -
 .../modulecache/DefaultModuleMetaDataCache.java    |  176 +
 .../modulecache/ModuleArtifactsCache.java          |   37 +
 .../modulecache/ModuleDescriptorCache.java         |   46 -
 .../modulecache/ModuleDescriptorCacheEntry.java    |    4 +-
 .../modulecache/ModuleDescriptorStore.java         |   43 +-
 .../modulecache/ModuleMetaDataCache.java           |   47 +
 .../ArtifactsExtraAttributesStrategy.java          |   27 -
 .../ArtifactsToModuleDescriptorConverter.java      |   26 -
 .../ConfigurationsToArtifactsConverter.java        |   23 +
 .../ConfigurationsToModuleDescriptorConverter.java |    3 -
 ...efaultArtifactsToModuleDescriptorConverter.java |   76 -
 .../DefaultConfigurationsToArtifactsConverter.java |   60 +
 ...tConfigurationsToModuleDescriptorConverter.java |    3 -
 .../DefaultExcludeRuleConverter.java               |    7 +-
 .../DefaultModuleDescriptorFactory.java            |   24 +-
 .../moduleconverter/ExcludeRuleConverter.java      |    3 -
 .../moduleconverter/ModuleDescriptorFactory.java   |    3 -
 .../PublishLocalComponentFactory.java              |   47 +
 .../PublishModuleDescriptorConverter.java          |   59 -
 .../ResolveLocalComponentFactory.java              |   55 +
 .../ResolveModuleDescriptorConverter.java          |   64 -
 .../AbstractIvyDependencyDescriptorFactory.java    |    3 -
 .../ClientModuleDependencyDescriptor.java          |    7 +-
 ...ClientModuleIvyDependencyDescriptorFactory.java |   14 +-
 .../dependencies/ClientModuleMetaDataFactory.java  |   26 +
 .../DefaultClientModuleMetaDataFactory.java        |   54 +
 ...ultDependenciesToModuleDescriptorConverter.java |    3 -
 .../DefaultDependencyDescriptorFactory.java        |    3 -
 ...aultModuleDescriptorFactoryForClientModule.java |   60 -
 .../DependenciesToModuleDescriptorConverter.java   |    3 -
 .../dependencies/DependencyDescriptorFactory.java  |    3 -
 ...ternalModuleIvyDependencyDescriptorFactory.java |    3 -
 .../ModuleDescriptorFactoryForClientModule.java    |   29 -
 .../ProjectIvyDependencyDescriptorFactory.java     |    9 +-
 .../DefaultProjectComponentRegistry.java           |   36 +
 .../DefaultProjectModuleRegistry.java              |   53 -
 .../projectmodule/DefaultProjectPublication.java   |   40 +
 .../DefaultProjectPublicationRegistry.java         |   33 +
 .../projectmodule/ProjectArtifactResolver.java     |   65 +
 .../projectmodule/ProjectComponentRegistry.java    |   22 +
 .../projectmodule/ProjectDependencyResolver.java   |   56 +-
 .../projectmodule/ProjectModuleRegistry.java       |   26 -
 .../projectmodule/ProjectPublication.java          |   28 +
 .../projectmodule/ProjectPublicationRegistry.java  |   29 +
 .../resolutionstrategy/DefaultCachePolicy.java     |   22 +-
 .../DefaultExternalResourceCachePolicy.java        |   22 +
 .../DefaultResolutionStrategy.java                 |    9 +-
 .../ExternalResourceCachePolicy.java               |   22 +
 .../LatestConflictResolution.java                  |    2 -
 .../ModuleForcingResolveRule.java                  |    3 -
 .../StrictConflictResolution.java                  |    2 -
 .../resolveengine/DefaultDependencyResolver.java   |  111 +-
 .../DefaultDependencyToConfigurationResolver.java  |   81 +
 .../resolveengine/DependencyGraphBuilder.java      |  634 +--
 .../DependencyToConfigurationResolver.java         |   30 +
 .../LatestModuleConflictResolver.java              |   19 +-
 .../resolveengine/ModuleConflictResolver.java      |    2 +-
 .../resolveengine/ModuleRevisionResolveState.java  |   11 +-
 .../resolveengine/ModuleVersionSpec.java           |    4 +-
 .../resolveengine/StrictConflictResolver.java      |    2 +-
 .../VersionSelectionReasonResolver.java            |    7 +-
 .../DefaultResolvedConfigurationBuilder.java       |  151 +
 .../DefaultTransientConfigurationResults.java      |   45 +
 .../oldresult/ResolvedConfigurationBuilder.java    |   44 +
 .../oldresult/ResolvedConfigurationResults.java    |   32 +
 .../oldresult/ResolvedContentsMapping.java         |   28 +
 .../oldresult/TransientConfigurationResults.java   |   32 +
 .../TransientConfigurationResultsBuilder.java      |  186 +
 .../result/CachingDependencyResultFactory.java     |   16 +-
 .../result/ComponentIdentifierSerializer.java      |   76 +
 .../result/ComponentSelectionReasonSerializer.java |   59 +
 .../result/ComponentSelectorSerializer.java        |   76 +
 .../result/DefaultInternalDependencyResult.java    |   59 +
 .../result/DefaultModuleVersionSelection.java      |   45 +
 .../result/DefaultResolutionResultBuilder.java     |   85 +
 .../result/InternalDependencyResult.java           |   18 +-
 .../result/InternalDependencyResultSerializer.java |   62 +
 .../result/ModuleVersionSelection.java             |   10 +-
 .../result/ModuleVersionSelectionSerializer.java   |   47 +
 .../result/ResolutionResultBuilder.java            |   63 +-
 .../result/ResolvedConfigurationListener.java      |   30 -
 .../result/StreamingResolutionResultBuilder.java   |  200 +
 .../result/VersionSelectionReasons.java            |   29 +-
 .../resolveengine/store/CachedStoreFactory.java    |  102 +
 .../resolveengine/store/DefaultBinaryStore.java    |  147 +
 .../store/ResolutionResultsStoreFactory.java       |  120 +
 .../ivyservice/resolveengine/store/StoreSet.java   |   29 +
 .../AbstractModuleDescriptorBackedMetaData.java    |  233 +
 .../BuildableModuleVersionPublishMetaData.java     |   27 +
 .../metadata/ComponentArtifactIdentifier.java      |   34 +
 .../metadata/ComponentArtifactMetaData.java        |   39 +
 .../artifacts/metadata/ComponentMetaData.java      |   85 +
 .../artifacts/metadata/ConfigurationMetaData.java  |   41 +
 .../metadata/DefaultDependencyMetaData.java        |  122 +
 .../artifacts/metadata/DefaultIvyArtifactName.java |   97 +
 .../metadata/DefaultLocalArtifactIdentifier.java   |   69 +
 .../metadata/DefaultLocalComponentMetaData.java    |  157 +
 .../DefaultModuleVersionArtifactIdentifier.java    |   79 +
 .../DefaultModuleVersionArtifactMetaData.java      |   63 +
 .../DefaultModuleVersionPublishMetaData.java       |   84 +
 .../artifacts/metadata/DependencyMetaData.java     |   65 +
 .../artifacts/metadata/IvyArtifactName.java        |   37 +
 .../artifacts/metadata/LocalArtifactMetaData.java  |   23 +
 .../artifacts/metadata/LocalComponentMetaData.java |   40 +
 .../metadata/ModuleDescriptorAdapter.java          |  112 +
 .../metadata/ModuleVersionArtifactIdentifier.java  |   29 +
 .../ModuleVersionArtifactIdentifierSerializer.java |   51 +
 .../metadata/ModuleVersionArtifactMetaData.java    |   38 +
 .../ModuleVersionArtifactPublishMetaData.java      |   35 +
 .../artifacts/metadata/ModuleVersionMetaData.java  |   41 +
 .../metadata/ModuleVersionPublishMetaData.java     |   28 +
 .../metadata/MutableLocalComponentMetaData.java    |   28 +
 .../metadata/MutableModuleVersionMetaData.java     |   34 +
 .../CannotLocateLocalMavenRepositoryException.java |    2 +-
 .../DefaultLocalMavenRepositoryLocator.java        |    7 +-
 .../mvnsettings/DefaultMavenFileLocations.java     |    3 -
 .../mvnsettings/DefaultMavenSettingsProvider.java  |    3 -
 .../CustomResolverArtifactRepository.java          |   72 -
 .../repositories/DefaultBaseRepositoryFactory.java |   56 +-
 .../DefaultFlatDirArtifactRepository.java          |   43 +-
 .../repositories/DefaultIvyArtifactRepository.java |   38 +-
 .../DefaultMavenArtifactRepository.java            |   38 +-
 .../DefaultMavenLocalArtifactRepository.java       |   50 +
 .../FixedResolverArtifactRepository.java           |   57 -
 .../repositories/LegacyDependencyResolver.java     |   44 +-
 .../repositories/LegacyMavenResolver.java          |    5 +-
 .../repositories/PublicationAwareRepository.java   |   23 +
 .../repositories/ResolutionAwareRepository.java    |    7 +-
 .../AbstractRepositoryCacheManager.java            |   86 -
 .../DownloadingRepositoryArtifactCache.java        |   73 +
 .../DownloadingRepositoryCacheManager.java         |  164 -
 .../EnhancedArtifactDownloadReport.java            |   38 -
 .../LocalFileRepositoryArtifactCache.java          |   43 +
 .../LocalFileRepositoryCacheManager.java           |   88 -
 .../cachemanager/RepositoryArtifactCache.java      |   45 +
 .../repositories/layout/MavenRepositoryLayout.java |    2 +-
 .../legacy/AbstractRepositoryCacheManager.java     |   85 +
 .../legacy/CustomIvyResolverRepositoryFactory.java |   41 +
 .../legacy/CustomResolverArtifactRepository.java   |   72 +
 .../legacy/DownloadingRepositoryCacheManager.java  |  161 +
 .../legacy/EnhancedArtifactDownloadReport.java     |   38 +
 .../legacy/FixedResolverArtifactRepository.java    |   60 +
 .../legacy/IvyDependencyResolverAdapter.java       |  202 +
 .../LegacyDependencyResolverRepositoryFactory.java |   24 +
 .../legacy/LegacyResolverParserSettings.java       |   98 +
 .../legacy/LocalFileRepositoryCacheManager.java    |   88 +
 .../repositories/resolver/AbstractVersionList.java |   40 +-
 .../resolver/ChainedVersionLister.java             |   20 +-
 .../resolver/ComponentMetadataDetailsAdapter.java  |   58 +
 .../repositories/resolver/DefaultVersionList.java  |   34 +-
 .../resolver/ExternalResourceResolver.java         |  913 ++--
 ...rnalResourceResolverDescriptorParseContext.java |   72 +
 .../repositories/resolver/IvyResolver.java         |   55 +-
 .../repositories/resolver/IvyResourcePattern.java  |   37 +-
 .../repositories/resolver/M2ResourcePattern.java   |   29 +-
 .../repositories/resolver/MavenLocalResolver.java  |   57 +
 .../repositories/resolver/MavenMetadataLoader.java |   37 +-
 .../repositories/resolver/MavenResolver.java       |  134 +-
 .../repositories/resolver/MavenVersionLister.java  |   15 +-
 .../resolver/PatternBasedResolver.java             |    4 +-
 .../repositories/resolver/ResourcePattern.java     |   16 +-
 .../resolver/ResourceVersionLister.java            |   21 +-
 .../VerifyingExternalResourceDownloader.java       |   86 +
 .../repositories/resolver/VersionList.java         |   47 +-
 .../repositories/resolver/VersionLister.java       |    6 +-
 .../transport/RepositoryTransportFactory.java      |   18 +-
 .../resolution/AbstractSoftwareArtifact.java       |   51 +
 .../resolution/AbstractSoftwareComponent.java      |   49 +
 .../resolution/ComponentMetaDataArtifact.java      |   21 +
 .../resolution/DefaultArtifactResolutionQuery.java |  156 +
 .../DefaultArtifactResolutionQueryFactory.java     |   46 +
 .../DefaultArtifactResolutionQueryResult.java      |   46 +
 .../artifacts/resolution/DefaultJvmLibrary.java    |   45 +
 .../DefaultJvmLibraryJavadocArtifact.java          |   31 +
 .../DefaultJvmLibrarySourcesArtifact.java          |   31 +
 .../DefaultUnresolvedSoftwareComponent.java        |   37 +
 .../resolution/IvyDescriptorArtifact.java          |   21 +
 .../artifacts/resolution/MavenPomArtifact.java     |   22 +
 .../artifacts/result/AbstractDependencyResult.java |   17 +-
 .../artifacts/result/DefaultResolutionResult.java  |   42 +-
 .../result/DefaultResolvedComponentResult.java     |   82 +
 .../result/DefaultResolvedDependencyResult.java    |   13 +-
 .../result/DefaultResolvedModuleVersionResult.java |   81 -
 .../result/DefaultUnresolvedDependencyResult.java  |   23 +-
 .../externalresource/AbstractExternalResource.java |   24 +-
 .../DefaultLocallyAvailableExternalResource.java   |   53 +
 .../externalresource/ExternalResource.java         |   60 +-
 .../LocalFileStandInExternalResource.java          |    4 +-
 .../LocallyAvailableExternalResource.java          |   34 +-
 .../externalresource/UrlExternalResource.java      |   65 +
 .../cached/ByUrlCachedExternalResourceIndex.java   |    6 +-
 .../cached/CachedExternalResource.java             |    8 -
 .../cached/DefaultCachedExternalResource.java      |   15 -
 .../cached/DefaultCachedExternalResourceIndex.java |    6 +-
 .../externalresource/ivy/AbstractCachedIndex.java  |    6 +-
 .../ArtifactAtRepositoryCachedArtifactIndex.java   |   62 +-
 .../ivy/ArtifactAtRepositoryKey.java               |   31 +-
 .../CompositeLocallyAvailableResourceFinder.java   |    3 +-
 .../local/DefaultLocallyAvailableResource.java     |   65 -
 .../LazyLocallyAvailableResourceCandidates.java    |    6 +-
 .../local/LocallyAvailableResource.java            |   31 -
 .../local/LocallyAvailableResourceCandidates.java  |    3 +-
 .../local/LocallyAvailableResourceFinder.java      |    2 +-
 ...leResourceFinderSearchableFileStoreAdapter.java |   10 +-
 .../ivy/LocallyAvailableResourceFinderFactory.java |   81 +-
 ...PatternBasedLocallyAvailableResourceFinder.java |   24 +-
 .../metadata/DefaultExternalResourceMetaData.java  |    2 +-
 .../metadata/ExternalResourceMetaData.java         |    2 +-
 .../DefaultCacheAwareExternalResourceAccessor.java |   22 +-
 .../transfer/ExternalResourceAccessor.java         |    2 +-
 .../ProgressLoggingExternalResourceAccessor.java   |   17 +-
 .../DefaultExternalResourceRepository.java         |    4 +-
 .../transport/file/FileResourceConnector.java      |   13 +-
 .../transport/file/FileTransport.java              |    6 +-
 .../http/ApacheDirectoryListingParser.java         |    9 +-
 .../transport/http/HttpRequestException.java       |    2 +-
 .../transport/http/HttpResourceAccessor.java       |    2 +-
 .../transport/http/HttpResourceLister.java         |   33 +-
 .../transport/http/HttpResponseResource.java       |    2 +-
 .../transport/http/HttpTransport.java              |   15 +-
 .../JavaSystemPropertiesHttpProxySettings.java     |    7 +-
 .../filestore/ivy/ArtifactIdentifierFileStore.java |   44 +
 .../filestore/ivy/ArtifactRevisionIdFileStore.java |   46 -
 .../ClientModuleNotationParserFactory.java         |   10 +-
 .../DependencyClassPathNotationParser.java         |    8 +-
 .../notations/DependencyFilesNotationParser.java   |    8 +-
 .../notations/DependencyMapNotationParser.java     |    9 +-
 .../notations/DependencyNotationParser.java        |   14 +-
 .../notations/DependencyProjectNotationParser.java |    5 +-
 .../notations/DependencyStringNotationParser.java  |    5 +-
 .../notations/ProjectDependencyFactory.java        |    7 +-
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../gradle/api/artifacts/ArtifactsTestUtils.java   |   62 -
 .../artifacts/DefaultArtifactIdentifierTest.groovy |   46 +
 .../DefaultDependencyManagementServicesTest.groovy |  119 +-
 .../DefaultModuleVersionSelectorTest.groovy        |   16 +-
 .../artifacts/DefaultResolvedArtifactTest.groovy   |   53 +-
 .../artifacts/DefaultResolvedDependencySpec.groovy |    2 +-
 .../artifacts/DefaultResolvedDependencyTest.java   |   70 +-
 ...pendencyManagementBuildScopeServicesTest.groovy |   28 +
 ...endencyManagementGlobalScopeServicesTest.groovy |   31 +
 .../ModuleVersionSelectorSerializerTest.groovy     |   33 +
 ...vedConfigurationIdentifierSerializerTest.groovy |   37 +
 .../ResolvedConfigurationIdentifierSpec.groovy     |   14 +-
 .../internal/artifacts/ResolverResultsSpec.groovy  |    9 +-
 .../DefaultComponentIdentifierFactoryTest.groovy   |   53 +
 .../DefaultModuleComponentIdentifierTest.groovy    |   81 +
 .../DefaultModuleComponentSelectorTest.groovy      |  117 +
 .../DefaultProjectComponentIdentifierTest.groovy   |   58 +
 .../DefaultProjectComponentSelectorTest.groovy     |   91 +
 .../configurations/ConfigurationsTest.java         |    8 -
 .../DefaultConfigurationContainerSpec.groovy       |    2 +-
 .../DefaultConfigurationContainerTest.groovy       |   33 +-
 .../configurations/DefaultConfigurationSpec.groovy |    8 +-
 .../configurations/DefaultConfigurationTest.java   |   16 +-
 .../internal/artifacts/dsl/ArtifactFileTest.groovy |    3 -
 .../dsl/DefaultArtifactHandlerTest.groovy          |   12 +-
 .../dsl/DefaultComponentMetadataHandlerTest.groovy |   42 +
 .../dsl/ModuleVersionSelectorParsersTest.groovy    |    3 -
 ...PublishArtifactNotationParserFactoryTest.groovy |   23 +-
 .../artifacts/ivyservice/CacheLayoutTest.groovy    |   54 +
 ...cheLockingArtifactDependencyResolverTest.groovy |   13 +-
 ...efaultBuildableArtifactResolveResultTest.groovy |    5 +-
 ...ultBuildableArtifactSetResolveResultTest.groovy |   75 +
 ...faultBuildableComponentResolveResultTest.groovy |  109 +
 ...tBuildableModuleVersionResolveResultTest.groovy |  148 -
 .../DefaultCacheLockingManagerTest.groovy          |   74 +
 .../DefaultDependencyResolveDetailsSpec.groovy     |    5 +-
 .../ivyservice/DefaultIvyContextManagerTest.groovy |  225 +
 .../ivyservice/DefaultIvyFactoryTest.groovy        |   40 -
 .../ivyservice/DefaultSettingsConverterTest.groovy |  114 -
 .../DefaultUnresolvedDependencySpec.groovy         |    3 -
 ...orHandlingArtifactDependencyResolverTest.groovy |   88 +-
 .../ivyservice/IvyBackedArtifactPublisherTest.java |  173 -
 .../ivyservice/IvySettingsFactoryTest.groovy       |   37 -
 .../artifacts/ivyservice/IvyUtilTest.groovy        |    6 +-
 .../IvyXmlModuleDescriptorWriterTest.groovy        |   78 +-
 .../ModuleVersionNotFoundExceptionTest.groovy      |   18 +-
 .../ModuleVersionResolveExceptionTest.groovy       |   13 +-
 .../ivyservice/ResolvedArtifactFactoryTest.groovy  |   54 -
 .../SelfResolvingDependencyResolverTest.groovy     |   16 +-
 ...ptyConfigsArtifactDependencyResolverSpec.groovy |   47 +-
 ...ionForcingDependencyToModuleResolverSpec.groovy |    8 +-
 .../clientmodule/ClientModuleResolverTest.groovy   |   39 +-
 .../CachingModuleVersionRepositoryTest.groovy      |  109 +-
 ...leModuleVersionMetaDataResolveResultTest.groovy |  174 +
 ...efaultBuildableModuleVersionMetaDataTest.groovy |  244 --
 .../DefaultDependencyMetaDataTest.groovy           |   77 -
 .../DependencyResolverIdentifierTest.groovy        |   15 +-
 .../ErrorHandlingArtifactResolverTest.groovy       |   82 +
 ...ynamicResolveModuleVersionRepositoryTest.groovy |   18 +-
 .../LazyDependencyToModuleResolverTest.groovy      |  109 +-
 .../RepositoryChainDependencyResolverTest.groovy   |  639 +++
 .../ivyresolve/UserResolverChainTest.groovy        |  588 ---
 .../memcache/CachedModuleVersionResultTest.groovy  |   99 +
 .../memcache/CachedRepositoryTest.groovy           |  178 +
 .../memcache/DependencyMetadataCacheTest.groovy    |  225 +
 .../InMemoryDependencyMetadataCacheTest.groovy     |   76 +
 ...tractGradlePomModuleDescriptorParserTest.groovy |   76 +
 .../ivyresolve/parser/AbstractPomReaderTest.groovy |   71 +
 ...onnectedIvyXmlModuleDescriptorParserTest.groovy |   80 +
 .../DownloadedIvyModuleDescriptorParserTest.groovy |   14 +-
 ...adlePomModuleDescriptorParserProfileTest.groovy |  827 ++++
 .../GradlePomModuleDescriptorParserTest.groovy     | 2028 ++++++++-
 .../parser/IvyXmlModuleDescriptorParserTest.groovy |  451 +-
 .../ivyresolve/parser/PomReaderProfileTest.groovy  | 1566 +++++++
 .../ivyresolve/parser/PomReaderTest.groovy         |  818 ++++
 .../parser/data/MavenDependencyKeyTest.groovy      |   51 +
 .../strategy/ChainVersionMatcherTest.groovy        |  129 +
 .../strategy/ExactVersionMatcherTest.groovy        |  181 +
 .../strategy/LatestVersionMatcherTest.groovy       |   83 +
 .../strategy/LatestVersionStrategyTest.groovy      |   78 +
 .../strategy/SubVersionMatcherTest.groovy          |   84 +
 .../strategy/VersionRangeMatcherTest.groovy        |  208 +
 .../modulecache/ModuleDescriptorStoreTest.groovy   |   12 +-
 ...ltArtifactsToModuleDescriptorConverterTest.java |  129 -
 ...ltConfigurationsToArtifactsConverterTest.groovy |  103 +
 ...figurationsToModuleDescriptorConverterTest.java |   14 +-
 .../DefaultExcludeRuleConverterTest.java           |    3 -
 .../DefaultModuleDescriptorFactoryTest.groovy      |   38 +-
 .../moduleconverter/IvyConverterTestUtil.java      |    3 -
 .../PublishLocalComponentFactoryTest.groovy        |   56 +
 .../PublishModuleDescriptorConverterTest.groovy    |   54 -
 .../ResolveLocalComponentFactoryTest.groovy        |   91 +
 .../ResolveModuleDescriptorConverterTest.groovy    |   59 -
 ...actDependencyDescriptorFactoryInternalTest.java |   11 +-
 ...lientModuleDependencyDescriptorFactoryTest.java |   92 -
 ...ntModuleIvyDependencyDescriptorFactoryTest.java |   89 +
 .../DefaultClientModuleMetaDataFactoryTest.java    |   89 +
 ...ependenciesToModuleDescriptorConverterTest.java |    7 +-
 ...ModuleDescriptorFactoryForClientModuleTest.java |   89 -
 ...ernalModuleDependencyDescriptorFactoryTest.java |    3 -
 .../ProjectDependencyDescriptorFactoryTest.groovy  |   63 +
 .../ProjectDependencyDescriptorFactoryTest.java    |   65 -
 ...eflectiveDependencyDescriptorFactoryTest.groovy |   13 +-
 .../ProjectDependencyResolverTest.groovy           |   52 +-
 .../DefaultCachePolicySpec.groovy                  |   21 +-
 .../DefaultResolutionStrategySpec.groovy           |    3 -
 .../ModuleForcingResolveRuleSpec.groovy            |    3 -
 .../DependencyGraphBuilderTest.groovy              |  224 +-
 .../resolveengine/ModuleVersionSpecTest.groovy     |   49 +-
 .../VersionSelectionReasonResolverTest.groovy      |   10 +-
 .../CachingDependencyResultFactoryTest.groovy      |   24 +-
 .../ComponentIdentifierSerializerTest.groovy       |   60 +
 .../ComponentSelectionReasonSerializerTest.groovy  |   54 +
 .../result/ComponentSelectorSerializerTest.groovy  |   60 +
 .../DefaultResolutionResultBuilderSpec.groovy      |  284 ++
 .../resolveengine/result/DummyBinaryStore.groovy   |   48 +
 .../resolveengine/result/DummyStore.groovy         |   24 +
 .../InternalDependencyResultSerializerTest.groovy  |   80 +
 .../ModuleVersionSelectionSerializerTest.groovy    |   40 +
 .../result/ResolutionResultBuilderSpec.groovy      |  268 --
 .../result/ResolutionResultPrinter.groovy          |   47 +
 .../StreamingResolutionResultBuilderTest.groovy    |  139 +
 .../result/VersionSelectionReasonsTest.groovy      |    3 -
 .../store/CachedStoreFactoryTest.groovy            |   40 +
 .../store/DefaultBinaryStoreTest.groovy            |  108 +
 .../store/ResolutionResultsStoreFactoryTest.groovy |   93 +
 .../metadata/DefaultDependencyMetaDataTest.groovy  |  162 +
 .../metadata/DefaultIvyArtifactNameTest.groovy     |   53 +
 .../DefaultLocalArtifactIdentifierTest.groovy      |   67 +
 .../DefaultLocalComponentMetaDataTest.groovy       |  146 +
 ...faultModuleVersionArtifactIdentifierTest.groovy |   67 +
 ...DefaultModuleVersionArtifactMetaDataTest.groovy |   71 +
 .../DefaultModuleVersionPublishMetaDataTest.groovy |   42 +
 .../metadata/ModuleDescriptorAdapterTest.groovy    |  296 ++
 .../DefaultLocalMavenRepositoryLocatorTest.groovy  |    4 +-
 .../DefaultBaseRepositoryFactoryTest.groovy        |  167 +-
 .../DefaultFlatDirArtifactRepositoryTest.groovy    |   30 +-
 .../DefaultIvyArtifactRepositoryTest.groovy        |   76 +-
 .../DefaultMavenArtifactRepositoryTest.groovy      |   51 +-
 .../DefaultMavenLocalRepositoryTest.groovy         |   69 +
 .../DownloadingRepositoryCacheManagerTest.groovy   |   71 -
 .../DownloadingRepositoryCacheManagerTest.groovy   |   67 +
 .../resolver/ChainedVersionListerTest.groovy       |   44 +-
 .../resolver/ExternalResourceResolverTest.groovy   |   80 +-
 .../resolver/IvyResourcePatternTest.groovy         |   25 +-
 .../resolver/M2ResourcePatternTest.groovy          |   58 +-
 .../repositories/resolver/MavenResolverTest.groovy |    7 +-
 .../resolver/MavenVersionListerTest.groovy         |   77 +-
 .../resolver/ResourceVersionListerTest.groovy      |   65 +-
 .../DefaultArtifactResolutionCacheTest.groovy      |   80 -
 .../result/DefaultResolutionResultTest.groovy      |   28 +-
 .../DefaultResolvedModuleVersionResultSpec.groovy  |    4 -
 .../CachedExternalResourceAdapterTest.groovy       |   83 -
 .../CachedExternalResourceAdapterTest.groovy       |   78 +
 .../DefaultArtifactResolutionCacheTest.groovy      |   84 +
 ...ifactAtRepositoryCachedArtifactIndexTest.groovy |   18 +-
 ...positeLocallyAvailableResourceFinderTest.groovy |    3 +-
 .../DefaultLocallyAvailableResourceTest.groovy     |   66 -
 ...zyLocallyAvailableResourceCandidatesTest.groovy |    2 +-
 .../DefaultExternalResourceMetaDataTest.groovy     |    2 +-
 ...ltCacheAwareExternalResourceAccessorTest.groovy |   14 +-
 ...gressLoggingExternalResourceAccessorTest.groovy |   15 +-
 .../http/ApacheDirectoryListingParserTest.groovy   |   16 +-
 .../transport/http/HttpResourceListerTest.groovy   |    3 +-
 ...avaSystemPropertiesHttpProxySettingsTest.groovy |   15 +-
 .../DependencyMapNotationParserTest.groovy         |    8 +-
 .../notations/DependencyNotationParserTest.groovy  |    5 +-
 .../DependencyStringNotationParserTest.groovy      |   12 +-
 .../notations/ProjectDependencyFactoryTest.groovy  |    3 -
 .../ivyresolve/parser/test-bad-confs.xml           |   27 -
 .../ivyresolve/parser/test-cyclic-confs1.xml       |   28 -
 .../ivyresolve/parser/test-empty-dependencies.xml  |   28 -
 .../ivyservice/ivyresolve/parser/test-full.xml     |    4 +-
 .../result/ResolutionResultDataBuilder.groovy      |   26 +-
 subprojects/core/core.gradle                       |   17 +-
 .../DeprecationHandlingIntegrationTest.groovy      |  125 +
 .../org/gradle/api/ApplyPluginIntegSpec.groovy     |  129 +
 .../api/BuildEventsErrorIntegrationTest.groovy     |   94 +
 .../api/BuildScriptErrorIntegrationTest.groovy     |   98 +
 .../ConfigurationOnDemandIntegrationTest.groovy    |   99 +-
 .../api/CrossProcessFileLockIntegrationTest.groovy |   71 +
 ...rredConfigurableExtensionIntegrationTest.groovy |  174 +
 .../api/ExternalScriptErrorIntegrationTest.groovy  |   87 +
 .../gradle/api/FinalizerTaskIntegrationTest.groovy |  248 ++
 .../gradle/api/GradlePluginIntegrationTest.groovy  |   97 +
 .../api/InitScriptErrorIntegrationTest.groovy      |   58 +
 .../org/gradle/api/ProfilingIntegrationTest.groovy |   46 +
 .../api/ProjectConfigurationIntegrationTest.groovy |    3 -
 ...ojectConfigureEventsErrorIntegrationTest.groovy |   78 +
 .../api/SettingsPluginIntegrationSpec.groovy       |   86 +
 .../api/SettingsScriptErrorIntegrationTest.groovy  |   41 +
 .../api/dsl/ConcurrentClassDecorationSpec.groovy   |   48 +
 .../BuildExecutionEventsIntegrationTest.groovy     |   57 +
 .../gradle/api/tasks/ArchiveIntegrationTest.groovy |   80 +-
 .../api/tasks/CopyErrorIntegrationTest.groovy      |    3 +-
 .../api/tasks/CopyTaskIntegrationSpec.groovy       |  121 +
 .../api/tasks/CopyTaskIntegrationTest.groovy       |   74 +
 .../tasks/IncrementalTaskIntegrationTest.groovy    |   47 +
 ...kCommandLineConfigurationIntegrationSpec.groovy |  299 ++
 .../api/tasks/TaskRemovalIntegrationTest.groovy    |   88 +
 .../api/tasks/bundling/ZipIntegrationTest.groovy   |  119 +
 .../plugin/PluginHandlerScriptIntegTest.groovy     |  554 +++
 .../ScriptPluginClassLoadingIntegrationTest.groovy |   54 +
 .../BintrayPluginResolutionIntegTest.groovy        |  115 +
 .../internal/PathLimitationIntegTest.groovy        |  255 ++
 .../internal/WorkerProcessIntegrationTest.java     |   48 +-
 .../groovy/org/gradle/BuildExceptionReporter.java  |   52 +-
 .../src/main/groovy/org/gradle/BuildListener.java  |    4 +-
 .../src/main/groovy/org/gradle/CacheUsage.java     |    1 -
 .../src/main/groovy/org/gradle/GradleLauncher.java |   54 +-
 .../src/main/groovy/org/gradle/StartParameter.java |   90 +-
 .../groovy/org/gradle/TaskExecutionLogger.java     |    9 +-
 .../org/gradle/api/CircularReferenceException.java |    2 -
 .../main/groovy/org/gradle/api/DefaultTask.java    |   12 -
 ...ExtensiblePolymorphicDomainObjectContainer.java |   28 +
 .../org/gradle/api/GradleScriptException.java      |    4 +-
 .../org/gradle/api/IllegalDependencyNotation.java  |    2 -
 .../IllegalOperationAtExecutionTimeException.java  |    3 +-
 .../org/gradle/api/InvalidUserCodeException.java   |    2 +-
 .../org/gradle/api/InvalidUserDataException.java   |    2 -
 .../gradle/api/NamedDomainObjectCollection.java    |   14 +-
 .../org/gradle/api/NamedDomainObjectContainer.java |   11 +-
 .../main/groovy/org/gradle/api/NonExtensible.java  |   31 +
 .../src/main/groovy/org/gradle/api/Plugin.java     |    3 +-
 .../api/PolymorphicDomainObjectContainer.java      |   15 +
 .../src/main/groovy/org/gradle/api/Project.java    |   13 +-
 .../gradle/api/ProjectConfigurationException.java  |   29 +
 .../org/gradle/api/ProjectEvaluationListener.java  |    2 -
 .../main/groovy/org/gradle/api/ProjectState.java   |    3 +
 .../core/src/main/groovy/org/gradle/api/Rule.java  |    2 -
 .../src/main/groovy/org/gradle/api/Script.java     |    1 +
 .../core/src/main/groovy/org/gradle/api/Task.java  |  160 +-
 .../org/gradle/api/UnknownProjectException.java    |    2 -
 .../org/gradle/api/UnknownTaskException.java       |    2 -
 .../main/groovy/org/gradle/api/XmlProvider.java    |    2 -
 .../gradle/api/artifacts/ArtifactIdentifier.java   |   12 +-
 .../api/artifacts/ArtifactRepositoryContainer.java |   42 +-
 .../org/gradle/api/artifacts/ClientModule.java     |    2 -
 .../api/artifacts/ComponentMetadataDetails.java    |   86 +
 .../org/gradle/api/artifacts/Configuration.java    |    8 +-
 .../api/artifacts/ConfigurationContainer.java      |   16 +-
 .../org/gradle/api/artifacts/Dependency.java       |    5 +-
 .../gradle/api/artifacts/DependencyArtifact.java   |    6 +-
 .../org/gradle/api/artifacts/ExcludeRule.java      |    4 +-
 .../gradle/api/artifacts/ExcludeRuleContainer.java |    2 -
 .../gradle/api/artifacts/ExternalDependency.java   |    2 -
 .../api/artifacts/ExternalModuleDependency.java    |    2 -
 .../groovy/org/gradle/api/artifacts/Module.java    |    5 +-
 .../gradle/api/artifacts/ProjectDependency.java    |    4 +-
 .../org/gradle/api/artifacts/PublishArtifact.java  |    6 +-
 .../org/gradle/api/artifacts/PublishException.java |    2 +-
 .../org/gradle/api/artifacts/ResolveException.java |    6 +-
 .../org/gradle/api/artifacts/ResolvedArtifact.java |    2 -
 .../gradle/api/artifacts/ResolvedDependency.java   |    2 -
 .../api/artifacts/UnknownRepositoryException.java  |    2 -
 .../cache/DependencyResolutionControl.java         |    6 +-
 .../artifacts/component/ComponentIdentifier.java   |   35 +
 .../api/artifacts/component/ComponentSelector.java |   44 +
 .../component/ModuleComponentIdentifier.java       |   50 +
 .../component/ModuleComponentSelector.java         |   48 +
 .../component/ProjectComponentIdentifier.java      |   33 +
 .../component/ProjectComponentSelector.java        |   34 +
 .../api/artifacts/component/package-info.java      |   20 +
 .../gradle/api/artifacts/dsl/ArtifactHandler.java  |    2 -
 .../artifacts/dsl/ComponentMetadataHandler.java    |   54 +
 .../api/artifacts/dsl/DependencyHandler.java       |   39 +-
 .../api/artifacts/dsl/RepositoryHandler.java       |   68 +-
 .../artifacts/repositories/ArtifactRepository.java |    2 +-
 .../repositories/IvyArtifactRepository.java        |    2 +-
 .../resolution/ArtifactResolutionQuery.java        |   32 +
 .../resolution/ArtifactResolutionQueryResult.java  |   32 +
 .../api/artifacts/resolution/JvmLibrary.java       |   31 +
 .../artifacts/resolution/JvmLibraryArtifact.java   |   27 +
 .../resolution/JvmLibraryJavadocArtifact.java      |   27 +
 .../resolution/JvmLibrarySourcesArtifact.java      |   27 +
 .../api/artifacts/resolution/SoftwareArtifact.java |   45 +
 .../artifacts/resolution/SoftwareComponent.java    |   32 +
 .../resolution/UnresolvedSoftwareComponent.java    |   41 +
 .../api/artifacts/resolution/package-info.java     |   20 +
 .../artifacts/result/ComponentSelectionReason.java |   64 +
 .../api/artifacts/result/DependencyResult.java     |   18 +-
 .../result/ModuleVersionSelectionReason.java       |   56 -
 .../api/artifacts/result/ResolutionResult.java     |   32 +-
 .../artifacts/result/ResolvedComponentResult.java  |   85 +
 .../artifacts/result/ResolvedDependencyResult.java |    4 +-
 .../result/ResolvedModuleVersionResult.java        |   60 -
 .../result/UnresolvedDependencyResult.java         |    8 +-
 .../gradle/api/component/SoftwareComponent.java    |    3 +-
 .../org/gradle/api/dsl/ConventionProperty.java     |    2 -
 .../gradle/api/execution/TaskExecutionAdapter.java |    2 +-
 .../groovy/org/gradle/api/file/CopySourceSpec.java |    2 -
 .../main/groovy/org/gradle/api/file/CopySpec.java  |   53 +-
 .../groovy/org/gradle/api/file/DeleteAction.java   |    2 -
 .../api/file/DuplicateFileCopyingException.java    |   31 +
 .../org/gradle/api/file/DuplicatesStrategy.java    |   59 +
 .../org/gradle/api/file/EmptyFileVisitor.java      |    2 -
 .../org/gradle/api/file/FileCopyDetails.java       |   41 +
 .../main/groovy/org/gradle/api/file/FileTree.java  |    2 +-
 .../groovy/org/gradle/api/file/FileVisitor.java    |    2 -
 .../groovy/org/gradle/api/file/RelativePath.java   |    2 -
 .../api/initialization/ProjectDescriptor.java      |    2 -
 .../org/gradle/api/initialization/Settings.java    |    5 +-
 .../api/internal/AbstractClassGenerator.java       |   29 +-
 .../api/internal/AbstractMultiCauseException.java  |  101 -
 .../AbstractNamedDomainObjectContainer.java        |   13 +-
 .../AbstractPolymorphicDomainObjectContainer.java  |   17 +-
 .../org/gradle/api/internal/AbstractTask.java      |  169 +-
 .../api/internal/AsmBackedClassGenerator.java      |  181 +-
 .../org/gradle/api/internal/BeanDynamicObject.java |   37 +-
 .../api/internal/CachingDirectedGraphWalker.java   |  176 -
 .../internal/ClassGeneratorBackedInstantiator.java |    2 +-
 .../api/internal/CompositeDomainObjectSet.java     |    9 +-
 .../org/gradle/api/internal/ConfigureDelegate.java |   62 +-
 .../groovy/org/gradle/api/internal/Contextual.java |   29 -
 .../gradle/api/internal/ConventionAwareHelper.java |   17 +-
 .../org/gradle/api/internal/ConventionTask.java    |    3 -
 .../DefaultNamedDomainObjectCollection.java        |    8 +
 .../DefaultPolymorphicDomainObjectContainer.java   |   45 +-
 .../internal/DependencyInjectingInstantiator.java  |    2 +-
 .../org/gradle/api/internal/DirectedGraph.java     |   26 -
 .../api/internal/DirectedGraphWithEdgeValues.java  |   25 -
 .../gradle/api/internal/DocumentationRegistry.java |   31 +-
 .../org/gradle/api/internal/GradleInternal.java    |   22 +-
 .../org/gradle/api/internal/GraphAggregator.java   |   90 -
 .../org/gradle/api/internal/IConventionAware.java  |    2 -
 .../api/internal/LocationAwareException.java       |  179 -
 .../gradle/api/internal/MultiCauseException.java   |   22 -
 ...amedDomainObjectContainerConfigureDelegate.java |   17 +-
 ...phicDomainObjectContainerConfigureDelegate.java |   25 +-
 .../org/gradle/api/internal/SettingsInternal.java  |    9 +-
 .../org/gradle/api/internal/TaskInternal.java      |    8 +-
 .../gradle/api/internal/TaskOutputsInternal.java   |    1 +
 .../artifacts/ArtifactPublicationServices.java     |   31 -
 .../api/internal/artifacts/ArtifactPublisher.java  |   31 -
 .../internal/artifacts/BaseRepositoryFactory.java  |    5 +
 .../artifacts/CachingDependencyResolveContext.java |    6 +-
 .../artifacts/DefaultArtifactIdentifier.java       |   55 -
 .../DefaultArtifactRepositoryContainer.java        |   12 +-
 .../api/internal/artifacts/DefaultExcludeRule.java |    5 -
 .../artifacts/DefaultExcludeRuleContainer.java     |    7 +-
 .../api/internal/artifacts/DefaultModule.java      |   11 +-
 .../artifacts/DependencyManagementServices.java    |   14 +-
 .../artifacts/DependencyResolutionServices.java    |    7 -
 .../DependencyResolveDetailsInternal.java          |    7 +-
 .../artifacts/ExcludeRuleNotationParser.java       |   13 +-
 .../api/internal/artifacts/ModuleInternal.java     |   25 +
 .../artifacts/ModuleVersionSelectorStrictSpec.java |    3 -
 .../internal/artifacts/ProjectBackedModule.java    |   30 +-
 .../ConfigurationContainerInternal.java            |    2 +
 .../configurations/ConfigurationInternal.java      |    2 +
 .../configurations/DependencyMetaDataProvider.java |    7 +-
 .../configurations/dynamicversion/CachePolicy.java |    7 +-
 .../artifacts/dependencies/AbstractDependency.java |    5 +-
 .../dependencies/DefaultClientModule.java          |    3 -
 .../DefaultExternalModuleDependency.java           |    3 -
 .../dependencies/DefaultProjectDependency.java     |    9 +-
 .../dependencies/ProjectDependencyInternal.java    |   28 +
 .../artifacts/dsl/DefaultRepositoryHandler.java    |   27 +-
 .../ArtifactResolutionQueryFactory.java            |   22 +
 .../dependencies/DefaultDependencyHandler.groovy   |  109 -
 .../dsl/dependencies/DefaultDependencyHandler.java |  135 +
 .../dsl/dependencies/DependencyFactory.java        |    3 -
 .../dependencies/ModuleDescriptorDelegate.groovy   |    3 -
 .../dsl/dependencies/ModuleFactoryHelper.java      |    5 +-
 .../artifacts/dsl/dependencies/ProjectFinder.java  |    3 -
 .../ivyservice/ModuleDescriptorConverter.java      |   35 -
 .../artifacts/publish/AbstractPublishArtifact.java |    3 -
 .../artifacts/publish/ArchivePublishArtifact.java  |   21 +-
 .../artifacts/publish/DefaultPublishArtifact.java  |    3 -
 .../repositories/PublicationAwareRepository.java   |   23 -
 .../version/LatestVersionSemanticComparator.java   |   49 -
 .../org/gradle/api/internal/cache/BinaryStore.java |   42 +
 .../org/gradle/api/internal/cache/Store.java       |   22 +
 .../CacheBackedFileSnapshotRepository.java         |   44 -
 .../CacheBackedTaskHistoryRepository.java          |  174 -
 .../CacheLockHandlingTaskExecuter.java             |   38 -
 .../internal/changedetection/CachingHasher.java    |   78 -
 .../changedetection/CompositeUpToDateRule.java     |   52 -
 .../changedetection/DefaultFileCacheListener.java  |   45 -
 .../changedetection/DefaultFileSnapshotter.java    |  158 -
 .../internal/changedetection/DefaultHasher.java    |   26 -
 .../DefaultTaskArtifactStateCacheAccess.java       |   85 -
 .../DefaultTaskArtifactStateRepository.java        |  172 -
 ...eCacheBroadcastTaskArtifactStateRepository.java |   63 -
 .../changedetection/FileCacheListener.java         |   35 -
 .../changedetection/FileCollectionSnapshot.java    |   59 -
 .../changedetection/FileSnapshotRepository.java    |   24 -
 .../internal/changedetection/FileSnapshotter.java  |   35 -
 .../api/internal/changedetection/Hasher.java       |   22 -
 .../changedetection/InMemoryIndexedCache.java      |   65 -
 .../InputFilesChangedUpToDateRule.java             |   63 -
 .../InputPropertiesChangedUpToDateRule.java        |   55 -
 .../changedetection/MapMergeChangeListener.java    |   67 -
 .../OutputFilesChangedUpToDateRule.java            |   85 -
 .../changedetection/OutputFilesSnapshotter.java    |  154 -
 .../ShortCircuitTaskArtifactStateRepository.java   |   96 -
 .../changedetection/TaskArtifactState.java         |   11 +-
 .../TaskArtifactStateCacheAccess.java              |   50 -
 .../TaskCacheLockHandlingBuildExecuter.java        |   35 -
 .../internal/changedetection/TaskExecution.java    |   67 -
 .../changedetection/TaskHistoryRepository.java     |   30 -
 .../TaskTypeChangedUpToDateRule.java               |   42 -
 .../api/internal/changedetection/UpToDateRule.java |   48 -
 .../changes/ChangesOnlyIncrementalTaskInputs.java  |   57 +
 .../DefaultTaskArtifactStateRepository.java        |  132 +
 .../changes/NoHistoryArtifactState.java            |   52 +
 .../changes/RebuildIncrementalTaskInputs.java      |   73 +
 .../ShortCircuitTaskArtifactStateRepository.java   |   96 +
 .../changes/StatefulIncrementalTaskInputs.java     |   49 +
 .../rules/CachingTaskStateChanges.java             |   86 +
 .../internal/changedetection/rules/ChangeType.java |   33 +
 .../changedetection/rules/DescriptiveChange.java   |   29 +
 .../internal/changedetection/rules/FileChange.java |   60 +
 .../changedetection/rules/InputFileChange.java     |   31 +
 .../rules/InputFilesStateChangeRule.java           |   77 +
 .../rules/InputPropertiesStateChangeRule.java      |   54 +
 .../rules/NoHistoryStateChangeRule.java            |   35 +
 .../changedetection/rules/OutputFileChange.java    |   29 +
 .../rules/OutputFilesStateChangeRule.java          |  100 +
 .../rules/SimpleTaskStateChanges.java              |   38 +
 .../rules/SummaryTaskStateChanges.java             |   76 +
 .../changedetection/rules/TaskStateChange.java     |   21 +
 .../changedetection/rules/TaskStateChanges.java    |   25 +
 .../rules/TaskTypeStateChangeRule.java             |   43 +
 .../changedetection/rules/TaskUpToDateState.java   |   66 +
 .../state/CacheBackedFileSnapshotRepository.java   |   45 +
 .../state/CacheBackedTaskHistoryRepository.java    |  279 ++
 .../state/CachingFileSnapshotter.java              |   87 +
 .../state/DefaultFileCollectionSnapshotter.java    |  190 +
 .../state/DefaultFileSnapshotterSerializer.java    |   67 +
 .../state/DefaultTaskArtifactStateCacheAccess.java |   68 +
 .../state/FileCollectionSnapshot.java              |   61 +
 .../state/FileCollectionSnapshotter.java           |   41 +
 .../state/FileSnapshotRepository.java              |   24 +
 .../changedetection/state/FileSnapshotter.java     |   37 +
 .../state/InMemoryTaskArtifactCache.java           |  126 +
 .../state/MapMergeChangeListener.java              |   67 +
 .../changedetection/state/NoOpDecorator.java       |   26 +
 .../state/OutputFilesCollectionSnapshotter.java    |  226 +
 .../state/OutputFilesSnapshotSerializer.java       |   63 +
 .../state/TaskArtifactStateCacheAccess.java        |   25 +
 .../changedetection/state/TaskExecution.java       |   66 +
 .../state/TaskHistoryRepository.java               |   30 +
 .../internal/classpath/DefaultModuleRegistry.java  |    2 +-
 .../api/internal/classpath/EffectiveClassPath.java |    2 +-
 .../api/internal/classpath/ManifestUtil.java       |    1 -
 .../coerce/MethodArgumentsTransformer.java         |   36 +
 .../TypeCoercingMethodArgumentsTransformer.java    |   91 +
 .../collections/CollectionEventRegister.java       |    2 +-
 .../api/internal/file/AbstractFileResolver.java    |   16 +-
 .../api/internal/file/AbstractFileResource.java    |    3 -
 .../api/internal/file/AbstractFileTreeElement.java |   17 +-
 .../internal/file/AntFileCollectionBuilder.groovy  |    5 +-
 .../api/internal/file/BaseDirFileResolver.java     |    3 -
 .../file/CopyActionProcessingStreamAction.java     |   25 +
 .../internal/file/DefaultCompositeFileTree.java    |   45 +
 .../api/internal/file/DefaultFileLookup.java       |   43 +
 .../api/internal/file/DefaultFileOperations.java   |   66 +-
 .../api/internal/file/DefaultFileTreeElement.java  |   12 +-
 .../api/internal/file/DefaultFileVisitDetails.java |    6 +-
 .../file/DefaultTemporaryFileProvider.java         |    3 +-
 .../org/gradle/api/internal/file/FileLookup.java   |   38 +
 .../gradle/api/internal/file/FileOperations.java   |    5 +
 .../api/internal/file/FileOrUriNotationParser.java |    7 +-
 .../org/gradle/api/internal/file/FileResolver.java |   13 +-
 .../org/gradle/api/internal/file/FileResource.java |    3 -
 .../api/internal/file/IdentityFileResolver.java    |    9 +-
 .../internal/file/MaybeCompressedFileResource.java |    3 -
 .../api/internal/file/archive/TarCopyAction.java   |  114 +
 .../internal/file/archive/TarCopySpecVisitor.java  |   88 -
 .../api/internal/file/archive/TarFileTree.java     |   15 +-
 .../api/internal/file/archive/ZipCopyAction.java   |  101 +-
 .../internal/file/archive/ZipCopySpecVisitor.java  |   81 -
 .../api/internal/file/archive/ZipFileTree.java     |   14 +-
 .../file/archive/compression/Bzip2Archiver.java    |    3 -
 .../file/archive/compression/GzipArchiver.java     |    3 -
 .../file/archive/compression/SimpleCompressor.java |    3 -
 .../collections/DefaultConfigurableFileTree.java   |   37 +-
 .../file/collections/DelegatingFileCollection.java |  111 +
 .../file/collections/DirectoryFileTree.java        |   13 +-
 .../LazilyInitializedFileCollection.java           |   35 +
 .../api/internal/file/collections/MapFileTree.java |   18 +-
 .../collections/SingleIncludePatternFileTree.java  |   14 +-
 .../file/collections/SingletonFileTree.java        |   19 +-
 .../internal/file/copy/AbstractZipCompressor.java  |   37 -
 .../api/internal/file/copy/ArchiveCopyAction.java  |   25 -
 .../gradle/api/internal/file/copy/CopyAction.java  |   49 +-
 .../api/internal/file/copy/CopyActionExecuter.java |   41 +
 .../api/internal/file/copy/CopyActionImpl.java     |  235 +-
 .../file/copy/CopyActionProcessingStream.java      |   25 +
 .../internal/file/copy/CopyFileVisitorImpl.java    |   66 +
 .../api/internal/file/copy/CopySpecActionImpl.java |   39 +
 .../CopySpecBackedCopyActionProcessingStream.java  |   38 +
 .../api/internal/file/copy/CopySpecImpl.java       |  461 --
 .../api/internal/file/copy/CopySpecInternal.java   |   47 +
 .../api/internal/file/copy/CopySpecSource.java     |    2 +-
 .../api/internal/file/copy/CopySpecVisitor.java    |   36 -
 .../api/internal/file/copy/CopySpecWrapper.java    |  222 +
 .../api/internal/file/copy/DefaultCopySpec.java    |  469 ++
 .../internal/file/copy/DefaultFileCopyDetails.java |  217 +
 .../internal/file/copy/DefaultZipCompressor.java   |   45 +
 .../file/copy/DelegatingCopySpecInternal.java      |  228 +
 .../file/copy/DelegatingCopySpecVisitor.java       |   54 -
 .../api/internal/file/copy/DeleteActionImpl.java   |    3 -
 .../file/copy/DestinationRootCopySpec.java         |   51 +
 .../copy/DuplicateHandlingCopyActionDecorator.java |   66 +
 .../internal/file/copy/EmptyCopySpecVisitor.java   |   39 -
 .../gradle/api/internal/file/copy/FileCopier.java  |   67 +
 .../api/internal/file/copy/FileCopyAction.java     |   32 +-
 .../api/internal/file/copy/FileCopyActionImpl.java |   33 +-
 .../file/copy/FileCopyDetailsInternal.java         |   25 +
 .../internal/file/copy/FileCopySpecVisitor.java    |   61 -
 .../internal/file/copy/MappingCopySpecVisitor.java |  230 -
 .../api/internal/file/copy/MatchingCopyAction.java |   40 +
 .../file/copy/NormalizingCopyActionDecorator.java  |  193 +
 .../file/copy/NormalizingCopySpecVisitor.java      |  121 -
 .../api/internal/file/copy/PathNotationParser.java |    4 +-
 .../api/internal/file/copy/ReadableCopySpec.java   |   32 +-
 .../api/internal/file/copy/RegExpNameMapper.java   |    3 -
 .../internal/file/copy/RelativizedCopySpec.java    |   51 +
 .../file/copy/SyncCopyActionDecorator.java         |   92 +
 .../internal/file/copy/SyncCopySpecVisitor.java    |   90 -
 .../api/internal/file/copy/ZipCompressor.java      |    5 +-
 .../internal/file/copy/ZipDeflatedCompressor.java  |   31 -
 .../internal/file/copy/ZipStoredCompressor.java    |   28 -
 .../file/pattern/AnyWildcardPatternStep.java       |   23 +
 .../file/pattern/DefaultPatternMatcher.java        |  159 -
 .../internal/file/pattern/EndOfPathMatcher.java    |   35 +
 .../internal/file/pattern/FixedPatternStep.java    |   34 +
 .../file/pattern/FixedStepsPathMatcher.java        |   70 +
 .../internal/file/pattern/GreedyPathMatcher.java   |   48 +
 .../internal/file/pattern/GreedyPatternStep.java   |   29 -
 .../file/pattern/NameOnlyPatternMatcher.java       |   58 -
 .../api/internal/file/pattern/PathMatcher.java     |   39 +
 .../file/pattern/PatternMatcherFactory.java        |   69 +-
 .../api/internal/file/pattern/PatternStep.java     |    6 +-
 .../internal/file/pattern/PatternStepFactory.java  |   46 +-
 .../internal/file/pattern/RegExpPatternStep.java   |   21 +-
 .../file/pattern/WildcardPrefixPatternStep.java    |   36 +
 .../internal/filestore/AbstractFileStoreEntry.java |   28 -
 .../gradle/api/internal/filestore/FileStore.java   |   31 -
 .../api/internal/filestore/FileStoreEntry.java     |   29 -
 .../api/internal/filestore/FileStoreSearcher.java  |   25 -
 .../filestore/GroupedAndNamedUniqueFileStore.java  |   13 +-
 .../api/internal/filestore/PathKeyFileStore.java   |   29 +-
 .../filestore/PathNormalisingKeyFileStore.java     |   11 +-
 .../internal/filestore/UniquePathKeyFileStore.java |    7 +-
 .../gradle/api/internal/hash/DefaultHasher.java    |   26 +
 .../org/gradle/api/internal/hash/Hasher.java       |   22 +
 .../initialization/AbstractScriptHandler.java      |   14 +-
 .../internal/initialization/ClassLoaderCache.java  |   27 +
 .../internal/initialization/ClassLoaderScope.java  |   89 +
 .../initialization/DefaultClassLoaderCache.java    |  102 +
 .../initialization/DefaultClassLoaderScope.java    |  168 +
 .../initialization/DefaultScriptHandler.java       |   75 +-
 .../DefaultScriptHandlerFactory.java               |   24 +-
 .../NoClassLoaderUpdateScriptHandler.java          |   33 -
 .../initialization/RootClassLoaderScope.java       |   70 +
 .../internal/initialization/ScriptClassLoader.java |   41 +
 .../initialization/ScriptClassLoaderProvider.java  |   22 -
 .../ScriptHandlerClassLoaderFactory.java           |   43 +
 .../initialization/ScriptHandlerFactory.java       |    5 +-
 .../initialization/ScriptHandlerInternal.java      |   21 -
 .../internal/notations/NotationParserBuilder.java  |   84 -
 .../gradle/api/internal/notations/TypeInfo.java    |   35 -
 .../api/internal/notations/api/NotationParser.java |   28 -
 .../api/UnsupportedNotationException.java          |   28 -
 .../parsers/CharSequenceNotationParser.java        |   28 -
 .../parsers/ClosureToSpecNotationParser.java       |   41 -
 .../notations/parsers/CompositeNotationParser.java |   53 -
 .../parsers/ErrorHandlingNotationParser.java       |   71 -
 .../parsers/FlatteningNotationParser.java          |   51 -
 .../notations/parsers/JustReturningParser.java     |   44 -
 .../api/internal/notations/parsers/MapKey.java     |   28 -
 .../notations/parsers/MapNotationParser.java       |  133 -
 .../notations/parsers/NormalizedTimeUnit.java      |   45 -
 .../notations/parsers/TimeUnitsParser.java         |   46 -
 .../notations/parsers/TypedNotationParser.java     |   48 -
 .../ClassloaderBackedPluginDescriptorLocator.java  |   38 +
 .../api/internal/plugins/DefaultConvention.java    |   13 +-
 .../plugins/DefaultObjectConfigurationAction.java  |   39 +-
 .../internal/plugins/DefaultPluginContainer.java   |  107 +
 .../internal/plugins/DefaultPluginRegistry.java    |   44 +-
 .../plugins/DefaultProjectsPluginContainer.java    |  110 -
 .../org/gradle/api/internal/plugins/DslObject.java |    4 +
 .../plugins/ExtensionContainerInternal.java        |   29 +
 .../api/internal/plugins/ExtensionsStorage.java    |   31 +-
 .../api/internal/plugins/PluginDescriptor.java     |   41 +
 .../internal/plugins/PluginDescriptorLocator.java  |   23 +
 .../api/internal/plugins/PluginRegistry.java       |    9 +-
 .../api/internal/project/AbstractPluginAware.java  |   52 +
 .../api/internal/project/AbstractProject.java      |  180 +-
 .../api/internal/project/DefaultAntBuilder.groovy  |   96 -
 .../api/internal/project/DefaultAntBuilder.java    |  138 +
 .../internal/project/DefaultAntBuilderFactory.java |   12 +-
 .../project/DefaultIsolatedAntBuilder.groovy       |    4 +
 .../api/internal/project/DefaultProject.java       |    6 +-
 .../project/DefaultProjectAccessListener.java      |    3 -
 .../internal/project/DefaultProjectRegistry.java   |    9 +-
 .../internal/project/GlobalServicesRegistry.java   |  113 -
 .../project/GradleInternalServiceRegistry.java     |   92 -
 .../api/internal/project/IProjectFactory.java      |    5 +-
 .../api/internal/project/IProjectRegistry.java     |   40 -
 .../api/internal/project/ProjectFactory.java       |   18 +-
 .../api/internal/project/ProjectInternal.java      |   21 +-
 .../project/ProjectInternalServiceRegistry.java    |  180 -
 .../api/internal/project/ProjectRegistry.java      |   37 +
 .../api/internal/project/ProjectScript.groovy      |    2 +-
 .../api/internal/project/ProjectStateInternal.java |    4 +
 .../internal/project/ServiceRegistryFactory.java   |   31 -
 .../internal/project/TaskExecutionServices.java    |   86 -
 .../project/TaskInternalServiceRegistry.java       |   61 -
 .../project/TopLevelBuildServiceRegistry.java      |  253 --
 .../internal/project/ant/AntLoggingAdapter.java    |    3 -
 .../api/internal/project/ant/BasicAntBuilder.java  |    5 +
 .../AnnotationProcessingTaskFactory.java           |  200 +-
 .../internal/project/taskfactory/ITaskFactory.java |    3 -
 .../internal/project/taskfactory/TaskFactory.java  |   27 +-
 .../api/internal/resource/ResourceException.java   |    2 +-
 .../internal/resources/DefaultResourceHandler.java |    3 -
 .../gradle/api/internal/resources/URIBuilder.java  |    3 -
 .../gradle/api/internal/specs/ExplainingSpecs.java |    3 -
 .../tasks/CachingTaskDependencyResolveContext.java |    6 +-
 .../api/internal/tasks/CommandLineOption.java      |   40 -
 .../api/internal/tasks/ContextAwareTaskAction.java |   24 +
 .../api/internal/tasks/DefaultTaskContainer.java   |  124 +-
 .../api/internal/tasks/SimpleWorkResult.java       |   30 +
 .../api/internal/tasks/TaskContainerInternal.java  |   26 +-
 .../gradle/api/internal/tasks/TaskExecuter.java    |    2 +-
 .../api/internal/tasks/TaskExecutionContext.java   |   24 +
 .../api/internal/tasks/TaskStatusNagger.java       |    9 +-
 .../execution/DefaultTaskExecutionContext.java     |   31 +
 .../execution/ExecuteActionsTaskExecuter.java      |   26 +-
 .../execution/ExecuteAtMostOnceTaskExecuter.java   |    5 +-
 .../PostExecutionAnalysisTaskExecuter.java         |    5 +-
 .../SkipEmptySourceFilesTaskExecuter.java          |    5 +-
 .../tasks/execution/SkipOnlyIfTaskExecuter.java    |    5 +-
 .../execution/SkipTaskWithNoActionsExecuter.java   |    5 +-
 .../tasks/execution/SkipUpToDateTaskExecuter.java  |   39 +-
 .../tasks/execution/ValidatingTaskExecuter.java    |    5 +-
 .../tasks/options/AbstractOptionElement.java       |   96 +
 .../internal/tasks/options/FieldOptionElement.java |   85 +
 .../tasks/options/InstanceOptionDescriptor.java    |   85 +
 .../tasks/options/MethodOptionElement.java         |   81 +
 .../gradle/api/internal/tasks/options/Option.java  |   40 +
 .../internal/tasks/options/OptionDescriptor.java   |   38 +
 .../api/internal/tasks/options/OptionElement.java  |   40 +
 .../tasks/options/OptionNotationParserFactory.java |   83 +
 .../api/internal/tasks/options/OptionReader.java   |  148 +
 .../tasks/options/OptionValidationException.java   |   28 +
 .../api/internal/tasks/options/OptionValues.groovy |   34 +
 .../api/internal/xml/SimpleMarkupWriter.java       |    8 +-
 .../gradle/api/internal/xml/SimpleXmlWriter.java   |    4 +-
 .../gradle/api/internal/xml/XmlTransformer.java    |    2 +-
 .../groovy/org/gradle/api/invocation/Gradle.java   |    7 +-
 .../groovy/org/gradle/api/logging/LogLevel.java    |    2 -
 .../groovy/org/gradle/api/logging/Logging.java     |    2 -
 .../groovy/org/gradle/api/plugins/Convention.java  |    2 -
 .../org/gradle/api/plugins/ExtensionContainer.java |    2 +
 .../groovy/org/gradle/api/plugins/PluginAware.java |   62 +
 .../org/gradle/api/plugins/PluginCollection.java   |    8 +-
 .../org/gradle/api/plugins/PluginContainer.java    |    2 -
 .../api/plugins/PluginInstantiationException.java  |    2 -
 .../gradle/api/plugins/UnknownPluginException.java |    2 -
 .../main/groovy/org/gradle/api/specs/Specs.java    |    2 -
 .../org/gradle/api/tasks/AbstractCopyTask.java     |   83 +-
 .../org/gradle/api/tasks/AntBuilderAware.groovy    |    2 -
 .../org/gradle/api/tasks/ConventionValue.java      |    1 -
 .../src/main/groovy/org/gradle/api/tasks/Copy.java |   86 +-
 .../main/groovy/org/gradle/api/tasks/Delete.java   |    2 -
 .../src/main/groovy/org/gradle/api/tasks/Exec.java |    7 +-
 .../groovy/org/gradle/api/tasks/GradleBuild.java   |   12 +-
 .../main/groovy/org/gradle/api/tasks/JavaExec.java |   12 +-
 .../groovy/org/gradle/api/tasks/SourceTask.java    |    2 +-
 .../org/gradle/api/tasks/StopActionException.java  |    2 -
 .../gradle/api/tasks/StopExecutionException.java   |    2 -
 .../src/main/groovy/org/gradle/api/tasks/Sync.java |   31 +-
 .../groovy/org/gradle/api/tasks/TaskContainer.java |  123 +-
 .../gradle/api/tasks/TaskExecutionException.java   |    2 +-
 .../gradle/api/tasks/TaskValidationException.java  |    4 +-
 .../main/groovy/org/gradle/api/tasks/Upload.java   |  147 -
 .../groovy/org/gradle/api/tasks/ant/AntTarget.java |    7 +-
 .../api/tasks/bundling/AbstractArchiveTask.java    |    3 +-
 .../org/gradle/api/tasks/bundling/Compression.java |    2 -
 .../groovy/org/gradle/api/tasks/bundling/Tar.java  |   42 +-
 .../groovy/org/gradle/api/tasks/bundling/Zip.java  |   89 +-
 .../bundling/internal/Zip64RequiredException.java  |   26 +
 .../tasks/incremental/IncrementalTaskInputs.java   |  122 +
 .../api/tasks/incremental/InputFileDetails.java    |   50 +
 .../gradle/api/tasks/incremental/package-info.java |   20 +
 .../org/gradle/api/tasks/util/PatternSet.java      |    9 +-
 .../main/groovy/org/gradle/cache/CacheBuilder.java |   47 +-
 .../org/gradle/cache/CacheOpenException.java       |    2 +-
 .../groovy/org/gradle/cache/CacheRepository.java   |   59 +-
 .../groovy/org/gradle/cache/CacheValidator.java    |   11 +-
 .../org/gradle/cache/DirectoryCacheBuilder.java    |   49 -
 .../org/gradle/cache/ObjectCacheBuilder.java       |   39 -
 .../groovy/org/gradle/cache/PersistentCache.java   |   30 +-
 .../org/gradle/cache/PersistentIndexedCache.java   |    3 +
 .../cache/PersistentIndexedCacheParameters.java    |   66 +
 .../groovy/org/gradle/cache/PersistentStore.java   |   39 +
 .../gradle/cache/internal/CacheCoordinator.java    |   35 +
 .../org/gradle/cache/internal/CacheDecorator.java  |   25 +
 .../org/gradle/cache/internal/CacheFactory.java    |   15 +-
 .../cache/internal/CacheInitializationAction.java  |   30 +
 .../gradle/cache/internal/CacheScopeMapping.java   |   26 +
 .../gradle/cache/internal/DefaultCacheAccess.java  |  389 +-
 .../gradle/cache/internal/DefaultCacheFactory.java |  274 +-
 .../cache/internal/DefaultCacheRepository.java     |  234 +-
 .../cache/internal/DefaultCacheScopeMapping.java   |   77 +
 .../cache/internal/DefaultFileLockManager.java     |  317 +-
 ...aultMultiProcessSafePersistentIndexedCache.java |   99 +
 .../internal/DefaultPersistentDirectoryCache.java  |  113 +-
 .../internal/DefaultPersistentDirectoryStore.java  |   78 +-
 .../DelegateOnDemandPersistentDirectoryCache.java  |  114 -
 .../org/gradle/cache/internal/FileAccess.java      |    2 +-
 .../groovy/org/gradle/cache/internal/FileLock.java |   14 +-
 .../cache/internal/FileLockCommunicator.java       |   96 +
 .../org/gradle/cache/internal/FileLockManager.java |   20 +-
 .../cache/internal/GracefullyStoppedException.java |   19 +
 .../MultiProcessSafePersistentIndexedCache.java    |   90 +-
 .../gradle/cache/internal/OnDemandFileAccess.java  |    8 +-
 .../internal/ReferencablePersistentCache.java      |    6 +-
 .../gradle/cache/internal/SimpleStateCache.java    |   14 +-
 .../cache/internal/UnitOfWorkParticipant.java      |    7 +-
 .../btree/BTreePersistentIndexedCache.java         |   16 +-
 .../cache/internal/btree/FileBackedBlockStore.java |   49 +-
 .../cacheops/CacheAccessOperationsStack.java       |   68 +
 .../cache/internal/cacheops/CacheOperation.java    |   27 +
 .../internal/cacheops/CacheOperationStack.java     |   74 +
 .../filelock/DefaultLockStateSerializer.java       |   91 +
 .../cache/internal/filelock/LockFileAccess.java    |   92 +
 .../gradle/cache/internal/filelock/LockInfo.java   |   23 +
 .../cache/internal/filelock/LockInfoAccess.java    |   71 +
 .../internal/filelock/LockInfoSerializer.java      |   54 +
 .../cache/internal/filelock/LockOptions.java       |   30 +
 .../internal/filelock/LockOptionsBuilder.java      |   83 +
 .../gradle/cache/internal/filelock/LockState.java  |   36 +
 .../cache/internal/filelock/LockStateAccess.java   |   89 +
 .../internal/filelock/LockStateSerializer.java     |   49 +
 .../filelock/Version1LockStateSerializer.java      |   72 +
 .../DefaultFileLockContentionHandler.java          |  163 +
 .../locklistener/FileLockContentionHandler.java    |   27 +
 .../gradle/configuration/BuildScriptProcessor.java |   45 -
 .../configuration/DefaultBuildConfigurer.java      |   22 +-
 .../configuration/DefaultInitScriptProcessor.java  |   15 +-
 .../configuration/DefaultScriptPluginFactory.java  |  148 +-
 .../configuration/ImplicitTasksConfigurer.java     |   13 +-
 .../org/gradle/configuration/ImportsReader.java    |   34 +-
 .../configuration/LifecycleProjectEvaluator.java   |   51 -
 .../ProjectDependencies2TaskResolver.java          |   47 -
 .../org/gradle/configuration/ProjectEvaluator.java |   23 -
 .../org/gradle/configuration/ScriptPlugin.java     |   19 +-
 .../gradle/configuration/ScriptPluginFactory.java  |    5 +-
 .../project/BuildScriptProcessor.java              |   45 +
 .../project/ConfigureActionsProjectEvaluator.java  |   37 +
 ...DefaultProjectConfigurationActionContainer.java |   45 +
 .../project/DelayedConfigurationActions.java       |   33 +
 .../project/LifecycleProjectEvaluator.java         |   82 +
 .../project/PluginsProjectConfigureActions.java    |   34 +
 .../ProjectConfigurationActionContainer.java       |   40 +
 .../project/ProjectConfigureAction.java            |   30 +
 .../project/ProjectDependencies2TaskResolver.java  |   41 +
 .../configuration/project/ProjectEvaluator.java    |   23 +
 .../TaskModelRealizingConfigurationAction.java     |   31 +
 ...ludedTaskFilteringBuildConfigurationAction.java |    6 +-
 .../gradle/execution/MultipleBuildFailures.java    |    2 +-
 .../gradle/execution/ProjectEvaluatingAction.java  |    2 -
 .../org/gradle/execution/TaskNameResolver.java     |   47 +-
 .../TaskNameResolvingBuildConfigurationAction.java |   18 +-
 .../gradle/execution/TaskPathProjectEvaluator.java |    3 -
 .../gradle/execution/TaskSelectionException.java   |   14 +-
 .../org/gradle/execution/TaskSelectionResult.java  |   23 +
 .../groovy/org/gradle/execution/TaskSelector.java  |   27 +-
 .../commandline/CommandLineTaskConfigurer.java     |   68 +-
 .../commandline/CommandLineTaskParser.java         |    8 +-
 .../commandline/TaskConfigurationException.java    |   44 +
 .../taskgraph/AbstractTaskPlanExecutor.java        |   87 +
 .../taskgraph/DefaultTaskExecutionPlan.java        |  377 +-
 .../taskgraph/DefaultTaskGraphExecuter.java        |   42 +-
 .../taskgraph/DefaultTaskPlanExecutor.java         |   37 +-
 .../execution/taskgraph/ExecutionOptions.java      |   36 -
 .../taskgraph/ParallelTaskPlanExecutor.java        |   84 +-
 .../execution/taskgraph/TaskDependencyGraph.java   |   52 +
 .../taskgraph/TaskDependencyGraphEdge.groovy       |   36 +
 .../execution/taskgraph/TaskExecutionPlan.java     |   17 +-
 .../org/gradle/execution/taskgraph/TaskInfo.java   |  131 +-
 .../taskgraph/TaskPlanExecutorFactory.java         |   26 +-
 .../taskpath/ProjectFinderByTaskPath.java          |    3 -
 .../execution/taskpath/ResolvedTaskPath.java       |    3 -
 .../execution/taskpath/TaskPathResolver.java       |    3 -
 .../org/gradle/groovy/scripts/BasicScript.java     |    8 +-
 .../org/gradle/groovy/scripts/DefaultScript.java   |   44 +-
 .../scripts/DefaultScriptCompilerFactory.java      |    7 +-
 .../org/gradle/groovy/scripts/ScriptAware.java     |    6 +-
 .../groovy/scripts/ScriptCompilerFactory.java      |    2 -
 .../gradle/groovy/scripts/StringScriptSource.java  |    2 +-
 .../org/gradle/groovy/scripts/UriScriptSource.java |    2 +-
 .../internal/AbstractScriptTransformer.java        |   36 -
 .../internal/AsmBackedEmptyScriptGenerator.java    |   10 +-
 .../gradle/groovy/scripts/internal/AstUtils.java   |   91 +
 .../BuildScriptClasspathScriptTransformer.java     |   38 -
 .../scripts/internal/BuildScriptTransformer.java   |   13 +-
 .../internal/ClasspathScriptTransformer.java       |  177 -
 .../internal/DefaultScriptCompilationHandler.java  |    3 -
 .../FileCacheBackedScriptClassCompiler.java        |   41 +-
 .../scripts/internal/FilteredTransformer.java      |   28 +
 .../internal/FilteringStatementTransformer.java    |   43 +
 .../scripts/internal/FixMainScriptTransformer.java |    4 +-
 .../internal/PluginsAndBuildscriptTransformer.java |  127 +
 .../groovy/scripts/internal/ScriptBlock.java       |   37 +
 ...riptBlockToServiceConfigurationTransformer.java |   54 +
 .../scripts/internal/ScriptCompilationHandler.java |    3 -
 .../StatementExtractingScriptTransformer.java      |  145 +
 .../internal/StatementLabelsScriptTransformer.java |    2 +-
 .../scripts/internal/StatementTransformer.java     |   30 +
 .../internal/TaskDefinitionScriptTransformer.java  |    6 +-
 .../gradle/initialization/AbstractProjectSpec.java |    8 +-
 .../org/gradle/initialization/BaseSettings.java    |   81 +-
 .../org/gradle/initialization/BuildAction.java     |   31 +
 .../org/gradle/initialization/BuildController.java |   45 +
 .../initialization/BuildFileProjectSpec.java       |    4 +-
 .../initialization/BuildLayoutParameters.java      |   25 +-
 .../org/gradle/initialization/BuildLoader.java     |    3 +-
 .../gradle/initialization/BuildProgressLogger.java |   65 -
 .../gradle/initialization/BuildSourceBuilder.java  |  155 -
 .../gradle/initialization/ClassLoaderRegistry.java |   16 +-
 .../initialization/DefaultClassLoaderRegistry.java |   38 +-
 .../DefaultCommandLineConverter.java               |   49 +-
 .../initialization/DefaultExceptionAnalyser.java   |   20 +-
 .../initialization/DefaultGradleLauncher.java      |    4 +-
 .../DefaultGradleLauncherFactory.java              |   44 +-
 .../DefaultGradlePropertiesLoader.java             |    3 -
 .../initialization/DefaultProjectDescriptor.java   |   16 +-
 .../DefaultProjectDescriptorRegistry.java          |    5 +-
 .../gradle/initialization/DefaultProjectSpec.java  |    4 +-
 .../gradle/initialization/DefaultSettings.groovy   |   36 -
 .../org/gradle/initialization/DefaultSettings.java |   36 +
 .../initialization/DefaultSettingsFinder.java      |    3 -
 .../initialization/DependencyResolutionLogger.java |    5 +-
 .../initialization/GradleLauncherAction.java       |   43 -
 .../initialization/GradleLauncherFactory.java      |    2 -
 .../initialization/IGradlePropertiesLoader.java    |    3 -
 .../initialization/IProjectDescriptorRegistry.java |   26 -
 .../org/gradle/initialization/ISettingsFinder.java |    3 -
 .../initialization/InstantiatingBuildLoader.java   |   22 +-
 .../gradle/initialization/JdkToolsInitializer.java |   25 +
 .../initialization/LayoutCommandLineConverter.java |   19 +-
 .../initialization/ProjectAccessListener.java      |    2 -
 .../initialization/ProjectDescriptorRegistry.java  |   23 +
 .../ProjectDirectoryProjectSpec.java               |    4 +-
 .../initialization/ProjectPathProjectSpec.java     |   66 +
 .../ProjectPropertySettingBuildLoader.java         |    8 +-
 .../org/gradle/initialization/ProjectSpec.java     |    6 +-
 .../org/gradle/initialization/ProjectSpecs.java    |   36 +
 .../PropertiesLoadingSettingsProcessor.java        |    9 +-
 .../ScriptEvaluatingSettingsProcessor.java         |   27 +-
 .../org/gradle/initialization/SettingsFactory.java |   16 +-
 .../org/gradle/initialization/SettingsHandler.java |   18 +-
 .../gradle/initialization/SettingsProcessor.java   |    7 +-
 .../buildsrc/BuildSourceBuilder.java               |  101 +
 .../buildsrc/BuildSrcBuildListenerFactory.java     |   61 +
 .../buildsrc/BuildSrcUpdateFactory.java            |   61 +
 .../environment/GradleBuildEnvironment.java        |   22 +
 .../exceptions/AbstractMultiCauseException.java    |  111 +
 .../org/gradle/internal/exceptions/Contextual.java |   29 +
 .../exceptions/FailureResolutionAware.java         |   28 +
 .../exceptions/LocationAwareException.java         |  168 +
 .../internal/exceptions/MultiCauseException.java   |   22 +
 .../featurelifecycle/DeprecatedFeatureHandler.java |   26 +
 .../featurelifecycle/DeprecatedFeatureUsage.java   |   77 +
 .../LoggingDeprecatedFeatureHandler.java           |   76 +
 .../ScriptUsageLocationReporter.java               |   91 +
 .../featurelifecycle/UsageLocationReporter.java    |   21 +
 .../internal/graph/CachingDirectedGraphWalker.java |  203 +
 .../org/gradle/internal/graph/DirectedGraph.java   |   26 +
 .../internal/graph/DirectedGraphRenderer.java      |   80 +
 .../graph/DirectedGraphWithEdgeValues.java         |   25 +
 .../org/gradle/internal/graph/GraphAggregator.java |   90 +
 .../gradle/internal/graph/GraphNodeRenderer.java   |   22 +
 .../org/gradle/internal/graph/GraphRenderer.java   |   69 +
 .../internal/progress/BuildProgressFilter.java     |   94 +
 .../internal/progress/BuildProgressLogger.java     |  108 +
 .../gradle/internal/progress/LoggerProvider.java   |   30 +
 .../internal/progress/OperationIdentifier.java     |   40 +
 .../internal/progress/OperationsHierarchy.java     |   92 +
 .../progress/OperationsHierarchyKeeper.java        |   40 +
 .../progress/PercentageProgressFormatter.java      |   40 +
 .../internal/progress/ProgressFormatter.java       |   21 +
 .../internal/progress/ProgressLoggerProvider.java  |   33 +
 .../internal/progress/SimpleProgressFormatter.java |   39 +
 .../scopes/BuildScopeServiceRegistryFactory.java   |   50 +
 .../service/scopes/BuildScopeServices.java         |  299 ++
 .../service/scopes/GlobalScopeServices.java        |  172 +
 .../service/scopes/GradleScopeServices.java        |  120 +
 .../service/scopes/PluginServiceRegistry.java      |   43 +
 .../service/scopes/ProjectScopeServices.java       |  176 +
 .../service/scopes/ServiceRegistryFactory.java     |   31 +
 .../service/scopes/SettingsScopeServices.java      |   55 +
 .../service/scopes/TaskExecutionServices.java      |   97 +
 .../internal/service/scopes/TaskScopeServices.java |   58 +
 .../org/gradle/internal/text/TreeFormatter.java    |  146 +
 .../typeconversion/CharSequenceNotationParser.java |   28 +
 .../ClosureToSpecNotationParser.java               |   36 +
 .../typeconversion/CompositeNotationParser.java    |   46 +
 .../EnumFromCharSequenceNotationParser.java        |   63 +
 .../ErrorHandlingNotationParser.java               |   66 +
 .../typeconversion/FlatteningNotationParser.java   |   50 +
 .../typeconversion/JustReturningParser.java        |   38 +
 .../org/gradle/internal/typeconversion/MapKey.java |   28 +
 .../internal/typeconversion/MapNotationParser.java |  131 +
 .../typeconversion/NormalizedTimeUnit.java         |   42 +
 .../internal/typeconversion/NotationParser.java    |   32 +
 .../typeconversion/NotationParserBuilder.java      |   84 +
 .../internal/typeconversion/TimeUnitsParser.java   |   43 +
 .../typeconversion/TypeConversionException.java    |   26 +
 .../gradle/internal/typeconversion/TypeInfo.java   |   33 +
 .../typeconversion/TypedNotationParser.java        |   47 +
 .../UnsupportedNotationException.java              |   28 +
 .../typeconversion/ValueAwareNotationParser.java   |   23 +
 .../org/gradle/invocation/DefaultGradle.java       |   79 +-
 .../org/gradle/listener/ActionBroadcast.java       |   21 +-
 .../org/gradle/listener/BroadcastDispatch.java     |   42 +-
 .../org/gradle/listener/ListenerBroadcast.java     |   18 +-
 .../listener/ListenerNotificationException.java    |   10 +-
 .../org/gradle/logging/LoggingServiceRegistry.java |    2 +-
 .../groovy/org/gradle/logging/ProgressLogger.java  |    9 +
 .../org/gradle/logging/ProgressLoggerFactory.java  |    4 +
 .../org/gradle/logging/StandardOutputCapture.java  |    3 -
 .../AbstractLineChoppingStyledTextOutput.java      |    2 +-
 .../internal/ConsoleBackedProgressRenderer.java    |   65 +-
 .../logging/internal/DefaultLoggingConfigurer.java |    4 -
 .../logging/internal/DefaultLoggingManager.java    |    7 +-
 .../internal/DefaultProgressLoggerFactory.java     |   38 +-
 .../internal/DefaultStandardOutputRedirector.java  |   10 +-
 .../internal/DefaultStatusBarFormatter.java        |   24 +-
 .../logging/internal/EmbeddedLoggingServices.java  |    3 -
 .../internal/LoggingBackedStyledTextOutput.java    |   79 +-
 .../internal/LoggingCommandLineConverter.java      |   59 +-
 .../gradle/logging/internal/LoggingConfigurer.java |    3 -
 .../gradle/logging/internal/NoOpLoggingSystem.java |    3 -
 .../logging/internal/PrintStreamLoggingSystem.java |   10 +-
 .../logging/internal/ProgressCompleteEvent.java    |    8 +-
 .../org/gradle/logging/internal/ProgressEvent.java |    8 +-
 .../logging/internal/ProgressStartEvent.java       |   14 +-
 .../logging/internal/StatusBarFormatter.java       |   23 -
 .../logging/internal/StdErrLoggingSystem.java      |    3 -
 .../logging/internal/StdOutLoggingSystem.java      |    3 -
 .../internal/StyledTextOutputBackedRenderer.java   |    3 -
 .../internal/logback/LogbackLoggingConfigurer.java |    6 +-
 .../internal/progress/ProgressOperation.java       |   50 +
 .../internal/progress/ProgressOperations.java      |   52 +
 .../groovy/org/gradle/model/ModelFinalizer.java    |   30 +
 .../main/groovy/org/gradle/model/ModelPath.java    |   90 +
 .../main/groovy/org/gradle/model/ModelRule.java    |   40 +
 .../main/groovy/org/gradle/model/ModelRules.java   |   57 +
 .../src/main/groovy/org/gradle/model/Path.java     |   34 +
 .../main/groovy/org/gradle/model/dsl/ModelDsl.java |   26 +
 .../gradle/model/dsl/internal/GroovyModelDsl.java  |   84 +
 .../org/gradle/model/internal/DefaultInputs.java   |   42 +
 .../model/internal/DefaultModelRegistry.java       |  253 ++
 .../groovy/org/gradle/model/internal/Inputs.java   |   25 +
 .../model/internal/ModelCreationListener.java      |   25 +
 .../org/gradle/model/internal/ModelCreator.java    |   25 +
 .../org/gradle/model/internal/ModelMutation.java   |   39 +
 .../org/gradle/model/internal/ModelMutator.java    |   25 +
 .../org/gradle/model/internal/ModelRegistry.java   |   38 +
 .../internal/ModelRegistryBackedModelRules.java    |  129 +
 .../model/internal/rules/ReflectiveRule.java       |  207 +
 .../groovy/org/gradle/plugin/PluginHandler.java    |   31 +
 .../plugin/internal/DefaultPluginHandler.java      |   48 +
 .../internal/NonPluggableTargetPluginHandler.java  |   38 +
 .../plugin/internal/PluginRequestApplicator.java   |   50 +
 .../internal/PluginResolutionApplicator.java       |   39 +
 .../plugin/internal/PluginResolverFactory.java     |   95 +
 .../gradle/plugin/internal/PluginResolvers.java    |   59 +
 .../internal/ClassPathPluginResolution.java        |   46 +
 .../resolve/internal/CompositePluginResolver.java  |   48 +
 .../resolve/internal/DefaultPluginRequest.java     |   78 +
 .../DependencyResolvingClasspathProvider.java      |   46 +
 .../internal/InvalidPluginRequestException.java    |   25 +
 .../resolve/internal/JCenterPluginMapper.java      |  113 +
 .../internal/JCenterRepositoryConfigurer.java      |   26 +
 .../internal/ModuleMappingPluginResolver.java      |   68 +
 .../NotInPluginRegistryPluginResolverCheck.java    |   61 +
 .../internal/PluginRegistryPluginResolver.java     |   56 +
 .../plugin/resolve/internal/PluginRequest.java     |   33 +
 .../resolve/internal/PluginRequestSerializer.java  |   34 +
 .../plugin/resolve/internal/PluginResolution.java  |   31 +
 .../plugin/resolve/internal/PluginResolver.java    |   33 +
 .../resolve/internal/SimplePluginResolution.java   |   34 +
 .../groovy/org/gradle/process/BaseExecSpec.java    |    2 -
 .../main/groovy/org/gradle/process/ExecResult.java |    2 -
 .../main/groovy/org/gradle/process/ExecSpec.java   |    2 -
 .../groovy/org/gradle/process/JavaExecSpec.java    |    2 -
 .../internal/AbstractExecHandleBuilder.java        |    3 -
 .../process/internal/BadExitCodeException.java     |    3 -
 .../gradle/process/internal/DefaultExecAction.java |    8 -
 .../gradle/process/internal/DefaultExecHandle.java |   19 +-
 .../process/internal/DefaultJavaExecAction.java    |    3 -
 .../process/internal/DefaultWorkerProcess.java     |   11 +-
 .../internal/DefaultWorkerProcessFactory.java      |   15 +-
 .../org/gradle/process/internal/ExecAction.java    |    5 +-
 .../gradle/process/internal/ExecActionFactory.java |   21 +
 .../org/gradle/process/internal/ExecException.java |    3 -
 .../org/gradle/process/internal/ExecHandle.java    |    3 -
 .../gradle/process/internal/ExecHandleBuilder.java |    3 -
 .../process/internal/ExecHandleListener.java       |    3 -
 .../gradle/process/internal/ExecHandleRunner.java  |   22 +-
 .../internal/ExecHandleShutdownHookAction.java     |    2 -
 .../gradle/process/internal/ExecHandleState.java   |    3 -
 .../gradle/process/internal/JavaExecAction.java    |    5 +-
 .../process/internal/JavaExecHandleBuilder.java    |    6 +-
 .../org/gradle/process/internal/JvmOptions.java    |    2 +-
 .../process/internal/ProcessBuilderFactory.java    |    2 -
 .../internal/ProcessParentingInitializer.java      |   87 -
 .../gradle/process/internal/ProcessSettings.java   |    3 -
 .../org/gradle/process/internal/WorkerProcess.java |    9 +-
 .../process/internal/WorkerProcessBuilder.java     |   10 +
 .../process/internal/WorkerProcessContext.java     |    2 +-
 ...ionClassesInSystemClassLoaderWorkerFactory.java |    4 +-
 .../process/internal/child/EncodedStream.java      |    2 -
 .../child/ImplementationClassLoaderWorker.java     |    6 +-
 .../IsolatedApplicationClassLoaderWorker.java      |    2 +-
 .../child/SystemApplicationClassLoaderWorker.java  |    1 -
 .../child/WorkerProcessClassPathProvider.java      |   24 +-
 .../shutdown/ShutdownHookActionRegister.java       |   19 -
 .../internal/streams/ExecOutputHandleRunner.java   |    5 +-
 .../process/internal/streams/SafeStreams.java      |    3 -
 .../process/internal/streams/StreamsForwarder.java |    8 +-
 .../process/internal/streams/StreamsHandler.java   |    5 +-
 .../groovy/org/gradle/profile/BuildProfile.java    |  126 +-
 .../org/gradle/profile/CompositeOperation.java     |    4 +
 .../org/gradle/profile/ContinuousOperation.java    |   20 +-
 .../gradle/profile/DependencyResolveProfile.java   |   30 -
 .../org/gradle/profile/EvalutationOperation.java   |   31 -
 .../main/groovy/org/gradle/profile/Operation.java  |   21 +
 .../org/gradle/profile/ProfileEventAdapter.java    |   40 +-
 .../org/gradle/profile/ProfileReportRenderer.java  |   59 +-
 .../groovy/org/gradle/profile/ProjectProfile.java  |   54 +-
 .../groovy/org/gradle/profile/TaskExecution.java   |   23 +-
 .../org/gradle/reporting/HtmlReportRenderer.java   |    4 +-
 .../org/gradle/reporting/ReportRenderer.java       |    4 +-
 .../org/gradle/reporting/TabbedPageRenderer.java   |   12 +-
 .../org/gradle/reporting/TextReportRenderer.java   |    4 +-
 .../testfixtures/internal/GlobalTestServices.java  |   60 -
 .../internal/InMemoryCacheFactory.java             |   48 +-
 .../internal/InMemoryIndexedCache.java             |   70 +
 .../testfixtures/internal/ProjectBuilderImpl.java  |   31 +-
 .../internal/TestBuildScopeServices.java           |   46 +
 .../internal/TestGlobalScopeServices.java          |   67 +
 .../internal/TestTopLevelBuildServiceRegistry.java |   52 -
 .../provider/model/ToolingModelBuilder.java        |   29 +
 .../model/ToolingModelBuilderRegistry.java         |   29 +
 .../provider/model/UnknownModelException.java      |   31 +
 .../DefaultToolingModelBuilderRegistry.java        |   64 +
 .../model/internal/LegacyConsumerInterface.java    |   29 +
 .../tooling/provider/model/package-info.java       |   20 +
 .../src/main/groovy/org/gradle/util/AntUtil.java   |    7 +-
 .../org/gradle/util/AvailablePortFinder.java       |    2 -
 .../gradle/util/BuildCommencedTimeProvider.java    |    4 +-
 .../util/ClassLoaderBackedClasspathSource.java     |   43 -
 .../groovy/org/gradle/util/ClassLoaderFactory.java |   41 -
 .../groovy/org/gradle/util/ClasspathSource.java    |   23 -
 .../main/groovy/org/gradle/util/ClasspathUtil.java |   98 -
 .../src/main/groovy/org/gradle/util/Clock.java     |    3 -
 .../main/groovy/org/gradle/util/ConfigureUtil.java |    3 -
 .../org/gradle/util/DefaultClassLoaderFactory.java |   86 -
 .../main/groovy/org/gradle/util/DeleteOnExit.java  |   52 -
 .../org/gradle/util/DistributionLocator.java       |    4 +-
 .../org/gradle/util/FilteringClassLoader.java      |  212 -
 .../main/groovy/org/gradle/util/GFileUtils.java    |   18 +-
 .../src/main/groovy/org/gradle/util/GUtil.java     |   12 +-
 .../main/groovy/org/gradle/util/GradleVersion.java |  116 +-
 .../src/main/groovy/org/gradle/util/JarUtil.java   |    5 +-
 .../main/groovy/org/gradle/util/JavaMethod.java    |   75 -
 .../org/gradle/util/LineBufferingOutputStream.java |   27 +-
 .../util/LinePerThreadBufferingOutputStream.java   |   10 +-
 .../org/gradle/util/MultiParentClassLoader.java    |  103 -
 .../org/gradle/util/MutableURLClassLoader.java     |   48 -
 .../core/src/main/groovy/org/gradle/util/Path.java |    3 -
 .../groovy/org/gradle/util/ReflectionUtil.groovy   |   46 -
 .../org/gradle/util/SingleMessageLogger.java       |  187 +-
 .../main/groovy/org/gradle/util/StdoutSwapper.java |   39 -
 .../src/main/groovy/org/gradle/util/TextUtil.java  |    7 +
 .../main/groovy/org/gradle/util/VersionNumber.java |   19 +-
 .../main/groovy/org/gradle/util/hash/HashUtil.java |   84 -
 .../groovy/org/gradle/util/hash/HashValue.java     |   90 -
 .../gradle/util/internal/LimitedDescription.java   |    2 -
 .../org/gradle/configuration/default-imports.txt   |   38 -
 .../buildsrc/defaultBuildSourceScript.txt          |    6 +
 .../initialization/defaultBuildSourceScript.txt    |    5 -
 .../resources/org/gradle/reporting/base-style.css  |    2 +-
 .../org/gradle/BuildExceptionReporterTest.groovy   |   91 +-
 .../groovy/org/gradle/StartParameterTest.groovy    |   28 -
 .../org/gradle/TaskExecutionLoggerTest.groovy      |    6 +-
 .../org/gradle/api/AllGradleExceptionsTest.groovy  |    6 +-
 .../org/gradle/api/file/ProjectCopySpecTest.groovy |  104 +
 .../AbstractMultiCauseExceptionTest.groovy         |   97 -
 .../AbstractNamedDomainObjectContainerTest.groovy  |  263 +-
 .../gradle/api/internal/AbstractTaskSpec.groovy    |    4 +-
 .../AsmBackedClassGeneratorGroovyTest.groovy       |  221 +-
 .../api/internal/AsmBackedClassGeneratorTest.java  |   67 +-
 .../internal/CachingDirectedGraphWalkerTest.groovy |  197 -
 .../api/internal/ChainingTransformerTest.java      |   12 +-
 .../internal/CompositeDomainObjectSetTest.groovy   |   29 +-
 .../api/internal/ConventionAwareHelperTest.java    |   15 +-
 .../DefaultDomainObjectCollectionTest.java         |   24 +-
 .../DefaultNamedDomainObjectCollectionTest.groovy  |   57 +
 .../internal/DefaultNamedDomainObjectSetTest.java  |   20 +-
 ...PolymorphicDomainObjectContainerBaseTest.groovy |   42 +
 ...tPolymorphicDomainObjectContainerDslTest.groovy |   88 +-
 ...aultPolymorphicDomainObjectContainerTest.groovy |  101 +-
 .../org/gradle/api/internal/DefaultTaskTest.groovy |  218 +-
 .../api/internal/DocumentationRegistryTest.groovy  |   47 +-
 .../api/internal/ExtensibleDynamicObjectTest.java  |    6 +-
 .../gradle/api/internal/GraphAggregatorTest.groovy |   65 -
 .../api/internal/LocationAwareExceptionTest.groovy |  184 -
 .../org/gradle/api/internal/TestContainer.java     |    6 +-
 .../artifacts/DefaultExcludeRuleContainerTest.java |    3 -
 .../artifacts/ProjectBackedModuleTest.groovy       |    5 +-
 .../AbstractModuleDependencySpec.groovy            |    4 +-
 .../dependencies/AbstractModuleDependencyTest.java |    7 +-
 .../dependencies/DefaultClientModuleTest.java      |    3 -
 .../DefaultDependencyArtifactTest.java             |    6 +-
 .../DefaultExternalModuleDependencyTest.java       |    3 -
 .../DefaultProjectDependencyTest.groovy            |   14 +-
 .../DefaultDependencyHandlerTest.groovy            |   17 +-
 .../dependencies/ModuleFactoryDelegateTest.java    |    9 +-
 .../publish/AbstractPublishArtifactTest.java       |    6 +-
 .../publish/ArchivePublishArtifactTest.groovy      |   90 +-
 .../publish/DefaultPublishArtifactTest.java        |    3 -
 ...meAfterContainerInclusionDeprecationTest.groovy |   11 +-
 .../LatestVersionSemanticComparatorSpec.groovy     |   76 -
 .../CacheBackedFileSnapshotRepositoryTest.groovy   |   65 -
 .../changedetection/CachingHasherTest.java         |  108 -
 .../CompositeUpToDateRuleTest.groovy               |   69 -
 .../DefaultFileSnapshotterTest.groovy              |  330 --
 .../DefaultTaskArtifactStateCacheAccessTest.groovy |   53 -
 .../DefaultTaskArtifactStateRepositoryTest.java    |  606 ---
 ...BroadcastTaskArtifactStateRepositoryTest.groovy |  107 -
 ...hortCircuitTaskArtifactStateRepositoryTest.java |  165 -
 .../DefaultTaskArtifactStateRepositoryTest.groovy  |  695 +++
 ...rtCircuitTaskArtifactStateRepositoryTest.groovy |  112 +
 .../rules/CachingTaskStateChangesTest.groovy       |   84 +
 .../rules/InputFilesStateChangeRuleTest.groovy     |   78 +
 .../rules/OutputFilesStateChangeRuleTest.groovy    |   82 +
 .../rules/SimpleTaskStateChangesTest.groovy        |   56 +
 .../rules/SummaryTaskStateChangesTest.groovy       |   89 +
 .../CacheBackedFileSnapshotRepositoryTest.groovy   |   68 +
 .../state/CachingFileSnapshotterTest.groovy        |  106 +
 .../DefaultFileCollectionSnapshotterTest.groovy    |  352 ++
 .../DefaultFileSnapshotterSerializerTest.groovy    |   38 +
 .../DefaultTaskArtifactStateCacheAccessTest.groovy |   44 +
 .../state/InMemoryTaskArtifactCacheTest.groovy     |  136 +
 .../state/OutputFilesSnapshotSerializerTest.groovy |   41 +
 ...peCoercingMethodArgumentsTransformerTest.groovy |   68 +
 .../internal/file/AbstractFileCollectionTest.java  |   10 +-
 .../internal/file/AbstractFileTreeElementTest.java |    6 +-
 .../internal/file/BaseDirFileResolverSpec.groovy   |    8 +-
 .../internal/file/BaseDirFileResolverTest.groovy   |    6 +-
 .../internal/file/CompositeFileCollectionTest.java |    6 +-
 .../api/internal/file/CompositeFileTreeTest.java   |    6 +-
 .../file/DefaultCompositeFileTreeTest.groovy       |   67 +
 .../internal/file/DefaultFileOperationsTest.groovy |   48 +-
 .../file/DefaultFileTreeElementTest.groovy         |   15 +-
 .../file/DelegatingFileCollectionTest.groovy       |  104 +
 .../file/FileOrUriNotationParserTest.groovy        |    3 +-
 .../LazilyInitializedFileCollectionTest.groovy     |   52 +
 .../file/MaybeCompressedFileResourceTest.groovy    |    3 -
 .../internal/file/archive/TarCopyActionTest.java   |  245 ++
 .../file/archive/TarCopySpecVisitorTest.java       |  250 --
 .../api/internal/file/archive/TarFileTreeTest.java |    7 +-
 .../internal/file/archive/ZipCopyActionTest.groovy |  193 +
 .../file/archive/ZipCopySpecVisitorTest.java       |  245 --
 .../api/internal/file/archive/ZipFileTreeTest.java |    3 +-
 .../file/archive/compression/ArchiversTest.groovy  |    3 -
 .../DefaultConfigurableFileCollectionTest.java     |   12 +-
 .../DefaultConfigurableFileTreeTest.groovy         |   24 +-
 .../file/collections/DirectoryFileTreeTest.java    |    6 +-
 .../internal/file/collections/MapFileTreeTest.java |   11 +-
 .../file/copy/CopyActionExecuterTest.groovy        |   72 +
 .../internal/file/copy/CopyActionImplTest.groovy   |   95 -
 .../file/copy/CopyFileVisitorImplTest.groovy       |  106 +
 .../file/copy/CopySpecActionImplTest.groovy        |   45 +
 ...SpecBackedCopyActionProcessingStreamTest.groovy |   41 +
 .../api/internal/file/copy/CopySpecImplTest.groovy |  350 --
 .../internal/file/copy/CopySpecMatchingTest.groovy |   88 +
 .../internal/file/copy/DefaultCopySpecTest.groovy  |  505 +++
 .../internal/file/copy/DeleteActionImplTest.groovy |    3 -
 ...DuplicateHandlingCopyActionDecoratorTest.groovy |  196 +
 .../internal/file/copy/FileCopyActionImplTest.java |   54 -
 .../api/internal/file/copy/FileCopyActionTest.java |   66 +
 .../file/copy/FileCopySpecVisitorTest.java         |   92 -
 .../api/internal/file/copy/FilterChainTest.java    |    4 +-
 .../file/copy/MappingCopySpecVisitorTest.java      |  400 --
 .../copy/NormalizingCopyActionDecoratorTest.java   |  152 +
 .../file/copy/NormalizingCopySpecVisitorTest.java  |  226 -
 .../file/copy/SyncCopyActionDecoratorTest.groovy   |   57 +
 .../file/copy/SyncCopySpecVisitorTest.java         |  169 -
 .../file/pattern/DefaultPatternMatcherTest.java    |  218 -
 .../file/pattern/FixedPatternStepTest.groovy       |   42 +
 .../file/pattern/FixedStepsPathMatcherTest.groovy  |  112 +
 .../file/pattern/GreedyPathMatcherTest.groovy      |   69 +
 .../file/pattern/NameOnlyPatternMatcherTest.java   |   70 -
 .../file/pattern/PatternMatcherFactoryTest.java    |  195 +-
 .../file/pattern/PatternStepFactoryTest.groovy     |  116 +
 .../file/pattern/PatternStepFactoryTest.java       |   40 -
 .../file/pattern/RegExpPatternStepTest.java        |   66 +-
 .../pattern/WildcardPrefixPatternStepTest.groovy   |   47 +
 .../DefaultClassLoaderCacheTest.groovy             |   80 +
 .../DefaultClassLoaderScopeTest.groovy             |  241 ++
 .../DefaultScriptHandlerFactoryTest.groovy         |   48 +-
 .../initialization/DefaultScriptHandlerTest.groovy |   92 +-
 .../parsers/CharSequenceNotationParserTest.groovy  |   47 -
 .../parsers/ClosureToSpecNotationParserTest.groovy |   40 -
 .../parsers/ErrorHandlingNotationParserTest.groovy |   62 -
 .../notations/parsers/MapNotationParserTest.groovy |  110 -
 .../notations/parsers/TimeUnitsParserTest.groovy   |   54 -
 .../parsers/TypedNotationParserTest.groovy         |   53 -
 .../internal/plugins/DefaultConventionTest.groovy  |    6 +-
 .../DefaultObjectConfigurationActionTest.groovy    |   95 +-
 .../plugins/DefaultPluginContainerTest.java        |  128 +
 .../plugins/DefaultPluginRegistryTest.groovy       |   23 +-
 .../DefaultProjectsPluginContainerTest.java        |  131 -
 .../internal/plugins/ExtensionContainerTest.groovy |    3 -
 .../internal/plugins/ExtensionsStorageTest.groovy  |   76 +
 .../project/DefaultAntBuilderFactoryTest.groovy    |    4 +-
 .../internal/project/DefaultAntBuilderTest.groovy  |    4 +-
 .../project/DefaultIsolatedAntBuilderTest.groovy   |    4 +-
 .../project/DefaultProjectRegistryTest.java        |   23 +-
 .../api/internal/project/DefaultProjectTest.groovy |  413 +-
 .../project/GlobalServicesRegistryTest.java        |  142 -
 .../GradleInternalServiceRegistryTest.groovy       |  102 -
 .../internal/project/NewDefaultProjectTest.groovy  |    7 +-
 .../api/internal/project/ProjectFactoryTest.groovy |  100 +
 .../api/internal/project/ProjectFactoryTest.java   |  208 -
 .../ProjectInternalServiceRegistryTest.java        |  276 --
 .../project/TaskExecutionServicesTest.groovy       |   54 -
 .../project/TaskInternalServiceRegistryTest.java   |   90 -
 .../gradle/api/internal/project/TestPlugin1.groovy |    3 -
 .../gradle/api/internal/project/TestPlugin2.groovy |    3 -
 .../TopLevelBuildServiceRegistryTest.groovy        |  264 --
 .../AnnotationProcessingTaskFactoryTest.java       |  116 +-
 .../project/taskfactory/TaskFactoryTest.groovy     |   25 +-
 .../api/internal/resource/UriResourceTest.groovy   |    5 +-
 .../api/internal/resources/URIBuilderTest.groovy   |    3 -
 .../internal/tasks/DefaultTaskContainerTest.groovy |  144 +-
 .../execution/ExecuteActionsTaskExecuterTest.java  |   79 +-
 .../ExecuteAtMostOnceTaskExecuterTest.groovy       |   22 +-
 .../PostExecutionAnalysisTaskExecuterTest.groovy   |   66 +-
 .../SkipEmptySourceFilesTaskExecuterTest.groovy    |   12 +-
 .../execution/SkipOnlyIfTaskExecuterTest.java      |   11 +-
 .../SkipTaskWithNoActionsExecuterTest.groovy       |   14 +-
 .../execution/SkipUpToDateTaskExecuterTest.groovy  |  110 +
 .../execution/SkipUpToDateTaskExecuterTest.java    |  141 -
 .../execution/ValidatingTaskExecuterTest.groovy    |   16 +-
 .../options/InstanceOptionDescriptorSpec.groovy    |   54 +
 .../options/OptionNotationParserFactorySpec.groovy |   56 +
 .../internal/tasks/options/OptionReaderTest.groovy |  315 ++
 .../tasks/util/DefaultJavaForkOptionsTest.groovy   |    9 +-
 .../api/internal/xml/SimpleXmlWriterSpec.groovy    |   17 +-
 .../api/plugins/TestPluginConvention1.groovy       |    3 -
 .../api/plugins/TestPluginConvention2.groovy       |    3 -
 .../gradle/api/tasks/AbstractCopyTaskTest.groovy   |   80 +
 .../org/gradle/api/tasks/AbstractCopyTaskTest.java |   99 -
 .../groovy/org/gradle/api/tasks/CopyTest.groovy    |   67 +-
 .../groovy/org/gradle/api/tasks/DeleteTest.java    |   33 +-
 .../org/gradle/api/tasks/DirectoryTest.groovy      |    8 +-
 .../org/gradle/api/tasks/GradleBuildTest.groovy    |   63 +-
 .../groovy/org/gradle/api/tasks/SyncTest.groovy    |   27 +
 .../groovy/org/gradle/api/tasks/UploadTest.groovy  |   32 -
 .../org/gradle/api/tasks/ant/AntTargetTest.java    |   10 +-
 .../org/gradle/api/tasks/bundling/TarTest.groovy   |   11 +-
 .../org/gradle/api/tasks/bundling/ZipTest.groovy   |    7 +-
 .../tasks/util/AbstractTestForPatternSet.groovy    |   12 +-
 .../internal/AbstractFileLockManagerTest.groovy    |  532 +++
 .../cache/internal/DefaultCacheAccessTest.groovy   |  609 +--
 .../cache/internal/DefaultCacheFactoryTest.groovy  |  309 +-
 .../internal/DefaultCacheRepositoryTest.groovy     |  102 +-
 .../internal/DefaultCacheScopeMappingTest.groovy   |  142 +
 .../internal/DefaultFileLockManagerTest.groovy     |  474 --
 ...eLockManagerWithCrossVersionProtocolTest.groovy |   54 +
 ...efaultFileLockManagerWithNewProtocolTest.groovy |  281 ++
 .../DefaultPersistentDirectoryCacheSpec.groovy     |    3 +-
 .../DefaultPersistentDirectoryCacheTest.java       |   49 +-
 .../DefaultPersistentDirectoryStoreTest.groovy     |   10 +-
 ...gateOnDemandPersistentDirectoryCacheSpec.groovy |  103 -
 .../cache/internal/FileLockCommunicatorTest.groovy |   99 +
 ...ltiProcessSafePersistentIndexedCacheTest.groovy |   14 +-
 .../cache/internal/OnDemandFileAccessTest.groovy   |    8 +-
 .../cacheops/CacheAccessOperationsStackTest.groovy |   43 +
 .../cacheops/CacheOperationStackTest.groovy        |  117 +
 .../filelock/LockOptionsBuilderTest.groovy         |   35 +
 .../DefaultFileLockContentionHandlerTest.groovy    |  185 +
 .../configuration/BuildScriptProcessorTest.java    |   59 -
 .../DefaultBuildConfigurerTest.groovy              |   21 +-
 .../DefaultInitScriptProcessorTest.groovy          |   51 +
 .../DefaultInitScriptProcessorTest.java            |   51 -
 .../DefaultScriptPluginFactoryTest.groovy          |  119 +
 .../DefaultScriptPluginFactoryTest.java            |  194 -
 .../ImplicitTasksConfigurerTest.groovy             |   33 -
 .../gradle/configuration/ImportsReaderTest.groovy  |   33 +-
 .../LifecycleProjectEvaluatorTest.groovy           |   90 -
 .../ProjectDependencies2TaskResolverTest.groovy    |   40 -
 .../project/BuildScriptProcessorTest.groovy        |   51 +
 .../ConfigureActionsProjectEvaluatorTest.groovy    |   59 +
 ...tProjectConfigurationActionContainerTest.groovy |   52 +
 .../project/DelayedConfigurationActionsTest.groovy |   70 +
 .../project/LifecycleProjectEvaluatorTest.groovy   |  152 +
 .../PluginsProjectConfigureActionsTest.groovy      |   52 +
 .../ProjectDependencies2TaskResolverTest.groovy    |   37 +
 ...askFilteringBuildConfigurationActionTest.groovy |    7 +-
 .../execution/ProjectEvaluatingActionTest.groovy   |    3 -
 .../gradle/execution/TaskNameResolverTest.groovy   |   50 +-
 ...kNameResolvingBuildConfigurationActionTest.java |   61 +-
 .../execution/TaskPathProjectEvaluatorTest.groovy  |    3 -
 .../CommandLineTaskConfigurerSpec.groovy           |   86 +-
 .../commandline/CommandLineTaskParserSpec.groovy   |   34 +-
 .../taskgraph/DefaultTaskExecutionPlanTest.groovy  |  759 +++-
 .../taskgraph/DefaultTaskGraphExecuterTest.java    |   51 +-
 .../taskgraph/DefaultTaskPlanExecutorTest.groovy   |   58 +
 .../taskgraph/ParallelTaskExecutionPlanTest.groovy |   26 -
 .../taskgraph/TaskDependencyGraphTest.groovy       |   78 +
 .../taskgraph/TaskPlanExecutorFactoryTest.groovy   |    8 +-
 .../taskpath/ProjectFinderByTaskPathTest.groovy    |   11 +-
 .../execution/taskpath/ResolvedTaskPathTest.groovy |    3 -
 .../execution/taskpath/TaskPathResolverTest.groovy |    3 -
 .../gradle/groovy/scripts/DefaultScriptTest.groovy |   18 +-
 .../org/gradle/groovy/scripts/EmptyScript.java     |    3 -
 .../DefaultScriptCompilationHandlerTest.java       |    3 -
 .../FileCacheBackedScriptClassCompilerTest.groovy  |   42 +-
 .../initialization/BuildFileProjectSpecTest.java   |    6 +-
 .../BuildLayoutParametersTest.groovy               |   51 +
 .../initialization/BuildProgressLoggerTest.groovy  |   80 -
 .../initialization/BuildSourceBuilderTest.groovy   |  171 -
 .../DefaultCommandLineConverterTest.java           |    3 -
 .../DefaultExceptionAnalyserTest.java              |   61 +-
 .../DefaultGradleLauncherFactoryTest.groovy        |    8 +-
 .../initialization/DefaultGradleLauncherTest.java  |   32 +-
 .../DefaultGradlePropertiesLoaderTest.java         |    3 -
 .../DefaultProjectDescriptorRegistryTest.java      |   18 +-
 .../DefaultProjectDescriptorTest.java              |   41 +-
 .../initialization/DefaultSettingsTest.groovy      |  107 +-
 .../DependencyResolutionLoggerTest.groovy          |    4 +-
 .../InstantiatingBuildLoaderTest.groovy            |  112 +-
 .../LayoutCommandLineConverterTest.groovy          |   46 +-
 .../ProjectDirectoryProjectSpecTest.java           |    6 +-
 .../initialization/ProjectPathProjectSpecTest.java |  117 +
 .../ProjectPropertySettingBuildLoaderTest.groovy   |   17 +-
 .../gradle/initialization/ProjectSpecsTest.groovy  |   79 +
 .../PropertiesLoadingSettingsProcessorTest.java    |    9 +-
 .../ScriptEvaluatingSettingsProcessorTest.groovy   |  101 -
 .../initialization/SettingsFactoryTest.groovy      |   76 +
 .../gradle/initialization/SettingsFactoryTest.java |   70 -
 .../initialization/SettingsHandlerTest.groovy      |   64 +
 .../gradle/initialization/SettingsHandlerTest.java |  132 -
 .../buildsrc/BuildSourceBuilderTest.groovy         |   58 +
 .../BuildSrcBuildListenerFactoryTest.groovy        |   62 +
 .../buildsrc/BuildSrcUpdateFactoryTest.groovy      |   67 +
 .../AbstractMultiCauseExceptionTest.groovy         |  125 +
 .../exceptions/LocationAwareExceptionTest.groovy   |  184 +
 .../DeprecatedFeatureUsageTest.groovy              |   38 +
 .../LoggingDeprecatedFeatureHandlerTest.groovy     |   57 +
 .../ScriptUsageLocationReporterTest.groovy         |  126 +
 .../graph/CachingDirectedGraphWalkerTest.groovy    |  266 ++
 .../graph/DirectedGraphRendererTest.groovy         |  140 +
 .../internal/graph/GraphAggregatorTest.groovy      |   65 +
 .../progress/BuildProgressFilterTest.groovy        |   86 +
 .../progress/BuildProgressLoggerTest.groovy        |  175 +
 .../progress/OperationsHierarchyKeeperTest.groovy  |   64 +
 .../progress/OperationsHierarchyTest.groovy        |  136 +
 .../PercentageProgressFormatterTest.groovy         |   39 +
 .../progress/SimpleProgressFormatterTest.groovy    |   45 +
 .../service/scopes/BuildScopeServicesTest.groovy   |  305 ++
 .../service/scopes/GlobalScopeServicesTest.java    |  172 +
 .../service/scopes/GradleScopeServicesTest.groovy  |  153 +
 .../service/scopes/ProjectScopeServicesTest.groovy |  219 +
 .../scopes/SettingsScopeServicesTest.groovy        |   75 +
 .../scopes/TaskExecutionServicesTest.groovy        |   58 +
 .../service/scopes/TaskScopeServicesTest.java      |   91 +
 .../gradle/internal/text/TreeFormatterTest.groovy  |  144 +
 .../CharSequenceNotationParserTest.groovy          |   47 +
 .../ClosureToSpecNotationParserTest.groovy         |   36 +
 .../EnumFromCharSequenceNotationParserSpec.groovy  |   46 +
 .../ErrorHandlingNotationParserTest.groovy         |   60 +
 .../typeconversion/MapNotationParserTest.groovy    |  109 +
 .../NotationParserBuilderSpec.groovy               |   47 +
 .../typeconversion/TimeUnitsParserTest.groovy      |   51 +
 .../typeconversion/TypedNotationParserTest.groovy  |   49 +
 .../org/gradle/invocation/DefaultGradleTest.java   |   52 +-
 .../org/gradle/listener/ActionBroadcastTest.groovy |   53 +-
 .../org/gradle/listener/ListenerBroadcastTest.java |   46 +-
 .../ConsoleBackedProgressRendererTest.groovy       |   21 +-
 .../internal/DefaultLoggingManagerTest.java        |    6 +-
 .../DefaultProgressLoggerFactoryTest.groovy        |   10 +
 .../internal/DefaultStatusBarFormatterTest.groovy  |   33 +-
 .../LoggingBackedStyledTextOutputTest.groovy       |   14 +-
 .../LoggingCommandLineConverterTest.groovy         |   16 +-
 .../logging/internal/OutputSpecification.groovy    |   16 +-
 .../progress/ProgressOperationsTest.groovy         |  116 +
 .../model/dsl/internal/GroovyModelDslTest.groovy   |  101 +
 .../ModelRegistryBackedModelRulesTest.groovy       |  102 +
 .../plugin/bintray/JCenterPluginMapperSpec.groovy  |   80 +
 .../internal/DefaultPluginHandlerTest.groovy       |   62 +
 .../process/internal/DefaultExecHandleSpec.groovy  |    3 -
 .../internal/DefaultWorkerProcessTest.groovy       |    5 +-
 .../internal/JavaExecHandleBuilderTest.groovy      |   20 +-
 .../gradle/process/internal/JvmOptionsTest.groovy  |   30 +-
 .../child/ImplementationClassLoaderWorkerTest.java |    2 +-
 .../internal/child/SerializableMockHelper.groovy   |    8 +-
 .../WorkerProcessClassPathProviderTest.groovy      |    6 +-
 .../org/gradle/profile/BuildProfileTest.groovy     |   80 +-
 .../profile/ProfileReportRendererTest.groovy       |  227 +
 .../org/gradle/profile/ProjectProfileTest.groovy   |   34 +
 .../org/gradle/profile/TaskExecutionTest.groovy    |   43 +
 .../gradle/reporting/HtmlReportRendererTest.groovy |    2 +-
 .../DefaultToolingModelBuilderRegistryTest.groovy  |   76 +
 .../util/DefaultClassLoaderFactoryTest.groovy      |   91 -
 .../util/DefaultClassLoaderFactoryTestHelper.java  |   35 -
 .../gradle/util/FilteringClassLoaderTest.groovy    |  182 -
 .../groovy/org/gradle/util/GFileUtilsTest.groovy   |    3 -
 .../test/groovy/org/gradle/util/GUtilTest.groovy   |   19 +
 .../org/gradle/util/GradleVersionTest.groovy       |  124 +-
 .../groovy/org/gradle/util/JavaMethodTest.java     |   68 -
 .../gradle/util/LineBufferingOutputStreamTest.java |  112 +-
 .../LinePerThreadBufferingOutputStreamTest.groovy  |    4 +-
 .../groovy/org/gradle/util/MatchersTest.groovy     |    3 -
 .../gradle/util/MultiParentClassLoaderTest.groovy  |  152 -
 .../test/groovy/org/gradle/util/PathTest.groovy    |    6 +-
 .../org/gradle/util/SingleMessageLoggerTest.groovy |   49 +-
 .../test/groovy/org/gradle/util/StageTest.groovy   |    3 -
 .../org/gradle/util/StdoutSwapperTest.groovy       |   44 -
 .../groovy/org/gradle/util/TextUtilTest.groovy     |   26 +-
 .../org/gradle/util/VersionNumberTest.groovy       |   19 +-
 .../org/gradle/util/hash/HashValueTest.groovy      |   64 -
 .../util/internal/ArgumentsSplitterTest.groovy     |    4 +-
 .../util/internal/LimitedDescriptionTest.groovy    |    3 -
 .../api/internal/file/archive/nomodeinfos.zip      |  Bin 0 -> 276 bytes
 .../api/internal/file/archive/permissions.zip      |  Bin 0 -> 300 bytes
 .../gradle/api/RecordingAntBuildListener.groovy    |   60 +
 .../gradle/api/file/FileCollectionMatchers.java    |   71 +
 .../org/gradle/api/internal/file/TestFiles.java    |   18 +-
 .../internal/file/copy/CopyActionExecuterUtil.java |   40 +
 .../api/tasks/AbstractConventionTaskTest.java      |   12 +-
 .../api/tasks/AbstractCopyTaskContractTest.groovy  |  127 +
 .../gradle/api/tasks/AbstractSpockTaskTest.groovy  |   25 +-
 .../org/gradle/api/tasks/AbstractTaskTest.java     |   22 +-
 .../gradle/api/tasks/TaskDependencyMatchers.java   |   98 +
 .../tasks/bundling/AbstractArchiveTaskTest.groovy  |   11 +-
 .../DefaultFileLockManagerTestHelper.groovy        |    9 +-
 .../NoOpFileLockContentionHandler.java             |   31 +
 .../org/gradle/util/ConcurrentSpecification.groovy |    3 -
 .../groovy/org/gradle/util/HelperUtil.groovy       |  143 -
 .../groovy/org/gradle/util/Matchers.java           |  429 --
 .../groovy/org/gradle/util/TestTask.groovy         |    3 -
 .../groovy/org/gradle/util/TestUtil.groovy         |  146 +
 subprojects/cpp/cpp.gradle                         |   14 +-
 ...alStudioFileCustomizationIntegrationTest.groovy |  207 +
 .../VisualStudioMultiProjectIntegrationTest.groovy |  316 ++
 ...VisualStudioSingleProjectIntegrationTest.groovy |  840 ++++
 .../VisualStudioPluginIntegrationTest.groovy       |   26 +
 .../CppAutoTestedSamplesIntegrationTest.groovy     |   31 +
 .../plugins/AssemblerPluginIntegrationTest.groovy  |   22 +
 .../c/plugins/CPluginIntegrationTest.groovy        |   22 +
 ...tLanguageIncrementalBuildIntegrationTest.groovy |  513 +++
 ...anguageIncrementalCompileIntegrationTest.groovy |  529 +++
 .../cpp/AbstractLanguageIntegrationTest.groovy     |  198 +
 ...yLanguageIncrementalBuildIntegrationTest.groovy |  136 +
 .../cpp/AssemblyLanguageIntegrationTest.groovy     |  110 +
 .../cpp/BinaryBuildTypesIntegrationTest.groovy     |  206 +
 .../cpp/BinaryFlavorsIntegrationTest.groovy        |  227 +
 .../cpp/BinaryPlatformIntegrationTest.groovy       |  349 ++
 ...llingMixedCAndCppLanguageIntegrationTest.groovy |   25 +
 ...CLanguageIncrementalBuildIntegrationTest.groovy |   27 +
 ...anguageIncrementalCompileIntegrationTest.groovy |   26 +
 .../language/cpp/CLanguageIntegrationTest.groovy   |  201 +
 .../language/cpp/CUnitIntegrationTest.groovy       |  387 ++
 .../language/cpp/CppBinariesIntegrationTest.groovy |  371 ++
 .../cpp/CppCallingCLanguageIntegrationTest.groovy  |   25 +
 ...pLanguageIncrementalBuildIntegrationTest.groovy |   25 +
 ...anguageIncrementalCompileIntegrationTest.groovy |   26 +
 .../language/cpp/CppLanguageIntegrationTest.groovy |  114 +
 .../language/cpp/CppPluginGoodBehaviourTest.groovy |   25 +
 .../cpp/DuplicateBaseNamesIntegrationTest.groovy   |  118 +
 ...GccToolChainCustomisationIntegrationTest.groovy |  193 +
 .../GccToolChainDiscoveryIntegrationTest.groovy    |  124 +
 .../cpp/GeneratedSourcesIntegrationTest.groovy     |  383 ++
 .../LibraryApiDependenciesIntegrationTest.groovy   |  237 +
 .../cpp/LibraryBinariesIntegrationTest.groovy      |  298 ++
 .../cpp/LibraryDependenciesIntegrationTest.groovy  |  350 ++
 .../cpp/MixedLanguageIntegrationTest.groovy        |  168 +
 .../cpp/MultipleToolChainIntegrationTest.groovy    |  115 +
 .../cpp/NativeBinariesPluginIntegrationTest.groovy |  226 +
 .../cpp/NativeSamplesIntegrationTest.groovy        |  409 ++
 .../cpp/PrebuiltLibrariesIntegrationTest.groovy    |  349 ++
 .../cpp/SharedLibrarySoNameIntegrationTest.groovy  |   80 +
 .../SourceSetDependenciesIntegrationTest.groovy    |  153 +
 .../cpp/ToolChainDiscoveryIntegrationTest.groovy   |   89 +
 ...ResourcesIncrementalBuildIntegrationTest.groovy |  162 +
 .../cpp/WindowsResourcesIntegrationTest.groovy     |  143 +
 ...ndowsResourcesUnsupportedIntegrationTest.groovy |   55 +
 ...bstractInstalledToolChainIntegrationSpec.groovy |   81 +
 .../cpp/fixtures/SingleToolChainTestRunner.java    |   77 +
 .../cpp/plugins/CppPluginIntegrationTest.groovy    |   22 +
 .../MixedObjectiveCIntegrationTest.groovy          |   33 +
 ...CLanguageIncrementalBuildIntegrationTest.groovy |   86 +
 ...anguageIncrementalCompileIntegrationTest.groovy |  120 +
 .../ObjectiveCLanguageIntegrationTest.groovy       |   32 +
 .../ObjectiveCUnsupportedIntegrationTest.groovy    |   53 +
 .../plugins/ObjectiveCPluginIntegrationTest.groovy |   26 +
 ...pLanguageIncrementalBuildIntegrationTest.groovy |   31 +
 ...anguageIncrementalCompileIntegrationTest.groovy |   31 +
 .../ObjectiveCppLanguageIntegrationTest.groovy     |   32 +
 .../ObjectiveCppUnsupportedIntegrationTest.groovy  |   54 +
 .../ObjectiveCppPluginIntegrationTest.groovy       |   26 +
 .../WindowsResourcesPluginIntegrationTest.groovy   |   26 +
 .../NativeBinariesPluginIntegrationTest.groovy     |   26 +
 .../plugins/CUnitPluginIntegrationTest.groovy      |   22 +
 .../cpp/AbstractBinariesIntegrationSpec.groovy     |   33 -
 .../org/gradle/plugins/cpp/AvailableCompilers.java |  171 -
 .../cpp/CppExePluginGoodBehaviourTest.groovy       |   25 -
 .../plugins/cpp/CppIntegrationTestRunner.java      |   96 -
 .../cpp/CppLibPluginGoodBehaviourTest.groovy       |   25 -
 .../plugins/cpp/CppPluginIntegrationTest.groovy    |  220 -
 .../plugins/cpp/CppSamplesIntegrationTest.groovy   |   85 -
 .../libs/cunit/2.1-2/include/CUnit/Automated.h     |   90 +
 .../shared/libs/cunit/2.1-2/include/CUnit/Basic.h  |  113 +
 .../libs/cunit/2.1-2/include/CUnit/CUError.h       |  199 +
 .../shared/libs/cunit/2.1-2/include/CUnit/CUnit.h  |  383 ++
 .../libs/cunit/2.1-2/include/CUnit/CUnit_intl.h    |   62 +
 .../libs/cunit/2.1-2/include/CUnit/Console.h       |   60 +
 .../shared/libs/cunit/2.1-2/include/CUnit/MyMem.h  |  104 +
 .../shared/libs/cunit/2.1-2/include/CUnit/TestDB.h |  914 ++++
 .../libs/cunit/2.1-2/include/CUnit/TestRun.h       |  444 ++
 .../shared/libs/cunit/2.1-2/include/CUnit/Util.h   |  158 +
 .../shared/libs/cunit/2.1-2/lib/cygwin/cunit.lib   |  Bin 0 -> 81868 bytes
 .../shared/libs/cunit/2.1-2/lib/linux/libcunit.a   |  Bin 0 -> 117622 bytes
 .../shared/libs/cunit/2.1-2/lib/mingw/cunit.lib    |  Bin 0 -> 75800 bytes
 .../shared/libs/cunit/2.1-2/lib/osx/libcunit.a     |  Bin 0 -> 85768 bytes
 .../shared/libs/cunit/2.1-2/lib/vs2010/cunit.lib   |  Bin 0 -> 117792 bytes
 .../shared/libs/cunit/2.1-2/lib/vs2013/cunit.lib   |  Bin 0 -> 116230 bytes
 .../groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy  |   79 +
 .../gradle/ide/cdt/model/CprojectDescriptor.groovy |  117 +
 .../gradle/ide/cdt/model/CprojectSettings.groovy   |  103 +
 .../gradle/ide/cdt/model/ProjectDescriptor.groovy  |   48 +
 .../gradle/ide/cdt/model/ProjectSettings.groovy    |   43 +
 .../ide/cdt/tasks/GenerateMetadataFileTask.groovy  |   53 +
 .../org/gradle/ide/visualstudio/ConfigFile.java    |   37 +
 .../gradle/ide/visualstudio/TextConfigFile.java    |   32 +
 .../org/gradle/ide/visualstudio/TextProvider.java  |   40 +
 .../ide/visualstudio/VisualStudioExtension.java    |   36 +
 .../ide/visualstudio/VisualStudioProject.java      |   62 +
 .../ide/visualstudio/VisualStudioSolution.java     |   64 +
 .../org/gradle/ide/visualstudio/XmlConfigFile.java |   33 +
 .../internal/DefaultVisualStudioExtension.java     |   52 +
 .../internal/DefaultVisualStudioProject.groovy     |  154 +
 .../internal/DefaultVisualStudioSolution.groovy    |  114 +
 ...ecutableVisualStudioProjectConfiguration.groovy |   46 +
 .../VisualStudioProjectConfiguration.groovy        |  109 +
 .../internal/VisualStudioProjectMapper.java        |   90 +
 .../internal/VisualStudioProjectRegistry.java      |   65 +
 .../internal/VisualStudioProjectResolver.java      |   44 +
 .../internal/VisualStudioSolutionRegistry.java     |   43 +
 .../internal/rules/CreateVisualStudioModel.java    |   39 +
 .../internal/rules/CreateVisualStudioTasks.java    |   90 +
 .../org/gradle/ide/visualstudio/package-info.java  |   20 +
 .../visualstudio/plugins/VisualStudioPlugin.groovy |   73 +
 .../tasks/GenerateFiltersFileTask.groovy           |   65 +
 .../tasks/GenerateProjectFileTask.groovy           |  112 +
 .../tasks/GenerateSolutionFileTask.groovy          |   71 +
 .../internal/AbsoluteFileNameTransformer.java      |   26 +
 .../internal/RelativeFileNameTransformer.java      |   96 +
 .../tasks/internal/VisualStudioFiltersFile.groovy  |   58 +
 .../tasks/internal/VisualStudioProjectFile.groovy  |   98 +
 .../tasks/internal/VisualStudioSolutionFile.groovy |  114 +
 .../org/gradle/language/DependentSourceSet.java    |   57 +
 .../gradle/language/HeaderExportingSourceSet.java  |   45 +
 .../language/assembler/AssemblerSourceSet.java     |   42 +
 .../internal/DefaultAssemblerSourceSet.java        |   29 +
 .../gradle/language/assembler/package-info.java    |   20 +
 .../assembler/plugins/AssemblerLangPlugin.groovy   |   62 +
 .../groovy/org/gradle/language/c/CSourceSet.java   |   49 +
 .../language/c/internal/DefaultCSourceSet.java     |   32 +
 .../groovy/org/gradle/language/c/package-info.java |   20 +
 .../gradle/language/c/plugins/CLangPlugin.groovy   |   63 +
 .../org/gradle/language/cpp/CppSourceSet.java      |   49 +
 .../language/cpp/internal/DefaultCppSourceSet.java |   29 +
 .../org/gradle/language/cpp/package-info.java      |   20 +
 .../language/cpp/plugins/CppLangPlugin.groovy      |   62 +
 .../AbstractHeaderExportingDependentSourceSet.java |   64 +
 .../internal/AbstractHeaderExportingSourceSet.java |   53 +
 .../ConfigurationBasedNativeDependencySet.groovy   |   90 +
 .../language/objectivec/ObjectiveCSourceSet.java   |   52 +
 .../internal/DefaultObjectiveCSourceSet.java       |   32 +
 .../gradle/language/objectivec/package-info.java   |   20 +
 .../objectivec/plugins/ObjectiveCLangPlugin.groovy |   62 +
 .../objectivecpp/ObjectiveCppSourceSet.java        |   51 +
 .../internal/DefaultObjectiveCppSourceSet.java     |   32 +
 .../gradle/language/objectivecpp/package-info.java |   20 +
 .../plugins/ObjectiveCppLangPlugin.groovy          |   62 +
 .../groovy/org/gradle/language/package-info.java   |   20 +
 .../org/gradle/language/rc/WindowsResourceSet.java |   48 +
 .../rc/internal/DefaultWindowsResourceSet.java     |   28 +
 .../org/gradle/language/rc/package-info.java       |   20 +
 .../rc/plugins/WindowsResourceScriptPlugin.groovy  |   63 +
 .../org/gradle/nativebinaries/BuildType.java       |   30 +
 .../gradle/nativebinaries/BuildTypeContainer.java  |   27 +
 .../org/gradle/nativebinaries/Executable.java      |   26 +
 .../gradle/nativebinaries/ExecutableBinary.java    |   36 +
 .../gradle/nativebinaries/ExecutableContainer.java |   27 +
 .../groovy/org/gradle/nativebinaries/Flavor.java   |   31 +
 .../org/gradle/nativebinaries/FlavorContainer.java |   30 +
 .../groovy/org/gradle/nativebinaries/Library.java  |   39 +
 .../org/gradle/nativebinaries/LibraryBinary.java   |   26 +
 .../gradle/nativebinaries/LibraryContainer.java    |   27 +
 .../org/gradle/nativebinaries/NativeBinary.java    |   42 +
 .../gradle/nativebinaries/NativeBinaryTasks.java   |   43 +
 .../gradle/nativebinaries/NativeDependencySet.java |   40 +
 .../nativebinaries/NativeLibraryRequirement.java   |   40 +
 .../gradle/nativebinaries/PrebuiltLibraries.java   |   29 +
 .../org/gradle/nativebinaries/PrebuiltLibrary.java |   38 +
 .../gradle/nativebinaries/ProjectNativeBinary.java |  106 +
 .../nativebinaries/ProjectNativeComponent.java     |   66 +
 .../org/gradle/nativebinaries/Repositories.java    |   28 +
 .../gradle/nativebinaries/SharedLibraryBinary.java |   47 +
 .../gradle/nativebinaries/StaticLibraryBinary.java |   40 +
 .../nativebinaries/TargetedNativeComponent.java    |   42 +
 .../groovy/org/gradle/nativebinaries/Tool.java     |   39 +
 .../internal/AbstractBinaryToolSpec.java           |   59 +
 .../internal/AbstractProjectLibraryBinary.java     |  104 +
 .../internal/AbstractProjectNativeBinary.java      |  161 +
 .../internal/AbstractProjectNativeComponent.java   |   73 +
 .../AbstractTargetedProjectNativeComponent.java    |   82 +
 .../nativebinaries/internal/BinaryToolSpec.java    |   39 +
 .../nativebinaries/internal/DefaultBuildType.java  |   39 +
 .../internal/DefaultBuildTypeContainer.java        |   33 +
 .../nativebinaries/internal/DefaultExecutable.java |   28 +
 .../internal/DefaultExecutableContainer.java       |   38 +
 .../nativebinaries/internal/DefaultFlavor.java     |   41 +
 .../internal/DefaultFlavorContainer.java           |   33 +
 .../nativebinaries/internal/DefaultLibrary.java    |   42 +
 .../internal/DefaultLibraryContainer.java          |   38 +
 .../nativebinaries/internal/DefaultLinkerSpec.java |   68 +
 .../internal/DefaultNativeBinaryTasks.java         |   56 +
 .../internal/DefaultStaticLibraryArchiverSpec.java |   45 +
 .../nativebinaries/internal/DefaultTool.java       |   37 +
 .../internal/LibraryBinaryInternal.java            |   29 +
 .../gradle/nativebinaries/internal/LinkerSpec.java |   44 +
 .../internal/NativeBinaryServices.java             |   37 +
 .../internal/NativeProjectComponentIdentifier.java |   64 +
 .../internal/ProjectExecutableBinary.java          |   49 +
 .../internal/ProjectNativeBinaryInternal.java      |   36 +
 .../internal/ProjectNativeComponentInternal.java   |   24 +
 .../internal/ProjectNativeLibraryRequirement.java  |   48 +
 .../internal/ProjectSharedLibraryBinary.java       |  120 +
 .../internal/ProjectStaticLibraryBinary.java       |   86 +
 .../internal/SharedLibraryLinkerSpec.java          |   23 +
 .../internal/SourceSetNotationParser.java          |   73 +
 .../internal/StaticLibraryArchiverSpec.java        |   31 +
 .../internal/StaticLibraryBinaryInternal.java      |   26 +
 .../internal/TargetedNativeComponentInternal.java  |   29 +
 .../configure/ApplySourceSetConventions.java       |   50 +
 .../configure/ConfigureGeneratedSourceSets.java    |   54 +
 .../configure/CreateDefaultBuildTypes.java         |   30 +
 .../internal/configure/CreateDefaultFlavors.java   |   32 +
 .../internal/configure/CreateDefaultPlatform.java  |   29 +
 .../internal/configure/CreateNativeBinaries.java   |   79 +
 .../configure/DefaultNativeBinariesFactory.java    |   60 +
 .../internal/configure/NativeBinariesFactory.java  |   27 +
 .../configure/ProjectNativeBinaryInitializer.java  |   52 +
 .../ProjectNativeComponentInitializer.java         |   90 +
 .../internal/configure/RepositoriesFactory.java    |   69 +
 .../prebuilt/AbstractPrebuiltLibraryBinary.java    |  107 +
 .../prebuilt/DefaultPrebuiltLibraries.java         |   59 +
 .../internal/prebuilt/DefaultPrebuiltLibrary.java  |   50 +
 .../DefaultPrebuiltSharedLibraryBinary.java        |   66 +
 .../DefaultPrebuiltStaticLibraryBinary.java        |   55 +
 .../prebuilt/PrebuiltLibraryBinaryLocator.java     |   58 +
 .../prebuilt/PrebuiltLibraryInitializer.java       |   77 +
 .../prebuilt/PrebuiltLibraryResolveException.java  |   27 +
 .../ApiRequirementNativeDependencyResolver.java    |  104 +
 .../resolve/ChainedLibraryBinaryLocator.java       |   51 +
 .../internal/resolve/DefaultLibraryResolver.java   |  107 +
 .../resolve/DefaultNativeDependencySet.java        |   41 +
 .../internal/resolve/DefaultProjectLocator.java    |   41 +
 .../InputHandlingNativeDependencyResolver.java     |   36 +
 .../internal/resolve/LibraryBinaryLocator.java     |   25 +
 .../resolve/LibraryNativeDependencyResolver.java   |   36 +
 .../internal/resolve/LibraryResolveException.java  |   32 +
 .../NativeBinaryRequirementResolveResult.java      |   65 +
 .../resolve/NativeBinaryResolveResult.java         |   74 +
 .../resolve/NativeDependencyNotationParser.java    |   59 +
 .../internal/resolve/NativeDependencyResolver.java |   20 +
 .../resolve/NativeDependencyResolverServices.java  |   47 +
 .../resolve/ProjectLibraryBinaryLocator.java       |   44 +
 .../internal/resolve/ProjectLocator.java           |   22 +
 ...RequirementParsingNativeDependencyResolver.java |   38 +
 .../resolve/SourceSetNativeDependencyResolver.java |   97 +
 .../nativebinaries/language/PreprocessingTool.java |   45 +
 .../language/assembler/internal/AssembleSpec.java  |   35 +
 .../assembler/internal/DefaultAssembleSpec.java    |   47 +
 .../language/assembler/package-info.java           |   20 +
 .../plugins/AssemblerNativeBinariesPlugin.groovy   |   88 +
 .../assembler/plugins/AssemblerPlugin.groovy       |   35 +
 .../language/assembler/tasks/Assemble.groovy       |   95 +
 .../language/c/internal/CCompileSpec.java          |   23 +
 .../language/c/internal/DefaultCCompileSpec.java   |   22 +
 .../AbstractIncrementalNativeCompiler.java         |   86 +
 .../incremental/CleanCompilingNativeCompiler.java  |   57 +
 .../internal/incremental/CompilationFileState.java |   50 +
 .../c/internal/incremental/CompilationState.java   |   41 +
 .../incremental/CompilationStateSerializer.java    |  127 +
 .../incremental/DefaultIncrementalCompilation.java |   37 +
 .../incremental/DefaultSourceIncludes.java         |   79 +
 .../incremental/DefaultSourceIncludesParser.java   |   43 +
 .../incremental/DefaultSourceIncludesResolver.java |   67 +
 .../incremental/IncrementalCompilation.java        |   25 +
 .../incremental/IncrementalCompileProcessor.java   |  148 +
 .../incremental/IncrementalCompilerBuilder.java    |   75 +
 .../incremental/IncrementalNativeCompiler.java     |   45 +
 .../c/internal/incremental/ResolvedInclude.java    |   67 +
 .../c/internal/incremental/SourceIncludes.java     |   24 +
 .../internal/incremental/SourceIncludesParser.java |   24 +
 .../incremental/SourceIncludesResolver.java        |   23 +
 .../incremental/sourceparser/CSourceParser.java    |   33 +
 .../sourceparser/PreprocessingReader.java          |  145 +
 .../sourceparser/RegexBackedCSourceParser.java     |   82 +
 .../nativebinaries/language/c/package-info.java    |   20 +
 .../c/plugins/CNativeBinariesPlugin.groovy         |   91 +
 .../language/c/plugins/CPlugin.groovy              |   35 +
 .../c/tasks/AbstractNativeCompileTask.groovy       |  145 +
 .../language/c/tasks/CCompile.groovy               |   36 +
 .../language/cpp/internal/CppCompileSpec.java      |   23 +
 .../cpp/internal/DefaultCppCompileSpec.java        |   22 +
 .../nativebinaries/language/cpp/package-info.java  |   20 +
 .../cpp/plugins/CppNativeBinariesPlugin.groovy     |   89 +
 .../language/cpp/plugins/CppPlugin.groovy          |   35 +
 .../language/cpp/plugins/package-info.java         |   20 +
 .../language/cpp/tasks/CppCompile.groovy           |   38 +
 .../language/cpp/tasks/package-info.java           |   20 +
 .../internal/AbstractNativeCompileSpec.java        |  109 +
 .../internal/DefaultPreprocessingTool.java         |   39 +
 .../internal/DefaultObjectiveCCompileSpec.java     |   23 +
 .../objectivec/internal/ObjectiveCCompileSpec.java |   23 +
 .../language/objectivec/package-info.java          |   20 +
 .../plugins/ObjectiveCNativeBinariesPlugin.groovy  |   89 +
 .../objectivec/plugins/ObjectiveCPlugin.groovy     |   36 +
 .../language/objectivec/plugins/package-info.java  |   20 +
 .../objectivec/tasks/ObjectiveCCompile.groovy      |   38 +
 .../language/objectivec/tasks/package-info.java    |   20 +
 .../internal/DefaultObjectiveCppCompileSpec.java   |   23 +
 .../internal/ObjectiveCppCompileSpec.java          |   23 +
 .../language/objectivecpp/package-info.java        |   20 +
 .../ObjectiveCppNativeBinariesPlugin.groovy        |   90 +
 .../objectivecpp/plugins/ObjectiveCppPlugin.groovy |   36 +
 .../objectivecpp/plugins/package-info.java         |   20 +
 .../objectivecpp/tasks/ObjectiveCppCompile.groovy  |   38 +
 .../language/objectivecpp/tasks/package-info.java  |   20 +
 .../nativebinaries/language/package-info.java      |   20 +
 .../DefaultWindowsResourceCompileSpec.java         |   21 +
 .../rc/internal/WindowsResourceCompileSpec.java    |   21 +
 .../WindowsResourcesNativeBinariesPlugin.groovy    |  103 +
 .../rc/plugins/WindowsResourcesPlugin.groovy       |   36 +
 .../rc/tasks/WindowsResourceCompile.groovy         |  131 +
 .../org/gradle/nativebinaries/package-info.java    |   20 +
 .../nativebinaries/platform/Architecture.java      |   32 +
 .../nativebinaries/platform/OperatingSystem.java   |   60 +
 .../gradle/nativebinaries/platform/Platform.java   |  125 +
 .../nativebinaries/platform/PlatformContainer.java |   27 +
 .../platform/internal/ArchitectureInternal.java    |   38 +
 .../internal/ArchitectureNotationParser.java       |   91 +
 .../platform/internal/DefaultArchitecture.java     |  100 +
 .../platform/internal/DefaultOperatingSystem.java  |   68 +
 .../platform/internal/DefaultPlatform.java         |   74 +
 .../internal/DefaultPlatformContainer.java         |   39 +
 .../internal/OperatingSystemNotationParser.java    |   80 +
 .../platform/internal/PlatformInternal.java        |   22 +
 .../nativebinaries/platform/package-info.java      |   20 +
 .../plugins/NativeBinariesModelPlugin.java         |  142 +
 .../plugins/NativeBinariesPlugin.groovy            |  138 +
 .../nativebinaries/plugins/package-info.java       |   20 +
 .../nativebinaries/tasks/AbstractLinkTask.groovy   |  120 +
 .../nativebinaries/tasks/BuildBinaryTask.java      |   31 +
 .../tasks/CreateStaticLibrary.groovy               |   96 +
 .../nativebinaries/tasks/InstallExecutable.groovy  |  156 +
 .../nativebinaries/tasks/LinkExecutable.groovy     |   31 +
 .../nativebinaries/tasks/LinkSharedLibrary.groovy  |   43 +
 .../gradle/nativebinaries/tasks/package-info.java  |   20 +
 .../test/ProjectComponentTestSuite.java            |   31 +
 .../org/gradle/nativebinaries/test/TestSuite.java  |   26 +
 .../nativebinaries/test/TestSuiteContainer.java    |   27 +
 .../test/TestSuiteExecutableBinary.java            |   26 +
 .../nativebinaries/test/cunit/CUnitTestSuite.java  |   26 +
 .../cunit/internal/ConfigureCUnitTestSources.java  |   66 +
 .../test/cunit/internal/CreateCUnitBinaries.java   |   88 +
 .../test/cunit/internal/DefaultCUnitTestSuite.java |   39 +
 .../nativebinaries/test/cunit/package-info.java    |   20 +
 .../test/cunit/plugins/CUnitPlugin.groovy          |   72 +
 .../test/cunit/plugins/package-info.java           |   20 +
 .../test/cunit/tasks/GenerateCUnitLauncher.groovy  |   40 +
 .../test/cunit/tasks/package-info.java             |   20 +
 .../test/internal/DefaultTestSuiteContainer.java   |   30 +
 .../internal/DefaultTestSuiteExecutableBinary.java |   48 +
 .../gradle/nativebinaries/test/package-info.java   |   20 +
 .../test/plugins/NativeBinariesTestPlugin.groovy   |   75 +
 .../nativebinaries/test/plugins/package-info.java  |   20 +
 .../test/tasks/RunTestExecutable.groovy            |   79 +
 .../nativebinaries/test/tasks/package-info.java    |   20 +
 .../org/gradle/nativebinaries/toolchain/Clang.java |   41 +
 .../org/gradle/nativebinaries/toolchain/Gcc.java   |   41 +
 .../gradle/nativebinaries/toolchain/GccTool.java   |   42 +
 .../toolchain/PlatformConfigurableToolChain.java   |   55 +
 .../toolchain/TargetPlatformConfiguration.java     |   67 +
 .../gradle/nativebinaries/toolchain/ToolChain.java |   35 +
 .../toolchain/ToolChainRegistry.java               |   28 +
 .../gradle/nativebinaries/toolchain/VisualCpp.java |   47 +
 .../toolchain/internal/AbstractToolChain.java      |   73 +
 .../toolchain/internal/ArgsTransformer.java        |   25 +
 .../toolchain/internal/CommandLineTool.java        |  113 +
 .../CompileSpecToArgsTransformerChain.java         |   44 +
 .../internal/DefaultToolChainRegistry.java         |  149 +
 .../toolchain/internal/MacroArgsConverter.java     |   35 +
 .../toolchain/internal/NativeCompileSpec.java      |   63 +
 .../internal/OptionsFileArgsTransformer.java       |   64 +
 .../toolchain/internal/OutputCleaningCompiler.java |   67 +
 .../toolchain/internal/PlatformToolChain.java      |   40 +
 .../SingleSourceCompileArgTransformer.java         |   66 +
 .../toolchain/internal/ToolChainAvailability.java  |   68 +
 .../toolchain/internal/ToolChainInternal.java      |   41 +
 .../internal/ToolChainRegistryInternal.java        |   34 +
 .../toolchain/internal/ToolSearchResult.java       |   28 +
 .../toolchain/internal/ToolType.java               |   44 +
 .../internal/UnavailablePlatformToolChain.java     |   79 +
 .../toolchain/internal/clang/ClangToolChain.java   |   47 +
 .../gcc/AbstractGccCompatibleToolChain.java        |  267 ++
 .../internal/gcc/ArStaticLibraryArchiver.java      |   73 +
 .../toolchain/internal/gcc/Assembler.java          |   80 +
 .../toolchain/internal/gcc/CCompiler.java          |   36 +
 .../internal/gcc/CommandLineToolSearchResult.java  |   25 +
 .../toolchain/internal/gcc/CppCompiler.java        |   37 +
 .../internal/gcc/GccCompilerArgsTransformer.java   |   58 +
 .../toolchain/internal/gcc/GccLinker.java          |   94 +
 .../internal/gcc/GccOptionsFileArgTransformer.java |   52 +
 .../internal/gcc/GccPlatformToolChain.java         |  114 +
 .../toolchain/internal/gcc/GccToolChain.java       |   90 +
 .../toolchain/internal/gcc/GccToolSearchPath.java  |   49 +
 .../toolchain/internal/gcc/NativeCompiler.java     |   65 +
 .../toolchain/internal/gcc/ObjectiveCCompiler.java |   38 +
 .../internal/gcc/ObjectiveCppCompiler.java         |   37 +
 .../gcc/PostTransformActionArgsTransformer.java    |   39 +
 .../internal/gcc/ShortCircuitArgsTransformer.java  |   41 +
 .../internal/gcc/version/GccVersionDeterminer.java |  142 +
 .../internal/gcc/version/GccVersionResult.java     |   23 +
 .../toolchain/internal/msvcpp/Assembler.java       |   80 +
 .../toolchain/internal/msvcpp/CCompiler.java       |   33 +
 .../toolchain/internal/msvcpp/CppCompiler.java     |   33 +
 .../msvcpp/DefaultVisualStudioLocator.java         |  369 ++
 .../internal/msvcpp/DefaultWindowsSdkLocator.java  |  275 ++
 .../toolchain/internal/msvcpp/EscapeUserArgs.java  |   40 +
 .../internal/msvcpp/InstallationSearchResult.java  |   27 +
 .../msvcpp/LibExeStaticLibraryArchiver.java        |   58 +
 .../toolchain/internal/msvcpp/LinkExeLinker.java   |   70 +
 .../toolchain/internal/msvcpp/NativeCompiler.java  |   59 +
 .../msvcpp/VisualCppCompilerArgsTransformer.java   |   50 +
 .../internal/msvcpp/VisualCppInstall.java          |  116 +
 .../internal/msvcpp/VisualCppToolChain.java        |  245 ++
 .../internal/msvcpp/VisualStudioInstall.java       |   48 +
 .../internal/msvcpp/VisualStudioLocator.java       |   29 +
 .../internal/msvcpp/WindowsResourceCompiler.java   |   90 +
 .../toolchain/internal/msvcpp/WindowsSdk.java      |  138 +
 .../internal/msvcpp/WindowsSdkLocator.java         |   29 +
 .../internal/plugins/StandardToolChainsPlugin.java |   34 +
 .../toolchain/internal/tools/DefaultTool.java      |   58 +
 .../internal/tools/DefaultToolRegistry.java        |   35 +
 .../toolchain/internal/tools/GccToolInternal.java  |   29 +
 .../toolchain/internal/tools/PlatformGccTool.java  |   58 +
 .../internal/tools/PlatformToolRegistry.java       |   48 +
 .../toolchain/internal/tools/ToolRegistry.java     |   22 +
 .../toolchain/internal/tools/ToolSearchPath.java   |  135 +
 .../nativebinaries/toolchain/package-info.java     |   20 +
 .../toolchain/plugins/ClangCompilerPlugin.groovy   |   62 +
 .../toolchain/plugins/GccCompilerPlugin.groovy     |   63 +
 .../plugins/MicrosoftVisualCppPlugin.groovy        |   76 +
 .../toolchain/plugins/package-info.java            |   20 +
 .../gradle/plugins/binaries/BinariesPlugin.java    |   66 -
 .../org/gradle/plugins/binaries/model/Binary.java  |   39 -
 .../gradle/plugins/binaries/model/CompileSpec.java |   51 -
 .../gradle/plugins/binaries/model/Compiler.java    |   24 -
 .../plugins/binaries/model/CompilerRegistry.java   |   31 -
 .../gradle/plugins/binaries/model/Executable.java  |   23 -
 .../binaries/model/HeaderExportingSourceSet.java   |   27 -
 .../org/gradle/plugins/binaries/model/Library.java |   27 -
 .../plugins/binaries/model/LibraryCompileSpec.java |   32 -
 .../model/NativeDependencyCapableSourceSet.java    |   25 -
 .../binaries/model/NativeDependencySet.java        |   28 -
 .../gradle/plugins/binaries/model/SourceSet.java   |   25 -
 .../binaries/model/internal/BinaryCompileSpec.java |   23 -
 .../model/internal/BinaryCompileSpecFactory.java   |   27 -
 .../model/internal/CompileSpecFactory.java         |   29 -
 .../binaries/model/internal/CompileTaskAware.java  |   23 -
 .../binaries/model/internal/CompilerAdapter.java   |   32 -
 .../ConfigurationBasedNativeDependencySet.groovy   |   86 -
 .../binaries/model/internal/DefaultBinary.java     |   66 -
 .../model/internal/DefaultCompilerRegistry.java    |   90 -
 .../binaries/model/internal/DefaultExecutable.java |   31 -
 .../binaries/model/internal/DefaultLibrary.java    |   76 -
 .../binaries/model/internal/package-info.java      |   20 -
 .../plugins/binaries/model/package-info.java       |   20 -
 .../org/gradle/plugins/binaries/package-info.java  |   20 -
 .../plugins/binaries/tasks/package-info.java       |   20 -
 .../org/gradle/plugins/cpp/CppCompile.groovy       |   33 -
 .../plugins/cpp/CppExeConventionPlugin.groovy      |   58 -
 .../org/gradle/plugins/cpp/CppExtension.java       |   50 -
 .../plugins/cpp/CppLibConventionPlugin.groovy      |   68 -
 .../groovy/org/gradle/plugins/cpp/CppPlugin.groovy |   99 -
 .../org/gradle/plugins/cpp/CppSourceSet.java       |   65 -
 .../org/gradle/plugins/cpp/cdt/CdtIdePlugin.groovy |   77 -
 .../cpp/cdt/model/CprojectDescriptor.groovy        |  115 -
 .../plugins/cpp/cdt/model/CprojectSettings.groovy  |  107 -
 .../plugins/cpp/cdt/model/ProjectDescriptor.groovy |   46 -
 .../plugins/cpp/cdt/model/ProjectSettings.groovy   |   40 -
 .../cpp/cdt/tasks/GenerateMetadataFileTask.groovy  |   51 -
 .../cpp/compiler/capability/AgainstLibrary.java    |   31 -
 .../cpp/compiler/capability/CompilesCpp.java       |   30 -
 .../compiler/capability/StandardCppCompiler.java   |   23 -
 .../cpp/compiler/capability/package-info.java      |   20 -
 .../compiler/internal/CommandLineCppCompiler.java  |   68 -
 .../internal/CommandLineCppCompilerAdapter.java    |   59 -
 ...ommandLineCppCompilerArgumentsToOptionFile.java |   56 -
 .../plugins/cpp/compiler/internal/CppCompiler.java |   24 -
 .../gradle/plugins/cpp/gpp/GppCompileSpec.groovy   |  218 -
 .../plugins/cpp/gpp/GppCompilerPlugin.groovy       |   53 -
 .../plugins/cpp/gpp/GppLibraryCompileSpec.groovy   |   40 -
 .../cpp/gpp/internal/GppCompileSpecFactory.java    |   42 -
 .../gpp/internal/GppCompileSpecToArguments.java    |   55 -
 .../plugins/cpp/gpp/internal/GppCompiler.java      |   44 -
 .../cpp/gpp/internal/GppCompilerAdapter.java       |  106 -
 .../gpp/internal/version/GppVersionDeterminer.java |  105 -
 .../org/gradle/plugins/cpp/gpp/package-info.java   |   20 -
 .../plugins/cpp/internal/CppCompileSpec.java       |   33 -
 .../plugins/cpp/internal/DefaultCppSourceSet.java  |   90 -
 .../cpp/msvcpp/MicrosoftVisualCppPlugin.groovy     |   61 -
 .../internal/VisualCppCompileSpecToArguments.java  |   47 -
 .../cpp/msvcpp/internal/VisualCppCompiler.java     |   36 -
 .../msvcpp/internal/VisualCppCompilerAdapter.java  |   51 -
 .../org/gradle/plugins/cpp/package-info.java       |   20 -
 .../META-INF/gradle-plugins/assembler.properties   |    1 +
 .../META-INF/gradle-plugins/binaries.properties    |    1 -
 .../resources/META-INF/gradle-plugins/c.properties |    1 +
 .../META-INF/gradle-plugins/cpp-exe.properties     |    1 -
 .../META-INF/gradle-plugins/cpp-lib.properties     |    1 -
 .../META-INF/gradle-plugins/cpp.properties         |    2 +-
 .../META-INF/gradle-plugins/cunit.properties       |   17 +
 .../META-INF/gradle-plugins/eclipse-cdt.properties |    2 +-
 .../gradle-plugins/gpp-compiler.properties         |    1 -
 .../gradle-plugins/native-binaries.properties      |    1 +
 .../META-INF/gradle-plugins/objective-c.properties |    1 +
 .../gradle-plugins/objective-cpp.properties        |    1 +
 .../gradle-plugins/visual-studio.properties        |    1 +
 .../gradle-plugins/windows-resources.properties    |    1 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../cdt/model/defaultCproject-linux.xml            |    0
 .../cdt/model/defaultCproject-macos.xml            |    0
 .../cpp => ide}/cdt/model/defaultProject.xml       |    0
 .../ide/visualstudio/tasks/internal/default.sln    |    2 +
 .../visualstudio/tasks/internal/default.vcxproj    |   17 +
 .../tasks/internal/default.vcxproj.filters         |   16 +
 .../test/cunit/tasks/gradle_cunit_main.c           |   48 +
 .../test/cunit/tasks/gradle_cunit_register.h       |    4 +
 .../ide/cdt/model/CprojectSettingsSpec.groovy      |   58 +
 .../ide/cdt/model/ProjectDescriptorSpec.groovy     |   48 +
 .../internal/DefaultVisualStudioProjectTest.groovy |  115 +
 .../VisualStudioProjectConfigurationTest.groovy    |  196 +
 .../internal/VisualStudioProjectMapperTest.groovy  |  142 +
 .../VisualStudioProjectRegistryTest.groovy         |  109 +
 .../RelativeFileNameTransformerTest.groovy         |  122 +
 .../internal/VisualStudioFiltersFileTest.groovy    |   97 +
 .../internal/VisualStudioProjectFileTest.groovy    |  118 +
 .../internal/VisualStudioSolutionFileTest.groovy   |  190 +
 .../plugins/AssemblerLangPluginTest.groovy         |   42 +
 .../language/c/plugins/CLangPluginTest.groovy      |   42 +
 .../language/cpp/plugins/CppLangPluginTest.groovy  |   42 +
 .../internal/DefaultBuildTypeTest.groovy           |   29 +
 .../internal/DefaultExecutableBinaryTest.groovy    |   39 +
 .../internal/DefaultExecutableTest.groovy          |   29 +
 .../internal/DefaultFlavorTest.groovy              |   29 +
 .../internal/DefaultLibraryTest.groovy             |   59 +
 .../internal/DefaultNativeBinaryTasksTest.groovy   |   55 +
 .../internal/DefaultNativeComponentTest.groovy     |   77 +
 .../internal/ProjectNativeBinaryTest.groovy        |  210 +
 .../internal/ProjectSharedLibraryBinaryTest.groovy |  123 +
 .../internal/ProjectStaticLibraryBinaryTest.groovy |  125 +
 .../internal/SourceSetNotationParserTest.groovy    |   53 +
 .../configure/CreateDefaultBuildTypesTest.groovy   |   44 +
 .../configure/CreateDefaultFlavorsTest.groovy      |   67 +
 .../configure/CreateDefaultPlatformTest.groovy     |   44 +
 .../DefaultNativeBinariesFactoryTest.groovy        |   93 +
 .../ProjectNativeBinaryInitializerTest.groovy      |   99 +
 .../ProjectNativeComponentInitializerTest.groovy   |  145 +
 .../DefaultPrebuiltSharedLibraryBinaryTest.groovy  |   74 +
 .../DefaultPrebuiltStaticLibraryBinaryTest.groovy  |   56 +
 .../NativeDependencyNotationParserTest.groovy      |   72 +
 .../resolve/ProjectLibraryBinaryLocatorTest.groovy |  136 +
 .../AbstractNativeBinariesPluginTest.groovy        |  160 +
 .../AssemblerNativeBinariesPluginTest.groovy       |  183 +
 .../language/assembler/tasks/AssemblerTest.groovy  |   65 +
 .../CleanCompilingNativeCompilerTest.groovy        |   68 +
 .../CompilationStateSerializerTest.groovy          |   90 +
 .../DefaultSourceIncludesParserTest.groovy         |   68 +
 .../DefaultSourceIncludesResolverTest.groovy       |  154 +
 .../IncrementalCompileProcessorTest.groovy         |  422 ++
 .../IncrementalNativeCompilerTest.groovy           |   54 +
 .../sourceparser/PreprocessingReaderTest.groovy    |   72 +
 .../RegexBackedCSourceParserTest.groovy            |  386 ++
 .../c/plugins/CNativeBinariesPluginTest.groovy     |   48 +
 .../language/c/tasks/CCompileTest.groovy           |   68 +
 .../binaryinfo/ReadelfBinaryInfoTest.groovy        |   56 +
 .../cpp/internal/DefaultCppSourceSetTest.groovy    |   66 +
 .../cpp/plugins/CppNativeBinariesPluginTest.groovy |  206 +
 .../language/cpp/tasks/CppCompileTest.groovy       |   67 +
 .../ObjectiveCNativeBinariesPluginTest.groovy      |   46 +
 .../ObjectiveCppNativeBinariesPluginTest.groovy    |   45 +
 .../internal/ArchitectureNotationParserTest.groovy |  115 +
 .../internal/DefaultArchitectureTest.groovy        |   29 +
 .../internal/DefaultOperatingSystemTest.groovy     |   30 +
 .../platform/internal/DefaultPlatformTest.groovy   |   61 +
 .../OperatingSystemNotationParserTest.groovy       |  100 +
 .../plugins/NativeBinariesModelPluginTest.groovy   |  238 +
 .../plugins/NativeBinariesPluginTest.groovy        |  126 +
 .../internal/DefaultToolChainRegistryTest.groovy   |  182 +
 .../internal/OutputCleaningCompilerTest.groovy     |  115 +
 .../internal/ToolChainAvailabilityTest.groovy      |   67 +
 .../UnavailablePlatformToolChainTest.groovy        |   48 +
 .../gcc/AbstractGccCompatibleToolChainTest.groovy  |  237 +
 .../toolchain/internal/gcc/AssemblerTest.groovy    |   83 +
 .../toolchain/internal/gcc/CCompilerTest.groovy    |   98 +
 .../internal/gcc/ClangToolChainTest.groovy         |   48 +
 .../toolchain/internal/gcc/GccLinkerTest.groovy    |   86 +
 .../toolchain/internal/gcc/GccToolChainTest.groovy |   68 +
 .../gcc/ShortCircuitArgsTransformerTest.groovy     |   64 +
 .../gcc/version/GccVersionDeterminerTest.groovy    |  139 +
 .../msvcpp/DefaultVisualStudioLocatorTest.groovy   |  202 +
 .../msvcpp/DefaultWindowsSdkLocatorTest.groovy     |  256 ++
 .../internal/msvcpp/VisualCppToolChainTest.groovy  |  206 +
 .../internal/tools/ToolSearchPathTest.groovy       |  125 +
 .../plugins/ClangCompilerPluginTest.groovy         |   57 +
 .../toolchain/plugins/GccCompilerPluginTest.groovy |   59 +
 .../plugins/MicrosoftVisualCppPluginTest.groovy    |   64 +
 .../toolchain/plugins/ToolchainPluginTest.groovy   |   70 +
 .../internal/DefaultCompilerRegistryTest.groovy    |  130 -
 .../plugins/cpp/CppExeConventionPluginTest.groovy  |   37 -
 .../plugins/cpp/CppLibConventionPluginTest.groovy  |   39 -
 .../org/gradle/plugins/cpp/CppPluginTest.groovy    |  235 -
 .../cpp/cdt/model/CprojectSettingsSpec.groovy      |   58 -
 .../cpp/cdt/model/ProjectDescriptorSpec.groovy     |   48 -
 .../plugins/cpp/gpp/GppCompileSpecTest.groovy      |   40 -
 .../cpp/gpp/GppLibraryCompileSpecTest.groovy       |   37 -
 .../version/GppVersionDeterminerTest.groovy        |  142 -
 .../ide/visualstudio/fixtures/FiltersFile.groovy   |   29 +
 .../ide/visualstudio/fixtures/ProjectFile.groovy   |  128 +
 .../ide/visualstudio/fixtures/SolutionFile.groovy  |   82 +
 .../language/cpp/fixtures/AvailableToolChains.java |  503 +++
 .../language/cpp/fixtures/ExecutableFixture.groovy |   35 +
 .../cpp/fixtures/NativeBinaryFixture.groovy        |   89 +
 .../cpp/fixtures/NativeInstallationFixture.groovy  |   73 +
 .../cpp/fixtures/RequiresInstalledToolChain.groovy |   30 +
 .../RequiresInstalledToolChainExtension.groovy     |   39 +
 .../cpp/fixtures/SharedLibraryFixture.groovy       |   47 +
 .../cpp/fixtures/StaticLibraryFixture.groovy       |   29 +
 .../cpp/fixtures/ToolChainRequirement.java         |   30 +
 .../app/CCallingMixedCAndCppHelloWorldApp.groovy   |   83 +
 .../fixtures/app/CCompilerDetectingTestApp.groovy  |   80 +
 .../cpp/fixtures/app/CHelloWorldApp.groovy         |  167 +
 .../fixtures/app/CppCallingCHelloWorldApp.groovy   |   75 +
 .../app/CppCompilerDetectingTestApp.groovy         |   80 +
 .../cpp/fixtures/app/CppHelloWorldApp.groovy       |  116 +
 .../app/DuplicateAssemblerBaseNamesTestApp.groovy  |   88 +
 .../fixtures/app/DuplicateCBaseNamesTestApp.groovy |   61 +
 .../app/DuplicateCppBaseNamesTestApp.groovy        |   64 +
 .../app/DuplicateMixedSameBaseNamesTestApp.groovy  |  140 +
 .../app/DuplicateObjectiveCBaseNamesTestApp.groovy |   80 +
 .../DuplicateObjectiveCppBaseNamesTestApp.groovy   |   80 +
 ...uplicateWindowsResourcesBaseNamesTestApp.groovy |   91 +
 .../ExeWithDiamondDependencyHelloWorldApp.groovy   |   56 +
 .../ExeWithLibraryUsingLibraryHelloWorldApp.groovy |  132 +
 .../language/cpp/fixtures/app/HelloWorldApp.java   |  117 +
 .../cpp/fixtures/app/IncrementalHelloWorldApp.java |   49 +
 .../fixtures/app/MixedLanguageHelloWorldApp.groovy |  143 +
 .../app/MixedObjectiveCHelloWorldApp.groovy        |  120 +
 .../fixtures/app/ObjectiveCHelloWorldApp.groovy    |  139 +
 .../fixtures/app/ObjectiveCppHelloWorldApp.groovy  |  146 +
 .../fixtures/app/PlatformDetectingTestApp.groovy   |   85 +
 .../language/cpp/fixtures/app/SourceFile.java      |   61 +
 .../language/cpp/fixtures/app/TestApp.java         |   72 +
 .../language/cpp/fixtures/app/TestComponent.groovy |   39 +
 .../app/WindowsResourceHelloWorldApp.groovy        |  129 +
 .../cpp/fixtures/binaryinfo/BinaryInfo.java        |   28 +
 .../fixtures/binaryinfo/DumpbinBinaryInfo.groovy   |   99 +
 .../cpp/fixtures/binaryinfo/OtoolBinaryInfo.groovy |   59 +
 .../fixtures/binaryinfo/ReadelfBinaryInfo.groovy   |   82 +
 .../test/cunit/CUnitTestResults.groovy             |  104 +
 subprojects/diagnostics/diagnostics.gradle         |    3 +-
 .../HtmlDependencyReportTaskIntegrationTest.groovy |  529 +++
 ...pendencyInsightReportTaskIntegrationTest.groovy |  423 +-
 .../DependencyReportTaskIntegrationTest.groovy     |  108 +-
 .../diagnostics/HelpTaskIntegrationTest.groovy     |  282 ++
 .../ResolutionResultApiIntegrationTest.groovy      |   79 -
 .../TaskReportTaskIntegrationTest.groovy           |    2 +-
 .../org/gradle/configuration/HelpTest.groovy       |   41 +
 .../listsCommonDynamicAvailableValues/build.gradle |   21 +
 .../settings.gradle                                |   18 +
 .../build.gradle                                   |   23 +
 .../settings.gradle                                |    2 +
 .../org/gradle/api/plugins/HelpTasksPlugin.groovy  |   23 +-
 .../gradle/api/plugins/ProjectReportsPlugin.java   |   27 +-
 .../plugins/internal/HelpTasksAutoApplyAction.java |   26 +
 .../dependencies/DependencyReportContainer.java    |   33 +
 .../dependencies/HtmlDependencyReportTask.java     |  115 +
 .../internal/DefaultDependencyReportContainer.java |   35 +
 .../internal/HtmlDependencyReporter.groovy         |  128 +
 .../JsonDependencyReportIndexRenderer.groovy       |   79 +
 .../internal/JsonProjectDependencyRenderer.groovy  |  253 ++
 .../internal/StrictDependencyResultSpec.java       |   69 +
 .../api/reporting/dependencies/package-info.java   |   20 +
 .../api/tasks/diagnostics/AbstractReportTask.java  |    2 +-
 .../diagnostics/DependencyInsightReportTask.groovy |   25 +-
 .../tasks/diagnostics/DependencyReportTask.java    |    6 +-
 .../api/tasks/diagnostics/ProjectReportTask.java   |    9 +-
 .../api/tasks/diagnostics/TaskReportTask.java      |    4 +-
 .../internal/DependencyReportRenderer.java         |    2 -
 .../tasks/diagnostics/internal/GraphRenderer.java  |   69 -
 .../internal/SingleProjectTaskReportModel.java     |    6 +-
 .../diagnostics/internal/TaskReportRenderer.java   |    2 -
 .../AsciiDependencyReportRenderer.java             |    4 +-
 .../internal/dsl/DependencyResultSpec.java         |   20 +-
 .../dsl/DependencyResultSpecNotationParser.java    |   17 +-
 .../internal/graph/DependencyGraphRenderer.groovy  |   13 +-
 .../diagnostics/internal/graph/NodeRenderer.groovy |    3 -
 .../internal/graph/SimpleNodeRenderer.java         |    3 -
 .../nodes/AbstractRenderableDependencyResult.java  |   64 +-
 .../nodes/AbstractRenderableModuleResult.java      |   15 +-
 .../internal/graph/nodes/DependencyEdge.java       |   14 +-
 .../graph/nodes/DependencyReportHeader.java        |   55 +
 .../nodes/InvertedRenderableModuleResult.java      |   10 +-
 .../internal/graph/nodes/RenderableDependency.java |    7 +-
 .../graph/nodes/RenderableDependencyResult.java    |   12 +-
 .../graph/nodes/RenderableModuleResult.java        |    7 +-
 .../RenderableUnresolvedDependencyResult.java      |   47 +-
 .../internal/graph/nodes/RequestedVersion.java     |   20 +-
 .../graph/nodes/ResolvedDependencyEdge.java        |   14 +-
 .../internal/graph/nodes/SimpleDependency.java     |   64 -
 .../graph/nodes/UnresolvedDependencyEdge.java      |   25 +-
 .../insight/DependencyInsightReporter.groovy       |   28 +-
 .../internal/insight/DependencyResultSorter.java   |  151 +-
 .../main/groovy/org/gradle/configuration/Help.java |   25 +
 .../gradle/configuration/TaskDetailPrinter.java    |  206 +
 ...le.configuration.project.ProjectConfigureAction |    1 +
 .../tasks/diagnostics/htmldependencyreport/d.gif   |  Bin 0 -> 2944 bytes
 .../tasks/diagnostics/htmldependencyreport/d.png   |  Bin 0 -> 7635 bytes
 .../diagnostics/htmldependencyreport/index.html    |   48 +
 .../htmldependencyreport/jquery-1.10.1.min.js      |    6 +
 .../htmldependencyreport/jquery.jstree.js          | 4564 ++++++++++++++++++++
 .../diagnostics/htmldependencyreport/script.js     |  225 +
 .../diagnostics/htmldependencyreport/style.css     |   85 +
 .../diagnostics/htmldependencyreport/template.html |   41 +
 .../diagnostics/htmldependencyreport/throbber.gif  |  Bin 0 -> 1849 bytes
 .../diagnostics/htmldependencyreport/tree.css      |  102 +
 .../gradle/api/plugins/HelpTasksPluginSpec.groovy  |   26 +-
 .../api/plugins/ProjectReportsPluginTest.groovy    |   72 +
 .../api/plugins/ProjectReportsPluginTest.java      |   68 -
 .../ReportingBasePluginConventionTest.groovy       |   64 -
 .../api/plugins/ReportingBasePluginTest.groovy     |   46 -
 .../internal/StrictDependencyResultSpecTest.groovy |   61 +
 .../tasks/diagnostics/AbstractReportTaskTest.java  |    8 +-
 .../DependencyInsightReportTaskSpec.groovy         |   15 +-
 .../diagnostics/DependencyReportTaskTest.groovy    |   19 +-
 .../tasks/diagnostics/ProjectReportTaskTest.groovy |   14 +-
 .../tasks/diagnostics/PropertyReportTaskTest.java  |    4 +-
 .../api/tasks/diagnostics/TaskReportTaskTest.java  |    4 +-
 .../internal/TaskReportRendererTest.groovy         |    3 -
 .../AsciiDependencyReportRendererTest.groovy       |    4 +-
 .../DependencyResultSpecNotationParserSpec.groovy  |   13 +-
 .../internal/dsl/DependencyResultSpecTest.groovy   |   13 +-
 .../graph/DependencyGraphRendererSpec.groovy       |    5 +-
 .../AbstractRenderableDependencyResultSpec.groovy  |   45 +-
 .../nodes/RenderableDependencyResultTest.groovy    |   11 +-
 ...RenderableUnresolvedDependencyResultTest.groovy |    6 +-
 .../internal/graph/nodes/SimpleDependency.java     |   64 +
 .../insight/DependencyInsightReporterSpec.groovy   |   28 +-
 .../insight/DependencyResultSorterSpec.groovy      |  210 +-
 subprojects/distributions/distributions.gradle     |   22 +-
 .../gradle/AllDistributionIntegrationSpec.groovy   |    9 +-
 .../org/gradle/DistributionIntegrationSpec.groovy  |    7 +-
 subprojects/docs/docs.gradle                       |   54 +-
 subprojects/docs/src/docs/css/release-notes.css    |   29 +-
 subprojects/docs/src/docs/dsl/dsl.xml              |  146 +-
 .../docs/src/docs/dsl/org.gradle.api.Task.xml      |   12 +
 ....gradle.api.artifacts.dsl.DependencyHandler.xml |    6 +
 ....gradle.api.artifacts.dsl.RepositoryHandler.xml |    3 +
 ...dle.api.plugins.ApplicationPluginConvention.xml |    6 +-
 ...adle.api.plugins.jetty.AbstractJettyRunTask.xml |    8 +
 .../org.gradle.api.plugins.jetty.JettyRunWar.xml   |    8 +
 .../org.gradle.api.plugins.quality.CodeNarc.xml    |   12 +
 ...radle.api.plugins.quality.CodeNarcExtension.xml |   15 +
 ...org.gradle.api.publish.PublicationContainer.xml |    3 -
 .../org.gradle.api.publish.ivy.IvyPublication.xml  |   24 +
 ...g.gradle.api.publish.maven.MavenPublication.xml |    9 +
 ...gradle.api.reporting.GenerateBuildDashboard.xml |    3 -
 .../docs/dsl/org.gradle.api.reporting.Report.xml   |   37 +
 .../org.gradle.api.reporting.ReportContainer.xml   |   25 +
 .../dsl/org.gradle.api.reporting.Reporting.xml     |   28 +
 ...org.gradle.api.reporting.ReportingExtension.xml |   28 +
 ...rting.dependencies.HtmlDependencyReportTask.xml |   27 +
 .../dsl/org.gradle.api.tasks.AbstractCopyTask.xml  |   10 +
 .../src/docs/dsl/org.gradle.api.tasks.Copy.xml     |    2 +-
 .../dsl/org.gradle.api.tasks.GroovyRuntime.xml     |   25 +
 .../docs/dsl/org.gradle.api.tasks.ScalaRuntime.xml |   31 +
 ...le.api.tasks.application.CreateStartScripts.xml |    3 +-
 .../docs/dsl/org.gradle.api.tasks.bundling.Zip.xml |    6 +-
 .../org.gradle.api.tasks.compile.GroovyCompile.xml |    2 +-
 ...api.tasks.incremental.IncrementalTaskInputs.xml |   25 +
 .../org.gradle.api.tasks.incremental.InputFile.xml |   26 +
 .../org.gradle.api.tasks.scala.ScalaCompile.xml    |    2 +-
 .../dsl/org.gradle.api.tasks.scala.ScalaDoc.xml    |    2 +-
 .../docs/dsl/org.gradle.api.tasks.testing.Test.xml |   13 +-
 .../dsl/org.gradle.api.tasks.wrapper.Wrapper.xml   |    4 +-
 .../dsl/org.gradle.buildinit.tasks.InitBuild.xml   |   43 +
 ...adle.ide.visualstudio.VisualStudioExtension.xml |   44 +
 ...gradle.ide.visualstudio.VisualStudioProject.xml |   44 +
 ...radle.ide.visualstudio.VisualStudioSolution.xml |   44 +
 .../dsl/org.gradle.language.DependentSourceSet.xml |   47 +
 ...rg.gradle.language.HeaderExportingSourceSet.xml |   44 +
 ...radle.language.assembler.AssemblerSourceSet.xml |   38 +
 .../org.gradle.language.base.BinaryContainer.xml   |   38 +
 ...rg.gradle.language.base.FunctionalSourceSet.xml |   38 +
 .../org.gradle.language.base.LanguageSourceSet.xml |   44 +
 .../org.gradle.language.base.ProjectSourceSet.xml  |   38 +
 .../docs/dsl/org.gradle.language.c.CSourceSet.xml  |   38 +
 .../dsl/org.gradle.language.cpp.CppSourceSet.xml   |   38 +
 ...dle.language.objectivec.ObjectiveCSourceSet.xml |   38 +
 ...language.objectivecpp.ObjectiveCppSourceSet.xml |   38 +
 .../org.gradle.language.rc.WindowsResourceSet.xml  |   38 +
 .../dsl/org.gradle.nativebinaries.BuildType.xml    |   38 +
 ...rg.gradle.nativebinaries.BuildTypeContainer.xml |   38 +
 .../dsl/org.gradle.nativebinaries.Executable.xml   |   38 +
 .../org.gradle.nativebinaries.ExecutableBinary.xml |   38 +
 ...g.gradle.nativebinaries.ExecutableContainer.xml |   38 +
 .../docs/dsl/org.gradle.nativebinaries.Flavor.xml  |   38 +
 .../org.gradle.nativebinaries.FlavorContainer.xml  |   38 +
 .../docs/dsl/org.gradle.nativebinaries.Library.xml |   47 +
 .../org.gradle.nativebinaries.LibraryBinary.xml    |   38 +
 .../org.gradle.nativebinaries.LibraryContainer.xml |   38 +
 .../dsl/org.gradle.nativebinaries.NativeBinary.xml |   47 +
 ...g.gradle.nativebinaries.ProjectNativeBinary.xml |   68 +
 ...radle.nativebinaries.ProjectNativeComponent.xml |   53 +
 ...g.gradle.nativebinaries.SharedLibraryBinary.xml |   44 +
 ...g.gradle.nativebinaries.StaticLibraryBinary.xml |   41 +
 ...adle.nativebinaries.TargetedNativeComponent.xml |   48 +
 .../docs/dsl/org.gradle.nativebinaries.Tool.xml    |   44 +
 ...e.nativebinaries.language.PreprocessingTool.xml |   44 +
 ...ebinaries.language.assembler.tasks.Assemble.xml |   47 +
 ....language.c.tasks.AbstractNativeCompileTask.xml |   68 +
 ...le.nativebinaries.language.c.tasks.CCompile.xml |   38 +
 ...language.cpp.plugins.CppExeConventionPlugin.xml |   38 +
 ...language.cpp.plugins.CppLibConventionPlugin.xml |   38 +
 ...tivebinaries.language.cpp.plugins.CppPlugin.xml |   38 +
 ...ativebinaries.language.cpp.tasks.CppCompile.xml |   38 +
 ...language.objectivec.tasks.ObjectiveCCompile.xml |   38 +
 ...uage.objectivecpp.tasks.ObjectiveCppCompile.xml |   38 +
 ...es.language.rc.tasks.WindowsResourceCompile.xml |   65 +
 ...org.gradle.nativebinaries.platform.Platform.xml |   50 +
 ...e.nativebinaries.platform.PlatformContainer.xml |   38 +
 ...radle.nativebinaries.tasks.AbstractLinkTask.xml |   59 +
 ...le.nativebinaries.tasks.CreateStaticLibrary.xml |   53 +
 ...adle.nativebinaries.tasks.InstallExecutable.xml |   50 +
 ....gradle.nativebinaries.tasks.LinkExecutable.xml |   38 +
 ...adle.nativebinaries.tasks.LinkSharedLibrary.xml |   38 +
 ...tivebinaries.test.ProjectComponentTestSuite.xml |   41 +
 .../org.gradle.nativebinaries.test.TestSuite.xml   |   38 +
 ...adle.nativebinaries.test.TestSuiteContainer.xml |   38 +
 ...tivebinaries.test.TestSuiteExecutableBinary.xml |   38 +
 ...le.nativebinaries.test.cunit.CUnitTestSuite.xml |   38 +
 .../org.gradle.nativebinaries.toolchain.Clang.xml  |   40 +
 .../org.gradle.nativebinaries.toolchain.Gcc.xml    |   40 +
 ...ies.toolchain.PlatformConfigurableToolChain.xml |   44 +
 ...g.gradle.nativebinaries.toolchain.ToolChain.xml |   38 +
 ....nativebinaries.toolchain.ToolChainRegistry.xml |   38 +
 ...g.gradle.nativebinaries.toolchain.VisualCpp.xml |   40 +
 ...inaries.toolchain.plugins.GppCompilerPlugin.xml |   38 +
 ....toolchain.plugins.MicrosoftVisualCppPlugin.xml |   38 +
 ...g.gradle.plugins.ide.idea.model.IdeaProject.xml |    2 +-
 ...esting.jacoco.plugins.JacocoPluginExtension.xml |   50 +
 ....testing.jacoco.plugins.JacocoTaskExtension.xml |   77 +
 .../org.gradle.testing.jacoco.tasks.JacocoBase.xml |   45 +
 ...org.gradle.testing.jacoco.tasks.JacocoMerge.xml |   50 +
 ...rg.gradle.testing.jacoco.tasks.JacocoReport.xml |   69 +
 subprojects/docs/src/docs/dsl/plugins.xml          |   41 +
 .../docs/src/docs/release/content/script.js        |   26 +-
 .../docs/src/docs/release/notes-template.md        |   14 +-
 subprojects/docs/src/docs/release/notes.md         |  485 +--
 subprojects/docs/src/docs/stylesheets/dslHtml.xsl  |   10 +-
 .../src/docs/stylesheets/userGuideHtmlCommon.xsl   |    2 +-
 .../docs/src/docs/userguide/applicationPlugin.xml  |   12 +-
 .../docs/src/docs/userguide/artifactMngmt.xml      |    4 +-
 .../docs/src/docs/userguide/bootstrapPlugin.xml    |   88 -
 .../docs/userguide/buildAnnouncementsPlugin.xml    |    2 +-
 .../src/docs/userguide/buildDashboardPlugin.xml    |   20 +-
 .../docs/src/docs/userguide/buildInitPlugin.xml    |  222 +
 .../docs/src/docs/userguide/buildLifecycle.xml     |   12 +-
 .../src/docs/userguide/buildScriptsTutorial.xml    |   30 +-
 .../src/docs/userguide/commandLineTutorial.xml     |   12 +
 .../docs/src/docs/userguide/comparingBuilds.xml    |    8 +-
 subprojects/docs/src/docs/userguide/cpp.xml        |  188 -
 .../docs/src/docs/userguide/customPlugins.xml      |    2 +-
 .../docs/src/docs/userguide/customTasks.xml        |  142 +
 subprojects/docs/src/docs/userguide/depMngmt.xml   |  146 +-
 .../docs/src/docs/userguide/distributionPlugin.xml |  206 +-
 .../docs/src/docs/userguide/eclipsePlugin.xml      |    4 +-
 .../docs/src/docs/userguide/gradleDaemon.xml       |    4 +-
 .../docs/src/docs/userguide/gradleWrapper.xml      |   64 +-
 .../docs/src/docs/userguide/groovyPlugin.xml       |   70 +-
 .../docs/src/docs/userguide/groovyTutorial.xml     |    4 +-
 subprojects/docs/src/docs/userguide/ideSupport.xml |    2 +-
 subprojects/docs/src/docs/userguide/ideaPlugin.xml |    4 +-
 .../src/docs/userguide/img/jacocoHtmlReport.png    |  Bin 0 -> 103803 bytes
 .../docs/src/docs/userguide/initscripts.xml        |   19 +-
 .../docs/src/docs/userguide/jacocoPlugin.xml       |  248 ++
 .../userguide/javaLibraryDistributionPlugin.xml    |    3 +-
 subprojects/docs/src/docs/userguide/javaPlugin.xml |  142 +-
 .../docs/src/docs/userguide/javaTutorial.xml       |    8 +-
 .../docs/src/docs/userguide/jettyPlugin.xml        |   14 +
 subprojects/docs/src/docs/userguide/logging.xml    |    7 +-
 .../docs/src/docs/userguide/mavenPlugin.xml        |    2 +-
 .../docs/src/docs/userguide/multiproject.xml       |    4 +-
 .../docs/src/docs/userguide/nativeBinaries.xml     |  682 +++
 .../docs/src/docs/userguide/organizeBuildLogic.xml |    2 +-
 subprojects/docs/src/docs/userguide/plugins.xml    |    6 +-
 .../docs/src/docs/userguide/projectReports.xml     |   12 +-
 .../docs/src/docs/userguide/publishingIvy.xml      |   49 +-
 .../docs/src/docs/userguide/publishingMaven.xml    |   39 +-
 .../docs/src/docs/userguide/scalaPlugin.xml        |   35 +-
 .../docs/src/docs/userguide/sonarPlugin.xml        |   40 +-
 .../docs/src/docs/userguide/sonarRunnerPlugin.xml  |   10 +-
 .../docs/src/docs/userguide/standardPlugins.xml    |  251 +-
 subprojects/docs/src/docs/userguide/tasks.xml      |  142 +-
 .../docs/src/docs/userguide/thisAndThat.xml        |    5 +-
 subprojects/docs/src/docs/userguide/userguide.xml  |    8 +-
 subprojects/docs/src/docs/userguide/warPlugin.xml  |    2 +-
 .../docs/src/docs/userguide/workingWithFiles.xml   |   41 +-
 .../docs/src/docs/userguide/wrapperPlugin.xml      |   59 +
 .../src/docs/userguide/writingBuildScripts.xml     |    2 +-
 .../docs/src/samples/application/build.gradle      |    4 +
 .../src/main/java/org/gradle/sample/Main.java      |    6 +-
 .../docs/src/samples/buildDashboard/build.gradle   |    2 +-
 .../src/main/java/org/gradle/sample/Person.java    |   15 +
 .../docs/src/samples/codeQuality/build.gradle      |    2 +-
 .../docs/src/samples/cpp/dependencies/build.gradle |   63 -
 .../cpp/dependencies/lib/src/main/cpp/hello.cpp    |    5 -
 .../cpp/dependencies/lib/src/main/headers/hello.h  |    1 -
 subprojects/docs/src/samples/cpp/exe/build.gradle  |   11 -
 .../docs/src/samples/cpp/exewithlib/build.gradle   |   18 -
 .../src/samples/cpp/exewithlib/settings.gradle     |    1 -
 .../groovy/org/gradle/samples/ProductPlugin.groovy |    2 +-
 .../samples/customDistribution/plugin/build.gradle |    2 +-
 .../src/samples/customPlugin/plugin/build.gradle   |    2 +-
 .../samples/groovy/customizedLayout/build.gradle   |    2 +-
 .../samples/groovy/mixedJavaAndGroovy/build.gradle |    2 +-
 .../multiproject/groovycDetector/build.gradle      |    2 +-
 .../groovy/multiproject/testproject/build.gradle   |    2 +-
 .../main/groovy/org/gradle/GroovyJavaPerson.java   |    3 -
 .../src/main/groovy/org/gradle/GroovyPerson.groovy |    3 -
 .../src/main/java/org/gradle/JavaPerson.java       |    3 -
 .../src/test/groovy/org/gradle/VersionTest.groovy  |    4 +-
 .../src/samples/groovy/quickstart/build.gradle     |    2 +-
 .../src/test/groovy/org/gradle/PersonTest.groovy   |    2 +-
 .../descriptor-customization/build.gradle          |    6 +-
 .../ivy-publish/java-multi-project/build.gradle    |    2 +-
 .../ivy-publish/multiple-publications/build.gradle |   83 +
 .../multiple-publications/output/project1.ivy.xml  |   15 +
 .../output/project2-api.ivy.xml                    |   13 +
 .../output/project2-impl.ivy.xml                   |   16 +
 .../multiple-publications/settings.gradle          |    2 +
 .../samples/ivy-publish/quickstart/build.gradle    |    2 +-
 .../java/org/gradle/webservice/TestTestTest.java   |    3 -
 .../docs/src/samples/java/quickstart/build.gradle  |    8 +-
 .../samples/maven-publish/javaProject/build.gradle |    2 +-
 .../multiple-publications/build.gradle             |   69 +
 .../multiple-publications/output/project1.pom.xml  |   17 +
 .../output/project2-api.pom.xml                    |    9 +
 .../output/project2-impl.pom.xml                   |   23 +
 .../multiple-publications/settings.gradle          |    2 +
 .../maven-publish/pomCustomization/build.gradle    |    8 +-
 .../samples/maven-publish/quickstart/build.gradle  |    2 +-
 .../maven/pomGeneration/lib/compile-1.0.jar        |  Bin 0 -> 144 bytes
 .../pomGeneration/lib/providedCompile-1.0.jar      |  Bin 0 -> 144 bytes
 .../pomGeneration/lib/providedRuntime-1.0.zip      |  Bin 0 -> 144 bytes
 .../pomGeneration/lib/providedRuntime-util-1.0.war |  Bin 0 -> 144 bytes
 .../maven/pomGeneration/lib/runtime-1.0.jar        |  Bin 0 -> 144 bytes
 .../maven/pomGeneration/lib/testCompile-1.0.jar    |  Bin 0 -> 144 bytes
 .../maven/pomGeneration/lib/testRuntime-1.0.jar    |  Bin 0 -> 144 bytes
 .../multiProjectBuildSrc/buildSrc/build.gradle     |    2 +-
 .../samples/native-binaries/assembler/build.gradle |   62 +
 .../assembler/src/main/asm_i386_gcc/sum.s          |    6 +
 .../assembler/src/main/asm_i386_masm/sum.s         |   12 +
 .../native-binaries/assembler/src/main/c/main.c    |    8 +
 .../assembler/src/main/headers/sum.h               |    6 +
 .../src/samples/native-binaries/c/build.gradle     |   61 +
 .../samples/native-binaries/c/src/hello/c/hello.c  |    6 +
 .../native-binaries/c/src/hello/headers/hello.h    |    8 +
 .../c/src/main/c/main.c}                           |    0
 .../samples/native-binaries/cpp-exe/build.gradle   |   27 +
 .../native-binaries/cpp-exe/settings.gradle        |    1 +
 .../cpp-exe}/src/main/cpp/hello.cpp                |    0
 .../samples/native-binaries/cpp-lib/build.gradle   |   14 +
 .../native-binaries/cpp-lib/settings.gradle        |    1 +
 .../native-binaries/cpp-lib/src/main/cpp/hello.cpp |   14 +
 .../cpp-lib}/src/main/headers/hello.h              |    0
 .../src/samples/native-binaries/cpp/build.gradle   |   51 +
 .../native-binaries/cpp/src/hello/cpp/hello.cpp    |    6 +
 .../native-binaries/cpp/src/hello/headers/hello.h  |    7 +
 .../cpp}/src/main/cpp/main.cpp                     |    0
 .../src/samples/native-binaries/cunit/README.md    |    7 +
 .../src/samples/native-binaries/cunit/build.gradle |   47 +
 .../lib/cunit/2.1-2/include/CUnit/Automated.h      |   90 +
 .../cunit/lib/cunit/2.1-2/include/CUnit/Basic.h    |  113 +
 .../cunit/lib/cunit/2.1-2/include/CUnit/CUError.h  |  199 +
 .../cunit/lib/cunit/2.1-2/include/CUnit/CUnit.h    |  383 ++
 .../lib/cunit/2.1-2/include/CUnit/CUnit_intl.h     |   62 +
 .../cunit/lib/cunit/2.1-2/include/CUnit/Console.h  |   60 +
 .../cunit/lib/cunit/2.1-2/include/CUnit/MyMem.h    |  104 +
 .../cunit/lib/cunit/2.1-2/include/CUnit/TestDB.h   |  914 ++++
 .../cunit/lib/cunit/2.1-2/include/CUnit/TestRun.h  |  444 ++
 .../cunit/lib/cunit/2.1-2/include/CUnit/Util.h     |  158 +
 .../cunit/lib/cunit/2.1-2/lib/cygwin/cunit.lib     |  Bin 0 -> 81868 bytes
 .../cunit/lib/cunit/2.1-2/lib/linux/libcunit.a     |  Bin 0 -> 117622 bytes
 .../cunit/lib/cunit/2.1-2/lib/mingw/cunit.lib      |  Bin 0 -> 75800 bytes
 .../cunit/lib/cunit/2.1-2/lib/osx/libcunit.a       |  Bin 0 -> 85768 bytes
 .../cunit/lib/cunit/2.1-2/lib/vs2010/cunit.lib     |  Bin 0 -> 117792 bytes
 .../cunit/lib/cunit/2.1-2/lib/vs2013/cunit.lib     |  Bin 0 -> 116230 bytes
 .../native-binaries/cunit/src/operators/c/minus.c  |    5 +
 .../native-binaries/cunit/src/operators/c/plus.c   |    9 +
 .../cunit/src/operators/headers/operators.h        |    2 +
 .../src/operatorsTest/cunit/suite_operators.c      |   17 +
 .../cunit/src/operatorsTest/cunit/test_minus.c     |    8 +
 .../cunit/src/operatorsTest/cunit/test_plus.c      |    8 +
 .../src/operatorsTest/headers/test_operators.h     |    2 +
 .../native-binaries/custom-layout/build.gradle     |   62 +
 .../custom-layout/src/include/hello.h              |    7 +
 .../custom-layout/src/source/hello.c               |    6 +
 .../custom-layout/src/source/main.cpp              |    8 +
 .../samples/native-binaries/flavors/build.gradle   |   37 +
 .../flavors/src/exe}/cpp/main.cpp                  |    0
 .../native-binaries/flavors/src/lib/cpp/hello.cpp  |   10 +
 .../flavors/src/lib/headers/hello.h                |   10 +
 .../src/samples/native-binaries/idl/build.gradle   |   44 +
 .../samples/native-binaries/idl/src/main/c/main.c  |    6 +
 .../native-binaries/idl/src/main/idl/hello.idl     |   16 +
 .../native-binaries/multi-project/build.gradle     |   24 +
 .../multi-project}/exe/src/main/cpp/main.cpp       |    0
 .../multi-project}/lib/src/main/cpp/hello.cpp      |    0
 .../multi-project}/lib/src/main/headers/hello.h    |    0
 .../multi-project}/settings.gradle                 |    0
 .../native-binaries/objective-c/build.gradle       |   23 +
 .../objective-c/src/main/objc/main.m               |   10 +
 .../native-binaries/objective-cpp/build.gradle     |   23 +
 .../objective-cpp/src/main/objcpp/main.mm          |   14 +
 .../prebuilt/3rd-party-lib/boost_1_55_0/README.txt |    2 +
 .../3rd-party-lib/boost_1_55_0/boost/version.hpp   |   32 +
 .../prebuilt/3rd-party-lib/util/README.txt         |    2 +
 .../prebuilt/3rd-party-lib/util/build.gradle       |   25 +
 .../prebuilt/3rd-party-lib/util/settings.gradle    |    1 +
 .../3rd-party-lib/util/src/util/cpp/util.cpp       |   10 +
 .../3rd-party-lib/util/src/util/headers/util.h     |    7 +
 .../samples/native-binaries/prebuilt/build.gradle  |   45 +
 .../native-binaries/prebuilt/src/main/cpp/main.cpp |    9 +
 .../native-binaries/tool-chains/build.gradle       |   29 +
 .../tool-chains/src/main/cpp/main.cpp              |   18 +
 .../samples/native-binaries/variants/build.gradle  |   76 +
 .../variants/src/hello/cpp/hello.cpp               |   10 +
 .../variants/src/hello/headers/hello.h             |   10 +
 .../variants}/src/main/cpp/main.cpp                |    0
 .../native-binaries/visual-studio/build.gradle     |   71 +
 .../visual-studio/src/hello/cpp/hello.cpp          |    6 +
 .../visual-studio/src/hello/headers/hello.h        |    7 +
 .../visual-studio}/src/main/cpp/main.cpp           |    0
 .../build-resource-only-dll.gradle                 |   27 +
 .../native-binaries/windows-resources/build.gradle |   33 +
 .../windows-resources/src/hello/cpp/hello.cpp      |   19 +
 .../windows-resources/src/hello/headers/hello.h    |    7 +
 .../src/hello/headers/resources.h                  |    1 +
 .../windows-resources/src/hello/rc/resources.rc    |    6 +
 .../windows-resources/src/main/cpp/main.cpp        |    6 +
 subprojects/docs/src/samples/osgi/build.gradle     |    4 +-
 .../main/groovy/org/gradle/GradleActivator.groovy  |    5 -
 .../samples/sonarRunner/multiProject/build.gradle  |    4 +-
 .../samples/sonarRunner/quickstart/build.gradle    |    4 +-
 .../src/main => src/main/cpp/library}/cpp/main.cpp |    0
 .../src/samples/testing/filtering/build.gradle     |   40 +
 .../filtering/src/test/java/SomeIntegTest.java     |    6 +
 .../filtering/src/test/java/SomeOtherTest.java     |    6 +
 .../testing/jacoco/application/build.gradle        |   35 +
 .../src/main/java/org/gradle/MyMain.java           |   30 +
 .../samples/testing/jacoco/quickstart/build.gradle |   58 +
 .../src/main/java/org/gradle/Person.java           |   24 +
 .../src/test/java/org/gradle/PersonTest.java       |   41 +
 .../samples/testing/junit/categories/build.gradle  |   18 +
 .../org/gradle/junit/CategorizedJUnitTest.java     |   35 +
 .../src/test/java/org/gradle/junit/CategoryA.java  |   21 +
 .../src/test/java/org/gradle/junit/CategoryB.java  |   21 +
 .../java/org/gradle/junit/SimpleJUnitTest.java     |   27 +
 .../src/samples/testing/testReport/build.gradle    |    2 +-
 .../src/samples/testing/testng/groups/build.gradle |   18 +
 .../org/gradle/testng/SimpleIntegrationTest.java   |   29 +
 .../java/org/gradle/testng/SimpleUnitTest.java     |   29 +
 .../src/main/java/org/gradle/testng/User.java      |    3 -
 .../src/main/java/org/gradle/testng/UserImpl.java  |    3 -
 .../test/java/org/gradle/testng/UserImplTest.java  |    3 -
 .../toolingApi/customModel/plugin/build.gradle     |   20 +
 .../java/org/gradle/sample/plugin/CustomModel.java |   14 +
 .../org/gradle/sample/plugin/CustomPlugin.java     |   39 +
 .../org/gradle/sample/plugin/DefaultModel.java     |   20 +
 .../gradle-plugins/custom-plugin.properties        |    1 +
 .../src/samples/toolingApi/customModel/readme.xml  |    3 +
 .../customModel/sampleBuild/build.gradle           |   10 +
 .../customModel/sampleBuild/settings.gradle        |   16 +
 .../toolingApi/customModel/tooling/build.gradle    |   22 +
 .../src/main/java/org/gradle/sample/Main.java      |   39 +
 .../src/samples/toolingApi/eclipse/build.gradle    |    2 +-
 .../src/main/java/org/gradle/sample/Main.java      |    5 +-
 .../docs/src/samples/toolingApi/idea/build.gradle  |    2 +-
 .../idea/src/main/java/org/gradle/sample/Main.java |    3 +-
 .../docs/src/samples/toolingApi/model/build.gradle |    2 +-
 .../src/main/java/org/gradle/sample/Main.java      |    5 +-
 .../src/samples/toolingApi/runBuild/build.gradle   |    2 +-
 .../src/main/java/org/gradle/sample/Main.java      |    3 -
 .../ant/useAntType/libs/test.jar}                  |    0
 .../artifacts/componentMetadata/build.gradle       |   41 +
 .../repo/air.birds/albatros/1.9/albatros-1.9.jar}  |    0
 .../repo/air.birds/albatros/1.9/ivy-1.9.xml        |    9 +
 .../repo/air.birds/albatros/2.0/albatros-2.0.jar}  |    0
 .../repo/air.birds/albatros/2.0/ivy-2.0.xml        |    9 +
 .../repo/sea.fish/tuna/1.3/ivy-1.3.xml             |    9 +
 .../repo/sea.fish/tuna/1.3/tuna-1.3.jar}           |    0
 .../repo/sea.fish/tuna/1.4/ivy-1.4.xml             |    9 +
 .../repo/sea.fish/tuna/1.4/tuna-1.4.jar}           |    0
 .../repo/sea.fish/tuna/1.5/ivy-1.5.xml             |    9 +
 .../repo/sea.fish/tuna/1.5/tuna-1.5.jar}           |    0
 .../repo/air.birds/albatros-1.0.jar}               |    0
 .../repo/sea.fish/herring-1.0.jar}                 |    0
 .../repo/sea.fish/shark-1.0.jar}                   |    0
 .../repo/sea.fish/tuna-1.0.jar}                    |    0
 .../repo/sea.mammals/orca-1.0.jar}                 |    0
 .../repo/sea.mammals/seal-1.0.jar}                 |    0
 .../repo/sea.mammals/seal-2.0.jar}                 |    0
 .../artifacts/defineRepository/build.gradle        |    6 +
 .../service-1.0-jdk14.jar}                         |    0
 .../service-1.0-jdk15.jar}                         |    0
 .../repo/org.gradle.test.excludes/api-1.0.jar}     |    0
 .../repo/org.gradle.test.excludes/commons-1.0.jar} |    0
 .../org.gradle.test.excludes/other-api-1.0.jar}    |    0
 .../repo/org.gradle.test.excludes/reports-1.0.jar} |    0
 .../repo/org.gradle.test.excludes/shared-1.0.jar}  |    0
 .../artifacts/externalDependencies/build.gradle    |   14 +-
 .../artifacts/resolutionStrategy/build.gradle      |    2 +-
 .../userguide/artifacts/uploading/build.gradle     |    4 +-
 .../samples/userguide/distribution/build.gradle    |   36 +-
 .../src/samples/userguide/files/copy/build.gradle  |   15 +
 .../userguide/files/copy/src/main/assets.zip       |  Bin 0 -> 332 bytes
 .../userguide/groovy/groovyDependency/build.gradle |    8 +-
 .../userguide/initScripts/customLogger/init.gradle |    3 +
 .../userguide/initScripts/plugins/build.gradle     |   27 +
 .../userguide/initScripts/plugins/init.gradle      |   34 +
 .../firstMessages/messages/build.gradle            |    1 +
 .../firstMessages/messages/consumer/build.gradle   |    3 +-
 .../messages/build.gradle                          |    1 +
 .../messages/consumer/build.gradle                 |    2 +-
 .../messages/build.gradle                          |    1 +
 .../messages/consumer/build.gradle                 |    3 +-
 .../messages/build.gradle                          |    1 +
 .../messages/consumer/build.gradle                 |    2 +-
 .../messagesHack/messages/build.gradle             |    1 +
 .../messagesHack/messages/consumer/build.gradle    |    3 +-
 .../messagesTaskDependencies/messages/build.gradle |    1 +
 .../messages/consumer/build.gradle                 |    3 +-
 .../messagesWithDependencies/messages/build.gradle |    1 +
 .../messages/consumer/build.gradle                 |    3 +-
 .../multiproject/standardLayouts/settings.gradle   |    2 +-
 .../userguide/organizeBuildLogic/build.gradle      |    2 +-
 .../tasks/addToTaskContainer/build.gradle          |    4 +-
 .../tasks/configureUsingConfigure/build.gradle     |    7 -
 .../tasks/configureUsingLiterateStyle/build.gradle |    4 -
 .../tasks/customTaskWithProperty/build.gradle      |    2 +-
 .../tasks/defineAndConfigure/build.gradle          |    2 +-
 .../userguide/tasks/finalizers/build.gradle        |    8 +
 .../tasks/finalizersWithFailure/build.gradle       |    9 +
 .../userguide/tasks/incrementalTask/build.gradle   |   66 +
 .../userguide/tasks/mustRunAfter/build.gradle      |    7 +
 .../userguide/tasks/shouldRunAfter/build.gradle    |    7 +
 .../tasks/shouldRunAfterWithCycle/build.gradle     |   12 +
 .../tutorial/groovyWithFlatDir/build.gradle        |   10 +-
 .../userguide/tutorial/projectReports/build.gradle |    2 +-
 .../tutorial/properties/gradle.properties          |    2 +-
 .../userguide/wrapper/customized/build.gradle      |    4 -
 .../samples/userguide/wrapper/simple/build.gradle  |    2 +-
 .../configurationHandlingAllFiles.out              |    4 +-
 .../samples/userguideOutput/customStatusScheme.out |    1 +
 .../userguideOutput/dependencyInsightReport.out    |    4 +-
 .../userguideOutput/dependencyListReport.out       |    6 +-
 .../userguideOutput/externalDependencies.out       |    4 +-
 .../incrementalTaskChangedProperty.out             |    4 +
 .../userguideOutput/incrementalTaskFirstRun.out    |    4 +
 .../incrementalTaskNoChange.out}                   |    0
 .../incrementalTaskRemovedInput.out                |    2 +
 .../incrementalTaskRemovedOutput.out               |    4 +
 .../incrementalTaskUpdatedInputs.out               |    3 +
 .../src/samples/userguideOutput/latestSelector.out |    3 +
 .../src/samples/userguideOutput/mustRunAfter.out   |    2 +
 .../userguideOutput/mustRunAfterSingleTask.out     |    1 +
 .../publishingIvyGenerateDescriptor.out            |    2 +-
 .../publishingIvyPublishLifecycle.out              |    2 +-
 .../userguideOutput/publishingIvyPublishSingle.out |    2 +-
 .../src/samples/userguideOutput/shouldRunAfter.out |    2 +
 .../userguideOutput/shouldRunAfterWithCycle.out    |    3 +
 .../src/samples/userguideOutput/taskFinalizers.out |    2 +
 .../userguideOutput/taskFinalizersWithFailure.out  |    2 +
 .../docs/src/samples/userguideOutput/taskHelp.out  |   12 +
 .../samples/userguideOutput/taskListAllReport.out  |    5 +
 .../src/samples/userguideOutput/taskListReport.out |    5 +
 .../userguideOutput/usePluginsInInitScripts.out    |    1 +
 .../samples/webApplication/customised/readme.xml   |    3 -
 .../customized/additionalLibs/additional-1.0.jar   |  Bin 0 -> 349 bytes
 .../{customised => customized}/build.gradle        |    0
 .../webApplication/customized/lib/compile-1.0.jar  |  Bin 0 -> 521 bytes
 .../customized/lib/compile-transitive-1.0.jar      |  Bin 0 -> 561 bytes
 .../webApplication/customized/lib/otherLib-1.0.jar |  Bin 0 -> 349 bytes
 .../customized/lib/providedCompile-1.0.jar         |  Bin 0 -> 552 bytes
 .../lib/providedCompile-transitive-1.0.jar         |  Bin 0 -> 577 bytes
 .../customized/lib/providedRuntime-1.0.jar         |  Bin 0 -> 553 bytes
 .../webApplication/customized/lib/runtime-1.0.jar  |  Bin 0 -> 1581 bytes
 .../samples/webApplication/customized/readme.xml   |    3 +
 .../src/additionalWebInf/additional.xml            |    0
 .../src/main/java/org/gradle/HelloServlet.java     |    0
 .../src/main/java/org/gradle/MyClass.java          |    0
 .../src/main/webapp/WEB-INF/webapp.xml             |    0
 .../src/main/webapp/webapp.html                    |    0
 .../src/rootContent/root.txt                       |    0
 .../{customised => customized}/src/someWeb.xml     |    0
 .../src/test/java/org/gradle/MyClassTest.java      |    0
 .../releasenotes/FunctionalReleaseNotesTest.groovy |    6 +-
 .../docs/src/transforms/release-notes.gradle       |   36 +-
 subprojects/ear/ear.gradle                         |    1 -
 .../plugins/ear/EarPluginIntegrationTest.groovy    |  111 +-
 .../main/groovy/org/gradle/plugins/ear/Ear.groovy  |   34 +-
 .../groovy/org/gradle/plugins/ear/EarPlugin.java   |    8 +-
 .../ear/descriptor/DeploymentDescriptor.java       |    2 -
 .../gradle/plugins/ear/descriptor/EarModule.java   |    2 -
 .../plugins/ear/descriptor/EarSecurityRole.java    |    2 -
 .../plugins/ear/descriptor/EarWebModule.java       |    2 -
 .../internal/DefaultDeploymentDescriptor.groovy    |    3 -
 .../descriptor/internal/DefaultEarModule.groovy    |    3 -
 .../internal/DefaultEarSecurityRole.groovy         |    3 -
 .../descriptor/internal/DefaultEarWebModule.groovy |    3 -
 .../org/gradle/plugins/ear/EarPluginTest.groovy    |   18 +-
 .../groovy/org/gradle/plugins/ear/EarTest.groovy   |    8 +-
 .../DefaultDeploymentDescriptorTest.groovy         |    3 -
 subprojects/ide/ide.gradle                         |    7 +-
 .../plugins/ide/AbstractIdeIntegrationSpec.groovy  |   33 +
 ...ractSourcesAndJavadocJarsIntegrationTest.groovy |  282 ++
 .../ide/AutoTestedSamplesIntegrationTest.groovy    |    3 -
 .../ide/eclipse/EclipseClasspathFixture.groovy     |   24 +-
 .../eclipse/EclipseClasspathIntegrationTest.groovy |    3 -
 ...ClasspathRemoteResolutionIntegrationTest.groovy |   71 -
 .../EclipseClasspathResolveIntegrationTest.groovy  |  108 -
 .../ide/eclipse/EclipseEarIntegrationTest.groovy   |    3 -
 .../EclipseMultiModuleIntegrationTest.groovy       |    3 -
 .../eclipse/EclipseProjectIntegrationTest.groovy   |    3 -
 ...ipseSourcesAndJavadocJarsIntegrationTest.groovy |   48 +
 .../eclipse/EclipseWtpModelIntegrationTest.groovy  |    3 -
 .../plugins/ide/idea/IdeaIntegrationTest.groovy    |   77 +-
 .../ide/idea/IdeaModuleIntegrationTest.groovy      |  198 +
 .../ide/idea/IdeaMultiModuleIntegrationTest.groovy |   53 +-
 ...IdeaSourcesAndJavadocJarsIntegrationTest.groovy |   55 +
 .../ide/idea/IdeaWorkspaceIntegrationTest.groovy   |    3 -
 .../expectedFiles/apiClasspath.xml                 |    6 +-
 .../expectedFiles/groovyprojectClasspath.xml       |    6 +-
 .../expectedFiles/webAppWithVarsClasspath.xml      |    8 +-
 .../expectedFiles/webAppWithVarsWtpComponent.xml   |    2 +-
 .../expectedFiles/webserviceClasspath.xml          |   12 +-
 .../expectedFiles/webserviceWtpComponent.xml       |    2 +-
 .../canCreateAndDeleteMetaData/master/build.gradle |    6 +-
 .../expectedFiles/project1/project1.iml.xml        |   32 -
 .../expectedFiles/project2/project2.iml.xml        |   32 -
 .../expectedFiles/project3/project3.iml.xml        |   32 -
 .../expectedFiles/root.ipr.xml                     |  123 -
 .../expectedFiles/api/api.iml.xml                  |    8 +-
 .../expectedFiles/webservice/webservice.iml.xml    |   24 +-
 .../expectedFiles/root.iml.xml                     |    8 +-
 .../plugins/ide/api/FileContentMerger.groovy       |    2 -
 .../org/gradle/plugins/ide/api/GeneratorTask.java  |    7 +-
 .../plugins/ide/api/XmlFileContentMerger.groovy    |    4 +-
 .../plugins/ide/eclipse/EclipsePlugin.groovy       |    6 +-
 .../plugins/ide/eclipse/EclipseWtpPlugin.groovy    |    9 +-
 .../ide/eclipse/GenerateEclipseClasspath.groovy    |    2 -
 .../ide/eclipse/GenerateEclipseProject.groovy      |    2 -
 .../ide/eclipse/GenerateEclipseWtpComponent.groovy |    2 -
 .../ide/eclipse/GenerateEclipseWtpFacet.groovy     |    2 -
 .../ide/eclipse/internal/EclipseNameDeduper.groovy |    3 -
 .../eclipse/internal/LinkedResourcesCreator.groovy |    5 +-
 .../eclipse/model/AbstractClasspathEntry.groovy    |    3 -
 .../ide/eclipse/model/AbstractLibrary.groovy       |    3 -
 .../plugins/ide/eclipse/model/AccessRule.groovy    |    3 -
 .../plugins/ide/eclipse/model/BuildCommand.groovy  |    3 -
 .../plugins/ide/eclipse/model/Classpath.groovy     |    4 +-
 .../plugins/ide/eclipse/model/ClasspathEntry.java  |    2 -
 .../plugins/ide/eclipse/model/Container.groovy     |    3 -
 .../ide/eclipse/model/EclipseClasspath.groovy      |    4 +-
 .../ide/eclipse/model/EclipseDomainModel.groovy    |    2 -
 .../plugins/ide/eclipse/model/EclipseJdt.groovy    |    2 -
 .../plugins/ide/eclipse/model/EclipseModel.groovy  |    2 -
 .../ide/eclipse/model/EclipseProject.groovy        |    8 +-
 .../plugins/ide/eclipse/model/EclipseWtp.groovy    |    2 -
 .../ide/eclipse/model/EclipseWtpComponent.groovy   |    8 +-
 .../ide/eclipse/model/EclipseWtpFacet.groovy       |    6 +-
 .../gradle/plugins/ide/eclipse/model/Facet.groovy  |    3 -
 .../plugins/ide/eclipse/model/Library.groovy       |    3 -
 .../gradle/plugins/ide/eclipse/model/Link.groovy   |    3 -
 .../gradle/plugins/ide/eclipse/model/Output.groovy |    3 -
 .../plugins/ide/eclipse/model/Project.groovy       |    2 -
 .../ide/eclipse/model/ProjectDependency.groovy     |    3 -
 .../plugins/ide/eclipse/model/SourceFolder.groovy  |    2 -
 .../plugins/ide/eclipse/model/Variable.groovy      |    3 -
 .../ide/eclipse/model/WbDependentModule.groovy     |    3 -
 .../plugins/ide/eclipse/model/WbProperty.groovy    |    3 -
 .../plugins/ide/eclipse/model/WbResource.groovy    |    3 -
 .../plugins/ide/eclipse/model/WtpComponent.groovy  |    2 -
 .../plugins/ide/eclipse/model/WtpFacet.groovy      |    2 -
 .../model/internal/ClassFoldersCreator.groovy      |    2 -
 .../eclipse/model/internal/ClasspathFactory.groovy |   17 +-
 .../model/internal/ExportedEntriesUpdater.groovy   |    3 -
 .../ide/eclipse/model/internal/PathUtil.groovy     |    3 -
 .../model/internal/ProjectDependencyBuilder.groovy |    3 -
 .../model/internal/SourceFoldersCreator.groovy     |    3 -
 .../model/internal/WtpComponentFactory.groovy      |    3 -
 .../plugins/ide/idea/GenerateIdeaModule.groovy     |    2 -
 .../plugins/ide/idea/GenerateIdeaProject.groovy    |    2 -
 .../plugins/ide/idea/GenerateIdeaWorkspace.groovy  |    2 -
 .../org/gradle/plugins/ide/idea/IdeaPlugin.groovy  |   22 +-
 .../ide/idea/internal/IdeaNameDeduper.groovy       |    3 -
 .../ide/idea/internal/IdeaScalaConfigurer.groovy   |   13 +-
 .../gradle/plugins/ide/idea/model/Dependency.java  |    2 -
 .../ide/idea/model/IdeaLanguageLevel.groovy        |    2 -
 .../gradle/plugins/ide/idea/model/IdeaModel.groovy |    1 -
 .../plugins/ide/idea/model/IdeaModule.groovy       |   10 +-
 .../plugins/ide/idea/model/IdeaModuleIml.groovy    |    2 -
 .../plugins/ide/idea/model/IdeaProject.groovy      |    6 +-
 .../plugins/ide/idea/model/IdeaWorkspace.groovy    |    6 +-
 .../plugins/ide/idea/model/JarDirectory.groovy     |    2 -
 .../org/gradle/plugins/ide/idea/model/Jdk.groovy   |    2 -
 .../gradle/plugins/ide/idea/model/Module.groovy    |    2 -
 .../plugins/ide/idea/model/ModuleDependency.groovy |    4 +-
 .../plugins/ide/idea/model/ModuleLibrary.groovy    |    4 +-
 .../org/gradle/plugins/ide/idea/model/Path.groovy  |    2 -
 .../gradle/plugins/ide/idea/model/Project.groovy   |    2 -
 .../gradle/plugins/ide/idea/model/Workspace.groovy |    2 -
 .../idea/model/internal/GeneratedIdeaScope.java    |   40 +
 .../model/internal/IdeaDependenciesProvider.groovy |   87 -
 .../model/internal/IdeaDependenciesProvider.java   |  267 ++
 .../idea/model/internal/IdeaScopeMappingRule.java  |   43 +
 .../model/internal/ModuleDependencyBuilder.groovy  |   34 -
 .../model/internal/ModuleDependencyBuilder.java    |   32 +
 .../ide/internal/IdeDependenciesExtractor.groovy   |  177 +-
 .../gradle/plugins/ide/internal/IdePlugin.groovy   |    2 +-
 .../internal/JavadocAndSourcesDownloader.groovy    |  125 -
 .../internal/configurer/DeduplicationTarget.groovy |    3 -
 .../internal/configurer/ModuleNameDeduper.groovy   |    1 -
 .../ide/internal/configurer/ProjectDeduper.groovy  |    3 -
 .../internal/tooling/BasicIdeaModelBuilder.java    |   39 +
 .../internal/tooling/BuildInvocationsBuilder.java  |   92 +
 .../ide/internal/tooling/EclipseModelBuilder.java  |  156 +
 .../ide/internal/tooling/GradleBuildBuilder.java   |   54 +
 .../ide/internal/tooling/GradleProjectBuilder.java |   84 +
 .../ide/internal/tooling/IdeaModelBuilder.java     |  143 +
 .../ide/internal/tooling/PublicationsBuilder.java  |   57 +
 .../plugins/ide/internal/tooling/TasksFactory.java |   46 +
 .../tooling/ToolingRegistrationAction.java         |   39 +
 .../eclipse/DefaultEclipseExternalDependency.java  |   54 +
 .../eclipse/DefaultEclipseLinkedResource.java      |   52 +
 .../tooling/eclipse/DefaultEclipseProject.java     |  135 +
 .../eclipse/DefaultEclipseProjectDependency.java   |   44 +
 .../eclipse/DefaultEclipseSourceDirectory.java     |   44 +
 .../tooling/eclipse/DefaultEclipseTask.java        |   56 +
 .../tooling/idea/DefaultIdeaCompilerOutput.java    |   65 +
 .../tooling/idea/DefaultIdeaContentRoot.java       |   80 +
 .../tooling/idea/DefaultIdeaDependency.java        |   22 +
 .../tooling/idea/DefaultIdeaDependencyScope.java   |   64 +
 .../tooling/idea/DefaultIdeaLanguageLevel.java     |   82 +
 .../internal/tooling/idea/DefaultIdeaModule.java   |  120 +
 .../tooling/idea/DefaultIdeaModuleDependency.java  |   61 +
 .../internal/tooling/idea/DefaultIdeaProject.java  |  107 +
 .../DefaultIdeaSingleEntryLibraryDependency.java   |   97 +
 .../tooling/idea/DefaultIdeaSourceDirectory.java   |   43 +
 .../internal/idea/DefaultIdeaModuleDependency.java |   27 +
 .../DefaultIdeaSingleEntryLibraryDependency.java   |   27 +
 .../internal/provider/BasicIdeaModelBuilder.java   |   36 -
 .../internal/provider/BuildModelAction.java        |   88 -
 .../tooling/internal/provider/BuildsModel.java     |   28 -
 .../internal/provider/EclipseModelBuilder.java     |  162 -
 .../internal/provider/FileOutcomeIdentifier.java   |   41 -
 .../internal/provider/GradleProjectBuilder.java    |   80 -
 .../internal/provider/IdeaModelBuilder.java        |  144 -
 .../internal/provider/NullResultBuilder.java       |   30 -
 .../provider/ProjectOutcomesModelBuilder.java      |   71 -
 ...blishArtifactToFileBuildOutcomeTransformer.java |   98 -
 .../tooling/internal/provider/TasksFactory.java    |   46 -
 .../resolver/DefaultIdeDependencyResolver.java     |  249 ++
 .../internal/resolver/IdeDependencyResolver.java   |   62 +
 .../ide/internal/resolver/model/IdeDependency.java |   31 +
 .../internal/resolver/model/IdeDependencyKey.java  |  157 +
 .../model/IdeExtendedRepoFileDependency.java       |   46 +
 .../resolver/model/IdeLocalFileDependency.java     |   34 +
 .../resolver/model/IdeProjectDependency.java       |   33 +
 .../resolver/model/IdeRepoFileDependency.java      |   44 +
 .../model/UnresolvedIdeRepoFileDependency.java     |   37 +
 .../ExternalModuleDependencyTranslator.java        |   27 +
 ...le.configuration.project.ProjectConfigureAction |    1 +
 .../plugins/ide/eclipse/EclipsePluginTest.groovy   |    7 +-
 .../ide/eclipse/EclipseWtpPluginTest.groovy        |    7 +-
 .../eclipse/GenerateEclipseClasspathTest.groovy    |    3 -
 .../eclipse/GenerateEclipseWtpComponentTest.groovy |    3 -
 .../ide/eclipse/GenerateEclipseWtpFacetTest.groovy |    3 -
 .../plugins/ide/eclipse/model/ClasspathTest.groovy |    3 -
 .../plugins/ide/eclipse/model/ContainerTest.groovy |    3 -
 .../ide/eclipse/model/EclipseModelTest.groovy      |    3 -
 .../ide/eclipse/model/EclipseProjectTest.groovy    |    3 -
 .../plugins/ide/eclipse/model/FacetTest.groovy     |    7 +-
 .../plugins/ide/eclipse/model/LibraryTest.groovy   |    3 -
 .../plugins/ide/eclipse/model/OutputTest.groovy    |    3 -
 .../ide/eclipse/model/ProjectDependencyTest.groovy |    3 -
 .../plugins/ide/eclipse/model/ProjectTest.groovy   |    3 -
 .../ide/eclipse/model/SourceFolderTest.groovy      |    3 -
 .../plugins/ide/eclipse/model/VariableTest.groovy  |    3 -
 .../ide/eclipse/model/WbDependentModuleTest.groovy |    3 -
 .../ide/eclipse/model/WbPropertyTest.groovy        |    3 -
 .../ide/eclipse/model/WbResourceTest.groovy        |    3 -
 .../ide/eclipse/model/WtpComponentTest.groovy      |    3 -
 .../plugins/ide/eclipse/model/WtpFacetTest.groovy  |    3 -
 .../internal/ProjectDependencyBuilderTest.groovy   |    7 +-
 .../ide/idea/ GenerateIdeaModuleTest.groovy        |   11 +-
 .../gradle/plugins/ide/idea/IdeaPluginTest.groovy  |   35 +-
 .../ide/idea/model/IdeaLanguageLevelTest.groovy    |    3 -
 .../ide/idea/model/ModuleDependencyTest.groovy     |    3 -
 .../ide/idea/model/ModuleLibraryTest.groovy        |    3 -
 .../plugins/ide/idea/model/ModuleTest.groovy       |    3 -
 .../ide/idea/model/ProjectLibraryTest.groovy       |    7 +-
 .../plugins/ide/idea/model/ProjectTest.groovy      |    3 -
 .../internal/IdeaDependenciesProviderTest.groovy   |  208 +
 .../internal/ModuleDependencyBuilderTest.groovy    |    7 +-
 .../plugins/ide/internal/GeneratorTaskTest.groovy  |    4 +-
 .../plugins/ide/internal/IdePluginTest.groovy      |    4 +-
 .../configurer/DeduplicationTargetTest.groovy      |   15 +-
 .../configurer/ModuleNameDeduperTest.groovy        |    3 -
 .../internal/configurer/ProjectDeduperTest.groovy  |   11 +-
 .../tooling/BuildInvocationsBuilderTest.groovy     |   79 +
 .../internal/tooling/GradleBuildBuilderTest.groovy |   46 +
 .../tooling/GradleProjectBuilderTest.groovy        |   42 +
 .../tooling/ProjectPublicationsBuilderTest.groovy  |   59 +
 .../ide/internal/tooling/TasksFactoryTest.groovy   |   52 +
 .../eclipse/DefaultEclipseProjectTest.groovy       |   27 +
 ...rtifactToFileBuildOutcomeTransformerTest.groovy |   86 -
 .../internal/provider/TasksFactoryTest.groovy      |   52 -
 subprojects/integ-test/integ-test.gradle           |    8 +-
 ...kCommandLineConfigurationIntegrationSpec.groovy |  252 --
 .../org/gradle/debug/GradleBuildRunner.groovy      |    2 -
 .../org/gradle/debug/GradleRunConfiguration.groovy |    2 -
 .../integtests/AntProjectIntegrationTest.groovy    |   63 +
 .../integtests/ApplicationIntegrationSpec.groovy   |    2 +-
 .../integtests/ApplicationIntegrationTest.groovy   |  146 +
 .../BuildAggregationIntegrationTest.groovy         |   26 +-
 .../BuildScriptClasspathIntegrationTest.java       |    3 +-
 .../BuildScriptErrorIntegrationTest.java           |  108 -
 .../BuildScriptExecutionIntegrationTest.groovy     |    1 -
 .../integtests/CacheProjectIntegrationTest.groovy  |   23 +-
 .../integtests/CommandLineIntegrationTest.groovy   |    9 +-
 .../integtests/CustomPluginIntegrationTest.groovy  |    4 +-
 .../DistributionLocatorIntegrationTest.groovy      |    8 +-
 .../ExternalScriptErrorIntegrationTest.groovy      |   93 -
 .../ExternalScriptExecutionIntegrationTest.groovy  |    3 -
 ...ementalGroovyProjectBuildIntegrationTest.groovy |    2 +-
 .../IncrementalTasksIntegrationTest.groovy         |  343 ++
 .../IncrementalTestIntegrationTest.groovy          |   94 -
 .../integtests/InitScriptErrorIntegrationTest.java |   51 -
 .../InitScriptExecutionIntegrationTest.groovy      |    1 -
 .../integtests/JavaProjectIntegrationTest.groovy   |   10 +-
 .../MixedNativeAndJvmProjectIntegrationTest.groovy |   41 +
 .../MultiProjectDependencyIntegrationTest.groovy   |   12 +-
 .../OsgiProjectSampleIntegrationTest.groovy        |    5 +-
 .../ParallelProjectExecutionIntegrationTest.groovy |   59 +-
 .../PluginCrossVersionIntegrationTest.groovy       |   72 -
 .../integtests/ProfilingIntegrationTest.groovy     |   41 -
 .../integtests/ProjectLayoutIntegrationTest.groovy |   21 +-
 .../SettingsScriptErrorIntegrationTest.java        |   39 -
 .../SettingsScriptExecutionIntegrationTest.groovy  |    1 -
 .../TaskDefinitionIntegrationSpec.groovy           |   30 +
 .../TaskErrorExecutionIntegrationTest.groovy       |   35 +-
 .../integtests/TaskExecutionIntegrationTest.groovy |  435 ++
 .../integtests/TaskExecutionIntegrationTest.java   |  180 -
 ...ssingBinaryCompatibilityCrossVersionSpec.groovy |   81 +
 .../integtests/WaterProjectIntegrationTest.groovy  |    3 -
 .../integtests/WebProjectIntegrationTest.java      |    2 +-
 .../BuildEnvironmentIntegrationTest.groovy         |    3 -
 .../fixture/TempDirIsUniquePerTestSpec.groovy      |    3 -
 .../logging/LoggingIntegrationTest.groovy          |   38 +-
 .../ivy/IvyHttpPublishIntegrationTest.groovy       |  334 --
 .../IvyJavaProjectPublishIntegrationTest.groovy    |   63 -
 .../ivy/IvyLocalPublishIntegrationTest.groovy      |  116 -
 .../ivy/IvySFtpPublishIntegrationTest.groovy       |   11 +-
 .../IvySingleProjectPublishIntegrationTest.groovy  |  128 -
 .../ivy/SamplesIvyPublishIntegrationTest.groovy    |   37 -
 .../maven/MavenPublishIntegrationTest.groovy       |  361 --
 ...SamplesMavenPomGenerationIntegrationTest.groovy |  109 -
 .../SamplesMavenQuickstartIntegrationTest.groovy   |   82 -
 .../AutoTestedSamplesCoreIntegrationTest.groovy    |    3 -
 .../AutoTestedSamplesPluginsIntegrationTest.groovy |    3 -
 .../samples/JUnitSamplesIntegrationTest.groovy     |   42 +
 .../samples/SamplesAntlrIntegrationTest.groovy     |    4 +-
 .../SamplesCodeQualityIntegrationTest.groovy       |    3 -
 .../SamplesCustomPluginIntegrationTest.groovy      |    4 +-
 ...lesExcludesAndClassifiersIntegrationTest.groovy |    3 -
 ...lesGroovyCustomizedLayoutIntegrationTest.groovy |    4 +-
 ...SamplesGroovyMultiProjectIntegrationTest.groovy |    3 -
 .../SamplesGroovyQuickstartIntegrationTest.groovy  |    4 +-
 .../samples/SamplesJUnitIntegrationTest.groovy     |   44 +
 .../samples/SamplesJavaBaseIntegrationTest.groovy  |    8 +-
 ...mplesJavaCustomizedLayoutIntegrationTest.groovy |    8 +-
 .../SamplesJavaMultiProjectIntegrationTest.groovy  |   11 +-
 ...esJavaProjectWithIntTestsIntegrationTest.groovy |    7 +-
 .../SamplesJavaQuickstartIntegrationTest.groovy    |    7 +-
 ...SamplesMixedJavaAndGroovyIntegrationTest.groovy |    4 +-
 .../SamplesMixedJavaAndScalaIntegrationTest.groovy |   74 -
 .../SamplesRepositoriesIntegrationTest.groovy      |    3 -
 ...plesScalaCustomizedLayoutIntegrationTest.groovy |   50 -
 .../SamplesScalaQuickstartIntegrationTest.groovy   |   66 -
 .../SamplesWebProjectIntegrationTest.groovy        |   11 +-
 .../SamplesWebQuickstartIntegrationTest.groovy     |    5 +-
 .../canExecuteCommands/canExecuteCommands.gradle   |    4 +-
 .../canExecuteJava/canExecuteJava.gradle           |    4 +-
 .../LoggingIntegrationTest/deprecated/build.gradle |    7 -
 .../logging/project1/build.gradle                  |    8 +-
 .../internal-integ-testing.gradle                  |   55 +-
 .../fixtures/AbstractAutoTestedSamplesTest.groovy  |    5 +-
 .../fixtures/AbstractCompatibilityTestRunner.java  |   22 +-
 .../fixtures/AbstractIntegrationSpec.groovy        |   34 +-
 .../fixtures/AbstractMultiTestRunner.java          |  329 +-
 .../fixtures/AutoTestedSamplesUtil.groovy          |    3 -
 .../integtests/fixtures/AvailableJavaHomes.java    |   41 +-
 .../fixtures/CrossVersionTestRunner.groovy         |    2 +-
 .../integtests/fixtures/IntegrationTestHint.java   |    3 -
 .../fixtures/KillProcessAvailability.groovy        |    3 -
 .../fixtures/MultiVersionSpecRunner.groovy         |   12 +-
 .../gradle/integtests/fixtures/TargetCoverage.java |   30 +
 .../fixtures/TestNGExecutionResult.groovy          |   49 +-
 .../fixtures/UserGuideSamplesRunner.groovy         |   14 +-
 .../fixtures/executer/AbstractGradleExecuter.java  |   25 +-
 .../fixtures/executer/AnyOrderOutputMatcher.groovy |   51 +
 .../fixtures/executer/DaemonGradleExecuter.java    |    3 +-
 .../executer/DefaultGradleDistribution.java        |   45 +-
 .../executer/DependencyResolutionFailure.groovy    |    3 -
 .../executer/DetailedExecutionFailure.groovy       |    5 +-
 .../executer/DownloadableGradleDistribution.groovy |    7 +-
 .../executer/EmbeddedDaemonGradleExecuter.java     |    5 +-
 .../fixtures/executer/ExecutionFailure.java        |   17 +
 .../fixtures/executer/ExecutionResult.java         |    2 +-
 .../fixtures/executer/ForkingGradleExecuter.java   |   14 +-
 .../fixtures/executer/GradleDistribution.java      |    8 +-
 .../fixtures/executer/GradleExecuter.java          |    5 +
 .../fixtures/executer/InProcessGradleExecuter.java |  130 +-
 .../executer/InitScriptExecuterFixture.groovy      |    7 +-
 .../executer/OutputScrapingExecutionFailure.java   |  104 +-
 .../executer/OutputScrapingExecutionResult.java    |   14 +-
 .../executer/ParallelForkingGradleHandle.java      |    5 +-
 .../fixtures/executer/ParallelOutputMatcher.groovy |   51 -
 .../executer/ProgressLoggingFixture.groovy         |    8 +
 .../versions/ClasspathVersionJsonSource.java       |   58 -
 .../fixtures/versions/ClasspathVersionSource.java  |   65 +
 .../versions/IsTestableGradleVersionSpec.groovy    |   39 -
 .../fixtures/versions/ReleasedGradleVersion.java   |   63 -
 .../versions/ReleasedVersionDistributions.java     |   47 +-
 .../versions/VersionWebServiceJsonParser.java      |   85 -
 .../org/gradle/test/fixtures/AbstractModule.groovy |   77 +
 .../org/gradle/test/fixtures/HttpModule.groovy     |   20 +
 .../org/gradle/test/fixtures/HttpRepository.groovy |   22 +
 .../groovy/org/gradle/test/fixtures/Module.groovy  |   23 +
 .../org/gradle/test/fixtures/Repository.groovy     |   24 +
 .../gradle/test/fixtures/bintray/BintrayApi.groovy |   83 +
 .../test/fixtures/bintray/BintrayTestServer.groovy |   62 +
 .../test/fixtures/ivy/AbstractIvyModule.groovy     |   25 -
 .../gradle/test/fixtures/ivy/IvyDescriptor.groovy  |    2 +
 .../gradle/test/fixtures/ivy/IvyFileModule.groovy  |  142 +-
 .../test/fixtures/ivy/IvyFileRepository.groovy     |   11 +-
 .../gradle/test/fixtures/ivy/IvyHttpModule.groovy  |  147 +-
 .../test/fixtures/ivy/IvyHttpRepository.groovy     |    9 +-
 .../org/gradle/test/fixtures/ivy/IvyModule.java    |   35 +-
 .../gradle/test/fixtures/ivy/IvyRepository.groovy  |    4 +-
 .../test/fixtures/maven/AbstractMavenModule.groovy |  341 ++
 .../test/fixtures/maven/BasicHttpResource.groovy   |    7 +-
 .../gradle/test/fixtures/maven/HttpArtifact.groovy |   15 +-
 .../gradle/test/fixtures/maven/HttpResource.groovy |   22 +-
 .../test/fixtures/maven/M2Installation.groovy      |    8 +-
 .../test/fixtures/maven/MavenDependency.groovy     |    5 +
 .../test/fixtures/maven/MavenFileModule.groovy     |  348 +-
 .../test/fixtures/maven/MavenFileRepository.groovy |    3 +-
 .../test/fixtures/maven/MavenHttpModule.groovy     |   30 +-
 .../test/fixtures/maven/MavenHttpRepository.groovy |   15 +-
 .../test/fixtures/maven/MavenLocalModule.groovy    |   67 +
 .../fixtures/maven/MavenLocalRepository.groovy     |   40 +
 .../gradle/test/fixtures/maven/MavenModule.groovy  |   23 +-
 .../test/fixtures/maven/MavenRepository.groovy     |    4 +-
 .../gradle/test/fixtures/maven/MavenScope.groovy   |    2 +-
 .../test/fixtures/plugin/PluginBuilder.groovy      |  104 +
 .../gradle/test/fixtures/publish/Identifier.java   |  101 -
 .../test/fixtures/server/http/HttpServer.groovy    |  100 +-
 .../fixtures/server/http/ServletContainer.groovy   |   43 +
 .../test/fixtures/server/sftp/SFTPServer.groovy    |   40 +-
 .../IsTestableGradleVersionSpecTest.groovy         |   59 -
 .../ReleasedVersionDistributionsTest.groovy        |   18 +-
 .../VersionWebServiceJsonParserTest.groovy         |  115 -
 .../test/fixtures/maven/MavenFileModuleTest.groovy |  228 +
 .../fixtures/maven/MavenLocalModuleTest.groovy     |  220 +
 .../internal-testing/internal-testing.gradle       |    7 +-
 .../fixtures/DefaultTestExecutionResult.groovy     |   17 +-
 .../fixtures/HtmlTestExecutionResult.groovy        |   83 +-
 .../fixtures/JUnitTestClassExecutionResult.groovy  |  173 +
 .../fixtures/JUnitXmlTestExecutionResult.groovy    |  135 +-
 .../fixtures/TestClassExecutionResult.java         |    4 +
 .../fixtures/TestResultOutputAssociation.java      |   22 +
 .../fixtures/archive/ArchiveTestFixture.groovy     |   81 +
 .../test/fixtures/archive/JarTestFixture.groovy    |   62 +
 .../test/fixtures/archive/TarTestFixture.groovy    |   41 +
 .../test/fixtures/archive/ZipTestFixture.groovy    |   37 +
 .../test/fixtures/concurrent/ConcurrentSpec.groovy |   18 +-
 .../test/fixtures/concurrent/Instants.groovy       |   45 +-
 .../test/fixtures/concurrent/TestExecutor.groovy   |   18 +-
 .../test/fixtures/concurrent/TestLogger.groovy     |   25 +
 .../fixtures/concurrent/TestThreadListener.groovy  |   22 -
 .../gradle/test/fixtures/encoding/Identifier.java  |  100 +
 .../gradle/test/fixtures/file/ExecOutput.groovy    |   29 +
 .../org/gradle/test/fixtures/file/TestFile.java    |   42 +-
 .../test/fixtures/file/TestFileHelper.groovy       |   18 +-
 .../gradle/test/fixtures/file/WorkspaceTest.groovy |   34 +
 .../gradle/testing/internal/util/Network.groovy    |   29 -
 .../main/groovy/org/gradle/util/Assertions.groovy  |    3 -
 .../org/gradle/util/JUnit4GroovyMockery.java       |    3 -
 .../src/main/groovy/org/gradle/util/Matchers.java  |  320 ++
 .../org/gradle/util/ReflectionEqualsMatcher.java   |    3 -
 .../src/main/groovy/org/gradle/util/Resources.java |    2 +-
 .../groovy/org/gradle/util/TestClassLoader.groovy  |   62 +
 .../groovy/org/gradle/util/TestPrecondition.groovy |   39 +-
 .../gradle/util/TestPreconditionExtension.groovy   |    4 +-
 .../fixtures/concurrent/ConcurrentSpecTest.groovy  |   25 +-
 .../groovy/org/gradle/util/AssertionsTest.groovy   |    3 -
 .../gradle/util/TempDirIsUniquePerTestSpec.groovy  |    3 -
 subprojects/ivy/ivy.gradle                         |    9 +-
 ...IvyPublishArtifactCustomisationIntegTest.groovy |  321 --
 ...IvyPublishArtifactCustomizationIntegTest.groovy |  324 ++
 .../publish/ivy/IvyPublishBasicIntegTest.groovy    |    9 +-
 .../ivy/IvyPublishCoordinatesIntegTest.groovy      |  132 +
 .../IvyPublishCrossVersionIntegrationTest.groovy   |   30 +-
 ...yPublishDescriptorCustomisationIntegTest.groovy |  147 -
 ...yPublishDescriptorCustomizationIntegTest.groovy |  151 +
 .../api/publish/ivy/IvyPublishEarIntegTest.groovy  |    2 +-
 .../api/publish/ivy/IvyPublishHttpIntegTest.groovy |  145 +-
 .../IvyPublishIdentifierValidationIntegTest.groovy |   11 +-
 .../api/publish/ivy/IvyPublishJavaIntegTest.groovy |    7 +-
 .../ivy/IvyPublishMultiProjectIntegTest.groovy     |   70 +-
 .../IvyPublishMultipleRepositoriesIntegTest.groovy |    4 +-
 .../api/publish/ivy/IvyPublishWarIntegTest.groovy  |    2 +-
 .../ivy/SamplesIvyPublishIntegrationTest.groovy    |   56 +-
 .../ivy/IvyEarProjectPublishIntegrationTest.groovy |    0
 .../ivy/IvyHttpPublishIntegrationTest.groovy       |  323 ++
 .../IvyJavaProjectPublishIntegrationTest.groovy    |   63 +
 .../ivy/IvyLocalPublishIntegrationTest.groovy      |  113 +
 .../IvySingleProjectPublishIntegrationTest.groovy  |  128 +
 .../IvyUrlResolverPublishIntegrationTest.groovy    |   75 +
 .../ivy/IvyWarProjectPublishIntegrationTest.groovy |    0
 .../ivy/SamplesIvyPublishIntegrationTest.groovy    |   34 +
 .../org/gradle/api/publish/ivy/IvyArtifactSet.java |    2 +-
 .../api/publish/ivy/IvyConfigurationContainer.java |    2 +-
 .../org/gradle/api/publish/ivy/IvyDependency.java  |   17 +-
 .../api/publish/ivy/IvyModuleDescriptor.java       |   12 +-
 .../org/gradle/api/publish/ivy/IvyPublication.java |   54 +-
 .../ivy/internal/IvyPublicationTasksModelRule.java |   82 +
 .../ivy/internal/artifact/DefaultIvyArtifact.java  |    5 +
 .../internal/artifact/DefaultIvyArtifactSet.java   |    6 +-
 .../artifact/IvyArtifactNotationParserFactory.java |   65 +-
 .../internal/dependency/DefaultIvyDependency.java  |   40 +-
 .../internal/dependency/IvyDependencyInternal.java |    4 +-
 ...tionDynamicDescriptorGenerationTaskCreator.java |   73 -
 .../plugins/IvyPublishDynamicTaskCreator.java      |   90 -
 .../publication/DefaultIvyModuleDescriptor.java    |    3 +-
 .../publication/DefaultIvyPublication.java         |   53 +-
 .../publication/IvyModuleDescriptorInternal.java   |    4 -
 .../publication/IvyPublicationInternal.java        |    3 +-
 .../publisher/ContextualizingIvyPublisher.java     |   40 +
 .../publisher/DependencyResolverIvyPublisher.java  |   20 +-
 .../publisher/IvyDescriptorFileGenerator.java      |   22 +-
 .../internal/publisher/ValidatingIvyPublisher.java |   22 +-
 .../api/publish/ivy/plugins/IvyPublishPlugin.java  |   55 +-
 .../publish/ivy/tasks/PublishToIvyRepository.java  |   11 +-
 .../IvyArtifactNotationParserFactoryTest.groovy    |   13 +-
 ...namicDescriptorGenerationTaskCreatorTest.groovy |   88 -
 .../IvyPublishDynamicTaskCreatorTest.groovy        |  104 -
 .../publication/DefaultIvyPublicationTest.groovy   |  124 +-
 .../IvyDescriptorFileGeneratorTest.groovy          |   34 +-
 .../publisher/ValidatingIvyPublisherTest.groovy    |    3 +-
 .../ivy/plugins/IvyPublishPluginTest.groovy        |   19 +-
 .../ivy/tasks/PublishToIvyRepositoryTest.groovy    |    6 +-
 subprojects/jacoco/jacoco.gradle                   |   27 +
 .../plugins/JacocoPluginGoodBehaviourTest.groovy   |   33 +
 .../plugins/JacocoPluginIntegrationTest.groovy     |  233 +
 .../jacoco/plugins/JacocoVersionIntegTest.groovy   |   69 +
 .../gradle/internal/jacoco/JacocoAgentJar.groovy   |   57 +
 .../jacoco/JacocoReportsContainerImpl.java         |   49 +
 .../testing/jacoco/plugins/JacocoPlugin.groovy     |  180 +
 .../jacoco/plugins/JacocoPluginExtension.groovy    |   87 +
 .../jacoco/plugins/JacocoTaskExtension.groovy      |  189 +
 .../gradle/testing/jacoco/tasks/JacocoBase.groovy  |   33 +
 .../gradle/testing/jacoco/tasks/JacocoMerge.groovy |   92 +
 .../testing/jacoco/tasks/JacocoReport.groovy       |  258 ++
 .../jacoco/tasks/JacocoReportsContainer.java       |   47 +
 .../gradle/testing/jacoco/tasks/package-info.java  |   20 +
 .../META-INF/gradle-plugins/jacoco.properties      |    1 +
 .../testing/jacoco/plugins/JacocoPluginSpec.groovy |   60 +
 .../jacoco/plugins/JacocoTaskExtensionSpec.groovy  |   99 +
 subprojects/javascript/javascript.gradle           |    4 +-
 .../base/JavaScriptRepositoriesExtension.java      |    2 +-
 .../coffeescript/CoffeeScriptBasePlugin.groovy     |    2 +-
 .../plugins/javascript/envjs/EnvJsPlugin.groovy    |    2 +-
 .../envjs/http/simple/SimpleHttpFileServer.java    |    2 +-
 .../http/simple/SimpleHttpFileServerFactory.java   |    2 +-
 .../plugins/javascript/jshint/JsHintPlugin.groovy  |    2 +-
 .../worker/internal/DefaultRhinoWorkerHandle.java  |    5 +
 .../internal/DefaultRhinoWorkerHandleFactory.java  |    1 +
 .../rhino/worker/internal/RhinoServer.java         |    1 +
 subprojects/jetty/jetty.gradle                     |    2 +-
 .../api/plugins/jetty/AbstractJettyRunTask.java    |   54 +-
 .../org/gradle/api/plugins/jetty/JettyPlugin.java  |    8 +-
 .../api/plugins/jetty/JettyPluginConvention.java   |    2 -
 .../org/gradle/api/plugins/jetty/JettyRun.java     |    4 +-
 .../org/gradle/api/plugins/jetty/JettyStop.java    |    6 +-
 .../api/plugins/jetty/JettyPluginTest.groovy       |   19 +-
 subprojects/language-base/language-base.gradle     |    7 +
 .../groovy/org/gradle/language/base/Binary.java    |   33 +
 .../org/gradle/language/base/BinaryContainer.java  |   25 +
 .../language/base/BuildableModelElement.java       |   41 +
 .../gradle/language/base/FunctionalSourceSet.java  |   27 +
 .../gradle/language/base/LanguageSourceSet.java    |   47 +
 .../org/gradle/language/base/ProjectSourceSet.java |   26 +
 .../internal/AbstractBuildableModelElement.java    |   55 +
 .../base/internal/AbstractLanguageSourceSet.java   |   81 +
 .../language/base/internal/BinaryInternal.java     |   23 +
 .../language/base/internal/BinaryNamingScheme.java |   35 +
 .../base/internal/BinaryNamingSchemeBuilder.java   |   26 +
 .../base/internal/DefaultBinaryContainer.java      |   27 +
 .../base/internal/DefaultBinaryNamingScheme.java   |  112 +
 .../internal/DefaultBinaryNamingSchemeBuilder.java |   64 +
 .../base/internal/DefaultFunctionalSourceSet.java  |   39 +
 .../base/internal/DefaultProjectSourceSet.java     |   32 +
 .../base/internal/LanguageSourceSetInternal.java   |   37 +
 .../org/gradle/language/base/package-info.java     |   23 +
 .../language/base/plugins/LanguageBasePlugin.java  |   67 +
 .../gradle/language/base/plugins/package-info.java |   23 +
 .../gradle-plugins/language-base.properties        |    1 +
 .../base/internal/BuildableModelElementTest.groovy |   54 +
 .../internal/DefaultBinaryNamingSchemeTest.groovy  |   79 +
 .../internal/DefaultFunctionalSourceSetTest.groovy |   29 +
 subprojects/language-jvm/language-jvm.gradle       |    7 +
 .../org/gradle/language/java/JavaSourceSet.java    |   28 +
 .../java/internal/DefaultJavaSourceSet.java        |   52 +
 .../org/gradle/language/java/package-info.java     |   23 +
 .../gradle/language/jvm/ClassDirectoryBinary.java  |   40 +
 .../groovy/org/gradle/language/jvm/Classpath.java  |   28 +
 .../org/gradle/language/jvm/ResourceSet.java       |   25 +
 .../internal/ClassDirectoryBinaryNamingScheme.java |   70 +
 .../jvm/internal/DefaultClassDirectoryBinary.java  |   83 +
 .../language/jvm/internal/DefaultClasspath.java    |   39 +
 .../language/jvm/internal/DefaultResourceSet.java  |   28 +
 .../jvm/internal/SimpleStaleClassCleaner.java      |   43 +
 .../language/jvm/internal/StaleClassCleaner.java   |   43 +
 .../org/gradle/language/jvm/package-info.java      |   23 +
 .../language/jvm/plugins/JvmLanguagePlugin.java    |  107 +
 .../gradle/language/jvm/plugins/package-info.java  |   23 +
 .../language/jvm/tasks/ProcessResources.java       |   35 +
 .../gradle/language/jvm/tasks/package-info.java    |   23 +
 .../java/internal/DefaultJavaSourceSetTest.groovy  |   33 +
 .../ClassDirectoryBinaryNamingSchemeTest.groovy    |   55 +
 .../DefaultClassDirectoryBinaryTest.groovy         |   79 +
 .../jvm/internal/DefaultResourceSetTest.groovy     |   32 +
 subprojects/launcher/launcher.gradle               |    8 +-
 .../ConfigurationOnDemandIntegrationTest.groovy    |    3 -
 ...EnablingParallelExecutionIntegrationTest.groovy |    3 -
 .../GradleConfigurabilityIntegrationSpec.groovy    |   30 +-
 .../daemon/DaemonFeedbackIntegrationSpec.groovy    |    3 -
 ...itialCommunicationFailureIntegrationSpec.groovy |   53 +-
 .../launcher/daemon/DaemonIntegrationSpec.groovy   |    3 -
 .../launcher/daemon/DaemonLifecycleSpec.groovy     |    2 +-
 .../daemon/DispachingFailureIntegrationSpec.groovy |    3 -
 .../launcher/daemon/EmbeddedDaemonSmokeTest.groovy |    4 +-
 .../gradle/launcher/daemon/ExecuteBuildAction.java |   28 +
 .../daemon/SingleUseDaemonIntegrationTest.groovy   |    3 +-
 .../daemon/StoppingDaemonIntegrationSpec.groovy    |    3 -
 .../DaemonParametersIntegrationTest.groovy         |   36 +
 .../daemon/testing/DaemonContextParser.java        |    3 -
 .../daemon/testing/DaemonLogsAnalyzer.groovy       |   15 +-
 .../daemon/testing/DaemonsEventSequence.groovy     |    2 +-
 .../main/java/org/gradle/launcher/GradleMain.java  |    3 -
 .../src/main/java/org/gradle/launcher/Main.java    |    4 +-
 .../launcher/bootstrap/ProcessBootstrap.java       |    6 +-
 .../gradle/launcher/cli/BuildActionsFactory.java   |  100 +-
 .../launcher/cli/CommandLineActionFactory.java     |    2 +-
 .../gradle/launcher/cli/ExecuteBuildAction.java    |   20 +-
 .../org/gradle/launcher/cli/GuiActionsFactory.java |    2 +-
 .../org/gradle/launcher/cli/RunBuildAction.java    |    6 +-
 .../cli/converter/DaemonCommandLineConverter.java  |   50 +
 .../cli/converter/LayoutToPropertiesConverter.java |   73 +
 .../PropertiesToDaemonParametersConverter.java     |   68 +
 .../PropertiesToStartParameterConverter.java       |   36 +
 .../launcher/daemon/DaemonExecHandleBuilder.java   |    3 -
 .../launcher/daemon/bootstrap/DaemonGreeter.java   |    3 -
 .../daemon/bootstrap/DaemonOutputConsumer.java     |    3 -
 .../bootstrap/DaemonStartupCommunication.java      |    3 -
 .../launcher/daemon/client/DaemonClient.java       |   30 +-
 .../daemon/client/DaemonClientConnection.java      |   42 +-
 .../daemon/client/DaemonClientInputForwarder.java  |   86 +-
 .../daemon/client/DaemonClientServices.java        |   35 +-
 .../daemon/client/DaemonClientServicesSupport.java |   37 +-
 .../daemon/client/DaemonConnectionException.java   |   30 +
 .../launcher/daemon/client/DaemonConnector.java    |    9 +-
 .../client/DaemonInitialConnectException.java      |    4 +
 .../daemon/client/DefaultDaemonConnector.java      |   63 +-
 .../client/EmbeddedDaemonClientServices.java       |   28 +-
 .../daemon/client/EmbeddedDaemonStarter.java       |    4 +-
 .../launcher/daemon/client/InputForwarder.java     |   39 +-
 .../client/NoUsableDaemonFoundException.java       |    3 -
 .../daemon/client/SingleUseDaemonClient.java       |   17 +-
 .../daemon/client/StaleDaemonAddressException.java |   29 +
 .../daemon/client/StopDaemonClientServices.java    |    2 +-
 .../launcher/daemon/client/StopDispatcher.java     |    3 -
 .../daemon/configuration/DaemonParameters.java     |   40 +-
 .../configuration/DaemonServerConfiguration.java   |    3 -
 .../DefaultDaemonServerConfiguration.java          |    3 -
 .../ForegroundDaemonConfiguration.java             |    3 -
 .../daemon/configuration/GradleProperties.java     |  177 +-
 .../configuration/GradlePropertiesConfigurer.java  |   48 -
 .../daemon/diagnostics/DaemonDiagnostics.java      |    2 -
 .../daemon/diagnostics/DaemonStartupInfo.java      |    3 -
 .../org/gradle/launcher/daemon/protocol/Build.java |    8 +-
 .../launcher/daemon/protocol/BuildAndStop.java     |    4 +-
 .../daemon/registry/DaemonRegistryContent.java     |    3 -
 .../daemon/registry/DaemonRegistryServices.java    |   26 +-
 .../daemon/registry/PersistentDaemonRegistry.java  |   30 +-
 .../org/gradle/launcher/daemon/server/Daemon.java  |    6 +-
 .../daemon/server/DaemonServerConnector.java       |    2 +-
 .../launcher/daemon/server/DaemonServices.java     |   23 +-
 .../daemon/server/DaemonStateCoordinator.java      |    2 +-
 .../daemon/server/DaemonTcpServerConnector.java    |   13 +-
 .../daemon/server/DefaultDaemonConnection.java     |    4 +-
 .../server/DefaultIncomingConnectionHandler.java   |    2 +-
 .../daemon/server/DomainRegistryUpdater.java       |    5 +-
 .../server/SynchronizedDispatchConnection.java     |    2 -
 .../daemon/server/exec/DaemonConnection.java       |    2 +-
 .../daemon/server/exec/DaemonHygieneAction.java    |   50 +
 .../server/exec/DefaultDaemonCommandExecuter.java  |    6 +-
 .../server/exec/EstablishBuildEnvironment.java     |    1 +
 .../launcher/daemon/server/exec/ExecuteBuild.java  |    4 +-
 .../daemon/server/exec/ForwardClientInput.java     |    4 +-
 .../server/exec/NoOpDaemonCommandAction.java       |   22 +
 .../gradle/launcher/exec/BuildActionExecuter.java  |   29 +
 .../exec/GradleLauncherActionExecuter.java         |   29 -
 .../exec/InProcessBuildActionExecuter.java         |   77 +
 .../InProcessGradleLauncherActionExecuter.java     |   46 -
 .../gradle/launcher/exec/InitializationAware.java  |   22 -
 .../internal/impl/LaunchableGradleProjectTask.java |   32 +
 .../internal/impl/LaunchableGradleTask.java        |   76 +
 .../impl/LaunchableGradleTaskSelector.java         |   86 +
 .../internal/impl/LaunchableImplementation.java    |   31 +
 .../internal/provider/BuildActionResult.java       |   33 +
 .../internal/provider/BuildModelAction.java        |  105 +
 .../internal/provider/ClassLoaderDetails.java      |   36 +
 .../internal/provider/ClasspathInferer.java        |  131 +
 .../provider/ClientProvidedBuildAction.java        |   81 +
 .../ClientSidePayloadClassLoaderRegistry.java      |  142 +
 .../internal/provider/ConfiguringBuildAction.java  |   91 +-
 .../internal/provider/ConnectionScopeServices.java |   55 +
 .../provider/DaemonBuildActionExecuter.java        |   47 +
 .../DaemonGradleLauncherActionExecuter.java        |   47 -
 .../internal/provider/DefaultBuildController.java  |   70 +
 .../internal/provider/DefaultConnection.java       |  223 +-
 .../provider/DefaultConnectionMetaData.java        |   30 +
 .../DefaultPayloadClassLoaderRegistry.java         |  174 +
 .../provider/DelegatingBuildModelAction.java       |   58 -
 .../tooling/internal/provider/DeserializeMap.java  |   24 +
 .../internal/provider/EmbeddedExecuterSupport.java |   45 -
 .../internal/provider/ExecuteBuildAction.java      |   33 -
 .../LoggingBridgingBuildActionExecuter.java        |   75 +
 ...oggingBridgingGradleLauncherActionExecuter.java |   75 -
 .../internal/provider/ModelClassLoaderFactory.java |  126 +
 .../provider/PayloadClassLoaderRegistry.java       |   26 +
 .../internal/provider/PayloadSerializer.java       |  155 +
 .../internal/provider/ProviderConnection.java      |  165 +
 .../internal/provider/ReflectionClassLookup.java   |   44 +
 .../tooling/internal/provider/SerializeMap.java    |   36 +
 .../internal/provider/SerializedPayload.java       |   37 +
 .../provider/ToolingGlobalScopeServices.java       |   25 +
 .../tooling/internal/provider/ToolingServices.java |   32 +
 .../connection/AdaptedOperationParameters.java     |   11 +-
 .../connection/ProviderOperationParameters.java    |    5 +-
 .../internal/provider/jdk6/Jdk6ClassLookup.java    |   27 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../groovy/org/gradle/launcher/MainTest.groovy     |    8 +-
 .../launcher/cli/BuildActionsFactoryTest.groovy    |   53 +-
 .../cli/CommandLineActionFactoryTest.groovy        |    2 +-
 .../gradle/launcher/cli/RunBuildActionTest.groovy  |    4 +-
 .../DaemonCommandLineConverterTest.groovy          |   39 +
 .../LayoutToPropertiesConverterTest.groovy         |   95 +
 ...ropertiesToDaemonParametersConverterTest.groovy |  106 +
 .../PropertiesToStartParameterConverterTest.groovy |   36 +
 .../daemon/DaemonExecHandleBuilderSpec.groovy      |    3 -
 .../daemon/bootstrap/DaemonGreeterTest.groovy      |    3 -
 .../bootstrap/DaemonOutputConsumerTest.groovy      |    3 -
 .../DaemonStartupCommunicationSpec.groovy          |    3 -
 .../client/DaemonClientConnectionTest.groovy       |   78 +-
 .../daemon/client/DaemonClientServicesTest.groovy  |    3 +-
 .../launcher/daemon/client/DaemonClientTest.groovy |   18 +-
 .../client/DefaultDaemonConnectorTest.groovy       |   47 +-
 .../daemon/client/InputForwarderTest.groovy        |   27 +-
 .../daemon/client/StopDispatcherTest.groovy        |    5 +-
 .../daemon/configuration/CurrentProcessTest.groovy |    3 +-
 .../configuration/DaemonParametersTest.groovy      |   82 +-
 .../GradlePropertiesConfigurerTest.groovy          |   77 -
 .../configuration/GradlePropertiesTest.groovy      |  218 -
 .../context/DaemonCompatibilitySpecSpec.groovy     |   10 +-
 .../diagnostics/DaemonDiagnosticsTest.groovy       |    3 -
 .../registry/DaemonRegistryServicesTest.groovy     |   14 +-
 .../registry/DomainRegistryUpdaterTest.groovy      |    3 -
 .../registry/PersistentDaemonRegistryTest.groovy   |   34 +-
 .../DaemonServerExceptionHandlingTest.groovy       |   21 +-
 .../daemon/server/DaemonServicesTest.groovy        |    1 -
 .../server/DaemonStateCoordinatorTest.groovy       |    3 -
 .../server/exec/DaemonHygieneActionTest.groovy     |   52 +
 .../exec/DefaultBuildActionParametersTest.groovy   |    8 +-
 .../exec/InProcessBuildActionExecuterTest.groovy   |  156 +
 ...nProcessGradleLauncherActionExecuterTest.groovy |  100 -
 .../provider/AbstractClassGraphSpec.groovy         |   63 +
 .../internal/provider/ClasspathInfererTest.groovy  |   66 +
 .../provider/ConfiguringBuildActionTest.groovy     |   51 +-
 .../provider/ConnectionScopeServicesTest.groovy    |   37 +
 .../tooling/internal/provider/CustomAction.java    |   34 +
 .../tooling/internal/provider/CustomModel.java     |   24 +
 .../tooling/internal/provider/CustomPayload.java   |   29 +
 .../provider/DaemonBuildActionExecuterTest.groovy  |   45 +
 .../DaemonGradleLauncherActionExecuterTest.groovy  |   45 -
 .../provider/DefaultBuildControllerTest.groovy     |  129 +
 .../provider/ExecuteBuildActionTest.groovy         |   37 -
 .../LoggingBridgingBuildActionExecuterTest.groovy  |   74 +
 ...BridgingGradleLauncherActionExecuterTest.groovy |   74 -
 .../provider/ModelClassLoaderFactoryTest.groovy    |   36 +
 .../internal/provider/PayloadInterface.java        |   21 +
 .../internal/provider/PayloadSerializerTest.groovy |  204 +
 .../provider/ToolingGlobalScopeServicesTest.groovy |   29 +
 .../tooling/internal/provider/WrapperPayload.java  |   27 +
 .../AdaptedOperationParametersTest.groovy          |    3 -
 .../connection/BuildLogLevelMixInTest.groovy       |    3 -
 subprojects/maven/maven.gradle                     |    4 +-
 .../maven/MavenConversionIntegrationTest.groovy    |  161 -
 .../maven/AbstractMavenPublishIntegTest.groovy     |   11 +-
 ...venPublishArtifactCustomisationIntegTest.groovy |  228 -
 ...venPublishArtifactCustomizationIntegTest.groovy |  255 ++
 .../maven/MavenPublishBasicIntegTest.groovy        |   53 +-
 .../maven/MavenPublishCoordinatesIntegTest.groovy  |  140 +
 .../MavenPublishCrossVersionIntegrationTest.groovy |   21 +-
 ...avenPublishIdentifierValidationIntegTest.groovy |    4 +-
 .../maven/MavenPublishIssuesIntegTest.groovy       |   51 +
 .../publish/maven/MavenPublishJavaIntegTest.groovy |   30 +-
 .../maven/MavenPublishMultiProjectIntegTest.groovy |   88 +-
 .../MavenPublishPomCustomisationIntegTest.groovy   |  174 -
 .../MavenPublishPomCustomizationIntegTest.groovy   |  212 +
 .../SamplesMavenPublishIntegrationTest.groovy      |   42 +-
 .../MavenEarProjectPublishIntegrationTest.groovy   |    0
 .../MavenJavaProjectPublishIntegrationTest.groovy  |    0
 .../MavenMultiProjectPublishIntegrationTest.groovy |    0
 .../maven/MavenPomGenerationIntegrationTest.groovy |    0
 .../MavenPublishIgnoresMavenSettingsTest.groovy    |    0
 .../maven/MavenPublishIntegrationTest.groovy       |  388 ++
 ...MavenPublishRespectsPomConfigurationTest.groovy |    0
 .../MavenWarProjectPublishIntegrationTest.groovy   |    0
 ...SamplesMavenPomGenerationIntegrationTest.groovy |  106 +
 .../SamplesMavenQuickstartIntegrationTest.groovy   |   79 +
 .../publish/maven/pomGeneration/expectedNewPom.txt |    0
 .../publish/maven/pomGeneration/expectedPom.txt    |    0
 .../maven/pomGeneration/expectedQuickstartPom.txt  |    0
 .../api/artifacts/maven/Conf2ScopeMapping.java     |    2 -
 .../maven/Conf2ScopeMappingContainer.java          |   10 +-
 .../api/artifacts/maven/GroovyMavenDeployer.java   |    2 -
 .../gradle/api/artifacts/maven/MavenDeployer.java  |    6 +-
 .../api/artifacts/maven/MavenDeployment.java       |    2 +-
 .../org/gradle/api/artifacts/maven/MavenPom.java   |   34 +-
 .../gradle/api/artifacts/maven/MavenResolver.java  |    4 +-
 .../api/artifacts/maven/PomFilterContainer.java    |   40 +-
 .../gradle/api/artifacts/maven/PublishFilter.java  |    2 -
 .../groovy/org/gradle/api/plugins/MavenPlugin.java |   69 +-
 .../gradle/api/plugins/MavenPluginConvention.java  |    2 -
 .../plugins/MavenRepositoryHandlerConvention.java  |    2 +-
 .../api/plugins/maven/ConvertMaven2Gradle.groovy   |   54 -
 .../api/plugins/maven/Maven2GradlePlugin.groovy    |   36 -
 .../api/plugins/maven/internal/Maven2Gradle.groovy |  552 ---
 .../maven/internal/MavenProjectXmlWriter.java      |   61 -
 .../maven/internal/MavenProjectsCreator.java       |   98 -
 .../publication/maven/internal/ArtifactPom.java    |    3 -
 .../maven/internal/ArtifactPomContainer.java       |    3 -
 .../maven/internal/ArtifactPomFactory.java         |    3 -
 .../maven/internal/BasePomFilterContainer.java     |    3 -
 .../internal/CustomTaskFactoryDeployerFactory.java |   43 -
 .../maven/internal/DefaultArtifactPom.java         |    6 +-
 .../internal/DefaultArtifactPomContainer.java      |    3 -
 .../maven/internal/DefaultArtifactPomFactory.java  |    3 -
 .../DefaultConf2ScopeMappingContainer.java         |    5 +-
 .../maven/internal/DefaultMavenDeployment.java     |    3 -
 .../maven/internal/DefaultMavenPom.java            |    9 +-
 .../maven/internal/DefaultMavenPomFactory.java     |    5 +-
 .../DefaultMavenRepositoryHandlerConvention.java   |    2 +-
 .../maven/internal/DefaultPomFilter.java           |    3 -
 .../maven/internal/ExcludeRuleConverter.java       |    3 -
 .../maven/internal/PomDependenciesConverter.java   |    3 -
 .../api/publication/maven/internal/PomFilter.java  |    3 -
 .../maven/internal/ant/AbstractMavenResolver.java  |   62 +-
 .../maven/internal/ant/BaseMavenDeployer.java      |   20 +-
 .../maven/internal/ant/BaseMavenInstaller.java     |   16 +-
 .../maven/internal/ant/CustomDeployTask.java       |    2 -
 .../ant/CustomInstallDeployTaskSupport.java        |    5 +-
 .../maven/internal/ant/CustomInstallTask.java      |    3 -
 .../internal/ant/DefaultDeployTaskFactory.java     |   27 -
 .../internal/ant/DefaultExcludeRuleConverter.java  |    3 -
 .../internal/ant/DefaultGroovyMavenDeployer.groovy |    4 -
 .../internal/ant/DefaultInstallTaskFactory.java    |   27 -
 .../ant/DefaultPomDependenciesConverter.java       |    3 -
 .../internal/ant/EmptyMavenSettingsSupplier.java   |    3 -
 .../maven/internal/ant/LoggingHelper.java          |    3 -
 .../maven/internal/ant/MavenSettingsSupplier.java  |    3 -
 .../ant/MaybeUserMavenSettingsSupplier.java        |    3 -
 .../internal/ant/NoInstallDeployTaskFactory.java   |   56 -
 .../ProjectDependencyArtifactIdExtractorHack.java  |    3 +-
 .../maven/internal/ant/RepositoryBuilder.java      |    3 -
 .../maven/internal/ant/RepositoryFactory.java      |    3 -
 .../gradle/api/publish/maven/MavenArtifactSet.java |    2 +-
 .../gradle/api/publish/maven/MavenDependency.java  |   41 +
 .../org/gradle/api/publish/maven/MavenPom.java     |   15 +-
 .../gradle/api/publish/maven/MavenPublication.java |   40 +-
 .../maven/internal/MavenPublishTaskModelRule.java  |  109 +
 .../internal/artifact/DefaultMavenArtifact.java    |    5 +
 .../internal/artifact/DefaultMavenArtifactSet.java |    6 +-
 .../MavenArtifactNotationParserFactory.java        |   26 +-
 .../dependencies/DefaultMavenDependency.java       |   56 +
 .../dependencies/MavenDependencyInternal.java      |   25 +
 .../internal/plugins/GeneratePomTaskCreator.java   |   71 -
 .../plugins/MavenPublishDynamicTaskCreator.java    |   86 -
 .../MavenPublishLocalDynamicTaskCreator.java       |   65 -
 .../internal/publication/DefaultMavenPom.java      |   14 +-
 .../publication/DefaultMavenPublication.java       |   70 +-
 .../internal/publication/MavenPomInternal.java     |    6 +-
 .../publication/MavenPublicationInternal.java      |    7 +-
 .../AbstractAntTaskBackedMavenPublisher.java       |  116 +
 .../AntTaskBackedMavenLocalPublisher.java          |   64 +
 .../publisher/AntTaskBackedMavenPublisher.java     |  103 +-
 .../publisher/MavenDeployerConfigurer.java         |   55 -
 .../publisher/MavenRemoteRepositoryFactory.java    |   50 +
 .../publisher/ValidatingMavenPublisher.java        |   22 +-
 .../internal/tasks/MavenPomFileGenerator.java      |   87 +-
 .../publish/maven/plugins/MavenPublishPlugin.java  |   46 +-
 .../api/publish/maven/tasks/GenerateMavenPom.java  |   39 +-
 .../publish/maven/tasks/PublishToMavenLocal.java   |   25 +-
 .../maven/tasks/PublishToMavenRepository.java      |    7 +-
 .../gradle-plugins/maven2Gradle.properties         |    1 -
 .../api/artifacts/maven/Conf2ScopeMappingTest.java |    3 -
 .../api/plugins/MavenPluginConventionTest.groovy   |   14 +-
 .../org/gradle/api/plugins/MavenPluginTest.java    |    9 +-
 .../plugins/maven/Maven2GradlePluginSpec.groovy    |   36 -
 .../internal/MavenProjectXmlWriterTest.groovy      |   34 -
 .../maven/internal/MavenProjectsCreatorSpec.groovy |  118 -
 .../maven/internal/BasePomFilterContainerTest.java |    3 -
 .../maven/internal/DefaultArtifactPomTest.java     |    7 +-
 .../DefaultConf2ScopeMappingContainerTest.java     |    3 -
 .../internal/DefaultMavenPomFactoryTest.groovy     |    7 +-
 ...aultMavenRepositoryHandlerConventionTest.groovy |    2 +-
 .../maven/internal/DefaultPomFilterTest.java       |    3 -
 .../internal/ant/AbstractMavenResolverTest.java    |  241 --
 .../maven/internal/ant/BaseMavenDeployerTest.java  |  108 -
 .../maven/internal/ant/BaseMavenInstallerTest.java |   72 -
 .../internal/ant/DefaultDeployTaskFactoryTest.java |   30 -
 .../ant/DefaultExcludeRuleConverterTest.java       |    3 -
 .../ant/DefaultGroovyMavenDeployerTest.groovy      |   26 +-
 .../ant/DefaultGroovyPomFilterContainerTest.groovy |    7 +-
 .../ant/DefaultPomDependenciesConverterTest.java   |    3 -
 .../ant/EmptyMavenSettingsSupplierTest.groovy      |    3 -
 .../ant/MaybeUserMavenSettingsSupplierTest.groovy  |    4 -
 ...ectDependencyArtifactIdExtractorHackTest.groovy |    5 +-
 .../MavenArtifactNotationParserFactoryTest.groovy  |    8 +-
 .../publication/DefaultMavenPublicationTest.groovy |  145 +-
 .../publisher/ValidatingMavenPublisherTest.groovy  |   41 +-
 .../tasks/MavenPomFileGeneratorTest.groovy         |   70 +-
 .../maven/plugins/MavenPublishPluginTest.groovy    |   51 +-
 .../tasks/PublishToMavenRepositoryTest.groovy      |    6 +-
 subprojects/messaging/messaging.gradle             |    2 +-
 .../remote/UnicastMessagingIntegrationTest.groovy  |   27 +-
 .../java/org/gradle/messaging/actor/Actor.java     |    2 +-
 .../actor/internal/DefaultActorFactory.java        |    4 +-
 .../gradle/messaging/dispatch/DelayedReceive.java  |    2 +-
 .../dispatch/ExceptionTrackingFailureHandler.java  |    2 +-
 .../gradle/messaging/dispatch/QueuingDispatch.java |    2 +-
 .../org/gradle/messaging/remote/Addressable.java   |   22 -
 .../org/gradle/messaging/remote/ConnectEvent.java  |   41 -
 .../gradle/messaging/remote/MessagingClient.java   |    2 +-
 .../gradle/messaging/remote/MessagingServer.java   |    8 +-
 .../gradle/messaging/remote/ObjectConnection.java  |   34 +-
 .../messaging/remote/ObjectConnectionBuilder.java  |   57 +
 .../remote/internal/AsyncConnectionAdapter.java    |    4 +-
 .../remote/internal/ConnectCompletion.java         |   37 +
 .../remote/internal/DefaultIncomingBroadcast.java  |   16 +-
 .../remote/internal/DefaultOutgoingBroadcast.java  |    6 +-
 .../remote/internal/IncomingConnector.java         |   15 +-
 .../gradle/messaging/remote/internal/Message.java  |  147 +-
 .../messaging/remote/internal/MessageHub.java      |   24 +-
 .../remote/internal/MessagingServices.java         |  103 +-
 .../remote/internal/OutgoingConnector.java         |   12 +-
 .../remote/internal/PlaceholderException.java      |   22 +-
 .../messaging/remote/internal/ProtocolStack.java   |    2 +-
 .../gradle/messaging/remote/internal/Router.java   |    2 +-
 .../internal/hub/InterHubMessageSerializer.java    |   61 +-
 .../internal/hub/MessageHubBackedClient.java       |   19 +-
 .../hub/MessageHubBackedObjectConnection.java      |   68 +-
 .../internal/hub/MessageHubBackedServer.java       |   37 +-
 .../internal/hub/MethodInvocationSerializer.java   |   59 +-
 .../remote/internal/inet/InetAddressFactory.java   |    7 +-
 .../internal/inet/SocketConnectCompletion.java     |   45 +
 .../remote/internal/inet/SocketConnection.java     |    2 +-
 .../remote/internal/inet/TcpIncomingConnector.java |   37 +-
 .../remote/internal/inet/TcpOutgoingConnector.java |   14 +-
 .../serialize/AbstractCollectionSerializer.java    |   40 +
 .../messaging/serialize/AbstractDecoder.java       |  105 +
 .../messaging/serialize/AbstractEncoder.java       |   80 +
 .../messaging/serialize/BaseSerializerFactory.java |   70 +
 .../serialize/DataStreamBackedSerializer.java      |   36 -
 .../org/gradle/messaging/serialize/Decoder.java    |  118 +
 .../messaging/serialize/DefaultSerializer.java     |   12 +-
 .../serialize/DefaultSerializerRegistry.java       |   85 +
 .../org/gradle/messaging/serialize/Encoder.java    |   91 +
 .../messaging/serialize/FlushableEncoder.java      |   24 +
 .../serialize/InputStreamBackedDecoder.java        |   65 +
 .../gradle/messaging/serialize/ListSerializer.java |   37 +
 .../gradle/messaging/serialize/LongSerializer.java |   29 +
 .../gradle/messaging/serialize/MapSerializer.java  |   48 +
 .../serialize/NullSafeStringSerializer.java        |   26 +
 .../serialize/OutputStreamBackedEncoder.java       |   65 +
 .../org/gradle/messaging/serialize/Serializer.java |    7 +-
 .../messaging/serialize/SerializerRegistry.java    |   23 +
 .../gradle/messaging/serialize/SetSerializer.java  |   38 +
 .../messaging/serialize/kryo/JavaSerializer.java   |   30 +-
 .../serialize/kryo/KryoAwareSerializer.java        |   28 -
 .../serialize/kryo/KryoBackedDecoder.java          |  156 +
 .../serialize/kryo/KryoBackedEncoder.java          |   91 +
 .../messaging/serialize/kryo/KryoSerializer.java   |   59 -
 .../serialize/kryo/StatefulSerializer.java         |   28 +
 .../serialize/kryo/TypeSafeSerializer.java         |   18 +-
 .../messaging/remote/internal/MessageTest.groovy   |  241 +-
 .../internal/PlaceholderExceptionTest.groovy       |    4 +-
 .../remote/internal/ProtocolStackTest.groovy       |    2 +-
 .../hub/InterHubMessageSerializerTest.groovy       |   13 +-
 .../internal/hub/MessageHubBackedClientTest.groovy |   16 +-
 .../internal/hub/MessageHubBackedServerTest.groovy |   33 +-
 .../hub/MethodInvocationSerializerTest.groovy      |   25 +-
 .../internal/inet/InetAddressFactoryTest.groovy    |   47 +
 .../remote/internal/inet/TcpConnectorTest.groovy   |   41 +-
 .../messaging/serialize/AbstractCodecTest.groovy   |  524 +++
 .../serialize/BaseSerializerFactoryTest.groovy     |   73 +
 .../serialize/DefaultSerializerRegistryTest.groovy |   92 +
 .../serialize/DefaultSerializerTest.groovy         |    8 +-
 .../messaging/serialize/ListSerializerTest.groovy  |   45 +
 .../messaging/serialize/LongSerializerTest.groovy  |   34 +
 .../messaging/serialize/MapSerializerTest.groovy   |   47 +
 .../messaging/serialize/SetSerializerTest.groovy   |   47 +
 .../serialize/StreamBackedCodecTest.groovy         |   31 +
 .../serialize/kryo/KryoBackedCodecTest.groovy      |   98 +
 .../messaging/serialize/SerializerSpec.groovy      |   39 +
 subprojects/native/native.gradle                   |    8 +-
 .../nativeplatform/ReflectiveEnvironment.java      |    2 -
 .../nativeplatform/filesystem/FileSystem.java      |    2 +-
 .../filesystem/FileSystemServices.java             |   72 +-
 .../nativeplatform/filesystem/FileSystems.java     |   33 -
 .../filesystem/GenericFileSystem.java              |    4 +-
 .../filesystem/MacFilePathEncoder.java             |   37 -
 .../filesystem/NativePlatformBackedChmod.java      |   34 +
 .../filesystem/NativePlatformBackedStat.java       |   34 +
 .../filesystem/NativePlatformBackedSymlink.java    |   35 +
 .../nativeplatform/jna/JnaBootPathConfigurer.java  |    3 -
 .../internal/nativeplatform/jna/Kernel32.java      |   66 -
 .../jna/WindowsHandlesManipulator.java             |   86 -
 .../jna/WindowsProcessEnvironment.java             |   61 -
 .../nativeplatform/services/FileSystems.java       |   24 +
 .../nativeplatform/services/NativeServices.java    |   69 +-
 .../filesystem/CommonFileSystemTest.groovy         |    3 +-
 .../FileSystemServicesOnLinuxTest.groovy           |   45 -
 .../filesystem/FileSystemServicesOnMacTest.groovy  |   45 -
 .../FileSystemServicesOnUnknownOsTest.groovy       |   55 -
 .../FileSystemServicesOnWindowsTest.groovy         |   45 -
 .../filesystem/LinuxFileSystemTest.groovy          |    3 +-
 .../filesystem/MacOsFileSystemTest.groovy          |    3 +-
 .../filesystem/WindowsFileSystemTest.groovy        |    3 +-
 .../jdk7/PosixFilePermissionConverterTest.groovy   |    2 +-
 .../services/NativeServicesTest.groovy             |   22 +
 subprojects/open-api/open-api.gradle               |    9 +-
 .../integtests/openapi/CrossVersionBuilder.java    |    6 +
 ...CrossVersionCompatibilityIntegrationTest.groovy |    4 +-
 .../integtests/openapi/GradleRunnerTest.groovy     |   12 +-
 .../gradle/integtests/openapi/OpenApiUiTest.groovy |    7 +
 .../integtests/openapi/OutputUILordTest.groovy     |    2 -
 .../TestAlternateUIInteractionVersion1.java        |    2 -
 .../openapi/TestSettingsNodeVersion1.java          |    2 -
 .../TestSingleDualPaneUIInteractionVersion1.java   |    1 -
 .../org/gradle/foundation/BootstrapLoader.java     |  189 -
 .../gradle/foundation/ParentLastClassLoader.java   |   73 -
 .../gradle/openapi/external/ExternalUtility.java   |  168 -
 .../foundation/GradleInterfaceVersion1.java        |   89 -
 .../foundation/GradleInterfaceVersion2.java        |   89 -
 .../external/foundation/ProjectVersion1.java       |   83 -
 .../foundation/RequestObserverVersion1.java        |   52 -
 .../external/foundation/RequestVersion1.java       |   62 -
 .../openapi/external/foundation/TaskVersion1.java  |   61 -
 .../foundation/favorites/FavoriteTaskVersion1.java |   48 -
 .../favorites/FavoritesEditorVersion1.java         |  105 -
 .../external/runner/GradleRunnerFactory.java       |  134 -
 .../runner/GradleRunnerInteractionVersion1.java    |   83 -
 .../external/runner/GradleRunnerVersion1.java      |   35 -
 .../ui/AlternateUIInteractionVersion1.java         |   59 -
 .../openapi/external/ui/BasicGradleUIVersion1.java |  199 -
 ...ommandLineArgumentAlteringListenerVersion1.java |   32 -
 .../external/ui/DualPaneUIInteractionVersion1.java |   29 -
 .../openapi/external/ui/DualPaneUIVersion1.java    |   56 -
 .../openapi/external/ui/GradleTabVersion1.java     |   51 -
 .../external/ui/GradleUIInteractionVersion1.java   |   42 -
 .../external/ui/OutputObserverVersion1.java        |   56 -
 .../openapi/external/ui/OutputUILordVersion1.java  |   70 -
 .../openapi/external/ui/SettingsNodeVersion1.java  |   67 -
 .../ui/SinglePaneUIInteractionVersion1.java        |   29 -
 .../openapi/external/ui/SinglePaneUIVersion1.java  |   39 -
 .../org/gradle/openapi/external/ui/UIFactory.java  |  239 -
 .../org/gradle/foundation/BootstrapLoader.java     |  187 +
 .../gradle/foundation/ParentLastClassLoader.java   |   72 +
 .../gradle/openapi/external/ExternalUtility.java   |  166 +
 .../foundation/GradleInterfaceVersion1.java        |   89 +
 .../foundation/GradleInterfaceVersion2.java        |   88 +
 .../external/foundation/ProjectVersion1.java       |   83 +
 .../foundation/RequestObserverVersion1.java        |   52 +
 .../external/foundation/RequestVersion1.java       |   62 +
 .../openapi/external/foundation/TaskVersion1.java  |   61 +
 .../foundation/favorites/FavoriteTaskVersion1.java |   45 +
 .../favorites/FavoritesEditorVersion1.java         |  105 +
 .../external/runner/GradleRunnerFactory.java       |  133 +
 .../runner/GradleRunnerInteractionVersion1.java    |   85 +
 .../external/runner/GradleRunnerVersion1.java      |   35 +
 .../ui/AlternateUIInteractionVersion1.java         |   59 +
 .../openapi/external/ui/BasicGradleUIVersion1.java |  199 +
 ...ommandLineArgumentAlteringListenerVersion1.java |   32 +
 .../external/ui/DualPaneUIInteractionVersion1.java |   30 +
 .../openapi/external/ui/DualPaneUIVersion1.java    |   59 +
 .../openapi/external/ui/GradleTabVersion1.java     |   48 +
 .../external/ui/GradleUIInteractionVersion1.java   |   41 +
 .../external/ui/OutputObserverVersion1.java        |   59 +
 .../openapi/external/ui/OutputUILordVersion1.java  |   70 +
 .../openapi/external/ui/SettingsNodeVersion1.java  |   67 +
 .../ui/SinglePaneUIInteractionVersion1.java        |   30 +
 .../openapi/external/ui/SinglePaneUIVersion1.java  |   40 +
 .../org/gradle/openapi/external/ui/UIFactory.java  |  238 +
 subprojects/osgi/osgi.gradle                       |    4 +-
 .../plugins/osgi/OsgiPluginIntegrationSpec.groovy  |    6 -
 .../plugins/osgi/ContainedVersionAnalyzer.java     |    2 +-
 .../plugins/osgi/DefaultAnalyzerFactory.java       |    3 -
 .../internal/plugins/osgi/DefaultOsgiManifest.java |   14 +-
 .../api/internal/plugins/osgi/OsgiHelper.java      |    3 -
 .../org/gradle/api/plugins/osgi/OsgiManifest.java  |    4 +-
 .../org/gradle/api/plugins/osgi/OsgiPlugin.groovy  |    2 -
 .../api/plugins/osgi/OsgiPluginConvention.java     |    2 -
 .../plugins/osgi/DefaultAnalyzerFactoryTest.java   |    4 +-
 .../plugins/osgi/DefaultOsgiManifestTest.groovy    |    8 +-
 .../plugins/osgi/OsgiPluginConventionTest.groovy   |   12 +-
 .../gradle/api/plugins/osgi/OsgiPluginTest.groovy  |    4 +-
 subprojects/performance/performance.gradle         |  118 +-
 .../performance/CleanBuildPerformanceTest.groovy   |   13 +-
 .../ConfigurationPerformanceTest.groovy            |   47 +
 .../DependencyReportPerformanceTest.groovy         |   15 +-
 .../DependencyResolutionStressTest.groovy          |    5 +-
 .../performance/FirstBuildPerformanceTest.groovy   |   46 +
 .../IdeIntegrationPerformanceTest.groovy           |   16 +-
 .../TestExecutionPerformanceTest.groovy            |   11 +-
 .../UpToDateBuildPerformanceTest.groovy            |   11 +-
 .../src/templates/config-inject/build.gradle       |    2 +-
 .../src/templates/project-with-source/build.gradle |    3 +-
 .../gradle/performance/ResultSpecification.groovy  |   52 +
 .../gradle/performance/fixture/AmountTest.groovy   |  231 -
 .../gradle/performance/fixture/DurationTest.groovy |   59 -
 .../fixture/GCLoggingCollectorTest.groovy          |   55 +
 .../fixture/PerformanceResultsTest.groovy          |  228 +-
 .../fixture/PerformanceTestRunnerTest.groovy       |  105 +
 .../fixture/PrettyCalculatorSpec.groovy            |    5 +-
 .../gradle/performance/fixture/UnitsTest.groovy    |   34 -
 .../gradle/performance/measure/AmountTest.groovy   |  231 +
 .../performance/measure/DataSeriesTest.groovy      |   56 +
 .../gradle/performance/measure/DurationTest.groovy |   59 +
 .../gradle/performance/measure/UnitsTest.groovy    |   34 +
 .../performance/results/ReportGeneratorTest.groovy |   44 +
 .../performance/results/ResultsStoreTest.groovy    |  248 ++
 .../org/gradle/performance/fixture/gc-1.txt        |   19 +
 .../org/gradle/performance/fixture/gc-2.txt        |   16 +
 .../org/gradle/performance/fixture/gc-3.txt        |   16 +
 .../fixture/AbstractPerformanceTest.groovy         |   27 +-
 .../org/gradle/performance/fixture/Amount.java     |  162 -
 .../performance/fixture/BaselineVersion.groovy     |   42 +-
 .../fixture/CompositeDataCollector.java            |   44 +
 .../performance/fixture/CompositeDataReporter.java |   39 +
 .../org/gradle/performance/fixture/DataAmount.java |   37 -
 .../gradle/performance/fixture/DataCollector.java  |    7 +-
 .../org/gradle/performance/fixture/Duration.java   |   45 -
 .../performance/fixture/GCLoggingCollector.java    |  141 +
 .../org/gradle/performance/fixture/Git.groovy      |   42 +
 .../performance/fixture/MeasuredOperation.groovy   |   41 -
 .../fixture/MeasuredOperationList.groovy           |   45 +-
 .../performance/fixture/MemoryInfoCollector.groovy |   11 +-
 .../gradle/performance/fixture/OperationTimer.java |   36 +
 .../performance/fixture/PerformanceResults.groovy  |   83 +-
 .../fixture/PerformanceTestRunner.groovy           |   74 +-
 .../performance/fixture/PrettyCalculator.groovy    |   15 +-
 .../performance/fixture/TestProjectLocator.groovy  |    5 +-
 .../fixture/TextFileDataReporter.groovy            |   13 +-
 .../org/gradle/performance/fixture/Units.java      |  193 -
 .../gradle/performance/fixture/VersionResults.java |   21 +
 .../org/gradle/performance/measure/Amount.java     |  172 +
 .../org/gradle/performance/measure/DataAmount.java |   41 +
 .../org/gradle/performance/measure/DataSeries.java |   68 +
 .../org/gradle/performance/measure/Duration.java   |   45 +
 .../performance/measure/MeasuredOperation.groovy   |   32 +
 .../org/gradle/performance/measure/Units.java      |  193 +
 .../gradle/performance/results/FileRenderer.java   |   34 +
 .../gradle/performance/results/FormatSupport.java  |   56 +
 .../performance/results/HtmlPageGenerator.java     |   54 +
 .../performance/results/IndexPageGenerator.java    |  108 +
 .../performance/results/ReportGenerator.java       |   54 +
 .../gradle/performance/results/ResultsStore.java   |  297 ++
 .../performance/results/TestDataGenerator.java     |   93 +
 .../performance/results/TestExecutionHistory.java  |   83 +
 .../performance/results/TestPageGenerator.java     |  221 +
 .../resources/org/gradle/reporting/report.js       |   63 +
 .../resources/org/gradle/reporting/style.css       |   89 +
 subprojects/plugins/plugins.gradle                 |    9 +-
 .../gradle/api/plugins/BuildSrcPluginTest.groovy   |    2 +-
 .../api/tasks/bundling/JarIntegrationTest.groovy   |  201 +-
 .../tasks/bundling/WarTaskIntegrationTest.groovy   |  181 +-
 .../groovy/GroovyBasePluginIntegrationTest.groovy  |   80 +-
 .../groovy/GroovyPluginIntegrationTest.groovy      |   52 +
 .../AntForkingGroovyCompilerIntegrationTest.groovy |    2 +-
 .../ApiGroovyCompilerIntegrationSpec.groovy        |    4 +-
 .../BasicGroovyCompilerIntegrationSpec.groovy      |    2 +-
 .../compile/GroovyCompilerIntegrationSpec.groovy   |   12 +
 .../compile/InvokeDynamicGroovyCompilerSpec.groovy |    2 +-
 .../JreJavaHomeGroovyIntegrationTest.groovy        |   29 +-
 .../gradle/java/JavaPluginGoodBehaviourTest.groovy |   22 +
 ...ncrementalJavaCompilationIntegrationTest.groovy |  219 +
 .../JreJavaHomeJavaIntegrationTest.groovy          |   30 +-
 .../testing/IncrementalTestIntegrationTest.groovy  |  123 +
 .../testing/SuiteTimestampIntegrationTest.groovy   |   52 +
 .../testing/TestEnvironmentIntegrationTest.groovy  |   14 +-
 .../testing/TestReportIntegrationTest.groovy       |  382 +-
 .../gradle/testing/TestTaskIntegrationTest.groovy  |   51 +
 .../gradle/testing/TestingIntegrationTest.groovy   |  188 +-
 .../CucumberJVMReportIntegrationTest.groovy        |   46 +
 .../AbstractTestFilteringIntegrationTest.groovy    |  187 +
 .../gradle/testing/fixture/JUnitCoverage.groovy    |   26 +
 .../gradle/testing/fixture/TestNGCoverage.groovy   |   22 +
 .../junit/JUnitAssumptionsIntegrationTest.groovy   |   47 +
 .../JUnitCategoriesCoverageIntegrationSpec.groovy  |   88 +
 .../junit/JUnitCategoriesIntegrationSpec.groovy    |   64 +
 .../junit/JUnitCrossVersionIntegrationSpec.groovy  |   61 -
 .../junit/JUnitFilteringIntegrationTest.groovy     |   32 +
 .../JUnitFilteringSupportIntegrationTest.groovy    |   62 +
 ...itIgnoreClassMultiVersionIntegrationSpec.groovy |   46 +
 .../testing/junit/JUnitIntegrationTest.groovy      |   27 +-
 .../junit/JUnitLoggingIntegrationTest.groovy       |    7 +-
 .../junit/JUnitMultiVersionIntegrationSpec.groovy  |   54 +
 ...JUnitTestFilteringSamplesIntegrationTest.groovy |   39 +
 .../testng/SampleTestNGIntegrationTest.groovy      |    7 +-
 .../testng/TestNGFilteringIntegrationTest.groovy   |   32 +
 .../testing/testng/TestNGIntegrationProject.groovy |   67 -
 .../testing/testng/TestNGIntegrationTest.groovy    |   23 +-
 .../testng/TestNGLoggingIntegrationTest.groovy     |  107 +-
 .../TestNGProducesOldReportsIntegrationTest.groovy |   22 +-
 ...TestNGSuiteInitialisationIntegrationTest.groovy |   53 +
 .../testng/TestNGSuiteIntegrationTest.groovy       |   74 +
 ...tNGXmlResultAndHtmlReportIntegrationTest.groovy |  299 +-
 .../shared/build.gradle                            |    2 +-
 .../build.gradle                                   |   10 +
 .../src/main/groovy/GroovyCode.groovy              |    1 +
 .../src/main/groovy/JavaCode.java                  |    3 +
 .../build.gradle                                   |    2 +-
 .../recompilesDependentClasses/build.gradle        |    2 +-
 .../build.gradle                                   |    2 +-
 .../doesNotRunStaleTests/src/test/java/Broken.java |    0
 .../NewMainClass.java                              |    0
 .../executesTestsWhenSourceChanges/NewOk.java      |    0
 .../src/main/java/MainClass.java                   |    0
 .../build.gradle                                   |    0
 .../src/test/java/JUnitExtra.java                  |    0
 .../src/test/java/JUnitTest.java                   |    0
 .../src/test/java/TestNGTest.java                  |    0
 .../shared/build.gradle                            |    0
 .../shared/src/test/java/Ok.java                   |    0
 .../build.gradle                                   |   34 +
 .../src/test/java/HelloStepdefs.java               |   20 +
 .../src/test/java/RunCukesTest.java                |    6 +
 .../src/test/resources/helloworld.feature          |    7 +
 .../supportsAssumptions/build.gradle               |   18 +
 .../test/java/org/gradle/TestWithAssumptions.java  |   32 +
 .../build.gradle                                   |   28 +
 .../src/test/java/org/gradle/CategoryA.java        |   20 +
 .../src/test/java/org/gradle/LocaleHolder.java     |   32 +
 .../src/test/java/org/gradle/Locales.java          |   80 +
 .../src/test/java/org/gradle/SomeLocaleTests.java  |   19 +
 .../test/java/org/gradle/SomeMoreLocalTests.java   |   35 +
 .../canSpecifyExcludesOnly/build.gradle            |   26 +
 .../src/test/java/org/gradle/CatATests.java        |   41 +
 .../src/test/java/org/gradle/CategoryA.java        |   20 +
 .../src/test/java/org/gradle/NoCatTests.java       |   30 +
 .../src/test/java/org/gradle/SomeOtherCat.java     |   20 +
 .../test/java/org/gradle/SomeOtherCatTests.java    |   32 +
 .../src/test/java/org/gradle/SomeTests.java        |   40 +
 .../build.gradle                                   |   28 +
 .../src/test/java/org/gradle/CatACTests.java       |   40 +
 .../src/test/java/org/gradle/CatADTests.java       |   42 +
 .../src/test/java/org/gradle/CatATests.java        |   40 +
 .../src/test/java/org/gradle/CatBTests.java        |   40 +
 .../src/test/java/org/gradle/CatCBTests.java       |   42 +
 .../src/test/java/org/gradle/CatCTests.java        |   40 +
 .../src/test/java/org/gradle/CatDTests.java        |   40 +
 .../src/test/java/org/gradle/CatZTests.java        |   40 +
 .../src/test/java/org/gradle/CategoryA.java        |   20 +
 .../src/test/java/org/gradle/CategoryB.java        |   20 +
 .../src/test/java/org/gradle/CategoryC.java        |   20 +
 .../src/test/java/org/gradle/CategoryD.java        |   20 +
 .../src/test/java/org/gradle/CategoryZ.java        |   20 +
 .../src/test/java/org/gradle/MixedTests.java       |   44 +
 .../src/test/java/org/gradle/NoCatTests.java       |   38 +
 .../reportsUnloadableCategories/build.gradle       |   27 +
 .../src/test/java/org/gradle/SomeTestClass.java    |   13 +
 .../build.gradle                                   |   16 +
 .../src/test/java/org/gradle/SomeTest.java         |   12 +
 .../canHandleClassLevelIgnoredTests/build.gradle   |   23 +
 .../test/java/org/gradle/CustomIgnoredTest.java    |   70 +
 .../src/test/java/org/gradle/IgnoredTest.java      |    0
 .../build.gradle                                   |    6 +-
 .../build.gradle                                   |    6 +-
 .../canRunTestsUsingJUnit3/build.gradle            |   25 +
 .../JUnitIntegrationTest/junit3Tests/build.gradle  |    9 -
 .../JUnitIntegrationTest/junit4Tests/build.gradle  |    9 -
 .../test/java/org/gradle/CustomIgnoredTest.java    |   71 -
 .../src/test/java/org/gradle/Junit4Test.java       |   11 +-
 .../build.gradle                                   |    8 +-
 .../supportsTestCategories/build.gradle            |   16 +
 .../src/test/java/org/gradle/CategoryA.java        |    4 +
 .../src/test/java/org/gradle/CategoryB.java        |    4 +
 .../src/test/java/org/gradle/CategoryC.java        |    4 +
 .../src/test/java/org/gradle/SomeTest.java         |   27 +
 .../canRunTestsUsingJUnit/build.gradle             |    0
 .../shared/build.gradle                            |   24 -
 .../src/test/groovy/org/gradle/TestNGTest.groovy   |   42 -
 .../standardOutputLogging/build.gradle             |   35 -
 .../org/gradle/TestNGStandardOutputTest.groovy     |   27 -
 .../org/gradle/api/distribution/Distribution.java  |   28 +-
 .../distribution/internal/DefaultDistribution.java |    8 +-
 .../internal/DefaultDistributionContainer.java     |   13 +-
 .../distribution/plugins/DistributionPlugin.groovy |   82 +-
 .../gradle/api/internal/java/WebApplication.java   |    2 +-
 .../internal/plugins/BuildConfigurationRule.java   |    2 +-
 .../org/gradle/api/internal/plugins/CleanRule.java |    2 +-
 .../api/internal/plugins/ProcessResources.java     |   21 +-
 .../internal/plugins/StartScriptGenerator.groovy   |   37 +
 .../gradle/api/internal/plugins/UploadRule.java    |    2 +-
 .../gradle/api/internal/tasks/CompileServices.java |   55 +
 .../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 -
 .../api/internal/tasks/DefaultSourceSet.java       |    2 +-
 .../internal/tasks/DefaultSourceSetContainer.java  |    3 +
 .../api/internal/tasks/DefaultSourceSetOutput.java |    3 -
 .../internal/tasks/SourceSetCompileClasspath.java  |    5 +-
 .../compile/AntDependsStaleClassCleaner.groovy     |    6 +-
 .../tasks/compile/AntGroovyCompiler.groovy         |    2 -
 .../internal/tasks/compile/AntJavaCompiler.groovy  |    7 +-
 .../internal/tasks/compile/ApiGroovyCompiler.java  |    5 +-
 .../api/internal/tasks/compile/ArgCollector.java   |    2 +
 .../api/internal/tasks/compile/ArgWriter.java      |    7 +
 .../tasks/compile/CleaningGroovyCompiler.java      |   40 +
 .../tasks/compile/CleaningJavaCompiler.java        |   50 +
 .../tasks/compile/CleaningJavaCompilerSupport.java |   39 +
 .../tasks/compile/CommandLineJavaCompiler.java     |    4 +-
 .../CommandLineJavaCompilerArgumentsGenerator.java |    7 +-
 .../tasks/compile/DefaultJavaCompilerFactory.java  |   31 +-
 .../tasks/compile/ExecSpecBackedArgCollector.java  |    5 +
 .../GroovyCompileTransformingClassLoader.java      |  124 +
 .../tasks/compile/GroovyCompilerFactory.java       |   11 +-
 .../compile/InProcessJavaCompilerFactory.java      |    4 +-
 .../tasks/compile/IncrementalGroovyCompiler.java   |   38 -
 .../tasks/compile/IncrementalJavaCompiler.java     |   48 -
 .../compile/IncrementalJavaCompilerSupport.java    |   39 -
 .../tasks/compile/NoOpStaleClassCleaner.java       |    2 +
 .../tasks/compile/NormalizingGroovyCompiler.java   |    1 +
 .../tasks/compile/NormalizingJavaCompiler.java     |    1 +
 .../tasks/compile/SimpleStaleClassCleaner.java     |   38 -
 .../internal/tasks/compile/SimpleWorkResult.java   |   30 -
 .../internal/tasks/compile/StaleClassCleaner.java  |   53 -
 .../internal/tasks/compile/SunJavaCompiler.java    |    1 +
 .../tasks/compile/TransformingClassLoader.java     |  152 -
 .../compile/daemon/CompilerClientsManager.java     |   82 +
 .../tasks/compile/daemon/CompilerDaemonClient.java |   22 +-
 .../compile/daemon/CompilerDaemonFactory.java      |    5 +-
 .../compile/daemon/CompilerDaemonManager.java      |   96 +-
 .../tasks/compile/daemon/CompilerDaemonServer.java |    3 +-
 .../daemon/CompilerDaemonServerProtocol.java       |    2 +-
 .../compile/daemon/CompilerDaemonStarter.java      |   68 +
 .../tasks/compile/daemon/DaemonGroovyCompiler.java |    2 +-
 .../tasks/compile/daemon/DaemonJavaCompiler.java   |    6 +-
 .../daemon/InProcessCompilerDaemonFactory.java     |    7 +-
 .../compile/incremental/AllFromJarRebuildInfo.java |   41 +
 .../tasks/compile/incremental/ClassDependents.java |   44 +
 .../compile/incremental/ClassNameProvider.java     |   38 +
 .../compile/incremental/DefaultRebuildInfo.java    |   53 +
 .../tasks/compile/incremental/DummySerializer.java |   51 +
 .../incremental/IncrementalCompilationSupport.java |   51 +
 .../compile/incremental/InputOutputMapper.java     |   60 +
 .../tasks/compile/incremental/JarArchive.java      |   30 +
 .../compile/incremental/JarChangeProcessor.java    |   56 +
 .../tasks/compile/incremental/JarDelta.java        |   23 +
 .../tasks/compile/incremental/JarSnapshot.java     |   43 +
 .../compile/incremental/JarSnapshotCache.java      |   53 +
 .../compile/incremental/JarSnapshotFeeder.java     |   57 +
 .../tasks/compile/incremental/JarSnapshotter.java  |   46 +
 .../tasks/compile/incremental/JavaSourceClass.java |   41 +
 .../compile/incremental/OutputClassMapper.java     |   32 +
 .../tasks/compile/incremental/RebuildInfo.java     |   25 +
 .../compile/incremental/SelectiveCompilation.java  |  141 +
 .../compile/incremental/SelectiveJavaCompiler.java |   66 +
 .../incremental/SpecificClassesRebuildInfo.java    |   23 +
 .../incremental/analyzer/ClassAnalysis.java        |   37 +
 .../analyzer/ClassDependenciesAnalyzer.java        |   74 +
 .../analyzer/ClassDependenciesVisitor.java         |   58 +
 .../incremental/analyzer/ClassRelevancyFilter.java |   30 +
 .../incremental/graph/ClassDependencyInfo.java     |   59 +
 .../graph/ClassDependencyInfoExtractor.java        |   74 +
 .../graph/ClassDependencyInfoSerializer.java       |   47 +
 .../tasks/compile/jdk6/Jdk6JavaCompiler.java       |   26 +-
 .../tasks/testing/DefaultJUnitXmlReport.java       |   41 +
 .../tasks/testing/DefaultTestClassRunInfo.java     |    3 -
 .../tasks/testing/DefaultTestOutputEvent.java      |   28 +
 .../tasks/testing/DefaultTestTaskReports.java      |   46 +
 .../tasks/testing/NoMatchingTestsReporter.java     |   42 +
 .../tasks/testing/SuiteTestClassProcessor.java     |    5 +-
 .../internal/tasks/testing/TestClassProcessor.java |    4 +-
 .../internal/tasks/testing/TestClassRunInfo.java   |    3 -
 .../internal/tasks/testing/TestCompleteEvent.java  |    2 +
 .../api/internal/tasks/testing/TestFramework.java  |    5 +-
 .../api/internal/tasks/testing/TestStartEvent.java |    3 +
 .../detection/AbstractTestFrameworkDetector.java   |    3 -
 .../detection/ClassFileExtractionManager.java      |    2 -
 .../testing/detection/DefaultTestClassScanner.java |    2 -
 .../testing/detection/DefaultTestExecuter.java     |    2 -
 .../testing/detection/JarFilePackageListener.java  |    3 -
 .../testing/detection/JarFilePackageLister.java    |    3 -
 .../tasks/testing/detection/TestClassVisitor.java  |    2 -
 .../tasks/testing/detection/TestExecuter.java      |    3 -
 .../testing/detection/TestFrameworkDetector.java   |    3 -
 .../tasks/testing/filter/DefaultTestFilter.java    |   54 +
 .../tasks/testing/filter/TestSelectionMatcher.java |   62 +
 .../tasks/testing/junit/CategoryFilter.java        |  112 +
 .../tasks/testing/junit/JUnitDetector.java         |    3 -
 .../internal/tasks/testing/junit/JUnitSpec.java    |   50 +
 .../testing/junit/JUnitTestClassDetecter.java      |    3 -
 .../testing/junit/JUnitTestClassExecuter.java      |   62 +-
 .../testing/junit/JUnitTestClassProcessor.java     |   10 +-
 .../tasks/testing/junit/JUnitTestEventAdapter.java |    6 +-
 .../tasks/testing/junit/JUnitTestFramework.java    |   58 +-
 .../testing/junit/JUnitTestMethodDetecter.java     |    3 -
 .../tasks/testing/junit/report/AllTestResults.java |   13 +-
 .../testing/junit/report/ClassPageRenderer.java    |   33 +-
 .../testing/junit/report/ClassTestResults.java     |   14 +-
 .../testing/junit/report/CompositeTestResults.java |   75 +-
 .../testing/junit/report/DefaultTestReport.java    |   41 +-
 .../junit/report/LocaleSafeDecimalFormat.java      |    3 -
 .../testing/junit/report/OverviewPageRenderer.java |   13 +-
 .../testing/junit/report/PackagePageRenderer.java  |    9 +-
 .../testing/junit/report/PackageTestResults.java   |   12 +-
 .../tasks/testing/junit/report/PageRenderer.java   |   38 +-
 .../tasks/testing/junit/report/TestFailure.java    |   34 -
 .../tasks/testing/junit/report/TestResult.java     |   17 +-
 .../junit/result/AggregateTestResultsProvider.java |  120 +-
 .../result/Binary2JUnitXmlReportGenerator.java     |   13 +-
 .../BinaryResultBackedTestResultsProvider.java     |   36 +-
 .../testing/junit/result/CachingFileWriter.java    |  100 -
 .../junit/result/InMemoryTestResultsProvider.java  |   63 +
 .../testing/junit/result/JUnitXmlResultWriter.java |   90 +-
 .../testing/junit/result/TestClassResult.java      |   29 +-
 .../tasks/testing/junit/result/TestFailure.java    |   41 +
 .../testing/junit/result/TestMethodResult.java     |   47 +-
 .../junit/result/TestOutputAssociation.java        |   22 +
 .../testing/junit/result/TestOutputSerializer.java |   90 -
 .../testing/junit/result/TestOutputStore.java      |  388 ++
 .../junit/result/TestReportDataCollector.java      |  125 +-
 .../testing/junit/result/TestResultSerializer.java |  135 +-
 .../testing/junit/result/TestResultsProvider.java  |   23 +-
 .../tasks/testing/logging/AbstractTestLogger.java  |    2 +-
 .../processors/MaxNParallelTestClassProcessor.java |    2 +-
 .../internal/tasks/testing/results/TestState.java  |    5 -
 .../testing/results/UnknownTestDescriptor.java     |   10 +-
 .../tasks/testing/testng/TestNGDetector.java       |    3 -
 .../testng/TestNGListenerAdapterFactory.java       |   25 +-
 .../internal/tasks/testing/testng/TestNGSpec.java  |    9 +-
 .../testing/testng/TestNGTestClassDetecter.java    |    3 -
 .../testing/testng/TestNGTestClassProcessor.java   |   43 +-
 .../tasks/testing/testng/TestNGTestFramework.java  |   25 +-
 .../testing/testng/TestNGTestMethodDetecter.java   |    3 -
 .../testng/TestNGTestResultProcessorAdapter.java   |   42 +-
 .../testng/UnrepresentableParameterException.java  |   32 +
 .../testing/worker/ForkingTestClassProcessor.java  |   39 +-
 .../tasks/testing/worker/TestEventSerializer.java  |  265 ++
 .../internal/tasks/testing/worker/TestWorker.java  |    4 +-
 .../testing/worker/WorkerTestClassProcessor.java   |    6 +-
 .../org/gradle/api/java/archives/Attributes.java   |    2 -
 .../api/java/archives/ManifestException.java       |    2 -
 .../java/archives/internal/DefaultAttributes.java  |    3 -
 .../java/archives/internal/DefaultManifest.java    |    7 +-
 .../internal/DefaultManifestMergeDetails.java      |    3 -
 .../gradle/api/plugins/ApplicationPlugin.groovy    |   18 +-
 .../api/plugins/ApplicationPluginConvention.groovy |    7 +-
 .../groovy/org/gradle/api/plugins/BasePlugin.java  |   54 +-
 .../gradle/api/plugins/BasePluginConvention.groovy |    5 +-
 .../org/gradle/api/plugins/GroovyBasePlugin.java   |   91 +-
 .../org/gradle/api/plugins/GroovyPlugin.java       |    4 +-
 .../org/gradle/api/plugins/JavaBasePlugin.java     |   83 +-
 .../org/gradle/api/plugins/JavaLanguagePlugin.java |   77 +-
 .../plugins/JavaLibraryDistributionPlugin.groovy   |    2 -
 .../groovy/org/gradle/api/plugins/JavaPlugin.java  |   12 +-
 .../gradle/api/plugins/JavaPluginConvention.groovy |   11 +-
 .../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/GroovyRuntime.java |  131 +
 .../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 -
 .../org/gradle/api/tasks/SourceSetContainer.java   |    4 +
 .../main/groovy/org/gradle/api/tasks/Upload.java   |  132 +
 .../tasks/application/CreateStartScripts.groovy    |   15 +-
 .../org/gradle/api/tasks/bundling/Jar.groovy       |   22 +-
 .../org/gradle/api/tasks/bundling/War.groovy       |    9 +-
 .../gradle/api/tasks/compile/AbstractCompile.java  |    1 -
 .../gradle/api/tasks/compile/AbstractOptions.java  |    6 +-
 .../gradle/api/tasks/compile/BaseForkOptions.java  |    3 -
 .../org/gradle/api/tasks/compile/Compile.java      |  143 +-
 .../gradle/api/tasks/compile/CompileOptions.java   |   47 +-
 .../org/gradle/api/tasks/compile/DebugOptions.java |    2 -
 .../gradle/api/tasks/compile/DependOptions.java    |    2 -
 .../org/gradle/api/tasks/compile/ForkOptions.java  |    2 -
 .../gradle/api/tasks/compile/GroovyCompile.java    |   21 +-
 .../api/tasks/compile/GroovyCompileOptions.java    |    5 +-
 .../api/tasks/compile/GroovyForkOptions.java       |    2 -
 .../org/gradle/api/tasks/compile/JavaCompile.java  |    8 +
 .../gradle/api/tasks/javadoc/AntGroovydoc.groovy   |    3 -
 .../org/gradle/api/tasks/javadoc/AntJavadoc.groovy |    3 +-
 .../org/gradle/api/tasks/javadoc/Groovydoc.java    |   16 +-
 .../org/gradle/api/tasks/javadoc/Javadoc.java      |    8 +-
 .../gradle/api/tasks/testing/JUnitXmlReport.java   |   39 +
 .../groovy/org/gradle/api/tasks/testing/Test.java  |  324 +-
 .../gradle/api/tasks/testing/TestDescriptor.java   |    3 +
 .../org/gradle/api/tasks/testing/TestFilter.java   |   87 +
 .../org/gradle/api/tasks/testing/TestListener.java |    4 +-
 .../org/gradle/api/tasks/testing/TestReport.java   |   39 +-
 .../gradle/api/tasks/testing/TestTaskReports.java  |   42 +
 .../api/tasks/testing/junit/JUnitOptions.groovy    |   51 +
 .../api/tasks/testing/junit/JUnitOptions.java      |   25 -
 .../api/tasks/testing/testng/TestNGOptions.groovy  |   40 +-
 .../org/gradle/api/tasks/wrapper/Wrapper.java      |  280 --
 .../external/javadoc/CoreJavadocOptions.java       |    2 -
 .../external/javadoc/JavadocMemberLevel.java       |    2 -
 .../external/javadoc/JavadocOfflineLink.java       |    2 -
 .../external/javadoc/JavadocOptionFileOption.java  |    1 -
 .../external/javadoc/JavadocOutputLevel.java       |    2 -
 .../external/javadoc/MinimalJavadocOptions.java    |    2 -
 .../javadoc/OptionLessJavadocOptionFileOption.java |    1 -
 .../javadoc/StandardJavadocDocletOptions.java      |   12 +-
 .../internal/AbstractJavadocOptionFileOption.java  |    1 -
 .../AbstractListJavadocOptionFileOption.java       |    3 +-
 .../internal/BooleanJavadocOptionFileOption.java   |    2 -
 .../internal/EnumJavadocOptionFileOption.java      |    1 -
 .../internal/FileJavadocOptionFileOption.java      |    2 -
 .../internal/GroupsJavadocOptionFileOption.java    |    2 -
 .../javadoc/internal/JavadocExecHandleBuilder.java |   14 +-
 .../javadoc/internal/JavadocOptionFile.java        |    3 -
 .../javadoc/internal/JavadocOptionFileWriter.java  |    7 +-
 .../internal/JavadocOptionFileWriterContext.java   |    5 +-
 .../LinksOfflineJavadocOptionFileOption.java       |    7 +-
 .../MultilineStringsJavadocOptionFileOption.java   |    7 +-
 .../OptionLessStringsJavadocOptionFileOption.java  |    7 +-
 .../internal/PathJavadocOptionFileOption.java      |    5 +-
 .../internal/StringJavadocOptionFileOption.java    |    3 -
 .../internal/StringsJavadocOptionFileOption.java   |    7 +-
 .../META-INF/gradle-plugins/jvm-lang.properties    |    2 +-
 .../META-INF/gradle-plugins/lang-base.properties   |    2 +-
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../api/internal/plugins/unixStartScript.txt       |    2 +-
 .../api/internal/plugins/windowsStartScript.txt    |    2 +-
 .../internal/tasks/testing/junit/report/style.css  |    6 +-
 .../plugins/DistributionPluginTest.groovy          |    4 +-
 .../plugins/StartScriptGeneratorTest.groovy        |   99 +
 .../api/internal/tasks/DefaultSourceSetTest.groovy |    2 +-
 .../tasks/compile/CleaningJavaCompilerTest.groovy  |   61 +
 .../compile/DefaultJavaCompilerFactoryTest.groovy  |    5 +-
 ...GroovyCompileTransformingClassLoaderTest.groovy |   96 +
 .../InProcessJavaCompilerFactoryTest.groovy        |    2 +-
 .../compile/IncrementalJavaCompilerTest.groovy     |   60 -
 .../compile/SimpleStaleClassCleanerTest.groovy     |   20 +
 .../compile/TransformingClassLoaderTest.groovy     |   96 -
 .../daemon/CompilerClientsManagerTest.groovy       |   97 +
 .../daemon/CompilerDaemonManagerTest.groovy        |  100 +
 .../incremental/AllFromJarRebuildInfoTest.groovy   |   44 +
 .../incremental/ClassNameProviderTest.groovy       |   42 +
 .../IncrementalCompilationSupportTest.groovy       |   52 +
 .../incremental/InputOutputMapperTest.groovy       |   53 +
 .../incremental/JarSnapshotCacheTest.groovy        |   50 +
 .../incremental/JarSnapshotFeederTest.groovy       |   72 +
 .../compile/incremental/JarSnapshotTest.groovy     |   49 +
 .../compile/incremental/JarSnapshotterTest.groovy  |   52 +
 .../compile/incremental/JavaSourceClassTest.groovy |   38 +
 .../incremental/OutputClassMapperTest.groovy       |   28 +
 .../analyzer/AccessedFromPrivateClass.java         |   24 +
 .../analyzer/ClassDependenciesAnalyzerTest.groovy  |   74 +
 .../analyzer/HasNonPrivateConstants.java           |   21 +
 .../incremental/analyzer/HasPrivateConstants.java  |   22 +
 .../incremental/analyzer/HasPublicConstants.java   |   21 +
 .../compile/incremental/analyzer/SomeClass.java    |   35 +
 .../incremental/analyzer/SomeOtherClass.java       |   24 +
 .../analyzer/UsedByNonPrivateConstantsClass.java   |   20 +
 .../incremental/analyzer/YetAnotherClass.java      |   20 +
 .../analyzer/annotations/SomeClassAnnotation.java  |   24 +
 .../annotations/SomeRuntimeAnnotation.java         |   24 +
 .../analyzer/annotations/SomeSourceAnnotation.java |   24 +
 .../annotations/UsesAnnotationInField.java         |   21 +
 .../analyzer/annotations/UsesClassAnnotation.java  |   20 +
 .../annotations/UsesRuntimeAnnotation.java         |   20 +
 .../analyzer/annotations/UsesSourceAnnotation.java |   20 +
 .../graph/ClassDependencyInfoExtractorTest.groovy  |   37 +
 .../graph/ClassDependencyInfoSerializerTest.groovy |   38 +
 .../tasks/testing/AbstractTestFrameworkTest.java   |   68 -
 .../testing/filter/DefaultTestFilterTest.groovy    |   53 +
 .../testing/filter/TestSelectionMatcherTest.groovy |  129 +
 .../junit/JUnitTestClassProcessorData.groovy       |  291 ++
 .../junit/JUnitTestClassProcessorTest.groovy       | 1098 +----
 .../testing/junit/JUnitTestFrameworkTest.java      |   99 -
 .../testing/junit/report/AllTestResultsTest.groovy |    4 +-
 .../junit/report/ClassTestResultsTest.groovy       |    4 +-
 .../junit/report/CompositeTestResultsTest.groovy   |   64 +-
 .../junit/report/DefaultTestReportTest.groovy      |  764 ++--
 .../junit/report/LocaleSafeDecimalFormatTest.java  |    3 -
 .../result/AggregateTestResultsProviderTest.groovy |  187 +
 .../Binary2JUnitXmlReportGeneratorSpec.groovy      |   23 +-
 .../junit/result/CachingFileWriterSpec.groovy      |   83 -
 .../junit/result/JUnitXmlResultWriterSpec.groovy   |  124 +-
 .../junit/result/TestClassResultSpec.groovy        |   11 +-
 .../junit/result/TestOutputSerializerTest.groovy   |   72 -
 .../junit/result/TestOutputStoreSpec.groovy        |  180 +
 .../result/TestReportDataCollectorSpec.groovy      |  215 +-
 .../junit/result/TestResultSerializerTest.groovy   |   54 +-
 .../logging/FullExceptionFormatterTest.groovy      |    6 +-
 .../logging/ShortExceptionFormatterTest.groovy     |    4 +-
 .../tasks/testing/logging/SimpleTestResult.groovy  |   31 -
 .../testing/logging/TestEventLoggerTest.groovy     |    6 +-
 .../testing/results/DefaultTestResultTest.groovy   |    3 -
 .../testng/TestNGTestClassProcessorTest.groovy     |  316 +-
 .../testing/testng/TestNGTestFrameworkTest.groovy  |   26 +-
 .../worker/ForkingTestClassProcessorTest.groovy    |   46 +
 .../worker/ForkingTestClassProcessorTest.java      |  141 -
 .../testing/worker/TestEventSerializerTest.groovy  |  202 +
 .../tasks/testing/worker/TestWorkerTest.groovy     |    3 +
 .../archives/internal/DefaultAttributesTest.groovy |    5 +-
 .../internal/DefaultManifestMergeSpecTest.groovy   |    3 -
 .../archives/internal/DefaultManifestTest.groovy   |    3 -
 .../api/plugins/ApplicationPluginTest.groovy       |   31 +-
 .../api/plugins/BasePluginConventionTest.groovy    |    8 +-
 .../org/gradle/api/plugins/BasePluginTest.groovy   |   49 +-
 .../gradle/api/plugins/GroovyBasePluginTest.groovy |   33 +-
 .../org/gradle/api/plugins/GroovyPluginTest.groovy |    9 +-
 .../gradle/api/plugins/JavaBasePluginTest.groovy   |   79 +-
 .../api/plugins/JavaLanguagePluginTest.groovy      |   17 +-
 .../JavaLibraryDistributionPluginTest.groovy       |    4 +-
 .../api/plugins/JavaPluginConventionTest.groovy    |    7 +-
 .../org/gradle/api/plugins/JavaPluginTest.groovy   |   68 +-
 .../api/plugins/JvmLanguagePluginTest.groovy       |   64 +-
 .../api/plugins/LanguageBasePluginTest.groovy      |   29 +-
 .../org/gradle/api/plugins/WarPluginTest.groovy    |   14 +-
 .../org/gradle/api/tasks/GroovyRuntimeTest.groovy  |  116 +
 .../groovy/org/gradle/api/tasks/UploadTest.groovy  |   32 +
 .../application/CreateStartScriptsTest.groovy      |    4 +-
 .../org/gradle/api/tasks/bundling/JarTest.groovy   |    4 +-
 .../org/gradle/api/tasks/bundling/WarTest.groovy   |    4 +-
 .../api/tasks/compile/CompileOptionsTest.groovy    |    8 +-
 .../api/tasks/compile/DebugOptionsTest.groovy      |    3 -
 .../api/tasks/compile/ForkOptionsTest.groovy       |    6 +-
 .../tasks/compile/GroovyCompileOptionsTest.groovy  |    6 +-
 .../api/tasks/compile/GroovyCompileTest.java       |   16 +-
 .../api/tasks/compile/GroovyForkOptionsTest.groovy |    6 +-
 .../gradle/api/tasks/compile/JavaCompileTest.java  |    3 -
 .../gradle/api/tasks/javadoc/GroovydocTest.java    |    7 +-
 .../org/gradle/api/tasks/javadoc/JavadocTest.java  |    2 +-
 .../testing/AbstractTestFrameworkOptionsTest.java  |    3 -
 .../gradle/api/tasks/testing/TestReportTest.groovy |    6 +-
 .../gradle/api/tasks/testing/TestTaskSpec.groovy   |   19 +-
 .../org/gradle/api/tasks/testing/TestTest.java     |   30 +-
 .../tasks/testing/testng/TestNGOptionsTest.groovy  |   13 +-
 .../org/gradle/api/tasks/wrapper/WrapperTest.java  |  164 -
 .../javadoc/StandardJavadocDocletOptionsTest.java  |   20 +-
 .../BooleanJavadocOptionFileOptionTest.java        |    9 +-
 .../internal/EnumJavadocOptionFileOptionTest.java  |    7 +-
 .../internal/FileJavadocOptionFileOptionTest.java  |    7 +-
 .../GroupsJavadocOptionFileOptionTest.java         |    7 +-
 .../internal/JavadocExecHandleBuilderTest.groovy   |   35 +-
 .../javadoc/internal/JavadocOptionFileTest.java    |    3 -
 .../JavadocOptionFileWriterContextTest.java        |    7 +-
 .../LinksOfflineJavadocOptionFileOptionTest.java   |    7 +-
 ...ultilineStringsJavadocOptionFileOptionTest.java |    5 +-
 ...tionLessStringsJavadocOptionFileOptionTest.java |    5 +-
 .../internal/PathJavadocOptionFileOptionTest.java  |    7 +-
 .../StringJavadocOptionFileOptionTest.java         |    5 +-
 .../StringsJavadocOptionFileOptionTest.java        |    5 +-
 .../tasks/testing/BuildableTestMethodResult.groovy |   71 +
 .../testing/BuildableTestResultsProvider.groovy    |  163 +
 .../tasks/testing/MethodTestOutputEvent.groovy     |   29 +
 .../internal/tasks/testing/SimpleTestResult.groovy |   35 +
 .../junit/report/HtmlTestResultsFixture.groovy     |  285 ++
 .../api/tasks/compile/AbstractCompileTest.java     |    5 +-
 subprojects/publish/publish.gradle                 |    4 +-
 .../gradle/api/publish/PublicationContainer.java   |   55 +-
 .../gradle/api/publish/PublishingExtension.java    |   23 +
 .../internal/CompositePublicationFactory.java      |   39 -
 .../internal/DefaultPublicationContainer.java      |   25 +-
 .../internal/GroovyPublicationContainer.groovy     |   35 -
 .../ProjectDependencyPublicationResolver.java      |   57 +
 .../internal/PublicationContainerInternal.java     |   23 -
 .../api/publish/internal/PublicationFactory.java   |   22 -
 .../api/publish/internal/PublicationInternal.java  |   23 +
 .../api/publish/internal/PublishServices.java      |   32 +
 .../api/publish/plugins/PublishingPlugin.java      |   44 +-
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../DefaultPublicationContainerTest.groovy         |   48 +-
 ...ProjectDependencyPublicationResolverTest.groovy |  134 +
 .../publish/plugins/PublishingPluginTest.groovy    |   10 +-
 subprojects/reporting/reporting.gradle             |    3 +-
 .../internal/TaskReportContainerIntegTest.groovy   |    0
 .../BuildDashboardPluginIntegrationTest.groovy     |  328 +-
 .../api/plugins/ReportingBasePluginConvention.java |    3 +-
 .../api/reporting/BuildDashboardReports.java       |    8 +-
 .../gradle/api/reporting/ConfigurableReport.java   |   34 +
 .../org/gradle/api/reporting/DirectoryReport.java  |   47 +
 .../api/reporting/GenerateBuildDashboard.java      |   60 +-
 .../groovy/org/gradle/api/reporting/Report.java    |   20 +-
 .../org/gradle/api/reporting/ReportContainer.java  |   14 +-
 .../groovy/org/gradle/api/reporting/Reporting.java |   40 +-
 .../gradle/api/reporting/ReportingExtension.java   |   22 +-
 .../org/gradle/api/reporting/SingleFileReport.java |   12 +-
 .../internal/BuildDashboardGenerator.java          |   70 +-
 .../internal/DefaultBuildDashboardReports.java     |   14 +-
 .../reporting/internal/DefaultReportContainer.java |    5 +-
 .../TaskGeneratedSingleDirectoryReport.java        |   45 +
 .../reporting/plugins/BuildDashboardPlugin.groovy  |   58 -
 .../reporting/plugins/BuildDashboardPlugin.java    |   73 +
 .../org/gradle/api/reporting/internal/style.css    |    3 +
 .../ReportingBasePluginConventionTest.groovy       |   64 +
 .../api/plugins/ReportingBasePluginTest.groovy     |   46 +
 .../reporting/GenerateBuildDashboardSpec.groovy    |    4 +-
 .../internal/BuildDashboardGeneratorSpec.groovy    |   22 +-
 .../internal/DefaultReportContainerTest.groovy     |   12 +-
 subprojects/resources/resources.gradle             |   11 +
 .../org/gradle/internal/filestore/FileStore.java   |   32 +
 .../internal/filestore/FileStoreSearcher.java      |   27 +
 .../local/AbstractLocallyAvailableResource.java    |   55 +
 .../local/DefaultLocallyAvailableResource.java     |   42 +
 .../resource/local/LocallyAvailableResource.java   |   31 +
 .../DefaultLocallyAvailableResourceTest.groovy     |   66 +
 subprojects/scala/scala.gradle                     |   13 +-
 .../integtests/ScalaPluginGoodBehaviourTest.groovy |    0
 .../integtests/ScalaProjectIntegrationTest.java    |    0
 .../SamplesMixedJavaAndScalaIntegrationTest.groovy |   74 +
 ...plesScalaCustomizedLayoutIntegrationTest.groovy |   50 +
 .../SamplesScalaQuickstartIntegrationTest.groovy   |   66 +
 .../samples/SamplesScalaZincIntegrationTest.groovy |    0
 .../scala/ScalaBasePluginIntegrationTest.groovy    |   90 +-
 .../ZincScalaCompilerJdk6IntegrationTest.groovy    |    2 +-
 .../JreJavaHomeScalaIntegrationTest.groovy         |   12 +-
 .../scala/test/ScalaTestIntegrationTest.groovy     |    4 +-
 .../internal/tasks/scala/AntScalaCompiler.groovy   |    2 +-
 .../tasks/scala/CleaningScalaCompiler.java         |   46 +
 .../internal/tasks/scala/DaemonScalaCompiler.java  |    2 +-
 .../tasks/scala/IncrementalScalaCompiler.java      |   44 -
 .../tasks/scala/NormalizingScalaCompiler.java      |    4 +-
 .../internal/tasks/scala/ScalaCompilerFactory.java |    8 +-
 .../tasks/scala/jdk6/ZincScalaCompiler.java        |   28 +-
 .../api/plugins/scala/ScalaBasePlugin.groovy       |  144 +-
 .../gradle/api/plugins/scala/ScalaPlugin.groovy    |    5 +-
 .../org/gradle/api/tasks/ScalaRuntime.groovy       |  159 +
 .../org/gradle/api/tasks/scala/ScalaCompile.java   |   13 +-
 .../api/plugins/scala/ScalaBasePluginTest.groovy   |  142 +-
 .../api/plugins/scala/ScalaPluginTest.groovy       |   12 +-
 .../org/gradle/api/tasks/ScalaRuntimeTest.groovy   |  124 +
 .../gradle/api/tasks/scala/ScalaCompileTest.java   |    9 +-
 subprojects/signing/signing.gradle                 |    2 +-
 .../gradle/plugins/signing/SigningExtension.groovy |    8 +-
 .../plugins/signing/SigningPluginConvention.groovy |    8 +-
 .../plugins/signing/SigningProjectSpec.groovy      |    4 +-
 subprojects/sonar/sonar.gradle                     |    3 +-
 .../plugins/sonar/SonarSmokeIntegrationTest.groovy |   16 +-
 .../runner/SonarRunnerSmokeIntegrationTest.groovy  |   16 +-
 .../shared/javaProject/build.gradle                |    2 -
 .../shared/javaProjectWithJacoco/build.gradle      |    5 +
 .../org/gradle/test/javaProject/Production1.java   |    0
 .../org/gradle/test/javaProject/Production10.java  |    0
 .../org/gradle/test/javaProject/Production2.java   |    0
 .../org/gradle/test/javaProject/Production3.java   |    0
 .../org/gradle/test/javaProject/Production4.java   |    0
 .../org/gradle/test/javaProject/Production5.java   |    0
 .../org/gradle/test/javaProject/Production6.java   |    0
 .../org/gradle/test/javaProject/Production7.java   |    0
 .../org/gradle/test/javaProject/Production8.java   |    0
 .../org/gradle/test/javaProject/Production9.java   |    0
 .../gradle/test/javaProject/productionResource.xml |    0
 .../java/org/gradle/test/javaProject/Test1.java    |    0
 .../java/org/gradle/test/javaProject/Test10.java   |    0
 .../java/org/gradle/test/javaProject/Test2.java    |    0
 .../java/org/gradle/test/javaProject/Test3.java    |    0
 .../java/org/gradle/test/javaProject/Test4.java    |    0
 .../java/org/gradle/test/javaProject/Test5.java    |    0
 .../java/org/gradle/test/javaProject/Test6.java    |    0
 .../java/org/gradle/test/javaProject/Test7.java    |    0
 .../java/org/gradle/test/javaProject/Test8.java    |    0
 .../java/org/gradle/test/javaProject/Test9.java    |    0
 .../org/gradle/test/javaProject/testResource.xml   |    0
 .../shared/settings.gradle                         |    2 +-
 .../shared/javaProject/build.gradle                |    2 -
 .../shared/javaProjectWithJacoco/build.gradle      |    5 +
 .../org/gradle/test/javaProject/Production1.java   |    0
 .../org/gradle/test/javaProject/Production10.java  |    0
 .../org/gradle/test/javaProject/Production2.java   |    0
 .../org/gradle/test/javaProject/Production3.java   |    0
 .../org/gradle/test/javaProject/Production4.java   |    0
 .../org/gradle/test/javaProject/Production5.java   |    0
 .../org/gradle/test/javaProject/Production6.java   |    0
 .../org/gradle/test/javaProject/Production7.java   |    0
 .../org/gradle/test/javaProject/Production8.java   |    0
 .../org/gradle/test/javaProject/Production9.java   |    0
 .../gradle/test/javaProject/productionResource.xml |    0
 .../java/org/gradle/test/javaProject/Test1.java    |    0
 .../java/org/gradle/test/javaProject/Test10.java   |    0
 .../java/org/gradle/test/javaProject/Test2.java    |    0
 .../java/org/gradle/test/javaProject/Test3.java    |    0
 .../java/org/gradle/test/javaProject/Test4.java    |    0
 .../java/org/gradle/test/javaProject/Test5.java    |    0
 .../java/org/gradle/test/javaProject/Test6.java    |    0
 .../java/org/gradle/test/javaProject/Test7.java    |    0
 .../java/org/gradle/test/javaProject/Test8.java    |    0
 .../java/org/gradle/test/javaProject/Test9.java    |    0
 .../org/gradle/test/javaProject/testResource.xml   |    0
 .../shared/settings.gradle                         |    2 +-
 .../gradle/api/plugins/sonar/SonarAnalyze.groovy   |    2 +-
 .../gradle/api/plugins/sonar/SonarPlugin.groovy    |   17 +-
 .../api/sonar/runner/SonarRunnerPlugin.groovy      |   39 +-
 .../api/plugins/sonar/SonarAnalyzeTest.groovy      |    2 +-
 .../api/plugins/sonar/SonarPluginTest.groovy       |   27 +-
 .../api/sonar/runner/SonarRunnerPluginTest.groovy  |   38 +-
 .../tooling/AutoTestedSamplesToolingApiTest.groovy |    5 +-
 .../ConcurrentToolingApiIntegrationSpec.groovy     |    4 +-
 .../SamplesToolingApiIntegrationTest.groovy        |   44 +-
 .../ToolingApiClasspathIntegrationTest.groovy      |    9 +-
 .../tooling/ToolingApiIntegrationTest.groovy       |   23 +-
 .../tooling/ToolingApiRemoteIntegrationTest.groovy |   25 +-
 ...lingApiUnsupportedVersionIntegrationTest.groovy |   62 +
 .../tooling/fixture/ConfigurableOperation.groovy   |    9 +-
 .../fixture/ExternalToolingApiDistribution.groovy  |   18 +-
 .../tooling/fixture/IncludeAllPermutations.java    |   23 -
 .../tooling/fixture/MaxTargetGradleVersion.java    |   25 -
 .../tooling/fixture/MinTargetGradleVersion.java    |   25 -
 .../tooling/fixture/MinToolingApiVersion.java      |   25 -
 .../tooling/fixture/TargetGradleVersion.java       |   31 +
 .../TestClasspathToolingApiDistribution.groovy     |    7 +-
 .../integtests/tooling/fixture/ToolingApi.groovy   |   36 +-
 .../ToolingApiCompatibilitySuiteRunner.groovy      |   79 +-
 .../tooling/fixture/ToolingApiDistribution.groovy  |    6 +-
 .../fixture/ToolingApiDistributionResolver.groovy  |   37 +-
 .../tooling/fixture/ToolingApiSpecification.groovy |   31 +-
 .../tooling/fixture/ToolingApiVersion.java         |   31 +
 .../m3/ToolingApiLoggingCrossVersionSpec.groovy    |  103 +
 ...piEclipseLinkedResourcesCrossVersionSpec.groovy |   11 +-
 ...ngApiEclipseMinimalModelCrossVersionSpec.groovy |    4 +-
 ...EclipseModelWithFlatRepoCrossVersionSpec.groovy |    4 +-
 ...ToolingApiBuildExecutionCrossVersionSpec.groovy |    8 +-
 ...ildableEclipseModelFixesCrossVersionSpec.groovy |    8 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |    6 +-
 .../ToolingApiGradleProjectCrossVersionSpec.groovy |    6 +-
 ...orsProjectCustomizationsCrossVersionSpec.groovy |    8 +-
 .../m5/ToolingApiIdeaModelCrossVersionSpec.groovy  |    8 +-
 .../m5/ToolingApiModelCrossVersionSpec.groovy      |   10 +-
 ...ReceivingStandardStreamsCrossVersionSpec.groovy |    8 +-
 ...UnsupportedModelFeedbackCrossVersionSpec.groovy |   38 +
 .../BuildEnvironmentModelCrossVersionSpec.groovy   |    8 +-
 .../ConsumingStandardInputCrossVersionSpec.groovy  |    8 +-
 ...adlePropertiesToolingApiCrossVersionSpec.groovy |   72 -
 .../m8/JavaConfigurabilityCrossVersionSpec.groovy  |    8 +-
 ...rictLongRunningOperationCrossVersionSpec.groovy |   25 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |   10 +-
 .../m8/ToolingApiLoggingCrossVersionSpec.groovy    |   67 +-
 .../m8/UnknownModelFeedbackCrossVersionSpec.groovy |   42 -
 ...sionOnlyBuildEnvironmentCrossVersionSpec.groovy |   10 +-
 .../m9/DaemonErrorFeedbackCrossVersionSpec.groovy  |   10 +-
 ...adlePropertiesToolingApiCrossVersionSpec.groovy |   72 +
 .../M9JavaConfigurabilityCrossVersionSpec.groovy   |   10 +-
 ...singCommandLineArgumentsCrossVersionSpec.groovy |   13 +-
 .../r112/BuildInvocationsCrossVersionSpec.groovy   |  351 ++
 .../r112/FetchAllTaskSelectorsBuildAction.java     |   43 +
 .../r112/FetchTaskSelectorsBuildAction.java        |   39 +
 .../tooling/r112/FetchTasksBuildAction.java        |   46 +
 .../r112/PublicationsCrossVersionSpec.groovy       |  204 +
 .../r112/TaskDisplayNameCrossVersionSpec.groovy    |   50 +
 .../r112/TestFilteringCrossVersionSpec.groovy      |   48 +
 .../ToolingApiDeprecationsCrossVersionSpec.groovy  |  167 +
 .../r112/UserHomeDirCrossVersionSpec.groovy        |   47 +
 .../DependencyMetaDataCrossVersionSpec.groovy      |    8 +-
 .../r12rc1/BuildModelCrossVersionSpec.groovy       |    8 +-
 .../ProjectOutcomesModuleCrossVersionSpec.groovy   |    8 +-
 ...pportedOperationFeedbackCrossVersionSpec.groovy |   10 +-
 ...ApiInitScriptCrossVersionIntegrationTest.groovy |    4 +-
 ...ningCommandLineArgumentsCrossVersionSpec.groovy |    8 +-
 ...ApiConfigurationOnDemandCrossVersionSpec.groovy |    8 +-
 .../gradle/integtests/tooling/r16/CustomModel.java |   31 +
 .../r16/CustomToolingModelCrossVersionSpec.groovy  |   81 +
 ...knownCustomModelFeedbackCrossVersionSpec.groovy |   58 +
 .../integtests/tooling/r18/BrokenAction.java       |   29 +
 .../tooling/r18/BuildActionCrossVersionSpec.groovy |  104 +
 .../r18/BuildScriptModelCrossVersionSpec.groovy    |   94 +
 .../gradle/integtests/tooling/r18/CustomModel.java |   27 +
 .../integtests/tooling/r18/FetchCustomModel.java   |   31 +
 .../integtests/tooling/r18/FetchIdeaModel.java     |   27 +
 .../integtests/tooling/r18/FetchUnknownModel.java  |   32 +
 .../r18/GradleBuildModelCrossVersionSpec.groovy    |   77 +
 .../gradle/integtests/tooling/r18/NullAction.java  |   26 +
 .../r18/ProjectLevelModelCrossVersionSpec.groovy   |  111 +
 .../r18/UseGradleBuildToFetchProjectModel.java     |   37 +
 .../r18/UseOtherTypesToFetchProjectModel.java      |   56 +
 .../main/java/org/gradle/tooling/BuildAction.java  |   41 +
 .../org/gradle/tooling/BuildActionExecuter.java    |   60 +
 .../tooling/BuildActionFailureException.java       |   31 +
 .../java/org/gradle/tooling/BuildController.java   |  114 +
 .../java/org/gradle/tooling/BuildException.java    |    4 +-
 .../java/org/gradle/tooling/BuildLauncher.java     |   42 +-
 .../gradle/tooling/GradleConnectionException.java  |    2 +
 .../org/gradle/tooling/LongRunningOperation.java   |   26 +-
 .../main/java/org/gradle/tooling/ModelBuilder.java |   29 +-
 .../java/org/gradle/tooling/ProjectConnection.java |   63 +-
 .../org/gradle/tooling/UnknownModelException.java  |    4 +
 .../tooling/UnsupportedVersionException.java       |    2 +
 .../UnsupportedBuildArgumentException.java         |    6 +-
 .../tooling/internal/adapter/CollectionMapper.java |   50 +
 .../internal/adapter/CompatibleIntrospector.java   |   76 +
 .../tooling/internal/adapter/MethodInvocation.java |   79 +
 .../tooling/internal/adapter/MethodInvoker.java    |   21 +
 .../internal/adapter/NoOpMethodInvoker.java        |   24 +
 .../internal/adapter/ProtocolToModelAdapter.java   |  496 +++
 .../internal/adapter/SourceObjectMapping.java      |   28 +
 .../internal/adapter/TargetTypeProvider.java       |   26 +
 .../internal/build/DefaultBuildEnvironment.java    |   19 +-
 .../build/VersionOnlyBuildEnvironment.java         |   19 +-
 .../consumer/AbstractLongRunningOperation.java     |   77 +
 .../internal/consumer/BlockingResultHandler.java   |   16 +-
 .../internal/consumer/ConnectionFactory.java       |   24 +-
 .../internal/consumer/ConnectionParameters.java    |    2 +-
 .../internal/consumer/ConnectorServices.java       |   13 +-
 .../consumer/DefaultBuildActionExecuter.java       |   64 +
 .../internal/consumer/DefaultBuildLauncher.java    |  121 +-
 .../consumer/DefaultConnectionParameters.java      |  120 +-
 .../internal/consumer/DefaultGradleConnector.java  |   21 +-
 .../internal/consumer/DefaultModelBuilder.java     |  110 +-
 .../consumer/DefaultProjectConnection.java         |   40 +-
 .../tooling/internal/consumer/Distribution.java    |    4 +-
 .../internal/consumer/DistributionFactory.java     |   19 +-
 .../tooling/internal/consumer/LoggingProvider.java |    3 -
 .../tooling/internal/consumer/ModelProvider.java   |   80 -
 .../internal/consumer/SynchronizedLogging.java     |    4 +-
 .../internal/consumer/async/AsyncConnection.java   |   30 -
 .../async/AsyncConsumerActionExecutor.java         |   39 +
 .../consumer/async/DefaultAsyncConnection.java     |   88 -
 .../async/DefaultAsyncConsumerActionExecutor.java  |   66 +
 .../connection/AbstractConsumerConnection.java     |   17 +-
 .../consumer/connection/AbstractModelProducer.java |   33 +
 .../AbstractPost12ConsumerConnection.java          |   39 +
 .../AbstractPre12ConsumerConnection.java           |   57 +
 .../connection/ActionAwareConsumerConnection.java  |   61 +
 .../consumer/connection/AdaptedConnection.java     |   55 -
 .../BuildActionRunnerBackedConsumerConnection.java |   80 +-
 .../connection/BuildControllerAdapter.java         |   81 +
 .../BuildInvocationsAdapterProducer.java           |   49 +
 ...ConnectionVersion4BackedConsumerConnection.java |  175 +
 .../consumer/connection/ConsumerAction.java        |   25 +
 .../connection/ConsumerActionExecutor.java         |   29 +
 .../consumer/connection/ConsumerConnection.java    |    8 +-
 .../connection/ConsumerConnectionMetadata.java     |   44 -
 .../connection/GradleBuildAdapterProducer.java     |   44 +
 ...InternalConnectionBackedConsumerConnection.java |   74 +-
 .../consumer/connection/LazyConnection.java        |  143 -
 .../connection/LazyConsumerActionExecutor.java     |  115 +
 .../connection/LoggingInitializerConnection.java   |   54 -
 .../LoggingInitializerConsumerActionExecutor.java  |   46 +
 .../ModelBuilderBackedConsumerConnection.java      |  107 +
 .../ModelBuilderBackedModelProducer.java           |   55 +
 .../consumer/connection/ModelProducer.java         |   23 +
 .../connection/NoToolingApiConnection.java         |   49 +
 .../connection/ProgressLoggingConnection.java      |  102 -
 .../ProgressLoggingConsumerActionExecutor.java     |   85 +
 .../converters/BuildInvocationsConverter.java      |   86 +
 .../converters/ConsumerTargetTypeProvider.java     |   47 +
 .../consumer/converters/GradleBuildConverter.java  |   60 +
 .../converters/GradleProjectConverter.java         |   23 +-
 .../converters/GradleProjectMixInHandler.java      |   30 +
 .../GradleTaskDisplayNameMixInHandler.java         |   31 +
 .../converters/PropertyHandlerFactory.java         |   44 +
 .../consumer/converters/TaskNameComparator.java    |   54 +
 .../converters/TaskPropertyHandlerFactory.java     |   44 +
 .../loader/CachingToolingImplementationLoader.java |    6 +-
 .../loader/DefaultToolingImplementationLoader.java |   52 +-
 .../SynchronizedToolingImplementationLoader.java   |    7 +-
 .../loader/ToolingImplementationLoader.java        |    4 +-
 .../parameters/ConsumerConnectionParameters.java   |   36 -
 .../parameters/ConsumerOperationParameters.java    |  140 +-
 .../protocoladapter/ConsumerPropertyHandler.java   |   41 -
 .../consumer/protocoladapter/MethodInvocation.java |   76 -
 .../consumer/protocoladapter/MethodInvoker.java    |   21 -
 .../protocoladapter/ProtocolToModelAdapter.java    |  358 --
 .../protocoladapter/TargetTypeProvider.java        |   55 -
 .../internal/consumer/versioning/ModelMapping.java |  118 +-
 .../consumer/versioning/VersionDetails.java        |   54 +-
 .../eclipse/DefaultEclipseExternalDependency.java  |   54 -
 .../eclipse/DefaultEclipseLinkedResource.java      |   55 -
 .../internal/eclipse/DefaultEclipseProject.java    |  134 -
 .../eclipse/DefaultEclipseProjectDependency.java   |   44 -
 .../eclipse/DefaultEclipseSourceDirectory.java     |   44 -
 .../internal/eclipse/DefaultEclipseTask.java       |   56 -
 .../internal/gradle/BasicGradleProject.java        |   55 +
 .../internal/gradle/BasicGradleTaskSelector.java   |   76 +
 .../internal/gradle/DefaultBuildInvocations.java   |   46 +
 .../gradle/DefaultConvertedGradleProject.java      |   58 +
 .../internal/gradle/DefaultGradleBuild.java        |   43 +
 .../gradle/DefaultGradleModuleVersion.java         |    3 -
 .../internal/gradle/DefaultGradleProject.java      |  102 +-
 .../internal/gradle/DefaultGradleProjectTask.java  |   30 +
 .../internal/gradle/DefaultGradlePublication.java  |   41 +
 .../internal/gradle/DefaultGradleScript.java       |   34 +
 .../tooling/internal/gradle/DefaultGradleTask.java |   41 +-
 .../gradle/DefaultProjectPublications.java         |   33 +
 .../internal/gradle/GradleProjectIdentity.java     |   21 +
 .../internal/gradle/PartialBasicGradleProject.java |   69 +
 .../internal/gradle/PartialGradleProject.java      |   95 +
 .../internal/gradle/TaskListingLaunchable.java     |   23 +
 .../internal/idea/DefaultIdeaCompilerOutput.java   |   68 -
 .../internal/idea/DefaultIdeaContentRoot.java      |   83 -
 .../internal/idea/DefaultIdeaDependencyScope.java  |   67 -
 .../internal/idea/DefaultIdeaLanguageLevel.java    |   85 -
 .../tooling/internal/idea/DefaultIdeaModule.java   |  125 -
 .../internal/idea/DefaultIdeaModuleDependency.java |   69 -
 .../tooling/internal/idea/DefaultIdeaProject.java  |  117 -
 .../DefaultIdeaSingleEntryLibraryDependency.java   |  103 -
 .../internal/idea/DefaultIdeaSourceDirectory.java  |   46 -
 .../outcomes/DefaultGradleBuildOutcome.java        |   46 -
 .../outcomes/DefaultGradleFileBuildOutcome.java    |   42 -
 .../internal/outcomes/DefaultProjectOutcomes.java  |   80 -
 .../internal/protocol/BuildActionRunner.java       |   16 +
 .../internal/protocol/BuildExceptionVersion1.java  |    5 +-
 .../protocol/BuildOperationParametersVersion1.java |   23 +
 .../tooling/internal/protocol/BuildParameters.java |    4 +-
 .../internal/protocol/BuildParametersVersion1.java |    7 +
 .../internal/protocol/ConfigurableConnection.java  |   14 +
 .../internal/protocol/ConnectionParameters.java    |    2 +-
 .../internal/protocol/ConnectionVersion4.java      |   59 +-
 .../protocol/InternalBasicIdeaProject.java         |    4 +-
 .../internal/protocol/InternalBuildAction.java     |   36 +
 .../protocol/InternalBuildActionExecutor.java      |   51 +
 .../InternalBuildActionFailureException.java       |   30 +
 .../internal/protocol/InternalBuildController.java |   53 +
 .../protocol/InternalBuildEnvironment.java         |    3 +-
 .../internal/protocol/InternalConnection.java      |   17 +-
 .../internal/protocol/InternalGradleProject.java   |    2 +
 .../internal/protocol/InternalIdeaProject.java     |    2 +
 .../internal/protocol/InternalLaunchable.java      |   29 +
 .../internal/protocol/InternalProjectOutcomes.java |    7 +-
 .../protocol/InternalProtocolInterface.java        |   12 +-
 .../internal/protocol/InternalTestModel.java       |   24 -
 .../InternalUnsupportedModelException.java         |   31 +
 .../LongRunningOperationParametersVersion1.java    |    8 +
 .../tooling/internal/protocol/ModelBuilder.java    |   51 +
 .../tooling/internal/protocol/ModelIdentifier.java |   42 +
 .../tooling/internal/protocol/ProjectVersion3.java |   17 +
 .../eclipse/EclipseLinkedResourceVersion1.java     |    2 -
 .../protocol/eclipse/EclipseProjectVersion3.java   |    2 +
 .../HierarchicalEclipseProjectVersion1.java        |    2 +
 .../internal/reflect/CompatibleIntrospector.java   |   71 -
 .../org/gradle/tooling/model/BuildableElement.java |    1 +
 .../java/org/gradle/tooling/model/Element.java     |    2 +
 .../gradle/tooling/model/ExternalDependency.java   |    2 +-
 .../gradle/tooling/model/GradleModuleVersion.java  |    2 +-
 .../org/gradle/tooling/model/GradleProject.java    |   21 +-
 .../java/org/gradle/tooling/model/GradleTask.java  |    1 +
 .../gradle/tooling/model/HierarchicalElement.java  |    2 +
 .../java/org/gradle/tooling/model/Launchable.java  |   47 +
 .../main/java/org/gradle/tooling/model/Model.java  |    1 +
 .../main/java/org/gradle/tooling/model/Task.java   |   16 +-
 .../org/gradle/tooling/model/TaskSelector.java     |   34 +
 .../tooling/model/build/BuildEnvironment.java      |    7 +-
 .../tooling/model/build/GradleEnvironment.java     |    2 +
 .../tooling/model/build/JavaEnvironment.java       |    4 +
 .../gradle/tooling/model/build/package-info.java   |    2 +-
 .../model/eclipse/EclipseLinkedResource.java       |   10 +-
 .../tooling/model/eclipse/EclipseProject.java      |   15 +-
 .../gradle/tooling/model/eclipse/EclipseTask.java  |    5 +-
 .../model/eclipse/HierarchicalEclipseProject.java  |    5 +
 .../gradle/tooling/model/eclipse/package-info.java |    2 +-
 .../tooling/model/gradle/BasicGradleProject.java   |   69 +
 .../tooling/model/gradle/BuildInvocations.java     |   52 +
 .../gradle/tooling/model/gradle/GradleBuild.java   |   42 +
 .../tooling/model/gradle/GradlePublication.java    |   35 +
 .../gradle/tooling/model/gradle/GradleScript.java  |   40 +
 .../tooling/model/gradle/ProjectPublications.java  |   34 +
 .../gradle/tooling/model/gradle/package-info.java  |   20 +
 .../tooling/model/idea/BasicIdeaProject.java       |    2 +
 .../gradle/tooling/model/idea/IdeaDependency.java  |    2 +-
 .../org/gradle/tooling/model/idea/IdeaModule.java  |    9 +-
 .../org/gradle/tooling/model/idea/IdeaProject.java |    7 +-
 .../gradle/tooling/model/idea/package-info.java    |    2 +-
 .../gradle/tooling/model/internal/Exceptions.java  |   41 +-
 .../ProjectSensitiveToolingModelBuilder.java       |   41 +
 .../gradle/tooling/model/internal/TestModel.java   |   26 -
 .../org/gradle/tooling/model/package-info.java     |    2 +-
 .../tooling/fixture/GradleVersionSpecTest.groovy   |  146 +
 .../internal/adapter/CollectionMapperTest.groovy   |   49 +
 .../adapter/CompatibleIntrospectorTest.groovy      |   79 +
 .../adapter/ProtocolToModelAdapterTest.groovy      |  501 +++
 .../internal/consumer/ConnectionFactoryTest.groovy |   19 +-
 .../internal/consumer/ConnectorServicesTest.groovy |    3 -
 .../consumer/DefaultBuildActionExecuterTest.groovy |  164 +
 .../consumer/DefaultBuildLauncherTest.groovy       |  281 +-
 .../consumer/DefaultGradleConnectorTest.groovy     |   18 +
 .../consumer/DefaultModelBuilderTest.groovy        |  159 +-
 .../consumer/DefaultProjectConnectionTest.groovy   |   30 +-
 .../consumer/DistributionFactoryTest.groovy        |   56 +-
 .../consumer/ProtocolToModelAdapterTest.groovy     |   68 -
 .../consumer/SynchronizedLoggingTest.groovy        |    3 -
 .../DefaultAsyncConsumerActionExecutorTest.groovy  |   81 +
 .../ActionAwareConsumerConnectionTest.groovy       |   77 +
 .../connection/AdaptedConnectionTest.groovy        |   50 -
 ...ActionRunnerBackedConsumerConnectionTest.groovy |  115 +-
 .../connection/BuildControllerAdapterTest.groovy   |  122 +
 ...tionVersion4BackedConsumerConnectionTest.groovy |  288 ++
 .../GradleBuildAdapterProducerTest.groovy          |   88 +
 ...alConnectionBackedConsumerConnectionTest.groovy |  112 +-
 .../consumer/connection/LazyConnectionTest.groovy  |  107 -
 .../LazyConsumerActionExecutorTest.groovy          |  102 +
 ...ModelBuilderBackedConsumerConnectionTest.groovy |  186 +
 .../ModelBuilderBackedModelProducerTest.groovy     |   74 +
 .../ProgressLoggingConnectionTest.groovy           |   55 -
 ...rogressLoggingConsumerActionExecutorTest.groovy |   55 +
 .../BuildInvocationsConverterTest.groovy           |  101 +
 .../converters/GradleBuildConverterTest.groovy     |   89 +
 .../converters/TaskNameComparatorTest.groovy       |   41 +
 .../CachingToolingImplementationLoaderTest.groovy  |   19 +-
 .../DefaultToolingImplementationLoaderTest.groovy  |  104 +-
 ...chronizedToolingImplementationLoaderTest.groovy |    7 +-
 .../ConsumerOperationParametersTest.groovy         |   17 +-
 .../ProtocolToModelAdapterTest.groovy              |  271 --
 .../consumer/versioning/ModelMappingTest.groovy    |  115 +
 .../eclipse/DefaultEclipseProjectTest.groovy       |   27 -
 .../gradle/DefaultGradleProjectTest.groovy         |   12 +-
 .../reflect/CompatibleIntrospectorTest.groovy      |   59 -
 .../tooling/fixture/GradleVersionSpec.java         |   83 +
 subprojects/tooling-api/tooling-api.gradle         |    9 +-
 .../integtests/FavoritesIntegrationTest.java       |    2 -
 .../integtests/LiveOutputIntegrationTest.groovy    |   16 +-
 ...projectProjectAndTaskListIntegrationTest.groovy |    3 -
 .../gradle/foundation/CommandLineAssistant.java    |    2 -
 .../org/gradle/foundation/PathParserPortion.java   |    2 -
 .../org/gradle/foundation/ProjectConverter.java    |    2 -
 .../java/org/gradle/foundation/ProjectView.java    |    2 -
 .../main/java/org/gradle/foundation/TaskView.java  |    2 -
 .../gradle/foundation/common/ListReorderer.java    |    2 -
 .../org/gradle/foundation/common/ObserverLord.java |    3 -
 .../gradle/foundation/common/ReorderableList.java  |    3 -
 .../gradle/foundation/ipc/basic/ClientProcess.java |    2 -
 .../gradle/foundation/ipc/basic/ExecutionInfo.java |    4 -
 .../gradle/foundation/ipc/basic/MessageObject.java |    2 -
 .../foundation/ipc/basic/ObjectSocketWrapper.java  |    2 -
 .../ipc/basic/ProcessLauncherServer.java           |    2 -
 .../org/gradle/foundation/ipc/basic/Server.java    |    2 -
 .../ipc/gradle/AbstractGradleServerProtocol.java   |    4 +-
 .../gradle/ExecuteGradleCommandClientProtocol.java |    2 -
 .../gradle/ExecuteGradleCommandServerProtocol.java |    2 -
 .../gradle/foundation/ipc/gradle/IPCUtilities.java |    2 -
 .../ipc/gradle/KillGradleClientProtocol.java       |    2 -
 .../ipc/gradle/KillGradleServerProtocol.java       |    2 -
 .../foundation/ipc/gradle/ProtocolConstants.java   |    2 -
 .../ipc/gradle/TaskListClientProtocol.java         |    2 -
 .../ipc/gradle/TaskListServerProtocol.java         |    2 -
 .../org/gradle/foundation/output/FileLink.java     |    2 -
 .../foundation/output/FileLinkDefinitionLord.java  |    2 -
 .../gradle/foundation/output/LiveOutputParser.java |    2 -
 .../org/gradle/foundation/output/OutputParser.java |    2 -
 .../definitions/ExtensionFileLinkDefinition.java   |    2 -
 .../output/definitions/FileLinkDefinition.java     |    2 -
 .../OptionalLineNumberFileLinkDefinition.java      |    2 -
 .../definitions/PrefixedFileLinkDefinition.java    |    2 -
 .../definitions/TestReportFileLinkDefinition.java  |    2 -
 .../gradle/foundation/queue/ExecutionQueue.java    |   18 +-
 .../visitors/AllProjectsAndTasksVisitor.java       |   10 -
 .../visitors/TaskTreePopulationVisitor.java        |   17 +-
 .../visitors/UniqueNameProjectAndTaskVisitor.java  |   14 +-
 .../CommandLineArgumentAlteringListener.java       |    2 -
 .../gradleplugin/foundation/DOM4JSerializer.java   |    2 -
 .../gradleplugin/foundation/Dom4JUtility.java      |    1 -
 .../foundation/ExtensionFileFilter.java            |    2 -
 .../gradleplugin/foundation/GradlePluginLord.java  |  129 +-
 .../foundation/favorites/FavoriteTask.java         |    2 -
 .../foundation/favorites/FavoritesEditor.java      |    2 -
 .../favorites/FavoritesSerializable.java           |    5 +-
 .../filters/AllowAllProjectAndTaskFilter.java      |    2 -
 .../foundation/filters/BasicFilterEditor.java      |    2 -
 .../filters/BasicProjectAndTaskFilter.java         |    2 -
 .../foundation/filters/ProjectAndTaskFilter.java   |    3 -
 .../foundation/request/AbstractRequest.java        |   10 +-
 .../foundation/request/ExecutionRequest.java       |    6 +-
 .../foundation/request/RefreshTaskListRequest.java |    6 +-
 .../gradleplugin/foundation/request/Request.java   |    2 -
 .../foundation/runner/GradleRunner.java            |    2 -
 .../foundation/search/BasicTextSearchCriteria.java |    2 -
 .../foundation/search/TextBlockSearchEditor.java   |    3 -
 .../foundation/settings/DOM4JSettingsNode.java     |    2 -
 .../foundation/settings/SettingsNode.java          |    2 -
 .../foundation/settings/SettingsSerializable.java  |    3 -
 .../userinterface/AlternateUIInteraction.java      |    3 -
 .../swing/common/BorderlessImageButton.java        |    2 -
 .../swing/common/BorderlessImageToggleButton.java  |    3 -
 .../swing/common/BorderlessUtility.java            |    2 -
 .../swing/common/PreferencesAssistant.java         |    2 -
 .../userinterface/swing/common/SearchPanel.java    |   21 +-
 .../swing/common/TextPaneSearchInteraction.java    |    4 +-
 .../swing/generic/AbstractGradleUIInstance.java    |    3 -
 .../userinterface/swing/generic/BasicGradleUI.java |   10 -
 .../swing/generic/DualPaneUIInstance.java          |    2 -
 .../swing/generic/MainGradlePanel.java             |   14 +-
 .../userinterface/swing/generic/OutputPanel.java   |   26 +-
 .../swing/generic/OutputPanelLord.java             |    9 +-
 .../userinterface/swing/generic/OutputTab.java     |   16 +-
 .../swing/generic/SinglePaneUIInstance.java        |    2 -
 .../SwingAddMultipleFavoritesInteraction.java      |    2 -
 .../generic/SwingEditFavoriteInteraction.java      |   10 +-
 .../swing/generic/SwingExportInteraction.java      |    8 +-
 .../swing/generic/SwingImportInteraction.java      |    2 -
 .../swing/generic/TaskTreeComponent.java           |    6 +-
 .../userinterface/swing/generic/Utility.java       |   18 +-
 .../generic/filter/AbstractFilterEditorPanel.java  |    2 -
 .../generic/filter/ProjectAndTaskFilterDialog.java |    2 -
 .../swing/generic/tabs/CommandLineTab.java         |    2 -
 .../swing/generic/tabs/FavoriteTasksTab.java       |    2 -
 .../swing/generic/tabs/GradleTab.java              |    3 -
 .../userinterface/swing/generic/tabs/SetupTab.java |    2 -
 .../swing/generic/tabs/TaskTreeTab.java            |   13 +-
 .../swing/standalone/Application.java              |    2 -
 .../swing/standalone/BlockingApplication.java      |    2 -
 .../openapi/wrappers/RunnerWrapperFactory.java     |    3 -
 .../gradle/openapi/wrappers/UIWrapperFactory.java  |    2 -
 .../foundation/GradleInterfaceWrapperVersion1.java |    2 -
 .../foundation/GradleInterfaceWrapperVersion2.java |    2 -
 .../wrappers/foundation/ProjectWrapper.java        |    2 -
 .../foundation/RequestObserverWrapper.java         |    2 -
 .../wrappers/foundation/RequestWrapper.java        |    2 -
 .../openapi/wrappers/foundation/TaskWrapper.java   |    2 -
 .../foundation/favorites/FavoriteTaskWrapper.java  |    2 -
 .../favorites/FavoritesEditorWrapper.java          |    2 -
 .../runner/GradleRunnerInteractionWrapper.java     |    2 -
 .../wrappers/runner/GradleRunnerWrapper.java       |    2 -
 .../wrappers/ui/AbstractOpenAPIUIWrapper.java      |    3 -
 .../ui/AlternateUIInteractionVersionWrapper.java   |    2 -
 ...CommandLineArgumentAlteringListenerWrapper.java |    2 -
 .../openapi/wrappers/ui/DualPaneUIWrapper.java     |    2 -
 .../wrappers/ui/GradleTabVersionWrapper.java       |    2 -
 .../openapi/wrappers/ui/OutputObserverWrapper.java |    2 -
 .../openapi/wrappers/ui/OutputUILordWrapper.java   |    2 -
 .../wrappers/ui/SettingsNodeVersionWrapper.java    |    2 -
 .../openapi/wrappers/ui/SinglePaneUIWrapper.java   |    2 -
 .../org/gradle/foundation/BuildInformation.java    |    7 +-
 .../gradle/foundation/CommandLineParsingTest.java  |    2 -
 .../gradle/foundation/DOM4JSettingsNodeTest.java   |    2 -
 .../org/gradle/foundation/FavoritesTest.java       |    2 -
 .../org/gradle/foundation/FileLinkTests.java       |    1 -
 .../groovy/org/gradle/foundation/FilterTest.java   |    2 -
 .../gradle/foundation/LiveOutputParserTests.java   |    2 -
 .../groovy/org/gradle/foundation/TestUtility.java  |    8 +-
 .../foundation/TextBlockSearchEditorTests.java     |    2 -
 subprojects/ui/ui.gradle                           |    2 +-
 .../WrapperConcurrentDownloadTest.groovy           |   89 +
 .../WrapperGenerationIntegrationTest.groovy        |   49 +
 .../integtests/WrapperHttpIntegrationTest.groovy   |  148 +
 .../WrapperProjectIntegrationTest.groovy           |  125 +-
 .../org/gradle/integtests/WrapperSetup.groovy      |   28 +
 .../WrapperUserHomeIntegrationTest.groovy          |   72 +
 .../org/gradle/wrapper/BootstrapMainStarter.java   |    3 -
 .../src/main/java/org/gradle/wrapper/Download.java |    7 -
 .../gradle/wrapper/ExclusiveFileAccessManager.java |   95 +
 .../org/gradle/wrapper/GradleUserHomeLookup.java   |   36 +
 .../java/org/gradle/wrapper/GradleWrapperMain.java |   51 +-
 .../main/java/org/gradle/wrapper/IDownload.java    |    3 -
 .../src/main/java/org/gradle/wrapper/Install.java  |  111 +-
 .../java/org/gradle/wrapper/PathAssembler.java     |    3 -
 .../gradle/wrapper/SystemPropertiesHandler.java    |    3 -
 .../org/gradle/wrapper/WrapperConfiguration.java   |   21 -
 .../java/org/gradle/wrapper/WrapperExecutor.java   |    3 -
 .../groovy/org/gradle/wrapper/DownloadTest.groovy  |    3 -
 .../groovy/org/gradle/wrapper/InstallTest.groovy   |   97 +-
 .../org/gradle/wrapper/PathAssemblerTest.java      |    3 -
 .../wrapper/SystemPropertiesHandlerTest.groovy     |    3 -
 subprojects/wrapper/wrapper.gradle                 |    3 +-
 version.txt                                        |    2 +-
 5736 files changed, 219741 insertions(+), 78490 deletions(-)

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



More information about the pkg-java-commits mailing list