[gradle] 01/02: Merge tag 'debian/3.2.1-1' into jessie-backports

Andreas Tille tille at debian.org
Sun Jun 25 08:11:42 UTC 2017


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

tille pushed a commit to branch jessie-backports
in repository gradle.

commit 8b64645adf7c4bb85af4b8f0848740a1601b2bfc
Merge: cdf2f22 cf3c881
Author: Andreas Tille <tille at debian.org>
Date:   Sun Jun 25 10:07:47 2017 +0200

    Merge tag 'debian/3.2.1-1' into jessie-backports
    
    gradle Debian release 3.2.1-1

 build.gradle                                       |  173 +-
 buildSrc/build.gradle                              |   30 +-
 buildSrc/src/main/groovy/org/gradle/ShadedJar.java |  364 ++
 .../src/main/groovy/org/gradle/build/JarJar.groovy |   65 -
 .../main/groovy/org/gradle/build/JarJarJar.groovy  |   86 -
 .../org/gradle/build/ReleasedVersions.groovy       |   31 +-
 .../build/ReproduciblePropertiesWriter.groovy      |   49 +
 .../build/docs/AssembleSamplesDocTask.groovy       |   10 +-
 .../org/gradle/build/docs/Docbook2Xhtml.groovy     |    7 +-
 .../gradle/build/docs/ExtractSnippetsTask.groovy   |   23 +-
 .../gradle/build/docs/SampleLayoutHandler.groovy   |  141 +-
 .../build/docs/UserGuideSectionVerifier.groovy     |  114 +
 .../build/docs/UserGuideTransformTask.groovy       |    9 +-
 .../docs/dsl/docbook/AssembleDslDocTask.groovy     |   13 +
 .../build/docs/dsl/links/ClassLinkMetaData.java    |    5 +-
 .../docs/dsl/source/ExtractDslMetaDataTask.groovy  |   24 +-
 .../dsl/source/GenerateDefaultImportsTask.java     |   47 +-
 .../build/docs/dsl/source/TypeNameResolver.java    |    9 +-
 .../docs/model/SimpleClassMetaDataRepository.java  |   13 +-
 .../org/gradle/cleanup/EmptyDirectoryCheck.groovy  |   54 +
 .../gradle/modules/ClasspathManifestPatcher.groovy |  100 +
 .../org/gradle/modules/ExcludeEntryPatcher.groovy  |   67 +
 .../generator/DependencyGenerator.groovy           |  120 -
 .../performance/generator/DependencyGraph.groovy   |   27 -
 .../performance/generator/MavenJarCreator.groovy   |   76 -
 .../performance/generator/MavenModule.groovy       |  162 -
 .../gradle/performance/generator/MavenPom.groovy   |   35 -
 .../performance/generator/MavenRepository.groovy   |   51 -
 .../gradle/performance/generator/MavenScope.groovy |   25 -
 .../performance/generator/RepositoryBuilder.groovy |   80 -
 .../performance/generator/TestProject.groovy       |   46 -
 .../generator/tasks/JvmProjectGeneratorTask.groovy |  123 -
 .../MonolithicNativeProjectGeneratorTask.groovy    |   64 -
 .../tasks/NativeProjectGeneratorTask.groovy        |   39 -
 .../generator/tasks/ProjectGeneratorTask.groovy    |  232 -
 .../org/gradle/plugins/classycle/Classycle.groovy  |  104 +
 .../plugins/classycle/ClassyclePlugin.groovy       |   54 +
 .../testing/DistributedPerformanceTest.groovy      |  306 ++
 .../org/gradle/testing/DistributionTest.java       |   25 +
 .../groovy/org/gradle/testing/IntegrationTest.java |   28 +
 .../groovy/org/gradle/testing/PerformanceTest.java |  117 +
 .../gradle/testing/ScenarioReportRenderer.groovy   |  100 +
 .../main/groovy/org/gradle/testing/SmokeTest.java  |   26 +
 .../main/groovy/org/gradle/testing/SoakTest.java   |   26 +
 .../generator/DependencyGenerator.groovy           |  120 +
 .../performance/generator/DependencyGraph.groovy   |   27 +
 .../performance/generator/MavenJarCreator.groovy   |   76 +
 .../performance/generator/MavenModule.groovy       |  163 +
 .../testing/performance/generator/MavenPom.groovy  |   35 +
 .../performance/generator/MavenRepository.groovy   |   51 +
 .../performance/generator/MavenScope.groovy        |   25 +
 .../performance/generator/RepositoryBuilder.groovy |   80 +
 .../performance/generator/TestProject.groovy       |   46 +
 .../tasks/AbstractProjectGeneratorTask.groovy      |  250 +
 .../generator/tasks/JvmProjectGeneratorTask.groovy |  124 +
 .../MonolithicNativeProjectGeneratorTask.groovy    |   80 +
 .../tasks/NativeProjectGeneratorTask.groovy        |   44 +
 .../NativeProjectWithDepsGeneratorTask.groovy      |  332 ++
 .../generator/tasks/ProjectGeneratorTask.groovy    |   49 +
 .../generator/tasks/RemoteProject.groovy           |   66 +
 .../org/gradle/testing/scenario-report-style.css   |   55 +
 .../build/docs/UserGuideSectionVerifierTest.groovy |  233 +
 .../docs/dsl/links/ClassLinkMetaDataTest.groovy    |   66 +
 .../dsl/source/ExtractDslMetaDataTaskTest.groovy   |    4 +
 .../model/SimpleClassMetaDataRepositoryTest.groovy |   17 +-
 .../gradle/cleanup/EmptyDirectoryCheckTest.groovy  |  117 +
 .../generator/DependencyGeneratorTest.groovy       |   48 -
 .../testing/ScenarioReportRendererTest.groovy      |   72 +
 .../generator/DependencyGeneratorTest.groovy       |   48 +
 .../resources/org/gradle/testing/TEST-sample.xml   |   42 +
 .../gradle/testing/sample-build-result-failure.xml |   43 +
 .../gradle/testing/sample-build-result-success.xml |   43 +
 config/checkstyle/checkstyle.xml                   |   13 +-
 config/checkstyle/suppressions.xml                 |   29 +-
 debian/.gitignore                                  |   25 +-
 debian/README.source                               |   15 +
 debian/additionalSrc/javascript/jquery.tipTip.js   |  191 +
 .../resources/all-released-versions.json           | 1387 ++++++
 debian/changelog                                   |  121 +-
 debian/compat                                      |    2 +-
 debian/control                                     |   61 +-
 debian/copyright                                   |   14 +-
 debian/generate_classpath.gradle                   |   24 -
 debian/generate_pom.gradle                         |   55 +-
 debian/gradle-doc.doc-base.gradle-dsl              |    8 +
 debian/gradle-doc.doc-base.gradle-groovydoc        |    9 -
 debian/gradle-doc.doc-base.gradle-javadoc          |    5 +-
 debian/gradle-doc.doc-base.gradle-release-notes    |    8 +
 debian/gradle-doc.doc-base.gradle-userguide        |    8 +
 debian/gradle-doc.install                          |    6 +-
 debian/gradle-doc.javadoc                          |    1 +
 debian/gradle-doc.lintian-overrides                |    2 +
 debian/gradle.1.md                                 |   66 +-
 debian/gradle.desktop                              |    6 +-
 debian/gradle.install                              |    4 +-
 debian/gradle.poms                                 |    4 +-
 debian/libgradle-core-java.links                   |    9 +-
 debian/libgradle-core-java.poms                    |   29 +-
 debian/libgradle-plugins-java.install              |    2 +-
 debian/libgradle-plugins-java.links                |   10 +-
 debian/libgradle-plugins-java.poms                 |   80 +-
 debian/maven.rules                                 |   24 +
 debian/patches/30_envjs.diff                       |   24 -
 debian/patches/33_scala_zinc.diff                  |   65 +-
 debian/patches/34_disable_code_quality.diff        |   67 +-
 .../Groovy_projects_depends_on_localGroovy.patch   |   15 +
 .../dependency-management_depends_on_testkit.patch |   11 +
 debian/patches/disable_Kotlin.patch                |   13 +
 debian/patches/disable_aws.diff                    |   58 +-
 debian/patches/disable_buildSrc_tests.patch        |   17 +
 debian/patches/disable_sonar.diff                  |   76 -
 debian/patches/disable_tests.diff                  |  532 --
 debian/patches/docs.diff                           |  102 +-
 debian/patches/drop_http-builder.patch             |  151 +
 debian/patches/drop_jmh-gradle-plugin.patch        |   16 +
 debian/patches/eclipse-aether.diff                 |   39 +-
 debian/patches/fix-classpath-annotation.patch      |   15 +
 debian/patches/generate_classpath.diff             |   18 -
 debian/patches/generate_pom.diff                   |   19 +-
 debian/patches/groovy-jar.patch                    |   32 +
 debian/patches/ivy-2.4.0.patch                     |   25 +-
 debian/patches/jcommander.diff                     |   32 +-
 debian/patches/jetty.diff                          |   17 -
 debian/patches/maven-3.3-compatibility.patch       |   45 +-
 debian/patches/nekohtml.diff                       |   11 +-
 debian/patches/new_APIs_in_3.0.patch               |   17 +
 debian/patches/relax_warnings.diff                 |    2 +-
 debian/patches/remove_timestamps.patch             |   31 +
 debian/patches/search_system_jar.diff              |   32 +-
 debian/patches/series                              |   18 +-
 debian/patches/upgrade-to-jetty9.patch             |  447 ++
 debian/patches/use_local_artifacts.diff            |  288 +-
 debian/rules                                       |   39 +-
 debian/source/lintian-overrides                    |    3 +
 debian/substituteDependencies.gradle               |   14 +
 debian/watch                                       |    4 +-
 gradle/buildReceipt.gradle                         |   44 +-
 gradle/buildReceiptInit.gradle                     |   20 -
 gradle/buildScanInit.gradle                        |   14 +
 gradle/buildScanUserData.gradle                    |   77 +
 gradle/buildSplits.gradle                          |  104 +-
 gradle/buildTagging.gradle                         |   27 +
 gradle/classycle.gradle                            |   48 +-
 gradle/codeQuality.gradle                          |   12 +-
 gradle/customM2Check.gradle                        |   34 +
 gradle/dependencies.gradle                         |   72 +-
 gradle/distributionTesting.gradle                  |  326 ++
 gradle/eclipse.gradle                              |   12 +-
 gradle/groovyProject.gradle                        |   65 +-
 gradle/idea.gradle                                 |   98 +-
 gradle/integTest.gradle                            |  256 +-
 gradle/java9.gradle                                |  205 +-
 gradle/jmh.gradle                                  |   37 +
 gradle/performanceTest.gradle                      |  306 ++
 gradle/publish.gradle                              |    4 -
 gradle/pullRequestBuild.gradle                     |   16 +-
 gradle/remoteHttpCacheInit.gradle                  |   20 +
 gradle/taskProperties.gradle                       |    9 +
 gradle/testFixtures.gradle                         |    5 -
 gradle/testGroupings.gradle                        |    2 +-
 gradle/versioning.gradle                           |   82 +-
 gradle/wrapper.gradle                              |   26 +-
 gradle/wrapper/gradle-wrapper.properties           |    5 +-
 gradlew                                            |   68 +-
 gradlew.bat                                        |   14 +-
 settings.gradle                                    |   15 +-
 subprojects/announce/announce.gradle               |    3 +-
 .../BuildAnnouncementsPluginIntegrationTest.groovy |   18 +-
 .../api/plugins/announce/AnnouncePlugin.groovy     |   30 -
 .../announce/AnnouncePluginExtension.groovy        |   95 -
 .../announce/BuildAnnouncementsPlugin.groovy       |   34 -
 .../announce/internal/AnnouncerFactory.groovy      |   22 -
 .../internal/AnnouncingBuildListener.groovy        |   87 -
 .../internal/DefaultAnnouncerFactory.groovy        |   79 -
 .../announce/internal/DefaultIconProvider.groovy   |   35 -
 .../api/plugins/announce/internal/Growl.groovy     |   21 -
 .../internal/GrowlNotifyBackedAnnouncer.groovy     |   49 -
 .../internal/IgnoreUnavailableAnnouncer.groovy     |   38 -
 .../plugins/announce/internal/NotifySend.groovy    |   51 -
 .../api/plugins/announce/internal/Snarl.groovy     |   78 -
 .../api/plugins/announce/internal/Twitter.groovy   |   62 -
 .../jdk6/AppleScriptBackedGrowlAnnouncer.groovy    |   69 -
 .../api/plugins/announce/AnnouncePlugin.java       |   29 +
 .../plugins/announce/AnnouncePluginExtension.java  |  137 +
 .../org/gradle/api/plugins/announce/Announcer.java |    0
 .../plugins/announce/BuildAnnouncementsPlugin.java |   33 +
 .../announce/internal/AnnouncerFactory.java        |   23 +
 .../internal/AnnouncerUnavailableException.java    |    0
 .../announce/internal/AnnouncingBuildListener.java |   92 +
 .../announce/internal/DefaultAnnouncerFactory.java |   73 +
 .../announce/internal/DefaultIconProvider.java     |   38 +
 .../api/plugins/announce/internal/Growl.java       |   22 +
 .../internal/GrowlNotifyBackedAnnouncer.java       |   55 +
 .../plugins/announce/internal/IconProvider.java    |    0
 .../internal/IgnoreUnavailableAnnouncer.java       |   41 +
 .../api/plugins/announce/internal/NotifySend.java  |   59 +
 .../api/plugins/announce/internal/Snarl.java       |  101 +
 .../api/plugins/announce/internal/Twitter.java     |   76 +
 .../announce/internal/UnknownAnnouncer.java        |   27 +
 .../jdk6/AppleScriptBackedGrowlAnnouncer.java      |   72 +
 .../gradle/api/plugins/announce/package-info.java  |    0
 .../announce/AnnouncePluginExtensionTest.groovy    |   12 +-
 .../api/plugins/announce/AnnouncePluginTest.groovy |    7 +-
 .../announce/BuildAnnouncementsPluginTest.groovy   |    7 +-
 .../internal/DefaultAnnouncerFactoryTest.groovy    |   17 +-
 .../internal/DefaultIconProviderTest.groovy        |   27 +-
 .../antlr/AbstractAntlrIntegrationTest.groovy      |    3 +-
 .../antlr/Antlr2PluginIntegrationTest.groovy       |    2 +-
 .../antlr/Antlr3PluginIntegrationTest.groovy       |    1 +
 .../antlr/Antlr4PluginIntegrationTest.groovy       |    1 +
 .../IncrementalAntlrTaskIntegrationTest.groovy     |   14 +
 .../org/gradle/api/plugins/antlr/AntlrPlugin.java  |  114 -
 .../plugins/antlr/AntlrSourceVirtualDirectory.java |   47 -
 .../org/gradle/api/plugins/antlr/AntlrTask.java    |  250 -
 .../api/plugins/antlr/internal/AntlrExecuter.java  |  225 -
 .../internal/AntlrSourceVirtualDirectoryImpl.java  |   46 -
 .../plugins/antlr/internal/AntlrWorkerClient.java  |   30 -
 .../antlr/internal/AntlrWorkerClientProtocol.java  |   21 -
 .../plugins/antlr/internal/AntlrWorkerManager.java |   58 -
 .../plugins/antlr/internal/AntlrWorkerServer.java  |   53 -
 .../org/gradle/api/plugins/antlr/AntlrPlugin.java  |  112 +
 .../plugins/antlr/AntlrSourceVirtualDirectory.java |   46 +
 .../org/gradle/api/plugins/antlr/AntlrTask.java    |  267 +
 .../api/plugins/antlr/internal/AntlrExecuter.java  |  223 +
 .../api/plugins/antlr/internal/AntlrResult.java    |    0
 .../internal/AntlrSourceGenerationException.java   |    0
 .../internal/AntlrSourceVirtualDirectoryImpl.java  |   45 +
 .../api/plugins/antlr/internal/AntlrSpec.java      |    0
 .../plugins/antlr/internal/AntlrSpecFactory.java   |    0
 .../api/plugins/antlr/internal/AntlrWorker.java    |   21 +
 .../plugins/antlr/internal/AntlrWorkerManager.java |   49 +
 .../antlr/internal/antlr2/GenerationPlan.java      |    0
 .../internal/antlr2/GenerationPlanBuilder.java     |    0
 .../antlr/internal/antlr2/GrammarDelegate.java     |    0
 .../antlr/internal/antlr2/GrammarFileMetadata.java |    0
 .../antlr/internal/antlr2/GrammarMetadata.java     |    0
 .../antlr/internal/antlr2/MetadataExtracter.java   |    0
 .../api/plugins/antlr/internal/antlr2/XRef.java    |    0
 .../org/gradle/api/plugins/antlr/package-info.java |    0
 .../api/plugins/antlr/AntlrPluginTest.groovy       |    7 +-
 .../base-services-groovy.gradle                    |    2 +
 .../gradle/api/internal/ClosureBackedAction.java   |  109 -
 .../main/groovy/org/gradle/api/specs/AndSpec.java  |   61 -
 .../main/groovy/org/gradle/api/specs/Specs.java    |   81 -
 .../gradle/groovy/scripts/internal/AstUtils.java   |  262 -
 .../gradle/api/InvalidActionClosureException.java  |    0
 .../gradle/api/internal/ClosureBackedAction.java   |  112 +
 .../main/java/org/gradle/api/specs/AndSpec.java    |   81 +
 .../src/main/java/org/gradle/api/specs/Specs.java  |  158 +
 .../org/gradle/api/specs/internal/ClosureSpec.java |    0
 .../org/gradle/groovy/scripts/Transformer.java     |    0
 .../internal/AbstractScriptTransformer.java        |    0
 .../gradle/groovy/scripts/internal/AstUtils.java   |  267 +
 .../ExpressionReplacingVisitorSupport.java         |    0
 .../scripts/internal/RestrictiveCodeVisitor.java   |    0
 .../groovy/scripts/internal/ScriptBlock.java       |    0
 .../internal/StatementReplacingVisitorSupport.java |    0
 .../scripts/internal/StatementTransformer.java     |    0
 .../org/gradle/internal/reflect/GroovyMethods.java |   53 +
 .../org/gradle/util/Configurable.java              |    0
 .../api/specs/AbstractCompositeSpecTest.java       |   29 +-
 .../groovy/org/gradle/api/specs/AndSpecTest.java   |   10 +-
 .../groovy/org/gradle/api/specs/OrSpecTest.java    |    6 +-
 .../groovy/org/gradle/api/specs/SpecsTest.groovy   |  147 +
 subprojects/base-services/base-services.gradle     |    5 +-
 .../SystemPropertiesIntegrationTest.groovy         |   41 +
 .../BuildOperationProcessorIntegrationTest.groovy  |   70 +
 .../reflect/CachedConstructorsBenchmark.java       |   56 +
 .../src/main/java/org/gradle/api/JavaVersion.java  |   33 +-
 .../main/java/org/gradle/api/internal/Factory.java |   25 -
 .../gradle/api/internal/cache/StringInterner.java  |   36 +
 .../api/internal/project/ServiceRegistry.java      |   25 -
 .../java/org/gradle/api/specs/CompositeSpec.java   |   65 +-
 .../main/java/org/gradle/api/specs/NotSpec.java    |    4 +
 .../src/main/java/org/gradle/api/specs/OrSpec.java |   39 +-
 .../src/main/java/org/gradle/internal/Actions.java |    7 +-
 .../main/java/org/gradle/internal/Factories.java   |   26 +
 .../main/java/org/gradle/internal/FileUtils.java   |   26 +-
 .../main/java/org/gradle/internal/IoActions.java   |   29 +-
 .../java/org/gradle/internal/SystemProperties.java |   35 +-
 .../java/org/gradle/internal/TimeProvider.java     |    4 +-
 .../java/org/gradle/internal/Transformers.java     |   32 +
 .../internal/classloader/CachingClassLoader.java   |    9 +-
 .../internal/classloader/ClassLoaderFactory.java   |   18 +-
 .../internal/classloader/ClassLoaderHasher.java    |   26 +
 .../classloader/ClassLoaderHierarchyHasher.java    |   36 +
 .../internal/classloader/ClassLoaderSpec.java      |   18 -
 .../internal/classloader/ClassLoaderUtils.java     |   54 +
 .../internal/classloader/ClassLoaderVisitor.java   |   37 +-
 .../internal/classloader/ClassPathSnapshot.java    |   35 +
 .../internal/classloader/ClassPathSnapshotter.java |   26 +
 .../ConfigurableClassLoaderHierarchyHasher.java    |  102 +
 .../classloader/DefaultClassLoaderFactory.java     |   90 +-
 .../DefaultHashingClassLoaderFactory.java          |   95 +
 .../internal/classloader/FilteringClassLoader.java |  189 +-
 .../classloader/HashingClassLoaderFactory.java     |   30 +
 .../classloader/MultiParentClassLoader.java        |   10 +-
 .../classloader/MutableURLClassLoader.java         |   94 -
 .../classloader/SystemClassLoaderSpec.java         |   39 +
 .../classloader/TransformingClassLoader.java       |   50 +-
 .../classloader/VisitableURLClassLoader.java       |   76 +
 .../internal/classpath/DefaultClassPath.java       |    2 +-
 .../concurrent/DefaultExecutorFactory.java         |    2 +-
 .../internal/concurrent/ExecutorFactory.java       |    6 +-
 .../gradle/internal/concurrent/ExecutorPolicy.java |   32 +-
 .../internal/concurrent/ThreadFactoryImpl.java     |    2 +-
 .../internal/exceptions/DiagnosticsVisitor.java    |    7 +-
 .../exceptions/FormattingDiagnosticsVisitor.java   |   14 +-
 .../ValueCollectingDiagnosticsVisitor.java         |   46 +
 .../gradle/internal/file/PathToFileResolver.java   |   30 +
 .../internal/file/RelativeFilePathResolver.java    |    3 +
 .../java/org/gradle/internal/hash/HashUtil.java    |   35 +-
 .../gradle/internal/id/CompositeIdGenerator.java   |    4 +-
 .../internal/io/LineBufferingOutputStream.java     |   99 +
 .../io/LinePerThreadBufferingOutputStream.java     |  213 +
 .../org/gradle/internal/io/NullOutputStream.java   |   43 +
 .../internal/io/RandomAccessFileInputStream.java   |    5 +
 .../internal/io/RandomAccessFileOutputStream.java  |    5 +
 .../gradle/internal/io/SkipFirstTextStream.java    |   44 +
 .../org/gradle/internal/io/StreamByteBuffer.java   |  528 ++
 .../org/gradle/internal/io/WriterTextStream.java   |   54 +
 .../java/org/gradle/internal/jvm/JavaInfo.java     |    9 +-
 .../java/org/gradle/internal/jvm/JdkTools.java     |   76 -
 .../src/main/java/org/gradle/internal/jvm/Jvm.java |  154 +-
 .../jvm/UnsupportedJavaRuntimeException.java       |   21 +-
 .../operations/BuildOperationProcessor.java        |   19 +-
 .../internal/operations/BuildOperationQueue.java   |   10 +
 .../operations/BuildOperationQueueFactory.java     |   23 +
 .../operations/BuildOperationQueueFailure.java     |   29 +
 .../operations/BuildOperationWorkerRegistry.java   |   56 +
 .../operations/DefaultBuildOperationProcessor.java |   69 +-
 .../operations/DefaultBuildOperationQueue.java     |   77 +-
 .../DefaultBuildOperationQueueFactory.java         |   26 +
 .../DefaultBuildOperationWorkerRegistry.java       |  188 +
 .../operations/RunnableBuildOperation.java         |   23 +
 .../org/gradle/internal/os/OperatingSystem.java    |   51 +-
 .../org/gradle/internal/process/ArgCollector.java  |   25 +
 .../org/gradle/internal/process/ArgWriter.java     |  127 +
 .../gradle/internal/reflect/ClassInspector.java    |    2 +-
 .../internal/reflect/DirectInstantiator.java       |   77 +-
 .../org/gradle/internal/reflect/JavaMethod.java    |    8 +-
 .../internal/reflect/JavaReflectionUtil.java       |  132 +-
 .../reflect/MethodSignatureEquivalence.java        |   48 -
 .../java/org/gradle/internal/reflect/Methods.java  |   76 +
 .../internal/reflect/PropertyAccessorType.java     |  149 +
 .../java/org/gradle/internal/reflect/Types.java    |   75 +
 .../reflect/UnsupportedPropertyValueException.java |   29 +
 .../internal/service/CachingServiceLocator.java    |   77 +
 .../internal/service/DefaultServiceLocator.java    |  181 +
 .../internal/service/DefaultServiceRegistry.java   |  323 +-
 .../gradle/internal/service/ServiceLocator.java    |  152 +-
 .../typeconversion/TypeConversionException.java    |    4 +
 .../internal/typeconversion/TypeConverter.java     |    4 +-
 .../UnsupportedNotationException.java              |    3 +-
 .../main/java/org/gradle/util/CollectionUtils.java |   58 +-
 .../src/main/java/org/gradle/util/GUtil.java       |   56 +-
 .../main/java/org/gradle/util/GradleVersion.java   |   56 +-
 .../groovy/org/gradle/api/JavaVersionSpec.groovy   |   24 +-
 .../api/internal/cache/StringInternerTest.groovy   |   56 +
 .../org/gradle/internal/FactoriesTest.groovy       |   20 +
 ...nfigurableClassLoaderHierarchyHasherTest.groovy |  102 +
 .../DefaultClassLoaderFactoryTest.groovy           |   22 +-
 .../classloader/FilteringClassLoaderTest.groovy    |   87 +-
 .../classloader/MutableURLClassLoaderTest.groovy   |   39 -
 .../classloader/TransformingClassLoaderTest.groovy |   37 +
 .../classloader/VisitableURLClassLoaderTest.groovy |   39 +
 .../concurrent/DefaultExecutorFactoryTest.groovy   |   63 +-
 .../ValueCollectingDiagnosticsVisitorTest.groovy   |   33 +
 .../gradle/internal/id/LongIdGeneratorTest.groovy  |   13 +-
 .../LinePerThreadBufferingOutputStreamTest.groovy  |   51 +
 .../internal/io/SkipFirstTextStreamTest.groovy     |   67 +
 .../gradle/internal/io/StreamByteBufferTest.groovy |  421 ++
 .../org/gradle/internal/jvm/AppleJvmTest.groovy    |   60 +-
 .../org/gradle/internal/jvm/JdkToolsTest.groovy    |   54 -
 .../groovy/org/gradle/internal/jvm/JvmTest.groovy  |  107 +-
 .../DefaultBuildOperationProcessorTest.groovy      |  189 +-
 .../DefaultBuildOperationQueueTest.groovy          |   79 +-
 .../DefaultBuildOperationWorkerRegistryTest.groovy |  222 +
 .../gradle/internal/os/OperatingSystemTest.groovy  |   88 +-
 .../gradle/internal/process/ArgWriterTest.groovy   |   98 +
 .../internal/reflect/ClassInspectorTest.groovy     |    9 -
 .../reflect/DirectInstantiatorCacheTest.groovy     |   42 +
 .../reflect/MethodSignatureEquivalenceTest.groovy  |   47 -
 .../org/gradle/internal/reflect/MethodsTest.groovy |   66 +
 .../reflect/PropertyAccessorTypeTest.groovy        |  144 +
 .../org/gradle/internal/reflect/TypesTest.groovy   |   52 +
 .../service/DefaultServiceRegistryTest.groovy      |  152 +-
 .../internal/service/ServiceLocatorTest.groovy     |    6 +-
 .../org/gradle/util/CollectionUtilsTest.groovy     |   34 +-
 .../org/gradle/util/GradleVersionTest.groovy       |   28 +-
 .../groovy/org/gradle/util/util/GUtilTest.groovy   |   69 +-
 .../ClassLoaderFactoryHelperExtension.java         |   27 +
 .../org.codehaus.groovy.runtime.ExtensionModule    |   19 +
 .../gradle/BuildComparisonIntegrationSpec.groovy   |   16 +-
 ...Pre12CompareGradleBuildsCrossVersionSpec.groovy |  171 -
 .../gradle/CompareGradleBuilds.java                |   42 +-
 .../gradle/CompareGradleBuildsPlugin.groovy        |   42 -
 .../gradle/CompareGradleBuildsPlugin.java          |   53 +
 .../gradle/GradleBuildInvocationSpec.java          |    6 +
 .../internal/ComparableGradleBuildExecuter.java    |   43 +-
 .../internal/DefaultGradleBuildInvocationSpec.java |    6 +-
 .../gradle/internal/GradleBuildComparison.java     |   98 +-
 .../internal/GradleBuildOutcomeSetInferrer.java    |   73 -
 .../internal/GradleBuildOutcomeSetTransformer.java |    2 +-
 .../buildcomparison/gradle/package-info.java       |    3 +-
 .../tooling/ProjectOutcomesModelBuilder.java       |    3 +-
 .../GradleBuildComparisonResultHtmlRenderer.groovy |   22 -
 .../render/internal/html/HtmlRenderContext.java    |    4 +-
 .../DefaultGradleBuildInvocationSpecTest.groovy    |   11 +-
 .../GradleBuildOutcomeSetInferrerTest.groovy       |   97 -
 ...neratedArchiveBuildOutcomeComparatorTest.groovy |   17 +-
 .../internal/archive/entry/ArchiveEntryTest.groovy |   12 +-
 ...rtifactToFileBuildOutcomeTransformerTest.groovy |    8 +-
 subprojects/build-init/build-init.gradle           |   63 -
 .../plugins/BuildInitPluginIntegrationTest.groovy  |   36 +
 .../plugins/JavaLibraryInitIntegrationTest.groovy  |   47 +-
 .../plugins/MavenConversionIntegrationTest.groovy  |   42 +-
 .../plugins/ScalaLibraryInitIntegrationTest.groovy |    4 +-
 .../WrapperPluginAutoApplyActionIntegTest.groovy   |    6 +-
 .../org/gradle/api/tasks/wrapper/Wrapper.java      |   85 +-
 .../BasicTemplateBasedProjectInitDescriptor.java   |   40 +-
 .../plugins/internal/BuildInitTestFramework.java   |   55 +
 .../internal/ConditionalTemplateOperation.groovy   |   38 -
 .../internal/ConditionalTemplateOperation.java     |   37 +
 .../DefaultTemplateLibraryVersionProvider.groovy   |   31 -
 .../DefaultTemplateLibraryVersionProvider.java     |   38 +
 .../GroovyLibraryProjectInitDescriptor.java        |   38 +-
 .../internal/JavaLibraryProjectInitDescriptor.java |   63 +-
 .../LanguageLibraryProjectInitDescriptor.java      |   27 +-
 .../internal/PomProjectInitDescriptor.groovy       |   47 -
 .../plugins/internal/PomProjectInitDescriptor.java |   57 +
 .../plugins/internal/ProjectInitDescriptor.groovy  |   20 -
 .../plugins/internal/ProjectInitDescriptor.java    |   22 +
 .../internal/ProjectLayoutSetupRegistry.groovy     |   52 -
 .../internal/ProjectLayoutSetupRegistry.java       |   56 +
 .../ProjectLayoutSetupRegistryFactory.groovy       |   61 -
 .../ProjectLayoutSetupRegistryFactory.java         |   45 +
 .../ScalaLibraryProjectInitDescriptor.java         |   42 +-
 .../SimpleGlobalFilesBuildSettingsDescriptor.java  |   34 +-
 .../internal/SimpleTemplateOperation.groovy        |   47 -
 .../plugins/internal/SimpleTemplateOperation.java  |   69 +
 .../TemplateBasedProjectInitDescriptor.java        |   34 -
 .../internal/TemplateLibraryVersionProvider.groovy |   21 -
 .../internal/TemplateLibraryVersionProvider.java   |   21 +
 .../plugins/internal/TemplateOperation.groovy      |   21 -
 .../plugins/internal/TemplateOperation.java        |   21 +
 .../plugins/internal/TemplateOperationFactory.java |    9 +-
 .../buildinit/plugins/internal/TemplateValue.java  |    2 +-
 .../action/WrapperPluginAutoApplyAction.groovy     |   29 -
 .../action/WrapperPluginAutoApplyAction.java       |   28 +
 .../plugins/internal/maven/Maven2Gradle.groovy     |   35 +-
 .../internal/maven/MavenProjectXmlWriter.java      |    8 +-
 .../org/gradle/buildinit/plugins/package-info.java |    3 +-
 .../org/gradle/buildinit/tasks/InitBuild.groovy    |   73 -
 .../org/gradle/buildinit/tasks/InitBuild.java      |  128 +
 .../org/gradle/buildinit/tasks/package-info.java   |   21 +
 .../groovylibrary/LibraryTest.groovy.template      |    2 +-
 .../javalibrary/LibraryTestNG.java.template        |   15 +
 .../javalibrary/spock-build.gradle.template        |   34 +
 .../javalibrary/testng-build.gradle.template       |   29 +
 .../tasks/templates/library-versions.properties    |   10 +
 .../gradle/api/tasks/wrapper/WrapperTest.groovy    |  167 +
 .../org/gradle/api/tasks/wrapper/WrapperTest.java  |  161 -
 .../buildinit/plugins/BuildInitPluginSpec.groovy   |   12 +-
 .../buildinit/plugins/WrapperPluginSpec.groovy     |    8 +-
 .../internal/BuildInitTestFrameworkTest.groovy     |   58 +
 ...LanguageLibraryProjectInitDescriptorSpec.groovy |   31 +-
 .../internal/SimpleTemplateOperationSpec.groovy    |   19 +-
 .../TemplateBasedProjectInitDescriptorSpec.groovy  |   44 -
 .../internal/maven/MavenProjectsCreatorSpec.groovy |    1 -
 .../gradle/buildinit/tasks/InitBuildSpec.groovy    |   87 +-
 .../SimpleTemplateOperationSpec-binding.template   |    1 +
 .../build-scan-performance.gradle                  |   33 +
 .../BuildScanPluginPerformanceTest.groovy          |  169 +
 .../project-with-source/Production.groovy          |   13 +
 .../templates/project-with-source/Production.java  |   24 +
 .../templates/project-with-source/Production.scala |    7 +
 .../src/templates/project-with-source/Test.groovy  |   13 +
 .../src/templates/project-with-source/Test.java    |   12 +
 .../src/templates/project-with-source/Test.scala   |   12 +
 .../src/templates/project-with-source/build.gradle |   91 +
 .../src/templates/project-with-source/build.xml    |   56 +
 .../src/templates/project-with-source/pom.xml      |   95 +
 .../src/templates/with-verbose-junit/Test.java     |   33 +
 .../fixture/BuildScanPerformanceTestRunner.groovy  |   48 +
 .../performance/results/BuildScanResultsStore.java |   25 +
 .../build-scan-performance/templates.gradle        |   46 +
 subprojects/cli/cli.gradle                         |    5 +-
 subprojects/code-quality/code-quality.gradle       |    1 -
 .../AbstractFindBugsPluginIntegrationTest.groovy   |   36 +-
 .../AbstractPmdPluginVersionIntegrationTest.groovy |    6 +
 .../CheckstylePluginVersionIntegrationTest.groovy  |   85 +-
 .../CheckstyleRelocationIntegrationTest.groovy     |   79 +
 .../quality/CodeNarcPluginIntegrationTest.groovy   |  262 +-
 .../CodeNarcPluginVersionIntegrationTest.groovy    |  184 +
 .../CodeNarcRelocationIntegrationTest.groovy       |   80 +
 ...ndBugsClasspathValidationIntegrationTest.groovy |    7 -
 .../FindBugsForOldJavaIntegrationTest.groovy       |   32 -
 .../plugins/quality/FindBugsIntegrationTest.groovy |    4 -
 .../quality/FindBugsPluginIntegrationTest.groovy   |    3 -
 .../FindBugsRelocationIntegrationTest.groovy       |   82 +
 .../JDependRelocationIntegrationTest.groovy        |   72 +
 .../PmdPluginAuxclasspathIntegrationTest.groovy    |   15 +-
 .../PmdPluginDependenciesIntegrationTest.groovy    |   11 +-
 .../PmdPluginSubtypeParamIntegrationTest.groovy    |  113 +
 .../quality/PmdPluginVersionIntegrationTest.groovy |   16 +-
 .../quality/PmdRelocationIntegrationTest.groovy    |   64 +
 .../internal/FindBugsSpecBuilderTest.groovy        |   32 +
 .../resources/checkstyle-custom-stylesheet.xsl     |   13 +
 .../resources/findbugs-custom-stylesheet.xsl       |   13 +
 .../gradle/api/plugins/quality/Checkstyle.groovy   |  187 -
 .../org/gradle/api/plugins/quality/Checkstyle.java |  256 +
 .../api/plugins/quality/CheckstyleExtension.groovy |   63 -
 .../api/plugins/quality/CheckstyleExtension.java   |   94 +
 .../api/plugins/quality/CheckstylePlugin.groovy    |   77 -
 .../api/plugins/quality/CheckstylePlugin.java      |  126 +
 .../api/plugins/quality/CheckstyleReports.java     |    3 +
 .../org/gradle/api/plugins/quality/CodeNarc.groovy |  155 -
 .../org/gradle/api/plugins/quality/CodeNarc.java   |  205 +
 .../api/plugins/quality/CodeNarcExtension.groovy   |   79 -
 .../api/plugins/quality/CodeNarcExtension.java     |  123 +
 .../api/plugins/quality/CodeNarcPlugin.groovy      |   88 -
 .../gradle/api/plugins/quality/CodeNarcPlugin.java |  150 +
 .../api/plugins/quality/CodeNarcReports.java       |    4 +
 .../plugins/quality/CodeQualityExtension.groovy    |   42 -
 .../api/plugins/quality/CodeQualityExtension.java  |   78 +
 .../org/gradle/api/plugins/quality/FindBugs.groovy |  322 --
 .../org/gradle/api/plugins/quality/FindBugs.java   |  504 ++
 .../api/plugins/quality/FindBugsExtension.groovy   |  161 -
 .../api/plugins/quality/FindBugsExtension.java     |  241 +
 .../api/plugins/quality/FindBugsPlugin.groovy      |  118 -
 .../gradle/api/plugins/quality/FindBugsPlugin.java |  201 +
 .../api/plugins/quality/FindBugsReports.java       |    9 +-
 .../api/plugins/quality/FindBugsXmlReport.java     |    6 +-
 .../org/gradle/api/plugins/quality/JDepend.groovy  |  123 -
 .../org/gradle/api/plugins/quality/JDepend.java    |  152 +
 .../api/plugins/quality/JDependExtension.groovy    |   24 -
 .../api/plugins/quality/JDependExtension.java      |   24 +
 .../api/plugins/quality/JDependPlugin.groovy       |   93 -
 .../gradle/api/plugins/quality/JDependPlugin.java  |  117 +
 .../gradle/api/plugins/quality/JDependReports.java |    3 +
 .../org/gradle/api/plugins/quality/Pmd.groovy      |  248 -
 .../groovy/org/gradle/api/plugins/quality/Pmd.java |  283 ++
 .../gradle/api/plugins/quality/PmdExtension.groovy |  128 -
 .../gradle/api/plugins/quality/PmdExtension.java   |  164 +
 .../gradle/api/plugins/quality/PmdPlugin.groovy    |  121 -
 .../org/gradle/api/plugins/quality/PmdPlugin.java  |  192 +
 .../org/gradle/api/plugins/quality/PmdReports.java |    3 +
 .../internal/AbstractCodeQualityPlugin.groovy      |  124 -
 .../internal/AbstractCodeQualityPlugin.java        |  209 +
 .../quality/internal/CheckstyleInvoker.groovy      |  103 +
 .../quality/internal/CheckstyleReportsImpl.java    |    3 +-
 .../quality/internal/CodeNarcInvoker.groovy        |   76 +
 .../quality/internal/FindBugsReportsImpl.java      |   15 +-
 .../quality/internal/FindBugsReportsInternal.java  |   32 +
 .../plugins/quality/internal/JDependInvoker.groovy |   49 +
 .../api/plugins/quality/internal/PmdInvoker.groovy |  111 +
 .../findbugs/FindBugsClasspathValidator.java       |   13 +-
 .../internal/findbugs/FindBugsExecuter.java        |   13 +-
 .../internal/findbugs/FindBugsSpecBuilder.java     |    8 +-
 .../quality/internal/findbugs/FindBugsWorker.java  |   23 +
 .../internal/findbugs/FindBugsWorkerClient.java    |   43 -
 .../findbugs/FindBugsWorkerClientProtocol.java     |   21 -
 .../internal/findbugs/FindBugsWorkerManager.groovy |   51 -
 .../internal/findbugs/FindBugsWorkerManager.java   |   44 +
 .../internal/findbugs/FindBugsWorkerServer.java    |   50 -
 .../internal/findbugs/FindBugsXmlReportImpl.java   |    2 +
 .../plugins/quality/CheckstylePluginTest.groovy    |    7 +-
 .../api/plugins/quality/CodeNarcPluginTest.groovy  |  145 +-
 .../api/plugins/quality/FindBugsPluginTest.groovy  |    7 +-
 .../api/plugins/quality/JDependPluginTest.groovy   |    7 +-
 .../api/plugins/quality/PmdPluginTest.groovy       |   25 +-
 .../findbugs/FindBugsClasspathValidatorTest.groovy |   29 +-
 .../findbugs/FindBugsWorkerServerTest.groovy       |   40 -
 .../composite-builds/composite-builds.gradle       |   14 +
 .../AbstractCompositeBuildIntegrationTest.groovy   |  104 +
 ...ompositeBuildClassloadingIntegrationTest.groovy |   73 +
 ...ositeBuildCommandLineArgsIntegrationTest.groovy |  146 +
 ...uildDeclaredSubstitutionsIntegrationTest.groovy |  176 +
 ...eBuildDependencyArtifactsIntegrationTest.groovy |  508 ++
 ...ositeBuildDependencyCycleIntegrationTest.groovy |  241 +
 ...ositeBuildDependencyGraphIntegrationTest.groovy |  682 +++
 .../CompositeBuildDetectionIntegrationTest.groovy  |   93 +
 ...CompositeBuildIdeaProjectIntegrationTest.groovy |  370 ++
 ...endencyConflictResolutionIntegrationTest.groovy |   90 +
 .../CompositeBuildInitScriptIntegrationTest.groovy |   81 +
 ...BuildMinimalConfigurationIntegrationTest.groovy |  212 +
 ...iteBuildPluginDevelopmentIntegrationTest.groovy |  156 +
 ...endencyConflictResolutionIntegrationTest.groovy |   65 +
 ...positeBuildTaskDependencyIntegrationTest.groovy |  310 ++
 .../IncludedBuildValidationIntegrationTest.groovy  |  130 +
 .../SamplesCompositeBuildIntegrationTest.groovy    |  139 +
 .../CompositeBuildDependencySubstitutions.java     |   95 +
 .../composite/internal/CompositeBuildServices.java |   91 +
 .../internal/CompositeBuildTaskDelegate.java       |   63 +
 .../internal/CompositeProjectArtifactBuilder.java  |   41 +
 .../CompositeProjectComponentArtifactMetadata.java |   99 +
 .../DefaultBuildableCompositeBuildContext.java     |  171 +
 .../internal/DefaultCompositeContextBuilder.java   |   55 +
 .../composite/internal/DefaultIncludedBuild.java   |  135 +
 .../internal/DefaultIncludedBuildExecuter.java     |  161 +
 .../internal/DefaultIncludedBuildFactory.java      |  117 +
 .../composite/internal/DefaultIncludedBuilds.java  |   41 +
 .../internal/IncludedBuildArtifactBuilder.java     |   90 +
 .../IncludedBuildDependencyMetadataBuilder.java    |  134 +
 ...ncludedBuildDependencySubstitutionsBuilder.java |   52 +
 .../composite/internal/IncludedBuildInternal.java  |   30 +
 .../internal/IncludedBuildTaskReference.java       |   42 +
 .../IncludedBuildTaskReferenceResolver.java        |   59 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 subprojects/core/core.gradle                       |   26 +-
 .../DeprecationHandlingIntegrationTest.groovy      |  116 -
 .../org/gradle/JansiEndUserIntegrationTest.groovy  |  317 ++
 .../gradle/NativeServicesIntegrationTest.groovy    |   47 +-
 .../api/AntBuilderLoggingIntegrationTest.groovy    |   89 +
 .../org/gradle/api/ApplyPluginIntegSpec.groovy     |   73 +-
 .../api/BuildScriptClassPathIntegrationTest.groovy |   52 +
 .../api/BuildScriptExecutionIntegrationSpec.groovy |   10 +-
 .../ConfigurationOnDemandIntegrationTest.groovy    |    9 +-
 .../CrossBuildScriptCachingIntegrationSpec.groovy  |  751 +++
 .../api/ExternalScriptErrorIntegrationTest.groovy  |    8 +-
 .../ExternalScriptExecutionIntegrationSpec.groovy  |   20 +-
 .../ExternalScriptExecutionIntegrationTest.groovy  |    6 +-
 .../api/ExtraPropertiesIntegrationTest.groovy      |   82 +
 .../api/InitScriptErrorIntegrationTest.groovy      |    3 +-
 .../api/InitScriptExecutionIntegrationTest.groovy  |    6 +-
 .../ParallelExecutionWarningIntegrationTest.groovy |   94 +
 .../PluginApplicationErrorIntegrationTest.groovy   |    2 -
 .../gradle/api/SettingsDslIntegrationSpec.groovy   |   35 +
 .../SettingsScriptExecutionIntegrationTest.groovy  |    6 +-
 .../api/dsl/ConcurrentClassDecorationSpec.groovy   |   10 +-
 .../dsl/DynamicMethodLookupIntegrationTest.groovy  |  118 +
 .../api/dsl/DynamicObjectIntegrationTest.groovy    |  715 ++-
 .../dsl/NestedConfigureDslIntegrationTest.groovy   |  459 ++
 .../api/dsl/PluginDetectionIntegrationTest.groovy  |    8 +-
 .../BuildExecutionEventsIntegrationTest.groovy     |    2 +-
 ...ltGeneratedGradleJarCacheIntegrationTest.groovy |  136 +
 ...askEnumTypesInputPropertyIntegrationTest.groovy |   73 +
 .../state/TaskTypeUpToDateIntegrationTest.groovy   |  219 +
 .../changedetection/state/UpToDateIntegTest.groovy |   82 +
 .../ClassLoadersCachingIntegrationTest.groovy      |   22 +-
 .../TaskPropertyNamingIntegrationTest.groovy       |  103 +
 .../BrokenCompressedResourceIntegrationTest.groovy |  101 +
 .../BrokenTextResourceIntegrationTest.groovy       |   75 +
 .../CompressedResourceIntegrationTest.groovy       |   69 +
 .../AbstractPathSensitivityIntegrationSpec.groovy  |  246 +
 .../api/tasks/AntArchiveIntegrationTest.groovy     |  128 +
 .../gradle/api/tasks/ArchiveIntegrationTest.groovy |   12 +-
 .../CachedPathSensitivityIntegrationTest.groovy    |   45 +
 .../tasks/CachedRelocationIntegrationTest.groovy   |  119 +
 .../CachedTaskExecutionIntegrationTest.groovy      |  556 +++
 ...entBuildsIncrementalBuildIntegrationTest.groovy |  198 +
 .../tasks/CopyPermissionsIntegrationTest.groovy    |   12 +-
 .../api/tasks/CopySpecIntegrationSpec.groovy       |  169 +
 .../tasks/CopyTaskChildSpecIntegrationTest.groovy  |   77 +
 .../api/tasks/CopyTaskIntegrationSpec.groovy       | 1016 +++-
 .../api/tasks/CopyTaskIntegrationTest.groovy       |  736 ---
 .../gradle/api/tasks/DeleteIntegrationTest.groovy  |  127 +
 ...tionTimeTaskConfigurationIntegrationTest.groovy |    6 +
 .../api/tasks/FileTreeCopyIntegrationTest.groovy   |   48 +-
 .../tasks/GradleBuildTaskIntegrationTest.groovy    |   63 +
 .../tasks/IncrementalBuildIntegrationTest.groovy   |  881 +++-
 .../tasks/IncrementalTasksIntegrationTest.groovy   |   36 +-
 ...kCommandLineConfigurationIntegrationSpec.groovy |    2 +-
 .../TaskInputPropertiesIntegrationTest.groovy      |  287 +-
 .../api/tasks/TaskRemovalIntegrationTest.groovy    |    2 +-
 .../UpToDatePathSensitivityIntegrationTest.groovy  |   28 +
 .../api/tasks/bundling/ZipIntegrationTest.groovy   |   89 +-
 .../RuleTaskBridgingIntegrationTest.groovy         |   94 +-
 .../RuleTaskCreationIntegrationTest.groovy         |   14 +-
 .../RuleTaskExecutionIntegrationTest.groovy        |    6 +-
 .../InitScriptIntegrationTest.groovy               |   86 +
 .../PropertiesLoaderIntegrationTest.groovy         |  135 +
 .../BuildScriptClasspathIntegrationSpec.groovy     |  225 +
 .../filewatch/AbstractFileWatcherTest.groovy       |   77 +
 .../DefaultFileSystemChangeWaiterTest.groovy       |  185 +
 .../filewatch/DefaultFileWatcherFactoryTest.groovy |  375 ++
 .../jdk7/WatchServiceFileWatcherBackingTest.groovy |  184 +
 .../ScriptPluginClassLoadingIntegrationTest.groovy |   18 +-
 .../AbstractWorkerProcessIntegrationSpec.groovy    |  113 +
 .../process/internal/BrokenRemoteProcess.java      |   28 +
 .../gradle/process/internal/BrokenTestWorker.java  |   29 +
 .../process/internal/CrashingRemoteProcess.java    |   33 +
 .../gradle/process/internal/CrashingWorker.java    |   34 +
 .../gradle/process/internal/LoggingProcess.java    |   30 +
 ...MultiRequestWorkerProcessIntegrationTest.groovy |  211 +
 .../process/internal/NoCleanUpRemoteProcess.java   |   41 +
 .../gradle/process/internal/NotDeserializable.java |   34 +
 .../process/internal/OtherRemoteProcess.java       |   31 +
 .../internal/PathLimitationIntegTest.groovy        |  254 -
 .../internal/PathLimitationIntegrationTest.groovy  |  158 +
 .../gradle/process/internal/PingRemoteProcess.java |   50 +
 .../org/gradle/process/internal/RemoteProcess.java |   54 +
 ...ingleRequestWorkerProcessIntegrationTest.groovy |  197 +
 .../process/internal/StatefulTestWorker.java       |   31 +
 .../process/internal/TestListenerInterface.java    |   21 +
 .../org/gradle/process/internal/TestProtocol.java  |   23 +
 .../gradle/process/internal/TestWorkProcess.java   |   22 +
 .../org/gradle/process/internal/TestWorker.java    |   32 +
 .../internal/WorkerProcessIntegrationTest.groovy   |  226 +
 .../internal/WorkerProcessIntegrationTest.java     |  389 --
 ...rojectBuilderCrossVersionIntegrationTest.groovy |  180 +
 .../buildSrc/src/main/java/DirTransformerTask.java |   58 -
 .../buildSrc/src/main/java/GeneratorTask.java      |   53 -
 .../buildSrc/src/main/java/TransformerTask.java    |   66 -
 .../api/tasks/copyTestResources/src/accents.c      |    1 +
 .../groovy/org/gradle/BuildExceptionReporter.java  |  260 -
 .../src/main/groovy/org/gradle/BuildLogger.java    |   80 -
 .../src/main/groovy/org/gradle/BuildResult.java    |   53 -
 .../main/groovy/org/gradle/BuildResultLogger.java  |   51 -
 .../src/main/groovy/org/gradle/StartParameter.java |  702 ---
 .../groovy/org/gradle/TaskExecutionLogger.java     |   73 -
 .../src/main/groovy/org/gradle/api/AntBuilder.java |   68 -
 .../org/gradle/api/DomainObjectCollection.java     |  145 -
 .../gradle/api/NamedDomainObjectCollection.java    |  194 -
 .../api/PolymorphicDomainObjectContainer.java      |   86 -
 .../src/main/groovy/org/gradle/api/Project.java    | 1447 ------
 .../core/src/main/groovy/org/gradle/api/Task.java  |  699 ---
 .../api/artifacts/ArtifactRepositoryContainer.java |   87 -
 .../api/artifacts/ComponentSelectionRules.java     |  143 -
 .../org/gradle/api/artifacts/Configuration.java    |  424 --
 .../api/artifacts/ConfigurationContainer.java      |  106 -
 .../gradle/api/artifacts/ConflictResolution.java   |   22 -
 .../gradle/api/artifacts/DependencyArtifact.java   |   58 -
 .../gradle/api/artifacts/LenientConfiguration.java |   60 -
 .../groovy/org/gradle/api/artifacts/Module.java    |   35 -
 .../org/gradle/api/artifacts/ModuleDependency.java |  131 -
 .../gradle/api/artifacts/ProjectDependency.java    |   43 -
 .../gradle/api/artifacts/ResolutionStrategy.java   |  267 -
 .../gradle/api/artifacts/cache/package-info.java   |   20 -
 .../component/LibraryBinaryIdentifier.java         |   44 -
 .../component/LibraryComponentSelector.java        |   46 -
 .../component/ProjectComponentIdentifier.java      |   33 -
 .../component/ProjectComponentSelector.java        |   34 -
 .../api/artifacts/component/package-info.java      |   20 -
 .../dsl/ComponentModuleMetadataHandler.java        |   60 -
 .../org/gradle/api/artifacts/ivy/package-info.java |   20 -
 .../artifacts/query/ArtifactResolutionQuery.java   |   75 -
 .../artifacts/repositories/ArtifactRepository.java |   46 -
 .../artifacts/result/ArtifactResolutionResult.java |   50 -
 .../artifacts/result/ResolvedArtifactResult.java   |   33 -
 .../artifacts/result/ResolvedComponentResult.java  |   86 -
 .../artifacts/result/UnresolvedArtifactResult.java |   31 -
 .../gradle/api/artifacts/result/package-info.java  |   20 -
 .../org/gradle/api/component/package-info.java     |   25 -
 .../org/gradle/api/credentials/package-info.java   |   24 -
 .../gradle/api/execution/TaskActionListener.java   |   37 -
 .../gradle/api/execution/TaskExecutionGraph.java   |  115 -
 .../org/gradle/api/file/ContentFilterable.java     |   82 -
 .../org/gradle/api/file/CopyProcessingSpec.java    |  129 -
 .../groovy/org/gradle/api/file/CopySourceSpec.java |   40 -
 .../main/groovy/org/gradle/api/file/CopySpec.java  |  327 --
 .../groovy/org/gradle/api/file/DeleteAction.java   |   29 -
 .../groovy/org/gradle/api/file/FileCollection.java |  194 -
 .../org/gradle/api/file/FileCopyDetails.java       |  130 -
 .../main/groovy/org/gradle/api/file/FileTree.java  |   94 -
 .../org/gradle/api/file/FileTreeElement.java       |  108 -
 .../groovy/org/gradle/api/file/FileVisitor.java    |   35 -
 .../groovy/org/gradle/api/file/RelativePath.java   |  244 -
 .../org/gradle/api/file/SourceDirectorySet.java    |   94 -
 .../org/gradle/api/initialization/Settings.java    |  175 -
 .../api/internal/AbstractClassGenerator.java       |  432 --
 .../gradle/api/internal/AbstractDynamicObject.java |   91 -
 .../AbstractNamedDomainObjectContainer.java        |   76 -
 .../AbstractPolymorphicDomainObjectContainer.java  |  153 -
 .../org/gradle/api/internal/AbstractTask.java      |  751 ---
 .../api/internal/AsmBackedClassGenerator.java      |  916 ----
 .../org/gradle/api/internal/BeanDynamicObject.java |  288 --
 .../api/internal/CompositeDomainObjectSet.java     |  125 -
 .../api/internal/CompositeDynamicObject.java       |  177 -
 .../org/gradle/api/internal/ConfigureDelegate.java |  126 -
 .../gradle/api/internal/ConventionAwareHelper.java |  150 -
 .../api/internal/DefaultClassPathProvider.java     |   59 -
 .../internal/DefaultDomainObjectCollection.java    |  296 --
 .../DefaultNamedDomainObjectCollection.java        |  452 --
 .../api/internal/DefaultNamedDomainObjectSet.java  |   88 -
 .../api/internal/DelegatingDomainObjectSet.java    |  135 -
 .../api/internal/DependencyClassPathProvider.java  |   60 -
 .../internal/DependencyInjectingInstantiator.java  |  131 -
 .../org/gradle/api/internal/DynamicObject.java     |   50 -
 .../gradle/api/internal/DynamicObjectAware.java    |   33 -
 .../gradle/api/internal/DynamicObjectHelper.java   |   60 -
 .../org/gradle/api/internal/DynamicObjectUtil.java |   30 -
 .../api/internal/DynamicPropertyNamer.groovy       |   47 -
 .../api/internal/ExtensibleDynamicObject.java      |  207 -
 .../api/internal/GradleDistributionLocator.java    |   36 -
 .../org/gradle/api/internal/GradleInternal.java    |   77 -
 ...amedDomainObjectContainerConfigureDelegate.java |   41 -
 .../api/internal/NoNamingPropertyException.java    |   23 -
 .../api/internal/NullNamingPropertyException.java  |   23 -
 ...phicDomainObjectContainerConfigureDelegate.java |   49 -
 .../org/gradle/api/internal/SettingsInternal.java  |   47 -
 .../org/gradle/api/internal/TaskInternal.java      |   73 -
 .../gradle/api/internal/TaskOutputsInternal.java   |   30 -
 .../api/internal/ThreadGlobalInstantiator.java     |   63 -
 .../TypedDomainObjectContainerWrapper.java         |  221 -
 .../artifacts/CachingDependencyResolveContext.java |   70 -
 .../DefaultArtifactRepositoryContainer.java        |  116 -
 .../internal/artifacts/DefaultDependencySet.java   |   58 -
 .../artifacts/DefaultExcludeRuleContainer.java     |   42 -
 .../api/internal/artifacts/DefaultModule.java      |   56 -
 .../artifacts/DefaultPublishArtifactSet.java       |   84 -
 .../artifacts/DependencyResolveContext.java        |   23 -
 .../api/internal/artifacts/ModuleInternal.java     |   25 -
 .../internal/artifacts/ProjectBackedModule.java    |   71 -
 .../configurations/DependencyMetaDataProvider.java |   22 -
 .../dependencies/AbstractModuleDependency.java     |  125 -
 .../dependencies/DefaultClientModule.java          |   93 -
 .../dependencies/DefaultDependencyArtifact.java    |   97 -
 .../DefaultExternalModuleDependency.java           |   74 -
 .../dependencies/DefaultProjectDependency.java     |  170 -
 .../dependencies/ProjectDependencyInternal.java    |   28 -
 .../artifacts/dsl/DefaultRepositoryHandler.java    |  105 -
 .../dsl/dependencies/ModuleFactoryDelegate.groovy  |   62 -
 .../artifacts/dsl/dependencies/ProjectFinder.java  |   27 -
 .../artifacts/publish/AbstractPublishArtifact.java |   43 -
 .../org/gradle/api/internal/cache/BinaryStore.java |   42 -
 .../gradle/api/internal/cache/CacheSupport.java    |   35 -
 .../api/internal/cache/HeapProportionalSizer.java  |   55 -
 .../cache/SingleOperationPersistentStore.java      |   88 -
 .../gradle/api/internal/cache/StringInterner.java  |   36 -
 .../changedetection/TaskArtifactState.java         |   55 -
 .../changes/ChangesOnlyIncrementalTaskInputs.java  |   59 -
 .../DefaultTaskArtifactStateRepository.java        |  138 -
 .../changes/IncrementalTaskInputsInternal.java     |   39 -
 .../changes/NoHistoryArtifactState.java            |   52 -
 .../changes/RebuildIncrementalTaskInputs.java      |   75 -
 .../ShortCircuitTaskArtifactStateRepository.java   |   97 -
 .../changes/StatefulIncrementalTaskInputs.java     |   74 -
 .../internal/changedetection/rules/ChangeType.java |   33 -
 .../rules/DiscoveredInputFileChange.java           |   27 -
 .../rules/DiscoveredInputFilesStateChangeRule.java |   88 -
 .../rules/DiscoveredTaskStateChanges.java          |   24 -
 .../internal/changedetection/rules/FileChange.java |   60 -
 .../changedetection/rules/InputFileChange.java     |   31 -
 .../rules/InputFilesStateChangeRule.java           |   72 -
 .../rules/InputPropertiesStateChangeRule.java      |   54 -
 .../rules/NoHistoryStateChangeRule.java            |   35 -
 .../changedetection/rules/OutputFileChange.java    |   29 -
 .../rules/OutputFilesStateChangeRule.java          |  100 -
 .../rules/TaskTypeStateChangeRule.java             |   43 -
 .../changedetection/rules/TaskUpToDateState.java   |   97 -
 .../state/CacheBackedFileSnapshotRepository.java   |   45 -
 .../state/CacheBackedTaskHistoryRepository.java    |  315 --
 .../state/CachingFileSnapshotter.java              |   93 -
 .../state/DefaultFileCollectionSnapshotter.java    |  278 --
 .../state/DefaultFileSnapshotterSerializer.java    |   74 -
 .../state/DefaultTaskArtifactStateCacheAccess.java |   70 -
 .../state/FileCollectionSnapshot.java              |   63 -
 .../state/FileCollectionSnapshotter.java           |   41 -
 .../changedetection/state/FileSnapshot.java        |   21 -
 .../changedetection/state/FileSnapshotter.java     |   27 -
 .../state/FileTreeElementSnapshotter.java          |   23 -
 .../changedetection/state/FilesSnapshotSet.java    |   37 -
 .../state/InMemoryTaskArtifactCache.java           |  176 -
 .../state/MapMergeChangeListener.java              |   67 -
 .../changedetection/state/NoOpDecorator.java       |   26 -
 .../state/OutputFilesCollectionSnapshotter.java    |  234 -
 .../state/OutputFilesSnapshotSerializer.java       |   66 -
 .../state/TaskArtifactStateCacheAccess.java        |   25 -
 .../changedetection/state/TaskExecution.java       |   70 -
 .../LeakyOnJava7GroovySystemLoader.java            |  114 -
 .../DefaultGradleDistributionLocator.java          |  117 -
 .../internal/classpath/DefaultModuleRegistry.java  |  275 --
 .../coerce/MethodArgumentsTransformer.java         |   36 -
 .../internal/coerce/PropertySetTransformer.java    |   25 -
 .../internal/coerce/StringToEnumTransformer.java   |   86 -
 .../collections/CollectionEventRegister.java       |   80 -
 .../api/internal/collections/CollectionFilter.java |   63 -
 .../api/internal/component/ArtifactType.java       |   26 -
 .../api/internal/file/AbstractFileCollection.java  |  245 -
 .../api/internal/file/AbstractFileResolver.java    |  263 -
 .../api/internal/file/AbstractFileResource.java    |   49 -
 .../gradle/api/internal/file/AbstractFileTree.java |  168 -
 .../api/internal/file/AbstractFileTreeElement.java |  104 -
 .../internal/file/AntFileCollectionBuilder.groovy  |   36 -
 .../file/AntFileCollectionMatchingTaskBuilder.java |   74 -
 .../api/internal/file/AntFileSetBuilder.groovy     |   38 -
 .../api/internal/file/AntFileTreeBuilder.groovy    |   36 -
 .../api/internal/file/BaseDirFileResolver.java     |   76 -
 .../api/internal/file/BasicFileResolver.java       |   63 -
 .../api/internal/file/CachingFileVisitDetails.java |   63 -
 .../api/internal/file/CompositeFileCollection.java |  172 -
 .../api/internal/file/CompositeFileTree.java       |  105 -
 .../api/internal/file/DefaultFileLookup.java       |   43 -
 .../api/internal/file/DefaultFileOperations.java   |  171 -
 .../api/internal/file/DefaultFileTreeElement.java  |   69 -
 .../api/internal/file/DefaultFileVisitDetails.java |   37 -
 .../internal/file/DefaultSourceDirectorySet.java   |  187 -
 .../file/DefaultTemporaryFileProvider.java         |   64 -
 .../api/internal/file/FileCollectionInternal.java  |   36 -
 .../gradle/api/internal/file/FileOperations.java   |   63 -
 .../org/gradle/api/internal/file/FileResolver.java |   47 -
 .../org/gradle/api/internal/file/FileResource.java |   41 -
 .../gradle/api/internal/file/FileSystemSubset.java |  152 -
 .../internal/file/FileTreeElementComparator.java   |   33 -
 .../api/internal/file/FileTreeElementHasher.java   |   53 -
 .../gradle/api/internal/file/FileTreeInternal.java |   22 -
 .../file/FileVisitDetailsWithAttributes.java       |   52 -
 .../api/internal/file/IdentityFileResolver.java    |   48 -
 .../api/internal/file/ImmutablePatternSet.java     |  103 -
 .../internal/file/MaybeCompressedFileResource.java |   71 -
 .../internal/file/TmpDirTemporaryFileProvider.java |   33 -
 .../api/internal/file/archive/TarFileTree.java     |  208 -
 .../api/internal/file/archive/ZipFileTree.java     |  179 -
 .../compression/ArchiveOutputStreamFactory.java    |   33 -
 .../file/archive/compression/Bzip2Archiver.java    |   89 -
 .../compression/CompressedReadableResource.java    |   23 -
 .../file/archive/compression/GzipArchiver.java     |   84 -
 ...pendenciesOnlyFileCollectionResolveContext.java |   94 -
 .../DefaultConfigurableFileCollection.java         |   99 -
 .../collections/DefaultConfigurableFileTree.java   |  174 -
 .../file/collections/DefaultDirectoryWalker.java   |   74 -
 .../collections/DefaultDirectoryWalkerFactory.java |   73 -
 .../DefaultFileCollectionResolveContext.java       |  241 -
 .../file/collections/DirectoryFileTree.java        |  164 -
 .../internal/file/collections/DirectoryTrees.java  |   45 -
 .../internal/file/collections/DirectoryWalker.java |   30 -
 .../internal/file/collections/EmptyFileTree.java   |   55 -
 .../collections/FileCollectionResolveContext.java  |   56 -
 .../internal/file/collections/FileTreeAdapter.java |  112 -
 .../file/collections/FileTreeWithBackingFile.java  |   23 -
 .../file/collections/FilteredFileTree.java         |   27 -
 .../api/internal/file/collections/MapFileTree.java |  224 -
 .../internal/file/collections/MinimalFileTree.java |   37 -
 .../collections/SingleIncludePatternFileTree.java  |  139 -
 .../file/collections/SingletonFileTree.java        |   52 -
 .../file/collections/jdk7/Jdk7DirectoryWalker.java |  117 -
 .../api/internal/file/copy/CopyActionImpl.java     |   28 -
 .../api/internal/file/copy/CopySpecInternal.java   |   40 -
 .../api/internal/file/copy/CopySpecResolver.java   |   54 -
 .../api/internal/file/copy/CopySpecWrapper.java    |  222 -
 .../api/internal/file/copy/DefaultCopySpec.java    |  506 --
 .../internal/file/copy/DefaultFileCopyDetails.java |  222 -
 .../internal/file/copy/DefaultZipCompressor.java   |   45 -
 .../file/copy/DelegatingCopySpecInternal.java      |  216 -
 .../api/internal/file/copy/DeleteActionImpl.java   |   94 -
 .../file/copy/DestinationRootCopySpec.java         |   52 -
 .../api/internal/file/copy/FileCopyAction.java     |   50 -
 .../api/internal/file/copy/FileCopyActionImpl.java |   28 -
 .../gradle/api/internal/file/copy/FilterChain.java |  103 -
 .../gradle/api/internal/file/copy/LineFilter.java  |  122 -
 .../file/copy/NormalizingCopyActionDecorator.java  |  205 -
 .../internal/file/copy/PathNotationConverter.java  |   74 -
 .../api/internal/file/copy/ReadableCopySpec.java   |   27 -
 .../api/internal/file/copy/RenamingCopyAction.java |   35 -
 .../internal/file/copy/SingleParentCopySpec.java   |   63 -
 .../file/copy/SyncCopyActionDecorator.java         |   92 -
 .../api/internal/file/copy/ZipCompressor.java      |   27 -
 .../file/pattern/PatternMatcherFactory.java        |   82 -
 .../api/internal/file/pattern/PatternStep.java     |   20 -
 .../internal/file/pattern/PatternStepFactory.java  |   62 -
 .../file/pattern/WildcardPrefixPatternStep.java    |   36 -
 .../gradle/api/internal/hash/DefaultHasher.java    |   26 -
 .../org/gradle/api/internal/hash/Hasher.java       |   22 -
 .../initialization/AbstractScriptHandler.java      |   78 -
 .../initialization/ClassLoaderScopeIdentifier.java |  118 -
 .../initialization/DefaultClassLoaderScope.java    |  250 -
 .../initialization/DefaultScriptHandler.java       |  119 -
 .../DefaultScriptHandlerFactory.java               |   56 -
 .../initialization/RootClassLoaderScope.java       |   88 -
 .../internal/initialization/ScriptClassLoader.java |   41 -
 .../loadercache/ClassLoaderCache.java              |   31 -
 .../loadercache/ClassPathSnapshot.java             |   25 -
 .../loadercache/ClassPathSnapshotter.java          |   26 -
 .../loadercache/DefaultClassLoaderCache.java       |  190 -
 .../loadercache/FileClassPathSnapshotter.java      |   50 -
 .../loadercache/HashClassPathSnapshotter.java      |  107 -
 .../ClassloaderBackedPluginDescriptorLocator.java  |   38 -
 .../api/internal/plugins/DefaultConvention.java    |  243 -
 .../plugins/DefaultExtraPropertiesExtension.java   |   81 -
 .../plugins/DefaultObjectConfigurationAction.java  |  138 -
 .../api/internal/plugins/DefaultPluginManager.java |  212 -
 .../internal/plugins/DefaultPluginRegistry.java    |  229 -
 .../plugins/DefaultPotentialPluginWithId.java      |   67 -
 .../org/gradle/api/internal/plugins/DslObject.java |   92 -
 .../api/internal/plugins/ExtensionsStorage.java    |  196 -
 .../ExtraPropertiesDynamicObjectAdapter.java       |   61 -
 .../plugins/RuleBasedPluginApplicator.java         |   66 -
 .../api/internal/project/AbstractPluginAware.java  |   55 -
 .../api/internal/project/AbstractProject.java      | 1007 ----
 .../api/internal/project/DefaultAntBuilder.java    |  180 -
 .../internal/project/DefaultAntBuilderFactory.java |   48 -
 .../api/internal/project/DefaultProject.java       |   33 -
 .../api/internal/project/ProjectInternal.java      |  100 -
 .../api/internal/project/ProjectScript.groovy      |   65 -
 .../internal/project/ant/AntLoggingAdapter.java    |   86 -
 .../api/internal/project/ant/BasicAntBuilder.java  |  114 -
 .../project/antbuilder/AntBuilderDelegate.groovy   |   86 -
 .../antbuilder/ClassPathToClassLoaderCache.java    |  149 -
 .../api/internal/project/antbuilder/Cleanup.java   |   55 -
 .../antbuilder/DefaultIsolatedAntBuilder.java      |  212 -
 .../project/antbuilder/FinalizerThread.java        |  102 -
 .../AnnotationProcessingTaskFactory.java           |  484 --
 .../InputDirectoryPropertyAnnotationHandler.java   |   57 -
 .../InputFilePropertyAnnotationHandler.java        |   50 -
 .../InputFilesPropertyAnnotationHandler.java       |   42 -
 .../InputPropertyAnnotationHandler.java            |   36 -
 .../NestedBeanPropertyAnnotationHandler.java       |   47 -
 .../OutputDirectoryPropertyAnnotationHandler.java  |   84 -
 .../OutputFilePropertyAnnotationHandler.java       |   83 -
 .../project/taskfactory/PropertyActionContext.java |   57 -
 .../taskfactory/PropertyAnnotationHandler.java     |   35 -
 .../internal/project/taskfactory/TaskFactory.java  |  150 -
 .../resources/CharSourceBackedTextResource.java    |   87 -
 .../internal/resources/DefaultResourceHandler.java |   47 -
 .../FileCollectionBackedTextResource.java          |   87 -
 .../resources/ResourceIsAFolderException.java      |   28 -
 .../resources/StringBackedTextResource.java        |   74 -
 .../api/internal/tasks/ContextAwareTaskAction.java |   24 -
 .../api/internal/tasks/DefaultTaskContainer.java   |  299 --
 .../tasks/DefaultTaskContainerFactory.java         |  101 -
 .../api/internal/tasks/DefaultTaskDependency.java  |  126 -
 .../api/internal/tasks/DefaultTaskInputs.java      |  167 -
 .../api/internal/tasks/DefaultTaskOutputs.java     |  108 -
 .../internal/tasks/RealizableTaskCollection.java   |  244 -
 .../api/internal/tasks/TaskContainerInternal.java  |   60 -
 .../tasks/TaskDependencyResolveContext.java        |   43 -
 .../org/gradle/api/internal/tasks/TaskMutator.java |   95 -
 .../gradle/api/internal/tasks/TaskResolver.java    |   22 -
 .../api/internal/tasks/TaskStateInternal.java      |  122 -
 .../execution/ExecuteActionsTaskExecuter.java      |   85 -
 .../execution/ExecuteAtMostOnceTaskExecuter.java   |   49 -
 .../PostExecutionAnalysisTaskExecuter.java         |   40 -
 .../SkipEmptySourceFilesTaskExecuter.java          |   54 -
 .../tasks/execution/SkipOnlyIfTaskExecuter.java    |   55 -
 .../execution/SkipTaskWithNoActionsExecuter.java   |   54 -
 .../tasks/execution/SkipUpToDateTaskExecuter.java  |   89 -
 .../tasks/execution/ValidatingTaskExecuter.java    |   60 -
 .../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 |   88 -
 .../api/internal/tasks/options/OptionReader.java   |  148 -
 .../api/internal/tasks/options/OptionValues.groovy |   34 -
 .../groovy/org/gradle/api/invocation/Gradle.java   |  274 --
 .../groovy/org/gradle/api/logging/Logging.java     |   64 -
 .../org/gradle/api/logging/LoggingManager.java     |   73 -
 .../groovy/org/gradle/api/plugins/Convention.java  |   63 -
 .../org/gradle/api/plugins/ExtensionAware.java     |   72 -
 .../org/gradle/api/plugins/ExtensionContainer.java |  105 -
 .../api/plugins/ExtraPropertiesExtension.java      |  177 -
 .../org/gradle/api/plugins/PluginManager.java      |  111 -
 .../api/resources/MissingResourceException.java    |   26 -
 .../org/gradle/api/resources/ReadableResource.java |   32 -
 .../gradle/api/resources/ResourceException.java    |   35 -
 .../org/gradle/api/resources/TextResource.java     |   87 -
 .../org/gradle/api/tasks/AbstractCopyTask.java     |  402 --
 .../org/gradle/api/tasks/AbstractExecTask.java     |  279 --
 .../org/gradle/api/tasks/ConventionValue.java      |   38 -
 .../main/groovy/org/gradle/api/tasks/Delete.java   |   80 -
 .../groovy/org/gradle/api/tasks/GradleBuild.java   |  122 -
 .../main/groovy/org/gradle/api/tasks/JavaExec.java |  472 --
 .../org/gradle/api/tasks/OutputDirectories.java    |   33 -
 .../groovy/org/gradle/api/tasks/OutputFiles.java   |   33 -
 .../groovy/org/gradle/api/tasks/SourceTask.java    |  167 -
 .../src/main/groovy/org/gradle/api/tasks/Sync.java |   72 -
 .../groovy/org/gradle/api/tasks/TaskContainer.java |  190 -
 .../groovy/org/gradle/api/tasks/TaskInputs.java    |  138 -
 .../groovy/org/gradle/api/tasks/TaskOutputs.java   |   92 -
 .../groovy/org/gradle/api/tasks/ant/AntTarget.java |   89 -
 .../api/tasks/bundling/AbstractArchiveTask.java    |  187 -
 .../groovy/org/gradle/api/tasks/bundling/Tar.java  |   72 -
 .../groovy/org/gradle/api/tasks/bundling/Zip.java  |  131 -
 .../gradle/api/tasks/incremental/package-info.java |   20 -
 .../org/gradle/api/tasks/util/PatternSet.java      |  272 --
 .../util/internal/CachingPatternSpecFactory.java   |  180 -
 .../internal/PatternSetAntBuilderDelegate.java     |  102 -
 .../tasks/util/internal/PatternSpecFactory.java    |   78 -
 .../main/groovy/org/gradle/cache/CacheBuilder.java |   84 -
 .../groovy/org/gradle/cache/CacheRepository.java   |   64 -
 .../groovy/org/gradle/cache/PersistentCache.java   |   54 -
 .../groovy/org/gradle/cache/PersistentStore.java   |   37 -
 .../gradle/cache/internal/AbstractFileAccess.java  |   35 -
 .../gradle/cache/internal/CacheCoordinator.java    |   35 -
 .../org/gradle/cache/internal/CacheDecorator.java  |   25 -
 .../org/gradle/cache/internal/CacheFactory.java    |   31 -
 .../gradle/cache/internal/CacheScopeMapping.java   |   26 -
 .../gradle/cache/internal/DefaultCacheAccess.java  |  443 --
 .../gradle/cache/internal/DefaultCacheFactory.java |  190 -
 .../cache/internal/DefaultCacheRepository.java     |  155 -
 .../cache/internal/DefaultCacheScopeMapping.java   |   77 -
 .../cache/internal/DefaultFileLockManager.java     |  343 --
 ...aultMultiProcessSafePersistentIndexedCache.java |   99 -
 .../internal/DefaultPersistentDirectoryCache.java  |  102 -
 .../internal/DefaultPersistentDirectoryStore.java  |  116 -
 .../groovy/org/gradle/cache/internal/FileLock.java |   56 -
 .../cache/internal/FileLockCommunicator.java       |   96 -
 .../cache/internal/LockTimeoutException.java       |   25 -
 .../cache/internal/MapBackedInMemoryStore.java     |   87 -
 .../MultiProcessSafePersistentIndexedCache.java    |   28 -
 .../gradle/cache/internal/SimpleStateCache.java    |   93 -
 .../cache/internal/UnitOfWorkParticipant.java      |   34 -
 .../btree/BTreePersistentIndexedCache.java         |  727 ---
 .../org/gradle/cache/internal/btree/Block.java     |   59 -
 .../gradle/cache/internal/btree/BlockPayload.java  |   51 -
 .../cache/internal/btree/CachingBlockStore.java    |  100 -
 .../cache/internal/btree/FileBackedBlockStore.java |  251 -
 .../cache/internal/btree/FreeListBlockStore.java   |  271 --
 .../cache/internal/btree/LockingBlockStore.java    |   94 -
 .../filelock/DefaultLockStateSerializer.java       |   91 -
 .../cache/internal/filelock/LockInfoAccess.java    |   71 -
 .../gradle/cache/internal/filelock/LockState.java  |   36 -
 .../cache/internal/filelock/LockStateAccess.java   |   89 -
 .../filelock/Version1LockStateSerializer.java      |   72 -
 .../DefaultFileLockContentionHandler.java          |  160 -
 .../configuration/DefaultBuildConfigurer.java      |   48 -
 .../gradle/configuration/DefaultImportsReader.java |   63 -
 .../configuration/DefaultInitScriptProcessor.java  |   51 -
 .../configuration/DefaultScriptPluginFactory.java  |  169 -
 .../gradle/configuration/DefaultScriptTarget.java  |   71 -
 .../org/gradle/configuration/ImportsReader.java    |   21 -
 .../gradle/configuration/ProjectScriptTarget.java  |   75 -
 .../org/gradle/configuration/ScriptTarget.java     |   54 -
 .../project/BuildScriptProcessor.java              |   43 -
 ...DefaultProjectConfigurationActionContainer.java |   45 -
 .../project/PluginsProjectConfigureActions.java    |   35 -
 .../DefaultCancellableOperationManager.java        |   70 -
 ...ludedTaskFilteringBuildConfigurationAction.java |   49 -
 .../org/gradle/execution/TaskNameResolver.java     |  202 -
 .../gradle/execution/TaskSelectionException.java   |   39 -
 .../commandline/TaskConfigurationException.java    |   44 -
 .../taskgraph/AbstractTaskPlanExecutor.java        |   74 -
 .../taskgraph/DefaultTaskExecutionPlan.java        |  766 ---
 .../taskgraph/DefaultTaskGraphExecuter.java        |  211 -
 .../taskgraph/DefaultTaskPlanExecutor.java         |   28 -
 .../taskgraph/ParallelTaskPlanExecutor.java        |   62 -
 .../taskgraph/TaskPlanExecutorFactory.java         |   48 -
 .../groovy/scripts/AbstractUriScriptSource.java    |   58 -
 .../org/gradle/groovy/scripts/BasicScript.java     |   83 -
 .../gradle/groovy/scripts/CachingScriptSource.java |   51 -
 .../org/gradle/groovy/scripts/DefaultScript.java   |  252 -
 .../scripts/DefaultScriptCompilerFactory.java      |   54 -
 .../groovy/scripts/DelegatingScriptSource.java     |   46 -
 .../scripts/NonExistentFileScriptSource.java       |   64 -
 .../groovy/org/gradle/groovy/scripts/Script.java   |   48 -
 .../org/gradle/groovy/scripts/ScriptSource.java    |   46 -
 .../gradle/groovy/scripts/StringScriptSource.java  |   44 -
 .../org/gradle/groovy/scripts/UriScriptSource.java |   59 -
 .../scripts/internal/BuildScriptTransformer.java   |   60 -
 .../internal/CachingScriptClassCompiler.java       |   83 -
 .../internal/DefaultScriptCompilationHandler.java  |  396 --
 .../internal/DefaultScriptRunnerFactory.java       |  102 -
 .../scripts/internal/EmptyScriptGenerator.java     |   20 -
 .../FileCacheBackedScriptClassCompiler.java        |  134 -
 .../internal/InitialPassStatementTransformer.java  |  103 -
 .../scripts/internal/ScriptCompilationHandler.java |   33 -
 .../internal/ShortCircuitEmptyScriptCompiler.java  |   63 -
 .../org/gradle/initialization/BaseSettings.java    |  231 -
 .../gradle/initialization/BuildEventConsumer.java  |   25 -
 .../initialization/BuildLayoutParameters.java      |   86 -
 .../gradle/initialization/ClassLoaderRegistry.java |   38 -
 .../initialization/DefaultClassLoaderRegistry.java |   85 -
 .../DefaultClassLoaderScopeRegistry.java           |   40 -
 .../DefaultCommandLineConverter.java               |  225 -
 .../initialization/DefaultGradleLauncher.java      |  200 -
 .../DefaultGradleLauncherFactory.java              |  153 -
 .../DefaultGradlePropertiesLoader.java             |  115 -
 .../initialization/DefaultProjectDescriptor.java   |  147 -
 .../org/gradle/initialization/DefaultSettings.java |   36 -
 .../initialization/DependencyResolutionLogger.java |   56 -
 .../initialization/DirectoryInitScriptFinder.java  |   40 -
 .../org/gradle/initialization/GradleLauncher.java  |   65 -
 .../initialization/GradleLauncherFactory.java      |   42 -
 .../initialization/IGradlePropertiesLoader.java    |   29 -
 .../org/gradle/initialization/InitScript.groovy    |   33 -
 .../initialization/NotifyingSettingsLoader.java    |   39 -
 .../ProjectPropertySettingBuildLoader.java         |   84 -
 .../ScriptEvaluatingSettingsProcessor.java         |   75 -
 .../org/gradle/initialization/SettingsFactory.java |   50 -
 .../org/gradle/initialization/SettingsHandler.java |   97 -
 .../gradle/initialization/SettingsScript.groovy    |   24 -
 .../buildsrc/BuildSourceBuilder.java               |  113 -
 .../initialization/layout/BuildLayoutFactory.java  |   71 -
 .../AuthenticationSupportedInternal.java           |   32 -
 .../exceptions/FailureResolutionAware.java         |   28 -
 .../exceptions/LocationAwareException.java         |  171 -
 .../featurelifecycle/DeprecatedFeatureUsage.java   |   77 -
 .../LoggingDeprecatedFeatureHandler.java           |   76 -
 .../DefaultFileSystemChangeWaiterFactory.java      |  161 -
 .../filewatch/DefaultFileWatcherFactory.java       |   71 -
 .../internal/filewatch/FileSystemChangeWaiter.java |   24 -
 .../filewatch/jdk7/Jdk7FileWatcherFactory.java     |   50 -
 .../jdk7/WatchServiceFileWatcherBacking.java       |  158 -
 .../filewatch/jdk7/WatchServicePoller.java         |   84 -
 .../filewatch/jdk7/WatchServiceRegistrar.java      |  173 -
 .../internal/graph/DirectedGraphRenderer.java      |   80 -
 .../gradle/internal/graph/GraphNodeRenderer.java   |   22 -
 .../org/gradle/internal/graph/GraphRenderer.java   |   69 -
 .../logging/DefaultBuildOperationLogger.java       |   96 -
 .../DefaultBuildOperationLoggerFactory.java        |   73 -
 .../internal/progress/BuildProgressLogger.java     |  108 -
 .../progress/DefaultBuildOperationExecutor.java    |  122 -
 .../gradle/internal/progress/LoggerProvider.java   |   30 -
 .../internal/progress/OperationIdentifier.java     |   54 -
 .../progress/PercentageProgressFormatter.java      |   40 -
 .../internal/progress/ProgressLoggerProvider.java  |   33 -
 .../local/GroupedAndNamedUniqueFileStore.java      |   80 -
 .../internal/resource/local/PathKeyFileStore.java  |  198 -
 .../service/scopes/BuildScopeServices.java         |  367 --
 .../service/scopes/BuildSessionScopeServices.java  |   98 -
 .../service/scopes/GlobalScopeServices.java        |  266 -
 .../service/scopes/GradleScopeServices.java        |  139 -
 .../service/scopes/PluginServiceRegistry.java      |   55 -
 .../service/scopes/ProjectScopeServices.java       |  195 -
 .../service/scopes/SettingsScopeServices.java      |   55 -
 .../service/scopes/TaskExecutionServices.java      |  122 -
 .../internal/service/scopes/TaskScopeServices.java |   58 -
 .../org/gradle/internal/text/TreeFormatter.java    |  146 -
 .../CharSequenceNotationConverter.java             |   39 -
 .../typeconversion/CompositeNotationParser.java    |   49 -
 .../typeconversion/DefaultTypeConverter.java       |  333 --
 .../EnumFromCharSequenceNotationParser.java        |   69 -
 .../NotationConverterToNotationParserAdapter.java  |   55 -
 .../internal/typeconversion/NotationParser.java    |   36 -
 .../typeconversion/NotationParserBuilder.java      |  135 -
 .../typeconversion/ValueAwareNotationParser.java   |   23 -
 .../gradle/internal/xml/SimpleMarkupWriter.java    |  306 --
 .../org/gradle/internal/xml/SimpleXmlWriter.java   |   45 -
 .../org/gradle/internal/xml/XmlTransformer.java    |  359 --
 .../org/gradle/internal/xml/XmlValidation.java     |  146 -
 .../org/gradle/invocation/DefaultGradle.java       |  256 -
 .../ClosureBackedMethodInvocationDispatch.java     |   71 -
 .../org/gradle/listener/ListenerBroadcast.java     |   26 -
 .../org/gradle/listener/ListenerManager.java       |   26 -
 .../groovy/org/gradle/logging/ConsoleOutput.java   |   39 -
 .../groovy/org/gradle/logging/ConsoleRenderer.java |   42 -
 .../org/gradle/logging/LoggingConfiguration.java   |   72 -
 .../org/gradle/logging/LoggingManagerInternal.java |   37 -
 .../org/gradle/logging/LoggingServiceRegistry.java |  154 -
 .../groovy/org/gradle/logging/ProgressLogger.java  |  126 -
 .../org/gradle/logging/ProgressLoggerFactory.java  |   40 -
 .../groovy/org/gradle/logging/ShowStacktrace.java  |   23 -
 .../org/gradle/logging/StandardOutputCapture.java  |   32 -
 .../org/gradle/logging/StyledTextOutput.java       |  160 -
 .../gradle/logging/StyledTextOutputFactory.java    |   55 -
 .../AbstractLineChoppingStyledTextOutput.java      |   77 -
 .../logging/internal/AbstractStyledTextOutput.java |  170 -
 .../internal/AbstractStyledTextOutputFactory.java  |   34 -
 .../org/gradle/logging/internal/AnsiConsole.java   |  247 -
 .../internal/BufferingStyledTextOutput.java        |   77 -
 .../logging/internal/CategorisedOutputEvent.java   |   42 -
 .../org/gradle/logging/internal/ColorMap.java      |   31 -
 .../org/gradle/logging/internal/Console.java       |   23 -
 .../internal/ConsoleBackedProgressRenderer.java    |   61 -
 .../logging/internal/ConsoleConfigureAction.java   |   64 -
 .../gradle/logging/internal/DefaultColorMap.java   |  138 -
 .../logging/internal/DefaultLoggingConfigurer.java |   37 -
 .../logging/internal/DefaultLoggingManager.java    |  228 -
 .../internal/DefaultLoggingManagerFactory.java     |   55 -
 .../internal/DefaultProgressLoggerFactory.java     |  183 -
 .../internal/DefaultStatusBarFormatter.java        |   56 -
 .../internal/DefaultStdErrLoggingSystem.java       |   37 -
 .../internal/DefaultStdOutLoggingSystem.java       |   37 -
 .../internal/DefaultStyledTextOutputFactory.java   |   35 -
 .../logging/internal/EmbeddedLoggingServices.java  |   27 -
 .../logging/internal/JavaUtilLoggingSystem.java    |   88 -
 .../groovy/org/gradle/logging/internal/Label.java  |   23 -
 .../internal/LinePrefixingStyledTextOutput.java    |   57 -
 .../org/gradle/logging/internal/LogEvent.java      |   53 -
 .../logging/internal/LogLevelChangeEvent.java      |   40 -
 .../internal/LoggingBackedStyledTextOutput.java    |   62 -
 .../internal/LoggingCommandLineConverter.java      |  178 -
 .../gradle/logging/internal/LoggingConfigurer.java |   22 -
 .../logging/internal/LoggingOutputInternal.java    |   74 -
 .../org/gradle/logging/internal/LoggingSystem.java |   44 -
 .../logging/internal/LoggingSystemAdapter.java     |   63 -
 .../gradle/logging/internal/NoOpLoggingSystem.java |   40 -
 .../org/gradle/logging/internal/OutputEvent.java   |   30 -
 .../logging/internal/OutputEventListener.java      |   20 -
 .../logging/internal/OutputEventRenderer.java      |  253 -
 .../logging/internal/PrintStreamLoggingSystem.java |  139 -
 .../logging/internal/ProgressCompleteEvent.java    |   49 -
 .../org/gradle/logging/internal/ProgressEvent.java |   43 -
 .../gradle/logging/internal/ProgressListener.java  |   25 -
 .../internal/ProgressLogEventGenerator.java        |  192 -
 .../logging/internal/ProgressLoggingBridge.java    |   37 -
 .../logging/internal/ProgressStartEvent.java       |   71 -
 .../logging/internal/RenderableOutputEvent.java    |   35 -
 .../logging/internal/StdErrLoggingSystem.java      |   20 -
 .../logging/internal/StdOutLoggingSystem.java      |   20 -
 .../StreamBackedStandardOutputListener.java        |   51 -
 .../internal/StreamingStyledTextOutput.java        |   65 -
 .../internal/StreamingStyledTextOutputFactory.java |   31 -
 .../internal/StyledTextOutputBackedRenderer.java   |   80 -
 .../logging/internal/StyledTextOutputEvent.java    |  116 -
 .../org/gradle/logging/internal/TextArea.java      |   22 -
 .../internal/TextStreamOutputEventListener.java    |   55 -
 .../internal/progress/ProgressOperation.java       |   50 -
 .../internal/progress/ProgressOperations.java      |   55 -
 .../slf4j/OutputEventListenerBackedLogger.java     |  472 --
 .../OutputEventListenerBackedLoggerContext.java    |  417 --
 .../internal/slf4j/Slf4jLoggingConfigurer.java     |   51 -
 .../collection/internal/BridgedCollections.java    |  105 -
 .../persist/AlwaysNewModelRegistryStore.java       |   36 -
 .../model/internal/persist/ModelRegistryStore.java |   26 -
 .../persist/ReusingModelRegistryStore.java         |   58 -
 .../gradle/plugin/use/PluginDependenciesSpec.java  |  110 -
 .../gradle/plugin/use/PluginDependencySpec.java    |   52 -
 .../plugin/use/internal/DefaultPluginRequest.java  |  106 -
 .../gradle/plugin/use/internal/PluginRequest.java  |   34 -
 .../use/internal/PluginRequestCollector.java       |  101 -
 .../use/internal/PluginRequestsSerializer.java     |   53 -
 .../PluginUseScriptBlockMetadataExtractor.java     |  164 -
 .../groovy/org/gradle/plugin/use/package-info.java |   20 -
 .../groovy/org/gradle/process/JavaExecSpec.java    |   94 -
 .../groovy/org/gradle/process/JavaForkOptions.java |  214 -
 .../org/gradle/process/ProcessForkOptions.java     |  109 -
 .../internal/AbstractExecHandleBuilder.java        |  153 -
 .../gradle/process/internal/DefaultExecAction.java |   35 -
 .../process/internal/DefaultExecActionFactory.java |   32 -
 .../gradle/process/internal/DefaultExecHandle.java |  384 --
 .../process/internal/DefaultJavaForkOptions.java   |  143 -
 .../internal/DefaultProcessForkOptions.java        |  101 -
 .../process/internal/DefaultWorkerProcess.java     |  180 -
 .../internal/DefaultWorkerProcessFactory.java      |  116 -
 .../gradle/process/internal/ExecActionFactory.java |   25 -
 .../org/gradle/process/internal/ExecHandle.java    |   59 -
 .../gradle/process/internal/ExecHandleBuilder.java |  152 -
 .../process/internal/JavaExecHandleBuilder.java    |  222 -
 .../org/gradle/process/internal/JvmOptions.java    |  317 --
 .../org/gradle/process/internal/WorkerProcess.java |   35 -
 .../process/internal/WorkerProcessBuilder.java     |  122 -
 .../process/internal/WorkerProcessContext.java     |   38 -
 .../internal/child/ActionExecutionWorker.java      |  102 -
 ...nClassesInIsolatedClassLoaderWorkerFactory.java |  106 -
 ...ionClassesInSystemClassLoaderWorkerFactory.java |  133 -
 .../internal/child/BootstrapSecurityManager.java   |   94 -
 .../process/internal/child/EncodedStream.java      |   86 -
 .../child/ImplementationClassLoaderWorker.java     |   97 -
 .../IsolatedApplicationClassLoaderWorker.java      |   56 -
 .../child/SystemApplicationClassLoaderWorker.java  |   57 -
 .../process/internal/child/WorkerContext.java      |   21 -
 .../process/internal/child/WorkerFactory.java      |   26 -
 .../child/WorkerProcessClassPathProvider.java      |  180 -
 .../internal/launcher/GradleWorkerMain.java        |   81 -
 .../launcher/IsolatedGradleWorkerMain.java         |   59 -
 .../process/internal/streams/SafeStreams.java      |   38 -
 .../process/internal/streams/StreamsForwarder.java |   80 -
 .../groovy/org/gradle/profile/BuildProfile.java    |  254 -
 .../org/gradle/profile/ProfileEventAdapter.java    |  122 -
 .../org/gradle/reporting/HtmlReportRenderer.java   |  175 -
 .../org/gradle/reporting/TabbedPageRenderer.java   |   96 -
 .../groovy/org/gradle/reporting/TabsRenderer.java  |   68 -
 .../org/gradle/testfixtures/ProjectBuilder.java    |  101 -
 .../internal/InMemoryCacheFactory.java             |  118 -
 .../testfixtures/internal/ProjectBuilderImpl.java  |  115 -
 .../internal/TestBuildScopeServices.java           |   49 -
 .../internal/TestGlobalScopeServices.java          |   31 -
 .../provider/model/ToolingModelBuilder.java        |   29 -
 .../DefaultToolingModelBuilderRegistry.java        |   64 -
 .../tooling/provider/model/package-info.java       |   20 -
 .../src/main/groovy/org/gradle/util/AntUtil.java   |   45 -
 .../org/gradle/util/AvailablePortFinder.java       |  117 -
 .../main/groovy/org/gradle/util/ConfigureUtil.java |  133 -
 .../src/main/groovy/org/gradle/util/DiffUtil.java  |   61 -
 .../org/gradle/util/DistributionLocator.java       |   47 -
 .../main/groovy/org/gradle/util/GFileUtils.java    |  298 --
 .../org/gradle/util/LineBufferingOutputStream.java |  113 -
 .../util/LinePerThreadBufferingOutputStream.java   |  216 -
 .../org/gradle/util/SingleMessageLogger.java       |  190 -
 .../groovy/org/slf4j/impl/StaticLoggerBinder.java  |   51 -
 .../{groovy => java}/org/gradle/BuildAdapter.java  |    0
 .../{groovy => java}/org/gradle/BuildListener.java |    0
 .../core/src/main/java/org/gradle/BuildResult.java |   66 +
 .../src/main/java/org/gradle/StartParameter.java   |  776 +++
 .../org/gradle/TaskExecutionRequest.java           |    0
 .../src/main/java/org/gradle/api/AntBuilder.java   |  120 +
 .../org/gradle/api/BuildCancelledException.java    |    0
 .../{groovy => java}/org/gradle/api/Buildable.java |    0
 .../org/gradle/api/CircularReferenceException.java |    0
 .../org/gradle/api/DefaultTask.java                |    0
 .../org/gradle/api/DomainObjectCollection.java     |  145 +
 .../org/gradle/api/DomainObjectSet.java            |    0
 ...ExtensiblePolymorphicDomainObjectContainer.java |    0
 .../org/gradle/api/GradleScriptException.java      |    0
 .../org/gradle/api/IllegalDependencyNotation.java  |    0
 .../org/gradle/api/InvalidUserCodeException.java   |    0
 .../org/gradle/api/InvalidUserDataException.java   |    0
 .../gradle/api/NamedDomainObjectCollection.java    |  206 +
 .../org/gradle/api/NamedDomainObjectContainer.java |    0
 .../org/gradle/api/NamedDomainObjectFactory.java   |    0
 .../org/gradle/api/NamedDomainObjectList.java      |    0
 .../org/gradle/api/NamedDomainObjectSet.java       |    0
 .../org/gradle/api/NonExtensible.java              |    0
 .../org/gradle/api/PathValidation.java             |    0
 .../{groovy => java}/org/gradle/api/Plugin.java    |    0
 .../api/PolymorphicDomainObjectContainer.java      |   85 +
 .../core/src/main/java/org/gradle/api/Project.java | 1496 ++++++
 .../gradle/api/ProjectConfigurationException.java  |    0
 .../org/gradle/api/ProjectEvaluationListener.java  |    0
 .../org/gradle/api/ProjectState.java               |    0
 .../main/{groovy => java}/org/gradle/api/Rule.java |    0
 .../{groovy => java}/org/gradle/api/Script.java    |    0
 .../core/src/main/java/org/gradle/api/Task.java    |  699 +++
 .../gradle/api/UnknownDomainObjectException.java   |    0
 .../org/gradle/api/UnknownProjectException.java    |    0
 .../org/gradle/api/UnknownTaskException.java       |    0
 .../org/gradle/api/XmlProvider.java                |    0
 .../gradle/api/artifacts/ArtifactIdentifier.java   |    0
 .../api/artifacts/ArtifactRepositoryContainer.java |   94 +
 .../org/gradle/api/artifacts/ClientModule.java     |    0
 .../gradle/api/artifacts/ComponentMetadata.java    |    0
 .../api/artifacts/ComponentMetadataDetails.java    |    0
 .../api/artifacts/ComponentModuleMetadata.java     |    0
 .../artifacts/ComponentModuleMetadataDetails.java  |    0
 .../gradle/api/artifacts/ComponentSelection.java   |    0
 .../api/artifacts/ComponentSelectionRules.java     |  143 +
 .../api/artifacts/ConfigurablePublishArtifact.java |    0
 .../org/gradle/api/artifacts/Configuration.java    |  458 ++
 .../api/artifacts/ConfigurationContainer.java      |  113 +
 .../org/gradle/api/artifacts/Dependency.java       |    0
 .../gradle/api/artifacts/DependencyArtifact.java   |   83 +
 .../artifacts/DependencyResolutionListener.java    |    0
 .../api/artifacts/DependencyResolveDetails.java    |    0
 .../org/gradle/api/artifacts/DependencySet.java    |    0
 .../api/artifacts/DependencySubstitution.java      |    0
 .../api/artifacts/DependencySubstitutions.java     |    0
 .../org/gradle/api/artifacts/ExcludeRule.java      |    0
 .../gradle/api/artifacts/ExcludeRuleContainer.java |    0
 .../gradle/api/artifacts/ExternalDependency.java   |    0
 .../api/artifacts/ExternalModuleDependency.java    |    0
 .../api/artifacts/FileCollectionDependency.java    |    0
 .../gradle/api/artifacts/LenientConfiguration.java |   68 +
 .../org/gradle/api/artifacts/ModuleDependency.java |  159 +
 .../org/gradle/api/artifacts/ModuleIdentifier.java |    0
 .../api/artifacts/ModuleVersionIdentifier.java     |    0
 .../api/artifacts/ModuleVersionSelector.java       |    0
 .../gradle/api/artifacts/ProjectDependency.java    |   45 +
 .../org/gradle/api/artifacts/PublishArtifact.java  |    0
 .../gradle/api/artifacts/PublishArtifactSet.java   |    0
 .../org/gradle/api/artifacts/PublishException.java |    0
 .../gradle/api/artifacts/ResolutionStrategy.java   |  288 ++
 .../api/artifacts/ResolvableDependencies.java      |    0
 .../org/gradle/api/artifacts/ResolveException.java |    0
 .../org/gradle/api/artifacts/ResolvedArtifact.java |    0
 .../api/artifacts/ResolvedConfiguration.java       |    0
 .../gradle/api/artifacts/ResolvedDependency.java   |    0
 .../api/artifacts/ResolvedModuleVersion.java       |    0
 .../api/artifacts/SelfResolvingDependency.java     |    0
 .../artifacts/UnknownConfigurationException.java   |    0
 .../api/artifacts/UnknownRepositoryException.java  |    0
 .../gradle/api/artifacts/UnresolvedDependency.java |    0
 .../artifacts/cache/ArtifactResolutionControl.java |    0
 .../cache/DependencyResolutionControl.java         |    0
 .../artifacts/cache/ModuleResolutionControl.java   |    0
 .../api/artifacts/cache/ResolutionControl.java     |    0
 .../api/artifacts/cache/ResolutionRules.java       |    0
 .../gradle/api/artifacts/cache/package-info.java   |   21 +
 .../api/artifacts/component/BuildIdentifier.java   |   37 +
 .../component/ComponentArtifactIdentifier.java     |    0
 .../artifacts/component/ComponentIdentifier.java   |    0
 .../api/artifacts/component/ComponentSelector.java |    0
 .../component/LibraryBinaryIdentifier.java         |   43 +
 .../component/LibraryComponentSelector.java        |   48 +
 .../component/ModuleComponentIdentifier.java       |    0
 .../component/ModuleComponentSelector.java         |    0
 .../component/ProjectComponentIdentifier.java      |   40 +
 .../component/ProjectComponentSelector.java        |   41 +
 .../api/artifacts/component/package-info.java      |   21 +
 .../gradle/api/artifacts/dsl/ArtifactHandler.java  |    0
 .../artifacts/dsl/ComponentMetadataHandler.java    |    0
 .../dsl/ComponentModuleMetadataHandler.java        |   60 +
 .../api/artifacts/dsl/DependencyHandler.java       |    0
 .../api/artifacts/dsl/RepositoryHandler.java       |    0
 .../org/gradle/api/artifacts/dsl/package-info.java |    0
 .../org/gradle/api/artifacts/ivy/IvyExtraInfo.java |    0
 .../api/artifacts/ivy/IvyModuleDescriptor.java     |    0
 .../org/gradle/api/artifacts/ivy/package-info.java |   21 +
 .../org/gradle/api/artifacts/package-info.java     |    0
 .../artifacts/query/ArtifactResolutionQuery.java   |   77 +
 .../gradle/api/artifacts/query/package-info.java   |    0
 .../artifacts/repositories/ArtifactRepository.java |   46 +
 .../repositories/AuthenticationContainer.java      |    0
 .../repositories/AuthenticationSupported.java      |    0
 .../FlatDirectoryArtifactRepository.java           |    0
 .../repositories/IvyArtifactRepository.java        |    0
 .../IvyArtifactRepositoryMetaDataProvider.java     |    0
 .../repositories/IvyPatternRepositoryLayout.java   |    0
 .../repositories/MavenArtifactRepository.java      |    0
 .../repositories/PasswordCredentials.java          |    0
 .../artifacts/repositories/RepositoryLayout.java   |    0
 .../api/artifacts/repositories/package-info.java   |    0
 .../artifacts/result/ArtifactResolutionResult.java |   50 +
 .../api/artifacts/result/ArtifactResult.java       |    0
 .../artifacts/result/ComponentArtifactsResult.java |    0
 .../api/artifacts/result/ComponentResult.java      |    0
 .../artifacts/result/ComponentSelectionReason.java |    0
 .../api/artifacts/result/DependencyResult.java     |    0
 .../api/artifacts/result/ResolutionResult.java     |    0
 .../artifacts/result/ResolvedArtifactResult.java   |   33 +
 .../artifacts/result/ResolvedComponentResult.java  |   86 +
 .../artifacts/result/ResolvedDependencyResult.java |    0
 .../artifacts/result/UnresolvedArtifactResult.java |   31 +
 .../result/UnresolvedComponentResult.java          |    0
 .../result/UnresolvedDependencyResult.java         |    0
 .../gradle/api/artifacts/result/package-info.java  |   21 +
 .../org/gradle/api/component/Artifact.java         |    0
 .../org/gradle/api/component/Component.java        |    0
 .../gradle/api/component/SoftwareComponent.java    |    0
 .../api/component/SoftwareComponentContainer.java  |    0
 .../org/gradle/api/component/package-info.java     |   23 +
 .../org/gradle/api/credentials/AwsCredentials.java |    0
 .../org/gradle/api/credentials/Credentials.java    |    0
 .../org/gradle/api/credentials/package-info.java   |   22 +
 .../org/gradle/api/dsl/ConventionProperty.java     |    0
 .../org/gradle/api/dsl/package-info.java           |    0
 .../gradle/api/execution/TaskActionListener.java   |   37 +
 .../gradle/api/execution/TaskExecutionAdapter.java |    0
 .../gradle/api/execution/TaskExecutionGraph.java   |  147 +
 .../api/execution/TaskExecutionGraphListener.java  |    0
 .../api/execution/TaskExecutionListener.java       |    0
 .../internal/InternalTaskExecutionListener.java    |    0
 .../api/execution/internal/TaskInputsListener.java |    0
 .../execution/internal/TaskOperationInternal.java  |    0
 .../org/gradle/api/execution/package-info.java     |    0
 .../api/file/ConfigurableFileCollection.java       |    0
 .../org/gradle/api/file/ConfigurableFileTree.java  |    0
 .../org/gradle/api/file/ContentFilterable.java     |   93 +
 .../org/gradle/api/file/CopyProcessingSpec.java    |  141 +
 .../java/org/gradle/api/file/CopySourceSpec.java   |   50 +
 .../main/java/org/gradle/api/file/CopySpec.java    |  396 ++
 .../main/java/org/gradle/api/file/DeleteSpec.java  |   40 +
 .../org/gradle/api/file/DirectoryTree.java         |    0
 .../api/file/DuplicateFileCopyingException.java    |    0
 .../org/gradle/api/file/DuplicatesStrategy.java    |    0
 .../org/gradle/api/file/EmptyFileVisitor.java      |    0
 .../java/org/gradle/api/file/FileCollection.java   |  194 +
 .../java/org/gradle/api/file/FileCopyDetails.java  |  134 +
 .../main/java/org/gradle/api/file/FileTree.java    |  104 +
 .../java/org/gradle/api/file/FileTreeElement.java  |  106 +
 .../org/gradle/api/file/FileVisitDetails.java      |    0
 .../main/java/org/gradle/api/file/FileVisitor.java |   35 +
 .../java/org/gradle/api/file/RelativePath.java     |  264 +
 .../org/gradle/api/file/SourceDirectorySet.java    |  101 +
 .../api/file/UnableToDeleteFileException.java      |    0
 .../org/gradle/api/file/package-info.java          |    0
 .../initialization/ConfigurableIncludedBuild.java  |   43 +
 .../gradle/api/initialization/IncludedBuild.java   |   45 +
 .../api/initialization/ProjectDescriptor.java      |    0
 .../org/gradle/api/initialization/Settings.java    |  193 +
 .../api/initialization/dsl/ScriptHandler.java      |    0
 .../api/initialization/dsl/package-info.java       |    0
 .../gradle/api/initialization/package-info.java    |    0
 .../api/internal/AbstractClassGenerator.java       |  432 ++
 .../AbstractNamedDomainObjectContainer.java        |   82 +
 .../AbstractPolymorphicDomainObjectContainer.java  |  150 +
 .../java/org/gradle/api/internal/AbstractTask.java |  799 +++
 .../api/internal/AsmBackedClassGenerator.java      |  970 ++++
 .../gradle/api/internal/ChainingTransformer.java   |    0
 .../org/gradle/api/internal/ClassGenerator.java    |    0
 .../internal/ClassGeneratorBackedInstantiator.java |    0
 .../org/gradle/api/internal/ClassPathProvider.java |    0
 .../org/gradle/api/internal/ClassPathRegistry.java |    0
 .../api/internal/CompositeDomainObjectSet.java     |  184 +
 .../gradle/api/internal/ConfigureByMapAction.java  |    0
 .../gradle/api/internal/ConventionAwareHelper.java |  147 +
 .../org/gradle/api/internal/ConventionMapping.java |    0
 .../org/gradle/api/internal/ConventionTask.java    |    0
 .../api/internal/DefaultClassPathProvider.java     |   53 +
 .../api/internal/DefaultClassPathRegistry.java     |    0
 .../internal/DefaultDomainObjectCollection.java    |  303 ++
 .../api/internal/DefaultDomainObjectSet.java       |    0
 .../DefaultNamedDomainObjectCollection.java        |  476 ++
 .../api/internal/DefaultNamedDomainObjectList.java |    0
 .../api/internal/DefaultNamedDomainObjectSet.java  |   88 +
 .../DefaultPolymorphicDomainObjectContainer.java   |    0
 .../DefaultPolymorphicNamedEntityInstantiator.java |    0
 .../api/internal/DelegatingDomainObjectSet.java    |  136 +
 .../api/internal/DependencyClassPathProvider.java  |   71 +
 .../internal/DependencyInjectingInstantiator.java  |  182 +
 .../internal/DependencyInjectingServiceLoader.java |   65 +
 .../gradle/api/internal/DocumentationRegistry.java |    0
 .../org/gradle/api/internal/DomNode.java           |    0
 .../gradle/api/internal/DomainObjectContext.java   |    0
 .../internal/DynamicModulesClassPathProvider.java  |    0
 .../gradle/api/internal/DynamicObjectAware.java    |   35 +
 .../org/gradle/api/internal/DynamicObjectUtil.java |   33 +
 .../gradle/api/internal/DynamicPropertyNamer.java  |   48 +
 .../org/gradle/api/internal/ExceptionAnalyser.java |    0
 .../api/internal/ExtensibleDynamicObject.java      |  255 +
 ...lePolymorphicDomainObjectContainerInternal.java |    0
 .../FactoryNamedDomainObjectContainer.java         |    0
 .../org/gradle/api/internal/GradleInternal.java    |   94 +
 .../org/gradle/api/internal/HasConvention.java     |    0
 .../org/gradle/api/internal/IConventionAware.java  |    0
 ...amedDomainObjectContainerConfigureDelegate.java |   43 +
 .../gradle/api/internal/NoConventionMapping.java   |    0
 .../NoFactoryRegisteredForTypeException.java       |    0
 .../api/internal/NoNamingPropertyException.java    |   23 +
 .../api/internal/NullNamingPropertyException.java  |   23 +
 ...phicDomainObjectContainerConfigureDelegate.java |   48 +
 .../PolymorphicDomainObjectContainerInternal.java  |    0
 .../PolymorphicNamedEntityInstantiator.java        |    0
 .../org/gradle/api/internal/ProcessOperations.java |    0
 .../gradle/api/internal/PropertiesTransformer.java |    0
 .../ReflectiveNamedDomainObjectFactory.java        |    0
 .../org/gradle/api/internal/SettingsInternal.java  |   53 +
 .../gradle/api/internal/TaskExecutionHistory.java  |    0
 .../gradle/api/internal/TaskInputsInternal.java    |   36 +
 .../java/org/gradle/api/internal/TaskInternal.java |   80 +
 .../gradle/api/internal/TaskOutputsInternal.java   |  123 +
 .../api/internal/ThreadGlobalInstantiator.java     |   63 +
 .../TypedDomainObjectContainerWrapper.java         |  231 +
 .../org/gradle/api/internal/UserCodeAction.java    |    0
 .../internal/artifacts/BaseRepositoryFactory.java  |    0
 .../artifacts/CachingDependencyResolveContext.java |   78 +
 .../DefaultArtifactRepositoryContainer.java        |  116 +
 .../internal/artifacts/DefaultDependencySet.java   |   66 +
 .../api/internal/artifacts/DefaultExcludeRule.java |    0
 .../artifacts/DefaultExcludeRuleContainer.java     |   45 +
 .../api/internal/artifacts/DefaultModule.java      |   56 +
 .../artifacts/DefaultPublishArtifactSet.java       |   82 +
 .../artifacts/DependencyManagementServices.java    |    0
 .../artifacts/DependencyResolutionServices.java    |    0
 .../artifacts/DependencyResolveContext.java        |   27 +
 .../DependencyResolveDetailsInternal.java          |    0
 .../artifacts/DependencySubstitutionInternal.java  |    0
 .../artifacts/ExcludeRuleNotationConverter.java    |    0
 .../org/gradle/api/internal/artifacts/Module.java  |   38 +
 .../artifacts/ModuleVersionSelectorStrictSpec.java |    0
 .../internal/artifacts/ProjectBackedModule.java    |   71 +
 .../internal/artifacts/ResolvableDependency.java   |    0
 .../configurations/DependencyMetaDataProvider.java |   22 +
 .../configurations/dynamicversion/CachePolicy.java |    0
 .../artifacts/dependencies/AbstractDependency.java |    0
 .../AbstractExternalModuleDependency.java          |    0
 .../dependencies/AbstractModuleDependency.java     |  141 +
 .../dependencies/DefaultClientModule.java          |   93 +
 .../dependencies/DefaultDependencyArtifact.java    |  122 +
 .../DefaultExternalModuleDependency.java           |   74 +
 .../dependencies/DefaultProjectDependency.java     |  225 +
 .../DefaultSelfResolvingDependency.java            |    0
 .../dependencies/ProjectDependencyInternal.java    |   36 +
 .../artifacts/dsl/DefaultRepositoryHandler.java    |  103 +
 .../dsl/dependencies/DefaultDependencyHandler.java |    0
 .../dsl/dependencies/DependencyFactory.java        |    0
 .../dsl/dependencies/ModuleFactoryDelegate.java    |   90 +
 .../dsl/dependencies/ModuleFactoryHelper.java      |    0
 .../artifacts/dsl/dependencies/ProjectFinder.java  |   36 +
 .../dsl/dependencies/UnknownProjectFinder.java     |   38 +
 .../artifacts/publish/AbstractPublishArtifact.java |   43 +
 .../artifacts/publish/ArchivePublishArtifact.java  |    0
 .../artifacts/publish/DefaultPublishArtifact.java  |    0
 .../query/ArtifactResolutionQueryFactory.java      |    0
 .../repositories/ArtifactRepositoryInternal.java   |    0
 .../repositories/DefaultPasswordCredentials.java   |    0
 .../org/gradle/api/internal/cache/BinaryStore.java |   42 +
 .../org/gradle/api/internal/cache/Cache.java       |    0
 .../api/internal/cache/CacheAccessSerializer.java  |    0
 .../gradle/api/internal/cache/CacheSupport.java    |   35 +
 .../cache/DefaultGeneratedGradleJarCache.java      |   66 +
 .../internal/cache/GeneratedGradleJarCache.java    |   42 +
 .../internal/cache/HeapProportionalCacheSizer.java |   62 +
 .../org/gradle/api/internal/cache/Loader.java      |    0
 .../gradle/api/internal/cache/MapBackedCache.java  |    0
 .../api/internal/cache/MinimalPersistentCache.java |    0
 .../cache/SingleOperationPersistentStore.java      |   99 +
 .../org/gradle/api/internal/cache/Stash.java       |    0
 .../org/gradle/api/internal/cache/Store.java       |    0
 .../changedetection/TaskArtifactState.java         |   66 +
 .../TaskArtifactStateRepository.java               |    0
 .../changes/ChangesOnlyIncrementalTaskInputs.java  |   57 +
 .../DefaultTaskArtifactStateRepository.java        |  170 +
 .../changes/DiscoveredInputRecorder.java           |   32 +
 .../changes/IncrementalTaskInputsInternal.java     |   26 +
 .../changes/NoHistoryArtifactState.java            |   65 +
 .../changes/RebuildIncrementalTaskInputs.java      |   73 +
 .../ShortCircuitTaskArtifactStateRepository.java   |  109 +
 .../changes/StatefulIncrementalTaskInputs.java     |   67 +
 .../AbstractNamedFileSnapshotTaskStateChanges.java |  137 +
 .../rules/CachingTaskStateChanges.java             |    0
 .../internal/changedetection/rules/ChangeType.java |   33 +
 .../changedetection/rules/DescriptiveChange.java   |    0
 .../rules/DiscoveredInputsListener.java            |   24 +
 .../rules/DiscoveredInputsTaskStateChanges.java    |   92 +
 .../internal/changedetection/rules/FileChange.java |   86 +
 .../rules/InputFilesTaskStateChanges.java          |   42 +
 .../rules/InputPropertiesTaskStateChanges.java     |   56 +
 .../rules/NoHistoryTaskStateChanges.java           |   36 +
 .../rules/OutputFilesTaskStateChanges.java         |   74 +
 .../rules/SimpleTaskStateChanges.java              |    0
 .../rules/SummaryTaskStateChanges.java             |    0
 .../changedetection/rules/TaskStateChange.java     |    0
 .../changedetection/rules/TaskStateChanges.java    |    0
 .../rules/TaskTypeTaskStateChanges.java            |   90 +
 .../changedetection/rules/TaskUpToDateState.java   |   87 +
 .../state/AbstractNormalizedFileSnapshot.java      |   73 +
 .../state/CacheBackedFileSnapshotRepository.java   |   45 +
 .../state/CacheBackedTaskHistoryRepository.java    |  423 ++
 .../changedetection/state/CacheCapSizer.java       |   65 +
 .../state/CachingFileSnapshotter.java              |  119 +
 .../state/DefaultFileCollectionSnapshot.java       |  125 +
 .../state/DefaultFileCollectionSnapshotter.java    |  193 +
 .../changedetection/state/DefaultFileDetails.java  |   58 +
 .../state/DefaultNormalizedFileSnapshot.java       |   31 +
 .../state/DefaultTaskHistoryStore.java             |   57 +
 .../changedetection/state/DirSnapshot.java         |   52 +
 .../state/FileCollectionSnapshot.java              |   51 +
 .../state/FileCollectionSnapshotter.java           |   49 +
 .../changedetection/state/FileDetails.java         |   55 +
 .../changedetection/state/FileHashSnapshot.java    |   78 +
 .../changedetection/state/FileSnapshot.java        |   23 +
 .../state/FileSnapshotRepository.java              |    0
 .../changedetection/state/FileSnapshotter.java     |   40 +
 .../state/IgnoredPathFileSnapshot.java             |   69 +
 .../state/InMemoryDecoratedCache.java              |  106 +
 .../state/InMemoryTaskArtifactCache.java           |  102 +
 .../state/IncrementalFileSnapshot.java             |   28 +
 .../state/IndexedNormalizedFileSnapshot.java       |   41 +
 .../state/InputPropertiesSerializer.java           |    0
 .../state/LoggingEvictionListener.java             |   55 +
 .../state/MapMergeChangeListener.java              |   41 +
 .../changedetection/state/MissingFileSnapshot.java |   52 +
 .../state/MissingFileVisitDetails.java             |   96 +
 .../state/NonNormalizedFileSnapshot.java           |   31 +
 .../state/NormalizedFileSnapshot.java              |   30 +
 ...InsensitiveTaskFilePropertyCompareStrategy.java |  227 +
 ...erSensitiveTaskFilePropertyCompareStrategy.java |   93 +
 .../state/OutputFilesCollectionSnapshotter.java    |  116 +
 ...ShortLivedProcessInMemoryTaskArtifactCache.java |   35 +
 .../state/SnapshotMapSerializer.java               |  129 +
 .../state/SnapshotNormalizationStrategy.java       |   28 +
 .../changedetection/state/TaskExecution.java       |  201 +
 .../state/TaskExecutionSnapshot.java               |   81 +
 .../state/TaskFilePropertyCompareStrategy.java     |  139 +
 ...kFilePropertySnapshotNormalizationStrategy.java |  130 +
 .../state/TaskHistoryRepository.java               |    0
 .../changedetection/state/TaskHistoryStore.java    |   24 +
 .../internal/classloading/GroovySystemLoader.java  |    0
 .../classloading/GroovySystemLoaderFactory.java    |    0
 .../LeakyOnJava7GroovySystemLoader.java            |  114 +
 .../classloading/NoOpGroovySystemLoader.java       |    0
 .../internal/classpath/DefaultModuleRegistry.java  |  316 ++
 .../classpath/DefaultPluginModuleRegistry.java     |    0
 .../api/internal/classpath/EffectiveClassPath.java |    0
 .../api/internal/classpath/ManifestUtil.java       |    0
 .../org/gradle/api/internal/classpath/Module.java  |    0
 .../api/internal/classpath/ModuleRegistry.java     |    0
 .../internal/classpath/PluginModuleRegistry.java   |    0
 .../internal/classpath/UnknownModuleException.java |    0
 .../coerce/MethodArgumentsTransformer.java         |   33 +
 .../internal/coerce/PropertySetTransformer.java    |   21 +
 .../internal/coerce/StringToEnumTransformer.java   |   77 +
 .../collections/CollectionEventRegister.java       |   80 +
 .../api/internal/collections/CollectionFilter.java |   63 +
 .../internal/collections/FilteredCollection.java   |    0
 .../api/internal/collections/FilteredList.java     |    0
 .../api/internal/collections/FilteredSet.java      |    0
 .../api/internal/component/ArtifactType.java       |   26 +
 .../internal/component/BuildableJavaComponent.java |    0
 .../api/internal/component/ComponentRegistry.java  |    0
 .../component/ComponentTypeRegistration.java       |    0
 .../internal/component/ComponentTypeRegistry.java  |    0
 .../component/DefaultComponentTypeRegistry.java    |    0
 .../DefaultSoftwareComponentContainer.java         |    0
 .../component/SoftwareComponentInternal.java       |    0
 .../org/gradle/api/internal/component/Usage.java   |    0
 .../api/internal/file/AbstractFileCollection.java  |  243 +
 .../api/internal/file/AbstractFileResolver.java    |  193 +
 .../api/internal/file/AbstractFileResource.java    |   52 +
 .../gradle/api/internal/file/AbstractFileTree.java |  173 +
 .../api/internal/file/AbstractFileTreeElement.java |  104 +
 .../internal/file/AntFileCollectionBuilder.java    |   49 +
 .../file/AntFileCollectionMatchingTaskBuilder.java |   74 +
 .../api/internal/file/AntFileSetBuilder.java       |   51 +
 .../api/internal/file/AntFileTreeBuilder.java      |   54 +
 .../api/internal/file/BaseDirFileResolver.java     |   78 +
 .../api/internal/file/BasicFileResolver.java       |   63 +
 .../api/internal/file/CompositeFileCollection.java |  188 +
 .../api/internal/file/CompositeFileTree.java       |  110 +
 .../file/CopyActionProcessingStreamAction.java     |    0
 .../internal/file/DefaultCompositeFileTree.java    |    0
 .../file/DefaultFileCollectionFactory.java         |   74 +
 .../api/internal/file/DefaultFileLookup.java       |   45 +
 .../api/internal/file/DefaultFileOperations.java   |  182 +
 .../api/internal/file/DefaultFileTreeElement.java  |   75 +
 .../api/internal/file/DefaultFileVisitDetails.java |   72 +
 .../internal/file/DefaultSourceDirectorySet.java   |  247 +
 .../file/DefaultSourceDirectorySetFactory.java     |   39 +
 .../file/DefaultTemporaryFileProvider.java         |   65 +
 .../api/internal/file/FileCollectionFactory.java   |   57 +
 .../api/internal/file/FileCollectionInternal.java  |   44 +
 .../api/internal/file/FileCollectionVisitor.java   |   27 +
 .../org/gradle/api/internal/file/FileLookup.java   |    0
 .../gradle/api/internal/file/FileNormaliser.java   |  155 +
 .../gradle/api/internal/file/FileOperations.java   |   62 +
 .../internal/file/FileOrUriNotationConverter.java  |    0
 .../org/gradle/api/internal/file/FileResolver.java |   47 +
 .../org/gradle/api/internal/file/FileResource.java |   40 +
 .../gradle/api/internal/file/FileSystemSubset.java |  163 +
 .../gradle/api/internal/file/FileTreeInternal.java |   24 +
 .../api/internal/file/IdentityFileResolver.java    |   51 +
 .../api/internal/file/ImmutableDirectoryTree.java  |    0
 .../api/internal/file/ImmutablePatternSet.java     |  104 +
 .../internal/file/MaybeCompressedFileResource.java |   77 +
 .../org/gradle/api/internal/file/RelativeFile.java |    0
 .../gradle/api/internal/file/RelativePathSpec.java |    0
 .../internal/file/SourceDirectorySetFactory.java   |   22 +
 .../api/internal/file/TemporaryFileProvider.java   |    0
 .../internal/file/TmpDirTemporaryFileProvider.java |   33 +
 .../api/internal/file/UnionFileCollection.java     |    0
 .../gradle/api/internal/file/UnionFileTree.java    |    0
 .../file/UnknownBackingFileReadableResource.java   |   59 +
 .../api/internal/file/ant/AntFileResource.java     |    0
 .../api/internal/file/ant/BaseDirSelector.java     |    0
 .../api/internal/file/archive/TarCopyAction.java   |    0
 .../api/internal/file/archive/TarFileTree.java     |  220 +
 .../api/internal/file/archive/ZipCopyAction.java   |    0
 .../api/internal/file/archive/ZipFileTree.java     |  187 +
 .../file/archive/compression/AbstractArchiver.java |   55 +
 .../compression/ArchiveOutputStreamFactory.java    |   34 +
 .../file/archive/compression/Bzip2Archiver.java    |   67 +
 .../compression/CompressedReadableResource.java    |   22 +
 .../file/archive/compression/GzipArchiver.java     |   62 +
 .../file/archive/compression/SimpleCompressor.java |    0
 ...pendenciesOnlyFileCollectionResolveContext.java |   90 +
 .../DefaultConfigurableFileCollection.java         |   99 +
 .../collections/DefaultConfigurableFileTree.java   |  178 +
 .../DefaultDirectoryFileTreeFactory.java           |   54 +
 .../file/collections/DefaultDirectoryWalker.java   |   77 +
 .../collections/DefaultDirectoryWalkerFactory.java |   68 +
 .../DefaultFileCollectionResolveContext.java       |  243 +
 .../file/collections/DirectoryFileTree.java        |  186 +
 .../file/collections/DirectoryFileTreeFactory.java |   27 +
 .../internal/file/collections/DirectoryTrees.java  |   40 +
 .../internal/file/collections/DirectoryWalker.java |   29 +
 .../collections/FileBackedDirectoryFileTree.java   |    0
 .../file/collections/FileCollectionAdapter.java    |    0
 .../file/collections/FileCollectionContainer.java  |    0
 .../collections/FileCollectionResolveContext.java  |   56 +
 .../collections/FileSystemMirroringFileTree.java   |    0
 .../internal/file/collections/FileTreeAdapter.java |  127 +
 .../LazilyInitializedFileCollection.java           |    0
 .../file/collections/ListBackedFileSet.java        |    0
 .../internal/file/collections/LocalFileTree.java   |    0
 .../api/internal/file/collections/MapFileTree.java |  252 +
 .../file/collections/MinimalFileCollection.java    |    0
 .../internal/file/collections/MinimalFileSet.java  |    0
 .../internal/file/collections/MinimalFileTree.java |   39 +
 .../collections/PatternFilterableFileTree.java     |    0
 .../collections/RandomAccessFileCollection.java    |    0
 .../ResolvableFileCollectionResolveContext.java    |    0
 .../file/collections/SimpleFileCollection.java     |    0
 .../collections/SingleIncludePatternFileTree.java  |  145 +
 .../file/collections/SingletonFileSet.java         |   42 +
 .../file/collections/SingletonFileTree.java        |   63 +
 .../file/collections/jdk7/Jdk7DirectoryWalker.java |  127 +
 .../file/copy/ClosureBackedTransformer.java        |   33 +
 .../gradle/api/internal/file/copy/CopyAction.java  |    0
 .../api/internal/file/copy/CopyActionExecuter.java |    0
 .../file/copy/CopyActionProcessingStream.java      |    0
 .../internal/file/copy/CopyFileVisitorImpl.java    |    0
 .../api/internal/file/copy/CopySpecActionImpl.java |    0
 .../CopySpecBackedCopyActionProcessingStream.java  |    0
 .../api/internal/file/copy/CopySpecInternal.java   |   82 +
 .../api/internal/file/copy/CopySpecResolver.java   |   55 +
 .../api/internal/file/copy/CopySpecSource.java     |    0
 .../api/internal/file/copy/CopySpecWrapper.java    |  272 ++
 .../api/internal/file/copy/DefaultCopySpec.java    |  731 +++
 .../internal/file/copy/DefaultFileCopyDetails.java |  229 +
 .../internal/file/copy/DefaultZipCompressor.java   |   48 +
 .../file/copy/DelegatingCopySpecInternal.java      |  274 ++
 .../file/copy/DestinationRootCopySpec.java         |   52 +
 .../copy/DuplicateHandlingCopyActionDecorator.java |    0
 .../gradle/api/internal/file/copy/FileCopier.java  |    0
 .../api/internal/file/copy/FileCopyAction.java     |   50 +
 .../file/copy/FileCopyDetailsInternal.java         |    0
 .../gradle/api/internal/file/copy/FilterChain.java |  129 +
 .../gradle/api/internal/file/copy/LineFilter.java  |  121 +
 .../api/internal/file/copy/MatchingCopyAction.java |    0
 .../file/copy/NormalizingCopyActionDecorator.java  |  210 +
 .../internal/file/copy/PathNotationConverter.java  |   71 +
 .../api/internal/file/copy/RegExpNameMapper.java   |    0
 .../api/internal/file/copy/RenamingCopyAction.java |   38 +
 .../internal/file/copy/SingleParentCopySpec.java   |   66 +
 .../file/copy/SyncCopyActionDecorator.java         |  113 +
 .../api/internal/file/copy/ZipCompressor.java      |   28 +
 .../internal/file/delete/DefaultDeleteSpec.java    |   51 +
 .../internal/file/delete/DeleteSpecInternal.java   |   37 +
 .../gradle/api/internal/file/delete/Deleter.java   |  112 +
 .../file/pattern/AnyWildcardPatternStep.java       |    0
 .../internal/file/pattern/EndOfPathMatcher.java    |    0
 .../internal/file/pattern/FixedPatternStep.java    |    0
 .../file/pattern/FixedStepsPathMatcher.java        |    0
 .../internal/file/pattern/GreedyPathMatcher.java   |    0
 .../pattern/HasPrefixAndSuffixPatternStep.java     |   32 +
 .../file/pattern/HasPrefixPatternStep.java         |   36 +
 .../file/pattern/HasSuffixPatternStep.java         |   48 +
 .../api/internal/file/pattern/PathMatcher.java     |    0
 .../file/pattern/PatternMatcherFactory.java        |   84 +
 .../api/internal/file/pattern/PatternStep.java     |   20 +
 .../internal/file/pattern/PatternStepFactory.java  |  106 +
 .../internal/file/pattern/RegExpPatternStep.java   |    0
 .../gradle/api/internal/hash/DefaultHasher.java    |   41 +
 .../java/org/gradle/api/internal/hash/Hasher.java  |   24 +
 .../initialization/AbstractClassLoaderScope.java   |   48 +
 .../initialization/BasicDomainObjectContext.java   |    0
 .../internal/initialization/ClassLoaderIds.java    |    0
 .../internal/initialization/ClassLoaderScope.java  |    0
 .../initialization/ClassLoaderScopeIdentifier.java |  118 +
 .../initialization/DefaultClassLoaderScope.java    |  239 +
 .../initialization/DefaultScriptHandler.java       |  128 +
 .../DefaultScriptHandlerFactory.java               |   51 +
 .../initialization/RootClassLoaderScope.java       |   77 +
 .../initialization/ScriptHandlerFactory.java       |    0
 .../initialization/ScriptHandlerInternal.java      |    0
 .../loadercache/ClassLoaderCache.java              |   51 +
 .../initialization/loadercache/ClassLoaderId.java  |    0
 .../loadercache/DefaultClassLoaderCache.java       |  222 +
 .../loadercache/HashClassPathSnapshotter.java      |  106 +
 .../ClassloaderBackedPluginDescriptorLocator.java  |   38 +
 .../api/internal/plugins/DefaultAppliedPlugin.java |    0
 .../api/internal/plugins/DefaultConvention.java    |  245 +
 .../plugins/DefaultExtraPropertiesExtension.java   |   81 +
 .../plugins/DefaultObjectConfigurationAction.java  |  139 +
 .../internal/plugins/DefaultPluginCollection.java  |    0
 .../internal/plugins/DefaultPluginContainer.java   |    0
 .../api/internal/plugins/DefaultPluginManager.java |  220 +
 .../internal/plugins/DefaultPluginRegistry.java    |  229 +
 .../plugins/DefaultPotentialPluginWithId.java      |   67 +
 .../org/gradle/api/internal/plugins/DslObject.java |   93 +
 .../plugins/ExtensionContainerInternal.java        |    0
 .../api/internal/plugins/ExtensionsStorage.java    |  196 +
 .../ExtraPropertiesDynamicObjectAdapter.java       |   64 +
 .../plugins/ImperativeOnlyPluginApplicator.java    |    0
 .../plugins/PluginApplicationException.java        |    0
 .../api/internal/plugins/PluginApplicator.java     |    0
 .../api/internal/plugins/PluginAwareInternal.java  |    0
 .../api/internal/plugins/PluginDescriptor.java     |    0
 .../internal/plugins/PluginDescriptorLocator.java  |    0
 .../api/internal/plugins/PluginImplementation.java |    0
 .../api/internal/plugins/PluginInspector.java      |    0
 .../internal/plugins/PluginManagerInternal.java    |    0
 .../api/internal/plugins/PluginRegistry.java       |    0
 .../api/internal/plugins/PotentialPlugin.java      |    0
 .../plugins/RuleBasedPluginApplicator.java         |   63 +
 .../api/internal/project/AbstractPluginAware.java  |   53 +
 .../api/internal/project/DefaultAntBuilder.java    |  193 +
 .../internal/project/DefaultAntBuilderFactory.java |   50 +
 .../api/internal/project/DefaultProject.java       | 1082 ++++
 .../project/DefaultProjectAccessListener.java      |    0
 .../internal/project/DefaultProjectRegistry.java   |    0
 .../internal/project/DefaultProjectTaskLister.java |    0
 .../project/DeferredProjectConfiguration.java      |    0
 .../api/internal/project/IProjectFactory.java      |    0
 .../api/internal/project/IsolatedAntBuilder.java   |    0
 .../api/internal/project/ProjectFactory.java       |    0
 .../api/internal/project/ProjectIdentifier.java    |    0
 .../api/internal/project/ProjectInternal.java      |  100 +
 .../api/internal/project/ProjectRegistry.java      |    0
 .../gradle/api/internal/project/ProjectScript.java |   65 +
 .../api/internal/project/ProjectStateInternal.java |    0
 .../api/internal/project/ProjectTaskLister.java    |    0
 .../internal/project/ant/AntLoggingAdapter.java    |  119 +
 .../project/ant/AntLoggingAdapterFactory.java      |   22 +
 .../api/internal/project/ant/BasicAntBuilder.java  |  124 +
 .../ant/DefaultAntLoggingAdapterFactory.java       |   24 +
 .../project/antbuilder/AntBuilderDelegate.java     |  128 +
 .../internal/project/antbuilder/CacheEntry.java    |    0
 .../project/antbuilder/CachedClassLoader.java      |    0
 .../antbuilder/ClassPathToClassLoaderCache.java    |  149 +
 .../api/internal/project/antbuilder/Cleanup.java   |   64 +
 .../antbuilder/DefaultIsolatedAntBuilder.java      |  224 +
 .../project/antbuilder/FinalizerThread.java        |  105 +
 .../AbstractOutputPropertyAnnotationHandler.java   |   45 +
 ...tractPluralOutputPropertyAnnotationHandler.java |   72 +
 .../AnnotationProcessingTaskFactory.java           |   83 +
 .../ClasspathPropertyAnnotationHandler.java        |   66 +
 .../taskfactory/DefaultTaskClassInfoStore.java     |  167 +
 .../DefaultTaskClassValidatorExtractor.java        |  277 ++
 .../taskfactory/DependencyAutoWireTaskFactory.java |    0
 .../internal/project/taskfactory/ITaskFactory.java |    0
 .../InputDirectoryPropertyAnnotationHandler.java   |   60 +
 .../InputFilePropertyAnnotationHandler.java        |   55 +
 .../InputFilesPropertyAnnotationHandler.java       |   45 +
 .../InputPropertyAnnotationHandler.java            |   37 +
 .../NestedBeanPropertyAnnotationHandler.java       |   46 +
 .../taskfactory/NoOpPropertyAnnotationHandler.java |   35 +
 ...OutputDirectoriesPropertyAnnotationHandler.java |   60 +
 .../OutputDirectoryPropertyAnnotationHandler.java  |   59 +
 .../OutputFilePropertyAnnotationHandler.java       |   59 +
 .../OutputFilesPropertyAnnotationHandler.java      |   60 +
 .../taskfactory/PropertyAnnotationHandler.java     |   35 +
 .../taskfactory/PropertyAnnotationUtils.java       |   29 +
 .../project/taskfactory/TaskClassInfo.java         |   64 +
 .../project/taskfactory/TaskClassInfoStore.java    |   23 +
 .../project/taskfactory/TaskClassValidator.java    |   83 +
 .../taskfactory/TaskClassValidatorExtractor.java   |   23 +
 .../internal/project/taskfactory/TaskFactory.java  |  150 +
 .../taskfactory/TaskPropertyActionContext.java     |   75 +
 .../project/taskfactory/TaskPropertyInfo.java      |  128 +
 .../taskfactory/TaskPropertyValidationAccess.java  |   36 +
 .../project/taskfactory/TaskPropertyValue.java     |   27 +
 .../internal/project/taskfactory/UpdateAction.java |    0
 .../project/taskfactory/ValidationAction.java      |    0
 .../resources/CharSourceBackedTextResource.java    |   99 +
 .../internal/resources/DefaultResourceHandler.java |   47 +
 .../resources/DefaultTextResourceFactory.java      |    0
 .../FileCollectionBackedArchiveTextResource.java   |    0
 .../FileCollectionBackedTextResource.java          |  108 +
 .../resources/StringBackedTextResource.java        |   84 +
 .../gradle/api/internal/resources/URIBuilder.java  |    0
 .../rules/NamedDomainObjectFactoryRegistry.java    |    0
 .../gradle/api/internal/specs/ExplainingSpec.java  |    0
 .../gradle/api/internal/specs/ExplainingSpecs.java |    0
 .../api/internal/tasks/AbstractTaskDependency.java |    0
 .../tasks/AbstractTaskPropertyBuilder.java         |   57 +
 .../tasks/CacheableTaskOutputFilePropertySpec.java |   27 +
 .../tasks/CachingTaskDependencyResolveContext.java |    0
 .../internal/tasks/ClassLoaderAwareTaskAction.java |   28 +
 .../api/internal/tasks/ContextAwareTaskAction.java |   21 +
 .../api/internal/tasks/DefaultTaskCollection.java  |    0
 .../api/internal/tasks/DefaultTaskContainer.java   |  311 ++
 .../tasks/DefaultTaskContainerFactory.java         |  108 +
 .../api/internal/tasks/DefaultTaskDependency.java  |  156 +
 .../api/internal/tasks/DefaultTaskInputs.java      |  421 ++
 .../api/internal/tasks/DefaultTaskOutputs.java     |  508 ++
 .../internal/tasks/PublicTaskSpecification.java    |    0
 .../internal/tasks/RealizableTaskCollection.java   |  249 +
 .../api/internal/tasks/SimpleWorkResult.java       |    0
 .../api/internal/tasks/TaskContainerInternal.java  |   59 +
 .../internal/tasks/TaskDependencyContainer.java    |    0
 .../api/internal/tasks/TaskDependencyInternal.java |    0
 .../tasks/TaskDependencyResolveContext.java        |   45 +
 .../gradle/api/internal/tasks/TaskExecuter.java    |    0
 .../api/internal/tasks/TaskExecutionContext.java   |    0
 .../api/internal/tasks/TaskExecutionOutcome.java   |   49 +
 .../tasks/TaskFilePropertyBuilderInternal.java     |   31 +
 .../api/internal/tasks/TaskFilePropertySpec.java   |   27 +
 .../TaskInputFilePropertyBuilderInternal.java      |   50 +
 .../internal/tasks/TaskInputFilePropertySpec.java  |   20 +
 .../org/gradle/api/internal/tasks/TaskMutator.java |  113 +
 .../internal/tasks/TaskOutputFilePropertySpec.java |   20 +
 .../gradle/api/internal/tasks/TaskOutputsUtil.java |   60 +
 .../internal/tasks/TaskPropertyFileCollection.java |   55 +
 .../api/internal/tasks/TaskPropertySpec.java       |   21 +
 .../api/internal/tasks/TaskPropertyUtils.java      |   52 +
 .../api/internal/tasks/TaskReferenceResolver.java  |   34 +
 .../gradle/api/internal/tasks/TaskResolver.java    |   24 +
 .../api/internal/tasks/TaskStateInternal.java      |  113 +
 .../tasks/cache/DefaultTaskCacheKeyBuilder.java    |  146 +
 .../internal/tasks/cache/GZipTaskOutputPacker.java |   56 +
 .../tasks/cache/LocalDirectoryTaskOutputCache.java |   83 +
 .../tasks/cache/MapBasedTaskOutputCache.java       |   55 +
 .../internal/tasks/cache/TarTaskOutputPacker.java  |  215 +
 .../api/internal/tasks/cache/TaskCacheKey.java     |   21 +
 .../internal/tasks/cache/TaskCacheKeyBuilder.java  |   29 +
 .../cache/TaskExecutionStatisticsEventAdapter.java |   63 +
 .../api/internal/tasks/cache/TaskOutputCache.java  |   46 +
 .../tasks/cache/TaskOutputCacheFactory.java        |   23 +
 .../api/internal/tasks/cache/TaskOutputPacker.java |   29 +
 .../api/internal/tasks/cache/TaskOutputReader.java |   24 +
 .../api/internal/tasks/cache/TaskOutputWriter.java |   24 +
 .../tasks/cache/config/DefaultTaskCaching.java     |   63 +
 .../tasks/cache/config/TaskCachingInternal.java    |   24 +
 .../cache/statistics/TaskExecutionStatistics.java  |   61 +
 .../TaskExecutionStatisticsListener.java           |   21 +
 .../execution/CatchExceptionTaskExecuter.java      |   39 +
 .../execution/DefaultTaskExecutionContext.java     |    0
 .../execution/ExecuteActionsTaskExecuter.java      |  100 +
 .../execution/ExecuteAtMostOnceTaskExecuter.java   |   48 +
 .../ResolveTaskArtifactStateTaskExecuter.java      |   51 +
 .../tasks/execution/SkipCachedTaskExecuter.java    |  152 +
 .../SkipEmptySourceFilesTaskExecuter.java          |   90 +
 .../tasks/execution/SkipOnlyIfTaskExecuter.java    |   56 +
 .../execution/SkipTaskWithNoActionsExecuter.java   |   53 +
 .../tasks/execution/SkipUpToDateTaskExecuter.java  |   85 +
 .../execution/TaskOutputsGenerationListener.java   |   25 +
 .../internal/tasks/execution/TaskValidator.java    |    0
 .../tasks/execution/ValidatingTaskExecuter.java    |   60 +
 .../tasks/options/AbstractOptionElement.java       |   99 +
 .../internal/tasks/options/FieldOptionElement.java |   85 +
 .../tasks/options/InstanceOptionDescriptor.java    |   91 +
 .../tasks/options/MethodOptionElement.java         |   81 +
 .../gradle/api/internal/tasks/options/Option.java  |   47 +
 .../internal/tasks/options/OptionDescriptor.java   |   41 +
 .../api/internal/tasks/options/OptionElement.java  |   43 +
 .../api/internal/tasks/options/OptionReader.java   |  155 +
 .../tasks/options/OptionValidationException.java   |    0
 .../options/OptionValueNotationParserFactory.java  |   64 +
 .../api/internal/tasks/options/OptionValues.java   |   28 +
 .../java/org/gradle/api/invocation/Gradle.java     |  289 ++
 .../org/gradle/api/invocation/package-info.java    |    0
 .../org/gradle/api/package-info.java               |    0
 .../org/gradle/api/plugins/AppliedPlugin.java      |    0
 .../java/org/gradle/api/plugins/Convention.java    |   63 +
 .../gradle/api/plugins/DeferredConfigurable.java   |    0
 .../org/gradle/api/plugins/ExtensionAware.java     |   89 +
 .../org/gradle/api/plugins/ExtensionContainer.java |  107 +
 .../api/plugins/ExtraPropertiesExtension.java      |  181 +
 .../gradle/api/plugins/InvalidPluginException.java |    0
 .../api/plugins/ObjectConfigurationAction.java     |    0
 .../org/gradle/api/plugins/PluginAware.java        |    0
 .../org/gradle/api/plugins/PluginCollection.java   |    0
 .../org/gradle/api/plugins/PluginContainer.java    |    0
 .../api/plugins/PluginInstantiationException.java  |    0
 .../java/org/gradle/api/plugins/PluginManager.java |  106 +
 .../gradle/api/plugins/UnknownPluginException.java |    0
 .../org/gradle/api/plugins/package-info.java       |    0
 .../org/gradle/api/resources/ReadableResource.java |   34 +
 .../org/gradle/api/resources/Resource.java         |    0
 .../org/gradle/api/resources/ResourceHandler.java  |    0
 .../org/gradle/api/resources/TextResource.java     |   95 +
 .../gradle/api/resources/TextResourceFactory.java  |    0
 .../internal/ReadableResourceInternal.java         |   26 +
 .../resources/internal/TextResourceInternal.java   |   23 +
 .../org/gradle/api/resources/package-info.java     |    0
 .../org/gradle/api/specs/package-info.java         |    0
 .../org/gradle/api/tasks/AbstractCopyTask.java     |  573 +++
 .../org/gradle/api/tasks/AbstractExecTask.java     |  290 ++
 .../org/gradle/api/tasks/AntBuilderAware.java      |    0
 .../java/org/gradle/api/tasks/CacheableTask.java   |   39 +
 .../main/java/org/gradle/api/tasks/Classpath.java  |   39 +
 .../tasks/CompatibilityAdapterForTaskInputs.java   |   50 +
 .../tasks/CompatibilityAdapterForTaskOutputs.java  |   49 +
 .../main/java/org/gradle/api/tasks/Console.java    |   40 +
 .../org/gradle/api/tasks/Copy.java                 |    0
 .../src/main/java/org/gradle/api/tasks/Delete.java |  137 +
 .../org/gradle/api/tasks/Exec.java                 |    0
 .../java/org/gradle/api/tasks/GradleBuild.java     |  126 +
 .../org/gradle/api/tasks/Input.java                |    0
 .../org/gradle/api/tasks/InputDirectory.java       |    0
 .../org/gradle/api/tasks/InputFile.java            |    0
 .../org/gradle/api/tasks/InputFiles.java           |    0
 .../main/java/org/gradle/api/tasks/Internal.java   |   42 +
 .../main/java/org/gradle/api/tasks/JavaExec.java   |  477 ++
 .../org/gradle/api/tasks/Nested.java               |    0
 .../org/gradle/api/tasks/Optional.java             |    0
 .../java/org/gradle/api/tasks/OrderSensitive.java  |   40 +
 .../org/gradle/api/tasks/OutputDirectories.java    |   37 +
 .../org/gradle/api/tasks/OutputDirectory.java      |    0
 .../org/gradle/api/tasks/OutputFile.java           |    0
 .../java/org/gradle/api/tasks/OutputFiles.java     |   37 +
 .../org/gradle/api/tasks/ParallelizableTask.java   |    0
 .../java/org/gradle/api/tasks/PathSensitive.java   |   38 +
 .../java/org/gradle/api/tasks/PathSensitivity.java |   49 +
 .../org/gradle/api/tasks/SkipWhenEmpty.java        |    0
 .../main/java/org/gradle/api/tasks/SourceTask.java |  180 +
 .../org/gradle/api/tasks/StopActionException.java  |    0
 .../gradle/api/tasks/StopExecutionException.java   |    0
 .../src/main/java/org/gradle/api/tasks/Sync.java   |  139 +
 .../org/gradle/api/tasks/TaskAction.java           |    0
 .../java/org/gradle/api/tasks/TaskCaching.java     |   47 +
 .../org/gradle/api/tasks/TaskCollection.java       |    0
 .../java/org/gradle/api/tasks/TaskContainer.java   |  188 +
 .../org/gradle/api/tasks/TaskDependency.java       |    0
 .../gradle/api/tasks/TaskExecutionException.java   |    0
 .../gradle/api/tasks/TaskFilePropertyBuilder.java  |   36 +
 .../api/tasks/TaskInputFilePropertyBuilder.java    |  201 +
 .../main/java/org/gradle/api/tasks/TaskInputs.java |  149 +
 .../api/tasks/TaskInstantiationException.java      |    0
 .../api/tasks/TaskOutputFilePropertyBuilder.java   |  120 +
 .../java/org/gradle/api/tasks/TaskOutputs.java     |  108 +
 .../org/gradle/api/tasks/TaskPropertyBuilder.java  |   38 +
 .../java/org/gradle/api/tasks/TaskReference.java   |   27 +
 .../org/gradle/api/tasks/TaskState.java            |    0
 .../gradle/api/tasks/TaskValidationException.java  |    0
 .../org/gradle/api/tasks/VerificationTask.java     |    0
 .../org/gradle/api/tasks/WorkResult.java           |    0
 .../java/org/gradle/api/tasks/ant/AntTarget.java   |   92 +
 .../org/gradle/api/tasks/ant/package-info.java     |    0
 .../api/tasks/bundling/AbstractArchiveTask.java    |  211 +
 .../org/gradle/api/tasks/bundling/Compression.java |    0
 .../java/org/gradle/api/tasks/bundling/Tar.java    |   77 +
 .../java/org/gradle/api/tasks/bundling/Zip.java    |  144 +
 .../api/tasks/bundling/ZipEntryCompression.java    |    0
 .../bundling/internal/Zip64RequiredException.java  |    0
 .../gradle/api/tasks/bundling/package-info.java    |    0
 .../tasks/incremental/IncrementalTaskInputs.java   |    0
 .../api/tasks/incremental/InputFileDetails.java    |    0
 .../gradle/api/tasks/incremental/package-info.java |   21 +
 .../org/gradle/api/tasks/package-info.java         |    0
 .../gradle/api/tasks/util/PatternFilterable.java   |    0
 .../java/org/gradle/api/tasks/util/PatternSet.java |  318 ++
 .../util/internal/CachingPatternSpecFactory.java   |  180 +
 .../internal/PatternSetAntBuilderDelegate.java     |  103 +
 .../api/tasks/util/internal/PatternSets.java       |   53 +
 .../tasks/util/internal/PatternSpecFactory.java    |   86 +
 .../org/gradle/api/tasks/util/package-info.java    |    0
 .../org/gradle/cache/CacheAccess.java              |    0
 .../main/java/org/gradle/cache/CacheBuilder.java   |   88 +
 .../org/gradle/cache/CacheOpenException.java       |    0
 .../java/org/gradle/cache/CacheRepository.java     |   51 +
 .../org/gradle/cache/CacheValidator.java           |    0
 .../java/org/gradle/cache/PersistentCache.java     |   71 +
 .../org/gradle/cache/PersistentIndexedCache.java   |    0
 .../cache/PersistentIndexedCacheParameters.java    |    0
 .../org/gradle/cache/PersistentStateCache.java     |    0
 .../java/org/gradle/cache/PersistentStore.java     |   44 +
 .../internal/AbstractCrossProcessCacheAccess.java  |   32 +
 .../gradle/cache/internal/AbstractFileAccess.java  |   32 +
 .../gradle/cache/internal/AsyncCacheAccess.java    |   40 +
 .../cache/internal/AsyncCacheAccessContext.java    |   85 +
 .../internal/AsyncCacheAccessDecoratedCache.java   |   84 +
 .../gradle/cache/internal/CacheAccessWorker.java   |  290 ++
 .../gradle/cache/internal/CacheCoordinator.java    |   39 +
 .../org/gradle/cache/internal/CacheDecorator.java  |   25 +
 .../org/gradle/cache/internal/CacheFactory.java    |   34 +
 .../cache/internal/CacheInitializationAction.java  |    0
 .../cache/internal/CacheRepositoryServices.java    |   43 +
 .../gradle/cache/internal/CacheScopeMapping.java   |   27 +
 .../cache/internal/CrossProcessCacheAccess.java    |   32 +
 .../internal/CrossProcessSynchronizingCache.java   |   68 +
 .../gradle/cache/internal/DefaultCacheAccess.java  |  501 ++
 .../gradle/cache/internal/DefaultCacheFactory.java |  194 +
 .../cache/internal/DefaultCacheRepository.java     |  119 +
 .../cache/internal/DefaultCacheScopeMapping.java   |   92 +
 .../cache/internal/DefaultFileLockManager.java     |  348 ++
 ...aultMultiProcessSafePersistentIndexedCache.java |  105 +
 .../internal/DefaultPersistentDirectoryCache.java  |   98 +
 .../internal/DefaultPersistentDirectoryStore.java  |  139 +
 .../internal/DefaultProcessMetaDataProvider.java   |    0
 .../org/gradle/cache/internal/FileAccess.java      |    0
 .../internal/FileIntegrityViolationException.java  |    0
 ...onSuppressingPersistentStateCacheDecorator.java |    0
 .../java/org/gradle/cache/internal/FileLock.java   |   57 +
 .../cache/internal/FileLockCommunicator.java       |   96 +
 .../org/gradle/cache/internal/FileLockManager.java |    0
 .../FixedExclusiveModeCrossProcessCacheAccess.java |   99 +
 .../FixedSharedModeCrossProcessCacheAccess.java    |  122 +
 .../cache/internal/GracefullyStoppedException.java |    0
 .../internal/InsufficientLockModeException.java    |    0
 .../LockOnDemandCrossProcessCacheAccess.java       |  145 +
 .../cache/internal/LockTimeoutException.java       |   64 +
 .../cache/internal/MapBackedInMemoryStore.java     |  109 +
 ...ultiProcessSafeAsyncPersistentIndexedCache.java |   36 +
 .../MultiProcessSafePersistentIndexedCache.java    |   24 +
 .../gradle/cache/internal/OnDemandFileAccess.java  |    0
 .../cache/internal/ProcessMetaDataProvider.java    |    0
 .../internal/ReferencablePersistentCache.java      |    0
 .../gradle/cache/internal/SimpleStateCache.java    |  105 +
 .../cache/internal/UnitOfWorkParticipant.java      |   39 +
 .../org/gradle/cache/internal/VersionStrategy.java |   29 +
 .../btree/BTreePersistentIndexedCache.java         |  733 +++
 .../org/gradle/cache/internal/btree/Block.java     |   59 +
 .../gradle/cache/internal/btree/BlockPayload.java  |   51 +
 .../gradle/cache/internal/btree/BlockPointer.java  |    0
 .../gradle/cache/internal/btree/BlockStore.java    |    0
 .../org/gradle/cache/internal/btree/ByteInput.java |   75 +
 .../gradle/cache/internal/btree/ByteOutput.java    |   75 +
 .../cache/internal/btree/CachingBlockStore.java    |  120 +
 .../internal/btree/CorruptedCacheException.java    |    0
 .../cache/internal/btree/FileBackedBlockStore.java |  248 +
 .../cache/internal/btree/FreeListBlockStore.java   |  271 ++
 .../org/gradle/cache/internal/btree/KeyHasher.java |   76 +
 .../cache/internal/btree/StateCheckBlockStore.java |    0
 .../cacheops/CacheAccessOperationsStack.java       |    0
 .../cache/internal/cacheops/CacheOperation.java    |    0
 .../internal/cacheops/CacheOperationStack.java     |    0
 .../filelock/DefaultLockStateSerializer.java       |   95 +
 .../cache/internal/filelock/LockFileAccess.java    |    0
 .../gradle/cache/internal/filelock/LockInfo.java   |    0
 .../cache/internal/filelock/LockInfoAccess.java    |   82 +
 .../internal/filelock/LockInfoSerializer.java      |    0
 .../cache/internal/filelock/LockOptions.java       |    0
 .../internal/filelock/LockOptionsBuilder.java      |    0
 .../gradle/cache/internal/filelock/LockState.java  |   38 +
 .../cache/internal/filelock/LockStateAccess.java   |  100 +
 .../internal/filelock/LockStateSerializer.java     |    0
 .../filelock/Version1LockStateSerializer.java      |   76 +
 .../DefaultFileLockContentionHandler.java          |  160 +
 .../locklistener/FileLockContentionHandler.java    |    0
 .../org/gradle/configuration/BuildConfigurer.java  |    0
 .../configuration/DefaultBuildConfigurer.java      |   64 +
 .../gradle/configuration/DefaultImportsReader.java |  101 +
 .../configuration/DefaultInitScriptProcessor.java  |   51 +
 .../configuration/DefaultScriptPluginFactory.java  |  213 +
 .../gradle/configuration/DefaultScriptTarget.java  |   76 +
 .../configuration/GradleLauncherMetaData.java      |    0
 .../org/gradle/configuration/ImportsReader.java    |   26 +
 .../gradle/configuration/InitScriptProcessor.java  |    0
 .../org/gradle/configuration/InitScriptTarget.java |    0
 .../InitialPassSettingScriptTarget.java            |   37 +
 .../gradle/configuration/ProjectScriptTarget.java  |   80 +
 .../org/gradle/configuration/ScriptPlugin.java     |    0
 .../gradle/configuration/ScriptPluginFactory.java  |    0
 .../configuration/ScriptPluginFactoryProvider.java |   40 +
 .../configuration/ScriptPluginFactorySelector.java |   82 +
 .../org/gradle/configuration/ScriptTarget.java     |   56 +
 .../gradle/configuration/SettingScriptTarget.java  |    0
 .../project/BuildScriptProcessor.java              |   43 +
 .../project/ConfigureActionsProjectEvaluator.java  |    0
 ...DefaultProjectConfigurationActionContainer.java |   45 +
 .../project/DelayedConfigurationActions.java       |    0
 .../project/LifecycleProjectEvaluator.java         |    0
 .../project/PluginsProjectConfigureActions.java    |   35 +
 .../ProjectConfigurationActionContainer.java       |    0
 .../project/ProjectConfigureAction.java            |    0
 .../configuration/project/ProjectEvaluator.java    |    0
 .../internal/DefaultDeploymentRegistry.java        |    0
 .../deployment/internal/DeploymentHandle.java      |    0
 .../deployment/internal/DeploymentRegistry.java    |    0
 .../gradle/execution/BuildConfigurationAction.java |    0
 .../BuildConfigurationActionExecuter.java          |    0
 .../org/gradle/execution/BuildExecuter.java        |    0
 .../org/gradle/execution/BuildExecutionAction.java |    0
 .../gradle/execution/BuildExecutionContext.java    |    0
 .../execution/CancellableOperationManager.java     |    0
 .../DefaultBuildConfigurationActionExecuter.java   |    0
 .../org/gradle/execution/DefaultBuildExecuter.java |    0
 .../DefaultCancellableOperationManager.java        |   81 +
 .../DefaultTasksBuildExecutionAction.java          |    0
 .../execution/DryRunBuildExecutionAction.java      |    0
 ...ludedTaskFilteringBuildConfigurationAction.java |   49 +
 .../gradle/execution/MultipleBuildFailures.java    |    0
 .../PassThruCancellableOperationManager.java       |    0
 .../org/gradle/execution/ProjectConfigurer.java    |    0
 .../execution/SelectedTaskExecutionAction.java     |    0
 .../org/gradle/execution/TaskFailureHandler.java   |    0
 .../org/gradle/execution/TaskGraphExecuter.java    |    0
 .../org/gradle/execution/TaskNameResolver.java     |  185 +
 .../TaskNameResolvingBuildConfigurationAction.java |    0
 .../gradle/execution/TaskPathProjectEvaluator.java |    0
 .../gradle/execution/TaskSelectionException.java   |   39 +
 .../org/gradle/execution/TaskSelectionResult.java  |    0
 .../org/gradle/execution/TaskSelector.java         |    0
 .../commandline/CommandLineTaskConfigurer.java     |    0
 .../commandline/CommandLineTaskParser.java         |    0
 .../commandline/TaskConfigurationException.java    |   44 +
 .../taskgraph/AbstractTaskPlanExecutor.java        |   82 +
 .../taskgraph/DefaultTaskExecutionPlan.java        |  790 +++
 .../taskgraph/DefaultTaskGraphExecuter.java        |  241 +
 .../taskgraph/DefaultTaskPlanExecutor.java         |   35 +
 .../taskgraph/ParallelTaskPlanExecutor.java        |   65 +
 .../execution/taskgraph/TaskDependencyGraph.java   |    0
 .../execution/taskgraph/TaskExecutionPlan.java     |    0
 .../org/gradle/execution/taskgraph/TaskInfo.java   |    0
 .../execution/taskgraph/TaskPlanExecutor.java      |    0
 .../taskgraph/TaskPlanExecutorFactory.java         |   43 +
 .../taskpath/ProjectFinderByTaskPath.java          |    0
 .../execution/taskpath/ResolvedTaskPath.java       |    0
 .../execution/taskpath/TaskPathResolver.java       |    0
 .../groovy/scripts/AbstractUriScriptSource.java    |   63 +
 .../org/gradle/groovy/scripts/BasicScript.java     |   87 +
 .../gradle/groovy/scripts/CachingScriptSource.java |   47 +
 .../org/gradle/groovy/scripts/DefaultScript.java   |  262 +
 .../scripts/DefaultScriptCompilerFactory.java      |   54 +
 .../groovy/scripts/DelegatingScriptSource.java     |   46 +
 .../scripts/NonExistentFileScriptSource.java       |   92 +
 .../java/org/gradle/groovy/scripts/Script.java     |   59 +
 .../groovy/scripts/ScriptCompilationException.java |    0
 .../org/gradle/groovy/scripts/ScriptCompiler.java  |    0
 .../groovy/scripts/ScriptCompilerFactory.java      |    0
 .../groovy/scripts/ScriptExecutionListener.java    |    0
 .../org/gradle/groovy/scripts/ScriptRunner.java    |    0
 .../org/gradle/groovy/scripts/ScriptSource.java    |   46 +
 .../gradle/groovy/scripts/StringScriptSource.java  |   44 +
 .../org/gradle/groovy/scripts/UriScriptSource.java |   61 +
 ...ildScopeInMemoryCachingScriptClassCompiler.java |   54 +
 .../groovy/scripts/internal/BuildScriptData.java   |    0
 .../internal/BuildScriptDataSerializer.java        |    0
 .../scripts/internal/BuildScriptTransformer.java   |   61 +
 .../groovy/scripts/internal/CompileOperation.java  |    0
 .../groovy/scripts/internal/CompiledScript.java    |    0
 .../CrossBuildInMemoryCachingScriptClassCache.java |   61 +
 .../internal/DefaultScriptCompilationHandler.java  |  350 ++
 .../internal/DefaultScriptRunnerFactory.java       |   99 +
 .../internal/FactoryBackedCompileOperation.java    |    0
 .../FileCacheBackedScriptClassCompiler.java        |  399 ++
 .../internal/FilteringScriptTransformer.java       |    0
 .../scripts/internal/FixMainScriptTransformer.java |    0
 .../scripts/internal/GradleResolveVisitor.java     | 1595 ++++++
 .../ImperativeStatementDetectingTransformer.java   |    0
 .../internal/InitialPassStatementTransformer.java  |  129 +
 .../RegistryAwareClassLoaderHierarchyHasher.java   |   56 +
 .../scripts/internal/RemappingScriptSource.java    |   40 +
 .../groovy/scripts/internal/ScriptCacheKey.java    |   52 +
 .../scripts/internal/ScriptClassCompiler.java      |    0
 .../scripts/internal/ScriptCompilationHandler.java |   34 +
 .../scripts/internal/ScriptRunnerFactory.java      |    0
 .../internal/StatementLabelsScriptTransformer.java |    0
 .../scripts/internal/SubsetScriptTransformer.java  |    0
 .../internal/TaskDefinitionScriptTransformer.java  |    0
 .../gradle/initialization/AbstractProjectSpec.java |    0
 .../initialization/BuildCancellationToken.java     |    0
 .../gradle/initialization/BuildClientMetaData.java |    0
 .../initialization/BuildCompletionListener.java    |    0
 .../gradle/initialization/BuildEventConsumer.java  |   25 +
 .../initialization/BuildFileProjectSpec.java       |    0
 .../org/gradle/initialization/BuildIdentity.java   |   23 +
 .../initialization/BuildLayoutParameters.java      |   86 +
 .../org/gradle/initialization/BuildLoader.java     |    0
 .../gradle/initialization/BuildRequestContext.java |    0
 .../initialization/BuildRequestMetaData.java       |    0
 .../gradle/initialization/ClassLoaderRegistry.java |   38 +
 .../initialization/ClassLoaderScopeRegistry.java   |    0
 .../initialization/CompositeInitScriptFinder.java  |    0
 .../DefaultBuildCancellationToken.java             |    0
 .../initialization/DefaultBuildIdentity.java       |   32 +
 .../initialization/DefaultBuildRequestContext.java |    0
 .../DefaultBuildRequestMetaData.java               |    0
 .../initialization/DefaultClassLoaderRegistry.java |   74 +
 .../DefaultClassLoaderScopeRegistry.java           |   40 +
 .../DefaultCommandLineConverter.java               |  224 +
 .../initialization/DefaultExceptionAnalyser.java   |    0
 .../DefaultGradleApiSpecProvider.java              |   48 +
 .../initialization/DefaultGradleLauncher.java      |  241 +
 .../DefaultGradleLauncherFactory.java              |  202 +
 .../DefaultGradlePropertiesLoader.java             |  115 +
 .../initialization/DefaultJdkToolsInitializer.java |   43 +
 .../initialization/DefaultLegacyTypesSupport.java  |   99 +
 .../initialization/DefaultProjectDescriptor.java   |  147 +
 .../DefaultProjectDescriptorRegistry.java          |    0
 .../gradle/initialization/DefaultProjectSpec.java  |    0
 .../org/gradle/initialization/DefaultSettings.java |  265 +
 .../initialization/DefaultSettingsFinder.java      |    0
 .../initialization/DefaultSettingsLoader.java      |   97 +
 .../DefaultSettingsLoaderFactory.java              |   63 +
 .../initialization/DependencyResolutionLogger.java |   56 +
 .../initialization/DirectoryInitScriptFinder.java  |   42 +
 .../DistributionInitScriptFinder.java              |    0
 .../initialization/FlatClassLoaderRegistry.java    |   46 +
 .../initialization/GradleApiSpecAggregator.java    |   95 +
 .../initialization/GradleApiSpecProvider.java      |   65 +
 .../org/gradle/initialization/GradleLauncher.java  |   77 +
 .../initialization/GradleLauncherFactory.java      |   55 +
 .../initialization/GradleUserHomeDirProvider.java  |   26 +
 .../initialization/IGradlePropertiesLoader.java    |   29 +
 .../org/gradle/initialization/ISettingsFinder.java |    0
 .../initialization/IncludedBuildExecuter.java      |   23 +
 .../initialization/IncludedBuildFactory.java       |   25 +
 .../org/gradle/initialization/IncludedBuilds.java  |   24 +
 .../java/org/gradle/initialization/InitScript.java |   34 +
 .../gradle/initialization/InitScriptFinder.java    |    0
 .../gradle/initialization/InitScriptHandler.java   |    0
 .../initialization/InitialPassSettingsScript.java  |   64 +
 .../initialization/InstantiatingBuildLoader.java   |    0
 .../gradle/initialization/JdkToolsInitializer.java |    0
 .../initialization/LayoutCommandLineConverter.java |    0
 .../gradle/initialization/LegacyTypesSupport.java  |   48 +
 .../MixInLegacyTypesClassLoader.java               |  330 ++
 .../initialization/ModelConfigurationListener.java |    0
 .../MultipleBuildFailuresExceptionAnalyser.java    |    0
 .../gradle/initialization/NestedBuildTracker.java  |    0
 .../initialization/NoOpBuildEventConsumer.java     |    0
 .../initialization/NotifyingSettingsLoader.java    |   39 +
 .../initialization/NotifyingSettingsProcessor.java |    0
 .../initialization/ProjectAccessListener.java      |    0
 .../initialization/ProjectDescriptorRegistry.java  |    0
 .../ProjectDirectoryProjectSpec.java               |    0
 .../ProjectPropertySettingBuildLoader.java         |  111 +
 .../org/gradle/initialization/ProjectSpec.java     |    0
 .../org/gradle/initialization/ProjectSpecs.java    |    0
 .../PropertiesLoadingSettingsProcessor.java        |    0
 .../gradle/initialization/ReportedException.java   |    0
 .../ScriptEvaluatingSettingsProcessor.java         |   75 +
 .../org/gradle/initialization/SettingsFactory.java |   51 +
 .../org/gradle/initialization/SettingsLoader.java  |    0
 .../initialization/SettingsLoaderFactory.java      |   29 +
 .../gradle/initialization/SettingsLocation.java    |    0
 .../gradle/initialization/SettingsProcessor.java   |    0
 .../org/gradle/initialization/SettingsScript.java  |   24 +
 .../StackTraceSanitizingExceptionAnalyser.java     |    0
 .../initialization/UserHomeInitScriptFinder.java   |    0
 .../buildsrc/BuildSourceBuilder.java               |  117 +
 .../buildsrc/BuildSrcBuildListenerFactory.java     |    0
 .../buildsrc/BuildSrcUpdateFactory.java            |    0
 .../gradle/initialization/layout/BuildLayout.java  |    0
 .../layout/BuildLayoutConfiguration.java           |    0
 .../initialization/layout/BuildLayoutFactory.java  |   71 +
 .../internal/DefaultTaskExecutionRequest.java      |    0
 .../AuthenticationSupportedInternal.java           |   41 +
 .../authentication/AbstractAuthentication.java     |    0
 .../authentication/AllSchemesAuthentication.java   |    0
 .../authentication/AuthenticationInternal.java     |    0
 .../DefaultAuthenticationContainer.java            |    0
 .../buildevents/BuildExceptionReporter.java        |  261 +
 .../gradle/internal/buildevents/BuildLogger.java   |   82 +
 .../internal/buildevents/BuildResultLogger.java    |   53 +
 .../buildevents/CacheStatisticsReporter.java       |   65 +
 .../internal/buildevents/TaskExecutionLogger.java  |   72 +
 .../classpath/CachedClasspathTransformer.java      |   35 +
 .../internal/classpath/CachedJarFileStore.java     |   29 +
 .../DefaultCachedClasspathTransformer.java         |  126 +
 .../composite/CompositeBuildSettingsLoader.java    |   90 +
 .../composite/CompositeContextBuilder.java         |   26 +
 .../credentials/DefaultAwsCredentials.java         |    0
 .../environment/GradleBuildEnvironment.java        |    0
 .../exceptions/FailureResolutionAware.java         |   28 +
 .../exceptions/LocationAwareException.java         |  171 +
 .../ScriptUsageLocationReporter.java               |    0
 .../java/org/gradle/internal/file/JarCache.java    |  103 +
 .../gradle/internal/filewatch/ChangeReporter.java  |   94 +
 .../DefaultFileSystemChangeWaiterFactory.java      |  224 +
 .../filewatch/DefaultFileWatcherFactory.java       |   65 +
 .../internal/filewatch/FileSystemChangeWaiter.java |   26 +
 .../filewatch/FileSystemChangeWaiterFactory.java   |    0
 .../org/gradle/internal/filewatch/FileWatcher.java |    0
 .../internal/filewatch/FileWatcherEvent.java       |    0
 .../filewatch/FileWatcherEventListener.java        |   21 +
 .../internal/filewatch/FileWatcherFactory.java     |    0
 .../internal/filewatch/FileWatcherListener.java    |    0
 .../filewatch/jdk7/Jdk7FileWatcherFactory.java     |   53 +
 .../filewatch/jdk7/WatchPointsRegistry.java        |  193 +
 .../jdk7/WatchServiceFileWatcherBacking.java       |  186 +
 .../filewatch/jdk7/WatchServicePoller.java         |   86 +
 .../filewatch/jdk7/WatchServiceRegistrar.java      |  281 ++
 .../internal/graph/CachingDirectedGraphWalker.java |    0
 .../org/gradle/internal/graph/DirectedGraph.java   |    0
 .../internal/graph/DirectedGraphRenderer.java      |   80 +
 .../graph/DirectedGraphWithEdgeValues.java         |    0
 .../org/gradle/internal/graph/GraphAggregator.java |    0
 .../gradle/internal/graph/GraphNodeRenderer.java   |   22 +
 .../org/gradle/internal/graph/GraphRenderer.java   |   69 +
 .../org/gradle/internal/html/SimpleHtmlWriter.java |    0
 .../installation/CurrentGradleInstallation.java    |   51 +
 .../CurrentGradleInstallationLocator.java          |   92 +
 .../internal/installation/GradleInstallation.java  |   65 +
 .../GradleRuntimeShadedJarDetector.java            |   89 +
 .../gradle/internal/invocation/BuildAction.java    |    0
 .../internal/invocation/BuildActionRunner.java     |    0
 .../internal/invocation/BuildController.java       |    0
 .../internal/metaobject/AbstractDynamicObject.java |  198 +
 .../internal/metaobject/BeanDynamicObject.java     |  516 ++
 .../metaobject/CompositeDynamicObject.java         |  102 +
 .../internal/metaobject/ConfigureDelegate.java     |  139 +
 .../gradle/internal/metaobject/DynamicObject.java  |   95 +
 .../internal/metaobject/GetPropertyResult.java     |   38 +
 .../internal/metaobject/InvokeMethodResult.java    |   35 +
 ...xInClosurePropertiesAsMethodsDynamicObject.java |   50 +
 .../internal/metaobject/SetPropertyResult.java     |   32 +
 .../operations/logging/BuildOperationLogInfo.java  |    0
 .../operations/logging/BuildOperationLogger.java   |    0
 .../logging/BuildOperationLoggerFactory.java       |    0
 .../logging/DefaultBuildOperationLogger.java       |  116 +
 .../DefaultBuildOperationLoggerFactory.java        |   61 +
 .../internal/progress/BuildOperationDetails.java   |    0
 .../internal/progress/BuildOperationExecutor.java  |    0
 .../internal/progress/BuildOperationInternal.java  |    0
 .../internal/progress/BuildProgressFilter.java     |    0
 .../internal/progress/BuildProgressLogger.java     |  108 +
 .../progress/DefaultBuildOperationExecutor.java    |  123 +
 .../internal/progress/InternalBuildListener.java   |    0
 .../gradle/internal/progress/LoggerProvider.java   |   30 +
 .../internal/progress/OperationIdGenerator.java    |    0
 .../gradle/internal/progress/OperationResult.java  |    0
 .../internal/progress/OperationStartEvent.java     |    0
 .../progress/PercentageProgressFormatter.java      |   44 +
 .../internal/progress/ProgressFormatter.java       |    0
 .../internal/progress/ProgressLoggerProvider.java  |   33 +
 .../internal/progress/SimpleProgressFormatter.java |    0
 .../local/GroupedAndNamedUniqueFileStore.java      |   80 +
 .../internal/resource/local/PathKeyFileStore.java  |  202 +
 .../local/PathNormalisingKeyFileStore.java         |    0
 .../resource/local/UniquePathKeyFileStore.java     |    0
 .../scopes/BuildScopeServiceRegistryFactory.java   |    0
 .../service/scopes/BuildScopeServices.java         |  451 ++
 .../service/scopes/BuildSessionScopeServices.java  |  104 +
 .../DefaultGradleUserHomeScopeServiceRegistry.java |  137 +
 .../service/scopes/GlobalScopeServices.java        |  387 ++
 .../service/scopes/GradleScopeServices.java        |  162 +
 .../scopes/GradleUserHomeScopePluginServices.java  |   35 +
 .../scopes/GradleUserHomeScopeServiceRegistry.java |   42 +
 .../scopes/GradleUserHomeScopeServices.java        |   49 +
 .../service/scopes/PluginServiceRegistry.java      |   65 +
 .../service/scopes/ProjectScopeServices.java       |  225 +
 .../service/scopes/ServiceRegistryFactory.java     |    0
 .../service/scopes/SettingsScopeServices.java      |   56 +
 .../service/scopes/TaskExecutionServices.java      |  184 +
 .../org/gradle/internal/text/TreeFormatter.java    |  146 +
 .../CharSequenceNotationConverter.java             |   39 +
 .../typeconversion/CharSequenceNotationParser.java |    0
 .../ClosureToSpecNotationConverter.java            |    0
 .../typeconversion/CompositeNotationConverter.java |    0
 .../typeconversion/DefaultTypeConverter.java       |  323 ++
 .../EnumFromCharSequenceNotationParser.java        |   72 +
 .../ErrorHandlingNotationParser.java               |    0
 .../typeconversion/FlatteningNotationParser.java   |    0
 .../typeconversion/JustReturningConverter.java     |    0
 .../org/gradle/internal/typeconversion/MapKey.java |    0
 .../typeconversion/MapNotationConverter.java       |    0
 .../typeconversion/NormalizedTimeUnit.java         |    0
 .../typeconversion/NotationConvertResult.java      |    0
 .../internal/typeconversion/NotationConverter.java |    0
 .../NotationConverterToNotationParserAdapter.java  |   55 +
 .../internal/typeconversion/NotationParser.java    |   36 +
 .../typeconversion/NotationParserBuilder.java      |  137 +
 .../internal/typeconversion/TimeUnitsParser.java   |    0
 .../TypeFilteringNotationConverter.java            |    0
 .../gradle/internal/typeconversion/TypeInfo.java   |    0
 .../typeconversion/TypedNotationConverter.java     |    0
 .../gradle/internal/xml/SimpleMarkupWriter.java    |  308 ++
 .../org/gradle/internal/xml/SimpleXmlWriter.java   |   58 +
 .../org/gradle/internal/xml/XmlTransformer.java    |  368 ++
 .../org/gradle/internal/xml/XmlValidation.java     |  148 +
 .../java/org/gradle/invocation/DefaultGradle.java  |  296 ++
 .../org/gradle/listener/ActionBroadcast.java       |    0
 .../ClosureBackedMethodInvocationDispatch.java     |   71 +
 .../collection/internal/BridgedCollections.java    |  102 +
 .../{groovy => java}/org/gradle/package-info.java  |    0
 .../plugin/internal/InvalidPluginIdException.java  |    0
 .../org/gradle/plugin/internal/PluginId.java       |    0
 .../plugin/repository/GradlePluginPortal.java      |   26 +
 .../plugin/repository/IvyPluginRepository.java     |   47 +
 .../plugin/repository/MavenPluginRepository.java   |   47 +
 .../plugin/repository/PluginRepositoriesSpec.java  |   52 +
 .../gradle/plugin/repository/PluginRepository.java |   31 +
 .../internal/DefaultPluginRepositoriesSpec.java    |   60 +
 .../internal/PluginRepositoryFactory.java          |   50 +
 .../internal/PluginRepositoryRegistry.java         |   28 +
 .../org/gradle/plugin/repository/package-info.java |   21 +
 .../gradle/plugin/use/PluginDependenciesSpec.java  |  120 +
 .../gradle/plugin/use/PluginDependencySpec.java    |   78 +
 .../plugin/use/internal/DefaultPluginRequest.java  |  116 +
 .../plugin/use/internal/DefaultPluginRequests.java |    0
 .../use/internal/InjectedPluginClasspath.java      |    0
 .../internal/InvalidPluginRequestException.java    |    0
 .../gradle/plugin/use/internal/PluginRequest.java  |   36 +
 .../use/internal/PluginRequestApplicator.java      |    0
 .../use/internal/PluginRequestCollector.java       |  110 +
 .../gradle/plugin/use/internal/PluginRequests.java |    0
 .../use/internal/PluginRequestsSerializer.java     |   55 +
 .../PluginUseScriptBlockMetadataExtractor.java     |  166 +
 .../java/org/gradle/plugin/use/package-info.java   |   21 +
 .../main/java/org/gradle/process/JavaExecSpec.java |  100 +
 .../java/org/gradle/process/JavaForkOptions.java   |  227 +
 .../internal/AbstractExecHandleBuilder.java        |  153 +
 .../process/internal/BadExitCodeException.java     |    0
 .../gradle/process/internal/CurrentProcess.java    |   53 +
 .../gradle/process/internal/DefaultExecAction.java |   35 +
 .../process/internal/DefaultExecActionFactory.java |   47 +
 .../gradle/process/internal/DefaultExecHandle.java |  386 ++
 .../process/internal/DefaultExecHandleBuilder.java |  145 +
 .../process/internal/DefaultJavaExecAction.java    |    0
 .../process/internal/DefaultJavaForkOptions.java   |  143 +
 .../internal/DefaultProcessForkOptions.java        |   97 +
 .../org/gradle/process/internal/ExecAction.java    |    0
 .../gradle/process/internal/ExecActionFactory.java |   26 +
 .../gradle/process/internal/ExecHandleRunner.java  |    0
 .../internal/ExecHandleShutdownHookAction.java     |    0
 .../gradle/process/internal/JavaExecAction.java    |    0
 .../process/internal/JavaExecHandleBuilder.java    |  222 +
 .../process/internal/JavaExecHandleFactory.java    |   21 +
 .../org/gradle/process/internal/JvmOptions.java    |  335 ++
 .../process/internal/ProcessBuilderFactory.java    |    0
 .../gradle/process/internal/ProcessSettings.java   |    0
 .../org/gradle/process/internal/package.html       |    0
 .../shutdown/ShutdownHookActionRegister.java       |    0
 .../process/internal/streams/EncodedStream.java    |   86 +
 .../internal/streams/ExecOutputHandleRunner.java   |    0
 .../process/internal/streams/SafeStreams.java      |   44 +
 .../process/internal/streams/StreamsForwarder.java |   80 +
 .../process/internal/streams/StreamsHandler.java   |    0
 .../DefaultMultiRequestWorkerProcessBuilder.java   |  161 +
 .../DefaultSingleRequestWorkerProcessBuilder.java  |  131 +
 .../internal/worker/DefaultWorkerProcess.java      |  184 +
 .../worker/DefaultWorkerProcessBuilder.java        |  174 +
 .../worker/DefaultWorkerProcessFactory.java        |   81 +
 .../process/internal/worker/GradleWorkerMain.java  |   74 +
 .../worker/MultiRequestWorkerProcessBuilder.java   |   35 +
 .../worker/SingleRequestWorkerProcessBuilder.java  |   31 +
 .../process/internal/worker/WorkerControl.java     |   31 +
 .../process/internal/worker/WorkerProcess.java     |   35 +
 .../internal/worker/WorkerProcessBuilder.java      |   61 +
 .../internal/worker/WorkerProcessContext.java      |   38 +
 .../internal/worker/WorkerProcessException.java    |   31 +
 .../internal/worker/WorkerProcessFactory.java      |   54 +
 .../internal/worker/WorkerProcessSettings.java     |   53 +
 .../worker/child/ActionExecutionWorker.java        |   82 +
 ...ionClassesInSystemClassLoaderWorkerFactory.java |  159 +
 .../worker/child/BootstrapSecurityManager.java     |   96 +
 .../child/SystemApplicationClassLoaderWorker.java  |  112 +
 .../internal/worker/child/WorkerContext.java       |   24 +
 .../internal/worker/child/WorkerFactory.java       |   31 +
 .../child/WorkerProcessClassPathProvider.java      |  194 +
 .../process/internal/worker/request/Receiver.java  |  101 +
 .../internal/worker/request/RequestProtocol.java   |   23 +
 .../internal/worker/request/ResponseProtocol.java  |   27 +
 .../internal/worker/request/WorkerAction.java      |  103 +
 .../org/gradle/process/package-info.java           |    0
 .../main/java/org/gradle/profile/BuildProfile.java |  254 +
 .../org/gradle/profile/CompositeOperation.java     |    0
 .../org/gradle/profile/ContinuousOperation.java    |    0
 .../org/gradle/profile/Operation.java              |    0
 .../org/gradle/profile/ProfileEventAdapter.java    |  124 +
 .../org/gradle/profile/ProfileListener.java        |    0
 .../org/gradle/profile/ProfileReportRenderer.java  |    0
 .../org/gradle/profile/ProjectProfile.java         |    0
 .../profile/ReportGeneratingProfileListener.java   |    0
 .../org/gradle/profile/TaskExecution.java          |    0
 .../org/gradle/reporting/CodePanelRenderer.java    |    0
 .../org/gradle/reporting/DurationFormatter.java    |    0
 .../org/gradle/reporting/HtmlPageBuilder.java      |    0
 .../org/gradle/reporting/HtmlReportBuilder.java    |    0
 .../org/gradle/reporting/HtmlReportRenderer.java   |  176 +
 .../org/gradle/reporting/ReportRenderer.java       |    0
 .../org/gradle/reporting/TabbedPageRenderer.java   |   96 +
 .../java/org/gradle/reporting/TabsRenderer.java    |   68 +
 .../org/gradle/testfixtures/ProjectBuilder.java    |  118 +
 .../internal/InMemoryCacheFactory.java             |  121 +
 .../internal/InMemoryIndexedCache.java             |    0
 .../testfixtures/internal/ProjectBuilderImpl.java  |  134 +
 .../internal/TestBuildScopeServices.java           |   49 +
 .../internal/TestGlobalScopeServices.java          |   32 +
 .../org/gradle/testfixtures/package-info.java      |    0
 .../provider/model/ToolingModelBuilder.java        |   56 +
 .../model/ToolingModelBuilderRegistry.java         |    0
 .../provider/model/UnknownModelException.java      |    0
 .../DefaultToolingModelBuilderRegistry.java        |   74 +
 .../model/internal/LegacyConsumerInterface.java    |    0
 .../ProjectSensitiveToolingModelBuilder.java       |   41 +
 .../tooling/provider/model/package-info.java       |   21 +
 .../src/main/java/org/gradle/util/AntUtil.java     |   56 +
 .../gradle/util/BuildCommencedTimeProvider.java    |    0
 .../org/gradle/util/BulkReadInputStream.java       |    0
 .../org/gradle/util/ChangeListener.java            |    0
 .../{groovy => java}/org/gradle/util/Clock.java    |    0
 .../main/java/org/gradle/util/ConfigureUtil.java   |  162 +
 .../src/main/java/org/gradle/util/DiffUtil.java    |   84 +
 .../org/gradle/util/DisconnectableInputStream.java |    0
 .../java/org/gradle/util/DistributionLocator.java  |   51 +
 .../src/main/java/org/gradle/util/GFileUtils.java  |  298 ++
 .../{groovy => java}/org/gradle/util/JarUtil.java  |    0
 .../org/gradle/util/NameMatcher.java               |    0
 .../org/gradle/util/NoOpChangeListener.java        |    0
 .../{groovy => java}/org/gradle/util/Path.java     |    0
 .../org/gradle/util/StdinSwapper.java              |    0
 .../{groovy => java}/org/gradle/util/Swapper.java  |    0
 .../org/gradle/util/TreeVisitor.java               |    0
 .../org/gradle/util/VersionNumber.java             |    0
 .../{groovy => java}/org/gradle/util/WrapUtil.java |    0
 .../gradle/util/internal/ArgumentsSplitter.java    |    0
 .../org/gradle/util/internal/Java9ClassReader.java |   40 +
 .../gradle/util/internal/LimitedDescription.java   |    0
 ...org.gradle.initialization.GradleApiSpecProvider |   17 +
 .../org/gradle/initialization/converted-types.txt  |  116 +
 .../org/gradle/initialization/removed-types.txt    |   15 +
 .../org/gradle/BuildExceptionReporterTest.groovy   |  339 --
 .../groovy/org/gradle/BuildResultLoggerTest.java   |   74 -
 .../groovy/org/gradle/StartParameterTest.groovy    |   40 +-
 .../org/gradle/TaskExecutionLoggerTest.groovy      |  110 -
 .../api/file/MicroBenchmarkPerformanceTest.groovy  |   11 +-
 .../org/gradle/api/file/ProjectCopySpecTest.groovy |   22 +-
 .../gradle/api/file/RelativePathSpockTest.groovy   |    4 +-
 .../api/internal/AbstractDynamicObjectTest.java    |   62 -
 .../AbstractNamedDomainObjectContainerTest.groovy  |   13 +-
 .../gradle/api/internal/AbstractTaskSpec.groovy    |   90 +
 .../gradle/api/internal/AbstractTaskTest.groovy    |   84 -
 .../AsmBackedClassGeneratorGroovyTest.groovy       |   22 +-
 .../api/internal/AsmBackedClassGeneratorTest.java  |   35 +-
 .../api/internal/BeanWithDynamicProperties.groovy  |   46 +
 .../api/internal/ChainingTransformerTest.groovy    |   84 +
 .../api/internal/ChainingTransformerTest.java      |  104 -
 .../api/internal/ConventionAwareHelperTest.java    |   13 +-
 .../DefaultDomainObjectCollectionTest.java         |   66 +-
 .../internal/DefaultNamedDomainObjectSetTest.java  |   15 +
 ...tPolymorphicDomainObjectContainerDslTest.groovy |   13 +-
 .../org/gradle/api/internal/DefaultTaskTest.groovy |  508 +-
 .../DependencyInjectingInstantiatorTest.groovy     |    2 +-
 .../DependencyInjectingServiceLoaderTest.groovy    |   81 +
 .../api/internal/ExtensibleDynamicObjectTest.java  |   91 +-
 .../CachingDependencyResolveContextTest.groovy     |    2 +-
 .../artifacts/DefaultDependencySetTest.groovy      |    9 +-
 .../artifacts/DefaultExcludeRuleContainerTest.java |    2 +-
 .../artifacts/DefaultPublishArtifactSetTest.groovy |   10 +-
 .../artifacts/ProjectBackedModuleTest.groovy       |    6 +-
 .../AbstractModuleDependencySpec.groovy            |    2 +
 .../DefaultProjectDependencyTest.groovy            |   12 +-
 .../DefaultSelfResolvingDependencyTest.java        |    2 +-
 .../publish/ArchivePublishArtifactTest.groovy      |   18 +-
 .../cache/GeneratedGradleJarCacheTest.groovy       |  117 +
 .../cache/HeapProportionalCacheSizerTest.groovy    |   32 +
 .../api/internal/cache/StringInternerTest.groovy   |   56 -
 .../DefaultTaskArtifactStateRepositoryTest.groovy  |  160 +-
 ...rtCircuitTaskArtifactStateRepositoryTest.groovy |   18 +-
 .../DiscoveredInputFilesStateChangeRuleTest.groovy |   72 -
 .../rules/InputFilesStateChangeRuleTest.groovy     |   65 -
 .../rules/OutputFilesStateChangeRuleTest.groovy    |   82 -
 .../rules/TaskTypeTaskStateChangesTest.groovy      |  106 +
 .../rules/TaskUpToDateStateTest.groovy             |   74 +-
 ...bstractSnapshotNormalizationStrategyTest.groovy |   89 +
 .../CacheBackedFileSnapshotRepositoryTest.groovy   |    2 +-
 .../changedetection/state/CacheCapSizerTest.groovy |   39 +-
 .../state/CachingFileSnapshotterTest.groovy        |   37 +-
 ...aultFileCollectionSnapshotSerializerTest.groovy |   65 +
 .../state/DefaultFileCollectionSnapshotTest.groovy |   85 +
 .../DefaultFileCollectionSnapshotterTest.groovy    |  340 +-
 .../DefaultFileSnapshotterSerializerTest.groovy    |   39 -
 .../DefaultTaskArtifactStateCacheAccessTest.groovy |   44 -
 .../state/DefaultTaskHistoryStoreTest.groovy       |   44 +
 .../state/InMemoryTaskArtifactCacheTest.groovy     |   39 +-
 .../state/LoggingEvictionListenerTest.groovy       |    2 +-
 .../state/OutputFilesSnapshotSerializerTest.groovy |   42 -
 .../TaskFilePropertyCompareStrategyTest.groovy     |  262 +
 ...ropertySnapshotNormalizationStrategyTest.groovy |   70 +
 .../DefaultGradleDistributionLocatorTest.groovy    |  124 -
 .../classpath/DefaultModuleRegistryTest.groovy     |  157 +-
 .../coerce/StringToEnumTransformerTest.groovy      |   52 +-
 .../file/AbstractFileCollectionTest.groovy         |   20 +-
 .../file/AbstractFileTreeElementTest.groovy        |  127 +
 .../internal/file/AbstractFileTreeElementTest.java |  143 -
 .../api/internal/file/AbstractFileTreeTest.groovy  |   12 +
 .../internal/file/BaseDirFileResolverSpec.groovy   |    2 +-
 .../internal/file/BaseDirFileResolverTest.groovy   |    7 +-
 .../file/CompositeFileCollectionSpec.groovy        |   26 +-
 .../internal/file/CompositeFileCollectionTest.java |   44 +-
 .../api/internal/file/CompositeFileTreeTest.java   |   16 +-
 .../file/DefaultFileCollectionFactoryTest.groovy   |   89 +
 .../internal/file/DefaultFileOperationsTest.groovy |   37 +-
 .../file/DefaultSourceDirectorySetTest.groovy      |  144 +-
 .../api/internal/file/FileNormaliserTest.groovy    |   49 +
 .../internal/file/archive/TarCopyActionSpec.groovy |  170 +
 .../internal/file/archive/TarCopyActionTest.java   |  245 -
 .../api/internal/file/archive/TarFileTreeTest.java |    7 +-
 .../internal/file/archive/ZipCopyActionTest.groovy |    5 +-
 .../api/internal/file/archive/ZipFileTreeTest.java |    3 +-
 .../DefaultConfigurableFileCollectionTest.java     |   22 +-
 .../DefaultConfigurableFileTreeTest.groovy         |   31 +-
 .../collections/DefaultDirectoryWalkerTest.groovy  |  265 +
 .../collections/DefaultDirectoryWalkerTest.java    |  387 --
 .../DefaultFileCollectionResolveContextTest.groovy |    3 +-
 .../file/collections/FileTreeAdapterTest.groovy    |   27 +
 .../internal/file/collections/MapFileTreeTest.java |   54 +
 .../jdk7/Jdk7DirectoryWalkerTest.groovy            |   61 +-
 .../internal/file/copy/CopySpecMatchingTest.groovy |   92 +-
 .../file/copy/DefaultCopySpecResolutionTest.groovy |    9 +-
 .../internal/file/copy/DefaultCopySpecTest.groovy  |  580 ++-
 .../internal/file/copy/DeleteActionImplTest.groovy |   91 -
 .../DuplicateHandlingCopyActionExecutorTest.groovy |    4 +-
 .../api/internal/file/copy/FilterChainTest.java    |  198 +-
 .../file/copy/RenamingCopyActionTest.groovy        |   51 +
 .../internal/file/copy/RenamingCopyActionTest.java |   47 -
 .../api/internal/file/delete/DeleterTest.groovy    |  160 +
 .../HasPrefixAndSuffixPatternStepTest.groovy       |   70 +
 .../file/pattern/HasPrefixPatternStepTest.groovy   |   53 +
 .../file/pattern/HasSuffixPatternStepTest.groovy   |   49 +
 .../file/pattern/PatternStepFactoryTest.groovy     |   92 +-
 .../pattern/WildcardPrefixPatternStepTest.groovy   |   47 -
 .../DefaultClassLoaderScopeTest.groovy             |    4 +-
 .../initialization/DefaultScriptHandlerTest.groovy |    2 +-
 .../loadercache/DefaultClassLoaderCacheTest.groovy |    9 +-
 .../loadercache/DummyClassLoaderCache.java         |   10 +-
 .../loadercache/FileClassPathSnapshotter.java      |   58 +
 .../HashClassPathSnapshotterTest.groovy            |   40 +-
 .../internal/plugins/ExtensionContainerTest.groovy |    7 +
 .../ExtraPropertiesDynamicObjectAdapterTest.groovy |   26 +-
 .../project/DefaultAntBuilderFactoryTest.groovy    |   52 +-
 .../internal/project/DefaultAntBuilderTest.groovy  |  216 +-
 .../project/DefaultIsolatedAntBuilderTest.groovy   |   11 +-
 .../project/DefaultProjectRegistryTest.java        |   23 +-
 .../api/internal/project/DefaultProjectTest.groovy |   58 +-
 .../DeferredProjectConfigurationTest.groovy        |   16 +-
 .../internal/project/NewDefaultProjectTest.groovy  |   58 +-
 .../project/ant/AntLoggingAdapterTest.groovy       |   92 +
 .../antbuilder/AntBuilderMemoryLeakTest.groovy     |   23 +-
 .../AnnotationProcessingTaskFactoryTest.groovy     |  656 +++
 .../AnnotationProcessingTaskFactoryTest.java       | 1120 -----
 .../taskfactory/AnnotationProcessingTasks.java     |  502 ++
 .../ClasspathPropertyAnnotationHandlerTest.groovy  |   35 +
 .../DefaultTaskClassInfoStoreTest.groovy           |  186 +
 .../DefaultTaskClassValidatorExtractorTest.groovy  |   59 +
 .../DependencyAutoWireTaskFactoryTest.java         |    4 +-
 .../internal/project/taskfactory/SearchPath.java   |   27 +
 .../project/taskfactory/TaskFactoryTest.groovy     |   11 +-
 .../resources/AbstractTextResourceTest.groovy      |   14 +-
 .../CharSourceBackedTextResourceTest.groovy        |    2 +-
 ...llectionBackedTarArchiveTextResourceTest.groovy |    2 -
 .../FileCollectionBackedTextResourceTest.groovy    |    4 +-
 ...llectionBackedZipArchiveTextResourceTest.groovy |    3 -
 .../resources/StringBackedTextResourceTest.groovy  |    2 -
 .../tasks/AbstractTaskPropertyBuilderTest.groovy   |   52 +
 .../internal/tasks/DefaultTaskContainerTest.groovy |    2 +-
 .../internal/tasks/DefaultTaskInputsTest.groovy    |   93 +-
 .../internal/tasks/DefaultTaskOutputsTest.groovy   |  190 +-
 .../tasks/RealizableTaskCollectionTest.groovy      |    6 +-
 .../internal/tasks/TaskStateInternalTest.groovy    |   36 +-
 .../tasks/cache/TarTaskOutputPackerTest.groovy     |  182 +
 .../TaskExecutionStatisticsEventAdapterTest.groovy |   71 +
 .../CatchExceptionTaskExecuterTest.groovy          |   62 +
 .../ExecuteActionsTaskExecuterTest.groovy          |  271 ++
 .../execution/ExecuteActionsTaskExecuterTest.java  |  376 --
 .../ExecuteAtMostOnceTaskExecuterTest.groovy       |   68 +-
 .../PostExecutionAnalysisTaskExecuterTest.groovy   |   51 -
 ...ResolveTaskArtifactStateTaskExecuterTest.groovy |   61 +
 .../execution/SkipCachedTaskExecuterTest.groovy    |  296 ++
 .../SkipEmptySourceFilesTaskExecuterTest.groovy    |  197 +-
 .../execution/SkipOnlyIfTaskExecuterTest.groovy    |   96 +
 .../execution/SkipOnlyIfTaskExecuterTest.java      |  117 -
 .../SkipTaskWithNoActionsExecuterTest.groovy       |    4 +-
 .../execution/SkipUpToDateTaskExecuterTest.groovy  |   25 +-
 .../execution/ValidatingTaskExecuterTest.groovy    |   10 +-
 .../options/InstanceOptionDescriptorSpec.groovy    |   69 +-
 .../options/OptionNotationParserFactorySpec.groovy |   55 -
 .../internal/tasks/options/OptionReaderTest.groovy |   66 +-
 .../OptionValueNotationParserFactorySpec.groovy    |   55 +
 .../tasks/util/DefaultJavaForkOptionsTest.groovy   |   10 +-
 .../groovy/org/gradle/api/logging/LoggingTest.java |  123 -
 .../gradle/api/tasks/AbstractCopyTaskTest.groovy   |   40 +-
 .../groovy/org/gradle/api/tasks/CopyTest.groovy    |    6 +-
 .../groovy/org/gradle/api/tasks/DeleteTest.groovy  |  111 +
 .../groovy/org/gradle/api/tasks/DeleteTest.java    |   77 -
 .../groovy/org/gradle/api/tasks/ExecTest.groovy    |  143 +-
 .../org/gradle/api/tasks/GradleBuildTest.groovy    |   10 +-
 .../org/gradle/api/tasks/SourceTaskTest.groovy     |   20 +-
 .../groovy/org/gradle/api/tasks/SyncTest.groovy    |    5 +-
 .../org/gradle/api/tasks/ant/AntTargetTest.java    |    9 +-
 .../org/gradle/api/tasks/bundling/TarTest.groovy   |   43 +-
 .../org/gradle/api/tasks/bundling/ZipTest.groovy   |   17 +-
 .../gradle/api/tasks/util/PatternSetTest.groovy    |   40 +
 .../internal/CachingPatternSpecFactoryTest.groovy  |   22 +-
 .../util/internal/PatternSpecFactoryTest.groovy    |   79 +
 .../cache/internal/CacheAccessWorkerTest.groovy    |  201 +
 .../cache/internal/DefaultCacheAccessTest.groovy   |  277 +-
 .../cache/internal/DefaultCacheFactoryTest.groovy  |   80 +-
 .../internal/DefaultCacheRepositoryTest.groovy     |   47 +-
 .../internal/DefaultCacheScopeMappingTest.groovy   |   79 +-
 .../DefaultFileLockManagerContentionTest.groovy    |   91 +
 .../DefaultPersistentDirectoryCacheSpec.groovy     |    4 +-
 .../DefaultPersistentDirectoryCacheTest.groovy     |  200 +
 .../DefaultPersistentDirectoryCacheTest.java       |  185 -
 ...tPersistentDirectoryStoreConcurrencyTest.groovy |    4 +-
 .../DefaultPersistentDirectoryStoreTest.groovy     |   33 +-
 .../cache/internal/FileLockCommunicatorTest.groovy |    2 +-
 ...ExclusiveModeCrossProcessCacheAccessTest.groovy |  123 +
 ...xedSharedModeCrossProcessCacheAccessTest.groovy |  187 +
 .../LockOnDemandCrossProcessCacheAccessTest.groovy |  511 ++
 ...ltiProcessSafePersistentIndexedCacheTest.groovy |   14 +-
 .../cache/internal/SimpleStateCacheTest.groovy     |   24 +-
 .../btree/BTreePersistentIndexedCacheTest.java     |  129 +-
 .../cache/internal/btree/ByteInputTest.groovy      |   68 +
 .../cache/internal/btree/ByteOutputTest.groovy     |  102 +
 .../cache/internal/btree/KeyHasherTest.groovy      |   57 +
 .../DefaultFileLockContentionHandlerTest.groovy    |    2 +-
 .../DefaultInitScriptProcessorTest.groovy          |   11 +-
 .../DefaultScriptPluginFactoryTest.groovy          |   35 +-
 .../PluginsProjectConfigureActionsTest.groovy      |    3 +-
 ...askFilteringBuildConfigurationActionTest.groovy |    2 +-
 .../gradle/execution/TaskNameResolverTest.groovy   |  295 +-
 .../org/gradle/execution/TaskSelectorTest.groovy   |    6 +-
 .../CommandLineTaskConfigurerSpec.groovy           |    3 +-
 ...askExecutionPlanParallelTaskHandlingTest.groovy |   14 +-
 .../taskgraph/DefaultTaskExecutionPlanTest.groovy  |   30 +-
 .../taskgraph/DefaultTaskGraphExecuterSpec.groovy  |    3 +-
 .../taskgraph/DefaultTaskGraphExecuterTest.java    |   99 +-
 .../taskgraph/DefaultTaskPlanExecutorTest.groovy   |    3 +-
 .../taskgraph/TaskPlanExecutorFactoryTest.groovy   |   13 +-
 .../taskpath/ProjectFinderByTaskPathTest.groovy    |   12 +-
 .../groovy/scripts/CachingScriptSourceTest.groovy  |   47 +
 .../groovy/scripts/CachingScriptSourceTest.java    |   45 -
 .../DefaultScriptCompilerFactoryTest.groovy        |   10 +-
 .../gradle/groovy/scripts/DefaultScriptTest.groovy |   15 +-
 .../groovy/scripts/StringScriptSourceTest.java     |    4 +-
 .../gradle/groovy/scripts/UriScriptSourceTest.java |   57 +-
 ...peInMemoryCachingScriptClassCompilerTest.groovy |  131 +
 .../internal/BuildScriptTransformerSpec.groovy     |   13 +-
 .../internal/CachingScriptClassCompilerTest.groovy |  125 -
 .../DefaultScriptCompilationHandlerTest.groovy     |  137 +-
 .../internal/DefaultScriptRunnerFactoryTest.java   |    2 +-
 .../FileCacheBackedScriptClassCompilerTest.groovy  |  129 +-
 .../ShortCircuitEmptyScriptCompilerTest.groovy     |   74 -
 .../initialization/BuildFileProjectSpecTest.groovy |  108 +
 .../initialization/BuildFileProjectSpecTest.java   |  120 -
 .../BuildLayoutParametersTest.groovy               |    6 +-
 .../CommandLineConverterTestSupport.java           |   10 +-
 .../DefaultCommandLineConverterTest.java           |   26 +-
 .../DefaultExceptionAnalyserTest.java              |   10 +-
 .../DefaultGradleLauncherFactoryTest.groovy        |   32 +-
 .../DefaultGradleLauncherSpec.groovy               |  312 ++
 .../initialization/DefaultGradleLauncherTest.java  |  392 --
 .../DefaultGradlePropertiesLoaderTest.java         |   15 +
 .../DefaultSettingsLoaderTest.groovy               |   62 +
 .../DependencyResolutionLoggerTest.groovy          |    4 +-
 .../GradleApiSpecAggregatorTest.groovy             |   88 +
 .../InstantiatingBuildLoaderTest.groovy            |    3 +-
 .../LayoutCommandLineConverterTest.groovy          |    6 +-
 .../MixInLegacyTypesClassLoaderTest.groovy         |  231 +
 .../ParallelOptionsCommandLineConverterTest.groovy |   22 +-
 .../ProjectDirectoryProjectSpecTest.groovy         |  106 +
 .../ProjectDirectoryProjectSpecTest.java           |  121 -
 .../ProjectPropertySettingBuildLoaderTest.groovy   |   27 +-
 .../initialization/SettingsHandlerTest.groovy      |   62 -
 .../UserHomeInitScriptFinderTest.groovy            |   70 +
 .../UserHomeInitScriptFinderTest.java              |   71 -
 .../buildsrc/BuildSourceBuilderTest.groovy         |    6 +-
 .../buildevents/BuildExceptionReporterTest.groovy  |  342 ++
 .../buildevents/BuildResultLoggerTest.java         |   76 +
 .../buildevents/CacheStatisticsReporterTest.groovy |   97 +
 .../buildevents/TaskExecutionLoggerTest.groovy     |  110 +
 .../DefaultCachedClasspathTransformerTest.groovy   |   90 +
 .../DeprecatedFeatureUsageTest.groovy              |   38 -
 .../LoggingDeprecatedFeatureHandlerTest.groovy     |   57 -
 .../org/gradle/internal/file/JarCacheTest.groovy   |  130 +
 .../internal/filewatch/ChangeReporterTest.groovy   |  137 +
 .../DefaultFileSystemChangeWaiterTest.groovy       |  195 -
 .../DefaultFileWatcherFactoryNonJava7Test.groovy   |   33 -
 .../filewatch/DefaultFileWatcherFactoryTest.groovy |  269 -
 .../filewatch/jdk7/WatchPointsRegistryTest.groovy  |  301 ++
 .../jdk7/WatchServiceFileWatcherBackingTest.groovy |   65 -
 .../jdk7/WatchServiceRegistrarTest.groovy          |  109 +
 .../graph/DirectedGraphRendererTest.groovy         |    4 +-
 .../CurrentGradleInstallationLocatorTest.groovy    |  121 +
 .../GradleRuntimeShadedJarDetectorTest.groovy      |  117 +
 .../metaobject/AbstractDynamicObjectTest.java      |   75 +
 .../metaobject/BeanDynamicObjectTest.groovy        |  758 +++
 .../metaobject/CompositeDynamicObjectTest.groovy   |  157 +
 ...surePropertiesAsMethodsDynamicObjectTest.groovy |  123 +
 .../logging/DefaultBuildOperationLoggerTest.groovy |   27 +-
 .../progress/BuildProgressLoggerTest.groovy        |    2 +-
 .../DefaultBuildOperationExecutorTest.groovy       |    4 +-
 .../service/scopes/BuildScopeServicesTest.groovy   |   68 +-
 .../scopes/BuildSessionScopeServicesTest.groovy    |   21 +-
 ...ltGradleUserHomeScopeServiceRegistryTest.groovy |  227 +
 .../service/scopes/GlobalScopeServicesTest.java    |   46 +-
 .../service/scopes/GradleScopeServicesTest.groovy  |    7 +-
 .../service/scopes/ProjectScopeServicesTest.groovy |   38 +-
 .../scopes/TaskExecutionServicesTest.groovy        |   24 +-
 .../service/scopes/TaskScopeServicesTest.java      |   91 -
 .../typeconversion/DefaultTypeConverterTest.groovy |  264 +-
 .../EnumFromCharSequenceNotationParserSpec.groovy  |   29 +-
 .../gradle/internal/xml/XmlValidationTest.groovy   |   21 +-
 .../org/gradle/invocation/DefaultGradleTest.java   |   33 +-
 .../org/gradle/logging/ConsoleRendererTest.groovy  |   38 -
 .../logging/LoggingServiceRegistryTest.groovy      |  468 --
 ...AbstractLineChoppingStyledTextOutputTest.groovy |  153 -
 .../internal/AbstractStyledTextOutputTest.groovy   |  177 -
 .../gradle/logging/internal/AnsiConsoleTest.groovy |  366 --
 .../ConsoleBackedProgressRendererTest.groovy       |  220 -
 .../org/gradle/logging/internal/ConsoleStub.java   |   43 -
 .../logging/internal/DefaultColorMapTest.groovy    |  106 -
 .../internal/DefaultLoggingManagerTest.java        |  445 --
 .../DefaultProgressLoggerFactoryTest.groovy        |  379 --
 .../internal/DefaultStatusBarFormatterTest.groovy  |   57 -
 .../internal/JavaUtilLoggingSystemTest.groovy      |   40 -
 .../LinePrefixingStyledTextOutputTest.groovy       |  135 -
 .../gradle/logging/internal/LogEventTest.groovy    |   47 -
 .../LoggingBackedStyledTextOutputTest.groovy       |  145 -
 .../LoggingCommandLineConverterTest.groovy         |  124 -
 .../internal/LoggingSystemAdapterTest.groovy       |   73 -
 .../internal/OutputEventRendererTest.groovy        |  310 --
 .../logging/internal/OutputSpecification.groovy    |   84 -
 .../internal/PrintStreamLoggingSystemTest.groovy   |  189 -
 .../internal/ProgressLogEventGeneratorTest.groovy  |  478 --
 .../StreamBackedStandardOutputListenerTest.groovy  |   56 -
 .../internal/StreamingStyledTextOutputTest.groovy  |   77 -
 .../StyledTextOutputBackedRendererTest.groovy      |  106 -
 .../internal/StyledTextOutputEventTest.groovy      |   64 -
 .../TextStreamOutputEventListenerTest.groovy       |   63 -
 .../progress/ProgressOperationsTest.groovy         |  117 -
 ...tputEventListenerBackedLoggerContextTest.groovy |   64 -
 ...enerBackedLoggerDefaultConfigurationTest.groovy |   99 -
 .../OutputEventListenerBackedLoggerTest.groovy     |  907 ----
 .../slf4j/Slf4jLoggingConfigurerTest.groovy        |  178 -
 .../use/internal/PluginRequestCollectorTest.groovy |    4 +-
 .../internal/PluginRequestsSerializerTest.groovy   |    7 +-
 .../internal/DefaultExecHandleBuilderTest.groovy   |   44 +
 .../process/internal/DefaultExecHandleSpec.groovy  |   53 +-
 .../internal/DefaultWorkerProcessTest.groovy       |  200 -
 .../process/internal/ExecHandleBuilderTest.groovy  |   43 -
 .../internal/JavaExecHandleBuilderTest.groovy      |    4 +-
 .../gradle/process/internal/JvmOptionsTest.groovy  |   86 +-
 .../internal/child/ActionExecutionWorkerTest.java  |  118 -
 .../child/BootstrapSecurityManagerTest.groovy      |  104 -
 .../internal/child/EncodedStreamTest.groovy        |   70 -
 .../child/ImplementationClassLoaderWorkerTest.java |   84 -
 .../internal/child/SerializableMockHelper.groovy   |   72 -
 .../WorkerProcessClassPathProviderTest.groovy      |   75 -
 .../internal/streams/EncodedStreamTest.groovy      |   70 +
 .../streams/ExecOutputHandleRunnerTest.groovy      |   18 +-
 .../worker/DefaultWorkerProcessTest.groovy         |  205 +
 .../child/BootstrapSecurityManagerTest.groovy      |  105 +
 .../worker/child/SerializableMockHelper.groovy     |   72 +
 .../WorkerProcessClassPathProviderTest.groovy      |   73 +
 .../org/gradle/testfixtures/CustomPlugin.groovy    |   27 +
 .../gradle/testfixtures/CustomRuleSource.groovy    |   29 +
 .../org/gradle/testfixtures/CustomTask.groovy      |   30 +
 .../gradle/testfixtures/ProjectBuilderTest.groovy  |   25 -
 .../org/gradle/util/AvailablePortFinderTest.groovy |   37 -
 .../org/gradle/util/ConfigureUtilTest.groovy       |   36 +-
 .../groovy/org/gradle/util/DiffUtilTest.groovy     |  203 +-
 .../util/DisconnectableInputStreamTest.groovy      |    2 +-
 .../gradle/util/LineBufferingOutputStreamTest.java |   23 +-
 .../LinePerThreadBufferingOutputStreamTest.groovy  |   44 -
 .../org/gradle/util/SingleMessageLoggerTest.groovy |  114 -
 .../util/ports/AbstractPortAllocatorTest.groovy    |   12 +
 .../ports/FixedAvailablePortAllocatorTest.groovy   |    2 +-
 .../gradle/testfixtures/ProjectBuilderTest.gradle  |    2 +-
 .../gradle/api/file/FileCollectionMatchers.java    |    3 +-
 .../org/gradle/api/internal/file/TestFiles.java    |   47 +-
 .../api/tasks/AbstractConventionTaskTest.groovy    |   42 +
 .../api/tasks/AbstractConventionTaskTest.java      |   41 -
 .../api/tasks/AbstractCopyTaskContractTest.groovy  |   19 +-
 .../gradle/api/tasks/AbstractSpockTaskTest.groovy  |   41 +-
 .../org/gradle/api/tasks/AbstractTaskTest.groovy   |  289 ++
 .../org/gradle/api/tasks/AbstractTaskTest.java     |  272 --
 .../gradle/api/tasks/AntBuilderAwareUtil.groovy    |    2 +-
 .../tasks/bundling/AbstractArchiveTaskTest.groovy  |   97 +-
 .../org/gradle/logging/ConfigureLogging.groovy     |   63 -
 .../gradle/logging/TestOutputEventListener.groovy  |   44 -
 .../org/gradle/logging/TestStyledTextOutput.groovy |   80 -
 .../logging/TestStyledTextOutputFactory.java       |   53 -
 .../gradle/messaging/actor/TestActorFactory.java   |   44 -
 .../fixtures/AbstractProjectBuilderSpec.groovy     |   48 +
 .../groovy/org/gradle/util/JarUtils.groovy         |   38 +
 .../groovy/org/gradle/util/MockExecutor.java       |   96 +-
 .../groovy/org/gradle/util/MockTimeProvider.java   |   43 +
 .../org/gradle/util/MultithreadedTestCase.java     |  666 ---
 .../org/gradle/util/MultithreadedTestRule.java     |  681 +++
 .../groovy/org/gradle/util/TestUtil.groovy         |  193 +-
 .../ports/AbstractAvailablePortAllocator.groovy    |   45 +-
 .../util/ports/FixedAvailablePortAllocator.groovy  |    8 +-
 .../dependency-management.gradle                   |   37 +-
 .../AddingConfigurationIntegrationTest.groovy      |   18 +-
 .../ArtifactDeclarationIntegrationTest.groovy      |    6 +-
 .../ArtifactDependenciesIntegrationTest.groovy     |  186 +-
 .../resolve/CacheResolveIntegrationTest.groovy     |    6 +-
 ...ModuleDependenciesResolveIntegrationTest.groovy |   18 +-
 ...adataRulesChangingModulesIntegrationTest.groovy |   32 +-
 ...etadataRulesErrorHandlingIntegrationTest.groovy |    5 +-
 ...gurationAttributesResolveIntegrationTest.groovy |  517 ++
 .../ConfigurationDefaultsIntegrationTest.groovy    |   39 +-
 .../DependencyExcludeResolveIntegrationTest.groovy |    6 +-
 ...pendencyHandlerApiResolveIntegrationTest.groovy |   20 +-
 .../DependencyNotationIntegrationSpec.groovy       |   82 +-
 .../DependencyResolveRulesIntegrationTest.groovy   |  246 +-
 ...RulesPreferProjectModulesIntegrationTest.groovy |  140 +
 ...pendencySubstitutionRulesIntegrationTest.groovy |  823 ++--
 .../DetachedConfigurationsIntegrationTest.groovy   |   14 +-
 .../ExtendingConfigurationsIntegrationTest.groovy  |   20 +-
 .../resolve/FlatDirResolveIntegrationTest.groovy   |   18 +-
 .../resolve/ForcedModulesIntegrationTest.groovy    |   50 +-
 .../JvmLibraryArtifactResolveTestFixture.groovy    |   88 +-
 ...endencyConflictResolutionIntegrationTest.groovy |   62 +
 .../ProjectDependenciesIntegrationTest.groovy      |   20 +-
 .../ProjectDependencyResolveIntegrationTest.groovy |  275 +-
 .../ResolutionResultApiIntegrationTest.groovy      |   30 +-
 ...ResolutionStrategySamplesIntegrationTest.groovy |    6 +-
 .../ResolveCrossVersionIntegrationTest.groovy      |   12 +-
 .../integtests/resolve/ResolveTestFixture.groovy   |  363 --
 .../ResolvedConfigurationIntegrationTest.groovy    |   58 +-
 .../ScriptDependencyResolveIntegrationTest.groovy  |   18 +-
 .../UnsupportedConfigurationMutationTest.groovy    |  216 +-
 ...VersionConflictResolutionIntegrationTest.groovy |  107 +-
 ...actCacheReuseCrossVersionIntegrationTest.groovy |   15 +-
 .../CacheReuseCrossVersionIntegrationTest.groovy   |   40 +-
 .../M3CacheReuseCrossVersionIntegrationTest.groovy |   83 -
 .../MavenM2CacheReuseIntegrationTest.groovy        |   14 +-
 .../ResolutionOverrideIntegrationTest.groovy       |    8 +-
 ...ameCacheUsageCrossVersionIntegrationTest.groovy |   23 +-
 .../CachedChangingModulesIntegrationTest.groovy    |   48 +-
 .../CachedMissingModulesIntegrationTest.groovy     |   18 +-
 ...ependencyMetadataInMemoryIntegrationTest.groovy |   18 +-
 ...BuildsCachingCrossVersionIntegrationTest.groovy |  123 +
 .../ConcurrentBuildsCachingIntegrationTest.groovy  |   93 +
 ...coverFromBrokenResolutionIntegrationTest.groovy |   10 +-
 .../AbstractHttpsRepoResolveIntegrationTest.groovy |   41 +-
 .../AbstractProxyResolveIntegrationTest.groovy     |  271 ++
 ...ationDependencyResolutionIntegrationTest.groovy |   55 +-
 ...odingDependencyResolutionIntegrationTest.groovy |    6 +-
 .../http/HttpProxyResolveIntegrationTest.groovy    |  143 +-
 .../http/HttpRedirectResolveIntegrationTest.groovy |   12 +-
 .../http/HttpsProxyResolveIntegrationTest.groovy   |   52 +
 ...ctComponentSelectionRulesIntegrationTest.groovy |    4 +-
 ...SelectionRulesDependencyResolveIntegTest.groovy |   20 +-
 ...nentSelectionRulesErrorHandlingIntegTest.groovy |    3 +-
 ...mponentSelectionRulesProcessingIntegTest.groovy |   36 +-
 .../ivy/IvyBrokenDescriptorIntegrationTest.groovy  |   86 +-
 .../IvyBrokenRemoteResolveIntegrationTest.groovy   |  148 +-
 ...IvyComponentMetadataRulesIntegrationTest.groovy |    3 +-
 ...rDependencyExcludeResolveIntegrationTest.groovy |  112 +-
 ...iptorModuleExcludeResolveIntegrationTest.groovy |  137 +-
 .../ivy/IvyDescriptorResolveIntegrationTest.groovy |   28 +-
 .../IvyDescriptorValidationIntegrationTest.groovy  |    6 +-
 ...amicRevisionRemoteResolveIntegrationTest.groovy |    4 +-
 ...IvyDynamicRevisionResolveIntegrationTest.groovy |    2 +-
 .../ivy/IvyHttpRepoResolveIntegrationTest.groovy   |   45 +
 .../ivy/IvyHttpsRepoResolveIntegrationTest.groovy  |   13 +-
 .../ivy/IvyModuleResolveIntegrationTest.groovy     |   61 +
 .../resolve/ivy/IvyResolveIntegrationTest.groovy   |  106 +-
 .../maven/BadPomFileResolveIntegrationTest.groovy  |   76 +-
 .../MavenBrokenRemoteResolveIntegrationTest.groovy |  218 +-
 ...adataRulesChangingModulesIntegrationTest.groovy |    6 +-
 ...ponentMetadataRulesStatusIntegrationTest.groovy |    6 +-
 ...venCustomPackagingResolveIntegrationTest.groovy |  103 +-
 .../MavenDependencyResolveIntegrationTest.groovy   |  266 +-
 .../MavenHttpRepoResolveIntegrationTest.groovy     |   60 +-
 .../MavenHttpsRepoResolveIntegrationTest.groovy    |   13 +-
 ...nJcenterDependencyResolveIntegrationTest.groovy |   38 +-
 .../MavenLocalRepoResolveIntegrationTest.groovy    |   39 +-
 ...nModuleArtifactResolutionIntegrationTest.groovy |   29 +-
 .../MavenParentPomResolveIntegrationTest.groovy    |    6 +-
 .../MavenPomExcludeResolveIntegrationTest.groovy   |   96 +-
 .../MavenPomPackagingResolveIntegrationTest.groovy |   27 +-
 .../maven/MavenPomResolveIntegrationTest.groovy    |    2 +-
 .../MavenProfileResolveIntegrationTest.groovy      |    4 +-
 ...ectDependencySubstitutionIntegrationTest.groovy |  234 +
 .../maven/MavenScopesIntegrationTest.groovy        |  379 ++
 .../MavenSnapshotResolveIntegrationTest.groovy     |   89 +-
 .../MavenVersionRangeResolveIntegrationTest.groovy |    4 +-
 .../MixedMavenAndIvyModulesIntegrationTest.groovy  |  344 ++
 .../projectWithConfigurationHierarchy.gradle       |   52 +-
 .../projectWithCyclesInDependencyGraph.gradle      |   28 +-
 .../canNestModules/projectWithNestedModules.gradle |    8 +-
 .../projectWithDynamicVersions.gradle              |   22 +-
 .../projectWithConflicts.gradle                    |   16 +-
 .../api/internal/artifacts/ArtifactPublisher.java  |    2 +-
 .../artifacts/ComponentMetadataProcessor.java      |    9 +-
 .../artifacts/ComponentSelectionRulesInternal.java |    3 +
 .../artifacts/DefaultDependencyFactory.java        |   10 +-
 .../DefaultDependencyManagementServices.java       |   62 +-
 .../DefaultGlobalDependencyResolutionRules.java    |   48 +-
 .../artifacts/DefaultModuleVersionIdentifier.java  |    6 -
 .../artifacts/DefaultModuleVersionSelector.java    |    7 +-
 .../DependencyManagementBuildScopeServices.java    |  119 +-
 .../DependencyManagementGlobalScopeServices.java   |   18 +-
 ...dencyManagementGradleUserHomeScopeServices.java |   26 +
 .../api/internal/artifacts/DependencyServices.java |   17 +-
 .../artifacts/GlobalDependencyResolutionRules.java |    8 +
 .../internal/artifacts/ModuleVersionPublisher.java |    4 +-
 .../api/internal/artifacts/ResolveContext.java     |    4 +-
 .../component/ComponentIdentifierFactory.java      |   10 +-
 .../component/DefaultBuildIdentifier.java          |   66 +
 .../DefaultComponentIdentifierFactory.java         |   31 +-
 .../configurations/ConflictResolution.java         |   21 +
 .../configurations/DefaultConfiguration.java       |  159 +-
 .../DefaultConfigurationContainer.java             |   26 +-
 .../configurations/MutationValidator.java          |    7 +-
 .../configurations/ResolutionStrategyInternal.java |    1 -
 .../configurations/RunnableMutationValidator.java  |    2 +-
 .../artifacts/dsl/ComponentSelectorParsers.java    |    2 +-
 .../dsl/DefaultComponentMetadataHandler.java       |   61 +-
 .../artifacts/dsl/ParsedModuleStringNotation.java  |   37 +-
 .../dsl/PublishArtifactNotationParserFactory.java  |    2 +-
 .../ivyservice/ArtifactCacheMetaData.java          |   19 +-
 .../internal/artifacts/ivyservice/CacheLayout.java |    2 +-
 .../CacheLockingArtifactDependencyResolver.java    |    2 +-
 .../ivyservice/CacheLockingArtifactResolver.java   |   65 +
 .../artifacts/ivyservice/CacheLockingManager.java  |   18 +-
 .../ivyservice/ContextualArtifactResolver.java     |   73 -
 .../ivyservice/DefaultArtifactCacheMetaData.java   |   54 +
 .../ivyservice/DefaultCacheLockingManager.java     |   28 +-
 .../ivyservice/DefaultConfigurationResolver.java   |   20 +-
 .../ivyservice/DefaultIvyDependencyPublisher.java  |   72 -
 .../ivyservice/DefaultLenientConfiguration.java    |   34 +-
 .../ErrorHandlingConfigurationResolver.java        |    9 +
 .../ivyservice/IvyBackedArtifactPublisher.java     |   92 -
 .../ivyservice/IvyContextualArtifactPublisher.java |   47 +
 .../ivyservice/IvyContextualMetaDataParser.java    |   67 +
 .../ivyservice/IvyDependencyPublisher.java         |   26 -
 .../artifacts/ivyservice/IvyLoggingAdaper.java     |    3 +-
 .../ivyservice/IvyModuleDescriptorWriter.java      |   28 -
 .../api/internal/artifacts/ivyservice/IvyUtil.java |   52 +-
 .../ivyservice/IvyXmlModuleDescriptorWriter.java   |  419 --
 .../internal/artifacts/ivyservice/NamespaceId.java |    2 -
 ...lfResolvingDependencyConfigurationResolver.java |    2 +-
 .../ShortCircuitEmptyConfigurationResolver.java    |   22 +-
 .../clientmodule/ClientModuleResolver.java         |   23 +-
 .../DefaultDependencySubstitutions.java            |   97 +-
 .../DependencySubstitutionResolver.java            |    4 +-
 .../DependencySubstitutionRules.java               |   42 +
 .../DependencySubstitutionsInternal.java           |    7 +-
 .../BaseModuleComponentRepositoryAccess.java       |   24 +-
 ...cheLockReleasingModuleComponentsRepository.java |   37 +-
 .../CachingModuleComponentRepository.java          |  121 +-
 .../ComponentSelectionRulesProcessor.java          |    9 +-
 .../DefaultVersionedComponentChooser.java          |   10 +-
 .../ivyresolve/DependencyResolverIdentifier.java   |   46 -
 .../ivyresolve/DynamicVersionResolver.java         |   30 +-
 .../ivyresolve/ErrorHandlingArtifactResolver.java  |   19 +-
 .../ErrorHandlingModuleComponentRepository.java    |   19 +-
 ...amicResolveModuleComponentRepositoryAccess.java |   16 +-
 .../ivyresolve/LocalModuleComponentRepository.java |   46 +-
 .../ivyservice/ivyresolve/MetadataProvider.java    |   17 +-
 .../ModuleComponentRepositoryAccess.java           |   17 +-
 .../ivyresolve/NoRepositoriesResolver.java         |   23 +-
 .../RepositoryChainArtifactResolver.java           |   29 +-
 .../RepositoryChainComponentMetaDataResolver.java  |    6 +-
 ...sitoryChainDependencyToComponentIdResolver.java |    8 +-
 .../RepositoryChainModuleResolution.java           |    6 +-
 .../ivyresolve/RepositoryChainModuleSource.java    |    5 +
 .../ivyservice/ivyresolve/ResolveIvyFactory.java   |   32 +-
 .../StartParameterResolutionOverride.java          |   20 +-
 .../ivyservice/ivyresolve/UserResolverChain.java   |    9 +-
 .../ivyresolve/VersionedComponentChooser.java      |    4 +-
 .../memcache/CachedModuleVersionResult.java        |    8 +-
 .../memcache/InMemoryArtifactsCache.java           |   71 +-
 .../ivyresolve/memcache/InMemoryCacheStats.java    |   29 -
 .../InMemoryCachedModuleComponentRepository.java   |   44 +-
 .../memcache/InMemoryCachedRepositoryFactory.java  |    9 +-
 .../ivyresolve/memcache/InMemoryMetaDataCache.java |    8 +-
 .../InMemoryModuleComponentRepositoryCaches.java   |   13 +-
 .../parser/AbstractModuleDescriptorParser.java     |    4 +-
 .../ivyresolve/parser/BuildableIvyArtifact.java    |    5 +-
 .../DisconnectedIvyXmlModuleDescriptorParser.java  |   16 +-
 .../DownloadedIvyModuleDescriptorParser.java       |    5 -
 .../parser/GradlePomModuleDescriptorBuilder.java   |  300 +-
 .../parser/GradlePomModuleDescriptorParser.java    |   52 +-
 .../parser/IvyModuleDescriptorConverter.java       |  167 +
 .../parser/IvyModuleResolveMetaDataBuilder.java    |   56 +
 .../parser/IvyXmlModuleDescriptorParser.java       |  168 +-
 .../ivyresolve/parser/MetaDataParseException.java  |    2 +-
 .../ivyresolve/parser/MetaDataParser.java          |    4 +-
 .../ivyservice/ivyresolve/parser/PomReader.java    |  166 +-
 .../ivyresolve/parser/data/MavenDependencyKey.java |   27 +-
 .../ivyresolve/parser/data/PomDependencyMgt.java   |    4 +-
 .../strategy/MavenVersionSelectorScheme.java       |    2 +-
 .../ivyresolve/strategy/ResolverStrategy.java      |   41 -
 .../ivyresolve/strategy/VersionParser.java         |    2 +-
 .../modulecache/DefaultCachedMetaData.java         |    8 +-
 .../modulecache/DefaultModuleArtifactsCache.java   |   58 +-
 .../modulecache/DefaultModuleMetaDataCache.java    |   90 +-
 .../modulecache/IvyModuleCacheEntry.java           |   35 -
 .../modulecache/MavenModuleCacheEntry.java         |   41 -
 .../modulecache/MissingModuleCacheEntry.java       |    2 +-
 .../modulecache/ModuleArtifactsCache.java          |   10 +-
 .../ModuleComponentAtRepositoryKey.java            |   56 +
 .../modulecache/ModuleDescriptorCacheEntry.java    |   77 -
 .../ModuleDescriptorCacheEntrySerializer.java      |   84 -
 .../modulecache/ModuleDescriptorStore.java         |   74 -
 .../modulecache/ModuleMetaDataCache.java           |    7 +-
 .../modulecache/ModuleMetadataCacheEntry.java      |   59 +
 .../ModuleMetadataCacheEntrySerializer.java        |   65 +
 .../modulecache/ModuleMetadataSerializer.java      |  516 ++
 .../modulecache/ModuleMetadataStore.java           |   83 +
 .../ConfigurationComponentMetaDataBuilder.java     |    4 +-
 ...faultConfigurationComponentMetaDataBuilder.java |   12 +-
 .../AbstractIvyDependencyDescriptorFactory.java    |   20 +-
 ...ultDependenciesToModuleDescriptorConverter.java |   15 +-
 .../DefaultDependencyDescriptorFactory.java        |    7 +-
 .../dependencies/DefaultExcludeRuleConverter.java  |   21 +-
 .../DependenciesToModuleDescriptorConverter.java   |    4 +-
 .../dependencies/DependencyDescriptorFactory.java  |    6 +-
 .../dependencies/ExcludeRuleConverter.java         |    5 +-
 ...ternalModuleIvyDependencyDescriptorFactory.java |   18 +-
 .../IvyDependencyDescriptorFactory.java            |    8 +-
 .../ProjectIvyDependencyDescriptorFactory.java     |   30 +-
 .../ReflectiveDependencyDescriptorFactory.java     |   82 -
 .../AggregatingProjectArtifactBuilder.java         |   43 +
 .../CacheLockReleasingProjectArtifactBuilder.java  |   45 +
 .../DefaultLocalComponentRegistry.java             |   62 +
 .../DefaultProjectComponentRegistry.java           |   54 -
 .../DefaultProjectLocalComponentProvider.java      |   88 +
 .../projectmodule/LocalComponentProvider.java      |   37 +
 .../projectmodule/LocalComponentRegistry.java      |   37 +
 .../projectmodule/ProjectArtifactBuilder.java      |   31 +
 .../projectmodule/ProjectComponentRegistry.java    |   22 -
 .../ProjectDependencyComponentArtifacts.java       |   42 +
 .../projectmodule/ProjectDependencyResolver.java   |   66 +-
 .../ProjectLocalComponentProvider.java             |   28 +
 .../publisher/DefaultIvyDependencyPublisher.java   |   72 +
 .../publisher/IvyBackedArtifactPublisher.java      |   84 +
 .../publisher/IvyDependencyPublisher.java          |   26 +
 .../publisher/IvyModuleDescriptorWriter.java       |   25 +
 .../publisher/IvyXmlModuleDescriptorWriter.java    |  280 ++
 .../DefaultComponentSelectionRules.java            |   33 +-
 .../DefaultResolutionStrategy.java                 |   41 +-
 .../LatestConflictResolution.java                  |    2 +-
 .../PreferProjectModulesConflictResolution.java    |   24 +
 .../StrictConflictResolution.java                  |    4 +-
 .../resolveengine/ComponentResolutionState.java    |    4 +-
 .../resolveengine/ComponentResolversChain.java     |   19 +-
 .../DefaultArtifactDependencyResolver.java         |   51 +-
 .../DefaultDependencyToConfigurationResolver.java  |   80 -
 .../DefaultModuleResolutionFilter.java             |  842 ----
 .../DependencyToConfigurationResolver.java         |   30 -
 .../LatestModuleConflictResolver.java              |    4 +-
 .../resolveengine/ModuleResolutionFilter.java      |   61 -
 .../ProjectDependencyForcingResolver.java          |   62 +
 .../resolveengine/artifact/DefaultArtifactSet.java |   22 +-
 .../artifact/DefaultResolvedArtifactResults.java   |   14 +-
 .../artifact/DefaultResolvedArtifactsBuilder.java  |   11 +-
 .../artifact/DependencyArtifactsVisitor.java       |    4 +-
 .../artifact/ResolvedArtifactsGraphVisitor.java    |   48 +-
 .../excludes/AbstractCompositeExclusion.java       |   72 +
 .../excludes/AbstractModuleExclusion.java          |  101 +
 .../excludes/ArtifactExcludeSpec.java              |   82 +
 .../excludes/ExcludeAllModulesSpec.java            |   46 +
 .../resolveengine/excludes/ExcludeNone.java        |   46 +
 .../excludes/GroupNameExcludeSpec.java             |   58 +
 .../excludes/IntersectionExclusion.java            |   84 +
 .../excludes/IvyPatternMatcherExcludeRuleSpec.java |   94 +
 .../resolveengine/excludes/ModuleExclusion.java    |   49 +
 .../resolveengine/excludes/ModuleExclusions.java   |  306 ++
 .../excludes/ModuleIdExcludeSpec.java              |   58 +
 .../excludes/ModuleNameExcludeSpec.java            |   57 +
 .../resolveengine/excludes/PatternMatchers.java    |   68 +
 .../resolveengine/excludes/UnionExclusion.java     |   87 +
 .../resolveengine/graph/ComponentResult.java       |   41 +
 .../graph/CompositeDependencyArtifactsVisitor.java |    3 +-
 .../graph/DependencyGraphBuilder.java              |  263 +-
 .../graph/DependencyGraphComponent.java            |   30 +
 .../resolveengine/graph/DependencyGraphEdge.java   |   18 +-
 .../resolveengine/graph/DependencyGraphNode.java   |   26 +-
 .../graph/DependencyGraphPathResolver.java         |   54 +-
 .../graph/DependencyGraphVisitor.java              |   20 +
 .../resolveengine/graph/DependencyResult.java      |   42 +
 .../DefaultResolvedConfigurationBuilder.java       |   26 +-
 .../oldresult/DefaultResolvedGraphResults.java     |    7 +-
 .../oldresult/ResolvedConfigurationBuilder.java    |   10 +-
 ...esolvedConfigurationDependencyGraphVisitor.java |   28 +-
 .../oldresult/ResolvedContentsMapping.java         |    3 +-
 .../oldresult/ResolvedGraphResults.java            |    3 +-
 .../TransientConfigurationResultsBuilder.java      |   65 +-
 .../TransientConfigurationResultsLoader.java       |    3 +-
 .../ResolvedLocalComponentsResultGraphVisitor.java |   16 +-
 .../result/BuildIdentifierSerializer.java          |   40 +
 .../result/ComponentIdentifierSerializer.java      |   53 +-
 .../result/ComponentResultSerializer.java          |   50 +
 .../result/ComponentSelectionReasonSerializer.java |    4 +-
 .../result/ComponentSelectorSerializer.java        |   43 +-
 .../result/DefaultComponentResult.java             |   53 +
 .../result/DefaultDependencyResult.java            |   59 +
 .../result/DefaultInternalDependencyResult.java    |   59 -
 .../result/DefaultModuleVersionSelection.java      |   45 -
 .../result/DefaultResolutionResultBuilder.java     |   50 +-
 .../result/DependencyResultSerializer.java         |   60 +
 .../result/InternalDependencyResult.java           |   40 -
 .../result/InternalDependencyResultSerializer.java |   62 -
 .../result/ModuleVersionSelection.java             |   30 -
 .../result/ModuleVersionSelectionSerializer.java   |   47 -
 .../result/ResolutionResultBuilder.java            |   31 -
 .../ResolutionResultDependencyGraphVisitor.java    |   44 -
 .../result/StreamingResolutionResultBuilder.java   |  103 +-
 .../result/VersionSelectionReasons.java            |    5 +-
 .../ComponentArtifactIdentifierSerializer.java     |   52 +
 .../ComponentArtifactMetadataSerializer.java       |   54 +
 .../ModuleVersionArtifactIdentifierSerializer.java |   54 -
 .../DefaultLocalMavenRepositoryLocator.java        |    2 +-
 .../query/DefaultArtifactResolutionQuery.java      |   14 +-
 .../AbstractAuthenticationSupportedRepository.java |  104 +-
 .../repositories/AuthenticationSupporter.java      |  152 +
 .../repositories/DefaultBaseRepositoryFactory.java |   34 +-
 .../DefaultFlatDirArtifactRepository.java          |   29 +-
 .../repositories/DefaultIvyArtifactRepository.java |   33 +-
 .../DefaultMavenArtifactRepository.java            |   25 +-
 .../DefaultMavenLocalArtifactRepository.java       |   13 +-
 .../resolver/AbstractResourcePattern.java          |    4 +-
 .../resolver/ChainedVersionLister.java             |   10 +-
 .../resolver/ComponentMetadataAdapter.java         |   46 +
 .../resolver/ComponentMetadataDetailsAdapter.java  |    6 +-
 .../DefaultExternalResourceArtifactResolver.java   |   41 +-
 .../resolver/ExternalResourceArtifactResolver.java |    8 +-
 .../resolver/ExternalResourceResolver.java         |  221 +-
 ...rnalResourceResolverDescriptorParseContext.java |   15 +-
 .../repositories/resolver/IvyResolver.java         |   70 +-
 .../repositories/resolver/IvyResourcePattern.java  |    6 +-
 .../repositories/resolver/M2ResourcePattern.java   |    8 +-
 .../repositories/resolver/MavenLocalResolver.java  |   29 +-
 .../repositories/resolver/MavenMetadataLoader.java |   10 +-
 .../repositories/resolver/MavenResolver.java       |   98 +-
 ...ueSnapshotExternalResourceArtifactResolver.java |   26 +-
 .../repositories/resolver/MavenVersionLister.java  |    2 +-
 .../repositories/resolver/ResourcePattern.java     |    4 +-
 .../resolver/ResourceVersionLister.java            |    5 +-
 .../resolver/VersionPatternVisitor.java            |    2 +-
 .../transport/RepositoryTransportFactory.java      |    2 +-
 .../artifacts/result/DefaultResolutionResult.java  |    6 +-
 .../result/DefaultResolvedComponentResult.java     |   10 +-
 .../result/DefaultResolvedDependencyResult.java    |    4 +-
 .../result/DefaultUnresolvedDependencyResult.java  |    2 +-
 .../artifacts/result/jvm/AbstractArtifact.java     |   51 -
 .../internal/composite/CompositeBuildContext.java  |   41 +
 .../CompositeBuildIdeProjectResolver.java          |   74 +
 .../filestore/ivy/ArtifactIdentifierFileStore.java |   32 +-
 .../DependencyClassPathNotationConverter.java      |   70 +-
 .../notations/DependencyNotationParser.java        |   20 +-
 .../DependencyStringNotationConverter.java         |   22 +-
 .../ImplementationDependencyRelocator.java         |  125 +
 .../runtimeshaded/PackageListGenerator.java        |  194 +
 .../runtimeshaded/RuntimeShadedJarCreator.java     |  412 ++
 .../runtimeshaded/RuntimeShadedJarFactory.java     |   54 +
 .../runtimeshaded/RuntimeShadedJarType.java        |   33 +
 .../gradle/api/internal/runtimeshaded/Trie.java    |  154 +
 .../component/external/descriptor/Artifact.java    |   44 +
 .../external/descriptor/Configuration.java         |   52 +
 .../external/descriptor/DefaultExclude.java        |   80 +
 .../component/external/descriptor/MavenScope.java  |   25 +
 .../external/descriptor/ModuleDescriptorState.java |  110 +
 .../descriptor/MutableModuleDescriptorState.java   |   68 +
 .../AbstractModuleComponentResolveMetaData.java    |  116 -
 .../AbstractModuleComponentResolveMetadata.java    |  379 ++
 ...tractMutableModuleComponentResolveMetadata.java |  163 +
 .../model/BuildableIvyModulePublishMetaData.java   |   26 -
 .../model/BuildableIvyModulePublishMetadata.java   |   26 +
 .../model/BuildableIvyModuleResolveMetaData.java   |   76 -
 .../DefaultIvyModuleArtifactPublishMetadata.java   |   65 +
 .../model/DefaultIvyModulePublishMetaData.java     |  164 -
 .../model/DefaultIvyModulePublishMetadata.java     |  141 +
 .../model/DefaultIvyModuleResolveMetaData.java     |   66 -
 .../model/DefaultIvyModuleResolveMetadata.java     |   49 +
 .../model/DefaultMavenModuleResolveMetaData.java   |   93 -
 .../model/DefaultMavenModuleResolveMetadata.java   |   76 +
 .../DefaultModuleComponentArtifactIdentifier.java  |   27 +-
 .../DefaultModuleComponentArtifactMetaData.java    |   56 -
 .../DefaultModuleComponentArtifactMetadata.java    |   56 +
 .../DefaultMutableIvyModuleResolveMetadata.java    |   63 +
 .../DefaultMutableMavenModuleResolveMetadata.java  |   97 +
 .../external/model/FixedComponentArtifacts.java    |   44 +
 .../external/model/IvyDependencyMetadata.java      |  200 +
 .../model/IvyModuleArtifactPublishMetaData.java    |   36 -
 .../model/IvyModuleArtifactPublishMetadata.java    |   32 +
 .../external/model/IvyModulePublishMetaData.java   |   33 -
 .../external/model/IvyModulePublishMetadata.java   |   40 +
 .../external/model/IvyModuleResolveMetaData.java   |   39 -
 .../external/model/IvyModuleResolveMetadata.java   |   52 +
 .../external/model/MavenDependencyMetadata.java    |  140 +
 .../external/model/MavenModuleResolveMetaData.java |   28 -
 .../external/model/MavenModuleResolveMetadata.java |   42 +
 .../model/MetadataSourcedComponentArtifacts.java   |   33 +
 .../model/ModuleComponentArtifactIdentifier.java   |    5 +
 .../model/ModuleComponentArtifactMetaData.java     |   33 -
 .../model/ModuleComponentArtifactMetadata.java     |   33 +
 .../model/ModuleComponentResolveMetaData.java      |   41 -
 .../model/ModuleComponentResolveMetadata.java      |   69 +
 .../model/MutableIvyModuleResolveMetadata.java     |   25 +
 .../model/MutableMavenModuleResolveMetadata.java   |   37 +
 .../MutableModuleComponentResolveMetaData.java     |   50 -
 .../MutableModuleComponentResolveMetadata.java     |   94 +
 .../model/BuildableLocalComponentMetaData.java     |   34 -
 .../model/BuildableLocalComponentMetadata.java     |   39 +
 .../model/DefaultLibraryBinaryIdentifier.java      |    3 +-
 .../model/DefaultLibraryComponentSelector.java     |   29 +-
 .../local/model/DefaultLocalComponentMetaData.java |  254 -
 .../local/model/DefaultLocalComponentMetadata.java |  259 +
 .../model/DefaultProjectComponentIdentifier.java   |   47 +-
 .../model/DefaultProjectComponentSelector.java     |   69 +-
 .../model/DefaultProjectDependencyMetaData.java    |   35 -
 .../model/DefaultProjectDependencyMetadata.java    |  107 +
 .../local/model/DslOriginDependencyMetaData.java   |   30 -
 .../model/DslOriginDependencyMetaDataWrapper.java  |  101 -
 .../local/model/DslOriginDependencyMetadata.java   |   30 +
 .../model/DslOriginDependencyMetadataWrapper.java  |  131 +
 .../model/LocalComponentArtifactIdentifier.java    |   25 -
 .../model/LocalComponentArtifactMetadata.java      |   25 +
 .../local/model/LocalComponentMetaData.java        |   22 -
 .../local/model/LocalComponentMetadata.java        |   22 +
 .../local/model/LocalConfigurationMetaData.java    |   34 -
 .../local/model/LocalConfigurationMetadata.java    |   34 +
 .../local/model/MissingLocalArtifactMetaData.java  |   84 -
 .../local/model/MissingLocalArtifactMetadata.java  |   84 +
 .../PublishArtifactLocalArtifactMetaData.java      |  111 -
 .../PublishArtifactLocalArtifactMetadata.java      |  100 +
 .../AbstractModuleDescriptorBackedMetaData.java    |  280 --
 .../component/model/ComponentArtifactMetaData.java |   40 -
 .../component/model/ComponentArtifactMetadata.java |   40 +
 .../component/model/ComponentArtifacts.java        |   26 +
 .../component/model/ComponentResolveMetaData.java  |   77 -
 .../component/model/ComponentResolveMetadata.java  |   79 +
 .../internal/component/model/ComponentUsage.java   |   20 -
 .../component/model/ConfigurationMetaData.java     |   52 -
 .../component/model/ConfigurationMetadata.java     |   62 +
 .../model/ConfigurationNotFoundException.java      |   26 +
 .../model/DefaultComponentOverrideMetadata.java    |   12 +-
 .../component/model/DefaultComponentUsage.java     |   33 -
 .../component/model/DefaultDependencyMetaData.java |  174 -
 .../component/model/DefaultDependencyMetadata.java |  138 +
 .../component/model/DefaultIvyArtifactName.java    |   62 +-
 .../DefaultModuleDescriptorArtifactMetaData.java   |   50 -
 .../DefaultModuleDescriptorArtifactMetadata.java   |   50 +
 .../component/model/DependencyMetaData.java        |   79 -
 .../component/model/DependencyMetadata.java        |   83 +
 .../gradle/internal/component/model/Exclude.java   |   32 +
 .../internal/component/model/IvyArtifactName.java  |    5 +-
 .../model/LocalComponentDependencyMetaData.java    |  155 -
 .../model/LocalComponentDependencyMetadata.java    |  224 +
 .../model/LocalOriginDependencyMetadata.java       |   38 +
 .../model/ModuleDescriptorArtifactMetaData.java    |   22 -
 .../model/ModuleDescriptorArtifactMetadata.java    |   25 +
 .../resolve/ModuleVersionResolveException.java     |   17 +-
 .../resolve/resolver/ArtifactResolver.java         |   16 +-
 .../resolver/DependencyToComponentIdResolver.java  |    4 +-
 .../resolve/result/ArtifactResolveResult.java      |   37 -
 .../resolve/result/ArtifactSetResolveResult.java   |   35 -
 .../result/BuildableArtifactResolveResult.java     |   14 +-
 .../result/BuildableArtifactSetResolveResult.java  |   10 +-
 .../BuildableComponentArtifactsResolveResult.java  |   23 +
 .../result/BuildableComponentIdResolveResult.java  |    4 +-
 .../result/BuildableComponentResolveResult.java    |    6 +-
 ...ldableModuleComponentMetaDataResolveResult.java |   20 +-
 .../result/BuildableTypedResolveResult.java        |   45 +
 .../resolve/result/ComponentIdResolveResult.java   |    4 +-
 .../resolve/result/ComponentResolveResult.java     |    4 +-
 .../DefaultBuildableArtifactResolveResult.java     |   40 +-
 .../DefaultBuildableArtifactSetResolveResult.java  |   44 +-
 ...ltBuildableComponentArtifactsResolveResult.java |   23 +
 .../DefaultBuildableComponentIdResolveResult.java  |    8 +-
 .../DefaultBuildableComponentResolveResult.java    |   10 +-
 ...ldableModuleComponentMetaDataResolveResult.java |   23 +-
 .../result/DefaultBuildableTypedResolveResult.java |   67 +
 .../resource/cached/ivy/AbstractCachedIndex.java   |    4 +-
 .../ArtifactAtRepositoryCachedArtifactIndex.java   |   10 +-
 .../cached/ivy/ArtifactAtRepositoryKey.java        |    8 +-
 .../ivy/LocallyAvailableResourceFinderFactory.java |   41 +-
 ...PatternBasedLocallyAvailableResourceFinder.java |   12 +-
 .../transfer/AbstractProgressLoggingHandler.java   |    6 +-
 .../DefaultCacheAwareExternalResourceAccessor.java |   24 +-
 .../ProgressLoggingExternalResourceAccessor.java   |   10 +-
 .../ProgressLoggingExternalResourceUploader.java   |    2 +-
 .../resource/transfer/ResourceOperation.java       |    2 +-
 .../DefaultExternalResourceRepository.java         |    8 +-
 .../transport/ExternalResourceRepository.java      |    9 +-
 .../ResourceConnectorRepositoryTransport.java      |    2 +-
 .../transport/file/FileResourceConnector.java      |    6 +-
 .../resource/transport/file/FileTransport.java     |    2 +-
 .../java/org/gradle/internal/rules/RuleAction.java |    3 -
 .../rules/RuleActionValidationException.java       |    5 -
 .../internal/rules/RuleSourceBackedRuleAction.java |   30 +-
 .../DefaultDependencyManagementServicesTest.groovy |    8 +-
 .../DefaultModuleVersionSelectorTest.groovy        |   13 -
 .../DefaultComponentIdentifierFactoryTest.groovy   |   17 +-
 .../DefaultConfigurationContainerSpec.groovy       |   19 +-
 .../DefaultConfigurationContainerTest.groovy       |  103 +-
 .../configurations/DefaultConfigurationSpec.groovy |   11 +-
 .../TasksFromDependentProjectsTest.groovy          |    6 +-
 .../TasksFromProjectDependenciesTest.groovy        |    6 +-
 .../dsl/ComponentSelectorParsersTest.groovy        |   14 +-
 .../dsl/DefaultComponentMetadataHandlerTest.groovy |  122 +-
 ...lishArtifactNotationConverterFactoryTest.groovy |    4 +-
 .../artifacts/ivyservice/CacheLayoutTest.groovy    |    8 +-
 .../DefaultArtifactCacheMetaDataTest.groovy        |   54 +
 .../DefaultCacheLockingManagerTest.groovy          |   74 -
 .../DefaultLenientConfigurationTest.groovy         |  135 +
 .../artifacts/ivyservice/IvyUtilTest.groovy        |   14 +-
 .../IvyXmlModuleDescriptorWriterTest.groovy        |  123 +-
 .../clientmodule/ClientModuleResolverTest.groovy   |   33 +-
 .../DefaultDependencySubstitutionSpec.groovy       |   12 +-
 .../DefaultDependencySubstitutionsSpec.groovy      |   43 +-
 .../DependencySubstitutionResolverSpec.groovy      |    7 +-
 .../CachingModuleComponentRepositoryTest.groovy    |   44 +-
 .../ComponentSelectionRulesProcessorTest.groovy    |   60 +-
 .../DefaultVersionedComponentChooserTest.groovy    |   38 +-
 .../DependencyResolverIdentifierTest.groovy        |   39 +-
 .../ErrorHandlingArtifactResolverTest.groovy       |   26 +-
 ...solveModuleComponentRepositoryAccessTest.groovy |   16 +-
 .../ivyresolve/MetadataProviderTest.groovy         |   25 +-
 .../ivyresolve/ResolveIvyFactoryTest.groovy        |    6 +-
 .../ResolverProviderArtifactResolverTest.groovy    |   48 +-
 ...verProviderComponentMetaDataResolverTest.groovy |   35 +-
 .../memcache/CachedModuleVersionResultTest.groovy  |   19 +-
 .../memcache/InMemoryArtifactsCacheTest.groovy     |  139 +-
 ...emoryCachedModuleComponentRepositoryTest.groovy |  176 +-
 .../InMemoryCachedRepositoryFactoryTest.groovy     |    3 -
 .../memcache/InMemoryMetaDataCacheTest.groovy      |   26 +-
 ...tractGradlePomModuleDescriptorParserTest.groovy |   46 +-
 ...onnectedIvyXmlModuleDescriptorParserTest.groovy |   11 +-
 .../DownloadedIvyModuleDescriptorParserTest.groovy |    5 +-
 ...adlePomModuleDescriptorParserProfileTest.groovy |  252 +-
 .../GradlePomModuleDescriptorParserTest.groovy     |  440 +-
 .../IvyModuleResolveMetadataBuilderTest.groovy     |  103 +
 .../parser/IvyXmlModuleDescriptorParserTest.groovy |  808 ++-
 .../ivyresolve/parser/PomReaderTest.groovy         |   26 +-
 .../modulecache/ModuleDescriptorStoreTest.groovy   |   76 -
 .../modulecache/ModuleMetadataStoreTest.groovy     |   66 +
 ...onfigurationComponentMetaDataBuilderTest.groovy |   57 +-
 ...actDependencyDescriptorFactoryInternalTest.java |   47 +-
 ...endenciesToModuleDescriptorConverterTest.groovy |   18 +-
 .../DefaultDependencyDescriptorFactoryTest.groovy  |   10 +-
 .../DefaultExcludeRuleConverterTest.java           |   33 +-
 ...ernalModuleDependencyDescriptorFactoryTest.java |   10 +-
 .../ProjectDependencyDescriptorFactoryTest.groovy  |   17 +-
 ...eflectiveDependencyDescriptorFactoryTest.groovy |   90 -
 .../ProjectDependencyResolverTest.groovy           |   50 +-
 .../DefaultResolutionStrategySpec.groovy           |   12 +-
 .../DefaultModuleResolutionFilterTest.groovy       |  673 ---
 .../DependencyGraphBuilderTest.groovy              |  472 +-
 .../excludes/DefaultModuleExclusionTest.groovy     |  798 +++
 .../ComponentIdentifierSerializerTest.groovy       |   17 +-
 .../result/ComponentResultSerializerTest.groovy    |   41 +
 .../result/ComponentSelectorSerializerTest.groovy  |    4 +-
 .../DefaultResolutionResultBuilderSpec.groovy      |   72 +-
 .../result/DependencyResultSerializerTest.groovy   |   80 +
 .../InternalDependencyResultSerializerTest.groovy  |   80 -
 .../ModuleVersionSelectionSerializerTest.groovy    |   40 -
 .../StreamingResolutionResultBuilderTest.groovy    |  149 +-
 .../result/VersionSelectionReasonsTest.groovy      |    8 +-
 ...omponentArtifactIdentifierSerializerTest.groovy |   43 +
 .../ComponentArtifactMetadataSerializerTest.groovy |   44 +
 .../DefaultArtifactResolutionQueryTest.groovy      |    8 +-
 ...itoryChangingNameAfterContainerInclusion.groovy |    7 +-
 ...actAuthenticationSupportedRepositoryTest.groovy |    3 +-
 .../DefaultBaseRepositoryFactoryTest.groovy        |    8 +-
 .../DefaultFlatDirArtifactRepositoryTest.groovy    |   11 +-
 .../DefaultIvyArtifactRepositoryTest.groovy        |    8 +-
 .../DefaultMavenLocalRepositoryTest.groovy         |    2 +-
 .../resolver/ChainedVersionListerTest.groovy       |   20 +-
 .../resolver/ExternalResourceResolverTest.groovy   |    6 +-
 .../repositories/resolver/IvyResolverTest.groovy   |    4 +-
 .../resolver/IvyResourcePatternTest.groovy         |    8 +-
 .../resolver/M2ResourcePatternTest.groovy          |   10 +-
 ...shotExternalResourceArtifactResolverTest.groovy |   10 +-
 .../resolver/MavenVersionListerTest.groovy         |   26 +-
 .../resolver/ResourceVersionListerTest.groovy      |    2 +-
 ...DependencyClassPathNotationConverterTest.groovy |   65 +-
 .../DependencyMapNotationConverterTest.groovy      |    2 +-
 .../notations/ProjectDependencyFactoryTest.groovy  |    2 +-
 .../RuntimeShadedJarCreatorTest.groovy             |  372 ++
 ...stractModuleComponentResolveMetaDataTest.groovy |  242 -
 ...stractModuleComponentResolveMetadataTest.groovy |  160 +
 ...utableModuleComponentResolveMetadataTest.groovy |  151 +
 .../BuildableIvyModuleResolveMetaDataTest.groovy   |   92 -
 .../DefaultIvyModulePublishMetaDataTest.groovy     |   94 -
 .../DefaultIvyModulePublishMetadataTest.groovy     |   64 +
 .../DefaultIvyModuleResolveMetaDataTest.groovy     |   66 -
 .../DefaultIvyModuleResolveMetadataTest.groovy     |   69 +
 .../DefaultMavenModuleResolveMetaDataTest.groovy   |   74 -
 .../DefaultMavenModuleResolveMetadataTest.groovy   |   68 +
 ...ultModuleComponentArtifactIdentifierTest.groovy |   45 +-
 ...faultModuleComponentArtifactMetaDataTest.groovy |   56 -
 ...faultModuleComponentArtifactMetadataTest.groovy |   56 +
 .../DefaultModuleComponentSelectorTest.groovy      |    6 +-
 ...faultMutableIvyModuleResolveMetadataTest.groovy |  209 +
 ...ultMutableMavenModuleResolveMetadataTest.groovy |  253 +
 .../model/IvyDependencyMetadataTest.groovy         |  385 ++
 .../model/MavenDependencyMetadataTest.groovy       |  268 +
 .../DefaultLibraryComponentSelectorTest.groovy     |   29 +-
 .../model/DefaultLocalComponentMetaDataTest.groovy |  180 -
 .../model/DefaultLocalComponentMetadataTest.groovy |  225 +
 .../DefaultProjectComponentIdentifierTest.groovy   |   24 +-
 .../DefaultProjectComponentSelectorTest.groovy     |   40 +-
 .../DefaultProjectDependencyMetadataTest.groovy    |   44 +
 .../model/MissingLocalArtifactMetaDataTest.groovy  |   75 -
 .../model/MissingLocalArtifactMetadataTest.groovy  |   75 +
 .../model/DefaultDependencyMetaDataTest.groovy     |  203 -
 .../model/DefaultDependencyMetadataTest.groovy     |  149 +
 .../model/DefaultIvyArtifactNameTest.groovy        |   45 +-
 .../LocalComponentDependencyMetadataTest.groovy    |  106 +
 .../ModuleVersionNotFoundExceptionTest.groovy      |    7 +-
 .../ModuleVersionResolveExceptionTest.groovy       |    2 +-
 ...efaultBuildableArtifactResolveResultTest.groovy |   10 +-
 ...ultBuildableArtifactSetResolveResultTest.groovy |   13 +-
 ...ultBuildableComponentIdResolveResultTest.groovy |    4 +-
 ...faultBuildableComponentResolveResultTest.groovy |   10 +-
 ...ModuleComponentMetaDataResolveResultTest.groovy |   36 +-
 .../DefaultBuildableTypedResolveResultTest.groovy  |  110 +
 ...ltCacheAwareExternalResourceAccessorTest.groovy |   22 +-
 ...gressLoggingExternalResourceAccessorTest.groovy |   30 +-
 ...gressLoggingExternalResourceUploaderTest.groovy |    4 +-
 .../resource/transfer/ResourceOperationTest.groovy |    2 +-
 .../rules/RuleSourceBackedRuleActionTest.groovy    |   26 +-
 .../fixtures/resolve/ResolveTestFixture.groovy     |  509 ++
 ...endencyConflictResolutionIntegrationSpec.groovy |  191 +
 ...tractIvyRemoteRepoResolveIntegrationTest.groovy |   24 +-
 .../local/model/TestComponentIdentifiers.java      |   38 +
 subprojects/diagnostics/diagnostics.gradle         |    4 +
 ...iagnosticsComponentReportIntegrationTest.groovy |   21 +-
 .../HtmlDependencyReportTaskIntegrationTest.groovy |    6 +-
 ...DependentComponentsReportIntegrationTest.groovy |   49 +
 .../DetailedModelReportIntegrationTest.groovy      |    6 +-
 .../model/ModelReportIntegrationTest.groovy        |  279 +-
 ...uildEnvironmentReportTaskIntegrationTest.groovy |    2 +
 ...pendencyInsightReportTaskIntegrationTest.groovy |   56 +-
 .../DependencyReportTaskIntegrationTest.groovy     |   69 +-
 .../diagnostics/HelpTaskIntegrationTest.groovy     |   18 +-
 .../org/gradle/configuration/HelpTest.groovy       |    8 +-
 .../listsCommonDynamicAvailableValues/build.gradle |    4 +-
 .../sortsOptionsBySpecifiedOrder/build.gradle      |   22 +
 .../org/gradle/api/plugins/HelpTasksPlugin.java    |  206 -
 .../gradle/api/plugins/ProjectReportsPlugin.java   |  104 -
 .../plugins/ProjectReportsPluginConvention.groovy  |   43 -
 .../plugins/internal/HelpTasksAutoApplyAction.java |   26 -
 .../api/reporting/components/ComponentReport.java  |  111 -
 .../internal/AbstractBinaryRenderer.java           |  118 -
 .../components/internal/ComponentRenderer.java     |   44 -
 .../internal/ComponentReportRenderer.java          |  108 -
 .../components/internal/DiagnosticsServices.java   |   49 -
 .../dependencies/DependencyReportContainer.java    |   33 -
 .../dependencies/HtmlDependencyReportTask.java     |  125 -
 .../internal/DefaultDependencyReportContainer.java |   35 -
 .../internal/HtmlDependencyReporter.groovy         |   93 -
 .../internal/JsonProjectDependencyRenderer.groovy  |  256 -
 .../dependencies/internal/ProjectPageRenderer.java |   88 -
 .../internal/ProjectsPageRenderer.java             |   85 -
 .../internal/StrictDependencyResultSpec.java       |   69 -
 .../gradle/api/reporting/model/ModelReport.java    |   77 -
 .../model/internal/ModelNodeRenderer.java          |  138 -
 .../diagnostics/AbstractDependencyReportTask.java  |   97 -
 .../api/tasks/diagnostics/AbstractReportTask.java  |  124 -
 .../diagnostics/BuildEnvironmentReportTask.java    |   95 -
 .../diagnostics/DependencyInsightReportTask.groovy |  215 -
 .../api/tasks/diagnostics/ProjectReportTask.java   |  100 -
 .../api/tasks/diagnostics/PropertyReportTask.java  |   50 -
 .../api/tasks/diagnostics/TaskReportTask.java      |   95 -
 .../AggregateMultiProjectTaskReportModel.java      |   90 -
 .../internal/DefaultGroupTaskReportModel.java      |   82 -
 .../diagnostics/internal/ReportGenerator.java      |   87 -
 .../tasks/diagnostics/internal/ReportRenderer.java |   70 -
 .../internal/SingleProjectTaskReportModel.java     |  141 -
 .../diagnostics/internal/TaskReportRenderer.java   |  164 -
 .../diagnostics/internal/TextReportRenderer.java   |  113 -
 .../AsciiDependencyReportRenderer.java             |  105 -
 .../internal/dsl/DependencyResultSpec.java         |   60 -
 .../dsl/DependencyResultSpecNotationConverter.java |   46 -
 .../internal/graph/DependencyGraphRenderer.groovy  |   77 -
 .../diagnostics/internal/graph/NodeRenderer.groovy |   24 -
 .../internal/graph/SimpleNodeRenderer.java         |   34 -
 .../nodes/AbstractRenderableDependencyResult.java  |   77 -
 .../nodes/AbstractRenderableModuleResult.java      |   54 -
 .../graph/nodes/DependencyReportHeader.java        |   55 -
 .../nodes/InvertedRenderableModuleResult.java      |   47 -
 .../graph/nodes/RenderableDependencyResult.java    |   60 -
 .../graph/nodes/RenderableModuleResult.java        |   44 -
 .../RenderableUnresolvedDependencyResult.java      |   70 -
 .../internal/graph/nodes/RequestedVersion.java     |   65 -
 .../graph/nodes/ResolvedDependencyEdge.java        |   57 -
 .../graph/nodes/UnresolvedDependencyEdge.java      |   63 -
 .../insight/DependencyInsightReporter.groovy       |   70 -
 .../internal/insight/DependencyResultSorter.java   |  204 -
 .../internal/text/DefaultTextReportBuilder.java    |  181 -
 .../internal/text/TextReportBuilder.java           |   50 -
 .../main/groovy/org/gradle/configuration/Help.java |   99 -
 .../gradle/configuration/TaskDetailPrinter.java    |  220 -
 .../org/gradle/api/plugins/HelpTasksPlugin.java    |  234 +
 .../gradle/api/plugins/ProjectReportsPlugin.java   |  105 +
 .../plugins/ProjectReportsPluginConvention.java    |   58 +
 .../plugins/internal/HelpTasksAutoApplyAction.java |   27 +
 .../api/reporting/components/ComponentReport.java  |  110 +
 .../internal/AbstractBinaryRenderer.java           |  120 +
 .../components/internal/BinaryRenderer.java        |    0
 .../components/internal/ComponentRenderer.java     |   52 +
 .../internal/ComponentReportRenderer.java          |   98 +
 .../components/internal/DiagnosticsServices.java   |   54 +
 .../components/internal/RendererUtils.java         |    0
 .../components/internal/SourceSetRenderer.java     |    0
 .../internal/TrackingReportRenderer.java           |   43 +
 .../internal/TypeAwareBinaryRenderer.java          |    0
 .../api/reporting/components/package-info.java     |    0
 .../dependencies/DependencyReportContainer.java    |   35 +
 .../dependencies/HtmlDependencyReportTask.java     |  138 +
 .../internal/DefaultDependencyReportContainer.java |   36 +
 .../internal/HtmlDependencyReporter.java           |  100 +
 .../internal/JsonProjectDependencyRenderer.java    |  304 ++
 .../dependencies/internal/ProjectPageRenderer.java |   88 +
 .../internal/ProjectsPageRenderer.java             |   85 +
 .../internal/StrictDependencyResultSpec.java       |   70 +
 .../api/reporting/dependencies/package-info.java   |    0
 .../dependents/DependentComponentsReport.java      |  184 +
 .../internal/ComponentRenderableDependency.java    |   61 +
 .../internal/DependentComponentsGraphRenderer.java |  131 +
 .../DependentComponentsRenderableDependency.java   |  126 +
 .../internal/DependentComponentsRenderer.java      |  121 +
 .../internal/DependentComponentsUtils.java         |   77 +
 .../TextDependentComponentsReportRenderer.java     |   49 +
 .../api/reporting/dependents/package-info.java     |   20 +
 .../gradle/api/reporting/model/ModelReport.java    |  107 +
 .../model/internal/ModelNodeRenderer.java          |  174 +
 .../model/internal/TextModelReportRenderer.java    |    0
 .../gradle/api/reporting/model/package-info.java   |    0
 .../diagnostics/AbstractDependencyReportTask.java  |  107 +
 .../api/tasks/diagnostics/AbstractReportTask.java  |  128 +
 .../diagnostics/BuildEnvironmentReportTask.java    |   95 +
 .../diagnostics/DependencyInsightReportTask.java   |  233 +
 .../tasks/diagnostics/DependencyReportTask.java    |    0
 .../api/tasks/diagnostics/ProjectReportTask.java   |   99 +
 .../api/tasks/diagnostics/PropertyReportTask.java  |   52 +
 .../api/tasks/diagnostics/TaskReportTask.java      |  105 +
 .../AggregateMultiProjectTaskReportModel.java      |   96 +
 .../internal/DefaultGroupTaskReportModel.java      |   84 +
 .../internal/DependencyReportRenderer.java         |    0
 .../internal/ProjectReportGenerator.java           |    0
 .../internal/PropertyReportRenderer.java           |    0
 .../diagnostics/internal/ReportGenerator.java      |   87 +
 .../tasks/diagnostics/internal/ReportRenderer.java |   70 +
 .../internal/SingleProjectTaskReportModel.java     |  147 +
 .../tasks/diagnostics/internal/TaskDetails.java    |    0
 .../diagnostics/internal/TaskDetailsFactory.java   |    0
 .../diagnostics/internal/TaskReportModel.java      |    0
 .../diagnostics/internal/TaskReportRenderer.java   |  164 +
 .../diagnostics/internal/TextReportRenderer.java   |  119 +
 .../AsciiDependencyReportRenderer.java             |  109 +
 .../internal/dsl/DependencyResultSpec.java         |   61 +
 .../dsl/DependencyResultSpecNotationConverter.java |   47 +
 .../internal/graph/DependencyGraphRenderer.java    |   85 +
 .../diagnostics/internal/graph/NodeRenderer.java   |   24 +
 .../internal/graph/SimpleNodeRenderer.java         |   35 +
 .../nodes/AbstractRenderableDependencyResult.java  |   80 +
 .../nodes/AbstractRenderableModuleResult.java      |   59 +
 .../internal/graph/nodes/DependencyEdge.java       |    0
 .../graph/nodes/DependencyReportHeader.java        |   60 +
 .../nodes/InvertedRenderableModuleResult.java      |   48 +
 .../internal/graph/nodes/RenderableDependency.java |    0
 .../graph/nodes/RenderableDependencyResult.java    |   62 +
 .../graph/nodes/RenderableModuleResult.java        |   45 +
 .../RenderableUnresolvedDependencyResult.java      |   75 +
 .../internal/graph/nodes/RequestedVersion.java     |   67 +
 .../graph/nodes/ResolvedDependencyEdge.java        |   63 +
 .../graph/nodes/UnresolvedDependencyEdge.java      |   69 +
 .../insight/DependencyInsightReporter.java         |   86 +
 .../internal/insight/DependencyResultSorter.java   |  205 +
 .../internal/text/DefaultTextReportBuilder.java    |  189 +
 .../internal/text/TextReportBuilder.java           |   50 +
 .../gradle/api/tasks/diagnostics/package-info.java |    0
 .../main/java/org/gradle/configuration/Help.java   |   99 +
 .../gradle/configuration/TaskDetailPrinter.java    |  227 +
 .../gradle/api/plugins/HelpTasksPluginSpec.groovy  |   12 +-
 .../api/plugins/ProjectReportsPluginTest.groovy    |    9 +-
 .../internal/ComponentRendererTest.groovy          |   10 +-
 .../internal/ComponentReportRendererTest.groovy    |    5 +-
 .../internal/SourceSetRendererTest.groovy          |    2 +-
 .../internal/TypeAwareBinaryRendererTest.groovy    |   64 +
 .../reporting/model/ModelReportParserTest.groovy   |   60 +-
 .../tasks/diagnostics/AbstractReportTaskTest.java  |    9 +-
 .../BuildEnvironmentReportTaskTest.groovy          |    8 +-
 .../DependencyInsightReportTaskSpec.groovy         |   10 +-
 .../diagnostics/DependencyReportTaskTest.groovy    |   22 +-
 .../tasks/diagnostics/ProjectReportTaskTest.groovy |    8 +-
 .../tasks/diagnostics/PropertyReportTaskTest.java  |   19 +-
 .../api/tasks/diagnostics/TaskReportTaskTest.java  |   16 +-
 .../internal/PropertyReportRendererTest.java       |    2 +-
 .../internal/ReportGeneratorTest.groovy            |   18 +-
 .../internal/TaskReportRendererTest.groovy         |    2 +-
 .../internal/TextReportRendererSpec.groovy         |  108 +
 .../internal/TextReportRendererTest.groovy         |  116 -
 .../AsciiDependencyReportRendererTest.groovy       |    9 +-
 .../internal/dsl/DependencyResultSpecTest.groovy   |    6 +-
 .../graph/DependencyGraphRendererSpec.groovy       |    2 +-
 .../AbstractRenderableDependencyResultSpec.groovy  |   13 +-
 .../insight/DependencyResultSorterSpec.groovy      |   39 +-
 .../text/DefaultTextReportBuilderTest.groovy       |    2 +-
 .../AbstractComponentReportIntegrationTest.groovy  |   11 +-
 ...ractNativeComponentReportIntegrationTest.groovy |    4 +
 .../api/reporting/model/ModelReportParser.groovy   |   22 +-
 subprojects/distributions/distributions.gradle     |    4 +-
 .../gradle/AllDistributionIntegrationSpec.groovy   |   10 -
 .../gradle/BinDistributionIntegrationSpec.groovy   |    5 -
 .../org/gradle/DistributionIntegrationSpec.groovy  |   13 +-
 .../gradle/SrcDistributionIntegrationSpec.groovy   |    2 +-
 subprojects/distributions/src/toplevel/LICENSE     |  961 ----
 .../distributions/src/toplevel/changelog.txt       |    3 +-
 subprojects/docs/docs.gradle                       |  110 +-
 subprojects/docs/src/docs/css/base.css             |    5 +-
 subprojects/docs/src/docs/css/icon-link.svg        |   17 +
 subprojects/docs/src/docs/css/userguide.css        |   44 +
 subprojects/docs/src/docs/dsl/dsl.xml              |  113 +-
 .../docs/src/docs/dsl/org.gradle.api.Project.xml   |    5 +-
 ...org.gradle.api.artifacts.ResolutionStrategy.xml |    3 +
 ...pi.initialization.ConfigurableIncludedBuild.xml |   41 +
 ...org.gradle.api.initialization.IncludedBuild.xml |   47 +
 .../dsl/org.gradle.api.initialization.Settings.xml |    5 +-
 .../docs/dsl/org.gradle.api.invocation.Gradle.xml  |    8 +-
 ...radle.api.plugins.quality.FindBugsXmlReport.xml |   25 +
 .../dsl/org.gradle.api.plugins.quality.Pmd.xml     |    5 +-
 ...gradle.api.reporting.CustomizableHtmlReport.xml |   25 +
 .../org.gradle.api.reporting.DirectoryReport.xml   |   25 +
 .../org.gradle.api.reporting.SingleFileReport.xml  |   22 +
 ...orting.dependents.DependentComponentsReport.xml |   51 +
 .../src/docs/dsl/org.gradle.api.tasks.Delete.xml   |    3 +-
 .../src/docs/dsl/org.gradle.api.tasks.Sync.xml     |    9 +-
 .../docs/dsl/org.gradle.api.tasks.bundling.Jar.xml |    7 +-
 .../docs/dsl/org.gradle.api.tasks.bundling.Zip.xml |    6 +-
 .../dsl/org.gradle.api.tasks.javadoc.Groovydoc.xml |   10 +-
 ....gradle.api.tasks.scala.ScalaCompileOptions.xml |   12 +-
 .../docs/dsl/org.gradle.api.tasks.testing.Test.xml |    9 +-
 .../dsl/org.gradle.api.tasks.wrapper.Wrapper.xml   |    4 +
 .../dsl/org.gradle.buildinit.tasks.InitBuild.xml   |    6 +-
 ...language.coffeescript.CoffeeScriptSourceSet.xml |   38 +
 ...dle.language.javascript.JavaScriptSourceSet.xml |   38 +
 .../org.gradle.language.routes.RoutesSourceSet.xml |   38 +
 .../org.gradle.language.twirl.TwirlSourceSet.xml   |   41 +
 .../src/docs/dsl/org.gradle.model.ModelElement.xml |   25 +
 ...latform.test.cunit.CUnitTestSuiteBinarySpec.xml |   38 +
 ...st.googletest.GoogleTestTestSuiteBinarySpec.xml |   38 +
 .../dsl/org.gradle.platform.base.BinarySpec.xml    |   21 +-
 .../dsl/org.gradle.platform.base.ComponentSpec.xml |   27 +-
 ...rg.gradle.platform.base.SourceComponentSpec.xml |   25 +
 ...g.gradle.platform.base.VariantComponentSpec.xml |   25 +
 .../dsl/org.gradle.play.tasks.TwirlCompile.xml     |    3 +
 ...gradle.plugin.repository.GradlePluginPortal.xml |   38 +
 ...radle.plugin.repository.IvyPluginRepository.xml |   44 +
 ...dle.plugin.repository.MavenPluginRepository.xml |   44 +
 ...le.plugin.repository.PluginRepositoriesSpec.xml |   47 +
 ...g.gradle.plugin.repository.PluginRepository.xml |   38 +
 ...org.gradle.plugins.ide.idea.model.IdeaModel.xml |    5 +-
 ...rg.gradle.plugins.ide.idea.model.IdeaModule.xml |   17 +-
 ...g.gradle.plugins.ide.idea.model.IdeaProject.xml |    9 +-
 .../org.gradle.sonar.runner.SonarProperties.xml    |   48 -
 ...rg.gradle.sonar.runner.SonarRunnerExtension.xml |   46 -
 ...radle.sonar.runner.SonarRunnerRootExtension.xml |   50 -
 .../org.gradle.sonar.runner.tasks.SonarRunner.xml  |   47 -
 ...esting.jacoco.plugins.JacocoPluginExtension.xml |    2 +-
 subprojects/docs/src/docs/dsl/plugins.xml          |    4 -
 .../docs/src/docs/release/notes-template.md        |    8 +-
 subprojects/docs/src/docs/release/notes.md         |  441 +-
 .../docs/src/docs/stylesheets/userGuideHtml.xsl    |   24 +-
 .../src/docs/stylesheets/userGuideHtmlCommon.xsl   |   37 +-
 .../src/docs/stylesheets/userGuideSingleHtml.xsl   |   13 +-
 .../docs/src/docs/userguide/announcePlugin.xml     |    4 +-
 subprojects/docs/src/docs/userguide/ant.xml        |   87 +-
 .../docs/src/docs/userguide/antlrPlugin.xml        |   14 +-
 .../docs/src/docs/userguide/applicationPlugin.xml  |   12 +-
 .../userguide/artifactDependenciesTutorial.xml     |   20 +-
 .../docs/src/docs/userguide/artifactMngmt.xml      |   12 +-
 .../docs/userguide/buildAnnouncementsPlugin.xml    |    2 +-
 .../src/docs/userguide/buildDashboardPlugin.xml    |   10 +-
 .../docs/src/docs/userguide/buildEnvironment.xml   |   25 +-
 .../docs/src/docs/userguide/buildInitPlugin.xml    |   33 +-
 .../docs/src/docs/userguide/buildLifecycle.xml     |   28 +-
 .../src/docs/userguide/buildScriptsTutorial.xml    |   46 +-
 .../src/docs/userguide/buildingJavaLibraries.xml   |  123 +-
 .../docs/src/docs/userguide/checkstylePlugin.xml   |   27 +-
 .../docs/src/docs/userguide/codeNarcPlugin.xml     |   12 +-
 .../docs/src/docs/userguide/commandLine.xml        |   45 +-
 .../src/docs/userguide/commandLineTutorial.xml     |   37 +-
 .../docs/src/docs/userguide/comparingBuilds.xml    |   16 +-
 .../docs/src/docs/userguide/compositeBuilds.xml    |  198 +
 .../docs/src/docs/userguide/continuousBuild.xml    |   44 +-
 .../docs/src/docs/userguide/customPlugins.xml      |   44 +-
 .../docs/src/docs/userguide/customTasks.xml        |   20 +-
 subprojects/docs/src/docs/userguide/depMngmt.xml   |  140 +-
 .../docs/src/docs/userguide/distributionPlugin.xml |    8 +-
 subprojects/docs/src/docs/userguide/earPlugin.xml  |   16 +-
 .../docs/src/docs/userguide/eclipsePlugin.xml      |   35 +-
 subprojects/docs/src/docs/userguide/embedding.xml  |  116 +-
 .../docs/src/docs/userguide/featureLifecycle.xml   |    8 +-
 .../docs/src/docs/userguide/findBugsPlugin.xml     |   26 +-
 subprojects/docs/src/docs/userguide/glossary.xml   |    2 +-
 .../docs/src/docs/userguide/gradleDaemon.xml       |  147 +-
 .../docs/src/docs/userguide/gradleWrapper.xml      |   58 +-
 .../docs/src/docs/userguide/groovyPlugin.xml       |   39 +-
 .../docs/src/docs/userguide/groovyTutorial.xml     |    4 +-
 .../docs/src/docs/userguide/guiTutorial.xml        |    8 +-
 subprojects/docs/src/docs/userguide/ideaPlugin.xml |   20 +-
 .../userguide/img/javaPluginConfigurations.graphml |  205 +-
 .../userguide/img/javaPluginConfigurations.png     |  Bin 20942 -> 27423 bytes
 .../docs/userguide/img/nativeDependents.graphml    |  287 ++
 .../src/docs/userguide/img/nativeDependents.png    |  Bin 0 -> 9931 bytes
 .../docs/src/docs/userguide/img/pluginMarkers.png  |  Bin 0 -> 69520 bytes
 .../docs/userguide/img/taskInputsOutputs.graffle   |  776 +++
 .../src/docs/userguide/img/taskInputsOutputs.png   |  Bin 0 -> 133210 bytes
 .../docs/src/docs/userguide/initscripts.xml        |   14 +-
 .../docs/src/docs/userguide/installation.xml       |   24 +-
 .../src/docs/userguide/introMultiProjectBuilds.xml |   12 +-
 .../docs/src/docs/userguide/introduction.xml       |    2 +-
 .../docs/src/docs/userguide/jacocoPlugin.xml       |   16 +-
 .../docs/src/docs/userguide/javaGradlePlugin.xml   |   28 +-
 .../userguide/javaLibraryDistributionPlugin.xml    |    4 +-
 subprojects/docs/src/docs/userguide/javaPlugin.xml |  175 +-
 .../docs/src/docs/userguide/javaTutorial.xml       |   28 +-
 .../docs/src/docs/userguide/jdependPlugin.xml      |   11 +-
 .../docs/src/docs/userguide/jettyPlugin.xml        |   19 +-
 subprojects/docs/src/docs/userguide/licenses.xml   |   60 +
 subprojects/docs/src/docs/userguide/logging.xml    |   11 +-
 .../docs/src/docs/userguide/mavenPlugin.xml        |   24 +-
 .../docs/src/docs/userguide/multiproject.xml       |   64 +-
 .../docs/src/docs/userguide/nativeBinaries.xml     |  259 +-
 .../docs/src/docs/userguide/organizeBuildLogic.xml |    8 +-
 subprojects/docs/src/docs/userguide/osgi.xml       |   38 +-
 subprojects/docs/src/docs/userguide/overview.xml   |    4 +-
 subprojects/docs/src/docs/userguide/playPlugin.xml |   93 +-
 subprojects/docs/src/docs/userguide/plugins.xml    |  384 +-
 subprojects/docs/src/docs/userguide/pmdPlugin.xml  |   11 +-
 .../docs/src/docs/userguide/potentialTraps.xml     |    4 +-
 .../docs/src/docs/userguide/projectReports.xml     |   10 +-
 .../docs/src/docs/userguide/publishingIvy.xml      |   12 +-
 .../docs/src/docs/userguide/publishingMaven.xml    |   20 +-
 subprojects/docs/src/docs/userguide/ruleSource.xml |   28 +
 .../docs/src/docs/userguide/scalaPlugin.xml        |  147 +-
 .../docs/src/docs/userguide/signingPlugin.xml      |   37 +-
 .../docs/src/docs/userguide/softwareModel.xml      |  313 +-
 .../src/docs/userguide/softwareModelConcepts.xml   |    4 +-
 .../src/docs/userguide/softwareModelExtend.xml     |  265 +
 .../docs/src/docs/userguide/sonarPlugin.xml        |  231 -
 .../docs/src/docs/userguide/sonarRunnerPlugin.xml  |  356 --
 .../docs/src/docs/userguide/standardPlugins.xml    |   48 +-
 subprojects/docs/src/docs/userguide/tasks.xml      |  796 ++-
 subprojects/docs/src/docs/userguide/testKit.xml    |  152 +-
 .../docs/src/docs/userguide/troubleshooting.xml    |    6 +-
 subprojects/docs/src/docs/userguide/tutorials.xml  |    4 +-
 subprojects/docs/src/docs/userguide/userguide.xml  |   10 +-
 subprojects/docs/src/docs/userguide/warPlugin.xml  |   14 +-
 .../docs/src/docs/userguide/webTutorial.xml        |    6 +-
 .../docs/src/docs/userguide/workingWithFiles.xml   |   15 +-
 .../docs/src/docs/userguide/wrapperPlugin.xml      |    4 +-
 .../src/docs/userguide/writingBuildScripts.xml     |   30 +-
 subprojects/docs/src/samples/announce/build.gradle |    6 +-
 .../docs/src/samples/application/build.gradle      |   86 +-
 .../clientModuleDependencies/api/build.gradle      |   10 +-
 .../clientModuleDependencies/shared/build.gradle   |   14 +-
 .../docs/src/samples/codeQuality/build.gradle      |   20 +-
 .../codeQuality/config/xsl/checkstyle-custom.xsl   |   13 +
 .../codeQuality/config/xsl/findbugs-custom.xsl     |   13 +
 .../samples/componentMetadataRules/build.gradle    |   34 +-
 .../samples/componentSelectionRules/build.gradle   |   24 +-
 .../src/samples/compositeBuilds/basic/README.md    |   66 +
 .../compositeBuilds/basic/composite/build.gradle   |   15 +
 .../basic/composite/settings.gradle                |    4 +
 .../compositeBuilds/basic/my-app/build.gradle      |   17 +
 .../basic/my-app/settings-composite.gradle         |    5 +
 .../compositeBuilds/basic/my-app/settings.gradle   |    1 +
 .../src/main/java/org/sample/myapp/Main.java       |   32 +
 .../compositeBuilds/basic/my-utils/build.gradle    |   19 +
 .../main/java/org/sample/numberutils/Numbers.java  |    5 +
 .../compositeBuilds/basic/my-utils/settings.gradle |    3 +
 .../main/java/org/sample/stringutils/Strings.java  |   13 +
 .../declared-substitution/README.md                |   37 +
 .../anonymous-library/build.gradle                 |    1 +
 .../anonymous-library/settings.gradle              |    1 +
 .../main/java/org/sample/numberutils/Numbers.java  |    5 +
 .../declared-substitution/my-app/build.gradle      |    8 +
 .../settings-without-declared-substitution.gradle  |   19 +
 .../declared-substitution/my-app/settings.gradle   |    7 +
 .../src/main/java/org/sample/myapp/Main.java       |   31 +
 .../hierarchical-multirepo/README.md               |  100 +
 .../multirepo-app/build.gradle                     |   26 +
 .../modules/number-utils/build.gradle              |   18 +
 .../modules/number-utils/settings.gradle           |    1 +
 .../main/java/org/sample/numberutils/Numbers.java  |    5 +
 .../modules/string-utils/build.gradle              |   23 +
 .../modules/string-utils/settings.gradle           |    1 +
 .../main/java/org/sample/stringutils/Strings.java  |   13 +
 .../multirepo-app/settings.gradle                  |    5 +
 .../src/main/java/org/sample/myapp/Main.java       |   32 +
 .../samples/compositeBuilds/plugin-dev/README.md   |   60 +
 .../plugin-dev/consumer/build.gradle               |   13 +
 .../plugin-dev/consumer/settings.gradle            |    1 +
 .../plugin-dev/greeting-plugin/build.gradle        |   14 +
 .../plugin-dev/greeting-plugin/settings.gradle     |    1 +
 .../src/main/java/org/sample/GreetingPlugin.java   |   14 +
 .../src/main/java/org/sample/GreetingTask.java     |   15 +
 .../samples/customModel/componentType/build.gradle |    6 +-
 .../samples/customModel/internalViews/build.gradle |   57 +
 .../samples/customModel/languageType/build.gradle  |   12 +-
 .../DefaultDocumentationBinary.groovy              |   21 -
 .../documentation/DocumentationBinary.groovy       |    9 +-
 .../documentation/DocumentationComponent.groovy    |    6 +-
 .../documentation/DocumentationPlugin.groovy       |   64 +-
 .../documentation/DocumentationSourceSet.groovy    |   29 -
 .../sample/documentation/TextSourceSet.groovy      |   25 +
 .../markdown/DefaultMarkdownSourceSet.groovy       |   24 -
 .../sample/markdown/MarkdownHtmlCompile.groovy     |   16 +-
 .../groovy/sample/markdown/MarkdownPlugin.groovy   |   43 +-
 .../sample/markdown/MarkdownSourceSet.groovy       |   20 +-
 .../languageType/src/docs/reference/README.txt     |    1 +
 .../languageType/src/docs/userguide/chapter1.md    |    8 +-
 .../src/samples/ear/earCustomized/ear/build.gradle |    2 +-
 .../docs/src/samples/ear/earWithWar/build.gradle   |    4 +-
 .../samples/groovy/crossCompilation/build.gradle   |   40 +
 .../groovy/crossCompilation/gradle.properties      |    2 +
 .../src/samples/groovy/crossCompilation/readme.xml |    3 +
 .../src/main/groovy/org/gradle/GroovyPerson.groovy |    5 +
 .../src/main/groovy/org/gradle/JavaPerson.java     |    7 +
 .../src/main/groovy/org/gradle/PersonList.groovy   |    7 +
 .../src/main/java/org/gradle/Person.java           |    5 +
 .../src/test/groovy/org/gradle/PersonTest.groovy   |   16 +
 .../samples/groovy/customizedLayout/build.gradle   |    2 +-
 .../samples/groovy/mixedJavaAndGroovy/build.gradle |    2 +-
 .../multiproject/groovycDetector/build.gradle      |    2 +-
 .../groovy/multiproject/testproject/build.gradle   |    2 +-
 .../src/test/groovy/org/gradle/VersionTest.groovy  |    4 +-
 .../src/samples/groovy/quickstart/build.gradle     |    2 +-
 .../src/test/groovy/org/gradle/PersonTest.groovy   |    2 +-
 .../ivy-publish/java-multi-project/build.gradle    |    2 +-
 .../ivy-publish/multiple-publications/build.gradle |    4 +-
 .../output/project2-impl.ivy.xml                   |    2 +-
 .../docs/src/samples/ivypublish/build.gradle       |    2 +-
 .../docs/src/samples/java/base/build.gradle        |    2 +-
 .../docs/src/samples/java/base/prod/build.gradle   |    2 +-
 .../src/samples/java/crossCompilation/build.gradle |   39 +
 .../java/crossCompilation/gradle.properties        |    2 +
 .../src/samples/java/crossCompilation/readme.xml   |    3 +
 .../src/main/java/org/gradle/Person.java           |    0
 .../src/main/resources/org/gradle/resource.xml     |    1 +
 .../src/test/java/org/gradle/PersonTest.java       |   34 +
 .../test/resources/org/gradle/test-resource.xml    |    1 +
 .../src/samples/java/customizedLayout/build.gradle |    4 +-
 .../src/samples/java/multiproject/api/build.gradle |   16 +-
 .../multiproject/services/webservice/build.gradle  |    4 +-
 .../docs/src/samples/java/quickstart/build.gradle  |    4 +-
 .../samples/java/withIntegrationTests/build.gradle |    2 +-
 .../docs/src/samples/javaGradlePlugin/build.gradle |   15 +-
 .../gradle-plugins/simple-plugin.properties        |    1 -
 .../collections/java/org/gradle/Collections.java   |    5 +
 .../src/commons/java/org/gradle/Application.java   |    7 +
 .../targetplatforms/core/build.gradle              |    2 +-
 .../build.gradle                                   |   39 +
 .../src/main/java/org/gradle/SmartApp.java         |   23 +
 .../main/resources/org/gradle/resource.properties  |    1 +
 .../src/test/java/org/gradle/SmartAppTest.java     |   29 +
 .../testing-junit-standalone/build.gradle          |   46 +
 .../src/test/java/org/gradle/MyTest.java           |   12 +
 .../src/test/resources/org/gradle/resource.xml     |    3 +
 .../javaLibraryPlugin/toolchains/build.gradle      |   35 +
 .../samples/maven-publish/javaProject/build.gradle |    2 +-
 .../multiple-publications/build.gradle             |    2 +-
 .../output/project2-impl.pom.xml                   |    2 +-
 .../src/samples/maven/pomGeneration/build.gradle   |   31 +-
 .../modelRules/basicRuleSourcePlugin/build.gradle  |    6 +-
 .../modelRules/ruleSourcePluginEach/build.gradle   |   47 +
 .../src/samples/multiProjectBuildSrc/build.gradle  |   10 +-
 .../samples/native-binaries/cpp-exe/build.gradle   |   18 +-
 .../src/samples/native-binaries/cunit/build.gradle |   11 +-
 .../native-binaries/custom-check/build.gradle      |   38 +
 .../native-binaries/google-test/build.gradle       |    7 +-
 subprojects/docs/src/samples/osgi/build.gradle     |    2 +-
 .../samples/play/configure-compiler/build.gradle   |    3 +
 .../src/samples/plugins/consuming/build.gradle     |    6 +
 .../1.0.0/ivy-1.0.0.xml                            |    9 +
 .../1.0.0/ivy-1.0.0.xml.sha1                       |    1 +
 .../1.0.0/ivy-1.0.0.xml                            |    9 +
 .../1.0.0/ivy-1.0.0.xml.sha1                       |    1 +
 .../sample-plugins/1.0.0/ivy-1.0.0.xml             |   12 +
 .../sample-plugins/1.0.0/ivy-1.0.0.xml.sha1        |    1 +
 .../1.0.0/sample-plugins-1.0.0.jar.sha1            |    1 +
 ...g.gradle.sample.goodbye.gradle.plugin-1.0.0.pom |   15 +
 ...adle.sample.goodbye.gradle.plugin-1.0.0.pom.md5 |    1 +
 ...dle.sample.goodbye.gradle.plugin-1.0.0.pom.sha1 |    1 +
 .../maven-metadata.xml                             |   12 +
 .../maven-metadata.xml.md5                         |    1 +
 .../maven-metadata.xml.sha1                        |    1 +
 ...org.gradle.sample.hello.gradle.plugin-1.0.0.pom |   15 +
 ...gradle.sample.hello.gradle.plugin-1.0.0.pom.md5 |    1 +
 ...radle.sample.hello.gradle.plugin-1.0.0.pom.sha1 |    1 +
 .../maven-metadata.xml                             |   12 +
 .../maven-metadata.xml.md5                         |    1 +
 .../maven-metadata.xml.sha1                        |    1 +
 .../1.0.0/sample-plugins-1.0.0.jar.md5             |    1 +
 .../1.0.0/sample-plugins-1.0.0.jar.sha1            |    1 +
 .../sample-plugins/1.0.0/sample-plugins-1.0.0.pom  |    8 +
 .../1.0.0/sample-plugins-1.0.0.pom.md5             |    1 +
 .../1.0.0/sample-plugins-1.0.0.pom.sha1            |    1 +
 .../sample/sample-plugins/maven-metadata.xml       |   12 +
 .../sample/sample-plugins/maven-metadata.xml.md5   |    1 +
 .../sample/sample-plugins/maven-metadata.xml.sha1  |    1 +
 .../src/samples/plugins/consuming/settings.gradle  |   13 +
 .../src/samples/plugins/multiproject/build.gradle  |   31 +
 ...g.gradle.sample.goodbye.gradle.plugin-1.0.0.pom |   15 +
 ...adle.sample.goodbye.gradle.plugin-1.0.0.pom.md5 |    1 +
 ...dle.sample.goodbye.gradle.plugin-1.0.0.pom.sha1 |    1 +
 .../maven-metadata.xml                             |   12 +
 .../maven-metadata.xml.md5                         |    1 +
 .../maven-metadata.xml.sha1                        |    1 +
 ...org.gradle.sample.hello.gradle.plugin-1.0.0.pom |   15 +
 ...gradle.sample.hello.gradle.plugin-1.0.0.pom.md5 |    1 +
 ...radle.sample.hello.gradle.plugin-1.0.0.pom.sha1 |    1 +
 .../maven-metadata.xml                             |   12 +
 .../maven-metadata.xml.md5                         |    1 +
 .../maven-metadata.xml.sha1                        |    1 +
 .../1.0.0/sample-plugins-1.0.0.jar.md5             |    1 +
 .../1.0.0/sample-plugins-1.0.0.jar.sha1            |    1 +
 .../sample-plugins/1.0.0/sample-plugins-1.0.0.pom  |    8 +
 .../1.0.0/sample-plugins-1.0.0.pom.md5             |    1 +
 .../1.0.0/sample-plugins-1.0.0.pom.sha1            |    1 +
 .../sample/sample-plugins/maven-metadata.xml       |   12 +
 .../sample/sample-plugins/maven-metadata.xml.md5   |    1 +
 .../sample/sample-plugins/maven-metadata.xml.sha1  |    1 +
 .../samples/plugins/multiproject/settings.gradle   |   29 +
 .../src/samples/plugins/publishing/build.gradle    |   34 +
 .../src/samples/plugins/publishing/settings.gradle |    1 +
 .../org/gradle/sample/goodbye/GoodbyePlugin.java   |   18 +
 .../java/org/gradle/sample/hello/HelloPlugin.java  |   18 +
 subprojects/docs/src/samples/plugins/readme.xml    |   23 +
 .../samples/scala/crossCompilation/build.gradle    |   40 +
 .../scala/crossCompilation/gradle.properties       |    2 +
 .../src/samples/scala/crossCompilation/readme.xml  |    3 +
 .../src/main/java/org/gradle/sample/Person.java    |    5 +
 .../scala/org/gradle/sample/impl/JavaPerson.java   |    7 +
 .../scala/org/gradle/sample/impl/PersonImpl.scala  |   11 +
 .../scala/org/gradle/sample/impl/PersonList.scala  |    9 +
 .../test/scala/org/gradle/sample/PersonTest.scala  |   19 +
 .../docs/src/samples/scala/force/build.gradle      |   22 +
 .../docs/src/samples/scala/force/readme.xml        |    3 +
 .../main/scala/org/gradle/sample/api/Person.scala  |    0
 .../scala/org/gradle/sample/impl/PersonImpl.scala  |    0
 .../org/gradle/sample/impl/PersonImplTest.scala    |   14 +
 .../docs/src/samples/scala/fsc/build.gradle        |   28 -
 subprojects/docs/src/samples/scala/fsc/readme.xml  |    3 -
 .../docs/src/samples/scala/quickstart/build.gradle |    2 +-
 .../docs/src/samples/scala/zinc/build.gradle       |    8 +-
 .../docs/src/samples/sonar/advanced/build.gradle   |   42 -
 .../src/samples/sonar/multiProject/build.gradle    |   49 -
 .../src/samples/sonar/multiProject/settings.gradle |    1 -
 .../docs/src/samples/sonar/quickstart/build.gradle |   36 -
 .../src/samples/sonarRunner/advanced/build.gradle  |   32 -
 .../advanced/src/main/java/org/gradle/Person.java  |   32 -
 .../src/test/java/org/gradle/PersonTest.java       |   28 -
 .../samples/sonarRunner/multiProject/build.gradle  |   43 -
 .../sonarRunner/multiProject/settings.gradle       |    1 -
 .../samples/sonarRunner/quickstart/build.gradle    |   32 -
 .../src/test/java/org/gradle/PersonTest.java       |   12 -
 .../build.gradle                                   |   38 +
 .../gradle/sample/BuildLogicFunctionalTest.groovy  |   54 +
 .../org/gradle/sample/HelloWorldPlugin.groovy      |   30 +
 .../org.gradle.sample.helloworld.properties        |    0
 .../build.gradle                                   |   14 +
 .../org/gradle/sample/HelloWorldPlugin.groovy      |   30 +
 .../org.gradle.sample.helloworld.properties        |    0
 .../gradle/sample/BuildLogicFunctionalTest.groovy  |   56 +
 .../gradleVersion}/build.gradle                    |    0
 .../gradle/sample/BuildLogicFunctionalTest.groovy  |    0
 .../junitQuickstart}/build.gradle                  |    0
 .../gradle/sample/BuildLogicFunctionalTest.java    |    0
 .../manualClasspathInjection/build.gradle          |   34 +
 .../groovy/org/gradle/sample/HelloWorld.groovy     |   27 +
 .../org/gradle/sample/HelloWorldPlugin.groovy      |    0
 .../org.gradle.sample.helloworld.properties        |    0
 .../gradle/sample/BuildLogicFunctionalTest.groovy  |    0
 .../spockQuickstart}/build.gradle                  |    0
 .../gradle/sample/BuildLogicFunctionalTest.groovy  |    0
 .../testKit/testKitSpockClasspath/lib/build.gradle |    5 -
 .../groovy/org/gradle/sample/lib/Messages.groovy   |    5 -
 .../testKitSpockClasspath/plugin/build.gradle      |   38 -
 .../groovy/org/gradle/sample/HelloWorld.groovy     |   28 -
 .../testKit/testKitSpockClasspath/settings.gradle  |    1 -
 .../samples/testing/jacoco/quickstart/build.gradle |    2 +-
 .../testing/testng/groupbyinstances/build.gradle   |   21 +
 .../test/java/org/gradle/testng/TestFactory.java   |   61 +
 .../testing/testng/java-jdk14-passing/build.gradle |   16 -
 .../src/test/java/org/gradle/OkTest.java           |    7 -
 .../testing/testng/java-jdk15-passing/build.gradle |   17 -
 .../src/main/java/org/gradle/Ok.java               |    4 -
 .../testing/testng/java-passing/build.gradle       |   15 +
 .../src/main/java/org/gradle/Ok.java               |    0
 .../src/test/java/org/gradle/AbstractTest.java     |    0
 .../src/test/java/org/gradle/ConcreteTest.java     |    0
 .../src/test/java/org/gradle/OkTest.java           |    0
 .../src/test/java/org/gradle/SuiteCleanup.java     |    0
 .../src/test/java/org/gradle/SuiteSetup.java       |    0
 .../src/test/java/org/gradle/TestCleanup.java      |    0
 .../src/test/java/org/gradle/TestSetup.java        |    0
 .../testing/testng/preserveorder/build.gradle      |   21 +
 .../src/test/java/org/gradle/testng/Test1.java     |   44 +
 .../src/test/java/org/gradle/testng/Test2.java     |   50 +
 .../toolingApi/customModel/tooling/build.gradle    |    9 +-
 .../src/samples/toolingApi/eclipse/build.gradle    |    7 +-
 .../docs/src/samples/toolingApi/idea/build.gradle  |    5 +-
 .../docs/src/samples/toolingApi/model/build.gradle |    5 +-
 .../src/samples/toolingApi/runBuild/build.gradle   |    9 +-
 .../ant/addBehaviourToAntTarget/build.gradle       |    6 +-
 .../samples/userguide/ant/antLogging/build.gradle  |    7 +
 .../userguide/ant/dependsOnAntTarget/build.gradle  |    6 +-
 .../userguide/ant/dependsOnTask/build.gradle       |    6 +-
 .../ant/taskWithNestedElements/build.gradle        |   12 +-
 .../userguide/ant/taskWithNestedText/build.gradle  |    6 +-
 .../samples/userguide/ant/useAntTask/build.gradle  |    8 +-
 .../samples/userguide/ant/useAntType/build.gradle  |   14 +-
 .../userguide/ant/useExternalAntTask/build.gradle  |   16 +-
 .../ant/useExternalAntTaskWithConfig/build.gradle  |   20 +-
 .../artifacts/configurationHandling/build.gradle   |   60 +-
 .../artifacts/defineRepository/build.gradle        |   12 +-
 .../artifacts/excludesAndClassifiers/build.gradle  |   14 +-
 .../artifacts/externalDependencies/build.gradle    |   18 +-
 .../generatedFileDependencies/build.gradle         |   12 +-
 .../samples/userguide/artifacts/maven/build.gradle |    6 +-
 .../userguide/buildlifecycle/basic/build.gradle    |    6 +-
 .../projectEvaluateEvents/build.gradle             |    6 +-
 .../taskExecutionEvents/build.gradle               |    6 +-
 .../src/samples/userguide/files/copy/build.gradle  |   15 +-
 .../userguide/files/fileCollections/build.gradle   |   68 +-
 .../userguide/files/inputFiles/build.gradle        |    2 +-
 .../userguide/groovy/groovyDependency/build.gradle |    2 +-
 .../configurationInjection/build.gradle            |    8 +-
 .../initScripts/customLogger/build.gradle          |   18 +-
 .../userguide/initScripts/plugins/build.gradle     |   10 +-
 .../userguide/javaLibraryDistribution/build.gradle |    2 +-
 .../multiproject/addKrill/water/build.gradle       |    6 +-
 .../multiproject/addSpecifics/water/build.gradle   |   18 +-
 .../multiproject/addTropical/water/build.gradle    |   18 +-
 .../firstMessages/messages/consumer/build.gradle   |    6 +-
 .../firstMessages/messages/producer/build.gradle   |    8 +-
 .../messages/consumer/build.gradle                 |    6 +-
 .../messages/consumer/build.gradle                 |    6 +-
 .../messages/consumer/build.gradle                 |    6 +-
 .../messagesHack/messages/aProducer/build.gradle   |    8 +-
 .../messagesHack/messages/consumer/build.gradle    |    6 +-
 .../messages/consumer/build.gradle                 |    6 +-
 .../messages/producer/build.gradle                 |    8 +-
 .../messages/consumer/build.gradle                 |    6 +-
 .../messages/producer/build.gradle                 |    8 +-
 .../multiproject/firstExample/water/build.gradle   |    4 +-
 .../multiproject/flat/master/build.gradle          |    6 +-
 .../flatWithNoDefaultMaster/water/build.gradle     |    6 +-
 .../partialTasks/water/bluewhale/build.gradle      |   12 +-
 .../multiproject/partialTasks/water/build.gradle   |    6 +-
 .../partialTasks/water/krill/build.gradle          |   12 +-
 .../spreadSpecifics/water/build.gradle             |   12 +-
 .../subprojectsAddFromTop/water/build.gradle       |   18 +-
 .../tropicalWithProperties/water/build.gradle      |    6 +-
 .../multiproject/useSubprojects/water/build.gradle |   12 +-
 .../userguide/organizeBuildLogic/build.gradle      |   20 +-
 .../organizeBuildLogic/customPlugin/build.gradle   |    6 +-
 .../build.gradle                                   |    6 +-
 .../customPluginWithConvention/build.gradle        |    6 +-
 .../build.gradle                                   |    8 +-
 .../externalDependency/build.gradle                |    8 +-
 .../inherited/child/build.gradle                   |   14 +-
 .../organizeBuildLogic/injected/build.gradle       |   12 +-
 .../organizeBuildLogic/nestedBuild/other.gradle    |    6 +-
 .../userguide/scala/ideaTargetVersion/build.gradle |    8 +
 .../userguide/scala/zincDependency/build.gradle    |   11 +
 .../userguide/scala/zincOverride/build.gradle      |   17 +
 .../tasks/addDependencyUsingClosure/build.gradle   |   24 +-
 .../tasks/addDependencyUsingPath/build.gradle      |   12 +-
 .../tasks/addDependencyUsingTask/build.gradle      |   12 +-
 .../samples/userguide/tasks/addRules/build.gradle  |    6 +-
 .../tasks/addToTaskContainer/build.gradle          |    6 +-
 .../tasks/customTaskWithFileProperty/build.gradle  |    6 +-
 .../tasks/defineAsExpression/build.gradle          |    6 +-
 .../tasks/defineUsingStringTaskNames/build.gradle  |    7 +-
 .../userguide/tasks/finalizers/build.gradle        |   12 +-
 .../tasks/finalizersWithFailure/build.gradle       |   14 +-
 .../incrementalBuild/customTaskClass/build.gradle  |   85 +
 .../main/java/org/example/ProcessTemplates.java    |   57 +
 .../org/example/ProcessTemplatesNoAnnotations.java |   45 +
 .../src/main/java/org/example/TemplateData.java    |   23 +
 .../main/java/org/example/TemplateEngineType.java  |    5 +
 .../customTaskClass/src/templates/README.md        |    1 +
 .../incrementalBuildAdvanced/build.gradle          |   84 +
 .../src/main/java/org/example/Instrument.java      |   36 +
 .../main/java/org/example/ProcessTemplates.java    |   73 +
 .../src/main/java/org/example/TemplateData.java    |   23 +
 .../main/java/org/example/TemplateEngineType.java  |    5 +
 .../src/main/java/org/gradle/Person.java           |    0
 .../src/main/resources/org/gradle/resource.xml     |    1 +
 .../src/templates/README.md                        |    1 +
 .../src/test/java/org/gradle/PersonTest.java       |    0
 .../test/resources/org/gradle/test-resource.xml    |    1 +
 .../userguide/tasks/incrementalTask/build.gradle   |   32 +-
 .../userguide/tasks/mustRunAfter/build.gradle      |   12 +-
 .../userguide/tasks/shouldRunAfter/build.gradle    |   12 +-
 .../tasks/shouldRunAfterWithCycle/build.gradle     |   18 +-
 .../userguide/tutorial/antLoadfile/build.gradle    |   16 +-
 .../tutorial/antLoadfileWithMethod/build.gradle    |   20 +-
 .../userguide/tutorial/configByDag/build.gradle    |   12 +-
 .../tutorial/configureObject/build.gradle          |   14 +-
 .../configureObjectUsingScript/build.gradle        |   14 +-
 .../configureProjectUsingScript/other.gradle       |    6 +-
 .../samples/userguide/tutorial/count/build.gradle  |    6 +-
 .../userguide/tutorial/defaultTasks/build.gradle   |   18 +-
 .../userguide/tutorial/disableTask/build.gradle    |    6 +-
 .../userguide/tutorial/dynamic/build.gradle        |    6 +-
 .../userguide/tutorial/dynamicDepends/build.gradle |    6 +-
 .../userguide/tutorial/excludeTasks/build.gradle   |   24 +-
 .../tutorial/extraProperties/build.gradle          |   16 +-
 .../tutorial/groovyWithFlatDir/build.gradle        |    4 +-
 .../userguide/tutorial/helloEnhanced/build.gradle  |   12 +-
 .../tutorial/helloWithShortCut/build.gradle        |    6 +-
 .../samples/userguide/tutorial/intro/build.gradle  |   12 +-
 .../userguide/tutorial/lazyDependsOn/build.gradle  |   12 +-
 .../userguide/tutorial/mkdirTrap/build.gradle      |   10 +-
 .../tutorial/pluginAccessConvention/build.gradle   |   14 +-
 .../userguide/tutorial/pluginConfig/build.gradle   |    6 +-
 .../tutorial/pluginConvention/build.gradle         |    6 +-
 .../userguide/tutorial/pluginIntro/build.gradle    |    8 +-
 .../userguide/tutorial/projectApi/build.gradle     |    4 +-
 .../userguide/tutorial/projectReports/build.gradle |    2 +-
 .../userguide/tutorial/properties/build.gradle     |   14 +-
 .../userguide/tutorial/replaceTask/build.gradle    |    6 +-
 .../src/samples/userguide/tutorial/rerun/README.md |    3 +
 .../samples/userguide/tutorial/rerun/build.gradle  |    8 +
 .../userguide/tutorial/rerun/build/README.md       |    3 +
 .../tutorial/selectProject/subdir/build.gradle     |    6 +-
 .../tutorial/selectProject/subdir/myproject.gradle |    6 +-
 .../tutorial/stopExecutionException/build.gradle   |   12 +-
 .../userguide/tutorial/taskOnlyIf/build.gradle     |    6 +-
 .../samples/userguide/tutorial/upper/build.gradle  |   10 +-
 .../src/samples/userguideOutput/antLogging.out     |    6 +
 .../basicRuleSourcePlugin-model-task.out           |   49 +-
 .../buildingJavaLibraries-compile-avoid.out        |    3 +-
 .../buildingJavaLibraries-compile-brokenclient.out |    1 +
 .../buildingJavaLibraries-compile-first.out        |    3 +-
 .../userguideOutput/compositeBuilds_basic_cli.out  |   16 +
 .../customTaskClassWithInputOutputAnnotations.out  |    3 +
 ...TaskClassWithInputOutputAnnotationsUpToDate.out |    3 +
 .../userguideOutput/dependencyInsightReport.out    |    2 +-
 .../userguideOutput/dependencyListReport.out       |    4 +-
 .../userguideOutput/externalDependencies.out       |   16 +-
 .../userguideOutput/incrementalAdHocTask.out       |    3 +
 .../incrementalAdHocTaskUpToDate.out               |    3 +
 .../incrementalBuildBadInputFilesConfig.out        |    4 +
 .../incrementalBuildCustomMethods.out              |    3 +
 .../incrementalBuildCustomMethodsWithTaskArg.out   |    4 +
 .../incrementalBuildInputFilesConfig.out           |    5 +
 .../incrementalBuildInputFilesConfigUsingTask.out  |    5 +
 .../incrementalBuildUpToDateWhen.out               |    4 +
 .../incrementalBuildUpToDateWhenAgain.out          |    4 +
 .../samples/userguideOutput/inferredTaskDep.out    |    4 +
 .../samples/userguideOutput/inferredTaskDep2.out   |    4 +
 .../inferredTaskDependencyWithBuiltBy.out          |    5 +
 .../userguideOutput/javaLibraryComponentReport.out |   32 +
 .../javaLibraryMultiComponents-clientJar.out       |    8 +
 .../javaLibraryMultiComponents-serverJar.out       |   13 +
 ... => javaLibraryMultiComponents-verifierJar.out} |    0
 ...avaQuickstart.out => javaLibraryQuickstart.out} |    0
 .../javaLibraryTargetPlatforms-java6MainJar.out    |   10 +
 .../javaLibraryTargetPlatforms-server.out          |   22 +
 .../userguideOutput/javaLibraryTargetPlatforms.out |   16 +
 .../userguideOutput/junit-component-under-test.out |    6 +
 .../samples/userguideOutput/junit-standalone.out   |    5 +
 .../nativeAssembleDependentComponents.out          |   15 +
 .../nativeAssembleDependentComponentsReport.out    |   17 +
 .../nativeBuildDependentComponents.out             |   18 +
 .../nativeBuildDependentComponentsReport.out       |   19 +
 .../nativeComponentCustomCheckOutput.out           |    7 +
 .../userguideOutput/nativeComponentReport.out      |   12 +-
 .../nativeDependentComponentsReport.out            |   17 +
 .../nativeDependentComponentsReportAll.out         |   23 +
 .../userguideOutput/newJavaComponentReport.out     |   32 -
 .../newJavaMultiComponents-clientJar.out           |    9 -
 .../newJavaMultiComponents-serverJar.out           |   14 -
 .../newJavaTargetPlatforms-java6MainJar.out        |   10 -
 .../newJavaTargetPlatforms-server.out              |   24 -
 .../userguideOutput/newJavaTargetPlatforms.out     |   16 -
 .../src/samples/userguideOutput/noRerunTasks.out   |    1 +
 .../userguideOutput/playComponentReport.out        |    6 +-
 .../samples/userguideOutput/propertyListReport.out |    2 +-
 .../src/samples/userguideOutput/rerunTasks.out     |    1 +
 .../userguideOutput/runtimeIncrementalApi.out      |    3 +
 .../runtimeIncrementalApiConfiguration.out         |    3 +
 .../runtimeIncrementalApiUpToDate.out              |    3 +
 .../softwareModelExtend-components.out             |   19 +
 .../softwareModelExtend-iv-model.out               |  120 +
 .../samples/userguideOutput/taskListAllReport.out  |    3 +
 .../src/samples/userguideOutput/taskListReport.out |    1 +
 .../plugins/ear/EarPluginIntegrationTest.groovy    |  161 +-
 .../main/groovy/org/gradle/plugins/ear/Ear.groovy  |  138 -
 .../gradle/plugins/ear/EarPluginConvention.groovy  |  100 -
 .../ear/descriptor/DeploymentDescriptor.java       |  225 -
 .../gradle/plugins/ear/descriptor/EarModule.java   |   52 -
 .../plugins/ear/descriptor/EarSecurityRole.java    |   37 -
 .../plugins/ear/descriptor/EarWebModule.java       |   29 -
 .../internal/DefaultDeploymentDescriptor.groovy    |  290 --
 .../descriptor/internal/DefaultEarModule.groovy    |   69 -
 .../internal/DefaultEarSecurityRole.groovy         |   60 -
 .../descriptor/internal/DefaultEarWebModule.groovy |   42 -
 .../src/main/java/org/gradle/plugins/ear/Ear.java  |  194 +
 .../org/gradle/plugins/ear/EarPlugin.java          |    0
 .../gradle/plugins/ear/EarPluginConvention.java    |  126 +
 .../ear/descriptor/DeploymentDescriptor.java       |  225 +
 .../gradle/plugins/ear/descriptor/EarModule.java   |   52 +
 .../plugins/ear/descriptor/EarSecurityRole.java    |   37 +
 .../plugins/ear/descriptor/EarWebModule.java       |   29 +
 .../internal/DefaultDeploymentDescriptor.java      |  439 ++
 .../ear/descriptor/internal/DefaultEarModule.java  |   91 +
 .../internal/DefaultEarSecurityRole.java           |   80 +
 .../descriptor/internal/DefaultEarWebModule.java   |   54 +
 .../plugins/ear/descriptor/package-info.java       |    0
 .../org/gradle/plugins/ear/package-info.java       |    0
 .../org/gradle/plugins/ear/EarPluginTest.groovy    |  236 +-
 .../groovy/org/gradle/plugins/ear/EarTest.groovy   |   82 +-
 .../DefaultDeploymentDescriptorTest.groovy         |   69 +-
 .../internal/DefaultEarModuleTest.groovy           |   39 +
 subprojects/ide-native/ide-native.gradle           |    2 +-
 ...VisualStudioSingleProjectIntegrationTest.groovy |    4 +-
 .../groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy  |   80 -
 .../gradle/ide/cdt/model/CprojectDescriptor.groovy |  117 -
 .../gradle/ide/cdt/model/CprojectSettings.groovy   |  102 -
 .../gradle/ide/cdt/model/ProjectDescriptor.groovy  |   48 -
 .../gradle/ide/cdt/model/ProjectSettings.groovy    |   43 -
 .../ide/cdt/tasks/GenerateMetadataFileTask.groovy  |   53 -
 .../ide/visualstudio/VisualStudioProject.java      |    5 +-
 .../ide/visualstudio/VisualStudioSolution.java     |    5 +-
 .../internal/DefaultVisualStudioExtension.java     |   11 +-
 .../internal/DefaultVisualStudioProject.groovy     |  154 -
 .../internal/DefaultVisualStudioProject.java       |  172 +
 .../internal/DefaultVisualStudioSolution.groovy    |  114 -
 .../internal/DefaultVisualStudioSolution.java      |  125 +
 ...ecutableVisualStudioProjectConfiguration.groovy |   47 -
 ...ExecutableVisualStudioProjectConfiguration.java |   52 +
 .../VisualStudioProjectConfiguration.groovy        |  107 -
 .../internal/VisualStudioProjectConfiguration.java |  128 +
 .../internal/VisualStudioProjectRegistry.java      |   16 +-
 .../internal/VisualStudioSolutionRegistry.java     |    8 +-
 .../org/gradle/ide/visualstudio/package-info.java  |    1 +
 .../visualstudio/plugins/VisualStudioPlugin.java   |   17 +-
 .../tasks/GenerateFiltersFileTask.groovy           |   66 -
 .../tasks/GenerateFiltersFileTask.java             |   78 +
 .../tasks/GenerateProjectFileTask.groovy           |  112 -
 .../tasks/GenerateProjectFileTask.java             |  150 +
 .../tasks/GenerateSolutionFileTask.groovy          |   71 -
 .../tasks/GenerateSolutionFileTask.java            |   90 +
 .../internal/RelativeFileNameTransformer.java      |    1 +
 .../ide/visualstudio/tasks/package-info.java       |   21 +
 .../org.gradle.eclipse-cdt.properties              |    1 -
 .../gradle/ide/cdt/model/defaultCproject-linux.xml |  114 -
 .../gradle/ide/cdt/model/defaultCproject-macos.xml |  115 -
 .../org/gradle/ide/cdt/model/defaultProject.xml    |   83 -
 .../ide/cdt/model/CprojectSettingsSpec.groovy      |   58 -
 .../ide/cdt/model/ProjectDescriptorSpec.groovy     |   48 -
 .../internal/DefaultVisualStudioProjectTest.groovy |   18 +-
 .../VisualStudioProjectRegistryTest.groovy         |    4 +-
 .../internal/VisualStudioFiltersFileTest.groovy    |    6 +-
 .../internal/VisualStudioProjectFileTest.groovy    |   10 +-
 .../internal/VisualStudioSolutionFileTest.groovy   |   11 +-
 subprojects/ide-play/ide-play.gradle               |   31 +
 .../ide/PlayIdePluginIntegrationTest.groovy        |   50 +
 .../PlayIdeaPluginAdvancedIntegrationTest.groovy   |   42 +
 .../ide/PlayIdeaPluginBasicIntegrationTest.groovy  |  130 +
 .../ide/PlayIdeaPluginIntegrationTest.groovy       |  155 +
 ...layIdeaPluginMultiprojectIntegrationTest.groovy |   59 +
 .../org/gradle/play/plugins/ide/PlayIdePlugin.java |   43 +
 .../play/plugins/ide/internal/PlayIdeaPlugin.java  |  139 +
 .../org/gradle/play/plugins/ide/package-info.java  |   21 +
 .../gradle-plugins/org.gradle.play-ide.properties  |   17 +
 subprojects/ide/ide.gradle                         |    4 +
 .../AbstractIdeDeduplicationIntegrationTest.groovy |   26 +-
 .../plugins/ide/AbstractIdeIntegrationSpec.groovy  |   19 +-
 .../plugins/ide/AbstractIdeIntegrationTest.groovy  |   11 +-
 ...ractSourcesAndJavadocJarsIntegrationTest.groovy |    6 +-
 .../eclipse/AbstractEclipseIntegrationSpec.groovy  |   12 -
 .../eclipse/AbstractEclipseIntegrationTest.groovy  |    4 +
 .../eclipse/EclipseClasspathIntegrationTest.groovy |  355 +-
 ...mSourceAndJavadocLocationIntegrationTest.groovy |   58 +
 .../ide/eclipse/EclipseIntegrationTest.groovy      |   29 +-
 .../EclipseLinkedResourceIntegrationTest.groovy    |   29 +
 .../EclipseMultiModuleIntegrationTest.groovy       |   32 +
 .../eclipse/EclipseProjectIntegrationTest.groovy   |    7 +-
 .../ide/eclipse/EclipseWtpComponentFixture.groovy  |   15 +-
 .../EclipseWtpEarProjectIntegrationTest.groovy     |   94 +-
 .../EclipseWtpEmptyProjectIntegrationTest.groovy   |    9 +-
 .../ide/eclipse/EclipseWtpIntegrationTest.groovy   |   54 +-
 ...seWtpJavaEarSingleProjectIntegrationTest.groovy |  103 +-
 .../EclipseWtpJavaProjectIntegrationTest.groovy    |   30 +-
 .../eclipse/EclipseWtpModelIntegrationTest.groovy  |  766 ++-
 ...lipseWtpWebAndJavaProjectIntegrationTest.groovy |   75 +-
 .../EclipseWtpWebProjectIntegrationTest.groovy     |   37 +-
 .../idea/ConfigurationHooksIntegrationTest.groovy  |    8 +-
 .../plugins/ide/idea/IdeaIntegrationTest.groovy    |   85 +-
 .../IdeaJavaLanguageSettingsIntegrationTest.groovy |  441 ++
 .../plugins/ide/idea/IdeaModuleFixture.groovy      |  144 -
 .../ide/idea/IdeaModuleIntegrationTest.groovy      |  198 +-
 .../ide/idea/IdeaMultiModuleIntegrationTest.groovy |   46 +-
 .../ide/idea/IdeaProjectIntegrationTest.groovy     |   39 -
 ...IdeaSourcesAndJavadocJarsIntegrationTest.groovy |    3 +-
 .../canCreateAndDeleteMetaData/api/build.gradle    |    2 +-
 .../expectedFiles/apiClasspath.xml                 |   13 +-
 .../expectedFiles/commonClasspath.xml              |   20 +-
 .../expectedFiles/groovyprojectClasspath.xml       |    8 +-
 .../expectedFiles/javabaseprojectClasspath.xml     |    2 +-
 .../expectedFiles/webAppJava6Classpath.xml         |   23 +-
 .../expectedFiles/webAppJava6WtpComponent.xml      |    9 -
 .../expectedFiles/webAppWithVarsClasspath.xml      |    9 +-
 .../expectedFiles/webAppWithVarsWtpComponent.xml   |    3 -
 .../expectedFiles/webserviceClasspath.xml          |   29 +-
 .../expectedFiles/webserviceWtpComponent.xml       |    6 -
 .../groovyproject/build.gradle                     |    2 +-
 .../canCreateAndDeleteMetaData/master/build.gradle |   10 +-
 .../build.gradle                                   |    6 +-
 .../project1/build.gradle                          |    2 +-
 .../project2/build.gradle                          |    2 +-
 .../project3/build.gradle                          |    2 +-
 .../settings.gradle                                |    2 +-
 .../build.gradle                                   |    0
 .../project1/build.gradle                          |    0
 .../project2/build.gradle                          |    0
 .../project3}/build.gradle                         |    0
 .../settings.gradle                                |    0
 .../canCreateAndDeleteMetaData/api/build.gradle    |    2 +-
 .../canCreateAndDeleteMetaData/build.gradle        |    2 +
 .../expectedFiles/api/api.iml.xml                  |    8 +-
 .../expectedFiles/root.ipr.xml                     |    5 +-
 .../expectedFiles/webservice/webservice.iml.xml    |    8 +-
 .../overwritesExistingDependencies/build.gradle    |    4 +-
 .../expectedFiles/root.iml.xml                     |    4 +-
 .../expectedFiles/root.ipr.xml                     |    5 +-
 .../expectedFiles/root.ipr.xml                     |    5 +-
 .../expectedFiles/root/root.ipr.xml                |    3 +
 .../plugins/ide/api/FileContentMerger.groovy       |   61 -
 .../org/gradle/plugins/ide/api/GeneratorTask.java  |  127 -
 .../ide/api/PropertiesFileContentMerger.groovy     |   44 -
 .../plugins/ide/api/PropertiesGeneratorTask.java   |   49 -
 .../plugins/ide/api/XmlFileContentMerger.groovy    |   46 -
 .../gradle/plugins/ide/api/XmlGeneratorTask.java   |   50 -
 .../plugins/ide/eclipse/EclipsePlugin.groovy       |  182 -
 .../plugins/ide/eclipse/EclipseWtpPlugin.groovy    |  240 -
 .../ide/eclipse/GenerateEclipseClasspath.groovy    |   46 -
 .../plugins/ide/eclipse/GenerateEclipseJdt.groovy  |   50 -
 .../ide/eclipse/GenerateEclipseProject.groovy      |   48 -
 .../ide/eclipse/GenerateEclipseWtpComponent.groovy |   47 -
 .../ide/eclipse/GenerateEclipseWtpFacet.groovy     |   48 -
 .../ide/eclipse/internal/EclipseNameDeduper.groovy |   36 -
 .../eclipse/internal/LinkedResourcesCreator.groovy |   31 -
 .../eclipse/model/AbstractClasspathEntry.groovy    |  153 -
 .../ide/eclipse/model/AbstractLibrary.groovy       |  110 -
 .../plugins/ide/eclipse/model/AccessRule.groovy    |   55 -
 .../plugins/ide/eclipse/model/BuildCommand.groovy  |   57 -
 .../plugins/ide/eclipse/model/Classpath.groovy     |  105 -
 .../plugins/ide/eclipse/model/Container.groovy     |   34 -
 .../ide/eclipse/model/EclipseClasspath.groovy      |  234 -
 .../ide/eclipse/model/EclipseDomainModel.groovy    |   26 -
 .../plugins/ide/eclipse/model/EclipseJdt.groovy    |  103 -
 .../plugins/ide/eclipse/model/EclipseModel.groovy  |  139 -
 .../ide/eclipse/model/EclipseProject.groovy        |  278 --
 .../plugins/ide/eclipse/model/EclipseWtp.groovy    |   95 -
 .../ide/eclipse/model/EclipseWtpComponent.groovy   |  273 --
 .../ide/eclipse/model/EclipseWtpFacet.groovy       |  115 -
 .../gradle/plugins/ide/eclipse/model/Facet.groovy  |   98 -
 .../plugins/ide/eclipse/model/Library.groovy       |   37 -
 .../gradle/plugins/ide/eclipse/model/Link.groovy   |   62 -
 .../gradle/plugins/ide/eclipse/model/Output.groovy |   62 -
 .../plugins/ide/eclipse/model/Project.groovy       |  213 -
 .../ide/eclipse/model/ProjectDependency.groovy     |   61 -
 .../plugins/ide/eclipse/model/SourceFolder.groovy  |  105 -
 .../plugins/ide/eclipse/model/Variable.groovy      |   37 -
 .../ide/eclipse/model/WbDependentModule.groovy     |   67 -
 .../plugins/ide/eclipse/model/WbProperty.groovy    |   64 -
 .../plugins/ide/eclipse/model/WbResource.groovy    |   66 -
 .../plugins/ide/eclipse/model/WtpComponent.groovy  |  119 -
 .../plugins/ide/eclipse/model/WtpFacet.groovy      |   77 -
 .../model/internal/ClassFoldersCreator.groovy      |   39 -
 .../eclipse/model/internal/ClasspathFactory.groovy |  112 -
 .../model/internal/FileReferenceFactory.groovy     |  139 -
 .../ide/eclipse/model/internal/PathUtil.groovy     |   24 -
 .../model/internal/ProjectDependencyBuilder.groovy |   41 -
 .../model/internal/SourceFoldersCreator.groovy     |  149 -
 .../model/internal/WtpComponentFactory.groovy      |  119 -
 .../plugins/ide/idea/GenerateIdeaModule.groovy     |   59 -
 .../plugins/ide/idea/GenerateIdeaProject.groovy    |   53 -
 .../plugins/ide/idea/GenerateIdeaWorkspace.groovy  |   39 -
 .../org/gradle/plugins/ide/idea/IdeaPlugin.groovy  |  195 -
 .../ide/idea/internal/IdeaNameDeduper.groovy       |   33 -
 .../ide/idea/internal/IdeaScalaConfigurer.groovy   |  128 -
 .../gradle/plugins/ide/idea/model/FilePath.groovy  |   33 -
 .../ide/idea/model/IdeaLanguageLevel.groovy        |   35 -
 .../gradle/plugins/ide/idea/model/IdeaModel.groovy |   95 -
 .../plugins/ide/idea/model/IdeaModule.groovy       |  356 --
 .../plugins/ide/idea/model/IdeaModuleIml.groovy    |   40 -
 .../plugins/ide/idea/model/IdeaProject.groovy      |  191 -
 .../plugins/ide/idea/model/IdeaWorkspace.groovy    |   65 -
 .../plugins/ide/idea/model/JarDirectory.groovy     |   64 -
 .../org/gradle/plugins/ide/idea/model/Jdk.groovy   |   85 -
 .../gradle/plugins/ide/idea/model/Module.groovy    |  356 --
 .../plugins/ide/idea/model/ModuleDependency.groovy |   89 -
 .../plugins/ide/idea/model/ModuleLibrary.groovy    |  135 -
 .../org/gradle/plugins/ide/idea/model/Path.groovy  |   73 -
 .../plugins/ide/idea/model/PathFactory.groovy      |  156 -
 .../gradle/plugins/ide/idea/model/Project.groovy   |  209 -
 .../plugins/ide/idea/model/ProjectLibrary.groovy   |  105 -
 .../ide/idea/model/SingleEntryModuleLibrary.groovy |   98 -
 .../gradle/plugins/ide/idea/model/Workspace.groovy |   39 -
 .../idea/model/internal/GeneratedIdeaScope.java    |   40 -
 .../model/internal/IdeaDependenciesProvider.java   |  271 --
 .../model/internal/ModuleDependencyBuilder.java    |   32 -
 .../ide/internal/IdeDependenciesExtractor.java     |  189 -
 .../gradle/plugins/ide/internal/IdePlugin.groovy   |   69 -
 .../internal/configurer/DeduplicationTarget.groovy |   27 -
 .../internal/configurer/ModuleNameDeduper.groovy   |  111 -
 .../ide/internal/configurer/ProjectDeduper.groovy  |   42 -
 .../AbstractPersistableConfigurationObject.groovy  |   71 -
 ...PropertiesPersistableConfigurationObject.groovy |   49 -
 .../XmlPersistableConfigurationObject.groovy       |   65 -
 .../PersistableConfigurationObjectGenerator.java   |   44 -
 .../internal/tooling/BasicIdeaModelBuilder.java    |   39 -
 .../internal/tooling/BuildInvocationsBuilder.java  |  127 -
 .../ide/internal/tooling/EclipseModelBuilder.java  |  175 -
 .../ide/internal/tooling/GradleBuildBuilder.java   |   54 -
 .../ide/internal/tooling/GradleProjectBuilder.java |   87 -
 .../ide/internal/tooling/IdeaModelBuilder.java     |  146 -
 .../ide/internal/tooling/PublicationsBuilder.java  |   57 -
 .../tooling/ToolingRegistrationAction.java         |   41 -
 .../eclipse/DefaultEclipseBuildCommand.java        |   46 -
 .../eclipse/DefaultEclipseExternalDependency.java  |   61 -
 .../tooling/eclipse/DefaultEclipseProject.java     |  167 -
 .../eclipse/DefaultEclipseProjectDependency.java   |   48 -
 .../eclipse/DefaultEclipseProjectNature.java       |   37 -
 .../eclipse/DefaultEclipseSourceDirectory.java     |   42 -
 .../tooling/eclipse/DefaultEclipseTask.java        |   53 -
 .../tooling/idea/DefaultIdeaCompilerOutput.java    |   65 -
 .../tooling/idea/DefaultIdeaContentRoot.java       |   93 -
 .../tooling/idea/DefaultIdeaDependencyScope.java   |   64 -
 .../tooling/idea/DefaultIdeaLanguageLevel.java     |   82 -
 .../internal/tooling/idea/DefaultIdeaModule.java   |  119 -
 .../tooling/idea/DefaultIdeaModuleDependency.java  |   61 -
 .../internal/tooling/idea/DefaultIdeaProject.java  |   96 -
 .../DefaultIdeaSingleEntryLibraryDependency.java   |   97 -
 .../tooling/java/DefaultJavaSourceSettings.java    |   33 -
 .../internal/idea/DefaultIdeaModuleDependency.java |   27 -
 .../DefaultIdeaSingleEntryLibraryDependency.java   |   27 -
 .../gradle/plugins/ide/api/FileContentMerger.java  |  110 +
 .../org/gradle/plugins/ide/api/GeneratorTask.java  |  149 +
 .../ide/api/PropertiesFileContentMerger.java       |   74 +
 .../plugins/ide/api/PropertiesGeneratorTask.java   |   53 +
 .../plugins/ide/api/XmlFileContentMerger.java      |   72 +
 .../gradle/plugins/ide/api/XmlGeneratorTask.java   |   54 +
 .../org/gradle/plugins/ide/api/package-info.java   |    0
 .../gradle/plugins/ide/eclipse/EclipsePlugin.java  |  401 ++
 .../plugins/ide/eclipse/EclipseWtpPlugin.java      |  370 ++
 .../ide/eclipse/GenerateEclipseClasspath.java      |   57 +
 .../plugins/ide/eclipse/GenerateEclipseJdt.java    |   62 +
 .../ide/eclipse/GenerateEclipseProject.java        |   59 +
 .../ide/eclipse/GenerateEclipseWtpComponent.java   |   60 +
 .../ide/eclipse/GenerateEclipseWtpFacet.java       |   61 +
 .../ide/eclipse/internal/AfterEvaluateHelper.java  |   43 +
 .../ide/eclipse/internal/EclipseNameDeduper.java   |   89 +
 .../eclipse/internal/LinkedResourcesCreator.java   |   46 +
 .../ide/eclipse/model/AbstractClasspathEntry.java  |  240 +
 .../plugins/ide/eclipse/model/AbstractLibrary.java |  128 +
 .../plugins/ide/eclipse/model/AccessRule.java      |   77 +
 .../plugins/ide/eclipse/model/BuildCommand.java    |   79 +
 .../plugins/ide/eclipse/model/Classpath.java       |  161 +
 .../plugins/ide/eclipse/model/ClasspathEntry.java  |    0
 .../plugins/ide/eclipse/model/Container.java       |   43 +
 .../ide/eclipse/model/EclipseClasspath.java        |  323 ++
 .../plugins/ide/eclipse/model/EclipseJdt.java      |  141 +
 .../plugins/ide/eclipse/model/EclipseModel.java    |  177 +
 .../plugins/ide/eclipse/model/EclipseProject.java  |  312 ++
 .../plugins/ide/eclipse/model/EclipseWtp.java      |  102 +
 .../ide/eclipse/model/EclipseWtpComponent.java     |  373 ++
 .../plugins/ide/eclipse/model/EclipseWtpFacet.java |  133 +
 .../gradle/plugins/ide/eclipse/model/Facet.java    |  122 +
 .../plugins/ide/eclipse/model/FileReference.java   |    0
 .../org/gradle/plugins/ide/eclipse/model/Jdt.java  |    0
 .../gradle/plugins/ide/eclipse/model/Library.java  |   44 +
 .../org/gradle/plugins/ide/eclipse/model/Link.java |  112 +
 .../ide/eclipse/model/NonRenamableProject.java     |  127 +
 .../gradle/plugins/ide/eclipse/model/Output.java   |   86 +
 .../gradle/plugins/ide/eclipse/model/Project.java  |  285 ++
 .../ide/eclipse/model/ProjectDependency.java       |   80 +
 .../plugins/ide/eclipse/model/SourceFolder.java    |  165 +
 .../gradle/plugins/ide/eclipse/model/Variable.java |   44 +
 .../ide/eclipse/model/WbDependentModule.java       |  101 +
 .../plugins/ide/eclipse/model/WbModuleEntry.java   |   26 +
 .../plugins/ide/eclipse/model/WbProperty.java      |   92 +
 .../plugins/ide/eclipse/model/WbResource.java      |   95 +
 .../plugins/ide/eclipse/model/WtpComponent.java    |  166 +
 .../gradle/plugins/ide/eclipse/model/WtpFacet.java |  114 +
 .../model/internal/ClassFoldersCreator.java        |   44 +
 .../eclipse/model/internal/ClasspathFactory.java   |   79 +
 .../model/internal/EclipseDependenciesCreator.java |  109 +
 .../model/internal/FileReferenceFactory.java       |  165 +
 .../ide/eclipse/model/internal/PathUtil.java       |   25 +
 .../model/internal/ProjectDependencyBuilder.java   |   46 +
 .../model/internal/SourceFoldersCreator.java       |  220 +
 .../internal/WtpClasspathAttributeSupport.java     |  117 +
 .../model/internal/WtpComponentFactory.java        |  143 +
 .../plugins/ide/eclipse/model/package-info.java    |    0
 .../gradle/plugins/ide/eclipse/package-info.java   |    0
 .../plugins/ide/idea/GenerateIdeaModule.java       |   74 +
 .../plugins/ide/idea/GenerateIdeaProject.java      |   69 +
 .../plugins/ide/idea/GenerateIdeaWorkspace.java    |   52 +
 .../org/gradle/plugins/ide/idea/IdeaPlugin.java    |  439 ++
 .../plugins/ide/idea/internal/IdeaNameDeduper.java |   83 +
 .../ide/idea/internal/IdeaScalaConfigurer.java     |  240 +
 .../gradle/plugins/ide/idea/model/Dependency.java  |    0
 .../gradle/plugins/ide/idea/model/FilePath.java    |   35 +
 .../plugins/ide/idea/model/IdeaLanguageLevel.java  |   60 +
 .../gradle/plugins/ide/idea/model/IdeaModel.java   |  114 +
 .../gradle/plugins/ide/idea/model/IdeaModule.java  |  566 +++
 .../plugins/ide/idea/model/IdeaModuleIml.java      |   49 +
 .../gradle/plugins/ide/idea/model/IdeaProject.java |  313 ++
 .../plugins/ide/idea/model/IdeaWorkspace.java      |   71 +
 .../plugins/ide/idea/model/JarDirectory.java       |   86 +
 .../org/gradle/plugins/ide/idea/model/Jdk.java     |  127 +
 .../org/gradle/plugins/ide/idea/model/Module.java  |  506 ++
 .../plugins/ide/idea/model/ModuleDependency.java   |  136 +
 .../plugins/ide/idea/model/ModuleLibrary.java      |  212 +
 .../org/gradle/plugins/ide/idea/model/Path.java    |   82 +
 .../gradle/plugins/ide/idea/model/PathFactory.java |  218 +
 .../org/gradle/plugins/ide/idea/model/Project.java |  349 ++
 .../plugins/ide/idea/model/ProjectLibrary.java     |  175 +
 .../ide/idea/model/SingleEntryModuleLibrary.java   |  114 +
 .../gradle/plugins/ide/idea/model/Workspace.java   |   42 +
 .../idea/model/internal/GeneratedIdeaScope.java    |   43 +
 .../model/internal/IdeaDependenciesProvider.java   |  338 ++
 .../idea/model/internal/IdeaScopeMappingRule.java  |    0
 .../model/internal/ModuleDependencyBuilder.java    |   39 +
 .../plugins/ide/idea/model/package-info.java       |    0
 .../org/gradle/plugins/ide/idea/package-info.java  |    0
 .../ide/internal/IdeDependenciesExtractor.java     |  197 +
 .../org/gradle/plugins/ide/internal/IdePlugin.java |   98 +
 .../HierarchicalElementDeduplicator.java           |  242 +
 .../configurer/NameDeduplicationAdapter.java       |   41 +
 .../AbstractPersistableConfigurationObject.java    |   83 +
 .../PropertiesPersistableConfigurationObject.java  |   55 +
 .../XmlPersistableConfigurationObject.java         |  122 +
 .../internal/generator/generator/Generator.java    |    0
 .../generator/PersistableConfigurationObject.java  |    0
 .../PersistableConfigurationObjectGenerator.java   |   47 +
 .../resolver/DefaultIdeDependencyResolver.java     |   59 +-
 .../resolver/UnresolvedDependenciesLogger.java     |   35 +
 .../ide/internal/resolver/model/IdeDependency.java |   10 -
 .../internal/resolver/model/IdeDependencyKey.java  |    8 +-
 .../model/IdeExtendedRepoFileDependency.java       |    8 +-
 .../resolver/model/IdeLocalFileDependency.java     |    5 +-
 .../resolver/model/IdeProjectDependency.java       |   36 +-
 .../resolver/model/IdeRepoFileDependency.java      |    4 +-
 .../model/UnresolvedIdeRepoFileDependency.java     |   19 +-
 .../internal/tooling/BasicIdeaModelBuilder.java    |   41 +
 .../internal/tooling/BuildEnvironmentBuilder.java  |   48 +
 .../internal/tooling/BuildInvocationsBuilder.java  |  130 +
 .../ide/internal/tooling/EclipseModelBuilder.java  |  291 ++
 .../ide/internal/tooling/GradleBuildBuilder.java   |   57 +
 .../ide/internal/tooling/GradleProjectBuilder.java |   89 +
 .../ide/internal/tooling/IdeaModelBuilder.java     |  211 +
 .../ide/internal/tooling/PublicationsBuilder.java  |   59 +
 .../plugins/ide/internal/tooling/TasksFactory.java |    0
 .../tooling/ToolingModelBuilderSupport.java        |    0
 .../ide/internal/tooling/ToolingModelServices.java |   66 +
 .../tooling/eclipse/DefaultAccessRule.java         |   38 +
 .../tooling/eclipse/DefaultClasspathAttribute.java |   37 +
 .../eclipse/DefaultEclipseBuildCommand.java        |   46 +
 .../eclipse/DefaultEclipseClasspathContainer.java  |   42 +
 .../eclipse/DefaultEclipseClasspathEntry.java      |   39 +
 .../tooling/eclipse/DefaultEclipseDependency.java  |   31 +
 .../eclipse/DefaultEclipseExternalDependency.java  |   68 +
 .../eclipse/DefaultEclipseJavaSourceSettings.java  |   55 +
 .../eclipse/DefaultEclipseLinkedResource.java      |    0
 .../eclipse/DefaultEclipseOutputLocation.java      |   32 +
 .../tooling/eclipse/DefaultEclipseProject.java     |  186 +
 .../eclipse/DefaultEclipseProjectDependency.java   |   48 +
 .../eclipse/DefaultEclipseProjectNature.java       |   37 +
 .../eclipse/DefaultEclipseSourceDirectory.java     |   61 +
 .../tooling/eclipse/DefaultEclipseTask.java        |   53 +
 .../tooling/idea/DefaultIdeaCompilerOutput.java    |   68 +
 .../tooling/idea/DefaultIdeaContentRoot.java       |   94 +
 .../tooling/idea/DefaultIdeaDependency.java        |    0
 .../tooling/idea/DefaultIdeaDependencyScope.java   |   61 +
 .../idea/DefaultIdeaJavaLanguageSettings.java      |   55 +
 .../tooling/idea/DefaultIdeaLanguageLevel.java     |   79 +
 .../internal/tooling/idea/DefaultIdeaModule.java   |  131 +
 .../tooling/idea/DefaultIdeaModuleDependency.java  |   72 +
 .../internal/tooling/idea/DefaultIdeaProject.java  |  106 +
 .../DefaultIdeaSingleEntryLibraryDependency.java   |   99 +
 .../tooling/idea/DefaultIdeaSourceDirectory.java   |    0
 .../internal/tooling/java/DefaultInstalledJdk.java |   47 +
 .../model/LaunchableGradleTaskSelector.java        |    3 +-
 ...le.configuration.project.ProjectConfigureAction |    1 -
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../plugins/ide/eclipse/EclipsePluginTest.groovy   |   28 +-
 .../ide/eclipse/EclipseWtpPluginTest.groovy        |   39 +-
 .../eclipse/GenerateEclipseWtpComponentTest.groovy |    3 +-
 .../ide/eclipse/GenerateEclipseWtpFacetTest.groovy |    3 +-
 .../plugins/ide/eclipse/model/ClasspathTest.groovy |   65 +-
 .../ide/eclipse/model/EclipseModelTest.groovy      |    8 +-
 .../ide/eclipse/model/EclipseProjectTest.groovy    |    6 +-
 .../ide/eclipse/model/ProjectDependencyTest.groovy |    4 +-
 .../internal/ProjectDependencyBuilderTest.groovy   |   44 +-
 .../plugins/ide/idea/GenerateIdeaModuleTest.groovy |   15 +-
 .../gradle/plugins/ide/idea/IdeaPluginTest.groovy  |   41 +-
 .../plugins/ide/idea/model/IdeaModuleTest.groovy   |   76 +
 .../plugins/ide/idea/model/IdeaProjectTest.groovy  |   61 +
 .../plugins/ide/idea/model/ModuleTest.groovy       |   17 +-
 .../plugins/ide/idea/model/ProjectTest.groovy      |   47 +-
 .../internal/IdeaDependenciesProviderTest.groovy   |  106 +-
 .../internal/ModuleDependencyBuilderTest.groovy    |   37 +-
 .../plugins/ide/internal/GeneratorTaskTest.groovy  |   15 +-
 .../plugins/ide/internal/IdePluginTest.groovy      |    6 +-
 .../HierarchicalElementDeduplicatorTest.groovy     |  314 ++
 .../configurer/ModuleNameDeduperTest.groovy        |  163 -
 .../internal/configurer/ProjectDeduperTest.groovy  |   43 -
 .../tooling/BuildInvocationsBuilderTest.groovy     |   18 +-
 .../internal/tooling/GradleBuildBuilderTest.groovy |   16 +-
 .../tooling/GradleProjectBuilderTest.groovy        |   16 +-
 .../tooling/ProjectPublicationsBuilderTest.groovy  |   10 +-
 .../ide/internal/tooling/TasksFactoryTest.groovy   |    6 +-
 .../tooling/eclipse/EclipseModelBuilderTest.groovy |  161 +-
 .../tooling/idea/IdeaModelBuilderTest.groovy       |  319 ++
 .../ide/idea/model/moduleWithoutContent.xml        |    6 +
 .../plugins/ide/fixtures/IdeaFixtures.groovy       |   33 +
 .../plugins/ide/fixtures/IdeaModuleFixture.groovy  |  214 +
 .../plugins/ide/fixtures/IdeaProjectFixture.groovy |   76 +
 .../installation-beacon/installation-beacon.gradle |   17 +
 .../installation/beacon/InstallationBeacon.java    |   25 +
 subprojects/integ-test/integ-test.gradle           |    4 +-
 .../integtests/AntProjectIntegrationTest.groovy    |    2 +-
 .../integtests/ApplicationIntegrationSpec.groovy   |   34 +-
 .../BuildAggregationIntegrationTest.groovy         |   74 +-
 .../BuildScriptClasspathIntegrationTest.java       |   27 +-
 .../BuildSourceBuilderIntegrationTest.groovy       |   20 +-
 .../integtests/CacheProjectIntegrationTest.groovy  |   39 +-
 .../integtests/ClosureScopeIntegrationTest.groovy  |   53 +
 .../integtests/CommandLineIntegrationTest.groovy   |   15 +-
 ...figurationOnDemandPluginsIntegrationTest.groovy |   54 +
 .../integtests/CustomPluginIntegrationTest.groovy  |   10 +-
 ...fferentJnaVersionInPluginIntegrationSpec.groovy |   56 +
 .../gradle/integtests/ExecIntegrationTest.groovy   |  123 +-
 .../GroovyToJavaConversionIntegrationTest.groovy   |   69 +
 ...ementalGroovyProjectBuildIntegrationTest.groovy |    1 +
 ...latedAntBuilderMemoryLeakIntegrationTest.groovy |   12 +-
 ...JavaCompileOnlyDependencyIntegrationTest.groovy |  270 +
 .../JavaProjectCrossVersionIntegrationTest.groovy  |    7 +-
 .../integtests/JavaProjectIntegrationTest.groovy   |    6 +-
 ...gacyAndComponentJvmPluginIntegrationTest.groovy |    4 +-
 .../MixedNativeAndJvmProjectIntegrationTest.groovy |    6 +-
 .../MultiProjectDependencyIntegrationTest.groovy   |    8 +-
 .../integtests/MultiprojectIntegrationTest.groovy  |    8 +-
 .../OsgiProjectSampleIntegrationTest.groovy        |   33 +-
 .../ParallelProjectExecutionIntegrationTest.groovy |    1 -
 .../ParallelTaskExecutionIntegrationTest.groovy    |    2 -
 ...luginBinaryCompatibilityCrossVersionSpec.groovy |   82 +
 .../integtests/ProjectLayoutIntegrationTest.groovy |   14 +-
 .../integtests/ProjectLoadingIntegrationTest.java  |    4 +-
 .../ScriptClassloadingIntegrationTest.groovy       |   96 +
 .../integtests/StaleOutputIntegrationTest.groovy   |  112 +
 .../gradle/integtests/StdioIntegrationTest.groovy  |   32 +-
 .../integtests/SyncTaskIntegrationTest.groovy      |  291 +-
 .../TaskAutoDependencyIntegrationTest.groovy       |    6 +-
 .../TaskDefinitionIntegrationSpec.groovy           |   20 +
 .../integtests/TaskDefinitionIntegrationTest.java  |   10 +-
 .../TaskErrorExecutionIntegrationTest.groovy       |   16 +-
 .../integtests/TaskExecutionIntegrationTest.groovy |  138 +-
 ...ssingBinaryCompatibilityCrossVersionSpec.groovy |  156 +-
 .../TaskUpToDateCrossVersionIntegrationTest.groovy |   40 +
 .../integtests/TaskUpToDateIntegrationTest.groovy  |   71 +
 .../BuildEnvironmentIntegrationTest.groovy         |    7 +-
 .../gradle/integtests/fixtures/SampleSpec.groovy   |   39 +
 .../logging/LoggerIsEnabledIntegrationTest.groovy  |   37 -
 .../logging/LoggingIntegrationTest.groovy          |  435 --
 .../AutoTestedSamplesCoreIntegrationTest.groovy    |    2 +-
 .../SamplesApplicationIntegrationTest.groovy       |    4 +-
 .../SamplesCodeQualityIntegrationTest.groovy       |   15 +-
 .../SamplesCustomPluginIntegrationTest.groovy      |    3 +-
 .../SamplesJavaApiAndImplIntegrationTest.groovy    |    3 +-
 .../samples/SamplesJavaBaseIntegrationTest.groovy  |   11 +-
 .../SamplesJavaMultiProjectIntegrationTest.groovy  |    2 +-
 .../SamplesJavaOnlyIfIntegrationTest.groovy        |   18 +-
 ...esJavaProjectWithIntTestsIntegrationTest.groovy |    5 +-
 .../SamplesJavaQuickstartIntegrationTest.groovy    |   26 +-
 ...mplesMultiProjectBuildSrcIntegrationTest.groovy |    2 -
 .../SamplesWebProjectIntegrationTest.groovy        |   28 +-
 .../SamplesWebQuickstartIntegrationTest.groovy     |   28 +-
 .../samples/UserGuideSamplesIntegrationTest.groovy |    6 +-
 .../samples/UserGuideSamplesRunner.groovy          |   38 +-
 .../CommandLineIntegrationTest/shared/build.gradle |   32 +-
 .../canExecuteCommands/canExecuteCommands.gradle   |   31 -
 .../canExecuteJava/canExecuteJava.gradle           |   29 -
 .../java/expectedApiClasspathFile.txt              |    2 +-
 .../eclipseproject/scala/expectedClasspathFile.txt |    2 +-
 .../shared/build.gradle                            |   20 -
 .../logging/nestedBuild/build.gradle               |    6 -
 .../logging/project1/build.gradle                  |   75 -
 .../multiThreaded/build.gradle                     |   26 -
 .../internal-android-performance-testing.gradle    |   66 +
 .../org/gradle/performance/android/GetModel.java   |   44 +
 .../org/gradle/performance/android/Inspector.java  |  118 +
 .../java/org/gradle/performance/android/Main.java  |   81 +
 .../org/gradle/performance/android/SyncAction.java |   57 +
 .../java/org/gradle/performance/android/Timer.java |   32 +
 .../internal-integ-testing.gradle                  |   15 +-
 .../fixtures/AbstractCompatibilityTestRunner.java  |   32 +-
 .../AbstractDependencyResolutionTest.groovy        |    8 -
 .../AbstractHttpDependencyResolutionTest.groovy    |   11 +-
 .../fixtures/AbstractIntegrationSpec.groovy        |   32 +-
 .../fixtures/AbstractIntegrationTest.java          |   26 +-
 .../fixtures/AbstractMultiTestRunner.java          |    6 +-
 .../AbstractTaskRelocationIntegrationTest.groovy   |   68 +
 .../integtests/fixtures/AvailableJavaHomes.java    |  128 +-
 .../fixtures/CrossVersionIntegrationSpec.groovy    |    9 +-
 .../fixtures/CrossVersionTestRunner.groovy         |    8 +
 .../ForkScalaCompileInDaemonModeFixture.groovy     |   60 -
 .../fixtures/KillProcessAvailability.groovy        |    4 +-
 .../fixtures/MultiVersionSpecRunner.groovy         |    2 +-
 .../PersistentBuildProcessIntegrationTest.groovy   |   37 -
 .../integtests/fixtures/ProcessFixture.groovy      |   94 +
 .../org/gradle/integtests/fixtures/Sample.java     |   43 +-
 .../integtests/fixtures/ScriptExecuter.groovy      |    9 +-
 .../fixtures/TestNGExecutionResult.groovy          |    4 +-
 .../fixtures/ZincScalaCompileFixture.groovy        |   48 +
 .../integtests/fixtures/build/BuildTestFile.groovy |   48 +
 .../fixtures/build/BuildTestFixture.groovy         |   93 +
 .../fixtures/daemon/AbstractDaemonFixture.groovy   |   92 +-
 .../fixtures/daemon/DaemonClientFixture.groovy     |   51 +
 .../integtests/fixtures/daemon/DaemonFixture.java  |   22 +
 .../fixtures/daemon/DaemonIntegrationSpec.groovy   |   21 +-
 .../fixtures/daemon/DaemonLogFileStateProbe.groovy |   16 +-
 .../fixtures/daemon/DaemonLogsAnalyzer.groovy      |   20 +-
 .../daemon/DaemonRegistryStateProbe.groovy         |   28 +-
 .../fixtures/daemon/DaemonStateProbe.java          |    4 +-
 .../integtests/fixtures/daemon/LegacyDaemon.groovy |   17 +
 .../fixtures/daemon/TestableDaemon.groovy          |   14 +-
 .../fixtures/executer/AbstractGradleExecuter.java  |  340 +-
 .../fixtures/executer/DaemonGradleExecuter.java    |   14 +-
 .../executer/DefaultGradleDistribution.java        |   59 +-
 .../executer/DownloadableGradleDistribution.groovy |   12 +-
 .../ExecuterDecoratingGradleDistribution.java      |  142 +
 .../fixtures/executer/ExecutionResult.java         |   12 +
 .../fixtures/executer/ForkingGradleExecuter.java   |   44 +-
 .../fixtures/executer/ForkingGradleHandle.java     |   10 +
 .../executer/GradleBackedArtifactBuilder.java      |    9 +
 .../executer/GradleContextualExecuter.java         |    2 +-
 .../fixtures/executer/GradleDistribution.java      |    5 +
 .../fixtures/executer/GradleExecuter.java          |   52 +-
 .../fixtures/executer/GradleExecuterDecorator.java |   20 +
 .../fixtures/executer/GradleVersions.java          |    1 -
 .../fixtures/executer/InProcessGradleExecuter.java |  137 +-
 .../executer/IntegrationTestBuildContext.java      |   28 +-
 .../executer/OutputScrapingExecutionFailure.java   |    4 +-
 .../executer/OutputScrapingExecutionResult.java    |   70 +-
 .../executer/OutputScrapingGradleHandle.java       |    2 +-
 .../executer/ParallelForkingGradleExecuter.java    |    4 +-
 .../executer/ParallelForkingGradleHandle.java      |    6 +-
 .../executer/ProgressLoggingFixture.groovy         |   22 +-
 .../fixtures/jvm/InstalledJvmLocator.java          |    3 +-
 .../fixtures/jvm/OsXInstalledJvmLocator.java       |    9 +-
 .../PersistentBuildProcessIntegrationTest.groovy   |   32 +
 .../versions/ReleasedVersionDistributions.java     |   31 +
 .../org/gradle/test/fixtures/AbstractModule.groovy |   42 +-
 .../org/gradle/test/fixtures/HttpRepository.groovy |    6 +-
 .../groovy/org/gradle/test/fixtures/Module.groovy  |   12 +-
 .../org/gradle/test/fixtures/Repository.groovy     |    7 +-
 .../gradle/test/fixtures/ivy/IvyDescriptor.groovy  |   14 +-
 .../fixtures/ivy/IvyDescriptorDependency.groovy    |   19 +-
 .../ivy/IvyDescriptorDependencyExclusion.groovy    |   30 +
 .../gradle/test/fixtures/ivy/IvyFileModule.groovy  |   25 +
 .../test/fixtures/ivy/IvyFileRepository.groovy     |    2 +-
 .../org/gradle/test/fixtures/ivy/IvyModule.java    |   24 +
 .../gradle/test/fixtures/ivy/IvyRepository.groovy  |    4 +-
 .../test/fixtures/ivy/RemoteIvyRepository.groovy   |    7 +-
 .../test/fixtures/keystore/TestKeyStore.groovy     |   30 +-
 .../test/fixtures/maven/AbstractMavenModule.groovy |   38 +-
 .../test/fixtures/maven/DelegatingMavenModule.java |   23 +-
 .../test/fixtures/maven/M2Installation.groovy      |   71 +-
 .../fixtures/maven/MavenDependencyExclusion.groovy |    3 +
 .../test/fixtures/maven/MavenFileModule.groovy     |   21 +-
 .../test/fixtures/maven/MavenFileRepository.groovy |    2 +-
 .../fixtures/maven/MavenLocalRepository.groovy     |    2 +-
 .../gradle/test/fixtures/maven/MavenModule.groovy  |    6 +-
 .../test/fixtures/maven/MavenRepository.groovy     |    4 +-
 .../gradle/test/fixtures/maven/MavenScope.groovy   |    5 +
 .../test/fixtures/plugin/PluginBuilder.groovy      |   62 +-
 .../server/http/AbstractHttpResource.groovy        |    4 +
 .../fixtures/server/http/BlockingHttpServer.groovy |    6 +
 .../server/http/CyclicBarrierHttpServer.java       |   32 +-
 .../server/http/HttpDirectoryResource.groovy       |   10 +
 .../test/fixtures/server/http/HttpResource.groovy  |    9 +
 .../test/fixtures/server/http/HttpServer.groovy    |   67 +-
 .../test/fixtures/server/http/IvyHttpModule.groovy |   23 +
 .../fixtures/server/http/IvyHttpRepository.groovy  |    2 +-
 .../fixtures/server/http/MavenHttpModule.groovy    |    7 +
 .../server/http/MavenHttpRepository.groovy         |    2 +-
 .../fixtures/server/http/NtlmAuthenticator.groovy  |  107 +
 .../fixtures/server/http/TestProxyServer.groovy    |   52 +-
 .../test/fixtures/server/sftp/IvySftpModule.groovy |   23 +-
 .../fixtures/server/sftp/IvySftpRepository.groovy  |    2 +-
 .../server/sftp/MavenSftpRepository.groovy         |    4 +-
 .../executer/AbstractGradleExecuterTest.groovy     |   81 +
 .../ReleasedVersionDistributionsTest.groovy        |   28 +-
 .../ivy/IvyDescriptorDependencyTest.groovy         |   96 +
 .../test/fixtures/maven/MavenFileModuleTest.groovy |    2 +-
 .../fixtures/maven/MavenLocalModuleTest.groovy     |    2 +-
 .../test/fixtures/maven/MavenScopeTest.groovy      |   70 +
 .../internal-performance-testing.gradle            |   86 +
 .../performance/fixture/MavenDownloaderTest.groovy |   64 +
 ...dStudioMockupCrossVersionPerformanceTest.groovy |   74 +
 .../AbstractCrossBuildPerformanceTest.groovy       |   71 +
 .../AbstractCrossVersionPerformanceTest.groovy     |   53 +
 .../AbstractGradleVsMavenPerformanceTest.groovy    |   73 +
 ...actToolingApiCrossVersionPerformanceTest.groovy |  268 +
 .../categories/AndroidPerformanceTest.java         |   21 +
 .../categories/BasicPerformanceTest.java           |   23 +
 .../gradle/performance/categories/Experiment.java  |   25 +
 .../categories/GradleCorePerformanceTest.java      |   21 +
 .../categories/JavaPerformanceTest.java            |   23 +
 .../categories/NativePerformanceTest.java          |   23 +
 .../performance/categories/PerformanceTest.java    |    0
 .../categories/ToolingApiPerformanceTest.java      |   23 +
 ...AbstractGradleBuildPerformanceTestRunner.groovy |  120 +
 .../fixture/BuildEventTimestampCollector.java      |   99 +
 .../fixture/BuildExperimentInvocationInfo.java     |    0
 .../fixture/BuildExperimentListener.java           |   29 +
 .../fixture/BuildExperimentListenerAdapter.java    |   31 +
 .../performance/fixture/BuildExperimentRunner.java |  293 ++
 .../performance/fixture/BuildExperimentSpec.groovy |   74 +
 .../fixture/CompilationLoggingCollector.java       |    0
 .../fixture/CompositeDataCollector.java            |    0
 .../performance/fixture/CompositeDataReporter.java |   42 +
 .../fixture/CrossBuildPerformanceTestRunner.groovy |   72 +
 .../CrossVersionPerformanceTestRunner.groovy       |  280 ++
 .../gradle/performance/fixture/DataCollector.java  |    0
 .../DefaultBuildExperimentInvocationInfo.java      |   59 +
 .../performance/fixture/FlameGraphSanitizer.java   |  118 +
 .../gradle/performance/fixture/GCEventParser.java  |   87 +
 .../performance/fixture/GCLoggingCollector.java    |  190 +
 .../org/gradle/performance/fixture/Git.groovy      |    0
 .../fixture/GradleBuildExperimentSpec.groovy       |  103 +
 .../fixture/GradleExecuterBackedSession.groovy     |   83 +
 .../fixture/GradleInvocationSpec.groovy            |  194 +
 .../gradle/performance/fixture/GradleSession.java  |   26 +
 .../performance/fixture/GradleSessionProvider.java |    0
 .../GradleVsMavenBuildExperimentRunner.java        |   87 +
 .../GradleVsMavenPerformanceTestRunner.groovy      |  102 +
 .../fixture/HonestProfilerCollector.groovy         |  185 +
 .../performance/fixture/InvocationCustomizer.java  |   21 +
 .../fixture/InvocationExecutorProvider.java        |   20 +
 .../performance/fixture/InvocationSpec.groovy      |   38 +
 .../org/gradle/performance/fixture/LogFiles.java   |    0
 .../fixture/MavenBuildExperimentSpec.groovy        |  110 +
 .../performance/fixture/MavenInstallation.groovy   |   61 +
 .../fixture/MavenInstallationDownloader.groovy     |  117 +
 .../performance/fixture/MavenInvocationSpec.groovy |  168 +
 .../performance/fixture/MemoryInfoCollector.groovy |    0
 .../gradle/performance/fixture/OperationTimer.java |    0
 .../fixture/PerformanceCounterCollector.java       |  128 +
 .../PerformanceTestDirectoryProvider.groovy        |   27 +
 .../performance/fixture/PerformanceTestSpec.java   |   47 +
 .../org/gradle/performance/fixture/Profiler.java   |   26 +
 .../performance/fixture/TestProjectLocator.groovy  |   28 +
 .../performance/fixture/TestScenarioSelector.java  |   81 +
 .../fixture/ToolingApiBackedGradleSession.groovy   |   74 +
 .../gradle/performance/fixture/WaitingReader.java  |   74 +
 .../performance/fixture/YourKitProfiler.groovy     |  206 +
 .../org/gradle/performance/measure/Amount.java     |  179 +
 .../org/gradle/performance/measure/DataAmount.java |    0
 .../org/gradle/performance/measure/DataSeries.java |   99 +
 .../org/gradle/performance/measure/Duration.java   |    0
 .../performance/measure/MeasuredOperation.groovy   |   57 +
 .../org/gradle/performance/measure/Units.java      |    0
 .../performance/results/AllResultsStore.java       |   49 +
 .../results/BaseCrossBuildResultsStore.java        |  313 ++
 .../performance/results/BaselineVersion.groovy     |  105 +
 .../performance/results/BuildDisplayInfo.groovy    |   43 +
 .../org/gradle/performance/results/Checks.java     |   39 +
 .../performance/results/CompositeResultsStore.java |   79 +
 .../performance/results/ConnectionAction.java      |   24 +
 .../results/CrossBuildPerformanceResults.groovy    |   68 +
 .../results/CrossBuildPerformanceTestHistory.java  |  206 +
 .../results/CrossBuildResultsStore.java            |   32 +
 .../results/CrossVersionPerformanceResults.groovy  |  131 +
 .../CrossVersionPerformanceTestHistory.java        |  235 +
 .../results/CrossVersionResultsStore.java          |  379 ++
 .../gradle/performance/results/DataReporter.groovy |   21 +
 .../gradle/performance/results/FileRenderer.java   |   39 +
 .../org/gradle/performance/results/Flakiness.java  |   33 +
 .../gradle/performance/results/FormatSupport.java  |    0
 .../GradleVsMavenBuildPerformanceResults.groovy    |   39 +
 .../results/GradleVsMavenBuildResultsStore.java    |   25 +
 .../results/GraphIndexPageGenerator.java           |   87 +
 .../performance/results/HtmlPageGenerator.java     |  198 +
 .../performance/results/IndexPageGenerator.java    |  121 +
 .../results/MeasuredOperationList.groovy           |   81 +
 .../performance/results/NoResultsStore.groovy      |   45 +
 .../performance/results/PerformanceDatabase.java   |   81 +
 .../results/PerformanceTestExecution.java          |   78 +
 .../results/PerformanceTestHistory.java            |   54 +
 .../performance/results/PerformanceTestResult.java |  130 +
 .../performance/results/PrettyCalculator.groovy    |   42 +
 .../performance/results/ReportGenerator.java       |   77 +
 .../gradle/performance/results/ResultsStore.java   |   37 +
 .../performance/results/ResultsStoreHelper.java    |   57 +
 .../performance/results/ScenarioDefinition.java    |   55 +
 .../performance/results/TestDataGenerator.java     |  140 +
 .../performance/results/TestPageGenerator.java     |  313 ++
 .../gradle/performance/results/VersionResults.java |   21 +
 .../org/gradle/reporting/performanceGraph.js       |  117 +
 .../main}/resources/org/gradle/reporting/report.js |    0
 .../main/resources/org/gradle/reporting/style.css  |  162 +
 .../performance/plugin/BuildEventTimeStamps.java   |   97 +
 .../plugin/DiagnosticCommandMBeanHelper.java       |   44 +
 .../performance/plugin/ExternalResources.java      |   33 +
 .../org/gradle/performance/plugin/HeapDumper.java  |   77 +
 .../gradle/performance/plugin/HeapMeasurement.java |   74 +
 .../plugin/JavaFlightRecorderControl.java          |   50 +
 .../performance/plugin/MeasurementPlugin.java      |   81 +
 .../plugin/PerformanceCounterDumper.java           |   70 +
 .../plugin/PerformanceCounterMeasurement.java      |   65 +
 .../gradle/performance/plugin/ReflectionUtil.java  |  151 +
 .../src/templates/init.gradle                      |    0
 .../src/templates/measurement-plugin/build.gradle  |   17 +
 .../src/templates/root-project/build.gradle        |   29 +
 .../src/templates/root-project/build.xml           |    0
 .../src/templates/root-project/checkstyle.xml      |    0
 .../src/templates/root-project/pom.xml             |   59 +
 .../src/templates/settings.gradle                  |    0
 .../gradle/performance/ResultSpecification.groovy  |   94 +
 .../BuildEventTimestampCollectorTest.groovy        |    0
 ...CrossVersionPerformanceTestExecutionTest.groovy |  260 +
 .../CrossVersionPerformanceTestRunnerTest.groovy   |  428 ++
 .../performance/fixture/GCEventParserTest.groovy   |   75 +
 .../fixture/GCLoggingCollectorTest.groovy          |    0
 .../fixture/PerformanceCounterCollectorTest.groovy |   49 +
 .../fixture/PrettyCalculatorSpec.groovy            |   44 +
 .../performance/fixture/WaitingReaderTest.groovy   |    0
 .../performance/fixture/YourKitProfilerTest.groovy |    0
 .../gradle/performance/measure/AmountTest.groovy   |  244 +
 .../performance/measure/DataSeriesTest.groovy      |   60 +
 .../gradle/performance/measure/DurationTest.groovy |    0
 .../gradle/performance/measure/UnitsTest.groovy    |    0
 .../results/CompositeResultsStoreTest.groovy       |   46 +
 .../results/CrossBuildResultsStoreTest.groovy      |  443 ++
 .../results/CrossVersionResultsStoreTest.groovy    |  339 ++
 .../performance/results/ReportGeneratorTest.groovy |   48 +
 .../results/TestPageGeneratorTest.groovy           |   47 +
 .../org/gradle/performance/fixture/gc-1.txt        |    0
 .../org/gradle/performance/fixture/gc-2.txt        |    0
 .../org/gradle/performance/fixture/gc-3.txt        |    0
 .../org/gradle/performance/fixture/gc-4.txt        |    0
 .../gradle/performance/fixture/mac-jdk8.0.25.txt   |    0
 .../performance/fixture/perf_counters_finish.txt   |  257 +
 .../performance/fixture/perf_counters_start.txt    |  257 +
 .../org/gradle/performance/fixture/win-1.txt       |    0
 .../fixtures/DefaultTestExecutionResult.groovy     |   13 +-
 .../fixtures/HtmlTestExecutionResult.groovy        |    2 +-
 .../fixtures/JUnitXmlTestExecutionResult.groovy    |    4 +-
 .../gradle/integtests/fixtures/UrlValidator.groovy |   18 +-
 .../gradle/test/fixtures/SerializationFixture.java |   49 +
 .../fixtures/archive/ArchiveTestFixture.groovy     |    2 +-
 .../test/fixtures/archive/JarTestFixture.groovy    |   29 +-
 .../test/fixtures/archive/TarTestFixture.groovy    |   10 +-
 .../test/fixtures/archive/ZipTestFixture.groovy    |   22 +-
 .../file/AbstractTestDirectoryProvider.java        |   67 +-
 .../org/gradle/test/fixtures/file/ClassFile.groovy |   68 +-
 .../org/gradle/test/fixtures/file/TestFile.java    |   82 +-
 .../test/fixtures/file/TestFileHelper.groovy       |   22 +
 .../file/TestNameTestDirectoryProvider.java        |    5 -
 .../internal/NativeServicesTestFixture.java        |    6 +-
 .../testing/internal/util/GradlewRunner.java       |    6 +-
 .../gradle/testing/internal/util/RetryFailure.java |   28 +
 .../gradle/testing/internal/util/RetryRule.groovy  |   78 +
 .../org/gradle/util/JUnit4GroovyMockery.java       |    4 +-
 .../org/gradle/util/RedirectStdOutAndErr.java      |   24 +-
 .../groovy/org/gradle/util/TestClassLoader.groovy  |    1 -
 .../groovy/org/gradle/util/TestPrecondition.groovy |   39 +-
 .../gradle/util/TestPreconditionExtension.groovy   |    2 +-
 .../gradle/util/UsesNativeServicesExtension.groovy |    2 +
 .../testing/internal/util/ExpectedFailure.java     |   29 +
 .../testing/internal/util/ExpectedFailureRule.java |   52 +
 .../testing/internal/util/RetryRuleTest.groovy     |  121 +
 subprojects/ivy/ivy.gradle                         |    6 +-
 .../IvyPublishCrossVersionIntegrationTest.groovy   |    4 +-
 .../api/publish/ivy/IvyPublishEarIntegTest.groovy  |    2 +-
 .../api/publish/ivy/IvyPublishHttpIntegTest.groovy |   13 +-
 .../publish/ivy/IvyPublishHttpsIntegTest.groovy    |   12 +-
 .../api/publish/ivy/IvyPublishJavaIntegTest.groovy |   73 +-
 .../ivy/IvyPublishMultiProjectIntegTest.groovy     |   58 +
 .../api/publish/ivy/IvyPublishWarIntegTest.groovy  |    2 +-
 .../ivy/SamplesIvyPublishIntegrationTest.groovy    |    2 +-
 .../ivy/IvyEarProjectPublishIntegrationTest.groovy |    2 +-
 .../ivy/IvyHttpPublishIntegrationTest.groovy       |   14 +-
 .../IvyJavaProjectPublishIntegrationTest.groovy    |    8 +-
 .../ivy/IvyWarProjectPublishIntegrationTest.groovy |    2 +-
 .../org/gradle/api/publish/ivy/IvyDependency.java  |    7 +
 .../org/gradle/api/publish/ivy/IvyPublication.java |    8 +-
 .../internal/artifact/DefaultIvyArtifactSet.java   |   21 +-
 .../internal/dependency/DefaultIvyDependency.java  |   28 +-
 .../internal/dependency/IvyDependencyInternal.java |    3 +
 .../DefaultIvyModuleDescriptorSpec.java            |    2 +-
 .../publication/DefaultIvyPublication.java         |   17 +-
 .../publisher/DependencyResolverIvyPublisher.java  |   43 +-
 .../publisher/IvyDescriptorFileGenerator.java      |   32 +-
 .../internal/publisher/ValidatingIvyPublisher.java |   11 +-
 .../org/gradle/api/publish/ivy/package-info.java   |    4 +-
 .../api/publish/ivy/plugins/IvyPublishPlugin.java  |   26 +-
 .../api/publish/ivy/plugins/package-info.java      |    4 +-
 .../publish/ivy/tasks/GenerateIvyDescriptor.java   |    6 +-
 .../publish/ivy/tasks/PublishToIvyRepository.java  |    8 +-
 .../gradle/api/publish/ivy/tasks/package-info.java |    4 +-
 .../src/main/java/org/gradle/ivy/package-info.java |    4 +-
 .../IvyArtifactNotationParserFactoryTest.groovy    |   11 +-
 .../publication/DefaultIvyPublicationTest.groovy   |   25 +-
 .../IvyDescriptorFileGeneratorTest.groovy          |   53 +-
 .../publisher/ValidatingIvyPublisherTest.groovy    |   33 +-
 .../ivy/plugins/IvyPublishPluginTest.groovy        |   16 +-
 .../ivy/tasks/PublishToIvyRepositoryTest.groovy    |   11 +-
 ...actIvyRemoteLegacyPublishIntegrationTest.groovy |   33 +-
 subprojects/jacoco/jacoco.gradle                   |    2 +-
 .../plugins/JacocoPluginIntegrationTest.groovy     |   61 +-
 .../jacoco/plugins/JacocoVersionIntegTest.groovy   |    2 +-
 .../gradle/internal/jacoco/JacocoAgentJar.groovy   |   57 -
 .../testing/jacoco/plugins/JacocoPlugin.groovy     |  177 -
 .../jacoco/plugins/JacocoPluginExtension.groovy    |   88 -
 .../jacoco/plugins/JacocoTaskExtension.groovy      |  189 -
 .../gradle/testing/jacoco/tasks/JacocoBase.groovy  |   33 -
 .../gradle/testing/jacoco/tasks/JacocoMerge.groovy |  102 -
 .../testing/jacoco/tasks/JacocoReport.groovy       |  271 --
 .../jacoco/tasks/JacocoReportsContainer.java       |   47 -
 .../gradle/testing/jacoco/tasks/package-info.java  |   20 -
 .../org/gradle/internal/jacoco/AntJacocoMerge.java |   56 +
 .../gradle/internal/jacoco/AntJacocoReport.java    |   98 +
 .../org/gradle/internal/jacoco/JacocoAgentJar.java |  111 +
 .../jacoco/JacocoReportsContainerImpl.java         |    0
 .../testing/jacoco/plugins/JacocoPlugin.java       |  250 +
 .../jacoco/plugins/JacocoPluginExtension.java      |  141 +
 .../jacoco/plugins/JacocoTaskExtension.java        |  323 ++
 .../testing/jacoco/plugins/package-info.java       |   21 +
 .../gradle/testing/jacoco/tasks/JacocoBase.java    |   42 +
 .../gradle/testing/jacoco/tasks/JacocoMerge.java   |  119 +
 .../gradle/testing/jacoco/tasks/JacocoReport.java  |  346 ++
 .../jacoco/tasks/JacocoReportsContainer.java       |   54 +
 .../gradle/testing/jacoco/tasks/package-info.java  |   21 +
 .../internal/jacoco/JacocoAgentJarTest.groovy      |   63 +
 .../testing/jacoco/plugins/JacocoPluginSpec.groovy |   77 +-
 .../jacoco/plugins/JacocoReportFixture.groovy      |    5 +-
 .../jacoco/plugins/JacocoTaskExtensionSpec.groovy  |   25 +-
 .../javascript/base/JavaScriptBasePlugin.groovy    |   31 -
 .../coffeescript/CoffeeScriptBasePlugin.groovy     |   69 -
 .../coffeescript/CoffeeScriptCompile.java          |  103 -
 .../coffeescript/CoffeeScriptCompileOptions.java   |   32 -
 .../CoffeeScriptCompileDestinationCalculator.java  |   52 -
 .../internal/CoffeeScriptCompileResult.java        |   32 -
 .../internal/rhino/CoffeeScriptCompilerWorker.java |   71 -
 .../internal/rhino/RhinoCoffeeScriptCompiler.java  |   68 -
 .../plugins/javascript/envjs/EnvJsPlugin.groovy    |   97 -
 .../javascript/envjs/browser/BrowserEvaluate.java  |   98 -
 .../envjs/http/simple/SimpleHttpFileServer.java    |   51 -
 .../simple/internal/SimpleFileServerContainer.java |   75 -
 .../envjs/internal/EnvJsBrowserEvaluator.java      |   72 -
 .../envjs/internal/EnvJsEvaluateWorker.java        |   58 -
 .../gradle/plugins/javascript/jshint/JsHint.java   |  165 -
 .../plugins/javascript/jshint/JsHintPlugin.groovy  |   72 -
 .../javascript/jshint/internal/JsHintWorker.java   |   69 -
 .../plugins/javascript/rhino/RhinoPlugin.groovy    |   70 -
 .../plugins/javascript/rhino/RhinoShellExec.java   |  112 -
 .../javascript/rhino/worker/RhinoWorker.java       |   29 -
 .../javascript/rhino/worker/RhinoWorkerHandle.java |   25 -
 .../rhino/worker/RhinoWorkerHandleFactory.java     |   31 -
 .../javascript/rhino/worker/RhinoWorkerSpec.java   |   45 -
 .../javascript/rhino/worker/RhinoWorkerUtils.java  |  142 -
 .../worker/internal/DefaultRhinoWorkerHandle.java  |  100 -
 .../internal/DefaultRhinoWorkerHandleFactory.java  |   57 -
 .../worker/internal/RhinoClientWorkerProtocol.java |   25 -
 .../rhino/worker/internal/RhinoServer.java         |   61 -
 .../worker/internal/RhinoWorkerClientProtocol.java |   29 -
 .../rhino/worker/internal/RhinoWorkerReceiver.java |   68 -
 .../javascript/base/JavaScriptBasePlugin.java      |   33 +
 .../javascript/base/JavaScriptExtension.java       |    0
 .../base/JavaScriptRepositoriesExtension.java      |    0
 .../base/SourceTransformationException.java        |    0
 .../coffeescript/CoffeeScriptBasePlugin.java       |   93 +
 .../coffeescript/CoffeeScriptCompile.java          |  105 +
 .../coffeescript/CoffeeScriptCompileOptions.java   |   36 +
 .../coffeescript/CoffeeScriptCompileSpec.java      |    0
 .../coffeescript/CoffeeScriptCompiler.java         |    0
 .../coffeescript/CoffeeScriptExtension.java        |    0
 .../CoffeeScriptCompileDestinationCalculator.java  |   52 +
 .../internal/DefaultCoffeeScriptCompileSpec.java   |    0
 .../SerializableCoffeeScriptCompileSpec.java       |    0
 .../rhino/CoffeeScriptCompilerProtocol.java        |   23 +
 .../internal/rhino/CoffeeScriptCompilerWorker.java |   62 +
 .../internal/rhino/RhinoCoffeeScriptCompiler.java  |   53 +
 .../plugins/javascript/envjs/EnvJsExtension.java   |    0
 .../plugins/javascript/envjs/EnvJsPlugin.java      |  107 +
 .../javascript/envjs/browser/BrowserEvaluate.java  |   99 +
 .../javascript/envjs/browser/BrowserEvaluator.java |    0
 .../javascript/envjs/http/HttpFileServer.java      |    0
 .../envjs/http/HttpFileServerFactory.java          |    0
 .../envjs/http/simple/SimpleHttpFileServer.java    |   51 +
 .../http/simple/SimpleHttpFileServerFactory.java   |    0
 .../simple/internal/SimpleFileServerContainer.java |   82 +
 .../envjs/internal/EnvJsBrowserEvaluator.java      |   58 +
 .../envjs/internal/EnvJsEvaluateSpec.java          |    0
 .../envjs/internal/EnvJsEvaluateWorker.java        |   47 +
 .../envjs/internal/EnvJvEvaluateProtocol.java      |   21 +
 .../gradle/plugins/javascript/jshint/JsHint.java   |  158 +
 .../plugins/javascript/jshint/JsHintExtension.java |    0
 .../plugins/javascript/jshint/JsHintPlugin.java    |   97 +
 .../javascript/jshint/internal/JsHintProtocol.java |   21 +
 .../javascript/jshint/internal/JsHintResult.java   |    0
 .../javascript/jshint/internal/JsHintSpec.java     |    0
 .../javascript/jshint/internal/JsHintWorker.java   |   63 +
 .../plugins/javascript/rhino/RhinoExtension.java   |    0
 .../plugins/javascript/rhino/RhinoPlugin.java      |   90 +
 .../plugins/javascript/rhino/RhinoShellExec.java   |  114 +
 .../javascript/rhino/worker/RhinoWorker.java       |   27 +
 .../rhino/worker/RhinoWorkerHandleFactory.java     |   29 +
 .../javascript/rhino/worker/RhinoWorkerUtils.java  |  146 +
 .../internal/DefaultRhinoWorkerHandleFactory.java  |   48 +
 .../simple/SimpleHttpFileServerFactoryTest.groovy  |   19 +
 subprojects/jetty/jetty.gradle                     |    6 +-
 .../api/plugins/jetty/JettyIntegrationSpec.groovy  |  150 +
 .../api/plugins/jetty/AbstractJettyRunTask.java    |   67 +-
 .../org/gradle/api/plugins/jetty/JettyPlugin.java  |    5 +
 .../api/plugins/jetty/JettyPluginConvention.java   |    3 +
 .../org/gradle/api/plugins/jetty/JettyRun.java     |   72 +-
 .../org/gradle/api/plugins/jetty/JettyRunWar.java  |   21 +-
 .../org/gradle/api/plugins/jetty/JettyStop.java    |   16 +-
 .../api/plugins/jetty/ScanTargetPattern.java       |    3 +
 .../api/plugins/jetty/internal/ConsoleScanner.java |   16 +-
 .../plugins/jetty/internal/Jetty6PluginServer.java |    9 +-
 .../plugins/jetty/internal/JettyConfiguration.java |   21 +-
 .../api/plugins/jetty/JettyPluginTest.groovy       |   15 +-
 subprojects/jvm-services/jvm-services.gradle       |   14 +
 .../jvm/inspection/CachingJvmVersionDetector.java  |   61 +
 .../jvm/inspection/DefaultJvmVersionDetector.java  |   77 +
 .../jvm/inspection/JvmVersionDetector.java         |   35 +
 .../CachingJvmVersionDetectorTest.groovy           |   42 +
 .../DefaultJvmVersionDetectorTest.groovy           |   82 +
 subprojects/language-groovy/language-groovy.gradle |    7 +-
 .../gradle/groovy/GroovyDocIntegrationTest.groovy  |   95 +-
 .../groovy/GroovyDocStampsIntegrationTest.groovy   |   61 +
 .../GroovyCompileRelocationIntegrationTest.groovy  |   65 +
 .../gradle/api/internal/tasks/AntGroovydoc.java    |  172 +
 .../internal/tasks/compile/ApiGroovyCompiler.java  |   28 +-
 .../compile/DefaultGroovyJavaJointCompileSpec.java |    3 +
 .../GroovyCompileTransformingClassLoader.java      |    5 +-
 .../tasks/compile/GroovyCompilerFactory.java       |    1 +
 .../tasks/compile/NormalizingGroovyCompiler.java   |   14 +-
 .../gradle/api/tasks/compile/GroovyCompile.java    |   28 +-
 .../api/tasks/compile/GroovyCompileOptions.java    |   15 +-
 .../org/gradle/api/tasks/javadoc/AntGroovydoc.java |  114 -
 .../org/gradle/api/tasks/javadoc/Groovydoc.java    |  111 +-
 .../gradle/api/tasks/javadoc/GroovydocTest.groovy  |   99 +
 .../gradle/api/tasks/javadoc/GroovydocTest.java    |   93 -
 .../testing/fixture/GroovydocCoverage.groovy       |   23 +
 subprojects/language-java/language-java.gradle     |    6 +
 ...CompileDefaultJavaVersionIntegrationTest.groovy |   63 +
 .../compile/JavaCompileIntegrationTest.groovy      |  187 +
 .../JavaCompileParallelIntegrationTest.groovy      |   19 +-
 .../JavaCompileRelocationIntegrationTest.groovy    |   65 +
 ...ncrementalJavaCompilationIntegrationTest.groovy |    2 +-
 ...ncrementalJavaCompilationIntegrationTest.groovy |   74 +-
 ...ustomComponentJarBinariesIntegrationTest.groovy |    8 +-
 ...aCompilationAgainstApiJarIntegrationTest.groovy |  220 +-
 ...lationAgainstDependenciesIntegrationTest.groovy |    3 +
 .../java/JavaJvmAssemblyIntegrationTest.groovy     |  164 +
 ...braryDependencyResolutionIntegrationTest.groovy |   45 +-
 ...guageDependencyResolutionIntegrationTest.groovy |   33 +-
 ...ernalDependencyResolutionIntegrationTest.groovy |    2 +
 .../java/JavaLanguageIntegrationTest.groovy        |    3 -
 .../java/JavaSourceSetIntegrationTest.groovy       |    3 -
 .../language/java/JvmApiSpecIntegrationTest.groovy |   47 +
 .../MultipleBinaryTypesWithVariantsTest.groovy     |   24 +-
 .../java/SingleBinaryTypeWithVariantsTest.groovy   |    6 -
 .../VariantAwareDependencyResolutionSpec.groovy    |   24 +-
 .../build.gradle                                   |    6 +-
 .../handlesTagsAndTaglets/build.gradle             |    6 +-
 .../api/internal/tasks/DefaultJavaToolChain.java   |   14 +-
 .../tasks/compile/AntDependsStaleClassCleaner.java |    1 +
 .../tasks/compile/CleaningJavaCompiler.java        |    1 +
 .../tasks/compile/CleaningJavaCompilerSupport.java |    1 +
 .../tasks/compile/CommandLineJavaCompiler.java     |    4 +-
 .../CommandLineJavaCompilerArgumentsGenerator.java |   26 +-
 .../tasks/compile/DefaultJavaCompileSpec.java      |    3 +
 .../compile/DefaultJavaCompileSpecFactory.java     |    3 +
 .../tasks/compile/DefaultJavaCompilerFactory.java  |    2 +
 .../internal/tasks/compile/JavaCompileSpec.java    |    1 +
 .../compile/JavaCompilerArgumentsBuilder.java      |   44 +-
 .../compile/JavaHomeBasedJavaCompilerFactory.java  |    5 +-
 .../internal/tasks/compile/JdkJavaCompiler.java    |    1 +
 .../api/internal/tasks/compile/JdkTools.java       |  112 +
 .../tasks/compile/NormalizingJavaCompiler.java     |    5 +-
 .../compile/incremental/ClassChangeProcessor.java  |   57 +
 .../IncrementalCompilationFinalizer.java           |    3 +-
 .../IncrementalCompilationInitializer.java         |    6 +-
 .../incremental/IncrementalCompilerDecorator.java  |    4 +-
 .../incremental/IncrementalCompilerFactory.java    |   11 +-
 .../incremental/RecompilationNotNecessary.java     |    1 +
 .../incremental/RecompilationSpecProvider.java     |   19 +-
 .../compile/incremental/SelectiveCompiler.java     |    1 +
 .../analyzer/CachingClassDependenciesAnalyzer.java |    5 +-
 .../incremental/analyzer/ClassAnalysisCache.java   |    5 +-
 .../analyzer/ClassAnalysisSerializer.java          |    2 +
 .../incremental/analyzer/ClassFilesAnalyzer.java   |    8 +-
 .../analyzer/DefaultClassAnalysisCache.java        |   11 +-
 .../analyzer/DefaultClassDependenciesAnalyzer.java |    5 +-
 .../cache/DefaultGeneralCompileCaches.java         |    4 +-
 .../incremental/deps/ClassSetAnalysisData.java     |    4 +
 .../incremental/deps/DefaultDependentsSet.java     |    3 +
 .../compile/incremental/deps/DependencyToAll.java  |    5 +-
 .../deps/LocalClassSetAnalysisStore.java           |    4 +-
 .../incremental/jar/CachingJarSnapshotter.java     |   18 +-
 .../incremental/jar/ClasspathJarFinder.java        |    6 +-
 .../incremental/jar/DefaultJarSnapshotCache.java   |   18 +-
 .../incremental/jar/DefaultJarSnapshotter.java     |   13 +-
 .../tasks/compile/incremental/jar/JarArchive.java  |    6 +-
 .../incremental/jar/JarChangeProcessor.java        |    2 +-
 .../incremental/jar/JarClasspathSnapshotData.java  |   10 +-
 .../jar/JarClasspathSnapshotDataSerializer.java    |   18 +-
 .../jar/JarClasspathSnapshotFactory.java           |   14 +-
 .../incremental/jar/JarClasspathSnapshotMaker.java |    4 +-
 .../tasks/compile/incremental/jar/JarSnapshot.java |   24 +-
 .../compile/incremental/jar/JarSnapshotCache.java  |    7 +-
 .../compile/incremental/jar/JarSnapshotData.java   |    9 +-
 .../incremental/jar/JarSnapshotDataSerializer.java |   19 +-
 .../gradle/api/tasks/compile/CompileOptions.java   |   17 +
 .../gradle/api/tasks/compile/DependOptions.java    |   11 +-
 .../org/gradle/api/tasks/compile/ForkOptions.java  |    4 +-
 .../org/gradle/api/tasks/compile/JavaCompile.java  |   47 +-
 .../java/org/gradle/api/tasks/javadoc/Javadoc.java |   41 +-
 .../tasks/javadoc/internal/JavadocGenerator.java   |    3 +-
 .../external/javadoc/CoreJavadocOptions.java       |   55 +
 .../external/javadoc/MinimalJavadocOptions.java    |   16 +-
 .../javadoc/StandardJavadocDocletOptions.java      |    9 +
 .../internal/AbstractJavadocOptionFileOption.java  |    3 +
 .../AbstractListJavadocOptionFileOption.java       |    3 +
 .../internal/BooleanJavadocOptionFileOption.java   |    1 +
 .../internal/EnumJavadocOptionFileOption.java      |    5 +-
 .../internal/FileJavadocOptionFileOption.java      |    1 +
 .../internal/GroupsJavadocOptionFileOption.java    |    1 +
 .../LinksOfflineJavadocOptionFileOption.java       |    1 +
 .../MultilineStringsJavadocOptionFileOption.java   |    1 +
 .../OptionLessStringsJavadocOptionFileOption.java  |    3 +
 .../internal/PathJavadocOptionFileOption.java      |    1 +
 .../internal/StringJavadocOptionFileOption.java    |    1 +
 .../internal/StringsJavadocOptionFileOption.java   |    1 +
 .../org/gradle/language/java/JavaSourceSet.java    |    3 +-
 .../internal/DefaultJavaLanguageSourceSet.java     |    4 -
 .../JavaLanguagePluginServiceRegistry.java         |    5 +
 .../internal/JavaToolChainServiceRegistry.java     |    9 +-
 .../org/gradle/language/java/package-info.java     |    4 +-
 .../language/java/plugins/JavaLanguagePlugin.java  |  170 +-
 .../gradle/language/java/plugins/package-info.java |    4 +-
 .../language/java/tasks/PlatformJavaCompile.java   |    1 +
 .../gradle/language/java/tasks/package-info.java   |    4 +-
 .../internal/tasks/DefaultJavaToolChainTest.groovy |    5 +
 .../JavaCompilerArgumentsBuilderTest.groovy        |   18 +-
 .../api/internal/tasks/compile/JdkToolsTest.groovy |   63 +
 .../incremental/ClassChangeProcessorTest.groovy    |  102 +
 .../jar/DefaultJarSnapshotterTest.groovy           |    7 +-
 .../jar/JarClasspathSnapshotFactoryTest.groovy     |   14 +-
 .../jar/JarClasspathSnapshotMakerTest.groovy       |    7 +-
 .../compile/incremental/jar/JarSnapshotTest.groovy |   35 +-
 .../api/tasks/compile/JavaCompileTest.groovy       |    2 +-
 .../gradle/api/tasks/javadoc/JavadocTest.groovy    |    2 +-
 .../javadoc/StandardJavadocDocletOptionsTest.java  |   96 +-
 .../BooleanJavadocOptionFileOptionTest.java        |    2 +-
 .../internal/EnumJavadocOptionFileOptionTest.java  |    2 +-
 .../internal/FileJavadocOptionFileOptionTest.java  |    4 +-
 .../GroupsJavadocOptionFileOptionTest.java         |   10 +-
 .../javadoc/internal/JavadocOptionFileTest.java    |    2 +-
 .../LinksOfflineJavadocOptionFileOptionTest.java   |    2 +-
 ...ultilineStringsJavadocOptionFileOptionTest.java |    6 +-
 ...tionLessStringsJavadocOptionFileOptionTest.java |    8 +-
 .../internal/PathJavadocOptionFileOptionTest.java  |    2 +-
 .../StringJavadocOptionFileOptionTest.java         |    2 +-
 .../StringsJavadocOptionFileOptionTest.java        |    2 +-
 subprojects/language-jvm/language-jvm.gradle       |    3 +
 .../tasks/compile/CompileSpecToArguments.java      |    4 +-
 .../compile/DefaultJvmLanguageCompileSpec.java     |   14 +
 .../tasks/compile/ExecSpecBackedArgCollector.java  |    4 +-
 .../tasks/compile/NoOpStaleClassCleaner.java       |   26 -
 .../compile/daemon/AbstractDaemonCompiler.java     |    1 +
 .../tasks/compile/daemon/CompileResult.java        |    1 +
 .../tasks/compile/daemon/CompilerDaemonClient.java |   36 +-
 .../daemon/CompilerDaemonClientProtocol.java       |   23 -
 .../compile/daemon/CompilerDaemonManager.java      |    4 +-
 .../compile/daemon/CompilerDaemonProtocol.java     |   24 +
 .../tasks/compile/daemon/CompilerDaemonServer.java |   40 +-
 .../daemon/CompilerDaemonServerProtocol.java       |   27 -
 .../compile/daemon/CompilerDaemonStarter.java      |   22 +-
 .../tasks/compile/daemon/CompilerDaemonWorker.java |   22 +
 .../daemon/InProcessCompilerDaemonFactory.java     |   25 +-
 .../gradle/api/tasks/compile/AbstractCompile.java  |    7 +-
 .../gradle/api/tasks/compile/AbstractOptions.java  |   19 +-
 .../gradle/api/tasks/compile/BaseForkOptions.java  |    2 +
 .../DefaultJvmResourceLanguageSourceSet.java       |    2 +-
 .../language/jvm/internal/EmptyClasspath.java      |    2 +
 .../jvm/internal/JvmPluginServiceRegistry.java     |    5 +
 .../java/org/gradle/language/jvm/package-info.java |    4 +-
 .../language/jvm/plugins/JvmResourcesPlugin.java   |   37 +-
 .../gradle/language/jvm/plugins/package-info.java  |    4 +-
 .../language/jvm/tasks/ProcessResources.java       |    4 +-
 .../gradle/language/jvm/tasks/package-info.java    |    4 +-
 .../api/tasks/compile/AbstractOptionsTest.groovy   |    6 +-
 .../AbstractJvmLanguageIntegrationTest.groovy      |    2 +-
 ...AbstractJvmPluginLanguageIntegrationTest.groovy |    2 +-
 subprojects/language-native/language-native.gradle |    1 +
 ...eLanguageIncrementalBuildIntegrationTest.groovy |   67 +-
 ...anguageIncrementalCompileIntegrationTest.groovy |   85 +-
 .../AbstractNativeLanguageIntegrationTest.groovy   |    5 +-
 ...ctNativePreCompiledHeaderIntegrationTest.groovy |    2 +-
 .../DuplicateBaseNamesIntegrationTest.groovy       |   15 +-
 ...yLanguageIncrementalBuildIntegrationTest.groovy |    5 +-
 .../AssemblyLanguageIntegrationTest.groovy         |    2 -
 ...CLanguageIncrementalBuildIntegrationTest.groovy |    3 +-
 .../language/c/CLanguageIntegrationTest.groovy     |    3 +-
 ...CPreCompiledHeaderSourcesIntegrationTest.groovy |    4 +-
 .../c/CppCallingCLanguageIntegrationTest.groovy    |    2 -
 .../language/c/MixedLanguageIntegrationTest.groovy |    2 -
 ...pLanguageIncrementalBuildIntegrationTest.groovy |    2 -
 ...anguageIncrementalCompileIntegrationTest.groovy |    2 -
 .../language/cpp/CppLanguageIntegrationTest.groovy |    2 -
 ...pPreCompiledHeaderSourcesIntegrationTest.groovy |    4 +-
 .../NativeLanguageSamplesIntegrationTest.groovy    |    7 +-
 .../ParallelNativePluginsIntegrationTest.groovy    |   10 +-
 .../ObjectiveCUnsupportedIntegrationTest.groovy    |    5 +-
 .../ObjectiveCppUnsupportedIntegrationTest.groovy  |    6 +-
 ...ResourcesIncrementalBuildIntegrationTest.groovy |    8 +-
 .../rc/WindowsResourcesIntegrationTest.groovy      |    8 +-
 ...ndowsResourcesUnsupportedIntegrationTest.groovy |    2 +-
 .../language/assembler/AssemblerSourceSet.java     |    3 +-
 .../internal/DefaultAssemblerSourceSet.java        |   27 -
 .../assembler/plugins/AssemblerLangPlugin.java     |   23 +-
 .../assembler/plugins/AssemblerPlugin.java         |    1 +
 .../plugins/internal/AssembleTaskConfig.java       |    5 +-
 .../language/assembler/plugins/package-info.java   |    1 +
 .../gradle/language/assembler/tasks/Assemble.java  |   12 +-
 .../language/c/internal/DefaultCSourceSet.java     |    4 -
 .../org/gradle/language/c/plugins/CLangPlugin.java |   23 +-
 .../org/gradle/language/c/plugins/CPlugin.java     |    1 +
 .../gradle/language/c/plugins/package-info.java    |    1 +
 .../language/cpp/internal/DefaultCppSourceSet.java |    4 +-
 .../gradle/language/cpp/plugins/CppLangPlugin.java |   23 +-
 .../org/gradle/language/cpp/plugins/CppPlugin.java |    1 +
 .../gradle/language/cpp/plugins/package-info.java  |    1 +
 .../AbstractHeaderExportingDependentSourceSet.java |    4 +-
 .../internal/AbstractHeaderExportingSourceSet.java |   13 +-
 .../internal/AbstractNativeCompileSpec.java        |   45 +-
 .../nativeplatform/internal/CompileTaskConfig.java |   16 +-
 .../internal/NativeLanguageTransform.java          |    4 +-
 .../internal/PCHCompileTaskConfig.java             |   10 +-
 .../internal/SourceCompileTaskConfig.java          |    3 +-
 .../incremental/BuildableCompilationState.java     |   46 +
 .../internal/incremental/CompilationFileState.java |   40 +-
 .../internal/incremental/CompilationState.java     |   34 +-
 .../incremental/CompilationStateSerializer.java    |   85 +-
 .../DefaultCompilationStateCacheFactory.java       |    8 +-
 .../incremental/DefaultIncrementalCompilation.java |   15 +-
 .../incremental/DefaultSourceIncludesParser.java   |   13 +-
 .../incremental/DefaultSourceIncludesResolver.java |   59 +-
 .../incremental/IncrementalCompilation.java        |    6 +
 .../incremental/IncrementalCompileProcessor.java   |   63 +-
 .../incremental/IncrementalCompilerBuilder.java    |   10 +-
 .../incremental/IncrementalNativeCompiler.java     |   92 +-
 .../internal/incremental/ResolvedInclude.java      |   29 +-
 .../internal/incremental/SourceIncludesParser.java |    4 +-
 .../incremental/SourceIncludesResolver.java        |   15 +-
 .../incremental/sourceparser/CSourceParser.java    |    4 +-
 .../sourceparser/DefaultIncludeDirectives.java     |  101 +
 .../sourceparser/DefaultSourceIncludes.java        |   97 -
 .../sourceparser/PreprocessingReader.java          |    1 +
 .../sourceparser/RegexBackedCSourceParser.java     |   14 +-
 .../internal/registry/NativeLanguageServices.java  |    5 +
 .../tasks/AbstractNativeCompileTask.java           |   13 +-
 .../tasks/AbstractNativePCHCompileTask.java        |    5 +-
 .../tasks/AbstractNativeSourceCompileTask.java     |    2 +-
 .../nativeplatform/tasks/package-info.java         |    1 +
 .../internal/DefaultObjectiveCSourceSet.java       |    4 +-
 .../objectivec/plugins/ObjectiveCLangPlugin.java   |   23 +-
 .../objectivec/plugins/ObjectiveCPlugin.java       |    1 +
 .../language/objectivec/plugins/package-info.java  |    1 +
 .../internal/DefaultObjectiveCppSourceSet.java     |    4 +-
 .../plugins/ObjectiveCppLangPlugin.java            |   23 +-
 .../objectivecpp/plugins/ObjectiveCppPlugin.java   |    1 +
 .../objectivecpp/plugins/package-info.java         |    1 +
 .../rc/internal/DefaultWindowsResourceSet.java     |    2 +-
 .../rc/plugins/WindowsResourceScriptPlugin.java    |   20 +-
 .../rc/plugins/WindowsResourcesPlugin.java         |    1 +
 .../WindowsResourcesCompileTaskConfig.java         |   13 +-
 .../gradle/language/rc/plugins/package-info.java   |    1 +
 .../language/rc/tasks/WindowsResourceCompile.java  |   14 +-
 .../AbstractNativeComponentPluginTest.groovy       |   47 +-
 .../assembler/plugins/AssemblerPluginTest.groovy   |   31 +-
 .../language/assembler/tasks/AssemblerTest.groovy  |   13 +-
 .../gradle/language/c/plugins/CPluginTest.groovy   |    5 +-
 .../gradle/language/c/tasks/CCompileTest.groovy    |   22 +-
 .../c/tasks/CPreCompiledHeaderCompileTest.groovy   |    8 +-
 .../cpp/internal/DefaultCppSourceSetTest.groovy    |   12 +-
 .../language/cpp/plugins/CppPluginTest.groovy      |    6 +-
 .../language/cpp/tasks/CppCompileTest.groovy       |   17 +-
 .../tasks/CppPreCompiledHeaderCompileTest.groovy   |   10 +-
 .../CompilationStateSerializerTest.groovy          |   63 +-
 .../DefaultSourceIncludesParserTest.groovy         |    4 +-
 .../DefaultSourceIncludesResolverTest.groovy       |   51 +-
 .../IncrementalCompileProcessorTest.groovy         |   42 +-
 .../IncrementalNativeCompilerTest.groovy           |   64 +-
 .../sourceparser/DefaultSourceIncludesTest.groovy  |    8 +-
 .../objectivec/tasks/ObjectiveCCompileTest.groovy  |   20 +-
 .../ObjectiveCPreCompiledHeaderCompileTest.groovy  |   10 +-
 .../tasks/ObjectiveCppCompileTest.groovy           |   18 +-
 ...ObjectiveCppPreCompiledHeaderCompileTest.groovy |   10 +-
 subprojects/language-scala/language-scala.gradle   |    3 +
 .../ScalaCompileParallelIntegrationTest.groovy     |  363 ++
 .../ScalaCompilerContinuousIntegrationTest.groovy  |    5 +
 .../scala/ScalaLanguageIntegrationTest.groovy      |   12 +-
 .../scala/DefaultScalaJavaJointCompileSpec.java    |    3 +
 .../tasks/scala/NormalizingScalaCompiler.java      |    1 +
 .../internal/tasks/scala/ZincScalaCompiler.java    |   90 +-
 .../api/tasks/scala/IncrementalCompileOptions.java |    3 +
 .../gradle/api/tasks/scala/ScalaForkOptions.java   |    4 +-
 .../org/gradle/language/scala/ScalaPlatform.java   |    3 +
 .../scala/internal/DefaultScalaJvmAssembly.java    |   38 +
 .../internal/DefaultScalaLanguageSourceSet.java    |    4 -
 .../scala/internal/DefaultScalaPlatform.java       |   12 +-
 .../language/scala/internal/ScalaJvmAssembly.java  |   24 +
 .../toolchain/DefaultScalaToolProvider.java        |   17 +-
 .../toolchain/DownloadingScalaToolChain.java       |   24 +-
 .../toolchain/NotFoundScalaToolProvider.java       |    2 +-
 .../toolchain/ScalaToolChainServiceRegistry.java   |   11 +-
 .../org/gradle/language/scala/package-info.java    |    3 +-
 .../scala/plugins/ScalaLanguagePlugin.java         |   92 +-
 .../language/scala/plugins/package-info.java       |    4 +-
 .../language/scala/tasks/AbstractScalaCompile.java |    9 +-
 .../scala/tasks/BaseScalaCompileOptions.java       |   26 +-
 .../language/scala/tasks/PlatformScalaCompile.java |    6 +-
 .../gradle/language/scala/tasks/package-info.java  |    4 +-
 .../language/scala/toolchain/ScalaToolChain.java   |    2 +
 .../language/scala/toolchain/package-info.java     |    4 +-
 .../toolchain/DefaultScalaToolProviderTest.groovy  |    6 +-
 .../toolchain/DownloadingScalaToolChainTest.groovy |    6 +-
 subprojects/launcher/launcher.gradle               |   11 +-
 .../BuildEnvironmentIntegrationTest.groovy         |   50 +-
 .../launcher/CommandLineIntegrationSpec.groovy     |   43 +-
 ...EnablingParallelExecutionIntegrationTest.groovy |   28 +-
 .../GradleConfigurabilityIntegrationSpec.groovy    |   24 +-
 .../launcher/GradleNativeIntegrationTest.groovy    |    4 +-
 .../SupportedBuildJvmIntegrationTest.groovy        |   52 +
 .../gradle/launcher/SystemClassLoaderTest.groovy   |   40 +-
 ...ionServiceReuseContinuousIntegrationTest.groovy |   20 +-
 .../CancellationContinuousIntegrationTest.groovy   |    2 +
 ...ngesDuringBuildContinuousIntegrationTest.groovy |  164 +-
 ...ntinuousBuildCancellationIntegrationTest.groovy |   35 +
 ...nuousBuildChangeReportingIntegrationTest.groovy |  247 +
 .../JdkVersionsContinuousIntegrationTest.groovy    |   80 -
 .../MultiProjectContinuousIntegrationTest.groovy   |   17 +-
 .../SimpleJavaContinuousIntegrationTest.groovy     |    7 +-
 .../SmokeContinuousIntegrationTest.groovy          |  111 +-
 .../jdk7/SymlinkContinuousIntegrationTest.groovy   |   31 +-
 .../DaemonAuthenticationIntegrationSpec.groovy     |   63 +
 .../daemon/DaemonFeedbackIntegrationSpec.groovy    |   17 +-
 .../DaemonInitScriptHandlingIntegrationTest.groovy |    2 +-
 ...itialCommunicationFailureIntegrationSpec.groovy |   60 +-
 .../launcher/daemon/DaemonLifecycleSpec.groovy     |  253 +-
 ...emonPerformanceMonitoringIntegrationTest.groovy |   69 -
 .../DaemonReportStatusIntegrationSpec.groovy       |   88 +
 .../daemon/DaemonReuseIntegrationTest.groovy       |  185 +
 .../DaemonStartupMessageIntegrationTest.groovy     |   13 +-
 .../DaemonSystemPropertiesIntegrationTest.groovy   |  200 +-
 .../DaemonUsageSuggestionIntegrationTest.groovy    |   72 -
 .../ProcessCrashHandlingIntegrationTest.groovy     |  246 +-
 .../daemon/SingleUseDaemonIntegrationTest.groovy   |   34 +-
 .../daemon/StoppingDaemonIntegrationSpec.groovy    |   16 +-
 .../server/health/MemoryInfoIntegrationTest.groovy |   51 +
 .../scaninfo/DaemonScanInfoIntegrationSpec.groovy  |  221 +
 .../daemon/testing/DaemonsEventSequence.groovy     |    4 +-
 .../org/gradle/launcher/bootstrap/EntryPoint.java  |   12 +-
 .../launcher/bootstrap/ProcessBootstrap.java       |   28 +-
 .../gradle/launcher/cli/BuildActionsFactory.java   |   67 +-
 .../launcher/cli/CommandLineActionFactory.java     |   47 +-
 .../launcher/cli/JavaRuntimeValidationAction.java  |    4 +-
 .../launcher/cli/ReportDaemonStatusAction.java     |   32 +
 .../org/gradle/launcher/cli/RunBuildAction.java    |   27 +-
 .../cli/converter/DaemonCommandLineConverter.java  |   21 +-
 .../cli/converter/LayoutToPropertiesConverter.java |   13 +-
 .../PropertiesToDaemonParametersConverter.java     |   15 +-
 .../PropertiesToStartParameterConverter.java       |    5 +
 .../launcher/daemon/DaemonExecHandleBuilder.java   |    4 +-
 .../launcher/daemon/bootstrap/DaemonGreeter.java   |    7 +-
 .../launcher/daemon/bootstrap/DaemonMain.java      |   53 +-
 .../bootstrap/DaemonStartupCommunication.java      |   36 +-
 .../daemon/bootstrap/ForegroundDaemonAction.java   |   17 +-
 .../daemon/client/DaemonCancelForwarder.java       |    7 +-
 .../launcher/daemon/client/DaemonClient.java       |   19 +-
 .../daemon/client/DaemonClientConnection.java      |   22 +-
 .../daemon/client/DaemonClientFactory.java         |    2 +-
 .../daemon/client/DaemonClientGlobalServices.java  |    5 +-
 .../daemon/client/DaemonClientInputForwarder.java  |    4 +-
 .../daemon/client/DaemonClientServices.java        |    5 +-
 .../daemon/client/DaemonClientServicesSupport.java |   35 +-
 .../launcher/daemon/client/DaemonConnector.java    |    4 +-
 .../daemon/client/DaemonStartListener.java         |    4 +-
 .../daemon/client/DaemonStartupMessage.java        |   50 +
 .../launcher/daemon/client/DaemonStopClient.java   |   45 +-
 .../daemon/client/DefaultDaemonConnector.java      |  176 +-
 .../daemon/client/DefaultDaemonStarter.java        |   52 +-
 .../client/EmbeddedDaemonClientServices.java       |  111 -
 .../daemon/client/EmbeddedDaemonStarter.java       |   67 -
 .../launcher/daemon/client/InputForwarder.java     |    8 +-
 .../launcher/daemon/client/JvmVersionDetector.java |   78 -
 .../daemon/client/JvmVersionValidator.java         |    5 +-
 .../daemon/client/ReportDaemonStatusClient.java    |  117 +
 .../daemon/client/ReportStatusDispatcher.java      |   53 +
 .../daemon/client/SingleUseDaemonClient.java       |    9 +-
 .../client/SingleUseDaemonClientServices.java      |    6 +-
 .../launcher/daemon/client/StopDispatcher.java     |    8 +-
 .../daemon/client/StubDaemonHealthServices.java    |   34 -
 .../daemon/configuration/BuildProcess.java         |   60 +
 .../daemon/configuration/CurrentProcess.java       |   74 -
 .../daemon/configuration/DaemonJvmOptions.java     |   84 +
 .../daemon/configuration/DaemonParameters.java     |   54 +-
 .../configuration/DaemonServerConfiguration.java   |    2 +
 .../launcher/daemon/configuration/DaemonUsage.java |   39 -
 .../DefaultDaemonServerConfiguration.java          |   15 +-
 .../ForegroundDaemonConfiguration.java             |    6 +-
 .../daemon/configuration/GradleProperties.java     |   10 +-
 .../daemon/context/DaemonCompatibilitySpec.java    |    4 +-
 .../daemon/context/DaemonConnectDetails.java       |   32 +
 .../daemon/context/DaemonContextBuilder.java       |    4 +-
 .../daemon/context/DaemonInstanceDetails.java      |   30 -
 .../daemon/context/DefaultDaemonContext.java       |   47 +-
 .../daemon/diagnostics/DaemonStartupInfo.java      |    7 +-
 .../launcher/daemon/logging/DaemonMessages.java    |    5 +-
 .../org/gradle/launcher/daemon/protocol/Build.java |    4 +-
 .../launcher/daemon/protocol/BuildAndStop.java     |    4 +-
 .../launcher/daemon/protocol/BuildEvent.java       |    2 +-
 .../gradle/launcher/daemon/protocol/Cancel.java    |    6 +-
 .../gradle/launcher/daemon/protocol/Command.java   |   16 +-
 .../daemon/protocol/DaemonMessageSerializer.java   |   25 +-
 .../launcher/daemon/protocol/InputMessage.java     |    2 +-
 .../launcher/daemon/protocol/OutputMessage.java    |    2 +-
 .../launcher/daemon/protocol/ReportStatus.java     |   23 +
 .../gradle/launcher/daemon/protocol/Result.java    |    6 +-
 .../gradle/launcher/daemon/protocol/Status.java    |   47 +
 .../org/gradle/launcher/daemon/protocol/Stop.java  |    4 +-
 .../launcher/daemon/protocol/StopWhenIdle.java     |    4 +-
 .../gradle/launcher/daemon/registry/DaemonDir.java |    4 +-
 .../launcher/daemon/registry/DaemonInfo.java       |  110 +-
 .../launcher/daemon/registry/DaemonRegistry.java   |   22 +-
 .../daemon/registry/DaemonRegistryContent.java     |  165 +-
 .../daemon/registry/DaemonRegistryServices.java    |    7 +-
 .../launcher/daemon/registry/DaemonStopEvent.java  |  132 +
 .../launcher/daemon/registry/DaemonStopEvents.java |   71 +
 .../daemon/registry/EmbeddedDaemonRegistry.java    |  102 -
 .../daemon/registry/PersistentDaemonRegistry.java  |  116 +-
 .../daemon/server/BadlyFormedRequestException.java |   23 +
 .../server/CompatibleDaemonExpirationStrategy.java |   62 +
 .../org/gradle/launcher/daemon/server/Daemon.java  |  171 +-
 .../DaemonIdleTimeoutExpirationStrategy.java       |   57 +
 ...aemonRegistryUnavailableExpirationStrategy.java |   73 +
 .../daemon/server/DaemonRegistryUpdater.java       |   98 +
 .../daemon/server/DaemonServerConnector.java       |    4 +-
 .../launcher/daemon/server/DaemonServices.java     |  115 +-
 .../daemon/server/DaemonStateCoordinator.java      |  204 +-
 .../daemon/server/DaemonTcpServerConnector.java    |   30 +-
 .../daemon/server/DefaultDaemonConnection.java     |   25 +-
 .../server/DefaultIncomingConnectionHandler.java   |   20 +-
 .../daemon/server/DomainRegistryUpdater.java       |   76 -
 .../daemon/server/IncomingConnectionHandler.java   |    4 +-
 .../daemon/server/MasterExpirationStrategy.java    |   85 +
 ...otMostRecentlyUsedDaemonExpirationStrategy.java |   56 +
 .../server/SynchronizedDispatchConnection.java     |   23 +-
 .../daemon/server/api/DaemonCommandAction.java     |    2 +-
 .../daemon/server/api/DaemonConnection.java        |    2 +-
 .../daemon/server/api/DaemonStateControl.java      |   20 +-
 .../daemon/server/api/DaemonStoppedException.java  |    6 +-
 .../daemon/server/api/HandleReportStatus.java      |   36 +
 .../launcher/daemon/server/api/HandleStop.java     |   17 +-
 .../daemon/server/exec/BuildCommandOnly.java       |    8 +-
 .../daemon/server/exec/DaemonCommandExecuter.java  |   35 +-
 .../server/exec/DefaultDaemonCommandExecuter.java  |   83 -
 .../server/exec/EstablishBuildEnvironment.java     |    4 +-
 .../launcher/daemon/server/exec/ExecuteBuild.java  |   22 +-
 .../daemon/server/exec/LogAndCheckHealth.java      |   61 +
 .../launcher/daemon/server/exec/LogToClient.java   |  109 +-
 .../server/exec/RequestStopIfSingleUsedDaemon.java |    4 +-
 .../daemon/server/exec/WatchForDisconnection.java  |   18 +-
 .../server/expiry/AllDaemonExpirationStrategy.java |   61 +
 .../server/expiry/AnyDaemonExpirationStrategy.java |   56 +
 .../server/expiry/DaemonExpirationListener.java    |   30 +
 .../server/expiry/DaemonExpirationResult.java      |   39 +
 .../server/expiry/DaemonExpirationStatus.java      |   36 +
 .../server/expiry/DaemonExpirationStrategy.java    |   21 +
 .../daemon/server/health/DaemonHealthCheck.java    |   43 +
 .../daemon/server/health/DaemonHealthServices.java |   32 -
 .../daemon/server/health/DaemonHealthStats.java    |  100 +
 .../daemon/server/health/DaemonHealthTracker.java  |   56 -
 .../daemon/server/health/DaemonMemoryStatus.java   |  151 +
 .../launcher/daemon/server/health/DaemonStats.java |   98 -
 .../daemon/server/health/DaemonStatus.java         |   48 -
 .../server/health/DefaultDaemonHealthServices.java |   42 -
 .../GcThrashingDaemonExpirationStrategy.java       |   45 +
 .../server/health/HealthExpirationStrategy.java    |   41 +
 .../daemon/server/health/HealthLogger.java         |    7 +-
 .../daemon/server/health/HintGCAfterBuild.java     |   52 -
 .../health/LowMemoryDaemonExpirationStrategy.java  |   62 +
 .../health/LowPermGenDaemonExpirationStrategy.java |   45 +
 .../LowTenuredSpaceDaemonExpirationStrategy.java   |   45 +
 .../launcher/daemon/server/health/MemoryInfo.java  |   61 -
 .../server/health/gc/DefaultSlidingWindow.java     |   54 +
 .../server/health/gc/GarbageCollectionCheck.java   |   58 +
 .../server/health/gc/GarbageCollectionEvent.java   |   43 +
 .../server/health/gc/GarbageCollectionInfo.java    |   36 +
 .../server/health/gc/GarbageCollectionMonitor.java |  146 +
 .../server/health/gc/GarbageCollectionStats.java   |  133 +
 .../gc/GarbageCollectorMonitoringStrategy.java     |   72 +
 .../daemon/server/health/gc/SlidingWindow.java     |   35 +
 .../server/health/memory/AvailableMemory.java      |   21 +
 .../health/memory/MBeanAttributeProvider.java      |   53 +
 .../server/health/memory/MBeanAvailableMemory.java |   29 +
 .../health/memory/MeminfoAvailableMemory.java      |  132 +
 .../daemon/server/health/memory/MemoryInfo.java    |   69 +
 .../health/memory/VmstatAvailableMemory.java       |  126 +
 .../daemon/server/scaninfo/DaemonScanInfo.java     |   57 +
 .../server/scaninfo/DefaultDaemonScanInfo.java     |   94 +
 .../daemon/server/stats/DaemonRunningStats.java    |   67 +
 .../launcher/exec/BuildActionParameters.java       |    3 +-
 .../exec/ContinuousBuildActionExecuter.java        |  178 -
 .../DaemonUsageSuggestingBuildActionExecuter.java  |   70 -
 .../exec/DefaultBuildActionParameters.java         |   15 +-
 .../launcher/exec/GradleBuildController.java       |   79 +
 .../exec/InProcessBuildActionExecuter.java         |   69 +-
 .../internal/provider/BuildActionResult.java       |    5 +-
 .../internal/provider/ClassLoaderCache.java        |   72 -
 .../internal/provider/ClassLoaderDetails.java      |   36 -
 .../internal/provider/ClasspathInferer.java        |  131 -
 .../provider/ClientProvidedBuildAction.java        |    1 +
 .../ClientSidePayloadClassLoaderFactory.java       |  121 -
 .../ClientSidePayloadClassLoaderRegistry.java      |  142 -
 .../internal/provider/ConnectionScopeServices.java |   40 +-
 .../provider/ContinuousBuildActionExecuter.java    |  176 +
 .../provider/DaemonBuildActionExecuter.java        |    3 +-
 .../DaemonSidePayloadClassLoaderFactory.java       |   91 -
 .../internal/provider/DefaultConnection.java       |   89 +-
 .../provider/DefaultConnectionMetaData.java        |    2 +-
 .../DefaultPayloadClassLoaderRegistry.java         |  157 -
 .../tooling/internal/provider/DeserializeMap.java  |   24 -
 .../provider/ExecuteBuildActionRunner.java         |    2 +-
 .../gradle/tooling/internal/provider/JarCache.java |  102 -
 .../internal/provider/LauncherServices.java        |   66 +-
 .../LoggingBridgingBuildActionExecuter.java        |   12 +-
 .../internal/provider/ModelClassLoaderFactory.java |   45 -
 .../provider/PayloadClassLoaderFactory.java        |   30 -
 .../provider/PayloadClassLoaderRegistry.java       |   26 -
 .../internal/provider/PayloadSerializer.java       |  144 -
 .../internal/provider/ProviderConnection.java      |   22 +-
 .../tooling/internal/provider/SerializeMap.java    |   36 -
 .../internal/provider/SerializedPayload.java       |   37 -
 .../provider/ServicesSetupBuildActionExecuter.java |   52 +
 .../internal/provider/ShutdownCoordinator.java     |   16 +-
 .../provider/connection/BuildLogLevelMixIn.java    |    7 +-
 .../DefaultOperationFinishedProgressEvent.java     |    2 +-
 .../DefaultOperationStartedProgressEvent.java      |    2 +-
 .../events/DefaultTaskFinishedProgressEvent.java   |    2 +-
 .../events/DefaultTaskStartedProgressEvent.java    |    2 +-
 .../events/DefaultTestFinishedProgressEvent.java   |    2 +-
 .../events/DefaultTestStartedProgressEvent.java    |    2 +-
 .../internal/provider/jdk6/Jdk6ClassLookup.java    |   27 -
 .../provider/serialization/ClassLoaderCache.java   |   98 +
 .../provider/serialization/ClassLoaderDetails.java |   41 +
 .../provider/serialization/ClasspathInferer.java   |  146 +
 .../serialization/ClientOwnedClassLoaderSpec.java  |   56 +
 .../ClientSidePayloadClassLoaderFactory.java       |  127 +
 .../ClientSidePayloadClassLoaderRegistry.java      |  176 +
 .../DaemonSidePayloadClassLoaderFactory.java       |   58 +
 .../DefaultPayloadClassLoaderRegistry.java         |  182 +
 .../provider/serialization/DeserializeMap.java     |   24 +
 .../serialization/ModelClassLoaderFactory.java     |   64 +
 .../serialization/PayloadClassLoaderFactory.java   |   30 +
 .../serialization/PayloadClassLoaderRegistry.java  |   37 +
 .../provider/serialization/PayloadSerializer.java  |   70 +
 .../PayloadSerializerObjectInputStream.java        |   95 +
 .../PayloadSerializerObjectOutputStream.java       |   66 +
 .../provider/serialization/SerializeMap.java       |   36 +
 .../provider/serialization/SerializedPayload.java  |   38 +
 .../WellKnownClassLoaderRegistry.java              |  126 +
 .../launcher/cli/BuildActionsFactoryTest.groovy    |   52 +-
 .../cli/CommandLineActionFactoryTest.groovy        |   18 +-
 .../cli/ReportDaemonStatusActionTest.groovy        |   34 +
 .../gradle/launcher/cli/RunBuildActionTest.groovy  |    5 +-
 .../DaemonCommandLineConverterTest.groovy          |   60 +-
 ...ropertiesToDaemonParametersConverterTest.groovy |   58 +-
 .../PropertiesToStartParameterConverterTest.groovy |    2 +-
 .../ContinuousIntegrationTestFixtureTest.groovy    |  134 +
 .../daemon/DaemonExecHandleBuilderSpec.groovy      |    4 +-
 .../daemon/bootstrap/DaemonGreeterTest.groovy      |    8 +-
 .../DaemonStartupCommunicationSpec.groovy          |    2 +-
 .../daemon/client/DaemonCancelForwarderTest.groovy |    5 +-
 .../client/DaemonClientConnectionTest.groovy       |   15 +-
 .../client/DaemonClientInputForwarderTest.groovy   |    4 +-
 .../daemon/client/DaemonClientServicesTest.groovy  |    2 +-
 .../launcher/daemon/client/DaemonClientTest.groovy |   32 +-
 .../daemon/client/DaemonStartupMessageTest.groovy  |   50 +
 .../daemon/client/DaemonStopClientTest.groovy      |   76 +-
 .../client/DefaultDaemonConnectorTest.groovy       |   27 +-
 .../daemon/client/JvmVersionDetectorTest.groovy    |   67 -
 .../client/ReportDaemonStatusClientTest.groovy     |  136 +
 .../client/ReportStatusDispatcherTest.groovy       |   53 +
 .../daemon/client/StopDispatcherTest.groovy        |    2 +-
 .../daemon/configuration/BuildProcessTest.groovy   |  109 +
 .../daemon/configuration/CurrentProcessTest.groovy |  108 -
 .../configuration/DaemonJvmOptionsTest.groovy      |   67 +
 .../configuration/DaemonParametersTest.groovy      |   22 +-
 .../protocol/DaemonMessageSerializerTest.groovy    |   10 +-
 .../DaemonStatusAndErrorReportingTest.groovy       |   62 +
 .../registry/DaemonRegistryServicesTest.groovy     |   15 +-
 .../registry/DaemonRegistryUpdaterTest.groovy      |  102 +
 .../daemon/registry/DaemonStopEventsTest.groovy    |   58 +
 .../registry/DomainRegistryUpdaterTest.groovy      |   89 -
 .../daemon/registry/EmbeddedDaemonRegistry.java    |  129 +
 .../registry/EmbeddedDaemonRegistrySpec.groovy     |   32 +-
 .../registry/PersistentDaemonRegistryTest.groovy   |   54 +-
 .../CompatibleDaemonExpirationStrategyTest.groovy  |   93 +
 .../server/DaemonExpirationStrategyTest.groovy     |   58 +
 .../DaemonIdleTimeoutExpirationStrategyTest.groovy |   71 +
 ...egistryUnavailableExpirationStrategyTest.groovy |   77 +
 .../DaemonServerExceptionHandlingTest.groovy       |  132 -
 .../daemon/server/DaemonServicesTest.groovy        |    9 +-
 .../server/DaemonStateCoordinatorTest.groovy       |  202 +-
 .../server/DefaultDaemonConnectionTest.groovy      |   12 +-
 ...RecentlyUsedDaemonExpirationStrategyTest.groovy |   51 +
 .../server/exec/LogAndCheckHealthTest.groovy       |   51 +
 .../expiry/AllDaemonExpirationStrategyTest.groovy  |   96 +
 .../expiry/AnyDaemonExpirationStrategyTest.groovy  |   81 +
 .../server/health/DaemonHealthStatsTest.groovy     |   81 +
 .../server/health/DaemonHealthTrackerTest.groovy   |   69 -
 .../server/health/DaemonMemoryStatusTest.groovy    |  170 +
 .../daemon/server/health/DaemonStatsTest.groovy    |   92 -
 .../daemon/server/health/DaemonStatusTest.groovy   |   76 -
 .../GcThrashingDaemonExpirationStrategyTest.groovy |   53 +
 .../daemon/server/health/HealthLoggerTest.groovy   |    2 +-
 .../server/health/HintGCAfterBuildTest.groovy      |   52 -
 .../LowMemoryDaemonExpirationStrategyTest.groovy   |  101 +
 .../LowPermGenDaemonExpirationStrategyTest.groovy  |   53 +
 ...TenuredSpaceDaemonExpirationStrategyTest.groovy |   53 +
 .../health/gc/DefaultSlidingWindowTest.groovy      |   45 +
 .../health/gc/GarbageCollectionMonitorTest.groovy  |   74 +
 .../health/gc/GarbageCollectionStatsTest.groovy    |   44 +
 .../memory/MeminfoAvailableMemoryTest.groovy       |  132 +
 .../server/health/memory/MemoryInfoTest.groovy     |   57 +
 .../health/memory/VmstatAvailableMemoryTest.groovy |   53 +
 .../exec/ContinuousBuildActionExecuterTest.groovy  |  255 -
 ...onUsageSuggestingBuildActionExecuterTest.groovy |  113 -
 .../exec/DefaultBuildActionParametersTest.groovy   |    4 +-
 .../provider/AbstractClassGraphSpec.groovy         |   22 +-
 .../internal/provider/ClasspathInfererTest.groovy  |  122 -
 .../ClientSidePayloadClassLoaderFactoryTest.groovy |   36 -
 .../provider/ConnectionScopeServicesTest.groovy    |   11 +-
 .../ContinuousBuildActionExecuterTest.groovy       |  190 +
 .../DaemonSidePayloadClassLoaderFactoryTest.groovy |   76 -
 .../tooling/internal/provider/JarCacheTest.groovy  |  130 -
 .../LoggingBridgingBuildActionExecuterTest.groovy  |    4 +-
 .../internal/provider/PayloadSerializerTest.groovy |  205 -
 .../serialization/ClasspathInfererTest.groovy      |  129 +
 .../ClientSidePayloadClassLoaderFactoryTest.groovy |   36 +
 .../DaemonSidePayloadClassLoaderFactoryTest.groovy |   65 +
 .../serialization/PayloadSerializerTest.groovy     |  208 +
 .../AbstractContinuousIntegrationTest.groovy       |   96 +-
 .../Java7RequiringContinuousIntegrationTest.groovy |    4 -
 subprojects/logging/logging.gradle                 |   25 +
 .../DeprecationHandlingIntegrationTest.groovy      |  211 +
 .../JavaUtilLoggingSystemIntegrationTest.groovy    |  141 +
 .../internal/logging/LoggingIntegrationTest.groovy |  435 ++
 .../LoggingIntegrationTest/logging/build.gradle    |    0
 .../logging/buildSrc/build.gradle                  |    0
 .../LoggingIntegrationTest/logging/external.gradle |    0
 .../LoggingIntegrationTest/logging/init.gradle     |    0
 .../logging/nestedBuild/build.gradle               |    8 +
 .../logging/nestedBuild/buildSrc/build.gradle      |    0
 .../logging/nestedBuild/settings.gradle            |    0
 .../logging/project1/build.gradle                  |   77 +
 .../logging/project2/build.gradle                  |    0
 .../LoggingIntegrationTest/logging/settings.gradle |    0
 .../multiThreaded/build.gradle                     |   28 +
 .../java}/org/gradle/api/logging/LogLevel.java     |    0
 .../main/java}/org/gradle/api/logging/Logger.java  |    0
 .../main/java/org/gradle/api/logging/Logging.java  |   50 +
 .../org/gradle/api/logging/LoggingManager.java     |   65 +
 .../org/gradle/api/logging/LoggingOutput.java      |    0
 .../gradle/api/logging/StandardOutputListener.java |    0
 .../api/logging/configuration/ConsoleOutput.java   |   39 +
 .../configuration/LoggingConfiguration.java        |   56 +
 .../api/logging/configuration/ShowStacktrace.java  |   24 +
 .../api/logging/configuration/package-info.java    |   20 +
 .../java}/org/gradle/api/logging/package-info.java |    0
 .../featurelifecycle/DeprecatedFeatureHandler.java |    0
 .../featurelifecycle/DeprecatedFeatureUsage.java   |  103 +
 .../LoggingDeprecatedFeatureHandler.java           |  126 +
 .../featurelifecycle/UsageLocationReporter.java    |    0
 .../gradle/internal/logging/ConsoleRenderer.java   |   42 +
 .../logging/DefaultLoggingConfiguration.java       |   72 +
 .../gradle/internal/logging/LogLevelMapping.java   |   38 +
 .../logging/LoggingCommandLineConverter.java       |  172 +
 .../internal/logging/LoggingManagerInternal.java   |   53 +
 .../internal/logging/LoggingOutputInternal.java    |   71 +
 .../internal/logging/StandardOutputCapture.java    |   32 +
 .../LoggingManagerInternalCompatibilityBridge.java |  127 +
 .../internal/logging/config/LoggingConfigurer.java |   23 +
 .../internal/logging/config/LoggingRouter.java     |   24 +
 .../logging/config/LoggingSourceSystem.java        |   42 +
 .../internal/logging/config/LoggingSystem.java     |   35 +
 .../logging/config/LoggingSystemAdapter.java       |   75 +
 .../internal/logging/console/AnsiConsole.java      |  252 +
 .../gradle/internal/logging/console/ColorMap.java  |   32 +
 .../gradle/internal/logging/console/Console.java   |   29 +
 .../console/ConsoleBackedProgressRenderer.java     |  137 +
 .../internal/logging/console/DefaultColorMap.java  |  138 +
 .../logging/console/DefaultStatusBarFormatter.java |   55 +
 .../org/gradle/internal/logging/console/Label.java |   21 +
 .../logging/console/ProgressOperation.java         |   50 +
 .../logging/console/ProgressOperations.java        |   55 +
 .../console/StyledTextOutputBackedRenderer.java    |   93 +
 .../gradle/internal/logging/console/TextArea.java  |   22 +
 .../logging/events/CategorisedOutputEvent.java     |   43 +
 .../internal/logging/events/EndOutputEvent.java    |   31 +
 .../gradle/internal/logging/events/LogEvent.java   |   54 +
 .../logging/events/LogLevelChangeEvent.java        |   44 +
 .../logging/events/OperationIdentifier.java        |   54 +
 .../internal/logging/events/OutputEvent.java       |   31 +
 .../logging/events/OutputEventListener.java        |   21 +
 .../logging/events/ProgressCompleteEvent.java      |   49 +
 .../internal/logging/events/ProgressEvent.java     |   43 +
 .../logging/events/ProgressStartEvent.java         |   71 +
 .../logging/events/RenderableOutputEvent.java      |   36 +
 .../logging/events/StyledTextOutputEvent.java      |  115 +
 .../progress/DefaultProgressLoggerFactory.java     |  184 +
 .../logging/progress/ProgressListener.java         |   29 +
 .../internal/logging/progress/ProgressLogger.java  |  126 +
 .../logging/progress/ProgressLoggerFactory.java    |   40 +
 .../logging/services/DefaultLoggingManager.java    |  345 ++
 .../services/DefaultLoggingManagerFactory.java     |   57 +
 .../services/DefaultStyledTextOutputFactory.java   |   38 +
 .../services/LoggingBackedStyledTextOutput.java    |   69 +
 .../logging/services/LoggingServiceRegistry.java   |  163 +
 .../logging/services/ProgressLoggingBridge.java    |   43 +
 .../services/TextStreamOutputEventListener.java    |   60 +
 .../logging/sink/ConsoleConfigureAction.java       |   63 +
 .../internal/logging/sink/OutputEventRenderer.java |  292 ++
 .../logging/sink/ProgressLogEventGenerator.java    |  194 +
 .../slf4j/OutputEventListenerBackedLogger.java     |  476 ++
 .../OutputEventListenerBackedLoggerContext.java    |  416 ++
 .../logging/slf4j/Slf4jLoggingConfigurer.java      |   51 +
 .../logging/source/DefaultStdErrLoggingSystem.java |   39 +
 .../logging/source/DefaultStdOutLoggingSystem.java |   39 +
 .../logging/source/JavaUtilLoggingSystem.java      |  130 +
 .../internal/logging/source/NoOpLoggingSystem.java |   44 +
 .../logging/source/PrintStreamLoggingSystem.java   |  165 +
 .../logging/source/StdErrLoggingSystem.java        |   25 +
 .../logging/source/StdOutLoggingSystem.java        |   25 +
 .../text/AbstractLineChoppingStyledTextOutput.java |   83 +
 .../logging/text/AbstractStyledTextOutput.java     |  170 +
 .../text/AbstractStyledTextOutputFactory.java      |   33 +
 .../logging/text/BufferingStyledTextOutput.java    |   77 +
 .../text/LinePrefixingStyledTextOutput.java        |   61 +
 .../text/StreamBackedStandardOutputListener.java   |   52 +
 .../logging/text/StreamingStyledTextOutput.java    |   66 +
 .../text/StreamingStyledTextOutputFactory.java     |   31 +
 .../internal/logging/text/StyledTextOutput.java    |  161 +
 .../logging/text/StyledTextOutputFactory.java      |   56 +
 .../org/gradle/logging/LoggingManagerInternal.java |   64 +
 .../org/gradle/logging/ProgressLoggerFactory.java  |   26 +
 .../org/gradle/logging/StandardOutputCapture.java  |   27 +
 .../gradle/logging/StyledTextOutputFactory.java    |   24 +
 .../java}/org/gradle/util/DeprecationLogger.java   |    0
 .../java/org/gradle/util/SingleMessageLogger.java  |  213 +
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |   51 +
 .../org/gradle/api/logging/LogLevelTest.groovy     |    0
 .../groovy/org/gradle/api/logging/LoggingTest.java |  123 +
 .../DeprecatedFeatureUsageTest.groovy              |   49 +
 .../LoggingDeprecatedFeatureHandlerTest.groovy     |  342 ++
 .../SimulatedDeprecationMessageLogger.java         |   35 +
 .../SimulatedGroovyCallLocation.groovy             |   34 +
 .../SimulatedJavaCallLocation.java                 |   35 +
 .../internal/logging/ConsoleRendererTest.groovy    |   38 +
 .../logging/LoggingCommandLineConverterTest.groovy |  117 +
 .../internal/logging/OutputSpecification.groovy    |   84 +
 .../logging/config/LoggingSystemAdapterTest.groovy |  107 +
 .../logging/console/AnsiConsoleTest.groovy         |  553 +++
 .../ConsoleBackedProgressRendererTest.groovy       |  386 ++
 .../internal/logging/console/ConsoleStub.java      |   47 +
 .../logging/console/DefaultColorMapTest.groovy     |  106 +
 .../console/DefaultStatusBarFormatterTest.groovy   |   56 +
 .../logging/console/ProgressOperationsTest.groovy  |  117 +
 .../StyledTextOutputBackedRendererTest.groovy      |  110 +
 .../internal/logging/console/TestColorMap.groovy   |   42 +
 .../internal/logging/events/LogEventTest.groovy    |   47 +
 .../events/StyledTextOutputEventTest.groovy        |   64 +
 .../DefaultProgressLoggerFactoryTest.groovy        |  382 ++
 .../services/DefaultLoggingManagerTest.groovy      |  527 ++
 .../services/LoggingServiceRegistryTest.groovy     |  674 +++
 .../StreamBackedStandardOutputListenerTest.groovy  |   57 +
 .../TextStreamOutputEventListenerTest.groovy       |   66 +
 .../logging/sink/OutputEventRendererTest.groovy    |  346 ++
 .../sink/ProgressLogEventGeneratorTest.groovy      |  484 ++
 ...tputEventListenerBackedLoggerContextTest.groovy |   64 +
 ...enerBackedLoggerDefaultConfigurationTest.groovy |   99 +
 .../OutputEventListenerBackedLoggerTest.groovy     |  941 ++++
 .../slf4j/Slf4jLoggingConfigurerTest.groovy        |  178 +
 .../source/JavaUtilLoggingSystemTest.groovy        |  124 +
 .../source/PrintStreamLoggingSystemTest.groovy     |  203 +
 ...AbstractLineChoppingStyledTextOutputTest.groovy |  165 +
 .../text/AbstractStyledTextOutputTest.groovy       |  177 +
 .../text/LinePrefixingStyledTextOutputTest.groovy  |  134 +
 .../text/LoggingBackedStyledTextOutputTest.groovy  |  149 +
 .../text/StreamingStyledTextOutputTest.groovy      |   78 +
 .../org/gradle/util/SingleMessageLoggerTest.groovy |  127 +
 .../CollectingTestOutputEventListener.groovy       |   35 +
 .../internal/logging/ConfigureLogging.groovy       |   72 +
 .../logging/TestOutputEventListener.groovy         |   44 +
 .../logging/text/TestStyledTextOutput.groovy       |   79 +
 .../logging/text/TestStyledTextOutputFactory.java  |   52 +
 subprojects/maven/maven.gradle                     |    4 +
 .../maven/MavenPublishBasicIntegTest.groovy        |   50 +-
 .../maven/MavenPublishCoordinatesIntegTest.groovy  |   14 +-
 .../MavenPublishCrossVersionIntegrationTest.groovy |    4 +-
 .../publish/maven/MavenPublishEarIntegTest.groovy  |    2 +-
 .../publish/maven/MavenPublishHttpIntegTest.groovy |    6 +-
 .../maven/MavenPublishHttpsIntegTest.groovy        |   14 +-
 .../maven/MavenPublishIssuesIntegTest.groovy       |   26 +-
 .../publish/maven/MavenPublishJavaIntegTest.groovy |   35 +-
 .../maven/MavenPublishMultiProjectIntegTest.groovy |   11 +-
 .../maven/MavenPublishWarProjectIntegTest.groovy   |    2 +-
 .../SamplesMavenPublishIntegrationTest.groovy      |    9 +-
 .../MavenEarProjectPublishIntegrationTest.groovy   |    3 +-
 .../MavenJavaProjectPublishIntegrationTest.groovy  |   69 +-
 .../MavenMultiProjectPublishIntegrationTest.groovy |  376 ++
 ...nNonUniqueSnapshotPublishIntegrationTest.groovy |    4 +-
 ...MavenPomGenerationPublishIntegrationTest.groovy |    4 +
 .../maven/MavenPublishIntegrationTest.groovy       |  270 +-
 .../MavenPublishRepoDslIntegrationTest.groovy      |   48 +
 .../MavenSettingsPublishIntegrationTest.groovy     |    6 +-
 .../MavenVersionRangePublishIntegrationTest.groovy |    4 +
 .../MavenWarProjectPublishIntegrationTest.groovy   |    4 +-
 ...SamplesMavenPomGenerationIntegrationTest.groovy |   11 +-
 .../SamplesMavenQuickstartIntegrationTest.groovy   |    8 +-
 .../publish/maven/pomGeneration/expectedNewPom.txt |   18 +
 .../publish/maven/pomGeneration/expectedPom.txt    |   20 +-
 .../api/artifacts/maven/GroovyMavenDeployer.java   |   37 -
 .../gradle/api/artifacts/maven/MavenDeployer.java  |   84 -
 .../groovy/org/gradle/api/plugins/MavenPlugin.java |  187 -
 .../maven/internal/DefaultDeployerFactory.java     |   83 -
 .../DefaultMavenRepositoryHandlerConvention.java   |   83 -
 .../internal/deployer/AbstractMavenResolver.java   |  197 -
 .../maven/internal/deployer/BaseMavenDeployer.java |   98 -
 .../internal/deployer/BaseMavenInstaller.java      |   39 -
 .../deployer/DefaultGroovyMavenDeployer.groovy     |   49 -
 .../maven/internal/deployer/RepositoryBuilder.java |   32 -
 .../maven/internal/deployer/RepositoryFactory.java |   51 -
 .../internal/pom/DefaultExcludeRuleConverter.java  |   35 -
 .../maven/internal/pom/DefaultMavenPom.java        |  234 -
 .../pom/DefaultPomDependenciesConverter.java       |  157 -
 .../wagon/RepositoryTransportDeployWagon.java      |  313 --
 .../wagon/RepositoryTransportWagonAdapter.java     |   61 -
 .../internal/artifact/DefaultMavenArtifact.java    |   71 -
 .../internal/artifact/DefaultMavenArtifactSet.java |   90 -
 .../publication/DefaultMavenPublication.java       |  234 -
 .../internal/publisher/AbstractMavenPublisher.java |   76 -
 .../internal/publisher/MavenLocalPublisher.java    |   38 -
 .../internal/publisher/MavenRemotePublisher.java   |  100 -
 .../org/gradle/api/publish/maven/package-info.java |   25 -
 .../publish/maven/plugins/MavenPublishPlugin.java  |  181 -
 .../api/publish/maven/plugins/package-info.java    |   25 -
 .../maven/tasks/AbstractPublishToMaven.java        |  107 -
 .../api/publish/maven/tasks/GenerateMavenPom.java  |  110 -
 .../maven/tasks/PublishToMavenRepository.java      |   93 -
 .../api/publish/maven/tasks/package-info.java      |   25 -
 .../apache/maven/artifact/ant/Authentication.java  |    0
 .../org/apache/maven/artifact/ant/Proxy.java       |    0
 .../maven/artifact/ant/RemoteRepository.java       |    0
 .../org/apache/maven/artifact/ant/Repository.java  |    0
 .../maven/artifact/ant/RepositoryPolicy.java       |    0
 .../apache/maven/artifact/ant/package-info.java    |    0
 .../api/artifacts/maven/Conf2ScopeMapping.java     |    0
 .../maven/Conf2ScopeMappingContainer.java          |    0
 .../api/artifacts/maven/GroovyMavenDeployer.java   |   37 +
 .../gradle/api/artifacts/maven/MavenDeployer.java  |   84 +
 .../api/artifacts/maven/MavenDeployment.java       |    0
 .../org/gradle/api/artifacts/maven/MavenPom.java   |    0
 .../gradle/api/artifacts/maven/MavenResolver.java  |    0
 .../api/artifacts/maven/PomFilterContainer.java    |    0
 .../gradle/api/artifacts/maven/PublishFilter.java  |    0
 .../gradle/api/artifacts/maven/package-info.java   |    0
 .../java/org/gradle/api/plugins/MavenPlugin.java   |  187 +
 .../gradle/api/plugins/MavenPluginConvention.java  |    0
 .../plugins/MavenRepositoryHandlerConvention.java  |    0
 .../publication/maven/internal/ArtifactPom.java    |    0
 .../maven/internal/ArtifactPomContainer.java       |    0
 .../maven/internal/ArtifactPomFactory.java         |    0
 .../maven/internal/BasePomFilterContainer.java     |    0
 .../maven/internal/DefaultArtifactPom.java         |    0
 .../internal/DefaultArtifactPomContainer.java      |    0
 .../maven/internal/DefaultArtifactPomFactory.java  |    0
 .../maven/internal/DefaultDeployerFactory.java     |   83 +
 .../maven/internal/DefaultMavenDeployment.java     |    0
 .../DefaultMavenRepositoryHandlerConvention.java   |   83 +
 .../maven/internal/DefaultPomFilter.java           |    0
 .../maven/internal/DeployerFactory.java            |    0
 .../publication/maven/internal/MavenFactory.java   |    0
 .../maven/internal/MavenPomMetaInfoProvider.java   |    0
 .../maven/internal/MavenVersionRangeMapper.java    |    0
 .../publication/maven/internal/ModelFactory.java   |    0
 .../api/publication/maven/internal/PomFilter.java  |    0
 .../maven/internal/VersionRangeMapper.java         |    0
 .../action/AbstractMavenPublishAction.java         |    0
 .../action/LoggingMavenTransferListener.java       |    0
 .../maven/internal/action/MavenDeployAction.java   |    0
 .../maven/internal/action/MavenInstallAction.java  |    0
 .../maven/internal/action/MavenPublishAction.java  |    0
 .../internal/action/MavenWagonDeployAction.java    |    0
 .../internal/action/SnapshotVersionManager.java    |    0
 .../internal/deployer/AbstractMavenResolver.java   |  210 +
 .../maven/internal/deployer/BaseMavenDeployer.java |   98 +
 .../internal/deployer/BaseMavenInstaller.java      |   39 +
 .../deployer/DefaultGroovyMavenDeployer.java       |   75 +
 .../internal/deployer/MavenRemoteRepository.java   |   55 +
 .../maven/internal/pom/CustomModelBuilder.java     |    0
 .../pom/DefaultConf2ScopeMappingContainer.java     |    0
 .../internal/pom/DefaultExcludeRuleConverter.java  |   39 +
 .../maven/internal/pom/DefaultMavenFactory.java    |    0
 .../maven/internal/pom/DefaultMavenPom.java        |  229 +
 .../maven/internal/pom/DefaultMavenPomFactory.java |    0
 .../pom/DefaultPomDependenciesConverter.java       |  244 +
 .../maven/internal/pom/ExcludeRuleConverter.java   |    0
 .../maven/internal/pom/PlexusLoggerAdapter.java    |    0
 .../internal/pom/PomDependenciesConverter.java     |    0
 .../ProjectDependencyArtifactIdExtractorHack.java  |    0
 .../wagon/RepositoryTransportDeployWagon.java      |  313 ++
 .../wagon/RepositoryTransportWagonAdapter.java     |   60 +
 .../maven/InvalidMavenPublicationException.java    |    0
 .../gradle/api/publish/maven/MavenArtifact.java    |    0
 .../gradle/api/publish/maven/MavenArtifactSet.java |    0
 .../gradle/api/publish/maven/MavenDependency.java  |    0
 .../org/gradle/api/publish/maven/MavenPom.java     |    0
 .../gradle/api/publish/maven/MavenPublication.java |    0
 .../maven/internal/MavenPublishServices.java       |    0
 .../internal/artifact/DefaultMavenArtifact.java    |   71 +
 .../internal/artifact/DefaultMavenArtifactSet.java |   87 +
 .../MavenArtifactNotationParserFactory.java        |    0
 .../dependencies/DefaultMavenDependency.java       |    0
 .../dependencies/MavenDependencyInternal.java      |    0
 .../internal/publication/DefaultMavenPom.java      |    0
 .../publication/DefaultMavenProjectIdentity.java   |    0
 .../publication/DefaultMavenPublication.java       |  244 +
 .../internal/publication/MavenPomInternal.java     |    0
 .../publication/MavenPublicationInternal.java      |    0
 .../internal/publisher/AbstractMavenPublisher.java |   76 +
 .../internal/publisher/MavenLocalPublisher.java    |   38 +
 .../publisher/MavenNormalizedPublication.java      |    0
 .../internal/publisher/MavenProjectIdentity.java   |    0
 .../maven/internal/publisher/MavenPublisher.java   |    0
 .../internal/publisher/MavenRemotePublisher.java   |  100 +
 .../publisher/StaticLockingMavenPublisher.java     |    0
 .../publisher/ValidatingMavenPublisher.java        |    0
 .../internal/tasks/MavenPomFileGenerator.java      |    0
 .../org/gradle/api/publish/maven/package-info.java |   23 +
 .../publish/maven/plugins/MavenPublishPlugin.java  |  184 +
 .../api/publish/maven/plugins/package-info.java    |   23 +
 .../maven/tasks/AbstractPublishToMaven.java        |  110 +
 .../api/publish/maven/tasks/GenerateMavenPom.java  |  112 +
 .../publish/maven/tasks/PublishToMavenLocal.java   |    0
 .../maven/tasks/PublishToMavenRepository.java      |   95 +
 .../api/publish/maven/tasks/package-info.java      |   23 +
 .../main/java/org/gradle/maven/package-info.java   |    4 +-
 .../api/plugins/MavenPluginConventionTest.groovy   |   16 +-
 .../org/gradle/api/plugins/MavenPluginTest.java    |   13 +-
 .../maven/internal/DefaultArtifactPomTest.java     |    4 +-
 ...aultMavenRepositoryHandlerConventionTest.groovy |   41 +-
 .../deployer/DefaultGroovyMavenDeployerTest.groovy |    9 +-
 .../pom/DefaultExcludeRuleConverterTest.groovy     |   52 +
 .../pom/DefaultExcludeRuleConverterTest.java       |   54 -
 .../pom/DefaultPomDependenciesConverterTest.groovy |   26 +-
 ...ectDependencyArtifactIdExtractorHackTest.groovy |   12 +-
 .../RepositoryTransportWagonAdapterTest.groovy     |    6 +-
 .../MavenArtifactNotationParserFactoryTest.groovy  |   11 +-
 .../publication/DefaultMavenPublicationTest.groovy |   46 +-
 .../publisher/ValidatingMavenPublisherTest.groovy  |   20 +-
 .../maven/plugins/MavenPublishPluginTest.groovy    |    7 +-
 .../tasks/PublishToMavenRepositoryTest.groovy      |    7 +-
 subprojects/messaging/messaging.gradle             |    3 +
 .../remote/UnicastMessagingIntegrationTest.groovy  |  303 ++
 .../internal/hub/MessageHubIntegrationTest.groovy  |  233 +
 .../BroadcastMessagingIntegrationTest.groovy       |  340 --
 .../remote/UnicastMessagingIntegrationTest.groovy  |  307 --
 .../internal/hub/MessageHubIntegrationTest.groovy  |  229 -
 .../main/java/org/gradle/internal/actor/Actor.java |   62 +
 .../org/gradle/internal/actor/ActorFactory.java    |   35 +
 .../actor/internal/DefaultActorFactory.java        |  157 +
 .../gradle/internal/dispatch/AsyncDispatch.java    |  193 +
 .../gradle/internal/dispatch/BoundedDispatch.java  |   29 +
 .../dispatch/ContextClassLoaderDispatch.java       |   37 +
 .../internal/dispatch/ContextClassLoaderProxy.java |   37 +
 .../dispatch/DiscardingFailureHandler.java         |   30 +
 .../org/gradle/internal/dispatch/Dispatch.java     |   31 +
 .../internal/dispatch/DispatchException.java       |   23 +
 .../internal/dispatch/DispatchFailureHandler.java  |   23 +
 .../dispatch/ExceptionTrackingFailureHandler.java  |   47 +
 .../internal/dispatch/FailureHandlingDispatch.java |   34 +
 .../gradle/internal/dispatch/MethodInvocation.java |   68 +
 .../internal/dispatch/ProxyDispatchAdapter.java    |   97 +
 .../java/org/gradle/internal/dispatch/Receive.java |   31 +
 .../internal/dispatch/ReflectionDispatch.java      |   42 +
 .../gradle/internal/dispatch/StreamCompletion.java |   24 +
 .../internal/event/AbstractBroadcastDispatch.java  |    6 +-
 .../gradle/internal/event/BroadcastDispatch.java   |    6 +-
 .../internal/event/DefaultListenerManager.java     |    8 +-
 .../gradle/internal/event/ListenerBroadcast.java   |    8 +-
 .../java/org/gradle/internal/remote/Address.java   |   30 +
 .../gradle/internal/remote/ConnectionAcceptor.java |   33 +
 .../gradle/internal/remote/MessagingClient.java    |   28 +
 .../gradle/internal/remote/MessagingServer.java    |   32 +
 .../gradle/internal/remote/ObjectConnection.java   |   43 +
 .../internal/remote/ObjectConnectionBuilder.java   |   57 +
 .../remote/internal/ConnectCompletion.java         |   32 +
 .../internal/remote/internal/ConnectException.java |   22 +
 .../internal/remote/internal/Connection.java       |   37 +
 .../remote/internal/IncomingConnector.java         |   31 +
 .../internal/KryoBackedMessageSerializer.java      |   37 +
 .../remote/internal/MessageIOException.java        |   22 +
 .../remote/internal/MessageSerializer.java         |   35 +
 .../remote/internal/OutgoingConnector.java         |   27 +
 .../internal/remote/internal/RemoteConnection.java |   42 +
 .../remote/internal/hub/ConnectionSet.java         |   72 +
 .../remote/internal/hub/ConnectionState.java       |   62 +
 .../internal/hub/DefaultMethodArgsSerializer.java  |   79 +
 .../remote/internal/hub/IncomingQueue.java         |   32 +
 .../internal/hub/InterHubMessageSerializer.java    |  122 +
 ...avaSerializationBackedMethodArgsSerializer.java |   62 +
 .../internal/remote/internal/hub/MessageHub.java   |  400 ++
 .../internal/hub/MessageHubBackedClient.java       |   37 +
 .../hub/MessageHubBackedObjectConnection.java      |  131 +
 .../internal/hub/MessageHubBackedServer.java       |   52 +
 .../remote/internal/hub/MethodArgsSerializer.java  |   23 +
 .../internal/hub/MethodInvocationSerializer.java   |  154 +
 .../remote/internal/hub/OutgoingQueue.java         |   51 +
 .../internal/hub/RejectedMessageListener.java      |   27 +
 .../internal/hub/protocol/ChannelIdentifier.java   |   51 +
 .../internal/hub/protocol/ChannelMessage.java      |   45 +
 .../remote/internal/hub/protocol/EndOfStream.java  |   29 +
 .../internal/hub/protocol/InterHubMessage.java     |   39 +
 .../internal/hub/protocol/RejectedMessage.java     |   45 +
 .../remote/internal/hub/protocol/Routable.java     |   21 +
 .../remote/internal/hub/queue/EndPointQueue.java   |   61 +
 .../internal/hub/queue/MultiChannelQueue.java      |   61 +
 .../internal/hub/queue/MultiEndPointQueue.java     |  101 +
 .../internal/hub/queue/QueueInitializer.java       |   39 +
 .../remote/internal/inet/InetAddressFactory.java   |  148 +
 .../remote/internal/inet/InetAddresses.java        |  124 +
 .../remote/internal/inet/InetEndpoint.java         |   31 +
 .../remote/internal/inet/MultiChoiceAddress.java   |   78 +
 .../inet/MultiChoiceAddressSerializer.java         |   54 +
 .../internal/inet/SocketConnectCompletion.java     |   41 +
 .../remote/internal/inet/SocketConnection.java     |  291 ++
 .../remote/internal/inet/SocketInetAddress.java    |   96 +
 .../remote/internal/inet/TcpIncomingConnector.java |  130 +
 .../remote/internal/inet/TcpOutgoingConnector.java |  108 +
 .../remote/services/MessagingServices.java         |   86 +
 .../internal/serialize/BaseSerializerFactory.java  |    1 -
 .../internal/serialize/CausePlaceholder.java       |   23 +
 .../org/gradle/internal/serialize/Decoder.java     |    3 +-
 .../serialize/DefaultSerializerRegistry.java       |   58 +-
 .../org/gradle/internal/serialize/Encoder.java     |    4 +
 .../internal/serialize/ExceptionPlaceholder.java   |  161 +
 .../ExceptionReplacingObjectInputStream.java       |   96 +
 .../ExceptionReplacingObjectOutputStream.java      |   79 +
 .../internal/serialize/FlushableEncoder.java       |    6 +
 .../internal/serialize/HashCodeSerializer.java     |   38 +
 .../gradle/internal/serialize/LongSerializer.java  |   29 -
 .../org/gradle/internal/serialize/Message.java     |   58 +
 .../internal/serialize/ObjectArraySerializer.java  |   43 -
 .../serialize/OutputStreamBackedEncoder.java       |    1 -
 .../internal/serialize/PlaceholderException.java   |   58 +
 .../internal/serialize/SerializerRegistry.java     |   10 +-
 .../internal/serialize/StatefulSerializer.java     |    4 +
 .../serialize/TopLevelExceptionPlaceholder.java    |   29 +
 .../internal/serialize/kryo/JavaSerializer.java    |   62 -
 .../java/org/gradle/messaging/actor/Actor.java     |   62 -
 .../org/gradle/messaging/actor/ActorFactory.java   |   35 -
 .../actor/internal/DefaultActorFactory.java        |  161 -
 .../gradle/messaging/dispatch/AsyncDispatch.java   |  193 -
 .../gradle/messaging/dispatch/AsyncReceive.java    |  204 -
 .../dispatch/ContextClassLoaderDispatch.java       |   37 -
 .../dispatch/ContextClassLoaderProxy.java          |   37 -
 .../gradle/messaging/dispatch/DelayedReceive.java  |  161 -
 .../dispatch/DiscardingFailureHandler.java         |   30 -
 .../org/gradle/messaging/dispatch/Dispatch.java    |   29 -
 .../messaging/dispatch/DispatchException.java      |   23 -
 .../messaging/dispatch/DispatchFailureHandler.java |   23 -
 .../dispatch/ExceptionTrackingFailureHandler.java  |   47 -
 .../dispatch/FailureHandlingDispatch.java          |   34 -
 .../messaging/dispatch/MethodInvocation.java       |   68 -
 .../messaging/dispatch/ProxyDispatchAdapter.java   |   97 -
 .../gradle/messaging/dispatch/QueuingDispatch.java |   80 -
 .../org/gradle/messaging/dispatch/Receive.java     |   31 -
 .../messaging/dispatch/ReflectionDispatch.java     |   42 -
 .../java/org/gradle/messaging/remote/Address.java  |   30 -
 .../messaging/remote/ConnectionAcceptor.java       |   33 -
 .../gradle/messaging/remote/MessagingClient.java   |   28 -
 .../gradle/messaging/remote/MessagingServer.java   |   32 -
 .../gradle/messaging/remote/ObjectConnection.java  |   43 -
 .../messaging/remote/ObjectConnectionBuilder.java  |   57 -
 .../messaging/remote/internal/AsyncConnection.java |   39 -
 .../remote/internal/AsyncConnectionAdapter.java    |   84 -
 .../remote/internal/BroadcastSendProtocol.java     |   96 -
 .../remote/internal/BufferingProtocol.java         |   90 -
 .../remote/internal/ChannelLookupProtocol.java     |  105 -
 .../internal/ChannelRegistrationProtocol.java      |   90 -
 .../remote/internal/ConnectCompletion.java         |   37 -
 .../remote/internal/ConnectException.java          |   22 -
 .../messaging/remote/internal/Connection.java      |   37 -
 .../remote/internal/DefaultIncomingBroadcast.java  |   92 -
 .../remote/internal/DefaultMessageSerializer.java  |   65 -
 .../remote/internal/DefaultOutgoingBroadcast.java  |  117 -
 .../remote/internal/DelegatingConnection.java      |   45 -
 .../remote/internal/EagerReceiveBuffer.java        |  244 -
 .../remote/internal/GroupMessageFilter.java        |   48 -
 .../remote/internal/IncomingBroadcast.java         |   20 -
 .../remote/internal/IncomingConnector.java         |   31 -
 .../internal/KryoBackedMessageSerializer.java      |   60 -
 .../gradle/messaging/remote/internal/Message.java  |  220 -
 .../messaging/remote/internal/MessageHub.java      |  199 -
 .../remote/internal/MessageIOException.java        |   22 -
 .../remote/internal/MessageOriginator.java         |   57 -
 .../remote/internal/MessageSerializer.java         |   37 -
 .../remote/internal/MessagingServices.java         |  153 -
 .../MethodInvocationMarshallingDispatch.java       |   60 -
 .../MethodInvocationUnmarshallingDispatch.java     |   62 -
 .../remote/internal/OutgoingBroadcast.java         |   20 -
 .../remote/internal/OutgoingConnector.java         |   27 -
 .../remote/internal/OutgoingMultiplex.java         |   33 -
 .../remote/internal/PlaceholderException.java      |   57 -
 .../gradle/messaging/remote/internal/Protocol.java |   53 -
 .../messaging/remote/internal/ProtocolContext.java |   39 -
 .../messaging/remote/internal/ProtocolStack.java   |  323 --
 .../messaging/remote/internal/ReceiveProtocol.java |  113 -
 .../remote/internal/RemoteConnection.java          |   40 -
 .../remote/internal/RemoteDisconnectProtocol.java  |   66 -
 .../gradle/messaging/remote/internal/Router.java   |  238 -
 .../messaging/remote/internal/SendProtocol.java    |  113 -
 .../remote/internal/TypeCastDispatch.java          |   32 -
 .../remote/internal/UnicastSendProtocol.java       |   86 -
 .../messaging/remote/internal/WorkerProtocol.java  |   70 -
 .../remote/internal/hub/ConnectionSet.java         |   67 -
 .../remote/internal/hub/ConnectionState.java       |   62 -
 .../remote/internal/hub/HubStateListener.java      |   32 -
 .../remote/internal/hub/IncomingQueue.java         |   32 -
 .../internal/hub/InterHubMessageSerializer.java    |  122 -
 .../messaging/remote/internal/hub/MessageHub.java  |  387 --
 .../internal/hub/MessageHubBackedClient.java       |   37 -
 .../hub/MessageHubBackedObjectConnection.java      |  112 -
 .../internal/hub/MessageHubBackedServer.java       |   52 -
 .../internal/hub/MethodInvocationSerializer.java   |  142 -
 .../remote/internal/hub/OutgoingQueue.java         |   51 -
 .../internal/hub/RejectedMessageListener.java      |   27 -
 .../internal/hub/protocol/ChannelIdentifier.java   |   51 -
 .../internal/hub/protocol/ChannelMessage.java      |   45 -
 .../internal/hub/protocol/ConnectionClosed.java    |   36 -
 .../hub/protocol/ConnectionEstablished.java        |   36 -
 .../remote/internal/hub/protocol/EndOfStream.java  |   29 -
 .../internal/hub/protocol/InterHubMessage.java     |   39 -
 .../internal/hub/protocol/RejectedMessage.java     |   45 -
 .../remote/internal/hub/protocol/Routable.java     |   21 -
 .../remote/internal/hub/queue/EndPointQueue.java   |   61 -
 .../internal/hub/queue/MultiChannelQueue.java      |   63 -
 .../internal/hub/queue/MultiEndPointQueue.java     |  101 -
 .../internal/hub/queue/QueueInitializer.java       |   56 -
 .../remote/internal/inet/InetAddressFactory.java   |  284 --
 .../remote/internal/inet/InetEndpoint.java         |   31 -
 .../remote/internal/inet/MultiChoiceAddress.java   |   77 -
 .../remote/internal/inet/MulticastConnection.java  |  105 -
 .../internal/inet/SocketConnectCompletion.java     |   42 -
 .../remote/internal/inet/SocketConnection.java     |  246 -
 .../remote/internal/inet/SocketInetAddress.java    |   68 -
 .../remote/internal/inet/TcpIncomingConnector.java |  128 -
 .../remote/internal/inet/TcpOutgoingConnector.java |  110 -
 .../internal/protocol/AbstractPayloadMessage.java  |   42 -
 .../remote/internal/protocol/ChannelAvailable.java |   57 -
 .../internal/protocol/ChannelUnavailable.java      |   58 -
 .../internal/protocol/ConsumerAvailable.java       |   36 -
 .../remote/internal/protocol/ConsumerMessage.java  |   64 -
 .../remote/internal/protocol/ConsumerReady.java    |   24 -
 .../remote/internal/protocol/ConsumerStopped.java  |   24 -
 .../remote/internal/protocol/ConsumerStopping.java |   24 -
 .../internal/protocol/ConsumerUnavailable.java     |   24 -
 .../remote/internal/protocol/DiscoveryMessage.java |   54 -
 .../protocol/DiscoveryProtocolSerializer.java      |  191 -
 .../remote/internal/protocol/EndOfStreamEvent.java |   20 -
 .../remote/internal/protocol/LookupRequest.java    |   51 -
 .../remote/internal/protocol/MessageCredits.java   |   53 -
 .../remote/internal/protocol/MethodMetaInfo.java   |  131 -
 .../internal/protocol/ParticipantAvailable.java    |   70 -
 .../internal/protocol/ParticipantUnavailable.java  |   58 -
 .../remote/internal/protocol/PayloadMessage.java   |   24 -
 .../internal/protocol/ProducerAvailable.java       |   36 -
 .../remote/internal/protocol/ProducerMessage.java  |   64 -
 .../remote/internal/protocol/ProducerReady.java    |   24 -
 .../remote/internal/protocol/ProducerStopped.java  |   24 -
 .../internal/protocol/ProducerUnavailable.java     |   24 -
 .../internal/protocol/RemoteMethodInvocation.java  |   65 -
 .../remote/internal/protocol/Request.java          |   63 -
 .../remote/internal/protocol/RoutableMessage.java  |   23 -
 .../internal/protocol/RouteAvailableMessage.java   |   33 -
 .../internal/protocol/RouteUnavailableMessage.java |   20 -
 .../remote/internal/protocol/StatelessMessage.java |   42 -
 .../remote/internal/protocol/UnknownMessage.java   |   30 -
 .../remote/internal/protocol/WorkerStopped.java    |   42 -
 .../remote/internal/protocol/WorkerStopping.java   |   19 -
 .../actor/internal/DefaultActorFactorySpec.groovy  |  306 ++
 .../internal/dispatch/AsyncDispatchTest.groovy     |  239 +
 .../dispatch/ContextClassLoaderDispatchTest.groovy |   70 +
 .../ExceptionTrackingFailureHandlerTest.groovy     |   61 +
 .../dispatch/FailureHandlingDispatchTest.groovy    |   57 +
 .../internal/dispatch/MethodInvocationTest.groovy  |   45 +
 .../dispatch/ProxyDispatchAdapterTest.groovy       |   62 +
 .../internal/event/ListenerBroadcastTest.groovy    |  265 +
 .../internal/event/ListenerBroadcastTest.java      |  268 -
 .../internal/remote/internal/TestConnection.groovy |   60 +
 .../remote/internal/hub/ConnectionSetTest.groovy   |   83 +
 .../hub/DefaultMethodArgsSerializerTest.groovy     |   43 +
 .../hub/InterHubMessageSerializerTest.groovy       |  124 +
 ...ializationBackedMethodArgsSerializerTest.groovy |   43 +
 .../internal/hub/MessageHubBackedClientTest.groovy |   59 +
 .../MessageHubBackedObjectConnectionTest.groovy    |   84 +
 .../internal/hub/MessageHubBackedServerTest.groovy |   70 +
 .../remote/internal/hub/MessageHubTest.groovy      |  722 +++
 .../hub/MethodInvocationSerializerTest.groovy      |  137 +
 .../hub/protocol/ChannelIdentifierTest.groovy      |   34 +
 .../internal/hub/queue/AbstractQueueTest.groovy    |   53 +
 .../hub/queue/MultiChannelQueueTest.groovy         |  130 +
 .../hub/queue/MultiEndPointQueueTest.groovy        |  165 +
 .../internal/hub/queue/QueueInitializerTest.groovy |   48 +
 .../internal/inet/InetAddressFactoryTest.groovy    |  109 +
 .../remote/internal/inet/InetAddressesTest.groovy  |   46 +
 .../inet/MultiChoiceAddressSerializerTest.groovy   |   27 +
 .../internal/inet/MultiChoiceAddressTest.groovy    |   52 +
 .../internal/inet/SocketInetAddressTest.groovy     |   43 +
 .../remote/internal/inet/TcpConnectorTest.groovy   |  324 ++
 .../remote/services/MessagingServicesTest.groovy   |   38 +
 .../serialize/DefaultSerializerRegistryTest.groovy |   49 +-
 .../internal/serialize/LongSerializerTest.groovy   |   34 -
 .../gradle/internal/serialize/MessageTest.groovy   |  410 ++
 .../serialize/ObjectArraySerializerTest.groovy     |   31 -
 .../serialize/PlaceholderExceptionTest.groovy      |   42 +
 .../actor/internal/DefaultActorFactorySpec.groovy  |  306 --
 .../messaging/dispatch/AsyncDispatchTest.groovy    |  210 -
 .../messaging/dispatch/AsyncReceiveTest.groovy     |  142 -
 .../dispatch/ContextClassLoaderDispatchTest.groovy |   81 -
 .../ExceptionTrackingFailureHandlerTest.groovy     |   61 -
 .../dispatch/FailureHandlingDispatchTest.groovy    |   57 -
 .../messaging/dispatch/MethodInvocationTest.groovy |   45 -
 .../dispatch/ProxyDispatchAdapterTest.groovy       |   61 -
 .../messaging/dispatch/QueuingDispatchTest.groovy  |   78 -
 .../internal/AsyncConnectionAdapterTest.groovy     |  103 -
 .../internal/BroadcastSendProtocolTest.groovy      |  139 -
 .../remote/internal/BufferingProtocolTest.groovy   |  190 -
 .../internal/ChannelLookupProtocolTest.groovy      |  140 -
 .../ChannelRegistrationProtocolTest.groovy         |   97 -
 .../remote/internal/EagerReceiveBufferTest.groovy  |  135 -
 .../remote/internal/GroupMessageFilterTest.groovy  |   57 -
 .../KryoBackedMessageSerializerTest.groovy         |   43 -
 .../messaging/remote/internal/MessageTest.groovy   |  410 --
 .../remote/internal/MessagingServicesTest.groovy   |   48 -
 .../MethodInvocationMarshallingDispatchTest.groovy |   85 -
 ...ethodInvocationUnmarshallingDispatchTest.groovy |   97 -
 .../internal/PlaceholderExceptionTest.groovy       |   42 -
 .../remote/internal/ProtocolStackTest.groovy       |  385 --
 .../remote/internal/ReceiveProtocolTest.groovy     |  148 -
 .../internal/RemoteDisconnectProtocolTest.groovy   |  131 -
 .../messaging/remote/internal/RouterTest.groovy    |  303 --
 .../remote/internal/SendProtocolTest.groovy        |  196 -
 .../remote/internal/UnicastSendProtocolTest.groovy |  134 -
 .../remote/internal/WorkerProtocolTest.groovy      |   96 -
 .../remote/internal/hub/ConnectionSetTest.groovy   |   84 -
 .../hub/InterHubMessageSerializerTest.groovy       |  124 -
 .../internal/hub/MessageHubBackedClientTest.groovy |   62 -
 .../internal/hub/MessageHubBackedServerTest.groovy |   73 -
 .../remote/internal/hub/MessageHubTest.groovy      |  680 ---
 .../hub/MethodInvocationSerializerTest.groovy      |  122 -
 .../hub/protocol/ChannelIdentifierTest.groovy      |   34 -
 .../internal/hub/queue/AbstractQueueTest.groovy    |   46 -
 .../hub/queue/MultiChannelQueueTest.groovy         |  132 -
 .../hub/queue/MultiEndPointQueueTest.groovy        |  165 -
 .../internal/hub/queue/QueueInitializerTest.groovy |   87 -
 .../internal/inet/InetAddressFactoryTest.groovy    |   55 -
 .../internal/inet/MultiChoiceAddressTest.groovy    |   49 -
 .../internal/inet/MulticastConnectionTest.groovy   |   90 -
 .../internal/inet/SocketInetAddressTest.groovy     |   43 -
 .../remote/internal/inet/TcpConnectorTest.groovy   |  326 --
 .../protocol/AbstractPayloadMessageTest.groovy     |   69 -
 .../DiscoveryProcotolSerializerTest.groovy         |   94 -
 .../protocol/RemoteMethodInvocationTest.java       |   37 -
 .../gradle/internal/actor/TestActorFactory.java    |   44 +
 .../internal/serialize/SerializerSpec.groovy       |    1 -
 subprojects/model-core/model-core.gradle           |   19 +-
 .../model/ConfigurationCycleIntegrationTest.groovy |   12 +-
 .../gradle/model/ModelMapIntegrationTest.groovy    |  355 ++
 .../gradle/model/ModelReuseIntegrationTest.groovy  |  170 -
 .../ModelRuleBindingFailureIntegrationTest.groovy  |   27 +-
 ...odelRuleBindingValidationIntegrationTest.groovy |    2 +-
 .../model/ModelRuleCachingIntegrationTest.groovy   |    2 +-
 .../ModelRuleValidationIntegrationTest.groovy      |   10 +-
 .../model/PluginRuleSourceIntegrationTest.groovy   |  403 --
 ...rceAppliedAsProjectPluginIntegrationTest.groovy |  445 ++
 ...SourceAppliedByRuleMethodIntegrationTest.groovy |  657 +++
 ...eAppliedToModelMapElementIntegrationTest.groovy |  158 +
 .../gradle/model/RuleSourceIntegrationTest.groovy  |   37 +
 .../model/ScalarCollectionIntegrationTest.groovy   |   90 +
 .../model/ScopedRuleSourceIntegrationTest.groovy   |  157 -
 .../model/UnmanagedElementIntegrationTest.groovy   |   56 +
 ...nterfaceBackedManagedTypeIntegrationTest.groovy |   87 +-
 ...validManagedModelMutationIntegrationTest.groovy |   55 +-
 .../InvalidManagedModelRuleIntegrationTest.groovy  |   30 +-
 ...GroovyScalarConfigurationIntegrationTest.groovy |  120 +-
 .../managed/ManagedModelMapIntegrationTest.groovy  |  170 +-
 .../ManagedScalarCollectionsIntegrationTest.groovy |  116 +-
 .../model/managed/ManagedSetIntegrationTest.groovy |  546 ---
 ...peWithUnmanagedPropertiesIntegrationTest.groovy |   52 +-
 .../model/managed/ModelSetIntegrationTest.groovy   |  198 +-
 ...ScalarTypesInManagedModelIntegrationTest.groovy |   52 +-
 ...managedCollectionPropertyIntegrationTest.groovy |    4 +-
 .../src/main/java/org/gradle/model/Each.java       |   33 +
 .../InvalidModelRuleDeclarationException.java      |    5 -
 .../main/java/org/gradle/model/ModelElement.java   |   38 +
 .../src/main/java/org/gradle/model/ModelMap.java   |  166 +-
 .../src/main/java/org/gradle/model/ModelSet.java   |    5 +-
 .../org/gradle/model/ModelViewClosedException.java |   12 +-
 .../gradle/model/ReadOnlyModelViewException.java   |   52 +
 .../src/main/java/org/gradle/model/RuleInput.java  |   33 +
 .../src/main/java/org/gradle/model/RuleSource.java |    4 +
 .../src/main/java/org/gradle/model/RuleTarget.java |   33 +
 .../src/main/java/org/gradle/model/Rules.java      |   33 +
 .../gradle/model/WriteOnlyModelViewException.java  |   28 +-
 .../gradle/model/collection/CollectionBuilder.java |  238 -
 .../org/gradle/model/collection/ManagedSet.java    |   62 -
 .../ChildNodeInitializerStrategyAccessor.java      |   24 -
 .../ChildNodeInitializerStrategyAccessors.java     |   42 -
 .../internal/ModelMapModelProjection.java          |  189 -
 .../org/gradle/model/collection/package-info.java  |   20 -
 .../model/internal/core/AbstractModelAction.java   |   13 +-
 .../internal/core/AbstractModelActionWithView.java |   11 +-
 .../model/internal/core/BaseInstanceFactory.java   |  353 --
 .../internal/core/ChainingModelProjection.java     |   78 +-
 .../core/ChildNodeInitializerStrategy.java         |    3 +-
 .../core/ChildNodeInitializerStrategyAccessor.java |   21 +
 .../ChildNodeInitializerStrategyAccessors.java     |   44 +
 .../internal/core/DefaultModelRegistration.java    |   49 +-
 .../model/internal/core/DefaultModelViewState.java |   26 +-
 .../core/DefaultNodeInitializerRegistry.java       |   69 +-
 .../core/DependencyOnlyExtractedModelRule.java     |   38 -
 .../model/internal/core/EmptyModelProjection.java  |   17 +-
 .../internal/core/EmptyReferenceProjection.java    |   40 +
 .../model/internal/core/ExtractedModelAction.java  |   49 -
 .../internal/core/ExtractedModelRegistration.java  |   45 -
 .../model/internal/core/ExtractedModelRule.java    |   27 -
 .../internal/core/FactoryBasedNodeInitializer.java |  187 -
 .../org/gradle/model/internal/core/Hidden.java     |   31 +
 .../model/internal/core/InstanceFactory.java       |   66 -
 .../model/internal/core/InstanceModelView.java     |    3 +
 .../gradle/model/internal/core/ModelAdapter.java   |    8 +-
 .../model/internal/core/ModelMapGroovyView.java    |   11 +
 .../internal/core/ModelMapModelProjection.java     |  150 +
 .../org/gradle/model/internal/core/ModelMaps.java  |   34 +-
 .../org/gradle/model/internal/core/ModelNode.java  |    2 -
 .../org/gradle/model/internal/core/ModelNodes.java |   49 +
 .../org/gradle/model/internal/core/ModelPath.java  |  225 +-
 .../gradle/model/internal/core/ModelPredicate.java |   20 +-
 .../gradle/model/internal/core/ModelPromise.java   |   12 +-
 .../gradle/model/internal/core/ModelReference.java |   28 +-
 .../model/internal/core/ModelRegistration.java     |   15 +-
 .../model/internal/core/ModelRegistrations.java    |  105 +-
 .../org/gradle/model/internal/core/ModelSpec.java  |   30 +
 .../core/ModelTypeInitializationException.java     |   66 +-
 .../model/internal/core/ModelViewFactory.java      |    2 +-
 .../gradle/model/internal/core/ModelViewState.java |    4 +-
 .../model/internal/core/MutableModelNode.java      |   75 +-
 .../model/internal/core/NodeBackedModelMap.java    |  398 +-
 .../model/internal/core/NodeBackedModelSet.java    |   36 +-
 .../internal/core/NodeInitializerContext.java      |   82 +-
 .../internal/core/NodeInitializerRegistry.java     |    4 +-
 .../gradle/model/internal/core/NodePredicate.java  |  117 +
 .../org/gradle/model/internal/core/Service.java    |   53 -
 .../core/SpecializedModelMapProjection.java        |   57 +-
 .../TypeCompatibilityModelProjectionSupport.java   |   69 +-
 .../model/internal/core/TypedModelProjection.java  |   31 +-
 .../internal/core/UnmanagedModelProjection.java    |   36 +-
 .../rule/describe/AbstractModelRuleDescriptor.java |   20 +-
 .../rule/describe/MethodModelRuleDescriptor.java   |   92 +-
 .../core/rule/describe/ModelRuleDescriptor.java    |    8 +-
 .../rule/describe/NestedModelRuleDescriptor.java   |   15 +-
 .../rule/describe/SimpleModelRuleDescriptor.java   |    7 +-
 .../rule/describe/StandardDescriptorFactory.java   |   38 -
 ...AbstractAnnotationDrivenModelRuleExtractor.java |   29 +-
 .../inspect/AbstractExtractedModelRule.java        |   30 +
 .../inspect/AbstractManagedModelInitializer.java   |  147 -
 .../internal/inspect/AbstractMethodRuleAction.java |   56 +
 .../AbstractModelCreationRuleExtractor.java        |   73 +-
 .../AbstractMutationModelRuleExtractor.java        |   50 +-
 ...bstractUnmanagedModelCreationRuleExtractor.java |   94 -
 .../DefaultMethodModelRuleExtractionContext.java   |   76 +
 .../inspect/DefaultMethodRuleDefinition.java       |   64 +-
 .../internal/inspect/DefaultModelRuleInvoker.java  |   30 +-
 ...efaultRuleSourceValidationProblemCollector.java |   69 +
 .../model/internal/inspect/ExtractedModelRule.java |   29 +
 .../internal/inspect/ExtractedRuleSource.java      |   45 +
 .../inspect/FactoryBasedStructNodeInitializer.java |   39 +
 .../FormattingValidationProblemCollector.java      |   96 +
 .../inspect/ManagedChildNodeCreatorStrategy.java   |    8 +-
 .../inspect/ManagedModelCreationRuleExtractor.java |  116 +-
 .../internal/inspect/ManagedModelInitializer.java  |   74 -
 .../internal/inspect/MethodBackedModelAction.java  |   29 +-
 .../inspect/MethodModelRuleApplicationContext.java |   38 +
 .../inspect/MethodModelRuleExtractionContext.java  |   21 +
 .../internal/inspect/MethodModelRuleExtractor.java |   11 +-
 .../inspect/MethodModelRuleExtractors.java         |    6 +-
 .../model/internal/inspect/MethodRuleAction.java   |   31 +
 .../internal/inspect/MethodRuleDefinition.java     |    7 +-
 .../internal/inspect/ModelElementProjection.java   |   61 +
 .../model/internal/inspect/ModelRuleExtractor.java |  588 ++-
 .../inspect/ProjectionOnlyNodeInitializer.java     |    9 +-
 .../ReadonlyImmutableManagedPropertyException.java |    2 -
 .../internal/inspect/RuleApplicationScope.java     |   71 +
 .../inspect/RuleDefinitionRuleExtractor.java       |  122 +
 .../model/internal/inspect/RuleExtractorUtils.java |   58 +
 .../inspect/RuleMethodBackedMutationAction.java    |   39 -
 .../RuleSourceValidationProblemCollector.java      |   27 +
 .../inspect/ServiceModelCreationRuleExtractor.java |   33 -
 .../internal/inspect/StructNodeInitializer.java    |  191 +
 .../UnmanagedModelCreationRuleExtractor.java       |   92 +-
 .../UnmanagedPropertyMissingSetterException.java   |    9 +-
 .../inspect/ValidationProblemCollector.java        |   45 +
 .../manage/binding/AbstractDelegationBinding.java  |   39 +
 .../binding/AbstractStructMethodBinding.java       |   46 +
 .../manage/binding/BridgeMethodBinding.java        |   29 +
 .../manage/binding/DefaultStructBindings.java      |  117 +
 .../manage/binding/DefaultStructBindingsStore.java |  582 +++
 .../manage/binding/DelegateMethodBinding.java      |   29 +
 .../manage/binding/DirectMethodBinding.java        |   39 +
 .../binding/InvalidManagedTypeException.java       |   29 +
 .../internal/manage/binding/ManagedProperty.java   |   76 +
 .../binding/ManagedPropertyMethodBinding.java      |   51 +
 .../binding/StructBindingExtractionContext.java    |   97 +
 .../StructBindingValidationProblemCollector.java   |   35 +
 .../internal/manage/binding/StructBindings.java    |   99 +
 .../manage/binding/StructBindingsStore.java        |   25 +
 .../manage/binding/StructMethodBinding.java        |   34 +
 .../binding/StructMethodImplementationBinding.java |   23 +
 .../manage/instance/GeneratedViewState.java        |   39 +
 .../manage/instance/ManagedProxyFactory.java       |   76 +-
 .../manage/instance/ModelElementState.java         |   12 +-
 .../manage/projection/ManagedModelProjection.java  |  117 +-
 .../manage/schema/AbstractStructSchema.java        |   28 +-
 .../manage/schema/ManagedImplStructSchema.java     |   10 +-
 .../internal/manage/schema/ModelProperty.java      |   79 +-
 .../internal/manage/schema/ModelSchemaStore.java   |    2 +
 .../internal/manage/schema/RuleSourceSchema.java   |   35 +
 .../manage/schema/ScalarCollectionSchema.java      |   17 +-
 .../model/internal/manage/schema/StructSchema.java |    8 +
 .../manage/schema/UnmanagedImplStructSchema.java   |   11 +-
 .../manage/schema/cache/ModelSchemaCache.java      |   66 +-
 ...CollectionNodeInitializerExtractionSupport.java |    7 +-
 .../manage/schema/extract/CollectionStrategy.java  |   36 -
 .../schema/extract/ConstructableTypesRegistry.java |   25 -
 .../extract/DefaultConstructableTypesRegistry.java |   44 -
 .../DefaultModelSchemaExtractionContext.java       |   59 +-
 .../extract/DefaultModelSchemaExtractor.java       |  118 +
 .../schema/extract/DefaultModelSchemaStore.java    |   29 +-
 .../manage/schema/extract/EnumStrategy.java        |    1 +
 ...toryBasedNodeInitializerExtractionStrategy.java |   52 -
 ...sedStructNodeInitializerExtractionStrategy.java |   95 +
 .../InvalidManagedModelElementTypeException.java   |   47 +-
 .../schema/extract/JavaUtilCollectionStrategy.java |   69 +
 .../schema/extract/JdkValueTypeStrategy.java       |   10 +-
 ...mplStructNodeInitializerExtractionStrategy.java |   21 +-
 .../schema/extract/ManagedImplStructStrategy.java  |  332 +-
 .../schema/extract/ManagedProxyClassGenerator.java |  477 +-
 ...anagedSetNodeInitializerExtractionStrategy.java |  116 -
 .../manage/schema/extract/ManagedSetStrategy.java  |   30 -
 .../internal/manage/schema/extract/MethodType.java |   87 -
 .../ModelMapNodeInitializerExtractionStrategy.java |   12 +-
 .../manage/schema/extract/ModelMapStrategy.java    |   18 +-
 .../extract/ModelPropertyExtractionContext.java    |   65 +-
 .../extract/ModelPropertyExtractionResult.java     |   20 +-
 .../extract/ModelSchemaExtractionContext.java      |   10 +-
 .../extract/ModelSchemaExtractionStrategy.java     |    7 +
 .../schema/extract/ModelSchemaExtractor.java       |  104 +-
 .../manage/schema/extract/ModelSchemaUtils.java    |   80 +-
 .../ModelSetNodeInitializerExtractionStrategy.java |    8 +-
 .../manage/schema/extract/ModelSetStrategy.java    |   50 +-
 .../extract/NodeInitializerExtractionStrategy.java |    3 +-
 .../manage/schema/extract/PrimitiveStrategy.java   |    5 +-
 .../manage/schema/extract/PrimitiveTypes.java      |   49 +
 .../extract/PropertyAccessorExtractionContext.java |   13 +-
 .../RuleSourceSchemaExtractionStrategy.java        |   45 +
 .../schema/extract/ScalarCollectionModelView.java  |  109 +
 ...ollectionNodeInitializerExtractionStrategy.java |  224 +-
 .../schema/extract/ScalarCollectionStrategy.java   |   60 -
 .../manage/schema/extract/ScalarTypes.java         |   25 +-
 .../manage/schema/extract/SetStrategy.java         |   58 -
 .../extract/SpecializedMapNodeInitializer.java     |   78 +
 ...alizedMapNodeInitializerExtractionStrategy.java |   49 +-
 .../schema/extract/SpecializedMapStrategy.java     |    5 +-
 .../StructSchemaExtractionStrategySupport.java     |  188 +-
 .../extract/UnmanagedCollectionStrategy.java       |   46 -
 .../extract/UnmanagedImplStructStrategy.java       |   54 +-
 .../UnmanagedModelElementTypeException.java        |   23 -
 .../method/WeaklyTypeReferencingMethod.java        |   38 +-
 .../model/internal/registry/BindingPredicate.java  |   18 +-
 .../internal/registry/DefaultModelRegistry.java    |  776 +--
 .../model/internal/registry/ModelBinding.java      |    5 -
 .../model/internal/registry/ModelElementNode.java  |  290 ++
 .../gradle/model/internal/registry/ModelGraph.java |   52 +-
 .../model/internal/registry/ModelListener.java     |    7 +-
 .../model/internal/registry/ModelNodeInternal.java |  209 +-
 .../registry/ModelPathSuggestionProvider.java      |    2 +
 .../internal/registry/ModelReferenceNode.java      |   88 +-
 .../model/internal/registry/ModelRegistry.java     |   39 +-
 .../internal/registry/ModelRegistryInternal.java   |   34 +
 .../registry/OneOfTypeBinderCreationListener.java  |    1 +
 .../registry/PathBinderCreationListener.java       |    7 +-
 .../model/internal/registry/RuleBindings.java      |  262 +-
 .../model/internal/registry/RuleContext.java       |   21 +-
 .../model/internal/registry/SingleNodeBinding.java |   20 -
 .../report/IncompatibleTypeReferenceReporter.java  |   12 +-
 .../model/internal/type/ClassTypeWrapper.java      |   30 +-
 .../internal/type/GenericArrayTypeWrapper.java     |   24 +-
 .../org/gradle/model/internal/type/ModelType.java  |  149 +-
 .../org/gradle/model/internal/type/ModelTypes.java |   73 +-
 .../internal/type/ParameterizedTypeWrapper.java    |  123 +-
 .../internal/type/TypeVariableTypeWrapper.java     |  126 +-
 .../gradle/model/internal/type/TypeWrapper.java    |   11 +-
 .../model/internal/type/WildcardTypeWrapper.java   |   36 +-
 .../model/internal/type/WildcardWrapper.java       |   26 +
 .../typeregistration/BaseInstanceFactory.java      |  410 ++
 .../internal/typeregistration/InstanceFactory.java |   57 +
 .../main/java/org/gradle/model/package-info.java   |    3 +-
 .../gradle/model/ManagedModelMapTypesTest.groovy   |   74 +-
 .../org/gradle/model/ManagedNamedTest.groovy       |   29 +-
 .../model/ManagedNodeBackedModelMapTest.groovy     |  973 +---
 .../org/gradle/model/NodeBackedModelMapSpec.groovy | 1224 +++++
 .../model/UnmanagedNodeBackedModelMapTest.groovy   |  835 +---
 .../internal/core/BaseInstanceFactoryTest.groovy   |  287 --
 .../InstanceBackedModelRegistrationTest.groovy     |    8 +-
 .../model/internal/core/ModelPathTest.groovy       |   30 +-
 .../model/internal/core/ModelTypeJavaTest.java     |    8 +
 .../model/internal/core/ModelTypeTest.groovy       |  388 +-
 .../core/UnmanagedModelProjectionTest.groovy       |   11 +-
 .../describe/MethodModelRuleDescriptorTest.groovy  |   25 +-
 .../describe/StandardDescriptorFactoryTest.groovy  |   38 -
 .../inspect/AbstractJavaPropertyRules.java         |   46 +
 ...herManagedWithPropertyOfInvalidManagedType.java |    3 +-
 .../ClassModelRuleSourceValidationTest.groovy      |   31 +-
 ...FormattingValidationProblemCollectorTest.groovy |  109 +
 .../internal/inspect/ManagedAnnotatedClass.java    |   23 -
 .../inspect/ManagedModelInitializerTest.groovy     |   74 +-
 .../ManagedWithPropertyOfInvalidManagedType.java   |    3 +-
 .../ManagedWithReferenceOfInvalidManagedType.java  |    5 +-
 .../internal/inspect/ModelRuleBindingTest.groovy   |   59 +-
 .../internal/inspect/ModelRuleExtractorTest.groovy |  504 +-
 .../inspect/MutationRuleExecutionOrderTest.groovy  |   18 +-
 .../gradle/model/internal/inspect/OuterClass.java  |    3 -
 .../inspect/RuleDefinitionRuleExtractorTest.groovy |  130 +
 .../model/internal/inspect/WithGroovyMeta.groovy   |   41 +
 .../binding/DefaultStructBindingsStoreTest.groovy  |  694 +++
 .../manage/instance/ManagedProxyTest.groovy        |   49 -
 .../AbstractCollectionModelProjectionTest.groovy   |   26 +-
 .../projection/ModelSetModelProjectionTest.groovy  |    8 +-
 .../schema/extract/CustomTestAnnotation.groovy     |   25 +
 .../schema/extract/CustomTestAnnotation2.groovy    |   23 +
 .../extract/DefaultModelSchemaExtractorTest.groovy | 1056 ++++
 .../extract/DefaultModelSchemaStoreTest.groovy     |   35 +-
 .../extract/JavaUtilCollectionStrategyTest.groovy  |   64 +
 .../extract/ManagedImplStructStrategyTest.groovy   |    4 +-
 .../extract/ManagedProxyClassGeneratorTest.groovy  |  252 +-
 .../schema/extract/ModelMapStrategyTest.groovy     |    4 +-
 .../schema/extract/ModelSchemaExtractorTest.groovy | 1552 ------
 .../schema/extract/ModelSchemaUtilsTest.groovy     |   25 +-
 .../schema/extract/ModelSetStrategyTest.groovy     |    4 +-
 .../schema/extract/PrimitiveTypesTest.groovy       |   75 +
 .../RuleSourceSchemaExtractionStrategyTest.groovy  |   60 +
 .../extract/ScalarCollectionStrategyTest.groovy    |   53 -
 .../extract/ScalarTypesInManagedModelTest.groovy   |    4 +-
 .../extract/SpecializedModelMapStrategyTest.groovy |    4 +-
 ...TypeWithManagedSuperTypeExtractionStrategy.java |   28 -
 .../extract/UnmanagedCollectionStrategyTest.groovy |   42 -
 .../extract/UnmanagedImplStructStrategyTest.groovy |    4 +-
 .../model/internal/registry/BeanRules.groovy       |   28 +
 .../registry/DefaultModelRegistryTest.groovy       |  352 +-
 .../internal/registry/EachBeanViaDirectRule.groovy |   28 +
 .../internal/registry/EachBeanViaRuleSource.groovy |   27 +
 .../model/internal/registry/ModelGraphTest.groovy  |  204 +-
 .../registry/ModelNodeReplacementTest.groovy       |   61 -
 .../registry/ModelRegistryEphemeralNodeTest.groovy |  209 -
 .../model/internal/registry/RegistrySpec.groovy    |   62 +-
 .../internal/registry/RuleBindingsTest.groovy      |  329 +-
 .../model/internal/registry/ScopedRuleTest.groovy  |   52 +-
 .../model/internal/type/ModelTypesTest.groovy      |   35 +
 .../BaseInstanceFactoryTest.groovy                 |  348 ++
 .../model/internal/fixture/ModelActionBuilder.java |   16 +-
 .../internal/fixture/ModelRegistrationBuilder.java |  182 -
 .../internal/fixture/ModelRegistryHelper.java      |    6 +-
 .../fixture/ModelRegistryHelperExtension.java      |  227 +-
 .../internal/fixture/ProjectRegistrySpec.groovy    |   65 +-
 .../fixture/TestManagedProxyFactory.groovy         |   23 -
 .../fixture/TestNodeInitializerRegistry.java       |   39 -
 subprojects/model-groovy/model-groovy.gradle       |    2 +
 .../internal/NonTransformedModelDslBacking.java    |   16 +-
 .../dsl/internal/TransformedModelDslBacking.java   |   10 +-
 .../transform/ClosureBackedRuleFactory.java        |    2 +-
 .../ClosureCreationInterceptingVerifier.java       |    1 +
 .../model/dsl/internal/transform/RuleVisitor.java  |    6 +-
 .../model/dsl/internal/transform/RulesVisitor.java |    3 +-
 .../dsl/internal/transform/SourceLocation.java     |    4 +-
 subprojects/native/native.gradle                   |   10 +-
 .../JansiLibraryFactoryIntegrationTest.groovy      |   61 +
 .../nativeintegration/ProcessEnvironment.java      |   14 +
 .../nativeintegration/console/ConsoleMetaData.java |    2 +-
 .../console/FallbackConsoleMetaData.java           |    3 +
 .../console/NativePlatformConsoleDetector.java     |    4 +-
 .../console/NativePlatformConsoleMetaData.java     |    3 +
 .../console/NoOpConsoleDetector.java               |    1 +
 .../console/UnixConsoleMetaData.java               |    3 +
 .../console/WindowsConsoleDetector.java            |    1 +
 .../nativeintegration/filesystem/FileSystem.java   |    8 +
 .../nativeintegration/filesystem/Symlink.java      |    2 +
 .../filesystem/jdk7/Jdk7FileCanonicalizer.java     |    1 +
 .../filesystem/jdk7/Jdk7Symlink.java               |   95 +
 .../jdk7/PosixJdk7FilePermissionHandler.java       |    2 +
 .../filesystem/jdk7/WindowsJdk7Symlink.java        |   39 +
 .../filesystem/services/EmptyChmod.java            |    1 +
 .../services/FallbackFileCanonicalizer.java        |    1 +
 .../filesystem/services/FallbackStat.java          |    1 +
 .../filesystem/services/FileSystemServices.java    |    7 +-
 .../filesystem/services/GenericFileSystem.java     |   10 +
 .../services/NativePlatformBackedChmod.java        |    1 +
 .../services/NativePlatformBackedStat.java         |    1 +
 .../services/NativePlatformBackedSymlink.java      |    8 +
 .../services/UnsupportedFilePermissions.java       |    2 +
 .../filesystem/services/UnsupportedSymlink.java    |    7 +
 .../filesystem/services/WindowsSymlink.java        |    7 +
 .../jansi/DefaultJansiRuntimeResolver.java         |   60 +
 .../jansi/JansiBootPathConfigurer.java             |   77 +
 .../nativeintegration/jansi/JansiLibrary.java      |   43 +
 .../jansi/JansiLibraryFactory.java                 |   45 +
 .../jansi/JansiOperatingSystemSupport.java         |   47 +
 .../jansi/JansiRuntimeResolver.java                |   23 +
 .../nativeintegration/jansi/JansiStorage.java      |   38 +
 .../jansi/JansiStorageLocator.java                 |   45 +
 .../jna/JnaBootPathConfigurer.java                 |   66 -
 .../jna/UnsupportedEnvironment.java                |   58 +-
 .../AbstractProcessEnvironment.java                |   14 +
 .../NativePlatformBackedProcessEnvironment.java    |    7 +
 .../nativeintegration/services/NativeServices.java |   45 +-
 .../NativePlatformConsoleDetectorTest.groovy       |   16 +
 .../filesystem/jdk7/Jdk7SymlinkTest.groovy         |   58 +
 .../jdk7/PosixFilePermissionConverterTest.groovy   |    7 +-
 .../services/UnsupportedFilePermissionsTest.groovy |    4 +-
 .../jansi/JansiLibraryFactoryTest.groovy           |   86 +
 .../jansi/JansiStorageLocatorTest.groovy           |   58 +
 .../NativeServicesInitializationTest.groovy        |    3 +
 subprojects/open-api/open-api.gradle               |    2 +
 ...CrossVersionCompatibilityIntegrationTest.groovy |    3 +-
 .../plugins/osgi/OsgiPluginIntegrationSpec.groovy  |  109 +-
 .../internal/plugins/osgi/DefaultOsgiManifest.java |  404 --
 .../org/gradle/api/plugins/osgi/OsgiPlugin.groovy  |   42 -
 .../api/plugins/osgi/OsgiPluginConvention.java     |   94 -
 .../plugins/osgi/ContainedVersionAnalyzer.java     |    0
 .../plugins/osgi/DefaultAnalyzerFactory.java       |    0
 .../internal/plugins/osgi/DefaultOsgiManifest.java |  404 ++
 .../api/internal/plugins/osgi/OsgiHelper.java      |    0
 .../org/gradle/api/plugins/osgi/OsgiManifest.java  |    0
 .../org/gradle/api/plugins/osgi/OsgiPlugin.java    |   48 +
 .../api/plugins/osgi/OsgiPluginConvention.java     |   94 +
 .../org/gradle/api/plugins/osgi/package-info.java  |    0
 .../plugins/osgi/OsgiPluginConventionTest.groovy   |   13 +-
 .../gradle/api/plugins/osgi/OsgiPluginTest.groovy  |   14 +-
 subprojects/performance/performance.gradle         |  634 +--
 .../performance/src/configPlugin/ConfigPlugin.java |   31 -
 .../performance/CleanBuildPerformanceTest.groovy   |   48 -
 .../ConfigurationPerformanceTest.groovy            |   49 -
 .../performance/DaemonPerformanceTest.groovy       |   52 -
 .../DependencyReportPerformanceTest.groovy         |   48 -
 .../DependencyResolutionStressTest.groovy          |  285 --
 .../performance/FirstBuildPerformanceTest.groovy   |   48 -
 .../IdeIntegrationPerformanceTest.groovy           |   72 -
 .../JavaSoftwareModelBuildPerformanceTest.groovy   |  105 -
 ...wareModelCompileAvoidancePerformanceTest.groovy |   70 -
 ...oftwareModelConfigurationPerformanceTest.groovy |   54 -
 .../JavaSoftwareModelSourceFileUpdater.groovy      |  210 -
 .../ManyEmptyProjectsHelpPerformanceTest.groovy    |   44 -
 .../MonolithicNativePluginPerformanceTest.groovy   |  158 -
 .../performance/NativeBuildPerformanceTest.groovy  |   65 -
 .../NativeParallelPerformanceTest.groovy           |   47 -
 .../NativeScenarioPerformanceTest.groovy           |   85 -
 .../OldJavaPluginBigProjectPerformanceTest.groovy  |   54 -
 .../OldVsNewJavaPluginPerformanceTest.groovy       |   92 -
 .../ProjectDependenciesPerformanceTest.groovy      |   42 -
 .../TestExecutionPerformanceTest.groovy            |   51 -
 .../UpToDateBuildPerformanceTest.groovy            |   48 -
 .../performance/VariantsPerformanceTest.groovy     |  147 -
 .../AbstractAndroidPerformanceTest.groovy          |   32 +
 .../performance/BaseJavalSourceFileUpdater.groovy  |  148 +
 .../DependencyReportPerformanceTest.groovy         |   51 +
 .../DependencyResolutionPerformanceTest.groovy     |   51 +
 .../EnterpriseJavaBuildPerformanceTest.groovy      |  102 +
 .../performance/FirstBuildPerformanceTest.groovy   |   44 +
 .../IdeIntegrationPerformanceTest.groovy           |   74 +
 .../JavaCleanDaemonPerformanceTest.groovy          |   77 +
 .../JavaConfigurationDaemonPerformanceTest.groovy  |   75 +
 .../JavaConfigurationPerformanceTest.groovy        |   52 +
 .../JavaFullAssembleDaemonPerformanceTest.groovy   |   85 +
 .../JavaFullBuildDaemonPerformanceTest.groovy      |   50 +
 .../JavaOldModelSourceFileUpdater.groovy           |   44 +
 ...JavaPartialAssembleDaemonPerformanceTest.groovy |   75 +
 .../JavaSoftwareModelBuildPerformanceTest.groovy   |   46 +
 ...wareModelCompileAvoidancePerformanceTest.groovy |   70 +
 .../JavaSoftwareModelSourceFileUpdater.groovy      |   99 +
 ...ChangesFullAssembleDaemonPerformanceTest.groovy |   46 +
 .../JavaTestExecutionPerformanceTest.groovy        |   66 +
 .../JavaTestGradleVsMavenPerformanceTest.groovy    |   97 +
 ...pToDateFullAssembleDaemonPerformanceTest.groovy |   66 +
 .../JavaUpToDateFullBuildPerformanceTest.groovy    |   72 +
 .../LocalTaskOutputCachePerformanceTest.groovy     |   52 +
 .../ManyEmptyProjectsHelpPerformanceTest.groovy    |   53 +
 .../NativeBuildDependentsPerformanceTest.groovy    |   80 +
 .../performance/NativeBuildPerformanceTest.groovy  |   63 +
 .../NativeParallelPerformanceTest.groovy           |   47 +
 .../NativePreCompiledHeaderPerformanceTest.groovy  |    0
 .../NativeScenarioPerformanceTest.groovy           |   71 +
 .../ParallelBuildPerformanceTest.groovy            |    0
 .../ProjectDependenciesPerformanceTest.groovy      |   44 +
 .../RealLifeAndroidBuildPerformanceTest.groovy     |   51 +
 ...alLifeAndroidStudioMockupPerformanceTest.groovy |   47 +
 .../RealWorldNativePluginPerformanceTest.groovy    |  163 +
 .../performance/SourceUpdateCardinality.java       |   63 +
 .../performance/TaskCreationPerformanceTest.groovy |   48 +
 .../TestExecutionPerformanceTest.groovy            |   52 +
 ...ngApiIdeModelCrossVersionPerformanceTest.groovy |  249 +
 .../performance/VariantsPerformanceTest.groovy     |  116 +
 .../templates/build-event-timestamps/build.gradle  |   25 -
 .../src/templates/config-inject/build.gradle       |   13 +-
 .../src/templates/heap-capture/build.gradle        |   56 -
 .../src/templates/java-config/build.gradle         |    7 -
 .../templates/java-sw-model-project/build.gradle   |   26 +-
 .../googleTest/build.gradle                        |   27 +
 .../1.7.0/include/gtest/gtest-death-test.h         |  294 ++
 .../googleTest/1.7.0/include/gtest/gtest-message.h |  250 +
 .../1.7.0/include/gtest/gtest-param-test.h         | 1421 ++++++
 .../1.7.0/include/gtest/gtest-param-test.h.pump    |  487 ++
 .../1.7.0/include/gtest/gtest-printers.h           |  855 ++++
 .../googleTest/1.7.0/include/gtest/gtest-spi.h     |  232 +
 .../1.7.0/include/gtest/gtest-test-part.h          |  179 +
 .../1.7.0/include/gtest/gtest-typed-test.h         |  259 +
 .../libs/googleTest/1.7.0/include/gtest/gtest.h    | 2291 +++++++++
 .../1.7.0/include/gtest/gtest_pred_impl.h          |  358 ++
 .../googleTest/1.7.0/include/gtest/gtest_prod.h    |   58 +
 .../gtest/internal/gtest-death-test-internal.h     |  319 ++
 .../1.7.0/include/gtest/internal/gtest-filepath.h  |  206 +
 .../1.7.0/include/gtest/internal/gtest-internal.h  | 1158 +++++
 .../include/gtest/internal/gtest-linked_ptr.h      |  233 +
 .../gtest/internal/gtest-param-util-generated.h    | 5143 ++++++++++++++++++++
 .../internal/gtest-param-util-generated.h.pump     |  301 ++
 .../include/gtest/internal/gtest-param-util.h      |  619 +++
 .../1.7.0/include/gtest/internal/gtest-port.h      | 1947 ++++++++
 .../1.7.0/include/gtest/internal/gtest-string.h    |  167 +
 .../1.7.0/include/gtest/internal/gtest-tuple.h     | 1012 ++++
 .../include/gtest/internal/gtest-tuple.h.pump      |  339 ++
 .../1.7.0/include/gtest/internal/gtest-type-util.h | 3331 +++++++++++++
 .../include/gtest/internal/gtest-type-util.h.pump  |  297 ++
 .../libs/googleTest/1.7.0/lib/linux/libgtest.a     |  Bin 0 -> 932906 bytes
 .../libs/googleTest/1.7.0/lib/osx/libgtest.a       |  Bin 0 -> 801248 bytes
 .../src/templates/native-dependents/build.gradle   |   59 +
 .../src/templates/native-dependents/header.h       |   12 +
 .../src/templates/native-dependents/lib.cpp        |    7 +
 .../src/templates/native-dependents/main.cpp       |   11 +
 .../templates/native-dependents/settings.gradle    |    8 +
 .../src/templates/native-dependents/test_main.cpp  |   17 +
 .../src/templates/native-monolithic/common.gradle  |    5 -
 .../templates/native-monolithic/components.gradle  |   12 +-
 .../src/templates/native-scenario/build.gradle     |    6 +-
 .../src/main/groovy/CheckstyleExtension.groovy     |   23 +
 .../src/main/groovy/CheckstyleTaskDefaults.groovy  |   27 +
 .../src/main/groovy/CustomExtension.groovy         |   27 +
 .../buildSrc/src/main/groovy/MyTaskClass.groovy    |   34 +
 .../buildSrc/src/main/groovy/TaskWiring.groovy     |   28 +
 .../src/templates/new-java-plugin/build.gradle     |   47 +-
 .../src/main/groovy/CheckstyleExtension.groovy     |   19 +
 .../src/main/groovy/CustomExtension.groovy         |   20 +
 .../src/main/groovy/FakeCheckstylePlugin.groovy    |   38 +
 .../buildSrc/src/main/groovy/MyTaskClass.groovy    |   34 +
 .../src/templates/old-java-plugin/build.gradle     |   41 -
 .../src/templates/project-with-source/build.gradle |   28 +-
 .../src/templates/root-project/build.gradle        |    0
 .../performance/src/templates/root-project/pom.xml |   11 -
 .../src/templates/task-creation/build.gradle       |   24 +
 .../src/templates/variants-new-model/build.gradle  |    4 +-
 .../src/templates/variants-old-model/build.gradle  |    6 +-
 .../src/templates/with-verbose-junit/Test.java     |    3 +-
 .../gradle/performance/ResultSpecification.groovy  |   70 -
 .../CrossVersionPerformanceResultsTest.groovy      |  287 --
 .../CrossVersionPerformanceTestRunnerTest.groovy   |  115 -
 .../performance/fixture/GCEventParserTest.groovy   |   75 -
 .../fixture/PrettyCalculatorSpec.groovy            |   44 -
 .../gradle/performance/measure/AmountTest.groovy   |  231 -
 .../performance/measure/DataSeriesTest.groovy      |   58 -
 .../results/CompositeResultsStoreTest.groovy       |   46 -
 .../results/CrossBuildResultsStoreTest.groovy      |  155 -
 .../results/CrossVersionResultsStoreTest.groovy    |  234 -
 .../performance/results/ReportGeneratorTest.groovy |   46 -
 .../AbstractCrossBuildPerformanceTest.groovy       |   65 -
 .../AbstractCrossVersionPerformanceTest.groovy     |   57 -
 .../categories/BasicPerformanceTest.java           |   23 -
 .../gradle/performance/categories/Experiment.java  |   25 -
 .../categories/JavaPerformanceTest.java            |   23 -
 .../categories/NativePerformanceTest.java          |   23 -
 .../performance/fixture/BaselineVersion.groovy     |   85 -
 .../performance/fixture/BuildDisplayInfo.groovy    |   39 -
 .../fixture/BuildEventTimestampCollector.java      |   95 -
 .../fixture/BuildExperimentListener.java           |   31 -
 .../fixture/BuildExperimentListenerAdapter.java    |   36 -
 .../performance/fixture/BuildExperimentRunner.java |  177 -
 .../performance/fixture/BuildExperimentSpec.groovy |  114 -
 .../performance/fixture/CompositeDataReporter.java |   39 -
 .../fixture/CrossBuildPerformanceResults.groovy    |   60 -
 .../fixture/CrossBuildPerformanceTestRunner.groovy |  103 -
 .../fixture/CrossVersionPerformanceResults.groovy  |  123 -
 .../CrossVersionPerformanceTestRunner.groovy       |  120 -
 .../gradle/performance/fixture/DataReporter.groovy |   21 -
 .../gradle/performance/fixture/GCEventParser.java  |   74 -
 .../performance/fixture/GCLoggingCollector.java    |  179 -
 .../fixture/GradleExecuterBackedSession.groovy     |   75 -
 .../fixture/GradleInvocationCustomizer.java        |   21 -
 .../fixture/GradleInvocationSpec.groovy            |  182 -
 .../gradle/performance/fixture/GradleSession.java  |   29 -
 .../fixture/MeasuredOperationList.groovy           |   70 -
 .../performance/fixture/PerformanceTestResult.java |   74 -
 .../performance/fixture/PerformanceTestSpec.java   |   47 -
 .../performance/fixture/PrettyCalculator.groovy    |   42 -
 .../org/gradle/performance/fixture/Profiler.java   |   26 -
 .../performance/fixture/TestProjectLocator.groovy  |   35 -
 .../fixture/TextFileDataReporter.groovy            |   35 -
 .../fixture/ToolingApiBackedGradleSession.groovy   |   73 -
 .../gradle/performance/fixture/VersionResults.java |   21 -
 .../gradle/performance/fixture/WaitingReader.java  |   73 -
 .../performance/fixture/YourKitProfiler.groovy     |  206 -
 .../org/gradle/performance/measure/Amount.java     |  172 -
 .../org/gradle/performance/measure/DataSeries.java |   90 -
 .../performance/measure/MeasuredOperation.groovy   |   38 -
 .../performance/results/AllResultsStore.java       |   48 -
 .../performance/results/CompositeResultsStore.java |   68 -
 .../performance/results/ConnectionAction.java      |   23 -
 .../results/CrossBuildResultsStore.java            |  264 -
 .../results/CrossBuildTestExecutionHistory.java    |  128 -
 .../results/CrossVersionResultsStore.java          |  265 -
 .../results/CrossVersionTestExecutionHistory.java  |  150 -
 .../gradle/performance/results/FileRenderer.java   |   34 -
 .../org/gradle/performance/results/H2FileDb.java   |   61 -
 .../performance/results/HtmlPageGenerator.java     |  116 -
 .../performance/results/IndexPageGenerator.java    |  101 -
 .../performance/results/PerformanceResults.java    |   39 -
 .../performance/results/ReportGenerator.java       |   55 -
 .../gradle/performance/results/ResultsStore.java   |   36 -
 .../performance/results/TestDataGenerator.java     |   93 -
 .../performance/results/TestExecutionHistory.java  |   37 -
 .../performance/results/TestPageGenerator.java     |  169 -
 .../resources/org/gradle/reporting/style.css       |   89 -
 subprojects/performance/templates.gradle           |  645 +++
 subprojects/platform-base/platform-base.gradle     |   10 +-
 .../AbstractComponentModelIntegrationTest.groovy   |   29 +-
 .../base/AssembleTaskIntegrationTest.groovy        |  149 -
 .../language/base/BaseModelIntegrationTest.groovy  |   26 +-
 .../BinariesLifecycleTaskIntegrationTest.groovy    |  181 +
 .../base/ComponentBinariesIntegrationTest.groovy   |   44 +-
 .../ComponentBinarySourcesIntegrationTest.groovy   |    8 +-
 .../base/ComponentModelIntegrationTest.groovy      |  115 +-
 .../ComponentModelReportIntegrationTest.groovy     |  358 ++
 .../base/ComponentSourcesIntegrationTest.groovy    |    2 +-
 .../base/CustomBinaryIntegrationTest.groovy        |  118 +-
 ...CustomBinaryInternalViewsIntegrationTest.groovy |   44 +-
 .../base/CustomBinaryTasksIntegrationTest.groovy   |  217 +-
 .../CustomComponentBinariesIntegrationTest.groovy  |  132 +-
 ...iesWithComponentReferenceIntegrationTest.groovy |   60 +
 .../base/CustomComponentIntegrationTest.groovy     |  275 +-
 ...tomComponentInternalViewsIntegrationTest.groovy |   26 +-
 .../CustomComponentPluginIntegrationTest.groovy    |   32 +-
 .../CustomComponentSourceSetIntegrationTest.groovy |  267 +-
 .../base/CustomManagedBinaryIntegrationTest.groovy |    8 +-
 .../base/FunctionalSourceSetIntegrationTest.groovy |  227 +-
 .../base/InternalViewsSampleIntegrationTest.groovy |   56 +
 .../base/LanguageSourceSetIntegrationTest.groovy   |  128 +-
 .../base/LanguageTypeIntegrationTest.groovy        |   36 +-
 .../base/LanguageTypeSampleIntegrationTest.groovy  |   16 +-
 .../VariantAspectExtractionIntegrationTest.groovy  |   40 +-
 .../LifecycleBasePluginIntegrationTest.groovy      |   47 +-
 .../org/gradle/api/BuildableComponentSpec.java     |   44 +
 .../java/org/gradle/api/BuildableModelElement.java |   43 -
 .../org/gradle/api/CheckableComponentSpec.java     |   44 +
 .../internal/AbstractBuildableComponentSpec.java   |   90 +
 .../internal/AbstractBuildableModelElement.java    |   58 -
 ...efaultLibraryResolutionErrorMessageBuilder.java |  105 -
 .../resolve/DefaultLocalLibraryResolver.java       |   54 +
 .../LibraryResolutionErrorMessageBuilder.java      |  144 +-
 .../internal/resolve/LibraryResolutionResult.java  |  161 +
 .../resolve/LocalLibraryDependencyResolver.java    |  176 +-
 .../resolve/LocalLibraryMetaDataAdapter.java       |    6 +-
 .../api/internal/resolve/LocalLibraryResolver.java |   26 +
 .../api/internal/resolve/VariantSelector.java      |   27 +
 .../api/internal/resolve/VariantsMatcher.java      |  135 -
 .../api/internal/tasks/compile/Compiler.java       |   26 -
 .../gradle/language/base/DependentSourceSet.java   |    2 +
 .../gradle/language/base/LanguageSourceSet.java    |    3 +-
 .../base/internal/AbstractLanguageSourceSet.java   |   92 +
 .../base/internal/JointCompileTaskConfig.java      |   26 +
 .../base/internal/LanguageSourceSetFactory.java    |   68 -
 .../base/internal/LanguageSourceSetInternal.java   |    5 -
 .../base/internal/SourceTransformTaskConfig.java   |    1 -
 .../model/BinarySourceTransformations.java         |  135 +
 .../base/internal/model/ComponentBinaryRules.java  |   48 -
 .../base/internal/model/ComponentRules.java        |  115 -
 .../internal/model/ComponentSpecInitializer.java   |   54 -
 .../DefaultLibraryLocalComponentMetaData.java      |  124 -
 .../DefaultLibraryLocalComponentMetadata.java      |  166 +
 .../model/DefaultVariantAxisCompatibility.java     |   35 -
 .../DefaultVariantAxisCompatibilityFactory.java    |   41 -
 .../internal/model/DefaultVariantsMetaData.java    |  106 -
 .../internal/model/VariantAxisCompatibility.java   |   39 -
 .../model/VariantAxisCompatibilityFactory.java     |   20 -
 .../base/internal/model/VariantsMetaData.java      |   35 -
 .../internal/model/VariantsMetaDataHelper.java     |   35 -
 .../language/base/internal/plugins/CleanRule.java  |    6 +-
 .../internal/registry/DefaultLanguageRegistry.java |   48 -
 .../internal/registry/LanguageRegistration.java    |   47 -
 .../base/internal/registry/LanguageRegistry.java   |   26 -
 .../base/internal/registry/LanguageTransform.java  |    6 +-
 .../registry/NamedLanguageRegistration.java        |   57 -
 .../resolve/DependentSourceSetResolveContext.java  |   68 -
 .../internal/tasks/SimpleStaleClassCleaner.java    |    2 +-
 .../org/gradle/language/base/package-info.java     |    4 +-
 .../base/plugins/ComponentModelBasePlugin.java     |  289 +-
 .../language/base/plugins/LanguageBasePlugin.java  |  186 +-
 .../language/base/plugins/LifecycleBasePlugin.java |   14 +-
 .../gradle/language/base/plugins/package-info.java |    4 +-
 .../base/sources/BaseLanguageSourceSet.java        |  126 +-
 .../gradle/language/base/sources/package-info.java |    4 +-
 .../core/DomainObjectCollectionBackedModelMap.java |   34 +-
 .../org/gradle/platform/base/ApplicationSpec.java  |    2 +-
 .../org/gradle/platform/base/BinaryContainer.java  |    1 -
 .../java/org/gradle/platform/base/BinarySpec.java  |   20 +-
 .../java/org/gradle/platform/base/BinaryTasks.java |   13 +-
 .../platform/base/BinaryTasksCollection.java       |   11 +-
 .../java/org/gradle/platform/base/BinaryType.java  |   51 -
 .../gradle/platform/base/BinaryTypeBuilder.java    |   26 -
 .../gradle/platform/base/ComponentBinaries.java    |    6 +-
 .../org/gradle/platform/base/ComponentSpec.java    |   33 +-
 .../platform/base/ComponentSpecContainer.java      |    1 -
 .../platform/base/ComponentSpecIdentifier.java     |   28 -
 .../org/gradle/platform/base/ComponentType.java    |    4 +-
 .../gradle/platform/base/ComponentTypeBuilder.java |   24 -
 .../gradle/platform/base/GeneralComponentSpec.java |   27 +
 .../platform/base/InvalidModelException.java       |    2 +
 .../org/gradle/platform/base/LanguageType.java     |   49 -
 .../gradle/platform/base/LanguageTypeBuilder.java  |   29 -
 .../platform/base/LibraryBinaryDependencySpec.java |   48 +
 .../gradle/platform/base/LibraryBinarySpec.java    |    2 +-
 .../java/org/gradle/platform/base/LibrarySpec.java |    2 +-
 .../platform/base/ModelInstantiationException.java |    2 +
 .../java/org/gradle/platform/base/Platform.java    |    6 +
 .../platform/base/PlatformAwareComponentSpec.java  |    2 +-
 .../gradle/platform/base/SourceComponentSpec.java  |   35 +
 .../gradle/platform/base/ToolChainRegistry.java    |    3 +
 .../java/org/gradle/platform/base/TypeBuilder.java |   16 +-
 .../org/gradle/platform/base/VariantComponent.java |   32 +
 .../gradle/platform/base/VariantComponentSpec.java |   31 +
 .../platform/base/binary/BaseBinarySpec.java       |  160 +-
 .../base/binary/internal/BinarySpecFactory.java    |   64 -
 .../gradle/platform/base/binary/package-info.java  |    4 +-
 .../platform/base/component/BaseComponentSpec.java |  112 +-
 .../component/internal/AbstractComponentSpec.java  |   60 +
 .../component/internal/ComponentSpecFactory.java   |   80 +-
 .../component/internal/DefaultComponentSpec.java   |   76 +
 .../platform/base/component/package-info.java      |    4 +-
 .../platform/base/internal/BinarySpecInternal.java |   13 +
 .../internal/BinaryTasksCollectionWrapper.java     |   13 +-
 .../base/internal/ComponentSpecIdentifier.java     |   63 +
 .../base/internal/ComponentSpecInternal.java       |   13 +-
 .../base/internal/DefaultBinaryNamingScheme.java   |    7 +-
 .../internal/DefaultBinaryTasksCollection.java     |    6 +
 .../internal/DefaultComponentSpecIdentifier.java   |   55 +-
 .../DefaultLibraryBinaryDependencySpec.java        |   92 +
 .../base/internal/DefaultModuleDependencySpec.java |    2 +-
 .../HasIntermediateOutputsComponentSpec.java       |   29 +
 .../PlatformAwareComponentSpecInternal.java        |    4 +-
 .../internal/VariantAspectExtractionStrategy.java  |   26 +-
 .../builder/LanguageTypeBuilderInternal.java       |   24 -
 .../base/internal/builder/TypeBuilderFactory.java  |   23 -
 .../base/internal/builder/TypeBuilderInternal.java |    2 +-
 ...bstractDependentBinariesResolutionStrategy.java |   45 +
 .../BaseDependentBinariesResolutionStrategy.java   |   48 +
 .../DefaultDependentBinariesResolutionResult.java  |   34 +
 .../DefaultDependentBinariesResolvedResult.java    |   70 +
 .../DefaultDependentBinariesResolver.java          |   85 +
 .../DependentBinariesResolutionResult.java         |   26 +
 .../DependentBinariesResolutionStrategy.java       |   29 +
 .../DependentBinariesResolvedResult.java           |   38 +
 .../dependents/DependentBinariesResolver.java      |   34 +
 ...nnotationDrivenComponentModelRuleExtractor.java |   79 +-
 .../internal/registry/AbstractTypeBuilder.java     |   69 -
 .../registry/BinaryTasksModelRuleExtractor.java    |  133 +-
 .../registry/BinaryTypeModelRuleExtractor.java     |   71 -
 .../ComponentBinariesModelRuleExtractor.java       |  102 +-
 .../ComponentModelBaseServiceRegistry.java         |   13 +-
 .../registry/ComponentTypeModelRuleExtractor.java  |  192 +-
 .../base/internal/registry/DefaultTypeBuilder.java |   69 +
 .../registry/LanguageTypeModelRuleExtractor.java   |   91 -
 .../base/internal/registry/ModelMapBasedRule.java  |   38 +-
 .../internal/registry/TypeModelRuleExtractor.java  |  137 -
 .../base/internal/toolchain/ArgCollector.java      |   25 -
 .../base/internal/toolchain/ArgWriter.java         |   89 -
 .../internal/toolchain/ToolChainAvailability.java  |    4 +
 .../org/gradle/platform/base/package-info.java     |    4 +-
 .../platform/base/plugins/BinaryBasePlugin.java    |   87 +
 .../platform/base/plugins/ComponentBasePlugin.java |   84 +
 .../gradle/platform/base/plugins/package-info.java |   21 +
 .../platform/base/test/TestSuiteBinarySpec.java    |   31 -
 .../platform/base/test/TestSuiteContainer.java     |   27 -
 .../gradle/platform/base/test/TestSuiteSpec.java   |   31 -
 .../gradle/platform/base/test/package-info.java    |   23 -
 .../org.gradle.binary-base.properties              |    1 +
 .../org.gradle.component-base.properties           |    1 +
 .../org.gradle.component-model-base.properties     |    1 +
 .../org.gradle.lifecycle-base.properties           |    1 +
 .../internal/resolve/VariantsMatcherTest.groovy    |  244 -
 .../language/base/internal/BareInternalView.java   |   20 +
 .../ComponentTypeModelRuleExtractorTest.groovy     |  134 +-
 .../language/base/internal/NotComponentSpec.java   |   20 +
 .../language/base/internal/SomeOtherBuilder.java   |   22 +
 .../model/DefaultVariantsMetaDataTest.groovy       |   75 -
 .../internal/model/ParametrizedBinaryString.java   |   26 -
 .../model/ParametrizedBinaryVariantDimension1.java |   26 -
 .../base/internal/model/ParametrizedVariant.java   |   24 -
 .../base/internal/model/VariantDimension1.java     |   22 -
 .../base/internal/model/VariantDimension2.java     |   22 -
 .../base/internal/model/VariantDimension3.java     |   20 -
 .../model/VariantsMetaDataHelperTest.groovy        |  106 -
 .../LanguageTypeModelRuleExtractorTest.groovy      |  118 +-
 .../DependentSourceSetResolveContextTest.groovy    |   69 -
 .../tasks/SimpleStaleClassCleanerTest.groovy       |    8 +-
 .../plugins/ComponentModelBasePluginTest.groovy    |  106 +
 .../base/plugins/LanguageBasePluginTest.groovy     |   73 +-
 .../base/plugins/LifecycleBasePluginTest.groovy    |   17 +-
 .../base/sources/BaseLanguageSourceSetTest.groovy  |   36 +-
 ...DomainObjectCollectionBackedModelMapTest.groovy |    4 +-
 .../platform/base/binary/BaseBinarySpecTest.groovy |   44 +-
 .../base/component/BaseComponentSpecTest.groovy    |   43 +-
 .../internal/BuildableComponentSpecTest.groovy     |   60 +
 .../base/internal/BuildableModelElementTest.groovy |   54 -
 .../DefaultComponentSpecIdentifierTest.groovy      |   67 +
 ...AbstractAnnotationModelRuleExtractorTest.groovy |   86 +-
 .../BinaryTasksModelRuleExtractorTest.groovy       |   68 +-
 .../BinaryTypeModelRuleExtractorTest.groovy        |  161 +-
 .../ComponentBinariesModelRuleExtractorTest.groovy |   51 +-
 .../base/internal/toolchain/ArgWriterTest.groovy   |   78 -
 .../base/plugins/BinaryBasePluginTest.groovy       |  129 +
 .../base/plugins/ComponentBasePluginTest.groovy    |   68 +
 .../sources/BaseLanguageSourceSetFixtures.groovy   |   36 +-
 .../platform/base/PlatformBaseSpecification.groovy |   84 +
 .../platform/base/binary/BaseBinaryFixtures.groovy |   29 +-
 .../base/component/BaseComponentFixtures.groovy    |   33 +-
 .../fixtures/BaseInstanceFixtureSupport.groovy     |   58 +
 .../plugin/AbstractLanguagePluginSpec.groovy       |   30 +-
 subprojects/platform-jvm/platform-jvm.gradle       |    2 +
 ...ustomJarBinarySpecSubtypeIntegrationTest.groovy |   35 +-
 .../jvm/JdkDeclarationIntegrationTest.groovy       |  158 +
 .../gradle/jvm/ModelReuseIntegrationTest.groovy    |   61 -
 ...latformJvmComponentReportIntegrationTest.groovy |   49 +-
 .../resolve/JvmLocalLibraryMetaDataAdapter.java    |   42 -
 .../internal/resolve/LibraryPublishArtifact.java   |   37 -
 .../org/gradle/api/java/archives/Manifest.java     |   17 +-
 .../api/java/archives/ManifestMergeSpec.java       |   26 +-
 .../internal/CustomManifestInternalWrapper.java    |   97 +
 .../java/archives/internal/DefaultAttributes.java  |   12 +
 .../java/archives/internal/DefaultManifest.java    |  275 +-
 .../internal/DefaultManifestMergeDetails.java      |    9 +-
 .../internal/DefaultManifestMergeSpec.java         |   54 +-
 .../java/archives/internal/ManifestInternal.java   |   50 +
 .../main/java/org/gradle/jvm/JarBinarySpec.java    |   27 +-
 .../main/java/org/gradle/jvm/JvmBinarySpec.java    |    6 -
 .../main/java/org/gradle/jvm/JvmBinaryTasks.java   |   32 -
 .../main/java/org/gradle/jvm/JvmComponentSpec.java |    2 +
 .../src/main/java/org/gradle/jvm/JvmResources.java |    1 -
 .../jvm/internal/AbstractJvmBinaryRenderer.java    |    4 +-
 .../org/gradle/jvm/internal/DefaultClasspath.java  |    2 +
 .../gradle/jvm/internal/DefaultJarBinarySpec.java  |   95 +-
 .../org/gradle/jvm/internal/DefaultJarFile.java    |   10 +-
 ...efaultJavaPlatformVariantAxisCompatibility.java |   31 -
 .../gradle/jvm/internal/DefaultJvmAssembly.java    |   70 +
 .../gradle/jvm/internal/DefaultJvmBinarySpec.java  |  100 +
 .../gradle/jvm/internal/DefaultJvmBinaryTasks.java |   33 -
 .../gradle/jvm/internal/DefaultJvmLibrarySpec.java |   18 +-
 .../jvm/internal/DependencyResolvingClasspath.java |   78 +-
 .../org/gradle/jvm/internal/JarBinaryRules.java    |   46 -
 .../gradle/jvm/internal/JarBinarySpecInternal.java |   15 +-
 .../main/java/org/gradle/jvm/internal/JarFile.java |    4 +-
 .../java/org/gradle/jvm/internal/JvmAssembly.java  |   56 +
 .../gradle/jvm/internal/JvmBinarySpecInternal.java |   25 +
 .../org/gradle/jvm/internal/WithDependencies.java  |   32 +
 .../org/gradle/jvm/internal/WithJvmAssembly.java   |   27 +
 ...efaultJavaPlatformVariantAxisCompatibility.java |   31 +
 ...efaultLibraryResolutionErrorMessageBuilder.java |  111 +
 .../resolve/DefaultVariantAxisCompatibility.java   |   35 +
 .../DefaultVariantAxisCompatibilityFactory.java    |   41 +
 .../internal/resolve/DefaultVariantsMetaData.java  |  103 +
 .../internal/resolve/JvmLibraryResolveContext.java |   74 +
 .../resolve/JvmLocalLibraryMetaDataAdapter.java    |  168 +
 .../jvm/internal/resolve/JvmVariantSelector.java   |   64 +
 .../internal/resolve/LibraryPublishArtifact.java   |   37 +
 .../SourceSetDependencyResolvingClasspath.java     |   43 +
 .../org/gradle/jvm/internal/resolve/UsageKind.java |   31 +
 .../internal/resolve/VariantAxisCompatibility.java |   39 +
 .../resolve/VariantAxisCompatibilityFactory.java   |   20 +
 .../jvm/internal/resolve/VariantsMatcher.java      |  135 +
 .../jvm/internal/resolve/VariantsMetaData.java     |   35 +
 .../internal/resolve/VariantsMetaDataHelper.java   |   35 +
 .../jvm/internal/services/PlatformJvmServices.java |   49 +-
 .../src/main/java/org/gradle/jvm/package-info.java |    4 +-
 .../java/org/gradle/jvm/platform/JavaPlatform.java |    4 +-
 .../jvm/platform/internal/DefaultJavaPlatform.java |    8 +-
 .../org/gradle/jvm/plugins/JvmComponentPlugin.java |  280 +-
 .../java/org/gradle/jvm/plugins/package-info.java  |    4 +-
 .../src/main/java/org/gradle/jvm/tasks/Jar.java    |   83 +-
 .../main/java/org/gradle/jvm/tasks/api/ApiJar.java |  220 +-
 .../jvm/tasks/api/internal/ApiClassExtractor.java  |   81 +-
 .../jvm/tasks/api/internal/ApiMemberSelector.java  |   17 +-
 .../org/gradle/jvm/tasks/api/internal/Member.java  |    4 +-
 .../api/internal/SortingAnnotationVisitor.java     |   12 +-
 .../java/org/gradle/jvm/tasks/package-info.java    |    4 +-
 .../java/org/gradle/jvm/toolchain/LocalJava.java   |   40 +
 .../internal/DefaultJavaToolChainRegistry.java     |    1 +
 .../jvm/toolchain/internal/InstalledJdk.java       |   23 +
 .../toolchain/internal/InstalledJdkInternal.java   |   46 +
 .../jvm/toolchain/internal/InstalledJre.java       |   24 +
 .../toolchain/internal/JavaInstallationProbe.java  |  321 ++
 .../toolchain/internal/LocalJavaInstallation.java  |   35 +
 .../org/gradle/jvm/toolchain/package-info.java     |    1 +
 .../JvmLocalLibraryDependencyResolverTest.groovy   |  268 -
 .../archives/internal/DefaultManifestTest.groovy   |  218 +-
 .../jvm/internal/DefaultJarBinarySpecTest.groovy   |    4 +-
 ...JavaPlatformVariantAxisCompatibilityTest.groovy |   74 -
 .../jvm/internal/DefaultJvmBinaryTasksTest.groovy  |   64 -
 .../jvm/internal/DefaultJvmLibrarySpecTest.groovy  |    4 +-
 .../internal/plugins/CreateJvmBinariesTest.groovy  |   10 +-
 ...JavaPlatformVariantAxisCompatibilityTest.groovy |   73 +
 .../resolve/DefaultVariantsMetaDataTest.groovy     |   75 +
 .../resolve/JvmLibraryResolveContextTest.groovy    |   49 +
 .../JvmLocalLibraryDependencyResolverTest.groovy   |  292 ++
 .../internal/resolve/ParametrizedBinaryString.java |   26 +
 .../ParametrizedBinaryVariantDimension1.java       |   26 +
 .../jvm/internal/resolve/ParametrizedVariant.java  |   24 +
 .../jvm/internal/resolve/VariantDimension1.java    |   22 +
 .../jvm/internal/resolve/VariantDimension2.java    |   22 +
 .../jvm/internal/resolve/VariantDimension3.java    |   20 +
 .../internal/resolve/VariantsMatcherTest.groovy    |  241 +
 .../resolve/VariantsMetaDataHelperTest.groovy      |  107 +
 .../groovy/org/gradle/jvm/tasks/JarTest.groovy     |   33 +-
 .../ApiClassExtractorAnnotationsTest.groovy        |   48 +-
 .../ApiClassExtractorInnerClassTest.groovy         |    3 -
 .../api/internal/ApiClassExtractorTest.groovy      |   10 +-
 .../internal/ApiClassExtractorTestSupport.groovy   |   18 +-
 .../ApiClassExtractorTestSupportTest.groovy        |    3 -
 .../internal/JavaInstallationProbeTest.groovy      |  193 +
 subprojects/platform-native/platform-native.gradle |   29 +-
 .../BinaryBuildTypesIntegrationTest.groovy         |    8 +-
 .../BinaryConfigurationIntegrationTest.groovy      |   43 +-
 .../BinaryFlavorsIntegrationTest.groovy            |   13 +-
 .../LibraryApiDependenciesIntegrationTest.groovy   |    5 +-
 .../LibraryBinariesIntegrationTest.groovy          |   11 +-
 .../LibraryDependenciesIntegrationTest.groovy      |   20 +-
 .../ModelReuseIntegrationTest.groovy               |   87 -
 .../NativeBinariesIntegrationTest.groovy           |    8 +-
 ...NativeDependentComponentsIntegrationSpec.groovy |  141 +
 ...DependentComponentsReportIntegrationTest.groovy |  786 +++
 .../NativePlatformSamplesIntegrationTest.groovy    |   39 +-
 ...formNativeComponentReportIntegrationTest.groovy |   69 +-
 .../PrebuiltLibrariesIntegrationTest.groovy        |   12 +-
 .../TestSuiteDefinitionIntegrationSpec.groovy      |  218 -
 .../TestSuiteModelIntegrationSpec.groovy           |  347 --
 .../BinaryNativePlatformIntegrationTest.groovy     |   59 +-
 .../InstallExecutableIntegrationTest.groovy        |   92 +
 .../GeneratedSourcesIntegrationTest.groovy         |   13 +-
 ...rceSetCompileDependenciesIntegrationTest.groovy |    2 -
 .../SourceSetDependenciesIntegrationTest.groovy    |   18 +-
 ...SourceSetLinkDependenciesIntegrationTest.groovy |    4 +-
 .../CommonToolchainCustomizationIntegTest.groovy   |    4 +-
 ...ToolChainCrossCompilationIntegrationTest.groovy |    4 +-
 ...GccToolChainCustomisationIntegrationTest.groovy |   10 +-
 .../GccToolChainDiscoveryIntegrationTest.groovy    |    6 +-
 .../MultipleNativeToolChainIntegrationTest.groovy  |   14 +-
 .../NativeToolChainDiscoveryIntegrationTest.groovy |    6 +-
 ...sualCppToolChainDiscoveryIntegrationTest.groovy |    5 +-
 .../nativeplatform/internal/SourceIncludes.java    |   26 -
 .../language/nativeplatform/package-info.java      |   20 -
 .../nativeplatform/NativeLibraryBinarySpec.java    |   36 -
 .../nativeplatform/NativeLibraryRequirement.java   |   39 -
 .../nativeplatform/TargetedNativeComponent.java    |   39 -
 .../internal/AbstractBinaryToolSpec.java           |   80 -
 .../internal/AbstractNativeBinarySpec.java         |  202 -
 .../internal/AbstractNativeComponentSpec.java      |   41 -
 .../internal/AbstractNativeLibraryBinarySpec.java  |  104 -
 .../AbstractTargetedNativeComponentSpec.java       |   77 -
 .../internal/CompilerOutputFileNamingScheme.java   |   44 -
 .../nativeplatform/internal/DefaultBuildType.java  |   39 -
 .../nativeplatform/internal/DefaultFlavor.java     |   41 -
 .../nativeplatform/internal/DefaultLinkerSpec.java |   68 -
 .../DefaultNativeExecutableBinarySpec.java         |   86 -
 .../internal/DefaultNativeExecutableSpec.java      |   25 -
 .../internal/DefaultNativeLibrarySpec.java         |   39 -
 .../internal/DefaultPreprocessingTool.java         |   38 -
 .../internal/DefaultSharedLibraryBinarySpec.java   |  132 -
 .../internal/DefaultStaticLibraryArchiverSpec.java |   45 -
 .../internal/DefaultStaticLibraryBinarySpec.java   |  100 -
 .../nativeplatform/internal/DefaultTool.java       |   37 -
 .../internal/NativeBinarySpecInternal.java         |   64 -
 .../internal/NativePlatformResolver.java           |   45 -
 .../internal/ProjectNativeLibraryRequirement.java  |   48 -
 .../configure/DefaultNativeComponentExtension.java |   49 -
 .../internal/configure/NativeBinaries.java         |   99 -
 .../internal/configure/NativeBinaryRules.java      |  118 -
 .../internal/configure/NativeComponentRules.java   |  160 -
 .../prebuilt/AbstractPrebuiltLibraryBinary.java    |  107 -
 .../prebuilt/DefaultPrebuiltLibraries.java         |   59 -
 .../internal/prebuilt/DefaultPrebuiltLibrary.java  |   50 -
 .../DefaultPrebuiltSharedLibraryBinary.java        |   66 -
 .../DefaultPrebuiltStaticLibraryBinary.java        |   55 -
 .../prebuilt/PrebuiltLibraryBinaryLocator.java     |   52 -
 .../prebuilt/PrebuiltLibraryInitializer.java       |   80 -
 .../ApiRequirementNativeDependencyResolver.java    |  104 -
 .../resolve/ChainedLibraryBinaryLocator.java       |   44 -
 .../resolve/CurrentProjectModelResolver.java       |   39 -
 .../internal/resolve/DefaultLibraryResolver.java   |  117 -
 .../resolve/DefaultNativeDependencySet.java        |   41 -
 .../InputHandlingNativeDependencyResolver.java     |   36 -
 .../internal/resolve/LibraryBinaryLocator.java     |   25 -
 .../resolve/LibraryNativeDependencyResolver.java   |   36 -
 .../resolve/NativeDependencyResolverServices.java  |   50 -
 .../resolve/ProjectLibraryBinaryLocator.java       |   60 -
 ...RequirementParsingNativeDependencyResolver.java |   38 -
 .../resolve/SourceSetNativeDependencyResolver.java |   97 -
 .../internal/services/NativeBinaryServices.java    |   57 -
 .../org/gradle/nativeplatform/package-info.java    |   20 -
 .../nativeplatform/platform/Architecture.java      |   65 -
 .../nativeplatform/platform/NativePlatform.java    |   69 -
 .../nativeplatform/platform/OperatingSystem.java   |   83 -
 .../platform/internal/ArchitectureInternal.java    |   30 -
 .../platform/internal/DefaultArchitecture.java     |   70 -
 .../platform/internal/DefaultNativePlatform.java   |   85 -
 .../platform/internal/DefaultOperatingSystem.java  |   92 -
 .../platform/internal/NativePlatformInternal.java  |   24 -
 .../platform/internal/NativePlatforms.java         |  112 -
 .../platform/internal/OperatingSystemInternal.java |   23 -
 .../nativeplatform/platform/package-info.java      |   20 -
 .../plugins/NativeComponentModelPlugin.java        |  423 --
 .../plugins/NativeComponentPlugin.java             |   33 -
 .../nativeplatform/plugins/package-info.java       |   20 -
 .../nativeplatform/tasks/AbstractLinkTask.groovy   |  130 -
 .../tasks/CreateStaticLibrary.groovy               |  111 -
 .../nativeplatform/tasks/InstallExecutable.groovy  |  167 -
 .../nativeplatform/tasks/LinkExecutable.groovy     |   33 -
 .../nativeplatform/tasks/LinkSharedLibrary.groovy  |   46 -
 .../tasks/PrefixHeaderFileGenerateTask.java        |   58 -
 .../gradle/nativeplatform/tasks/package-info.java  |   20 -
 .../test/NativeTestSuiteBinarySpec.java            |   83 -
 .../nativeplatform/test/NativeTestSuiteSpec.java   |   33 -
 .../internal/DefaultNativeTestSuiteBinarySpec.java |  102 -
 .../internal/NativeTestSuiteBinaryRenderer.java    |   47 -
 .../gradle/nativeplatform/test/package-info.java   |   20 -
 .../test/plugins/NativeBinariesTestPlugin.java     |  107 -
 .../test/tasks/RunTestExecutable.groovy            |   72 -
 .../toolchain/GccCompatibleToolChain.java          |   56 -
 .../gradle/nativeplatform/toolchain/VisualCpp.java |   53 -
 .../internal/AbstractPlatformToolProvider.java     |  161 -
 .../internal/CommandLineToolInvocationWorker.java  |   26 -
 .../internal/DefaultCommandLineToolInvocation.java |   63 -
 .../DefaultCommandLineToolInvocationWorker.java    |   90 -
 .../DefaultMutableCommandLineToolContext.java      |   70 -
 .../internal/DefaultNativeToolChainRegistry.java   |  134 -
 .../toolchain/internal/ExtendableToolChain.java    |   69 -
 .../toolchain/internal/MacroArgsConverter.java     |   35 -
 .../toolchain/internal/NativeCompileSpec.java      |   88 -
 .../toolchain/internal/NativeCompiler.java         |  169 -
 .../internal/NativeToolChainInternal.java          |   39 -
 .../toolchain/internal/OptionsFileArgsWriter.java  |   66 -
 .../toolchain/internal/OutputCleaningCompiler.java |   67 -
 .../toolchain/internal/PreCompiledHeader.java      |   58 -
 .../internal/UnavailablePlatformToolProvider.java  |   81 -
 .../gcc/AbstractGccCompatibleToolChain.java        |  267 -
 .../internal/gcc/ArStaticLibraryArchiver.java      |   88 -
 .../toolchain/internal/gcc/Assembler.java          |   46 -
 .../toolchain/internal/gcc/CCompiler.java          |   36 -
 .../toolchain/internal/gcc/CPCHCompiler.java       |   35 -
 .../toolchain/internal/gcc/CppCompiler.java        |   36 -
 .../toolchain/internal/gcc/CppPCHCompiler.java     |   35 -
 .../internal/gcc/DefaultGccPlatformToolChain.java  |  100 -
 .../internal/gcc/GccCompilerArgsTransformer.java   |   70 -
 .../toolchain/internal/gcc/GccLinker.java          |  111 -
 .../internal/gcc/GccOptionsFileArgsWriter.java     |   53 -
 .../toolchain/internal/gcc/ObjectiveCCompiler.java |   36 -
 .../internal/gcc/ObjectiveCPCHCompiler.java        |   35 -
 .../internal/gcc/ObjectiveCppCompiler.java         |   36 -
 .../internal/gcc/ObjectiveCppPCHCompiler.java      |   35 -
 .../version/CompilerMetaDataProviderFactory.java   |   90 -
 .../internal/gcc/version/GccVersionDeterminer.java |  218 -
 .../toolchain/internal/msvcpp/CCompiler.java       |   36 -
 .../toolchain/internal/msvcpp/CppCompiler.java     |   36 -
 .../msvcpp/DefaultVisualCppPlatformToolChain.java  |   72 -
 .../msvcpp/DefaultVisualStudioLocator.java         |  368 --
 .../internal/msvcpp/DefaultWindowsSdkLocator.java  |  275 --
 .../toolchain/internal/msvcpp/EscapeUserArgs.java  |   40 -
 .../msvcpp/LibExeStaticLibraryArchiver.java        |   78 -
 .../toolchain/internal/msvcpp/LinkExeLinker.java   |   85 -
 .../msvcpp/VisualCppCompilerArgsTransformer.java   |   69 -
 .../internal/msvcpp/VisualCppInstall.java          |  112 -
 .../msvcpp/VisualCppOptionsFileArgsWriter.java     |   31 -
 .../msvcpp/VisualCppPlatformToolProvider.java      |  200 -
 .../internal/msvcpp/VisualCppToolChain.java        |  139 -
 .../internal/msvcpp/VisualStudioInstall.java       |   48 -
 .../internal/msvcpp/VisualStudioLocator.java       |   29 -
 .../internal/msvcpp/WindowsResourceCompiler.java   |   51 -
 .../toolchain/internal/msvcpp/WindowsSdk.java      |  138 -
 .../internal/plugins/StandardToolChainsPlugin.java |   34 -
 .../tools/DefaultCommandLineToolConfiguration.java |   45 -
 .../DefaultGccCommandLineToolConfiguration.java    |   35 -
 .../toolchain/internal/tools/ToolSearchPath.java   |  184 -
 .../nativeplatform/toolchain/package-info.java     |   20 -
 .../toolchain/plugins/ClangCompilerPlugin.java     |   65 -
 .../toolchain/plugins/GccCompilerPlugin.java       |   67 -
 .../plugins/MicrosoftVisualCppPlugin.java          |   68 -
 .../toolchain/plugins/package-info.java            |   20 -
 .../nativeplatform/DependentSourceSet.java         |    0
 .../nativeplatform/HeaderExportingSourceSet.java   |    0
 .../language/nativeplatform/NativeResourceSet.java |    0
 .../internal/DependentSourceSetInternal.java       |    0
 .../language/nativeplatform/internal/Include.java  |    0
 .../nativeplatform/internal/IncludeDirectives.java |   29 +
 .../nativeplatform/internal/IncludeType.java       |    0
 .../language/nativeplatform/package-info.java      |   21 +
 .../org/gradle/nativeplatform/BuildType.java       |    0
 .../gradle/nativeplatform/BuildTypeContainer.java  |    0
 .../org/gradle/nativeplatform/Flavor.java          |    0
 .../org/gradle/nativeplatform/FlavorContainer.java |    0
 .../org/gradle/nativeplatform/NativeBinary.java    |    0
 .../gradle/nativeplatform/NativeBinarySpec.java    |    0
 .../nativeplatform/NativeComponentExtension.java   |    0
 .../gradle/nativeplatform/NativeComponentSpec.java |    0
 .../gradle/nativeplatform/NativeDependencySet.java |    0
 .../gradle/nativeplatform/NativeExecutable.java    |    0
 .../nativeplatform/NativeExecutableBinary.java     |    0
 .../nativeplatform/NativeExecutableBinarySpec.java |    0
 .../nativeplatform/NativeExecutableFileSpec.java   |    0
 .../nativeplatform/NativeExecutableSpec.java       |    0
 .../nativeplatform/NativeInstallationSpec.java     |    0
 .../org/gradle/nativeplatform/NativeLibrary.java   |    0
 .../gradle/nativeplatform/NativeLibraryBinary.java |    0
 .../nativeplatform/NativeLibraryBinarySpec.java    |   38 +
 .../nativeplatform/NativeLibraryRequirement.java   |   44 +
 .../gradle/nativeplatform/NativeLibrarySpec.java   |    0
 .../org/gradle/nativeplatform/ObjectFile.java      |    0
 .../gradle/nativeplatform/PrebuiltLibraries.java   |    0
 .../org/gradle/nativeplatform/PrebuiltLibrary.java |    0
 .../PrebuiltSharedLibraryBinary.java               |    0
 .../PrebuiltStaticLibraryBinary.java               |    0
 .../gradle/nativeplatform/PreprocessingTool.java   |    0
 .../org/gradle/nativeplatform/Repositories.java    |    0
 .../gradle/nativeplatform/SharedLibraryBinary.java |    0
 .../nativeplatform/SharedLibraryBinarySpec.java    |    0
 .../gradle/nativeplatform/StaticLibraryBinary.java |    0
 .../nativeplatform/StaticLibraryBinarySpec.java    |    0
 .../nativeplatform/TargetedNativeComponent.java    |   39 +
 .../org/gradle/nativeplatform/Tool.java            |    0
 .../internal/AbstractBinaryToolSpec.java           |   91 +
 .../internal/AbstractNativeBinaryRenderer.java     |    0
 .../internal/AbstractNativeBinarySpec.java         |  253 +
 .../internal/AbstractNativeComponentSpec.java      |   45 +
 .../internal/AbstractNativeLibraryBinarySpec.java  |  107 +
 .../AbstractTargetedNativeComponentSpec.java       |   83 +
 .../nativeplatform/internal/BinaryToolSpec.java    |    0
 .../BuildOperationLoggingCompilerDecorator.java    |    0
 .../internal/CompilerOutputFileNamingScheme.java   |   44 +
 .../nativeplatform/internal/DefaultBuildType.java  |   41 +
 .../internal/DefaultBuildTypeContainer.java        |    0
 .../nativeplatform/internal/DefaultFlavor.java     |   43 +
 .../internal/DefaultFlavorContainer.java           |    0
 .../nativeplatform/internal/DefaultLinkerSpec.java |   76 +
 .../DefaultNativeExecutableBinarySpec.java         |   89 +
 .../internal/DefaultNativeExecutableSpec.java      |   25 +
 .../internal/DefaultNativeLibrarySpec.java         |   43 +
 .../internal/DefaultPreprocessingTool.java         |   41 +
 .../internal/DefaultSharedLibraryBinarySpec.java   |  151 +
 .../internal/DefaultStaticLibraryArchiverSpec.java |   49 +
 .../internal/DefaultStaticLibraryBinarySpec.java   |  112 +
 .../nativeplatform/internal/DefaultTool.java       |   39 +
 .../gradle/nativeplatform/internal/LinkerSpec.java |    0
 .../internal/NativeBinaryRenderer.java             |   31 +
 .../internal/NativeBinarySpecInternal.java         |   71 +
 .../nativeplatform/internal/NativeComponents.java  |  210 +
 .../NativeDependentBinariesResolutionStrategy.java |  250 +
 .../internal/NativeExecutableBinaryRenderer.java   |    0
 .../NativeExecutableBinarySpecInternal.java        |    0
 .../internal/NativePlatformResolver.java           |   46 +
 .../internal/ProjectNativeLibraryRequirement.java  |   56 +
 .../internal/SharedLibraryBinaryRenderer.java      |    0
 .../internal/SharedLibraryBinarySpecInternal.java  |    0
 .../internal/SharedLibraryLinkerSpec.java          |    0
 .../internal/StaticLibraryArchiverSpec.java        |    0
 .../internal/StaticLibraryBinaryRenderer.java      |    0
 .../internal/StaticLibraryBinarySpecInternal.java  |    0
 .../internal/TargetedNativeComponentInternal.java  |    0
 .../configure/DefaultNativeComponentExtension.java |   53 +
 .../internal/configure/NativeBinaries.java         |  105 +
 .../internal/configure/NativeBinaryRules.java      |  123 +
 .../internal/configure/NativeComponentRules.java   |  128 +
 .../internal/pch/PchEnabledLanguageTransform.java  |    0
 .../prebuilt/AbstractPrebuiltLibraryBinary.java    |  113 +
 .../prebuilt/DefaultPrebuiltLibraries.java         |   62 +
 .../internal/prebuilt/DefaultPrebuiltLibrary.java  |   57 +
 .../DefaultPrebuiltSharedLibraryBinary.java        |   74 +
 .../DefaultPrebuiltStaticLibraryBinary.java        |   60 +
 .../prebuilt/PrebuiltLibraryBinaryLocator.java     |   59 +
 .../prebuilt/PrebuiltLibraryInitializer.java       |   86 +
 .../prebuilt/PrebuiltLibraryResolveException.java  |    0
 .../ApiRequirementNativeDependencyResolver.java    |  120 +
 .../resolve/CachingLibraryBinaryLocator.java       |   49 +
 .../resolve/ChainedLibraryBinaryLocator.java       |   44 +
 .../internal/resolve/DefaultLibraryResolver.java   |  128 +
 .../resolve/DefaultNativeDependencySet.java        |   44 +
 .../InputHandlingNativeDependencyResolver.java     |   37 +
 .../internal/resolve/LibraryBinaryLocator.java     |   31 +
 .../internal/resolve/LibraryIdentifier.java        |   57 +
 .../resolve/LibraryNativeDependencyResolver.java   |   37 +
 .../NativeBinaryRequirementResolveResult.java      |    0
 .../resolve/NativeBinaryResolveResult.java         |    0
 .../resolve/NativeDependencyNotationParser.java    |    0
 .../internal/resolve/NativeDependencyResolver.java |    0
 .../resolve/NativeDependencyResolverServices.java  |   40 +
 .../resolve/ProjectLibraryBinaryLocator.java       |   57 +
 ...RequirementParsingNativeDependencyResolver.java |   42 +
 .../resolve/SourceSetNativeDependencyResolver.java |  111 +
 .../internal/services/NativeBinaryServices.java    |   62 +
 .../org/gradle/nativeplatform/package-info.java    |   21 +
 .../nativeplatform/platform/Architecture.java      |   72 +
 .../nativeplatform/platform/NativePlatform.java    |   72 +
 .../nativeplatform/platform/OperatingSystem.java   |   96 +
 .../platform/internal/ArchitectureInternal.java    |   35 +
 .../platform/internal/Architectures.java           |    0
 .../platform/internal/DefaultArchitecture.java     |   76 +
 .../platform/internal/DefaultNativePlatform.java   |   91 +
 .../platform/internal/DefaultOperatingSystem.java  |  101 +
 .../platform/internal/NativePlatformInternal.java  |   26 +
 .../platform/internal/NativePlatforms.java         |  110 +
 .../platform/internal/OperatingSystemInternal.java |   25 +
 .../nativeplatform/platform/package-info.java      |   21 +
 .../plugins/NativeComponentModelPlugin.java        |  434 ++
 .../plugins/NativeComponentPlugin.java             |   34 +
 .../nativeplatform/plugins/package-info.java       |   21 +
 .../nativeplatform/tasks/AbstractLinkTask.java     |  204 +
 .../nativeplatform/tasks/CreateStaticLibrary.java  |  157 +
 .../nativeplatform/tasks/InstallExecutable.java    |  213 +
 .../nativeplatform/tasks/LinkExecutable.java       |   33 +
 .../nativeplatform/tasks/LinkSharedLibrary.java    |   62 +
 .../nativeplatform/tasks/ObjectFilesToBinary.java  |    0
 .../tasks/PrefixHeaderFileGenerateTask.java        |   59 +
 .../gradle/nativeplatform/tasks/package-info.java  |   21 +
 .../org/gradle/nativeplatform/toolchain/Clang.java |    0
 .../toolchain/CommandLineToolConfiguration.java    |    0
 .../org/gradle/nativeplatform/toolchain/Gcc.java   |    0
 .../toolchain/GccCommandLineToolConfiguration.java |    0
 .../toolchain/GccCompatibleToolChain.java          |   56 +
 .../toolchain/GccPlatformToolChain.java            |    0
 .../toolchain/NativePlatformToolChain.java         |    0
 .../nativeplatform/toolchain/NativeToolChain.java  |    0
 .../toolchain/NativeToolChainRegistry.java         |    0
 .../gradle/nativeplatform/toolchain/VisualCpp.java |   53 +
 .../toolchain/VisualCppPlatformToolChain.java      |    0
 .../internal/AbstractPlatformToolProvider.java     |  169 +
 .../toolchain/internal/ArgsTransformer.java        |    0
 .../toolchain/internal/CommandLineToolContext.java |    0
 .../internal/CommandLineToolInvocation.java        |    0
 .../internal/CommandLineToolInvocationFailure.java |    0
 .../internal/CommandLineToolInvocationWorker.java  |   27 +
 .../internal/DefaultCommandLineToolInvocation.java |   68 +
 .../DefaultCommandLineToolInvocationWorker.java    |   92 +
 .../DefaultMutableCommandLineToolContext.java      |   79 +
 .../internal/DefaultNativeToolChainRegistry.java   |  143 +
 .../toolchain/internal/ExtendableToolChain.java    |   72 +
 .../toolchain/internal/MacroArgsConverter.java     |   36 +
 .../internal/MutableCommandLineToolContext.java    |    0
 .../toolchain/internal/NativeCompileSpec.java      |   89 +
 .../toolchain/internal/NativeCompiler.java         |  172 +
 .../internal/NativeToolChainInternal.java          |   40 +
 .../internal/NativeToolChainRegistryInternal.java  |    0
 .../toolchain/internal/OptionsFileArgsWriter.java  |   42 +
 .../toolchain/internal/OutputCleaningCompiler.java |   68 +
 .../toolchain/internal/PCHUtils.java               |    0
 .../toolchain/internal/PlatformToolProvider.java   |    0
 .../toolchain/internal/PreCompiledHeader.java      |  120 +
 .../toolchain/internal/ToolType.java               |    0
 .../internal/UnavailablePlatformToolProvider.java  |   87 +
 .../toolchain/internal/clang/ClangToolChain.java   |    0
 .../internal/compilespec/AssembleSpec.java         |    0
 .../internal/compilespec/CCompileSpec.java         |    0
 .../internal/compilespec/CPCHCompileSpec.java      |    0
 .../internal/compilespec/CppCompileSpec.java       |    0
 .../internal/compilespec/CppPCHCompileSpec.java    |    0
 .../compilespec/ObjectiveCCompileSpec.java         |    0
 .../compilespec/ObjectiveCPCHCompileSpec.java      |    0
 .../compilespec/ObjectiveCppCompileSpec.java       |    0
 .../compilespec/ObjectiveCppPCHCompileSpec.java    |    0
 .../compilespec/WindowsResourceCompileSpec.java    |    0
 .../gcc/AbstractGccCompatibleToolChain.java        |  278 ++
 .../internal/gcc/ArStaticLibraryArchiver.java      |   96 +
 .../toolchain/internal/gcc/Assembler.java          |   47 +
 .../toolchain/internal/gcc/CCompiler.java          |   37 +
 .../toolchain/internal/gcc/CPCHCompiler.java       |   36 +
 .../toolchain/internal/gcc/CppCompiler.java        |   37 +
 .../toolchain/internal/gcc/CppPCHCompiler.java     |   36 +
 .../internal/gcc/DefaultGccPlatformToolChain.java  |  109 +
 .../internal/gcc/GccCompatibleNativeCompiler.java  |    0
 .../internal/gcc/GccCompilerArgsTransformer.java   |   71 +
 .../toolchain/internal/gcc/GccLinker.java          |  119 +
 .../internal/gcc/GccOptionsFileArgsWriter.java     |   53 +
 .../internal/gcc/GccPlatformToolProvider.java      |    0
 .../toolchain/internal/gcc/GccToolChain.java       |    0
 .../toolchain/internal/gcc/ObjectiveCCompiler.java |   37 +
 .../internal/gcc/ObjectiveCPCHCompiler.java        |   36 +
 .../internal/gcc/ObjectiveCppCompiler.java         |   37 +
 .../internal/gcc/ObjectiveCppPCHCompiler.java      |   36 +
 .../internal/gcc/TargetPlatformConfiguration.java  |    0
 .../gcc/version/CompilerMetaDataProvider.java      |    0
 .../version/CompilerMetaDataProviderFactory.java   |   83 +
 .../internal/gcc/version/GccVersionDeterminer.java |  231 +
 .../internal/gcc/version/GccVersionResult.java     |    0
 .../internal/msvcpp/ArchitectureDescriptor.java    |   31 +
 .../toolchain/internal/msvcpp/Assembler.java       |    0
 .../toolchain/internal/msvcpp/CCompiler.java       |   37 +
 .../toolchain/internal/msvcpp/CPCHCompiler.java    |    0
 .../toolchain/internal/msvcpp/CppCompiler.java     |   37 +
 .../toolchain/internal/msvcpp/CppPCHCompiler.java  |    0
 .../msvcpp/DefaultVisualCppPlatformToolChain.java  |   79 +
 .../msvcpp/DefaultVisualStudioLocator.java         |  444 ++
 .../internal/msvcpp/DefaultWindowsSdkLocator.java  |  282 ++
 .../toolchain/internal/msvcpp/EscapeUserArgs.java  |   41 +
 .../msvcpp/LibExeStaticLibraryArchiver.java        |   87 +
 .../toolchain/internal/msvcpp/LinkExeLinker.java   |   94 +
 .../msvcpp/VisualCppCompilerArgsTransformer.java   |   70 +
 .../internal/msvcpp/VisualCppInstall.java          |  105 +
 .../internal/msvcpp/VisualCppNativeCompiler.java   |    0
 .../msvcpp/VisualCppOptionsFileArgsWriter.java     |   37 +
 .../VisualCppPCHCompilerArgsTransformer.java       |    0
 .../msvcpp/VisualCppPlatformToolProvider.java      |  199 +
 .../internal/msvcpp/VisualCppToolChain.java        |  145 +
 .../internal/msvcpp/VisualStudioInstall.java       |   50 +
 .../internal/msvcpp/VisualStudioLocator.java       |   34 +
 .../internal/msvcpp/WindowsResourceCompiler.java   |   53 +
 .../toolchain/internal/msvcpp/WindowsSdk.java      |  139 +
 .../internal/msvcpp/WindowsSdkLocator.java         |    0
 .../internal/plugins/StandardToolChainsPlugin.java |   35 +
 .../CommandLineToolConfigurationInternal.java      |    0
 .../tools/CommandLineToolSearchResult.java         |    0
 .../tools/DefaultCommandLineToolConfiguration.java |   47 +
 .../DefaultGccCommandLineToolConfiguration.java    |   37 +
 .../GccCommandLineToolConfigurationInternal.java   |    0
 .../toolchain/internal/tools/ToolRegistry.java     |    0
 .../toolchain/internal/tools/ToolSearchPath.java   |  190 +
 .../nativeplatform/toolchain/package-info.java     |   21 +
 .../toolchain/plugins/ClangCompilerPlugin.java     |   66 +
 .../toolchain/plugins/GccCompilerPlugin.java       |   68 +
 .../plugins/MicrosoftVisualCppCompilerPlugin.java  |   69 +
 .../toolchain/plugins/package-info.java            |   21 +
 .../org.gradle.clang-compiler.properties           |    1 +
 .../org.gradle.gcc-compiler.properties             |    1 +
 ...gradle.microsoft-visual-cpp-compiler.properties |    1 +
 .../org.gradle.native-component-model.properties   |    1 +
 .../org.gradle.standard-tool-chains.properties     |    1 +
 .../internal/DefaultNativeComponentTest.groovy     |    7 +-
 .../DefaultNativeExecutableBinarySpecTest.groovy   |   17 +-
 .../DefaultNativeExecutableSpecTest.groovy         |    3 +-
 .../internal/DefaultNativeLibrarySpecTest.groovy   |    3 +-
 .../DefaultSharedLibraryBinarySpecTest.groovy      |   15 +-
 .../DefaultStaticLibraryBinarySpecTest.groovy      |   14 +-
 .../internal/NativeBinarySpecTest.groovy           |   14 +-
 .../internal/TestNativeBinariesFactory.java        |   18 +-
 .../configure/CreateDefaultFlavorsTest.groovy      |    2 +-
 .../configure/NativeComponentRulesTest.groovy      |   11 +-
 .../prebuilt/DefaultPrebuiltLibraryTest.groovy     |   30 +
 .../DefaultPrebuiltSharedLibraryBinaryTest.groovy  |   15 +-
 .../DefaultPrebuiltStaticLibraryBinaryTest.groovy  |   12 +-
 .../resolve/CachingLibraryBinaryLocatorTest.groovy |   59 +
 .../resolve/ProjectLibraryBinaryLocatorTest.groovy |   47 +-
 .../plugins/NativeComponentModelPluginTest.groovy  |   75 +-
 .../plugins/NativeComponentPluginTest.groovy       |   15 +-
 .../DefaultNativeTestSuiteBinarySpecTest.groovy    |   68 -
 .../DefaultNativeToolChainRegistryTest.groovy      |    8 +-
 .../toolchain/internal/NativeCompilerTest.groovy   |    3 +-
 .../toolchain/internal/gcc/GccLinkerTest.groovy    |   16 +-
 .../msvcpp/DefaultVisualStudioLocatorTest.groovy   |  154 +-
 .../internal/msvcpp/VisualCppToolChainTest.groovy  |    4 +-
 .../plugins/ClangCompilerPluginTest.groovy         |   10 +-
 .../toolchain/plugins/GccCompilerPluginTest.groovy |   12 +-
 .../MicrosoftVisualCppCompilerPluginTest.groovy    |   68 +
 .../plugins/MicrosoftVisualCppPluginTest.groovy    |   64 -
 .../plugins/NativeToolChainPluginTest.groovy       |    9 +-
 ...bstractInstalledToolChainIntegrationSpec.groovy |    4 +-
 .../fixtures/AvailableToolChains.java              |  115 +-
 .../fixtures/NativeBinaryFixture.groovy            |   13 +
 .../fixtures/NativeInstallationFixture.groovy      |    6 +-
 .../fixtures/RequiresInstalledToolChain.groovy     |    2 +-
 .../fixtures/ToolChainRequirement.java             |   16 +-
 .../fixtures/VisualStudioVersion.java              |   40 +
 .../fixtures/binaryinfo/DumpbinBinaryInfo.groovy   |    9 +-
 .../binaryinfo/FileArchOnlyBinaryInfo.groovy       |   62 +
 .../fixtures/binaryinfo/ReadelfBinaryInfo.groovy   |    6 +
 subprojects/platform-play/platform-play.gradle     |    6 +
 ...dPlayAndJvmLibraryProjectIntegrationTest.groovy |   13 +-
 ...dPlayAndLegacyJavaProjectIntegrationTest.groovy |   35 +
 .../PlayBinaryApplicationIntegrationTest.groovy    |   23 +-
 ...ayDistributionApplicationIntegrationTest.groovy |   45 +-
 ...ayMultiProjectApplicationIntegrationTest.groovy |   11 +-
 ...ayPlatformComponentReportIntegrationTest.groovy |    8 +-
 .../integtest/PlayPlatformIntegrationTest.groovy   |   14 +-
 .../PlayTestApplicationIntegrationTest.groovy      |    8 +-
 .../PlayBinaryAdvancedAppIntegrationTest.groovy    |    8 +-
 ...ayDistributionAdvancedAppIntegrationTest.groovy |   19 +-
 ...aScriptCompilerContinuousIntegrationTest.groovy |    2 +-
 ...ltiProjectContinuousBuildIntegrationTest.groovy |   89 +-
 .../PlayMultiProjectReloadIntegrationTest.groovy   |   16 +-
 ...yRoutesCompilerContinuousIntegrationTest.groovy |    2 +-
 ...ayTwirlCompilerContinuousIntegrationTest.groovy |    2 +-
 .../AbstractPlaySampleIntegrationTest.groovy       |    4 +-
 .../UserGuidePlaySamplesIntegrationTest.groovy     |   11 +-
 .../PlayApplicationPluginIntegrationTest.groovy    |   16 +-
 .../PlayDistributionPluginIntegrationTest.groovy   |  107 +-
 ...stractCoffeeScriptCompileIntegrationTest.groovy |   34 +-
 .../AbstractJavaScriptMinifyIntegrationTest.groovy |   36 +-
 .../AbstractRoutesCompileIntegrationTest.groovy    |   88 +-
 .../CoffeeScriptCompileIntegrationTest.groovy      |   79 +-
 ...offeeScriptImplementationIntegrationTest.groovy |   19 +-
 .../tasks/DistributionZipIntegrationTest.groovy    |    2 +-
 .../tasks/JavaScriptMinifyIntegrationTest.groovy   |   70 +-
 .../Play23RoutesCompileIntegrationTest.groovy      |   11 +-
 .../Play24RoutesCompileIntegrationTest.groovy      |   10 +-
 .../play/tasks/PlayAssetsJarIntegrationTest.groovy |    4 +-
 .../play/tasks/PlayRunIntegrationTest.groovy       |    1 -
 .../play/tasks/TwirlCompileIntegrationTest.groovy  |  163 +-
 .../play/tasks/TwirlVersionIntegrationTest.groovy  |   18 +-
 .../coffeescript/CoffeeScriptSourceSet.java        |    3 +-
 .../internal/DefaultCoffeeScriptSourceSet.java     |   30 -
 .../internal/DefaultJavaScriptSourceSet.java       |    4 +-
 .../gradle/language/routes/RoutesSourceSet.java    |    3 +-
 .../routes/internal/DefaultRoutesSourceSet.java    |   30 -
 .../org/gradle/language/twirl/TwirlImports.java    |   27 +
 .../org/gradle/language/twirl/TwirlSourceSet.java  |    9 +
 .../twirl/internal/DefaultTwirlSourceSet.java      |   17 +-
 .../org/gradle/language/twirl/package-info.java    |    3 +-
 .../src/main/java/org/gradle/play/JvmClasses.java  |    4 +-
 .../org/gradle/play/PlayApplicationBinarySpec.java |    9 +-
 .../java/org/gradle/play/PlayApplicationSpec.java  |    3 +-
 .../main/java/org/gradle/play/PublicAssets.java    |    4 +-
 .../org/gradle/play/distribution/package-info.java |    3 +-
 .../play/internal/CleaningPlayToolCompiler.java    |    1 +
 .../internal/DefaultPlayApplicationBinarySpec.java |  133 +-
 .../gradle/play/internal/DefaultPlayPlatform.java  |    4 +-
 .../DefaultPlayPlatformAwareComponentSpec.java     |   13 +-
 .../gradle/play/internal/JavaScriptSourceCode.java |   22 +
 .../PlayApplicationBinarySpecInternal.java         |   13 +-
 .../play/internal/PlayPlatformNotationParser.java  |   11 +-
 .../gradle/play/internal/PlayPlatformResolver.java |    4 +-
 .../gradle/play/internal/PlaySourceSetRules.java   |   79 -
 .../org/gradle/play/internal/ScalaSourceCode.java  |   22 +
 .../distribution/DefaultPlayDistribution.java      |    1 +
 .../internal/javascript/GoogleClosureCompiler.java |    2 +-
 .../JavaScriptCompileDestinationCalculator.java    |    2 +-
 .../play/internal/platform/PlayMajorVersion.java   |   31 +-
 .../internal/routes/DefaultRoutesCompileSpec.java  |    6 +
 .../DefaultVersionedRoutesCompilerAdapter.java     |    4 +-
 .../play/internal/routes/RoutesCompiler.java       |    1 +
 .../internal/routes/RoutesCompilerAdapterV22X.java |    2 +
 .../internal/routes/RoutesCompilerAdapterV23X.java |    1 +
 .../internal/routes/RoutesCompilerAdapterV24X.java |    5 +-
 .../internal/routes/RoutesCompilerFactory.java     |   15 +-
 .../play/internal/run/DefaultPlayRunSpec.java      |    8 +
 .../run/DefaultVersionedPlayRunAdapter.java        |    3 +
 .../play/internal/run/PlayApplicationRunner.java   |   16 +-
 .../internal/run/PlayApplicationRunnerFactory.java |    7 +-
 .../internal/run/PlayApplicationRunnerToken.java   |    2 +-
 .../play/internal/run/PlayRunAdapterV23X.java      |    4 +-
 .../play/internal/run/PlayRunAdapterV25X.java      |   33 +
 .../gradle/play/internal/run/PlayWorkerClient.java |    1 +
 .../gradle/play/internal/run/PlayWorkerServer.java |   27 +-
 .../spec/PlayApplicationBinaryRenderer.java        |   16 +
 .../internal/toolchain/DefaultPlayToolChain.java   |   18 +-
 .../toolchain/DefaultPlayToolProvider.java         |   13 +-
 .../internal/toolchain/PlayToolChainInternal.java  |    3 +-
 .../toolchain/PlayToolChainServiceRegistry.java    |   11 +-
 .../internal/twirl/DefaultTwirlCompileSpec.java    |   15 +-
 .../play/internal/twirl/TwirlCompileSpec.java      |    3 +-
 .../gradle/play/internal/twirl/TwirlCompiler.java  |    3 +-
 .../internal/twirl/TwirlCompilerAdapterV10X.java   |   14 +-
 .../internal/twirl/TwirlCompilerAdapterV22X.java   |   24 +-
 .../play/internal/twirl/TwirlCompilerFactory.java  |    1 +
 .../twirl/VersionedTwirlCompilerAdapter.java       |    3 +-
 .../main/java/org/gradle/play/package-info.java    |    1 +
 .../org/gradle/play/platform/PlayPlatform.java     |    6 +-
 .../gradle/play/plugins/PlayApplicationPlugin.java |  288 +-
 .../play/plugins/PlayCoffeeScriptPlugin.java       |  189 +-
 .../play/plugins/PlayDistributionPlugin.java       |  177 +-
 .../gradle/play/plugins/PlayJavaScriptPlugin.java  |  146 +-
 .../java/org/gradle/play/plugins/PlayPlugin.java   |    2 +
 .../play/plugins/PlayPluginConfigurations.java     |    4 +-
 .../org/gradle/play/plugins/PlayRoutesPlugin.java  |  134 +
 .../org/gradle/play/plugins/PlayTestPlugin.java    |   17 +-
 .../org/gradle/play/plugins/PlayTwirlPlugin.java   |  164 +
 .../java/org/gradle/play/plugins/package-info.java |    5 +-
 .../org/gradle/play/tasks/JavaScriptMinify.java    |    7 +-
 .../main/java/org/gradle/play/tasks/PlayRun.java   |   29 +-
 .../java/org/gradle/play/tasks/RoutesCompile.java  |    6 +-
 .../java/org/gradle/play/tasks/TwirlCompile.java   |   38 +-
 .../java/org/gradle/play/tasks/package-info.java   |    3 +-
 .../gradle/scala/internal/reflect/ScalaMethod.java |    2 +-
 .../scala/internal/reflect/package-info.java       |   23 -
 .../DefaultCoffeeScriptSourceSetTest.groovy        |   32 -
 .../internal/DefaultJavaScriptSourceSetTest.groovy |    9 +-
 .../play/internal/DefaultPlayToolChainTest.groovy  |    4 +-
 .../play/internal/PlayPlatformResolverTest.groovy  |   53 +-
 .../routes/RoutesCompilerFactoryTest.groovy        |   42 +
 .../run/PlayApplicationRunnerTokenTest.groovy      |    2 +-
 .../toolchain/DefaultPlayToolProviderTest.groovy   |   18 +-
 .../play/plugins/PlayCoffeeScriptPluginTest.groovy |   39 +-
 ...istributionPluginRenameArtifactFilesTest.groovy |  142 +
 .../play/plugins/PlayDistributionPluginTest.groovy |   24 +-
 .../play/plugins/PlayJavaScriptPluginTest.groovy   |   39 +-
 .../org/gradle/play/tasks/PlayRunTest.groovy       |    7 +-
 .../org/gradle/play/tasks/TwirlCompileTest.groovy  |   11 +-
 ...actPlayCompilerContinuousIntegrationTest.groovy |    2 +-
 .../DistributionTestExecHandleBuilder.groovy       |    4 +-
 .../gradle/play/integtest/fixtures/PlayApp.groovy  |    2 +-
 .../play/integtest/fixtures/PlayCoverage.groovy    |    3 +-
 ...ayMultiVersionApplicationIntegrationTest.groovy |    5 +
 .../PlayMultiVersionIntegrationTest.groovy         |    5 -
 .../play/integtest/fixtures/Repositories.groovy    |    2 +-
 .../integtest/fixtures/app/AdvancedPlayApp.groovy  |    5 +
 .../fixtures/app/WithFailingTestsApp.groovy        |    2 +-
 .../app/controllers/jva/PureJava.java              |    4 +-
 .../app/controllers/scala/MixedJava.java           |   30 -
 .../app/controllers/scla/MixedJava.java            |   30 +
 .../fixtures/app/advancedplayapp/build.gradle      |   14 +
 .../fixtures/app/advancedplayapp/conf/scala.routes |    4 +-
 .../advancedplayapp/templates/jva/index.scala.html |   11 +
 .../plugin-development/plugin-development.gradle   |    8 +
 .../BaseGradleImplDepsIntegrationTest.groovy       |  123 +
 ...adleImplDepsCompatibilityIntegrationTest.groovy |  215 +
 ...GradleImplDepsConcurrencyIntegrationTest.groovy |  189 +
 .../GradleImplDepsGenerationIntegrationTest.groovy |   70 +
 ...GradleImplDepsPerformanceIntegrationTest.groovy |   68 +
 .../GradleImplDepsPublishingIntegrationTest.groovy |  131 +
 ...adleImplDepsShadingIssuesIntegrationTest.groovy |  150 +
 .../GradleImplDepsVisibilityIntegrationTest.groovy |  125 +
 .../PackageListGeneratorIntegrationTest.groovy     |  132 +
 .../JavaGradlePluginPluginIntegrationTest.groovy   |  125 +-
 ...dlePluginPluginPublishingIntegrationTest.groovy |  207 +
 ...ePluginPluginTestKitSetupIntegrationTest.groovy |  124 +
 .../PluginUnderTestMetadataIntegrationTest.groovy  |  122 +
 ...pertiesConfiguredByPluginIntegrationTest.groovy |  121 +
 .../ValidateTaskPropertiesIntegrationTest.groovy   |  157 +
 .../devel/GradlePluginDevelopmentExtension.java    |  143 +
 .../org/gradle/plugin/devel/PluginDeclaration.java |   80 +
 .../java/org/gradle/plugin/devel/package-info.java |   20 +
 .../devel/plugins/IvyPluginPublishingRules.java    |  101 +
 .../devel/plugins/JavaGradlePluginPlugin.java      |  229 +-
 .../devel/plugins/MavenPluginPublishingRules.java  |   91 +
 .../gradle/plugin/devel/plugins/package-info.java  |    4 +-
 .../devel/tasks/GeneratePluginDescriptors.java     |   97 +
 .../devel/tasks/PluginUnderTestMetadata.java       |  112 +
 .../plugin/devel/tasks/ValidateTaskProperties.java |  362 ++
 .../gradle/plugin/devel/tasks/package-info.java    |   20 +
 .../plugins/JavaGradlePluginPluginTest.groovy      |   63 +-
 .../JavaGradlePluginPluginTestKitSetupTest.groovy  |  163 +
 subprojects/plugin-use/plugin-use.gradle           |    4 +-
 .../AuthenticatedPluginRepositorySpec.groovy       |  143 +
 .../repository/PluginRepositoriesDslSpec.groovy    |  256 +
 ...ngFromMultipleCustomPluginRepositorySpec.groovy |  283 ++
 ...vingFromSingleCustomPluginRepositorySpec.groovy |  290 ++
 .../plugin/use/CorePluginUseIntegrationSpec.groovy |   18 +
 .../use/DeployedPortalIntegrationSpec.groovy       |   45 +-
 ...readyOnClasspathDetectionIntegrationSpec.groovy |    2 -
 .../NonDeclarativePluginUseIntegrationSpec.groovy  |   14 +-
 .../PluginUseClassLoadingIntegrationSpec.groovy    |   51 +-
 .../plugin/use/PluginUseDslIntegrationSpec.groovy  |   33 +-
 ...lutionCachingCrossVersionIntegrationTest.groovy |    6 +-
 .../PluginResolutionCachingIntegrationTest.groovy  |   12 +-
 ...esolutionDeprecatedClientIntegrationTest.groovy |   11 +-
 ...ginResolutionServiceCommsIntegrationTest.groovy |   12 +-
 .../PluginResolutionServiceIntegrationSpec.groovy  |    6 +-
 .../internal/AbstractPluginRepository.java         |  132 +
 .../internal/BackedByArtifactRepository.java       |   25 +
 .../internal/DefaultGradlePluginPortal.java        |   48 +
 .../internal/DefaultIvyPluginRepository.java       |   60 +
 .../internal/DefaultMavenPluginRepository.java     |   61 +
 .../internal/DefaultPluginRepositoryFactory.java   |   91 +
 .../internal/DefaultPluginRepositoryRegistry.java  |   78 +
 .../internal/PluginRepositoryInternal.java         |   24 +
 .../internal/DefaultPluginRequestApplicator.java   |   72 +-
 .../plugin/use/internal/PluginResolverFactory.java |   64 +-
 .../internal/PluginUsePluginServiceRegistry.java   |   81 +-
 .../internal/ArtifactRepositoryPluginResolver.java |   97 +
 .../use/resolve/internal/CorePluginResolver.java   |    6 +
 .../use/resolve/internal/PluginResolveContext.java |    2 +
 .../use/resolve/internal/PluginResolver.java       |    2 -
 ...tionListeningPluginResolutionServiceClient.java |    2 +-
 .../HttpPluginResolutionServiceClient.java         |   35 +-
 .../internal/PluginResolutionServiceClient.java    |    4 +-
 .../ArtifactRepositoryPluginResolverTest.groovy    |   59 +
 .../resolve/internal/CorePluginResolverTest.groovy |    2 +-
 ...steningPluginResolutionServiceClientTest.groovy |    2 +-
 .../HttpPluginResolutionServiceClientTest.groovy   |   12 +-
 ...CachingPluginResolutionServiceClientTest.groovy |    2 +-
 ...CachingPluginResolutionServiceClientTest.groovy |    2 +-
 .../PluginResolutionServiceTestServer.groovy       |    2 -
 subprojects/plugins/plugins.gradle                 |   16 +-
 .../AbstractCachedCompileIntegrationTest.groovy    |   99 +
 .../ApplicationPluginIntegrationTest.groovy        |  138 +-
 ...plicationPluginUnixShellsIntegrationTest.groovy |  242 +
 .../api/plugins/BasePluginIntegrationTest.groovy   |   29 +-
 .../plugins/BuildSrcPluginIntegrationTest.groovy   |  129 +
 .../gradle/api/plugins/BuildSrcPluginTest.groovy   |   95 -
 .../DistributionPluginIntegrationTest.groovy       |    1 +
 .../JavaLibraryDistributionIntegrationTest.groovy  |   35 +-
 .../api/tasks/JavaExecIntegrationTest.groovy       |   17 +-
 .../api/tasks/bundling/JarIntegrationTest.groovy   |  281 ++
 .../tasks/bundling/WarTaskIntegrationTest.groovy   |   25 +
 .../groovy/GroovyBasePluginIntegrationTest.groovy  |   26 +-
 .../GroovyCrossCompilationIntegrationTest.groovy   |  102 +
 ...oovySecurityManagerIssuesIntegrationTest.groovy |   83 +
 .../BasicGroovyCompilerIntegrationSpec.groovy      |   35 +-
 .../CachedGroovyCompileIntegrationTest.groovy      |  169 +
 .../InProcessGroovyCompilerIntegrationTest.groovy  |    7 +
 .../compile/InvokeDynamicGroovyCompilerSpec.groovy |   13 +-
 .../JavaCrossCompilationIntegrationTest.groovy     |   44 +-
 .../JavaProjectModelBridgingIntegrationTest.groovy |   10 +-
 .../java/ParallelTestTaskIntegrationTest.groovy    |   94 +
 .../PluginsComponentReportIntegrationTest.groovy   |   26 +-
 ...vaVersionCrossCompilationIntegrationTest.groovy |   90 +
 .../BasicJavaCompilerIntegrationSpec.groovy        |   49 +-
 .../CachedJavaCompileIntegrationTest.groovy        |   54 +
 .../InProcessJavaCompilerIntegrationTest.groovy    |    9 +
 .../IncrementalJavaCompileIntegrationTest.groovy   |    4 +-
 .../compile/JavaCompilerIntegrationSpec.groovy     |   13 +-
 .../testing/TestEnvironmentIntegrationTest.groovy  |   71 -
 .../testing/TestReportIntegrationTest.groovy       |  452 --
 .../gradle/testing/TestTaskIntegrationTest.groovy  |   53 -
 .../gradle/testing/TestingIntegrationTest.groovy   |  361 --
 .../AbstractTestFilteringIntegrationTest.groovy    |  190 -
 .../gradle/testing/fixture/TestNGCoverage.groovy   |   36 -
 .../junit/JUnitCategoriesIntegrationSpec.groovy    |   64 -
 .../JUnitConsoleLoggingIntegrationTest.groovy      |  115 -
 .../junit/JUnitFilteringIntegrationTest.groovy     |   79 -
 .../JUnitFilteringSupportIntegrationTest.groovy    |   57 -
 .../testing/junit/JUnitIntegrationTest.groovy      |  448 --
 ...JUnitLoggingOutputCaptureIntegrationTest.groovy |  295 --
 .../testng/SampleTestNGIntegrationTest.groovy      |   62 -
 .../TestNGConsoleLoggingIntegrationTest.groovy     |  168 -
 .../testng/TestNGFilteringIntegrationTest.groovy   |   32 -
 .../testing/testng/TestNGIntegrationTest.groovy    |  172 -
 .../TestNGStaticLoggingIntegrationTest.groovy      |  147 -
 .../testng/TestNGSuiteIntegrationTest.groovy       |   74 -
 .../shared/JavaClass.java                          |    2 +-
 .../build.gradle                                   |    6 +-
 .../build.gradle                                   |    6 +-
 .../build.gradle                                   |    6 +-
 .../build.gradle                                   |    2 +-
 .../shared/build.gradle                            |   23 -
 .../standardOutputLogging/build.gradle             |   34 -
 .../src/test/java/org/gradle/OkTest.java           |   84 -
 .../groovyJdk15Failing/build.gradle                |   16 -
 .../src/main/groovy/org/gradle/Ok.groovy           |    4 -
 .../src/test/groovy/org/gradle/BadTest.groovy      |    5 -
 .../groovyJdk15Passing/build.gradle                |   16 -
 .../src/main/groovy/org/gradle/Ok.groovy           |    4 -
 .../src/test/groovy/org/gradle/OkTest.groovy       |    5 -
 .../javaJdk14Failing/build.gradle                  |   16 -
 .../src/main/java/org/gradle/Ok.java               |    4 -
 .../src/test/java/org/gradle/BadTest.java          |    7 -
 .../javaJdk15Failing/build.gradle                  |   17 -
 .../src/main/java/org/gradle/Ok.java               |    4 -
 .../src/test/java/org/gradle/BadTest.java          |    5 -
 .../src/test/java/org/gradle/BrokenAfterSuite.java |   26 -
 .../org/gradle/TestWithBrokenMethodDependency.java |   30 -
 .../test/java/org/gradle/TestWithBrokenSetup.java  |   31 -
 .../org/gradle/api/distribution/package-info.java  |   20 -
 .../distribution/plugins/DistributionPlugin.groovy |  135 -
 .../internal/java/AbstractLanguageSourceSet.java   |   88 -
 .../api/internal/java/DefaultJavaSourceSet.java    |   57 -
 .../api/internal/java/DefaultJvmResourceSet.java   |   25 -
 .../jvm/ClassDirectoryBinaryNamingScheme.java      |   66 -
 .../internal/jvm/ClassDirectoryBinaryRenderer.java |   35 -
 .../jvm/DefaultClassDirectoryBinarySpec.java       |  169 -
 .../gradle/api/internal/plugins/AbstractRule.java  |   27 -
 .../internal/plugins/BuildConfigurationRule.java   |   53 -
 .../gradle/api/internal/plugins/UploadRule.java    |   65 -
 .../gradle/api/internal/tasks/CompileServices.java |   74 -
 .../api/internal/tasks/DefaultGroovySourceSet.java |   49 -
 .../api/internal/tasks/DefaultSourceSet.java       |  175 -
 .../internal/tasks/DefaultSourceSetContainer.java  |   48 -
 .../api/internal/tasks/DefaultSourceSetOutput.java |  107 -
 .../tasks/testing/AbstractTestDescriptor.java      |   53 -
 .../tasks/testing/DecoratingTestDescriptor.java    |   64 -
 .../tasks/testing/DefaultJUnitXmlReport.java       |   41 -
 .../tasks/testing/DefaultTestClassDescriptor.java  |   33 -
 .../tasks/testing/DefaultTestClassRunInfo.java     |   34 -
 .../tasks/testing/DefaultTestDescriptor.java       |   41 -
 .../tasks/testing/DefaultTestMethodDescriptor.java |   28 -
 .../tasks/testing/DefaultTestOutputEvent.java      |   68 -
 .../tasks/testing/DefaultTestSuiteDescriptor.java  |   34 -
 .../tasks/testing/DefaultTestTaskReports.java      |   46 -
 .../tasks/testing/NoMatchingTestsReporter.java     |   42 -
 .../tasks/testing/SuiteTestClassProcessor.java     |   67 -
 .../tasks/testing/TestClassLoaderFactory.java      |   41 -
 .../internal/tasks/testing/TestClassProcessor.java |   46 -
 .../api/internal/tasks/testing/TestFramework.java  |   47 -
 .../detection/AbstractTestFrameworkDetector.java   |  183 -
 .../testing/detection/DefaultTestClassScanner.java |   82 -
 .../testing/detection/DefaultTestExecuter.java     |   81 -
 .../testing/detection/JarFilePackageLister.java    |   68 -
 .../tasks/testing/filter/DefaultTestFilter.java    |   75 -
 .../tasks/testing/filter/TestSelectionMatcher.java |   62 -
 .../junit/AllExceptIgnoredTestRunnerBuilder.java   |   67 -
 .../tasks/testing/junit/JULRedirector.java         |   42 -
 .../tasks/testing/junit/JUnitDetector.java         |   63 -
 .../testing/junit/JUnitTestClassDetecter.java      |   83 -
 .../testing/junit/JUnitTestClassExecuter.java      |  145 -
 .../testing/junit/JUnitTestClassProcessor.java     |   70 -
 .../tasks/testing/junit/JUnitTestFramework.java    |  103 -
 .../testing/junit/JUnitTestMethodDetecter.java     |   37 -
 .../junit/TestClassExecutionEventGenerator.java    |   89 -
 .../testing/junit/report/ClassPageRenderer.java    |  122 -
 .../testing/junit/report/ClassTestResults.java     |   80 -
 .../testing/junit/report/CompositeTestResults.java |  155 -
 .../testing/junit/report/DefaultTestReport.java    |   93 -
 .../testing/junit/report/PackagePageRenderer.java  |   73 -
 .../testing/junit/report/PackageTestResults.java   |   65 -
 .../tasks/testing/junit/report/PageRenderer.java   |  187 -
 .../tasks/testing/junit/report/TestResult.java     |  106 -
 .../junit/result/AggregateTestResultsProvider.java |  138 -
 .../result/Binary2JUnitXmlReportGenerator.java     |   78 -
 .../BinaryResultBackedTestResultsProvider.java     |   62 -
 .../junit/result/InMemoryTestResultsProvider.java  |   63 -
 .../testing/junit/result/JUnitXmlResultWriter.java |  124 -
 .../testing/junit/result/TestOutputStore.java      |  388 --
 .../junit/result/TestReportDataCollector.java      |  139 -
 .../tasks/testing/logging/AbstractTestLogger.java  |   99 -
 .../logging/ClassMethodNameStackTraceSpec.java     |   35 -
 .../tasks/testing/logging/DefaultTestLogging.java  |  152 -
 .../logging/DefaultTestLoggingContainer.java       |  213 -
 .../testing/logging/FullExceptionFormatter.java    |  125 -
 .../testing/logging/GroovyStackTraceSpec.java      |   46 -
 .../testing/logging/ShortExceptionFormatter.java   |   68 -
 .../tasks/testing/logging/TestCountLogger.java     |  107 -
 .../tasks/testing/logging/TestEventLogger.java     |  119 -
 .../testing/logging/TruncatedStackTraceSpec.java   |   32 -
 .../CaptureTestOutputTestResultProcessor.java      |   90 -
 .../DefaultStandardOutputRedirector.java           |   93 -
 .../processors/MaxNParallelTestClassProcessor.java |   80 -
 .../RestartEveryNTestClassProcessor.java           |   66 -
 .../processors/StandardOutputRedirector.java       |   26 -
 .../tasks/testing/processors/TestMainAction.java   |   77 -
 .../testing/processors/TestOutputRedirector.java   |   77 -
 .../results/AttachParentTestResultProcessor.java   |   54 -
 .../tasks/testing/results/DefaultTestResult.java   |   87 -
 .../results/StateTrackingTestResultProcessor.java  |   99 -
 .../testing/results/UnknownTestDescriptor.java     |   48 -
 .../tasks/testing/testng/TestNGDetector.java       |   64 -
 .../testng/TestNGListenerAdapterFactory.java       |   75 -
 .../internal/tasks/testing/testng/TestNGSpec.java  |  110 -
 .../testing/testng/TestNGTestClassDetecter.java    |   75 -
 .../testing/testng/TestNGTestClassProcessor.java   |  162 -
 .../tasks/testing/testng/TestNGTestFramework.java  |  126 -
 .../testing/testng/TestNGTestMethodDetecter.java   |   48 -
 .../testng/TestNGTestResultProcessorAdapter.java   |  215 -
 .../testing/worker/ForkingTestClassProcessor.java  |   89 -
 .../tasks/testing/worker/TestEventSerializer.java  |  209 -
 .../internal/tasks/testing/worker/TestWorker.java  |  145 -
 .../gradle/api/plugins/ApplicationPlugin.groovy    |  139 -
 .../api/plugins/ApplicationPluginConvention.groovy |   65 -
 .../groovy/org/gradle/api/plugins/BasePlugin.java  |  172 -
 .../gradle/api/plugins/BasePluginConvention.groovy |   64 -
 .../org/gradle/api/plugins/GroovyBasePlugin.java   |  140 -
 .../org/gradle/api/plugins/JavaBasePlugin.java     |  412 --
 .../plugins/JavaLibraryDistributionPlugin.groovy   |   46 -
 .../groovy/org/gradle/api/plugins/JavaPlugin.java  |  205 -
 .../gradle/api/plugins/JavaPluginConvention.groovy |  176 -
 .../gradle/api/plugins/WarPluginConvention.groovy  |   38 -
 .../groovy/org/gradle/api/tasks/GroovyRuntime.java |  131 -
 .../groovy/org/gradle/api/tasks/SourceSet.java     |  208 -
 .../main/groovy/org/gradle/api/tasks/Upload.java   |  132 -
 .../tasks/application/CreateStartScripts.groovy    |   20 -
 .../org/gradle/api/tasks/bundling/Jar.groovy       |   33 -
 .../org/gradle/api/tasks/bundling/War.groovy       |  133 -
 .../gradle/api/tasks/testing/JUnitXmlReport.java   |   39 -
 .../groovy/org/gradle/api/tasks/testing/Test.java  | 1160 -----
 .../org/gradle/api/tasks/testing/TestFilter.java   |  109 -
 .../org/gradle/api/tasks/testing/TestReport.java   |  158 -
 .../gradle/api/tasks/testing/TestTaskReports.java  |   42 -
 .../api/tasks/testing/junit/JUnitOptions.groovy    |   51 -
 .../api/tasks/testing/testng/TestNGOptions.groovy  |  264 -
 .../jvm/application/tasks/CreateStartScripts.java  |  278 --
 .../org/gradle/api/distribution/Distribution.java  |    0
 .../api/distribution/DistributionContainer.java    |    0
 .../distribution/internal/DefaultDistribution.java |    0
 .../internal/DefaultDistributionContainer.java     |    0
 .../org/gradle/api/distribution/package-info.java  |   21 +
 .../distribution/plugins/DistributionPlugin.java   |  159 +
 .../api/distribution/plugins/package-info.java     |   21 +
 .../api/internal/java/DefaultJavaSourceSet.java    |   64 +
 .../api/internal/java/DefaultJvmResourceSet.java   |   32 +
 .../org/gradle/api/internal/java/JavaLibrary.java  |    0
 .../gradle/api/internal/java/WebApplication.java   |    0
 .../jvm/ClassDirectoryBinaryNamingScheme.java      |   66 +
 .../jvm/ClassDirectoryBinarySpecInternal.java      |    0
 .../jvm/DefaultClassDirectoryBinarySpec.java       |  166 +
 .../gradle/api/internal/jvm/JvmBinaryRenderer.java |   35 +
 .../gradle/api/internal/plugins/AbstractRule.java  |   27 +
 .../internal/plugins/BuildConfigurationRule.java   |   53 +
 .../plugins/DefaultArtifactPublicationSet.java     |    0
 .../DefaultTemplateBasedStartScriptGenerator.java  |    6 +-
 .../gradle/api/internal/plugins/GroovyJarFile.java |    0
 .../api/internal/plugins/StartScriptGenerator.java |    0
 .../gradle/api/internal/plugins/UploadRule.java    |   65 +
 .../gradle/api/internal/tasks/CompileServices.java |   74 +
 .../api/internal/tasks/DefaultGroovySourceSet.java |   48 +
 .../api/internal/tasks/DefaultSourceSet.java       |  183 +
 .../internal/tasks/DefaultSourceSetContainer.java  |   51 +
 .../api/internal/tasks/DefaultSourceSetOutput.java |  107 +
 .../internal/tasks/SourceSetCompileClasspath.java  |    0
 .../org/gradle/api/plugins/ApplicationPlugin.java  |  194 +
 .../api/plugins/ApplicationPluginConvention.java   |  109 +
 .../java/org/gradle/api/plugins/BasePlugin.java    |  172 +
 .../gradle/api/plugins/BasePluginConvention.java   |  123 +
 .../org/gradle/api/plugins/GroovyBasePlugin.java   |  148 +
 .../org/gradle/api/plugins/GroovyPlugin.java       |    0
 .../org/gradle/api/plugins/JavaBasePlugin.java     |  421 ++
 .../api/plugins/JavaLibraryDistributionPlugin.java |   58 +
 .../java/org/gradle/api/plugins/JavaPlugin.java    |  201 +
 .../gradle/api/plugins/JavaPluginConvention.java   |  233 +
 .../org/gradle/api/plugins/WarPlugin.java          |    0
 .../gradle/api/plugins/WarPluginConvention.java    |   56 +
 .../java/org/gradle/api/tasks/GroovyRuntime.java   |  131 +
 .../org/gradle/api/tasks/GroovySourceSet.java      |    0
 .../main/java/org/gradle/api/tasks/SourceSet.java  |  227 +
 .../org/gradle/api/tasks/SourceSetContainer.java   |    0
 .../org/gradle/api/tasks/SourceSetOutput.java      |    0
 .../src/main/java/org/gradle/api/tasks/Upload.java |  136 +
 .../api/tasks/application/CreateStartScripts.java  |   84 +
 .../java/org/gradle/api/tasks/bundling/Jar.java    |   35 +
 .../java/org/gradle/api/tasks/bundling/War.java    |  176 +
 .../org/gradle/jvm/ClassDirectoryBinarySpec.java   |    0
 .../jvm/application/scripts/package-info.java      |    1 +
 .../jvm/application/tasks/CreateStartScripts.java  |  288 ++
 .../gradle/jvm/application/tasks/package-info.java |    0
 .../api/internal/plugins/unixStartScript.txt       |   68 +-
 .../api/internal/plugins/windowsStartScript.txt    |   14 +-
 .../plugins/DistributionPluginTest.groovy          |    7 +-
 .../internal/java/DefaultJavaSourceSetTest.groovy  |    7 +-
 .../internal/java/DefaultJvmResourceSetTest.groovy |    7 +-
 .../jvm/DefaultClassDirectoryBinarySpecTest.groovy |   15 +-
 .../plugins/UnixStartScriptGeneratorTest.groovy    |    2 +-
 .../plugins/WindowsStartScriptGeneratorTest.groovy |    2 +-
 .../tasks/DefaultGroovySourceSetTest.groovy        |   10 +-
 .../tasks/DefaultSourceSetContainerTest.java       |    5 +-
 .../api/internal/tasks/DefaultSourceSetTest.groovy |   30 +-
 .../detection/DefaultTestClassScannerTest.groovy   |   58 -
 .../detection/DefaultTestExecuterTest.groovy       |   72 -
 .../junit/JUnitTestClassProcessorData.groovy       |  293 --
 .../junit/JUnitTestClassProcessorTest.groovy       |  297 --
 .../junit/report/DefaultTestReportTest.groovy      |  584 ---
 .../Binary2JUnitXmlReportGeneratorSpec.groovy      |   74 -
 .../result/TestReportDataCollectorSpec.groovy      |  222 -
 .../testing/logging/AbstractTestLoggerTest.groovy  |  167 -
 .../logging/FullExceptionFormatterTest.groovy      |  252 -
 .../logging/ShortExceptionFormatterTest.groovy     |   70 -
 .../testing/logging/TestCountLoggerTest.groovy     |  153 -
 .../testing/logging/TestEventLoggerTest.groovy     |  105 -
 .../MaxNParallelTestClassProcessorTest.groovy      |  170 -
 .../RestartEveryNTestClassProcessorTest.java       |  156 -
 .../testing/processors/TestMainActionTest.groovy   |  127 -
 .../testng/TestNGListenerAdapterFactorySpec.groovy |   80 -
 .../testng/TestNGTestClassProcessorTest.groovy     |  417 --
 .../testing/testng/TestNGTestFrameworkTest.groovy  |   75 -
 .../worker/ForkingTestClassProcessorTest.groovy    |   46 -
 .../testing/worker/TestEventSerializerTest.groovy  |  190 -
 .../tasks/testing/worker/TestWorkerTest.groovy     |   74 -
 .../api/plugins/ApplicationPluginTest.groovy       |   31 +-
 .../api/plugins/BasePluginConventionTest.groovy    |   23 +-
 .../org/gradle/api/plugins/BasePluginTest.groovy   |    9 +-
 .../gradle/api/plugins/GroovyBasePluginTest.groovy |   15 +-
 .../org/gradle/api/plugins/GroovyPluginTest.groovy |    2 +-
 .../gradle/api/plugins/JavaBasePluginTest.groovy   |   42 +-
 .../JavaLibraryDistributionPluginTest.groovy       |    6 +-
 .../api/plugins/JavaPluginConventionTest.groovy    |   14 +-
 .../org/gradle/api/plugins/JavaPluginTest.groovy   |  395 +-
 .../org/gradle/api/plugins/WarPluginTest.groovy    |   16 +-
 .../org/gradle/api/tasks/GroovyRuntimeTest.groovy  |    6 +-
 .../groovy/org/gradle/api/tasks/UploadTest.groovy  |    6 +-
 .../application/CreateStartScriptsTest.groovy      |    8 +-
 .../org/gradle/api/tasks/bundling/WarTest.groovy   |   16 +-
 .../api/tasks/compile/GroovyCompileTest.groovy     |  102 +
 .../api/tasks/compile/GroovyCompileTest.java       |  114 -
 .../gradle/api/tasks/testing/TestReportTest.groovy |   17 +-
 .../gradle/api/tasks/testing/TestTaskSpec.groovy   |    7 +-
 .../org/gradle/api/tasks/testing/TestTest.groovy   |  235 +
 .../org/gradle/api/tasks/testing/TestTest.java     |  281 --
 .../tasks/testing/testng/TestNGOptionsTest.groovy  |   24 +-
 .../testing/BuildableTestResultsProvider.groovy    |  163 -
 .../api/tasks/compile/AbstractCompileTest.groovy   |   92 +
 .../api/tasks/compile/AbstractCompileTest.java     |   92 -
 .../process-services/process-services.gradle       |   14 +
 .../java}/org/gradle/process/BaseExecSpec.java     |    0
 .../main/java}/org/gradle/process/ExecResult.java  |    0
 .../main/java}/org/gradle/process/ExecSpec.java    |    0
 .../org/gradle/process/ProcessForkOptions.java     |  109 +
 .../org/gradle/process/internal/ExecException.java |    0
 .../org/gradle/process/internal/ExecHandle.java    |   59 +
 .../gradle/process/internal/ExecHandleBuilder.java |   25 +
 .../gradle/process/internal/ExecHandleFactory.java |   21 +
 .../process/internal/ExecHandleListener.java       |    0
 .../gradle/process/internal/ExecHandleState.java   |    0
 .../org/gradle/api/publish/package-info.java       |   25 -
 .../gradle/api/publish/plugins/package-info.java   |   25 -
 .../org/gradle/api/publish/Publication.java        |    0
 .../gradle/api/publish/PublicationContainer.java   |    0
 .../gradle/api/publish/PublishingExtension.java    |    0
 .../internal/DefaultPublicationContainer.java      |    0
 .../internal/DefaultPublishingExtension.java       |    0
 .../ProjectDependencyPublicationResolver.java      |    0
 .../internal/PublicationFieldValidator.java        |    0
 .../api/publish/internal/PublicationInternal.java  |    0
 .../api/publish/internal/PublishOperation.java     |    0
 .../api/publish/internal/PublishServices.java      |    0
 .../java/org/gradle/api/publish/package-info.java  |   23 +
 .../api/publish/plugins/PublishingPlugin.java      |    0
 .../gradle/api/publish/plugins/package-info.java   |   23 +
 .../publish/plugins/PublishingPluginTest.groovy    |    7 +-
 subprojects/reporting/reporting.gradle             |    2 +
 .../BuildDashboardPluginIntegrationTest.groovy     |    6 +-
 .../api/reporting/BuildDashboardReports.java       |   32 -
 .../org/gradle/api/reporting/DirectoryReport.java  |   47 -
 .../api/reporting/GenerateBuildDashboard.java      |  160 -
 .../groovy/org/gradle/api/reporting/Report.java    |  119 -
 .../org/gradle/api/reporting/ReportContainer.java  |   60 -
 .../groovy/org/gradle/api/reporting/Reporting.java |   84 -
 .../gradle/api/reporting/ReportingExtension.java   |  110 -
 .../org/gradle/api/reporting/SingleFileReport.java |   30 -
 .../internal/BuildDashboardGenerator.java          |  105 -
 .../reporting/internal/DefaultReportContainer.java |   80 -
 .../api/reporting/internal/SimpleReport.java       |   83 -
 .../reporting/internal/TaskGeneratedReport.java    |   32 -
 .../reporting/internal/TaskReportContainer.java    |   82 -
 .../gradle/api/plugins/ReportingBasePlugin.java    |    0
 .../api/reporting/BuildDashboardReports.java       |   34 +
 .../gradle/api/reporting/ConfigurableReport.java   |    0
 .../api/reporting/CustomizableHtmlReport.java      |   42 +
 .../org/gradle/api/reporting/DirectoryReport.java  |   53 +
 .../api/reporting/GenerateBuildDashboard.java      |  188 +
 .../main/java/org/gradle/api/reporting/Report.java |  126 +
 .../org/gradle/api/reporting/ReportContainer.java  |  105 +
 .../java/org/gradle/api/reporting/Reporting.java   |  103 +
 .../gradle/api/reporting/ReportingExtension.java   |  110 +
 .../org/gradle/api/reporting/SingleFileReport.java |   36 +
 .../internal/BuildDashboardGenerator.java          |  105 +
 .../internal/CustomizableHtmlReportImpl.java       |   41 +
 .../internal/DefaultBuildDashboardReports.java     |    0
 .../reporting/internal/DefaultReportContainer.java |  129 +
 .../api/reporting/internal/SimpleReport.java       |   83 +
 .../reporting/internal/TaskGeneratedReport.java    |   32 +
 .../TaskGeneratedSingleDirectoryReport.java        |    0
 .../internal/TaskGeneratedSingleFileReport.java    |    0
 .../reporting/internal/TaskReportContainer.java    |   36 +
 .../org/gradle/api/reporting/package-info.java     |    0
 .../reporting/plugins/BuildDashboardPlugin.java    |    0
 .../gradle/api/reporting/plugins/package-info.java |    0
 .../org.gradle.reporting-base.properties           |    1 +
 .../api/plugins/ReportingBasePluginTest.groovy     |   17 +-
 .../reporting/GenerateBuildDashboardSpec.groovy    |    7 +-
 .../internal/TaskReportContainerTest.groovy        |   56 +-
 subprojects/resources-http/resources-http.gradle   |    5 +-
 .../HttpResourceAccessorIntegrationTest.groovy     |   46 +
 .../gradle/authentication/http/package-info.java   |    4 +-
 .../http/ApacheDirectoryListingParser.java         |   10 +-
 .../transport/http/DefaultHttpSettings.java        |   15 +-
 .../transport/http/DefaultSslContextFactory.java   |  181 +
 .../transport/http/HttpClientConfigurer.java       |  107 +-
 .../resource/transport/http/HttpClientHelper.java  |  253 +-
 .../transport/http/HttpConnectorFactory.java       |    8 +-
 .../transport/http/HttpResourceAccessor.java       |   71 +-
 .../transport/http/HttpResourceLister.java         |    7 +-
 .../transport/http/HttpResourceUploader.java       |   17 +-
 .../http/HttpResourcesPluginServiceRegistry.java   |    8 +-
 .../transport/http/HttpResponseResource.java       |   28 +-
 .../resource/transport/http/HttpSettings.java      |    4 +
 .../resource/transport/http/SslContextFactory.java |   23 +
 .../transport/http/ntlm/NTLMCredentials.java       |    2 +-
 .../transport/http/ntlm/NTLMSchemeFactory.java     |   14 +-
 .../transport/http/AbstractHttpClientTest.groovy   |   56 +
 .../http/AlwaysRedirectRedirectStrategyTest.groovy |    4 +-
 .../http/ApacheDirectoryListingParserTest.groovy   |   14 +-
 .../http/DefaultSslContextFactoryTest.groovy       |  156 +
 .../transport/http/HttpClientConfigurerTest.groovy |   50 +-
 .../transport/http/HttpClientHelperTest.groovy     |   51 +-
 .../transport/http/HttpResourceAccessorTest.groovy |   37 +
 .../transport/http/HttpResourceListerTest.groovy   |    4 +-
 .../transport/http/HttpResourceUploaderTest.groovy |   40 +
 .../transport/http/HttpResponseResourceTest.groovy |   22 +-
 subprojects/resources-s3/resources-s3.gradle       |    3 +
 .../resource/s3/S3ClientIntegrationTest.groovy     |   64 +-
 .../resource/s3/fixtures/IvyS3Module.groovy        |   21 +
 .../resource/s3/fixtures/IvyS3Repository.groovy    |    2 +-
 .../resource/s3/fixtures/MavenS3Repository.groovy  |    2 +-
 .../resource/s3/fixtures/S3Server.groovy           |  212 +-
 .../maven/MavenS3ProxiedRepoIntegrationTest.groovy |    2 +-
 .../maven/MavenS3RepoResolveIntegrationTest.groovy |   12 +-
 .../MavenS3SnapshotRepoIntegrationTest.groovy      |    6 +-
 .../resource/transport/aws/s3/S3Client.java        |   93 +-
 .../transport/aws/s3/S3RegionalResource.java       |    9 +-
 .../transport/aws/s3/S3ResourceConnector.java      |   15 +-
 .../transport/aws/s3/S3ResourceResolver.java       |   87 +
 .../resource/transport/aws/s3/S3ClientTest.groovy  |   44 +-
 .../transport/aws/s3/S3RegionalResourceTest.groovy |   17 +-
 .../aws/s3/S3ResourceConnectorTest.groovy          |   26 +-
 .../transport/aws/s3/S3ResourceResolverTest.groovy |   94 +
 subprojects/resources-sftp/resources-sftp.gradle   |    3 +
 .../ivy/IvySftpRepoErrorsIntegrationTest.groovy    |    2 +-
 .../resource/transport/sftp/SftpClientFactory.java |    2 +-
 .../resource/transport/sftp/SftpResource.java      |    4 +-
 .../transport/sftp/SftpResourceAccessor.java       |   10 +-
 .../transport/sftp/SftpResourceLister.java         |    2 +-
 .../transport/sftp/SftpResourceUploader.java       |    5 +-
 subprojects/resources/resources.gradle             |    4 +
 .../resource/UriTextResourceIntegrationTest.groovy |   51 +
 .../api/resources/MissingResourceException.java    |   40 +
 .../gradle/api/resources/ResourceException.java    |   65 +
 .../org/gradle/authentication/package-info.java    |    4 +-
 .../resource/AbstractExternalResource.java         |   20 +-
 .../gradle/internal/resource/CachingResource.java  |   45 -
 .../internal/resource/CachingTextResource.java     |   92 +
 .../org/gradle/internal/resource/CharsetUtil.java  |   25 -
 .../internal/resource/DelegatingResource.java      |   52 -
 .../gradle/internal/resource/ExternalResource.java |   18 +-
 .../resource/LocalFileStandInExternalResource.java |    8 +
 .../org/gradle/internal/resource/Resource.java     |   44 +-
 .../internal/resource/ResourceException.java       |   67 -
 .../internal/resource/ResourceExceptions.java      |   71 +
 .../resource/ResourceIsAFolderException.java       |   30 +
 .../gradle/internal/resource/ResourceLocation.java |   54 +
 .../resource/ResourceNotFoundException.java        |   32 -
 .../gradle/internal/resource/StringResource.java   |   50 -
 .../internal/resource/StringTextResource.java      |  105 +
 .../org/gradle/internal/resource/TextResource.java |  100 +
 .../org/gradle/internal/resource/UriResource.java  |  204 -
 .../gradle/internal/resource/UriTextResource.java  |  273 ++
 .../local/AbstractLocallyAvailableResource.java    |   10 +
 .../DefaultLocallyAvailableExternalResource.java   |    5 -
 .../local/DefaultLocallyAvailableResource.java     |    5 -
 .../internal/resource/local/FileLocalResource.java |    4 +-
 .../internal/resource/local/LocalResource.java     |    2 +-
 .../resource/local/LocallyAvailableResource.java   |    3 +-
 .../resource/transfer/DefaultExternalResource.java |    2 +-
 .../transfer/DefaultExternalResourceConnector.java |  211 +-
 .../transfer/ExternalResourceAccessor.java         |   10 +-
 .../resource/transfer/ExternalResourceLister.java  |   11 +-
 .../resource/AbstractExternalResourceTest.groovy   |   17 +-
 .../internal/resource/CachingResourceTest.groovy   |   67 -
 .../resource/CachingTextResourceTest.groovy        |   88 +
 .../internal/resource/ResourceExceptionTest.groovy |   54 -
 .../resource/ResourceExceptionsTest.groovy         |   55 +
 .../internal/resource/StringResourceTest.groovy    |   49 -
 .../resource/StringTextResourceTest.groovy         |   54 +
 .../internal/resource/UriResourceTest.groovy       |  210 -
 .../internal/resource/UriTextResourceTest.groovy   |  277 ++
 subprojects/scala/scala.gradle                     |    4 +-
 .../integtests/ScalaProjectIntegrationTest.java    |    4 +-
 .../SamplesMixedJavaAndScalaIntegrationTest.groovy |    9 +-
 ...plesScalaCustomizedLayoutIntegrationTest.groovy |    6 +-
 .../SamplesScalaQuickstartIntegrationTest.groovy   |    4 +-
 .../samples/SamplesScalaZincIntegrationTest.groovy |    2 +-
 .../scala/ScalaBasePluginIntegrationTest.groovy    |   53 +-
 .../ScalaCrossCompilationIntegrationTest.groovy    |  109 +
 ...ctAntForkingScalaCompilerIntegrationTest.groovy |   41 -
 ...AntInProcessScalaCompilerIntegrationTest.groovy |   46 -
 ...ForkingOlderScalaCompilerIntegrationTest.groovy |   28 -
 .../AntForkingScalaCompilerIntegrationTest.groovy  |   24 -
 ...ProcessOlderScalaCompilerIntegrationTest.groovy |   28 -
 ...AntInProcessScalaCompilerIntegrationTest.groovy |   25 -
 .../BasicScalaCompilerIntegrationTest.groovy       |   15 +-
 .../IncrementalScalaCompileIntegrationTest.groovy  |   12 +-
 .../ZincScalaCompilerIntegrationTest.groovy        |   33 +-
 ...ScalaCompilerMultiVersionIntegrationTest.groovy |    5 +-
 .../JreJavaHomeScalaIntegrationTest.groovy         |   29 +-
 .../scala/test/ScalaTestIntegrationTest.groovy     |    4 +-
 .../compilesAllScalaCodeWhenForced/build.gradle    |   15 +
 .../src/main/scala/House.scala                     |    1 +
 .../src/main/scala/Other.scala                     |    1 +
 .../src/main/scala/Person.scala                    |    1 +
 .../build.gradle                                   |    7 -
 .../compilesJavaCodeIncrementally/build.gradle     |    6 -
 .../compilesScalaCodeIncrementally/build.gradle    |    6 -
 .../api/internal/tasks/DefaultScalaSourceSet.java  |   49 -
 .../internal/tasks/scala/AntScalaCompiler.groovy   |  107 -
 .../internal/tasks/scala/ScalaCompilerFactory.java |   70 -
 .../tasks/scala/ScalaJavaJointCompiler.java        |   26 -
 .../api/plugins/scala/ScalaBasePlugin.groovy       |  142 -
 .../gradle/api/plugins/scala/ScalaPlugin.groovy    |   44 -
 .../groovy/org/gradle/api/tasks/ScalaRuntime.java  |  149 -
 .../org/gradle/api/tasks/scala/AntScalaDoc.groovy  |   63 -
 .../org/gradle/api/tasks/scala/ScalaCompile.java   |  119 -
 .../api/tasks/scala/ScalaCompileOptions.java       |  141 -
 .../org/gradle/api/tasks/scala/ScalaDoc.java       |  115 -
 .../gradle/api/tasks/scala/ScalaDocOptions.java    |  220 -
 .../api/internal/tasks/DefaultScalaSourceSet.java  |   48 +
 .../api/internal/tasks/scala/AntScalaDoc.java      |   76 +
 .../tasks/scala/CleaningScalaCompiler.java         |    0
 .../tasks/scala/DefaultScalaJavaJointCompiler.java |    0
 .../internal/tasks/scala/ScalaCompilerFactory.java |   54 +
 .../gradle/api/plugins/scala/ScalaBasePlugin.java  |  193 +
 .../org/gradle/api/plugins/scala/ScalaPlugin.java  |   70 +
 .../org/gradle/api/plugins/scala/package-info.java |   20 +
 .../java/org/gradle/api/tasks/ScalaRuntime.java    |  144 +
 .../org/gradle/api/tasks/ScalaSourceSet.java       |    0
 .../org/gradle/api/tasks/scala/ScalaCompile.java   |  109 +
 .../api/tasks/scala/ScalaCompileOptions.java       |   25 +
 .../java/org/gradle/api/tasks/scala/ScalaDoc.java  |  122 +
 .../gradle/api/tasks/scala/ScalaDocOptions.java    |  220 +
 .../tasks/DefaultScalaSourceSetTest.groovy         |    9 +-
 .../api/plugins/scala/ScalaBasePluginTest.groovy   |   20 +-
 .../api/plugins/scala/ScalaPluginTest.groovy       |    9 +-
 .../org/gradle/api/tasks/ScalaRuntimeTest.groovy   |    6 +-
 .../api/tasks/scala/BaseScalaOptionTest.groovy     |  101 +
 .../api/tasks/scala/ScalaCompileOptionsTest.groovy |  144 -
 .../gradle/api/tasks/scala/ScalaCompileTest.groovy |   86 +
 .../gradle/api/tasks/scala/ScalaCompileTest.java   |  141 -
 .../api/tasks/scala/ScalaDocOptionsTest.groovy     |  105 +-
 .../org/gradle/api/tasks/scala/ScalaDocSpec.groovy |   55 +
 .../org/gradle/api/tasks/scala/ScalaDocTest.java   |   61 -
 subprojects/signing/signing.gradle                 |    4 +-
 .../NoSigningCredentialsIntegrationSpec.groovy     |    9 +-
 .../plugins/signing/SigningSamplesSpec.groovy      |    6 +-
 .../signing/SigningTasksIntegrationSpec.groovy     |   66 +-
 .../gradle/plugins/signing/keys/subkey/keyId.txt   |    1 +
 .../plugins/signing/keys/subkey/password.txt       |    1 +
 .../gradle/plugins/signing/keys/subkey/secring.gpg |  Bin 0 -> 2291 bytes
 .../groovy/org/gradle/plugins/signing/Sign.groovy  |  205 -
 .../gradle/plugins/signing/SignOperation.groovy    |  179 -
 .../org/gradle/plugins/signing/Signature.groovy    |  330 --
 .../gradle/plugins/signing/SignatureSpec.groovy    |   72 -
 .../gradle/plugins/signing/SigningExtension.groovy |  379 --
 .../gradle/plugins/signing/SigningPlugin.groovy    |   42 -
 .../plugins/signing/signatory/Signatory.groovy     |   48 -
 .../signing/signatory/SignatoryProvider.groovy     |   52 -
 .../signing/signatory/SignatorySupport.groovy      |   26 -
 .../plugins/signing/signatory/pgp/PgpKeyId.groovy  |  100 -
 .../signing/signatory/pgp/PgpSignatory.groovy      |   86 -
 .../signatory/pgp/PgpSignatoryFactory.groovy       |  109 -
 .../signatory/pgp/PgpSignatoryProvider.groovy      |   76 -
 .../signing/type/AbstractSignatureType.groovy      |   50 -
 .../type/AbstractSignatureTypeProvider.groovy      |   48 -
 .../signing/type/BinarySignatureType.groovy        |   24 -
 .../type/DefaultSignatureTypeProvider.groovy       |   29 -
 .../plugins/signing/type/SignatureType.groovy      |   32 -
 .../signing/type/SignatureTypeProvider.groovy      |   27 -
 .../signing/type/pgp/ArmoredSignatureType.groovy   |   34 -
 .../main/java/org/gradle/plugins/signing/Sign.java |  358 ++
 .../org/gradle/plugins/signing/SignOperation.java  |  238 +
 .../java/org/gradle/plugins/signing/Signature.java |  404 ++
 .../org/gradle/plugins/signing/SignatureSpec.java  |   71 +
 .../gradle/plugins/signing/SigningExtension.java   |  454 ++
 .../org/gradle/plugins/signing/SigningPlugin.java  |   40 +
 .../org/gradle/plugins/signing/package-info.java   |   20 +
 .../plugins/signing/signatory/Signatory.java       |   48 +
 .../signing/signatory/SignatoryProvider.java       |   53 +
 .../signing/signatory/SignatorySupport.java        |   32 +
 .../plugins/signing/signatory/package-info.java    |   20 +
 .../gradle/plugins/signing/signatory/pgp/Dsl.java  |   60 +
 .../plugins/signing/signatory/pgp/PgpKeyId.java    |  112 +
 .../signing/signatory/pgp/PgpSignatory.java        |  121 +
 .../signing/signatory/pgp/PgpSignatoryFactory.java |  167 +
 .../signatory/pgp/PgpSignatoryProvider.java        |   52 +
 .../signing/signatory/pgp/package-info.java        |   20 +
 .../signing/type/AbstractSignatureType.java        |   83 +
 .../type/AbstractSignatureTypeProvider.java        |   62 +
 .../plugins/signing/type/BinarySignatureType.java  |   27 +
 .../signing/type/DefaultSignatureTypeProvider.java |   32 +
 .../gradle/plugins/signing/type/SignatureType.java |   68 +
 .../signing/type/SignatureTypeProvider.java        |   30 +
 .../gradle/plugins/signing/type/package-info.java  |   20 +
 .../signing/type/pgp/ArmoredSignatureType.java     |   46 +
 .../plugins/signing/type/pgp/package-info.java     |   20 +
 .../plugins/signing/SigningProjectSpec.groovy      |   66 +-
 subprojects/smoke-test/smoke-test.gradle           |   46 +
 .../org/gradle/smoketests/AbstractSmokeTest.groovy |   70 +
 .../smoketests/AndroidPluginsSmokeTest.groovy      |  250 +
 .../org/gradle/smoketests/GrettySmokeTest.groovy   |   53 +
 .../smoketests/JavascriptPluginsSmokeTest.groovy   |  125 +
 .../gradle/smoketests/KotlinPluginSmokeTest.groovy |   50 +
 .../smoketests/NebulaPluginsSmokeTest.groovy       |  122 +
 .../smoketests/ThirdPartyPluginsSmokeTest.groovy   |  296 ++
 .../smoketests/android-kotlin-example/build.gradle |  108 +
 .../src/main/AndroidManifest.xml                   |    8 +
 .../kotlin/android/StringPrinterFragment.kt        |   12 +
 .../smoketest/kotlin/android/StringPrinterTest.kt  |   17 +
 .../gradle/smoketests/gretty-example/build.gradle  |   33 +
 .../src/main/java/org/gradle/sample/Greeter.java   |   11 +
 .../gretty-example/src/main/webapp/index.jsp       |    6 +
 .../gradle/smoketests/kotlin-example/build.gradle  |   21 +
 .../src/main/kotlin/pkg/HelloWorld.kt              |   13 +
 subprojects/soak/soak.gradle                       |   21 +
 .../launcher/daemon/AndroidDexingSoakTest.groovy   |  251 +
 .../DaemonPerformanceMonitoringCoverage.groovy     |   33 +
 .../DaemonPerformanceMonitoringSoakTest.groovy     |  321 ++
 .../resolve/DependencyResolutionStressTest.groovy  |  288 ++
 .../fixtures/DaemonMultiJdkIntegrationTest.groovy  |  103 +
 .../fixtures/FullyQualifiedGarbageCollector.groovy |   81 +
 .../daemon/fixtures/JavaGarbageCollector.groovy    |   49 +
 .../launcher/daemon/fixtures/JdkVendor.groovy      |   34 +
 .../org/gradle/soak/categories/SoakTest.java       |   20 +
 subprojects/sonar/sonar.gradle                     |   52 -
 .../plugins/sonar/SonarSmokeIntegrationTest.groovy |   88 -
 .../runner/SonarRunnerSmokeIntegrationTest.groovy  |   84 -
 .../org/gradle/sonar/runner/SonarTestServer.groovy |  138 -
 .../SonarSmokeIntegrationTest/shared/build.gradle  |   24 -
 .../shared/customizedProject/build.gradle          |   14 -
 .../gradle/test/customizedProject/Production1.java |   14 -
 .../org/gradle/test/customizedProject/Test1.java   |   12 -
 .../shared/gradle.properties                       |    1 -
 .../shared/javaProjectWithJacoco/build.gradle      |    5 -
 .../org/gradle/test/javaProject/Production1.java   |   14 -
 .../org/gradle/test/javaProject/Production10.java  |   14 -
 .../org/gradle/test/javaProject/Production2.java   |   14 -
 .../org/gradle/test/javaProject/Production3.java   |   14 -
 .../org/gradle/test/javaProject/Production4.java   |   14 -
 .../org/gradle/test/javaProject/Production5.java   |   14 -
 .../org/gradle/test/javaProject/Production6.java   |   14 -
 .../org/gradle/test/javaProject/Production7.java   |   14 -
 .../org/gradle/test/javaProject/Production8.java   |   14 -
 .../org/gradle/test/javaProject/Production9.java   |   14 -
 .../gradle/test/javaProject/productionResource.xml |    6 -
 .../java/org/gradle/test/javaProject/Test1.java    |   12 -
 .../java/org/gradle/test/javaProject/Test10.java   |   12 -
 .../java/org/gradle/test/javaProject/Test2.java    |   12 -
 .../java/org/gradle/test/javaProject/Test3.java    |   12 -
 .../java/org/gradle/test/javaProject/Test4.java    |   12 -
 .../java/org/gradle/test/javaProject/Test5.java    |   12 -
 .../java/org/gradle/test/javaProject/Test6.java    |   12 -
 .../java/org/gradle/test/javaProject/Test7.java    |   12 -
 .../java/org/gradle/test/javaProject/Test8.java    |   12 -
 .../java/org/gradle/test/javaProject/Test9.java    |   12 -
 .../org/gradle/test/javaProject/testResource.xml   |    6 -
 .../nested/nested2/nestedProject/build.gradle      |    1 -
 .../org/gradle/test/nestedProject/Production1.java |   14 -
 .../java/org/gradle/test/nestedProject/Test1.java  |   12 -
 .../shared/settings.gradle                         |    3 -
 .../shared/skippedProject/build.gradle             |    3 -
 .../gradle/test/skippedProject/Production1.java    |   14 -
 .../java/org/gradle/test/skippedProject/Test1.java |   12 -
 .../shared/src/main/java/Person.java               |    5 -
 .../shared/build.gradle                            |   20 -
 .../shared/customizedProject/build.gradle          |   14 -
 .../gradle/test/customizedProject/Production1.java |   14 -
 .../org/gradle/test/customizedProject/Test1.java   |   12 -
 .../shared/emptyJavaProject/build.gradle           |   17 -
 .../shared/gradle.properties                       |    1 -
 .../shared/groovyProject/build.gradle              |   14 -
 .../test/groovyProject/ProductionGroovy1.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy10.groovy   |   13 -
 .../test/groovyProject/ProductionGroovy2.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy3.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy4.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy5.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy6.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy7.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy8.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy9.groovy    |   13 -
 .../gradle/test/groovyProject/TestGroovy1.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy10.groovy  |   12 -
 .../gradle/test/groovyProject/TestGroovy2.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy3.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy4.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy5.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy6.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy7.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy8.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy9.groovy   |   12 -
 .../shared/javaProjectWithJacoco/build.gradle      |    5 -
 .../org/gradle/test/javaProject/Production1.java   |   14 -
 .../org/gradle/test/javaProject/Production10.java  |   14 -
 .../org/gradle/test/javaProject/Production2.java   |   14 -
 .../org/gradle/test/javaProject/Production3.java   |   14 -
 .../org/gradle/test/javaProject/Production4.java   |   14 -
 .../org/gradle/test/javaProject/Production5.java   |   14 -
 .../org/gradle/test/javaProject/Production6.java   |   14 -
 .../org/gradle/test/javaProject/Production7.java   |   14 -
 .../org/gradle/test/javaProject/Production8.java   |   14 -
 .../org/gradle/test/javaProject/Production9.java   |   14 -
 .../gradle/test/javaProject/productionResource.xml |    6 -
 .../java/org/gradle/test/javaProject/Test1.java    |   12 -
 .../java/org/gradle/test/javaProject/Test10.java   |   12 -
 .../java/org/gradle/test/javaProject/Test2.java    |   12 -
 .../java/org/gradle/test/javaProject/Test3.java    |   12 -
 .../java/org/gradle/test/javaProject/Test4.java    |   12 -
 .../java/org/gradle/test/javaProject/Test5.java    |   12 -
 .../java/org/gradle/test/javaProject/Test6.java    |   12 -
 .../java/org/gradle/test/javaProject/Test7.java    |   12 -
 .../java/org/gradle/test/javaProject/Test8.java    |   12 -
 .../java/org/gradle/test/javaProject/Test9.java    |   12 -
 .../org/gradle/test/javaProject/testResource.xml   |    6 -
 .../javaProjectWithSkippedTestTask/build.gradle    |   21 -
 .../src/test/java/Test1.java                       |   25 -
 .../javaProjectWithoutTestClasses/build.gradle     |    1 -
 .../src/main/java/Production1.java                 |   12 -
 .../nested/nested2/nestedProject/build.gradle      |    1 -
 .../org/gradle/test/nestedProject/Production1.java |   14 -
 .../java/org/gradle/test/nestedProject/Test1.java  |   12 -
 .../shared/settings.gradle                         |    3 -
 .../shared/skippedProject/build.gradle             |    3 -
 .../gradle/test/skippedProject/Production1.java    |   14 -
 .../java/org/gradle/test/skippedProject/Test1.java |   12 -
 .../gradle/api/plugins/sonar/SonarAnalyze.groovy   |   83 -
 .../gradle/api/plugins/sonar/SonarPlugin.groovy    |  163 -
 .../sonar/internal/SonarCodeAnalyzer.groovy        |  117 -
 .../plugins/sonar/model/IncludeProperties.groovy   |   31 -
 .../sonar/model/ModelToPropertiesConverter.groovy  |   89 -
 .../api/plugins/sonar/model/SonarProperty.groovy   |   30 -
 .../api/plugins/sonar/model/SonarRootModel.groovy  |  473 --
 .../org/gradle/sonar/runner/SonarProperties.java   |   69 -
 .../gradle/sonar/runner/SonarRunnerExtension.java  |  101 -
 .../sonar/runner/SonarRunnerRootExtension.java     |   94 -
 .../org/gradle/sonar/runner/package-info.java      |   24 -
 .../sonar/runner/plugins/SonarRunnerPlugin.java    |  350 --
 .../gradle/sonar/runner/plugins/package-info.java  |   22 -
 .../org/gradle/sonar/runner/tasks/SonarRunner.java |  127 -
 .../gradle/sonar/runner/tasks/package-info.java    |   22 -
 .../org.gradle.sonar-runner.properties             |    1 -
 .../gradle-plugins/org.gradle.sonar.properties     |    1 -
 subprojects/sonar/src/main/resources/logback.xml   |   28 -
 .../api/plugins/sonar/SonarAnalyzeTest.groovy      |   43 -
 .../api/plugins/sonar/SonarPluginTest.groovy       |  142 -
 .../model/ModelToPropertiesConverterTest.groovy    |  113 -
 .../gradle/sonar/runner/SonarPropertiesTest.groovy |   48 -
 .../sonar/runner/SonarRunnerExtensionTest.groovy   |   46 -
 .../runner/plugins/SonarRunnerPluginTest.groovy    |  449 --
 .../http/HttpTaskOutputCacheIntegrationTest.groovy |  248 +
 .../tasks/http/HttpTaskOutputCacheTest.groovy      |   62 +
 .../cache/tasks/http/HttpTaskOutputCache.java      |  121 +
 .../tasks/http/HttpTaskOutputCacheFactory.java     |   47 +
 subprojects/task-cache-http/task-cache-http.gradle |   30 +
 ...DependencyClassVisibilityIntegrationTest.groovy |   80 +
 .../testkit/TestKitEndUserIntegrationTest.groovy   |  977 ----
 .../testkit/TestKitSamplesIntegrationTest.groovy   |   62 -
 .../AbstractGradleRunnerIntegrationTest.groovy     |  108 -
 .../runner/BaseGradleRunnerIntegrationTest.groovy  |  320 ++
 .../GradleRunnerArgumentsIntegrationTest.groovy    |  106 +-
 .../GradleRunnerBuildFailureIntegrationTest.groovy |  188 +-
 ...GradleRunnerCaptureOutputIntegrationTest.groovy |   76 +-
 ...GradleRunnerConfigurationIntegrationTest.groovy |   45 +
 ...lPluginClasspathInjectionIntegrationTest.groovy |  123 +
 .../GradleRunnerDaemonIntegrationTest.groovy       |  112 +
 ...GradleRunnerGradleVersionIntegrationTest.groovy |  123 +-
 ...radleRunnerIsolatedDaemonIntegrationTest.groovy |  186 -
 .../GradleRunnerIsolationIntegrationTest.groovy    |   61 +
 ...lPluginClasspathInjectionIntegrationTest.groovy |   49 +
 ...leRunnerMechanicalFailureIntegrationTest.groovy |   86 +-
 ...rPluginClasspathInjectionIntegrationTest.groovy |  380 ++
 ...adleRunnerPluginInjectionIntegrationTest.groovy |  532 --
 .../GradleRunnerResultIntegrationTest.groovy       |   43 +-
 .../runner/GradleRunnerSmokeIntegrationTest.groovy |  104 -
 ...leRunnerSupportedBuildJvmIntegrationTest.groovy |   46 +
 ...UnsupportedFeatureFailureIntegrationTest.groovy |  133 +
 ...ortedGradleVersionFailureIntegrationTest.groovy |   39 +
 .../BaseTestKitEndUserIntegrationTest.groovy       |   48 +
 .../CheckstyleEndUserIntegrationTest.groovy        |  114 +
 ...ClasspathInjectionEndUserIntegrationTest.groovy |  139 +
 .../GradleRunnerMiscEndUserIntegationTest.groovy   |  196 +
 ...ClasspathInjectionEndUserIntegrationTest.groovy |  151 +
 ...radleRunnerSamplesEndUserIntegrationTest.groovy |   78 +
 ...eRunnerUserLoggingEndUserIntegrationTest.groovy |   81 +
 .../runner/fixtures/CustomDaemonDirectory.java     |   28 +
 .../org/gradle/testkit/runner/fixtures/Debug.java  |   28 +
 .../fixtures/GradleRunnerIntegTestRunner.groovy    |   74 -
 .../runner/fixtures/InjectsPluginClasspath.java    |   25 +
 .../runner/fixtures/InspectsBuildOutput.java       |   25 +
 .../runner/fixtures/InspectsExecutedTasks.java     |   25 +
 .../gradle/testkit/runner/fixtures/NoDebug.java    |    2 +-
 .../testkit/runner/fixtures/NonCrossVersion.java   |   28 +
 .../testkit/runner/fixtures/PluginUnderTest.groovy |  209 +
 .../org/gradle/testkit/runner/GradleRunner.java    |   27 +
 .../runner/InvalidPluginMetadataException.java     |   33 +
 .../runner/UnsupportedFeatureException.java        |   40 +
 .../runner/internal/BuildOperationParameters.java  |   37 +
 .../testkit/runner/internal/DefaultBuildTask.java  |    2 +-
 .../runner/internal/DefaultGradleRunner.java       |   56 +-
 .../runner/internal/FeatureCheckBuildResult.java   |   71 +
 .../runner/internal/GradleExecutionParameters.java |   11 +-
 .../runner/internal/GradleExecutionResult.java     |   12 +-
 .../testkit/runner/internal/GradleProvider.java    |   99 +
 .../internal/PluginUnderTestMetadataReading.java   |   76 +
 .../runner/internal/TempTestKitDirProvider.java    |   10 +-
 .../runner/internal/ToolingApiGradleExecutor.java  |   80 +-
 .../runner/internal/dist/GradleDistribution.java   |   20 -
 .../internal/dist/InstalledGradleDistribution.java |   32 -
 .../dist/URILocatedGradleDistribution.java         |   32 -
 .../dist/VersionBasedGradleDistribution.java       |   30 -
 .../feature/BuildResultOutputFeatureCheck.java     |   42 +
 .../feature/BuildResultTasksFeatureCheck.java      |   40 +
 .../runner/internal/feature/FeatureCheck.java      |   21 +
 .../runner/internal/feature/TestKitFeature.java    |   38 +
 .../org/gradle/testkit/runner/package-info.java    |    1 +
 .../runner/internal/DefaultGradleRunnerTest.groovy |   14 +-
 .../internal/FeatureCheckBuildResultTest.groovy    |  110 +
 .../internal/TempTestKitDirProviderTest.groovy     |   19 +-
 .../BuildResultOutputFeatureCheckTest.groovy       |   58 +
 .../BuildResultTasksFeatureCheckTest.groovy        |   49 +
 subprojects/test-kit/test-kit.gradle               |   46 +-
 .../testing/JULRedirectorIntegrationTest.groovy    |   98 +
 .../loggingConfig}/build.gradle                    |    0
 .../src/main/java/com/example/LumberJack.java      |   33 +
 .../src/test/java/com/example/LumberJackTest.java  |   30 +
 .../src/test/resources/logging.properties          |    6 +
 .../tasks/testing/AbstractTestDescriptor.java      |   57 +
 .../tasks/testing/DecoratingTestDescriptor.java    |   69 +
 .../tasks/testing/DefaultTestClassDescriptor.java  |   33 +
 .../tasks/testing/DefaultTestClassRunInfo.java     |   35 +
 .../tasks/testing/DefaultTestDescriptor.java       |   43 +
 .../tasks/testing/DefaultTestMethodDescriptor.java |   28 +
 .../tasks/testing/DefaultTestOutputEvent.java      |   70 +
 .../tasks/testing/DefaultTestSuiteDescriptor.java  |   35 +
 .../api/internal/tasks/testing/JULRedirector.java  |   60 +
 .../tasks/testing/NoMatchingTestsReporter.java     |   46 +
 .../tasks/testing/SuiteTestClassProcessor.java     |   69 +
 .../internal/tasks/testing/TestClassProcessor.java |   47 +
 .../internal/tasks/testing/TestClassRunInfo.java   |    0
 .../internal/tasks/testing/TestCompleteEvent.java  |    0
 .../tasks/testing/TestDescriptorInternal.java      |    0
 .../tasks/testing/TestResultProcessor.java         |    0
 .../api/internal/tasks/testing/TestStartEvent.java |    0
 .../tasks/testing/TestSuiteExecutionException.java |    0
 .../testing/WorkerTestClassProcessorFactory.java   |    0
 .../tasks/testing/filter/DefaultTestFilter.java    |   79 +
 .../tasks/testing/filter/TestSelectionMatcher.java |   64 +
 .../tasks/testing/logging/AbstractTestLogger.java  |   99 +
 .../logging/ClassMethodNameStackTraceSpec.java     |   36 +
 .../tasks/testing/logging/DefaultTestLogging.java  |  174 +
 .../logging/DefaultTestLoggingContainer.java       |  254 +
 .../testing/logging/FullExceptionFormatter.java    |  126 +
 .../testing/logging/GroovyStackTraceSpec.java      |   48 +
 .../testing/logging/ShortExceptionFormatter.java   |   69 +
 .../tasks/testing/logging/StackTraceFilter.java    |    0
 .../tasks/testing/logging/TestCountLogger.java     |  112 +
 .../tasks/testing/logging/TestEventLogger.java     |  124 +
 .../testing/logging/TestExceptionFormatter.java    |    0
 .../testing/logging/TruncatedStackTraceSpec.java   |   33 +
 .../CaptureTestOutputTestResultProcessor.java      |   94 +
 .../DefaultStandardOutputRedirector.java           |  100 +
 .../processors/MaxNParallelTestClassProcessor.java |   84 +
 .../RestartEveryNTestClassProcessor.java           |   69 +
 .../processors/StandardOutputRedirector.java       |   26 +
 .../tasks/testing/processors/TestMainAction.java   |   78 +
 .../testing/processors/TestOutputRedirector.java   |   78 +
 .../results/AttachParentTestResultProcessor.java   |   58 +
 .../tasks/testing/results/DefaultTestResult.java   |   96 +
 .../results/StateTrackingTestResultProcessor.java  |  103 +
 .../tasks/testing/results/TestListenerAdapter.java |    0
 .../testing/results/TestListenerInternal.java      |    0
 .../internal/tasks/testing/results/TestState.java  |    0
 .../testing/results/UnknownTestDescriptor.java     |   53 +
 .../testing/worker/ForkingTestClassProcessor.java  |  126 +
 .../testing/worker/RemoteTestClassProcessor.java   |    0
 .../tasks/testing/worker/TestEventSerializer.java  |  231 +
 .../internal/tasks/testing/worker/TestWorker.java  |  149 +
 .../testing/worker/WorkerTestClassProcessor.java   |    0
 .../gradle/api/tasks/testing/TestDescriptor.java   |    0
 .../api/tasks/testing/TestExecutionException.java  |    0
 .../org/gradle/api/tasks/testing/TestFilter.java   |  112 +
 .../api/tasks/testing/TestFrameworkOptions.java    |    0
 .../org/gradle/api/tasks/testing/TestListener.java |    0
 .../gradle/api/tasks/testing/TestOutputEvent.java  |    0
 .../api/tasks/testing/TestOutputListener.java      |    0
 .../org/gradle/api/tasks/testing/TestResult.java   |    0
 .../tasks/testing/logging/TestExceptionFormat.java |    0
 .../api/tasks/testing/logging/TestLogEvent.java    |    0
 .../api/tasks/testing/logging/TestLogging.java     |    0
 .../testing/logging/TestLoggingContainer.java      |    0
 .../testing/logging/TestStackTraceFilter.java      |    0
 .../api/tasks/testing/logging/package-info.java    |    0
 .../org/gradle/api/tasks/testing/package-info.java |    0
 .../gradle/platform/base/test/package-info.java    |   21 +
 .../gradle/testing/base/TestSuiteBinarySpec.java   |   38 +
 .../gradle/testing/base/TestSuiteContainer.java    |   27 +
 .../org/gradle/testing/base/TestSuiteSpec.java     |   43 +
 .../testing/base/TestSuiteTaskCollection.java      |   30 +
 .../testing/base/internal/BaseTestSuiteSpec.java   |   41 +
 .../java/org/gradle/testing/base/package-info.java |   21 +
 .../base/plugins/TestingModelBasePlugin.java       |  122 +
 .../gradle/testing/base/plugins/package-info.java  |   20 +
 .../testing/DefaultTestClassDescriptorTest.groovy  |    0
 .../testing/DefaultTestSuiteDescriptorTest.groovy  |    0
 .../testing/SuiteTestClassProcessorTest.groovy     |    0
 .../tasks/testing/TestStartEventTest.groovy        |    0
 .../testing/filter/DefaultTestFilterTest.groovy    |    0
 .../testing/filter/TestSelectionMatcherTest.groovy |    0
 .../testing/logging/AbstractTestLoggerTest.groovy  |  167 +
 .../ClassMethodNameStackTraceSpecTest.groovy       |    0
 .../logging/DefaultTestLoggingContainerTest.groovy |    0
 .../testing/logging/DefaultTestLoggingTest.groovy  |    0
 .../logging/FullExceptionFormatterTest.groovy      |  252 +
 .../logging/GroovyStackTraceSpecTest.groovy        |    0
 .../logging/ShortExceptionFormatterTest.groovy     |   70 +
 .../testing/logging/SimpleTestDescriptor.groovy    |    0
 .../testing/logging/SimpleTestOutputEvent.groovy   |    0
 .../testing/logging/StackTraceFilterTest.groovy    |    0
 .../testing/logging/TestCountLoggerTest.groovy     |  147 +
 .../testing/logging/TestEventLoggerTest.groovy     |  105 +
 .../logging/TruncatedStackTraceSpecTest.groovy     |    0
 ...CaptureTestOutputTestResultProcessorTest.groovy |    0
 .../DefaultStandardOutputRedirectorTest.groovy     |    0
 .../testing/processors/JULRedirectorTest.groovy    |  175 +
 .../MaxNParallelTestClassProcessorTest.groovy      |  170 +
 .../RestartEveryNTestClassProcessorTest.groovy     |  159 +
 .../testing/processors/TestMainActionTest.groovy   |  125 +
 .../processors/TestOutputRedirectorTest.groovy     |    0
 .../AttachParentTestResultProcessorTest.groovy     |    0
 .../testing/results/DefaultTestResultTest.groovy   |    0
 .../StateTrackingTestResultProcessorTest.groovy    |    0
 .../worker/ForkingTestClassProcessorTest.groovy    |   87 +
 .../testing/worker/TestEventSerializerTest.groovy  |  181 +
 .../tasks/testing/worker/TestWorkerTest.groovy     |   74 +
 .../base/plugins/TestingModelBasePluginTest.groovy |   93 +
 .../tasks/testing/MethodTestOutputEvent.groovy     |    0
 .../internal/tasks/testing/SimpleTestResult.groovy |    0
 subprojects/testing-base/testing-base.gradle       |   29 +
 .../JUnitTestSuitePluginGoodBehaviourTest.groovy   |   25 +
 ...bstractJUnitTestExecutionIntegrationSpec.groovy |   52 +
 .../JUnitComponentUnderTestIntegrationTest.groovy  |  391 ++
 .../test/JUnitIncrementalTestExecutionTest.groovy  |  172 +
 ...itStandaloneTestExecutionIntegrationTest.groovy |  907 ++++
 ...tTestSuiteComponentReportIntegrationTest.groovy |  281 ++
 .../testing/IncrementalTestIntegrationTest.groovy  |    0
 .../testing/TestEnvironmentIntegrationTest.groovy  |   69 +
 .../TestOutputListenerIntegrationTest.groovy       |    0
 .../TestProgressLoggingIntegrationTest.groovy      |  163 +
 .../testing/TestReportIntegrationTest.groovy       |  451 ++
 .../gradle/testing/TestTaskIntegrationTest.groovy  |  134 +
 .../gradle/testing/TestingIntegrationTest.groovy   |  421 ++
 .../CucumberJVMReportIntegrationTest.groovy        |    0
 .../AbstractTestFilteringIntegrationTest.groovy    |  249 +
 .../gradle/testing/fixture/JUnitCoverage.groovy    |    0
 .../gradle/testing/fixture/TestNGCoverage.groovy   |   38 +
 .../junit/BuildSrcSpockIntegrationTest.groovy      |   78 +
 .../junit/JUnit3FilteringIntegrationTest.groovy    |   57 +
 .../junit/JUnitAssumptionsIntegrationTest.groovy   |    0
 .../JUnitCategoriesCoverageIntegrationSpec.groovy  |    0
 .../junit/JUnitCategoriesIntegrationSpec.groovy    |   67 +
 .../JUnitClassLevelFilteringIntegrationTest.groovy |    0
 .../JUnitConsoleLoggingIntegrationTest.groovy      |  116 +
 .../junit/JUnitFilteringIntegrationTest.groovy     |  179 +
 ...itIgnoreClassMultiVersionIntegrationSpec.groovy |    0
 .../testing/junit/JUnitIntegrationTest.groovy      |  459 ++
 .../junit/JUnitJdkNavigationIntegrationTest.groovy |   39 +
 .../testing/junit/JUnitJnaIntegrationTest.groovy   |    0
 ...JUnitLoggingOutputCaptureIntegrationTest.groovy |  295 ++
 .../junit/JUnitMultiVersionIntegrationSpec.groovy  |    0
 ...JUnitTestFilteringSamplesIntegrationTest.groovy |    0
 .../testng/SampleTestNGIntegrationTest.groovy      |   57 +
 .../TestNGConsoleLoggingIntegrationTest.groovy     |  169 +
 .../TestNGFailurePolicyIntegrationTest.groovy      |    0
 .../testng/TestNGFilteringIntegrationTest.groovy   |  119 +
 .../TestNGGroupByInstancesIntegrationTest.groovy   |  103 +
 ...upByInstancesNotSupportedIntegrationTest.groovy |   48 +
 .../testing/testng/TestNGIntegrationTest.groovy    |  172 +
 .../TestNGJdkNavigationIntegrationTest.groovy      |   39 +
 ...estNGLoggingOutputCaptureIntegrationTest.groovy |    0
 .../TestNGParallelSuiteIntegrationTest.groovy      |    0
 .../TestNGPreserveOrderIntegrationTest.groovy      |  117 +
 ...PreserveOrderNotSupportedIntegrationTest.groovy |   48 +
 .../TestNGProducesOldReportsIntegrationTest.groovy |    0
 .../TestNGStaticLoggingIntegrationTest.groovy      |  147 +
 ...TestNGSuiteInitialisationIntegrationTest.groovy |    0
 .../testng/TestNGSuiteIntegrationTest.groovy       |  133 +
 ...tNGXmlResultAndHtmlReportIntegrationTest.groovy |    0
 .../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
 .../testing/SuiteTimestampIntegrationTest.groovy   |    0
 .../build.gradle                                   |    0
 .../src/test/java/org/gradle/JUnitTest.java        |    0
 .../test/java/org/gradle/MySecurityManager.java    |    0
 .../build.gradle                                   |    0
 .../src/test/java/org/gradle/JUnitTest.java        |    0
 .../test/java/org/gradle/MySystemClassLoader.java  |    0
 .../build.gradle                                   |    0
 .../src/main/java/org/gradle/MyAgent.java          |    0
 .../main/java/org/gradle/MySystemClassLoader.java  |    0
 .../src/test/java/org/gradle/JUnitTest.java        |    0
 .../build.gradle                                   |    0
 .../src/test/java/org/gradle/JMockitTest.java      |    0
 .../build.gradle                                   |    0
 .../src/test/java/HelloStepdefs.java               |    0
 .../src/test/java/RunCukesTest.java                |    0
 .../src/test/resources/helloworld.feature          |    0
 .../supportsAssumptions/build.gradle               |    0
 .../test/java/org/gradle/TestWithAssumptions.java  |    0
 .../build.gradle                                   |    0
 .../src/test/java/org/gradle/CategoryA.java        |    0
 .../src/test/java/org/gradle/LocaleHolder.java     |    0
 .../src/test/java/org/gradle/Locales.java          |    0
 .../src/test/java/org/gradle/SomeLocaleTests.java  |    0
 .../test/java/org/gradle/SomeMoreLocalTests.java   |    0
 .../canSpecifyExcludesOnly/build.gradle            |    0
 .../src/test/java/org/gradle/CatATests.java        |    0
 .../src/test/java/org/gradle/CategoryA.java        |    0
 .../src/test/java/org/gradle/NoCatTests.java       |    0
 .../src/test/java/org/gradle/SomeOtherCat.java     |    0
 .../test/java/org/gradle/SomeOtherCatTests.java    |    0
 .../src/test/java/org/gradle/SomeTests.java        |    0
 .../build.gradle                                   |    0
 .../src/test/java/org/gradle/CatACTests.java       |    0
 .../src/test/java/org/gradle/CatADTests.java       |    0
 .../src/test/java/org/gradle/CatATests.java        |    0
 .../src/test/java/org/gradle/CatBTests.java        |    0
 .../src/test/java/org/gradle/CatCBTests.java       |    0
 .../src/test/java/org/gradle/CatCTests.java        |    0
 .../src/test/java/org/gradle/CatDTests.java        |    0
 .../src/test/java/org/gradle/CatZTests.java        |    0
 .../src/test/java/org/gradle/CategoryA.java        |    0
 .../src/test/java/org/gradle/CategoryB.java        |    0
 .../src/test/java/org/gradle/CategoryC.java        |    0
 .../src/test/java/org/gradle/CategoryD.java        |    0
 .../src/test/java/org/gradle/CategoryZ.java        |    0
 .../src/test/java/org/gradle/MixedTests.java       |    0
 .../src/test/java/org/gradle/NoCatTests.java       |    0
 .../reportsUnloadableCategories/build.gradle       |    0
 .../src/test/java/org/gradle/SomeTestClass.java    |    0
 .../build.gradle                                   |    0
 .../src/test/java/org/gradle/SomeTest.java         |    0
 .../shared/build.gradle                            |   23 +
 .../src/test/groovy/org/gradle/JUnit4Test.groovy   |    0
 .../standardOutputLogging/build.gradle             |   34 +
 .../org/gradle/JUnit4StandardOutputTest.groovy     |    0
 .../canHandleClassLevelIgnoredTests/build.gradle   |    0
 .../test/java/org/gradle/CustomIgnoredTest.java    |    0
 .../src/test/java/org/gradle/IgnoredTest.java      |    0
 .../canHaveMultipleTestTaskInstances/build.gradle  |    0
 .../src/test/java/org/gradle/Test1.java            |    0
 .../src/test/java/org/gradle/Test2.java            |    0
 .../canRunSingleTests/build.gradle                 |    0
 .../canRunSingleTests/src/test/java/NotATest.java  |    0
 .../canRunSingleTests/src/test/java/Ok.java        |    0
 .../canRunSingleTests/src/test/java/Ok2.java       |    0
 .../canRunTestsUsingJUnit3/build.gradle            |    0
 .../createsRunnerBeforeTests/build.gradle          |    0
 .../src/test/java/org/gradle/CustomRunner.java     |    0
 .../test/java/org/gradle/ExecutionOrderTest.java   |    0
 .../detectsTestClasses/build.gradle                |    0
 .../test/java/org/gradle/AbstractHasRunWith.java   |    0
 .../src/test/java/org/gradle/CustomRunner.java     |    0
 .../test/java/org/gradle/EmptyRunWithSubclass.java |    0
 .../src/test/java/org/gradle/TestsOnInner.java     |    0
 .../executesTestsInCorrectEnvironment/build.gradle |    0
 .../src/test/java/org/gradle/OkTest.java           |   99 +
 .../src/test/java/org/gradle/OtherTest.java        |    0
 .../src/test/java/org/gradle/Junit3Test.java       |    0
 .../src/test/java/org/gradle/Junit4Test.java       |    0
 .../src/test/java/org/gradle/NoTest.java           |    0
 .../build.gradle                                   |    0
 .../src/test/java/org/gradle/BrokenAfter.java      |    0
 .../src/test/java/org/gradle/BrokenAfterClass.java |    0
 .../src/test/java/org/gradle/BrokenBefore.java     |    0
 .../test/java/org/gradle/BrokenBeforeAndAfter.java |    0
 .../test/java/org/gradle/BrokenBeforeClass.java    |    0
 .../test/java/org/gradle/BrokenConstructor.java    |    0
 .../src/test/java/org/gradle/BrokenException.java  |    0
 .../src/test/java/org/gradle/BrokenRunner.java     |    0
 .../src/test/java/org/gradle/BrokenTest.java       |    0
 .../java/org/gradle/ClassWithBrokenRunner.java     |    0
 .../src/test/java/org/gradle/CustomException.java  |    0
 .../src/test/java/org/gradle/Unloadable.java       |    0
 .../java/org/gradle/UnserializableException.java   |    0
 .../suitesOutputIsVisible/build.gradle             |    0
 .../src/test/java/org/gradle/ASuite.java           |    0
 .../src/test/java/org/gradle/OkTest.java           |    0
 .../src/test/java/org/gradle/OtherTest.java        |    0
 .../supportsJunit3Suites/build.gradle              |    0
 .../src/test/java/org/gradle/SomeSuite.java        |    0
 .../src/test/java/org/gradle/SomeTest1.java        |    0
 .../src/test/java/org/gradle/SomeTest2.java        |    0
 .../supportsTestCategories/build.gradle            |    0
 .../src/test/java/org/gradle/CategoryA.java        |    0
 .../src/test/java/org/gradle/CategoryB.java        |    0
 .../src/test/java/org/gradle/CategoryC.java        |    0
 .../src/test/java/org/gradle/SomeTest.java         |    0
 .../build.gradle                                   |    0
 .../test/java/org/gradle/SomeOtherTestSuite.java   |    0
 .../src/test/java/org/gradle/SomeTest.java         |    0
 .../src/test/java/org/gradle/SomeTestSuite.java    |    0
 .../shouldNotNavigateToJdkClasses/build.gradle     |   10 +
 .../src/test/java/org/gradle/AbstractTest.java     |   13 +
 .../src/test/java/org/gradle/Test1.java            |   13 +
 .../canRunTestsUsingJna/build.gradle               |    0
 .../canRunTestsUsingJna/src/test/java/OkTest.java  |    0
 .../canRunTestsUsingJUnit/build.gradle             |    0
 .../shared/build.gradle                            |    0
 .../TestWithFailureInConfigMethod.java             |    0
 .../canListenForTestResults/build.gradle           |    0
 .../src/test/java/AppException.java                |    0
 .../src/test/java/SomeTest.java                    |    0
 .../executesTestsInCorrectEnvironment/build.gradle |    0
 .../src/test/java/org/gradle/OkTest.java           |    0
 .../supportsTestFactory/build.gradle               |    0
 .../test/java/org/gradle/factory/FactoryTest.java  |    0
 .../java/org/gradle/factory/TestNGFactory.java     |    0
 .../supportsTestGroups/build.gradle                |    0
 .../src/test/java/org/gradle/groups/SomeTest.java  |    0
 .../shouldNotNavigateToJdkClasses/build.gradle     |   14 +
 .../src/test/java/org/gradle/AbstractTest.java     |   13 +
 .../src/test/java/org/gradle/Test1.java            |   13 +
 .../tasks/testing/DefaultJUnitXmlReport.java       |   41 +
 .../tasks/testing/DefaultTestTaskReports.java      |   47 +
 .../tasks/testing/TestClassLoaderFactory.java      |   42 +
 .../api/internal/tasks/testing/TestFramework.java  |   47 +
 .../detection/AbstractTestFrameworkDetector.java   |  199 +
 .../detection/ClassFileExtractionManager.java      |    0
 .../testing/detection/DefaultTestClassScanner.java |   84 +
 .../testing/detection/DefaultTestExecuter.java     |   89 +
 .../testing/detection/JarFilePackageListener.java  |    0
 .../testing/detection/JarFilePackageLister.java    |   70 +
 .../tasks/testing/detection/TestClassVisitor.java  |    0
 .../tasks/testing/detection/TestExecuter.java      |    0
 .../testing/detection/TestFrameworkDetector.java   |    0
 .../junit/AllExceptIgnoredTestRunnerBuilder.java   |   69 +
 .../tasks/testing/junit/CategoryFilter.java        |    0
 .../junit/IgnoredTestDescriptorProvider.java       |    0
 .../tasks/testing/junit/JUnitDetector.java         |   65 +
 .../internal/tasks/testing/junit/JUnitSpec.java    |    0
 .../testing/junit/JUnitTestClassDetecter.java      |   90 +
 .../testing/junit/JUnitTestClassExecuter.java      |  173 +
 .../testing/junit/JUnitTestClassProcessor.java     |   73 +
 .../tasks/testing/junit/JUnitTestEventAdapter.java |    0
 .../tasks/testing/junit/JUnitTestFramework.java    |   88 +
 .../testing/junit/JUnitTestMethodDetecter.java     |   38 +
 .../junit/TestClassExecutionEventGenerator.java    |   95 +
 .../testing/junit/TestClassExecutionListener.java  |    0
 .../tasks/testing/junit/report/AllTestResults.java |    0
 .../testing/junit/report/ClassPageRenderer.java    |  122 +
 .../testing/junit/report/ClassTestResults.java     |   82 +
 .../testing/junit/report/CompositeTestResults.java |  157 +
 .../testing/junit/report/DefaultTestReport.java    |  132 +
 .../junit/report/LocaleSafeDecimalFormat.java      |    0
 .../testing/junit/report/OverviewPageRenderer.java |    0
 .../testing/junit/report/PackagePageRenderer.java  |   73 +
 .../testing/junit/report/PackageTestResults.java   |   66 +
 .../tasks/testing/junit/report/PageRenderer.java   |  189 +
 .../tasks/testing/junit/report/TestReporter.java   |    0
 .../tasks/testing/junit/report/TestResult.java     |  107 +
 .../testing/junit/report/TestResultModel.java      |    0
 .../junit/result/AggregateTestResultsProvider.java |  145 +
 .../result/Binary2JUnitXmlReportGenerator.java     |  100 +
 .../BinaryResultBackedTestResultsProvider.java     |   89 +
 .../junit/result/InMemoryTestResultsProvider.java  |   90 +
 .../testing/junit/result/JUnitXmlResultWriter.java |  127 +
 .../testing/junit/result/TestClassResult.java      |    0
 .../tasks/testing/junit/result/TestFailure.java    |    0
 .../testing/junit/result/TestMethodResult.java     |    0
 .../junit/result/TestOutputAssociation.java        |    0
 .../testing/junit/result/TestOutputStore.java      |  390 ++
 .../TestOutputStoreBackedResultsProvider.java      |   43 +
 .../junit/result/TestReportDataCollector.java      |  144 +
 .../testing/junit/result/TestResultSerializer.java |    0
 .../testing/junit/result/TestResultsProvider.java  |    0
 .../testng/TestNGConfigurationListener.java        |    0
 .../tasks/testing/testng/TestNGDetector.java       |   66 +
 .../testng/TestNGListenerAdapterFactory.java       |  117 +
 .../internal/tasks/testing/testng/TestNGSpec.java  |  103 +
 .../testing/testng/TestNGTestClassDetecter.java    |   82 +
 .../testing/testng/TestNGTestClassProcessor.java   |  169 +
 .../tasks/testing/testng/TestNGTestFramework.java  |  153 +
 .../testing/testng/TestNGTestMethodDetecter.java   |   49 +
 .../testng/TestNGTestResultProcessorAdapter.java   |  228 +
 .../testng/UnrepresentableParameterException.java  |    0
 .../gradle/api/tasks/testing/JUnitXmlReport.java   |   41 +
 .../java/org/gradle/api/tasks/testing/Test.java    | 1245 +++++
 .../org/gradle/api/tasks/testing/TestReport.java   |  165 +
 .../gradle/api/tasks/testing/TestTaskReports.java  |   45 +
 .../api/tasks/testing/junit/JUnitOptions.java      |   72 +
 .../api/tasks/testing/junit/package-info.java      |    0
 .../api/tasks/testing/testng/TestNGOptions.java    |  385 ++
 .../api/tasks/testing/testng/package-info.java     |    0
 .../gradle/jvm/plugins/JUnitTestSuitePlugin.java   |   90 +
 .../gradle/jvm/plugins/JvmTestSuiteBasePlugin.java |  149 +
 .../gradle/jvm/test/JUnitTestSuiteBinarySpec.java  |   32 +
 .../org/gradle/jvm/test/JUnitTestSuiteSpec.java    |   29 +
 .../gradle/jvm/test/JvmTestSuiteBinarySpec.java    |   53 +
 .../java/org/gradle/jvm/test/JvmTestSuiteSpec.java |   37 +
 .../internal/DefaultJUnitTestSuiteBinarySpec.java  |  107 +
 .../test/internal/DefaultJUnitTestSuiteSpec.java   |   63 +
 .../internal/JUnitTestSuiteBinaryRenderer.java     |   37 +
 .../internal/JUnitTestSuiteBinarySpecInternal.java |   21 +
 .../test/internal/JvmTestSuiteBinaryRenderer.java  |   54 +
 .../internal/JvmTestSuiteBinarySpecInternal.java   |   26 +
 .../jvm/test/internal/JvmTestSuiteRules.java       |  128 +
 .../test/internal/services/JvmTestingServices.java |   48 +
 .../java/org/gradle/jvm/test/package-info.java     |   21 +
 .../org.gradle.junit-test-suite.properties         |   17 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../internal/tasks/testing/junit/report/style.css  |    0
 .../detection/DefaultTestClassScannerTest.groovy   |   55 +
 .../detection/DefaultTestExecuterTest.groovy       |   77 +
 .../junit/JUnitTestClassProcessorData.groovy       |  357 ++
 .../junit/JUnitTestClassProcessorTest.groovy       |  454 ++
 .../TestClassExecutionEventGeneratorTest.groovy    |    0
 .../testing/junit/report/AllTestResultsTest.groovy |    0
 .../junit/report/ClassTestResultsTest.groovy       |    0
 .../junit/report/CompositeTestResultsTest.groovy   |    0
 .../junit/report/DefaultTestReportTest.groovy      |  629 +++
 .../junit/report/LocaleSafeDecimalFormatTest.java  |    0
 .../junit/report/TestResultModelTest.groovy        |    0
 .../testing/junit/report/TestResultTest.groovy     |    0
 .../result/AggregateTestResultsProviderTest.groovy |    0
 .../Binary2JUnitXmlReportGeneratorSpec.groovy      |   92 +
 .../junit/result/JUnitXmlResultWriterSpec.groovy   |    0
 .../junit/result/TestClassResultSpec.groovy        |    0
 .../junit/result/TestOutputStoreSpec.groovy        |    0
 .../result/TestReportDataCollectorSpec.groovy      |  222 +
 .../junit/result/TestResultSerializerTest.groovy   |    0
 .../testng/TestNGListenerAdapterFactorySpec.groovy |   95 +
 .../testng/TestNGTestClassProcessorTest.groovy     |  417 ++
 .../testing/testng/TestNGTestFrameworkTest.groovy  |   57 +
 .../tasks/testing/BuildableTestMethodResult.groovy |    0
 .../testing/BuildableTestResultsProvider.groovy    |  163 +
 .../junit/report/HtmlTestResultsFixture.groovy     |    0
 subprojects/testing-jvm/testing-jvm.gradle         |   44 +
 .../CUnitComponentReportIntegrationTest.groovy     |   48 +-
 .../CUnitDependentComponentsIntegrationSpec.groovy |  139 +
 .../test/cunit/CUnitIntegrationTest.groovy         |  135 +-
 ...leTestDependentComponentsIntegrationSpec.groovy |  154 +
 .../googletest/GoogleTestIntegrationTest.groovy    |  128 +-
 .../GoogleTestSamplesIntegrationTest.groovy        |   12 +-
 ...tingNativeComponentReportIntegrationTest.groovy |   26 +-
 .../TestSuiteDefinitionIntegrationSpec.groovy      |  210 +
 .../plugins/TestSuiteModelIntegrationSpec.groovy   |  350 ++
 .../test/NativeTestSuiteBinarySpec.java            |   80 +
 .../nativeplatform/test/NativeTestSuiteSpec.java   |   29 +
 .../cunit/internal/DefaultCUnitTestSuiteSpec.java  |   18 +-
 .../nativeplatform/test/cunit/package-info.java    |    1 +
 .../test/cunit/plugins/CUnitConventionPlugin.java  |   50 +
 .../test/cunit/plugins/CUnitPlugin.java            |   80 +-
 .../test/cunit/plugins/package-info.java           |    1 +
 .../internal/DefaultGoogleTestTestSuiteSpec.java   |   17 +-
 .../test/googletest/package-info.java              |    1 +
 .../plugins/GoogleTestConventionPlugin.java        |   51 +
 .../test/googletest/plugins/GoogleTestPlugin.java  |   56 +-
 .../test/googletest/plugins/package-info.java      |    1 +
 .../internal/DefaultNativeTestSuiteBinarySpec.java |  115 +
 ...ndentBinariesResolutionStrategyTestSupport.java |   43 +
 .../internal/NativeTestSuiteBinaryRenderer.java    |   64 +
 .../NativeTestSuiteBinarySpecInternal.java         |    0
 .../test/internal/NativeTestSuites.java            |   98 +-
 .../internal/services/NativeTestingServices.java   |   47 +
 .../gradle/nativeplatform/test/package-info.java   |   21 +
 .../test/plugins/NativeBinariesTestPlugin.java     |  145 +
 .../nativeplatform/test/plugins/package-info.java  |    0
 .../test/tasks/RunTestExecutable.java              |   95 +
 .../nativeplatform/test/tasks/package-info.java    |    0
 .../org.gradle.cunit-test-suite.properties         |   17 +
 .../gradle-plugins/org.gradle.cunit.properties     |    2 +-
 .../org.gradle.google-test-test-suite.properties   |   17 +
 .../org.gradle.google-test.properties              |    2 +-
 ...e.internal.service.scopes.PluginServiceRegistry |    2 +
 .../test/cunit/tasks/gradle_cunit_register.h       |    2 +-
 .../nativeplatform/test/cunit/CUnitTest.groovy     |   13 +-
 .../test/googletest/GoogleTestTest.groovy          |   13 +-
 .../DefaultNativeTestSuiteBinarySpecTest.groovy    |   74 +
 .../plugins/NativeBinariesTestPluginTest.groovy    |   60 +
 subprojects/testing-native/testing-native.gradle   |    6 +-
 .../provider/runner/BuildModelActionRunner.java    |  119 +-
 .../runner/ClientForwardingTaskListener.java       |    2 +-
 .../runner/ClientProvidedBuildActionRunner.java    |   57 +-
 .../provider/runner/DefaultBuildController.java    |    2 +-
 .../ProgressListenerToProgressLoggerAdapter.java   |   52 +
 .../runner/TestExecutionRequestActionRunner.java   |    2 +-
 .../provider/runner/ToolingBuilderServices.java    |    1 +
 .../ClientProvidedBuildActionRunnerTest.groovy     |   27 +-
 .../runner/DefaultBuildControllerTest.groovy       |    2 +-
 ...gressListenerToProgressLoggerAdapterTest.groovy |  127 +
 .../tooling-api-builders.gradle                    |    3 +-
 subprojects/tooling-api/buildship.gradle           |  141 +
 .../tooling/AutoTestedSamplesToolingApiTest.groovy |    3 +-
 .../ConcurrentToolingApiIntegrationSpec.groovy     |    4 +-
 ...GlobalLoggingManipulationIntegrationTest.groovy |   97 +-
 .../SamplesToolingApiIntegrationTest.groovy        |    4 +-
 .../ToolingApiClasspathIntegrationTest.groovy      |    2 +-
 .../tooling/ToolingApiIntegrationTest.groovy       |   52 +-
 .../tooling/ToolingApiRemoteIntegrationTest.groovy |   11 +-
 ...ngApiUnsupportedBuildJvmCrossVersionSpec.groovy |  109 +
 ...gApiUnsupportedClientJvmCrossVersionSpec.groovy |  101 +
 ...ingApiUnsupportedVersionCrossVersionSpec.groovy |  163 +
 ...lingApiUnsupportedVersionIntegrationTest.groovy |    4 +-
 .../ContinuousBuildToolingApiSpecification.groovy  |  236 -
 .../fixture/ExternalToolingApiDistribution.groovy  |   46 -
 .../tooling/fixture/ProgressEvents.groovy          |  239 -
 .../integtests/tooling/fixture/ToolingApi.groovy   |  199 -
 .../ToolingApiCompatibilitySuiteRunner.groovy      |  168 -
 .../fixture/ToolingApiDistributionResolver.groovy  |  101 -
 .../tooling/fixture/ToolingApiSpecification.groovy |  204 -
 .../tooling/fixture/ToolingApiVersion.java         |   31 -
 .../tooling/fixture/ToolingApiVersions.java        |   31 -
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |   30 +-
 .../m3/ToolingApiLoggingCrossVersionSpec.groovy    |   10 +-
 ...piEclipseLinkedResourcesCrossVersionSpec.groovy |    4 +-
 ...ngApiEclipseMinimalModelCrossVersionSpec.groovy |   10 +-
 ...EclipseModelWithFlatRepoCrossVersionSpec.groovy |    4 +-
 ...ToolingApiBuildExecutionCrossVersionSpec.groovy |    2 +-
 ...ildableEclipseModelFixesCrossVersionSpec.groovy |    2 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |    2 +-
 ...orsProjectCustomizationsCrossVersionSpec.groovy |   12 +-
 .../m5/ToolingApiIdeaModelCrossVersionSpec.groovy  |   13 +-
 ...ReceivingStandardStreamsCrossVersionSpec.groovy |    2 -
 .../BuildEnvironmentModelCrossVersionSpec.groovy   |   20 +-
 .../ConsumingStandardInputCrossVersionSpec.groovy  |    6 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |    2 +-
 .../m8/ToolingApiLoggingCrossVersionSpec.groovy    |   11 +-
 .../m9/DaemonErrorFeedbackCrossVersionSpec.groovy  |    2 -
 ...adlePropertiesToolingApiCrossVersionSpec.groovy |    2 -
 .../M9JavaConfigurabilityCrossVersionSpec.groovy   |    8 +-
 ...singCommandLineArgumentsCrossVersionSpec.groovy |   37 +-
 .../r112/BuildInvocationsCrossVersionSpec.groovy   |   64 +-
 .../r112/PublicationsCrossVersionSpec.groovy       |    6 +-
 .../r112/TaskDisplayNameCrossVersionSpec.groovy    |    2 -
 ...ingApiUnsupportedVersionCrossVersionSpec.groovy |  121 -
 .../r112/UserHomeDirCrossVersionSpec.groovy        |    8 +-
 .../DependencyMetaDataCrossVersionSpec.groovy      |    8 +-
 .../r12rc1/BuildModelCrossVersionSpec.groovy       |   10 +-
 .../ProjectOutcomesModuleCrossVersionSpec.groovy   |    4 -
 ...pportedOperationFeedbackCrossVersionSpec.groovy |   37 -
 ...ApiInitScriptCrossVersionIntegrationTest.groovy |    6 +-
 ...ApiConfigurationOnDemandCrossVersionSpec.groovy |    4 -
 .../gradle/integtests/tooling/r16/CustomModel.java |    6 +-
 .../r16/CustomToolingModelCrossVersionSpec.groovy  |    4 +-
 ...knownCustomModelFeedbackCrossVersionSpec.groovy |    2 +-
 .../integtests/tooling/r18/BrokenAction.java       |    2 +-
 .../tooling/r18/BuildActionCrossVersionSpec.groovy |   17 +-
 .../r18/BuildScriptModelCrossVersionSpec.groovy    |    8 +-
 .../integtests/tooling/r18/CounterAction.java      |    6 +-
 .../tooling/r18/FetchBuildEnvironment.java         |   27 +
 .../r18/GradleBuildModelCrossVersionSpec.groovy    |    4 +-
 .../r18/ProjectLevelModelCrossVersionSpec.groovy   |    2 -
 .../integtests/tooling/r20/BrokenAction.java       |   26 -
 .../r20/GradleProjectModelCrossVersionSpec.groovy  |    6 +-
 ...ngApiUnsupportedBuildJvmCrossVersionSpec.groovy |   86 -
 ...gApiUnsupportedClientJvmCrossVersionSpec.groovy |  109 -
 .../r21/PreCancellationCrossVersionSpec.groovy     |   10 +-
 .../r21/R21CancellationCrossVersionSpec.groovy     |   48 +-
 .../r21/TaskVisibilityCrossVersionSpec.groovy      |    2 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |   27 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |  159 +
 .../ToolingApiIdeaModelCrossVersionSpec.groovy     |  315 ++
 .../ToolingApiIdeaModelCrossVersionSpec.groovy     |   70 +
 .../r213/BuildActionCrossVersionSpec.groovy        |   38 +
 .../r213/FetchProjectModelsBuildAction.java        |   41 +
 .../ModelsWithGradleProjectCrossVersionSpec.groovy |  232 +
 ...hGradleProjectIdentifierCrossVersionSpec.groovy |  121 +
 ...lNaturesAndBuildCommandsCrossVersionSpec.groovy |   75 +
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |   77 +
 ...elWtpClasspathAttributesCrossVersionSpec.groovy |  285 ++
 ...lipseProjectDependenciesCrossVersionSpec.groovy |   67 +
 ...iIdeaProjectDependenciesCrossVersionSpec.groovy |   66 +
 .../tooling/r22/BuildActionCrossVersionSpec.groovy |   33 +-
 .../r22/CancellationCrossVersionSpec.groovy        |   50 +-
 .../r22/ClientShutdownCrossVersionSpec.groovy      |   22 +-
 .../r23/ModelBuilderCrossVersionSpec.groovy        |    4 +-
 .../r23/StandardStreamsCrossVersionSpec.groovy     |   14 +-
 .../r24/BuildInvocationsCrossVersionSpec.groovy    |    3 +-
 .../DaemonUsageSuggestionCrossVersionTest.groovy   |   41 -
 ...TestProgressDaemonErrorsCrossVersionSpec.groovy |   12 +-
 .../r25/BuildProgressCrossVersionSpec.groovy       |    2 +-
 ...tinuousBuildCancellationCrossVersionSpec.groovy |   63 +-
 ...usUnsupportedJavaVersionCrossVersionSpec.groovy |   54 -
 ...pportedToolingApiVersionCrossVersionSpec.groovy |    4 +-
 ...entHandleContinuousBuildCrossVersionSpec.groovy |    5 +-
 .../gradle/integtests/tooling/r25/NullAction.java  |   26 -
 .../tooling/r25/ProgressCrossVersionSpec.groovy    |    1 +
 .../r25/TaskProgressCrossVersionSpec.groovy        |    2 +-
 .../r25/TestProgressCrossVersionSpec.groovy        |    2 +-
 ...TestProgressDaemonErrorsCrossVersionSpec.groovy |   13 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |    5 +-
 .../r26/TestLauncherCrossVersionSpec.groovy        |   18 +-
 ...piEclipseLinkedResourcesCrossVersionSpec.groovy |    4 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |    4 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |   26 +-
 .../r30/ComplexCustomModelBuildingAction.java      |   42 +
 .../tooling/r30/CustomModelBuildingAction.java     |   31 +
 .../r30/CustomToolingModelCrossVersionSpec.groovy  |  111 +
 ...ModelClasspathAttributesCrossVersionSpec.groovy |   81 +
 ...spathContainerAccessRuleCrossVersionSpec.groovy |   81 +
 ...eModelClasspathContainerCrossVersionSpec.groovy |  218 +
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |   67 +
 ...mLibrarySourceAndJavadocCrossVersionSpec.groovy |   70 +
 ...odelDependencyAccessRuleCrossVersionSpec.groovy |  130 +
 ...lipseModelOutputLocationCrossVersionSpec.groovy |  165 +
 ...ourceDirectoryAccessRuleCrossVersionSpec.groovy |   90 +
 ...oryExcludeIncludePatternCrossVersionSpec.groovy |  110 +
 ...delSourceDirectoryOutputCrossVersionSpec.groovy |   85 +
 ...olderClasspathAttributesCrossVersionSpec.groovy |  122 +
 .../tooling/r31/BuildActionCrossVersionSpec.groovy |   34 +
 .../integtests/tooling/r31/FetchTaskAction.java    |   35 +
 .../integtests/tooling/r31/ReturnValueAction.java  |   34 +
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |   53 +
 .../r31/ToolingApiIdeaModelCrossVersionSpec.groovy |  114 +
 .../org/gradle/integtests/tooling/r32/Action1.java |   30 +
 .../org/gradle/integtests/tooling/r32/Action2.java |   30 +
 .../integtests/tooling/r32/BrokenBuildAction.java  |   31 +
 .../tooling/r32/BuildActionCrossVersionSpec.groovy |   96 +
 .../r32/BuildFinishedCrossVersionSpec.groovy       |   65 +
 .../tooling/r32/CustomArtifactModel.java           |   25 +
 ...NonSerializableExceptionCrossVersionSpec.groovy |  170 +
 ...ionExceptionSerializableCrossVersionSpec.groovy |   89 +
 .../RuntimeExceptionThrowingBrokenBuildAction.java |   31 +
 .../tooling/r32/SharedActionStaticState.java       |   21 +
 .../java/org/gradle/tooling/GradleConnector.java   |   23 +-
 .../java/org/gradle/tooling/ProjectConnection.java |    2 +-
 .../org/gradle/tooling/events/OperationType.java   |    3 +
 .../org/gradle/tooling/events/package-info.java    |    1 +
 .../gradle/tooling/events/task/package-info.java   |    1 +
 .../gradle/tooling/events/test/package-info.java   |    1 +
 .../tooling/internal/adapter/CollectionMapper.java |   11 +-
 .../internal/adapter/CompatibleIntrospector.java   |   76 -
 .../tooling/internal/adapter/MethodInvocation.java |   27 +-
 .../tooling/internal/adapter/MethodInvoker.java    |    2 +-
 .../internal/adapter/NoOpMethodInvoker.java        |   24 -
 .../internal/adapter/ObjectGraphAdapter.java       |   26 +
 .../internal/adapter/ProtocolToModelAdapter.java   |  863 +++-
 .../internal/adapter/SourceObjectMapping.java      |   28 -
 .../tooling/internal/adapter/TypeInspector.java    |  107 +
 .../tooling/internal/adapter/ViewBuilder.java      |   49 +
 .../connection/DefaultBuildIdentifier.java         |   59 +
 .../connection/DefaultProjectIdentifier.java       |   71 +
 .../consumer/AbstractLongRunningOperation.java     |    4 +
 .../internal/consumer/BlockingResultHandler.java   |    6 +-
 .../internal/consumer/ConnectionFactory.java       |    4 +-
 .../internal/consumer/ConnectionParameters.java    |    2 +-
 .../internal/consumer/ConnectorServices.java       |   14 +-
 .../consumer/DefaultBuildActionExecuter.java       |   28 +-
 .../internal/consumer/DefaultBuildLauncher.java    |   19 +-
 .../consumer/DefaultConnectionParameters.java      |   69 +-
 .../internal/consumer/DefaultModelBuilder.java     |   22 +-
 .../consumer/DefaultProjectConnection.java         |   10 +-
 .../internal/consumer/DefaultTestLauncher.java     |   12 +-
 .../tooling/internal/consumer/Distribution.java    |    2 +-
 .../internal/consumer/DistributionFactory.java     |   37 +-
 .../internal/consumer/ExceptionTransformer.java    |   62 +
 .../tooling/internal/consumer/LoggingProvider.java |    2 +-
 .../consumer/ProjectConnectionBuildLauncher.java   |   27 +
 .../internal/consumer/ResultHandlerAdapter.java    |   37 +-
 .../internal/consumer/SynchronizedLogging.java     |    6 +-
 .../connection/AbstractConsumerConnection.java     |    6 +-
 .../AbstractPost12ConsumerConnection.java          |    4 +-
 .../connection/ActionAwareConsumerConnection.java  |   21 +-
 .../BuildActionRunnerBackedConsumerConnection.java |   16 +-
 .../connection/BuildControllerAdapter.java         |   36 +-
 .../CancellableConsumerActionExecutor.java         |   47 +
 .../connection/CancellableConsumerConnection.java  |   24 +-
 ...CancellableModelBuilderBackedModelProducer.java |   18 +-
 .../consumer/connection/ConsumerConnection.java    |    1 +
 .../connection/GradleBuildAdapterProducer.java     |    6 +-
 .../connection/HasCompatibilityMapping.java        |   57 +
 .../connection/InternalBuildActionAdapter.java     |   15 +-
 ...InternalConnectionBackedConsumerConnection.java |  153 -
 .../connection/LazyConsumerActionExecutor.java     |    4 -
 .../ModelBuilderBackedConsumerConnection.java      |    4 +-
 .../ModelBuilderBackedModelProducer.java           |   10 +-
 .../connection/NoToolingApiConnection.java         |    5 +-
 .../NonCancellableConsumerConnectionAdapter.java   |    1 +
 ...sspathInjectionSupportedCheckModelProducer.java |    2 +-
 .../ProgressLoggingConsumerActionExecutor.java     |   10 +-
 .../UnsupportedOlderVersionConnection.java         |   17 +-
 .../BasicGradleProjectIdentifierMixin.java         |   34 +
 .../converters/BuildInvocationsConverter.java      |    4 +
 .../converters/ConsumerTargetTypeProvider.java     |    2 +-
 .../converters/FixedBuildIdentifierProvider.java   |   51 +
 .../converters/GradleProjectIdentifierMixin.java   |   34 +
 .../GradleTaskDisplayNameMixInHandler.java         |   31 -
 .../converters/IdeaModelCompatibilityMapping.java  |   54 +
 .../IdeaModuleDependencyTargetNameMixin.java       |   36 +
 .../IdeaProjectJavaLanguageSettingsMixin.java      |   46 +
 .../TaskDisplayNameCompatibilityMapping.java       |   37 +
 .../consumer/converters/TaskDisplayNameMixin.java  |   31 +
 .../converters/TaskPropertyHandlerFactory.java     |   44 -
 .../loader/CachingToolingImplementationLoader.java |    2 +-
 .../loader/DefaultToolingImplementationLoader.java |   44 +-
 .../SynchronizedToolingImplementationLoader.java   |    4 +-
 .../loader/ToolingImplementationLoader.java        |    2 +-
 .../parameters/ConsumerOperationParameters.java    |   75 +-
 .../internal/consumer/versioning/ModelMapping.java |    4 +-
 .../internal/gradle/ConsumerProvidedTask.java      |    2 +-
 .../internal/protocol/BuildActionRunner.java       |    2 +-
 .../internal/protocol/ConnectionVersion4.java      |    9 +-
 .../internal/protocol/InternalConnection.java      |    6 +-
 .../org/gradle/tooling/model/BuildIdentifier.java  |   31 +
 .../java/org/gradle/tooling/model/BuildModel.java  |   32 +
 .../org/gradle/tooling/model/GradleProject.java    |    9 +-
 .../java/org/gradle/tooling/model/Launchable.java  |   10 +-
 .../gradle/tooling/model/ProjectIdentifier.java    |   37 +
 .../org/gradle/tooling/model/ProjectModel.java     |   32 +
 .../main/java/org/gradle/tooling/model/Task.java   |   11 -
 .../tooling/model/build/BuildEnvironment.java      |   12 +-
 .../gradle/tooling/model/eclipse/AccessRule.java   |   49 +
 .../tooling/model/eclipse/ClasspathAttribute.java  |   45 +
 .../model/eclipse/EclipseClasspathContainer.java   |   42 +
 .../model/eclipse/EclipseClasspathEntry.java       |   47 +
 .../model/eclipse/EclipseExternalDependency.java   |   29 +
 .../model/eclipse/EclipseJavaSourceSettings.java   |   35 +-
 .../model/eclipse/EclipseOutputLocation.java       |   35 +
 .../tooling/model/eclipse/EclipseProject.java      |   36 +-
 .../model/eclipse/EclipseProjectDependency.java    |    5 +-
 .../model/eclipse/EclipseSourceDirectory.java      |   52 +-
 .../model/eclipse/HierarchicalEclipseProject.java  |    4 +-
 .../tooling/model/gradle/BasicGradleProject.java   |   12 +-
 .../tooling/model/gradle/BuildInvocations.java     |   19 +-
 .../gradle/tooling/model/gradle/GradleBuild.java   |   12 +-
 .../tooling/model/gradle/ProjectPublications.java  |   12 +-
 .../gradle/tooling/model/gradle/package-info.java  |    3 +-
 .../model/idea/IdeaJavaLanguageSettings.java       |   54 +
 .../org/gradle/tooling/model/idea/IdeaModule.java  |   19 +-
 .../tooling/model/idea/IdeaModuleDependency.java   |   12 +-
 .../tooling/model/idea/IdeaModuleIdentifier.java   |   27 +
 .../org/gradle/tooling/model/idea/IdeaProject.java |   17 +-
 .../gradle/tooling/model/internal/Exceptions.java  |    6 -
 .../ProjectSensitiveToolingModelBuilder.java       |   41 -
 .../gradle/tooling/model/java/InstalledJdk.java    |   44 +
 .../org/gradle/tooling/model/java/JavaRuntime.java |   44 +
 .../gradle/tooling/model/java/JavaSourceAware.java |   39 -
 .../tooling/model/java/JavaSourceSettings.java     |   35 -
 .../gradle/tooling/model/java/package-info.java    |    1 +
 .../tooling/fixture/GradleVersionSpecTest.groovy   |   25 +-
 .../adapter/CompatibleIntrospectorTest.groovy      |   79 -
 .../adapter/ProtocolToModelAdapterTest.groovy      |  410 +-
 .../internal/adapter/TypeInspectorTest.groovy      |   43 +
 .../internal/adapter/TypeInspectorTestHelper.java  |   64 +
 .../internal/consumer/ConnectorServicesTest.groovy |    2 +-
 .../consumer/DefaultBuildLauncherTest.groovy       |   11 +-
 .../consumer/DefaultModelBuilderTest.groovy        |    4 +-
 .../consumer/DefaultProjectConnectionTest.groovy   |    4 +-
 .../consumer/DistributionFactoryTest.groovy        |    8 +-
 ...ActionRunnerBackedConsumerConnectionTest.groovy |   16 +-
 .../connection/BuildControllerAdapterTest.groovy   |   12 +-
 .../CancellableConsumerActionExecutorTest.groovy   |   56 +
 .../CancellableConsumerConnectionTest.groovy       |   11 +-
 ...lableModelBuilderBackedModelProducerTest.groovy |   19 +-
 .../GradleBuildAdapterProducerTest.groovy          |   31 +-
 ...alConnectionBackedConsumerConnectionTest.groovy |  163 -
 .../LazyConsumerActionExecutorTest.groovy          |   21 +-
 ...ModelBuilderBackedConsumerConnectionTest.groovy |   10 +-
 .../ModelBuilderBackedModelProducerTest.groovy     |   14 +-
 ...CancellableConsumerConnectionAdapterTest.groovy |    4 +-
 ...rogressLoggingConsumerActionExecutorTest.groovy |    4 +-
 .../UnsupportedOlderVersionConnectionTest.groovy   |    4 +-
 .../CachingToolingImplementationLoaderTest.groovy  |    2 +-
 .../DefaultToolingImplementationLoaderTest.groovy  |   38 +-
 ...chronizedToolingImplementationLoaderTest.groovy |    4 +-
 .../ConsumerOperationParametersTest.groovy         |   11 +-
 .../fixture/AbstractToolingApiSpecification.groovy |   98 +
 .../tooling/fixture/ClassLoaderFixture.groovy      |   36 +
 .../tooling/fixture/ConfigurableOperation.groovy   |    0
 .../ContinuousBuildToolingApiSpecification.groovy  |  238 +
 .../fixture/ExternalToolingApiDistribution.groovy  |   47 +
 .../tooling/fixture/GradleBuildCancellation.groovy |    0
 .../tooling/fixture/GradleVersionSpec.java         |   16 +-
 .../tooling/fixture/IgnoreIntegratedComposite.java |   28 +
 .../tooling/fixture/ProgressEvents.groovy          |  241 +
 .../fixture/RequiresIntegratedComposite.java       |   28 +
 .../tooling/fixture/TargetGradleVersion.java       |    0
 .../TestClasspathToolingApiDistribution.groovy     |    0
 .../integtests/tooling/fixture/TextUtil.java       |    0
 .../integtests/tooling/fixture/ToolingApi.groovy   |  207 +
 .../fixture/ToolingApiClasspathProvider.groovy     |   81 +
 .../ToolingApiCompatibilitySuiteRunner.groovy      |   51 +
 .../tooling/fixture/ToolingApiDistribution.groovy  |    0
 .../fixture/ToolingApiDistributionResolver.groovy  |  116 +
 .../tooling/fixture/ToolingApiExecution.groovy     |  112 +
 .../fixture/ToolingApiLoggingSpecification.groovy  |    0
 .../tooling/fixture/ToolingApiSpecification.groovy |  149 +
 .../tooling/fixture/ToolingApiVersion.java         |   31 +
 .../tooling/fixture/ToolingApiVersions.java        |   40 +
 subprojects/tooling-api/tooling-api.gradle         |   69 +-
 .../ExtraTestCommandLineOptionsListener.java       |    2 +-
 ...ExtraTestCommandLineOptionsListenerWrapper.java |    2 +-
 ...projectProjectAndTaskListIntegrationTest.groovy |  157 +-
 .../gradle/foundation/CommandLineAssistant.java    |    4 +-
 .../ipc/basic/ProcessLauncherServer.java           |    5 +-
 .../ipc/gradle/AbstractGradleServerProtocol.java   |    6 +-
 .../gradle/ExecuteGradleCommandServerProtocol.java |    2 +-
 .../ipc/gradle/TaskListServerProtocol.java         |    2 +-
 .../gradleplugin/foundation/GradlePluginLord.java  |   56 +-
 .../foundation/request/ExecutionRequest.java       |    2 +-
 .../foundation/request/RefreshTaskListRequest.java |    2 +-
 .../gradleplugin/foundation/request/Request.java   |    2 +-
 .../userinterface/swing/generic/OutputPanel.java   |    2 +-
 .../userinterface/swing/generic/tabs/SetupTab.java |    4 +-
 .../gradle/foundation/CommandLineParsingTest.java  |    2 +-
 .../groovy/org/gradle/foundation/TestUtility.java  |    4 +-
 subprojects/ui/ui.gradle                           |    5 +
 .../AbstractWrapperIntegrationSpec.groovy          |   44 +
 .../NonInteractiveLaunchIntegrationTest.groovy     |   49 +
 .../WrapperChecksumVerificationTest.groovy         |   35 +-
 .../WrapperConcurrentDownloadTest.groovy           |   20 +-
 .../WrapperCrossVersionIntegrationTest.groovy      |   93 +-
 .../WrapperGenerationIntegrationTest.groovy        |   19 +
 .../integtests/WrapperHttpIntegrationTest.groovy   |  191 +-
 .../WrapperLoggingIntegrationTest.groovy           |   31 +-
 .../WrapperProjectIntegrationTest.groovy           |   35 +-
 .../org/gradle/integtests/WrapperSetup.groovy      |   28 -
 .../WrapperSupportedBuildJvmIntegrationTest.groovy |   52 +
 .../WrapperUserHomeIntegrationTest.groovy          |   46 +-
 .../org/gradle/wrapper/BootstrapMainStarter.java   |    4 +
 .../src/main/java/org/gradle/wrapper/Download.java |   81 +-
 .../gradle/wrapper/ExclusiveFileAccessManager.java |    6 +-
 .../java/org/gradle/wrapper/GradleWrapperMain.java |    8 +-
 .../src/main/java/org/gradle/wrapper/Install.java  |    5 +-
 .../java/org/gradle/wrapper/PathAssembler.java     |    6 +-
 .../gradle/wrapper/SystemPropertiesHandler.java    |    9 +-
 .../java/org/gradle/wrapper/WrapperExecutor.java   |   35 +-
 .../wrapper/ExclusiveFileAccessManagerTest.groovy  |   39 +
 .../groovy/org/gradle/wrapper/InstallTest.groovy   |   12 +-
 .../wrapper/SystemPropertiesHandlerTest.groovy     |   20 +-
 .../org/gradle/wrapper/WrapperExecutorTest.groovy  |   52 +-
 subprojects/wrapper/wrapper.gradle                 |    4 +
 version.txt                                        |    2 +-
 9875 files changed, 404588 insertions(+), 251152 deletions(-)

diff --cc debian/changelog
index 42913ab,bc3518c..9d224a8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,122 +1,128 @@@
+ gradle (3.2.1-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release
+     - Refreshed the patches
+     - Skip the internalAndroidPerformanceTesting build
+ 
+  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 22 Dec 2016 11:31:24 +0100
+ 
+ gradle (3.1-2) unstable; urgency=medium
+ 
+   * d/control:
+     * Requires JDK >= 7 as the upstream does
+     * libgradle-plugins-java Breaks & Replaces libgradle-core-java (<< 3.1-1~)
+       because gradle-wrapper.jar is moved. This may be able to fix #844336.
+ 
+  -- Kai-Chung Yan <seamlikok at gmail.com>  Wed, 16 Nov 2016 14:07:14 +0800
+ 
+ gradle (3.1-1) unstable; urgency=medium
+ 
+   * New upstream release (Closes: #844020)
+   * Rename javadoc directory: /usr/share/doc/gradle/{javadoc => api}
+   * Update to debhelper 10
+   * d/gradle.desktop: Improve zh-TW translation
+   * Move gradle-wrapper.jar from libgradle-core-java to libgradle-plugins-java
+   * gradle-doc: Install DSL documentations and release notes
+   * Use javahelper to install Javadoc
+   * No longer embed Class-Path in JAR manifests since Gradle uses its own class
+     loading mechanism, otherwise 2 sets of the same JARs will be loaded
+   * d/gradle-doc.lintian-overrides: Override duplicate-files since they are
+     example files not mistakes and the warnings are annoying
+   * Drop/new patches:
+     - disable_tests.diff: Now use a cleaner way to bypass tests
+     - disable_sonar.diff: Upstream dropped the sonar plugin
+     + drop_http-builder.patch: http-builder is not in Debian yet
+     + new_APIs_in_3.0.patch
+     + disable_Kotlin.patch
+     + disable_buildSrc_tests.patch
+     + dependency-management_depends_on_testkit.patch: Otherwise ZIP I/O errors
+     + Groovy_projects_depends_on_localGroovy.patch: Otherwise errors
+     + remove_timestamps.patch: Improve reproducibility by manually setting
+       timestamps and other dynamic properties
+     + drop_jmh-gradle-plugin.patch: jmh-gradle-plugin is not in Debian yet
+   * New JARs:
+     * gradle-composite-builds.jar
+     * gradle-ide-play.jar
+     * gradle-installation-beacon.jar
+     * gradle-jvm-services.jar
+     * gradle-logging.jar
+     * gradle-process-services.jar
+     * gradle-task-cache-http.jar
+   * d/control:
+     * Build-Depends on libfindbugs instead of findbugs
+     * Restrict dependencies:
+       * groovy >= 2.4.7
+       * gradle >= 2.13
+       * libnative-platform-java >= 0.11
+     * gradle now Suggests gradle-doc (Closes: #843211)
+ 
+  -- Kai-Chung Yan <seamlikok at gmail.com>  Mon, 14 Nov 2016 13:34:34 +0800
+ 
+ gradle (2.13-4) unstable; urgency=emergency
+ 
+   * Make all dependencies versionless (Closes: #836391)
+   * Drop 30_envjs.diff: simpleframework is already in Debian
+   * d/gradle.desktop: Add zh-HK translation
+ 
+  -- Kai-Chung Yan <seamlikok at gmail.com>  Sun, 04 Sep 2016 22:41:19 +0800
+ 
+ gradle (2.13-3) unstable; urgency=high
+ 
+   * Team upload.
+   * Use a versionless dependency on groovy-all in the classpath of the modules
+   * Use a versionless dependency on httpcore in the classpath
+     of the resources-http module
+ 
+  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 23 Jun 2016 10:09:10 +0200
+ 
+ gradle (2.13-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Added the missing dependency on ant-optional for libgradle-plugins-java
+     (required to use groovy-ant in gradle-plugins)
+ 
+  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 19 May 2016 09:33:06 +0200
+ 
+ gradle (2.13-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release
+     - Refreshed the patches
+   * Transition to Jetty 9 (patch imported from Fedora, thanks to Michal Srb)
+   * Modified the Groovy jar detection logic to recognize the jar
+     in the system Maven repository
+ 
+  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 18 May 2016 22:10:23 +0200
+ 
+ gradle (2.12-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release
+     - Refreshed the patches
+   * Standards-Version updated to 3.9.8 (no changes)
+ 
+  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 12 May 2016 10:33:01 +0200
+ 
+ gradle (2.11-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release
+     - Refreshed the patches
+     - Install the new gradle-testing-base and gradle-testing-jvm artifacts
+   * Removed the unused dependency on libclassworlds-java
+   * Depend on libasm-java instead of libasm4-java
+   * Depend on libcglib-nodep-java instead of libcglib3-java
+   * Depend on groovy instead of groovy2
+ 
+  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 03 May 2016 08:57:42 +0200
+ 
 +gradle (2.10-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Emmanuel Bourg <ebourg at apache.org>  Sun, 17 Apr 2016 23:46:02 +0200
 +
  gradle (2.10-2) unstable; urgency=medium
  
    * Team upload.

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



More information about the pkg-java-commits mailing list