[gradle] branch master updated (e023ad0 -> b5bd294)

Kai-Chung Yan seamlik-guest at moszumanska.debian.org
Thu Jul 2 14:20:45 UTC 2015


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

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

      from  e023ad0   Add missing headers for patches
       new  fd6bd89   Bump to version 2.4
       new  339730e   Imported Upstream version 2.4
       new  3105cdb   Merge tag 'upstream/2.4'
       new  4eeb887   Update jlibs
       new  b5bd294   Refresh patches

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.gradle                                       |   58 +-
 buildSrc/build.gradle                              |    7 +-
 .../main/groovy/org/gradle/build/BuildTypes.groovy |    7 +-
 .../main/groovy/org/gradle/build/JarJarJar.groovy  |    8 +
 .../org/gradle/build/ReleasedVersions.groovy       |    4 +
 .../org/gradle/build/TestReportAggregator.groovy   |   51 -
 ...csTask.groovy => AssembleSamplesDocTask.groovy} |    0
 .../{Docbook2XHtml.groovy => Docbook2Xhtml.groovy} |    0
 .../gradle/build/docs/ExtractSnippetsTask.groovy   |    2 +-
 .../build/docs/SampleElementLocationHandler.groovy |    2 +-
 .../build/docs/UserGuideTransformTask.groovy       |    8 +-
 .../docs/dsl/docbook/AssembleDslDocTask.groovy     |    2 +-
 .../build/docs/dsl/docbook/BasicJavadocLexer.java  |    2 +-
 .../build/docs/dsl/docbook/JavadocConverter.java   |    3 +-
 .../docs/dsl/docbook/JavadocLinkConverter.java     |   18 +-
 .../build/docs/dsl/links/ClassLinkMetaData.java    |   11 +-
 .../build/docs/dsl/source/model/TypeMetaData.java  |    4 +-
 .../build/docs/UserGuideTransformTaskTest.groovy   |   72 +
 .../docs/dsl/docbook/BasicJavadocLexerTest.groovy  |   13 +-
 .../docs/dsl/docbook/JavadocConverterTest.groovy   |   20 +
 .../dsl/docbook/JavadocLinkConverterTest.groovy    |   31 +-
 .../dsl/source/ExtractDslMetaDataTaskTest.groovy   |    3 +-
 .../dsl/source/model/MethodMetaDataTest.groovy     |   12 +
 .../docs/dsl/source/model/TypeMetaDataTest.groovy  |   11 +-
 config/checkstyle/checkstyle-api.xml               |    2 +-
 config/checkstyle/suppressions.xml                 |    5 +
 config/codenarc.xml                                |    1 +
 debian/changelog                                   |   16 +-
 debian/control                                     |   15 +-
 debian/copyright                                   |    9 +-
 debian/gradle.1.md                                 |    4 +-
 debian/gradle.links                                |    2 +-
 debian/libgradle-core-java.jlibs                   |    2 +
 debian/libgradle-core-java.links                   |    2 +-
 debian/libgradle-plugins-java.jlibs                |   20 +-
 debian/patches/03_plexus.diff                      |   17 -
 debian/patches/11_fix_jni_path.diff                |   30 -
 debian/patches/26_disable_commitid.diff            |    4 +-
 debian/patches/30_envjs.diff                       |    2 +-
 debian/patches/33_scala_zinc.diff                  |   40 +-
 debian/patches/34_disable_code_quality.diff        |    9 +-
 debian/patches/35_ivy_23.diff                      |   54 -
 debian/patches/36_java8_compatibility.diff         |   25 -
 debian/patches/37_replace_internal_testng_api.diff |   21 -
 debian/patches/38_use_jdk7_nio_file_api.diff       |   32 -
 .../39_ignore_test_processor_assertion.diff        |   13 -
 debian/patches/bintray_api.diff                    |   43 -
 debian/patches/bintray_dependencies.diff           |   24 -
 debian/patches/build_init.diff                     |    6 +-
 debian/patches/disable_buildSrc_tests.diff         |   10 +-
 debian/patches/disable_distributions.diff          |    6 +-
 debian/patches/disable_release_notes.diff          |   19 +-
 debian/patches/disable_sonar.diff                  |   53 +-
 debian/patches/disable_tests.diff                  |   72 +-
 debian/patches/docs.diff                           |  117 +-
 debian/patches/remove_test_dependencies.diff       |  135 +-
 debian/patches/search_system_jar.diff              |   13 +-
 debian/patches/series                              |   11 -
 debian/patches/use_local_artifacts.diff            |  266 +-
 gradle/buildReceipt.gradle                         |   12 +-
 gradle/classycle.gradle                            |   14 +-
 gradle/codeQuality.gradle                          |   11 +-
 gradle/compile.gradle                              |    2 +-
 gradle/dependencies.gradle                         |   85 +-
 gradle/fix-GRADLE-2492.gradle                      |   29 +
 gradle/groovyProject.gradle                        |    8 +-
 gradle/idea.gradle                                 |   45 +-
 gradle/integTest.gradle                            |  127 +-
 gradle/providedConfiguration.gradle                |    2 +-
 gradle/strictCompile.gradle                        |   23 +
 gradle/taskOrdering.gradle                         |   36 +
 gradle/testFixtures.gradle                         |    3 +-
 gradle/wrapper/gradle-wrapper.properties           |    4 +-
 settings.gradle                                    |   22 +-
 .../announce/AnnouncePluginIntegrationTest.groovy  |   25 +
 .../BuildAnnouncementsPluginIntegrationTest.groovy |   20 +-
 .../announce/BuildAnnouncementsPlugin.groovy       |    2 +-
 .../internal/DefaultAnnouncerFactory.groovy        |    9 +-
 ...e.properties => org.gradle.announce.properties} |    0
 ...s => org.gradle.build-announcements.properties} |    0
 subprojects/antlr/antlr.gradle                     |    9 +-
 .../antlr/AbstractAntlrIntegrationTest.groovy      |   49 +
 .../antlr/Antlr2PluginIntegrationTest.groovy       |  150 +
 .../antlr/Antlr3PluginIntegrationTest.groovy       |   98 +
 .../antlr/Antlr4PluginIntegrationTest.groovy       |   70 +
 .../antlr/AntlrPluginIntegrationTest.groovy        |   64 +
 .../IncrementalAntlrTaskIntegrationTest.groovy     |  180 +
 .../samples/SamplesAntlrIntegrationTest.groovy     |   40 +
 .../org/gradle/api/plugins/antlr/AntlrPlugin.java  |   46 +-
 .../org/gradle/api/plugins/antlr/AntlrTask.java    |  132 +-
 .../api/plugins/antlr/internal/AntlrExecuter.java  |  119 +
 .../api/plugins/antlr/internal/AntlrResult.java    |   41 +
 .../internal/AntlrSourceGenerationException.java   |   27 +
 .../internal/AntlrSourceVirtualDirectoryImpl.java  |    1 +
 .../api/plugins/antlr/internal/AntlrSpec.java      |   75 +
 .../plugins/antlr/internal/AntlrSpecFactory.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 +
 .../api/plugins/antlr/internal/GenerationPlan.java |   77 -
 .../antlr/internal/GenerationPlanBuilder.java      |  129 -
 .../plugins/antlr/internal/GrammarDelegate.java    |  148 -
 .../antlr/internal/GrammarFileMetadata.java        |   59 -
 .../plugins/antlr/internal/GrammarMetadata.java    |   92 -
 .../plugins/antlr/internal/MetadataExtracter.java  |   84 -
 .../gradle/api/plugins/antlr/internal/XRef.java    |   95 -
 .../antlr/internal/antlr2/GenerationPlan.java      |   77 +
 .../internal/antlr2/GenerationPlanBuilder.java     |  129 +
 .../antlr/internal/antlr2/GrammarDelegate.java     |  148 +
 .../antlr/internal/antlr2/GrammarFileMetadata.java |   59 +
 .../antlr/internal/antlr2/GrammarMetadata.java     |   92 +
 .../antlr/internal/antlr2/MetadataExtracter.java   |   84 +
 .../api/plugins/antlr/internal/antlr2/XRef.java    |   93 +
 ...ntlr.properties => org.gradle.antlr.properties} |    0
 .../api/plugins/antlr/AntlrPluginTest.groovy       |    7 +-
 .../antlr/internal/AntlrSpecFactoryTest.groovy     |  102 +
 .../gradle/api/internal/ClosureBackedAction.java   |  109 +
 .../main/groovy/org/gradle/api/specs/Specs.java    |   81 +
 .../org/gradle/groovy/scripts/Transformer.java     |   23 +
 .../internal/AbstractScriptTransformer.java        |    0
 .../gradle/groovy/scripts/internal/AstUtils.java   |  251 +
 .../scripts/internal/RestrictiveCodeVisitor.java   |  251 +
 .../groovy/scripts/internal/ScriptBlock.java       |   37 +
 .../ScriptSourceDescriptionTransformer.java        |   41 +
 .../scripts/internal/StatementTransformer.java     |   29 +
 .../main/groovy/org/gradle/util/Configurable.java  |    0
 .../groovy/org/gradle/api/specs/OrSpecTest.java    |    6 +-
 .../groovy/org/gradle/api/specs/SpecsTest.groovy   |    0
 subprojects/base-services/base-services.gradle     |    1 +
 .../SystemPropertiesIntegrationTest.groovy         |   49 +
 .../src/main/java/org/gradle/api/JavaVersion.java  |    8 +
 .../src/main/java/org/gradle/api/Named.java        |    8 +-
 .../src/main/java/org/gradle/api/Transformer.java  |   12 +-
 .../src/main/java/org/gradle/internal/Actions.java |   20 +-
 .../main/java/org/gradle/internal/BiAction.java    |   23 +
 .../main/java/org/gradle/internal/BiActions.java   |   34 +
 .../src/main/java/org/gradle/internal/Cast.java    |    4 +
 .../main/java/org/gradle/internal/Factories.java   |    4 +
 .../src/main/java/org/gradle/internal/Pair.java    |  123 +
 .../main/java/org/gradle/internal/Supplier.java    |   25 -
 .../main/java/org/gradle/internal/Suppliers.java   |   64 -
 .../java/org/gradle/internal/SystemProperties.java |   54 +-
 .../java/org/gradle/internal/Transformers.java     |   25 +-
 .../main/java/org/gradle/internal/TriAction.java   |   23 +
 .../org/gradle/internal/UncheckedException.java    |    6 +
 .../internal/classloader/CachingClassLoader.java   |   18 +
 .../internal/classloader/ClassLoaderFactory.java   |    8 +-
 .../gradle/internal/classloader/ClasspathUtil.java |   19 +-
 .../classloader/DefaultClassLoaderFactory.java     |    7 +-
 .../internal/classloader/FilteringClassLoader.java |   40 +-
 .../classloader/MultiParentClassLoader.java        |   33 +-
 .../classloader/MutableURLClassLoader.java         |    5 +
 .../org/gradle/internal/classpath/ClassPath.java   |    7 +-
 .../internal/classpath/DefaultClassPath.java       |   30 +-
 .../internal/concurrent/CompositeStoppable.java    |   44 +-
 .../concurrent/DefaultExecutorFactory.java         |   93 +-
 .../internal/concurrent/ExecutorFactory.java       |   10 +
 .../gradle/internal/concurrent/ExecutorPolicy.java |   83 +
 .../internal/concurrent/StoppableExecutor.java     |    4 +-
 .../internal/concurrent/StoppableExecutorImpl.java |   91 +
 .../internal/concurrent/ThreadFactoryImpl.java     |   43 +
 .../org/gradle/internal/exceptions/Contextual.java |    0
 .../exceptions/DefaultMultiCauseException.java     |  111 +
 .../internal/exceptions/DiagnosticsVisitor.java    |   29 +
 .../exceptions/FormattingDiagnosticsVisitor.java   |   71 +
 .../internal/exceptions/MultiCauseException.java   |    0
 .../java/org/gradle/internal/hash/HashUtil.java    |    3 +
 .../java/org/gradle/internal/hash/HashValue.java   |    8 +-
 .../main/java/org/gradle/internal/io/IoUtils.java  |   35 +
 .../java/org/gradle/internal/jvm/JavaInfo.java     |    9 +-
 .../java/org/gradle/internal/jvm/JdkTools.java     |   67 +
 .../src/main/java/org/gradle/internal/jvm/Jvm.java |    9 +-
 .../jvm/UnsupportedJavaRuntimeException.java       |   41 +
 .../gradle/internal/operations/BuildOperation.java |   24 +
 .../internal/operations/BuildOperationFailure.java |   42 +
 .../operations/BuildOperationProcessor.java        |   34 +
 .../internal/operations/BuildOperationQueue.java   |   46 +
 .../internal/operations/BuildOperationWorker.java  |   26 +
 .../operations/DefaultBuildOperationProcessor.java |   39 +
 .../operations/DefaultBuildOperationQueue.java     |  117 +
 .../operations/MultipleBuildOperationFailures.java |   50 +
 .../org/gradle/internal/os/OperatingSystem.java    |   13 +-
 .../org/gradle/internal/reflect/ClassDetails.java  |   50 +
 .../gradle/internal/reflect/ClassInspector.java    |  233 +
 .../internal/reflect/DirectInstantiator.java       |   10 +
 .../org/gradle/internal/reflect/JavaMethod.java    |   22 +-
 .../internal/reflect/JavaReflectionUtil.java       |  137 +-
 .../gradle/internal/reflect/MethodDescription.java |  104 +
 .../reflect/MethodSignatureEquivalence.java        |   48 +
 .../reflect/ObjectInstantiationException.java      |    3 +
 .../gradle/internal/reflect/PropertyAccessor.java  |    6 +-
 .../gradle/internal/reflect/PropertyDetails.java   |   28 +
 .../internal/service/DefaultServiceRegistry.java   |  306 +-
 .../gradle/internal/service/ServiceLocator.java    |    4 +-
 .../gradle/internal/service/ServiceRegistry.java   |   10 -
 .../java/org/gradle/internal/util/BiFunction.java  |   23 +
 .../java/org/gradle/internal/util/NumberUtil.java  |   74 +
 .../main/java/org/gradle/util/CollectionUtils.java |  120 +-
 .../main/java/org/gradle/util/GradleVersion.java   |  311 ++
 .../src/main/java/org/gradle/util/TextUtil.java    |  126 +
 .../groovy/org/gradle/api/JavaVersionSpec.groovy   |    9 +
 .../groovy/org/gradle/internal/PairTest.groovy     |   56 +
 .../org/gradle/internal/SuppliersTest.groovy       |   82 -
 .../gradle/internal/SystemPropertiesTest.groovy    |    4 +-
 .../org/gradle/internal/TransformersTest.groovy    |   19 +-
 .../classloader/CachingClassLoaderTest.groovy      |   12 +
 .../classloader/FilteringClassLoaderTest.groovy    |   34 +
 .../classloader/MultiParentClassLoaderTest.groovy  |   11 +
 .../internal/classpath/DefaultClassPathTest.groovy |   27 +-
 .../concurrent/CompositeStoppableTest.groovy       |   34 -
 .../concurrent/DefaultExecutorFactoryTest.groovy   |    2 +-
 .../DefaultMultiCauseExceptionTest.groovy          |  125 +
 .../FormattingDiagnosticsVisitorTest.groovy        |   45 +
 .../org/gradle/internal/hash/HashUtilTest.groovy   |  109 +
 .../org/gradle/internal/hash/HashValueTest.groovy  |   25 +-
 .../org/gradle/internal/jvm/JdkToolsTest.groovy    |   55 +
 .../DefaultBuildOperationProcessorTest.groovy      |  160 +
 .../DefaultBuildOperationQueueTest.groovy          |  155 +
 .../MultipleBuildOperationFailuresTest.groovy      |  129 +
 .../gradle/internal/os/OperatingSystemTest.groovy  |   17 +-
 .../internal/reflect/ClassInspectorTest.groovy     |  357 ++
 .../internal/reflect/DirectInstantiatorTest.groovy |    2 +-
 .../internal/reflect/JavaReflectionUtilTest.groovy |   72 +-
 .../gradle/internal/reflect/JavaTestSubject.java   |    6 +-
 .../internal/reflect/MethodDescriptionTest.groovy  |   33 +
 .../service/DefaultServiceRegistryTest.groovy      |   96 +-
 .../org/gradle/internal/util/NumberUtilTest.groovy |   97 +
 .../org/gradle/util/CollectionUtilsTest.groovy     |   55 +-
 .../org/gradle/util/GradleVersionTest.groovy       |  251 +
 .../BuildComparisonHtmlReportFixture.groovy        |   68 +
 .../gradle/BuildComparisonIntegrationSpec.groovy   |  104 +-
 ...Pre12CompareGradleBuildsCrossVersionSpec.groovy |   47 +-
 .../source/build.gradle                            |    0
 .../source/settings.gradle                         |    0
 .../target/build.gradle                            |    0
 .../target/settings.gradle                         |    0
 .../source/build.gradle                            |    0
 .../source/settings.gradle                         |    0
 .../source/src/main/java/org/gradle/Changed.java   |    0
 .../src/main/java/org/gradle/DifferentCrc.java     |    0
 .../src/main/java/org/gradle/SourceBuildOnly.java  |    0
 .../source/src/main/java/org/gradle/Unchanged.java |    0
 .../source/src/main/resources/dir1/different.txt   |    1 +
 .../source/src/main/resources/similar.txt          |    1 +
 .../src/main/resources/someSource.properties       |    1 +
 .../target/build.gradle                            |    0
 .../target}/settings.gradle                        |    0
 .../target/src/main/java/org/gradle/Changed.java   |    0
 .../src/main/java/org/gradle/DifferentCrc.java     |    0
 .../src/main/java/org/gradle/TargetBuildOnly.java  |    0
 .../target/src/main/java/org/gradle/Unchanged.java |    0
 .../target/src/main/resources/dir1/different.txt   |    1 +
 .../target/src/main/resources/similar.txt          |    1 +
 .../src/main/resources/someTarget.properties       |    1 +
 .../gradle/CompareGradleBuilds.java                |   36 +-
 .../gradle/CompareGradleBuildsPlugin.groovy        |    2 +-
 .../gradle/internal/GradleBuildComparison.java     |    2 +-
 .../internal/GradleBuildOutcomeSetInferrer.java    |    2 +-
 .../internal/GradleBuildOutcomeSetTransformer.java |   10 +-
 .../archive/GeneratedArchiveBuildOutcome.java      |    1 +
 .../GeneratedArchiveBuildOutcomeComparator.java    |   27 +-
 ...neratedArchiveBuildOutcomeComparisonResult.java |    2 +-
 ...BuildOutcomeComparisonResultHtmlRenderer.groovy |   32 +-
 .../internal/archive/entry/ArchiveEntry.java       |  213 +-
 .../archive/entry/ArchiveEntryComparison.java      |   16 +-
 .../entry/FileToArchiveEntrySetTransformer.java    |   54 +-
 .../entry/ZipEntryToArchiveEntryTransformer.java   |   33 -
 ...blishArtifactToFileBuildOutcomeTransformer.java |    8 +-
 .../GradleBuildComparisonResultHtmlRenderer.groovy |   55 +-
 ...=> org.gradle.compare-gradle-builds.properties} |    0
 ...DefaultBuildOutcomeComparatorFactoryTest.groovy |    2 +-
 .../GradleBuildOutcomeSetInferrerTest.groovy       |    4 +-
 .../GradleBuildOutcomeSetTransformerTest.groovy    |    8 +-
 ...neratedArchiveBuildOutcomeComparatorTest.groovy |  103 +-
 .../entry/ArchiveEntryComparisonTest.groovy        |   14 +-
 .../internal/archive/entry/ArchiveEntryTest.groovy |  101 +-
 .../FileToArchiveEntrySetTransformerTest.groovy    |   74 +-
 .../ZipEntryToArchiveEntryTransformerTest.groovy   |   63 -
 ...rtifactToFileBuildOutcomeTransformerTest.groovy |   10 +-
 ...dleBuildComparisonResultHtmlRendererTest.groovy |   67 +-
 .../fixtures/MutableProjectOutcomes.groovy         |    4 +-
 .../StringBuildOutcomeComparisonResult.groovy      |    2 +-
 subprojects/build-init/build-init.gradle           |    7 +-
 .../plugins/BuildInitPluginIntegrationTest.groovy  |    5 -
 .../GroovyLibraryInitIntegrationTest.groovy        |    1 -
 .../plugins/MavenConversionIntegrationTest.groovy  |    6 +-
 .../plugins/ScalaLibraryInitIntegrationTest.groovy |    3 -
 .../org/gradle/api/tasks/wrapper/Wrapper.java      |   11 +-
 .../buildinit/plugins/BuildInitPlugin.groovy       |   62 -
 .../gradle/buildinit/plugins/BuildInitPlugin.java  |   34 +
 .../gradle/buildinit/plugins/WrapperPlugin.groovy  |   34 -
 .../gradle/buildinit/plugins/WrapperPlugin.java    |   34 +
 .../BasicTemplateBasedProjectInitDescriptor.java   |    4 +-
 .../plugins/internal/BuildInitAutoApplyAction.java |   33 -
 .../plugins/internal/BuildInitServices.java        |    3 +
 .../GroovyLibraryProjectInitDescriptor.java        |    1 +
 .../internal/JavaLibraryProjectInitDescriptor.java |    1 +
 .../ProjectLayoutSetupRegistryFactory.groovy       |    4 +-
 .../internal/WrapperPluginAutoApplyAction.groovy   |   32 -
 .../internal/action/BuildInitAutoApplyAction.java  |   29 +
 .../action/WrapperPluginAutoApplyAction.groovy     |   29 +
 .../internal/maven/MavenProjectsCreator.java       |    2 +-
 .../org/gradle/buildinit/plugins/package-info.java |   20 +
 .../tasks/internal/TaskConfiguration.java          |  126 +
 ...properties => org.gradle.build-init.properties} |    0
 ...er.properties => org.gradle.wrapper.properties} |    0
 ...le.configuration.project.ProjectConfigureAction |    4 +-
 .../tasks/templates/build.gradle.template          |    8 +-
 .../templates/groovylibrary/build.gradle.template  |    8 +-
 .../templates/javalibrary/build.gradle.template    |    6 +-
 .../templates/scalalibrary/build.gradle.template   |    4 +-
 .../buildinit/plugins/BuildInitPluginSpec.groovy   |    8 +-
 .../buildinit/plugins/WrapperPluginSpec.groovy     |    6 +-
 .../internal/BuildInitAutoApplyActionSpec.groovy   |   72 -
 .../action/BuildInitAutoApplyActionSpec.groovy     |   71 +
 .../gradle/cli/AbstractCommandLineConverter.java   |   12 -
 .../AbstractPropertiesCommandLineConverter.java    |    5 -
 .../java/org/gradle/cli/CommandLineConverter.java  |    4 -
 .../java/org/gradle/cli/CommandLineParser.java     |    2 +-
 .../java/org/gradle/cli/ParsedCommandLine.java     |   22 +-
 ...stractPropertiesCommandLineConverterTest.groovy |    2 +-
 .../org/gradle/cli/CommandLineParserTest.groovy    |    2 +-
 .../org/gradle/cli/ParsedCommandLineTest.groovy    |   18 +
 ...rojectPropertiesCommandLineConverterTest.groovy |    2 +-
 ...SystemPropertiesCommandLineConverterTest.groovy |    2 +-
 subprojects/code-quality/code-quality.gradle       |    6 +-
 .../AbstractFindBugsPluginIntegrationTest.groovy   |  469 ++
 .../quality/CheckstylePluginIntegrationTest.groovy |   16 +-
 .../quality/CodeNarcPluginIntegrationTest.groovy   |   12 +-
 .../CodeQualityPluginIntegrationTest.groovy        |  207 -
 ...ndBugsClasspathValidationIntegrationTest.groovy |   58 +
 .../FindBugsForOldJavaIntegrationTest.groovy       |   32 +
 .../plugins/quality/FindBugsIntegrationTest.groovy |   22 +
 .../quality/FindBugsPluginIntegrationTest.groovy   |  381 +-
 .../quality/JDependPluginIntegrationTest.groovy    |   22 +
 .../quality/PmdPluginIntegrationTest.groovy        |   44 +-
 .../quality/PmdPluginVersionIntegrationTest.groovy |    2 +-
 .../gradle/api/plugins/quality/Checkstyle.groovy   |   78 +-
 .../api/plugins/quality/CheckstyleExtension.groovy |   31 +-
 .../api/plugins/quality/CheckstylePlugin.groovy    |    9 +-
 .../org/gradle/api/plugins/quality/CodeNarc.groovy |   76 +-
 .../api/plugins/quality/CodeNarcExtension.groovy   |   30 +-
 .../api/plugins/quality/CodeNarcPlugin.groovy      |   19 +-
 .../api/plugins/quality/CodeQualityPlugin.groovy   |   71 -
 .../org/gradle/api/plugins/quality/FindBugs.groovy |  100 +-
 .../api/plugins/quality/FindBugsExtension.groovy   |   71 +-
 .../api/plugins/quality/FindBugsPlugin.groovy      |   12 +-
 .../GroovyCodeQualityPluginConvention.groovy       |   60 -
 .../org/gradle/api/plugins/quality/JDepend.groovy  |   14 +-
 .../api/plugins/quality/JDependPlugin.groovy       |   21 +-
 .../quality/JavaCodeQualityPluginConvention.groovy |   60 -
 .../org/gradle/api/plugins/quality/Pmd.groovy      |   92 +-
 .../gradle/api/plugins/quality/PmdExtension.groovy |   24 +
 .../gradle/api/plugins/quality/PmdPlugin.groovy    |   17 +-
 .../internal/AbstractCodeQualityPlugin.groovy      |    6 +-
 .../findbugs/FindBugsClasspathValidator.java       |   70 +
 .../quality/internal/findbugs/FindBugsResult.java  |    6 +-
 .../internal/findbugs/FindBugsSpecBuilder.java     |   16 +
 .../internal/findbugs/FindBugsWorkerServer.java    |   13 +-
 .../gradle-plugins/code-quality.properties         |    1 -
 ...properties => org.gradle.checkstyle.properties} |    0
 ...c.properties => org.gradle.codenarc.properties} |    0
 ...s.properties => org.gradle.findbugs.properties} |    0
 ...nd.properties => org.gradle.jdepend.properties} |    0
 .../{pmd.properties => org.gradle.pmd.properties}  |    0
 .../plugins/quality/CheckstylePluginTest.groovy    |   51 +-
 .../api/plugins/quality/CheckstyleTest.groovy      |   15 +-
 .../api/plugins/quality/CodeNarcPluginTest.groovy  |   55 +-
 .../plugins/quality/CodeQualityPluginTest.groovy   |  159 -
 .../gradle/api/plugins/quality/CodenarcTest.groovy |   33 +
 .../api/plugins/quality/FindBugsPluginTest.groovy  |   80 +-
 .../gradle/api/plugins/quality/FindBugsTest.groovy |   37 +-
 .../api/plugins/quality/JDependPluginTest.groovy   |   15 +-
 .../api/plugins/quality/PmdPluginTest.groovy       |   25 +-
 .../findbugs/FindBugsClasspathValidatorTest.groovy |   63 +
 .../findbugs/FindBugsWorkerServerTest.groovy       |   40 +
 subprojects/core-impl/core-impl.gradle             |   77 -
 .../ArtifactDependenciesIntegrationTest.groovy     |  691 ---
 .../resolve/CacheResolveIntegrationTest.groovy     |  115 -
 ...ModuleDependenciesResolveIntegrationTest.groovy |   67 -
 ...adataRulesChangingModulesIntegrationTest.groovy |  170 -
 .../ComponentMetadataRulesIntegrationTest.groovy   |  118 -
 ...ponentMetadataRulesStatusIntegrationTest.groovy |   45 -
 .../DependencyNotationIntegrationSpec.groovy       |  186 -
 ...ependencyResolutionEventsIntegrationTest.groovy |   51 -
 .../DependencyResolveRulesIntegrationTest.groovy   |  797 ---
 ...LibraryArtifactResolutionIntegrationTest.groovy |  105 -
 .../JvmLibraryArtifactResolveTestFixture.groovy    |  214 -
 .../ProjectDependenciesIntegrationTest.groovy      |   92 -
 .../ProjectDependencyResolveIntegrationTest.groovy |  422 --
 ...ResolutionStrategySamplesIntegrationTest.groovy |   58 -
 .../ResolveCrossVersionIntegrationTest.groovy      |   60 -
 .../integtests/resolve/ResolveTestFixture.groovy   |  333 --
 .../ResolvedConfigurationIntegrationTest.groovy    |  106 -
 ...VersionConflictResolutionIntegrationTest.groovy |  733 ---
 ...AliasedArtifactResolutionIntegrationTest.groovy |  202 -
 .../CacheReuseCrossVersionIntegrationTest.groovy   |  173 -
 .../M3CacheReuseCrossVersionIntegrationTest.groovy |   75 -
 .../MavenM2CacheReuseIntegrationTest.groovy        |   54 -
 .../ResolutionOverrideIntegrationTest.groovy       |  221 -
 ...ameCacheUsageCrossVersionIntegrationTest.groovy |   77 -
 .../CachedChangingModulesIntegrationTest.groovy    |  232 -
 ...achedDependencyResolutionIntegrationTest.groovy |  239 -
 .../CachedMissingModulesIntegrationTest.groovy     |  295 --
 ...ependencyMetadataInMemoryIntegrationTest.groovy |  197 -
 ...coverFromBrokenResolutionIntegrationTest.groovy |  357 --
 .../FileSystemResolverIntegrationTest.groovy       |   76 -
 .../custom/IvySFtpResolverIntegrationTest.groovy   |   84 -
 .../custom/IvyUrlResolverIntegrationTest.groovy    |  251 -
 .../AbstractHttpsRepoResolveIntegrationTest.groovy |  129 -
 ...ationDependencyResolutionIntegrationTest.groovy |  221 -
 ...odingDependencyResolutionIntegrationTest.groovy |   49 -
 .../http/HttpProxyResolveIntegrationTest.groovy    |  154 -
 .../http/HttpRedirectResolveIntegrationTest.groovy |   87 -
 .../ivy/IvyBrokenDescriptorIntegrationTest.groovy  |  119 -
 .../IvyBrokenRemoteResolveIntegrationTest.groovy   |  181 -
 ...angingModuleRemoteResolveIntegrationTest.groovy |  418 --
 ...adataRulesChangingModulesIntegrationTest.groovy |   41 -
 ...IvyComponentMetadataRulesIntegrationTest.groovy |   42 -
 ...ponentMetadataRulesStatusIntegrationTest.groovy |   98 -
 ...CustomStatusLatestVersionIntegrationTest.groovy |  107 -
 .../ivy/IvyDescriptorResolveIntegrationTest.groovy |  240 -
 .../IvyDescriptorValidationIntegrationTest.groovy  |   54 -
 ...amicRevisionRemoteResolveIntegrationTest.groovy |  835 ----
 ...IvyDynamicRevisionResolveIntegrationTest.groovy |  430 --
 .../ivy/IvyHttpRepoResolveIntegrationTest.groovy   |  345 --
 .../ivy/IvyHttpsRepoResolveIntegrationTest.groovy  |   28 -
 ...LibraryArtifactResolutionIntegrationTest.groovy |  325 --
 .../ivy/IvyModuleResolveIntegrationTest.groovy     |  223 -
 .../resolve/ivy/IvyResolveIntegrationTest.groovy   |  197 -
 .../maven/BadPomFileResolveIntegrationTest.groovy  |  186 -
 .../LegacyMavenRepoResolveIntegrationTest.groovy   |  225 -
 .../MavenBrokenRemoteResolveIntegrationTest.groovy |  101 -
 ...adataRulesChangingModulesIntegrationTest.groovy |   70 -
 ...venComponentMetadataRulesIntegrationTest.groovy |   42 -
 ...ponentMetadataRulesStatusIntegrationTest.groovy |   65 -
 ...venCustomPackagingResolveIntegrationTest.groovy |   68 -
 .../MavenDependencyResolveIntegrationTest.groovy   |  212 -
 .../MavenDynamicResolveIntegrationTest.groovy      |  228 -
 .../MavenHttpRepoResolveIntegrationTest.groovy     |  297 --
 ...LibraryArtifactResolutionIntegrationTest.groovy |  321 --
 .../maven/MavenLatestResolveIntegrationTest.groovy |   98 -
 .../MavenLocalRepoResolveIntegrationTest.groovy    |  320 --
 .../MavenParentPomResolveIntegrationTest.groovy    |  449 --
 .../MavenPomPackagingResolveIntegrationTest.groovy |  378 --
 .../maven/MavenPomResolveIntegrationTest.groovy    |   65 -
 .../MavenProfileResolveIntegrationTest.groovy      |  218 -
 .../MavenSnapshotResolveIntegrationTest.groovy     |  679 ---
 .../projectWithConfigurationHierarchy.gradle       |   58 -
 .../projectWithUnknownDependency.gradle            |   14 -
 .../artifacts/ArtifactDependencyResolver.java      |   29 -
 .../artifacts/DefaultArtifactIdentifier.java       |  107 -
 .../DefaultDependencyManagementServices.java       |  188 -
 .../artifacts/DefaultModuleIdentifier.java         |   67 -
 .../artifacts/DefaultModuleVersionIdentifier.java  |  101 -
 .../artifacts/DefaultResolvedArtifact.java         |  111 -
 .../DependencyManagementBuildScopeServices.java    |  284 --
 .../DependencyManagementGlobalScopeServices.java   |   86 -
 .../api/internal/artifacts/DependencyServices.java |   33 -
 .../artifacts/ModuleMetadataProcessor.java         |   22 -
 .../ModuleVersionIdentifierSerializer.java         |   39 -
 .../internal/artifacts/ModuleVersionPublisher.java |   28 -
 .../artifacts/ModuleVersionSelectorSerializer.java |   41 -
 .../internal/artifacts/PlexusLoggerAdapter.java    |   98 -
 .../ResolvedConfigurationIdentifierSerializer.java |   39 -
 .../api/internal/artifacts/ResolverResults.java    |   64 -
 .../DefaultComponentIdentifierFactory.java         |   32 -
 .../DefaultModuleComponentIdentifier.java          |   98 -
 .../component/DefaultModuleComponentSelector.java  |  107 -
 .../DefaultProjectComponentIdentifier.java         |   69 -
 .../component/DefaultProjectComponentSelector.java |   82 -
 .../artifacts/configurations/Configurations.java   |   56 -
 .../configurations/DefaultConfiguration.java       |  572 ---
 .../DefaultConfigurationContainer.java             |  123 -
 .../artifacts/dsl/DefaultArtifactHandler.groovy    |   67 -
 .../dsl/DefaultComponentMetadataHandler.java       |   47 -
 .../dsl/ModuleVersionSelectorParsers.java          |   90 -
 .../artifacts/dsl/ParsedModuleStringNotation.java  |   65 -
 .../dsl/PublishArtifactNotationParserFactory.java  |   98 -
 .../ivyservice/ArtifactResolveContext.java         |   21 -
 .../ivyservice/ArtifactResolveResult.java          |   35 -
 .../artifacts/ivyservice/ArtifactResolver.java     |   33 -
 .../ivyservice/ArtifactSetResolveResult.java       |   32 -
 .../ivyservice/ArtifactTypeResolveContext.java     |   38 -
 .../ivyservice/BuildableArtifactResolveResult.java |   39 -
 .../BuildableArtifactSetResolveResult.java         |   29 -
 .../BuildableComponentResolveResult.java           |   42 -
 .../internal/artifacts/ivyservice/CacheLayout.java |   59 -
 .../CacheLockingArtifactDependencyResolver.java    |   46 -
 .../artifacts/ivyservice/CacheLockingManager.java  |   53 -
 .../ivyservice/ComponentResolveResult.java         |   42 -
 .../ivyservice/ConfigurationResolveContext.java    |   41 -
 .../ivyservice/ContextualArtifactResolver.java     |   58 -
 .../DefaultBuildableArtifactResolveResult.java     |   63 -
 .../DefaultBuildableArtifactSetResolveResult.java  |   64 -
 .../DefaultBuildableComponentResolveResult.java    |   73 -
 .../ivyservice/DefaultCacheLockingManager.java     |   88 -
 .../ivyservice/DefaultConfigurationResolver.java   |   49 -
 .../DefaultDependencyResolveDetails.java           |   72 -
 .../ivyservice/DefaultIvyDependencyPublisher.java  |   71 -
 .../ivyservice/DefaultLenientConfiguration.java    |  169 -
 .../ivyservice/DefaultUnresolvedDependency.java    |   47 -
 .../DependencyToModuleVersionIdResolver.java       |   28 -
 .../DependencyToModuleVersionResolver.java         |   28 -
 .../ErrorHandlingArtifactDependencyResolver.java   |  256 -
 .../ivyservice/IvyBackedArtifactPublisher.java     |   84 -
 .../ivyservice/IvyDependencyPublisher.java         |   26 -
 .../IvyResolverBackedModuleVersionPublisher.java   |   67 -
 .../api/internal/artifacts/ivyservice/IvyUtil.java |   77 -
 .../ivyservice/IvyXmlModuleDescriptorWriter.java   |  402 --
 .../ivyservice/LocalComponentFactory.java          |   26 -
 .../ivyservice/ModuleToModuleVersionResolver.java  |   29 -
 .../ivyservice/ModuleVersionIdResolveResult.java   |   46 -
 .../ivyservice/ModuleVersionNotFoundException.java |   34 -
 .../ivyservice/ModuleVersionResolveException.java  |  110 -
 .../SelfResolvingDependencyResolver.java           |  113 -
 ...cuitEmptyConfigsArtifactDependencyResolver.java |  104 -
 .../SubstitutedModuleVersionIdResolveResult.java   |   47 -
 .../VersionForcingDependencyToModuleResolver.java  |   75 -
 .../clientmodule/ClientModuleResolver.java         |   47 -
 .../DefaultCachedModuleVersionList.java            |   37 -
 .../dynamicversions/ModuleVersionsCache.java       |   33 -
 .../dynamicversions/ModuleVersionsCacheEntry.java  |   28 -
 .../SingleFileBackedModuleVersionsCache.java       |  140 -
 .../ivyresolve/ArtifactNotFoundException.java      |   24 -
 .../ivyresolve/ArtifactResolveException.java       |   69 -
 ...uildableModuleVersionMetaDataResolveResult.java |   72 -
 ...ildableModuleVersionSelectionResolveResult.java |   60 -
 .../CacheLockingModuleVersionRepository.java       |   78 -
 .../ivyresolve/CachingModuleVersionRepository.java |  308 --
 .../ivyresolve/ChangingModuleDetector.java         |   55 -
 .../ConfiguredModuleVersionRepository.java         |   23 -
 ...uildableModuleVersionMetaDataResolveResult.java |   95 -
 ...ildableModuleVersionSelectionResolveResult.java |   58 -
 .../ivyresolve/DefaultModuleVersionListing.java    |   94 -
 .../ivyresolve/DependencyResolverIdentifier.java   |   66 -
 .../ivyresolve/ErrorHandlingArtifactResolver.java  |   47 -
 .../IvyAwareModuleVersionRepository.java           |   26 -
 .../IvyDynamicResolveModuleVersionRepository.java  |   81 -
 .../ivyresolve/LazyDependencyToModuleResolver.java |  155 -
 .../LocalArtifactsModuleVersionRepository.java     |   31 -
 .../LocalAwareModuleVersionRepository.java         |   42 -
 .../ivyresolve/LocalModuleVersionRepository.java   |   69 -
 .../ivyresolve/LoopbackDependencyResolver.java     |  186 -
 .../ivyservice/ivyresolve/ModuleSource.java        |   28 -
 .../ivyresolve/ModuleVersionListing.java           |   30 -
 .../ivyresolve/ModuleVersionRepository.java        |   41 -
 .../ivyresolve/NoOpRepositoryCacheManager.java     |   76 -
 .../ivyservice/ivyresolve/RepositoryChain.java     |   24 -
 .../RepositoryChainArtifactResolver.java           |   64 -
 .../RepositoryChainDependencyResolver.java         |  297 --
 .../RepositoryChainModuleResolution.java           |   38 -
 .../ivyresolve/RepositoryChainModuleSource.java    |   34 -
 .../ivyservice/ivyresolve/ResolveIvyFactory.java   |  202 -
 .../StartParameterResolutionOverride.java          |  123 -
 .../ivyservice/ivyresolve/UserResolverChain.java   |   53 -
 .../memcache/CachedModuleVersionResult.java        |   55 -
 .../ivyresolve/memcache/CachedRepository.java      |   90 -
 .../memcache/DependencyMetadataCache.java          |  123 -
 .../memcache/DependencyMetadataCacheStats.java     |   29 -
 .../memcache/InMemoryDependencyMetadataCache.java  |   62 -
 .../parser/AbstractModuleDescriptorParser.java     |   55 -
 .../ivyresolve/parser/DescriptorParseContext.java  |   27 -
 .../parser/DisconnectedDescriptorParseContext.java |   37 -
 .../DisconnectedIvyXmlModuleDescriptorParser.java  |   65 -
 .../parser/GradlePomModuleDescriptorBuilder.java   |  377 --
 .../parser/GradlePomModuleDescriptorParser.java    |  216 -
 .../parser/IvyXmlModuleDescriptorParser.java       | 1226 -----
 .../ivyresolve/parser/MetaDataParseException.java  |   32 -
 .../ivyresolve/parser/MetaDataParser.java          |   29 -
 .../ivyservice/ivyresolve/parser/PomReader.java    |  776 ---
 .../ivyresolve/strategy/ChainVersionMatcher.java   |   64 -
 .../ivyresolve/strategy/ExactVersionMatcher.java   |  113 -
 .../ivyresolve/strategy/LatestStrategy.java        |   42 -
 .../ivyresolve/strategy/LatestVersionMatcher.java  |   47 -
 .../ivyresolve/strategy/LatestVersionStrategy.java |   65 -
 .../ivyresolve/strategy/ResolverStrategy.java      |   53 -
 .../ivyresolve/strategy/SubVersionMatcher.java     |   59 -
 .../ivyresolve/strategy/VersionMatcher.java        |   67 -
 .../ivyresolve/strategy/VersionRangeMatcher.java   |  180 -
 .../CachedModuleDescriptorParseContext.java        |   38 -
 .../modulecache/DefaultCachedMetaData.java         |   71 -
 .../modulecache/DefaultModuleArtifactsCache.java   |  182 -
 .../modulecache/DefaultModuleMetaDataCache.java    |  176 -
 .../modulecache/ModuleArtifactsCache.java          |   37 -
 .../modulecache/ModuleDescriptorCacheEntry.java    |   38 -
 .../modulecache/ModuleDescriptorStore.java         |   79 -
 .../modulecache/ModuleMetaDataCache.java           |   47 -
 .../ConfigurationsToArtifactsConverter.java        |   23 -
 .../ConfigurationsToModuleDescriptorConverter.java |   23 -
 .../DefaultConfigurationsToArtifactsConverter.java |   60 -
 ...tConfigurationsToModuleDescriptorConverter.java |   42 -
 .../DefaultModuleDescriptorFactory.java            |   26 -
 .../moduleconverter/ModuleDescriptorFactory.java   |   23 -
 .../PublishLocalComponentFactory.java              |   47 -
 .../ResolveLocalComponentFactory.java              |   55 -
 .../AbstractIvyDependencyDescriptorFactory.java    |   77 -
 .../ClientModuleDependencyDescriptor.java          |   34 -
 ...ClientModuleIvyDependencyDescriptorFactory.java |   63 -
 .../dependencies/ClientModuleMetaDataFactory.java  |   26 -
 .../DefaultClientModuleMetaDataFactory.java        |   54 -
 ...ultDependenciesToModuleDescriptorConverter.java |   59 -
 .../DefaultDependencyDescriptorFactory.java        |   48 -
 .../DependenciesToModuleDescriptorConverter.java   |   25 -
 .../dependencies/DependencyDescriptorFactory.java  |   23 -
 .../dependencies/EnhancedDependencyDescriptor.java |   34 -
 ...ternalModuleIvyDependencyDescriptorFactory.java |   54 -
 .../IvyDependencyDescriptorFactory.java            |   25 -
 .../dependencies/ProjectDependencyDescriptor.java  |   31 -
 .../ProjectIvyDependencyDescriptorFactory.java     |   51 -
 .../DefaultProjectComponentRegistry.java           |   36 -
 .../projectmodule/DefaultProjectPublication.java   |   40 -
 .../projectmodule/ProjectArtifactResolver.java     |   65 -
 .../projectmodule/ProjectComponentRegistry.java    |   22 -
 .../projectmodule/ProjectDependencyResolver.java   |   57 -
 .../resolutionstrategy/DefaultCachePolicy.java     |  254 -
 .../DefaultResolutionStrategy.java                 |  127 -
 .../ModuleForcingResolveRule.java                  |   54 -
 .../resolveengine/DefaultDependencyResolver.java   |  130 -
 .../DefaultDependencyToConfigurationResolver.java  |   81 -
 .../resolveengine/DependencyGraphBuilder.java      |  985 ----
 .../DependencyToConfigurationResolver.java         |   30 -
 .../LatestModuleConflictResolver.java              |   32 -
 .../resolveengine/ModuleConflictResolver.java      |   22 -
 .../resolveengine/ModuleRevisionResolveState.java  |   27 -
 .../resolveengine/ModuleVersionSpec.java           |  556 ---
 .../resolveengine/StrictConflictResolver.java      |   30 -
 .../VersionSelectionReasonResolver.java            |   36 -
 .../DefaultResolvedConfigurationBuilder.java       |  151 -
 .../DefaultTransientConfigurationResults.java      |   45 -
 .../oldresult/ResolvedConfigurationBuilder.java    |   44 -
 .../oldresult/TransientConfigurationResults.java   |   32 -
 .../TransientConfigurationResultsBuilder.java      |  186 -
 .../result/CachingDependencyResultFactory.java     |   56 -
 .../result/ComponentIdentifierSerializer.java      |   76 -
 .../result/ComponentSelectionReasonSerializer.java |   59 -
 .../result/ComponentSelectorSerializer.java        |   76 -
 .../result/DefaultInternalDependencyResult.java    |   59 -
 .../result/DefaultModuleVersionSelection.java      |   45 -
 .../result/DefaultResolutionResultBuilder.java     |   85 -
 .../result/InternalDependencyResult.java           |   40 -
 .../result/InternalDependencyResultSerializer.java |   62 -
 .../result/ModuleVersionSelection.java             |   30 -
 .../result/ModuleVersionSelectionSerializer.java   |   47 -
 .../result/StreamingResolutionResultBuilder.java   |  200 -
 .../result/VersionSelectionReasons.java            |   81 -
 .../resolveengine/store/CachedStoreFactory.java    |  102 -
 .../resolveengine/store/DefaultBinaryStore.java    |  147 -
 .../AbstractModuleDescriptorBackedMetaData.java    |  233 -
 .../BuildableModuleVersionPublishMetaData.java     |   27 -
 .../metadata/ComponentArtifactIdentifier.java      |   34 -
 .../metadata/ComponentArtifactMetaData.java        |   39 -
 .../artifacts/metadata/ComponentMetaData.java      |   85 -
 .../artifacts/metadata/ConfigurationMetaData.java  |   41 -
 .../metadata/DefaultDependencyMetaData.java        |  122 -
 .../artifacts/metadata/DefaultIvyArtifactName.java |   97 -
 .../metadata/DefaultLocalArtifactIdentifier.java   |   69 -
 .../metadata/DefaultLocalComponentMetaData.java    |  157 -
 .../DefaultModuleVersionArtifactIdentifier.java    |   79 -
 .../DefaultModuleVersionArtifactMetaData.java      |   63 -
 .../DefaultModuleVersionPublishMetaData.java       |   84 -
 .../artifacts/metadata/DependencyMetaData.java     |   65 -
 .../artifacts/metadata/IvyArtifactName.java        |   37 -
 .../artifacts/metadata/LocalArtifactMetaData.java  |   23 -
 .../artifacts/metadata/LocalComponentMetaData.java |   40 -
 .../metadata/ModuleDescriptorAdapter.java          |  112 -
 .../metadata/ModuleVersionArtifactIdentifier.java  |   29 -
 .../ModuleVersionArtifactIdentifierSerializer.java |   51 -
 .../metadata/ModuleVersionArtifactMetaData.java    |   38 -
 .../ModuleVersionArtifactPublishMetaData.java      |   35 -
 .../artifacts/metadata/ModuleVersionMetaData.java  |   41 -
 .../metadata/ModuleVersionPublishMetaData.java     |   28 -
 .../metadata/MutableLocalComponentMetaData.java    |   28 -
 .../metadata/MutableModuleVersionMetaData.java     |   34 -
 .../DefaultLocalMavenRepositoryLocator.java        |   74 -
 .../mvnsettings/DefaultMavenFileLocations.java     |   55 -
 .../mvnsettings/DefaultMavenSettingsProvider.java  |   40 -
 .../repositories/AbstractArtifactRepository.java   |   42 -
 .../AbstractAuthenticationSupportedRepository.java |   37 -
 .../repositories/DefaultBaseRepositoryFactory.java |  134 -
 .../DefaultFlatDirArtifactRepository.java          |   98 -
 .../repositories/DefaultIvyArtifactRepository.java |  201 -
 .../DefaultMavenArtifactRepository.java            |  123 -
 .../DefaultMavenLocalArtifactRepository.java       |   50 -
 .../repositories/LegacyDependencyResolver.java     |  294 --
 .../repositories/LegacyMavenResolver.java          |   61 -
 .../repositories/ResolutionAwareRepository.java    |   26 -
 .../DownloadingRepositoryArtifactCache.java        |   73 -
 .../LocalFileRepositoryArtifactCache.java          |   43 -
 .../cachemanager/RepositoryArtifactCache.java      |   45 -
 .../layout/GradleRepositoryLayout.java             |   42 -
 .../repositories/layout/MavenRepositoryLayout.java |   45 -
 .../layout/PatternRepositoryLayout.java            |   85 -
 .../repositories/layout/RepositoryLayout.java      |   47 -
 .../legacy/AbstractRepositoryCacheManager.java     |   85 -
 .../legacy/CustomIvyResolverRepositoryFactory.java |   41 -
 .../legacy/CustomResolverArtifactRepository.java   |   72 -
 .../legacy/DownloadingRepositoryCacheManager.java  |  161 -
 .../legacy/EnhancedArtifactDownloadReport.java     |   38 -
 .../legacy/FixedResolverArtifactRepository.java    |   60 -
 .../legacy/IvyDependencyResolverAdapter.java       |  202 -
 .../LegacyDependencyResolverRepositoryFactory.java |   24 -
 .../legacy/LegacyResolverParserSettings.java       |   98 -
 .../legacy/LocalFileRepositoryCacheManager.java    |   88 -
 .../repositories/resolver/AbstractVersionList.java |   37 -
 .../resolver/ChainedVersionLister.java             |   79 -
 .../resolver/ComponentMetadataDetailsAdapter.java  |   58 -
 .../repositories/resolver/DefaultVersionList.java  |   37 -
 .../resolver/ExternalResourceResolver.java         |  599 ---
 ...rnalResourceResolverDescriptorParseContext.java |   72 -
 .../repositories/resolver/IvyResolver.java         |   92 -
 .../repositories/resolver/IvyResourcePattern.java  |   84 -
 .../repositories/resolver/M2ResourcePattern.java   |   79 -
 .../repositories/resolver/MavenLocalResolver.java  |   57 -
 .../repositories/resolver/MavenMetadataLoader.java |   89 -
 .../repositories/resolver/MavenResolver.java       |  275 --
 .../repositories/resolver/MavenVersionLister.java  |   50 -
 .../resolver/PatternBasedResolver.java             |   31 -
 .../repositories/resolver/ResourcePattern.java     |   43 -
 .../resolver/ResourceVersionLister.java            |  165 -
 .../VerifyingExternalResourceDownloader.java       |   86 -
 .../repositories/resolver/VersionList.java         |   74 -
 .../repositories/resolver/VersionLister.java       |   26 -
 .../transport/ProgressLoggingTransferListener.java |   58 -
 .../transport/RepositoryTransport.java             |   29 -
 .../transport/RepositoryTransportFactory.java      |   56 -
 .../resolution/AbstractSoftwareArtifact.java       |   51 -
 .../resolution/AbstractSoftwareComponent.java      |   49 -
 .../resolution/ComponentMetaDataArtifact.java      |   21 -
 .../resolution/DefaultArtifactResolutionQuery.java |  156 -
 .../DefaultArtifactResolutionQueryFactory.java     |   46 -
 .../DefaultArtifactResolutionQueryResult.java      |   46 -
 .../artifacts/resolution/DefaultJvmLibrary.java    |   45 -
 .../DefaultJvmLibraryJavadocArtifact.java          |   31 -
 .../DefaultJvmLibrarySourcesArtifact.java          |   31 -
 .../DefaultUnresolvedSoftwareComponent.java        |   37 -
 .../resolution/IvyDescriptorArtifact.java          |   21 -
 .../artifacts/resolution/MavenPomArtifact.java     |   22 -
 .../result/DefaultUnresolvedDependencyResult.java  |   56 -
 .../externalresource/AbstractExternalResource.java |   68 -
 .../DefaultLocallyAvailableExternalResource.java   |   53 -
 .../externalresource/ExternalResource.java         |   88 -
 .../LocalFileStandInExternalResource.java          |   92 -
 .../LocallyAvailableExternalResource.java          |   27 -
 .../MetaDataOnlyExternalResource.java              |   73 -
 .../externalresource/MissingExternalResource.java  |   68 -
 .../externalresource/UrlExternalResource.java      |   65 -
 .../cached/ByUrlCachedExternalResourceIndex.java   |   28 -
 .../externalresource/cached/CachedArtifact.java    |   23 -
 .../cached/CachedArtifactIndex.java                |   63 -
 .../cached/CachedExternalResource.java             |   56 -
 .../cached/CachedExternalResourceAdapter.java      |   75 -
 .../cached/CachedExternalResourceIndex.java        |   71 -
 .../externalresource/cached/CachedItem.java        |   49 -
 .../cached/DefaultCachedArtifact.java              |   55 -
 .../cached/DefaultCachedExternalResource.java      |   72 -
 .../cached/DefaultCachedExternalResourceIndex.java |   51 -
 .../externalresource/ivy/AbstractCachedIndex.java  |  104 -
 .../ArtifactAtRepositoryCachedArtifactIndex.java   |   99 -
 .../ivy/ArtifactAtRepositoryKey.java               |   56 -
 .../AbstractLocallyAvailableResourceFinder.java    |   37 -
 .../CompositeLocallyAvailableResourceFinder.java   |   70 -
 .../LazyLocallyAvailableResourceCandidates.java    |   60 -
 .../local/LocallyAvailableResourceCandidates.java  |   31 -
 .../local/LocallyAvailableResourceFinder.java      |   32 -
 ...leResourceFinderSearchableFileStoreAdapter.java |   54 -
 .../ivy/LocallyAvailableResourceFinderFactory.java |  158 -
 ...PatternBasedLocallyAvailableResourceFinder.java |   63 -
 .../metadata/DefaultExternalResourceMetaData.java  |   70 -
 .../metadata/ExternalResourceMetaData.java         |   54 -
 .../metadata/ExternalResourceMetaDataCompare.java  |   66 -
 .../transfer/AbstractProgressLoggingHandler.java   |   41 -
 .../CacheAwareExternalResourceAccessor.java        |   29 -
 .../DefaultCacheAwareExternalResourceAccessor.java |  118 -
 .../transfer/ExternalResourceAccessor.java         |   75 -
 .../transfer/ExternalResourceLister.java           |   26 -
 .../transfer/ExternalResourceUploader.java         |   27 -
 .../ProgressLoggingExternalResourceAccessor.java   |  157 -
 .../ProgressLoggingExternalResourceUploader.java   |   81 -
 .../transfer/ResourceOperation.java                |   70 -
 .../DefaultExternalResourceRepository.java         |  125 -
 .../transport/ExternalResourceRepository.java      |   70 -
 .../transport/file/FileResourceConnector.java      |   99 -
 .../transport/file/FileTransport.java              |   79 -
 .../http/ApacheDirectoryListingParser.java         |  131 -
 .../transport/http/DefaultHttpSettings.java        |   35 -
 .../transport/http/HttpClientConfigurer.java       |  128 -
 .../transport/http/HttpClientHelper.java           |  129 -
 .../transport/http/HttpProxySettings.java          |   42 -
 .../transport/http/HttpRequestException.java       |   31 -
 .../transport/http/HttpResourceAccessor.java       |  108 -
 .../transport/http/HttpResourceLister.java         |   73 -
 .../transport/http/HttpResourceUploader.java       |   49 -
 .../transport/http/HttpResponseResource.java       |  141 -
 .../transport/http/HttpSettings.java               |   24 -
 .../transport/http/HttpTransport.java              |   81 -
 .../JavaSystemPropertiesHttpProxySettings.java     |  104 -
 .../http/RepeatableInputStreamEntity.java          |   60 -
 .../transport/http/ntlm/NTLMCredentials.java       |   92 -
 .../transport/http/ntlm/NTLMSchemeFactory.java     |   64 -
 .../filestore/ivy/ArtifactIdentifierFileStore.java |   44 -
 .../ClientModuleNotationParserFactory.java         |   41 -
 .../DependencyClassPathNotationParser.java         |   56 -
 .../notations/DependencyFilesNotationParser.java   |   44 -
 .../notations/DependencyMapNotationParser.java     |   53 -
 .../notations/DependencyNotationParser.java        |   55 -
 .../notations/DependencyProjectNotationParser.java |   43 -
 .../notations/DependencyStringNotationParser.java  |   74 -
 .../notations/ProjectDependencyFactory.java        |   58 -
 .../DefaultDependencyManagementServicesTest.groovy |   92 -
 .../artifacts/DefaultResolvedArtifactTest.groovy   |   48 -
 .../artifacts/DefaultResolvedDependencySpec.groovy |   92 -
 .../artifacts/DefaultResolvedDependencyTest.java   |  215 -
 .../ModuleVersionSelectorSerializerTest.groovy     |   33 -
 ...vedConfigurationIdentifierSerializerTest.groovy |   37 -
 .../internal/artifacts/ResolverResultsSpec.groovy  |   52 -
 .../DefaultComponentIdentifierFactoryTest.groovy   |   53 -
 .../DefaultModuleComponentIdentifierTest.groovy    |   81 -
 .../DefaultModuleComponentSelectorTest.groovy      |  117 -
 .../DefaultProjectComponentIdentifierTest.groovy   |   58 -
 .../DefaultProjectComponentSelectorTest.groovy     |   91 -
 .../DefaultConfigurationContainerSpec.groovy       |  100 -
 .../DefaultConfigurationContainerTest.groovy       |  117 -
 .../configurations/DefaultConfigurationSpec.groovy |  320 --
 .../configurations/DefaultConfigurationTest.java   |  965 ----
 .../dsl/DefaultComponentMetadataHandlerTest.groovy |   42 -
 .../dsl/ModuleVersionSelectorParsersTest.groovy    |  152 -
 ...PublishArtifactNotationParserFactoryTest.groovy |  122 -
 .../artifacts/ivyservice/CacheLayoutTest.groovy    |   54 -
 ...cheLockingArtifactDependencyResolverTest.groovy |   45 -
 ...efaultBuildableArtifactResolveResultTest.groovy |   64 -
 ...ultBuildableArtifactSetResolveResultTest.groovy |   75 -
 ...faultBuildableComponentResolveResultTest.groovy |  109 -
 .../DefaultDependencyResolveDetailsSpec.groovy     |  152 -
 .../DefaultUnresolvedDependencySpec.groovy         |   35 -
 ...orHandlingArtifactDependencyResolverTest.groovy |  156 -
 .../artifacts/ivyservice/IvyUtilTest.groovy        |   32 -
 .../IvyXmlModuleDescriptorWriterTest.groovy        |  148 -
 .../ModuleVersionNotFoundExceptionTest.groovy      |   49 -
 .../ModuleVersionResolveExceptionTest.groovy       |   60 -
 .../SelfResolvingDependencyResolverTest.groovy     |  135 -
 ...ptyConfigsArtifactDependencyResolverSpec.groovy |   77 -
 ...ionForcingDependencyToModuleResolverSpec.groovy |  107 -
 .../clientmodule/ClientModuleResolverTest.groovy   |   95 -
 .../CachingModuleVersionRepositoryTest.groovy      |  101 -
 ...leModuleVersionMetaDataResolveResultTest.groovy |  174 -
 .../DependencyResolverIdentifierTest.groovy        |  123 -
 .../ErrorHandlingArtifactResolverTest.groovy       |   82 -
 ...ynamicResolveModuleVersionRepositoryTest.groovy |   69 -
 .../LazyDependencyToModuleResolverTest.groovy      |  244 -
 .../RepositoryChainDependencyResolverTest.groovy   |  639 ---
 .../memcache/CachedModuleVersionResultTest.groovy  |   99 -
 .../memcache/CachedRepositoryTest.groovy           |  178 -
 .../memcache/DependencyMetadataCacheTest.groovy    |  225 -
 .../InMemoryDependencyMetadataCacheTest.groovy     |   76 -
 ...tractGradlePomModuleDescriptorParserTest.groovy |   76 -
 .../ivyresolve/parser/AbstractPomReaderTest.groovy |   71 -
 ...onnectedIvyXmlModuleDescriptorParserTest.groovy |   80 -
 ...adlePomModuleDescriptorParserProfileTest.groovy |  827 ----
 .../GradlePomModuleDescriptorParserTest.groovy     | 2087 --------
 .../parser/IvyXmlModuleDescriptorParserTest.groovy |  761 ---
 .../ivyresolve/parser/PomReaderProfileTest.groovy  | 1566 ------
 .../ivyresolve/parser/PomReaderTest.groovy         |  818 ----
 .../strategy/ChainVersionMatcherTest.groovy        |  129 -
 .../strategy/ExactVersionMatcherTest.groovy        |  181 -
 .../strategy/LatestVersionMatcherTest.groovy       |   83 -
 .../strategy/LatestVersionStrategyTest.groovy      |   78 -
 .../strategy/SubVersionMatcherTest.groovy          |   84 -
 .../strategy/VersionRangeMatcherTest.groovy        |  208 -
 .../modulecache/ModuleDescriptorStoreTest.groovy   |   83 -
 ...ltConfigurationsToArtifactsConverterTest.groovy |  103 -
 ...figurationsToModuleDescriptorConverterTest.java |   91 -
 .../DefaultModuleDescriptorFactoryTest.groovy      |   40 -
 .../PublishLocalComponentFactoryTest.groovy        |   56 -
 .../ResolveLocalComponentFactoryTest.groovy        |   91 -
 ...actDependencyDescriptorFactoryInternalTest.java |  135 -
 ...ntModuleIvyDependencyDescriptorFactoryTest.java |   89 -
 .../DefaultClientModuleMetaDataFactoryTest.java    |   89 -
 ...ependenciesToModuleDescriptorConverterTest.java |  129 -
 .../DefaultDependencyDescriptorFactoryTest.groovy  |   61 -
 ...ernalModuleDependencyDescriptorFactoryTest.java |   65 -
 .../ProjectDependencyDescriptorFactoryTest.groovy  |   63 -
 .../ProjectDependencyResolverTest.groovy           |   75 -
 .../DefaultCachePolicySpec.groovy                  |  276 --
 .../DefaultResolutionStrategySpec.groovy           |  193 -
 .../ModuleForcingResolveRuleSpec.groovy            |   89 -
 .../DependencyGraphBuilderTest.groovy              |  957 ----
 .../resolveengine/ModuleVersionSpecTest.groovy     |  368 --
 .../VersionSelectionReasonResolverTest.groovy      |   43 -
 .../CachingDependencyResultFactoryTest.groovy      |   76 -
 .../ComponentIdentifierSerializerTest.groovy       |   60 -
 .../ComponentSelectionReasonSerializerTest.groovy  |   54 -
 .../result/ComponentSelectorSerializerTest.groovy  |   60 -
 .../DefaultResolutionResultBuilderSpec.groovy      |  284 --
 .../resolveengine/result/DummyBinaryStore.groovy   |   48 -
 .../InternalDependencyResultSerializerTest.groovy  |   80 -
 .../ModuleVersionSelectionSerializerTest.groovy    |   40 -
 .../StreamingResolutionResultBuilderTest.groovy    |  139 -
 .../result/VersionSelectionReasonsTest.groovy      |   41 -
 .../metadata/DefaultDependencyMetaDataTest.groovy  |  162 -
 .../metadata/DefaultIvyArtifactNameTest.groovy     |   53 -
 .../DefaultLocalArtifactIdentifierTest.groovy      |   67 -
 .../DefaultLocalComponentMetaDataTest.groovy       |  146 -
 ...faultModuleVersionArtifactIdentifierTest.groovy |   67 -
 ...DefaultModuleVersionArtifactMetaDataTest.groovy |   71 -
 .../DefaultModuleVersionPublishMetaDataTest.groovy |   42 -
 .../metadata/ModuleDescriptorAdapterTest.groovy    |  296 --
 .../DefaultLocalMavenRepositoryLocatorTest.groovy  |  148 -
 .../DefaultBaseRepositoryFactoryTest.groovy        |  162 -
 .../DefaultFlatDirArtifactRepositoryTest.groovy    |   82 -
 .../DefaultIvyArtifactRepositoryTest.groovy        |  320 --
 .../DefaultMavenArtifactRepositoryTest.groovy      |  150 -
 .../DefaultMavenLocalRepositoryTest.groovy         |   69 -
 .../DownloadingRepositoryCacheManagerTest.groovy   |   67 -
 .../resolver/ChainedVersionListerTest.groovy       |  125 -
 .../resolver/ExternalResourceResolverTest.groovy   |  122 -
 .../resolver/IvyResourcePatternTest.groovy         |   50 -
 .../resolver/M2ResourcePatternTest.groovy          |   84 -
 .../repositories/resolver/MavenResolverTest.groovy |   53 -
 .../resolver/MavenVersionListerTest.groovy         |  195 -
 .../resolver/ResourceVersionListerTest.groovy      |  199 -
 .../ProgressLoggingTransferListenerTest.groovy     |   78 -
 .../result/DefaultResolutionResultTest.groovy      |  113 -
 .../DefaultResolvedModuleVersionResultSpec.groovy  |   63 -
 .../CachedExternalResourceAdapterTest.groovy       |   78 -
 .../DefaultArtifactResolutionCacheTest.groovy      |   84 -
 ...ifactAtRepositoryCachedArtifactIndexTest.groovy |  128 -
 ...positeLocallyAvailableResourceFinderTest.groovy |   75 -
 ...zyLocallyAvailableResourceCandidatesTest.groovy |   57 -
 .../DefaultExternalResourceMetaDataTest.groovy     |   33 -
 .../ExternalResourceMetaDataCompareTest.groovy     |  172 -
 ...ltCacheAwareExternalResourceAccessorTest.groovy |   63 -
 ...gressLoggingExternalResourceAccessorTest.groovy |  111 -
 ...gressLoggingExternalResourceUploaderTest.groovy |   67 -
 .../transfer/ResourceOperationTest.groovy          |   95 -
 .../http/ApacheDirectoryListingParserTest.groovy   |  169 -
 .../transport/http/HttpClientConfigurerTest.groovy |  101 -
 .../transport/http/HttpClientHelperTest.groovy     |   62 -
 .../transport/http/HttpResourceListerTest.groovy   |   45 -
 .../transport/http/HttpResponseResourceTest.groovy |   72 -
 ...avaSystemPropertiesHttpProxySettingsTest.groovy |   88 -
 .../transport/http/ntlm/NTLMCredentialsTest.groovy |   96 -
 .../DependencyClassPathNotationParserTest.groovy   |   55 -
 .../DependencyMapNotationParserTest.groovy         |  137 -
 .../notations/DependencyNotationParserTest.groovy  |   54 -
 .../DependencyStringNotationParserTest.groovy      |  171 -
 .../notations/ProjectDependencyFactoryTest.groovy  |   64 -
 .../ivyservice/ivyresolve/parser/test-full.xml     |  106 -
 .../result/ResolutionResultDataBuilder.groovy      |   48 -
 subprojects/core/core.gradle                       |   42 +-
 .../DeprecationHandlingIntegrationTest.groovy      |    9 -
 .../org/gradle/api/ApplyPluginIntegSpec.groovy     |   18 +-
 .../api/BuildScriptExecutionIntegrationSpec.groovy |   40 +
 .../api/BuildScriptExecutionIntegrationTest.groovy |   91 +
 .../ConfigurationOnDemandIntegrationTest.groovy    |  175 +-
 ...rredConfigurableExtensionIntegrationTest.groovy |    2 +-
 .../ExternalScriptExecutionIntegrationSpec.groovy  |   72 +
 .../ExternalScriptExecutionIntegrationTest.groovy  |  196 +
 .../gradle/api/FinalizerTaskIntegrationTest.groovy |   11 +-
 .../api/InitScriptExecutionIntegrationTest.groovy  |  158 +
 .../PluginApplicationErrorIntegrationTest.groovy   |   83 +
 .../SettingsScriptExecutionIntegrationTest.groovy  |   78 +
 .../api/dsl/ConcurrentClassDecorationSpec.groovy   |    2 +-
 .../api/dsl/DynamicObjectIntegrationTest.groovy    |   14 +-
 .../api/dsl/PluginDetectionIntegrationTest.groovy  |  229 +
 .../api/file/FileResolutionIntegrationTest.groovy  |   56 +
 .../ClassLoadersCachingIntegrationTest.groovy      |  559 +++
 .../resource/TextResourceIntegrationTest.groovy    |   91 +
 .../gradle/api/tasks/ArchiveIntegrationTest.groovy |    5 +-
 .../api/tasks/CopyErrorIntegrationTest.groovy      |   24 +
 .../tasks/CopyPermissionsIntegrationTest.groovy    |    4 +
 .../api/tasks/CopyTaskIntegrationSpec.groovy       |   36 +-
 .../api/tasks/CopyTaskIntegrationTest.groovy       |  223 +-
 ...tionTimeTaskConfigurationIntegrationTest.groovy |  192 +-
 .../FailingIncrementalTasksIntegrationTest.groovy  |   47 +
 .../tasks/IncrementalBuildIntegrationTest.groovy   |  376 ++
 .../tasks/IncrementalTaskIntegrationTest.groovy    |   47 -
 .../tasks/IncrementalTasksIntegrationTest.groovy   |  343 ++
 ...kCommandLineConfigurationIntegrationSpec.groovy |    1 -
 .../TaskInputPropertiesIntegrationTest.groovy      |   60 +
 .../api/tasks/TaskRemovalIntegrationTest.groovy    |   44 +-
 .../api/tasks/TaskSelectionIntegrationTest.groovy  |  117 +
 .../RuleBasedTaskExecutionIntegrationTest.groovy   |  234 +
 .../scripts/StatementLabelsIntegrationTest.groovy  |   46 +-
 ...tiveBuildScriptEvaluationIntegrationTest.groovy |   49 +
 .../plugin/PluginHandlerScriptIntegTest.groovy     |  554 ---
 .../ScriptPluginClassLoadingIntegrationTest.groovy |  226 +-
 .../BintrayPluginResolutionIntegTest.groovy        |  115 -
 .../internal/PathLimitationIntegTest.groovy        |   19 +-
 .../internal/WorkerProcessIntegrationTest.java     |   13 +-
 .../ProjectBuilderIntegrationTest.groovy           |    2 +-
 .../shared/build.gradle                            |   53 +
 .../buildSrc/src/main/java/DirTransformerTask.java |    0
 .../buildSrc/src/main/java/GeneratorTask.java      |    0
 .../buildSrc/src/main/java/TransformerTask.java    |    0
 .../groovy/org/gradle/BuildExceptionReporter.java  |   37 +-
 .../src/main/groovy/org/gradle/BuildLogger.java    |    2 +-
 .../src/main/groovy/org/gradle/BuildResult.java    |    2 +-
 .../src/main/groovy/org/gradle/CacheUsage.java     |   36 -
 .../src/main/groovy/org/gradle/GradleLauncher.java |  187 -
 .../src/main/groovy/org/gradle/RefreshOptions.java |   85 -
 .../src/main/groovy/org/gradle/StartParameter.java |  258 +-
 .../groovy/org/gradle/TaskExecutionLogger.java     |    2 +-
 .../groovy/org/gradle/TaskExecutionRequest.java    |   44 +
 .../src/main/groovy/org/gradle/api/AntBuilder.java |   14 +
 .../org/gradle/api/BuildCancelledException.java    |   37 +
 .../org/gradle/api/BuildableModelElement.java      |   43 +
 .../main/groovy/org/gradle/api/DefaultTask.java    |    2 +
 .../IllegalOperationAtExecutionTimeException.java  |   29 -
 .../gradle/api/NamedDomainObjectCollection.java    |    2 +
 .../api/PolymorphicDomainObjectContainer.java      |   12 +
 .../src/main/groovy/org/gradle/api/Project.java    |  257 +-
 .../src/main/groovy/org/gradle/api/Script.java     |   44 +-
 .../core/src/main/groovy/org/gradle/api/Task.java  |   41 +-
 .../api/artifacts/ArtifactRepositoryContainer.java |  167 +-
 .../org/gradle/api/artifacts/ClientModule.java     |    2 +-
 .../gradle/api/artifacts/ComponentMetadata.java    |   60 +
 .../api/artifacts/ComponentMetadataDetails.java    |   33 +-
 .../api/artifacts/ComponentModuleMetadata.java     |   40 +
 .../artifacts/ComponentModuleMetadataDetails.java  |   41 +
 .../gradle/api/artifacts/ComponentSelection.java   |   43 +
 .../api/artifacts/ComponentSelectionRules.java     |  143 +
 .../org/gradle/api/artifacts/Configuration.java    |    4 +-
 .../api/artifacts/ConfigurationContainer.java      |   25 -
 .../api/artifacts/DependencyResolveDetails.java    |    2 +-
 .../api/artifacts/DependencySubstitution.java      |   52 +
 .../api/artifacts/DependencySubstitutions.java     |  167 +
 .../org/gradle/api/artifacts/ExcludeRule.java      |   15 -
 .../artifacts/ModuleDependencySubstitution.java    |   42 +
 .../artifacts/ProjectDependencySubstitution.java   |   31 +
 .../org/gradle/api/artifacts/PublishException.java |    4 +
 .../gradle/api/artifacts/ResolutionStrategy.java   |   49 +-
 .../org/gradle/api/artifacts/ResolveException.java |    4 +-
 .../org/gradle/api/artifacts/ResolvedArtifact.java |    9 -
 .../gradle/api/artifacts/UnresolvedDependency.java |    9 -
 .../artifacts/dsl/ComponentMetadataHandler.java    |   94 +-
 .../dsl/ComponentModuleMetadataHandler.java        |   60 +
 .../api/artifacts/dsl/DependencyHandler.java       |   38 +-
 .../api/artifacts/dsl/RepositoryHandler.java       |   90 +-
 .../org/gradle/api/artifacts/ivy/IvyExtraInfo.java |   60 +
 .../api/artifacts/ivy/IvyModuleDescriptor.java     |   52 +
 .../org/gradle/api/artifacts/ivy/package-info.java |   20 +
 .../artifacts/query/ArtifactResolutionQuery.java   |   75 +
 .../gradle/api/artifacts/query/package-info.java   |   20 +
 .../repositories/AuthenticationSupported.java      |   63 +-
 .../repositories/IvyArtifactRepository.java        |   62 +-
 .../repositories/IvyPatternRepositoryLayout.java   |   55 +
 .../repositories/MavenArtifactRepository.java      |    2 +
 .../repositories/PasswordCredentials.java          |    5 +-
 .../artifacts/repositories/RepositoryLayout.java   |   25 +
 .../resolution/ArtifactResolutionQuery.java        |   32 -
 .../resolution/ArtifactResolutionQueryResult.java  |   32 -
 .../api/artifacts/resolution/JvmLibrary.java       |   31 -
 .../artifacts/resolution/JvmLibraryArtifact.java   |   27 -
 .../resolution/JvmLibraryJavadocArtifact.java      |   27 -
 .../resolution/JvmLibrarySourcesArtifact.java      |   27 -
 .../api/artifacts/resolution/SoftwareArtifact.java |   45 -
 .../artifacts/resolution/SoftwareComponent.java    |   32 -
 .../resolution/UnresolvedSoftwareComponent.java    |   41 -
 .../api/artifacts/resolution/package-info.java     |   20 -
 .../artifacts/result/ArtifactResolutionResult.java |   50 +
 .../api/artifacts/result/ArtifactResult.java       |   29 +
 .../artifacts/result/ComponentArtifactsResult.java |   44 +
 .../api/artifacts/result/ComponentResult.java      |   32 +
 .../artifacts/result/ComponentSelectionReason.java |    7 +-
 .../artifacts/result/ResolvedArtifactResult.java   |   33 +
 .../artifacts/result/ResolvedComponentResult.java  |    1 +
 .../artifacts/result/UnresolvedArtifactResult.java |   31 +
 .../result/UnresolvedComponentResult.java          |   31 +
 .../groovy/org/gradle/api/component/Artifact.java  |   27 +
 .../groovy/org/gradle/api/component/Component.java |   27 +
 .../org/gradle/api/credentials/AwsCredentials.java |   47 +
 .../org/gradle/api/credentials/Credentials.java    |   29 +
 .../org/gradle/api/credentials/package-info.java   |   24 +
 .../main/groovy/org/gradle/api/file/CopySpec.java  |   46 +-
 .../org/gradle/api/file/FileCopyDetails.java       |   37 +-
 .../org/gradle/api/initialization/Settings.java    |    2 +-
 .../internal/AbstractBuildableModelElement.java    |   58 +
 .../api/internal/AbstractClassGenerator.java       |  379 +-
 .../gradle/api/internal/AbstractDynamicObject.java |    2 +-
 .../AbstractPolymorphicDomainObjectContainer.java  |   18 +-
 .../org/gradle/api/internal/AbstractTask.java      |  270 +-
 .../api/internal/AsmBackedClassGenerator.java      |  529 +-
 .../org/gradle/api/internal/BeanDynamicObject.java |   33 +-
 .../gradle/api/internal/ClosureBackedAction.java   |   99 -
 .../api/internal/CompositeDomainObjectSet.java     |   57 +-
 .../api/internal/CompositeDynamicObject.java       |    7 +-
 .../org/gradle/api/internal/ConfigureDelegate.java |   23 +-
 .../api/internal/DefaultClassPathProvider.java     |    3 +
 .../internal/DefaultDomainObjectCollection.java    |   14 +-
 .../DefaultNamedDomainObjectCollection.java        |  170 +-
 .../api/internal/DefaultNamedDomainObjectList.java |   17 +-
 .../api/internal/DefaultNamedDomainObjectSet.java  |    4 +-
 .../DefaultPolymorphicDomainObjectContainer.java   |   41 +-
 .../api/internal/DelegatingDomainObjectSet.java    |   11 +-
 .../api/internal/DependencyClassPathProvider.java  |   16 +-
 .../internal/DependencyInjectingInstantiator.java  |   98 +-
 .../gradle/api/internal/DocumentationRegistry.java |    4 +
 .../internal/DynamicModulesClassPathProvider.java  |   16 +-
 .../api/internal/ExtensibleDynamicObject.java      |   12 +-
 .../org/gradle/api/internal/GradleInternal.java    |    2 +-
 .../PolymorphicDomainObjectContainerInternal.java  |   29 +
 .../org/gradle/api/internal/ProcessOperations.java |   10 +-
 .../ReflectiveNamedDomainObjectFactory.java        |    2 +-
 .../org/gradle/api/internal/SettingsInternal.java  |   13 +-
 .../org/gradle/api/internal/TaskInternal.java      |   14 +-
 .../api/internal/ThreadGlobalInstantiator.java     |    2 +-
 .../TypedDomainObjectContainerWrapper.java         |  221 +
 .../internal/artifacts/BaseRepositoryFactory.java  |   14 +-
 .../DefaultArtifactRepositoryContainer.java        |  119 +-
 .../api/internal/artifacts/DefaultExcludeRule.java |   12 -
 .../artifacts/DefaultExcludeRuleContainer.java     |    8 +-
 .../artifacts/DependencyResolutionServices.java    |    5 +-
 .../DependencyResolveDetailsInternal.java          |    3 +
 .../artifacts/DependencySubstitutionInternal.java  |   35 +
 .../artifacts/ExcludeRuleNotationConverter.java    |   49 +
 .../artifacts/ExcludeRuleNotationParser.java       |   44 -
 .../ModuleDependencySubstitutionInternal.java      |   25 +
 .../ProjectDependencySubstitutionInternal.java     |   23 +
 .../configurations/ConfigurationInternal.java      |   27 -
 .../configurations/ResolutionStrategyInternal.java |   56 -
 .../configurations/dynamicversion/CachePolicy.java |    8 +-
 .../dependencies/AbstractExternalDependency.java   |   42 -
 .../AbstractExternalModuleDependency.java          |   86 +
 .../dependencies/DefaultClientModule.java          |   71 +-
 .../DefaultExternalModuleDependency.java           |   62 +-
 .../artifacts/dsl/DefaultRepositoryHandler.java    |   42 +-
 .../ArtifactResolutionQueryFactory.java            |   22 -
 .../dsl/dependencies/DefaultDependencyHandler.java |   22 +-
 ...elegate.groovy => ModuleFactoryDelegate.groovy} |    0
 .../query/ArtifactResolutionQueryFactory.java      |   22 +
 .../repositories/ArtifactRepositoryInternal.java   |    6 -
 .../org/gradle/api/internal/cache/BinaryStore.java |    4 +-
 .../org/gradle/api/internal/cache/Cache.java       |    2 +-
 .../api/internal/cache/CacheAccessSerializer.java  |    2 +-
 .../gradle/api/internal/cache/CacheSupport.java    |    2 +-
 .../org/gradle/api/internal/cache/Loader.java      |   26 +
 .../api/internal/cache/MinimalPersistentCache.java |   88 +
 .../cache/SingleOperationPersistentStore.java      |   88 +
 .../org/gradle/api/internal/cache/Stash.java       |   26 +
 .../changes/ChangesOnlyIncrementalTaskInputs.java  |    4 +-
 .../DefaultTaskArtifactStateRepository.java        |    4 +-
 .../changes/IncrementalTaskInputsInternal.java     |   24 +
 .../changes/RebuildIncrementalTaskInputs.java      |    4 +-
 .../ShortCircuitTaskArtifactStateRepository.java   |    3 +-
 .../changes/StatefulIncrementalTaskInputs.java     |   13 +-
 .../rules/InputFilesStateChangeRule.java           |    7 +-
 .../changedetection/rules/TaskUpToDateState.java   |   29 +-
 .../state/CacheBackedFileSnapshotRepository.java   |    2 +-
 .../state/CacheBackedTaskHistoryRepository.java    |   17 +-
 .../state/CachingFileSnapshotter.java              |   11 +-
 .../state/DefaultFileCollectionSnapshotter.java    |   73 +-
 .../state/DefaultFileSnapshotterSerializer.java    |   18 +-
 .../state/DefaultTaskArtifactStateCacheAccess.java |    6 +-
 .../state/FileCollectionSnapshot.java              |    2 +
 .../state/FileCollectionSnapshotter.java           |    2 +-
 .../changedetection/state/FileSnapshot.java        |   21 +
 .../changedetection/state/FileSnapshotter.java     |   10 -
 .../changedetection/state/FilesSnapshotSet.java    |   37 +
 .../state/InputPropertiesSerializer.java           |   45 +
 .../state/OutputFilesCollectionSnapshotter.java    |   10 +-
 .../state/OutputFilesSnapshotSerializer.java       |    6 +-
 .../internal/classpath/DefaultModuleRegistry.java  |   23 +-
 .../internal/coerce/PropertySetTransformer.java    |   25 +
 .../internal/coerce/StringToEnumTransformer.java   |   86 +
 .../TypeCoercingMethodArgumentsTransformer.java    |   91 -
 .../api/internal/collections/CollectionFilter.java |    5 +
 .../api/internal/component/ArtifactType.java       |   26 +
 .../internal/component/BuildableJavaComponent.java |   36 +
 .../api/internal/component/ComponentRegistry.java  |   32 +
 .../component/ComponentTypeRegistration.java       |   25 +
 .../internal/component/ComponentTypeRegistry.java  |   25 +
 .../component/DefaultComponentTypeRegistry.java    |   69 +
 .../api/internal/file/AbstractFileResolver.java    |   23 +-
 .../api/internal/file/AbstractFileTreeElement.java |    4 +-
 .../api/internal/file/BaseDirFileResolver.java     |    2 +-
 .../api/internal/file/BasicFileResolver.java       |   63 +
 .../api/internal/file/DefaultFileLookup.java       |    2 +-
 .../api/internal/file/DefaultFileOperations.java   |   57 +-
 .../api/internal/file/DefaultFileTreeElement.java  |   12 +-
 .../api/internal/file/DefaultFileVisitDetails.java |    4 +-
 .../org/gradle/api/internal/file/FileLookup.java   |    2 +-
 .../gradle/api/internal/file/FileOperations.java   |   12 +-
 .../internal/file/FileOrUriNotationConverter.java  |  120 +
 .../api/internal/file/FileOrUriNotationParser.java |  111 -
 .../api/internal/file/IdentityFileResolver.java    |    4 +-
 .../org/gradle/api/internal/file/RelativeFile.java |   12 +
 .../api/internal/file/TemporaryFileProvider.java   |    2 +-
 .../internal/file/TmpDirTemporaryFileProvider.java |    2 +-
 .../api/internal/file/archive/TarFileTree.java     |   12 +-
 .../api/internal/file/archive/ZipFileTree.java     |   10 +-
 .../file/collections/DelegatingFileTree.java       |   53 +
 .../file/collections/DirectoryFileTree.java        |    4 +-
 .../collections/LazilyInitializedFileTree.java     |   35 +
 .../api/internal/file/collections/MapFileTree.java |   31 +-
 .../collections/SingleIncludePatternFileTree.java  |    8 +-
 .../file/collections/SingletonFileTree.java        |    4 +-
 .../api/internal/file/copy/CopyActionExecuter.java |    2 +-
 .../internal/file/copy/CopyFileVisitorImpl.java    |   12 +-
 .../api/internal/file/copy/CopySpecActionImpl.java |   10 +-
 .../CopySpecBackedCopyActionProcessingStream.java  |    2 +-
 .../api/internal/file/copy/CopySpecInternal.java   |   23 +-
 .../api/internal/file/copy/CopySpecResolver.java   |   54 +
 .../api/internal/file/copy/DefaultCopySpec.java    |  363 +-
 .../internal/file/copy/DefaultFileCopyDetails.java |   39 +-
 .../file/copy/DelegatingCopySpecInternal.java      |   34 +-
 .../file/copy/DestinationRootCopySpec.java         |    1 +
 .../gradle/api/internal/file/copy/LineFilter.java  |    2 +-
 .../api/internal/file/copy/MatchingCopyAction.java |    2 +-
 .../file/copy/NormalizingCopyActionDecorator.java  |   14 +-
 .../internal/file/copy/PathNotationConverter.java  |   74 +
 .../api/internal/file/copy/PathNotationParser.java |   63 -
 .../internal/file/copy/RelativizedCopySpec.java    |   51 -
 .../internal/file/copy/SingleParentCopySpec.java   |   63 +
 .../filestore/GroupedAndNamedUniqueFileStore.java  |   83 -
 .../api/internal/filestore/PathKeyFileStore.java   |  202 -
 .../filestore/PathNormalisingKeyFileStore.java     |   66 -
 .../internal/filestore/UniquePathKeyFileStore.java |   52 -
 .../gradle/api/internal/html/SimpleHtmlWriter.java |   41 -
 .../initialization/BasicDomainObjectContext.java   |   25 +
 .../internal/initialization/ClassLoaderCache.java  |   27 -
 .../internal/initialization/ClassLoaderIds.java    |   80 +
 .../internal/initialization/ClassLoaderScope.java  |   64 +-
 .../initialization/ClassLoaderScopeIdentifier.java |  118 +
 .../initialization/DefaultClassLoaderCache.java    |  102 -
 .../initialization/DefaultClassLoaderScope.java    |  176 +-
 .../DefaultScriptHandlerFactory.java               |    5 -
 .../initialization/RootClassLoaderScope.java       |   45 +-
 .../ScriptHandlerClassLoaderFactory.java           |    2 +-
 .../loadercache/ClassLoaderCache.java              |   31 +
 .../initialization/loadercache/ClassLoaderId.java  |   25 +
 .../loadercache/ClassPathSnapshot.java             |   25 +
 .../loadercache/ClassPathSnapshotter.java          |   26 +
 .../loadercache/DefaultClassLoaderCache.java       |  184 +
 .../loadercache/FileClassPathSnapshotter.java      |   50 +
 .../loadercache/HashClassPathSnapshotter.java      |  100 +
 .../api/internal/plugins/DefaultAppliedPlugin.java |   42 +
 .../api/internal/plugins/DefaultConvention.java    |    6 -
 .../plugins/DefaultObjectConfigurationAction.java  |   49 +-
 .../internal/plugins/DefaultPluginContainer.java   |  105 +-
 .../api/internal/plugins/DefaultPluginManager.java |  212 +
 .../internal/plugins/DefaultPluginRegistry.java    |  243 +-
 .../plugins/DefaultPotentialPluginWithId.java      |   67 +
 .../internal/plugins/EmbeddableJavaProject.java    |   31 -
 .../ExtraPropertiesDynamicObjectAdapter.java       |   25 +-
 .../plugins/ImperativeOnlyPluginApplicator.java    |   47 +
 .../plugins/PluginApplicationException.java        |   28 +
 .../api/internal/plugins/PluginApplicator.java     |   32 +
 .../api/internal/plugins/PluginAwareInternal.java  |   23 +
 .../api/internal/plugins/PluginDescriptor.java     |    4 +
 .../api/internal/plugins/PluginImplementation.java |   32 +
 .../api/internal/plugins/PluginInspector.java      |  156 +
 .../internal/plugins/PluginManagerInternal.java    |   71 +
 .../api/internal/plugins/PluginRegistry.java       |   26 +-
 .../api/internal/plugins/PotentialPlugin.java      |   43 +
 .../plugins/RuleBasedPluginApplicator.java         |   72 +
 .../api/internal/project/AbstractPluginAware.java  |   37 +-
 .../api/internal/project/AbstractProject.java      |  501 +-
 .../api/internal/project/DefaultAntBuilder.java    |   66 +-
 .../internal/project/DefaultAntBuilderFactory.java |    4 +-
 .../project/DefaultIsolatedAntBuilder.groovy       |  127 +-
 .../api/internal/project/DefaultProject.java       |    4 +-
 .../project/DefaultProjectAccessListener.java      |   11 +-
 .../internal/project/DefaultProjectTaskLister.java |   32 +
 .../project/DeferredProjectConfiguration.java      |   65 +
 .../api/internal/project/IProjectFactory.java      |    2 +-
 .../api/internal/project/IsolatedAntBuilder.java   |   10 -
 .../api/internal/project/ProjectFactory.java       |   16 +-
 .../api/internal/project/ProjectInternal.java      |   25 +-
 .../api/internal/project/ProjectTaskLister.java    |   30 +
 .../api/internal/project/ant/BasicAntBuilder.java  |    8 +-
 .../AnnotationProcessingTaskFactory.java           |   21 +-
 .../taskfactory/DependencyAutoWireTaskFactory.java |   10 +-
 .../internal/project/taskfactory/ITaskFactory.java |    3 +-
 .../InputDirectoryPropertyAnnotationHandler.java   |    4 +-
 .../InputFilePropertyAnnotationHandler.java        |    4 +-
 .../InputFilesPropertyAnnotationHandler.java       |    4 +-
 .../InputPropertyAnnotationHandler.java            |    4 +-
 .../NestedBeanPropertyAnnotationHandler.java       |    4 +-
 .../OutputDirectoryPropertyAnnotationHandler.java  |    5 +-
 .../OutputFilePropertyAnnotationHandler.java       |    5 +-
 .../internal/project/taskfactory/TaskFactory.java  |   27 +-
 .../internal/project/taskfactory/UpdateAction.java |    4 +-
 .../api/internal/resource/CachingResource.java     |   45 -
 .../api/internal/resource/DelegatingResource.java  |   52 -
 .../org/gradle/api/internal/resource/Resource.java |   64 -
 .../api/internal/resource/ResourceException.java   |   31 -
 .../resource/ResourceNotFoundException.java        |   30 -
 .../api/internal/resource/StringResource.java      |   50 -
 .../gradle/api/internal/resource/UriResource.java  |  117 -
 .../resources/CharSourceBackedTextResource.java    |   87 +
 .../internal/resources/DefaultResourceHandler.java |   22 +-
 .../resources/DefaultTextResourceFactory.java      |   55 +
 .../FileCollectionBackedArchiveTextResource.java   |   52 +
 .../FileCollectionBackedTextResource.java          |   87 +
 .../resources/StringBackedTextResource.java        |   74 +
 .../api/internal/tasks/DefaultTaskCollection.java  |   17 +-
 .../api/internal/tasks/DefaultTaskContainer.java   |  165 +-
 .../tasks/DefaultTaskContainerFactory.java         |   50 +-
 .../api/internal/tasks/DefaultTaskDependency.java  |   22 +-
 .../api/internal/tasks/DefaultTaskInputs.java      |   93 +-
 .../api/internal/tasks/DefaultTaskOutputs.java     |   49 +-
 .../internal/tasks/PublicTaskSpecification.java    |   38 +
 .../api/internal/tasks/TaskContainerInternal.java  |   37 +-
 .../org/gradle/api/internal/tasks/TaskMutator.java |   95 +
 .../gradle/api/internal/tasks/TaskResolver.java    |    2 +-
 .../api/internal/tasks/TaskStateInternal.java      |    1 +
 .../api/internal/tasks/TaskStatusNagger.java       |  105 -
 .../tasks/options/OptionNotationParserFactory.java |   23 +-
 .../api/internal/xml/SimpleMarkupWriter.java       |  421 --
 .../gradle/api/internal/xml/SimpleXmlWriter.java   |   45 -
 .../gradle/api/internal/xml/XmlTransformer.java    |  359 --
 .../groovy/org/gradle/api/logging/LogLevel.java    |   92 +-
 .../groovy/org/gradle/api/logging/Logging.java     |  316 +-
 .../org/gradle/api/logging/LoggingManager.java     |    3 +
 .../org/gradle/api/logging/LoggingOutput.java      |    3 +
 .../org/gradle/api/plugins/AppliedPlugin.java      |   70 +
 .../groovy/org/gradle/api/plugins/Convention.java  |    2 +-
 .../org/gradle/api/plugins/ExtensionContainer.java |   11 -
 .../api/plugins/ExtraPropertiesExtension.java      |   11 +-
 .../gradle/api/plugins/InvalidPluginException.java |   33 +
 .../api/plugins/ObjectConfigurationAction.java     |   11 +
 .../groovy/org/gradle/api/plugins/PluginAware.java |   72 +-
 .../org/gradle/api/plugins/PluginContainer.java    |   18 +-
 .../org/gradle/api/plugins/PluginManager.java      |  111 +
 .../org/gradle/api/resources/ResourceHandler.java  |   13 +
 .../org/gradle/api/resources/TextResource.java     |   87 +
 .../gradle/api/resources/TextResourceFactory.java  |   88 +
 .../main/groovy/org/gradle/api/specs/Specs.java    |   92 -
 .../org/gradle/api/tasks/AbstractCopyTask.java     |   64 +-
 .../org/gradle/api/tasks/AbstractExecTask.java     |  279 ++
 .../org/gradle/api/tasks/ConventionValue.java      |    5 +-
 .../src/main/groovy/org/gradle/api/tasks/Copy.java |   16 +-
 .../groovy/org/gradle/api/tasks/Directory.groovy   |   42 -
 .../src/main/groovy/org/gradle/api/tasks/Exec.java |  248 +-
 .../groovy/org/gradle/api/tasks/GradleBuild.java   |  240 +-
 .../org/gradle/api/tasks/InputDirectory.java       |    3 +-
 .../main/groovy/org/gradle/api/tasks/JavaExec.java |    9 +-
 .../org/gradle/api/tasks/ParallelizableTask.java   |   73 +
 .../groovy/org/gradle/api/tasks/SourceTask.java    |   25 +-
 .../src/main/groovy/org/gradle/api/tasks/Sync.java |    7 +-
 .../groovy/org/gradle/api/tasks/TaskContainer.java |  109 +-
 .../groovy/org/gradle/api/tasks/TaskState.java     |    2 +-
 .../gradle/api/tasks/TaskValidationException.java  |    4 +-
 .../groovy/org/gradle/api/tasks/ant/AntTarget.java |   30 +-
 .../api/tasks/bundling/AbstractArchiveTask.java    |    2 +-
 .../org/gradle/api/tasks/bundling/Compression.java |   11 -
 .../tasks/incremental/IncrementalTaskInputs.java   |    3 +-
 .../org/gradle/api/tasks/util/PatternSet.java      |   28 +-
 .../cache/PersistentIndexedCacheParameters.java    |    8 +-
 .../groovy/org/gradle/cache/PersistentStore.java   |    4 +-
 .../org/gradle/cache/internal/CacheFactory.java    |    3 +-
 .../gradle/cache/internal/DefaultCacheAccess.java  |    9 +-
 .../gradle/cache/internal/DefaultCacheFactory.java |   24 +-
 .../cache/internal/DefaultCacheRepository.java     |    7 +-
 .../cache/internal/DefaultFileLockManager.java     |    3 +-
 .../internal/DefaultPersistentDirectoryCache.java  |    9 +-
 .../internal/DefaultPersistentDirectoryStore.java  |    2 +-
 .../internal/DefaultProcessMetaDataProvider.java   |    2 +-
 .../cache/internal/FileLockCommunicator.java       |    2 +-
 .../cache/internal/NonThreadsafeInMemoryStore.java |   74 +
 .../gradle/cache/internal/SimpleStateCache.java    |    6 +-
 .../btree/BTreePersistentIndexedCache.java         |    6 +-
 .../DefaultFileLockContentionHandler.java          |    7 +-
 .../configuration/DefaultBuildConfigurer.java      |   19 +-
 .../gradle/configuration/DefaultImportsReader.java |   63 +
 .../configuration/DefaultInitScriptProcessor.java  |   14 +-
 .../configuration/DefaultScriptPluginFactory.java  |  146 +-
 .../configuration/ImplicitTasksConfigurer.java     |   26 -
 .../org/gradle/configuration/ImportsReader.java    |   46 +-
 .../gradle/configuration/ImportsScriptSource.java  |   53 -
 .../gradle/configuration/ScriptPluginFactory.java  |    2 +-
 .../project/BuildScriptProcessor.java              |    3 +-
 .../project/LifecycleProjectEvaluator.java         |    2 +-
 .../project/PluginsProjectConfigureActions.java    |    7 +-
 .../project/ProjectDependencies2TaskResolver.java  |   41 -
 .../TaskModelRealizingConfigurationAction.java     |   31 -
 .../org/gradle/execution/DefaultBuildExecuter.java |    2 +
 .../DefaultTasksBuildExecutionAction.java          |   21 +-
 ...ludedTaskFilteringBuildConfigurationAction.java |   17 +-
 .../gradle/execution/MultipleBuildFailures.java    |    4 +-
 .../org/gradle/execution/ProjectConfigurer.java    |   31 +
 .../gradle/execution/ProjectEvaluatingAction.java  |   54 -
 .../execution/SelectedTaskExecutionAction.java     |   21 +
 .../org/gradle/execution/TaskNameResolver.java     |  191 +-
 .../TaskNameResolvingBuildConfigurationAction.java |   25 +-
 .../gradle/execution/TaskPathProjectEvaluator.java |   37 +-
 .../gradle/execution/TaskSelectionException.java   |    4 +-
 .../org/gradle/execution/TaskSelectionResult.java  |    4 +-
 .../groovy/org/gradle/execution/TaskSelector.java  |  104 +-
 .../commandline/CommandLineTaskParser.java         |   20 +-
 .../commandline/TaskConfigurationException.java    |    4 +-
 .../taskgraph/DefaultTaskExecutionPlan.java        |  349 +-
 .../taskgraph/DefaultTaskGraphExecuter.java        |   10 +-
 .../taskgraph/ParallelTaskPlanExecutor.java        |   21 +-
 .../taskgraph/TaskDependencyGraphEdge.groovy       |   36 -
 .../org/gradle/execution/taskgraph/TaskInfo.java   |    2 +-
 .../execution/taskpath/ResolvedTaskPath.java       |    9 +
 .../groovy/scripts/AbstractUriScriptSource.java    |   58 +
 .../gradle/groovy/scripts/CachingScriptSource.java |    4 +-
 .../org/gradle/groovy/scripts/DefaultScript.java   |   43 +-
 .../scripts/DefaultScriptCompilerFactory.java      |   32 +-
 .../groovy/scripts/DelegatingScriptSource.java     |    2 +-
 .../scripts/NonExistentFileScriptSource.java       |   64 +
 .../org/gradle/groovy/scripts/ScriptCompiler.java  |   20 +-
 .../org/gradle/groovy/scripts/ScriptRunner.java    |    5 +-
 .../org/gradle/groovy/scripts/ScriptSource.java    |    2 +-
 .../gradle/groovy/scripts/StringScriptSource.java  |    4 +-
 .../org/gradle/groovy/scripts/Transformer.java     |   28 -
 .../org/gradle/groovy/scripts/UriScriptSource.java |   48 +-
 .../gradle/groovy/scripts/internal/AstUtils.java   |   91 -
 .../scripts/internal/BuildScriptTransformer.java   |   40 +-
 .../internal/CachingScriptClassCompiler.java       |   66 +-
 .../internal/ClassCachingCompiledScript.java       |   42 +
 .../groovy/scripts/internal/CompileOperation.java  |   47 +
 .../groovy/scripts/internal/CompiledScript.java    |   26 +
 .../internal/DefaultScriptCompilationHandler.java  |  211 +-
 .../internal/DefaultScriptRunnerFactory.java       |   36 +-
 .../internal/FactoryBackedCompileOperation.java    |   56 +
 .../FileCacheBackedScriptClassCompiler.java        |   44 +-
 .../scripts/internal/FilteredTransformer.java      |   28 -
 .../internal/FilteringScriptTransformer.java       |   49 +
 .../internal/FilteringStatementTransformer.java    |   43 -
 .../scripts/internal/FixMainScriptTransformer.java |    4 -
 .../ImperativeStatementDetectingTransformer.java   |  334 ++
 .../internal/InitialPassStatementTransformer.java  |  103 +
 .../internal/PluginsAndBuildscriptTransformer.java |  127 -
 .../groovy/scripts/internal/ScriptBlock.java       |   37 -
 ...riptBlockToServiceConfigurationTransformer.java |   54 -
 .../scripts/internal/ScriptClassCompiler.java      |    8 +-
 .../scripts/internal/ScriptCompilationHandler.java |   13 +-
 .../scripts/internal/ScriptRunnerFactory.java      |    3 +-
 .../internal/ShortCircuitEmptyScriptCompiler.java  |   29 +-
 .../StatementExtractingScriptTransformer.java      |  145 -
 .../internal/StatementLabelsDeprecationLogger.java |   34 -
 .../internal/StatementLabelsScriptTransformer.java |   25 +-
 .../scripts/internal/StatementTransformer.java     |   30 -
 .../scripts/internal/SubsetScriptTransformer.java  |  109 +
 .../internal/TaskDefinitionScriptTransformer.java  |    4 -
 .../gradle/initialization/AbstractProjectSpec.java |   25 +-
 .../org/gradle/initialization/BaseSettings.java    |   94 +-
 .../org/gradle/initialization/BuildAction.java     |   31 -
 .../initialization/BuildCancellationToken.java     |   36 +
 .../initialization/BuildCompletionListener.java    |   24 +
 .../org/gradle/initialization/BuildController.java |   45 -
 .../gradle/initialization/BuildEventConsumer.java  |   25 +
 .../initialization/BuildFileProjectSpec.java       |   31 +-
 .../initialization/BuildLayoutParameters.java      |   25 +-
 .../org/gradle/initialization/BuildLoader.java     |    2 +-
 .../gradle/initialization/BuildRequestContext.java |   32 +
 .../gradle/initialization/ClassLoaderRegistry.java |    8 +-
 .../initialization/ClassLoaderScopeRegistry.java   |   27 +
 .../DefaultBuildCancellationToken.java             |   79 +
 .../initialization/DefaultBuildRequestContext.java |   51 +
 .../initialization/DefaultClassLoaderRegistry.java |   40 +-
 .../DefaultClassLoaderScopeRegistry.java           |   40 +
 .../DefaultCommandLineConverter.java               |   96 +-
 .../initialization/DefaultExceptionAnalyser.java   |    6 +-
 .../initialization/DefaultGradleLauncher.java      |   63 +-
 .../DefaultGradleLauncherFactory.java              |   80 +-
 .../gradle/initialization/DefaultProjectSpec.java  |   32 +-
 .../org/gradle/initialization/DefaultSettings.java |    6 +-
 .../initialization/DependencyResolutionLogger.java |    1 -
 .../FixedBuildCancellationToken.java               |   33 +
 .../org/gradle/initialization/GradleLauncher.java  |   66 +
 .../initialization/GradleLauncherFactory.java      |   17 +-
 .../initialization/InstantiatingBuildLoader.java   |   33 +-
 .../initialization/LayoutCommandLineConverter.java |   22 +-
 .../initialization/NoOpBuildEventConsumer.java     |   23 +
 .../ProjectDirectoryProjectSpec.java               |   29 +-
 .../initialization/ProjectPathProjectSpec.java     |   66 -
 .../ProjectPropertySettingBuildLoader.java         |   15 +-
 .../org/gradle/initialization/ProjectSpec.java     |   17 +-
 .../org/gradle/initialization/ProjectSpecs.java    |   17 +-
 .../PropertiesLoadingSettingsProcessor.java        |    4 +-
 .../ScriptEvaluatingSettingsProcessor.java         |   10 +-
 .../org/gradle/initialization/SettingsFactory.java |    4 +-
 .../org/gradle/initialization/SettingsHandler.java |   50 +-
 .../gradle/initialization/SettingsLocation.java    |    2 +-
 .../gradle/initialization/SettingsProcessor.java   |    2 +-
 .../StackTraceSanitizingExceptionAnalyser.java     |   32 +
 .../buildsrc/BuildSourceBuilder.java               |   20 +-
 .../buildsrc/BuildSrcBuildListenerFactory.java     |    5 +-
 .../buildsrc/BuildSrcUpdateFactory.java            |    2 +-
 .../gradle/initialization/layout/BuildLayout.java  |    2 +
 .../initialization/layout/BuildLayoutFactory.java  |   16 +-
 .../internal/DefaultTaskExecutionRequest.java      |   82 +
 .../AuthenticationSupportedInternal.java           |   31 +
 .../credentials/DefaultAwsCredentials.java         |   41 +
 .../exceptions/AbstractMultiCauseException.java    |  111 -
 .../exceptions/LocationAwareException.java         |   21 +-
 .../LoggingDeprecatedFeatureHandler.java           |    4 +-
 .../org/gradle/internal/html/SimpleHtmlWriter.java |   41 +
 .../gradle/internal/invocation/BuildAction.java    |   28 +
 .../internal/invocation/BuildActionRunner.java     |   27 +
 .../internal/invocation/BuildController.java       |   60 +
 .../operations/logging/BuildOperationLogInfo.java  |   47 +
 .../operations/logging/BuildOperationLogger.java   |   25 +
 .../logging/BuildOperationLoggerFactory.java       |   23 +
 .../logging/DefaultBuildOperationLogger.java       |   96 +
 .../DefaultBuildOperationLoggerFactory.java        |   73 +
 .../local/GroupedAndNamedUniqueFileStore.java      |   80 +
 .../internal/resource/local/PathKeyFileStore.java  |  198 +
 .../local/PathNormalisingKeyFileStore.java         |   63 +
 .../resource/local/UniquePathKeyFileStore.java     |   51 +
 .../scopes/BuildScopeServiceRegistryFactory.java   |    4 +-
 .../service/scopes/BuildScopeServices.java         |  132 +-
 .../service/scopes/GlobalScopeServices.java        |   87 +-
 .../service/scopes/GradleScopeServices.java        |   51 +-
 .../service/scopes/PluginServiceRegistry.java      |    6 +
 .../service/scopes/ProjectScopeServices.java       |   48 +-
 .../service/scopes/SettingsScopeServices.java      |   14 +-
 .../service/scopes/TaskExecutionServices.java      |   12 +-
 .../internal/service/scopes/TaskScopeServices.java |   10 +-
 .../CharSequenceNotationConverter.java             |   39 +
 .../typeconversion/CharSequenceNotationParser.java |   12 +-
 .../ClosureToSpecNotationConverter.java            |   40 +
 .../ClosureToSpecNotationParser.java               |   36 -
 .../typeconversion/CompositeNotationConverter.java |   43 +
 .../typeconversion/CompositeNotationParser.java    |    7 +-
 .../EnumFromCharSequenceNotationParser.java        |   12 +-
 .../ErrorHandlingNotationParser.java               |   44 +-
 .../typeconversion/FlatteningNotationParser.java   |    8 +-
 .../typeconversion/JustReturningConverter.java     |   39 +
 .../typeconversion/JustReturningParser.java        |   38 -
 .../typeconversion/MapNotationConverter.java       |  137 +
 .../internal/typeconversion/MapNotationParser.java |  131 -
 .../typeconversion/NotationConvertResult.java      |   26 +
 .../internal/typeconversion/NotationConverter.java |   38 +
 .../NotationConverterToNotationParserAdapter.java  |   55 +
 .../internal/typeconversion/NotationParser.java    |   10 +-
 .../typeconversion/NotationParserBuilder.java      |   97 +-
 .../TypeFilteringNotationConverter.java            |   40 +
 .../typeconversion/TypedNotationConverter.java     |   48 +
 .../typeconversion/TypedNotationParser.java        |   47 -
 .../UnsupportedNotationException.java              |   24 +
 .../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       |   85 +-
 .../org/gradle/listener/BroadcastDispatch.java     |  113 -
 .../gradle/listener/ContextClassLoaderProxy.java   |   42 -
 .../gradle/listener/DefaultListenerManager.java    |  184 -
 .../org/gradle/listener/LazyCreationProxy.java     |   55 -
 .../org/gradle/listener/ListenerBroadcast.java     |  115 +-
 .../org/gradle/listener/ListenerManager.java       |   83 +-
 .../listener/ListenerNotificationException.java    |   29 -
 .../groovy/org/gradle/logging/ConsoleOutput.java   |   39 +
 .../org/gradle/logging/LoggingConfiguration.java   |   17 +-
 .../org/gradle/logging/LoggingServiceRegistry.java |   57 +-
 .../AbstractLineChoppingStyledTextOutput.java      |    2 +-
 .../logging/internal/AbstractStyledTextOutput.java |    2 +-
 .../org/gradle/logging/internal/AnsiConsole.java   |   12 +-
 .../logging/internal/ConsoleConfigureAction.java   |   39 +-
 .../gradle/logging/internal/DefaultColorMap.java   |   14 +-
 .../logging/internal/DefaultLoggingManager.java    |   33 +-
 .../internal/DefaultStatusBarFormatter.java        |    2 +-
 .../internal/LoggingCommandLineConverter.java      |   31 +-
 .../logging/internal/LoggingOutputInternal.java    |   45 +-
 .../logging/internal/OutputEventRenderer.java      |  105 +-
 .../internal/ProgressLogEventGenerator.java        |    2 +-
 .../internal/logback/LogLevelConverter.java        |   70 -
 .../internal/logback/LogbackLoggingConfigurer.java |  138 -
 .../slf4j/OutputEventListenerBackedLogger.java     |  472 ++
 .../OutputEventListenerBackedLoggerContext.java    |  417 ++
 .../internal/slf4j/Slf4jLoggingConfigurer.java     |   51 +
 .../groovy/org/gradle/model/ModelFinalizer.java    |   30 -
 .../main/groovy/org/gradle/model/ModelPath.java    |   90 -
 .../main/groovy/org/gradle/model/ModelRule.java    |   40 -
 .../main/groovy/org/gradle/model/ModelRules.java   |   57 -
 .../collection/internal/BridgedCollections.java    |  213 +
 .../DomainObjectContainerModelProjection.java      |  137 +
 ...cTypesDomainObjectContainerModelProjection.java |   45 +
 ...icTypeDomainObjectContainerModelProjection.java |   64 +
 .../main/groovy/org/gradle/model/dsl/ModelDsl.java |   26 -
 .../gradle/model/dsl/internal/GroovyModelDsl.java  |   84 -
 .../org/gradle/model/internal/DefaultInputs.java   |   42 -
 .../model/internal/DefaultModelRegistry.java       |  253 -
 .../groovy/org/gradle/model/internal/Inputs.java   |   25 -
 .../model/internal/ModelCreationListener.java      |   25 -
 .../org/gradle/model/internal/ModelCreator.java    |   25 -
 .../org/gradle/model/internal/ModelMutation.java   |   39 -
 .../org/gradle/model/internal/ModelMutator.java    |   25 -
 .../org/gradle/model/internal/ModelRegistry.java   |   38 -
 .../internal/ModelRegistryBackedModelRules.java    |  129 -
 .../persist/AlwaysNewModelRegistryStore.java       |   36 +
 .../model/internal/persist/ModelRegistryStore.java |   26 +
 .../persist/ReusingModelRegistryStore.java         |   60 +
 .../model/internal/rules/ReflectiveRule.java       |  207 -
 .../groovy/org/gradle/plugin/PluginHandler.java    |   31 -
 .../plugin/internal/DefaultPluginHandler.java      |   48 -
 .../plugin/internal/InvalidPluginIdException.java  |   33 +
 .../internal/NonPluggableTargetPluginHandler.java  |   38 -
 .../org/gradle/plugin/internal/PluginId.java       |  124 +
 .../plugin/internal/PluginRequestApplicator.java   |   50 -
 .../internal/PluginResolutionApplicator.java       |   39 -
 .../plugin/internal/PluginResolverFactory.java     |   95 -
 .../gradle/plugin/internal/PluginResolvers.java    |   59 -
 .../internal/ClassPathPluginResolution.java        |   46 -
 .../resolve/internal/CompositePluginResolver.java  |   48 -
 .../resolve/internal/DefaultPluginRequest.java     |   78 -
 .../DependencyResolvingClasspathProvider.java      |   46 -
 .../internal/InvalidPluginRequestException.java    |   25 -
 .../resolve/internal/JCenterPluginMapper.java      |  113 -
 .../internal/JCenterRepositoryConfigurer.java      |   26 -
 .../internal/ModuleMappingPluginResolver.java      |   68 -
 .../NotInPluginRegistryPluginResolverCheck.java    |   61 -
 .../internal/PluginRegistryPluginResolver.java     |   56 -
 .../plugin/resolve/internal/PluginRequest.java     |   33 -
 .../resolve/internal/PluginRequestSerializer.java  |   34 -
 .../plugin/resolve/internal/PluginResolution.java  |   31 -
 .../plugin/resolve/internal/PluginResolver.java    |   33 -
 .../resolve/internal/SimplePluginResolution.java   |   34 -
 .../gradle/plugin/use/PluginDependenciesSpec.java  |  110 +
 .../gradle/plugin/use/PluginDependencySpec.java    |   52 +
 .../plugin/use/internal/DefaultPluginRequest.java  |  106 +
 .../plugin/use/internal/DefaultPluginRequests.java |   44 +
 .../internal/InvalidPluginRequestException.java    |   32 +
 .../gradle/plugin/use/internal/PluginRequest.java  |   34 +
 .../use/internal/PluginRequestApplicator.java      |   26 +
 .../use/internal/PluginRequestCollector.java       |  101 +
 .../gradle/plugin/use/internal/PluginRequests.java |   24 +
 .../use/internal/PluginRequestsSerializer.java     |   56 +
 .../PluginUseScriptBlockMetadataExtractor.java     |  164 +
 .../groovy/org/gradle/plugin/use/package-info.java |   20 +
 .../process/internal/DefaultExecActionFactory.java |   32 +
 .../gradle/process/internal/DefaultExecHandle.java |    4 +-
 .../internal/DefaultWorkerProcessFactory.java      |   21 +-
 .../gradle/process/internal/ExecActionFactory.java |    4 +
 .../org/gradle/process/internal/JvmOptions.java    |   20 +-
 .../process/internal/WorkerProcessBuilder.java     |    9 +
 .../internal/child/ActionExecutionWorker.java      |    9 +-
 ...nClassesInIsolatedClassLoaderWorkerFactory.java |   39 +-
 ...ionClassesInSystemClassLoaderWorkerFactory.java |   79 +-
 .../internal/child/BootstrapSecurityManager.java   |   11 +-
 .../child/ImplementationClassLoaderWorker.java     |   12 +-
 .../child/SystemApplicationClassLoaderWorker.java  |   22 +-
 .../process/internal/child/WorkerFactory.java      |    7 -
 .../child/WorkerProcessClassPathProvider.java      |   24 +-
 .../launcher/BootstrapClassLoaderWorker.java       |   48 -
 .../internal/launcher/GradleWorkerMain.java        |   47 +-
 .../launcher/IsolatedGradleWorkerMain.java         |   59 +
 .../groovy/org/gradle/profile/BuildProfile.java    |   22 +-
 .../org/gradle/profile/ProfileEventAdapter.java    |   12 +-
 .../org/gradle/profile/ProfileReportRenderer.java  |   19 +-
 .../org/gradle/reporting/CodePanelRenderer.java    |    2 +-
 .../org/gradle/reporting/HtmlPageBuilder.java      |   33 +
 .../org/gradle/reporting/HtmlReportBuilder.java    |   30 +
 .../org/gradle/reporting/HtmlReportRenderer.java   |  168 +-
 .../org/gradle/reporting/TabbedPageRenderer.java   |   58 +-
 .../groovy/org/gradle/reporting/TabsRenderer.java  |    2 +-
 .../org/gradle/reporting/TextReportRenderer.java   |   41 -
 .../internal/InMemoryCacheFactory.java             |   44 +-
 .../internal/InMemoryIndexedCache.java             |    6 +-
 .../testfixtures/internal/NoOpLoggingManager.java  |   19 +-
 .../testfixtures/internal/ProjectBuilderImpl.java  |   40 +-
 .../internal/TestBuildScopeServices.java           |    6 +
 .../internal/TestGlobalScopeServices.java          |    4 +-
 .../src/main/groovy/org/gradle/util/Clock.java     |    2 +-
 .../main/groovy/org/gradle/util/GFileUtils.java    |   23 +-
 .../main/groovy/org/gradle/util/GradleVersion.java |  334 --
 .../core/src/main/groovy/org/gradle/util/Jvm.java  |   93 -
 .../org/gradle/util/LineBufferingOutputStream.java |    2 +-
 .../org/gradle/util/SingleMessageLogger.java       |   30 +-
 .../src/main/groovy/org/gradle/util/TextUtil.java  |  118 -
 .../main/groovy/org/gradle/util/VersionNumber.java |  231 +-
 .../src/main/groovy/org/gradle/util/WrapUtil.java  |   13 +
 .../groovy/org/slf4j/impl/StaticLoggerBinder.java  |   51 +
 .../resources/org/gradle/reporting/base-style.css  |   19 +-
 .../main/resources/org/gradle/reporting/report.js  |  275 +-
 .../org/gradle/BuildExceptionReporterTest.groovy   |   25 +-
 .../groovy/org/gradle/StartParameterTest.groovy    |   70 +-
 .../api/file/MicroBenchmarkPerformanceTest.groovy  |   48 +
 .../AbstractClassGeneratorTestGroovy.groovy        |   13 +
 .../AbstractNamedDomainObjectContainerTest.groovy  |   31 +-
 .../gradle/api/internal/AbstractTaskSpec.groovy    |   67 -
 .../gradle/api/internal/AbstractTaskTest.groovy    |   84 +
 .../AsmBackedClassGeneratorGroovyTest.groovy       |  174 +-
 .../api/internal/AsmBackedClassGeneratorTest.java  |  263 +-
 .../api/internal/ClosureBackedActionTest.groovy    |    2 -
 .../internal/CompositeDomainObjectSetTest.groovy   |    7 +-
 .../DefaultNamedDomainObjectListTest.groovy        |    2 +-
 .../internal/DefaultNamedDomainObjectSetTest.java  |   33 +-
 ...PolymorphicDomainObjectContainerBaseTest.groovy |   11 +
 ...aultPolymorphicDomainObjectContainerTest.groovy |   24 +-
 .../org/gradle/api/internal/DefaultTaskTest.groovy |    8 +-
 .../DependencyClassPathProviderTest.groovy         |    6 +-
 .../DependencyInjectingInstantiatorTest.groovy     |  119 +-
 .../api/internal/DocumentationRegistryTest.groovy  |   10 +
 .../api/internal/ExtensibleDynamicObjectTest.java  |   57 +-
 .../ExtensibleDynamicObjectTestHelper.groovy       |   12 +-
 ...AutoCreateNamedDomainObjectContainerSpec.groovy |    6 +-
 .../gradle/api/internal/PackageScopedClass.java    |   20 +
 .../org/gradle/api/internal/TestJavaObject.java    |   23 +
 .../TypedDomainObjectContainerWrapperTest.groovy   |  157 +
 .../DefaultArtifactRepositoryContainerTest.groovy  |  158 +-
 .../ExcludeRuleNotationConverterTest.groovy        |   83 +
 .../artifacts/ExcludeRuleNotationParserTest.groovy |   82 -
 .../AbstractModuleDependencySpec.groovy            |   40 +-
 .../dependencies/AbstractModuleDependencyTest.java |  110 -
 .../dependencies/ClientModuleDependencySpec.groovy |   41 +
 .../dependencies/DefaultClientModuleTest.java      |   94 -
 .../DefaultExternalModuleDependencySpec.groovy     |   26 +
 .../DefaultExternalModuleDependencyTest.java       |   99 -
 .../dsl/DefaultRepositoryHandlerTest.groovy        |   96 +-
 .../DefaultDependencyHandlerTest.groovy            |    4 +-
 .../publish/AbstractPublishArtifactTest.java       |    9 -
 .../publish/DefaultPublishArtifactTest.java        |    4 -
 ...meAfterContainerInclusionDeprecationTest.groovy |   67 -
 .../DefaultTaskArtifactStateRepositoryTest.groovy  |    9 +-
 ...rtCircuitTaskArtifactStateRepositoryTest.groovy |    2 +-
 .../rules/InputFilesStateChangeRuleTest.groovy     |   17 +-
 .../rules/TaskUpToDateStateTest.groovy             |   99 +
 .../CacheBackedFileSnapshotRepositoryTest.groovy   |    2 +-
 .../DefaultFileCollectionSnapshotterTest.groovy    |    2 +-
 .../DefaultFileSnapshotterSerializerTest.groovy    |    2 +-
 .../state/InputPropertiesSerializerTest.groovy     |   74 +
 .../state/OutputFilesSnapshotSerializerTest.groovy |    4 +-
 .../classpath/DefaultModuleRegistryTest.groovy     |   15 +
 .../coerce/StringToEnumTransformerTest.groovy      |   68 +
 ...peCoercingMethodArgumentsTransformerTest.groovy |   68 -
 .../DefaultComponentTypeRegistryTest.groovy        |   83 +
 .../internal/file/AbstractFileCollectionTest.java  |    7 +
 .../internal/file/AbstractFileTreeElementTest.java |    4 +-
 .../internal/file/BaseDirFileResolverSpec.groovy   |   25 +-
 .../internal/file/BaseDirFileResolverTest.groovy   |    5 +-
 .../api/internal/file/BasicFileResolverTest.groovy |   58 +
 .../internal/file/CompositeFileCollectionTest.java |    7 +
 .../api/internal/file/CompositeFileTreeTest.java   |    8 +
 .../internal/file/DefaultFileOperationsTest.groovy |   63 +-
 .../file/DefaultFileTreeElementTest.groovy         |    4 +-
 .../file/DefaultSourceDirectorySetTest.groovy      |    2 +
 .../file/FileOrUriNotationConverterTest.groovy     |  117 +
 .../file/FileOrUriNotationParserTest.groovy        |  107 -
 .../api/internal/file/RelativeFileTest.groovy      |   43 +
 .../api/internal/file/UnionFileCollectionTest.java |    7 +
 .../api/internal/file/UnionFileTreeTest.java       |    7 +
 .../api/internal/file/archive/TarFileTreeTest.java |   16 +-
 .../api/internal/file/archive/ZipFileTreeTest.java |   11 +-
 ...ciesOnlyFileCollectionResolveContextTest.groovy |    2 +
 .../DefaultConfigurableFileCollectionTest.java     |   11 +-
 .../DefaultConfigurableFileTreeTest.groovy         |    2 +
 .../DefaultFileCollectionResolveContextTest.groovy |    3 +
 .../file/collections/DirectoryFileTreeTest.java    |    2 +
 .../file/collections/FileTreeAdapterTest.groovy    |    2 +
 .../internal/file/collections/MapFileTreeTest.java |   32 +-
 .../SingleIncludePatternFileTreeSpec.groovy        |    2 +
 .../file/collections/SingletonFileTreeTest.groovy  |    2 +
 .../file/copy/CopyActionExecuterTest.groovy        |    4 +-
 .../file/copy/CopyFileVisitorImplTest.groovy       |   24 +-
 .../file/copy/CopySpecActionImplTest.groovy        |    8 +-
 ...SpecBackedCopyActionProcessingStreamTest.groovy |    2 +-
 .../internal/file/copy/CopySpecMatchingTest.groovy |   21 +-
 .../file/copy/DefaultCopySpecResolutionTest.groovy |  323 ++
 .../internal/file/copy/DefaultCopySpecTest.groovy  |  314 +-
 ...DuplicateHandlingCopyActionDecoratorTest.groovy |  196 -
 .../DuplicateHandlingCopyActionExecutorTest.groovy |  197 +
 .../api/internal/file/copy/LineFilterTest.groovy   |    2 +-
 .../file/copy/PathNotationConverterTest.groovy     |  108 +
 .../file/copy/PathNotationParserTest.groovy        |   90 -
 .../file/copy/SyncCopyActionDecoratorTest.groovy   |    2 +-
 .../internal/filestore/PathKeyFileStoreTest.groovy |  198 -
 .../PathNormalisingKeyFileStoreTest.groovy         |   94 -
 .../filestore/UniquePathKeyFileStoreTest.groovy    |  112 -
 .../api/internal/html/SimpleHtmlWriterTest.groovy  |   40 -
 .../initialization/ClassLoaderIdsTest.groovy       |   39 +
 .../ClassLoaderScopeIdentifierTest.groovy          |   60 +
 .../DefaultClassLoaderCacheTest.groovy             |   80 -
 .../DefaultClassLoaderScopeTest.groovy             |  315 +-
 .../DefaultScriptHandlerFactoryTest.groovy         |   10 +-
 .../initialization/DefaultScriptHandlerTest.groovy |    2 +-
 .../api/internal/initialization/TestClass1.java    |   20 +
 .../api/internal/initialization/TestClass2.java    |   20 +
 .../loadercache/DefaultClassLoaderCacheTest.groovy |  168 +
 .../loadercache/DummyClassLoaderCache.java         |   39 +
 .../HashClassPathSnapshotterTest.groovy            |  115 +
 .../DefaultObjectConfigurationActionTest.groovy    |   13 +-
 .../plugins/DefaultPluginContainerTest.groovy      |  290 ++
 .../plugins/DefaultPluginContainerTest.java        |  128 -
 .../plugins/DefaultPluginManagerTest.groovy        |  581 +++
 .../plugins/DefaultPluginRegistryTest.groovy       |  302 +-
 .../ExtraPropertiesDynamicObjectAdapterTest.groovy |   15 +-
 .../plugins/RuleSourceApplicationTest.groovy       |  103 +
 .../internal/project/DefaultAntBuilderTest.groovy  |   45 +-
 .../project/DefaultIsolatedAntBuilderTest.groovy   |  106 +-
 .../api/internal/project/DefaultProjectTest.groovy |  364 +-
 .../DeferredProjectConfigurationTest.groovy        |   89 +
 .../internal/project/NewDefaultProjectTest.groovy  |  101 +-
 .../api/internal/project/ProjectFactoryTest.groovy |   20 +-
 .../gradle/api/internal/project/TestAntTask.java   |   28 +
 .../gradle/api/internal/project/TestPlugin2.groovy |   25 -
 .../api/internal/project/TestRuleSource.groovy     |   22 +
 .../AnnotationProcessingTaskFactoryTest.java       |   67 +-
 .../project/taskfactory/TaskFactoryTest.groovy     |   14 +-
 .../internal/resource/CachingResourceTest.groovy   |   65 -
 .../internal/resource/StringResourceTest.groovy    |   47 -
 .../api/internal/resource/UriResourceTest.groovy   |  183 -
 .../resources/AbstractTextResourceTest.groovy      |   47 +
 .../CharSourceBackedTextResourceTest.groovy        |   32 +
 ...llectionBackedTarArchiveTextResourceTest.groovy |   35 +
 .../FileCollectionBackedTextResourceTest.groovy    |   30 +
 ...llectionBackedZipArchiveTextResourceTest.groovy |   36 +
 .../resources/StringBackedTextResourceTest.groovy  |   27 +
 .../internal/tasks/DefaultTaskContainerTest.groovy |   96 +-
 .../tasks/DefaultTaskDependencyTest.groovy         |   47 +-
 .../internal/tasks/DefaultTaskInputsTest.groovy    |   72 +-
 .../internal/tasks/DefaultTaskOutputsTest.groovy   |   28 +-
 .../tasks/PublicTaskSpecificationTest.groovy       |   62 +
 .../api/internal/tasks/TaskMutatorTest.groovy      |   77 +
 .../options/OptionNotationParserFactorySpec.groovy |    1 -
 .../tasks/util/DefaultJavaForkOptionsTest.groovy   |   34 +-
 .../api/internal/xml/SimpleXmlWriterSpec.groovy    |  414 --
 .../api/internal/xml/XmlTransformerTest.groovy     |  358 --
 .../groovy/org/gradle/api/logging/LoggingTest.java |   66 +-
 .../gradle/api/tasks/AbstractCopyTaskTest.groovy   |   28 +-
 .../org/gradle/api/tasks/DirectoryTest.groovy      |   78 -
 .../org/gradle/api/tasks/GradleBuildTest.groovy    |  113 +-
 .../org/gradle/api/tasks/ant/AntTargetTest.java    |   16 -
 .../gradle/api/tasks/util/PatternSetTest.groovy    |  188 +-
 .../cache/internal/DefaultCacheAccessTest.groovy   |    2 +-
 .../cache/internal/DefaultCacheFactoryTest.groovy  |   62 +-
 .../internal/DefaultCacheRepositoryTest.groovy     |   21 +-
 .../DefaultPersistentDirectoryCacheSpec.groovy     |    3 +-
 .../DefaultPersistentDirectoryCacheTest.java       |   30 +-
 ...tPersistentDirectoryStoreConcurrencyTest.groovy |   58 +
 .../DefaultProcessMetaDataProviderTest.groovy      |    2 +-
 .../cache/internal/SimpleStateCacheTest.groovy     |    4 +-
 .../btree/BTreePersistentIndexedCacheTest.java     |    4 +-
 .../DefaultBuildConfigurerTest.groovy              |   17 +-
 .../configuration/DefaultImportsReaderTest.groovy  |   32 +
 .../DefaultInitScriptProcessorTest.groovy          |   20 +-
 .../DefaultScriptPluginFactoryTest.groovy          |   60 +-
 .../gradle/configuration/ImportsReaderTest.groovy  |   44 -
 .../configuration/ImportsScriptSourceTest.java     |  101 -
 .../project/BuildScriptProcessorTest.groovy        |    8 +-
 .../project/LifecycleProjectEvaluatorTest.groovy   |   11 +-
 .../PluginsProjectConfigureActionsTest.groovy      |    9 +-
 .../ProjectDependencies2TaskResolverTest.groovy    |   37 -
 .../DefaultTasksBuildExecutionActionTest.groovy    |   22 +-
 ...askFilteringBuildConfigurationActionTest.groovy |   15 +-
 .../execution/ProjectEvaluatingActionTest.groovy   |   66 -
 .../gradle/execution/TaskNameResolverTest.groovy   |  333 +-
 ...ameResolvingBuildConfigurationActionSpec.groovy |   90 +
 ...kNameResolvingBuildConfigurationActionTest.java |  423 --
 .../execution/TaskPathProjectEvaluatorTest.groovy  |   49 +-
 .../org/gradle/execution/TaskSelectorTest.groovy   |  145 +
 .../CommandLineTaskConfigurerSpec.groovy           |    7 +-
 .../commandline/CommandLineTaskParserSpec.groovy   |   99 +-
 ...askExecutionPlanParallelTaskHandlingTest.groovy |  349 ++
 .../taskgraph/DefaultTaskExecutionPlanTest.groovy  |  109 +-
 .../taskgraph/DefaultTaskGraphExecuterSpec.groovy  |  104 +
 .../taskgraph/DefaultTaskGraphExecuterTest.java    |   46 +-
 .../groovy/scripts/CachingScriptSourceTest.java    |    4 +-
 .../DefaultScriptCompilerFactoryTest.groovy        |   37 +-
 .../gradle/groovy/scripts/DefaultScriptTest.groovy |    7 +-
 .../groovy/scripts/StringScriptSourceTest.java     |    2 +-
 .../gradle/groovy/scripts/UriScriptSourceTest.java |    2 +-
 .../internal/BuildScriptTransformerSpec.groovy     |   96 +
 .../internal/CachingScriptClassCompilerTest.groovy |   70 +-
 .../DefaultScriptCompilationHandlerTest.java       |  123 +-
 .../internal/DefaultScriptRunnerFactoryTest.java   |   22 +-
 .../FileCacheBackedScriptClassCompilerTest.groovy  |   37 +-
 .../ShortCircuitEmptyScriptCompilerTest.groovy     |   36 +-
 .../BuildLayoutParametersTest.groovy               |    6 +-
 .../DefaultBuildCancellationTokenSpec.groovy       |  145 +
 .../DefaultCommandLineConverterTest.groovy         |  445 ++
 .../DefaultCommandLineConverterTest.java           |  413 --
 .../DefaultExceptionAnalyserTest.java              |   18 +-
 .../DefaultGradleLauncherFactoryTest.groovy        |   82 +-
 .../initialization/DefaultGradleLauncherTest.java  |   84 +-
 .../initialization/DefaultSettingsTest.groovy      |   49 +-
 .../InstantiatingBuildLoaderTest.groovy            |   36 +-
 .../LayoutCommandLineConverterTest.groovy          |   13 +-
 .../initialization/ProjectPathProjectSpecTest.java |  117 -
 .../ProjectPropertySettingBuildLoaderTest.groovy   |   29 +-
 .../gradle/initialization/ProjectSpecsTest.groovy  |   19 +-
 .../PropertiesLoadingSettingsProcessorTest.java    |   64 -
 .../initialization/SettingsFactoryTest.groovy      |    7 +-
 .../initialization/SettingsHandlerTest.groovy      |    4 +-
 .../buildsrc/BuildSourceBuilderTest.groovy         |    3 +
 .../BuildSrcBuildListenerFactoryTest.groovy        |   23 +-
 .../buildsrc/BuildSrcUpdateFactoryTest.groovy      |    2 +-
 .../layout/BuildLayoutFactoryTest.groovy           |    9 +-
 .../AbstractMultiCauseExceptionTest.groovy         |  125 -
 .../exceptions/LocationAwareExceptionTest.groovy   |    4 +-
 .../LoggingDeprecatedFeatureHandlerTest.groovy     |   10 +-
 .../internal/html/SimpleHtmlWriterTest.groovy      |   40 +
 .../DefaultBuildOperationLoggerFactoryTest.groovy  |   55 +
 .../logging/DefaultBuildOperationLoggerTest.groovy |  153 +
 .../resource/local/PathKeyFileStoreTest.groovy     |  199 +
 .../local/PathNormalisingKeyFileStoreTest.groovy   |   96 +
 .../local/UniquePathKeyFileStoreTest.groovy        |  114 +
 .../service/scopes/BuildScopeServicesTest.groovy   |   37 +-
 .../service/scopes/GlobalScopeServicesTest.java    |   81 +-
 .../service/scopes/GradleScopeServicesTest.groovy  |   51 +-
 .../service/scopes/ProjectScopeServicesTest.groovy |   42 +-
 .../scopes/SettingsScopeServicesTest.groovy        |   29 +-
 .../scopes/TaskExecutionServicesTest.groovy        |   15 +-
 .../service/scopes/TaskScopeServicesTest.java      |    6 +-
 .../CharSequenceNotationConverterTest.groovy       |   49 +
 .../CharSequenceNotationParserTest.groovy          |   47 -
 .../ClosureToSpecNotationConverterTest.groovy      |   38 +
 .../ClosureToSpecNotationParserTest.groovy         |   36 -
 .../EnumFromCharSequenceNotationParserSpec.groovy  |    1 +
 .../ErrorHandlingNotationParserTest.groovy         |   18 +-
 .../typeconversion/MapNotationConverterTest.groovy |  111 +
 .../typeconversion/MapNotationParserTest.groovy    |  109 -
 ...tionConverterToNotationParserAdapterTest.groovy |   51 +
 .../NotationParserBuilderSpec.groovy               |  101 +-
 .../TypeFilteringNotationConverterTest.groovy      |   41 +
 .../TypedNotationConverterTest.groovy              |   49 +
 .../typeconversion/TypedNotationParserTest.groovy  |   49 -
 .../gradle/internal/xml/SimpleXmlWriterSpec.groovy |  413 ++
 .../gradle/internal/xml/XmlTransformerTest.groovy  |  359 ++
 .../gradle/internal/xml/XmlValidationTest.groovy   |  111 +
 .../org/gradle/invocation/DefaultGradleTest.java   |   39 +-
 .../listener/DefaultListenerManagerTest.java       |  225 -
 .../gradle/listener/LazyCreationProxyTest.groovy   |   90 -
 .../org/gradle/listener/ListenerBroadcastTest.java |  268 -
 .../org/gradle/logging/ConfigureLogging.groovy     |   64 -
 .../logging/LoggingServiceRegistryTest.groovy      |   83 +-
 .../groovy/org/gradle/logging/TestAppender.groovy  |   40 -
 ...AbstractLineChoppingStyledTextOutputTest.groovy |    2 +-
 .../internal/AbstractStyledTextOutputTest.groovy   |    2 +-
 .../gradle/logging/internal/AnsiConsoleTest.groovy |    2 +-
 .../ConsoleBackedProgressRendererTest.groovy       |    2 +-
 .../DefaultStandardOutputRedirectorTest.groovy     |   28 +-
 .../internal/DefaultStatusBarFormatterTest.groovy  |    2 +-
 .../internal/JavaUtilLoggingConfigurerTest.groovy  |    8 +-
 .../LoggingCommandLineConverterTest.groovy         |   29 +-
 .../internal/OutputEventRendererTest.groovy        |   18 +-
 .../logback/LogbackLoggingConfigurerTest.groovy    |  249 -
 ...tputEventListenerBackedLoggerContextTest.groovy |   64 +
 ...enerBackedLoggerDefaultConfigurationTest.groovy |   99 +
 .../OutputEventListenerBackedLoggerTest.groovy     |  907 ++++
 .../slf4j/Slf4jLoggingConfigurerTest.groovy        |  178 +
 .../model/dsl/internal/GroovyModelDslTest.groovy   |  101 -
 .../ModelRegistryBackedModelRulesTest.groovy       |  102 -
 .../plugin/bintray/JCenterPluginMapperSpec.groovy  |   80 -
 .../internal/DefaultPluginHandlerTest.groovy       |   62 -
 .../org/gradle/plugin/internal/PluginIdTest.groovy |   76 +
 .../use/internal/PluginRequestCollectorTest.groovy |   79 +
 .../internal/PluginRequestsSerializerTest.groovy   |   48 +
 .../process/internal/DefaultExecHandleSpec.groovy  |   23 +-
 .../process/internal/ExecHandleBuilderTest.groovy  |    2 +
 .../internal/JavaExecHandleBuilderTest.groovy      |   14 +-
 .../gradle/process/internal/JvmOptionsTest.groovy  |   27 +-
 .../org/gradle/process/internal/TestApp.java       |   26 +
 .../internal/child/ActionExecutionWorkerTest.java  |    7 +-
 .../child/BootstrapSecurityManagerTest.groovy      |    6 +-
 .../child/ImplementationClassLoaderWorkerTest.java |    5 +-
 .../profile/ProfileReportRendererTest.groovy       |    5 +-
 .../gradle/reporting/HtmlReportRendererTest.groovy |  135 +-
 .../org/gradle/reporting/TabsRendererTest.groovy   |    2 +-
 .../gradle/reporting/TextReportRendererTest.groovy |   41 -
 .../gradle/testfixtures/ProjectBuilderTest.groovy  |   85 +-
 .../groovy/org/gradle/util/GFileUtilsTest.groovy   |   13 +-
 .../org/gradle/util/GradleVersionTest.groovy       |  276 --
 .../gradle/util/LineBufferingOutputStreamTest.java |    2 +-
 .../org/gradle/util/SingleMessageLoggerTest.groovy |   22 +-
 .../groovy/org/gradle/util/TextUtilTest.groovy     |    9 +
 .../org/gradle/util/VersionNumberTest.groovy       |   83 +-
 ...perties => org.gradle.custom-plugin.properties} |    0
 .../org.gradle.custom-rule-source.properties       |    1 +
 .../resources/org/gradle/api/file/symlinks/symlink |    0
 .../org/gradle/api/internal/file/TestFiles.java    |    6 +-
 .../gradle/api/tasks/AbstractSpockTaskTest.groovy  |   18 +-
 .../org/gradle/api/tasks/AbstractTaskTest.java     |   20 +-
 .../org/gradle/logging/ConfigureLogging.groovy     |   63 +
 .../gradle/logging/TestOutputEventListener.groovy  |   44 +
 .../org/gradle/logging/TestStyledTextOutput.groovy |    2 +-
 .../gradle/test/fixtures/ConcurrentTestUtil.groovy |   40 +-
 .../groovy/org/gradle/util/TestUtil.groovy         |    2 +-
 subprojects/cpp/cpp.gradle                         |   30 -
 ...alStudioFileCustomizationIntegrationTest.groovy |  207 -
 .../VisualStudioMultiProjectIntegrationTest.groovy |  316 --
 ...VisualStudioSingleProjectIntegrationTest.groovy |  840 ----
 .../VisualStudioPluginIntegrationTest.groovy       |   26 -
 .../CppAutoTestedSamplesIntegrationTest.groovy     |   31 -
 .../plugins/AssemblerPluginIntegrationTest.groovy  |   22 -
 .../c/plugins/CPluginIntegrationTest.groovy        |   22 -
 ...tLanguageIncrementalBuildIntegrationTest.groovy |  513 --
 ...anguageIncrementalCompileIntegrationTest.groovy |  529 --
 .../cpp/AbstractLanguageIntegrationTest.groovy     |  198 -
 ...yLanguageIncrementalBuildIntegrationTest.groovy |  136 -
 .../cpp/AssemblyLanguageIntegrationTest.groovy     |  110 -
 .../cpp/BinaryBuildTypesIntegrationTest.groovy     |  206 -
 .../cpp/BinaryFlavorsIntegrationTest.groovy        |  227 -
 .../cpp/BinaryPlatformIntegrationTest.groovy       |  349 --
 ...llingMixedCAndCppLanguageIntegrationTest.groovy |   25 -
 ...CLanguageIncrementalBuildIntegrationTest.groovy |   27 -
 ...anguageIncrementalCompileIntegrationTest.groovy |   26 -
 .../language/cpp/CLanguageIntegrationTest.groovy   |  201 -
 .../language/cpp/CUnitIntegrationTest.groovy       |  387 --
 .../language/cpp/CppBinariesIntegrationTest.groovy |  371 --
 .../cpp/CppCallingCLanguageIntegrationTest.groovy  |   25 -
 ...pLanguageIncrementalBuildIntegrationTest.groovy |   25 -
 ...anguageIncrementalCompileIntegrationTest.groovy |   26 -
 .../language/cpp/CppLanguageIntegrationTest.groovy |  114 -
 .../language/cpp/CppPluginGoodBehaviourTest.groovy |   25 -
 .../cpp/DuplicateBaseNamesIntegrationTest.groovy   |  118 -
 ...GccToolChainCustomisationIntegrationTest.groovy |  193 -
 .../GccToolChainDiscoveryIntegrationTest.groovy    |  124 -
 .../cpp/GeneratedSourcesIntegrationTest.groovy     |  383 --
 .../LibraryApiDependenciesIntegrationTest.groovy   |  237 -
 .../cpp/LibraryBinariesIntegrationTest.groovy      |  298 --
 .../cpp/LibraryDependenciesIntegrationTest.groovy  |  350 --
 .../cpp/MixedLanguageIntegrationTest.groovy        |  168 -
 .../cpp/MultipleToolChainIntegrationTest.groovy    |  115 -
 .../cpp/NativeBinariesPluginIntegrationTest.groovy |  226 -
 .../cpp/NativeSamplesIntegrationTest.groovy        |  409 --
 .../cpp/PrebuiltLibrariesIntegrationTest.groovy    |  349 --
 .../cpp/SharedLibrarySoNameIntegrationTest.groovy  |   80 -
 .../SourceSetDependenciesIntegrationTest.groovy    |  153 -
 .../cpp/ToolChainDiscoveryIntegrationTest.groovy   |   89 -
 ...ResourcesIncrementalBuildIntegrationTest.groovy |  162 -
 .../cpp/WindowsResourcesIntegrationTest.groovy     |  143 -
 ...ndowsResourcesUnsupportedIntegrationTest.groovy |   55 -
 ...bstractInstalledToolChainIntegrationSpec.groovy |   81 -
 .../cpp/fixtures/SingleToolChainTestRunner.java    |   77 -
 .../cpp/plugins/CppPluginIntegrationTest.groovy    |   22 -
 .../MixedObjectiveCIntegrationTest.groovy          |   33 -
 ...CLanguageIncrementalBuildIntegrationTest.groovy |   86 -
 ...anguageIncrementalCompileIntegrationTest.groovy |  120 -
 .../ObjectiveCLanguageIntegrationTest.groovy       |   32 -
 .../ObjectiveCUnsupportedIntegrationTest.groovy    |   53 -
 .../plugins/ObjectiveCPluginIntegrationTest.groovy |   26 -
 ...pLanguageIncrementalBuildIntegrationTest.groovy |   31 -
 ...anguageIncrementalCompileIntegrationTest.groovy |   31 -
 .../ObjectiveCppLanguageIntegrationTest.groovy     |   32 -
 .../ObjectiveCppUnsupportedIntegrationTest.groovy  |   54 -
 .../ObjectiveCppPluginIntegrationTest.groovy       |   26 -
 .../WindowsResourcesPluginIntegrationTest.groovy   |   26 -
 .../NativeBinariesPluginIntegrationTest.groovy     |   26 -
 .../plugins/CUnitPluginIntegrationTest.groovy      |   22 -
 .../groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy  |   79 -
 .../gradle/ide/cdt/model/CprojectDescriptor.groovy |  117 -
 .../gradle/ide/cdt/model/CprojectSettings.groovy   |  103 -
 .../gradle/ide/cdt/model/ProjectDescriptor.groovy  |   48 -
 .../ide/visualstudio/VisualStudioExtension.java    |   36 -
 .../ide/visualstudio/VisualStudioProject.java      |   62 -
 .../ide/visualstudio/VisualStudioSolution.java     |   64 -
 .../internal/DefaultVisualStudioExtension.java     |   52 -
 .../internal/DefaultVisualStudioProject.groovy     |  154 -
 .../internal/DefaultVisualStudioSolution.groovy    |  114 -
 ...ecutableVisualStudioProjectConfiguration.groovy |   46 -
 .../VisualStudioProjectConfiguration.groovy        |  109 -
 .../internal/VisualStudioProjectMapper.java        |   90 -
 .../internal/VisualStudioProjectRegistry.java      |   65 -
 .../internal/VisualStudioProjectResolver.java      |   44 -
 .../internal/rules/CreateVisualStudioModel.java    |   39 -
 .../internal/rules/CreateVisualStudioTasks.java    |   90 -
 .../visualstudio/plugins/VisualStudioPlugin.groovy |   73 -
 .../tasks/internal/VisualStudioFiltersFile.groovy  |   58 -
 .../tasks/internal/VisualStudioProjectFile.groovy  |   98 -
 .../org/gradle/language/DependentSourceSet.java    |   57 -
 .../gradle/language/HeaderExportingSourceSet.java  |   45 -
 .../language/assembler/AssemblerSourceSet.java     |   42 -
 .../internal/DefaultAssemblerSourceSet.java        |   29 -
 .../assembler/plugins/AssemblerLangPlugin.groovy   |   62 -
 .../groovy/org/gradle/language/c/CSourceSet.java   |   49 -
 .../language/c/internal/DefaultCSourceSet.java     |   32 -
 .../gradle/language/c/plugins/CLangPlugin.groovy   |   63 -
 .../org/gradle/language/cpp/CppSourceSet.java      |   49 -
 .../language/cpp/internal/DefaultCppSourceSet.java |   29 -
 .../language/cpp/plugins/CppLangPlugin.groovy      |   62 -
 .../AbstractHeaderExportingDependentSourceSet.java |   64 -
 .../internal/AbstractHeaderExportingSourceSet.java |   53 -
 .../ConfigurationBasedNativeDependencySet.groovy   |   90 -
 .../language/objectivec/ObjectiveCSourceSet.java   |   52 -
 .../internal/DefaultObjectiveCSourceSet.java       |   32 -
 .../objectivec/plugins/ObjectiveCLangPlugin.groovy |   62 -
 .../objectivecpp/ObjectiveCppSourceSet.java        |   51 -
 .../internal/DefaultObjectiveCppSourceSet.java     |   32 -
 .../plugins/ObjectiveCppLangPlugin.groovy          |   62 -
 .../org/gradle/language/rc/WindowsResourceSet.java |   48 -
 .../rc/internal/DefaultWindowsResourceSet.java     |   28 -
 .../rc/plugins/WindowsResourceScriptPlugin.groovy  |   63 -
 .../org/gradle/nativebinaries/BuildType.java       |   30 -
 .../gradle/nativebinaries/BuildTypeContainer.java  |   27 -
 .../org/gradle/nativebinaries/Executable.java      |   26 -
 .../gradle/nativebinaries/ExecutableBinary.java    |   36 -
 .../gradle/nativebinaries/ExecutableContainer.java |   27 -
 .../groovy/org/gradle/nativebinaries/Flavor.java   |   31 -
 .../org/gradle/nativebinaries/FlavorContainer.java |   30 -
 .../groovy/org/gradle/nativebinaries/Library.java  |   39 -
 .../org/gradle/nativebinaries/LibraryBinary.java   |   26 -
 .../gradle/nativebinaries/LibraryContainer.java    |   27 -
 .../org/gradle/nativebinaries/NativeBinary.java    |   42 -
 .../gradle/nativebinaries/NativeBinaryTasks.java   |   43 -
 .../gradle/nativebinaries/NativeDependencySet.java |   40 -
 .../nativebinaries/NativeLibraryRequirement.java   |   40 -
 .../gradle/nativebinaries/PrebuiltLibraries.java   |   29 -
 .../org/gradle/nativebinaries/PrebuiltLibrary.java |   38 -
 .../gradle/nativebinaries/ProjectNativeBinary.java |  106 -
 .../nativebinaries/ProjectNativeComponent.java     |   66 -
 .../org/gradle/nativebinaries/Repositories.java    |   28 -
 .../gradle/nativebinaries/SharedLibraryBinary.java |   47 -
 .../gradle/nativebinaries/StaticLibraryBinary.java |   40 -
 .../nativebinaries/TargetedNativeComponent.java    |   42 -
 .../groovy/org/gradle/nativebinaries/Tool.java     |   39 -
 .../internal/AbstractBinaryToolSpec.java           |   59 -
 .../internal/AbstractProjectLibraryBinary.java     |  104 -
 .../internal/AbstractProjectNativeBinary.java      |  161 -
 .../internal/AbstractProjectNativeComponent.java   |   73 -
 .../AbstractTargetedProjectNativeComponent.java    |   82 -
 .../nativebinaries/internal/BinaryToolSpec.java    |   39 -
 .../nativebinaries/internal/DefaultBuildType.java  |   39 -
 .../internal/DefaultBuildTypeContainer.java        |   33 -
 .../nativebinaries/internal/DefaultExecutable.java |   28 -
 .../internal/DefaultExecutableContainer.java       |   38 -
 .../nativebinaries/internal/DefaultFlavor.java     |   41 -
 .../internal/DefaultFlavorContainer.java           |   33 -
 .../nativebinaries/internal/DefaultLibrary.java    |   42 -
 .../internal/DefaultLibraryContainer.java          |   38 -
 .../nativebinaries/internal/DefaultLinkerSpec.java |   68 -
 .../internal/DefaultNativeBinaryTasks.java         |   56 -
 .../internal/DefaultStaticLibraryArchiverSpec.java |   45 -
 .../nativebinaries/internal/DefaultTool.java       |   37 -
 .../internal/LibraryBinaryInternal.java            |   29 -
 .../gradle/nativebinaries/internal/LinkerSpec.java |   44 -
 .../internal/NativeBinaryServices.java             |   37 -
 .../internal/NativeProjectComponentIdentifier.java |   64 -
 .../internal/ProjectExecutableBinary.java          |   49 -
 .../internal/ProjectNativeBinaryInternal.java      |   36 -
 .../internal/ProjectNativeComponentInternal.java   |   24 -
 .../internal/ProjectNativeLibraryRequirement.java  |   48 -
 .../internal/ProjectSharedLibraryBinary.java       |  120 -
 .../internal/ProjectStaticLibraryBinary.java       |   86 -
 .../internal/SharedLibraryLinkerSpec.java          |   23 -
 .../internal/SourceSetNotationParser.java          |   73 -
 .../internal/StaticLibraryArchiverSpec.java        |   31 -
 .../internal/StaticLibraryBinaryInternal.java      |   26 -
 .../internal/TargetedNativeComponentInternal.java  |   29 -
 .../configure/ApplySourceSetConventions.java       |   50 -
 .../configure/ConfigureGeneratedSourceSets.java    |   54 -
 .../configure/CreateDefaultBuildTypes.java         |   30 -
 .../internal/configure/CreateDefaultFlavors.java   |   32 -
 .../internal/configure/CreateDefaultPlatform.java  |   29 -
 .../internal/configure/CreateNativeBinaries.java   |   79 -
 .../configure/DefaultNativeBinariesFactory.java    |   60 -
 .../internal/configure/NativeBinariesFactory.java  |   27 -
 .../configure/ProjectNativeBinaryInitializer.java  |   52 -
 .../ProjectNativeComponentInitializer.java         |   90 -
 .../internal/configure/RepositoriesFactory.java    |   69 -
 .../prebuilt/AbstractPrebuiltLibraryBinary.java    |  107 -
 .../prebuilt/DefaultPrebuiltLibraries.java         |   59 -
 .../internal/prebuilt/DefaultPrebuiltLibrary.java  |   50 -
 .../DefaultPrebuiltSharedLibraryBinary.java        |   66 -
 .../DefaultPrebuiltStaticLibraryBinary.java        |   55 -
 .../prebuilt/PrebuiltLibraryBinaryLocator.java     |   58 -
 .../prebuilt/PrebuiltLibraryInitializer.java       |   77 -
 .../prebuilt/PrebuiltLibraryResolveException.java  |   27 -
 .../ApiRequirementNativeDependencyResolver.java    |  104 -
 .../resolve/ChainedLibraryBinaryLocator.java       |   51 -
 .../internal/resolve/DefaultLibraryResolver.java   |  107 -
 .../resolve/DefaultNativeDependencySet.java        |   41 -
 .../internal/resolve/DefaultProjectLocator.java    |   41 -
 .../InputHandlingNativeDependencyResolver.java     |   36 -
 .../internal/resolve/LibraryBinaryLocator.java     |   25 -
 .../resolve/LibraryNativeDependencyResolver.java   |   36 -
 .../internal/resolve/LibraryResolveException.java  |   32 -
 .../NativeBinaryRequirementResolveResult.java      |   65 -
 .../resolve/NativeBinaryResolveResult.java         |   74 -
 .../resolve/NativeDependencyNotationParser.java    |   59 -
 .../internal/resolve/NativeDependencyResolver.java |   20 -
 .../resolve/NativeDependencyResolverServices.java  |   47 -
 .../resolve/ProjectLibraryBinaryLocator.java       |   44 -
 .../internal/resolve/ProjectLocator.java           |   22 -
 ...RequirementParsingNativeDependencyResolver.java |   38 -
 .../resolve/SourceSetNativeDependencyResolver.java |   97 -
 .../nativebinaries/language/PreprocessingTool.java |   45 -
 .../language/assembler/internal/AssembleSpec.java  |   35 -
 .../assembler/internal/DefaultAssembleSpec.java    |   47 -
 .../language/assembler/package-info.java           |   20 -
 .../plugins/AssemblerNativeBinariesPlugin.groovy   |   88 -
 .../assembler/plugins/AssemblerPlugin.groovy       |   35 -
 .../language/assembler/tasks/Assemble.groovy       |   95 -
 .../language/c/internal/CCompileSpec.java          |   23 -
 .../language/c/internal/DefaultCCompileSpec.java   |   22 -
 .../AbstractIncrementalNativeCompiler.java         |   86 -
 .../incremental/CleanCompilingNativeCompiler.java  |   57 -
 .../internal/incremental/CompilationFileState.java |   50 -
 .../c/internal/incremental/CompilationState.java   |   41 -
 .../incremental/CompilationStateSerializer.java    |  127 -
 .../incremental/DefaultIncrementalCompilation.java |   37 -
 .../incremental/DefaultSourceIncludes.java         |   79 -
 .../incremental/DefaultSourceIncludesParser.java   |   43 -
 .../incremental/DefaultSourceIncludesResolver.java |   67 -
 .../incremental/IncrementalCompilation.java        |   25 -
 .../incremental/IncrementalCompileProcessor.java   |  148 -
 .../incremental/IncrementalCompilerBuilder.java    |   75 -
 .../incremental/IncrementalNativeCompiler.java     |   45 -
 .../c/internal/incremental/ResolvedInclude.java    |   67 -
 .../c/internal/incremental/SourceIncludes.java     |   24 -
 .../internal/incremental/SourceIncludesParser.java |   24 -
 .../incremental/SourceIncludesResolver.java        |   23 -
 .../incremental/sourceparser/CSourceParser.java    |   33 -
 .../sourceparser/PreprocessingReader.java          |  145 -
 .../sourceparser/RegexBackedCSourceParser.java     |   82 -
 .../nativebinaries/language/c/package-info.java    |   20 -
 .../c/plugins/CNativeBinariesPlugin.groovy         |   91 -
 .../language/c/plugins/CPlugin.groovy              |   35 -
 .../c/tasks/AbstractNativeCompileTask.groovy       |  145 -
 .../language/c/tasks/CCompile.groovy               |   36 -
 .../language/cpp/internal/CppCompileSpec.java      |   23 -
 .../cpp/internal/DefaultCppCompileSpec.java        |   22 -
 .../nativebinaries/language/cpp/package-info.java  |   20 -
 .../cpp/plugins/CppNativeBinariesPlugin.groovy     |   89 -
 .../language/cpp/plugins/CppPlugin.groovy          |   35 -
 .../language/cpp/plugins/package-info.java         |   20 -
 .../language/cpp/tasks/CppCompile.groovy           |   38 -
 .../language/cpp/tasks/package-info.java           |   20 -
 .../internal/AbstractNativeCompileSpec.java        |  109 -
 .../internal/DefaultPreprocessingTool.java         |   39 -
 .../internal/DefaultObjectiveCCompileSpec.java     |   23 -
 .../objectivec/internal/ObjectiveCCompileSpec.java |   23 -
 .../language/objectivec/package-info.java          |   20 -
 .../plugins/ObjectiveCNativeBinariesPlugin.groovy  |   89 -
 .../objectivec/plugins/ObjectiveCPlugin.groovy     |   36 -
 .../language/objectivec/plugins/package-info.java  |   20 -
 .../objectivec/tasks/ObjectiveCCompile.groovy      |   38 -
 .../language/objectivec/tasks/package-info.java    |   20 -
 .../internal/DefaultObjectiveCppCompileSpec.java   |   23 -
 .../internal/ObjectiveCppCompileSpec.java          |   23 -
 .../language/objectivecpp/package-info.java        |   20 -
 .../ObjectiveCppNativeBinariesPlugin.groovy        |   90 -
 .../objectivecpp/plugins/ObjectiveCppPlugin.groovy |   36 -
 .../objectivecpp/plugins/package-info.java         |   20 -
 .../objectivecpp/tasks/ObjectiveCppCompile.groovy  |   38 -
 .../language/objectivecpp/tasks/package-info.java  |   20 -
 .../nativebinaries/language/package-info.java      |   20 -
 .../DefaultWindowsResourceCompileSpec.java         |   21 -
 .../rc/internal/WindowsResourceCompileSpec.java    |   21 -
 .../WindowsResourcesNativeBinariesPlugin.groovy    |  103 -
 .../rc/plugins/WindowsResourcesPlugin.groovy       |   36 -
 .../rc/tasks/WindowsResourceCompile.groovy         |  131 -
 .../org/gradle/nativebinaries/package-info.java    |   20 -
 .../nativebinaries/platform/Architecture.java      |   32 -
 .../nativebinaries/platform/OperatingSystem.java   |   60 -
 .../gradle/nativebinaries/platform/Platform.java   |  125 -
 .../nativebinaries/platform/PlatformContainer.java |   27 -
 .../platform/internal/ArchitectureInternal.java    |   38 -
 .../internal/ArchitectureNotationParser.java       |   91 -
 .../platform/internal/DefaultArchitecture.java     |  100 -
 .../platform/internal/DefaultOperatingSystem.java  |   68 -
 .../platform/internal/DefaultPlatform.java         |   74 -
 .../internal/DefaultPlatformContainer.java         |   39 -
 .../internal/OperatingSystemNotationParser.java    |   80 -
 .../platform/internal/PlatformInternal.java        |   22 -
 .../nativebinaries/platform/package-info.java      |   20 -
 .../plugins/NativeBinariesModelPlugin.java         |  142 -
 .../plugins/NativeBinariesPlugin.groovy            |  138 -
 .../nativebinaries/plugins/package-info.java       |   20 -
 .../nativebinaries/tasks/AbstractLinkTask.groovy   |  120 -
 .../nativebinaries/tasks/BuildBinaryTask.java      |   31 -
 .../tasks/CreateStaticLibrary.groovy               |   96 -
 .../nativebinaries/tasks/InstallExecutable.groovy  |  156 -
 .../nativebinaries/tasks/LinkExecutable.groovy     |   31 -
 .../nativebinaries/tasks/LinkSharedLibrary.groovy  |   43 -
 .../gradle/nativebinaries/tasks/package-info.java  |   20 -
 .../test/ProjectComponentTestSuite.java            |   31 -
 .../org/gradle/nativebinaries/test/TestSuite.java  |   26 -
 .../nativebinaries/test/TestSuiteContainer.java    |   27 -
 .../test/TestSuiteExecutableBinary.java            |   26 -
 .../nativebinaries/test/cunit/CUnitTestSuite.java  |   26 -
 .../cunit/internal/ConfigureCUnitTestSources.java  |   66 -
 .../test/cunit/internal/CreateCUnitBinaries.java   |   88 -
 .../test/cunit/internal/DefaultCUnitTestSuite.java |   39 -
 .../nativebinaries/test/cunit/package-info.java    |   20 -
 .../test/cunit/plugins/CUnitPlugin.groovy          |   72 -
 .../test/cunit/plugins/package-info.java           |   20 -
 .../test/cunit/tasks/GenerateCUnitLauncher.groovy  |   40 -
 .../test/cunit/tasks/package-info.java             |   20 -
 .../test/internal/DefaultTestSuiteContainer.java   |   30 -
 .../internal/DefaultTestSuiteExecutableBinary.java |   48 -
 .../gradle/nativebinaries/test/package-info.java   |   20 -
 .../test/plugins/NativeBinariesTestPlugin.groovy   |   75 -
 .../nativebinaries/test/plugins/package-info.java  |   20 -
 .../test/tasks/RunTestExecutable.groovy            |   79 -
 .../nativebinaries/test/tasks/package-info.java    |   20 -
 .../org/gradle/nativebinaries/toolchain/Clang.java |   41 -
 .../org/gradle/nativebinaries/toolchain/Gcc.java   |   41 -
 .../gradle/nativebinaries/toolchain/GccTool.java   |   42 -
 .../toolchain/PlatformConfigurableToolChain.java   |   55 -
 .../toolchain/TargetPlatformConfiguration.java     |   67 -
 .../gradle/nativebinaries/toolchain/ToolChain.java |   35 -
 .../toolchain/ToolChainRegistry.java               |   28 -
 .../gradle/nativebinaries/toolchain/VisualCpp.java |   47 -
 .../toolchain/internal/AbstractToolChain.java      |   73 -
 .../toolchain/internal/ArgsTransformer.java        |   25 -
 .../toolchain/internal/CommandLineTool.java        |  113 -
 .../CompileSpecToArgsTransformerChain.java         |   44 -
 .../internal/DefaultToolChainRegistry.java         |  149 -
 .../toolchain/internal/MacroArgsConverter.java     |   35 -
 .../toolchain/internal/NativeCompileSpec.java      |   63 -
 .../internal/OptionsFileArgsTransformer.java       |   64 -
 .../toolchain/internal/OutputCleaningCompiler.java |   67 -
 .../toolchain/internal/PlatformToolChain.java      |   40 -
 .../SingleSourceCompileArgTransformer.java         |   66 -
 .../toolchain/internal/ToolChainAvailability.java  |   68 -
 .../toolchain/internal/ToolChainInternal.java      |   41 -
 .../internal/ToolChainRegistryInternal.java        |   34 -
 .../toolchain/internal/ToolSearchResult.java       |   28 -
 .../toolchain/internal/ToolType.java               |   44 -
 .../internal/UnavailablePlatformToolChain.java     |   79 -
 .../toolchain/internal/clang/ClangToolChain.java   |   47 -
 .../gcc/AbstractGccCompatibleToolChain.java        |  267 -
 .../internal/gcc/ArStaticLibraryArchiver.java      |   73 -
 .../toolchain/internal/gcc/Assembler.java          |   80 -
 .../toolchain/internal/gcc/CCompiler.java          |   36 -
 .../internal/gcc/CommandLineToolSearchResult.java  |   25 -
 .../toolchain/internal/gcc/CppCompiler.java        |   37 -
 .../internal/gcc/GccCompilerArgsTransformer.java   |   58 -
 .../toolchain/internal/gcc/GccLinker.java          |   94 -
 .../internal/gcc/GccOptionsFileArgTransformer.java |   52 -
 .../internal/gcc/GccPlatformToolChain.java         |  114 -
 .../toolchain/internal/gcc/GccToolChain.java       |   90 -
 .../toolchain/internal/gcc/GccToolSearchPath.java  |   49 -
 .../toolchain/internal/gcc/NativeCompiler.java     |   65 -
 .../toolchain/internal/gcc/ObjectiveCCompiler.java |   38 -
 .../internal/gcc/ObjectiveCppCompiler.java         |   37 -
 .../gcc/PostTransformActionArgsTransformer.java    |   39 -
 .../internal/gcc/ShortCircuitArgsTransformer.java  |   41 -
 .../internal/gcc/version/GccVersionDeterminer.java |  142 -
 .../internal/gcc/version/GccVersionResult.java     |   23 -
 .../toolchain/internal/msvcpp/Assembler.java       |   80 -
 .../toolchain/internal/msvcpp/CCompiler.java       |   33 -
 .../toolchain/internal/msvcpp/CppCompiler.java     |   33 -
 .../msvcpp/DefaultVisualStudioLocator.java         |  369 --
 .../internal/msvcpp/DefaultWindowsSdkLocator.java  |  275 --
 .../toolchain/internal/msvcpp/EscapeUserArgs.java  |   40 -
 .../internal/msvcpp/InstallationSearchResult.java  |   27 -
 .../msvcpp/LibExeStaticLibraryArchiver.java        |   58 -
 .../toolchain/internal/msvcpp/LinkExeLinker.java   |   70 -
 .../toolchain/internal/msvcpp/NativeCompiler.java  |   59 -
 .../msvcpp/VisualCppCompilerArgsTransformer.java   |   50 -
 .../internal/msvcpp/VisualCppInstall.java          |  116 -
 .../internal/msvcpp/VisualCppToolChain.java        |  245 -
 .../internal/msvcpp/VisualStudioInstall.java       |   48 -
 .../internal/msvcpp/VisualStudioLocator.java       |   29 -
 .../internal/msvcpp/WindowsResourceCompiler.java   |   90 -
 .../toolchain/internal/msvcpp/WindowsSdk.java      |  138 -
 .../internal/msvcpp/WindowsSdkLocator.java         |   29 -
 .../internal/plugins/StandardToolChainsPlugin.java |   34 -
 .../toolchain/internal/tools/DefaultTool.java      |   58 -
 .../internal/tools/DefaultToolRegistry.java        |   35 -
 .../toolchain/internal/tools/GccToolInternal.java  |   29 -
 .../toolchain/internal/tools/PlatformGccTool.java  |   58 -
 .../internal/tools/PlatformToolRegistry.java       |   48 -
 .../toolchain/internal/tools/ToolRegistry.java     |   22 -
 .../toolchain/internal/tools/ToolSearchPath.java   |  135 -
 .../nativebinaries/toolchain/package-info.java     |   20 -
 .../toolchain/plugins/ClangCompilerPlugin.groovy   |   62 -
 .../toolchain/plugins/GccCompilerPlugin.groovy     |   63 -
 .../plugins/MicrosoftVisualCppPlugin.groovy        |   76 -
 .../toolchain/plugins/package-info.java            |   20 -
 .../META-INF/gradle-plugins/assembler.properties   |    1 -
 .../resources/META-INF/gradle-plugins/c.properties |    1 -
 .../META-INF/gradle-plugins/cpp.properties         |    1 -
 .../META-INF/gradle-plugins/cunit.properties       |   17 -
 .../gradle-plugins/native-binaries.properties      |    1 -
 .../META-INF/gradle-plugins/objective-c.properties |    1 -
 .../gradle-plugins/objective-cpp.properties        |    1 -
 .../gradle-plugins/windows-resources.properties    |    1 -
 ...e.internal.service.scopes.PluginServiceRegistry |    1 -
 .../ide/cdt/model/CprojectSettingsSpec.groovy      |   58 -
 .../internal/DefaultVisualStudioProjectTest.groovy |  115 -
 .../VisualStudioProjectConfigurationTest.groovy    |  196 -
 .../internal/VisualStudioProjectMapperTest.groovy  |  142 -
 .../VisualStudioProjectRegistryTest.groovy         |  109 -
 .../internal/VisualStudioFiltersFileTest.groovy    |   97 -
 .../internal/VisualStudioProjectFileTest.groovy    |  118 -
 .../internal/VisualStudioSolutionFileTest.groovy   |  190 -
 .../plugins/AssemblerLangPluginTest.groovy         |   42 -
 .../language/c/plugins/CLangPluginTest.groovy      |   42 -
 .../language/cpp/plugins/CppLangPluginTest.groovy  |   42 -
 .../internal/DefaultBuildTypeTest.groovy           |   29 -
 .../internal/DefaultExecutableBinaryTest.groovy    |   39 -
 .../internal/DefaultExecutableTest.groovy          |   29 -
 .../internal/DefaultFlavorTest.groovy              |   29 -
 .../internal/DefaultLibraryTest.groovy             |   59 -
 .../internal/DefaultNativeBinaryTasksTest.groovy   |   55 -
 .../internal/DefaultNativeComponentTest.groovy     |   77 -
 .../internal/ProjectNativeBinaryTest.groovy        |  210 -
 .../internal/ProjectSharedLibraryBinaryTest.groovy |  123 -
 .../internal/ProjectStaticLibraryBinaryTest.groovy |  125 -
 .../internal/SourceSetNotationParserTest.groovy    |   53 -
 .../configure/CreateDefaultBuildTypesTest.groovy   |   44 -
 .../configure/CreateDefaultFlavorsTest.groovy      |   67 -
 .../configure/CreateDefaultPlatformTest.groovy     |   44 -
 .../DefaultNativeBinariesFactoryTest.groovy        |   93 -
 .../ProjectNativeBinaryInitializerTest.groovy      |   99 -
 .../ProjectNativeComponentInitializerTest.groovy   |  145 -
 .../DefaultPrebuiltSharedLibraryBinaryTest.groovy  |   74 -
 .../DefaultPrebuiltStaticLibraryBinaryTest.groovy  |   56 -
 .../NativeDependencyNotationParserTest.groovy      |   72 -
 .../resolve/ProjectLibraryBinaryLocatorTest.groovy |  136 -
 .../AbstractNativeBinariesPluginTest.groovy        |  160 -
 .../AssemblerNativeBinariesPluginTest.groovy       |  183 -
 .../language/assembler/tasks/AssemblerTest.groovy  |   65 -
 .../CleanCompilingNativeCompilerTest.groovy        |   68 -
 .../CompilationStateSerializerTest.groovy          |   90 -
 .../DefaultSourceIncludesParserTest.groovy         |   68 -
 .../DefaultSourceIncludesResolverTest.groovy       |  154 -
 .../IncrementalCompileProcessorTest.groovy         |  422 --
 .../IncrementalNativeCompilerTest.groovy           |   54 -
 .../sourceparser/PreprocessingReaderTest.groovy    |   72 -
 .../RegexBackedCSourceParserTest.groovy            |  386 --
 .../c/plugins/CNativeBinariesPluginTest.groovy     |   48 -
 .../language/c/tasks/CCompileTest.groovy           |   68 -
 .../binaryinfo/ReadelfBinaryInfoTest.groovy        |   56 -
 .../cpp/internal/DefaultCppSourceSetTest.groovy    |   66 -
 .../cpp/plugins/CppNativeBinariesPluginTest.groovy |  206 -
 .../language/cpp/tasks/CppCompileTest.groovy       |   67 -
 .../ObjectiveCNativeBinariesPluginTest.groovy      |   46 -
 .../ObjectiveCppNativeBinariesPluginTest.groovy    |   45 -
 .../internal/ArchitectureNotationParserTest.groovy |  115 -
 .../internal/DefaultArchitectureTest.groovy        |   29 -
 .../internal/DefaultOperatingSystemTest.groovy     |   30 -
 .../platform/internal/DefaultPlatformTest.groovy   |   61 -
 .../OperatingSystemNotationParserTest.groovy       |  100 -
 .../plugins/NativeBinariesModelPluginTest.groovy   |  238 -
 .../plugins/NativeBinariesPluginTest.groovy        |  126 -
 .../internal/DefaultToolChainRegistryTest.groovy   |  182 -
 .../internal/OutputCleaningCompilerTest.groovy     |  115 -
 .../internal/ToolChainAvailabilityTest.groovy      |   67 -
 .../UnavailablePlatformToolChainTest.groovy        |   48 -
 .../gcc/AbstractGccCompatibleToolChainTest.groovy  |  237 -
 .../toolchain/internal/gcc/AssemblerTest.groovy    |   83 -
 .../toolchain/internal/gcc/CCompilerTest.groovy    |   98 -
 .../internal/gcc/ClangToolChainTest.groovy         |   48 -
 .../toolchain/internal/gcc/GccLinkerTest.groovy    |   86 -
 .../toolchain/internal/gcc/GccToolChainTest.groovy |   68 -
 .../gcc/ShortCircuitArgsTransformerTest.groovy     |   64 -
 .../gcc/version/GccVersionDeterminerTest.groovy    |  139 -
 .../msvcpp/DefaultVisualStudioLocatorTest.groovy   |  202 -
 .../msvcpp/DefaultWindowsSdkLocatorTest.groovy     |  256 -
 .../internal/msvcpp/VisualCppToolChainTest.groovy  |  206 -
 .../internal/tools/ToolSearchPathTest.groovy       |  125 -
 .../plugins/ClangCompilerPluginTest.groovy         |   57 -
 .../toolchain/plugins/GccCompilerPluginTest.groovy |   59 -
 .../plugins/MicrosoftVisualCppPluginTest.groovy    |   64 -
 .../toolchain/plugins/ToolchainPluginTest.groovy   |   70 -
 .../ide/visualstudio/fixtures/ProjectFile.groovy   |  128 -
 .../language/cpp/fixtures/AvailableToolChains.java |  503 --
 .../language/cpp/fixtures/ExecutableFixture.groovy |   35 -
 .../cpp/fixtures/NativeBinaryFixture.groovy        |   89 -
 .../cpp/fixtures/NativeInstallationFixture.groovy  |   73 -
 .../cpp/fixtures/RequiresInstalledToolChain.groovy |   30 -
 .../RequiresInstalledToolChainExtension.groovy     |   39 -
 .../cpp/fixtures/SharedLibraryFixture.groovy       |   47 -
 .../cpp/fixtures/StaticLibraryFixture.groovy       |   29 -
 .../cpp/fixtures/ToolChainRequirement.java         |   30 -
 .../app/CCallingMixedCAndCppHelloWorldApp.groovy   |   83 -
 .../fixtures/app/CCompilerDetectingTestApp.groovy  |   80 -
 .../cpp/fixtures/app/CHelloWorldApp.groovy         |  167 -
 .../fixtures/app/CppCallingCHelloWorldApp.groovy   |   75 -
 .../app/CppCompilerDetectingTestApp.groovy         |   80 -
 .../cpp/fixtures/app/CppHelloWorldApp.groovy       |  116 -
 .../app/DuplicateAssemblerBaseNamesTestApp.groovy  |   88 -
 .../fixtures/app/DuplicateCBaseNamesTestApp.groovy |   61 -
 .../app/DuplicateCppBaseNamesTestApp.groovy        |   64 -
 .../app/DuplicateMixedSameBaseNamesTestApp.groovy  |  140 -
 .../app/DuplicateObjectiveCBaseNamesTestApp.groovy |   80 -
 .../DuplicateObjectiveCppBaseNamesTestApp.groovy   |   80 -
 ...uplicateWindowsResourcesBaseNamesTestApp.groovy |   91 -
 .../ExeWithDiamondDependencyHelloWorldApp.groovy   |   56 -
 .../ExeWithLibraryUsingLibraryHelloWorldApp.groovy |  132 -
 .../language/cpp/fixtures/app/HelloWorldApp.java   |  117 -
 .../cpp/fixtures/app/IncrementalHelloWorldApp.java |   49 -
 .../fixtures/app/MixedLanguageHelloWorldApp.groovy |  143 -
 .../app/MixedObjectiveCHelloWorldApp.groovy        |  120 -
 .../fixtures/app/ObjectiveCHelloWorldApp.groovy    |  139 -
 .../fixtures/app/ObjectiveCppHelloWorldApp.groovy  |  146 -
 .../fixtures/app/PlatformDetectingTestApp.groovy   |   85 -
 .../language/cpp/fixtures/app/SourceFile.java      |   61 -
 .../language/cpp/fixtures/app/TestApp.java         |   72 -
 .../language/cpp/fixtures/app/TestComponent.groovy |   39 -
 .../app/WindowsResourceHelloWorldApp.groovy        |  129 -
 .../cpp/fixtures/binaryinfo/BinaryInfo.java        |   28 -
 .../fixtures/binaryinfo/DumpbinBinaryInfo.groovy   |   99 -
 .../cpp/fixtures/binaryinfo/OtoolBinaryInfo.groovy |   59 -
 .../fixtures/binaryinfo/ReadelfBinaryInfo.groovy   |   82 -
 .../test/cunit/CUnitTestResults.groovy             |  104 -
 .../dependency-management.gradle                   |   88 +
 .../ArtifactDeclarationIntegrationTest.groovy      |    0
 .../ArtifactDependenciesIntegrationTest.groovy     |  691 +++
 .../resolve/CacheResolveIntegrationTest.groovy     |  112 +
 ...ModuleDependenciesResolveIntegrationTest.groovy |  110 +
 ...adataRulesChangingModulesIntegrationTest.groovy |  169 +
 ...etadataRulesErrorHandlingIntegrationTest.groovy |  175 +
 .../ComponentMetadataRulesIntegrationTest.groovy   |  223 +
 ...ponentMetadataRulesStatusIntegrationTest.groovy |   43 +
 .../ComponentReplacementIntegrationTest.groovy     |  350 ++
 .../resolve/CredentialsDslIntegrationTest.groovy   |   39 +
 .../DependencyExcludeResolveIntegrationTest.groovy |   89 +
 .../DependencyNotationIntegrationSpec.groovy       |  211 +
 ...ependencyResolutionEventsIntegrationTest.groovy |   51 +
 .../DependencyResolveRulesIntegrationTest.groovy   |  840 ++++
 ...pendencySubstitutionRulesIntegrationTest.groovy | 1417 ++++++
 .../DetachedConfigurationsIntegrationTest.groovy   |    0
 .../ExtendingConfigurationsIntegrationTest.groovy  |    0
 ...LibraryArtifactResolutionIntegrationTest.groovy |  112 +
 .../resolve/FlatDirResolveIntegrationTest.groovy   |    0
 .../resolve/ForcedModulesIntegrationTest.groovy    |    0
 .../JvmLibraryArtifactResolveTestFixture.groovy    |  213 +
 .../MetadataArtifactResolveTestFixture.groovy      |  194 +
 .../ProjectDependenciesIntegrationTest.groovy      |   89 +
 .../ProjectDependencyResolveIntegrationTest.groovy |  500 ++
 .../ResolutionResultApiIntegrationTest.groovy      |    0
 ...ResolutionStrategySamplesIntegrationTest.groovy |   58 +
 .../ResolveCrossVersionIntegrationTest.groovy      |  131 +
 .../integtests/resolve/ResolveTestFixture.groovy   |  352 ++
 .../ResolvedConfigurationIntegrationTest.groovy    |  100 +
 .../ScriptDependencyResolveIntegrationTest.groovy  |   59 +
 .../UnsupportedConfigurationMutationTest.groovy    |  227 +
 ...VersionConflictResolutionIntegrationTest.groovy |  727 +++
 ...actCacheReuseCrossVersionIntegrationTest.groovy |    0
 ...AliasedArtifactResolutionIntegrationTest.groovy |  200 +
 .../CacheReuseCrossVersionIntegrationTest.groovy   |  178 +
 .../M3CacheReuseCrossVersionIntegrationTest.groovy |   83 +
 .../MavenM2CacheReuseIntegrationTest.groovy        |   88 +
 .../ResolutionOverrideIntegrationTest.groovy       |  212 +
 ...ameCacheUsageCrossVersionIntegrationTest.groovy |   82 +
 .../CachedChangingModulesIntegrationTest.groovy    |  229 +
 ...achedDependencyResolutionIntegrationTest.groovy |  238 +
 .../CachedMissingModulesIntegrationTest.groovy     |  500 ++
 ...ependencyMetadataInMemoryIntegrationTest.groovy |  195 +
 ...coverFromBrokenResolutionIntegrationTest.groovy |  354 ++
 .../AbstractHttpsRepoResolveIntegrationTest.groovy |  111 +
 ...ationDependencyResolutionIntegrationTest.groovy |  215 +
 ...odingDependencyResolutionIntegrationTest.groovy |   46 +
 .../http/HttpProxyResolveIntegrationTest.groovy    |  151 +
 .../http/HttpRedirectResolveIntegrationTest.groovy |   85 +
 ...ctComponentSelectionRulesIntegrationTest.groovy |  104 +
 ...yDescriptorExcludeResolveIntegrationTest.groovy |   54 +
 ...SelectionRulesDependencyResolveIntegTest.groovy |  428 ++
 ...nentSelectionRulesErrorHandlingIntegTest.groovy |  284 ++
 ...mponentSelectionRulesProcessingIntegTest.groovy |  451 ++
 .../ivy/IvyBrokenDescriptorIntegrationTest.groovy  |  148 +
 .../IvyBrokenRemoteResolveIntegrationTest.groovy   |  364 ++
 ...angingModuleRemoteResolveIntegrationTest.groovy |  406 ++
 ...adataRulesChangingModulesIntegrationTest.groovy |   41 +
 ...IvyComponentMetadataRulesIntegrationTest.groovy |  315 ++
 ...ponentMetadataRulesStatusIntegrationTest.groovy |   98 +
 ...CustomStatusLatestVersionIntegrationTest.groovy |  238 +
 ...rDependencyExcludeResolveIntegrationTest.groovy |  386 ++
 ...iptorModuleExcludeResolveIntegrationTest.groovy |  322 ++
 .../ivy/IvyDescriptorResolveIntegrationTest.groovy |  239 +
 .../IvyDescriptorValidationIntegrationTest.groovy  |   54 +
 ...amicRevisionRemoteResolveIntegrationTest.groovy | 1233 +++++
 ...IvyDynamicRevisionResolveIntegrationTest.groovy |  449 ++
 .../ivy/IvyFileRepoResolveIntegrationTest.groovy   |    0
 .../ivy/IvyHttpRepoResolveIntegrationTest.groovy   |   63 +
 .../ivy/IvyHttpsRepoResolveIntegrationTest.groovy  |   28 +
 ...LibraryArtifactResolutionIntegrationTest.groovy |  435 ++
 ...yModuleArtifactResolutionIntegrationTest.groovy |  172 +
 .../ivy/IvyModuleResolveIntegrationTest.groovy     |  258 +
 .../resolve/ivy/IvyResolveIntegrationTest.groovy   |  276 ++
 .../maven/BadPomFileResolveIntegrationTest.groovy  |  182 +
 .../MavenBrokenRemoteResolveIntegrationTest.groovy |   97 +
 ...adataRulesChangingModulesIntegrationTest.groovy |   70 +
 ...venComponentMetadataRulesIntegrationTest.groovy |   75 +
 ...ponentMetadataRulesStatusIntegrationTest.groovy |   67 +
 ...venCustomPackagingResolveIntegrationTest.groovy |   66 +
 .../MavenDependencyResolveIntegrationTest.groovy   |  212 +
 .../MavenDynamicResolveIntegrationTest.groovy      |  401 ++
 .../MavenFileRepoResolveIntegrationTest.groovy     |    0
 .../MavenHttpRepoResolveIntegrationTest.groovy     |  391 ++
 .../MavenHttpsRepoResolveIntegrationTest.groovy    |    0
 ...nJcenterDependencyResolveIntegrationTest.groovy |    0
 ...LibraryArtifactResolutionIntegrationTest.groovy |  334 ++
 .../maven/MavenLatestResolveIntegrationTest.groovy |  120 +
 .../MavenLocalRepoResolveIntegrationTest.groovy    |  362 ++
 ...nModuleArtifactResolutionIntegrationTest.groovy |  170 +
 .../MavenParentPomResolveIntegrationTest.groovy    |  433 ++
 .../MavenPomExcludeResolveIntegrationTest.groovy   |   76 +
 .../MavenPomPackagingResolveIntegrationTest.groovy |  360 ++
 .../maven/MavenPomResolveIntegrationTest.groovy    |   64 +
 .../MavenProfileResolveIntegrationTest.groovy      |  485 ++
 .../MavenSnapshotResolveIntegrationTest.groovy     |  997 ++++
 .../resolve/support/RepositoryDslSupport.groovy    |   76 +
 .../projectA-1.2-ivy.xml                           |    0
 .../projectB-1.5-ivy.xml                           |    0
 .../projectWithConfigurationHierarchy.gradle       |   57 +
 .../projectA-1.2-ivy.xml                           |    0
 .../projectB-1.5-ivy.xml                           |    0
 .../projectWithCyclesInDependencyGraph.gradle      |    0
 .../canNestModules/projectWithNestedModules.gradle |    0
 .../canUseDynamicVersions/projectA-1.2-ivy.xml     |    0
 .../canUseDynamicVersions/projectB-1.5-ivy.xml     |    0
 .../projectWithDynamicVersions.gradle              |    0
 .../projectA-1.2-ivy.xml                           |    0
 .../projectA-2.0-ivy.xml                           |    0
 .../projectB-1.5-ivy.xml                           |    0
 .../projectB-2.1.5-ivy.xml                         |    0
 .../projectWithConflicts.gradle                    |    0
 .../dependencyReportWithConflicts/settings.gradle  |    0
 .../artifacts/ArtifactDependencyResolver.java      |   29 +
 .../artifacts/ArtifactPublicationServices.java     |    0
 .../api/internal/artifacts/ArtifactPublisher.java  |    0
 .../artifacts/ComponentMetadataProcessor.java      |   22 +
 .../ComponentModuleMetadataProcessor.java          |   23 +
 .../artifacts/ComponentSelectionInternal.java      |   25 +
 .../artifacts/ComponentSelectionRulesInternal.java |   27 +
 .../internal/artifacts/ConfigurationResolver.java  |    0
 .../artifacts/DefaultArtifactIdentifier.java       |  107 +
 .../artifacts/DefaultComponentSelection.java       |   46 +
 .../artifacts/DefaultDependencyFactory.java        |    0
 .../DefaultDependencyManagementServices.java       |  203 +
 .../DefaultGlobalDependencyResolutionRules.java    |   35 +
 .../artifacts/DefaultModuleIdentifier.java         |   71 +
 .../artifacts/DefaultModuleVersionIdentifier.java  |  109 +
 .../artifacts/DefaultModuleVersionSelector.java    |    0
 .../artifacts/DefaultProjectDependencyFactory.java |    0
 .../artifacts/DefaultResolvedArtifact.java         |   98 +
 .../artifacts/DefaultResolvedDependency.java       |    0
 .../DependencyManagementBuildScopeServices.java    |  236 +
 .../DependencyManagementGlobalScopeServices.java   |   68 +
 .../api/internal/artifacts/DependencyServices.java |   36 +
 .../artifacts/GlobalDependencyResolutionRules.java |   21 +
 .../ModuleVersionIdentifierSerializer.java         |   39 +
 .../internal/artifacts/ModuleVersionPublisher.java |   25 +
 .../artifacts/ModuleVersionSelectorSerializer.java |   41 +
 .../artifacts/ResolvedConfigurationIdentifier.java |    0
 .../ResolvedConfigurationIdentifierSerializer.java |   39 +
 .../api/internal/artifacts/ResolverResults.java    |   75 +
 .../component/ComponentIdentifierFactory.java      |    0
 .../DefaultComponentIdentifierFactory.java         |   34 +
 .../ConfigurationContainerInternal.java            |    0
 .../configurations/ConfigurationInternal.java      |   26 +
 .../artifacts/configurations/Configurations.java   |   40 +
 .../configurations/ConfigurationsProvider.java     |    0
 .../configurations/DefaultConfiguration.java       |  569 +++
 .../DefaultConfigurationContainer.java             |  113 +
 .../DetachedConfigurationsProvider.java            |    0
 .../configurations/MutationValidator.java          |   47 +
 .../configurations/ResolutionStrategyInternal.java |   71 +
 .../configurations/RunnableMutationValidator.java  |   34 +
 .../configurations/TasksFromDependentProjects.java |   80 +
 .../TasksFromProjectDependencies.java              |   58 +
 .../api/internal/artifacts/dsl/ArtifactFile.java   |    0
 .../dsl/ComponentModuleMetadataContainer.java      |   93 +
 .../artifacts/dsl/ComponentSelectorParsers.java    |   99 +
 .../artifacts/dsl/DefaultArtifactHandler.java      |   72 +
 .../dsl/DefaultComponentMetadataHandler.java       |  178 +
 .../dsl/DefaultComponentModuleMetadataHandler.java |   33 +
 .../artifacts/dsl/ModuleReplacementsData.java      |   24 +
 .../dsl/ModuleVersionSelectorParsers.java          |   83 +
 .../artifacts/dsl/ParsedModuleStringNotation.java  |   65 +
 .../dsl/PublishArtifactNotationParserFactory.java  |   94 +
 .../ivyservice/AbstractDependencySubstitution.java |   73 +
 .../ivyservice/ArtifactCacheMetaData.java          |    0
 .../internal/artifacts/ivyservice/CacheLayout.java |   62 +
 .../CacheLockingArtifactDependencyResolver.java    |   46 +
 .../artifacts/ivyservice/CacheLockingManager.java  |   53 +
 .../ivyservice/ContextualArtifactResolver.java     |   73 +
 .../ivyservice/DefaultCacheLockingManager.java     |   87 +
 .../ivyservice/DefaultConfigurationResolver.java   |   49 +
 .../DefaultDependencyResolveDetails.java           |   95 +
 .../ivyservice/DefaultIvyContextManager.java       |    0
 .../ivyservice/DefaultIvyDependencyPublisher.java  |   73 +
 .../artifacts/ivyservice/DefaultIvyExtraInfo.java  |   69 +
 .../ivyservice/DefaultIvyModuleDescriptor.java     |   45 +
 .../ivyservice/DefaultLenientConfiguration.java    |  169 +
 .../DefaultModuleDependencySubstitution.java       |   50 +
 .../DefaultProjectDependencySubstitution.java      |   28 +
 .../ivyservice/DefaultResolvedConfiguration.java   |    0
 .../ivyservice/DefaultUnresolvedDependency.java    |   41 +
 .../ivyservice/DependencySubstitutionResolver.java |   61 +
 .../ErrorHandlingArtifactDependencyResolver.java   |  256 +
 .../ivyservice/IvyBackedArtifactPublisher.java     |   83 +
 .../artifacts/ivyservice/IvyContextManager.java    |    0
 .../ivyservice/IvyDependencyPublisher.java         |   26 +
 .../artifacts/ivyservice/IvyLoggingAdaper.java     |    0
 .../ivyservice/IvyModuleDescriptorWriter.java      |    0
 .../api/internal/artifacts/ivyservice/IvyUtil.java |   90 +
 .../ivyservice/IvyXmlModuleDescriptorWriter.java   |  402 ++
 .../ivyservice/LocalComponentFactory.java          |   26 +
 .../internal/artifacts/ivyservice/NamespaceId.java |  100 +
 .../SelfResolvingDependencyResolver.java           |  113 +
 ...cuitEmptyConfigsArtifactDependencyResolver.java |  107 +
 .../clientmodule/ClientModuleResolver.java         |   77 +
 .../DefaultCachedModuleVersionList.java            |   38 +
 .../DefaultResolvedModuleVersion.java              |    0
 .../dynamicversions/ModuleVersionsCache.java       |   34 +
 .../dynamicversions/ModuleVersionsCacheEntry.java  |   28 +
 .../SingleFileBackedModuleVersionsCache.java       |  138 +
 .../ivyresolve/BaseModuleComponentRepository.java  |   55 +
 .../BaseModuleComponentRepositoryAccess.java       |   56 +
 ...cheLockReleasingModuleComponentsRepository.java |  100 +
 .../CachingModuleComponentRepository.java          |  402 ++
 .../ivyresolve/ComponentMetaDataResolveState.java  |   81 +
 .../ComponentSelectionRulesProcessor.java          |  118 +
 .../ConfiguredModuleComponentRepository.java       |   23 +
 .../DefaultVersionedComponentChooser.java          |  153 +
 .../ivyresolve/DependencyResolverIdentifier.java   |   46 +
 .../ivyresolve/DynamicVersionResolver.java         |  365 ++
 .../ivyresolve/ErrorHandlingArtifactResolver.java  |   58 +
 .../ErrorHandlingModuleComponentRepository.java    |  122 +
 .../ivyservice/ivyresolve/IvyContextualiser.java   |    0
 ...amicResolveModuleComponentRepositoryAccess.java |   68 +
 .../ivyresolve/LocalModuleComponentRepository.java |  114 +
 .../ivyservice/ivyresolve/MetadataProvider.java    |   76 +
 .../ivyresolve/ModuleComponentRepository.java      |   33 +
 .../ModuleComponentRepositoryAccess.java           |   55 +
 .../ivyresolve/ModuleComponentResolveState.java    |   26 +
 .../ivyresolve/NoRepositoriesResolver.java         |   71 +
 .../ivyservice/ivyresolve/RepositoryChain.java     |   31 +
 .../ivyresolve/RepositoryChainAdapter.java         |   71 +
 .../RepositoryChainArtifactResolver.java           |   88 +
 .../RepositoryChainDependencyResolver.java         |  143 +
 .../RepositoryChainModuleResolution.java           |   32 +
 .../ivyresolve/RepositoryChainModuleSource.java    |   36 +
 .../ivyservice/ivyresolve/ResolveIvyFactory.java   |  188 +
 .../StartParameterResolutionOverride.java          |  126 +
 .../ivyservice/ivyresolve/UserResolverChain.java   |   78 +
 .../ivyservice/ivyresolve/VersionInfo.java         |    0
 .../artifacts/ivyservice/ivyresolve/Versioned.java |    0
 .../ivyresolve/VersionedComponentChooser.java      |   31 +
 .../memcache/CachedModuleVersionResult.java        |   59 +
 .../memcache/InMemoryArtifactsCache.java           |   49 +
 .../ivyresolve/memcache/InMemoryCacheStats.java    |   29 +
 .../InMemoryCachedModuleComponentRepository.java   |   87 +
 .../memcache/InMemoryCachedRepositoryFactory.java  |   62 +
 .../ivyresolve/memcache/InMemoryMetaDataCache.java |   70 +
 .../InMemoryModuleComponentRepositoryCaches.java   |   42 +
 .../parser/AbstractModuleDescriptorParser.java     |   55 +
 .../ivyresolve/parser/BuildableIvyArtifact.java    |   47 +
 .../ivyresolve/parser/DescriptorParseContext.java  |   24 +
 .../parser/DisconnectedDescriptorParseContext.java |   33 +
 .../DisconnectedIvyXmlModuleDescriptorParser.java  |   65 +
 .../DownloadedIvyModuleDescriptorParser.java       |    0
 .../parser/GradlePomModuleDescriptorBuilder.java   |  402 ++
 .../parser/GradlePomModuleDescriptorParser.java    |  217 +
 .../parser/IvyXmlModuleDescriptorParser.java       | 1281 +++++
 .../ivyresolve/parser/MetaDataParseException.java  |   32 +
 .../ivyresolve/parser/MetaDataParser.java          |   29 +
 .../ivyservice/ivyresolve/parser/PomDomParser.java |  165 +
 .../ivyservice/ivyresolve/parser/PomParent.java    |    0
 .../ivyservice/ivyresolve/parser/PomReader.java    |  675 +++
 .../ivyresolve/parser/RootPomParent.java           |    0
 .../UnresolvedDependencyVersionException.java      |    0
 .../ivyresolve/parser/data/MavenDependencyKey.java |    0
 .../ivyresolve/parser/data/PomDependencyMgt.java   |    0
 .../ivyresolve/parser/data/PomProfile.java         |    0
 .../strategy/AbstractVersionSelector.java          |   35 +
 .../strategy/DefaultVersionComparator.java         |   47 +
 .../strategy/DefaultVersionSelectorScheme.java     |   45 +
 .../ivyresolve/strategy/ExactVersionSelector.java  |   41 +
 .../ivyresolve/strategy/LatestVersionSelector.java |   49 +
 .../strategy/MavenVersionSelectorScheme.java       |   62 +
 .../ivyresolve/strategy/ResolverStrategy.java      |   41 +
 .../strategy/StaticVersionComparator.java          |   81 +
 .../ivyresolve/strategy/SubVersionSelector.java    |   44 +
 .../ivyservice/ivyresolve/strategy/Version.java    |   40 +
 .../ivyresolve/strategy/VersionComparator.java     |   31 +
 .../ivyresolve/strategy/VersionParser.java         |  122 +
 .../ivyresolve/strategy/VersionRangeSelector.java  |  167 +
 .../ivyresolve/strategy/VersionSelector.java       |   55 +
 .../ivyresolve/strategy/VersionSelectorScheme.java |   36 +
 .../CachedModuleDescriptorParseContext.java        |   32 +
 .../modulecache/DefaultCachedMetaData.java         |   62 +
 .../modulecache/DefaultModuleArtifactsCache.java   |  182 +
 .../modulecache/DefaultModuleMetaDataCache.java    |  143 +
 .../modulecache/IvyModuleCacheEntry.java           |   35 +
 .../modulecache/MavenModuleCacheEntry.java         |   41 +
 .../modulecache/MissingModuleCacheEntry.java       |   25 +
 .../modulecache/ModuleArtifactsCache.java          |   37 +
 .../modulecache/ModuleDescriptorCacheEntry.java    |   77 +
 .../ModuleDescriptorCacheEntrySerializer.java      |   84 +
 .../modulecache/ModuleDescriptorStore.java         |   74 +
 .../modulecache/ModuleMetaDataCache.java           |   47 +
 .../ConfigurationsToArtifactsConverter.java        |   23 +
 .../ConfigurationsToModuleDescriptorConverter.java |   23 +
 .../DefaultConfigurationsToArtifactsConverter.java |   53 +
 ...tConfigurationsToModuleDescriptorConverter.java |   36 +
 .../DefaultExcludeRuleConverter.java               |    0
 .../moduleconverter/ExcludeRuleConverter.java      |    0
 .../ResolveLocalComponentFactory.java              |   62 +
 .../AbstractIvyDependencyDescriptorFactory.java    |   77 +
 ...ultDependenciesToModuleDescriptorConverter.java |   59 +
 .../DefaultDependencyDescriptorFactory.java        |   47 +
 .../DependenciesToModuleDescriptorConverter.java   |   25 +
 .../dependencies/DependencyDescriptorFactory.java  |   24 +
 ...ternalModuleIvyDependencyDescriptorFactory.java |   59 +
 .../IvyDependencyDescriptorFactory.java            |   26 +
 .../ProjectIvyDependencyDescriptorFactory.java     |   56 +
 .../ReflectiveDependencyDescriptorFactory.java     |    0
 .../DefaultProjectComponentRegistry.java           |   36 +
 .../projectmodule/DefaultProjectPublication.java   |   42 +
 .../DefaultProjectPublicationRegistry.java         |    0
 .../projectmodule/ProjectArtifactResolver.java     |   72 +
 .../projectmodule/ProjectComponentRegistry.java    |   22 +
 .../projectmodule/ProjectDependencyResolver.java   |   56 +
 .../projectmodule/ProjectPublication.java          |    0
 .../projectmodule/ProjectPublicationRegistry.java  |    0
 .../resolutionstrategy/DefaultCachePolicy.java     |  270 +
 .../DefaultComponentSelectionRules.java            |  143 +
 .../DefaultDependencySubstitutions.java            |  267 +
 .../DefaultExternalResourceCachePolicy.java        |    0
 .../DefaultResolutionStrategy.java                 |  160 +
 .../DependencySubstitutionsInternal.java           |   34 +
 .../ExternalResourceCachePolicy.java               |    0
 .../LatestConflictResolution.java                  |    0
 .../ModuleForcingResolveRule.java                  |   57 +
 .../StrictConflictResolution.java                  |    0
 .../resolveengine/ComponentResolutionState.java    |   38 +
 .../resolveengine/DefaultDependencyResolver.java   |  139 +
 .../DefaultDependencyToConfigurationResolver.java  |   81 +
 .../DefaultModuleResolutionFilter.java             |  764 +++
 .../DependencyToConfigurationResolver.java         |   30 +
 .../LatestModuleConflictResolver.java              |   69 +
 .../resolveengine/ModuleConflictResolver.java      |   30 +
 .../resolveengine/ModuleResolutionFilter.java      |   54 +
 .../resolveengine/StrictConflictResolver.java      |   30 +
 .../VersionSelectionReasonResolver.java            |   36 +
 .../graph/CompositeDependencyGraphVisitor.java     |   52 +
 .../graph/DependencyGraphBuilder.java              |  920 ++++
 .../graph/DependencyGraphVisitor.java              |   24 +
 .../ResolutionResultDependencyGraphVisitor.java    |   43 +
 ...esolvedConfigurationDependencyGraphVisitor.java |  178 +
 ...lvedProjectConfigurationResultGraphVisitor.java |   50 +
 .../graph/conflicts/CandidateModule.java           |   37 +
 .../graph/conflicts/CompositeConflictResolver.java |   44 +
 .../graph/conflicts/ConflictContainer.java         |  130 +
 .../graph/conflicts/ConflictHandler.java           |   43 +
 .../graph/conflicts/ConflictResolutionResult.java  |   32 +
 .../graph/conflicts/DefaultConflictHandler.java    |   74 +
 .../conflicts/DefaultConflictResolutionResult.java |   37 +
 .../graph/conflicts/PotentialConflict.java         |   33 +
 .../graph/conflicts/PotentialConflictFactory.java  |   39 +
 .../DefaultResolvedConfigurationBuilder.java       |  133 +
 .../DefaultTransientConfigurationResults.java      |   38 +
 .../oldresult/ResolvedConfigurationBuilder.java    |   44 +
 .../oldresult/ResolvedConfigurationResults.java    |    0
 .../oldresult/ResolvedContentsMapping.java         |    0
 .../oldresult/TransientConfigurationResults.java   |   29 +
 .../TransientConfigurationResultsBuilder.java      |  189 +
 .../DefaultResolvedProjectConfigurationResult.java |   74 +
 ...tResolvedProjectConfigurationResultBuilder.java |   56 +
 ...DefaultResolvedProjectConfigurationResults.java |   32 +
 .../ResolvedProjectConfigurationResult.java        |   27 +
 .../ResolvedProjectConfigurationResultBuilder.java |   25 +
 .../ResolvedProjectConfigurationResults.java       |   23 +
 .../result/CachingDependencyResultFactory.java     |   56 +
 .../result/ComponentIdentifierSerializer.java      |   76 +
 .../result/ComponentSelectionReasonSerializer.java |   59 +
 .../result/ComponentSelectorSerializer.java        |   76 +
 .../result/DefaultInternalDependencyResult.java    |   59 +
 .../result/DefaultModuleVersionSelection.java      |   45 +
 .../result/DefaultResolutionResultBuilder.java     |   85 +
 .../result/InternalDependencyResult.java           |   40 +
 .../result/InternalDependencyResultSerializer.java |   62 +
 .../result/ModuleVersionSelection.java             |   30 +
 .../result/ModuleVersionSelectionSerializer.java   |   47 +
 .../result/ResolutionResultBuilder.java            |    0
 .../result/StreamingResolutionResultBuilder.java   |  200 +
 .../result/VersionSelectionReasons.java            |   83 +
 .../resolveengine/store/CachedStoreFactory.java    |  103 +
 .../resolveengine/store/DefaultBinaryStore.java    |  144 +
 .../store/ResolutionResultsStoreFactory.java       |    0
 .../ivyservice/resolveengine/store/StoreSet.java   |    0
 .../ModuleVersionArtifactIdentifierSerializer.java |   54 +
 .../CannotLocateLocalMavenRepositoryException.java |    0
 .../DefaultLocalMavenRepositoryLocator.java        |  105 +
 .../mvnsettings/DefaultMavenFileLocations.java     |   50 +
 .../mvnsettings/DefaultMavenSettingsProvider.java  |   39 +
 .../mvnsettings/LocalMavenRepositoryLocator.java   |    0
 .../artifacts/mvnsettings/MavenFileLocations.java  |    0
 .../mvnsettings/MavenSettingsProvider.java         |    0
 .../query/DefaultArtifactResolutionQuery.java      |  163 +
 .../DefaultArtifactResolutionQueryFactory.java     |   48 +
 .../repositories/AbstractArtifactRepository.java   |   41 +
 .../AbstractAuthenticationSupportedRepository.java |  105 +
 .../repositories/DefaultBaseRepositoryFactory.java |   99 +
 .../DefaultFlatDirArtifactRepository.java          |   95 +
 .../repositories/DefaultIvyArtifactRepository.java |  195 +
 .../DefaultMavenArtifactRepository.java            |  128 +
 .../DefaultMavenLocalArtifactRepository.java       |   52 +
 .../repositories/DefaultPasswordCredentials.java   |    0
 .../repositories/PublicationAwareRepository.java   |    0
 .../repositories/ResolutionAwareRepository.java    |   26 +
 .../layout/AbstractRepositoryLayout.java           |   48 +
 .../layout/DefaultIvyPatternRepositoryLayout.java  |   80 +
 .../layout/GradleRepositoryLayout.java             |   42 +
 .../repositories/layout/IvyRepositoryLayout.java   |   40 +
 .../repositories/layout/MavenRepositoryLayout.java |   45 +
 .../repositories/layout/ResolvedPattern.java       |    0
 .../resolver/AbstractResourcePattern.java          |   87 +
 .../resolver/ChainedVersionLister.java             |   62 +
 .../resolver/ComponentMetadataDetailsAdapter.java  |   58 +
 .../DefaultExternalResourceArtifactResolver.java   |  104 +
 .../resolver/ExternalResourceArtifactResolver.java |   31 +
 .../resolver/ExternalResourceResolver.java         |  444 ++
 ...rnalResourceResolverDescriptorParseContext.java |   65 +
 .../repositories/resolver/IvyResolver.java         |  154 +
 .../repositories/resolver/IvyResourcePattern.java  |   60 +
 .../repositories/resolver/M2ResourcePattern.java   |   89 +
 .../repositories/resolver/MavenLocalResolver.java  |   79 +
 .../repositories/resolver/MavenMetadata.java       |    0
 .../repositories/resolver/MavenMetadataLoader.java |   90 +
 .../repositories/resolver/MavenPattern.java        |    0
 .../repositories/resolver/MavenResolver.java       |  280 ++
 .../MavenUniqueSnapshotComponentIdentifier.java    |   67 +
 ...ueSnapshotExternalResourceArtifactResolver.java |   49 +
 .../resolver/MavenUniqueSnapshotModuleSource.java  |   30 +
 .../repositories/resolver/MavenVersionLister.java  |   54 +
 .../resolver/PatternBasedResolver.java             |   29 +
 .../repositories/resolver/ResourcePattern.java     |   51 +
 .../resolver/ResourceVersionLister.java            |  149 +
 .../repositories/resolver/VersionLister.java       |   32 +
 .../resolver/VersionPatternVisitor.java            |   31 +
 .../transport/RepositoryTransport.java             |   27 +
 .../transport/RepositoryTransportFactory.java      |  145 +
 .../artifacts/result/AbstractDependencyResult.java |    0
 .../result/DefaultArtifactResolutionResult.java    |   45 +
 .../result/DefaultComponentArtifactsResult.java    |   51 +
 .../artifacts/result/DefaultResolutionResult.java  |    0
 .../result/DefaultResolvedArtifactResult.java      |   39 +
 .../result/DefaultResolvedComponentResult.java     |    0
 .../result/DefaultResolvedDependencyResult.java    |    0
 .../result/DefaultUnresolvedArtifactResult.java    |   37 +
 .../result/DefaultUnresolvedComponentResult.java   |   37 +
 .../result/DefaultUnresolvedDependencyResult.java  |   52 +
 .../artifacts/result/jvm/AbstractArtifact.java     |   51 +
 .../filestore/ivy/ArtifactIdentifierFileStore.java |   44 +
 .../ClientModuleNotationParserFactory.java         |   40 +
 .../DependencyClassPathNotationConverter.java      |   81 +
 .../DependencyFilesNotationConverter.java          |   42 +
 .../notations/DependencyMapNotationConverter.java  |   52 +
 .../notations/DependencyNotationParser.java        |   43 +
 .../DependencyProjectNotationConverter.java        |   43 +
 .../DependencyStringNotationConverter.java         |   74 +
 .../ModuleIdentiferNotationConverter.java          |   64 +
 .../notations/ProjectDependencyFactory.java        |   60 +
 .../AbstractModuleComponentResolveMetaData.java    |  138 +
 .../model/BuildableIvyModulePublishMetaData.java   |   27 +
 .../model/BuildableIvyModuleResolveMetaData.java   |   76 +
 .../model/DefaultIvyModulePublishMetaData.java     |   84 +
 .../model/DefaultIvyModuleResolveMetaData.java     |   65 +
 .../model/DefaultMavenModuleResolveMetaData.java   |   92 +
 .../DefaultModuleComponentArtifactIdentifier.java  |   88 +
 .../DefaultModuleComponentArtifactMetaData.java    |   68 +
 .../model/DefaultModuleComponentIdentifier.java    |  102 +
 .../model/DefaultModuleComponentSelector.java      |  116 +
 .../model/IvyModuleArtifactPublishMetaData.java    |   36 +
 .../external/model/IvyModulePublishMetaData.java   |   27 +
 .../external/model/IvyModuleResolveMetaData.java   |   39 +
 .../external/model/MavenModuleResolveMetaData.java |   28 +
 .../model/ModuleComponentArtifactIdentifier.java   |   30 +
 .../model/ModuleComponentArtifactMetaData.java     |   39 +
 .../model/ModuleComponentResolveMetaData.java      |   40 +
 .../MutableModuleComponentResolveMetaData.java     |   50 +
 .../model/DefaultLocalArtifactIdentifier.java      |   72 +
 .../local/model/DefaultLocalComponentMetaData.java |  182 +
 .../model/DefaultProjectComponentIdentifier.java   |   69 +
 .../model/DefaultProjectComponentSelector.java     |   80 +
 .../model/DefaultProjectDependencyMetaData.java    |   35 +
 .../local/model/DslOriginDependencyMetaData.java   |   30 +
 .../model/DslOriginDependencyMetaDataWrapper.java  |   79 +
 .../local/model/LocalArtifactMetaData.java         |   25 +
 .../local/model/LocalComponentMetaData.java        |   40 +
 .../local/model/MutableLocalComponentMetaData.java |   36 +
 .../local/model/OpaqueComponentIdentifier.java     |   60 +
 .../AbstractModuleDescriptorBackedMetaData.java    |  265 +
 .../model/ComponentArtifactIdentifier.java         |   34 +
 .../component/model/ComponentArtifactMetaData.java |   39 +
 .../component/model/ComponentResolveMetaData.java  |   90 +
 .../internal/component/model/ComponentUsage.java   |   20 +
 .../component/model/ConfigurationMetaData.java     |   41 +
 .../component/model/DefaultComponentUsage.java     |   33 +
 .../component/model/DefaultDependencyMetaData.java |  154 +
 .../component/model/DefaultIvyArtifactName.java    |  118 +
 .../component/model/DependencyMetaData.java        |   74 +
 .../internal/component/model/IvyArtifactName.java  |   37 +
 .../internal/component/model/ModuleSource.java     |   28 +
 .../resolve/ArtifactNotFoundException.java         |   38 +
 .../internal/resolve/ArtifactResolveException.java |   71 +
 .../resolve/ModuleVersionNotFoundException.java    |   92 +
 .../resolve/ModuleVersionResolveException.java     |  127 +
 .../resolve/resolver/ArtifactResolver.java         |   41 +
 .../resolver/ComponentMetaDataResolver.java        |   28 +
 .../resolver/DependencyToComponentIdResolver.java  |   29 +
 .../resolver/DependencyToComponentResolver.java    |   29 +
 .../resolver/ModuleToComponentResolver.java        |   30 +
 .../resolve/result/ArtifactResolveResult.java      |   37 +
 .../resolve/result/ArtifactSetResolveResult.java   |   35 +
 .../result/BuildableArtifactResolveResult.java     |   39 +
 .../result/BuildableArtifactSetResolveResult.java  |   27 +
 .../result/BuildableComponentIdResolveResult.java  |   33 +
 .../result/BuildableComponentResolveResult.java    |   43 +
 .../result/BuildableComponentSelectionResult.java  |   73 +
 ...ldableModuleComponentMetaDataResolveResult.java |   72 +
 ...BuildableModuleVersionListingResolveResult.java |   65 +
 .../resolve/result/ComponentIdResolveResult.java   |   45 +
 .../resolve/result/ComponentResolveResult.java     |   48 +
 .../DefaultBuildableArtifactResolveResult.java     |   67 +
 .../DefaultBuildableArtifactSetResolveResult.java  |   64 +
 .../DefaultBuildableComponentIdResolveResult.java  |   96 +
 .../DefaultBuildableComponentResolveResult.java    |   88 +
 .../DefaultBuildableComponentSelectionResult.java  |   96 +
 ...ldableModuleComponentMetaDataResolveResult.java |   97 +
 ...BuildableModuleVersionListingResolveResult.java |   82 +
 .../result/DefaultResourceAwareResolveResult.java  |   44 +
 .../internal/resolve/result/ResolveResult.java     |   32 +
 .../resolve/result/ResourceAwareResolveResult.java |   40 +
 .../cached/ByUrlCachedExternalResourceIndex.java   |   28 +
 .../internal/resource/cached/CachedArtifact.java   |   26 +
 .../resource/cached/CachedArtifactIndex.java       |   63 +
 .../resource/cached/CachedExternalResource.java    |   46 +
 .../cached/CachedExternalResourceIndex.java        |   71 +
 .../internal/resource/cached/CachedItem.java       |   49 +
 .../resource/cached/DefaultCachedArtifact.java     |   64 +
 .../cached/DefaultCachedExternalResource.java      |   67 +
 .../cached/DefaultCachedExternalResourceIndex.java |   51 +
 .../resource/cached/ivy/AbstractCachedIndex.java   |  104 +
 .../ArtifactAtRepositoryCachedArtifactIndex.java   |  110 +
 .../cached/ivy/ArtifactAtRepositoryKey.java        |   56 +
 .../ivy/LocallyAvailableResourceFinderFactory.java |  155 +
 ...PatternBasedLocallyAvailableResourceFinder.java |   63 +
 .../transfer/AbstractProgressLoggingHandler.java   |   80 +
 .../CacheAwareExternalResourceAccessor.java        |   38 +
 .../DefaultCacheAwareExternalResourceAccessor.java |  237 +
 .../ProgressLoggingExternalResourceAccessor.java   |   84 +
 .../ProgressLoggingExternalResourceUploader.java   |   62 +
 .../resource/transfer/ResourceOperation.java       |   70 +
 .../transport/AbstractRepositoryTransport.java     |   27 +
 .../DefaultExternalResourceRepository.java         |   84 +
 .../transport/ExternalResourceRepository.java      |   72 +
 .../ResourceConnectorRepositoryTransport.java      |   55 +
 .../transport/file/FileResourceConnector.java      |   90 +
 .../resource/transport/file/FileTransport.java     |   61 +
 .../internal/rules/ClosureBackedRuleAction.java    |   95 +
 .../internal/rules/DefaultRuleActionAdapter.java   |   60 +
 .../internal/rules/DefaultRuleActionValidator.java |   65 +
 .../gradle/internal/rules/NoInputsRuleAction.java  |   56 +
 .../java/org/gradle/internal/rules/RuleAction.java |   32 +
 .../gradle/internal/rules/RuleActionAdapter.java   |   28 +
 .../rules/RuleActionValidationException.java       |   34 +
 .../gradle/internal/rules/RuleActionValidator.java |   21 +
 .../internal/rules/RuleSourceBackedRuleAction.java |  102 +
 .../org/gradle/internal/rules/SpecRuleAction.java  |   40 +
 ...internal.artifacts.DependencyManagementServices |    0
 ...e.internal.service.scopes.PluginServiceRegistry |    0
 .../artifacts/DefaultArtifactIdentifierTest.groovy |    0
 .../artifacts/DefaultComponentSelectionTest.groovy |   53 +
 .../DefaultDependencyManagementServicesTest.groovy |   92 +
 .../artifacts/DefaultModuleIdentifierSpec.groovy   |    0
 .../DefaultModuleVersionIdentifierSpec.groovy      |    0
 .../DefaultModuleVersionSelectorTest.groovy        |    0
 .../artifacts/DefaultResolvedArtifactTest.groovy   |   48 +
 .../artifacts/DefaultResolvedDependencySpec.groovy |   92 +
 .../artifacts/DefaultResolvedDependencyTest.java   |  215 +
 ...pendencyManagementBuildScopeServicesTest.groovy |    0
 ...endencyManagementGlobalScopeServicesTest.groovy |    0
 .../ModuleVersionSelectorSerializerTest.groovy     |   33 +
 ...vedConfigurationIdentifierSerializerTest.groovy |   37 +
 .../ResolvedConfigurationIdentifierSpec.groovy     |    0
 .../internal/artifacts/ResolverResultsSpec.groovy  |   55 +
 .../DefaultComponentIdentifierFactoryTest.groovy   |   55 +
 .../configurations/ConfigurationsTest.java         |    0
 .../DefaultConfigurationContainerSpec.groovy       |  102 +
 .../DefaultConfigurationContainerTest.groovy       |  119 +
 .../configurations/DefaultConfigurationSpec.groovy |  359 ++
 .../configurations/DefaultConfigurationTest.java   |  906 ++++
 .../TasksFromDependentProjectsTest.groovy          |   73 +
 .../TasksFromProjectDependenciesTest.groovy        |   64 +
 .../internal/artifacts/dsl/ArtifactFileTest.groovy |    0
 .../ComponentModuleMetadataContainerTest.groovy    |   79 +
 .../dsl/ComponentSelectorParsersTest.groovy        |  174 +
 .../dsl/DefaultArtifactHandlerTest.groovy          |    0
 .../dsl/DefaultComponentMetadataHandlerTest.groovy |  412 ++
 .../dsl/ModuleVersionSelectorParsersTest.groovy    |  153 +
 ...lishArtifactNotationConverterFactoryTest.groovy |  122 +
 .../artifacts/ivyservice/ArtifactTypeTest.groovy   |   30 +
 .../artifacts/ivyservice/CacheLayoutTest.groovy    |   54 +
 ...cheLockingArtifactDependencyResolverTest.groovy |   45 +
 .../DefaultCacheLockingManagerTest.groovy          |    0
 .../DefaultDependencyResolveDetailsSpec.groovy     |  154 +
 .../ivyservice/DefaultIvyContextManagerTest.groovy |    0
 .../ivyservice/DefaultIvyExtraInfoTest.groovy      |   89 +
 .../DefaultIvyModuleDescriptorTest.groovy          |   50 +
 .../DefaultModuleDependencySubstitutionTest.groovy |  192 +
 ...DefaultProjectDependencySubstitutionTest.groovy |  102 +
 .../DefaultUnresolvedDependencySpec.groovy         |   34 +
 .../DependencySubstitutionResolverSpec.groovy      |   84 +
 ...orHandlingArtifactDependencyResolverTest.groovy |  158 +
 .../artifacts/ivyservice/IvyUtilTest.groovy        |   45 +
 .../IvyXmlModuleDescriptorWriterTest.groovy        |  146 +
 .../artifacts/ivyservice/NamespaceIdTest.groovy    |   64 +
 .../SelfResolvingDependencyResolverTest.groovy     |  136 +
 ...ptyConfigsArtifactDependencyResolverSpec.groovy |   77 +
 .../clientmodule/ClientModuleResolverTest.groovy   |   96 +
 .../BaseModuleComponentRepositoryTest.groovy       |   61 +
 .../CachingModuleComponentRepositoryTest.groovy    |  152 +
 .../ComponentSelectionRulesProcessorTest.groovy    |  323 ++
 .../DefaultVersionedComponentChooserTest.groovy    |  345 ++
 .../DependencyResolverIdentifierTest.groovy        |   63 +
 .../ErrorHandlingArtifactResolverTest.groovy       |   98 +
 ...solveModuleComponentRepositoryAccessTest.groovy |   72 +
 .../ivyresolve/MetadataProviderTest.groovy         |  121 +
 .../ivyresolve/RepositoryChainAdapterTest.groovy   |   72 +
 .../RepositoryChainArtifactResolverTest.groovy     |  128 +
 .../RepositoryChainDependencyResolverTest.groovy   |  582 +++
 .../ivyresolve/ResolveIvyFactoryTest.groovy        |  139 +
 .../memcache/CachedModuleVersionResultTest.groovy  |  118 +
 .../memcache/InMemoryArtifactsCacheTest.groovy     |   76 +
 ...emoryCachedModuleComponentRepositoryTest.groovy |  233 +
 .../InMemoryCachedRepositoryFactoryTest.groovy     |   77 +
 .../memcache/InMemoryMetaDataCacheTest.groovy      |  142 +
 ...tractGradlePomModuleDescriptorParserTest.groovy |   70 +
 .../ivyresolve/parser/AbstractPomReaderTest.groovy |   71 +
 ...onnectedIvyXmlModuleDescriptorParserTest.groovy |   80 +
 .../DownloadedIvyModuleDescriptorParserTest.groovy |    0
 ...adlePomModuleDescriptorParserProfileTest.groovy | 1735 +++++++
 .../GradlePomModuleDescriptorParserTest.groovy     | 2250 +++++++++
 .../parser/IvyXmlModuleDescriptorParserTest.groovy |  939 ++++
 .../ivyresolve/parser/PomReaderProfileTest.groovy  | 2364 +++++++++
 .../ivyresolve/parser/PomReaderTest.groovy         |  851 ++++
 .../parser/data/MavenDependencyKeyTest.groovy      |    0
 .../strategy/AbstractVersionSelectorTest.groovy    |   40 +
 .../strategy/DefaultVersionComparatorTest.groovy   |  201 +
 .../DefaultVersionSelectorSchemeTest.groovy        |   79 +
 .../strategy/ExactVersionSelectorTest.groovy       |   85 +
 .../strategy/LatestVersionSelectorTest.groovy      |   71 +
 .../strategy/MavenVersionSelectorSchemeTest.groovy |   66 +
 .../strategy/SubVersionSelectorTest.groovy         |   64 +
 .../ivyresolve/strategy/VersionParserTest.groovy   |  103 +
 .../strategy/VersionRangeSelectorTest.groovy       |  155 +
 .../modulecache/ModuleDescriptorStoreTest.groovy   |   77 +
 ...ltConfigurationsToArtifactsConverterTest.groovy |  100 +
 ...figurationsToModuleDescriptorConverterTest.java |   94 +
 .../DefaultExcludeRuleConverterTest.java           |    0
 .../moduleconverter/IvyConverterTestUtil.java      |    0
 .../ResolveLocalComponentFactoryTest.groovy        |   58 +
 ...actDependencyDescriptorFactoryInternalTest.java |  135 +
 ...endenciesToModuleDescriptorConverterTest.groovy |   87 +
 .../DefaultDependencyDescriptorFactoryTest.groovy  |   65 +
 ...ernalModuleDependencyDescriptorFactoryTest.java |   67 +
 .../ProjectDependencyDescriptorFactoryTest.groovy  |   63 +
 ...eflectiveDependencyDescriptorFactoryTest.groovy |    0
 .../ProjectDependencyResolverTest.groovy           |   68 +
 .../DefaultCachePolicySpec.groovy                  |  329 ++
 .../DefaultComponentSelectionRulesTest.groovy      |  301 ++
 .../DefaultDependencySubstitutionsSpec.groovy      |  328 ++
 .../DefaultResolutionStrategySpec.groovy           |  245 +
 .../ModuleForcingResolveRuleSpec.groovy            |   89 +
 .../DefaultModuleResolutionFilterTest.groovy       |  623 +++
 .../DependencyGraphBuilderTest.groovy              | 1095 +++++
 .../VersionSelectionReasonResolverTest.groovy      |   43 +
 .../graph/conflicts/ConflictContainerTest.groovy   |  149 +
 .../conflicts/DefaultConflictHandlerTest.groovy    |  101 +
 .../CachingDependencyResultFactoryTest.groovy      |   76 +
 .../ComponentIdentifierSerializerTest.groovy       |   60 +
 .../ComponentSelectionReasonSerializerTest.groovy  |   54 +
 .../result/ComponentSelectorSerializerTest.groovy  |   60 +
 .../DefaultResolutionResultBuilderSpec.groovy      |  284 ++
 .../resolveengine/result/DummyBinaryStore.groovy   |   48 +
 .../resolveengine/result/DummyStore.groovy         |    0
 .../InternalDependencyResultSerializerTest.groovy  |   80 +
 .../ModuleVersionSelectionSerializerTest.groovy    |   40 +
 .../result/ResolutionResultPrinter.groovy          |    0
 .../StreamingResolutionResultBuilderTest.groovy    |  139 +
 .../result/VersionSelectionReasonsTest.groovy      |   42 +
 .../store/CachedStoreFactoryTest.groovy            |    0
 .../store/DefaultBinaryStoreTest.groovy            |    0
 .../store/ResolutionResultsStoreFactoryTest.groovy |    0
 .../DefaultLocalMavenRepositoryLocatorTest.groovy  |  188 +
 .../DefaultArtifactResolutionQueryTest.groovy      |  150 +
 ...itoryChangingNameAfterContainerInclusion.groovy |   41 +
 ...actAuthenticationSupportedRepositoryTest.groovy |  201 +
 .../DefaultBaseRepositoryFactoryTest.groovy        |  104 +
 .../DefaultFlatDirArtifactRepositoryTest.groovy    |   82 +
 .../DefaultIvyArtifactRepositoryTest.groovy        |  280 ++
 .../DefaultMavenArtifactRepositoryTest.groovy      |  137 +
 .../DefaultMavenLocalRepositoryTest.groovy         |   66 +
 .../resolver/ChainedVersionListerTest.groovy       |  141 +
 .../resolver/ExternalResourceResolverTest.groovy   |  123 +
 .../repositories/resolver/IvyResolverTest.groovy   |   31 +
 .../resolver/IvyResourcePatternTest.groovy         |   89 +
 .../resolver/M2ResourcePatternTest.groovy          |  127 +
 .../repositories/resolver/MavenResolverTest.groovy |   31 +
 ...venUniqueSnapshotComponentIdentifierTest.groovy |   79 +
 ...shotExternalResourceArtifactResolverTest.groovy |   69 +
 .../resolver/MavenVersionListerTest.groovy         |  212 +
 .../resolver/ResourceVersionListerTest.groovy      |  198 +
 .../RepositoryTransportFactoryTest.groovy          |   76 +
 .../DefaultArtifactResolutionResultTest.groovy     |   59 +
 .../DefaultComponentArtifactsResultTest.groovy     |   43 +
 .../result/DefaultResolutionResultTest.groovy      |  113 +
 .../DefaultResolvedComponentResultTest.groovy      |   63 +
 ...DependencyClassPathNotationConverterTest.groovy |   69 +
 .../DependencyMapNotationConverterTest.groovy      |  139 +
 .../DependencyStringNotationConverterTest.groovy   |  176 +
 .../ModuleIdentiferNotationConverterTest.groovy    |   52 +
 .../notations/ProjectDependencyFactoryTest.groovy  |   64 +
 ...stractModuleComponentResolveMetaDataTest.groovy |  275 ++
 .../BuildableIvyModuleResolveMetaDataTest.groovy   |   92 +
 .../DefaultIvyModulePublishMetaDataTest.groovy     |   42 +
 .../DefaultIvyModuleResolveMetaDataTest.groovy     |   66 +
 .../DefaultMavenModuleResolveMetaDataTest.groovy   |   74 +
 ...ultModuleComponentArtifactIdentifierTest.groovy |   66 +
 ...faultModuleComponentArtifactMetaDataTest.groovy |   71 +
 .../DefaultModuleComponentIdentifierTest.groovy    |   81 +
 .../DefaultModuleComponentSelectorTest.groovy      |  118 +
 .../DefaultLocalArtifactIdentifierTest.groovy      |   67 +
 .../model/DefaultLocalComponentMetaDataTest.groovy |  221 +
 .../DefaultProjectComponentIdentifierTest.groovy   |   58 +
 .../DefaultProjectComponentSelectorTest.groovy     |   92 +
 .../model/OpaqueComponentIdentifierTest.groovy     |   60 +
 .../model/DefaultDependencyMetaDataTest.groovy     |  203 +
 .../model/DefaultIvyArtifactNameTest.groovy        |   65 +
 .../resolve/ArtifactNotFoundExceptionTest.groovy   |   47 +
 .../ModuleVersionNotFoundExceptionTest.groovy      |  135 +
 .../ModuleVersionResolveExceptionTest.groovy       |   56 +
 ...efaultBuildableArtifactResolveResultTest.groovy |  106 +
 ...ultBuildableArtifactSetResolveResultTest.groovy |   75 +
 ...ultBuildableComponentIdResolveResultTest.groovy |   96 +
 ...faultBuildableComponentResolveResultTest.groovy |  154 +
 ...ultBuildableComponentSelectionResultTest.groovy |   94 +
 ...ModuleComponentMetaDataResolveResultTest.groovy |  108 +
 ...bleModuleVersionListingResolveResultTest.groovy |   80 +
 .../DefaultResourceAwareResolveResultTest.groovy   |   34 +
 .../DefaultArtifactResolutionCacheTest.groovy      |   80 +
 ...positeLocallyAvailableResourceFinderTest.groovy |   74 +
 ...zyLocallyAvailableResourceCandidatesTest.groovy |   57 +
 ...ltCacheAwareExternalResourceAccessorTest.groovy |  335 ++
 ...gressLoggingExternalResourceAccessorTest.groovy |  147 +
 ...gressLoggingExternalResourceUploaderTest.groovy |   73 +
 .../resource/transfer/ResourceOperationTest.groovy |   95 +
 .../rules/ClosureBackedRuleActionTest.groovy       |  149 +
 .../rules/DefaultRuleActionAdapterTest.groovy      |  135 +
 .../rules/DefaultRuleActionValidatorTest.groovy    |   56 +
 .../internal/rules/NoInputsRuleActionTest.groovy   |   60 +
 .../rules/RuleSourceBackedRuleActionTest.groovy    |  167 +
 .../ivyservice/ivyresolve/parser/test-full.xml     |  107 +
 ...ifactAtRepositoryCachedArtifactIndexTest.groovy |  130 +
 .../result/ResolutionResultDataBuilder.groovy      |   48 +
 ...tractIvyRemoteRepoResolveIntegrationTest.groovy |  428 ++
 subprojects/diagnostics/diagnostics.gradle         |   11 +-
 .../plugins/HelpTasksPluginIntegrationTest.groovy  |   43 +
 .../ComponentReportIntegrationTest.groovy          |  154 +
 .../HtmlDependencyReportTaskIntegrationTest.groovy |   71 +-
 .../model/ModelReportIntegrationTest.groovy        |   57 +
 ...pendencyInsightReportTaskIntegrationTest.groovy |   51 +-
 .../DependencyReportTaskIntegrationTest.groovy     |  211 +-
 .../diagnostics/HelpTaskIntegrationTest.groovy     |  122 +-
 .../TaskReportTaskIntegrationTest.groovy           |   78 +-
 .../org/gradle/api/plugins/HelpTasksPlugin.groovy  |   68 -
 .../org/gradle/api/plugins/HelpTasksPlugin.java    |  191 +
 .../gradle/api/plugins/ProjectReportsPlugin.java   |   12 +-
 .../plugins/internal/HelpTasksAutoApplyAction.java |    2 +-
 .../api/reporting/components/ComponentReport.java  |  101 +
 .../internal/AbstractBinaryRenderer.java           |   71 +
 .../components/internal/BinaryRenderer.java        |   26 +
 .../components/internal/ComponentRenderer.java     |   50 +
 .../internal/ComponentReportRenderer.java          |  108 +
 .../components/internal/DiagnosticsServices.java   |   45 +
 .../components/internal/SourceSetRenderer.java     |   53 +
 .../internal/TypeAwareBinaryRenderer.java          |   57 +
 .../api/reporting/components/package-info.java     |   20 +
 .../dependencies/HtmlDependencyReportTask.java     |   34 +-
 .../internal/HtmlDependencyReporter.groovy         |   99 +-
 .../JsonDependencyReportIndexRenderer.groovy       |   79 -
 .../internal/JsonProjectDependencyRenderer.groovy  |   13 +-
 .../dependencies/internal/ProjectPageRenderer.java |   88 +
 .../internal/ProjectsPageRenderer.java             |   85 +
 .../gradle/api/reporting/model/ModelReport.java    |   64 +
 .../model/internal/ModelReportRenderer.java        |   56 +
 .../gradle/api/reporting/model/package-info.java   |   20 +
 .../api/tasks/diagnostics/AbstractReportTask.java  |   17 +-
 .../diagnostics/DependencyInsightReportTask.groovy |   39 +-
 .../api/tasks/diagnostics/ProjectReportTask.java   |   10 +-
 .../api/tasks/diagnostics/TaskReportTask.java      |   20 +-
 .../tasks/diagnostics/internal/ReportRenderer.java |   12 +-
 .../diagnostics/internal/TaskReportRenderer.java   |   23 +-
 .../diagnostics/internal/TextReportRenderer.java   |   56 +-
 .../AsciiDependencyReportRenderer.java             |    2 +-
 .../dsl/DependencyResultSpecNotationConverter.java |   46 +
 .../dsl/DependencyResultSpecNotationParser.java    |   54 -
 .../internal/graph/DependencyGraphRenderer.groovy  |    4 +-
 .../graph/nodes/UnresolvedDependencyEdge.java      |    3 +-
 .../insight/DependencyInsightReporter.groovy       |   10 +-
 .../internal/insight/DependencyResultSorter.java   |   31 +-
 .../internal/text/DefaultTextReportBuilder.java    |  114 +
 .../internal/text/TextReportBuilder.java           |   43 +
 .../main/groovy/org/gradle/configuration/Help.java |   38 +-
 .../gradle/configuration/TaskDetailPrinter.java    |   50 +-
 ...properties => org.gradle.help-tasks.properties} |    0
 ...erties => org.gradle.project-report.properties} |    0
 ...rties => org.gradle.project-reports.properties} |    0
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../diagnostics/htmldependencyreport/index.html    |   48 -
 .../diagnostics/htmldependencyreport/script.js     |   27 +-
 .../diagnostics/htmldependencyreport/style.css     |    5 +-
 .../diagnostics/htmldependencyreport/template.html |   41 -
 .../diagnostics/htmldependencyreport/tree.css      |   10 +-
 .../gradle/api/plugins/HelpTasksPluginSpec.groovy  |   46 +-
 .../internal/ComponentRendererTest.groovy          |  106 +
 .../internal/ComponentReportRendererTest.groovy    |  142 +
 .../internal/SourceSetRendererTest.groovy          |   79 +
 .../tasks/diagnostics/AbstractReportTaskTest.java  |    8 +-
 .../DependencyInsightReportTaskSpec.groovy         |    3 +-
 .../api/tasks/diagnostics/TaskReportTaskTest.java  |    6 +-
 .../DependencyResultSpecNotationParserSpec.groovy  |   23 +-
 .../internal/dsl/DependencyResultSpecTest.groovy   |    2 +-
 .../AbstractRenderableDependencyResultSpec.groovy  |    8 +-
 .../nodes/RenderableDependencyResultTest.groovy    |    2 +-
 ...RenderableUnresolvedDependencyResultTest.groovy |    2 +-
 .../internal/graph/nodes/SimpleDependency.java     |    2 +-
 .../insight/DependencyInsightReporterSpec.groovy   |   17 +-
 .../insight/DependencyResultSorterSpec.groovy      |   40 +-
 .../text/DefaultTextReportBuilderTest.groovy       |  152 +
 .../AbstractComponentReportIntegrationTest.groovy  |   51 +
 .../ComponentReportOutputFormatter.groovy          |   46 +
 subprojects/distributions/distributions.gradle     |    3 +
 .../gradle/AllDistributionIntegrationSpec.groovy   |    5 +
 .../gradle/BinDistributionIntegrationSpec.groovy   |    5 +
 .../org/gradle/DistributionIntegrationSpec.groovy  |   55 +-
 .../gradle/SrcDistributionIntegrationSpec.groovy   |    5 +
 subprojects/distributions/src/toplevel/LICENSE     |   18 +-
 subprojects/distributions/src/toplevel/NOTICE      |    1 -
 subprojects/docs/docs.gradle                       |   83 +-
 subprojects/docs/src/docs/css/base.css             |    2 +-
 subprojects/docs/src/docs/css/dsl.css              |    6 +-
 subprojects/docs/src/docs/css/release-notes.css    |    6 +-
 subprojects/docs/src/docs/css/userguide.css        |    4 -
 subprojects/docs/src/docs/dsl/dsl.xml              |  128 +-
 .../org.gradle.api.NamedDomainObjectCollection.xml |   44 +
 .../org.gradle.api.NamedDomainObjectContainer.xml  |   44 +
 ...ml => org.gradle.api.NamedDomainObjectList.xml} |    0
 ...xml => org.gradle.api.NamedDomainObjectSet.xml} |    0
 .../docs/src/docs/dsl/org.gradle.api.Project.xml   |   18 -
 ...org.gradle.api.artifacts.ComponentSelection.xml |   47 +
 ...radle.api.artifacts.ComponentSelectionRules.xml |   44 +
 ...gradle.api.artifacts.ConfigurationContainer.xml |    3 -
 ...org.gradle.api.artifacts.ResolutionStrategy.xml |    6 +
 ....api.artifacts.dsl.ComponentMetadataHandler.xml |   44 +
 ...rtifacts.dsl.ComponentModuleMetadataHandler.xml |   41 +
 ....gradle.api.artifacts.dsl.DependencyHandler.xml |    9 +
 ....gradle.api.artifacts.dsl.RepositoryHandler.xml |    3 -
 ...api.artifacts.query.ArtifactResolutionQuery.xml |   47 +
 ...i.artifacts.repositories.ArtifactRepository.xml |   41 +
 ...ifacts.repositories.AuthenticationSupported.xml |   44 +
 .../dsl/org.gradle.api.plugins.PluginAware.xml     |   31 +
 .../dsl/org.gradle.api.plugins.PluginManager.xml   |   34 +
 .../dsl/org.gradle.api.plugins.antlr.AntlrTask.xml |    1 +
 .../org.gradle.api.plugins.quality.Checkstyle.xml  |    4 +
 ...dle.api.plugins.quality.CheckstyleExtension.xml |   12 +-
 .../org.gradle.api.plugins.quality.CodeNarc.xml    |    4 +
 ...radle.api.plugins.quality.CodeNarcExtension.xml |   14 +-
 .../org.gradle.api.plugins.quality.FindBugs.xml    |    8 +
 ...radle.api.plugins.quality.FindBugsExtension.xml |   10 +-
 ...s.quality.GroovyCodeQualityPluginConvention.xml |   39 -
 ...ins.quality.JavaCodeQualityPluginConvention.xml |   43 -
 .../dsl/org.gradle.api.plugins.quality.Pmd.xml     |    8 +
 ...org.gradle.api.plugins.quality.PmdExtension.xml |   10 +-
 ....gradle.api.publish.ivy.IvyModuleDescriptor.xml |   25 -
 ...dle.api.publish.ivy.IvyModuleDescriptorSpec.xml |   37 +
 .../dsl/org.gradle.api.publish.maven.MavenPom.xml  |    3 +
 ....publish.maven.tasks.AbstractPublishToMaven.xml |   25 +
 ...ublish.maven.tasks.PublishToMavenRepository.xml |    1 -
 ...e.api.reporting.components.ComponentReport.xml} |    0
 ...org.gradle.api.reporting.model.ModelReport.xml} |    0
 .../org.gradle.api.resources.ResourceHandler.xml   |   47 +
 .../dsl/org.gradle.api.resources.TextResource.xml  |   47 +
 ...rg.gradle.api.resources.TextResourceFactory.xml |   47 +
 .../dsl/org.gradle.api.tasks.AbstractExecTask.xml  |   67 +
 .../src/docs/dsl/org.gradle.api.tasks.Exec.xml     |   47 +-
 ...le.api.tasks.application.CreateStartScripts.xml |   24 -
 .../docs/dsl/org.gradle.api.tasks.bundling.Jar.xml |   19 -
 ...org.gradle.api.tasks.compile.CompileOptions.xml |   16 +-
 ...adle.api.tasks.compile.GroovyCompileOptions.xml |   16 +-
 .../org.gradle.api.tasks.compile.JavaCompile.xml   |    4 +
 .../dsl/org.gradle.api.tasks.javadoc.Javadoc.xml   |    4 +
 .../org.gradle.api.tasks.scala.ScalaCompile.xml    |   14 +-
 ....gradle.api.tasks.scala.ScalaCompileOptions.xml |    4 -
 .../docs/dsl/org.gradle.api.tasks.testing.Test.xml |   12 -
 ...le.jvm.application.tasks.CreateStartScripts.xml |   26 +
 .../docs/src/docs/dsl/org.gradle.jvm.tasks.Jar.xml |   33 +
 ... => org.gradle.jvm.toolchain.JavaToolChain.xml} |    0
 .../dsl/org.gradle.language.DependentSourceSet.xml |    3 -
 ...l => org.gradle.language.PreprocessingTool.xml} |    0
 ...g.gradle.language.assembler.tasks.Assemble.xml} |    0
 ...ml => org.gradle.language.c.tasks.CCompile.xml} |    0
 ... org.gradle.language.cpp.plugins.CppPlugin.xml} |    0
 ...> org.gradle.language.cpp.tasks.CppCompile.xml} |    0
 ...veplatform.tasks.AbstractNativeCompileTask.xml} |    0
 ...anguage.objectivec.tasks.ObjectiveCCompile.xml} |    0
 ...age.objectivecpp.tasks.ObjectiveCppCompile.xml} |    0
 ...e.language.rc.tasks.WindowsResourceCompile.xml} |    0
 ...e.language.scala.tasks.AbstractScalaCompile.xml |   51 +
 ...g.gradle.nativebinaries.ProjectNativeBinary.xml |   68 -
 ...radle.nativebinaries.ProjectNativeComponent.xml |   53 -
 ...adle.nativebinaries.TargetedNativeComponent.xml |   48 -
 ...org.gradle.nativebinaries.platform.Platform.xml |   50 -
 ...tivebinaries.test.ProjectComponentTestSuite.xml |   41 -
 .../org.gradle.nativebinaries.toolchain.Gcc.xml    |   40 -
 ...ies.toolchain.PlatformConfigurableToolChain.xml |   44 -
 ...xml => org.gradle.nativeplatform.BuildType.xml} |    0
 ...g.gradle.nativeplatform.BuildTypeContainer.xml} |    0
 ...er.xml => org.gradle.nativeplatform.Flavor.xml} |    0
 ... org.gradle.nativeplatform.FlavorContainer.xml} |    0
 ... => org.gradle.nativeplatform.NativeBinary.xml} |    0
 .../org.gradle.nativeplatform.NativeBinarySpec.xml |   56 +
 ...dle.nativeplatform.NativeComponentExtension.xml |   50 +
 ...g.gradle.nativeplatform.NativeComponentSpec.xml |   41 +
 ...org.gradle.nativeplatform.NativeExecutable.xml} |    0
 ...adle.nativeplatform.NativeExecutableBinary.xml} |    0
 ....nativeplatform.NativeExecutableBinarySpec.xml} |    0
 ...gradle.nativeplatform.NativeExecutableSpec.xml} |    0
 ...=> org.gradle.nativeplatform.NativeLibrary.xml} |    0
 ....gradle.nativeplatform.NativeLibraryBinary.xml} |    0
 ...rg.gradle.nativeplatform.NativeLibrarySpec.xml} |    0
 ... org.gradle.nativeplatform.PrebuiltLibrary.xml} |    0
 ...nativeplatform.PrebuiltSharedLibraryBinary.xml} |    0
 ...nativeplatform.PrebuiltStaticLibraryBinary.xml} |    0
 ....gradle.nativeplatform.SharedLibraryBinary.xml} |    0
 ...adle.nativeplatform.SharedLibraryBinarySpec.xml |   44 +
 ....gradle.nativeplatform.StaticLibraryBinary.xml} |    0
 ...dle.nativeplatform.StaticLibraryBinarySpec.xml} |    0
 ...adle.nativeplatform.TargetedNativeComponent.xml |   45 +
 ...Tool.xml => org.gradle.nativeplatform.Tool.xml} |    0
 ....nativeplatform.platform.PlatformContainer.xml} |    0
 ...adle.nativeplatform.tasks.AbstractLinkTask.xml} |    0
 ...e.nativeplatform.tasks.CreateStaticLibrary.xml} |    0
 ...dle.nativeplatform.tasks.InstallExecutable.xml} |    0
 ...gradle.nativeplatform.tasks.LinkExecutable.xml} |    0
 ...dle.nativeplatform.tasks.LinkSharedLibrary.xml} |    0
 ...iveplatform.test.NativeTestSuiteBinarySpec.xml} |    0
 ...le.nativeplatform.test.NativeTestSuiteSpec.xml} |    0
 ...dle.nativeplatform.test.TestSuiteContainer.xml} |    0
 ...tiveplatform.test.cunit.CUnitTestSuiteSpec.xml} |    0
 ...orm.test.googletest.GoogleTestTestSuiteSpec.xml |   38 +
 ...nativeplatform.test.tasks.RunTestExecutable.xml |   22 +
 ... org.gradle.nativeplatform.toolchain.Clang.xml} |    0
 ...iveplatform.toolchain.ConfigurableToolChain.xml |   45 +
 ...=> org.gradle.nativeplatform.toolchain.Gcc.xml} |    0
 ...eplatform.toolchain.GccCompatibleToolChain.xml} |    0
 ...orm.toolchain.PlatformConfigurableToolChain.xml |   39 +
 ...nativeplatform.toolchain.ToolChainRegistry.xml} |    0
 ....gradle.nativeplatform.toolchain.VisualCpp.xml} |    0
 ...atform.toolchain.plugins.GppCompilerPlugin.xml} |    0
 ...toolchain.plugins.MicrosoftVisualCppPlugin.xml} |    0
 ...ml => org.gradle.platform.base.Application.xml} |    0
 ...Set.xml => org.gradle.platform.base.Binary.xml} |    0
 ...> org.gradle.platform.base.BinaryContainer.xml} |    0
 .../dsl/org.gradle.platform.base.BinarySpec.xml    |   50 +
 .../dsl/org.gradle.platform.base.ComponentSpec.xml |   50 +
 ...radle.platform.base.ComponentSpecContainer.xml} |    0
 ...et.xml => org.gradle.platform.base.Library.xml} |    0
 ...ml => org.gradle.platform.base.LibrarySpec.xml} |    0
 ...le.platform.base.PlatformAwareComponentSpec.xml |   41 +
 ...rg.gradle.plugin.use.PluginDependenciesSpec.xml |   41 +
 .../org.gradle.plugin.use.PluginDependencySpec.xml |   41 +
 ...lugins.ide.eclipse.GenerateEclipseClasspath.xml |   40 +-
 ...adle.plugins.ide.eclipse.GenerateEclipseJdt.xml |    4 +
 ....plugins.ide.eclipse.GenerateEclipseProject.xml |    6 +-
 ...ins.ide.eclipse.GenerateEclipseWtpComponent.xml |   53 +-
 ...plugins.ide.eclipse.GenerateEclipseWtpFacet.xml |    4 +-
 ....gradle.plugins.ide.idea.GenerateIdeaModule.xml |    5 +
 ...gradle.plugins.ide.idea.GenerateIdeaProject.xml |    5 +
 ...adle.plugins.ide.idea.GenerateIdeaWorkspace.xml |    4 +
 ...g.gradle.plugins.ide.idea.model.IdeaProject.xml |    5 +
 .../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          |   36 +-
 .../docs/src/docs/release/content/script.js        |    7 +-
 subprojects/docs/src/docs/release/notes-next.md    |  113 +
 .../docs/src/docs/release/notes-template.md        |    6 +-
 subprojects/docs/src/docs/release/notes.md         |  544 ++-
 .../docs/src/docs/userguide/announcePlugin.xml     |    4 +-
 subprojects/docs/src/docs/userguide/ant.xml        |   17 +-
 .../docs/src/docs/userguide/antlrPlugin.xml        |   28 +-
 .../docs/src/docs/userguide/applicationPlugin.xml  |  150 +-
 .../userguide/artifactDependenciesTutorial.xml     |   14 +-
 .../docs/src/docs/userguide/artifactMngmt.xml      |   12 +-
 .../docs/userguide/buildAnnouncementsPlugin.xml    |    2 +-
 .../src/docs/userguide/buildDashboardPlugin.xml    |    6 +-
 .../docs/src/docs/userguide/buildEnvironment.xml   |  115 +-
 .../docs/src/docs/userguide/buildInitPlugin.xml    |   54 +-
 .../docs/src/docs/userguide/buildLifecycle.xml     |   81 +-
 .../src/docs/userguide/buildScriptsTutorial.xml    |   31 +-
 .../docs/src/docs/userguide/checkstylePlugin.xml   |    4 +-
 .../docs/src/docs/userguide/codeNarcPlugin.xml     |    4 +-
 .../docs/src/docs/userguide/commandLine.xml        |   84 +-
 .../src/docs/userguide/commandLineTutorial.xml     |   19 +-
 .../docs/src/docs/userguide/comparingBuilds.xml    |   12 +-
 .../docs/src/docs/userguide/customPlugins.xml      |   96 +-
 .../docs/src/docs/userguide/customTasks.xml        |   14 +-
 subprojects/docs/src/docs/userguide/depMngmt.xml   |  556 ++-
 .../docs/src/docs/userguide/distributionPlugin.xml |  100 +-
 subprojects/docs/src/docs/userguide/earPlugin.xml  |   18 +-
 .../docs/src/docs/userguide/eclipsePlugin.xml      |  142 +-
 subprojects/docs/src/docs/userguide/embedding.xml  |   38 +-
 .../docs/src/docs/userguide/featureLifecycle.xml   |   12 +-
 .../docs/src/docs/userguide/findBugsPlugin.xml     |    4 +-
 .../docs/src/docs/userguide/gradleDaemon.xml       |  311 +-
 .../docs/src/docs/userguide/gradleWrapper.xml      |   32 +-
 .../docs/src/docs/userguide/groovyPlugin.xml       |   21 +-
 .../docs/src/docs/userguide/groovyTutorial.xml     |    8 +-
 .../docs/src/docs/userguide/guiTutorial.xml        |   16 +-
 subprojects/docs/src/docs/userguide/ideaPlugin.xml |   42 +-
 .../userguide/img/codeQualityPluginTasks.graphml   |  135 -
 .../docs/userguide/img/codeQualityPluginTasks.png  |  Bin 9278 -> 0 bytes
 .../userguide/img/commandLineTutorialTasks.graphml |  245 +-
 .../userguide/img/commandLineTutorialTasks.png     |  Bin 5469 -> 4220 bytes
 .../docs/userguide/img/groovyPluginTasks.graphml   |  439 +-
 .../src/docs/userguide/img/groovyPluginTasks.png   |  Bin 17912 -> 13717 bytes
 .../src/docs/userguide/img/javaPluginTasks.graphml |  630 ++-
 .../src/docs/userguide/img/javaPluginTasks.png     |  Bin 25445 -> 21111 bytes
 .../docs/userguide/img/jettyPluginTasks.graphml    |  204 +-
 .../src/docs/userguide/img/jettyPluginTasks.png    |  Bin 5898 -> 5692 bytes
 .../docs/userguide/img/scalaPluginTasks.graphml    |  439 +-
 .../src/docs/userguide/img/scalaPluginTasks.png    |  Bin 17262 -> 13331 bytes
 .../src/docs/userguide/img/warPluginTasks.graphml  |  139 +-
 .../docs/src/docs/userguide/img/warPluginTasks.png |  Bin 2113 -> 1782 bytes
 .../docs/src/docs/userguide/initscripts.xml        |   15 +-
 .../docs/src/docs/userguide/installation.xml       |   20 +-
 .../docs/src/docs/userguide/introduction.xml       |    3 +
 .../docs/src/docs/userguide/jacocoPlugin.xml       |    4 +-
 .../docs/src/docs/userguide/javaGradlePlugin.xml   |   55 +
 .../userguide/javaLibraryDistributionPlugin.xml    |   10 +-
 subprojects/docs/src/docs/userguide/javaPlugin.xml |  136 +-
 .../docs/userguide/javaProjectGenericLayout.xml    |    2 +
 .../src/docs/userguide/javaProjectMainLayout.xml   |    2 +
 .../src/docs/userguide/javaProjectTestLayout.xml   |    2 +
 .../docs/src/docs/userguide/javaTutorial.xml       |   33 +-
 .../docs/src/docs/userguide/jdependPlugin.xml      |    4 +-
 .../docs/src/docs/userguide/jettyPlugin.xml        |    2 +-
 subprojects/docs/src/docs/userguide/logging.xml    |    2 +-
 .../docs/src/docs/userguide/mavenPlugin.xml        |   38 +-
 .../docs/src/docs/userguide/multiproject.xml       |  284 +-
 .../docs/src/docs/userguide/nativeBinaries.xml     |  436 +-
 subprojects/docs/src/docs/userguide/newModel.xml   |  370 ++
 .../docs/src/docs/userguide/organizeBuildLogic.xml |   34 +-
 subprojects/docs/src/docs/userguide/osgi.xml       |    7 +-
 subprojects/docs/src/docs/userguide/overview.xml   |   29 +-
 subprojects/docs/src/docs/userguide/plugins.xml    |  289 +-
 subprojects/docs/src/docs/userguide/pmdPlugin.xml  |    4 +-
 .../docs/src/docs/userguide/potentialTraps.xml     |    2 +-
 .../docs/src/docs/userguide/projectReports.xml     |    9 +-
 .../docs/src/docs/userguide/publishingIvy.xml      |   66 +-
 .../docs/src/docs/userguide/publishingMaven.xml    |   32 +-
 .../docs/src/docs/userguide/scalaPlugin.xml        |   27 +-
 .../docs/src/docs/userguide/signingPlugin.xml      |   18 +-
 .../docs/src/docs/userguide/sonarRunnerPlugin.xml  |   96 +-
 .../docs/src/docs/userguide/standardPlugins.xml    |   15 +-
 subprojects/docs/src/docs/userguide/tasks.xml      |   99 +-
 .../docs/src/docs/userguide/thisAndThat.xml        |  132 -
 .../docs/src/docs/userguide/troubleshooting.xml    |    4 +-
 subprojects/docs/src/docs/userguide/userguide.xml  |    5 +-
 subprojects/docs/src/docs/userguide/warPlugin.xml  |   14 +-
 .../docs/src/docs/userguide/webTutorial.xml        |    9 +-
 .../docs/src/docs/userguide/workingWithFiles.xml   |   16 +-
 .../docs/src/docs/userguide/wrapperPlugin.xml      |    6 +-
 .../src/docs/userguide/writingBuildScripts.xml     |   48 +-
 subprojects/docs/src/samples/antlr/build.gradle    |   11 +-
 .../antlr/src/main/antlr/org/gradle/Calculator.g   |   23 +-
 .../src/test/java/org/gradle/GrammarTest.java      |    9 +-
 .../docs/src/samples/application/build.gradle      |   14 +-
 .../docs/src/samples/buildDashboard/build.gradle   |    2 +-
 .../samples/clientModuleDependencies/build.gradle  |    2 +-
 .../docs/src/samples/codeQuality/build.gradle      |    2 +-
 .../samples/componentMetadataRules/build.gradle    |   98 +
 .../repo/org.sample/api/1.9/ivy-1.9.xml            |    9 +
 .../repo/org.sample/api/2.0/ivy-2.0.xml            |    9 +
 .../repo/org.sample/client/1.3/ivy-1.3.xml         |    9 +
 .../repo/org.sample/client/1.4/ivy-1.4.xml         |    9 +
 .../repo/org.sample/client/1.5/ivy-1.5.xml         |    9 +
 .../repo/org.sample/lib/1.9/ivy-1.9.xml            |   25 +
 .../repo/org.sample/lib/2.0/ivy-2.0.xml            |   27 +
 .../samples/componentSelectionRules/build.gradle   |  173 +
 .../repo/org.sample/api/1.3.0/ivy-1.3.0.xml        |   25 +
 .../repo/org.sample/api/1.4/ivy-1.4.xml            |   25 +
 .../repo/org.sample/api/1.5/ivy-1.5.xml            |   27 +
 .../repo/org.sample/lib/1.9/ivy-1.9.xml            |   26 +
 .../repo/org.sample/lib/2.0/ivy-2.0.xml            |   26 +
 .../samples/customModel/componentType/build.gradle |  103 +
 .../samples/customModel/languageType/build.gradle  |   32 +
 .../customModel/languageType/buildSrc/build.gradle |   27 +
 .../DefaultDocumentationBinary.groovy              |   21 +
 .../DefaultDocumentationComponent.groovy           |   21 +
 .../documentation/DocumentationBinary.groovy       |   21 +
 .../documentation/DocumentationComponent.groovy    |   21 +
 .../documentation/DocumentationPlugin.groovy       |   59 +
 .../documentation/DocumentationSourceSet.groovy    |   29 +
 .../markdown/DefaultMarkdownSourceSet.groovy       |   24 +
 .../sample/markdown/MarkdownHtmlCompile.groovy     |   60 +
 .../groovy/sample/markdown/MarkdownPlugin.groovy   |   47 +
 .../sample/markdown/MarkdownSourceSet.groovy       |   29 +
 .../languageType/src/docs/userguide/chapter1.md    |    9 +
 .../languageType/src/docs/userguide/chapter2.md    |    4 +
 .../src/samples/customPlugin/consumer/build.gradle |    5 +-
 .../src/samples/customPlugin/plugin/build.gradle   |    2 +-
 ....properties => org.samples.greeting.properties} |    0
 .../groovy/org/gradle/GreetingPluginTest.groovy    |    2 +-
 .../src/samples/ear/earCustomized/ear/build.gradle |   19 +-
 subprojects/docs/src/samples/eclipse/build.gradle  |    7 +-
 .../samples/groovy/customizedLayout/build.gradle   |    4 +-
 .../samples/groovy/mixedJavaAndGroovy/build.gradle |    4 +-
 .../groovy/multiproject/buildSrc/build.gradle      |    2 +-
 .../multiproject/groovycDetector/build.gradle      |    2 +-
 .../groovy/multiproject/testproject/build.gradle   |    4 +-
 .../src/test/groovy/org/gradle/VersionTest.groovy  |    6 +-
 .../src/samples/groovy/quickstart/build.gradle     |    4 +-
 .../src/test/groovy/org/gradle/PersonTest.groovy   |    2 +-
 subprojects/docs/src/samples/idea/build.gradle     |    4 +-
 .../descriptor-customization/build.gradle          |    6 +-
 .../ivy-publish/java-multi-project/build.gradle    |    5 +-
 .../ivy-publish/java-multi-project/output-ivy.xml  |    2 +-
 .../ivy-publish/multiple-publications/build.gradle |    4 +-
 .../multiple-publications/output/project1.ivy.xml  |    6 +-
 .../samples/ivy-publish/quickstart/build.gradle    |    3 +-
 .../docs/src/samples/ivypublish/build.gradle       |    4 +-
 .../docs/src/samples/java/apiAndImpl/build.gradle  |    2 +-
 .../docs/src/samples/java/base/test/build.gradle   |    2 +-
 .../src/samples/java/customizedLayout/build.gradle |    2 +-
 .../src/samples/java/multiproject/build.gradle     |    2 +-
 .../java/multiproject/buildSrc/build.gradle        |    2 +-
 .../docs/src/samples/java/onlyif/build.gradle      |    2 +-
 .../docs/src/samples/java/quickstart/build.gradle  |    3 +-
 .../src/samples/java/testListener/build.gradle     |    6 +-
 .../src/test/java/org/gradle/DoNothingTest.java    |    2 +
 .../samples/java/withIntegrationTests/build.gradle |    4 +-
 .../docs/src/samples/javaGradlePlugin/build.gradle |   19 +
 .../docs/src/samples/javaGradlePlugin/readme.xml   |    7 +
 .../main/java/org/gradle/sample/SimplePlugin.java  |   26 +
 .../gradle-plugins/simple-plugin.properties        |    1 +
 .../src/samples/jvmComponents/java/build.gradle    |   26 +
 .../main/java/org/gradle/samples/HelloWorld.java   |    7 +
 .../src/samples/jvmComponents/scala/build.gradle   |   29 +
 .../main/scala/org/gradle/samples/Greeter.scala    |   22 +
 .../main/scala/org/gradle/samples/HelloWorld.scala |   22 +
 .../src/main/scala/org/gradle/samples/Person.java  |   15 +
 .../multiple-publications/build.gradle             |    2 +-
 .../multiple-publications/output/project1.pom.xml  |    2 +-
 .../maven-publish/pomCustomization/build.gradle    |    6 +-
 .../samples/maven-publish/quickstart/build.gradle  |    9 +-
 .../src/samples/maven/pomGeneration/build.gradle   |   16 +-
 .../modelRules/basicRuleSourcePlugin/build.gradle  |   43 +
 .../src/samples/modelRules/modelDsl/build.gradle   |   28 +
 .../samples/native-binaries/assembler/build.gradle |   46 +-
 .../src/samples/native-binaries/c/build.gradle     |   25 +-
 .../native-binaries/c/src/hello/headers/hello.h    |    2 +-
 .../samples/native-binaries/cpp-exe/build.gradle   |   20 +-
 .../samples/native-binaries/cpp-lib/build.gradle   |   12 +-
 .../native-binaries/cpp-lib/src/main/cpp/hello.cpp |   10 +-
 .../cpp-lib/src/main/headers/hello.h               |    4 +-
 .../src/samples/native-binaries/cpp/build.gradle   |   29 +-
 .../native-binaries/cpp/src/hello/cpp/hello.cpp    |    4 +-
 .../native-binaries/cpp/src/hello/headers/hello.h  |    7 +-
 .../native-binaries/cpp/src/main/cpp/main.cpp      |    5 +-
 .../src/samples/native-binaries/cunit/build.gradle |   22 +-
 .../lib/cunit/2.1-2/include/CUnit/Automated.h      |   90 -
 .../cunit/lib/cunit/2.1-2/include/CUnit/Basic.h    |  113 -
 .../cunit/lib/cunit/2.1-2/include/CUnit/CUError.h  |  199 -
 .../cunit/lib/cunit/2.1-2/include/CUnit/CUnit.h    |  383 --
 .../lib/cunit/2.1-2/include/CUnit/CUnit_intl.h     |   62 -
 .../cunit/lib/cunit/2.1-2/include/CUnit/Console.h  |   60 -
 .../cunit/lib/cunit/2.1-2/include/CUnit/MyMem.h    |  104 -
 .../cunit/lib/cunit/2.1-2/include/CUnit/TestDB.h   |  914 ----
 .../cunit/lib/cunit/2.1-2/include/CUnit/TestRun.h  |  444 --
 .../cunit/lib/cunit/2.1-2/include/CUnit/Util.h     |  158 -
 .../libs/cunit/2.1-2/include/CUnit/Automated.h     |    0
 .../cunit}/libs/cunit/2.1-2/include/CUnit/Basic.h  |    0
 .../libs/cunit/2.1-2/include/CUnit/CUError.h       |    0
 .../cunit}/libs/cunit/2.1-2/include/CUnit/CUnit.h  |    0
 .../libs/cunit/2.1-2/include/CUnit/CUnit_intl.h    |    0
 .../libs/cunit/2.1-2/include/CUnit/Console.h       |    0
 .../cunit}/libs/cunit/2.1-2/include/CUnit/MyMem.h  |    0
 .../cunit}/libs/cunit/2.1-2/include/CUnit/TestDB.h |    0
 .../libs/cunit/2.1-2/include/CUnit/TestRun.h       |    0
 .../cunit}/libs/cunit/2.1-2/include/CUnit/Util.h   |    0
 .../operatorsTest/{cunit => c}/suite_operators.c   |    0
 .../src/operatorsTest/{cunit => c}/test_minus.c    |    0
 .../src/operatorsTest/{cunit => c}/test_plus.c     |    0
 .../src/operatorsTest/headers/test_operators.h     |    4 +-
 .../native-binaries/custom-layout/build.gradle     |   62 +-
 .../custom-layout/src/include/hello.h              |    2 +-
 .../samples/native-binaries/flavors/build.gradle   |   33 +-
 .../flavors/src/{lib => hello}/cpp/hello.cpp       |    0
 .../flavors/src/hello/headers/hello.h              |    7 +
 .../flavors/src/lib/headers/hello.h                |   10 -
 .../flavors/src/{exe => main}/cpp/main.cpp         |    0
 .../samples/native-binaries/google-test/README.md  |    7 +
 .../native-binaries/google-test/build.gradle       |   59 +
 .../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/operators/cpp/minus.cpp}                   |    0
 .../src/operators/cpp/plus.cpp}                    |    0
 .../src/operators/headers/operators.h              |    0
 .../src/operatorsTest/cpp/test_main.cpp            |    8 +
 .../src/operatorsTest/cpp/test_minus.cpp           |   10 +
 .../src/operatorsTest/cpp/test_plus.cpp            |   10 +
 .../src/samples/native-binaries/idl/build.gradle   |   18 +-
 .../native-binaries/multi-project/build.gradle     |   29 +-
 .../multi-project/lib/src/main/cpp/hello.cpp       |    6 +-
 .../multi-project/lib/src/main/headers/hello.h     |    4 +-
 .../native-binaries/objective-c/build.gradle       |   16 +-
 .../objective-c/src/main/headers/greeter.h         |    5 +
 .../objective-c/src/main/objc/greeter.m            |   10 +
 .../objective-c/src/main/objc/main.m               |   14 +-
 .../native-binaries/objective-cpp/build.gradle     |   16 +-
 .../objective-cpp/src/main/headers/greeter.h       |    7 +
 .../objective-cpp/src/main/objcpp/greeter.mm       |   11 +
 .../objective-cpp/src/main/objcpp/main.mm          |   16 +-
 .../prebuilt/3rd-party-lib/util/build.gradle       |   25 +-
 .../samples/native-binaries/prebuilt/build.gradle  |   17 +-
 .../native-binaries/target-platforms/build.gradle  |   49 +
 .../src/main/cpp/main.cpp                          |    0
 .../native-binaries/tool-chains/build.gradle       |   38 +-
 .../samples/native-binaries/variants/build.gradle  |   29 +-
 .../variants/src/hello/headers/hello.h             |    7 +-
 .../native-binaries/visual-studio/build.gradle     |   17 +-
 .../visual-studio/src/hello/headers/hello.h        |    2 +-
 .../build-resource-only-dll.gradle                 |   38 +-
 .../native-binaries/windows-resources/build.gradle |   23 +-
 .../windows-resources/src/hello/cpp/hello.cpp      |    2 +-
 .../windows-resources/src/hello/headers/hello.h    |    8 +-
 subprojects/docs/src/samples/osgi/build.gradle     |    2 +-
 .../app/assets/coffeescript/console.coffee         |    1 +
 .../app/assets/coffeescript/squareit.coffee        |    7 +
 .../play/advanced/app/assets/javascripts/sample.js |    9 +
 .../advanced/app/controllers/Application.scala     |   16 +
 .../app/controllers/QuestionsThreeController.scala |   34 +
 .../app/controllers/hello/HelloController.java     |   30 +
 .../samples/play/advanced/app/models/Person.scala  |    7 +
 .../play/advanced/app/views/fields.scala.html      |    9 +
 .../play/advanced/app/views/index.scala.html       |    7 +
 .../play/advanced/app/views/main.scala.html        |   16 +
 .../play/advanced/app/views/pass.scala.html        |   13 +
 .../play/advanced/app/views/person.scala.html      |   29 +
 .../play/advanced/app/views/square.scala.html      |   23 +
 .../docs/src/samples/play/advanced/build.gradle    |   28 +
 .../samples/play/advanced/conf/application.conf    |   62 +
 .../src/samples/play/advanced/conf/hello.routes    |    1 +
 .../docs/src/samples/play/advanced/conf/routes     |   19 +
 .../play/advanced/public/images/favicon.png        |  Bin 0 -> 687 bytes
 .../play/advanced/public/javascripts/hello.js      |    3 +
 .../public/javascripts/jquery-2.1.3.min.js         |    4 +
 .../advanced/public/stylesheets/bootstrap.min.css  |    9 +
 .../play/advanced/public/stylesheets/main.css}     |    0
 .../play/advanced/test/ApplicationSpec.scala       |   30 +
 .../play/advanced/test/IntegrationSpec.scala       |   24 +
 .../play/basic/app/controllers/Application.scala   |   14 +
 .../samples/play/basic/app/views/index.scala.html  |    7 +
 .../samples/play/basic/app/views/main.scala.html   |   15 +
 .../docs/src/samples/play/basic/build.gradle       |   16 +
 .../src/samples/play/basic/conf/application.conf   |   62 +
 .../docs/src/samples/play/basic/conf/routes        |    9 +
 .../samples/play/basic/public/images/favicon.png   |  Bin 0 -> 687 bytes
 .../samples/play/basic/public/javascripts/hello.js |    3 +
 .../play/basic/public/stylesheets/main.css}        |    0
 .../samples/play/basic/test/ApplicationSpec.scala  |   41 +
 .../samples/play/basic/test/IntegrationSpec.scala  |   24 +
 .../multiproject/app/controllers/Application.scala |   12 +
 .../play/multiproject/app/views/index.scala.html   |   19 +
 .../src/samples/play/multiproject/build.gradle     |   19 +
 .../play/multiproject/conf/application.conf        |   28 +
 .../docs/src/samples/play/multiproject/conf/routes |   11 +
 .../admin/app/controllers/admin/Application.scala  |   12 +
 .../admin/app/controllers/admin/Assets.scala       |    4 +
 .../modules/admin/app/views/admin/index.scala.html |   14 +
 .../play/multiproject/modules/admin/build.gradle   |    7 +
 .../multiproject/modules/admin/conf/admin.routes   |    2 +
 .../modules/admin/conf/application.conf            |    3 +
 .../modules/admin/public/javascript/admin.js       |    4 +
 .../user/app/controllers/user/Application.scala    |   12 +
 .../modules/user/app/views/user/index.scala.html   |   12 +
 .../play/multiproject/modules/user/build.gradle    |    7 +
 .../modules/user/conf/application.conf             |    3 +
 .../multiproject/modules/user/conf/user.routes     |    1 +
 .../play/multiproject/modules/util/build.gradle    |    3 +
 .../src/main/java/org/sample/util/BuiltBy.java     |    7 +
 .../play/multiproject/public/images/gradle.ico     |  Bin 0 -> 25051 bytes
 .../multiproject/public/javascript/timestamp.js    |    4 +
 .../src/samples/play/multiproject/settings.gradle  |    5 +
 .../src/samples/plugins/buildscript/build.gradle   |   30 +
 .../docs/src/samples/plugins/dsl/build.gradle      |   29 +
 .../samples/scala/customizedLayout/build.gradle    |    4 +-
 .../docs/src/samples/scala/fsc/build.gradle        |    4 +-
 .../samples/scala/mixedJavaAndScala/build.gradle   |    4 +-
 .../docs/src/samples/scala/quickstart/build.gradle |    4 +-
 .../docs/src/samples/scala/zinc/build.gradle       |    4 +-
 .../src/samples/sonarRunner/advanced/build.gradle  |    8 +
 .../advanced/src/main/java/org/gradle/Person.java  |   32 +
 .../src/test/java/org/gradle/PersonTest.java       |   28 +
 .../samples/sonarRunner/quickstart/build.gradle    |    6 +
 .../src/samples/testing/filtering/build.gradle     |    2 +-
 .../samples/testing/jacoco/quickstart/build.gradle |    2 +-
 .../samples/testing/junit/categories/build.gradle  |    2 +-
 .../src/samples/testing/testReport/build.gradle    |    2 +-
 .../toolingApi/customModel/tooling/build.gradle    |    4 +-
 .../src/samples/toolingApi/eclipse/build.gradle    |    4 +-
 .../docs/src/samples/toolingApi/idea/build.gradle  |    4 +-
 .../docs/src/samples/toolingApi/model/build.gradle |    4 +-
 .../src/samples/toolingApi/runBuild/build.gradle   |    4 +-
 .../src/main/java/org/gradle/sample/Main.java      |    6 +-
 .../samples/userguide/ant/renameTask/build.gradle  |    3 +
 .../build.xml                                      |    0
 .../ant/useExternalAntTaskWithConfig/build.gradle  |    8 +-
 .../artifacts/componentMetadata/build.gradle       |   41 -
 .../repo/air.birds/albatros/1.9/ivy-1.9.xml        |    9 -
 .../repo/air.birds/albatros/2.0/ivy-2.0.xml        |    9 -
 .../repo/sea.fish/tuna/1.3/ivy-1.3.xml             |    9 -
 .../repo/sea.fish/tuna/1.4/ivy-1.4.xml             |    9 -
 .../repo/sea.fish/tuna/1.5/ivy-1.5.xml             |    9 -
 .../artifacts/componentModuleMetadata/build.gradle |   11 +
 .../artifacts/configurationHandling/build.gradle   |   25 +-
 .../artifacts/defineRepository/build.gradle        |   60 +-
 .../artifacts/externalDependencies/build.gradle    |   23 +-
 .../artifacts/resolutionStrategy/build.gradle      |   20 +-
 .../userguide/buildlifecycle/basic/build.gradle    |   10 +
 .../projectEvaluateEvents/build.gradle             |    2 +-
 .../buildlifecycle/taskCreationEvents/build.gradle |    2 +-
 .../samples/userguide/distribution/build.gradle    |   13 +
 .../src/samples/userguide/files/copy/build.gradle  |    8 +-
 .../userguide/files/fileCollections/build.gradle   |    4 +-
 .../userguide/groovy/groovyDependency/build.gradle |    2 +-
 .../userguide/initScripts/plugins/init.gradle      |    7 +-
 .../samples/userguide/java/sourceSets/build.gradle |    2 +-
 .../multiproject/dependencies/java/build.gradle    |    2 +-
 .../dependencies/javaWithCustomConf/build.gradle   |    2 +-
 .../messages/consumer/build.gradle                 |    2 +-
 .../messages/consumer/build.gradle                 |    2 +-
 .../multiproject/dependencies/webDist/build.gradle |   13 +-
 .../multiproject/partialTasks/water/build.gradle   |    4 +-
 .../partialTasks/water/krill/build.gradle          |    4 +-
 .../spreadSpecifics/water/bluewhale/build.gradle   |    4 +-
 .../spreadSpecifics/water/krill/build.gradle       |    2 +-
 .../water/bluewhale/build.gradle                   |    4 +-
 .../userguide/organizeBuildLogic/build.gradle      |    2 +-
 .../organizeBuildLogic/inherited/build.gradle      |    4 +-
 .../organizeBuildLogic/injected/build.gradle       |   12 +-
 .../userguide/scala/scalaDependency/build.gradle   |    2 +-
 .../tasks/customTaskWithFileProperty/build.gradle  |    2 +-
 .../userguide/tasks/incrementalTask/build.gradle   |    3 +-
 .../tutorial/configureObject/build.gradle          |    2 +-
 .../configureObjectUsingScript/build.gradle        |    2 +-
 .../configureObjectUsingScript/other.gradle        |    5 +-
 .../samples/userguide/tutorial/groovy/build.gradle |   14 +-
 .../tutorial/groovyWithFlatDir/build.gradle        |    7 +-
 .../userguide/tutorial/makeDirectory/build.gradle  |   11 -
 .../userguide/tutorial/manifest/build.gradle       |    9 +-
 .../userguide/tutorial/mkdirTrap/build.gradle      |    2 +-
 .../userguide/tutorial/pluginIntro/build.gradle    |    5 +-
 .../userguide/tutorial/projectReports/build.gradle |    4 +-
 .../tutorial/properties/gradle.properties          |    2 +-
 .../src/samples/userguide/tutorial/scope.groovy    |   12 +-
 .../tutorial/stopExecutionException/build.gradle   |    3 +-
 .../samples/userguide/wrapper/simple/build.gradle  |    2 +-
 .../userguideOutput/basicRuleSourcePlugin-all.out  |    6 +
 .../basicRuleSourcePlugin-model-task.out           |   10 +
 .../src/samples/userguideOutput/buildlifecycle.out |    4 +
 .../userguideOutput/completeCUnitExample.out       |    5 +
 .../userguideOutput/completeGoogleTestExample.out  |   22 +
 .../userguideOutput/configurationHandlingCopy.out  |    4 +-
 .../configurationHandlingDependencies.out          |    6 +-
 .../samples/userguideOutput/customStatusScheme.out |    1 -
 .../userguideOutput/dependencyInsightReport.out    |    2 +-
 .../userguideOutput/dependencyListReport.out       |    6 +-
 .../dependencyListReportFiltered.out               |    2 +-
 .../src/samples/userguideOutput/latestSelector.out |    4 +-
 .../src/samples/userguideOutput/makeDirectory.out  |    1 -
 .../src/samples/userguideOutput/modelDslCreate.out |    6 +
 .../userguideOutput/nativeComponentReport.out      |   51 +
 .../samples/userguideOutput/propertyListReport.out |    3 +-
 .../samples/userguideOutput/renameAntDelegate.out  |    6 +
 .../docs/src/samples/userguideOutput/taskHelp.out  |    2 +
 .../samples/userguideOutput/taskListAllReport.out  |   20 +-
 .../src/samples/userguideOutput/taskListReport.out |    8 +-
 .../userguideOutput/usePluginsInInitScripts.out    |    2 +-
 .../samples/userguideOutput/wrapperCommandLine.out |    5 +
 .../docs/src/samples/water/bluewhale/build.gradle  |    7 -
 subprojects/docs/src/samples/water/build.gradle    |   16 -
 .../docs/src/samples/water/krill/build.gradle      |    7 -
 .../src/samples/water/phytoplankton/build.gradle   |    5 -
 subprojects/docs/src/samples/water/settings.gradle |    1 -
 .../samples/webApplication/customized/build.gradle |    2 +-
 .../releasenotes/FunctionalReleaseNotesTest.groovy |   26 +-
 .../docs/src/transforms/release-notes.gradle       |    2 +-
 .../plugins/ear/EarPluginIntegrationTest.groovy    |  198 +-
 .../org/gradle/plugins/ear/application_1_3.dtd     |  251 +
 .../main/groovy/org/gradle/plugins/ear/Ear.groovy  |   22 +-
 .../groovy/org/gradle/plugins/ear/EarPlugin.java   |   12 +-
 .../gradle/plugins/ear/EarPluginConvention.groovy  |   19 +-
 .../ear/descriptor/DeploymentDescriptor.java       |    8 +
 .../internal/DefaultDeploymentDescriptor.groovy    |   52 +-
 .../internal/DefaultEarSecurityRole.groovy         |    3 +
 .../{ear.properties => org.gradle.ear.properties}  |    0
 .../org/gradle/plugins/ear/EarPluginTest.groovy    |   50 +-
 .../groovy/org/gradle/plugins/ear/EarTest.groovy   |   29 +-
 .../DefaultDeploymentDescriptorTest.groovy         |   18 +-
 subprojects/ide-native/ide-native.gradle           |   28 +
 ...utoTestedSamplesIdeNativeIntegrationTest.groovy |   31 +
 .../NativeIdeSamplesIntegrationTest.groovy         |   51 +
 ...alStudioFileCustomizationIntegrationTest.groovy |  204 +
 .../VisualStudioMultiProjectIntegrationTest.groovy |  363 ++
 ...VisualStudioSingleProjectIntegrationTest.groovy |  924 ++++
 .../VisualStudioPluginIntegrationTest.groovy       |   22 +
 .../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    |    0
 .../ide/cdt/tasks/GenerateMetadataFileTask.groovy  |    0
 .../org/gradle/ide/visualstudio/ConfigFile.java    |    0
 .../gradle/ide/visualstudio/TextConfigFile.java    |    0
 .../org/gradle/ide/visualstudio/TextProvider.java  |    0
 .../ide/visualstudio/VisualStudioExtension.java    |   36 +
 .../ide/visualstudio/VisualStudioProject.java      |   62 +
 .../ide/visualstudio/VisualStudioSolution.java     |   64 +
 .../org/gradle/ide/visualstudio/XmlConfigFile.java |    0
 .../internal/DefaultVisualStudioExtension.java     |   51 +
 .../internal/DefaultVisualStudioProject.groovy     |  153 +
 .../internal/DefaultVisualStudioSolution.groovy    |  114 +
 ...ecutableVisualStudioProjectConfiguration.groovy |   47 +
 .../internal/VisualStudioExtensionInternal.java    |   25 +
 .../VisualStudioProjectConfiguration.groovy        |  108 +
 .../internal/VisualStudioProjectMapper.java        |   90 +
 .../internal/VisualStudioProjectRegistry.java      |   65 +
 .../internal/VisualStudioProjectResolver.java      |   46 +
 .../internal/VisualStudioSolutionRegistry.java     |    0
 .../org/gradle/ide/visualstudio/package-info.java  |    0
 .../visualstudio/plugins/VisualStudioPlugin.java   |  149 +
 .../ide/visualstudio/plugins/package-info.java     |   20 +
 .../tasks/GenerateFiltersFileTask.groovy           |    0
 .../tasks/GenerateProjectFileTask.groovy           |    0
 .../tasks/GenerateSolutionFileTask.groovy          |    0
 .../internal/AbsoluteFileNameTransformer.java      |    0
 .../internal/RelativeFileNameTransformer.java      |    0
 .../tasks/internal/VisualStudioFiltersFile.groovy  |   58 +
 .../tasks/internal/VisualStudioProjectFile.groovy  |   98 +
 .../tasks/internal/VisualStudioSolutionFile.groovy |    0
 .../org.gradle.eclipse-cdt.properties}             |    0
 .../org.gradle.visual-studio.properties}           |    0
 .../gradle/ide/cdt/model/defaultCproject-linux.xml |    0
 .../gradle/ide/cdt/model/defaultCproject-macos.xml |    0
 .../org/gradle/ide/cdt/model/defaultProject.xml    |    0
 .../ide/visualstudio/tasks/internal/default.sln    |    0
 .../visualstudio/tasks/internal/default.vcxproj    |    0
 .../tasks/internal/default.vcxproj.filters         |    0
 .../ide/cdt/model/CprojectSettingsSpec.groovy      |   58 +
 .../ide/cdt/model/ProjectDescriptorSpec.groovy     |    0
 .../internal/DefaultVisualStudioProjectTest.groovy |  115 +
 .../VisualStudioProjectConfigurationTest.groovy    |  199 +
 .../internal/VisualStudioProjectMapperTest.groovy  |  156 +
 .../VisualStudioProjectRegistryTest.groovy         |  106 +
 .../RelativeFileNameTransformerTest.groovy         |    0
 .../internal/VisualStudioFiltersFileTest.groovy    |   97 +
 .../internal/VisualStudioProjectFileTest.groovy    |  118 +
 .../internal/VisualStudioSolutionFileTest.groovy   |  190 +
 subprojects/ide/ide.gradle                         |    2 +-
 .../plugins/ide/AbstractIdeIntegrationSpec.groovy  |    5 +
 .../plugins/ide/AbstractIdeIntegrationTest.groovy  |    5 +
 ...ractSourcesAndJavadocJarsIntegrationTest.groovy |  115 +-
 .../eclipse/AbstractEclipseIntegrationSpec.groovy  |   53 +
 .../eclipse/AbstractEclipseIntegrationTest.groovy  |   12 +
 .../ide/eclipse/EclipseClasspathFixture.groovy     |   39 +-
 .../eclipse/EclipseClasspathIntegrationTest.groovy |   61 +-
 ...pseDependencySubstitutionIntegrationTest.groovy |  117 +
 .../ide/eclipse/EclipseProjectFixture.groovy       |   59 +
 ...ipseSourcesAndJavadocJarsIntegrationTest.groovy |   16 +-
 .../ide/eclipse/EclipseWtpComponentFixture.groovy  |   98 +
 ...WtpEarAndWebAndEjbProjectIntegrationTest.groovy |  102 +
 .../EclipseWtpEarProjectIntegrationTest.groovy     |   66 +
 .../EclipseWtpEmptyProjectIntegrationTest.groovy   |   48 +
 .../ide/eclipse/EclipseWtpFacetsFixture.groovy     |   53 +
 .../ide/eclipse/EclipseWtpIntegrationTest.groovy   |  109 -
 ...seWtpJavaEarSingleProjectIntegrationTest.groovy |   74 +
 .../EclipseWtpJavaProjectIntegrationTest.groovy    |   72 +
 .../eclipse/EclipseWtpModelIntegrationTest.groovy  |   86 +-
 ...lipseWtpWebAndJavaProjectIntegrationTest.groovy |  113 +
 .../EclipseWtpWebProjectIntegrationTest.groovy     |   79 +
 ...deaDependencySubstitutionIntegrationTest.groovy |  122 +
 .../plugins/ide/idea/IdeaIntegrationTest.groovy    |   24 +-
 .../plugins/ide/idea/IdeaModuleFixture.groovy      |  144 +
 .../ide/idea/IdeaModuleIntegrationTest.groovy      |  114 +-
 .../ide/idea/IdeaMultiModuleIntegrationTest.groovy |  118 +-
 .../ide/idea/IdeaProjectIntegrationTest.groovy     |   21 +
 ...IdeaSourcesAndJavadocJarsIntegrationTest.groovy |   26 +-
 .../canCreateAndDeleteMetaData/common/build.gradle |   25 +
 .../src/main/java/org/gradle/api/PersonList.java   |    5 +
 .../src/main/resources/someprops.properties        |    0
 .../test/java/org/gradle/shared/PersonTest.java    |    0
 .../expectedFiles/apiClasspath.xml                 |    6 +-
 .../expectedFiles/apiWtpComponent.xml              |    6 +
 .../expectedFiles/apiWtpFacet.xml                  |    5 +
 .../expectedFiles/commonClasspath.xml              |   30 +
 .../expectedFiles/commonJdt.properties             |   11 +
 .../expectedFiles/commonProject.xml                |   26 +
 .../expectedFiles/commonWtpComponent.xml           |    9 +
 .../expectedFiles/commonWtpFacet.xml               |    5 +
 .../canCreateAndDeleteMetaData/master/build.gradle |    6 +-
 .../master/settings.gradle                         |    2 +-
 .../org/gradle/plugins/ide/api/GeneratorTask.java  |    7 +
 .../plugins/ide/api/XmlFileContentMerger.groovy    |    2 +-
 .../gradle/plugins/ide/api/XmlGeneratorTask.java   |    2 +-
 .../plugins/ide/eclipse/EclipsePlugin.groovy       |   19 +-
 .../plugins/ide/eclipse/EclipseWtpPlugin.groovy    |  277 +-
 .../ide/eclipse/GenerateEclipseClasspath.groovy    |  165 +-
 .../plugins/ide/eclipse/GenerateEclipseJdt.groovy  |    5 +-
 .../ide/eclipse/GenerateEclipseProject.groovy      |    5 +-
 .../ide/eclipse/GenerateEclipseWtpComponent.groovy |  166 +-
 .../ide/eclipse/GenerateEclipseWtpFacet.groovy     |    7 +-
 .../plugins/ide/eclipse/model/Classpath.groovy     |    2 +-
 .../ide/eclipse/model/EclipseClasspath.groovy      |    6 +-
 .../plugins/ide/eclipse/model/EclipseWtp.groovy    |    6 -
 .../ide/eclipse/model/EclipseWtpComponent.groovy   |    8 +-
 .../ide/eclipse/model/EclipseWtpFacet.groovy       |    3 +-
 .../gradle/plugins/ide/eclipse/model/Facet.groovy  |    6 +
 .../plugins/ide/eclipse/model/Project.groovy       |    2 +-
 .../plugins/ide/eclipse/model/WtpComponent.groovy  |    2 +-
 .../plugins/ide/eclipse/model/WtpFacet.groovy      |    2 +-
 .../model/internal/FileReferenceFactory.groovy     |    4 +-
 .../model/internal/WtpComponentFactory.groovy      |   13 +-
 .../plugins/ide/idea/GenerateIdeaModule.groovy     |    2 +-
 .../plugins/ide/idea/GenerateIdeaProject.groovy    |    2 +-
 .../plugins/ide/idea/GenerateIdeaWorkspace.groovy  |    4 +-
 .../plugins/ide/idea/model/IdeaModule.groovy       |   35 +-
 .../plugins/ide/idea/model/IdeaModuleIml.groovy    |    2 +-
 .../plugins/ide/idea/model/IdeaProject.groovy      |   19 +-
 .../gradle/plugins/ide/idea/model/Module.groovy    |   43 +-
 .../plugins/ide/idea/model/ModuleLibrary.groovy    |    4 +-
 .../plugins/ide/idea/model/PathFactory.groovy      |    6 +-
 .../gradle/plugins/ide/idea/model/Project.groovy   |   60 +-
 .../ide/idea/model/SingleEntryModuleLibrary.groovy |   23 +-
 .../gradle/plugins/ide/idea/model/Workspace.groovy |    2 +-
 .../model/internal/IdeaDependenciesProvider.java   |   16 +-
 .../ide/internal/IdeDependenciesExtractor.groovy   |  170 -
 .../ide/internal/IdeDependenciesExtractor.java     |  189 +
 .../XmlPersistableConfigurationObject.groovy       |    2 +-
 .../internal/tooling/BuildInvocationsBuilder.java  |   98 +-
 .../ide/internal/tooling/EclipseModelBuilder.java  |   20 +-
 .../ide/internal/tooling/GradleProjectBuilder.java |   37 +-
 .../ide/internal/tooling/IdeaModelBuilder.java     |   17 +-
 .../tooling/ToolingRegistrationAction.java         |    4 +-
 .../eclipse/DefaultEclipseLinkedResource.java      |    4 +-
 .../tooling/eclipse/DefaultEclipseProject.java     |   50 +-
 .../eclipse/DefaultEclipseProjectDependency.java   |   11 +-
 .../eclipse/DefaultEclipseSourceDirectory.java     |    4 +-
 .../tooling/eclipse/DefaultEclipseTask.java        |   11 +-
 .../tooling/idea/DefaultIdeaContentRoot.java       |   41 +-
 .../internal/tooling/idea/DefaultIdeaModule.java   |    7 +-
 .../internal/tooling/idea/DefaultIdeaProject.java  |   15 +-
 .../tooling/idea/DefaultIdeaSourceDirectory.java   |   16 +-
 .../resolver/DefaultIdeDependencyResolver.java     |   35 +-
 .../internal/resolver/model/IdeDependencyKey.java  |   21 +-
 .../model/IdeExtendedRepoFileDependency.java       |   35 +-
 ...roperties => org.gradle.eclipse-wtp.properties} |    0
 ...se.properties => org.gradle.eclipse.properties} |    0
 ...{idea.properties => org.gradle.idea.properties} |    0
 .../plugins/ide/eclipse/EclipsePluginTest.groovy   |   26 +-
 .../ide/eclipse/EclipseWtpPluginTest.groovy        |  285 +-
 .../eclipse/GenerateEclipseClasspathTest.groovy    |   18 -
 .../eclipse/GenerateEclipseWtpComponentTest.groovy |   29 -
 .../ide/eclipse/GenerateEclipseWtpFacetTest.groovy |   20 +
 .../plugins/ide/eclipse/model/ClasspathTest.groovy |    2 +-
 .../plugins/ide/eclipse/model/ProjectTest.groovy   |    2 +-
 .../ide/eclipse/model/WtpComponentTest.groovy      |    2 +-
 .../plugins/ide/eclipse/model/WtpFacetTest.groovy  |    2 +-
 ...leTest.groovy => GenerateIdeaModuleTest.groovy} |    0
 .../gradle/plugins/ide/idea/IdeaPluginTest.groovy  |    4 +-
 .../plugins/ide/idea/model/ModuleTest.groovy       |   20 +-
 .../plugins/ide/idea/model/ProjectTest.groovy      |   17 +-
 .../internal/IdeaDependenciesProviderTest.groovy   |    8 +-
 .../XmlPersistableConfigurationObjectTest.groovy   |    2 +-
 .../tooling/BuildInvocationsBuilderTest.groovy     |  126 +-
 .../tooling/GradleProjectBuilderTest.groovy        |   29 +-
 .../ide/internal/tooling/TasksFactoryTest.groovy   |    2 +-
 .../tooling/idea/DefaultIdeaContentRootTest.groovy |   47 +
 .../gradle/plugins/ide/idea/model/customModule.xml |    2 +
 subprojects/integ-test/integ-test.gradle           |   10 +-
 .../org/gradle/debug/GradleRunConfiguration.groovy |    2 +-
 .../integtests/AntProjectIntegrationTest.groovy    |   44 +
 .../integtests/AntlrPluginGoodBehaviourTest.groovy |   25 -
 .../integtests/ApplicationIntegrationSpec.groovy   |  370 +-
 .../integtests/ApplicationIntegrationTest.groovy   |  350 --
 .../BuildAggregationIntegrationTest.groovy         |   31 +-
 .../BuildScriptExecutionIntegrationTest.groovy     |   91 -
 .../BuildSourceBuilderIntegrationTest.groovy       |    2 +-
 .../integtests/CacheProjectIntegrationTest.groovy  |   15 +-
 .../integtests/CharacterEncodingIntegTest.groovy   |  103 -
 .../integtests/CustomPluginIntegrationTest.groovy  |    4 +-
 .../DistributionLocatorIntegrationTest.groovy      |    3 +-
 .../ExternalScriptExecutionIntegrationTest.groovy  |  196 -
 .../IncrementalBuildIntegrationTest.groovy         |  380 --
 .../IncrementalTasksIntegrationTest.groovy         |  343 --
 .../InitScriptExecutionIntegrationTest.groovy      |  158 -
 .../integtests/MavenPluginGoodBehaviourTest.groovy |    4 -
 ...gacyAndComponentJvmPluginIntegrationTest.groovy |   91 +
 .../MixedNativeAndJvmProjectIntegrationTest.groovy |  126 +-
 .../ParallelProjectExecutionIntegrationTest.groovy |   15 +-
 .../ParallelTaskExecutionIntegrationTest.groovy    |  273 ++
 .../integtests/ProjectLayoutIntegrationTest.groovy |   23 +-
 .../integtests/ProjectLoadingIntegrationTest.java  |   83 +-
 .../SettingsScriptExecutionIntegrationTest.groovy  |   78 -
 .../integtests/TaskExecutionIntegrationTest.groovy |  126 +-
 ...ssingBinaryCompatibilityCrossVersionSpec.groovy |   70 +-
 .../integtests/WaterProjectIntegrationTest.groovy  |   77 -
 .../BuildEnvironmentIntegrationTest.groovy         |    8 +-
 .../logging/LoggingIntegrationTest.groovy          |   10 +-
 .../ivy/IvySFtpPublishIntegrationTest.groovy       |  101 -
 .../samples/JUnitSamplesIntegrationTest.groovy     |    2 +-
 .../samples/SamplesAntlrIntegrationTest.groovy     |   40 -
 .../SamplesApplicationIntegrationTest.groovy       |    2 +-
 .../SamplesCodeQualityIntegrationTest.groovy       |   16 +-
 ...lesComponentMetadataRulesIntegrationTest.groovy |   75 +
 ...esComponentSelectionRulesIntegrationTest.groovy |   89 +
 .../SamplesJavaTestListenerIntegrationTest.groovy  |   46 +
 .../SamplesWebQuickstartIntegrationTest.groovy     |   27 +-
 .../samples/UserGuideSamplesIntegrationTest.groovy |    5 +-
 .../samples/UserGuideSamplesRunner.groovy          |  298 ++
 .../canUseANonStandardBuildDir/build.gradle        |    2 +-
 .../internal-integ-testing.gradle                  |    6 +-
 .../AbstractDependencyResolutionTest.groovy        |   31 -
 .../AbstractHttpDependencyResolutionTest.groovy    |   57 +
 .../fixtures/AbstractIntegrationSpec.groovy        |   63 +-
 .../fixtures/AbstractIntegrationTest.java          |   29 +-
 .../fixtures/AutoTestedSamplesUtil.groovy          |    3 +-
 .../integtests/fixtures/AvailableJavaHomes.java    |  222 +-
 .../gradle/integtests/fixtures/ClassFile.groovy    |   69 -
 .../fixtures/CompilationOutputsFixture.groovy      |   84 +
 .../fixtures/CrossVersionIntegrationSpec.groovy    |   15 +-
 .../gradle/integtests/fixtures/EnableModelDsl.java |   32 +
 .../ForkScalaCompileInDaemonModeFixture.groovy     |   57 +
 .../fixtures/MultiVersionIntegrationSpec.groovy    |    4 +-
 .../fixtures/MultiVersionSpecRunner.groovy         |   18 +-
 .../org/gradle/integtests/fixtures/Sample.java     |   20 +-
 .../org/gradle/integtests/fixtures/SourceFile.java |   61 +
 .../integtests/fixtures/TestDependency.groovy      |   80 +
 .../fixtures/TestNGExecutionResult.groovy          |    7 +-
 .../fixtures/UserGuideSamplesRunner.groovy         |  275 --
 .../fixtures/WellBehavedPluginTest.groovy          |   28 +-
 .../executer/AbstractDelegatingGradleExecuter.java |    5 -
 .../fixtures/executer/AbstractGradleExecuter.java  |   52 +-
 .../fixtures/executer/AnyOrderOutputMatcher.groovy |    2 +-
 .../fixtures/executer/DaemonGradleExecuter.java    |   17 +-
 .../executer/DefaultGradleDistribution.java        |   26 +-
 .../executer/DownloadableGradleDistribution.groovy |    7 +-
 .../executer/EmbeddedDaemonGradleExecuter.java     |  113 -
 .../fixtures/executer/ExecutionFailure.java        |    5 +-
 .../fixtures/executer/ForkingGradleExecuter.java   |   18 +-
 .../executer/GradleContextualExecuter.java         |    7 +-
 .../fixtures/executer/GradleDistribution.java      |   15 +-
 .../fixtures/executer/GradleExecuter.java          |   34 +-
 .../integtests/fixtures/executer/GradleHandle.java |   20 +
 .../fixtures/executer/InProcessGradleExecuter.java |   89 +-
 .../executer/InitScriptExecuterFixture.groovy      |   12 +-
 .../executer/OutputScrapingExecutionFailure.java   |   73 +-
 .../executer/OutputScrapingExecutionResult.java    |   12 +
 .../executer/ParallelForkingGradleExecuter.java    |   10 +-
 .../executer/ProgressLoggingFixture.groovy         |    2 +-
 .../executer/ProjectLifecycleFixture.groovy        |    1 +
 .../fixtures/executer/RedirectMavenCentral.groovy  |   46 -
 .../executer/SequentialOutputMatcher.groovy        |    9 +-
 .../UnderDevelopmentGradleDistribution.java        |    6 +
 .../fixtures/jvm/InstalledJvmLocator.java          |   82 +
 .../integtests/fixtures/jvm/JvmInstallation.java   |   65 +
 .../fixtures/jvm/OsXInstalledJvmLocator.java       |   47 +
 .../integtests/fixtures/jvm/OsXJavaHomeParser.java |   68 +
 .../integtests/fixtures/jvm/UbuntuJvmLocator.java  |   75 +
 .../fixtures/jvm/WindowsOracleJvmLocator.java      |   68 +
 .../fixtures/versions/ClasspathVersionSource.java  |    2 +-
 .../org/gradle/test/fixtures/AbstractModule.groovy |    1 +
 .../org/gradle/test/fixtures/HttpModule.groovy     |    2 +-
 .../gradle/test/fixtures/bintray/BintrayApi.groovy |   83 -
 .../test/fixtures/bintray/BintrayTestServer.groovy |   62 -
 .../gradle/test/fixtures/ivy/IvyDescriptor.groovy  |   10 +
 .../gradle/test/fixtures/ivy/IvyFileModule.groovy  |  162 +-
 .../test/fixtures/ivy/IvyFileRepository.groovy     |   34 +-
 .../gradle/test/fixtures/ivy/IvyHttpModule.groovy  |  161 -
 .../test/fixtures/ivy/IvyHttpRepository.groovy     |   67 -
 .../org/gradle/test/fixtures/ivy/IvyModule.java    |   12 +
 .../gradle/test/fixtures/ivy/IvyRepository.groovy  |    2 -
 .../ivy/M2CompatibleIvyPatternHelper.groovy        |   40 +
 .../test/fixtures/ivy/RemoteIvyModule.groovy       |   24 +
 .../test/fixtures/ivy/RemoteIvyRepository.groovy   |   32 +
 .../test/fixtures/keystore/TestKeyStore.groovy     |   77 +
 .../test/fixtures/maven/AbstractMavenModule.groovy |  126 +-
 .../test/fixtures/maven/BasicHttpResource.groovy   |   41 -
 .../test/fixtures/maven/DelegatingMavenModule.java |  141 +
 .../gradle/test/fixtures/maven/HttpArtifact.groovy |   66 -
 .../gradle/test/fixtures/maven/HttpResource.groovy |   74 -
 .../test/fixtures/maven/MavenDependency.groovy     |    1 +
 .../fixtures/maven/MavenDependencyExclusion.groovy |   22 +
 .../test/fixtures/maven/MavenHttpArtifact.groovy   |   45 -
 .../test/fixtures/maven/MavenHttpModule.groovy     |  143 -
 .../test/fixtures/maven/MavenHttpRepository.groovy |   60 -
 .../test/fixtures/maven/MavenLocalModule.groovy    |    6 +
 .../gradle/test/fixtures/maven/MavenModule.groovy  |   17 +-
 .../org/gradle/test/fixtures/maven/MavenPom.groovy |   14 +-
 .../test/fixtures/maven/MavenRepository.groovy     |    2 -
 .../test/fixtures/maven/MetaDataArtifact.groovy    |   48 -
 .../test/fixtures/maven/PomHttpArtifact.groovy     |   57 -
 .../test/fixtures/plugin/PluginBuilder.groovy      |   57 +-
 .../test/fixtures/resource/RemoteArtifact.java     |   23 +
 .../test/fixtures/resource/RemoteResource.groovy   |   48 +
 .../gradle/test/fixtures/server/ExpectOne.groovy   |   29 +
 .../test/fixtures/server/RepositoryServer.groovy   |   34 +
 .../test/fixtures/server/ServerExpectation.groovy  |   21 +
 .../fixtures/server/ServerWithExpectations.groovy  |   56 +
 .../server/http/AbstractHttpResource.groovy        |  101 +
 .../fixtures/server/http/BasicHttpResource.groovy  |   40 +
 .../fixtures/server/http/BlockingHttpServer.groovy |   52 +-
 .../server/http/CyclicBarrierHttpServer.java       |  222 +
 .../test/fixtures/server/http/HttpArtifact.groovy  |   62 +
 .../server/http/HttpDirectoryResource.groovy       |   75 +
 .../test/fixtures/server/http/HttpResource.groovy  |   81 +
 .../server/http/HttpResourceInteraction.java       |   21 +
 .../test/fixtures/server/http/HttpServer.groovy    |  322 +-
 .../test/fixtures/server/http/IvyHttpModule.groovy |  209 +
 .../fixtures/server/http/IvyHttpRepository.groovy  |   67 +
 .../fixtures/server/http/MavenHttpArtifact.groovy  |   45 +
 .../fixtures/server/http/MavenHttpModule.groovy    |  102 +
 .../server/http/MavenHttpRepository.groovy         |   61 +
 .../fixtures/server/http/MetaDataArtifact.groovy   |   49 +
 .../fixtures/server/http/PomHttpArtifact.groovy    |   44 +
 .../server/http/RepositoryHttpServer.groovy        |   56 +
 .../fixtures/server/http/TestProxyServer.groovy    |   10 +-
 .../test/fixtures/server/sftp/IvySftpModule.groovy |  135 +
 .../fixtures/server/sftp/IvySftpRepository.groovy  |   69 +
 .../fixtures/server/sftp/MavenSftpModule.groovy    |   48 +
 .../server/sftp/MavenSftpRepository.groovy         |   40 +
 .../test/fixtures/server/sftp/SFTPServer.groovy    |  469 +-
 .../test/fixtures/server/sftp/SftpArtifact.java    |   37 +
 .../server/sftp/SftpDirectoryResource.groovy       |   85 +
 .../test/fixtures/server/sftp/SftpResource.groovy  |  141 +
 .../src/main/resources/logback.xml                 |   14 -
 .../src/main/resources/test-key-store/keyStore}    |  Bin
 .../src/main/resources/test-key-store/trustStore}  |  Bin
 .../fixtures/jvm/OsXJavaHomeParserTest.groovy      |  100 +
 .../fixtures/jvm/UbuntuJvmLocatorTest.groovy       |  113 +
 .../test/fixtures/maven/MavenFileModuleTest.groovy |   29 +-
 .../fixtures/maven/MavenLocalModuleTest.groovy     |   33 +-
 .../internal-testing/internal-testing.gradle       |    1 +
 .../fixtures/DefaultTestExecutionResult.groovy     |    7 +-
 .../fixtures/HtmlTestExecutionResult.groovy        |   17 +-
 .../fixtures/JUnitTestClassExecutionResult.groovy  |   13 +
 .../fixtures/JUnitXmlTestExecutionResult.groovy    |   21 +-
 .../fixtures/TestClassExecutionResult.java         |    2 +
 .../gradle/integtests/fixtures/UrlValidator.groovy |   79 +
 .../fixtures/archive/ArchiveTestFixture.groovy     |   21 +-
 .../test/fixtures/archive/JarTestFixture.groovy    |   25 +-
 .../fixtures/concurrent/TestExecutorFactory.groovy |    5 +
 .../concurrent/TestStoppableExecutor.groovy        |   23 +-
 .../gradle/test/fixtures/encoding/Identifier.java  |   54 +-
 .../file/AbstractTestDirectoryProvider.java        |  118 +
 .../org/gradle/test/fixtures/file/ClassFile.groovy |   73 +
 .../file/TestDistributionDirectoryProvider.java    |   44 +
 .../org/gradle/test/fixtures/file/TestFile.java    |   46 +-
 .../file/TestNameTestDirectoryProvider.java        |   87 +-
 .../test/fixtures/file/TestWorkspaceBuilder.groovy |    2 +-
 .../internal/NativeServicesTestFixture.java        |   48 +
 .../main/groovy/org/gradle/util/Assertions.groovy  |   42 -
 .../src/main/groovy/org/gradle/util/Matchers.java  |   16 +
 .../main/groovy/org/gradle/util/Requires.groovy    |    3 +-
 .../groovy/org/gradle/util/TestPrecondition.groovy |   28 +-
 .../org/gradle/util/UsesNativeServices.groovy      |   31 +
 .../gradle/util/UsesNativeServicesExtension.groovy |   38 +
 .../groovy/org/gradle/util/AssertionsTest.groovy   |   58 -
 subprojects/ivy/ivy.gradle                         |    6 +-
 .../publish/ivy/AbstractIvyPublishIntegTest.groovy |   67 -
 .../IvyHttpsLegacyPublishIntegrationTest.groovy    |   47 +
 ...IvyPublishArtifactCustomizationIntegTest.groovy |   42 +
 .../publish/ivy/IvyPublishBasicIntegTest.groovy    |    2 +-
 .../IvyPublishCrossVersionIntegrationTest.groovy   |   37 +-
 ...yPublishDescriptorCustomizationIntegTest.groovy |   79 +-
 .../api/publish/ivy/IvyPublishHttpIntegTest.groovy |   11 +-
 .../publish/ivy/IvyPublishHttpsIntegTest.groovy    |  140 +
 .../IvyPublishIdentifierValidationIntegTest.groovy |  160 -
 .../api/publish/ivy/IvyPublishJavaIntegTest.groovy |    2 +-
 .../ivy/IvyPublishValidationIntegTest.groovy       |  196 +
 .../api/publish/ivy/IvyPublishWarIntegTest.groovy  |    2 +-
 .../ivy/SamplesIvyPublishIntegrationTest.groovy    |    2 +-
 .../ivy/plugins/IvyPublishPluginIntegTest.groovy   |    6 -
 .../ivy/IvyHttpLegacyPublishIntegrationTest.groovy |   25 +
 .../ivy/IvyHttpPublishIntegrationTest.groovy       |   70 +-
 .../IvyUrlResolverPublishIntegrationTest.groovy    |   75 -
 .../gradle/api/publish/ivy/IvyExtraInfoSpec.java   |   37 +
 .../api/publish/ivy/IvyModuleDescriptor.java       |   82 -
 .../api/publish/ivy/IvyModuleDescriptorSpec.java   |  104 +
 .../org/gradle/api/publish/ivy/IvyPublication.java |    8 +-
 .../ivy/internal/IvyPublicationTasksModelRule.java |   82 -
 .../publish/ivy/internal/IvyPublishServices.java   |   62 +
 .../artifact/IvyArtifactNotationParserFactory.java |   71 +-
 .../publication/DefaultIvyExtraInfoSpec.java       |   36 +
 .../publication/DefaultIvyModuleDescriptor.java    |   72 -
 .../DefaultIvyModuleDescriptorSpec.java            |   99 +
 .../publication/DefaultIvyPublication.java         |   10 +-
 .../publication/IvyModuleDescriptorInternal.java   |   40 -
 .../IvyModuleDescriptorSpecInternal.java           |   40 +
 .../publication/IvyPublicationInternal.java        |    2 +-
 .../publisher/DependencyResolverIvyPublisher.java  |    4 +-
 .../publisher/IvyDescriptorFileGenerator.java      |   41 +-
 .../internal/publisher/ValidatingIvyPublisher.java |   26 +-
 .../api/publish/ivy/plugins/IvyPublishPlugin.java  |   65 +-
 .../publish/ivy/tasks/GenerateIvyDescriptor.java   |   41 +-
 .../publish/ivy/tasks/PublishToIvyRepository.java  |   18 +-
 .../java/org/gradle/ivy/IvyDescriptorArtifact.java |   27 +
 .../src/main/java/org/gradle/ivy/IvyModule.java    |   27 +
 .../src/main/java/org/gradle/ivy/package-info.java |   23 +
 ...roperties => org.gradle.ivy-publish.properties} |    0
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../IvyArtifactNotationParserFactoryTest.groovy    |    2 +-
 .../publication/DefaultIvyExtraInfoSpecTest.groovy |   32 +
 .../DefaultIvyModuleDescriptorSpecTest.groovy      |   59 +
 .../publication/DefaultIvyPublicationTest.groovy   |    5 +-
 .../IvyDescriptorFileGeneratorTest.groovy          |   37 +-
 .../publisher/ValidatingIvyPublisherTest.groovy    |  142 +-
 .../ivy/plugins/IvyPublishPluginTest.groovy        |   19 +-
 .../publish/ivy/AbstractIvyPublishIntegTest.groovy |   78 +
 ...actIvyRemoteLegacyPublishIntegrationTest.groovy |  122 +
 .../plugins/JacocoPluginIntegrationTest.groovy     |   71 +-
 .../jacoco/plugins/JacocoVersionIntegTest.groovy   |   30 +-
 .../testing/jacoco/plugins/JacocoPlugin.groovy     |    7 +-
 .../jacoco/plugins/JacocoPluginExtension.groovy    |    3 +-
 .../gradle/testing/jacoco/tasks/JacocoMerge.groovy |   16 +-
 .../testing/jacoco/tasks/JacocoReport.groovy       |   55 +-
 .../jacoco/tasks/JacocoReportsContainer.java       |    2 +-
 ...oco.properties => org.gradle.jacoco.properties} |    0
 .../jacoco/plugins/JacocoReportFixture.groovy      |   47 +
 subprojects/javascript/javascript.gradle           |    2 +-
 .../JavaScriptBasePluginIntegrationTest.groovy     |    2 +-
 .../CoffeeScriptBasePluginIntegrationTest.groovy   |    5 +-
 .../envjs/EnvJsPluginIntegrationTest.groovy        |    4 +
 .../jshint/JsHintPluginIntegrationTest.groovy      |    7 +
 .../javascript/base/JavaScriptBasePlugin.groovy    |    2 +-
 .../base/JavaScriptRepositoriesExtension.java      |   10 +-
 .../base/SourceTransformationException.java        |   30 +
 .../coffeescript/CoffeeScriptBasePlugin.groovy     |    3 +-
 .../coffeescript/CoffeeScriptCompile.java          |   25 +-
 .../internal/rhino/CoffeeScriptCompilerWorker.java |    8 +-
 .../plugins/javascript/envjs/EnvJsPlugin.groovy    |    4 +-
 .../gradle/plugins/javascript/jshint/JsHint.java   |    7 +-
 .../plugins/javascript/jshint/JsHintPlugin.groovy  |    4 +-
 .../plugins/javascript/rhino/RhinoPlugin.groovy    |    3 +-
 .../javascript/rhino/worker/RhinoWorkerUtils.java  |    4 +-
 ...ies => org.gradle.coffeescript-base.properties} |    0
 ...nvjs.properties => org.gradle.envjs.properties} |    0
 ...rties => org.gradle.javascript-base.properties} |    0
 ...int.properties => org.gradle.jshint.properties} |    0
 ...hino.properties => org.gradle.rhino.properties} |    0
 .../base/JavaScriptBasePluginTest.groovy           |    4 +-
 .../javascript/rhino/RhinoPluginTest.groovy        |    7 +-
 .../org/gradle/api/plugins/jetty/JettyPlugin.java  |    2 +-
 .../plugins/jetty/internal/JettyConfiguration.java |    2 +-
 ...etty.properties => org.gradle.jetty.properties} |    0
 subprojects/language-base/language-base.gradle     |    7 -
 .../groovy/org/gradle/language/base/Binary.java    |   33 -
 .../org/gradle/language/base/BinaryContainer.java  |   25 -
 .../language/base/BuildableModelElement.java       |   41 -
 .../gradle/language/base/FunctionalSourceSet.java  |   27 -
 .../gradle/language/base/LanguageSourceSet.java    |   47 -
 .../org/gradle/language/base/ProjectSourceSet.java |   26 -
 .../internal/AbstractBuildableModelElement.java    |   55 -
 .../base/internal/AbstractLanguageSourceSet.java   |   81 -
 .../language/base/internal/BinaryInternal.java     |   23 -
 .../language/base/internal/BinaryNamingScheme.java |   35 -
 .../base/internal/BinaryNamingSchemeBuilder.java   |   26 -
 .../base/internal/DefaultBinaryContainer.java      |   27 -
 .../base/internal/DefaultBinaryNamingScheme.java   |  112 -
 .../internal/DefaultBinaryNamingSchemeBuilder.java |   64 -
 .../base/internal/DefaultFunctionalSourceSet.java  |   39 -
 .../base/internal/DefaultProjectSourceSet.java     |   32 -
 .../base/internal/LanguageSourceSetInternal.java   |   37 -
 .../language/base/plugins/LanguageBasePlugin.java  |   67 -
 .../base/internal/BuildableModelElementTest.groovy |   54 -
 .../internal/DefaultBinaryNamingSchemeTest.groovy  |   79 -
 .../internal/DefaultFunctionalSourceSetTest.groovy |   29 -
 subprojects/language-groovy/language-groovy.gradle |   13 +
 .../gradle/groovy/GroovyDocIntegrationTest.groovy  |   61 +
 .../internal/tasks/compile/ApiGroovyCompiler.java  |  242 +
 .../tasks/compile/CleaningGroovyCompiler.java      |   41 +
 .../compile/DefaultGroovyJavaJointCompileSpec.java |    0
 .../DefaultGroovyJavaJointCompileSpecFactory.java  |   46 +
 .../internal/tasks/compile/GroovyCompileSpec.java  |    0
 .../GroovyCompileTransformingClassLoader.java      |  124 +
 .../tasks/compile/GroovyCompilerFactory.java       |   56 +
 .../tasks/compile/GroovyJavaJointCompileSpec.java  |    0
 .../tasks/compile/GroovyJavaJointCompiler.java     |   26 +
 .../tasks/compile/NormalizingGroovyCompiler.java   |  123 +
 .../tasks/compile/daemon/DaemonGroovyCompiler.java |   60 +
 .../gradle/api/tasks/compile/GroovyCompile.java    |  138 +
 .../api/tasks/compile/GroovyCompileOptions.java    |  308 ++
 .../api/tasks/compile/GroovyForkOptions.java       |    0
 .../org/gradle/api/tasks/compile/package-info.java |   20 +
 .../org/gradle/api/tasks/javadoc/AntGroovydoc.java |  113 +
 .../org/gradle/api/tasks/javadoc/Groovydoc.java    |  366 ++
 ...ultGroovyJavaJointCompileSpecFactoryTest.groovy |   44 +
 ...GroovyCompileTransformingClassLoaderTest.groovy |   96 +
 .../compile/NormalizingGroovyCompilerTest.groovy   |   66 +
 .../tasks/compile/GroovyCompileOptionsTest.groovy  |   97 +
 .../api/tasks/compile/GroovyForkOptionsTest.groovy |    0
 .../gradle/api/tasks/javadoc/GroovydocTest.java    |    0
 subprojects/language-java/language-java.gradle     |   17 +
 .../compile/JavaCompileIntegrationTest.groovy      |   91 +
 .../JavaCompileParallelIntegrationTest.groovy      |  102 +
 ...ncrementalJavaCompilationIntegrationTest.groovy |  407 ++
 ...ncrementalJavaCompilationIntegrationTest.groovy |  342 ++
 .../gradle/javadoc/JavadocIntegrationTest.groovy   |  100 +
 ...aLanguageIncrementalBuildIntegrationTest.groovy |   41 +
 .../java/JavaLanguageIntegrationTest.groovy        |  179 +
 .../java/SampleJavaLanguageIntegrationTest.groovy  |   41 +
 .../JavaLanguagePluginGoodBehaviourTest.groovy     |   25 +
 .../JavaLanguagePluginIntegrationTest.groovy       |   23 +
 .../build.gradle                                   |    0
 .../src/main/java/Person.java                      |    0
 .../src/taglet/java/LocaleAwareTaglet.java         |    0
 .../handlesTagsAndTaglets/build.gradle             |    0
 .../src/main/java/Person.java                      |    0
 .../src/taglet/java/CustomTaglet.java              |    0
 .../api/internal/tasks/DefaultJavaToolChain.java   |  119 +
 .../compile/AbstractJavaCompileSpecFactory.java    |   47 +
 .../api/internal/tasks/compile/AntDepend.java      |    0
 .../tasks/compile/AntDependsStaleClassCleaner.java |   62 +
 .../tasks/compile/CleaningJavaCompiler.java        |   53 +
 .../tasks/compile/CleaningJavaCompilerSupport.java |   40 +
 .../tasks/compile/CommandLineJavaCompileSpec.java  |   20 +
 .../tasks/compile/CommandLineJavaCompiler.java     |   64 +
 .../CommandLineJavaCompilerArgumentsGenerator.java |   78 +
 .../internal/tasks/compile/DaemonJavaCompiler.java |   39 +
 .../tasks/compile/DefaultJavaCompileSpec.java      |   42 +
 .../compile/DefaultJavaCompileSpecFactory.java     |   43 +
 .../tasks/compile/DefaultJavaCompilerFactory.java  |   62 +
 .../tasks/compile/ForkingJavaCompileSpec.java      |   20 +
 .../internal/tasks/compile/JavaCompileSpec.java    |   31 +
 .../compile/JavaCompilerArgumentsBuilder.java      |  212 +
 .../tasks/compile/JavaCompilerFactory.java         |   28 +
 .../compile/JavaHomeBasedJavaCompilerFactory.java  |   80 +
 .../internal/tasks/compile/JdkJavaCompiler.java    |   61 +
 .../tasks/compile/NormalizingJavaCompiler.java     |  110 +
 .../incremental/ClassSetAnalysisUpdater.java       |   53 +
 .../compile/incremental/CompilationSourceDirs.java |   53 +
 .../IncrementalCompilationFinalizer.java           |   50 +
 .../IncrementalCompilationInitializer.java         |   69 +
 .../incremental/IncrementalCompilerDecorator.java  |   79 +
 .../incremental/IncrementalCompilerFactory.java    |   61 +
 .../compile/incremental/JavaChangeProcessor.java   |   44 +
 .../incremental/RecompilationNotNecessary.java     |   26 +
 .../incremental/RecompilationSpecProvider.java     |   78 +
 .../compile/incremental/SelectiveCompiler.java     |   73 +
 .../compile/incremental/SourceToNameConverter.java |   48 +
 .../analyzer/CachingClassDependenciesAnalyzer.java |   44 +
 .../incremental/analyzer/ClassAnalysis.java        |   38 +
 .../incremental/analyzer/ClassAnalysisCache.java   |   22 +
 .../analyzer/ClassAnalysisSerializer.java          |   42 +
 .../analyzer/ClassDependenciesAnalyzer.java        |   23 +
 .../analyzer/ClassDependenciesVisitor.java         |   58 +
 .../incremental/analyzer/ClassFilesAnalyzer.java   |   61 +
 .../incremental/analyzer/ClassRelevancyFilter.java |   30 +
 .../analyzer/DefaultClassAnalysisCache.java        |   33 +
 .../analyzer/DefaultClassDependenciesAnalyzer.java |   77 +
 .../compile/incremental/cache/CompileCaches.java   |   25 +
 .../cache/DefaultGeneralCompileCaches.java         |   39 +
 .../incremental/cache/GeneralCompileCaches.java    |   25 +
 .../compile/incremental/deps/AffectedClasses.java  |   38 +
 .../deps/ClassDependentsAccumulator.java           |   57 +
 .../compile/incremental/deps/ClassSetAnalysis.java |   79 +
 .../incremental/deps/ClassSetAnalysisData.java     |   84 +
 .../incremental/deps/DefaultDependentsSet.java     |   65 +
 .../compile/incremental/deps/DependencyToAll.java  |   44 +
 .../compile/incremental/deps/DependentsSet.java    |   27 +
 .../deps/LocalClassSetAnalysisStore.java           |   41 +
 .../incremental/deps/OutputToNameConverter.java    |   38 +
 .../incremental/jar/CachingJarSnapshotter.java     |   55 +
 .../incremental/jar/ClasspathJarFinder.java        |   41 +
 .../incremental/jar/DefaultJarSnapshotCache.java   |   64 +
 .../incremental/jar/DefaultJarSnapshotter.java     |   58 +
 .../tasks/compile/incremental/jar/JarArchive.java  |   30 +
 .../incremental/jar/JarChangeDependentsFinder.java |   83 +
 .../incremental/jar/JarChangeProcessor.java        |   46 +
 .../incremental/jar/JarClasspathSnapshot.java      |   51 +
 .../incremental/jar/JarClasspathSnapshotData.java  |   40 +
 .../jar/JarClasspathSnapshotDataSerializer.java    |   42 +
 .../jar/JarClasspathSnapshotFactory.java           |   52 +
 .../incremental/jar/JarClasspathSnapshotMaker.java |   66 +
 .../jar/JarClasspathSnapshotProvider.java          |   23 +
 .../jar/JarClasspathSnapshotWriter.java            |   23 +
 .../tasks/compile/incremental/jar/JarSnapshot.java |   96 +
 .../compile/incremental/jar/JarSnapshotCache.java  |   27 +
 .../compile/incremental/jar/JarSnapshotData.java   |   43 +
 .../incremental/jar/JarSnapshotDataSerializer.java |   52 +
 .../compile/incremental/jar/JarSnapshotter.java    |   21 +
 .../jar/LocalJarClasspathSnapshotStore.java        |   39 +
 .../incremental/jar/PreviousCompilation.java       |   54 +
 .../incremental/recomp/RecompilationSpec.java      |   43 +
 .../gradle/api/tasks/compile/CompileOptions.java   |  429 ++
 .../org/gradle/api/tasks/compile/DebugOptions.java |    0
 .../gradle/api/tasks/compile/DependOptions.java    |    0
 .../org/gradle/api/tasks/compile/ForkOptions.java  |    0
 .../org/gradle/api/tasks/compile/JavaCompile.java  |  193 +
 .../org/gradle/api/tasks/compile/package-info.java |   20 +
 .../java/org/gradle/api/tasks/javadoc/Javadoc.java |  318 ++
 .../tasks/javadoc/internal/JavadocGenerator.java   |   62 +
 .../api/tasks/javadoc/internal/JavadocSpec.java    |   70 +
 .../org/gradle/api/tasks/javadoc/package-info.java |    0
 .../external/javadoc/CoreJavadocOptions.java       |    0
 .../external/javadoc/JavadocMemberLevel.java       |    0
 .../external/javadoc/JavadocOfflineLink.java       |   44 +
 .../external/javadoc/JavadocOptionFileOption.java  |    0
 .../external/javadoc/JavadocOutputLevel.java       |    0
 .../external/javadoc/MinimalJavadocOptions.java    |    0
 .../javadoc/OptionLessJavadocOptionFileOption.java |    0
 .../javadoc/StandardJavadocDocletOptions.java      |    0
 .../internal/AbstractJavadocOptionFileOption.java  |    0
 .../AbstractListJavadocOptionFileOption.java       |   59 +
 .../internal/BooleanJavadocOptionFileOption.java   |    0
 .../internal/EnumJavadocOptionFileOption.java      |    0
 .../internal/FileJavadocOptionFileOption.java      |    0
 .../internal/GroupsJavadocOptionFileOption.java    |    0
 .../javadoc/internal/JavadocExecHandleBuilder.java |    0
 .../javadoc/internal/JavadocOptionFile.java        |  115 +
 .../javadoc/internal/JavadocOptionFileWriter.java  |   59 +
 .../internal/JavadocOptionFileWriterContext.java   |  109 +
 .../LinksOfflineJavadocOptionFileOption.java       |    0
 .../MultilineStringsJavadocOptionFileOption.java   |    0
 .../OptionLessStringsJavadocOptionFileOption.java  |    0
 .../internal/PathJavadocOptionFileOption.java      |    0
 .../internal/StringJavadocOptionFileOption.java    |    0
 .../internal/StringsJavadocOptionFileOption.java   |    0
 .../org/gradle/external/javadoc/package-info.java  |    0
 .../org/gradle/language/java/JavaSourceSet.java    |   28 +
 .../language/java/artifact/JavadocArtifact.java    |   28 +
 .../language/java/artifact/package-info.java       |   20 +
 .../internal/DefaultJavaLanguageSourceSet.java     |   34 +
 .../JavaLanguagePluginServiceRegistry.java         |   48 +
 .../internal/JavaToolChainServiceRegistry.java     |   71 +
 .../org/gradle/language/java/package-info.java     |    0
 .../language/java/plugins/JavaLanguagePlugin.java  |  118 +
 .../gradle/language/java/plugins/package-info.java |   23 +
 .../language/java/tasks/PlatformJavaCompile.java   |   37 +
 .../gradle/language/java/tasks/package-info.java   |   23 +
 .../gradle-plugins/org.gradle.java-lang.properties |    1 +
 ...e.internal.service.scopes.PluginServiceRegistry |    2 +
 .../internal/tasks/DefaultJavaToolChainTest.groovy |   97 +
 .../tasks/compile/CleaningJavaCompilerTest.groovy  |   61 +
 ...ndLineJavaCompilerArgumentsGeneratorTest.groovy |   81 +
 .../DefaultJavaCompileSpecFactoryTest.groovy       |   43 +
 .../compile/DefaultJavaCompilerFactoryTest.groovy  |   73 +
 .../JavaCompilerArgumentsBuilderTest.groovy        |  333 ++
 .../JavaHomeBasedJavaCompilerFactoryTest.groovy    |   81 +
 .../compile/NormalizingJavaCompilerTest.groovy     |  125 +
 .../incremental/ClassSetAnalysisUpdaterTest.groovy |   42 +
 .../IncrementalCompilationFinalizerTest.groovy     |   55 +
 .../IncrementalCompilationInitializerTest.groovy   |   63 +
 .../incremental/SourceToNameConverterTest.groovy   |   43 +
 .../DefaultClassDependenciesAnalyzerTest.groovy    |   77 +
 .../analyzer/annotations/SomeClassAnnotation.java  |    0
 .../annotations/SomeRuntimeAnnotation.java         |    0
 .../analyzer/annotations/SomeSourceAnnotation.java |    0
 .../annotations/UsesAnnotationInField.java         |    0
 .../analyzer/annotations/UsesClassAnnotation.java  |    0
 .../annotations/UsesRuntimeAnnotation.java         |    0
 .../analyzer/annotations/UsesSourceAnnotation.java |    0
 .../deps/ClassDependentsAccumulatorTest.groovy     |  106 +
 .../incremental/deps/ClassFilesAnalyzerTest.groovy |   62 +
 .../deps/ClassSetAnalysisDataSerializerTest.groovy |   50 +
 .../incremental/deps/ClassSetAnalysisTest.groovy   |  179 +
 .../deps/OutputToNameConverterTest.groovy          |   44 +
 .../jar/DefaultJarSnapshotterTest.groovy           |   67 +
 .../jar/JarClasspathSnapshotFactoryTest.groovy     |   65 +
 .../jar/JarClasspathSnapshotMakerTest.groovy       |   72 +
 .../compile/incremental/jar/JarSnapshotTest.groovy |  114 +
 .../incremental/test/AccessedFromPrivateClass.java |   24 +
 .../incremental/test/HasNonPrivateConstants.java   |   21 +
 .../incremental/test/HasPrivateConstants.java      |   22 +
 .../incremental/test/HasPublicConstants.java       |   21 +
 .../tasks/compile/incremental/test/SomeClass.java  |   35 +
 .../compile/incremental/test/SomeOtherClass.java   |   24 +
 .../test/UsedByNonPrivateConstantsClass.java       |   20 +
 .../compile/incremental/test/YetAnotherClass.java  |   20 +
 .../api/tasks/compile/CompileOptionsTest.groovy    |  165 +
 .../api/tasks/compile/DebugOptionsTest.groovy      |    0
 .../api/tasks/compile/ForkOptionsTest.groovy       |    0
 .../api/tasks/compile/JavaCompileTest.groovy       |   50 +
 .../gradle/api/tasks/javadoc/JavadocTest.groovy    |  103 +
 .../javadoc/StandardJavadocDocletOptionsTest.java  |  523 ++
 .../BooleanJavadocOptionFileOptionTest.java        |    0
 .../internal/EnumJavadocOptionFileOptionTest.java  |    0
 .../internal/FileJavadocOptionFileOptionTest.java  |    0
 .../GroupsJavadocOptionFileOptionTest.java         |    0
 .../internal/JavadocExecHandleBuilderTest.groovy   |    0
 .../javadoc/internal/JavadocOptionFileTest.java    |    0
 .../JavadocOptionFileWriterContextTest.groovy      |   57 +
 .../internal/JavadocOptionFileWriterTest.groovy    |    0
 .../LinksOfflineJavadocOptionFileOptionTest.java   |    0
 ...ultilineStringsJavadocOptionFileOptionTest.java |    0
 ...tionLessStringsJavadocOptionFileOptionTest.java |    0
 .../internal/PathJavadocOptionFileOptionTest.java  |    0
 .../StringJavadocOptionFileOptionTest.java         |    0
 .../StringsJavadocOptionFileOptionTest.java        |    0
 .../java/plugins/JavaLanguagePluginTest.groovy     |   40 +
 .../language/fixtures/BadJavaComponent.groovy      |   47 +
 .../language/fixtures/TestJavaComponent.groovy     |   72 +
 subprojects/language-jvm/language-jvm.gradle       |   15 +-
 .../jvm/JvmResourcesPluginIntegrationTest.groovy   |   22 +
 .../ResourceOnlyJvmLibraryIntegrationTest.groovy   |  111 +
 .../org/gradle/language/java/JavaSourceSet.java    |   28 -
 .../java/internal/DefaultJavaSourceSet.java        |   52 -
 .../gradle/language/jvm/ClassDirectoryBinary.java  |   40 -
 .../groovy/org/gradle/language/jvm/Classpath.java  |   28 -
 .../org/gradle/language/jvm/ResourceSet.java       |   25 -
 .../internal/ClassDirectoryBinaryNamingScheme.java |   70 -
 .../jvm/internal/DefaultClassDirectoryBinary.java  |   83 -
 .../language/jvm/internal/DefaultClasspath.java    |   39 -
 .../language/jvm/internal/DefaultResourceSet.java  |   28 -
 .../jvm/internal/SimpleStaleClassCleaner.java      |   43 -
 .../language/jvm/internal/StaleClassCleaner.java   |   43 -
 .../language/jvm/plugins/JvmLanguagePlugin.java    |  107 -
 .../gradle/language/jvm/plugins/package-info.java  |   23 -
 .../language/jvm/tasks/ProcessResources.java       |   35 -
 .../tasks/compile/CompilationFailedException.java  |    0
 .../tasks/compile/CompileSpecToArguments.java      |   23 +
 .../compile/DefaultJvmLanguageCompileSpec.java     |   87 +
 .../tasks/compile/ExecSpecBackedArgCollector.java  |   38 +
 .../tasks/compile/JvmLanguageCompileSpec.java      |   52 +
 .../tasks/compile/NoOpStaleClassCleaner.java       |   26 +
 .../compile/daemon/AbstractDaemonCompiler.java     |   51 +
 .../tasks/compile/daemon/CompileResult.java        |    0
 .../compile/daemon/CompilerClientsManager.java     |    0
 .../tasks/compile/daemon/CompilerDaemon.java       |   26 +
 .../tasks/compile/daemon/CompilerDaemonClient.java |   66 +
 .../daemon/CompilerDaemonClientProtocol.java       |    0
 .../compile/daemon/CompilerDaemonFactory.java      |    0
 .../compile/daemon/CompilerDaemonManager.java      |   55 +
 .../tasks/compile/daemon/CompilerDaemonServer.java |   65 +
 .../daemon/CompilerDaemonServerProtocol.java       |   27 +
 .../compile/daemon/CompilerDaemonStarter.java      |   63 +
 .../tasks/compile/daemon/DaemonForkOptions.java    |    0
 .../daemon/InProcessCompilerDaemonFactory.java     |   94 +
 .../gradle/api/tasks/compile/AbstractCompile.java  |    0
 .../gradle/api/tasks/compile/AbstractOptions.java  |   85 +
 .../gradle/api/tasks/compile/BaseForkOptions.java  |    0
 .../org/gradle/api/tasks/compile/package-info.java |    0
 .../org/gradle/language/jvm/JvmResourceSet.java    |   25 +
 .../DefaultJvmResourceLanguageSourceSet.java       |   26 +
 .../language/jvm/internal/EmptyClasspath.java      |   34 +
 .../jvm/internal/JvmPluginServiceRegistry.java     |   48 +
 .../org/gradle/language/jvm/package-info.java      |    0
 .../language/jvm/plugins/JvmResourcesPlugin.java   |  101 +
 .../gradle/language/jvm/plugins/package-info.java  |   23 +
 .../language/jvm/tasks/ProcessResources.java       |   35 +
 .../gradle/language/jvm/tasks/package-info.java    |    0
 .../org.gradle.jvm-resources.properties            |    1 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../daemon/CompilerClientsManagerTest.groovy       |    0
 .../daemon/CompilerDaemonManagerTest.groovy        |  100 +
 .../daemon/DaemonForkOptionsMergeTest.groovy       |    0
 .../compile/daemon/DaemonForkOptionsTest.groovy    |    0
 .../api/tasks/compile/AbstractOptionsTest.groovy   |    0
 .../java/internal/DefaultJavaSourceSetTest.groovy  |   33 -
 .../ClassDirectoryBinaryNamingSchemeTest.groovy    |   55 -
 .../DefaultClassDirectoryBinaryTest.groovy         |   79 -
 .../jvm/internal/DefaultResourceSetTest.groovy     |   32 -
 .../jvm/IncrementalTestJvmComponent.groovy         |   26 +
 .../integtests/fixtures/jvm/JvmSourceFile.java     |   69 +
 .../fixtures/jvm/TestJvmComponent.groovy           |   48 +
 ...mLanguageIncrementalBuildIntegrationTest.groovy |  189 +
 .../AbstractJvmLanguageIntegrationTest.groovy      |  211 +
 ...AbstractJvmPluginLanguageIntegrationTest.groovy |  174 +
 subprojects/language-native/language-native.gradle |   32 +
 ...eLanguageIncrementalBuildIntegrationTest.groovy |  594 +++
 ...anguageIncrementalCompileIntegrationTest.groovy |  520 ++
 .../AbstractNativeLanguageIntegrationTest.groovy   |  212 +
 ...ctNativePreCompiledHeaderIntegrationTest.groovy |  386 ++
 ...stedSamplesLanguageNativeIntegrationTest.groovy |   33 +
 .../DuplicateBaseNamesIntegrationTest.groovy       |  175 +
 ...yLanguageIncrementalBuildIntegrationTest.groovy |  145 +
 .../AssemblyLanguageIntegrationTest.groovy         |  118 +
 .../AssemblerLangPluginIntegrationTest.groovy      |   22 +
 .../plugins/AssemblerPluginIntegrationTest.groovy  |   22 +
 ...llingMixedCAndCppLanguageIntegrationTest.groovy |   26 +
 ...CLanguageIncrementalBuildIntegrationTest.groovy |   27 +
 ...anguageIncrementalCompileIntegrationTest.groovy |   50 +
 .../language/c/CLanguageIntegrationTest.groovy     |  244 +
 ...CPreCompiledHeaderSourcesIntegrationTest.groovy |   28 +
 .../c/CppCallingCLanguageIntegrationTest.groovy    |   26 +
 .../language/c/MixedLanguageIntegrationTest.groovy |  171 +
 .../c/plugins/CLangPluginIntegrationTest.groovy    |   22 +
 .../c/plugins/CPluginIntegrationTest.groovy        |   22 +
 ...pLanguageIncrementalBuildIntegrationTest.groovy |   27 +
 ...anguageIncrementalCompileIntegrationTest.groovy |   27 +
 .../language/cpp/CppLanguageIntegrationTest.groovy |  123 +
 ...pPreCompiledHeaderSourcesIntegrationTest.groovy |   28 +
 .../plugins/CppLangPluginIntegrationTest.groovy    |   22 +
 .../cpp/plugins/CppPluginIntegrationTest.groovy    |   22 +
 .../app/DuplicateAssemblerBaseNamesTestApp.groovy  |   90 +
 .../fixtures/app/DuplicateCBaseNamesTestApp.groovy |   64 +
 .../app/DuplicateCppBaseNamesTestApp.groovy        |   67 +
 .../app/DuplicateMixedSameBaseNamesTestApp.groovy  |  144 +
 .../app/DuplicateObjectiveCBaseNamesTestApp.groovy |   77 +
 .../DuplicateObjectiveCppBaseNamesTestApp.groovy   |   84 +
 ...uplicateWindowsResourcesBaseNamesTestApp.groovy |   86 +
 .../NativeLanguageSamplesIntegrationTest.groovy    |  176 +
 .../ParallelNativePluginsIntegrationTest.groovy    |  138 +
 .../MixedObjectiveCIntegrationTest.groovy          |   33 +
 ...CLanguageIncrementalBuildIntegrationTest.groovy |   59 +
 ...anguageIncrementalCompileIntegrationTest.groovy |  119 +
 .../ObjectiveCLanguageIntegrationTest.groovy       |   32 +
 ...CPreCompiledHeaderSourcesIntegrationTest.groovy |   31 +
 .../ObjectiveCUnsupportedIntegrationTest.groovy    |   55 +
 .../ObjectiveCLangPluginIntegrationTest.groovy     |   22 +
 .../plugins/ObjectiveCPluginIntegrationTest.groovy |   22 +
 ...pLanguageIncrementalBuildIntegrationTest.groovy |   31 +
 ...anguageIncrementalCompileIntegrationTest.groovy |   31 +
 .../ObjectiveCppLanguageIntegrationTest.groovy     |   32 +
 ...pPreCompiledHeaderSourcesIntegrationTest.groovy |   31 +
 .../ObjectiveCppUnsupportedIntegrationTest.groovy  |   56 +
 .../ObjectiveCppLangPluginIntegrationTest.groovy   |   22 +
 .../ObjectiveCppPluginIntegrationTest.groovy       |   22 +
 ...ResourcesIncrementalBuildIntegrationTest.groovy |  178 +
 .../rc/WindowsResourcesIntegrationTest.groovy      |  153 +
 ...ndowsResourcesUnsupportedIntegrationTest.groovy |   94 +
 ...ndowsResourceScriptPluginIntegrationTest.groovy |   22 +
 .../WindowsResourcesPluginIntegrationTest.groovy   |   22 +
 .../org/gradle/language/PreprocessingTool.java     |   45 +
 .../language/assembler/AssemblerSourceSet.java     |   45 +
 .../assembler/internal/DefaultAssembleSpec.java    |   24 +
 .../internal/DefaultAssemblerSourceSet.java        |   27 +
 .../gradle/language/assembler/package-info.java    |    0
 .../assembler/plugins/AssemblerLangPlugin.java     |   77 +
 .../assembler/plugins/AssemblerPlugin.java         |   38 +
 .../plugins/internal/AssembleTaskConfig.java       |   60 +
 .../language/assembler/plugins/package-info.java   |   20 +
 .../gradle/language/assembler/tasks/Assemble.java  |  146 +
 .../language/assembler/tasks/package-info.java     |   20 +
 .../java/org/gradle/language/c/CSourceSet.java     |   52 +
 .../language/c/internal/DefaultCCompileSpec.java   |   23 +
 .../c/internal/DefaultCPCHCompileSpec.java         |   23 +
 .../language/c/internal/DefaultCSourceSet.java     |   27 +
 .../java}/org/gradle/language/c/package-info.java  |    0
 .../gradle/language/c/plugins/CLangPCHPlugin.java  |   58 +
 .../org/gradle/language/c/plugins/CLangPlugin.java |   78 +
 .../org/gradle/language/c/plugins/CPlugin.java     |   39 +
 .../gradle/language/c/plugins/package-info.java    |   20 +
 .../java/org/gradle/language/c/tasks/CCompile.java |   34 +
 .../c/tasks/CPreCompiledHeaderCompile.java         |   31 +
 .../org/gradle/language/c/tasks/package-info.java  |   20 +
 .../java/org/gradle/language/cpp/CppSourceSet.java |   52 +
 .../cpp/internal/DefaultCppCompileSpec.java        |   23 +
 .../cpp/internal/DefaultCppPCHCompileSpec.java     |   23 +
 .../language/cpp/internal/DefaultCppSourceSet.java |   27 +
 .../org/gradle/language/cpp/package-info.java      |    0
 .../language/cpp/plugins/CppLangPCHPlugin.java     |   59 +
 .../gradle/language/cpp/plugins/CppLangPlugin.java |   77 +
 .../org/gradle/language/cpp/plugins/CppPlugin.java |   38 +
 .../gradle/language/cpp/plugins/package-info.java  |   20 +
 .../org/gradle/language/cpp/tasks/CppCompile.java  |   35 +
 .../cpp/tasks/CppPreCompiledHeaderCompile.java     |   31 +
 .../gradle/language/cpp/tasks/package-info.java    |   20 +
 .../AbstractHeaderExportingDependentSourceSet.java |   72 +
 .../internal/AbstractHeaderExportingSourceSet.java |   50 +
 .../internal/AbstractNativeCompileSpec.java        |  171 +
 .../nativeplatform/internal/CompileTaskConfig.java |  136 +
 .../internal/DefaultPreprocessingTool.java         |   39 +
 .../internal/NativeLanguageTransform.java          |   35 +
 .../internal/PCHCompileTaskConfig.java             |   58 +
 .../internal/incremental/CompilationFileState.java |   52 +
 .../internal/incremental/CompilationState.java     |   41 +
 .../incremental/CompilationStateCacheFactory.java  |   23 +
 .../incremental/CompilationStateSerializer.java    |  128 +
 .../DefaultCompilationStateCacheFactory.java       |   56 +
 .../incremental/DefaultIncrementalCompilation.java |   52 +
 .../incremental/DefaultSourceIncludes.java         |   81 +
 .../incremental/DefaultSourceIncludesParser.java   |   44 +
 .../incremental/DefaultSourceIncludesResolver.java |   67 +
 .../incremental/IncrementalCompilation.java        |   32 +
 .../incremental/IncrementalCompileProcessor.java   |  155 +
 .../incremental/IncrementalCompilerBuilder.java    |   39 +
 .../incremental/IncrementalNativeCompiler.java     |  119 +
 .../internal/incremental/ResolvedInclude.java      |   67 +
 .../internal/incremental/SourceIncludesParser.java |   26 +
 .../incremental/SourceIncludesResolver.java        |   25 +
 .../incremental/sourceparser/CSourceParser.java    |   33 +
 .../sourceparser/PreprocessingReader.java          |  147 +
 .../sourceparser/RegexBackedCSourceParser.java     |   81 +
 .../internal/registry/NativeLanguageServices.java  |   38 +
 .../tasks/AbstractNativeCompileTask.java           |  253 +
 .../tasks/AbstractNativePCHCompileTask.java        |   23 +
 .../nativeplatform/tasks/package-info.java         |   20 +
 .../language/objectivec/ObjectiveCSourceSet.java   |   55 +
 .../internal/DefaultObjectiveCCompileSpec.java     |   24 +
 .../internal/DefaultObjectiveCPCHCompileSpec.java  |   23 +
 .../internal/DefaultObjectiveCSourceSet.java       |   27 +
 .../gradle/language/objectivec/package-info.java   |    0
 .../plugins/ObjectiveCLangPCHPlugin.java           |   58 +
 .../objectivec/plugins/ObjectiveCLangPlugin.java   |   77 +
 .../objectivec/plugins/ObjectiveCPlugin.java       |   39 +
 .../language/objectivec/plugins/package-info.java  |   20 +
 .../objectivec/tasks/ObjectiveCCompile.java        |   35 +
 .../tasks/ObjectiveCPreCompiledHeaderCompile.java  |   31 +
 .../language/objectivec/tasks/package-info.java    |   20 +
 .../objectivecpp/ObjectiveCppSourceSet.java        |   54 +
 .../internal/DefaultObjectiveCppCompileSpec.java   |   24 +
 .../DefaultObjectiveCppPCHCompileSpec.java         |   23 +
 .../internal/DefaultObjectiveCppSourceSet.java     |   27 +
 .../gradle/language/objectivecpp/package-info.java |    0
 .../plugins/ObjectiveCppLangPCHPlugin.java         |   58 +
 .../plugins/ObjectiveCppLangPlugin.java            |   78 +
 .../objectivecpp/plugins/ObjectiveCppPlugin.java   |   39 +
 .../objectivecpp/plugins/package-info.java         |   20 +
 .../objectivecpp/tasks/ObjectiveCppCompile.java    |   35 +
 .../ObjectiveCppPreCompiledHeaderCompile.java      |   31 +
 .../language/objectivecpp/tasks/package-info.java  |   20 +
 .../java}/org/gradle/language/package-info.java    |    0
 .../org/gradle/language/rc/WindowsResourceSet.java |   52 +
 .../DefaultWindowsResourceCompileSpec.java         |   22 +
 .../rc/internal/DefaultWindowsResourceSet.java     |   26 +
 .../java}/org/gradle/language/rc/package-info.java |    0
 .../rc/plugins/WindowsResourceScriptPlugin.java    |   88 +
 .../rc/plugins/WindowsResourcesPlugin.java         |   38 +
 .../WindowsResourcesCompileTaskConfig.java         |   78 +
 .../gradle/language/rc/plugins/package-info.java   |   20 +
 .../language/rc/tasks/WindowsResourceCompile.java  |  197 +
 .../org/gradle/language/rc/tasks/package-info.java |   20 +
 .../org.gradle.assembler-lang.properties           |    1 +
 .../gradle-plugins/org.gradle.assembler.properties |    1 +
 .../gradle-plugins/org.gradle.c-lang.properties    |    1 +
 .../gradle-plugins/org.gradle.c.properties         |    1 +
 .../gradle-plugins/org.gradle.cpp-lang.properties  |    1 +
 .../gradle-plugins/org.gradle.cpp.properties       |    1 +
 .../org.gradle.objective-c-lang.properties         |    1 +
 .../org.gradle.objective-c.properties              |    1 +
 .../org.gradle.objective-cpp-lang.properties       |    1 +
 .../org.gradle.objective-cpp.properties            |    1 +
 .../org.gradle.windows-resource-script.properties  |    1 +
 .../org.gradle.windows-resources.properties        |    1 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../AbstractNativeComponentPluginTest.groovy       |  180 +
 .../plugins/AssemblerLangPluginTest.groovy         |   36 +
 .../assembler/plugins/AssemblerPluginTest.groovy   |  172 +
 .../language/assembler/tasks/AssemblerTest.groovy  |   68 +
 .../language/c/plugins/CLangPluginTest.groovy      |   36 +
 .../gradle/language/c/plugins/CPluginTest.groovy   |   49 +
 .../gradle/language/c/tasks/CCompileTest.groovy    |   71 +
 .../cpp/internal/DefaultCppSourceSetTest.groovy    |   66 +
 .../language/cpp/plugins/CppLangPluginTest.groovy  |   38 +
 .../language/cpp/plugins/CppPluginTest.groovy      |   48 +
 .../language/cpp/tasks/CppCompileTest.groovy       |   71 +
 .../CompilationStateSerializerTest.groovy          |   90 +
 .../DefaultSourceIncludesParserTest.groovy         |   68 +
 .../DefaultSourceIncludesResolverTest.groovy       |  155 +
 .../IncrementalCompileProcessorTest.groovy         |  426 ++
 .../IncrementalNativeCompilerTest.groovy           |  105 +
 .../sourceparser/PreprocessingReaderTest.groovy    |   88 +
 .../RegexBackedCSourceParserTest.groovy            |  446 ++
 .../plugins/ObjectiveCLangPluginTest.groovy        |   38 +
 .../objectivec/plugins/ObjectiveCPluginTest.groovy |   47 +
 .../plugins/ObjectiveCppLangPluginTest.groovy      |   37 +
 .../plugins/ObjectiveCppPluginTest.groovy          |   46 +
 subprojects/language-scala/language-scala.gradle   |   17 +
 .../scala/JointScalaLangIntegrationTest.groovy     |   25 +
 .../SampleScalaLanguageIntegrationTest.groovy      |   44 +
 ...aLanguageIncrementalBuildIntegrationTest.groovy |   25 +
 .../scala/ScalaLanguageIntegrationTest.groovy      |   48 +
 ...aToolProviderNotAvailableIntegrationTest.groovy |   50 +
 .../ScalaLanguagePluginGoodBehaviourTest.groovy    |   26 +
 .../ScalaLanguagePluginIntegrationTest.groovy      |   24 +
 .../internal/tasks/scala/DaemonScalaCompiler.java  |   71 +
 .../scala/DefaultScalaJavaJointCompileSpec.java    |   62 +
 .../DefaultScalaJavaJointCompileSpecFactory.java   |   49 +
 .../tasks/scala/NormalizingScalaCompiler.java      |  110 +
 .../api/internal/tasks/scala/ScalaCompileSpec.java |   31 +
 .../tasks/scala/ScalaJavaJointCompileSpec.java     |    0
 .../internal/tasks/scala/ZincScalaCompiler.java    |  124 +
 .../scala/ZincScalaCompilerArgumentsGenerator.java |   66 +
 .../api/tasks/scala/IncrementalCompileOptions.java |   71 +
 .../gradle/api/tasks/scala/ScalaForkOptions.java   |    0
 .../org/gradle/api/tasks/scala/package-info.java   |   21 +
 .../language/scala/ScalaLanguageSourceSet.java     |   29 +
 .../org/gradle/language/scala/ScalaPlatform.java   |   28 +
 .../internal/DefaultScalaLanguageSourceSet.java    |   36 +
 .../scala/internal/DefaultScalaPlatform.java       |   50 +
 .../toolchain/DefaultScalaToolProvider.java        |   70 +
 .../toolchain/DownloadingScalaToolChain.java       |   75 +
 .../toolchain/NotFoundScalaToolProvider.java       |   60 +
 .../internal/toolchain/ScalaToolChainInternal.java |   24 +
 .../toolchain/ScalaToolChainServiceRegistry.java   |   47 +
 .../org/gradle/language/scala/package-info.java    |   20 +
 .../scala/plugins/ScalaLanguagePlugin.java         |  131 +
 .../language/scala/plugins/package-info.java       |   23 +
 .../language/scala/tasks/AbstractScalaCompile.java |  135 +
 .../scala/tasks/BaseScalaCompileOptions.java       |  218 +
 .../language/scala/tasks/PlatformScalaCompile.java |   58 +
 .../gradle/language/scala/tasks/package-info.java  |   23 +
 .../language/scala/toolchain/ScalaToolChain.java   |   25 +
 .../language/scala/toolchain/package-info.java     |   24 +
 .../org.gradle.scala-lang.properties               |   17 +
 ...e.internal.service.scopes.PluginServiceRegistry |   16 +
 ...aultScalaJavaJointCompileSpecFactoryTest.groovy |   45 +
 .../scala/NormalizingScalaCompilerTest.groovy      |  116 +
 .../ZincScalaCompilerArgumentsGeneratorTest.groovy |  110 +
 .../toolchain/DefaultScalaToolProviderTest.groovy  |   46 +
 .../toolchain/DownloadingScalaToolChainTest.groovy |  103 +
 .../scala/plugins/ScalaLanguagePluginTest.groovy   |   40 +
 .../language/scala/fixtures/BadScalaLibrary.groovy |   43 +
 .../fixtures/TestJointCompiledComponent.groovy     |   50 +
 .../scala/fixtures/TestScalaComponent.groovy       |   60 +
 subprojects/launcher/launcher.gradle               |   10 +
 .../BuildEnvironmentIntegrationTest.groovy         |  198 +
 .../launcher/CommandLineIntegrationSpec.groovy     |   75 +
 ...EnablingParallelExecutionIntegrationTest.groovy |   16 +-
 .../GradleConfigurabilityIntegrationSpec.groovy    |   49 +-
 .../launcher/GradleNativeIntegrationTest.groovy    |   36 +
 .../daemon/DaemonFeedbackIntegrationSpec.groovy    |   41 +-
 .../DaemonHealthLoggingIntegrationTest.groovy      |   30 +
 .../DaemonInitScriptHandlingIntegrationTest.groovy |    2 +-
 ...itialCommunicationFailureIntegrationSpec.groovy |   23 +-
 .../launcher/daemon/DaemonIntegrationSpec.groovy   |   19 +-
 .../launcher/daemon/DaemonLifecycleSpec.groovy     |  181 +-
 .../DaemonNativeServicesIntegrationTest.groovy     |   34 +
 .../DaemonOutputToggleIntegrationTest.groovy       |   39 +
 ...emonPerformanceMonitoringIntegrationTest.groovy |   77 +
 .../daemon/DaemonReuseIntegrationTest.groovy       |   35 +
 .../DaemonStartupMessageIntegrationTest.groovy     |   61 +
 .../DaemonUsageSuggestionIntegrationTest.groovy    |   68 +
 .../launcher/daemon/EmbeddedDaemonSmokeTest.groovy |   71 -
 .../gradle/launcher/daemon/ExecuteBuildAction.java |   28 -
 .../launcher/daemon/IsolatedDaemonSpec.groovy      |   37 +
 .../LocaleSupportDaemonIntegrationTest.groovy      |   95 +
 .../ProcessCrashHandlingIntegrationTest.groovy     |   80 +
 .../daemon/SingleUseDaemonIntegrationTest.groovy   |  107 +-
 .../daemon/StoppingDaemonIntegrationSpec.groovy    |   57 +-
 .../daemon/testing/DaemonContextParser.java        |   48 -
 .../daemon/testing/DaemonLogsAnalyzer.groovy       |   55 -
 .../daemon/testing/DaemonsEventSequence.groovy     |    2 +-
 .../launcher/daemon/testing/TestableDaemon.groovy  |  116 -
 .../src/main/java/org/gradle/launcher/Main.java    |   17 +-
 .../org/gradle/launcher/bootstrap/EntryPoint.java  |    8 +-
 .../launcher/bootstrap/ProcessBootstrap.java       |    8 +-
 .../gradle/launcher/cli/BuildActionsFactory.java   |   86 +-
 .../org/gradle/launcher/cli/CommandLineAction.java |    4 +-
 .../launcher/cli/CommandLineActionFactory.java     |   58 +-
 .../gradle/launcher/cli/ExecuteBuildAction.java    |   12 +-
 .../org/gradle/launcher/cli/GuiActionsFactory.java |    7 +-
 .../launcher/cli/JavaRuntimeValidationAction.java  |   37 +
 .../org/gradle/launcher/cli/RunBuildAction.java    |   25 +-
 .../org/gradle/launcher/cli/StopDaemonAction.java  |    6 +-
 .../cli/converter/DaemonCommandLineConverter.java  |    5 -
 .../cli/converter/LayoutToPropertiesConverter.java |   12 +-
 .../PropertiesToDaemonParametersConverter.java     |    5 +-
 .../PropertiesToStartParameterConverter.java       |   20 +-
 .../launcher/daemon/bootstrap/DaemonGreeter.java   |   20 +-
 .../launcher/daemon/bootstrap/DaemonMain.java      |   87 +-
 .../bootstrap/DaemonStartupCommunication.java      |   82 +-
 .../daemon/bootstrap/ForegroundDaemonAction.java   |   53 +
 .../daemon/bootstrap/ForegroundDaemonMain.java     |   49 -
 .../daemon/client/DaemonCancelForwarder.java       |   50 +
 .../launcher/daemon/client/DaemonClient.java       |   91 +-
 .../daemon/client/DaemonClientConnection.java      |   34 +-
 .../daemon/client/DaemonClientFactory.java         |   60 +
 .../daemon/client/DaemonClientGlobalServices.java  |   28 +
 .../daemon/client/DaemonClientInputForwarder.java  |   54 +-
 .../client/DaemonClientInterruptedException.java   |   30 +
 .../daemon/client/DaemonClientServices.java        |   48 +-
 .../daemon/client/DaemonClientServicesSupport.java |   23 +-
 .../launcher/daemon/client/DaemonConnector.java    |    9 +
 .../daemon/client/DaemonDisappearedException.java  |    2 +-
 .../daemon/client/DaemonStartListener.java         |   26 +
 .../launcher/daemon/client/DaemonStopClient.java   |  116 +
 .../daemon/client/DefaultDaemonConnector.java      |   60 +-
 .../daemon/client/DefaultDaemonStarter.java        |   18 +-
 .../client/EmbeddedDaemonClientServices.java       |   27 +-
 .../daemon/client/EmbeddedDaemonStarter.java       |    2 +-
 .../launcher/daemon/client/InputForwarder.java     |    2 +-
 .../daemon/client/JvmVersionValidator.java         |   66 +
 .../daemon/client/SingleUseDaemonClient.java       |    9 +-
 .../daemon/client/StopDaemonClientServices.java    |   46 -
 .../launcher/daemon/client/StopDispatcher.java     |   12 +-
 .../daemon/client/StubDaemonHealthServices.java    |   34 +
 .../daemon/configuration/CurrentProcess.java       |   21 +-
 .../daemon/configuration/DaemonParameters.java     |   44 +-
 .../launcher/daemon/configuration/DaemonUsage.java |   39 +
 .../daemon/configuration/GradleProperties.java     |    3 +-
 .../daemon/context/DaemonCompatibilitySpec.java    |    2 +-
 .../launcher/daemon/context/DaemonContext.java     |    2 +-
 .../daemon/context/DaemonContextBuilder.java       |   12 +-
 .../daemon/context/DaemonInstanceDetails.java      |   30 +
 .../daemon/diagnostics/DaemonStartupInfo.java      |   25 +-
 .../launcher/daemon/logging/DaemonMessages.java    |    1 +
 .../org/gradle/launcher/daemon/protocol/Build.java |   19 +-
 .../launcher/daemon/protocol/BuildAndStop.java     |    7 +-
 .../launcher/daemon/protocol/BuildEvent.java       |   37 +
 .../launcher/daemon/protocol/BuildStarted.java     |    4 +-
 .../gradle/launcher/daemon/protocol/Cancel.java    |   23 +
 .../gradle/launcher/daemon/protocol/Command.java   |    4 +-
 .../daemon/protocol/DaemonUnavailable.java         |    4 +-
 .../gradle/launcher/daemon/protocol/Finished.java  |    8 +-
 .../gradle/launcher/daemon/protocol/Message.java   |   25 +
 .../gradle/launcher/daemon/protocol/Result.java    |    8 +-
 .../launcher/daemon/protocol/StopWhenIdle.java     |   22 +
 .../launcher/daemon/registry/DaemonInfo.java       |   15 +-
 .../launcher/daemon/registry/DaemonRegistry.java   |    4 +
 .../daemon/registry/PersistentDaemonRegistry.java  |    2 +-
 .../org/gradle/launcher/daemon/server/Daemon.java  |   10 +-
 .../launcher/daemon/server/DaemonServices.java     |   36 +-
 .../daemon/server/DaemonStateCoordinator.java      |  189 +-
 .../daemon/server/DaemonStoppedException.java      |   30 -
 .../daemon/server/DaemonTcpServerConnector.java    |    8 +-
 .../daemon/server/DefaultDaemonConnection.java     |  127 +-
 .../server/DefaultIncomingConnectionHandler.java   |   23 +-
 .../daemon/server/api/DaemonCommandAction.java     |   35 +
 .../daemon/server/api/DaemonCommandExecution.java  |  136 +
 .../daemon/server/api/DaemonConnection.java        |  109 +
 .../daemon/server/api/DaemonStateControl.java      |   65 +
 .../daemon/server/api/DaemonStoppedException.java  |   28 +
 .../server/api/DaemonUnavailableException.java     |   27 +
 .../launcher/daemon/server/api/StdinHandler.java   |   25 +
 .../daemon/server/exec/BuildCommandOnly.java       |    2 +
 .../server/exec/CatchAndForwardDaemonFailure.java  |   38 -
 .../daemon/server/exec/DaemonCommandAction.java    |   35 -
 .../daemon/server/exec/DaemonCommandExecuter.java  |    4 +-
 .../daemon/server/exec/DaemonCommandExecution.java |  134 -
 .../daemon/server/exec/DaemonConnection.java       |   90 -
 .../daemon/server/exec/DaemonHygieneAction.java    |   50 -
 .../daemon/server/exec/DaemonStateControl.java     |   46 -
 .../server/exec/DaemonUnavailableException.java    |   27 -
 .../server/exec/DefaultDaemonCommandExecuter.java  |   56 +-
 .../server/exec/EstablishBuildEnvironment.java     |   20 +-
 .../launcher/daemon/server/exec/ExecuteBuild.java  |   33 +-
 .../daemon/server/exec/ForwardClientInput.java     |    3 +
 .../launcher/daemon/server/exec/HandleCancel.java  |   42 +
 .../launcher/daemon/server/exec/HandleStop.java    |   39 -
 .../launcher/daemon/server/exec/LogToClient.java   |   16 +-
 .../server/exec/NoOpDaemonCommandAction.java       |    3 +
 .../server/exec/RequestStopIfSingleUsedDaemon.java |   36 +
 .../daemon/server/exec/ResetDeprecationLogger.java |    2 +
 .../launcher/daemon/server/exec/ReturnResult.java  |    2 +
 .../server/exec/StartBuildOrRespondWithBusy.java   |   13 +-
 .../server/exec/StartStopIfBuildAndStop.java       |   35 -
 .../launcher/daemon/server/exec/StdinHandler.java  |   25 -
 .../server/exec/StopHandlingCommandExecuter.java   |   45 +
 .../daemon/server/exec/WatchForDisconnection.java  |    9 +-
 .../daemon/server/health/DaemonHealthServices.java |   32 +
 .../daemon/server/health/DaemonHealthTracker.java  |   56 +
 .../launcher/daemon/server/health/DaemonStats.java |   93 +
 .../daemon/server/health/DaemonStatus.java         |   48 +
 .../server/health/DefaultDaemonHealthServices.java |   42 +
 .../daemon/server/health/HealthLogger.java         |   34 +
 .../daemon/server/health/HintGCAfterBuild.java     |   52 +
 .../launcher/daemon/server/health/MemoryInfo.java  |   61 +
 .../gradle/launcher/exec/BuildActionExecuter.java  |    6 +-
 .../launcher/exec/BuildActionParameters.java       |    9 +-
 .../launcher/exec/ChainingBuildActionRunner.java   |   42 +
 .../DaemonUsageSuggestingBuildActionExecuter.java  |   65 +
 .../exec/DefaultBuildActionParameters.java         |   23 +-
 .../exec/InProcessBuildActionExecuter.java         |   84 +-
 .../internal/impl/DefaultBuildInvocations.java     |   45 +
 .../internal/impl/LaunchableGradleTask.java        |   23 +-
 .../impl/LaunchableGradleTaskSelector.java         |   20 +-
 .../internal/impl/LaunchableImplementation.java    |   31 -
 .../internal/provider/BuildModelAction.java        |   91 +-
 .../internal/provider/ClassLoaderCache.java        |   72 +
 .../internal/provider/ClasspathInferer.java        |    2 +-
 .../provider/ClientProvidedBuildAction.java        |   62 +-
 .../ClientSidePayloadClassLoaderFactory.java       |  121 +
 .../internal/provider/ConfiguringBuildAction.java  |  152 -
 .../internal/provider/ConnectionScopeServices.java |   27 +-
 .../provider/DaemonBuildActionExecuter.java        |   27 +-
 .../DaemonSidePayloadClassLoaderFactory.java       |   91 +
 .../internal/provider/DefaultBuildController.java  |   70 -
 .../internal/provider/DefaultConnection.java       |  148 +-
 .../DefaultPayloadClassLoaderRegistry.java         |  115 +-
 .../provider/ExecuteBuildActionRunner.java         |   32 +
 .../provider/InternalCancellationTokenAdapter.java |   40 +
 .../gradle/tooling/internal/provider/JarCache.java |  102 +
 .../internal/provider/LauncherServices.java        |   82 +
 .../LoggingBridgingBuildActionExecuter.java        |   28 +-
 .../internal/provider/ModelClassLoaderFactory.java |   99 +-
 .../provider/PayloadClassLoaderFactory.java        |   30 +
 .../internal/provider/PayloadSerializer.java       |   23 +-
 .../internal/provider/ProviderConnection.java      |   98 +-
 .../provider/ProviderStartParameterConverter.java  |   99 +
 .../internal/provider/ReflectionClassLookup.java   |   44 -
 .../internal/provider/ShutdownCoordinator.java     |   51 +
 .../provider/ToolingGlobalScopeServices.java       |   25 -
 .../tooling/internal/provider/ToolingServices.java |   32 -
 .../connection/AdaptedOperationParameters.java     |  129 -
 .../provider/connection/BuildLogLevelMixIn.java    |    2 +-
 .../connection/ProviderConnectionParameters.java   |    7 +
 .../connection/ProviderOperationParameters.java    |   10 +-
 .../provider/events/AbstractTestProgressEvent.java |   39 +
 .../provider/events/AbstractTestResult.java        |   48 +
 .../internal/provider/events/DefaultFailure.java   |   60 +
 .../provider/events/DefaultTestDescriptor.java     |   85 +
 .../provider/events/DefaultTestFailureResult.java  |   40 +
 .../events/DefaultTestFinishedProgressEvent.java   |   38 +
 .../provider/events/DefaultTestSkippedResult.java  |   30 +
 .../events/DefaultTestStartedProgressEvent.java    |   30 +
 .../provider/events/DefaultTestSuccessResult.java  |   30 +
 ...e.internal.service.scopes.PluginServiceRegistry |    2 +-
 .../groovy/org/gradle/launcher/MainTest.groovy     |    2 +-
 .../launcher/bootstrap/EntryPointTest.groovy       |    2 +-
 .../launcher/cli/BuildActionsFactoryTest.groovy    |   49 +-
 .../cli/CommandLineActionFactoryTest.groovy        |   36 +-
 .../launcher/cli/GuiActionsFactoryTest.groovy      |    2 +-
 .../gradle/launcher/cli/RunBuildActionTest.groovy  |   21 +-
 .../launcher/cli/StopDaemonActionTest.groovy       |    4 +-
 .../DaemonCommandLineConverterTest.groovy          |   27 +-
 .../LayoutToPropertiesConverterTest.groovy         |   12 +
 ...ropertiesToDaemonParametersConverterTest.groovy |   46 +-
 .../PropertiesToStartParameterConverterTest.groovy |   13 +-
 .../daemon/DaemonExecHandleBuilderSpec.groovy      |    3 +-
 .../daemon/bootstrap/DaemonGreeterTest.groovy      |   23 +-
 .../DaemonStartupCommunicationSpec.groovy          |   42 +-
 .../daemon/client/DaemonCancelForwarderTest.groovy |   70 +
 .../client/DaemonClientConnectionTest.groovy       |   16 +-
 .../client/DaemonClientInputForwarderTest.groovy   |    2 +-
 .../daemon/client/DaemonClientServicesTest.groovy  |   21 +-
 .../launcher/daemon/client/DaemonClientTest.groovy |  128 +-
 .../daemon/client/DaemonStopClientTest.groovy      |  118 +
 .../client/DefaultDaemonConnectorTest.groovy       |    6 +-
 .../daemon/client/InputForwarderTest.groovy        |    2 +
 .../daemon/client/JvmVersionValidatorTest.groovy   |   65 +
 .../daemon/client/StopDispatcherTest.groovy        |   12 +-
 .../daemon/configuration/CurrentProcessTest.groovy |   40 +-
 .../configuration/DaemonParametersTest.groovy      |   61 +-
 .../context/DaemonCompatibilitySpecSpec.groovy     |    6 +-
 .../registry/DaemonRegistryServicesTest.groovy     |    1 -
 .../registry/PersistentDaemonRegistryTest.groovy   |    2 +-
 .../DaemonServerExceptionHandlingTest.groovy       |   45 +-
 .../daemon/server/DaemonServicesTest.groovy        |    4 +-
 .../server/DaemonStateCoordinatorTest.groovy       |  265 +-
 .../server/DefaultDaemonConnectionTest.groovy      |    3 +-
 .../server/exec/DaemonHygieneActionTest.groovy     |   52 -
 .../server/health/DaemonHealthTrackerTest.groovy   |   69 +
 .../daemon/server/health/DaemonStatsTest.groovy    |   61 +
 .../daemon/server/health/DaemonStatusTest.groovy   |   76 +
 .../daemon/server/health/HealthLoggerTest.groovy   |   44 +
 .../server/health/HintGCAfterBuildTest.groovy      |   52 +
 .../exec/ChainingBuildActionRunnerTest.groovy      |   44 +
 ...onUsageSuggestingBuildActionExecuterTest.groovy |  111 +
 .../exec/DefaultBuildActionParametersTest.groovy   |    5 +-
 .../exec/InProcessBuildActionExecuterTest.groovy   |  141 +-
 .../provider/AbstractClassGraphSpec.groovy         |   24 +-
 .../internal/provider/ClasspathInfererTest.groovy  |   54 +
 .../ClientSidePayloadClassLoaderFactoryTest.groovy |   36 +
 .../provider/ConfiguringBuildActionTest.groovy     |  122 -
 .../provider/DaemonBuildActionExecuterTest.groovy  |   10 +-
 .../DaemonSidePayloadClassLoaderFactoryTest.groovy |   76 +
 .../provider/DefaultBuildControllerTest.groovy     |  129 -
 .../tooling/internal/provider/JarCacheTest.groovy  |  130 +
 .../LoggingBridgingBuildActionExecuterTest.groovy  |   16 +-
 .../provider/ModelClassLoaderFactoryTest.groovy    |   36 -
 .../internal/provider/PayloadSerializerTest.groovy |    5 +-
 .../ProviderStartParameterConverterTest.groovy     |  122 +
 .../provider/ToolingGlobalScopeServicesTest.groovy |   29 -
 .../AdaptedOperationParametersTest.groovy          |   68 -
 .../daemon/testing/AbstractDaemonFixture.groovy    |  102 +
 .../daemon/testing/DaemonContextParser.java        |   77 +
 .../launcher/daemon/testing/DaemonFixture.java     |   54 +
 .../daemon/testing/DaemonLogFileStateProbe.groovy  |   84 +
 .../daemon/testing/DaemonLogsAnalyzer.groovy       |   81 +
 .../daemon/testing/DaemonRegistryStateProbe.groovy |   40 +
 .../launcher/daemon/testing/DaemonStateProbe.java  |   21 +
 .../launcher/daemon/testing/DaemonsFixture.java    |   41 +
 .../launcher/daemon/testing/LegacyDaemon.groovy    |   57 +
 .../launcher/daemon/testing/TestableDaemon.groovy  |   61 +
 subprojects/maven/maven.gradle                     |    9 +-
 .../maven/AbstractMavenPublishIntegTest.groovy     |   98 -
 .../MavenPublicationVersionRangeIntegTest.groovy   |   64 +
 ...venPublishArtifactCustomizationIntegTest.groovy |    4 +-
 .../maven/MavenPublishBasicIntegTest.groovy        |    6 +-
 .../maven/MavenPublishCoordinatesIntegTest.groovy  |    1 +
 .../MavenPublishCrossVersionIntegrationTest.groovy |   11 +-
 .../maven/MavenPublishDependenciesIntegTest.groovy |  111 +
 .../publish/maven/MavenPublishEarIntegTest.groovy  |    2 +
 .../publish/maven/MavenPublishHttpIntegTest.groovy |   18 +-
 .../maven/MavenPublishHttpsIntegTest.groovy        |  152 +
 ...avenPublishIdentifierValidationIntegTest.groovy |   20 +-
 .../maven/MavenPublishIssuesIntegTest.groovy       |   72 +-
 .../publish/maven/MavenPublishJavaIntegTest.groovy |    4 +-
 .../maven/MavenPublishMultiProjectIntegTest.groovy |    4 +-
 .../MavenPublishPomCustomizationIntegTest.groovy   |    4 +-
 .../maven/MavenPublishPomPackagingIntegTest.groovy |  179 +
 .../maven/MavenPublishWarProjectIntegTest.groovy   |    4 +-
 .../plugins/MavenPublishPluginIntegTest.groovy     |    5 -
 .../maven/MavenPomGenerationIntegrationTest.groovy |    5 +
 .../MavenPublishIgnoresMavenSettingsTest.groovy    |    3 -
 .../maven/MavenPublishIntegrationTest.groovy       |   66 +-
 .../MavenPublishVersionRangeIntegrationTest.groovy |   97 +
 ...SamplesMavenPomGenerationIntegrationTest.groovy |    2 +-
 .../SamplesMavenQuickstartIntegrationTest.groovy   |    2 +-
 .../apache/maven/artifact/ant/Authentication.java  |   44 +
 .../org/apache/maven/artifact/ant/Proxy.java       |   45 +
 .../maven/artifact/ant/RemoteRepository.java       |   97 +
 .../org/apache/maven/artifact/ant/Repository.java  |   85 +
 .../maven/artifact/ant/RepositoryPolicy.java       |   69 +
 .../apache/maven/artifact/ant/package-info.java    |   25 +
 .../maven/Conf2ScopeMappingContainer.java          |    2 +-
 .../gradle/api/artifacts/maven/MavenDeployer.java  |    2 +-
 .../gradle/api/artifacts/maven/MavenResolver.java  |    2 +-
 .../groovy/org/gradle/api/plugins/MavenPlugin.java |   22 +-
 .../maven/internal/CustomModelBuilder.java         |   82 -
 .../DefaultConf2ScopeMappingContainer.java         |  112 -
 .../maven/internal/DefaultDeployerFactory.java     |   19 +-
 .../maven/internal/DefaultMavenFactory.java        |   45 -
 .../maven/internal/DefaultMavenPom.java            |  236 -
 .../maven/internal/DefaultMavenPomFactory.java     |   43 -
 .../maven/internal/ExcludeRuleConverter.java       |   23 -
 .../maven/internal/MavenVersionRangeMapper.java    |   37 +
 .../maven/internal/PomDependenciesConverter.java   |   26 -
 .../maven/internal/VersionRangeMapper.java         |   21 +
 .../action/AbstractMavenPublishAction.java         |  200 +
 .../action/LoggingMavenTransferListener.java       |   65 +
 .../maven/internal/action/MavenDeployAction.java   |   97 +
 .../maven/internal/action/MavenInstallAction.java  |   40 +
 .../maven/internal/action/MavenPublishAction.java  |   26 +
 .../internal/action/MavenWagonDeployAction.java    |   38 +
 .../maven/internal/action/ParsedMavenPom.java      |   64 +
 .../maven/internal/ant/AbstractMavenResolver.java  |  314 --
 .../maven/internal/ant/BaseMavenDeployer.java      |  119 -
 .../maven/internal/ant/BaseMavenInstaller.java     |   40 -
 .../maven/internal/ant/CustomDeployTask.java       |   45 -
 .../ant/CustomInstallDeployTaskSupport.java        |   27 -
 .../maven/internal/ant/CustomInstallTask.java      |   38 -
 .../internal/ant/DefaultExcludeRuleConverter.java  |   37 -
 .../internal/ant/DefaultGroovyMavenDeployer.groovy |   47 -
 .../ant/DefaultPomDependenciesConverter.java       |  153 -
 .../internal/ant/EmptyMavenSettingsSupplier.java   |   49 -
 .../maven/internal/ant/LoggingHelper.java          |   43 -
 .../maven/internal/ant/MavenSettingsSupplier.java  |   24 -
 .../ant/MaybeUserMavenSettingsSupplier.java        |   44 -
 .../ProjectDependencyArtifactIdExtractorHack.java  |  109 -
 .../maven/internal/ant/RepositoryBuilder.java      |   32 -
 .../maven/internal/ant/RepositoryFactory.java      |   51 -
 .../internal/deployer/AbstractMavenResolver.java   |  196 +
 .../maven/internal/deployer/BaseMavenDeployer.java |  101 +
 .../internal/deployer/BaseMavenInstaller.java      |   39 +
 .../deployer/DefaultGroovyMavenDeployer.groovy     |   49 +
 .../maven/internal/deployer/RepositoryBuilder.java |   32 +
 .../maven/internal/deployer/RepositoryFactory.java |   51 +
 .../maven/internal/pom/CustomModelBuilder.java     |   82 +
 .../pom/DefaultConf2ScopeMappingContainer.java     |  112 +
 .../internal/pom/DefaultExcludeRuleConverter.java  |   35 +
 .../maven/internal/pom/DefaultMavenFactory.java    |   51 +
 .../maven/internal/pom/DefaultMavenPom.java        |  236 +
 .../maven/internal/pom/DefaultMavenPomFactory.java |   43 +
 .../pom/DefaultPomDependenciesConverter.java       |  158 +
 .../maven/internal/pom/ExcludeRuleConverter.java   |   23 +
 .../maven/internal/pom/PlexusLoggerAdapter.java    |   98 +
 .../internal/pom/PomDependenciesConverter.java     |   26 +
 .../ProjectDependencyArtifactIdExtractorHack.java  |  111 +
 .../wagon/RepositoryTransportDeployWagon.java      |  304 ++
 .../wagon/RepositoryTransportWagonAdapter.java     |   61 +
 .../maven/internal/wagon/WagonRegistry.java        |   45 +
 .../gradle/api/publish/maven/MavenPublication.java |   14 +-
 .../maven/internal/MavenPublishServices.java       |   61 +
 .../maven/internal/MavenPublishTaskModelRule.java  |  109 -
 .../MavenArtifactNotationParserFactory.java        |   92 +-
 .../dependencies/DefaultMavenDependency.java       |   11 +
 .../dependencies/MavenDependencyInternal.java      |    2 +
 .../internal/publication/DefaultMavenPom.java      |    6 +-
 .../publication/DefaultMavenPublication.java       |   51 +-
 .../publication/MavenPublicationInternal.java      |    2 +-
 .../AbstractAntTaskBackedMavenPublisher.java       |  116 -
 .../internal/publisher/AbstractMavenPublisher.java |   76 +
 .../AntTaskBackedMavenLocalPublisher.java          |   64 -
 .../publisher/AntTaskBackedMavenPublisher.java     |   68 -
 .../internal/publisher/MavenLocalPublisher.java    |   38 +
 .../publisher/MavenNormalizedPublication.java      |    8 +-
 .../internal/publisher/MavenRemotePublisher.java   |  103 +
 .../publisher/MavenRemoteRepositoryFactory.java    |   50 -
 .../internal/tasks/MavenPomFileGenerator.java      |   23 +-
 .../publish/maven/plugins/MavenPublishPlugin.java  |   92 +-
 .../maven/tasks/AbstractPublishToMaven.java        |  107 +
 .../api/publish/maven/tasks/GenerateMavenPom.java  |   21 +-
 .../publish/maven/tasks/PublishToMavenLocal.java   |   46 +-
 .../maven/tasks/PublishToMavenRepository.java      |   90 +-
 .../main/java/org/gradle/maven/MavenModule.java    |   27 +
 .../java/org/gradle/maven/MavenPomArtifact.java    |   27 +
 .../main/java/org/gradle/maven/package-info.java   |   23 +
 ...perties => org.gradle.maven-publish.properties} |    0
 ...aven.properties => org.gradle.maven.properties} |    0
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../api/plugins/MavenPluginConventionTest.groovy   |    2 +-
 .../org/gradle/api/plugins/MavenPluginTest.java    |   24 +-
 .../maven/internal/DefaultArtifactPomTest.java     |    2 +
 .../DefaultConf2ScopeMappingContainerTest.java     |  125 -
 .../internal/DefaultMavenPomFactoryTest.groovy     |   40 -
 .../maven/internal/DefaultMavenPomTest.groovy      |  186 -
 .../internal/MavenVersionRangeMapperTest.groovy    |   26 +
 .../ant/DefaultExcludeRuleConverterTest.java       |   54 -
 .../ant/DefaultGroovyMavenDeployerTest.groovy      |  110 -
 .../ant/DefaultGroovyPomFilterContainerTest.groovy |  120 -
 .../ant/DefaultPomDependenciesConverterTest.java   |  250 -
 .../ant/EmptyMavenSettingsSupplierTest.groovy      |   52 -
 .../ant/MaybeUserMavenSettingsSupplierTest.groovy  |   61 -
 ...ectDependencyArtifactIdExtractorHackTest.groovy |   90 -
 .../deployer/DefaultGroovyMavenDeployerTest.groovy |  114 +
 .../pom/DefaultConf2ScopeMappingContainerTest.java |  125 +
 .../pom/DefaultExcludeRuleConverterTest.java       |   54 +
 .../pom/DefaultGroovyPomFilterContainerTest.groovy |  120 +
 .../internal/pom/DefaultMavenPomFactoryTest.groovy |   40 +
 .../maven/internal/pom/DefaultMavenPomTest.groovy  |  186 +
 .../pom/DefaultPomDependenciesConverterTest.groovy |  260 +
 ...ectDependencyArtifactIdExtractorHackTest.groovy |   90 +
 .../RepositoryTransportDeployWagonTest.groovy      |  309 ++
 .../RepositoryTransportWagonAdapterTest.groovy     |   91 +
 .../MavenArtifactNotationParserFactoryTest.groovy  |    2 +-
 .../publication/DefaultMavenPublicationTest.groovy |   48 +-
 .../publisher/ValidatingMavenPublisherTest.groovy  |   36 +-
 .../tasks/MavenPomFileGeneratorTest.groovy         |   82 +-
 .../maven/plugins/MavenPublishPluginTest.groovy    |   19 +-
 .../maven/AbstractMavenPublishIntegTest.groovy     |   95 +
 .../gradle/internal/event/BroadcastDispatch.java   |  117 +
 .../internal/event/DefaultListenerManager.java     |  162 +
 .../gradle/internal/event/ListenerBroadcast.java   |  140 +
 .../org/gradle/internal/event/ListenerManager.java |   88 +
 .../event/ListenerNotificationException.java       |   29 +
 .../serialize/AbstractCollectionSerializer.java    |   40 +
 .../gradle/internal/serialize/AbstractDecoder.java |  105 +
 .../gradle/internal/serialize/AbstractEncoder.java |   80 +
 .../internal/serialize/BaseSerializerFactory.java  |  140 +
 .../org/gradle/internal/serialize/Decoder.java     |  118 +
 .../internal/serialize/DefaultSerializer.java      |   56 +
 .../serialize/DefaultSerializerRegistry.java       |   85 +
 .../org/gradle/internal/serialize/Encoder.java     |   91 +
 .../internal/serialize/FlushableEncoder.java       |   24 +
 .../serialize/InputStreamBackedDecoder.java        |   65 +
 .../gradle/internal/serialize/ListSerializer.java  |   37 +
 .../gradle/internal/serialize/LongSerializer.java  |   29 +
 .../gradle/internal/serialize/MapSerializer.java   |   74 +
 .../serialize/NullSafeStringSerializer.java        |   26 +
 .../gradle/internal/serialize/ObjectReader.java    |   21 +
 .../gradle/internal/serialize/ObjectWriter.java    |   21 +
 .../serialize/OutputStreamBackedEncoder.java       |   65 +
 .../org/gradle/internal/serialize/Serializer.java  |   29 +
 .../internal/serialize/SerializerRegistry.java     |   23 +
 .../gradle/internal/serialize/SetSerializer.java   |   46 +
 .../internal/serialize/kryo/JavaSerializer.java    |   65 +
 .../internal/serialize/kryo/KryoBackedDecoder.java |  156 +
 .../internal/serialize/kryo/KryoBackedEncoder.java |   91 +
 .../serialize/kryo/StatefulSerializer.java         |   28 +
 .../serialize/kryo/TypeSafeSerializer.java         |   50 +
 .../dispatch/ContextClassLoaderProxy.java          |   37 +
 .../messaging/dispatch/MethodInvocation.java       |    4 +-
 .../org/gradle/messaging/dispatch/Receive.java     |    3 +
 .../messaging/remote/ObjectConnectionBuilder.java  |    2 +-
 .../remote/internal/ConnectCompletion.java         |    4 +-
 .../remote/internal/DefaultMessageSerializer.java  |    4 +-
 .../remote/internal/EagerReceiveBuffer.java        |    2 +-
 .../remote/internal/MessageSerializer.java         |    4 +-
 .../remote/internal/MessagingServices.java         |    4 +-
 .../remote/internal/RemoteConnection.java          |   40 +
 .../internal/hub/InterHubMessageSerializer.java    |   14 +-
 .../messaging/remote/internal/hub/MessageHub.java  |    9 +-
 .../hub/MessageHubBackedObjectConnection.java      |    6 +-
 .../internal/hub/MethodInvocationSerializer.java   |   10 +-
 .../remote/internal/inet/InetAddressFactory.java   |  194 +-
 .../remote/internal/inet/MulticastConnection.java  |   35 +-
 .../internal/inet/SocketConnectCompletion.java     |    9 +-
 .../remote/internal/inet/SocketConnection.java     |   25 +-
 .../remote/internal/inet/TcpIncomingConnector.java |    2 +-
 .../protocol/DiscoveryProtocolSerializer.java      |    4 +-
 .../serialize/AbstractCollectionSerializer.java    |   40 -
 .../messaging/serialize/AbstractDecoder.java       |  105 -
 .../messaging/serialize/AbstractEncoder.java       |   80 -
 .../messaging/serialize/BaseSerializerFactory.java |   70 -
 .../org/gradle/messaging/serialize/Decoder.java    |  118 -
 .../messaging/serialize/DefaultSerializer.java     |   56 -
 .../serialize/DefaultSerializerRegistry.java       |   85 -
 .../org/gradle/messaging/serialize/Encoder.java    |   91 -
 .../messaging/serialize/FlushableEncoder.java      |   24 -
 .../serialize/InputStreamBackedDecoder.java        |   65 -
 .../gradle/messaging/serialize/ListSerializer.java |   37 -
 .../gradle/messaging/serialize/LongSerializer.java |   29 -
 .../gradle/messaging/serialize/MapSerializer.java  |   48 -
 .../serialize/NullSafeStringSerializer.java        |   26 -
 .../gradle/messaging/serialize/ObjectReader.java   |   21 -
 .../gradle/messaging/serialize/ObjectWriter.java   |   21 -
 .../serialize/OutputStreamBackedEncoder.java       |   65 -
 .../org/gradle/messaging/serialize/Serializer.java |   29 -
 .../messaging/serialize/SerializerRegistry.java    |   23 -
 .../gradle/messaging/serialize/SetSerializer.java  |   38 -
 .../messaging/serialize/kryo/JavaSerializer.java   |   65 -
 .../serialize/kryo/KryoBackedDecoder.java          |  156 -
 .../serialize/kryo/KryoBackedEncoder.java          |   91 -
 .../serialize/kryo/StatefulSerializer.java         |   28 -
 .../serialize/kryo/TypeSafeSerializer.java         |   50 -
 .../internal/event/DefaultListenerManagerTest.java |  226 +
 .../internal/event/ListenerBroadcastTest.java      |  268 +
 .../internal/serialize/AbstractCodecTest.groovy    |  522 ++
 .../serialize/BaseSerializerFactoryTest.groovy     |  125 +
 .../serialize/DefaultSerializerRegistryTest.groovy |   92 +
 .../serialize/DefaultSerializerTest.groovy         |   32 +
 .../internal/serialize/ListSerializerTest.groovy   |   45 +
 .../internal/serialize/LongSerializerTest.groovy   |   34 +
 .../internal/serialize/MapSerializerTest.groovy    |   80 +
 .../internal/serialize/SetSerializerTest.groovy    |   54 +
 .../serialize/StreamBackedCodecTest.groovy         |   31 +
 .../serialize/kryo/KryoBackedCodecTest.groovy      |   98 +
 .../messaging/dispatch/MethodInvocationTest.groovy |   45 +
 .../messaging/dispatch/MethodInvocationTest.java   |   35 -
 .../messaging/remote/internal/MessageTest.groovy   |    6 +-
 .../remote/internal/ProtocolStackTest.groovy       |    6 +-
 .../hub/InterHubMessageSerializerTest.groovy       |    2 +-
 .../internal/hub/MessageHubBackedClientTest.groovy |    4 +-
 .../internal/hub/MessageHubBackedServerTest.groovy |    4 +-
 .../hub/MethodInvocationSerializerTest.groovy      |    6 +-
 .../internal/inet/InetAddressFactoryTest.groovy    |    8 +
 .../internal/inet/MulticastConnectionTest.groovy   |   87 +
 .../messaging/serialize/AbstractCodecTest.groovy   |  524 --
 .../serialize/BaseSerializerFactoryTest.groovy     |   73 -
 .../serialize/DefaultSerializerRegistryTest.groovy |   92 -
 .../serialize/DefaultSerializerTest.groovy         |   32 -
 .../messaging/serialize/ListSerializerTest.groovy  |   45 -
 .../messaging/serialize/LongSerializerTest.groovy  |   34 -
 .../messaging/serialize/MapSerializerTest.groovy   |   47 -
 .../messaging/serialize/SetSerializerTest.groovy   |   47 -
 .../serialize/StreamBackedCodecTest.groovy         |   31 -
 .../serialize/kryo/KryoBackedCodecTest.groovy      |   98 -
 .../internal/serialize/SerializerSpec.groovy       |   41 +
 .../messaging/serialize/SerializerSpec.groovy      |   39 -
 subprojects/model-core/model-core.gradle           |   43 +
 .../model/ConfigurationCycleIntegrationTest.groovy |   73 +
 .../gradle/model/ModelReuseIntegrationTest.groovy  |  205 +
 .../ModelRuleBindingFailureIntegrationTest.groovy  |  242 +
 ...odelRuleBindingValidationIntegrationTest.groovy |   72 +
 .../model/ModelRuleCachingIntegrationTest.groovy   |   59 +
 .../model/ModelRuleSamplesIntegrationTest.groovy   |   37 +
 .../ModelRuleValidationIntegrationTest.groovy      |   76 +
 ...ationRuleApplicationOrderIntegrationTest.groovy |  153 +
 .../model/PluginRuleSourceIntegrationTest.groovy   |  434 ++
 .../model/ScopedRuleSourceIntegrationTest.groovy   |  166 +
 .../model/TaskCreationIntegrationTest.groovy       |  675 +++
 ...actClassBackedManagedTypeIntegrationTest.groovy |  308 ++
 .../ComplexManagedTypeIntegrationTest.groovy       |  228 +
 .../CyclicalManagedTypeIntegrationTest.groovy      |  121 +
 .../EnumsInManagedModelIntegrationTest.groovy      |   75 +
 ...nterfaceBackedManagedTypeIntegrationTest.groovy |  346 ++
 ...validManagedModelMutationIntegrationTest.groovy |  272 ++
 .../InvalidManagedModelRuleIntegrationTest.groovy  |  191 +
 ...odelPropertyTargetingRuleIntegrationTest.groovy |  267 +
 .../model/managed/ManagedSetIntegrationTest.groovy |  582 +++
 ...anagedTypeImplementationClassCachingSpec.groovy |   63 +
 ...peWithUnmanagedPropertiesIntegrationTest.groovy |  128 +
 .../PolymorphicManagedTypeIntegrationTest.groovy   |  251 +
 .../PrimitivesInManagedModelIntegrationTest.groovy |  207 +
 .../gradle/model/ConfigurationCycleException.java  |   30 +
 .../src/main/java/org/gradle/model/Defaults.java   |   38 +
 .../src/main/java/org/gradle/model/Finalize.java   |   38 +
 .../InvalidModelRuleDeclarationException.java      |   54 +
 .../gradle/model/InvalidModelRuleException.java    |   54 +
 .../src/main/java/org/gradle/model/Managed.java    |  100 +
 .../src/main/java/org/gradle/model/Model.java      |   73 +
 .../gradle/model/ModelRuleBindingException.java    |   34 +
 .../org/gradle/model/ModelViewClosedException.java |   39 +
 .../src/main/java/org/gradle/model/Mutate.java     |   38 +
 .../src/main/java}/org/gradle/model/Path.java      |    0
 .../src/main/java/org/gradle/model/RuleSource.java |   78 +
 .../src/main/java/org/gradle/model/Unmanaged.java  |   37 +
 .../src/main/java/org/gradle/model/Validate.java   |   38 +
 .../gradle/model/WriteOnlyModelViewException.java  |   35 +
 .../gradle/model/collection/CollectionBuilder.java |  229 +
 .../org/gradle/model/collection/ManagedSet.java    |   62 +
 .../org/gradle/model/collection/package-info.java  |   20 +
 .../internal/core/ActionBackedModelAction.java     |   59 +
 .../internal/core/BiActionBackedModelAction.java   |   70 +
 .../internal/core/ChainingModelProjection.java     |  117 +
 .../internal/core/CollectionBuilderModelView.java  |  283 ++
 .../internal/core/DefaultCollectionBuilder.java    |  314 ++
 .../internal/core/DelegatingCollectionBuilder.java |  157 +
 .../core/DependencyOnlyExtractedModelRule.java     |   52 +
 .../model/internal/core/DirectNodeModelAction.java |   70 +
 .../internal/core/DuplicateModelException.java     |   28 +
 .../model/internal/core/EmptyModelProjection.java  |   64 +
 .../model/internal/core/ExtractedModelAction.java  |   63 +
 .../model/internal/core/ExtractedModelCreator.java |   55 +
 .../model/internal/core/ExtractedModelRule.java    |   42 +
 .../model/internal/core/InstanceModelView.java     |   55 +
 .../gradle/model/internal/core/ModelAction.java    |   33 +
 .../model/internal/core/ModelActionRole.java       |   30 +
 .../gradle/model/internal/core/ModelAdapter.java   |   36 +
 .../gradle/model/internal/core/ModelCreator.java   |   37 +
 .../model/internal/core/ModelCreatorFactory.java   |   41 +
 .../gradle/model/internal/core/ModelCreators.java  |  112 +
 .../org/gradle/model/internal/core/ModelNode.java  |   74 +
 .../org/gradle/model/internal/core/ModelPath.java  |  257 +
 .../model/internal/core/ModelProjection.java       |   20 +
 .../gradle/model/internal/core/ModelPromise.java   |   37 +
 .../gradle/model/internal/core/ModelReference.java |  148 +
 .../gradle/model/internal/core/ModelRegistrar.java |   29 +
 .../org/gradle/model/internal/core/ModelRule.java  |   23 +
 .../internal/core/ModelRuleExecutionException.java |   49 +
 .../org/gradle/model/internal/core/ModelView.java  |   31 +
 .../org/gradle/model/internal/core/ModelViews.java |   49 +
 .../model/internal/core/MutableModelNode.java      |  102 +
 .../internal/core/NamedEntityInstantiator.java     |   21 +
 .../core/ProjectionBackedModelCreator.java         |   83 +
 .../TypeCompatibilityModelProjectionSupport.java   |  110 +
 .../internal/core/UnmanagedModelProjection.java    |   40 +
 .../rule/describe/AbstractModelRuleDescriptor.java |   31 +
 .../rule/describe/MethodModelRuleDescriptor.java   |  107 +
 .../core/rule/describe/ModelRuleDescriptor.java    |   30 +
 .../rule/describe/NestedModelRuleDescriptor.java   |   52 +
 .../rule/describe/SimpleModelRuleDescriptor.java   |   41 +
 ...AbstractAnnotationDrivenModelRuleExtractor.java |   47 +
 .../AbstractModelCreationRuleExtractor.java        |   39 +
 .../AbstractMutationModelRuleExtractor.java        |   43 +
 .../inspect/DefaultMethodRuleDefinition.java       |  128 +
 .../inspect/DefaultModelCreatorFactory.java        |   82 +
 .../internal/inspect/DefaultModelRuleInvoker.java  |   56 +
 .../inspect/DefaultsModelRuleExtractor.java        |   29 +
 .../inspect/FinalizeModelRuleExtractor.java        |   29 +
 .../inspect/ManagedModelCreationRuleExtractor.java |   94 +
 .../internal/inspect/ManagedModelInitializer.java  |   77 +
 .../internal/inspect/ManagedSetInitializer.java    |   40 +
 .../internal/inspect/MethodBackedModelAction.java  |   65 +
 .../internal/inspect/MethodModelRuleExtractor.java |   30 +
 .../inspect/MethodModelRuleExtractors.java         |   39 +
 .../internal/inspect/MethodRuleDefinition.java     |   45 +
 .../model/internal/inspect/ModelRuleExtractor.java |  229 +
 .../model/internal/inspect/ModelRuleInvoker.java   |   21 +
 .../internal/inspect/ModelRuleSourceDetector.java  |  105 +
 .../internal/inspect/MutateModelRuleExtractor.java |   29 +
 .../inspect/RuleMethodBackedMutationAction.java    |   39 +
 .../UnmanagedModelCreationRuleExtractor.java       |   92 +
 .../inspect/ValidateModelRuleExtractor.java        |   29 +
 .../internal/manage/instance/ManagedInstance.java  |   29 +
 .../manage/instance/ManagedProxyFactory.java       |   42 +
 .../manage/instance/ModelElementState.java         |   29 +
 .../manage/projection/ManagedModelProjection.java  |  172 +
 .../projection/ManagedSetModelProjection.java      |  244 +
 .../manage/schema/ModelCollectionSchema.java       |   32 +
 .../internal/manage/schema/ModelProperty.java      |   88 +
 .../model/internal/manage/schema/ModelSchema.java  |   84 +
 .../internal/manage/schema/ModelSchemaStore.java   |   29 +
 .../internal/manage/schema/ModelStructSchema.java  |   45 +
 .../manage/schema/cache/ModelSchemaCache.java      |  109 +
 .../manage/schema/cache/MultiWeakClassSet.java     |   81 +
 .../manage/schema/cache/SingleWeakClassSet.java    |   59 +
 .../internal/manage/schema/cache/WeakClassSet.java |   36 +
 .../schema/extract/DefaultModelSchemaStore.java    |   53 +
 .../manage/schema/extract/EnumStrategy.java        |   40 +
 .../InvalidManagedModelElementTypeException.java   |   79 +
 .../schema/extract/JdkValueTypeStrategy.java       |   73 +
 .../schema/extract/ManagedProxyClassGenerator.java |  403 ++
 .../manage/schema/extract/ManagedSetStrategy.java  |   85 +
 .../extract/ModelSchemaExtractionContext.java      |   86 +
 .../extract/ModelSchemaExtractionResult.java       |   47 +
 .../extract/ModelSchemaExtractionStrategy.java     |   29 +
 .../schema/extract/ModelSchemaExtractor.java       |  117 +
 .../manage/schema/extract/PrimitiveStrategy.java   |   55 +
 .../manage/schema/extract/StructStrategy.java      |  417 ++
 .../UnmanagedModelElementTypeException.java        |   23 +
 .../manage/schema/extract/UnmanagedStrategy.java   |   32 +
 .../method/WeaklyTypeReferencingMethod.java        |  165 +
 .../internal/registry/BinderCreationListener.java  |   42 +
 .../model/internal/registry/CreatorRuleBinder.java |   35 +
 .../internal/registry/DefaultModelRegistry.java    | 1017 ++++
 .../model/internal/registry/ModelBinding.java      |   71 +
 .../internal/registry/ModelCreationListener.java   |   64 +
 .../gradle/model/internal/registry/ModelGraph.java |  186 +
 .../model/internal/registry/ModelNodeInternal.java |  239 +
 .../registry/ModelPathSuggestionProvider.java      |   90 +
 .../model/internal/registry/ModelRegistry.java     |  141 +
 .../internal/registry/ModelRegistryScope.java      |   23 +
 .../model/internal/registry/MutatorRuleBinder.java |   67 +
 .../registry/OneOfTypeBinderCreationListener.java  |   72 +
 .../registry/PathBinderCreationListener.java       |   57 +
 .../gradle/model/internal/registry/RuleBinder.java |  106 +
 .../registry/UnboundModelRulesException.java       |   47 +
 .../internal/registry/UnboundRulesProcessor.java   |   89 +
 .../internal/report/AmbiguousBindingReporter.java  |  108 +
 .../report/IncompatibleTypeReferenceReporter.java  |   92 +
 .../model/internal/report/unbound/UnboundRule.java |   85 +
 .../internal/report/unbound/UnboundRuleInput.java  |  134 +
 .../report/unbound/UnboundRulesReporter.java       |   90 +
 .../model/internal/type/ClassTypeWrapper.java      |   37 +
 .../org/gradle/model/internal/type/ModelType.java  |  381 ++
 .../org/gradle/model/internal/type/ModelTypes.java |   29 +
 .../model/internal/type/NullTypeWrapper.java       |   33 +
 .../internal/type/ParameterizedTypeWrapper.java    |  135 +
 .../gradle/model/internal/type/TypeWrapper.java    |   25 +
 .../model/internal/type/WildcardTypeWrapper.java   |  105 +
 .../main/java/org/gradle/model/package-info.java   |   20 +
 .../internal/CollectionBuilderModelViewTest.groovy |   51 +
 .../internal/DefaultCollectionBuilderTest.groovy   |  842 ++++
 .../collection/internal/HasDependencies.groovy     |   27 +
 .../gradle/model/collection/internal/Special.java  |   23 +
 .../core/InstanceBackedModelCreatorTest.groovy     |   56 +
 .../model/internal/core/ModelPathTest.groovy       |  119 +
 .../internal/core/ModelPathValidationTest.groovy   |  123 +
 .../model/internal/core/ModelTypeJavaTest.java     |   43 +
 .../model/internal/core/ModelTypeTest.groovy       |  122 +
 .../describe/MethodModelRuleDescriptorTest.groovy  |   46 +
 ...herManagedWithPropertyOfInvalidManagedType.java |   24 +
 .../ClassModelRuleSourceValidationTest.groovy      |   66 +
 .../gradle/model/internal/inspect/HasStrings.java  |   23 +
 .../internal/inspect/ManagedAnnotatedClass.java    |   23 +
 ...agedWithNestedPropertyOfInvalidManagedType.java |   24 +
 ...gedWithNestedReferenceOfInvalidManagedType.java |   25 +
 .../inspect/ManagedWithNonManageableParents.java   |   23 +
 .../ManagedWithPropertyOfInvalidManagedType.java   |   24 +
 .../ManagedWithReferenceOfInvalidManagedType.java  |   25 +
 .../internal/inspect/ModelRuleBindingTest.groovy   |  186 +
 .../internal/inspect/ModelRuleExtractorTest.groovy |  532 ++
 .../inspect/ModelRuleSourceDetectorTest.groovy     |  114 +
 .../inspect/MutationRuleExecutionOrderTest.groovy  |  126 +
 .../gradle/model/internal/inspect/NonManaged.java  |   20 +
 .../gradle/model/internal/inspect/OuterClass.java  |   72 +
 .../internal/inspect/ParametrizedManaged.java      |   23 +
 .../manage/instance/ManagedProxyTest.groovy        |   45 +
 .../ManagedSetModelProjectionTest.groovy           |  170 +
 .../extract/DefaultModelSchemaStoreTest.groovy     |  144 +
 .../extract/ManagedProxyClassGeneratorTest.groovy  |  136 +
 .../schema/extract/ModelSchemaExtractorTest.groovy |  814 ++++
 .../manage/schema/extract/SimpleManagedType.java   |   28 +
 .../manage/schema/extract/SpecialManagedSet.java   |   21 +
 .../registry/DefaultModelRegistryTest.groovy       |  826 ++++
 .../model/internal/registry/ModelGraphTest.groovy  |  362 ++
 .../registry/ModelNodeReplacementTest.groovy       |   57 +
 .../ModelPathSuggestionProviderTest.groovy         |   55 +
 .../registry/ModelRegistryEphemeralNodeTest.groovy |  147 +
 .../model/internal/registry/ScopedRuleTest.groovy  |  209 +
 .../registry/UnboundRulesProcessorTest.groovy      |  396 ++
 .../report/unbound/UnboundRulesReporterTest.groovy |   50 +
 .../internal/fixture/ModelRegistryHelper.java      |  568 +++
 .../unbound/UnboundRulesReportMatchers.groovy      |   38 +
 subprojects/model-groovy/model-groovy.gradle       |   33 +
 .../dsl/ModelDslCreationIntegrationTest.groovy     |  121 +
 .../model/dsl/ModelDslIntegrationTest.groovy       |  234 +
 .../ModelDslRuleDetectionIntegrationSpec.groovy    |  151 +
 ...odelDslRuleInputDetectionIntegrationSpec.groovy |  251 +
 .../NestedModelDslUsageIntegrationSpec.groovy      |  178 +
 .../internal/NonTransformedModelDslBacking.java    |  130 +
 .../dsl/internal/TransformedModelDslBacking.java   |  137 +
 .../model/dsl/internal/inputs/RuleInputAccess.java |   23 +
 .../internal/inputs/RuleInputAccessBacking.java    |   58 +
 .../ClosureCreationInterceptingVerifier.java       |   39 +
 .../internal/transform/ModelBlockTransformer.java  |  101 +
 .../model/dsl/internal/transform/RuleMetadata.java |   32 +
 .../model/dsl/internal/transform/RuleVisitor.java  |  168 +
 .../model/dsl/internal/transform/RulesBlock.java   |   30 +
 .../model/dsl/internal/transform/RulesVisitor.java |  188 +
 .../dsl/internal/transform/SourceLocation.java     |   55 +
 .../NonTransformedModelDslBackingTest.groovy       |  178 +
 .../internal/TransformedModelDslBackingTest.groovy |  125 +
 subprojects/native/native.gradle                   |    3 -
 .../NativeIntegrationException.java                |   26 +
 .../NativeIntegrationUnavailableException.java     |   25 +
 .../nativeintegration/ProcessEnvironment.java      |  103 +
 .../nativeintegration/ReflectiveEnvironment.java   |   76 +
 .../nativeintegration/console/ConsoleDetector.java |   29 +
 .../nativeintegration/console/ConsoleMetaData.java |   36 +
 .../console/FallbackConsoleMetaData.java           |   31 +
 .../console/NativePlatformConsoleDetector.java     |   48 +
 .../console/NativePlatformConsoleMetaData.java     |   43 +
 .../console/NoOpConsoleDetector.java               |   23 +
 .../console/UnixConsoleMetaData.java               |   51 +
 .../console/WindowsConsoleDetector.java            |   35 +
 .../nativeintegration/filesystem/Chmod.java        |   31 +
 .../filesystem/FileCanonicalizer.java              |   23 +
 .../filesystem/FileException.java                  |   23 +
 .../filesystem/FileModeAccessor.java               |   23 +
 .../filesystem/FileModeMutator.java                |   23 +
 .../nativeintegration/filesystem/FileSystem.java   |   57 +
 .../nativeintegration/filesystem/Stat.java         |   23 +
 .../nativeintegration/filesystem/Symlink.java      |   25 +
 .../filesystem/jdk7/Jdk7FileCanonicalizer.java     |   33 +
 .../jdk7/PosixFilePermissionConverter.java         |   96 +
 .../jdk7/PosixJdk7FilePermissionHandler.java       |   42 +
 .../filesystem/services/EmptyChmod.java            |   30 +
 .../services/FallbackFileCanonicalizer.java        |   33 +
 .../filesystem/services/FallbackStat.java          |   36 +
 .../filesystem/services/FileSystemServices.java    |   84 +
 .../filesystem/services/GenericFileSystem.java     |  126 +
 .../services/NativePlatformBackedChmod.java        |   34 +
 .../services/NativePlatformBackedStat.java         |   35 +
 .../services/NativePlatformBackedSymlink.java      |   40 +
 .../filesystem/services/UnavailablePosixFiles.java |   22 +
 .../services/UnsupportedFilePermissions.java       |   49 +
 .../filesystem/services/UnsupportedSymlink.java    |   32 +
 .../filesystem/services/WindowsSymlink.java        |   32 +
 .../jna/JnaBootPathConfigurer.java                 |   66 +
 .../jna/UnsupportedEnvironment.java                |   70 +
 .../AbstractProcessEnvironment.java                |   92 +
 .../NativePlatformBackedProcessEnvironment.java    |   51 +
 .../nativeintegration/services/FileSystems.java    |   24 +
 .../nativeintegration/services/NativeServices.java |  209 +
 .../nativeplatform/NativeIntegrationException.java |   26 -
 .../NativeIntegrationUnavailableException.java     |   25 -
 .../nativeplatform/ProcessEnvironment.java         |  103 -
 .../nativeplatform/ReflectiveEnvironment.java      |   76 -
 .../nativeplatform/console/ConsoleDetector.java    |   29 -
 .../nativeplatform/console/ConsoleMetaData.java    |   36 -
 .../console/FallbackConsoleMetaData.java           |   31 -
 .../console/NativePlatformConsoleDetector.java     |   48 -
 .../console/NativePlatformConsoleMetaData.java     |   43 -
 .../console/NoOpConsoleDetector.java               |   23 -
 .../console/UnixConsoleMetaData.java               |   51 -
 .../console/WindowsConsoleDetector.java            |   35 -
 .../internal/nativeplatform/filesystem/Chmod.java  |   33 -
 .../filesystem/DefaultFilePathEncoder.java         |   42 -
 .../nativeplatform/filesystem/EmptyChmod.java      |   25 -
 .../nativeplatform/filesystem/FallbackStat.java    |   30 -
 .../nativeplatform/filesystem/FallbackSymlink.java |   26 -
 .../nativeplatform/filesystem/FilePathEncoder.java |   23 -
 .../nativeplatform/filesystem/FileSystem.java      |   62 +-
 .../filesystem/FileSystemServices.java             |  116 -
 .../filesystem/GenericFileSystem.java              |  144 -
 .../nativeplatform/filesystem/LibCStat.java        |   55 -
 .../nativeplatform/filesystem/LibcChmod.java       |   42 -
 .../nativeplatform/filesystem/LibcSymlink.java     |   40 -
 .../filesystem/NativePlatformBackedChmod.java      |   34 -
 .../filesystem/NativePlatformBackedStat.java       |   34 -
 .../filesystem/NativePlatformBackedSymlink.java    |   35 -
 .../nativeplatform/filesystem/PosixStat.java       |   34 -
 .../nativeplatform/filesystem/PosixUtil.java       |   75 -
 .../internal/nativeplatform/filesystem/Stat.java   |   24 -
 .../nativeplatform/filesystem/Symlink.java         |   24 -
 .../jdk7/PosixFilePermissionConverter.java         |   96 -
 .../jdk7/PosixJdk7FilePermissionHandler.java       |   47 -
 .../nativeplatform/jna/JnaBootPathConfigurer.java  |   66 -
 .../gradle/internal/nativeplatform/jna/LibC.java   |   36 -
 .../jna/LibCBackedConsoleDetector.java             |   64 -
 .../jna/LibCBackedProcessEnvironment.java          |   69 -
 .../nativeplatform/jna/UnsupportedEnvironment.java |   70 -
 .../AbstractProcessEnvironment.java                |   92 -
 .../NativePlatformBackedProcessEnvironment.java    |   51 -
 .../nativeplatform/services/FileSystems.java       |   24 -
 .../nativeplatform/services/NativeServices.java    |  197 -
 .../NativePlatformConsoleDetectorTest.groovy       |   67 +
 .../filesystem/CommonFileSystemTest.groovy         |  119 +
 .../filesystem/LinuxFileSystemTest.groovy          |   36 +
 .../filesystem/MacOsFileSystemTest.groovy          |   36 +
 .../filesystem/WindowsFileSystemTest.groovy        |   37 +
 .../jdk7/PosixFilePermissionConverterTest.groovy   |   59 +
 .../jdk7/PosixJdk7FilePermissionHandlerTest.groovy |   41 +
 .../services/GenericFileSystemTest.groovy          |   75 +
 .../services/UnsupportedFilePermissionsTest.groovy |   57 +
 .../ProcessEnvironmentTest.groovy                  |   79 +
 .../NativeServicesInitializationTest.groovy        |   47 +
 .../services/NativeServicesTest.groovy             |   80 +
 .../NativePlatformConsoleDetectorTest.groovy       |   67 -
 .../filesystem/CommonFileSystemTest.groovy         |  113 -
 .../nativeplatform/filesystem/LibcStatTest.groovy  |   51 -
 .../filesystem/LinuxFileSystemTest.groovy          |   36 -
 .../filesystem/MacOsFileSystemTest.groovy          |   36 -
 .../filesystem/WindowsFileSystemTest.groovy        |   37 -
 .../jdk7/PosixFilePermissionConverterTest.groovy   |   59 -
 .../jdk7/PosixJdk7FilePermissionHandlerTest.groovy |   41 -
 .../jna/LibCBackedProcessEnvironmentTest.groovy    |   39 -
 .../ProcessEnvironmentTest.groovy                  |   79 -
 .../services/NativeServicesTest.groovy             |   68 -
 subprojects/open-api/open-api.gradle               |    3 +-
 .../openapi/BlockingRequestObserver.java           |  136 -
 .../integtests/openapi/CrossVersionBuilder.java    |   99 -
 ...CrossVersionCompatibilityIntegrationTest.groovy |   89 +-
 .../ExtraTestCommandLineOptionsListener.java       |   32 -
 .../integtests/openapi/GradleRunnerTest.groovy     |  278 --
 .../gradle/integtests/openapi/OpenApiFixture.java  |  154 -
 .../gradle/integtests/openapi/OpenApiUiTest.groovy |  971 ----
 .../integtests/openapi/OutputUILordTest.groovy     |  127 -
 .../TestAlternateUIInteractionVersion1.java        |   52 -
 .../openapi/TestSettingsNodeVersion1.java          |  245 -
 .../TestSingleDualPaneUIInteractionVersion1.java   |   44 -
 .../shared/build.gradle                            |    3 -
 .../shared/settings.gradle                         |    1 -
 .../integtests/openapi/testproject/build.gradle    |    1 -
 .../integtests/openapi/testproject/settings.gradle |    1 -
 .../org/gradle/foundation/BootstrapLoader.java     |  187 -
 .../gradle/foundation/ParentLastClassLoader.java   |   72 -
 .../gradle/openapi/external/ExternalUtility.java   |  166 -
 .../external/runner/GradleRunnerFactory.java       |  133 -
 .../external/runner/GradleRunnerVersion1.java      |   35 -
 .../openapi/external/ui/DualPaneUIVersion1.java    |   59 -
 .../org/gradle/openapi/external/ui/UIFactory.java  |  238 -
 .../openapi/external/ExternalUtilityTest.groovy    |   70 -
 .../plugins/osgi/OsgiPluginIntegrationSpec.groovy  |    7 +-
 .../org/gradle/api/plugins/osgi/OsgiPlugin.groovy  |    3 +-
 ...{osgi.properties => org.gradle.osgi.properties} |    0
 .../plugins/osgi/OsgiPluginConventionTest.groovy   |    2 +-
 .../gradle/api/plugins/osgi/OsgiPluginTest.groovy  |    1 -
 subprojects/performance/performance.gradle         |  256 +-
 .../performance/src/configPlugin/ConfigPlugin.java |    4 +-
 subprojects/performance/src/generator.groovy       |   70 +-
 .../performance/CleanBuildPerformanceTest.groovy   |    5 +-
 .../ConfigurationPerformanceTest.groovy            |    5 +-
 .../performance/DaemonPerformanceTest.groovy       |   48 +
 .../DependencyReportPerformanceTest.groovy         |    5 +-
 .../DependencyResolutionStressTest.groovy          |    2 +
 .../performance/FirstBuildPerformanceTest.groovy   |    5 +-
 .../IdeIntegrationPerformanceTest.groovy           |   19 +-
 .../ManyEmptyProjectsHelpPerformanceTest.groovy    |   40 +
 .../NativeParallelPerformanceTest.groovy           |   44 +
 .../performance/NativePerformanceTest.groovy       |   62 +
 .../NativeScenarioPerformanceTest.groovy           |   77 +
 .../OldJavaPluginBigProjectPerformanceTest.groovy  |   50 +
 .../OldVsNewJavaPluginPerformanceTest.groovy       |   85 +
 .../ParallelBuildPerformanceTest.groovy            |   40 +
 .../ProjectDependenciesPerformanceTest.groovy      |   38 +
 .../TestExecutionPerformanceTest.groovy            |    5 +-
 .../UpToDateBuildPerformanceTest.groovy            |    5 +-
 .../performance/VariantsPerformanceTest.groovy     |  130 +
 .../templates/build-event-timestamps/build.gradle  |   20 +
 .../src/templates/config-inject/build.gradle       |    8 +-
 .../src/templates/heap-capture/build.gradle        |    8 +-
 subprojects/performance/src/templates/init.gradle  |    5 +
 .../Production.java                                |    0
 .../src/templates/native-component/build.gradle    |    9 +
 .../src/templates/native-scenario/build.gradle     |   70 +
 .../performance/src/templates/native-source/lib.c  |    8 +
 .../src/templates/new-java-plugin/build.gradle     |  112 +
 .../src/templates/old-java-plugin/build.gradle     |   76 +
 .../src/templates/project-with-source/build.gradle |   25 +-
 .../src/templates/project-with-source/pom.xml      |   12 +-
 .../performance/src/templates/root-project/pom.xml |    1 +
 .../performance/src/templates/settings.gradle      |    8 +-
 .../src/templates/variants-new-model/build.gradle  |  194 +
 .../src/templates/variants-old-model/build.gradle  |  167 +
 .../src/templates/with-testng/build.gradle         |    5 +-
 .../src/templates/with-verbose-testng/build.gradle |    5 +-
 .../gradle/performance/ResultSpecification.groovy  |   28 +-
 .../BuildEventTimestampCollectorTest.groovy        |   97 +
 .../CrossVersionPerformanceResultsTest.groovy      |  287 ++
 .../CrossVersionPerformanceTestRunnerTest.groovy   |  110 +
 .../performance/fixture/GCEventParserTest.groovy   |   64 +
 .../fixture/GCLoggingCollectorTest.groovy          |   29 +-
 .../fixture/PerformanceResultsTest.groovy          |  287 --
 .../fixture/PerformanceTestRunnerTest.groovy       |  105 -
 .../performance/fixture/WaitingReaderTest.groovy   |   93 +
 .../performance/measure/DataSeriesTest.groovy      |    4 +-
 .../results/CompositeResultsStoreTest.groovy       |   46 +
 .../results/CrossBuildResultsStoreTest.groovy      |  155 +
 .../results/CrossVersionResultsStoreTest.groovy    |  234 +
 .../performance/results/ReportGeneratorTest.groovy |    4 +-
 .../performance/results/ResultsStoreTest.groovy    |  248 -
 .../org/gradle/performance/fixture/gc-1.txt        |   18 +-
 .../org/gradle/performance/fixture/gc-2.txt        |   14 +-
 .../org/gradle/performance/fixture/gc-3.txt        |   14 +-
 .../org/gradle/performance/fixture/gc-4.txt        |   19 +
 .../gradle/performance/fixture/mac-jdk8.0.25.txt   |   24 +
 .../org/gradle/performance/fixture/win-1.txt       |   20 +
 .../AbstractCrossBuildPerformanceTest.groovy       |   64 +
 .../AbstractCrossVersionPerformanceTest.groovy     |   56 +
 .../groovy/org/gradle/performance/Experiment.java  |   20 +
 .../org/gradle/performance/PerformanceTest.java    |   20 +
 .../fixture/AbstractPerformanceTest.groovy         |   52 -
 .../performance/fixture/BaselineVersion.groovy     |   10 +-
 .../performance/fixture/BuildDisplayInfo.groovy    |   39 +
 .../fixture/BuildEventTimestampCollector.java      |   95 +
 .../performance/fixture/BuildExperimentRunner.java |   84 +
 .../performance/fixture/BuildExperimentSpec.groovy |   90 +
 .../fixture/CompositeDataCollector.java            |   18 +-
 .../performance/fixture/CompositeDataReporter.java |   10 +-
 .../fixture/CrossBuildPerformanceResults.groovy    |   60 +
 .../fixture/CrossBuildPerformanceTestRunner.groovy |   97 +
 .../fixture/CrossVersionPerformanceResults.groovy  |  123 +
 .../CrossVersionPerformanceTestRunner.groovy       |  118 +
 .../gradle/performance/fixture/DataCollector.java  |    6 +-
 .../gradle/performance/fixture/DataReporter.groovy |    8 +-
 .../gradle/performance/fixture/GCEventParser.java  |   74 +
 .../performance/fixture/GCLoggingCollector.java    |  133 +-
 .../fixture/GradleExecuterBackedSession.groovy     |   78 +
 .../fixture/GradleInvocationSpec.groovy            |  136 +
 .../gradle/performance/fixture/GradleSession.java  |   29 +
 .../performance/fixture/GradleSessionProvider.java |   38 +
 .../fixture/MeasuredOperationList.groovy           |   10 +-
 .../performance/fixture/MemoryInfoCollector.groovy |   10 +-
 .../gradle/performance/fixture/OperationTimer.java |   15 +-
 .../performance/fixture/PerformanceResults.groovy  |  129 -
 .../performance/fixture/PerformanceTestResult.java |   74 +
 .../fixture/PerformanceTestRunner.groovy           |  138 -
 .../performance/fixture/PerformanceTestSpec.java   |   47 +
 .../fixture/TextFileDataReporter.groovy            |    4 +-
 .../fixture/ToolingApiBackedGradleSession.groovy   |   72 +
 .../gradle/performance/fixture/WaitingReader.java  |   73 +
 .../org/gradle/performance/measure/DataSeries.java |   22 +
 .../performance/measure/MeasuredOperation.groovy   |    6 +
 .../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          |  261 +
 .../results/CrossVersionTestExecutionHistory.java  |  150 +
 .../org/gradle/performance/results/H2FileDb.java   |   61 +
 .../performance/results/HtmlPageGenerator.java     |   70 +-
 .../performance/results/IndexPageGenerator.java    |   59 +-
 .../performance/results/PerformanceResults.java    |   39 +
 .../performance/results/ReportGenerator.java       |    5 +-
 .../gradle/performance/results/ResultsStore.java   |  291 +-
 .../performance/results/TestDataGenerator.java     |   18 +-
 .../performance/results/TestExecutionHistory.java  |   64 +-
 .../performance/results/TestPageGenerator.java     |  139 +-
 subprojects/platform-base/platform-base.gradle     |   10 +
 .../base/AssembleTaskIntegrationTest.groovy        |  151 +
 ...oTestedSamplePlatformBaseIntegrationTest.groovy |   27 +
 .../base/ComponentTypeSampleIntegTest.groovy       |   59 +
 .../base/CustomBinaryIntegrationTest.groovy        |  302 ++
 .../base/CustomBinaryTasksIntegrationTest.groovy   |  278 ++
 .../CustomComponentBinariesIntegrationTest.groovy  |  244 +
 .../CustomComponentPluginIntegrationTest.groovy    |  318 ++
 .../base/LanguageTypeIntegrationTest.groovy        |  112 +
 .../base/LanguageTypeSampleIntegrationTest.groovy  |   67 +
 .../LanguageBasePluginIntegrationTest.groovy       |   21 +
 .../LifecycleBasePluginIntegrationTest.groovy      |   92 +
 .../api/internal/tasks/compile/Compiler.java       |   26 +
 .../gradle/language/base/FunctionalSourceSet.java  |   30 +
 .../gradle/language/base/LanguageSourceSet.java    |   49 +
 .../org/gradle/language/base/ProjectSourceSet.java |   25 +
 .../language/base/artifact/SourcesArtifact.java    |   28 +
 .../language/base/artifact/package-info.java       |   20 +
 .../base/internal/DefaultFunctionalSourceSet.java  |   66 +
 .../base/internal/DefaultProjectSourceSet.java     |   26 +
 .../base/internal/LanguageSourceSetContainer.java  |   51 +
 .../base/internal/LanguageSourceSetInternal.java   |   34 +
 .../base/internal/SourceSetNotationParser.java     |   70 +
 .../base/internal/SourceTransformTaskConfig.java   |   28 +
 .../base/internal/compile/CompileSpec.java         |   20 +
 .../language/base/internal/compile/Compiler.java   |   22 +
 .../base/internal/compile/CompilerFactory.java     |   21 +
 .../base/internal/compile/CompilerUtil.java        |   24 +
 .../language/base/internal/plugins/CleanRule.java  |   61 +
 .../internal/registry/DefaultLanguageRegistry.java |   32 +
 .../DefaultLanguageTransformContainer.java         |   32 +
 .../internal/registry/LanguageRegistration.java    |   38 +
 .../base/internal/registry/LanguageRegistry.java   |   25 +
 .../base/internal/registry/LanguageTransform.java  |   52 +
 .../registry/LanguageTransformContainer.java       |   25 +
 .../registry/RuleBasedLanguageRegistration.java    |   59 +
 .../internal/tasks/SimpleStaleClassCleaner.java    |   43 +
 .../base/internal/tasks/StaleClassCleaner.java     |   43 +
 .../org/gradle/language/base/package-info.java     |    0
 .../base/plugins/ComponentModelBasePlugin.java     |  215 +
 .../language/base/plugins/LanguageBasePlugin.java  |  195 +
 .../language/base/plugins/LifecycleBasePlugin.java |  116 +
 .../gradle/language/base/plugins/package-info.java |    0
 .../base/sources/BaseLanguageSourceSet.java        |  143 +
 .../gradle/language/base/sources/package-info.java |   24 +
 .../java/org/gradle/platform/base/Application.java |   27 +
 .../platform/base/ApplicationBinarySpec.java       |   30 +
 .../org/gradle/platform/base/ApplicationSpec.java  |   26 +
 .../main/java/org/gradle/platform/base/Binary.java |   30 +
 .../org/gradle/platform/base/BinaryContainer.java  |   25 +
 .../java/org/gradle/platform/base/BinarySpec.java  |   71 +
 .../java/org/gradle/platform/base/BinaryTasks.java |   68 +
 .../platform/base/BinaryTasksCollection.java       |   34 +
 .../java/org/gradle/platform/base/BinaryType.java  |   54 +
 .../gradle/platform/base/BinaryTypeBuilder.java    |   26 +
 .../gradle/platform/base/ComponentBinaries.java    |   60 +
 .../org/gradle/platform/base/ComponentSpec.java    |   58 +
 .../platform/base/ComponentSpecContainer.java      |   28 +
 .../platform/base/ComponentSpecIdentifier.java     |   28 +
 .../org/gradle/platform/base/ComponentType.java    |   59 +
 .../gradle/platform/base/ComponentTypeBuilder.java |   24 +
 .../platform/base/InvalidModelException.java       |   32 +
 .../org/gradle/platform/base/LanguageType.java     |   52 +
 .../gradle/platform/base/LanguageTypeBuilder.java  |   29 +
 .../java/org/gradle/platform/base/Library.java     |   27 +
 .../gradle/platform/base/LibraryBinarySpec.java    |   30 +
 .../java/org/gradle/platform/base/LibrarySpec.java |   27 +
 .../platform/base/ModelInstantiationException.java |   32 +
 .../java/org/gradle/platform/base/Platform.java    |   35 +
 .../platform/base/PlatformAwareComponentSpec.java  |   31 +
 .../gradle/platform/base/PlatformContainer.java    |   27 +
 .../java/org/gradle/platform/base/ToolChain.java   |   35 +
 .../gradle/platform/base/ToolChainRegistry.java    |   29 +
 .../platform/base/TransformationFileType.java      |   26 +
 .../java/org/gradle/platform/base/TypeBuilder.java |   35 +
 .../platform/base/binary/BaseBinarySpec.java       |  173 +
 .../gradle/platform/base/binary/package-info.java  |   23 +
 .../platform/base/component/BaseComponentSpec.java |  136 +
 .../platform/base/component/package-info.java      |   23 +
 .../platform/base/internal/BinaryBuildAbility.java |   24 +
 .../platform/base/internal/BinaryNamingScheme.java |   42 +
 .../base/internal/BinaryNamingSchemeBuilder.java   |   26 +
 .../platform/base/internal/BinarySpecInternal.java |   32 +
 .../internal/BinaryTasksCollectionWrapper.java     |  193 +
 .../base/internal/ComponentSpecInternal.java       |   30 +
 .../base/internal/DefaultBinaryContainer.java      |   27 +
 .../base/internal/DefaultBinaryNamingScheme.java   |  116 +
 .../internal/DefaultBinaryNamingSchemeBuilder.java |   64 +
 .../internal/DefaultBinaryTasksCollection.java     |   61 +
 .../internal/DefaultComponentSpecContainer.java    |   29 +
 .../internal/DefaultComponentSpecIdentifier.java   |   60 +
 .../base/internal/DefaultPlatformContainer.java    |   30 +
 .../base/internal/DefaultPlatformRequirement.java  |   53 +
 .../base/internal/DefaultPlatformResolvers.java    |   70 +
 .../platform/base/internal/FixedBuildAbility.java  |   39 +
 .../PlatformAwareComponentSpecInternal.java        |   35 +
 .../base/internal/PlatformRequirement.java         |   21 +
 .../platform/base/internal/PlatformResolver.java   |   24 +
 .../platform/base/internal/PlatformResolvers.java  |   24 +
 .../base/internal/ToolSearchBuildAbility.java      |   38 +
 .../builder/LanguageTypeBuilderInternal.java       |   24 +
 .../base/internal/builder/TypeBuilderInternal.java |   23 +
 ...nnotationDrivenComponentModelRuleExtractor.java |   99 +
 .../internal/registry/AbstractTypeBuilder.java     |   41 +
 .../registry/BinaryTasksModelRuleExtractor.java    |  113 +
 .../registry/BinaryTypeModelRuleExtractor.java     |  109 +
 .../registry/CollectionBuilderBasedRule.java       |   97 +
 .../ComponentBinariesModelRuleExtractor.java       |  105 +
 .../ComponentModelBaseServiceRegistry.java         |   76 +
 .../registry/ComponentTypeModelRuleExtractor.java  |  118 +
 .../registry/LanguageTypeModelRuleExtractor.java   |  118 +
 .../internal/registry/TypeModelRuleExtractor.java  |  121 +
 .../RuleAwarePolymorphicDomainObjectContainer.java |   52 +
 .../internal/test/DefaultTestSuiteContainer.java   |   28 +
 .../base/internal/toolchain/ArgCollector.java      |   25 +
 .../base/internal/toolchain/ArgWriter.java         |   89 +
 .../toolchain/DefaultResolvedCompiler.java         |   45 +
 .../internal/toolchain/DefaultResolvedTool.java    |   43 +
 .../internal/toolchain/DefaultToolResolver.java    |  178 +
 .../base/internal/toolchain/ResolvedTool.java      |   21 +
 .../internal/toolchain/ToolChainAvailability.java  |   68 +
 .../base/internal/toolchain/ToolChainInternal.java |   27 +
 .../base/internal/toolchain/ToolProvider.java      |   26 +
 .../base/internal/toolchain/ToolResolver.java      |   29 +
 .../base/internal/toolchain/ToolSearchResult.java  |   28 +
 .../internal/util/ImplementationTypeDetermer.java  |   61 +
 .../org/gradle/platform/base/package-info.java     |   23 +
 .../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.language-base.properties}           |    0
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../ComponentTypeModelRuleExtractorTest.groovy     |  182 +
 .../internal/DefaultFunctionalSourceSetTest.groovy |   30 +
 .../internal/SourceSetNotationParserTest.groovy    |   54 +
 .../LanguageTypeModelRuleExtractorTest.groovy      |  184 +
 .../tasks/SimpleStaleClassCleanerTest.groovy       |   75 +
 .../plugins/ComponentModelBasePluginTest.groovy    |  283 ++
 .../base/plugins/LanguageBasePluginTest.groovy     |   73 +
 .../base/plugins/LifecycleBasePluginTest.groovy    |   88 +
 .../platform/base/binary/BaseBinarySpecTest.groovy |   70 +
 .../base/component/BaseComponentSpecTest.groovy    |  105 +
 .../base/internal/BuildableModelElementTest.groovy |   54 +
 .../internal/DefaultBinaryNamingSchemeTest.groovy  |   79 +
 .../DefaultBinaryTasksCollectionTest.groovy        |   82 +
 .../base/internal/FixedBuildAbilityTest.groovy     |   49 +
 .../internal/ToolSearchBuildAbilityTest.groovy     |   56 +
 ...AbstractAnnotationModelRuleExtractorTest.groovy |   67 +
 .../BinaryTasksModelRuleExtractorTest.groovy       |  108 +
 .../BinaryTypeModelRuleExtractorTest.groovy        |  179 +
 .../ComponentBinariesModelRuleExtractorTest.groovy |  134 +
 ...warePolymorphicDomainObjectContainerTest.groovy |   66 +
 .../base/internal/toolchain/ArgWriterTest.groovy   |   78 +
 .../toolchain/DefaultToolResolverTest.groovy       |  128 +
 .../toolchain/ToolChainAvailabilityTest.groovy     |   67 +
 .../plugin/AbstractLanguagePluginSpec.groovy       |   53 +
 subprojects/platform-jvm/platform-jvm.gradle       |   17 +
 .../jvm/ComponentReportIntegrationTest.groovy      |  186 +
 .../gradle/jvm/JarBinariesIntegrationTest.groovy   |   88 +
 ...toTestedSamplePlatformJvmIntegrationTest.groovy |   27 +
 .../JvmComponentPluginGoodBehaviourTest.groovy     |   21 +
 .../JvmComponentPluginIntegrationTest.groovy       |  246 +
 .../org/gradle/api/java/archives/Attributes.java   |    0
 .../org/gradle/api/java/archives/Manifest.java     |  112 +
 .../api/java/archives/ManifestException.java       |    0
 .../api/java/archives/ManifestMergeDetails.java    |    0
 .../api/java/archives/ManifestMergeSpec.java       |   57 +
 .../java/archives/internal/DefaultAttributes.java  |   97 +
 .../java/archives/internal/DefaultManifest.java    |  241 +
 .../internal/DefaultManifestMergeDetails.java      |    0
 .../internal/DefaultManifestMergeSpec.java         |  122 +
 .../org/gradle/api/java/archives/package-info.java |    0
 .../src/main/java/org/gradle/jvm/Classpath.java    |   28 +
 .../main/java/org/gradle/jvm/JarBinarySpec.java    |   38 +
 .../main/java/org/gradle/jvm/JvmBinarySpec.java    |   84 +
 .../main/java/org/gradle/jvm/JvmBinaryTasks.java   |   32 +
 .../src/main/java/org/gradle/jvm/JvmByteCode.java  |   27 +
 .../java/org/gradle/jvm/JvmComponentExtension.java |   33 +
 .../main/java/org/gradle/jvm/JvmComponentSpec.java |   25 +
 .../src/main/java/org/gradle/jvm/JvmLibrary.java   |   27 +
 .../main/java/org/gradle/jvm/JvmLibrarySpec.java   |   29 +
 .../src/main/java/org/gradle/jvm/JvmResources.java |   28 +
 .../jvm/internal/AbstractJvmBinaryRenderer.java    |   29 +
 .../org/gradle/jvm/internal/DefaultClasspath.java  |   39 +
 .../gradle/jvm/internal/DefaultJarBinarySpec.java  |  108 +
 .../gradle/jvm/internal/DefaultJvmBinaryTasks.java |   33 +
 .../gradle/jvm/internal/DefaultJvmLibrarySpec.java |   54 +
 .../org/gradle/jvm/internal/JarBinaryRenderer.java |   32 +
 .../gradle/jvm/internal/JarBinarySpecInternal.java |   26 +
 .../gradle/jvm/internal/JavaPlatformResolver.java  |   51 +
 .../jvm/internal/JvmLibrarySpecInternal.java       |   26 +
 .../gradle/jvm/internal/PlatformJvmServices.java   |   35 +
 .../plugins/DefaultJvmComponentExtension.java      |   34 +
 .../internal/toolchain/JavaToolChainInternal.java  |   24 +
 .../src/main/java/org/gradle/jvm/package-info.java |   23 +
 .../java/org/gradle/jvm/platform/JavaPlatform.java |   45 +
 .../jvm/platform/internal/DefaultJavaPlatform.java |   64 +
 .../java/org/gradle/jvm/platform/package-info.java |   20 +
 .../org/gradle/jvm/plugins/JvmComponentPlugin.java |  181 +
 .../java/org/gradle/jvm/plugins/package-info.java  |   23 +
 .../src/main/java/org/gradle/jvm/tasks/Jar.java    |  130 +
 .../java/org/gradle/jvm/tasks/package-info.java    |   23 +
 .../org/gradle/jvm/toolchain/JavaToolChain.java    |   39 +
 .../jvm/toolchain/JavaToolChainRegistry.java       |   29 +
 .../internal/DefaultJavaToolChainRegistry.java     |   34 +
 .../org/gradle/jvm/toolchain/package-info.java     |   20 +
 .../org.gradle.jvm-component.properties            |   17 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../archives/internal/DefaultAttributesTest.groovy |    0
 .../internal/DefaultManifestMergeSpecTest.groovy   |    0
 .../archives/internal/DefaultManifestTest.groovy   |    0
 .../jvm/internal/DefaultJarBinarySpecTest.groovy   |   65 +
 .../jvm/internal/DefaultJvmBinaryTasksTest.groovy  |   60 +
 .../jvm/internal/DefaultJvmLibrarySpecTest.groovy  |   71 +
 .../internal/plugins/CreateJvmBinariesTest.groovy  |   98 +
 .../internal/DefaultJavaPlatformTest.groovy        |   51 +
 .../groovy/org/gradle/jvm/tasks/JarTest.groovy     |   61 +
 subprojects/platform-native/platform-native.gradle |   42 +
 ...estedSamplesRuntimeNativeIntegrationTest.groovy |   31 +
 .../BinaryBuildTypesIntegrationTest.groovy         |  210 +
 .../BinaryConfigurationIntegrationTest.groovy      |  384 ++
 .../BinaryFlavorsIntegrationTest.groovy            |  175 +
 .../ComponentReportIntegrationTest.groovy          |  256 +
 .../LibraryApiDependenciesIntegrationTest.groovy   |  264 +
 .../LibraryBinariesIntegrationTest.groovy          |  317 ++
 .../LibraryDependenciesIntegrationTest.groovy      |  399 ++
 .../NativeBinariesIntegrationTest.groovy           |  360 ++
 .../NativePlatformSamplesIntegrationTest.groovy    |  240 +
 .../PrebuiltLibrariesIntegrationTest.groovy        |  370 ++
 .../SharedLibrarySoNameIntegrationTest.groovy      |   82 +
 .../BinaryNativePlatformIntegrationTest.groovy     |  416 ++
 .../NativeComponentPluginIntegrationTest.groovy    |   22 +
 .../GeneratedSourcesIntegrationTest.groovy         |  461 ++
 ...rceSetCompileDependenciesIntegrationTest.groovy |  147 +
 .../SourceSetDependenciesIntegrationTest.groovy    |  169 +
 ...SourceSetLinkDependenciesIntegrationTest.groovy |  154 +
 .../CommonToolchainCustomizationIntegTest.groovy   |   61 +
 ...ToolChainCrossCompilationIntegrationTest.groovy |   92 +
 ...GccToolChainCustomisationIntegrationTest.groovy |  215 +
 .../GccToolChainDiscoveryIntegrationTest.groovy    |  162 +
 .../MultipleNativeToolChainIntegrationTest.groovy  |   91 +
 .../NativeToolChainDiscoveryIntegrationTest.groovy |   91 +
 ...sualCppToolChainDiscoveryIntegrationTest.groovy |   84 +
 .../nativeplatform/DependentSourceSet.java         |   71 +
 .../nativeplatform/HeaderExportingSourceSet.java   |   43 +
 .../language/nativeplatform/NativeResourceSet.java |   26 +
 .../nativeplatform/internal/SourceIncludes.java    |   24 +
 .../language/nativeplatform/package-info.java      |   20 +
 .../org/gradle/nativeplatform/BuildType.java       |   30 +
 .../gradle/nativeplatform/BuildTypeContainer.java  |   27 +
 .../groovy/org/gradle/nativeplatform/Flavor.java   |   31 +
 .../org/gradle/nativeplatform/FlavorContainer.java |   30 +
 .../org/gradle/nativeplatform/NativeBinary.java    |   42 +
 .../gradle/nativeplatform/NativeBinarySpec.java    |   92 +
 .../nativeplatform/NativeComponentExtension.java   |   47 +
 .../gradle/nativeplatform/NativeComponentSpec.java |   35 +
 .../gradle/nativeplatform/NativeDependencySet.java |   40 +
 .../gradle/nativeplatform/NativeExecutable.java    |   27 +
 .../nativeplatform/NativeExecutableBinary.java     |   31 +
 .../nativeplatform/NativeExecutableBinarySpec.java |   73 +
 .../nativeplatform/NativeExecutableSpec.java       |   27 +
 .../org/gradle/nativeplatform/NativeLibrary.java   |   26 +
 .../gradle/nativeplatform/NativeLibraryBinary.java |   33 +
 .../nativeplatform/NativeLibraryBinarySpec.java    |   36 +
 .../nativeplatform/NativeLibraryRequirement.java   |   39 +
 .../gradle/nativeplatform/NativeLibrarySpec.java   |   40 +
 .../org/gradle/nativeplatform/ObjectFile.java      |   27 +
 .../gradle/nativeplatform/PrebuiltLibraries.java   |   29 +
 .../org/gradle/nativeplatform/PrebuiltLibrary.java |   38 +
 .../PrebuiltSharedLibraryBinary.java               |   37 +
 .../PrebuiltStaticLibraryBinary.java               |   32 +
 .../org/gradle/nativeplatform/Repositories.java    |   28 +
 .../gradle/nativeplatform/SharedLibraryBinary.java |   37 +
 .../nativeplatform/SharedLibraryBinarySpec.java    |   65 +
 .../gradle/nativeplatform/StaticLibraryBinary.java |   34 +
 .../nativeplatform/StaticLibraryBinarySpec.java    |   61 +
 .../nativeplatform/TargetedNativeComponent.java    |   39 +
 .../groovy/org/gradle/nativeplatform/Tool.java     |   36 +
 .../internal/AbstractBinaryToolSpec.java           |   80 +
 .../internal/AbstractNativeBinaryRenderer.java     |   31 +
 .../internal/AbstractNativeBinarySpec.java         |  166 +
 .../internal/AbstractNativeComponentSpec.java      |   44 +
 .../internal/AbstractNativeLibraryBinarySpec.java  |  103 +
 .../AbstractTargetedNativeComponentSpec.java       |   77 +
 .../nativeplatform/internal/BinaryToolSpec.java    |   49 +
 .../BuildOperationLoggingCompilerDecorator.java    |   43 +
 .../internal/CompilerOutputFileNamingScheme.java   |   44 +
 .../nativeplatform/internal/DefaultBuildType.java  |   39 +
 .../internal/DefaultBuildTypeContainer.java        |   34 +
 .../nativeplatform/internal/DefaultFlavor.java     |   41 +
 .../internal/DefaultFlavorContainer.java           |   34 +
 .../nativeplatform/internal/DefaultLinkerSpec.java |   68 +
 .../DefaultNativeExecutableBinarySpec.java         |   79 +
 .../internal/DefaultNativeExecutableSpec.java      |   25 +
 .../internal/DefaultNativeLibrarySpec.java         |   39 +
 .../internal/DefaultSharedLibraryBinarySpec.java   |  132 +
 .../internal/DefaultStaticLibraryArchiverSpec.java |   45 +
 .../internal/DefaultStaticLibraryBinarySpec.java   |  100 +
 .../nativeplatform/internal/DefaultTool.java       |   37 +
 .../gradle/nativeplatform/internal/LinkerSpec.java |   43 +
 .../internal/NativeBinarySpecInternal.java         |   63 +
 .../internal/NativeExecutableBinaryRenderer.java   |   37 +
 .../NativeExecutableBinarySpecInternal.java        |   22 +
 .../internal/NativePlatformResolver.java           |   49 +
 .../internal/ProjectNativeLibraryRequirement.java  |   48 +
 .../internal/SharedLibraryBinaryRenderer.java      |   32 +
 .../internal/SharedLibraryBinarySpecInternal.java  |   22 +
 .../internal/SharedLibraryLinkerSpec.java          |   23 +
 .../internal/StaticLibraryArchiverSpec.java        |   31 +
 .../internal/StaticLibraryBinaryRenderer.java      |   32 +
 .../internal/StaticLibraryBinarySpecInternal.java  |   22 +
 .../internal/TargetedNativeComponentInternal.java  |   28 +
 .../configure/DefaultNativeBinariesFactory.java    |   77 +
 .../configure/DefaultNativeComponentExtension.java |   49 +
 .../internal/configure/NativeBinariesFactory.java  |   28 +
 .../configure/NativeBinarySpecInitializer.java     |   51 +
 .../configure/NativeComponentSpecInitializer.java  |  109 +
 .../ToolSettingNativeBinaryInitializer.java        |   43 +
 ...DefaultPreCompiledHeaderTransformContainer.java |   33 +
 .../pch/PreCompiledHeaderTransformContainer.java   |   23 +
 .../prebuilt/AbstractPrebuiltLibraryBinary.java    |  107 +
 .../prebuilt/DefaultPrebuiltLibraries.java         |   59 +
 .../internal/prebuilt/DefaultPrebuiltLibrary.java  |   50 +
 .../DefaultPrebuiltSharedLibraryBinary.java        |   66 +
 .../DefaultPrebuiltStaticLibraryBinary.java        |   55 +
 .../prebuilt/PrebuiltLibraryBinaryLocator.java     |   60 +
 .../prebuilt/PrebuiltLibraryInitializer.java       |   80 +
 .../prebuilt/PrebuiltLibraryResolveException.java  |   27 +
 .../ApiRequirementNativeDependencyResolver.java    |  104 +
 .../resolve/ChainedLibraryBinaryLocator.java       |   51 +
 .../internal/resolve/DefaultLibraryResolver.java   |  109 +
 .../resolve/DefaultNativeDependencySet.java        |   41 +
 .../internal/resolve/DefaultProjectLocator.java    |   42 +
 .../InputHandlingNativeDependencyResolver.java     |   36 +
 .../internal/resolve/LibraryBinaryLocator.java     |   25 +
 .../resolve/LibraryNativeDependencyResolver.java   |   39 +
 .../internal/resolve/LibraryResolveException.java  |   32 +
 .../NativeBinaryRequirementResolveResult.java      |   64 +
 .../resolve/NativeBinaryResolveResult.java         |   74 +
 .../resolve/NativeDependencyNotationParser.java    |   59 +
 .../internal/resolve/NativeDependencyResolver.java |   20 +
 .../resolve/NativeDependencyResolverServices.java  |   48 +
 .../resolve/ProjectLibraryBinaryLocator.java       |   54 +
 .../internal/resolve/ProjectLocator.java           |   22 +
 ...RequirementParsingNativeDependencyResolver.java |   38 +
 .../resolve/SourceSetNativeDependencyResolver.java |   97 +
 .../internal/services/NativeBinaryServices.java    |   50 +
 .../org/gradle/nativeplatform/package-info.java    |   20 +
 .../nativeplatform/platform/Architecture.java      |   32 +
 .../nativeplatform/platform/NativePlatform.java    |  119 +
 .../nativeplatform/platform/OperatingSystem.java   |   60 +
 .../platform/internal/ArchitectureInternal.java    |   30 +
 .../platform/internal/Architectures.java           |   68 +
 .../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        |  319 ++
 .../plugins/NativeComponentPlugin.groovy           |  132 +
 .../nativeplatform/plugins/package-info.java       |   20 +
 .../nativeplatform/tasks/AbstractLinkTask.groovy   |  130 +
 .../tasks/CreateStaticLibrary.groovy               |  111 +
 .../nativeplatform/tasks/InstallExecutable.groovy  |  169 +
 .../nativeplatform/tasks/LinkExecutable.groovy     |   33 +
 .../nativeplatform/tasks/LinkSharedLibrary.groovy  |   46 +
 .../nativeplatform/tasks/ObjectFilesToBinary.java  |   32 +
 .../tasks/PrefixHeaderFileGenerateTask.java        |   58 +
 .../gradle/nativeplatform/tasks/package-info.java  |   20 +
 .../test/NativeTestSuiteBinarySpec.java            |   84 +
 .../nativeplatform/test/NativeTestSuiteSpec.java   |   33 +
 .../internal/DefaultNativeTestSuiteBinarySpec.java |   93 +
 .../internal/NativeTestSuiteBinaryRenderer.java    |   38 +
 .../NativeTestSuiteBinarySpecInternal.java         |   24 +
 .../gradle/nativeplatform/test/package-info.java   |   20 +
 .../test/plugins/NativeBinariesTestPlugin.java     |  102 +
 .../nativeplatform/test/plugins/package-info.java  |   20 +
 .../test/tasks/RunTestExecutable.groovy            |   72 +
 .../nativeplatform/test/tasks/package-info.java    |   20 +
 .../org/gradle/nativeplatform/toolchain/Clang.java |   26 +
 .../toolchain/CommandLineToolConfiguration.java    |   33 +
 .../org/gradle/nativeplatform/toolchain/Gcc.java   |   26 +
 .../toolchain/GccCommandLineToolConfiguration.java |   38 +
 .../toolchain/GccCompatibleToolChain.java          |   56 +
 .../toolchain/GccPlatformToolChain.java            |   60 +
 .../toolchain/NativePlatformToolChain.java         |   31 +
 .../nativeplatform/toolchain/NativeToolChain.java  |   29 +
 .../toolchain/NativeToolChainRegistry.java         |   30 +
 .../gradle/nativeplatform/toolchain/VisualCpp.java |   53 +
 .../toolchain/VisualCppPlatformToolChain.java      |   55 +
 .../internal/AbstractPlatformToolProvider.java     |  161 +
 .../toolchain/internal/ArgsTransformer.java        |   25 +
 .../toolchain/internal/CommandLineToolContext.java |   36 +
 .../internal/CommandLineToolInvocation.java        |   36 +
 .../internal/CommandLineToolInvocationFailure.java |   26 +
 .../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 +
 .../internal/MutableCommandLineToolContext.java    |   34 +
 .../toolchain/internal/NativeCompileSpec.java      |   85 +
 .../toolchain/internal/NativeCompiler.java         |  155 +
 .../internal/NativeToolChainInternal.java          |   39 +
 .../internal/NativeToolChainRegistryInternal.java  |   31 +
 .../toolchain/internal/OptionsFileArgsWriter.java  |   66 +
 .../toolchain/internal/OutputCleaningCompiler.java |   67 +
 .../internal/PCHObjectDirectoryGeneratorUtil.java  |   39 +
 .../toolchain/internal/PlatformToolProvider.java   |   33 +
 .../internal/PrefixHeaderFileGeneratorUtil.java    |   49 +
 .../toolchain/internal/ToolType.java               |   45 +
 .../internal/UnavailablePlatformToolProvider.java  |   86 +
 .../toolchain/internal/clang/ClangToolChain.java   |   51 +
 .../internal/compilespec/AssembleSpec.java         |   26 +
 .../internal/compilespec/CCompileSpec.java         |   23 +
 .../internal/compilespec/CPCHCompileSpec.java      |   22 +
 .../internal/compilespec/CppCompileSpec.java       |   23 +
 .../internal/compilespec/CppPCHCompileSpec.java    |   22 +
 .../compilespec/ObjectiveCCompileSpec.java         |   23 +
 .../compilespec/ObjectiveCPCHCompileSpec.java      |   22 +
 .../compilespec/ObjectiveCppCompileSpec.java       |   23 +
 .../compilespec/ObjectiveCppPCHCompileSpec.java    |   22 +
 .../compilespec/WindowsResourceCompileSpec.java    |   21 +
 .../gcc/AbstractGccCompatibleToolChain.java        |  254 +
 .../internal/gcc/ArStaticLibraryArchiver.java      |   88 +
 .../toolchain/internal/gcc/Assembler.java          |   36 +
 .../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/GccCompatibleNativeCompiler.java  |   55 +
 .../internal/gcc/GccCompilerArgsTransformer.java   |   70 +
 .../toolchain/internal/gcc/GccLinker.java          |  111 +
 .../internal/gcc/GccOptionsFileArgsWriter.java     |   53 +
 .../internal/gcc/GccPlatformToolProvider.java      |  139 +
 .../toolchain/internal/gcc/GccToolChain.java       |   47 +
 .../toolchain/internal/gcc/ObjectiveCCompiler.java |   36 +
 .../internal/gcc/ObjectiveCPCHCompiler.java        |   35 +
 .../internal/gcc/ObjectiveCppCompiler.java         |   36 +
 .../internal/gcc/ObjectiveCppPCHCompiler.java      |   35 +
 .../internal/gcc/TargetPlatformConfiguration.java  |   31 +
 .../gcc/version/CompilerMetaDataProvider.java      |   24 +
 .../version/CompilerMetaDataProviderFactory.java   |   90 +
 .../internal/gcc/version/GccVersionDeterminer.java |  218 +
 .../internal/gcc/version/GccVersionResult.java     |   32 +
 .../toolchain/internal/msvcpp/Assembler.java       |   44 +
 .../toolchain/internal/msvcpp/CCompiler.java       |   36 +
 .../toolchain/internal/msvcpp/CPCHCompiler.java    |   38 +
 .../toolchain/internal/msvcpp/CppCompiler.java     |   36 +
 .../toolchain/internal/msvcpp/CppPCHCompiler.java  |   38 +
 .../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 +
 .../internal/msvcpp/VisualCppNativeCompiler.java   |   61 +
 .../msvcpp/VisualCppOptionsFileArgsWriter.java     |   31 +
 .../VisualCppPCHCompilerArgsTransformer.java       |   26 +
 .../VisualCppPCHSourceFileGeneratorUtil.java       |   62 +
 .../msvcpp/VisualCppPCHSourceFileTransformer.java  |   36 +
 .../msvcpp/VisualCppPlatformToolProvider.java      |  201 +
 .../internal/msvcpp/VisualCppToolChain.java        |  139 +
 .../internal/msvcpp/VisualStudioInstall.java       |   48 +
 .../internal/msvcpp/VisualStudioLocator.java       |   29 +
 .../internal/msvcpp/WindowsResourceCompiler.java   |   48 +
 .../toolchain/internal/msvcpp/WindowsSdk.java      |  138 +
 .../internal/msvcpp/WindowsSdkLocator.java         |   29 +
 .../internal/plugins/StandardToolChainsPlugin.java |   34 +
 .../CommandLineToolConfigurationInternal.java      |   27 +
 .../tools/CommandLineToolSearchResult.java         |   25 +
 .../tools/DefaultCommandLineToolConfiguration.java |   45 +
 .../DefaultGccCommandLineToolConfiguration.java    |   35 +
 .../GccCommandLineToolConfigurationInternal.java   |   29 +
 .../toolchain/internal/tools/ToolRegistry.java     |   22 +
 .../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 +
 .../org.gradle.native-component.properties         |    1 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../internal/DefaultBuildTypeTest.groovy           |   29 +
 .../internal/DefaultFlavorTest.groovy              |   29 +
 .../internal/DefaultNativeComponentTest.groovy     |   59 +
 .../DefaultNativeExecutableBinarySpecTest.groovy   |   77 +
 .../DefaultNativeExecutableSpecTest.groovy         |   35 +
 .../internal/DefaultNativeLibrarySpecTest.groovy   |   66 +
 .../DefaultSharedLibraryBinarySpecTest.groovy      |  157 +
 .../DefaultStaticLibraryBinarySpecTest.groovy      |  154 +
 .../internal/NativeBinarySpecTest.groovy           |  221 +
 .../configure/CreateDefaultBuildTypesTest.groovy   |   45 +
 .../configure/CreateDefaultFlavorsTest.groovy      |   68 +
 .../DefaultNativeBinariesFactoryTest.groovy        |  103 +
 .../NativeBinarySpecInitializerTest.groovy         |   99 +
 .../NativeComponentSpecInitializerTest.groovy      |  180 +
 .../ToolSettingNativeBinaryInitializerTest.groovy  |   71 +
 .../DefaultPrebuiltSharedLibraryBinaryTest.groovy  |   74 +
 .../DefaultPrebuiltStaticLibraryBinaryTest.groovy  |   56 +
 .../NativeDependencyNotationParserTest.groovy      |   72 +
 .../resolve/ProjectLibraryBinaryLocatorTest.groovy |  148 +
 .../platform/internal/ArchitecturesTest.groovy     |   36 +
 .../internal/DefaultArchitectureTest.groovy        |   56 +
 .../internal/DefaultNativePlatformTest.groovy      |   54 +
 .../internal/DefaultOperatingSystemTest.groovy     |   58 +
 .../platform/internal/ReadelfBinaryInfoTest.groovy |  242 +
 .../plugins/NativeComponentModelPluginTest.groovy  |  230 +
 .../plugins/NativeComponentPluginTest.groovy       |  102 +
 .../DefaultNativeTestSuiteBinarySpecTest.groovy    |   68 +
 .../plugins/NativeBinariesTestPluginTest.groovy    |   70 +
 ...faultCommandLineToolInvocationWorkerTest.groovy |   49 +
 .../DefaultNativeToolChainRegistryTest.groovy      |  183 +
 .../toolchain/internal/NativeCompilerTest.groovy   |  199 +
 .../internal/OptionsFileArgsWriterTest.groovy      |   41 +
 .../internal/OutputCleaningCompilerTest.groovy     |  117 +
 .../PrefixHeaderFileGeneratorUtilTest.groovy       |   46 +
 ...navailableNativePlatformToolProviderTest.groovy |   49 +
 .../gcc/AbstractGccCompatibleToolChainTest.groovy  |  356 ++
 .../toolchain/internal/gcc/AssemblerTest.groovy    |   38 +
 .../toolchain/internal/gcc/CCompilerTest.groovy    |   38 +
 .../internal/gcc/ClangToolChainTest.groovy         |   58 +
 .../toolchain/internal/gcc/CppCompilerTest.groovy  |   39 +
 .../gcc/GccCompatibleNativeCompilerTest.groovy     |   41 +
 .../toolchain/internal/gcc/GccLinkerTest.groovy    |  216 +
 .../gcc/GccOptionsFileArgsWriterTest.groovy        |   51 +
 .../toolchain/internal/gcc/GccToolChainTest.groovy |   74 +
 .../gcc/version/GccVersionDeterminerTest.groovy    |  197 +
 .../toolchain/internal/msvcpp/AssemblerTest.groovy |   50 +
 .../toolchain/internal/msvcpp/CCompilerTest.groovy |   39 +
 .../internal/msvcpp/CppCompilerTest.groovy         |   40 +
 .../msvcpp/DefaultVisualStudioLocatorTest.groovy   |  202 +
 .../msvcpp/DefaultWindowsSdkLocatorTest.groovy     |  256 +
 .../msvcpp/VisualCppNativeCompilerTest.groovy      |   43 +
 .../VisualCppOptionsFileArgsWriterTest.groovy      |   30 +
 .../VisualCppPCHSourceFileGeneratorUtilTest.groovy |   52 +
 .../VisualCppPCHSourceFileTransformerTest.groovy   |   49 +
 .../VisualCppPlatformToolProviderTest.groovy       |   40 +
 .../internal/msvcpp/VisualCppToolChainTest.groovy  |  232 +
 .../msvcpp/WindowsResourceCompilerTest.groovy      |   51 +
 .../internal/tools/ToolSearchPathTest.groovy       |  200 +
 .../plugins/ClangCompilerPluginTest.groovy         |   57 +
 .../toolchain/plugins/GccCompilerPluginTest.groovy |   59 +
 .../plugins/MicrosoftVisualCppPluginTest.groovy    |   64 +
 .../plugins/NativeToolChainPluginTest.groovy       |   73 +
 .../ide/visualstudio/fixtures/FiltersFile.groovy   |    0
 .../ide/visualstudio/fixtures/ProjectFile.groovy   |  128 +
 .../ide/visualstudio/fixtures/SolutionFile.groovy  |    0
 ...bstractInstalledToolChainIntegrationSpec.groovy |   85 +
 .../fixtures/AvailableToolChains.java              |  503 ++
 .../fixtures/ExecutableFixture.groovy              |   35 +
 .../fixtures/NativeBinaryFixture.groovy            |   89 +
 .../fixtures/NativeInstallationFixture.groovy      |   73 +
 .../fixtures/NativePlatformsTestFixture.java       |   37 +
 .../fixtures/RequiresInstalledToolChain.groovy     |   30 +
 .../RequiresInstalledToolChainExtension.groovy     |   39 +
 .../fixtures/SharedLibraryFixture.groovy           |   47 +
 .../fixtures/SingleToolChainTestRunner.java        |   89 +
 .../fixtures/StaticLibraryFixture.groovy           |   29 +
 .../fixtures/ToolChainRequirement.java             |   32 +
 .../app/CCallingMixedCAndCppHelloWorldApp.groovy   |   85 +
 .../fixtures/app/CCompilerDetectingTestApp.groovy  |   81 +
 .../fixtures/app/CHelloWorldApp.groovy             |  173 +
 .../fixtures/app/CPCHHelloWorldApp.groovy          |  186 +
 .../fixtures/app/CppCallingCHelloWorldApp.groovy   |   77 +
 .../app/CppCompilerDetectingTestApp.groovy         |   81 +
 .../fixtures/app/CppHelloWorldApp.groovy           |  169 +
 .../fixtures/app/CppPCHHelloWorldApp.groovy        |  187 +
 .../ExeWithDiamondDependencyHelloWorldApp.groovy   |   58 +
 .../ExeWithLibraryUsingLibraryHelloWorldApp.groovy |  133 +
 .../nativeplatform/fixtures/app/HelloWorldApp.java |  121 +
 .../fixtures/app/IncrementalHelloWorldApp.java     |   53 +
 .../fixtures/app/MixedLanguageHelloWorldApp.groovy |  146 +
 .../app/MixedObjectiveCHelloWorldApp.groovy        |  122 +
 .../fixtures/app/ObjectiveCHelloWorldApp.groovy    |  147 +
 .../fixtures/app/ObjectiveCPCHHelloWorldApp.groovy |  190 +
 .../fixtures/app/ObjectiveCppHelloWorldApp.groovy  |  153 +
 .../app/ObjectiveCppPCHHelloWorldApp.groovy        |  187 +
 .../fixtures/app/PCHHelloWorldApp.groovy           |   31 +
 .../fixtures/app/PlatformDetectingTestApp.groovy   |   87 +
 .../nativeplatform/fixtures/app/TestApp.java       |   74 +
 .../fixtures/app/TestNativeComponent.groovy        |   40 +
 .../app/WindowsResourceHelloWorldApp.groovy        |  131 +
 .../fixtures/binaryinfo/BinaryInfo.java            |   28 +
 .../fixtures/binaryinfo/DumpbinBinaryInfo.groovy   |   97 +
 .../fixtures/binaryinfo/OtoolBinaryInfo.groovy     |   58 +
 .../fixtures/binaryinfo/ReadelfBinaryInfo.groovy   |   89 +
 subprojects/platform-play/platform-play.gradle     |   18 +
 ...xedPlayAndJavaLangProjectIntegrationTest.groovy |   71 +
 ...edPlayAndScalaLangProjectIntegrationTest.groovy |   70 +
 .../PlayAppWithFailingTestsIntegrationTest.groovy  |   66 +
 .../PlayApplicationBinariesIntegrationTest.groovy  |   52 +
 .../PlayBinaryApplicationIntegrationTest.groovy    |   94 +
 ...ayDistributionApplicationIntegrationTest.groovy |  121 +
 ...ayMultiProjectApplicationIntegrationTest.groovy |  179 +
 .../integtest/PlayPlatformIntegrationTest.groovy   |  136 +
 .../PlayTestApplicationIntegrationTest.groovy      |   69 +
 .../advanced/AdvancedAppContentVerifier.groovy     |   41 +
 .../PlayBinaryAdvancedAppIntegrationTest.groovy    |   56 +
 ...ayDistributionAdvancedAppIntegrationTest.groovy |   71 +
 .../basic/PlayBinaryBasicAppIntegrationTest.groovy |   28 +
 .../PlayDistributionBasicAppIntegrationTest.groovy |   28 +
 .../basic/PlayTestBasicAppIntegrationTest.groovy   |   36 +
 ...BinaryAppWithDependenciesIntegrationTest.groovy |   28 +
 ...butionAppWithDependenciesIntegrationTest.groovy |   28 +
 ...ayTestAppWithDependenciesIntegrationTest.groovy |   36 +
 .../DistributionTestExecHandleBuilder.groovy       |   76 +
 .../play/integtest/fixtures/PlayCoverage.groovy    |   21 +
 ...ayMultiVersionApplicationIntegrationTest.groovy |   50 +
 .../PlayMultiVersionIntegrationTest.groovy         |   28 +
 ...ultiVersionRunApplicationIntegrationTest.groovy |   47 +
 .../integtest/fixtures/app/AdvancedPlayApp.groovy  |   20 +
 .../integtest/fixtures/app/BasicPlayApp.groovy     |   20 +
 .../play/integtest/fixtures/app/PlayApp.groovy     |   94 +
 .../fixtures/app/PlayAppWithDependencies.groovy    |   20 +
 .../integtest/fixtures/app/PlayMultiProject.groovy |   26 +
 .../fixtures/app/WithFailingTestsApp.groovy        |   38 +
 .../AbstractPlaySampleIntegrationTest.groovy       |  100 +
 .../AdvancedPlaySampleIntegrationTest.groovy       |   49 +
 .../samples/BasicPlaySampleIntegrationTest.groovy  |   29 +
 .../MultiprojectPlaySampleIntegrationTest.groovy   |   78 +
 ...cationPluginGoodBehaviourIntegrationTest.groovy |   27 +
 .../PlayApplicationPluginIntegrationTest.groovy    |  193 +
 ...ScriptPluginGoodBehaviourIntegrationTest.groovy |   27 +
 .../PlayCoffeeScriptPluginIntegrationTest.groovy   |   95 +
 .../PlayDistributionPluginIntegrationTest.groovy   |  115 +
 ...ScriptPluginGoodBehaviourIntegrationTest.groovy |   28 +
 .../PlayJavaScriptPluginIntegrationTest.groovy     |   89 +
 ...stractCoffeeScriptCompileIntegrationTest.groovy |   94 +
 .../AbstractJavaScriptMinifyIntegrationTest.groovy |  149 +
 .../CoffeeScriptCompileIntegrationTest.groovy      |  234 +
 ...offeeScriptImplementationIntegrationTest.groovy |  104 +
 .../tasks/DistributionZipIntegrationTest.groovy    |   81 +
 .../tasks/JavaScriptMinifyIntegrationTest.groovy   |  230 +
 .../play/tasks/PlayAssetsJarIntegrationTest.groovy |   78 +
 .../play/tasks/RoutesCompileIntegrationTest.groovy |  236 +
 .../play/tasks/TwirlCompileIntegrationTest.groovy  |  213 +
 .../play/tasks/TwirlVersionIntegrationTest.groovy  |  108 +
 .../src/integTest/resources/coffee-script.min.js   |   12 +
 .../app/assets/javascripts/sample.js               |   47 +
 .../app/assets/javascripts/test.coffee             |   28 +
 .../app/controllers/Application.scala              |   35 +
 .../app/controllers/jva/PureJava.java              |   28 +
 .../app/controllers/scala/MixedJava.java           |   30 +
 .../app/advancedplayapp/app/models/DataType.java   |   32 +
 .../advancedplayapp/app/models/ScalaClass.scala    |    3 +
 .../app/special/strangename/Application.scala      |   24 +
 .../app/views/awesome/index.scala.html             |    7 +
 .../app/advancedplayapp/app/views/index.scala.html |    9 +
 .../app/advancedplayapp/app/views/main.scala.html  |   13 +
 .../fixtures/app/advancedplayapp/build.gradle      |   16 +
 .../fixtures/app/advancedplayapp/conf/jva.routes   |    1 +
 .../fixtures/app/advancedplayapp/conf/routes       |   10 +
 .../fixtures/app/advancedplayapp/conf/scala.routes |    2 +
 .../basicplayapp/app/controllers/Application.scala |   32 +
 .../app/basicplayapp/app/views/index.scala.html    |    7 +
 .../app/basicplayapp/app/views/main.scala.html     |   13 +
 .../fixtures/app/basicplayapp/build.gradle         |   11 +
 .../fixtures/app/basicplayapp/conf/routes          |    9 +
 .../app/basicplayapp/test/ApplicationSpec.scala    |   35 +
 .../app/basicplayapp/test/IntegrationSpec.scala    |   34 +
 .../app/controllers/Application.scala              |   33 +
 .../app/views/index.scala.html                     |    7 +
 .../app/views/main.scala.html                      |   13 +
 .../app/playappwithdependencies/build.gradle       |   16 +
 .../app/playappwithdependencies/conf/routes        |    9 +
 .../test/ApplicationSpec.scala                     |   36 +
 .../test/IntegrationSpec.scala                     |   38 +
 .../fixtures/app/playmultiproject/build.gradle     |    9 +
 .../app/playmultiproject/javalibrary/build.gradle  |    3 +
 .../javalibrary/src/main/java/org/test/Util.java   |    7 +
 .../primary/app/controllers/Application.scala      |   18 +
 .../app/playmultiproject/primary/build.gradle      |    8 +
 .../playmultiproject/primary/conf/application.conf |   11 +
 .../app/playmultiproject/primary/conf/routes       |    5 +
 .../playmultiproject/primary/public/primary.txt    |    1 +
 .../fixtures/app/playmultiproject/settings.gradle  |    1 +
 .../app/controllers/submodule/Application.scala    |   12 +
 .../app/playmultiproject/submodule/build.gradle    |    3 +
 .../submodule/public/submodule.txt                 |    1 +
 .../play/integtest/fixtures/app/shared/README      |    1 +
 .../fixtures/app/shared/conf/application.conf      |   11 +
 .../fixtures/app/shared/public/images/favicon.svg  |   10 +
 .../app/shared/public/javascripts/hello.js         |    3 +
 .../app/shared/public/stylesheets/main.css}        |    0
 .../test/FailingApplicationSpec.scala              |   36 +
 .../test/FailingIntegrationSpec.scala              |   36 +
 .../coffeescript/CoffeeScriptSourceSet.java        |   27 +
 .../internal/DefaultCoffeeScriptSourceSet.java     |   30 +
 .../gradle/language/coffeescript/package-info.java |   20 +
 .../language/javascript/JavaScriptSourceSet.java   |   27 +
 .../internal/DefaultJavaScriptSourceSet.java       |   30 +
 .../gradle/language/javascript/package-info.java   |   20 +
 .../gradle/language/routes/RoutesSourceSet.java    |   27 +
 .../routes/internal/DefaultRoutesSourceSet.java    |   30 +
 .../org/gradle/language/routes/package-info.java   |   20 +
 .../org/gradle/language/twirl/TwirlSourceSet.java  |   27 +
 .../twirl/internal/DefaultTwirlSourceSet.java      |   30 +
 .../org/gradle/language/twirl/package-info.java    |   20 +
 .../src/main/java/org/gradle/play/JvmClasses.java  |   50 +
 .../org/gradle/play/PlayApplicationBinarySpec.java |   51 +
 .../java/org/gradle/play/PlayApplicationSpec.java  |   30 +
 .../main/java/org/gradle/play/PublicAssets.java    |   39 +
 .../gradle/play/distribution/PlayDistribution.java |   29 +
 .../distribution/PlayDistributionContainer.java    |   28 +
 .../org/gradle/play/distribution/package-info.java |   20 +
 .../play/internal/CleaningPlayToolCompiler.java    |   40 +
 .../internal/DefaultPlayApplicationBinarySpec.java |  165 +
 .../play/internal/DefaultPlayApplicationSpec.java  |   47 +
 .../gradle/play/internal/DefaultPlayPlatform.java  |   64 +
 .../PlayApplicationBinarySpecInternal.java         |   46 +
 .../play/internal/PlayApplicationSpecInternal.java |   23 +
 .../play/internal/PlayPlatformNotationParser.java  |   65 +
 .../play/internal/PlayPlatformRequirement.java     |   63 +
 .../gradle/play/internal/PlayPlatformResolver.java |   86 +
 .../distribution/DefaultPlayDistribution.java      |   35 +
 .../DefaultPlayDistributionContainer.java          |   28 +
 .../javascript/DefaultJavaScriptCompileSpec.java   |   52 +
 .../internal/javascript/GoogleClosureCompiler.java |  150 +
 .../JavaScriptCompileDestinationCalculator.java    |   46 +
 .../internal/javascript/JavaScriptCompileSpec.java |   24 +
 .../play/internal/platform/PlayMajorVersion.java   |   67 +
 .../internal/platform/PlayPlatformInternal.java    |   23 +
 .../internal/routes/DefaultRoutesCompileSpec.java  |   51 +
 .../DefaultVersionedRoutesCompilerAdapter.java     |   50 +
 .../play/internal/routes/RoutesCompileSpec.java    |   28 +
 .../play/internal/routes/RoutesCompiler.java       |   88 +
 .../internal/routes/RoutesCompilerAdapterV22X.java |   59 +
 .../internal/routes/RoutesCompilerAdapterV23X.java |   63 +
 .../internal/routes/RoutesCompilerFactory.java     |   38 +
 .../routes/VersionedRoutesCompilerAdapter.java     |   34 +
 .../play/internal/run/DefaultPlayRunSpec.java      |   54 +
 .../run/DefaultVersionedPlayRunAdapter.java        |   96 +
 .../play/internal/run/PlayAppLifecycleUpdate.java  |   62 +
 .../play/internal/run/PlayApplicationRunner.java   |   65 +
 .../internal/run/PlayApplicationRunnerToken.java   |   33 +
 .../play/internal/run/PlayRunAdapterV22X.java      |   34 +
 .../play/internal/run/PlayRunAdapterV23X.java      |   35 +
 .../org/gradle/play/internal/run/PlayRunSpec.java  |   33 +
 .../internal/run/PlayRunWorkerClientProtocol.java  |   21 +
 .../internal/run/PlayRunWorkerServerProtocol.java  |   22 +
 .../gradle/play/internal/run/PlayWorkerClient.java |   56 +
 .../gradle/play/internal/run/PlayWorkerServer.java |   83 +
 .../play/internal/run/VersionedPlayRunAdapter.java |   30 +
 .../spec/PlayApplicationBinaryRenderer.java        |   34 +
 .../gradle/play/internal/spec/PlayCompileSpec.java |   28 +
 .../internal/toolchain/DaemonPlayCompiler.java     |   45 +
 .../internal/toolchain/DefaultPlayToolChain.java   |  123 +
 .../toolchain/DefaultPlayToolProvider.java         |  125 +
 .../internal/toolchain/PlayToolChainInternal.java  |   26 +
 .../toolchain/PlayToolChainServiceRegistry.java    |   50 +
 .../play/internal/toolchain/PlayToolProvider.java  |   22 +
 .../internal/twirl/DefaultTwirlCompileSpec.java    |   52 +
 .../play/internal/twirl/TwirlCompileSpec.java      |   28 +
 .../gradle/play/internal/twirl/TwirlCompiler.java  |   71 +
 .../internal/twirl/TwirlCompilerAdapterV10X.java   |  105 +
 .../internal/twirl/TwirlCompilerAdapterV22X.java   |   91 +
 .../play/internal/twirl/TwirlCompilerFactory.java  |   39 +
 .../twirl/VersionedTwirlCompilerAdapter.java       |   34 +
 .../main/java/org/gradle/play/package-info.java    |   20 +
 .../org/gradle/play/platform/PlayPlatform.java     |   35 +
 .../org/gradle/play/platform/package-info.java     |   20 +
 .../gradle/play/plugins/PlayApplicationPlugin.java |  431 ++
 .../play/plugins/PlayCoffeeScriptPlugin.java       |  132 +
 .../play/plugins/PlayDistributionPlugin.java       |  224 +
 .../gradle/play/plugins/PlayJavaScriptPlugin.java  |  103 +
 .../java/org/gradle/play/plugins/PlayPlugin.java   |   35 +
 .../play/plugins/PlayPluginConfigurations.java     |   93 +
 .../org/gradle/play/plugins/PlayTestPlugin.java    |  117 +
 .../java/org/gradle/play/plugins/package-info.java |   22 +
 .../org/gradle/play/tasks/JavaScriptMinify.java    |  150 +
 .../gradle/play/tasks/PlayCoffeeScriptCompile.java |   56 +
 .../main/java/org/gradle/play/tasks/PlayRun.java   |  136 +
 .../java/org/gradle/play/tasks/RoutesCompile.java  |  124 +
 .../java/org/gradle/play/tasks/TwirlCompile.java   |  171 +
 .../java/org/gradle/play/tasks/package-info.java   |   20 +
 .../org/gradle/play/toolchain/PlayToolChain.java   |   29 +
 .../org/gradle/play/toolchain/package-info.java    |   19 +
 .../scala/internal/reflect/ScalaCodecMapper.java   |   30 +
 .../scala/internal/reflect/ScalaListBuffer.java    |   38 +
 .../gradle/scala/internal/reflect/ScalaMethod.java |   80 +
 .../reflect/ScalaOptionInvocationWrapper.java      |   48 +
 .../internal/reflect/ScalaReflectionUtil.java      |   23 +
 .../scala/internal/reflect/package-info.java       |   23 +
 .../org.gradle.play-application.properties         |   17 +
 .../org.gradle.play-coffeescript.properties        |   17 +
 .../org.gradle.play-javascript.properties          |   17 +
 .../gradle-plugins/org.gradle.play.properties      |   17 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../DefaultCoffeeScriptSourceSetTest.groovy        |   32 +
 .../internal/DefaultJavaScriptSourceSetTest.groovy |   33 +
 .../DefaultPlayApplicationBinarySpecTest.groovy    |   52 +
 .../play/internal/DefaultPlayToolChainTest.groovy  |  142 +
 .../play/internal/PlayPlatformResolverTest.groovy  |  137 +
 ...vaScriptCompileDestinationCalculatorTest.groovy |   42 +
 .../toolchain/DaemonPlayCompilerTest.groovy        |   63 +
 .../toolchain/DefaultPlayToolProviderTest.groovy   |  103 +
 .../play/plugins/PlayCoffeeScriptPluginTest.groovy |   54 +
 .../play/plugins/PlayDistributionPluginTest.groovy |  235 +
 .../play/plugins/PlayJavaScriptPluginTest.groovy   |   54 +
 .../gradle/play/plugins/PlayTestPluginTest.groovy  |   78 +
 .../org/gradle/play/tasks/PlayRunTest.groovy       |   86 +
 .../org/gradle/play/tasks/TwirlCompileTest.groovy  |   82 +
 .../plugin-development/plugin-development.gradle   |   26 +
 .../JavaGradlePluginPluginIntegrationTest.groovy   |  167 +
 .../devel/plugins/JavaGradlePluginPlugin.java      |  154 +
 .../gradle/plugin/devel/plugins/package-info.java  |   20 +
 .../org.gradle.java-gradle-plugin.properties       |   17 +
 .../plugins/JavaGradlePluginPluginTest.groovy      |  202 +
 subprojects/plugin-use/plugin-use.gradle           |   29 +
 .../plugin/use/CorePluginUseIntegrationSpec.groovy |  195 +
 .../use/DeployedPortalIntegrationSpec.groovy       |   64 +
 ...readyOnClasspathDetectionIntegrationSpec.groovy |  106 +
 .../use/NonCorePluginUseIntegrationSpec.groovy     |   41 +
 .../NonDeclarativePluginUseIntegrationSpec.groovy  |  305 ++
 .../PluginUseClassLoadingIntegrationSpec.groovy    |  171 +
 .../plugin/use/PluginUseDslIntegrationSpec.groovy  |  238 +
 ...tPluginResolutionFailuresIntegrationSpec.groovy |  105 +
 .../use/RuleSourcePluginUseIntegrationSpec.groovy  |   60 +
 ...lutionCachingCrossVersionIntegrationTest.groovy |   70 +
 .../PluginResolutionCachingIntegrationTest.groovy  |  192 +
 ...esolutionDeprecatedClientIntegrationTest.groovy |  330 ++
 ...ginResolutionServiceCommsIntegrationTest.groovy |  366 ++
 .../PluginResolutionServiceIntegrationSpec.groovy  |  103 +
 .../internal/DefaultPluginRequestApplicator.java   |  248 +
 .../plugin/use/internal/PluginResolverFactory.java |   59 +
 .../internal/PluginUsePluginServiceRegistry.java   |  108 +
 .../internal/ClassPathPluginResolution.java        |   60 +
 .../resolve/internal/CompositePluginResolver.java  |   40 +
 .../use/resolve/internal/CorePluginResolver.java   |   61 +
 .../use/resolve/internal/NoopPluginResolver.java   |   48 +
 ...onCorePluginOnClasspathCheckPluginResolver.java |   56 +
 .../use/resolve/internal/PluginResolution.java     |   27 +
 .../resolve/internal/PluginResolutionResult.java   |   55 +
 .../use/resolve/internal/PluginResolveContext.java |   26 +
 .../use/resolve/internal/PluginResolver.java       |   31 +
 .../resolve/internal/SimplePluginResolution.java   |   37 +
 .../use/resolve/service/internal/ClientStatus.java |   67 +
 ...tionListeningPluginResolutionServiceClient.java |   89 +
 .../resolve/service/internal/ErrorResponse.java    |   44 +
 .../HttpPluginResolutionServiceClient.java         |  174 +
 ...MemoryCachingPluginResolutionServiceClient.java |  169 +
 .../OfflinePluginResolutionServiceClient.java      |   36 +
 ...istentCachingPluginResolutionServiceClient.java |  248 +
 .../internal/PluginResolutionServiceClient.java    |  160 +
 .../internal/PluginResolutionServiceResolver.java  |  159 +
 .../service/internal/PluginUseMetaData.java        |  105 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../resolve/internal/CorePluginResolverTest.groovy |   94 +
 ...steningPluginResolutionServiceClientTest.groovy |   97 +
 .../HttpPluginResolutionServiceClientTest.groovy   |  144 +
 ...CachingPluginResolutionServiceClientTest.groovy |  135 +
 ...CachingPluginResolutionServiceClientTest.groovy |  155 +
 .../PluginResolutionServiceTestServer.groovy       |  239 +
 subprojects/plugins/plugins.gradle                 |   15 +-
 .../ApplicationPluginIntegrationTest.groovy        |  223 +
 .../api/plugins/BasePluginIntegrationTest.groovy   |   26 +-
 .../DistributionPluginIntegrationTest.groovy       |   93 +-
 .../JavaLibraryDistributionIntegrationTest.groovy  |    2 +-
 .../api/plugins/ParallelJavaPluginTest.groovy      |   46 +
 .../api/tasks/JavaExecIntegrationTest.groovy       |    6 +-
 .../groovy/GroovyBasePluginIntegrationTest.groovy  |   42 +-
 .../groovy/GroovyPluginIntegrationTest.groovy      |   52 -
 .../AntForkingGroovyCompilerIntegrationTest.groovy |   46 -
 ...ntInProcessGroovyCompilerIntegrationTest.groovy |   42 -
 .../BasicGroovyCompilerIntegrationSpec.groovy      |  443 +-
 .../compile/GroovyCompilerIntegrationSpec.groovy   |   17 +-
 .../InProcessGroovyCompilerIntegrationTest.groovy  |    1 -
 .../IncrementalGroovyCompileIntegrationTest.groovy |   18 +
 .../compile/InvokeDynamicGroovyCompilerSpec.groovy |    1 -
 .../JreJavaHomeGroovyIntegrationTest.groovy        |   19 +-
 .../java/ComponentReportIntegrationTest.groovy     |   67 +
 .../JavaCrossCompilationIntegrationTest.groovy     |  112 +
 .../gradle/java/JavaPluginGoodBehaviourTest.groovy |   47 -
 .../AntForkingJavaCompilerIntegrationTest.groovy   |   35 -
 .../AntInProcessJavaCompilerIntegrationTest.groovy |   35 -
 .../BasicJavaCompilerIntegrationSpec.groovy        |  155 +-
 .../CommandLineJavaCompilerIntegrationTest.groovy  |    1 -
 .../InProcessJavaCompilerIntegrationTest.groovy    |    1 -
 ...ncrementalJavaCompilationIntegrationTest.groovy |  219 -
 .../compile/JavaCompilerIntegrationSpec.groovy     |   20 +-
 .../JreJavaHomeJavaIntegrationTest.groovy          |   20 +-
 .../gradle/javadoc/JavadocIntegrationTest.groovy   |   48 -
 .../testing/IncrementalTestIntegrationTest.groovy  |   10 +-
 .../testing/SuiteTimestampIntegrationTest.groovy   |    2 +-
 .../testing/TestEnvironmentIntegrationTest.groovy  |    1 +
 .../TestOutputListenerIntegrationTest.groovy       |   14 +-
 .../testing/TestReportIntegrationTest.groovy       |   40 +-
 .../gradle/testing/TestingIntegrationTest.groovy   |   81 +-
 .../CucumberJVMReportIntegrationTest.groovy        |    8 +-
 .../AbstractTestFilteringIntegrationTest.groovy    |    3 +
 .../gradle/testing/fixture/JUnitCoverage.groovy    |    3 +-
 .../gradle/testing/fixture/TestNGCoverage.groovy   |   14 +-
 .../junit/JUnitAssumptionsIntegrationTest.groovy   |    2 +-
 .../junit/JUnitCategoriesIntegrationSpec.groovy    |    2 +-
 .../JUnitConsoleLoggingIntegrationTest.groovy      |  121 +
 .../JUnitFilteringSupportIntegrationTest.groovy    |    4 +-
 .../testing/junit/JUnitIntegrationTest.groovy      |  309 +-
 .../testing/junit/JUnitJnaIntegrationTest.groovy   |   41 +
 .../junit/JUnitLoggingIntegrationTest.groovy       |  121 -
 ...JUnitLoggingOutputCaptureIntegrationTest.groovy |  296 ++
 .../TestNGConsoleLoggingIntegrationTest.groovy     |  172 +
 .../TestNGFailurePolicyIntegrationTest.groovy      |   85 +
 .../testing/testng/TestNGIntegrationTest.groovy    |   41 +-
 .../testng/TestNGLoggingIntegrationTest.groovy     |  170 -
 ...estNGLoggingOutputCaptureIntegrationTest.groovy |  173 +
 .../TestNGParallelSuiteIntegrationTest.groovy      |   73 +
 .../TestNGProducesOldReportsIntegrationTest.groovy |   10 +-
 .../TestNGStaticLoggingIntegrationTest.groovy      |  147 +
 .../ParallelJavaPluginTest/shared/build.gradle     |   60 +
 .../shared/src/custom/java/SomeClass.java          |   18 +
 .../shared/src/custom/resources}/resource.txt      |    0
 .../shared/src/customTest/java/SomeTest.java       |   24 +
 .../src/customTest}/resources/testResource.txt     |    0
 .../shared/src/main/java/SomeClass.java            |   18 +
 .../shared/src/main/resources}/resource.txt        |    0
 .../shared/src/test/java/SomeTest.java             |   24 +
 .../shared}/src/test/resources/testResource.txt    |    0
 .../canUseCustomFileExtensions/build.gradle        |    2 +-
 .../build.gradle                                   |    2 +-
 .../build.gradle                                   |    0
 .../src/main/groovy/FxApp.groovy                   |    9 +
 .../configurationScriptNotSupported/build.gradle   |    7 +
 .../groovycompilerconfig.groovy                    |   23 +
 .../src/main/groovy/BrokenClass.groovy             |    5 +
 .../failsBecauseOfInvalidConfigFile/build.gradle   |    7 +
 .../groovycompilerconfig.groovy                    |    3 +
 .../src/main/groovy/BrokenClass.groovy             |    5 +
 .../failsBecauseOfMissingConfigFile/build.gradle   |    7 +
 .../src/main/groovy/BrokenClass.groovy             |    5 +
 .../build.gradle                                   |    0
 .../src/main/groovy/Thing.groovy                   |    3 +
 .../useConfigurationScript/build.gradle            |    7 +
 .../groovycompilerconfig.groovy                    |    5 +
 .../src/main/groovy/BrokenClass.groovy             |    5 +
 .../build.gradle                                   |    3 +-
 .../src/test/groovy/TestCaseTransformTest.groovy   |   17 +-
 .../canUseAstTransformWrittenInGroovy/build.gradle |    2 +-
 .../canUseBuiltInAstTransform/build.gradle         |    2 +-
 .../canUseThirdPartyAstTransform/build.gradle      |    2 +-
 .../gradle3235/build.gradle                        |   10 +
 .../src/main/groovy/com/example/Country.groovy     |   11 +
 .../org.codehaus.groovy.runtime.ExtensionModule    |    3 +
 .../src/test/groovy/DummyFileForCompilation.groovy |   22 +
 .../build.gradle                                   |    7 +
 .../groovycompilerconfig.groovy                    |    4 +
 .../newbuild.gradle                                |    5 +
 .../newgroovycompilerconfig.groovy                 |    5 +
 .../src/main/groovy/BrokenClass.groovy             |    5 +
 .../build.gradle                                   |    2 +-
 .../shared/build.gradle                            |    2 +-
 .../build.gradle                                   |    2 +-
 .../build.gradle                                   |    2 +-
 .../test/java/org/gradle/MySystemClassLoader.java  |    2 +-
 .../build.gradle                                   |    2 +-
 .../main/java/org/gradle/MySystemClassLoader.java  |    2 +-
 .../build.gradle                                   |    2 +-
 .../build.gradle                                   |    2 +-
 .../reportsUnloadableCategories/build.gradle       |    2 +-
 .../shared/build.gradle                            |   23 +
 .../src/test/groovy/org/gradle/JUnit4Test.groovy   |    0
 .../standardOutputLogging/build.gradle             |   34 +
 .../org/gradle/JUnit4StandardOutputTest.groovy     |    0
 .../build.gradle                                   |   11 -
 .../test/groovy/org/gradle/SystemErrTest.groovy    |   32 -
 .../build.gradle                                   |   11 -
 .../test/groovy/org/gradle/SystemOutTest.groovy    |   32 -
 .../canHaveMultipleTestTaskInstances/build.gradle  |    2 +-
 .../canRunSingleTests/build.gradle                 |    2 +-
 .../createsRunnerBeforeTests/build.gradle          |    8 +
 .../src/test/java/org/gradle/CustomRunner.java     |   57 +
 .../test/java/org/gradle/ExecutionOrderTest.java   |   20 +
 .../detectsTestClasses/build.gradle                |    2 +-
 .../executesTestsInCorrectEnvironment/build.gradle |    2 +-
 .../src/test/java/org/gradle/OkTest.java           |   41 +-
 .../src/test/java/org/gradle/OtherTest.java        |   15 -
 .../build.gradle                                   |    2 +-
 .../src/test/java/org/gradle/Unloadable.java       |    4 +
 .../suitesOutputIsVisible/build.gradle             |    2 +-
 .../supportsTestCategories/build.gradle            |    2 +-
 .../build.gradle                                   |    2 +-
 .../canRunTestsUsingJna/build.gradle               |   10 +
 .../canRunTestsUsingJna/src/test/java/OkTest.java  |    9 +
 .../shared/build.gradle                            |   23 -
 .../standardOutputLogging/build.gradle             |   34 -
 .../shared/build.gradle                            |   27 +
 .../TestWithFailureInConfigMethod.java             |   31 +
 .../src/test/java/org/gradle/OkTest.java           |    7 -
 .../groovyJdk15Failing/build.gradle                |    2 +-
 .../groovyJdk15Passing/build.gradle                |    2 +-
 .../distribution/plugins/DistributionPlugin.groovy |   74 +-
 .../internal/java/AbstractLanguageSourceSet.java   |   86 +
 .../api/internal/java/DefaultJavaSourceSet.java    |   50 +
 .../api/internal/java/DefaultJvmResourceSet.java   |   25 +
 .../jvm/ClassDirectoryBinaryNamingScheme.java      |   74 +
 .../internal/jvm/ClassDirectoryBinaryRenderer.java |   34 +
 .../jvm/ClassDirectoryBinarySpecInternal.java      |   25 +
 .../jvm/DefaultClassDirectoryBinarySpec.java       |  171 +
 .../org/gradle/api/internal/plugins/CleanRule.java |   56 -
 .../api/internal/plugins/ProcessResources.java     |   25 -
 .../internal/plugins/StartScriptGenerator.groovy   |  162 -
 .../api/internal/plugins/StartScriptGenerator.java |  141 +
 .../gradle/api/internal/plugins/UploadRule.java    |    8 +-
 .../gradle/api/internal/tasks/CompileServices.java |   36 +-
 .../internal/tasks/DefaultSourceSetContainer.java  |   21 +-
 .../api/internal/tasks/DefaultSourceSetOutput.java |    8 -
 .../internal/tasks/SourceSetCompileClasspath.java  |    2 +-
 .../compile/AntDependsStaleClassCleaner.groovy     |   48 -
 .../tasks/compile/AntGroovyCompiler.groovy         |   94 -
 .../internal/tasks/compile/AntJavaCompiler.groovy  |   75 -
 .../internal/tasks/compile/ApiGroovyCompiler.java  |  140 -
 .../api/internal/tasks/compile/ArgCollector.java   |   25 -
 .../api/internal/tasks/compile/ArgWriter.java      |   89 -
 .../tasks/compile/CleaningGroovyCompiler.java      |   40 -
 .../tasks/compile/CleaningJavaCompiler.java        |   50 -
 .../tasks/compile/CleaningJavaCompilerSupport.java |   39 -
 .../tasks/compile/CommandLineJavaCompiler.java     |   71 -
 .../CommandLineJavaCompilerArgumentsGenerator.java |   81 -
 .../api/internal/tasks/compile/CompileSpec.java    |   20 -
 .../tasks/compile/CompileSpecToArguments.java      |   21 -
 .../api/internal/tasks/compile/Compiler.java       |   22 -
 .../tasks/compile/DefaultJavaCompileSpec.java      |   51 -
 .../tasks/compile/DefaultJavaCompilerFactory.java  |  108 -
 .../compile/DefaultJvmLanguageCompileSpec.java     |   61 -
 .../tasks/compile/DelegatingGroovyCompiler.java    |   31 -
 .../tasks/compile/DelegatingJavaCompiler.java      |   31 -
 .../tasks/compile/ExecSpecBackedArgCollector.java  |   37 -
 .../GroovyCompileTransformingClassLoader.java      |  124 -
 .../tasks/compile/GroovyCompilerFactory.java       |   82 -
 .../compile/InProcessJavaCompilerFactory.java      |   52 -
 .../internal/tasks/compile/JavaCompileSpec.java    |   37 -
 .../compile/JavaCompilerArgumentsBuilder.java      |  168 -
 .../tasks/compile/JavaCompilerFactory.java         |   25 -
 .../tasks/compile/JvmLanguageCompileSpec.java      |   39 -
 .../tasks/compile/NoOpStaleClassCleaner.java       |   26 -
 .../tasks/compile/NormalizingGroovyCompiler.java   |  109 -
 .../tasks/compile/NormalizingJavaCompiler.java     |  105 -
 .../internal/tasks/compile/SunJavaCompiler.java    |   46 -
 .../tasks/compile/daemon/CompilerDaemon.java       |   26 -
 .../tasks/compile/daemon/CompilerDaemonClient.java |   66 -
 .../compile/daemon/CompilerDaemonManager.java      |   54 -
 .../tasks/compile/daemon/CompilerDaemonServer.java |   65 -
 .../daemon/CompilerDaemonServerProtocol.java       |   27 -
 .../compile/daemon/CompilerDaemonStarter.java      |   68 -
 .../tasks/compile/daemon/DaemonGroovyCompiler.java |   75 -
 .../tasks/compile/daemon/DaemonJavaCompiler.java   |   51 -
 .../daemon/InProcessCompilerDaemonFactory.java     |   79 -
 .../compile/incremental/AllFromJarRebuildInfo.java |   41 -
 .../tasks/compile/incremental/ClassDependents.java |   44 -
 .../compile/incremental/ClassNameProvider.java     |   38 -
 .../compile/incremental/DefaultRebuildInfo.java    |   53 -
 .../tasks/compile/incremental/DummySerializer.java |   51 -
 .../incremental/IncrementalCompilationSupport.java |   51 -
 .../compile/incremental/InputOutputMapper.java     |   60 -
 .../tasks/compile/incremental/JarArchive.java      |   30 -
 .../compile/incremental/JarChangeProcessor.java    |   56 -
 .../tasks/compile/incremental/JarDelta.java        |   23 -
 .../tasks/compile/incremental/JarSnapshot.java     |   43 -
 .../compile/incremental/JarSnapshotCache.java      |   53 -
 .../compile/incremental/JarSnapshotFeeder.java     |   57 -
 .../tasks/compile/incremental/JarSnapshotter.java  |   46 -
 .../tasks/compile/incremental/JavaSourceClass.java |   41 -
 .../compile/incremental/OutputClassMapper.java     |   32 -
 .../tasks/compile/incremental/RebuildInfo.java     |   25 -
 .../compile/incremental/SelectiveCompilation.java  |  141 -
 .../compile/incremental/SelectiveJavaCompiler.java |   66 -
 .../incremental/SpecificClassesRebuildInfo.java    |   23 -
 .../incremental/analyzer/ClassAnalysis.java        |   37 -
 .../analyzer/ClassDependenciesAnalyzer.java        |   74 -
 .../analyzer/ClassDependenciesVisitor.java         |   58 -
 .../incremental/analyzer/ClassRelevancyFilter.java |   30 -
 .../incremental/graph/ClassDependencyInfo.java     |   59 -
 .../graph/ClassDependencyInfoExtractor.java        |   74 -
 .../graph/ClassDependencyInfoSerializer.java       |   47 -
 .../tasks/compile/jdk6/Jdk6JavaCompiler.java       |   79 -
 .../tasks/testing/DecoratingTestDescriptor.java    |    4 +-
 .../tasks/testing/DefaultTestClassDescriptor.java  |    2 +-
 .../tasks/testing/DefaultTestDescriptor.java       |    2 +-
 .../tasks/testing/DefaultTestMethodDescriptor.java |    2 +-
 .../tasks/testing/DefaultTestSuiteDescriptor.java  |    2 +-
 .../tasks/testing/SuiteTestClassProcessor.java     |    4 +-
 .../tasks/testing/TestClassLoaderFactory.java      |   41 +
 .../tasks/testing/TestDescriptorInternal.java      |    5 +
 .../testing/detection/DefaultTestExecuter.java     |    2 +-
 .../tasks/testing/detection/TestClassVisitor.java  |    2 +-
 .../internal/tasks/testing/junit/JUnitSpec.java    |    9 +-
 .../testing/junit/JUnitTestClassExecuter.java      |    2 +-
 .../testing/junit/JUnitTestClassProcessor.java     |   13 +-
 .../tasks/testing/junit/JUnitTestEventAdapter.java |    5 +-
 .../tasks/testing/junit/JUnitTestFramework.java    |   23 +-
 .../testing/junit/JUnitTestMethodDetecter.java     |    2 +-
 .../testing/junit/report/ClassPageRenderer.java    |    9 +-
 .../testing/junit/report/DefaultTestReport.java    |   38 +-
 .../testing/junit/report/OverviewPageRenderer.java |    2 +-
 .../testing/junit/report/PackagePageRenderer.java  |    2 +-
 .../tasks/testing/junit/report/PageRenderer.java   |   10 +-
 .../testing/junit/result/JUnitXmlResultWriter.java |    2 +-
 .../testing/junit/result/TestOutputStore.java      |    4 +-
 .../junit/result/TestReportDataCollector.java      |    4 +
 .../testing/junit/result/TestResultSerializer.java |   10 +-
 .../tasks/testing/logging/DefaultTestLogging.java  |    8 +-
 .../CaptureTestOutputTestResultProcessor.java      |   82 +-
 .../tasks/testing/processors/TestMainAction.java   |   17 +-
 .../testing/processors/TestOutputRedirector.java   |   78 +
 .../results/StateTrackingTestResultProcessor.java  |   33 +-
 .../tasks/testing/results/TestListenerAdapter.java |   18 +-
 .../testing/results/TestListenerInternal.java      |   31 +
 .../testing/results/UnknownTestDescriptor.java     |    3 +-
 .../testng/TestNGListenerAdapterFactory.java       |    3 +-
 .../internal/tasks/testing/testng/TestNGSpec.java  |    6 +
 .../testing/testng/TestNGTestClassProcessor.java   |   56 +-
 .../tasks/testing/testng/TestNGTestFramework.java  |   34 +-
 .../testing/testng/TestNGTestMethodDetecter.java   |    2 +-
 .../testng/TestNGTestResultProcessorAdapter.java   |   79 +-
 .../tasks/testing/worker/TestEventSerializer.java  |   27 +-
 .../internal/tasks/testing/worker/TestWorker.java  |   13 +-
 .../testing/worker/WorkerTestClassProcessor.java   |    2 +-
 .../org/gradle/api/java/archives/Manifest.java     |  112 -
 .../api/java/archives/ManifestMergeSpec.java       |   57 -
 .../java/archives/internal/DefaultAttributes.java  |   97 -
 .../java/archives/internal/DefaultManifest.java    |  241 -
 .../internal/DefaultManifestMergeSpec.java         |  122 -
 .../gradle/api/plugins/ApplicationPlugin.groovy    |   74 +-
 .../groovy/org/gradle/api/plugins/BasePlugin.java  |   65 +-
 .../org/gradle/api/plugins/GroovyBasePlugin.java   |   41 +-
 .../org/gradle/api/plugins/GroovyPlugin.java       |   11 +-
 .../org/gradle/api/plugins/JavaBasePlugin.java     |   63 +-
 .../org/gradle/api/plugins/JavaLanguagePlugin.java |  113 -
 .../plugins/JavaLibraryDistributionPlugin.groovy   |    9 +-
 .../groovy/org/gradle/api/plugins/JavaPlugin.java  |   25 +-
 .../gradle/api/plugins/JavaPluginConvention.groovy |   16 +-
 .../api/plugins/LegacyJavaComponentPlugin.java     |  159 +
 .../groovy/org/gradle/api/plugins/WarPlugin.java   |    2 +-
 .../groovy/org/gradle/api/tasks/GroovyRuntime.java |   19 +-
 .../groovy/org/gradle/api/tasks/SourceSet.java     |    2 +-
 .../org/gradle/api/tasks/SourceSetContainer.java   |   25 -
 .../org/gradle/api/tasks/SourceSetOutput.java      |    2 +-
 .../main/groovy/org/gradle/api/tasks/Upload.java   |   16 +-
 .../tasks/application/CreateStartScripts.groovy    |   97 +-
 .../org/gradle/api/tasks/bundling/Jar.groovy       |   92 +-
 .../gradle/api/tasks/compile/AbstractOptions.java  |   89 -
 .../org/gradle/api/tasks/compile/Compile.java      |  215 -
 .../gradle/api/tasks/compile/CompileOptions.java   |  539 --
 .../gradle/api/tasks/compile/GroovyCompile.java    |  139 -
 .../api/tasks/compile/GroovyCompileOptions.java    |  330 --
 .../org/gradle/api/tasks/compile/JavaCompile.java  |   31 -
 .../gradle/api/tasks/javadoc/AntGroovydoc.groovy   |   70 -
 .../org/gradle/api/tasks/javadoc/AntJavadoc.groovy |   51 -
 .../org/gradle/api/tasks/javadoc/Groovydoc.java    |  355 --
 .../org/gradle/api/tasks/javadoc/Javadoc.java      |  306 --
 .../groovy/org/gradle/api/tasks/testing/Test.java  |  211 +-
 .../gradle/api/tasks/testing/TestDescriptor.java   |    3 +
 .../org/gradle/api/tasks/testing/TestLogging.java  |   38 -
 .../org/gradle/api/tasks/testing/TestReport.java   |    1 +
 .../org/gradle/api/tasks/testing/TestResult.java   |    5 +-
 .../api/tasks/testing/logging/TestLogging.java     |    2 +-
 .../testing/logging/TestLoggingContainer.java      |    5 +
 .../api/tasks/testing/testng/TestNGOptions.groovy  |    7 +
 .../external/javadoc/JavadocOfflineLink.java       |   44 -
 .../AbstractListJavadocOptionFileOption.java       |   59 -
 .../javadoc/internal/JavadocOptionFile.java        |  115 -
 .../javadoc/internal/JavadocOptionFileWriter.java  |   59 -
 .../internal/JavadocOptionFileWriterContext.java   |  108 -
 .../org/gradle/jvm/ClassDirectoryBinarySpec.java   |   31 +
 .../jvm/application/tasks/CreateStartScripts.java  |  278 ++
 .../gradle/jvm/application/tasks/package-info.java |   20 +
 .../main/groovy/org/gradle/jvm/package-info.java   |   20 +
 ...DefaultJavaAppStartScriptGenerationDetails.java |  130 +
 .../DefaultTemplateBasedStartScriptGenerator.java  |   95 +
 .../plugins/StartScriptTemplateBindingFactory.java |  184 +
 .../internal/plugins/UnixStartScriptGenerator.java |   31 +
 .../plugins/WindowsStartScriptGenerator.java       |   29 +
 .../JavaAppStartScriptGenerationDetails.java       |   63 +
 .../jvm/application/scripts/ScriptGenerator.java   |   42 +
 .../scripts/TemplateBasedScriptGenerator.java      |   42 +
 .../jvm/application/scripts/package-info.java      |   20 +
 .../gradle-plugins/github-dependencies.properties  |    1 -
 .../META-INF/gradle-plugins/java-lang.properties   |    1 -
 .../META-INF/gradle-plugins/jvm-lang.properties    |    1 -
 .../META-INF/gradle-plugins/lang-base.properties   |    1 -
 ...roperties => org.gradle.application.properties} |    0
 ...{base.properties => org.gradle.base.properties} |    0
 ...operties => org.gradle.distribution.properties} |    0
 ...roperties => org.gradle.groovy-base.properties} |    0
 ...ovy.properties => org.gradle.groovy.properties} |    0
 ....properties => org.gradle.java-base.properties} |    0
 ...rg.gradle.java-library-distribution.properties} |    0
 ...{java.properties => org.gradle.java.properties} |    0
 .../{war.properties => org.gradle.war.properties}  |    0
 .../internal/tasks/testing/junit/report/style.css  |    1 -
 .../plugins/DistributionPluginTest.groovy          |   35 +-
 .../internal/java/DefaultJavaSourceSetTest.groovy  |   29 +
 .../internal/java/DefaultJvmResourceSetTest.groovy |   28 +
 .../ClassDirectoryBinaryNamingSchemeTest.groovy    |   53 +
 .../jvm/DefaultClassDirectoryBinarySpecTest.groovy |   91 +
 .../api/internal/plugins/GroovyJarFileTest.groovy  |    7 +-
 .../plugins/StartScriptGeneratorTest.groovy        |  177 +-
 .../plugins/UnixStartScriptGeneratorTest.groovy    |  141 +
 .../plugins/WindowsStartScriptGeneratorTest.groovy |  117 +
 .../tasks/DefaultGroovySourceSetTest.groovy        |    7 +-
 .../tasks/DefaultSourceSetContainerTest.java       |    2 +-
 .../api/internal/tasks/DefaultSourceSetTest.groovy |    7 +
 .../internal/tasks/compile/ArgWriterTest.groovy    |   77 -
 .../tasks/compile/CleaningJavaCompilerTest.groovy  |   61 -
 ...ndLineJavaCompilerArgumentsGeneratorTest.groovy |   76 -
 .../compile/DefaultJavaCompilerFactoryTest.groovy  |   84 -
 .../compile/DelegatingJavaCompilerTest.groovy      |   33 -
 ...GroovyCompileTransformingClassLoaderTest.groovy |   96 -
 .../InProcessJavaCompilerFactoryTest.groovy        |   39 -
 .../JavaCompilerArgumentsBuilderTest.groovy        |  276 --
 .../compile/NormalizingGroovyCompilerTest.groovy   |   67 -
 .../compile/NormalizingJavaCompilerTest.groovy     |  125 -
 .../compile/SimpleStaleClassCleanerTest.groovy     |   77 -
 .../daemon/CompilerDaemonManagerTest.groovy        |  100 -
 .../incremental/AllFromJarRebuildInfoTest.groovy   |   44 -
 .../incremental/ClassNameProviderTest.groovy       |   42 -
 .../IncrementalCompilationSupportTest.groovy       |   52 -
 .../incremental/InputOutputMapperTest.groovy       |   53 -
 .../incremental/JarSnapshotCacheTest.groovy        |   50 -
 .../incremental/JarSnapshotFeederTest.groovy       |   72 -
 .../compile/incremental/JarSnapshotTest.groovy     |   49 -
 .../compile/incremental/JarSnapshotterTest.groovy  |   52 -
 .../compile/incremental/JavaSourceClassTest.groovy |   38 -
 .../incremental/OutputClassMapperTest.groovy       |   28 -
 .../analyzer/AccessedFromPrivateClass.java         |   24 -
 .../analyzer/ClassDependenciesAnalyzerTest.groovy  |   74 -
 .../analyzer/HasNonPrivateConstants.java           |   21 -
 .../incremental/analyzer/HasPrivateConstants.java  |   22 -
 .../incremental/analyzer/HasPublicConstants.java   |   21 -
 .../compile/incremental/analyzer/SomeClass.java    |   35 -
 .../incremental/analyzer/SomeOtherClass.java       |   24 -
 .../analyzer/UsedByNonPrivateConstantsClass.java   |   20 -
 .../incremental/analyzer/YetAnotherClass.java      |   20 -
 .../graph/ClassDependencyInfoExtractorTest.groovy  |   37 -
 .../graph/ClassDependencyInfoSerializerTest.groovy |   38 -
 .../testing/DefaultTestClassDescriptorTest.groovy  |    2 +-
 .../testing/DefaultTestSuiteDescriptorTest.groovy  |    2 +-
 .../detection/DefaultTestExecuterTest.groovy       |    1 +
 .../junit/JUnitTestClassProcessorData.groovy       |    2 +
 .../junit/JUnitTestClassProcessorTest.groovy       |   17 +-
 .../junit/report/CompositeTestResultsTest.groovy   |   20 +
 .../junit/report/DefaultTestReportTest.groovy      |  195 +-
 .../Binary2JUnitXmlReportGeneratorSpec.groovy      |    1 -
 .../junit/result/JUnitXmlResultWriterSpec.groovy   |    2 +-
 .../logging/DefaultTestLoggingContainerTest.groovy |    2 +-
 .../testing/logging/DefaultTestLoggingTest.groovy  |   19 +-
 .../testing/logging/SimpleTestDescriptor.groovy    |    6 +-
 ...CaptureTestOutputTestResultProcessorTest.groovy |  123 +-
 .../testing/processors/TestMainActionTest.groovy   |   25 +-
 .../processors/TestOutputRedirectorTest.groovy     |   82 +
 .../StateTrackingTestResultProcessorTest.groovy    |  347 ++
 .../testing/results/TestListenerAdapterTest.groovy |  324 --
 .../testng/TestNGListenerAdapterFactorySpec.groovy |   18 +-
 .../testng/TestNGTestClassProcessorTest.groovy     |  212 +-
 .../testing/testng/TestNGTestFrameworkTest.groovy  |    5 +-
 .../testing/worker/TestEventSerializerTest.groovy  |    4 +-
 .../org/gradle/api/plugins/BasePluginTest.groovy   |   26 +-
 .../gradle/api/plugins/GroovyBasePluginTest.groovy |   20 +-
 .../org/gradle/api/plugins/GroovyPluginTest.groovy |   26 +-
 .../gradle/api/plugins/JavaBasePluginTest.groovy   |   80 +-
 .../api/plugins/JavaLanguagePluginTest.groovy      |   50 -
 .../JavaLibraryDistributionPluginTest.groovy       |    4 +-
 .../api/plugins/JavaPluginConventionTest.groovy    |    7 +-
 .../org/gradle/api/plugins/JavaPluginTest.groovy   |   26 +-
 .../api/plugins/JvmLanguagePluginTest.groovy       |   89 -
 .../api/plugins/LanguageBasePluginTest.groovy      |   56 -
 .../plugins/LegacyJavaComponentPluginTest.groovy   |   55 +
 .../org/gradle/api/tasks/GroovyRuntimeTest.groovy  |   38 +-
 .../application/CreateStartScriptsTest.groovy      |   10 +-
 .../org/gradle/api/tasks/bundling/JarTest.groovy   |   59 -
 .../api/tasks/compile/CompileOptionsTest.groovy    |  172 -
 .../tasks/compile/GroovyCompileOptionsTest.groovy  |  101 -
 .../api/tasks/compile/GroovyCompileTest.java       |    2 +-
 .../gradle/api/tasks/compile/JavaCompileTest.java  |   86 -
 .../org/gradle/api/tasks/javadoc/JavadocTest.java  |  153 -
 .../gradle/api/tasks/testing/TestTaskSpec.groovy   |  215 +-
 .../org/gradle/api/tasks/testing/TestTest.java     |  109 +-
 .../tasks/testing/testng/TestNGOptionsTest.groovy  |    2 +
 .../javadoc/StandardJavadocDocletOptionsTest.java  |  523 --
 .../JavadocOptionFileWriterContextTest.java        |   93 -
 subprojects/publish/publish.gradle                 |    2 +-
 .../internal/PublicationFieldValidator.java        |   10 +-
 .../api/publish/internal/PublishOperation.java     |    7 +-
 .../api/publish/internal/PublishServices.java      |    3 +
 .../api/publish/plugins/PublishingPlugin.java      |   64 +-
 ...properties => org.gradle.publishing.properties} |    0
 ...ProjectDependencyPublicationResolverTest.groovy |    2 +-
 .../publish/plugins/PublishingPluginTest.groovy    |    6 +-
 subprojects/reporting/reporting.gradle             |   20 +-
 .../internal/TaskReportContainerIntegTest.groovy   |    7 +-
 .../BuildDashboardPluginIntegrationTest.groovy     |   11 +-
 .../gradle/api/plugins/ReportingBasePlugin.java    |   10 +-
 .../api/plugins/ReportingBasePluginConvention.java |  101 -
 .../api/reporting/BuildDashboardReports.java       |    2 +-
 .../api/reporting/GenerateBuildDashboard.java      |   14 +-
 .../internal/BuildDashboardGenerator.java          |   64 +-
 .../reporting/internal/DefaultReportContainer.java |    1 +
 .../reporting/plugins/BuildDashboardPlugin.java    |   11 +-
 ...rties => org.gradle.build-dashboard.properties} |    0
 .../ReportingBasePluginConventionTest.groovy       |   64 -
 .../api/plugins/ReportingBasePluginTest.groovy     |   11 +-
 .../internal/BuildDashboardGeneratorSpec.groovy    |   57 +-
 .../internal/DefaultReportContainerTest.groovy     |    2 +-
 subprojects/resources-http/resources-http.gradle   |   30 +
 .../http/ApacheDirectoryListingParser.java         |  145 +
 .../transport/http/DefaultHttpSettings.java        |   36 +
 .../transport/http/HttpClientConfigurer.java       |  130 +
 .../resource/transport/http/HttpClientHelper.java  |  129 +
 .../transport/http/HttpConnectorFactory.java       |   42 +
 .../resource/transport/http/HttpProxySettings.java |   42 +
 .../transport/http/HttpRequestException.java       |   31 +
 .../transport/http/HttpResourceAccessor.java       |  116 +
 .../transport/http/HttpResourceLister.java         |   57 +
 .../transport/http/HttpResourceUploader.java       |   49 +
 .../http/HttpResourcesPluginServiceRegistry.java   |   42 +
 .../transport/http/HttpResponseResource.java       |  147 +
 .../resource/transport/http/HttpSettings.java      |   25 +
 .../JavaSystemPropertiesHttpProxySettings.java     |   25 +
 .../http/JavaSystemPropertiesProxySettings.java    |  120 +
 ...avaSystemPropertiesSecureHttpProxySettings.java |   26 +
 .../http/RepeatableInputStreamEntity.java          |   58 +
 .../transport/http/ntlm/NTLMCredentials.java       |   93 +
 .../transport/http/ntlm/NTLMSchemeFactory.java     |   64 +
 ...e.internal.service.scopes.PluginServiceRegistry |    2 +
 .../http/ApacheDirectoryListingParserTest.groovy   |  172 +
 .../transport/http/HttpClientConfigurerTest.groovy |  101 +
 .../transport/http/HttpClientHelperTest.groovy     |   62 +
 .../transport/http/HttpResourceListerTest.groovy   |   46 +
 .../transport/http/HttpResponseResourceTest.groovy |   88 +
 ...avaSystemPropertiesHttpProxySettingsTest.groovy |   29 +
 .../JavaSystemPropertiesProxySettingsTest.groovy   |   95 +
 ...temPropertiesSecureHttpProxySettingsTest.groovy |   29 +
 .../transport/http/ntlm/NTLMCredentialsTest.groovy |   96 +
 .../transport/http/artifactory_dirlisting.html     |    0
 .../transport/http/mavencentral_dirlisting.html    |    0
 .../resource}/transport/http/nexus_dirlisting.html |    0
 subprojects/resources-s3/resources-s3.gradle       |   15 +
 .../s3/AbstractS3DependencyResolutionTest.groovy   |   70 +
 .../resource/s3/S3ClientIntegrationTest.groovy     |  188 +
 .../resource/s3/fixtures/IvyS3Module.groovy        |  157 +
 .../resource/s3/fixtures/IvyS3Repository.groovy    |   72 +
 .../resource/s3/fixtures/MavenS3Module.groovy      |   53 +
 .../resource/s3/fixtures/MavenS3Repository.groovy  |   44 +
 .../resource/s3/fixtures/S3Artifact.groovy         |   36 +
 .../s3/fixtures/S3DirectoryResource.groovy         |  102 +
 .../resource/s3/fixtures/S3Resource.groovy         |  103 +
 .../resource/s3/fixtures/S3Server.groovy           |  496 ++
 .../resource/s3/fixtures/stub/HttpMessage.groovy   |   25 +
 .../resource/s3/fixtures/stub/HttpStub.groovy      |   49 +
 .../resource/s3/fixtures/stub/StubRequest.groovy   |   26 +
 .../resource/s3/fixtures/stub/StubResponse.groovy  |   24 +
 .../s3/ivy/IvyPublishS3IntegrationTest.groovy      |   73 +
 .../s3/ivy/IvyS3RepoResolveIntegrationTest.groovy  |   39 +
 .../ivy/IvyS3UploadArchivesIntegrationTest.groovy  |   36 +
 .../MavenPublishS3ErrorsIntegrationTest.groovy     |   85 +
 .../s3/maven/MavenPublishS3IntegrationTest.groovy  |   80 +
 .../maven/MavenS3ProxiedRepoIntegrationTest.groovy |  124 +
 .../maven/MavenS3RepoErrorsIntegrationTest.groovy  |  123 +
 .../maven/MavenS3RepoResolveIntegrationTest.groovy |  115 +
 .../MavenS3SnapshotRepoIntegrationTest.groovy      |  137 +
 .../resource/transport/aws/s3/S3Client.java        |  199 +
 .../transport/aws/s3/S3ConnectionProperties.java   |  105 +
 .../transport/aws/s3/S3ConnectorFactory.java       |   41 +
 .../transport/aws/s3/S3RegionalResource.java       |   85 +
 .../resource/transport/aws/s3/S3Resource.java      |   71 +
 .../transport/aws/s3/S3ResourceConnector.java      |   82 +
 .../aws/s3/S3ResourcesPluginServiceRegistry.java   |   42 +
 ...e.internal.service.scopes.PluginServiceRegistry |    2 +
 .../resource/transport/aws/s3/S3ClientTest.groovy  |  210 +
 .../aws/s3/S3ConnectionPropertiesTest.groovy       |  105 +
 .../transport/aws/s3/S3ConnectorFactoryTest.groovy |   38 +
 .../transport/aws/s3/S3RegionalResourceTest.groovy |   48 +
 .../aws/s3/S3ResourceConnectorTest.groovy          |   48 +
 subprojects/resources-sftp/resources-sftp.gradle   |   29 +
 .../ivy/IvyPublishSftpIntegrationTest.groovy       |  209 +
 .../ivy/IvySftpLegacyPublishIntegrationTest.groovy |   25 +
 .../maven/MavenPublishSftpIntegrationTest.groovy   |   92 +
 .../AbstractSftpDependencyResolutionTest.groovy    |   43 +
 ...vySftpRepoDynamicRevisionIntegrationTest.groovy |  120 +
 .../ivy/IvySftpRepoErrorsIntegrationTest.groovy    |  217 +
 .../ivy/IvySftpRepoResolveIntegrationTest.groovy   |   34 +
 .../MavenSftpRepoResolveIntegrationTest.groovy     |   59 +
 .../transport/sftp/LockableSftpClient.java         |   25 +
 .../resource/transport/sftp/SftpClientFactory.java |  170 +
 .../transport/sftp/SftpConnectorFactory.java       |   48 +
 .../internal/resource/transport/sftp/SftpHost.java |   92 +
 .../resource/transport/sftp/SftpResource.java      |   68 +
 .../transport/sftp/SftpResourceAccessor.java       |   73 +
 .../transport/sftp/SftpResourceLister.java         |   58 +
 .../transport/sftp/SftpResourceUploader.java       |   82 +
 .../sftp/SftpResourcesPluginServiceRegistry.java   |   47 +
 ...e.internal.service.scopes.PluginServiceRegistry |    2 +
 .../transport/sftp/SftpClientFactoryTest.groovy    |  259 +
 subprojects/resources/resources.gradle             |    4 +
 .../org/gradle/internal/filestore/FileStore.java   |   32 -
 .../internal/filestore/FileStoreSearcher.java      |   27 -
 .../resource/AbstractExternalResource.java         |  112 +
 .../gradle/internal/resource/CachingResource.java  |   45 +
 .../org/gradle/internal/resource/CharsetUtil.java  |   25 +
 .../internal/resource/DelegatingResource.java      |   52 +
 .../gradle/internal/resource/ExternalResource.java |   96 +
 .../internal/resource/ExternalResourceName.java    |  202 +
 .../resource/LocalFileStandInExternalResource.java |   70 +
 .../internal/resource/PasswordCredentials.java     |   41 +
 .../org/gradle/internal/resource/Resource.java     |   69 +
 .../internal/resource/ResourceException.java       |   67 +
 .../resource/ResourceNotFoundException.java        |   32 +
 .../gradle/internal/resource/StringResource.java   |   50 +
 .../org/gradle/internal/resource/UriResource.java  |  204 +
 .../connector/ResourceConnectorFactory.java        |   27 +
 .../connector/ResourceConnectorSpecification.java  |   22 +
 .../AbstractLocallyAvailableResourceFinder.java    |   37 +
 .../resource/local/ByteArrayLocalResource.java     |   38 +
 .../CompositeLocallyAvailableResourceFinder.java   |   69 +
 .../DefaultLocallyAvailableExternalResource.java   |   50 +
 .../internal/resource/local/FileLocalResource.java |   45 +
 .../gradle/internal/resource/local/FileStore.java  |   31 +
 .../internal/resource/local/FileStoreSearcher.java |   25 +
 .../LazyLocallyAvailableResourceCandidates.java    |   58 +
 .../internal/resource/local/LocalResource.java     |   30 +
 .../local/LocallyAvailableExternalResource.java    |   27 +
 .../local/LocallyAvailableResourceCandidates.java  |   30 +
 .../local/LocallyAvailableResourceFinder.java      |   32 +
 ...leResourceFinderSearchableFileStoreAdapter.java |   52 +
 .../metadata/DefaultExternalResourceMetaData.java  |   78 +
 .../metadata/ExternalResourceMetaData.java         |   61 +
 .../metadata/ExternalResourceMetaDataCompare.java  |   66 +
 .../resource/transfer/DefaultExternalResource.java |   64 +
 .../transfer/DefaultExternalResourceConnector.java |   60 +
 .../transfer/ExternalResourceAccessor.java         |   57 +
 .../transfer/ExternalResourceConnector.java        |   20 +
 .../resource/transfer/ExternalResourceLister.java  |   29 +
 .../transfer/ExternalResourceReadResponse.java     |   34 +
 .../transfer/ExternalResourceUploader.java         |   26 +
 .../resource/transfer/UrlExternalResource.java     |   79 +
 .../resource/AbstractExternalResourceTest.groovy   |  164 +
 .../internal/resource/CachingResourceTest.groovy   |   67 +
 .../resource/ExternalResourceNameTest.groovy       |  164 +
 .../internal/resource/ResourceExceptionTest.groovy |   54 +
 .../internal/resource/StringResourceTest.groovy    |   49 +
 .../internal/resource/UriResourceTest.groovy       |  207 +
 .../DefaultExternalResourceMetaDataTest.groovy     |   33 +
 .../ExternalResourceMetaDataCompareTest.groovy     |  172 +
 subprojects/scala/scala.gradle                     |    7 +-
 .../integtests/ScalaProjectIntegrationTest.java    |    5 +
 .../integtests/fixtures/ScalaCoverage.groovy       |   32 +
 .../SamplesMixedJavaAndScalaIntegrationTest.groovy |    8 +
 ...plesScalaCustomizedLayoutIntegrationTest.groovy |    2 +
 .../SamplesScalaQuickstartIntegrationTest.groovy   |    8 +
 .../samples/SamplesScalaZincIntegrationTest.groovy |    3 -
 .../scala/ScalaBasePluginIntegrationTest.groovy    |   52 +-
 .../gradle/scala/ScalaPluginIntegrationTest.groovy |   36 +
 ...ctAntForkingScalaCompilerIntegrationTest.groovy |   41 +
 ...AntInProcessScalaCompilerIntegrationTest.groovy |   43 +
 ...ForkingOlderScalaCompilerIntegrationTest.groovy |   26 +
 .../AntForkingScalaCompilerIntegrationTest.groovy  |   29 +-
 ...ProcessOlderScalaCompilerIntegrationTest.groovy |   26 +
 ...AntInProcessScalaCompilerIntegrationTest.groovy |   27 +-
 .../BasicScalaCompilerIntegrationTest.groovy       |    9 +-
 .../IncrementalScalaCompileIntegrationTest.groovy  |    4 +-
 .../ZincScalaCompilerIntegrationTest.groovy        |   93 +-
 ...tForkingScalaCompilerJdk6IntegrationTest.groovy |   45 -
 ...nProcessScalaCompilerJdk6IntegrationTest.groovy |   43 -
 .../ZincScalaCompilerJdk6IntegrationTest.groovy    |   96 -
 .../JreJavaHomeScalaIntegrationTest.groovy         |   18 +-
 .../scala/test/ScalaTestIntegrationTest.groovy     |   10 +-
 .../recompilesDependentClasses/build.gradle        |    2 +-
 .../build.gradle                                   |    2 +-
 .../build.gradle                                   |    0
 .../prj1/src/main/scala/Person.scala               |    0
 .../prj2/src/main/scala/House.scala                |    0
 .../prj2/src/main/scala/Other.scala                |    0
 .../settings.gradle                                |    0
 .../compilesJavaCodeIncrementally/build.gradle     |    0
 .../src/main/scala/House.java                      |   11 +
 .../src/main/scala/Other.java                      |    0
 .../src/main/scala/Person.java                     |    0
 .../compilesScalaCodeIncrementally/build.gradle    |    0
 .../src/main/scala/House.scala                     |    0
 .../src/main/scala/Other.scala                     |    0
 .../src/main/scala/Person.scala                    |    0
 .../src/main/scala/House.java                      |   13 -
 .../internal/tasks/scala/AntScalaCompiler.groovy   |   44 +-
 .../tasks/scala/CleaningScalaCompiler.java         |   19 +-
 .../internal/tasks/scala/DaemonScalaCompiler.java  |   86 -
 .../tasks/scala/DefaultScalaCompileSpec.java       |   58 -
 .../scala/DefaultScalaJavaJointCompileSpec.java    |   62 -
 .../tasks/scala/DefaultScalaJavaJointCompiler.java |    2 +-
 .../tasks/scala/DelegatingScalaCompiler.java       |   33 -
 .../tasks/scala/NormalizingScalaCompiler.java      |  107 -
 .../api/internal/tasks/scala/ScalaCompileSpec.java |   39 -
 .../scala/ScalaCompilerArgumentsGenerator.java     |   66 -
 .../internal/tasks/scala/ScalaCompilerFactory.java |   58 +-
 .../tasks/scala/ScalaJavaJointCompiler.java        |   26 +
 .../tasks/scala/jdk6/ZincScalaCompiler.java        |  124 -
 .../api/plugins/scala/ScalaBasePlugin.groovy       |   39 +-
 .../gradle/api/plugins/scala/ScalaPlugin.groovy    |    4 +-
 .../org/gradle/api/tasks/ScalaRuntime.groovy       |  159 -
 .../groovy/org/gradle/api/tasks/ScalaRuntime.java  |  151 +
 .../api/tasks/scala/IncrementalCompileOptions.java |   72 -
 .../org/gradle/api/tasks/scala/ScalaCompile.java   |  152 +-
 .../api/tasks/scala/ScalaCompileOptions.java       |  279 +-
 .../org/gradle/api/tasks/scala/ScalaDoc.java       |   16 +-
 .../gradle/api/tasks/scala/ScalaDocOptions.groovy  |  112 -
 .../gradle/api/tasks/scala/ScalaDocOptions.java    |  220 +
 ...properties => org.gradle.scala-base.properties} |    0
 ...cala.properties => org.gradle.scala.properties} |    0
 .../tasks/DefaultScalaSourceSetTest.groovy         |    5 +
 .../scala/DefaultScalaJavaJointCompilerTest.groovy |    7 +-
 .../scala/NormalizingScalaCompilerTest.groovy      |  127 -
 .../ScalaCompilerArgumentsGeneratorTest.groovy     |  105 -
 .../api/plugins/scala/ScalaBasePluginTest.groovy   |   52 +-
 .../org/gradle/api/tasks/ScalaRuntimeTest.groovy   |   15 +-
 .../gradle/api/tasks/scala/ScalaCompileTest.java   |   48 +-
 .../org/gradle/api/tasks/scala/ScalaDocTest.java   |   53 +-
 subprojects/signing/signing.gradle                 |    6 +-
 .../NoSigningCredentialsIntegrationSpec.groovy     |    4 +
 .../plugins/signing/SigningSamplesSpec.groovy      |    5 +-
 .../signing/SigningTasksIntegrationSpec.groovy     |   12 +-
 .../groovy/org/gradle/plugins/signing/Sign.groovy  |    2 +-
 .../gradle/plugins/signing/SignOperation.groovy    |    2 +-
 .../gradle/plugins/signing/SigningExtension.groovy |    2 +-
 .../gradle/plugins/signing/SigningPlugin.groovy    |   10 +-
 .../plugins/signing/SigningPluginConvention.groovy |   78 -
 .../signing/signatory/pgp/PgpSignatory.groovy      |   14 +-
 .../signatory/pgp/PgpSignatoryProvider.groovy      |    2 +-
 ...ng.properties => org.gradle.signing.properties} |    0
 .../plugins/signing/SignOperationSpec.groovy       |    8 +-
 .../signing/SignatoriesConfigurationSpec.groovy    |    6 +-
 .../signing/SigningConfigurationsSpec.groovy       |    2 +-
 .../plugins/signing/SigningProjectSpec.groovy      |    2 +-
 subprojects/sonar/sonar.gradle                     |   12 +-
 .../plugins/sonar/SonarSmokeIntegrationTest.groovy |    8 +-
 .../runner/SonarRunnerSmokeIntegrationTest.groovy  |   82 -
 .../runner/SonarRunnerSmokeIntegrationTest.groovy  |   82 +
 .../org/gradle/sonar/runner/SonarTestServer.groovy |  138 +
 .../SonarSmokeIntegrationTest/shared/build.gradle  |    2 +-
 .../shared/build.gradle                            |   20 -
 .../shared/groovyProject/build.gradle              |   14 -
 .../shared/settings.gradle                         |    3 -
 .../shared/build.gradle                            |   20 +
 .../shared/customizedProject/build.gradle          |    0
 .../gradle/test/customizedProject/Production1.java |    0
 .../org/gradle/test/customizedProject/Test1.java   |    0
 .../shared/emptyJavaProject/build.gradle           |   17 +
 .../shared/gradle.properties                       |    0
 .../shared/groovyProject/build.gradle              |   14 +
 .../test/groovyProject/ProductionGroovy1.groovy    |    0
 .../test/groovyProject/ProductionGroovy10.groovy   |    0
 .../test/groovyProject/ProductionGroovy2.groovy    |    0
 .../test/groovyProject/ProductionGroovy3.groovy    |    0
 .../test/groovyProject/ProductionGroovy4.groovy    |    0
 .../test/groovyProject/ProductionGroovy5.groovy    |    0
 .../test/groovyProject/ProductionGroovy6.groovy    |    0
 .../test/groovyProject/ProductionGroovy7.groovy    |    0
 .../test/groovyProject/ProductionGroovy8.groovy    |    0
 .../test/groovyProject/ProductionGroovy9.groovy    |    0
 .../gradle/test/groovyProject/TestGroovy1.groovy   |    0
 .../gradle/test/groovyProject/TestGroovy10.groovy  |    0
 .../gradle/test/groovyProject/TestGroovy2.groovy   |    0
 .../gradle/test/groovyProject/TestGroovy3.groovy   |    0
 .../gradle/test/groovyProject/TestGroovy4.groovy   |    0
 .../gradle/test/groovyProject/TestGroovy5.groovy   |    0
 .../gradle/test/groovyProject/TestGroovy6.groovy   |    0
 .../gradle/test/groovyProject/TestGroovy7.groovy   |    0
 .../gradle/test/groovyProject/TestGroovy8.groovy   |    0
 .../gradle/test/groovyProject/TestGroovy9.groovy   |    0
 .../shared/javaProjectWithJacoco/build.gradle      |    0
 .../org/gradle/test/javaProject/Production1.java   |    0
 .../org/gradle/test/javaProject/Production10.java  |    0
 .../org/gradle/test/javaProject/Production2.java   |    0
 .../org/gradle/test/javaProject/Production3.java   |    0
 .../org/gradle/test/javaProject/Production4.java   |    0
 .../org/gradle/test/javaProject/Production5.java   |    0
 .../org/gradle/test/javaProject/Production6.java   |    0
 .../org/gradle/test/javaProject/Production7.java   |    0
 .../org/gradle/test/javaProject/Production8.java   |    0
 .../org/gradle/test/javaProject/Production9.java   |    0
 .../gradle/test/javaProject/productionResource.xml |    0
 .../java/org/gradle/test/javaProject/Test1.java    |    0
 .../java/org/gradle/test/javaProject/Test10.java   |    0
 .../java/org/gradle/test/javaProject/Test2.java    |    0
 .../java/org/gradle/test/javaProject/Test3.java    |    0
 .../java/org/gradle/test/javaProject/Test4.java    |    0
 .../java/org/gradle/test/javaProject/Test5.java    |    0
 .../java/org/gradle/test/javaProject/Test6.java    |    0
 .../java/org/gradle/test/javaProject/Test7.java    |    0
 .../java/org/gradle/test/javaProject/Test8.java    |    0
 .../java/org/gradle/test/javaProject/Test9.java    |    0
 .../org/gradle/test/javaProject/testResource.xml   |    0
 .../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      |    0
 .../org/gradle/test/nestedProject/Production1.java |    0
 .../java/org/gradle/test/nestedProject/Test1.java  |    0
 .../shared/settings.gradle                         |    3 +
 .../shared/skippedProject/build.gradle             |    0
 .../gradle/test/skippedProject/Production1.java    |    0
 .../java/org/gradle/test/skippedProject/Test1.java |    0
 .../gradle/api/plugins/sonar/SonarAnalyze.groovy   |   47 +-
 .../gradle/api/sonar/runner/SonarProperties.groovy |   56 -
 .../org/gradle/api/sonar/runner/SonarRunner.groovy |   54 -
 .../api/sonar/runner/SonarRunnerExtension.groovy   |   78 -
 .../api/sonar/runner/SonarRunnerPlugin.groovy      |  243 -
 .../org/gradle/sonar/runner/SonarProperties.java   |   69 +
 .../gradle/sonar/runner/SonarRunnerExtension.java  |  100 +
 .../sonar/runner/SonarRunnerRootExtension.java     |   91 +
 .../org/gradle/sonar/runner/package-info.java      |   22 +
 .../sonar/runner/plugins/SonarRunnerPlugin.java    |  350 ++
 .../gradle/sonar/runner/plugins/package-info.java  |   22 +
 .../org/gradle/sonar/runner/tasks/SonarRunner.java |  126 +
 .../gradle/sonar/runner/tasks/package-info.java    |   22 +
 .../org.gradle.sonar-runner.properties             |    1 +
 ...onar.properties => org.gradle.sonar.properties} |    0
 .../gradle-plugins/sonar-runner.properties         |    1 -
 subprojects/sonar/src/main/resources/logback.xml   |   28 +
 .../api/plugins/sonar/SonarPluginTest.groovy       |   10 +-
 .../api/sonar/runner/SonarPropertiesTest.groovy    |   48 -
 .../sonar/runner/SonarRunnerExtensionTest.groovy   |   43 -
 .../api/sonar/runner/SonarRunnerPluginTest.groovy  |  377 --
 .../gradle/sonar/runner/SonarPropertiesTest.groovy |   48 +
 .../sonar/runner/SonarRunnerExtensionTest.groovy   |   46 +
 .../runner/plugins/SonarRunnerPluginTest.groovy    |  445 ++
 .../test/cunit/CUnitIntegrationTest.groovy         |  419 ++
 .../test/cunit/CUnitSamplesIntegrationTest.groovy  |   95 +
 .../test/cunit/CUnitTestResults.groovy             |  105 +
 .../cunit/ComponentReportIntegrationTest.groovy    |   83 +
 .../plugins/CUnitPluginIntegrationTest.groovy      |   26 +
 .../ComponentReportIntegrationTest.groovy          |   81 +
 .../googletest/GoogleTestIntegrationTest.groovy    |  409 ++
 .../GoogleTestSamplesIntegrationTest.groovy        |   79 +
 .../test/googletest/GoogleTestTestResults.groovy   |   75 +
 .../plugins/GoogleTestPluginIntegrationTest.groovy |   26 +
 .../test/cunit/CUnitTestSuiteBinarySpec.java       |   38 +
 .../test/cunit/CUnitTestSuiteSpec.java             |   26 +
 .../internal/DefaultCUnitTestSuiteBinary.java      |   50 +
 .../cunit/internal/DefaultCUnitTestSuiteSpec.java  |   37 +
 .../nativeplatform/test/cunit/package-info.java    |   20 +
 .../test/cunit/plugins/CUnitPlugin.java            |  185 +
 .../test/cunit/plugins/package-info.java           |   20 +
 .../test/cunit/tasks/GenerateCUnitLauncher.java    |   61 +
 .../test/cunit/tasks/package-info.java             |   20 +
 .../googletest/GoogleTestTestSuiteBinarySpec.java  |   38 +
 .../test/googletest/GoogleTestTestSuiteSpec.java   |   27 +
 .../internal/DefaultGoogleTestTestSuiteBinary.java |   50 +
 .../internal/DefaultGoogleTestTestSuiteSpec.java   |   37 +
 .../test/googletest/package-info.java              |   20 +
 .../test/googletest/plugins/GoogleTestPlugin.java  |  159 +
 .../test/googletest/plugins/package-info.java      |   20 +
 .../gradle-plugins/org.gradle.cunit.properties     |   17 +
 .../org.gradle.google-test.properties              |   17 +
 .../test/cunit/tasks/gradle_cunit_main.c           |    0
 .../test/cunit/tasks/gradle_cunit_register.h       |    0
 .../nativeplatform/test/cunit/CUnitTest.groovy     |   44 +
 .../test/googletest/GoogleTestTest.groovy          |   44 +
 subprojects/testing-native/testing-native.gradle   |   32 +
 .../provider/runner/BuildModelActionRunner.java    |   90 +
 .../runner/ClientForwardingTestListener.java       |  107 +
 .../runner/ClientProvidedBuildActionRunner.java    |   68 +
 .../provider/runner/DefaultBuildController.java    |   76 +
 .../provider/runner/ToolingBuilderServices.java    |   46 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../ClientProvidedBuildActionRunnerTest.groovy     |  114 +
 .../runner/DefaultBuildControllerTest.groovy       |  148 +
 .../tooling-api-builders.gradle                    |    8 +
 .../tooling/AutoTestedSamplesToolingApiTest.groovy |    6 +-
 .../ConcurrentToolingApiIntegrationSpec.groovy     |   32 +-
 .../SamplesToolingApiIntegrationTest.groovy        |    1 +
 .../ToolingApiClasspathIntegrationTest.groovy      |    2 +-
 .../tooling/ToolingApiIntegrationTest.groovy       |   20 +-
 .../tooling/ToolingApiRemoteIntegrationTest.groovy |  102 +-
 .../fixture/ExternalToolingApiDistribution.groovy  |    3 +-
 .../tooling/fixture/TargetGradleVersion.java       |    2 +-
 .../integtests/tooling/fixture/TextUtil.java       |    2 +-
 .../integtests/tooling/fixture/ToolingApi.groovy   |  100 +-
 .../ToolingApiCompatibilitySuiteRunner.groovy      |    3 +
 .../fixture/ToolingApiDistributionResolver.groovy  |    6 +-
 .../tooling/fixture/ToolingApiSpecification.groovy |  117 +-
 .../tooling/fixture/ToolingApiVersion.java         |    2 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |    7 +-
 .../m3/ToolingApiLoggingCrossVersionSpec.groovy    |   78 +-
 ...piEclipseLinkedResourcesCrossVersionSpec.groovy |    4 -
 ...ngApiEclipseMinimalModelCrossVersionSpec.groovy |    2 -
 ...EclipseModelWithFlatRepoCrossVersionSpec.groovy |    2 -
 ...ToolingApiBuildExecutionCrossVersionSpec.groovy |    7 +-
 ...ildableEclipseModelFixesCrossVersionSpec.groovy |    8 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |    2 -
 .../ToolingApiGradleProjectCrossVersionSpec.groovy |    2 -
 ...orsProjectCustomizationsCrossVersionSpec.groovy |    9 +-
 .../m5/ToolingApiIdeaModelCrossVersionSpec.groovy  |    4 -
 .../m5/ToolingApiModelCrossVersionSpec.groovy      |    4 -
 ...ReceivingStandardStreamsCrossVersionSpec.groovy |    6 +-
 ...UnsupportedModelFeedbackCrossVersionSpec.groovy |   38 -
 .../BuildEnvironmentModelCrossVersionSpec.groovy   |   33 +-
 .../ConsumingStandardInputCrossVersionSpec.groovy  |    6 +-
 .../m8/JavaConfigurabilityCrossVersionSpec.groovy  |    6 +-
 ...rictLongRunningOperationCrossVersionSpec.groovy |   96 -
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |    4 -
 .../m8/ToolingApiLoggingCrossVersionSpec.groovy    |   32 +-
 ...sionOnlyBuildEnvironmentCrossVersionSpec.groovy |   53 -
 .../m9/DaemonErrorFeedbackCrossVersionSpec.groovy  |    4 +-
 ...adlePropertiesToolingApiCrossVersionSpec.groovy |    8 +-
 .../M9JavaConfigurabilityCrossVersionSpec.groovy   |   26 +-
 ...singCommandLineArgumentsCrossVersionSpec.groovy |    4 +-
 .../r112/BuildInvocationsCrossVersionSpec.groovy   |  135 +-
 .../r112/PublicationsCrossVersionSpec.groovy       |   22 +-
 .../r112/TaskDisplayNameCrossVersionSpec.groovy    |    2 -
 .../r112/TestFilteringCrossVersionSpec.groovy      |    4 +-
 .../ToolingApiDeprecationsCrossVersionSpec.groovy  |   94 +-
 .../r112/UserHomeDirCrossVersionSpec.groovy        |    1 -
 .../DependencyMetaDataCrossVersionSpec.groovy      |    2 -
 .../r12rc1/BuildModelCrossVersionSpec.groovy       |    2 -
 .../ProjectOutcomesModuleCrossVersionSpec.groovy   |    2 -
 ...pportedOperationFeedbackCrossVersionSpec.groovy |    4 +-
 ...ApiInitScriptCrossVersionIntegrationTest.groovy |   12 +-
 ...ningCommandLineArgumentsCrossVersionSpec.groovy |    2 -
 ...ApiConfigurationOnDemandCrossVersionSpec.groovy |    2 -
 ...knownCustomModelFeedbackCrossVersionSpec.groovy |    2 +-
 .../tooling/r18/BuildActionCrossVersionSpec.groovy |   36 +-
 .../r18/BuildScriptModelCrossVersionSpec.groovy    |   23 +-
 .../integtests/tooling/r18/CounterAction.java      |   28 +
 .../r18/GradleBuildModelCrossVersionSpec.groovy    |    2 +-
 .../integtests/tooling/r20/BrokenAction.java       |   26 +
 .../r20/GradleProjectModelCrossVersionSpec.groovy  |   42 +
 ...ngApiUnsupportedBuildJvmCrossVersionSpec.groovy |   73 +
 ...gApiUnsupportedClientJvmCrossVersionSpec.groovy |  109 +
 .../r21/CancellationCrossVersionSpec.groovy        |  131 +
 .../integtests/tooling/r21/HangingBuildAction.java |   28 +
 .../r21/PreCancellationCrossVersionSpec.groovy     |   65 +
 .../r21/R21CancellationCrossVersionSpec.groovy     |  264 +
 .../r21/TaskVisibilityCrossVersionSpec.groovy      |  100 +
 .../tooling/r22/BuildActionCrossVersionSpec.groovy |  100 +
 .../r22/CancellationCrossVersionSpec.groovy        |  386 ++
 .../r22/ClientShutdownCrossVersionSpec.groovy      |  137 +
 .../tooling/r22/Idea13ModelCrossVersionSpec.groovy |   83 +
 .../r23/GradleProjectCrossVersionSpec.groovy       |   50 +
 .../ImplicitTasksToolingApiCrossVersionSpec.groovy |   38 +
 .../r23/ModelBuilderCrossVersionSpec.groovy        |   78 +
 .../r23/StandardStreamsCrossVersionSpec.groovy     |  174 +
 .../r24/BuildEnvironmentCrossVersionSpec.groovy    |   46 +
 .../r24/BuildInvocationsCrossVersionSpec.groovy    |   67 +
 .../DaemonUsageSuggestionCrossVersionTest.groovy   |   47 +
 .../r24/GradleProjectCrossVersionSpec.groovy       |   44 +
 .../ModelTasksToolingApiCrossVersionTest.groovy    |   60 +
 .../r24/TestProgressCrossVersionSpec.groovy        |  744 +++
 ...TestProgressDaemonErrorsCrossVersionSpec.groovy |   75 +
 .../org/gradle/tooling/BuildActionExecuter.java    |   78 +-
 .../gradle/tooling/BuildCancelledException.java    |   35 +
 .../java/org/gradle/tooling/BuildLauncher.java     |  116 +-
 .../java/org/gradle/tooling/CancellationToken.java |   35 +
 .../gradle/tooling/CancellationTokenSource.java    |   57 +
 .../src/main/java/org/gradle/tooling/Failure.java  |   55 +
 .../java/org/gradle/tooling/GradleConnector.java   |   32 +-
 .../org/gradle/tooling/LongRunningOperation.java   |   37 +-
 .../main/java/org/gradle/tooling/ModelBuilder.java |   36 +-
 .../java/org/gradle/tooling/ResultHandler.java     |    6 +-
 .../org/gradle/tooling/events/FailureResult.java   |   39 +
 .../org/gradle/tooling/events/FinishEvent.java     |   36 +
 .../gradle/tooling/events/OperationDescriptor.java |   53 +
 .../org/gradle/tooling/events/OperationResult.java |   43 +
 .../org/gradle/tooling/events/ProgressEvent.java   |   52 +
 .../org/gradle/tooling/events/SkippedResult.java   |   28 +
 .../java/org/gradle/tooling/events/StartEvent.java |   28 +
 .../org/gradle/tooling/events/SuccessResult.java   |   28 +
 .../tooling/events/internal/BaseFinishEvent.java   |   40 +
 .../tooling/events/internal/BaseProgressEvent.java |   57 +
 .../tooling/events/internal/BaseStartEvent.java    |   31 +
 .../org/gradle/tooling/events/package-info.java    |   20 +
 .../gradle/tooling/events/test/JvmTestKind.java    |   47 +
 .../events/test/JvmTestOperationDescriptor.java    |   62 +
 .../tooling/events/test/TestFailureResult.java     |   41 +
 .../tooling/events/test/TestFinishEvent.java       |   46 +
 .../events/test/TestOperationDescriptor.java       |   29 +
 .../tooling/events/test/TestOperationResult.java   |   29 +
 .../tooling/events/test/TestProgressEvent.java     |   38 +
 .../tooling/events/test/TestProgressListener.java  |   46 +
 .../tooling/events/test/TestSkippedResult.java     |   29 +
 .../gradle/tooling/events/test/TestStartEvent.java |   29 +
 .../tooling/events/test/TestSuccessResult.java     |   29 +
 .../test/internal/DefaultTestFailureResult.java    |   54 +
 .../test/internal/DefaultTestFinishEvent.java      |   43 +
 .../test/internal/DefaultTestSkippedResult.java    |   44 +
 .../test/internal/DefaultTestStartEvent.java       |   37 +
 .../test/internal/DefaultTestSuccessResult.java    |   44 +
 .../gradle/tooling/events/test/package-info.java   |   20 +
 ...UnsupportedOperationConfigurationException.java |    2 +-
 .../internal/adapter/ProtocolToModelAdapter.java   |    7 +-
 .../internal/build/DefaultBuildEnvironment.java    |   25 +-
 .../build/VersionOnlyBuildEnvironment.java         |   18 +-
 .../consumer/AbstractLongRunningOperation.java     |   22 +-
 .../consumer/CancellationTokenInternal.java        |   23 +
 .../internal/consumer/ConnectionFactory.java       |   18 +-
 .../internal/consumer/ConnectionParameters.java    |    5 +
 .../internal/consumer/ConnectorServices.java       |   62 +-
 .../consumer/DefaultBuildActionExecuter.java       |    5 +-
 .../internal/consumer/DefaultBuildLauncher.java    |   47 +-
 .../consumer/DefaultCancellationTokenSource.java   |   54 +
 .../consumer/DefaultConnectionParameters.java      |   16 +-
 .../consumer/DefaultExecutorServiceFactory.java    |   26 +
 .../tooling/internal/consumer/DefaultFailure.java  |   50 +
 .../internal/consumer/DefaultGradleConnector.java  |   30 +-
 .../internal/consumer/DefaultModelBuilder.java     |    7 +-
 .../tooling/internal/consumer/Distribution.java    |    4 +-
 .../internal/consumer/DistributionFactory.java     |   82 +-
 .../internal/consumer/ExecutorServiceFactory.java  |   25 +
 .../tooling/internal/consumer/LoggingProvider.java |    2 +-
 .../internal/consumer/ResultHandlerAdapter.java    |    4 +
 .../internal/consumer/SynchronizedLogging.java     |   60 +-
 .../connection/AbstractConsumerConnection.java     |   14 +-
 .../consumer/connection/AbstractModelProducer.java |   33 -
 .../AbstractPre12ConsumerConnection.java           |   57 -
 .../connection/ActionAwareConsumerConnection.java  |   95 +-
 .../internal/consumer/connection/ActionRunner.java |   24 +
 .../BuildActionRunnerBackedConsumerConnection.java |   32 +-
 .../BuildInvocationsAdapterProducer.java           |   17 +-
 .../connection/CancellableConsumerConnection.java  |  115 +
 ...CancellableModelBuilderBackedModelProducer.java |   66 +
 ...ConnectionVersion4BackedConsumerConnection.java |  162 +-
 .../connection/ConsumerActionExecutor.java         |    8 +-
 .../consumer/connection/ConsumerConnection.java    |   13 +-
 .../connection/GradleBuildAdapterProducer.java     |   11 +-
 .../connection/InternalBuildActionAdapter.java     |   42 +
 ...InternalConnectionBackedConsumerConnection.java |   65 +-
 .../connection/LazyConsumerActionExecutor.java     |   17 +-
 .../LoggingInitializerConsumerActionExecutor.java  |   46 -
 .../ModelBuilderBackedConsumerConnection.java      |   72 +-
 .../ModelBuilderBackedModelProducer.java           |    9 +-
 .../connection/NoToolingApiConnection.java         |    5 +
 .../NonCancellableConsumerConnectionAdapter.java   |   73 +
 .../ProgressLoggingConsumerActionExecutor.java     |    2 +-
 .../ShutdownAwareConsumerConnection.java           |   37 +
 .../connection/UnsupportedActionRunner.java        |   34 +
 .../converters/BuildInvocationsConverter.java      |   64 +-
 .../ConsumerProvidedBuildInvocations.java          |   43 +
 .../converters/GradleProjectConverter.java         |   63 -
 .../converters/GradleProjectMixInHandler.java      |   30 -
 .../converters/PropertyHandlerFactory.java         |   44 -
 .../loader/CachingToolingImplementationLoader.java |   19 +-
 .../loader/DefaultToolingImplementationLoader.java |   20 +-
 .../SynchronizedToolingImplementationLoader.java   |   23 +-
 .../loader/ToolingImplementationLoader.java        |    4 +-
 .../parameters/BuildCancellationTokenAdapter.java  |   40 +
 .../parameters/BuildProgressListenerAdapter.java   |  242 +
 .../parameters/ConsumerOperationParameters.java    |  108 +-
 .../parameters/ProgressListenerAdapter.java        |   11 +-
 .../consumer/versioning/VersionDetails.java        |    4 +-
 .../internal/gradle/BasicGradleTaskSelector.java   |   76 -
 .../internal/gradle/ConsumerProvidedTask.java      |   84 +
 .../gradle/ConsumerProvidedTaskSelector.java       |   75 +
 .../internal/gradle/DefaultBuildInvocations.java   |   46 -
 .../gradle/DefaultConvertedGradleProject.java      |   58 -
 .../internal/gradle/DefaultGradleProject.java      |   26 +-
 .../internal/gradle/DefaultGradleProjectTask.java  |   30 -
 .../tooling/internal/gradle/DefaultGradleTask.java |   81 -
 .../internal/gradle/PartialGradleProject.java      |    3 +
 .../internal/protocol/BuildActionRunner.java       |    6 +-
 .../protocol/BuildableProjectVersion1.java         |    2 +-
 .../internal/protocol/ConnectionVersion4.java      |   18 +-
 .../protocol/HierarchicalProjectVersion1.java      |    2 +-
 .../protocol/InternalBasicIdeaProject.java         |    2 +-
 .../protocol/InternalBuildActionExecutor.java      |    8 +-
 .../protocol/InternalBuildCancelledException.java  |   30 +
 .../protocol/InternalBuildProgressListener.java    |   50 +
 .../protocol/InternalCancellableConnection.java    |   78 +
 .../protocol/InternalCancellationToken.java        |   41 +
 .../internal/protocol/InternalConnection.java      |   10 +-
 .../tooling/internal/protocol/InternalFailure.java |   48 +
 .../internal/protocol/InternalGradleProject.java   |    2 +-
 .../internal/protocol/InternalIdeaProject.java     |    2 +-
 .../tooling/internal/protocol/ModelBuilder.java    |    8 +-
 .../internal/protocol/ShutdownParameters.java      |   27 +
 .../internal/protocol/StoppableConnection.java     |   39 +
 .../protocol/eclipse/EclipseProjectVersion3.java   |    3 +-
 .../protocol/events/InternalJvmTestDescriptor.java |   56 +
 .../protocol/events/InternalTestDescriptor.java    |   54 +
 .../protocol/events/InternalTestFailureResult.java |   25 +
 .../events/InternalTestFinishedProgressEvent.java  |   31 +
 .../protocol/events/InternalTestProgressEvent.java |   44 +
 .../protocol/events/InternalTestResult.java        |   51 +
 .../protocol/events/InternalTestSkippedResult.java |   27 +
 .../events/InternalTestStartedProgressEvent.java   |   23 +
 .../protocol/events/InternalTestSuccessResult.java |   25 +
 .../org/gradle/tooling/model/GradleProject.java    |   21 +
 .../java/org/gradle/tooling/model/Launchable.java  |    9 +
 .../main/java/org/gradle/tooling/model/Task.java   |    5 +-
 .../tooling/model/build/GradleEnvironment.java     |   15 +-
 .../gradle/tooling/model/eclipse/EclipseTask.java  |   32 -
 .../model/eclipse/HierarchicalEclipseProject.java  |    6 +-
 .../tooling/model/gradle/BasicGradleProject.java   |    1 -
 .../tooling/model/gradle/BuildInvocations.java     |    8 +-
 .../gradle/tooling/model/gradle/GradleBuild.java   |    3 +-
 .../tooling/model/gradle/ProjectPublications.java  |    3 +-
 .../gradle/tooling/model/idea/IdeaContentRoot.java |   25 +-
 .../tooling/model/idea/IdeaSourceDirectory.java    |   12 +-
 .../tooling/fixture/GradleVersionSpecTest.groovy   |   18 +
 .../adapter/ProtocolToModelAdapterTest.groovy      |   12 +
 .../internal/consumer/ConnectionFactoryTest.groovy |   48 -
 .../internal/consumer/ConnectorServicesTest.groovy |   13 +-
 .../consumer/DefaultBuildActionExecuterTest.groovy |    4 +-
 .../consumer/DefaultBuildLauncherTest.groovy       |   36 +-
 .../DefaultCancellationTokenSourceTest.groovy      |   48 +
 .../consumer/DefaultModelBuilderTest.groovy        |    1 +
 .../consumer/DistributionFactoryTest.groovy        |   43 +-
 .../consumer/SynchronizedLoggingTest.groovy        |   45 +-
 .../ActionAwareConsumerConnectionTest.groovy       |   74 +-
 ...ActionRunnerBackedConsumerConnectionTest.groovy |    6 +-
 .../CancellableConsumerConnectionTest.groovy       |  168 +
 ...lableModelBuilderBackedModelProducerTest.groovy |   75 +
 ...tionVersion4BackedConsumerConnectionTest.groovy |  258 +-
 .../GradleBuildAdapterProducerTest.groovy          |   18 +-
 ...alConnectionBackedConsumerConnectionTest.groovy |    5 +-
 .../LazyConsumerActionExecutorTest.groovy          |   47 +-
 ...ModelBuilderBackedConsumerConnectionTest.groovy |   66 +-
 ...CancellableConsumerConnectionAdapterTest.groovy |   90 +
 ...rogressLoggingConsumerActionExecutorTest.groovy |    2 +-
 .../BuildInvocationsConverterTest.groovy           |   15 +-
 .../CachingToolingImplementationLoaderTest.groovy  |   74 +-
 .../DefaultToolingImplementationLoaderTest.groovy  |  115 +-
 ...chronizedToolingImplementationLoaderTest.groovy |   78 +-
 .../BuildProgressListenerAdapterTest.groovy        |  533 ++
 .../ConsumerOperationParametersTest.groovy         |   59 +-
 .../parameters/ProgressListenerAdapterTest.groovy  |    7 +-
 .../tooling/fixture/GradleVersionSpec.java         |    7 +
 .../tooling/fixture/TestOutputStream.groovy        |   35 +
 .../tooling/fixture/TestResultHandler.groovy       |   47 +
 subprojects/tooling-api/tooling-api.gradle         |   22 +-
 .../gradle/integtests/BlockingRequestObserver.java |  136 +
 ...ExtraTestCommandLineOptionsListenerWrapper.java |   32 +
 .../integtests/FavoritesIntegrationTest.java       |    9 +-
 .../integtests/LiveOutputIntegrationTest.groovy    |  105 +-
 .../ModelTasksGradleUIIntegrationTest.groovy       |   70 +
 ...projectProjectAndTaskListIntegrationTest.groovy |   10 +-
 .../org/gradle/integtests/OpenApiFixture.java      |  137 +
 .../org/gradle/integtests/OpenApiUiTest.groovy     |  933 ++++
 .../org/gradle/integtests/OutputUILordTest.groovy  |  127 +
 .../TestAlternateUIInteractionVersion1.java        |   52 +
 .../integtests/TestExecutionInteraction.groovy     |   92 +
 .../integtests/TestSettingsNodeVersion1.java       |  245 +
 .../TestSingleDualPaneUIInteractionVersion1.java   |   43 +
 .../org/gradle/foundation/ProjectConverter.java    |   56 +-
 .../java/org/gradle/foundation/ProjectView.java    |   17 -
 .../gradle/foundation/ipc/basic/ClientProcess.java |   27 +-
 .../ipc/gradle/AbstractGradleServerProtocol.java   |    2 +-
 .../gradle/ExecuteGradleCommandServerProtocol.java |    2 +-
 .../gradle/foundation/ipc/gradle/GradleClient.java |   28 +-
 .../ipc/gradle/KillGradleServerProtocol.java       |    4 -
 .../ipc/gradle/TaskListClientProtocol.java         |    4 +-
 .../ipc/gradle/TaskListServerProtocol.java         |    2 +-
 .../gradle/foundation/queue/ExecutionQueue.java    |    5 +-
 .../gradleplugin/foundation/GradlePluginLord.java  |   13 +-
 .../foundation/request/ExecutionRequest.java       |    2 +-
 .../foundation/runner/GradleRunner.java            |   73 -
 .../swing/common/PreferencesAssistant.java         |    2 +-
 .../swing/generic/DualPaneUIInstance.java          |   57 -
 .../userinterface/swing/generic/OutputPanel.java   |    2 +-
 .../generic/SwingEditFavoriteInteraction.java      |    2 +-
 .../userinterface/swing/generic/tabs/SetupTab.java |    4 +-
 .../swing/standalone/Application.java              |   21 +-
 .../swing/standalone/BlockingApplication.java      |   56 +-
 .../wrappers/NoLongerSupportedException.java       |   23 +
 .../openapi/wrappers/RunnerWrapperFactory.java     |   59 -
 .../gradle/openapi/wrappers/UIWrapperFactory.java  |   57 -
 .../wrappers/foundation/ProjectWrapper.java        |    3 +-
 .../runner/GradleRunnerInteractionWrapper.java     |  123 -
 .../wrappers/runner/GradleRunnerWrapper.java       |   32 +-
 .../openapi/wrappers/ui/DualPaneUIWrapper.java     |   41 +-
 .../openapi/wrappers/ui/SinglePaneUIWrapper.java   |   17 +
 .../org/gradle/foundation/BuildInformation.java    |    5 +-
 .../org/gradle/foundation/FavoritesTest.java       |   11 +-
 .../org/gradle/foundation/FileLinkTests.java       |    2 +-
 .../groovy/org/gradle/foundation/FilterTest.java   |    9 +-
 .../gradle/foundation/ProjectConverterTest.groovy  |    7 +-
 .../groovy/org/gradle/foundation/TestUtility.java  |   48 +-
 .../WrapperConcurrentDownloadTest.groovy           |    2 +-
 .../WrapperCrossVersionIntegrationTest.groovy      |   40 +-
 .../WrapperGenerationIntegrationTest.groovy        |   28 +-
 .../WrapperLoggingIntegrationTest.groovy           |   51 +
 .../WrapperProjectIntegrationTest.groovy           |    2 +-
 .../WrapperUserHomeIntegrationTest.groovy          |    2 +-
 .../src/main/java/org/gradle/wrapper/Download.java |   12 +-
 .../gradle/wrapper/ExclusiveFileAccessManager.java |    8 +-
 .../java/org/gradle/wrapper/GradleWrapperMain.java |   18 +-
 .../src/main/java/org/gradle/wrapper/Install.java  |   16 +-
 .../src/main/java/org/gradle/wrapper/Logger.java   |   52 +
 .../java/org/gradle/wrapper/PathAssembler.java     |   16 +-
 .../groovy/org/gradle/wrapper/DownloadTest.groovy  |    2 +-
 .../groovy/org/gradle/wrapper/InstallTest.groovy   |    2 +-
 .../org/gradle/wrapper/PathAssemblerTest.java      |    9 +-
 version.txt                                        |    2 +-
 7919 files changed, 360448 insertions(+), 190278 deletions(-)
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/build/TestReportAggregator.groovy
 rename buildSrc/src/main/groovy/org/gradle/build/docs/{AssembleSampleDocsTask.groovy => AssembleSamplesDocTask.groovy} (100%)
 rename buildSrc/src/main/groovy/org/gradle/build/docs/{Docbook2XHtml.groovy => Docbook2Xhtml.groovy} (100%)
 create mode 100644 buildSrc/src/test/groovy/org/gradle/build/docs/UserGuideTransformTaskTest.groovy
 delete mode 100644 debian/patches/03_plexus.diff
 delete mode 100644 debian/patches/11_fix_jni_path.diff
 delete mode 100644 debian/patches/35_ivy_23.diff
 delete mode 100644 debian/patches/36_java8_compatibility.diff
 delete mode 100644 debian/patches/37_replace_internal_testng_api.diff
 delete mode 100644 debian/patches/38_use_jdk7_nio_file_api.diff
 delete mode 100644 debian/patches/39_ignore_test_processor_assertion.diff
 delete mode 100644 debian/patches/bintray_api.diff
 delete mode 100644 debian/patches/bintray_dependencies.diff
 create mode 100644 gradle/fix-GRADLE-2492.gradle
 create mode 100644 gradle/strictCompile.gradle
 create mode 100644 gradle/taskOrdering.gradle
 create mode 100644 subprojects/announce/src/integTest/groovy/org/gradle/api/plugins/announce/AnnouncePluginIntegrationTest.groovy
 rename subprojects/announce/src/main/resources/META-INF/gradle-plugins/{announce.properties => org.gradle.announce.properties} (100%)
 rename subprojects/announce/src/main/resources/META-INF/gradle-plugins/{build-announcements.properties => org.gradle.build-announcements.properties} (100%)
 create mode 100644 subprojects/antlr/src/integTest/groovy/org/gradle/api/plugins/antlr/AbstractAntlrIntegrationTest.groovy
 create mode 100644 subprojects/antlr/src/integTest/groovy/org/gradle/api/plugins/antlr/Antlr2PluginIntegrationTest.groovy
 create mode 100644 subprojects/antlr/src/integTest/groovy/org/gradle/api/plugins/antlr/Antlr3PluginIntegrationTest.groovy
 create mode 100644 subprojects/antlr/src/integTest/groovy/org/gradle/api/plugins/antlr/Antlr4PluginIntegrationTest.groovy
 create mode 100644 subprojects/antlr/src/integTest/groovy/org/gradle/api/plugins/antlr/AntlrPluginIntegrationTest.groovy
 create mode 100644 subprojects/antlr/src/integTest/groovy/org/gradle/api/plugins/antlr/IncrementalAntlrTaskIntegrationTest.groovy
 create mode 100644 subprojects/antlr/src/integTest/groovy/org/gradle/integtests/samples/SamplesAntlrIntegrationTest.groovy
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/AntlrExecuter.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/AntlrResult.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/AntlrSourceGenerationException.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/AntlrSpec.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/AntlrSpecFactory.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/AntlrWorkerClient.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/AntlrWorkerClientProtocol.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/AntlrWorkerManager.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/AntlrWorkerServer.java
 delete mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/GenerationPlan.java
 delete mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/GenerationPlanBuilder.java
 delete mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/GrammarDelegate.java
 delete mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/GrammarFileMetadata.java
 delete mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/GrammarMetadata.java
 delete mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/MetadataExtracter.java
 delete mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/XRef.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/antlr2/GenerationPlan.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/antlr2/GenerationPlanBuilder.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/antlr2/GrammarDelegate.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/antlr2/GrammarFileMetadata.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/antlr2/GrammarMetadata.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/antlr2/MetadataExtracter.java
 create mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/antlr2/XRef.java
 rename subprojects/antlr/src/main/resources/META-INF/gradle-plugins/{antlr.properties => org.gradle.antlr.properties} (100%)
 create mode 100644 subprojects/antlr/src/test/groovy/org/gradle/api/plugins/antlr/internal/AntlrSpecFactoryTest.groovy
 create mode 100644 subprojects/base-services-groovy/src/main/groovy/org/gradle/api/internal/ClosureBackedAction.java
 create mode 100644 subprojects/base-services-groovy/src/main/groovy/org/gradle/api/specs/Specs.java
 create mode 100644 subprojects/base-services-groovy/src/main/groovy/org/gradle/groovy/scripts/Transformer.java
 rename subprojects/{core => base-services-groovy}/src/main/groovy/org/gradle/groovy/scripts/internal/AbstractScriptTransformer.java (100%)
 create mode 100644 subprojects/base-services-groovy/src/main/groovy/org/gradle/groovy/scripts/internal/AstUtils.java
 create mode 100644 subprojects/base-services-groovy/src/main/groovy/org/gradle/groovy/scripts/internal/RestrictiveCodeVisitor.java
 create mode 100644 subprojects/base-services-groovy/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptBlock.java
 create mode 100644 subprojects/base-services-groovy/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptSourceDescriptionTransformer.java
 create mode 100644 subprojects/base-services-groovy/src/main/groovy/org/gradle/groovy/scripts/internal/StatementTransformer.java
 rename subprojects/{core => base-services-groovy}/src/main/groovy/org/gradle/util/Configurable.java (100%)
 rename subprojects/{core => base-services-groovy}/src/test/groovy/org/gradle/api/specs/SpecsTest.groovy (100%)
 create mode 100644 subprojects/base-services/src/integTest/groovy/org/gradle/internal/SystemPropertiesIntegrationTest.groovy
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/BiAction.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/BiActions.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/Pair.java
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/Supplier.java
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/Suppliers.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/TriAction.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/concurrent/ExecutorPolicy.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/concurrent/StoppableExecutorImpl.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/concurrent/ThreadFactoryImpl.java
 rename subprojects/{core/src/main/groovy => base-services/src/main/java}/org/gradle/internal/exceptions/Contextual.java (100%)
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/exceptions/DefaultMultiCauseException.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/exceptions/DiagnosticsVisitor.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/exceptions/FormattingDiagnosticsVisitor.java
 rename subprojects/{core/src/main/groovy => base-services/src/main/java}/org/gradle/internal/exceptions/MultiCauseException.java (100%)
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/io/IoUtils.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/jvm/JdkTools.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/jvm/UnsupportedJavaRuntimeException.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/operations/BuildOperation.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/operations/BuildOperationFailure.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/operations/BuildOperationProcessor.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/operations/BuildOperationQueue.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/operations/BuildOperationWorker.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/operations/DefaultBuildOperationProcessor.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/operations/DefaultBuildOperationQueue.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/operations/MultipleBuildOperationFailures.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/reflect/ClassDetails.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/reflect/ClassInspector.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/reflect/MethodDescription.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/reflect/MethodSignatureEquivalence.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/reflect/PropertyDetails.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/util/BiFunction.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/util/NumberUtil.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/util/GradleVersion.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/util/TextUtil.java
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/PairTest.groovy
 delete mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/SuppliersTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/exceptions/DefaultMultiCauseExceptionTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/exceptions/FormattingDiagnosticsVisitorTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/hash/HashUtilTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/jvm/JdkToolsTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/operations/DefaultBuildOperationProcessorTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/operations/DefaultBuildOperationQueueTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/operations/MultipleBuildOperationFailuresTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/reflect/ClassInspectorTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/reflect/MethodDescriptionTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/util/NumberUtilTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/util/GradleVersionTest.groovy
 create mode 100644 subprojects/build-comparison/src/integTest/groovy/org/gradle/api/plugins/buildcomparison/fixtures/BuildComparisonHtmlReportFixture.groovy
 copy subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareNestedArchives}/source/build.gradle (100%)
 copy subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareNestedArchives}/source/settings.gradle (100%)
 copy subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareNestedArchives}/target/build.gradle (100%)
 rename subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareNestedArchives}/target/settings.gradle (100%)
 rename subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareSimpleArchives}/source/build.gradle (100%)
 copy subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareSimpleArchives}/source/settings.gradle (100%)
 rename subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareSimpleArchives}/source/src/main/java/org/gradle/Changed.java (100%)
 rename subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareSimpleArchives}/source/src/main/java/org/gradle/DifferentCrc.java (100%)
 rename subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareSimpleArchives}/source/src/main/java/org/gradle/SourceBuildOnly.java (100%)
 rename subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareSimpleArchives}/source/src/main/java/org/gradle/Unchanged.java (100%)
 create mode 100644 subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/compareSimpleArchives/source/src/main/resources/dir1/different.txt
 create mode 100644 subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/compareSimpleArchives/source/src/main/resources/similar.txt
 create mode 100644 subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/compareSimpleArchives/source/src/main/resources/someSource.properties
 rename subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareSimpleArchives}/target/build.gradle (100%)
 rename subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives/source => compareSimpleArchives/target}/settings.gradle (100%)
 rename subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareSimpleArchives}/target/src/main/java/org/gradle/Changed.java (100%)
 rename subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareSimpleArchives}/target/src/main/java/org/gradle/DifferentCrc.java (100%)
 rename subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareSimpleArchives}/target/src/main/java/org/gradle/TargetBuildOnly.java (100%)
 rename subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/{compareArchives => compareSimpleArchives}/target/src/main/java/org/gradle/Unchanged.java (100%)
 create mode 100644 subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/compareSimpleArchives/target/src/main/resources/dir1/different.txt
 create mode 100644 subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/compareSimpleArchives/target/src/main/resources/similar.txt
 create mode 100644 subprojects/build-comparison/src/integTest/resources/org/gradle/api/plugins/buildcomparison/gradle/BuildComparisonIntegrationSpec/compareSimpleArchives/target/src/main/resources/someTarget.properties
 delete mode 100644 subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/outcome/internal/archive/entry/ZipEntryToArchiveEntryTransformer.java
 rename subprojects/build-comparison/src/main/resources/META-INF/gradle-plugins/{compare-gradle-builds.properties => org.gradle.compare-gradle-builds.properties} (100%)
 delete mode 100644 subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/outcome/internal/archive/entry/ZipEntryToArchiveEntryTransformerTest.groovy
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/BuildInitPlugin.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/BuildInitPlugin.java
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/WrapperPlugin.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/WrapperPlugin.java
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/BuildInitAutoApplyAction.java
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/WrapperPluginAutoApplyAction.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/action/BuildInitAutoApplyAction.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/action/WrapperPluginAutoApplyAction.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/package-info.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/tasks/internal/TaskConfiguration.java
 rename subprojects/build-init/src/main/resources/META-INF/gradle-plugins/{build-init.properties => org.gradle.build-init.properties} (100%)
 rename subprojects/build-init/src/main/resources/META-INF/gradle-plugins/{wrapper.properties => org.gradle.wrapper.properties} (100%)
 delete mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/internal/BuildInitAutoApplyActionSpec.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/internal/action/BuildInitAutoApplyActionSpec.groovy
 create mode 100644 subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/AbstractFindBugsPluginIntegrationTest.groovy
 delete mode 100644 subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/CodeQualityPluginIntegrationTest.groovy
 create mode 100644 subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/FindBugsClasspathValidationIntegrationTest.groovy
 create mode 100644 subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/FindBugsForOldJavaIntegrationTest.groovy
 create mode 100644 subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/FindBugsIntegrationTest.groovy
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeQualityPlugin.groovy
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/GroovyCodeQualityPluginConvention.groovy
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JavaCodeQualityPluginConvention.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsClasspathValidator.java
 delete mode 100755 subprojects/code-quality/src/main/resources/META-INF/gradle-plugins/code-quality.properties
 rename subprojects/code-quality/src/main/resources/META-INF/gradle-plugins/{checkstyle.properties => org.gradle.checkstyle.properties} (100%)
 rename subprojects/code-quality/src/main/resources/META-INF/gradle-plugins/{codenarc.properties => org.gradle.codenarc.properties} (100%)
 rename subprojects/code-quality/src/main/resources/META-INF/gradle-plugins/{findbugs.properties => org.gradle.findbugs.properties} (100%)
 rename subprojects/code-quality/src/main/resources/META-INF/gradle-plugins/{jdepend.properties => org.gradle.jdepend.properties} (100%)
 rename subprojects/code-quality/src/main/resources/META-INF/gradle-plugins/{pmd.properties => org.gradle.pmd.properties} (100%)
 delete mode 100644 subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CodeQualityPluginTest.groovy
 create mode 100644 subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CodenarcTest.groovy
 create mode 100644 subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsClasspathValidatorTest.groovy
 create mode 100644 subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsWorkerServerTest.groovy
 delete mode 100644 subprojects/core-impl/core-impl.gradle
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/CacheResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ClientModuleDependenciesResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesChangingModulesIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesStatusIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/DependencyNotationIntegrationSpec.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/DependencyResolutionEventsIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/DependencyResolveRulesIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/FlatDirJvmLibraryArtifactResolutionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/JvmLibraryArtifactResolveTestFixture.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ProjectDependenciesIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ProjectDependencyResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ResolutionStrategySamplesIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ResolveCrossVersionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ResolveTestFixture.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ResolvedConfigurationIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/VersionConflictResolutionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/AliasedArtifactResolutionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/CacheReuseCrossVersionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/M3CacheReuseCrossVersionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/MavenM2CacheReuseIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/ResolutionOverrideIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/SameCacheUsageCrossVersionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedChangingModulesIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedDependencyResolutionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedMissingModulesIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachingDependencyMetadataInMemoryIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/RecoverFromBrokenResolutionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/custom/FileSystemResolverIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/custom/IvySFtpResolverIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/custom/IvyUrlResolverIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/AbstractHttpsRepoResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpAuthenticationDependencyResolutionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpEncodingDependencyResolutionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpProxyResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpRedirectResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyBrokenDescriptorIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyBrokenRemoteResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyChangingModuleRemoteResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesChangingModulesIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesStatusIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyCustomStatusLatestVersionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorValidationIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDynamicRevisionRemoteResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDynamicRevisionResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyHttpRepoResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyHttpsRepoResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyJvmLibraryArtifactResolutionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyModuleResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/BadPomFileResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/LegacyMavenRepoResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenBrokenRemoteResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesChangingModulesIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesStatusIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenCustomPackagingResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenDependencyResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenDynamicResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenHttpRepoResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenJvmLibraryArtifactResolutionIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenLatestResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenLocalRepoResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenParentPomResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomPackagingResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenProfileResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenSnapshotResolveIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/canHaveConfigurationHierarchy/projectWithConfigurationHierarchy.gradle
 delete mode 100644 subprojects/core-impl/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/reportsUnknownDependencyError/projectWithUnknownDependency.gradle
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ArtifactDependencyResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultArtifactIdentifier.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultDependencyManagementServices.java
 delete mode 100755 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultModuleIdentifier.java
 delete mode 100755 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultModuleVersionIdentifier.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultResolvedArtifact.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyManagementBuildScopeServices.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyManagementGlobalScopeServices.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyServices.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ModuleMetadataProcessor.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ModuleVersionIdentifierSerializer.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ModuleVersionPublisher.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ModuleVersionSelectorSerializer.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ResolvedConfigurationIdentifierSerializer.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ResolverResults.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/component/DefaultComponentIdentifierFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/component/DefaultModuleComponentIdentifier.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/component/DefaultModuleComponentSelector.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/component/DefaultProjectComponentIdentifier.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/component/DefaultProjectComponentSelector.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/configurations/Configurations.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfiguration.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationContainer.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/dsl/DefaultArtifactHandler.groovy
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandler.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/dsl/ModuleVersionSelectorParsers.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/dsl/ParsedModuleStringNotation.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/dsl/PublishArtifactNotationParserFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolveContext.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactSetResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactTypeResolveContext.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/BuildableArtifactResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/BuildableArtifactSetResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/BuildableComponentResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLayout.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLockingArtifactDependencyResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLockingManager.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ComponentResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ConfigurationResolveContext.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ContextualArtifactResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactSetResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableComponentResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultCacheLockingManager.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultConfigurationResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultDependencyResolveDetails.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyDependencyPublisher.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultLenientConfiguration.java
 delete mode 100755 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultUnresolvedDependency.java
 delete mode 100755 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DependencyToModuleVersionIdResolver.java
 delete mode 100755 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DependencyToModuleVersionResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ErrorHandlingArtifactDependencyResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyBackedArtifactPublisher.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyDependencyPublisher.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyResolverBackedModuleVersionPublisher.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyUtil.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyXmlModuleDescriptorWriter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/LocalComponentFactory.java
 delete mode 100755 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ModuleToModuleVersionResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ModuleVersionIdResolveResult.java
 delete mode 100755 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ModuleVersionNotFoundException.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ModuleVersionResolveException.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/SelfResolvingDependencyResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ShortcircuitEmptyConfigsArtifactDependencyResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/SubstitutedModuleVersionIdResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/VersionForcingDependencyToModuleResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/clientmodule/ClientModuleResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/DefaultCachedModuleVersionList.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/ModuleVersionsCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/ModuleVersionsCacheEntry.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/SingleFileBackedModuleVersionsCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ArtifactNotFoundException.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ArtifactResolveException.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BuildableModuleVersionMetaDataResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BuildableModuleVersionSelectionResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CacheLockingModuleVersionRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleVersionRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ChangingModuleDetector.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ConfiguredModuleVersionRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaDataResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionSelectionResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultModuleVersionListing.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DependencyResolverIdentifier.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyAwareModuleVersionRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleVersionRepository.java
 delete mode 100755 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LazyDependencyToModuleResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalArtifactsModuleVersionRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalAwareModuleVersionRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalModuleVersionRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LoopbackDependencyResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleSource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleVersionListing.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleVersionRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NoOpRepositoryCacheManager.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChain.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainArtifactResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainModuleResolution.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainModuleSource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ResolveIvyFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/StartParameterResolutionOverride.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/UserResolverChain.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedModuleVersionResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCacheStats.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryDependencyMetadataCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractModuleDescriptorParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DescriptorParseContext.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedDescriptorParseContext.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorBuilder.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParseException.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReader.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ChainVersionMatcher.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ExactVersionMatcher.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/LatestStrategy.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/LatestVersionMatcher.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/LatestVersionStrategy.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ResolverStrategy.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/SubVersionMatcher.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/VersionMatcher.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/VersionRangeMatcher.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/CachedModuleDescriptorParseContext.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultCachedMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleArtifactsCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleMetaDataCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleArtifactsCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorCacheEntry.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorStore.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleMetaDataCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ConfigurationsToArtifactsConverter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ConfigurationsToModuleDescriptorConverter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToArtifactsConverter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToModuleDescriptorConverter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultModuleDescriptorFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ModuleDescriptorFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/PublishLocalComponentFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ResolveLocalComponentFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/AbstractIvyDependencyDescriptorFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleDependencyDescriptor.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleIvyDependencyDescriptorFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleMetaDataFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultClientModuleMetaDataFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependencyDescriptorFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DependenciesToModuleDescriptorConverter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DependencyDescriptorFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/EnhancedDependencyDescriptor.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ExternalModuleIvyDependencyDescriptorFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/IvyDependencyDescriptorFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ProjectDependencyDescriptor.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ProjectIvyDependencyDescriptorFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/DefaultProjectComponentRegistry.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/DefaultProjectPublication.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectArtifactResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectComponentRegistry.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectDependencyResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultCachePolicy.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultResolutionStrategy.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/ModuleForcingResolveRule.java
 delete mode 100755 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DefaultDependencyResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DefaultDependencyToConfigurationResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilder.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyToConfigurationResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/LatestModuleConflictResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleConflictResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleRevisionResolveState.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleVersionSpec.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/StrictConflictResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/VersionSelectionReasonResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultResolvedConfigurationBuilder.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultTransientConfigurationResults.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/ResolvedConfigurationBuilder.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResults.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResultsBuilder.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/CachingDependencyResultFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentIdentifierSerializer.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentSelectionReasonSerializer.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentSelectorSerializer.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultInternalDependencyResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultModuleVersionSelection.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultResolutionResultBuilder.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/InternalDependencyResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/InternalDependencyResultSerializer.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ModuleVersionSelection.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ModuleVersionSelectionSerializer.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/StreamingResolutionResultBuilder.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/VersionSelectionReasons.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/CachedStoreFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/DefaultBinaryStore.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/AbstractModuleDescriptorBackedMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/BuildableModuleVersionPublishMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ComponentArtifactIdentifier.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ComponentArtifactMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ComponentMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ConfigurationMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultDependencyMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyArtifactName.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultLocalArtifactIdentifier.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultLocalComponentMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactIdentifier.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionPublishMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DependencyMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/IvyArtifactName.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/LocalArtifactMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/LocalComponentMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleDescriptorAdapter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionArtifactIdentifier.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionArtifactIdentifierSerializer.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionArtifactMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionArtifactPublishMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionPublishMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/MutableLocalComponentMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/MutableModuleVersionMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultLocalMavenRepositoryLocator.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultMavenFileLocations.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultMavenSettingsProvider.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/AbstractArtifactRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/AbstractAuthenticationSupportedRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultFlatDirArtifactRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultIvyArtifactRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenArtifactRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalArtifactRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/LegacyDependencyResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/LegacyMavenResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/ResolutionAwareRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/DownloadingRepositoryArtifactCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/LocalFileRepositoryArtifactCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/RepositoryArtifactCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/layout/GradleRepositoryLayout.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/layout/MavenRepositoryLayout.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/layout/PatternRepositoryLayout.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/layout/RepositoryLayout.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/AbstractRepositoryCacheManager.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/CustomIvyResolverRepositoryFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/CustomResolverArtifactRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManager.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/EnhancedArtifactDownloadReport.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/FixedResolverArtifactRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/IvyDependencyResolverAdapter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/LegacyDependencyResolverRepositoryFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/LegacyResolverParserSettings.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/LocalFileRepositoryCacheManager.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/AbstractVersionList.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ChainedVersionLister.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ComponentMetadataDetailsAdapter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/DefaultVersionList.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolverDescriptorParseContext.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResourcePattern.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/M2ResourcePattern.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenLocalResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenMetadataLoader.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenVersionLister.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/PatternBasedResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourcePattern.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourceVersionLister.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/VerifyingExternalResourceDownloader.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/VersionList.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/VersionLister.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/ProgressLoggingTransferListener.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransport.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransportFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/AbstractSoftwareArtifact.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/AbstractSoftwareComponent.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/ComponentMetaDataArtifact.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQuery.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQueryFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQueryResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibrary.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibraryJavadocArtifact.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibrarySourcesArtifact.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultUnresolvedSoftwareComponent.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/IvyDescriptorArtifact.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/MavenPomArtifact.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultUnresolvedDependencyResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/AbstractExternalResource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/DefaultLocallyAvailableExternalResource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ExternalResource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/LocalFileStandInExternalResource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/LocallyAvailableExternalResource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/MetaDataOnlyExternalResource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/MissingExternalResource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/UrlExternalResource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/ByUrlCachedExternalResourceIndex.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedArtifact.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedArtifactIndex.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResourceAdapter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResourceIndex.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedItem.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/DefaultCachedArtifact.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/DefaultCachedExternalResource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/DefaultCachedExternalResourceIndex.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ivy/AbstractCachedIndex.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ivy/ArtifactAtRepositoryCachedArtifactIndex.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ivy/ArtifactAtRepositoryKey.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/AbstractLocallyAvailableResourceFinder.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/CompositeLocallyAvailableResourceFinder.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LazyLocallyAvailableResourceCandidates.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResourceCandidates.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResourceFinder.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResourceFinderSearchableFileStoreAdapter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/ivy/LocallyAvailableResourceFinderFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/ivy/PatternBasedLocallyAvailableResourceFinder.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/metadata/DefaultExternalResourceMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/metadata/ExternalResourceMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/metadata/ExternalResourceMetaDataCompare.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/AbstractProgressLoggingHandler.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/CacheAwareExternalResourceAccessor.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/DefaultCacheAwareExternalResourceAccessor.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ExternalResourceAccessor.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ExternalResourceLister.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ExternalResourceUploader.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceAccessor.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceUploader.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ResourceOperation.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/DefaultExternalResourceRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/ExternalResourceRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/file/FileResourceConnector.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/file/FileTransport.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/ApacheDirectoryListingParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/DefaultHttpSettings.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientConfigurer.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientHelper.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpProxySettings.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpRequestException.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceAccessor.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceLister.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceUploader.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResponseResource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpSettings.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpTransport.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/JavaSystemPropertiesHttpProxySettings.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/RepeatableInputStreamEntity.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/ntlm/NTLMCredentials.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/ntlm/NTLMSchemeFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/filestore/ivy/ArtifactIdentifierFileStore.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/notations/ClientModuleNotationParserFactory.java
 delete mode 100755 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/notations/DependencyClassPathNotationParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/notations/DependencyFilesNotationParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/notations/DependencyMapNotationParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/notations/DependencyNotationParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/notations/DependencyProjectNotationParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/notations/DependencyStringNotationParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/notations/ProjectDependencyFactory.java
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DefaultDependencyManagementServicesTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedArtifactTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedDependencySpec.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedDependencyTest.java
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ModuleVersionSelectorSerializerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ResolvedConfigurationIdentifierSerializerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ResolverResultsSpec.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/component/DefaultComponentIdentifierFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/component/DefaultModuleComponentIdentifierTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/component/DefaultModuleComponentSelectorTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/component/DefaultProjectComponentIdentifierTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/component/DefaultProjectComponentSelectorTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationContainerSpec.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationContainerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationSpec.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationTest.java
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandlerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/dsl/ModuleVersionSelectorParsersTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/dsl/PublishArtifactNotationParserFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLayoutTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLockingArtifactDependencyResolverTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactResolveResultTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactSetResolveResultTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableComponentResolveResultTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultDependencyResolveDetailsSpec.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultUnresolvedDependencySpec.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ErrorHandlingArtifactDependencyResolverTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyUtilTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyXmlModuleDescriptorWriterTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ModuleVersionNotFoundExceptionTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ModuleVersionResolveExceptionTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/SelfResolvingDependencyResolverTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ShortcircuitEmptyConfigsArtifactDependencyResolverSpec.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/VersionForcingDependencyToModuleResolverSpec.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/clientmodule/ClientModuleResolverTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleVersionRepositoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaDataResolveResultTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DependencyResolverIdentifierTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolverTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleVersionRepositoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LazyDependencyToModuleResolverTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolverTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedModuleVersionResultTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedRepositoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCacheTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryDependencyMetadataCacheTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractGradlePomModuleDescriptorParserTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractPomReaderTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParserTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParserProfileTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParserTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParserTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReaderProfileTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReaderTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ChainVersionMatcherTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ExactVersionMatcherTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/LatestVersionMatcherTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/LatestVersionStrategyTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/SubVersionMatcherTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/VersionRangeMatcherTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorStoreTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToArtifactsConverterTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToModuleDescriptorConverterTest.java
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultModuleDescriptorFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/PublishLocalComponentFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ResolveLocalComponentFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/AbstractDependencyDescriptorFactoryInternalTest.java
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleIvyDependencyDescriptorFactoryTest.java
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultClientModuleMetaDataFactoryTest.java
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverterTest.java
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependencyDescriptorFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ExternalModuleDependencyDescriptorFactoryTest.java
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ProjectDependencyDescriptorFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectDependencyResolverTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultCachePolicySpec.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultResolutionStrategySpec.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/ModuleForcingResolveRuleSpec.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilderTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleVersionSpecTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/VersionSelectionReasonResolverTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/CachingDependencyResultFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentIdentifierSerializerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentSelectionReasonSerializerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentSelectorSerializerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultResolutionResultBuilderSpec.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DummyBinaryStore.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/InternalDependencyResultSerializerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ModuleVersionSelectionSerializerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/StreamingResolutionResultBuilderTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/VersionSelectionReasonsTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultDependencyMetaDataTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyArtifactNameTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultLocalArtifactIdentifierTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultLocalComponentMetaDataTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactIdentifierTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactMetaDataTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionPublishMetaDataTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/ModuleDescriptorAdapterTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultLocalMavenRepositoryLocatorTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultFlatDirArtifactRepositoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultIvyArtifactRepositoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenArtifactRepositoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalRepositoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManagerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ChainedVersionListerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolverTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResourcePatternTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/M2ResourcePatternTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenResolverTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenVersionListerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourceVersionListerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/transport/ProgressLoggingTransferListenerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolutionResultTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedModuleVersionResultSpec.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResourceAdapterTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/cached/DefaultArtifactResolutionCacheTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/ivy/ArtifactAtRepositoryCachedArtifactIndexTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/local/CompositeLocallyAvailableResourceFinderTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/local/LazyLocallyAvailableResourceCandidatesTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/metadata/DefaultExternalResourceMetaDataTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/metadata/ExternalResourceMetaDataCompareTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/DefaultCacheAwareExternalResourceAccessorTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceAccessorTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceUploaderTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/ResourceOperationTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/ApacheDirectoryListingParserTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientConfigurerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientHelperTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceListerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResponseResourceTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/JavaSystemPropertiesHttpProxySettingsTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/ntlm/NTLMCredentialsTest.groovy
 delete mode 100755 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/notations/DependencyClassPathNotationParserTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/notations/DependencyMapNotationParserTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/notations/DependencyNotationParserTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/notations/DependencyStringNotationParserTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/notations/ProjectDependencyFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/resources/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/test-full.xml
 delete mode 100644 subprojects/core-impl/src/testFixtures/groovy/org/gradle/api/internal/artifacts/result/ResolutionResultDataBuilder.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/BuildScriptExecutionIntegrationSpec.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/BuildScriptExecutionIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/ExternalScriptExecutionIntegrationSpec.groovy
 create mode 100755 subprojects/core/src/integTest/groovy/org/gradle/api/ExternalScriptExecutionIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/InitScriptExecutionIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/PluginApplicationErrorIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/SettingsScriptExecutionIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/dsl/PluginDetectionIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/file/FileResolutionIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/internal/initialization/loadercache/ClassLoadersCachingIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/resource/TextResourceIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/FailingIncrementalTasksIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalBuildIntegrationTest.groovy
 delete mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalTaskIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalTasksIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/TaskInputPropertiesIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/TaskSelectionIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/execution/taskgraph/RuleBasedTaskExecutionIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/plugin/NonImperativeBuildScriptEvaluationIntegrationTest.groovy
 delete mode 100644 subprojects/core/src/integTest/groovy/org/gradle/plugin/PluginHandlerScriptIntegTest.groovy
 delete mode 100644 subprojects/core/src/integTest/groovy/org/gradle/plugin/bintray/BintrayPluginResolutionIntegTest.groovy
 create mode 100644 subprojects/core/src/integTest/resources/org/gradle/api/resource/TextResourceIntegrationTest/shared/build.gradle
 rename subprojects/{integ-test/src/integTest/resources/org/gradle/integtests => core/src/integTest/resources/org/gradle/api/tasks}/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/DirTransformerTask.java (100%)
 rename subprojects/{integ-test/src/integTest/resources/org/gradle/integtests => core/src/integTest/resources/org/gradle/api/tasks}/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/GeneratorTask.java (100%)
 rename subprojects/{integ-test/src/integTest/resources/org/gradle/integtests => core/src/integTest/resources/org/gradle/api/tasks}/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/TransformerTask.java (100%)
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/CacheUsage.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/GradleLauncher.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/RefreshOptions.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/TaskExecutionRequest.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/BuildCancelledException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/BuildableModelElement.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/IllegalOperationAtExecutionTimeException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ComponentMetadata.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ComponentModuleMetadata.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ComponentModuleMetadataDetails.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ComponentSelection.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ComponentSelectionRules.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/DependencySubstitution.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/DependencySubstitutions.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ModuleDependencySubstitution.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ProjectDependencySubstitution.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/dsl/ComponentModuleMetadataHandler.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ivy/IvyExtraInfo.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ivy/IvyModuleDescriptor.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ivy/package-info.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/query/ArtifactResolutionQuery.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/query/package-info.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/repositories/IvyPatternRepositoryLayout.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/repositories/RepositoryLayout.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/ArtifactResolutionQuery.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/ArtifactResolutionQueryResult.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibrary.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibraryArtifact.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibraryJavadocArtifact.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibrarySourcesArtifact.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/SoftwareArtifact.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/SoftwareComponent.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/UnresolvedSoftwareComponent.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/package-info.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ArtifactResolutionResult.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ArtifactResult.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ComponentArtifactsResult.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ComponentResult.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ResolvedArtifactResult.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/UnresolvedArtifactResult.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/UnresolvedComponentResult.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/component/Artifact.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/component/Component.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/credentials/AwsCredentials.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/credentials/Credentials.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/credentials/package-info.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractBuildableModelElement.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/ClosureBackedAction.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/PolymorphicDomainObjectContainerInternal.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/TypedDomainObjectContainerWrapper.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/DependencySubstitutionInternal.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/ExcludeRuleNotationConverter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/ExcludeRuleNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/ModuleDependencySubstitutionInternal.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/ProjectDependencySubstitutionInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/configurations/ConfigurationInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/configurations/ResolutionStrategyInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractExternalDependency.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractExternalModuleDependency.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/ArtifactResolutionQueryFactory.java
 rename subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/{ModuleDescriptorDelegate.groovy => ModuleFactoryDelegate.groovy} (100%)
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/query/ArtifactResolutionQueryFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/cache/Loader.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/cache/MinimalPersistentCache.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/cache/SingleOperationPersistentStore.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/cache/Stash.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/IncrementalTaskInputsInternal.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/FileSnapshot.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/FilesSnapshotSet.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/InputPropertiesSerializer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/coerce/PropertySetTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/coerce/StringToEnumTransformer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/coerce/TypeCoercingMethodArgumentsTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/component/ArtifactType.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/component/BuildableJavaComponent.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/component/ComponentRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/component/ComponentTypeRegistration.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/component/ComponentTypeRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/component/DefaultComponentTypeRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/BasicFileResolver.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/FileOrUriNotationConverter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/FileOrUriNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/DelegatingFileTree.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/LazilyInitializedFileTree.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecResolver.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/PathNotationConverter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/PathNotationParser.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/RelativizedCopySpec.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/SingleParentCopySpec.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/GroupedAndNamedUniqueFileStore.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/PathKeyFileStore.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/PathNormalisingKeyFileStore.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/UniquePathKeyFileStore.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/html/SimpleHtmlWriter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/BasicDomainObjectContext.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ClassLoaderCache.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ClassLoaderIds.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ClassLoaderScopeIdentifier.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderCache.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/loadercache/ClassLoaderCache.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/loadercache/ClassLoaderId.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/loadercache/ClassPathSnapshot.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/loadercache/ClassPathSnapshotter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/loadercache/DefaultClassLoaderCache.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/loadercache/FileClassPathSnapshotter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/loadercache/HashClassPathSnapshotter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultAppliedPlugin.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultPluginManager.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultPotentialPluginWithId.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/EmbeddableJavaProject.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/ImperativeOnlyPluginApplicator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/PluginApplicationException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/PluginApplicator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/PluginAwareInternal.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/PluginImplementation.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/PluginInspector.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/PluginManagerInternal.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/PotentialPlugin.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/RuleBasedPluginApplicator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/DefaultProjectTaskLister.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/DeferredProjectConfiguration.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectTaskLister.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/resource/CachingResource.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/resource/DelegatingResource.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/resource/Resource.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/resource/ResourceException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/resource/ResourceNotFoundException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/resource/StringResource.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/resource/UriResource.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/resources/CharSourceBackedTextResource.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/resources/DefaultTextResourceFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/resources/FileCollectionBackedArchiveTextResource.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/resources/FileCollectionBackedTextResource.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/resources/StringBackedTextResource.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/PublicTaskSpecification.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/TaskMutator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/TaskStatusNagger.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/xml/SimpleMarkupWriter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/xml/SimpleXmlWriter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/xml/XmlTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/plugins/AppliedPlugin.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/plugins/InvalidPluginException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/plugins/PluginManager.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/resources/TextResource.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/resources/TextResourceFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/specs/Specs.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/AbstractExecTask.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/Directory.groovy
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/ParallelizableTask.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/NonThreadsafeInMemoryStore.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/DefaultImportsReader.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/ImplicitTasksConfigurer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/ImportsScriptSource.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/ProjectDependencies2TaskResolver.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/TaskModelRealizingConfigurationAction.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/ProjectConfigurer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/ProjectEvaluatingAction.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/taskgraph/TaskDependencyGraphEdge.groovy
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/AbstractUriScriptSource.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/NonExistentFileScriptSource.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/Transformer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/AstUtils.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ClassCachingCompiledScript.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/CompileOperation.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/CompiledScript.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/FactoryBackedCompileOperation.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/FilteredTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/FilteringScriptTransformer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/FilteringStatementTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ImperativeStatementDetectingTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/InitialPassStatementTransformer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/PluginsAndBuildscriptTransformer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptBlock.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptBlockToServiceConfigurationTransformer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/StatementExtractingScriptTransformer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/StatementLabelsDeprecationLogger.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/StatementTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/SubsetScriptTransformer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/BuildAction.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/BuildCancellationToken.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/BuildCompletionListener.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/BuildController.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/BuildEventConsumer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/BuildRequestContext.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/ClassLoaderScopeRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/DefaultBuildCancellationToken.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/DefaultBuildRequestContext.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderScopeRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/FixedBuildCancellationToken.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/GradleLauncher.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/NoOpBuildEventConsumer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/ProjectPathProjectSpec.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/StackTraceSanitizingExceptionAnalyser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/DefaultTaskExecutionRequest.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/artifacts/repositories/AuthenticationSupportedInternal.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/credentials/DefaultAwsCredentials.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/exceptions/AbstractMultiCauseException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/html/SimpleHtmlWriter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/invocation/BuildAction.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/invocation/BuildActionRunner.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/invocation/BuildController.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/operations/logging/BuildOperationLogInfo.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/operations/logging/BuildOperationLogger.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/operations/logging/BuildOperationLoggerFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/operations/logging/DefaultBuildOperationLogger.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/operations/logging/DefaultBuildOperationLoggerFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/resource/local/GroupedAndNamedUniqueFileStore.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/resource/local/PathKeyFileStore.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/resource/local/PathNormalisingKeyFileStore.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/resource/local/UniquePathKeyFileStore.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/CharSequenceNotationConverter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/ClosureToSpecNotationConverter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/ClosureToSpecNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/CompositeNotationConverter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/JustReturningConverter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/JustReturningParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/MapNotationConverter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/MapNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/NotationConvertResult.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/NotationConverter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/NotationConverterToNotationParserAdapter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/TypeFilteringNotationConverter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/TypedNotationConverter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/TypedNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/xml/SimpleMarkupWriter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/xml/SimpleXmlWriter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/xml/XmlTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/xml/XmlValidation.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/listener/BroadcastDispatch.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/listener/ContextClassLoaderProxy.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/listener/DefaultListenerManager.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/listener/LazyCreationProxy.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/listener/ListenerNotificationException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/ConsoleOutput.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/logback/LogLevelConverter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/logback/LogbackLoggingConfigurer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/slf4j/OutputEventListenerBackedLogger.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/slf4j/OutputEventListenerBackedLoggerContext.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/slf4j/Slf4jLoggingConfigurer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/ModelFinalizer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/ModelPath.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/ModelRule.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/ModelRules.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/collection/internal/BridgedCollections.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/collection/internal/DomainObjectContainerModelProjection.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/collection/internal/DynamicTypesDomainObjectContainerModelProjection.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/collection/internal/StaticTypeDomainObjectContainerModelProjection.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/dsl/ModelDsl.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/dsl/internal/GroovyModelDsl.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/DefaultInputs.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/DefaultModelRegistry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/Inputs.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/ModelCreationListener.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/ModelCreator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/ModelMutation.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/ModelMutator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/ModelRegistry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/ModelRegistryBackedModelRules.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/persist/AlwaysNewModelRegistryStore.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/persist/ModelRegistryStore.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/persist/ReusingModelRegistryStore.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/rules/ReflectiveRule.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/PluginHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/DefaultPluginHandler.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/InvalidPluginIdException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/NonPluggableTargetPluginHandler.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginId.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginRequestApplicator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolutionApplicator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolverFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolvers.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/ClassPathPluginResolution.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/CompositePluginResolver.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/DefaultPluginRequest.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/DependencyResolvingClasspathProvider.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/InvalidPluginRequestException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterPluginMapper.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterRepositoryConfigurer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/ModuleMappingPluginResolver.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/NotInPluginRegistryPluginResolverCheck.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRegistryPluginResolver.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRequest.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRequestSerializer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginResolution.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginResolver.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/SimplePluginResolution.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/PluginDependenciesSpec.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/PluginDependencySpec.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/DefaultPluginRequest.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/DefaultPluginRequests.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/InvalidPluginRequestException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequest.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequestApplicator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequestCollector.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequests.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequestsSerializer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginUseScriptBlockMetadataExtractor.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/package-info.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/DefaultExecActionFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/launcher/BootstrapClassLoaderWorker.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/launcher/IsolatedGradleWorkerMain.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/reporting/HtmlPageBuilder.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/reporting/HtmlReportBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/reporting/TextReportRenderer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/GradleVersion.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/Jvm.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/TextUtil.java
 create mode 100644 subprojects/core/src/main/groovy/org/slf4j/impl/StaticLoggerBinder.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/file/MicroBenchmarkPerformanceTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/AbstractTaskSpec.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/AbstractTaskTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/PackageScopedClass.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/TestJavaObject.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/TypedDomainObjectContainerWrapperTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/ExcludeRuleNotationConverterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/ExcludeRuleNotationParserTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractModuleDependencyTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/ClientModuleDependencySpec.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultClientModuleTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultExternalModuleDependencySpec.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultExternalModuleDependencyTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/repositories/ArtifactRepositoryChangingNameAfterContainerInclusionDeprecationTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/rules/TaskUpToDateStateTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/InputPropertiesSerializerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/coerce/StringToEnumTransformerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/coerce/TypeCoercingMethodArgumentsTransformerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/component/DefaultComponentTypeRegistryTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/BasicFileResolverTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/FileOrUriNotationConverterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/FileOrUriNotationParserTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/RelativeFileTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DefaultCopySpecResolutionTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionDecoratorTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionExecutorTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/PathNotationConverterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/PathNotationParserTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/filestore/PathKeyFileStoreTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/filestore/PathNormalisingKeyFileStoreTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/filestore/UniquePathKeyFileStoreTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/html/SimpleHtmlWriterTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/ClassLoaderIdsTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/ClassLoaderScopeIdentifierTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderCacheTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/TestClass1.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/TestClass2.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/loadercache/DefaultClassLoaderCacheTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/loadercache/DummyClassLoaderCache.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/loadercache/HashClassPathSnapshotterTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginContainerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginContainerTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginManagerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/RuleSourceApplicationTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/DeferredProjectConfigurationTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/TestAntTask.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/TestPlugin2.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/TestRuleSource.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/resource/CachingResourceTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/resource/StringResourceTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/resource/UriResourceTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/resources/AbstractTextResourceTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/resources/CharSourceBackedTextResourceTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/resources/FileCollectionBackedTarArchiveTextResourceTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/resources/FileCollectionBackedTextResourceTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/resources/FileCollectionBackedZipArchiveTextResourceTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/resources/StringBackedTextResourceTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/PublicTaskSpecificationTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/TaskMutatorTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/xml/SimpleXmlWriterSpec.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/xml/XmlTransformerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/tasks/DirectoryTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/DefaultPersistentDirectoryStoreConcurrencyTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/DefaultImportsReaderTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/ImportsReaderTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/ImportsScriptSourceTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/project/ProjectDependencies2TaskResolverTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/execution/ProjectEvaluatingActionTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/execution/TaskNameResolvingBuildConfigurationActionSpec.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/execution/TaskNameResolvingBuildConfigurationActionTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/execution/TaskSelectorTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/execution/taskgraph/DefaultTaskExecutionPlanParallelTaskHandlingTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/execution/taskgraph/DefaultTaskGraphExecuterSpec.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/groovy/scripts/internal/BuildScriptTransformerSpec.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/DefaultBuildCancellationTokenSpec.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/DefaultCommandLineConverterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/DefaultCommandLineConverterTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/ProjectPathProjectSpecTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/PropertiesLoadingSettingsProcessorTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/exceptions/AbstractMultiCauseExceptionTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/html/SimpleHtmlWriterTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/operations/logging/DefaultBuildOperationLoggerFactoryTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/operations/logging/DefaultBuildOperationLoggerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/resource/local/PathKeyFileStoreTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/resource/local/PathNormalisingKeyFileStoreTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/resource/local/UniquePathKeyFileStoreTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/CharSequenceNotationConverterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/CharSequenceNotationParserTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/ClosureToSpecNotationConverterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/ClosureToSpecNotationParserTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/MapNotationConverterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/MapNotationParserTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/NotationConverterToNotationParserAdapterTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/TypeFilteringNotationConverterTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/TypedNotationConverterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/TypedNotationParserTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/xml/SimpleXmlWriterSpec.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/xml/XmlTransformerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/xml/XmlValidationTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/listener/DefaultListenerManagerTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/listener/LazyCreationProxyTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/listener/ListenerBroadcastTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/ConfigureLogging.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/TestAppender.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/logback/LogbackLoggingConfigurerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/slf4j/OutputEventListenerBackedLoggerContextTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/slf4j/OutputEventListenerBackedLoggerDefaultConfigurationTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/slf4j/OutputEventListenerBackedLoggerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/slf4j/Slf4jLoggingConfigurerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/model/dsl/internal/GroovyModelDslTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/model/internal/ModelRegistryBackedModelRulesTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/plugin/bintray/JCenterPluginMapperSpec.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/plugin/internal/DefaultPluginHandlerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/plugin/internal/PluginIdTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/plugin/use/internal/PluginRequestCollectorTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/plugin/use/internal/PluginRequestsSerializerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/process/internal/TestApp.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/reporting/TextReportRendererTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/util/GradleVersionTest.groovy
 rename subprojects/core/src/test/resources/META-INF/gradle-plugins/{custom-plugin.properties => org.gradle.custom-plugin.properties} (100%)
 create mode 100644 subprojects/core/src/test/resources/META-INF/gradle-plugins/org.gradle.custom-rule-source.properties
 mode change 100644 => 100755 subprojects/core/src/test/resources/org/gradle/api/file/symlinks/symlink
 create mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/logging/ConfigureLogging.groovy
 create mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/logging/TestOutputEventListener.groovy
 delete mode 100644 subprojects/cpp/cpp.gradle
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/ide/visualstudio/VisualStudioFileCustomizationIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/ide/visualstudio/VisualStudioMultiProjectIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/ide/visualstudio/VisualStudioSingleProjectIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/ide/visualstudio/plugins/VisualStudioPluginIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/CppAutoTestedSamplesIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerPluginIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/c/plugins/CPluginIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIncrementalBuildIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIncrementalCompileIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AssemblyLanguageIncrementalBuildIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AssemblyLanguageIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/BinaryBuildTypesIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/BinaryFlavorsIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/BinaryPlatformIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CCallingMixedCAndCppLanguageIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CLanguageIncrementalBuildIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CLanguageIncrementalCompileIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CLanguageIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppBinariesIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppCallingCLanguageIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppLanguageIncrementalBuildIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppLanguageIncrementalCompileIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppLanguageIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppPluginGoodBehaviourTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/DuplicateBaseNamesIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GccToolChainCustomisationIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GccToolChainDiscoveryIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GeneratedSourcesIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryApiDependenciesIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryBinariesIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryDependenciesIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/MixedLanguageIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/MultipleToolChainIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeBinariesPluginIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeSamplesIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/PrebuiltLibrariesIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/SharedLibrarySoNameIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/SourceSetDependenciesIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/ToolChainDiscoveryIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesIncrementalBuildIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesUnsupportedIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/fixtures/AbstractInstalledToolChainIntegrationSpec.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/fixtures/SingleToolChainTestRunner.java
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppPluginIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/MixedObjectiveCIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/ObjectiveCLanguageIncrementalBuildIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/ObjectiveCLanguageIncrementalCompileIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/ObjectiveCLanguageIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/ObjectiveCUnsupportedIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCPluginIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivecpp/ObjectiveCppLanguageIncrementalBuildIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivecpp/ObjectiveCppLanguageIncrementalCompileIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivecpp/ObjectiveCppLanguageIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivecpp/ObjectiveCppUnsupportedIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppPluginIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesPluginIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPluginIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/test/cunit/plugins/CUnitPluginIntegrationTest.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/model/CprojectDescriptor.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/model/CprojectSettings.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/model/ProjectDescriptor.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioExtension.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioProject.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioSolution.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioExtension.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioProject.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioSolution.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/ExecutableVisualStudioProjectConfiguration.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfiguration.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapper.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistry.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectResolver.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/rules/CreateVisualStudioModel.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/rules/CreateVisualStudioTasks.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/plugins/VisualStudioPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioFiltersFile.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioProjectFile.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/DependentSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/HeaderExportingSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/assembler/AssemblerSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/assembler/internal/DefaultAssemblerSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/assembler/plugins/AssemblerLangPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/c/CSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/c/internal/DefaultCSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/c/plugins/CLangPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/cpp/CppSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/cpp/internal/DefaultCppSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/cpp/plugins/CppLangPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/internal/AbstractHeaderExportingDependentSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/internal/AbstractHeaderExportingSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/internal/ConfigurationBasedNativeDependencySet.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivec/ObjectiveCSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivec/internal/DefaultObjectiveCSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivec/plugins/ObjectiveCLangPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivecpp/ObjectiveCppSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivecpp/internal/DefaultObjectiveCppSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivecpp/plugins/ObjectiveCppLangPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/rc/WindowsResourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/rc/internal/DefaultWindowsResourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/rc/plugins/WindowsResourceScriptPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/BuildType.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/BuildTypeContainer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Executable.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ExecutableBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ExecutableContainer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Flavor.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/FlavorContainer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Library.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/LibraryBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/LibraryContainer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeBinaryTasks.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeDependencySet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeLibraryRequirement.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/PrebuiltLibraries.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/PrebuiltLibrary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ProjectNativeBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ProjectNativeComponent.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Repositories.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/SharedLibraryBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/StaticLibraryBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/TargetedNativeComponent.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Tool.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractBinaryToolSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectLibraryBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeComponent.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractTargetedProjectNativeComponent.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/BinaryToolSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultBuildType.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultBuildTypeContainer.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultExecutable.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultExecutableContainer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultFlavor.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultFlavorContainer.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultLibrary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultLibraryContainer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultLinkerSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultNativeBinaryTasks.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultStaticLibraryArchiverSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultTool.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/LibraryBinaryInternal.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/LinkerSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeBinaryServices.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeProjectComponentIdentifier.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectExecutableBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeBinaryInternal.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeComponentInternal.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeLibraryRequirement.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectSharedLibraryBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectStaticLibraryBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/SharedLibraryLinkerSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/SourceSetNotationParser.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/StaticLibraryArchiverSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/StaticLibraryBinaryInternal.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/TargetedNativeComponentInternal.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ApplySourceSetConventions.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ConfigureGeneratedSourceSets.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/CreateDefaultBuildTypes.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/CreateDefaultFlavors.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/CreateDefaultPlatform.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/CreateNativeBinaries.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeBinariesFactory.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/NativeBinariesFactory.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeBinaryInitializer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeComponentInitializer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/RepositoriesFactory.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/AbstractPrebuiltLibraryBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/DefaultPrebuiltLibraries.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/DefaultPrebuiltLibrary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/DefaultPrebuiltSharedLibraryBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/DefaultPrebuiltStaticLibraryBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/PrebuiltLibraryBinaryLocator.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/PrebuiltLibraryInitializer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/PrebuiltLibraryResolveException.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/ApiRequirementNativeDependencyResolver.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/ChainedLibraryBinaryLocator.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultLibraryResolver.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultNativeDependencySet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultProjectLocator.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/InputHandlingNativeDependencyResolver.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/LibraryBinaryLocator.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/LibraryNativeDependencyResolver.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/LibraryResolveException.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeBinaryRequirementResolveResult.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeBinaryResolveResult.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyNotationParser.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyResolver.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyResolverServices.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLibraryBinaryLocator.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLocator.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/RequirementParsingNativeDependencyResolver.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/SourceSetNativeDependencyResolver.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/PreprocessingTool.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/internal/AssembleSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/internal/DefaultAssembleSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerNativeBinariesPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/tasks/Assemble.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/CCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/DefaultCCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/AbstractIncrementalNativeCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CleanCompilingNativeCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CompilationFileState.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CompilationState.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CompilationStateSerializer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultIncrementalCompilation.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludes.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludesParser.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludesResolver.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompilation.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompileProcessor.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompilerBuilder.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalNativeCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/ResolvedInclude.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/SourceIncludes.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/SourceIncludesParser.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/SourceIncludesResolver.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/CSourceParser.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/PreprocessingReader.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/RegexBackedCSourceParser.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/plugins/CNativeBinariesPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/plugins/CPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/tasks/AbstractNativeCompileTask.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/tasks/CCompile.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/internal/CppCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/internal/DefaultCppCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppNativeBinariesPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/plugins/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/tasks/CppCompile.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/tasks/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/internal/AbstractNativeCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/internal/DefaultPreprocessingTool.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/internal/DefaultObjectiveCCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/internal/ObjectiveCCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCNativeBinariesPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/plugins/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/tasks/ObjectiveCCompile.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/tasks/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/internal/DefaultObjectiveCppCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/internal/ObjectiveCppCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppNativeBinariesPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/tasks/ObjectiveCppCompile.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/tasks/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/internal/DefaultWindowsResourceCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/internal/WindowsResourceCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesNativeBinariesPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/tasks/WindowsResourceCompile.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/Architecture.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/OperatingSystem.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/Platform.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/PlatformContainer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/ArchitectureInternal.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/ArchitectureNotationParser.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/DefaultArchitecture.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/DefaultOperatingSystem.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/DefaultPlatform.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/DefaultPlatformContainer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/OperatingSystemNotationParser.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/PlatformInternal.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeBinariesModelPlugin.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/AbstractLinkTask.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/BuildBinaryTask.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/CreateStaticLibrary.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/InstallExecutable.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/LinkExecutable.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/LinkSharedLibrary.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/ProjectComponentTestSuite.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuite.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuiteContainer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuiteExecutableBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/CUnitTestSuite.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/ConfigureCUnitTestSources.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/CreateCUnitBinaries.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/DefaultCUnitTestSuite.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/plugins/CUnitPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/plugins/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/tasks/GenerateCUnitLauncher.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/tasks/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultTestSuiteContainer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultTestSuiteExecutableBinary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/plugins/NativeBinariesTestPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/plugins/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/tasks/RunTestExecutable.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/tasks/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/Clang.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/Gcc.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/GccTool.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/PlatformConfigurableToolChain.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/TargetPlatformConfiguration.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/ToolChain.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/ToolChainRegistry.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/VisualCpp.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/AbstractToolChain.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ArgsTransformer.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/CommandLineTool.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/CompileSpecToArgsTransformerChain.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultToolChainRegistry.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/MacroArgsConverter.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/NativeCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/OptionsFileArgsTransformer.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/OutputCleaningCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/PlatformToolChain.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/SingleSourceCompileArgTransformer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolChainAvailability.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolChainInternal.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolChainRegistryInternal.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolSearchResult.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolType.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/UnavailablePlatformToolChain.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/clang/ClangToolChain.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AbstractGccCompatibleToolChain.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ArStaticLibraryArchiver.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/Assembler.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CommandLineToolSearchResult.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CppCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccCompilerArgsTransformer.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccLinker.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccOptionsFileArgTransformer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccPlatformToolChain.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolChain.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolSearchPath.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/NativeCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ObjectiveCCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ObjectiveCppCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/PostTransformActionArgsTransformer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ShortCircuitArgsTransformer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/version/GccVersionDeterminer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/version/GccVersionResult.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/Assembler.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/CCompiler.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/CppCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/DefaultVisualStudioLocator.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/DefaultWindowsSdkLocator.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/EscapeUserArgs.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/InstallationSearchResult.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/LibExeStaticLibraryArchiver.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/LinkExeLinker.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/NativeCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppCompilerArgsTransformer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppInstall.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppToolChain.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualStudioInstall.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualStudioLocator.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/WindowsResourceCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/WindowsSdk.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/WindowsSdkLocator.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/plugins/StandardToolChainsPlugin.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultTool.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultToolRegistry.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/GccToolInternal.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/PlatformGccTool.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/PlatformToolRegistry.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/ToolRegistry.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/ToolSearchPath.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/ClangCompilerPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/GccCompilerPlugin.groovy
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/MicrosoftVisualCppPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/package-info.java
 delete mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/assembler.properties
 delete mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/c.properties
 delete mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/cpp.properties
 delete mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/cunit.properties
 delete mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/native-binaries.properties
 delete mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/objective-c.properties
 delete mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/objective-cpp.properties
 delete mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/windows-resources.properties
 delete mode 100644 subprojects/cpp/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/cdt/model/CprojectSettingsSpec.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioProjectTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfigurationTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapperTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistryTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioFiltersFileTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioProjectFileTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioSolutionFileTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/language/assembler/plugins/AssemblerLangPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/language/c/plugins/CLangPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/language/cpp/plugins/CppLangPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultBuildTypeTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultExecutableBinaryTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultExecutableTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultFlavorTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultLibraryTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeBinaryTasksTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeComponentTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectNativeBinaryTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectSharedLibraryBinaryTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectStaticLibraryBinaryTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/SourceSetNotationParserTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/CreateDefaultBuildTypesTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/CreateDefaultFlavorsTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/CreateDefaultPlatformTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeBinariesFactoryTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeBinaryInitializerTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeComponentInitializerTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/prebuilt/DefaultPrebuiltSharedLibraryBinaryTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/prebuilt/DefaultPrebuiltStaticLibraryBinaryTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyNotationParserTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLibraryBinaryLocatorTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/AbstractNativeBinariesPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerNativeBinariesPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/tasks/AssemblerTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CleanCompilingNativeCompilerTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CompilationStateSerializerTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludesParserTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludesResolverTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompileProcessorTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalNativeCompilerTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/PreprocessingReaderTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/RegexBackedCSourceParserTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/plugins/CNativeBinariesPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/tasks/CCompileTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/fixtures/binaryinfo/ReadelfBinaryInfoTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/internal/DefaultCppSourceSetTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppNativeBinariesPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/tasks/CppCompileTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCNativeBinariesPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppNativeBinariesPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/platform/internal/ArchitectureNotationParserTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/platform/internal/DefaultArchitectureTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/platform/internal/DefaultOperatingSystemTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/platform/internal/DefaultPlatformTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/platform/internal/OperatingSystemNotationParserTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeBinariesModelPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultToolChainRegistryTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/OutputCleaningCompilerTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/ToolChainAvailabilityTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/UnavailablePlatformToolChainTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AbstractGccCompatibleToolChainTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AssemblerTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CCompilerTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ClangToolChainTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccLinkerTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolChainTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ShortCircuitArgsTransformerTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/version/GccVersionDeterminerTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/DefaultVisualStudioLocatorTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/DefaultWindowsSdkLocatorTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppToolChainTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/tools/ToolSearchPathTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/plugins/ClangCompilerPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/plugins/GccCompilerPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/plugins/MicrosoftVisualCppPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/plugins/ToolchainPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/ide/visualstudio/fixtures/ProjectFile.groovy
 delete mode 100755 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/AvailableToolChains.java
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/ExecutableFixture.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/NativeBinaryFixture.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/NativeInstallationFixture.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/RequiresInstalledToolChain.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/RequiresInstalledToolChainExtension.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/SharedLibraryFixture.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/StaticLibraryFixture.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/ToolChainRequirement.java
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CCallingMixedCAndCppHelloWorldApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CCompilerDetectingTestApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CHelloWorldApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CppCallingCHelloWorldApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CppCompilerDetectingTestApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CppHelloWorldApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateAssemblerBaseNamesTestApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateCBaseNamesTestApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateCppBaseNamesTestApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateMixedSameBaseNamesTestApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateObjectiveCBaseNamesTestApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateObjectiveCppBaseNamesTestApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateWindowsResourcesBaseNamesTestApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ExeWithDiamondDependencyHelloWorldApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ExeWithLibraryUsingLibraryHelloWorldApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/HelloWorldApp.java
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/IncrementalHelloWorldApp.java
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/MixedLanguageHelloWorldApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/MixedObjectiveCHelloWorldApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ObjectiveCHelloWorldApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ObjectiveCppHelloWorldApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/PlatformDetectingTestApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/SourceFile.java
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/TestApp.java
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/TestComponent.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/WindowsResourceHelloWorldApp.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/binaryinfo/BinaryInfo.java
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/binaryinfo/DumpbinBinaryInfo.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/binaryinfo/OtoolBinaryInfo.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/binaryinfo/ReadelfBinaryInfo.groovy
 delete mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/test/cunit/CUnitTestResults.groovy
 create mode 100644 subprojects/dependency-management/dependency-management.gradle
 rename subprojects/{core-impl => dependency-management}/src/integTest/groovy/org/gradle/integtests/resolve/ArtifactDeclarationIntegrationTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/CacheResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ClientModuleDependenciesResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesChangingModulesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesErrorHandlingIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesStatusIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ComponentReplacementIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/CredentialsDslIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/DependencyExcludeResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/DependencyNotationIntegrationSpec.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/DependencyResolutionEventsIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/DependencyResolveRulesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/DependencySubstitutionRulesIntegrationTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/integTest/groovy/org/gradle/integtests/resolve/DetachedConfigurationsIntegrationTest.groovy (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/groovy/org/gradle/integtests/resolve/ExtendingConfigurationsIntegrationTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/FlatDirJvmLibraryArtifactResolutionIntegrationTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/integTest/groovy/org/gradle/integtests/resolve/FlatDirResolveIntegrationTest.groovy (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/groovy/org/gradle/integtests/resolve/ForcedModulesIntegrationTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/JvmLibraryArtifactResolveTestFixture.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/MetadataArtifactResolveTestFixture.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ProjectDependenciesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ProjectDependencyResolveIntegrationTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/integTest/groovy/org/gradle/integtests/resolve/ResolutionResultApiIntegrationTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ResolutionStrategySamplesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ResolveCrossVersionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ResolveTestFixture.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ResolvedConfigurationIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ScriptDependencyResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/UnsupportedConfigurationMutationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/VersionConflictResolutionIntegrationTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/AbstractCacheReuseCrossVersionIntegrationTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/AliasedArtifactResolutionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/CacheReuseCrossVersionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/M3CacheReuseCrossVersionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/MavenM2CacheReuseIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/ResolutionOverrideIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/SameCacheUsageCrossVersionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedChangingModulesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedDependencyResolutionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedMissingModulesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachingDependencyMetadataInMemoryIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/caching/RecoverFromBrokenResolutionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/http/AbstractHttpsRepoResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpAuthenticationDependencyResolutionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpEncodingDependencyResolutionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpProxyResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpRedirectResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/AbstractComponentSelectionRulesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/AbstractIvyDescriptorExcludeResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/ComponentSelectionRulesDependencyResolveIntegTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/ComponentSelectionRulesErrorHandlingIntegTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/ComponentSelectionRulesProcessingIntegTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyBrokenDescriptorIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyBrokenRemoteResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyChangingModuleRemoteResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesChangingModulesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesStatusIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyCustomStatusLatestVersionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorDependencyExcludeResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorModuleExcludeResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorValidationIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDynamicRevisionRemoteResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDynamicRevisionResolveIntegrationTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyFileRepoResolveIntegrationTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyHttpRepoResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyHttpsRepoResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyJvmLibraryArtifactResolutionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyModuleArtifactResolutionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyModuleResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/BadPomFileResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenBrokenRemoteResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesChangingModulesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesStatusIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenCustomPackagingResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenDependencyResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenDynamicResolveIntegrationTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenFileRepoResolveIntegrationTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenHttpRepoResolveIntegrationTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenHttpsRepoResolveIntegrationTest.groovy (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenJcenterDependencyResolveIntegrationTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenJvmLibraryArtifactResolutionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenLatestResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenLocalRepoResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenModuleArtifactResolutionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenParentPomResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomExcludeResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomPackagingResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenProfileResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenSnapshotResolveIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/support/RepositoryDslSupport.groovy
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/canHaveConfigurationHierarchy/projectA-1.2-ivy.xml (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/canHaveConfigurationHierarchy/projectB-1.5-ivy.xml (100%)
 create mode 100644 subprojects/dependency-management/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/canHaveConfigurationHierarchy/projectWithConfigurationHierarchy.gradle
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/canHaveCycleInDependencyGraph/projectA-1.2-ivy.xml (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/canHaveCycleInDependencyGraph/projectB-1.5-ivy.xml (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/canHaveCycleInDependencyGraph/projectWithCyclesInDependencyGraph.gradle (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/canNestModules/projectWithNestedModules.gradle (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/canUseDynamicVersions/projectA-1.2-ivy.xml (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/canUseDynamicVersions/projectB-1.5-ivy.xml (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/canUseDynamicVersions/projectWithDynamicVersions.gradle (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/dependencyReportWithConflicts/projectA-1.2-ivy.xml (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/dependencyReportWithConflicts/projectA-2.0-ivy.xml (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/dependencyReportWithConflicts/projectB-1.5-ivy.xml (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/dependencyReportWithConflicts/projectB-2.1.5-ivy.xml (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/dependencyReportWithConflicts/projectWithConflicts.gradle (100%)
 rename subprojects/{core-impl => dependency-management}/src/integTest/resources/org/gradle/integtests/resolve/ArtifactDependenciesIntegrationTest/dependencyReportWithConflicts/settings.gradle (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ArtifactDependencyResolver.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ArtifactPublicationServices.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ArtifactPublisher.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ComponentMetadataProcessor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ComponentModuleMetadataProcessor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ComponentSelectionInternal.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ComponentSelectionRulesInternal.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ConfigurationResolver.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultArtifactIdentifier.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultComponentSelection.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/DefaultDependencyFactory.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultDependencyManagementServices.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultGlobalDependencyResolutionRules.java
 create mode 100755 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultModuleIdentifier.java
 create mode 100755 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultModuleVersionIdentifier.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/DefaultModuleVersionSelector.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/DefaultProjectDependencyFactory.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultResolvedArtifact.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/DefaultResolvedDependency.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DependencyManagementBuildScopeServices.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DependencyManagementGlobalScopeServices.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DependencyServices.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/GlobalDependencyResolutionRules.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ModuleVersionIdentifierSerializer.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ModuleVersionPublisher.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ModuleVersionSelectorSerializer.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ResolvedConfigurationIdentifier.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ResolvedConfigurationIdentifierSerializer.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ResolverResults.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/component/ComponentIdentifierFactory.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/component/DefaultComponentIdentifierFactory.java
 rename subprojects/{core/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/configurations/ConfigurationContainerInternal.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/configurations/ConfigurationInternal.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/configurations/Configurations.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/configurations/ConfigurationsProvider.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/configurations/DefaultConfiguration.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationContainer.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/configurations/DetachedConfigurationsProvider.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/configurations/MutationValidator.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/configurations/ResolutionStrategyInternal.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/configurations/RunnableMutationValidator.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/configurations/TasksFromDependentProjects.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/configurations/TasksFromProjectDependencies.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/dsl/ArtifactFile.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/dsl/ComponentModuleMetadataContainer.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/dsl/ComponentSelectorParsers.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/dsl/DefaultArtifactHandler.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandler.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/dsl/DefaultComponentModuleMetadataHandler.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/dsl/ModuleReplacementsData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/dsl/ModuleVersionSelectorParsers.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/dsl/ParsedModuleStringNotation.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/dsl/PublishArtifactNotationParserFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/AbstractDependencySubstitution.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/ArtifactCacheMetaData.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/CacheLayout.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/CacheLockingArtifactDependencyResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/CacheLockingManager.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ContextualArtifactResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/DefaultCacheLockingManager.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/DefaultConfigurationResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/DefaultDependencyResolveDetails.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyContextManager.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyDependencyPublisher.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyExtraInfo.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyModuleDescriptor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/DefaultLenientConfiguration.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/DefaultModuleDependencySubstitution.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/DefaultProjectDependencySubstitution.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/DefaultResolvedConfiguration.java (100%)
 create mode 100755 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/DefaultUnresolvedDependency.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/DependencySubstitutionResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ErrorHandlingArtifactDependencyResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/IvyBackedArtifactPublisher.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/IvyContextManager.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/IvyDependencyPublisher.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/IvyLoggingAdaper.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/IvyModuleDescriptorWriter.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/IvyUtil.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/IvyXmlModuleDescriptorWriter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/LocalComponentFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/NamespaceId.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/SelfResolvingDependencyResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ShortcircuitEmptyConfigsArtifactDependencyResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/clientmodule/ClientModuleResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/DefaultCachedModuleVersionList.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/DefaultResolvedModuleVersion.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/ModuleVersionsCache.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/ModuleVersionsCacheEntry.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/SingleFileBackedModuleVersionsCache.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BaseModuleComponentRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BaseModuleComponentRepositoryAccess.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CacheLockReleasingModuleComponentsRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleComponentRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ComponentMetaDataResolveState.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ComponentSelectionRulesProcessor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ConfiguredModuleComponentRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultVersionedComponentChooser.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DependencyResolverIdentifier.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DynamicVersionResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingModuleComponentRepository.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyContextualiser.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleComponentRepositoryAccess.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalModuleComponentRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/MetadataProvider.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepositoryAccess.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentResolveState.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NoRepositoriesResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChain.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainAdapter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainArtifactResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainModuleResolution.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainModuleSource.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ResolveIvyFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/StartParameterResolutionOverride.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/UserResolverChain.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/VersionInfo.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/Versioned.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/VersionedComponentChooser.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedModuleVersionResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryArtifactsCache.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCacheStats.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedModuleComponentRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedRepositoryFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryMetaDataCache.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryModuleComponentRepositoryCaches.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractModuleDescriptorParser.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/BuildableIvyArtifact.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DescriptorParseContext.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedDescriptorParseContext.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParser.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DownloadedIvyModuleDescriptorParser.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorBuilder.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParser.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParseException.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParser.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomDomParser.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomParent.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReader.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/RootPomParent.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/UnresolvedDependencyVersionException.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/data/MavenDependencyKey.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/data/PomDependencyMgt.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/data/PomProfile.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/AbstractVersionSelector.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/DefaultVersionComparator.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/DefaultVersionSelectorScheme.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ExactVersionSelector.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/LatestVersionSelector.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/MavenVersionSelectorScheme.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ResolverStrategy.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/StaticVersionComparator.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/SubVersionSelector.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/Version.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/VersionComparator.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/VersionParser.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/VersionRangeSelector.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/VersionSelector.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/VersionSelectorScheme.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/CachedModuleDescriptorParseContext.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultCachedMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleArtifactsCache.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleMetaDataCache.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/IvyModuleCacheEntry.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/MavenModuleCacheEntry.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/MissingModuleCacheEntry.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleArtifactsCache.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorCacheEntry.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorCacheEntrySerializer.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorStore.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleMetaDataCache.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ConfigurationsToArtifactsConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ConfigurationsToModuleDescriptorConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToArtifactsConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToModuleDescriptorConverter.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultExcludeRuleConverter.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ExcludeRuleConverter.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ResolveLocalComponentFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/AbstractIvyDependencyDescriptorFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependencyDescriptorFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DependenciesToModuleDescriptorConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DependencyDescriptorFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ExternalModuleIvyDependencyDescriptorFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/IvyDependencyDescriptorFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ProjectIvyDependencyDescriptorFactory.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ReflectiveDependencyDescriptorFactory.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/projectmodule/DefaultProjectComponentRegistry.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/projectmodule/DefaultProjectPublication.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/projectmodule/DefaultProjectPublicationRegistry.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectArtifactResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectComponentRegistry.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectDependencyResolver.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectPublication.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectPublicationRegistry.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultCachePolicy.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultComponentSelectionRules.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultDependencySubstitutions.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultExternalResourceCachePolicy.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultResolutionStrategy.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DependencySubstitutionsInternal.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/ExternalResourceCachePolicy.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/LatestConflictResolution.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/ModuleForcingResolveRule.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/StrictConflictResolution.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ComponentResolutionState.java
 create mode 100755 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DefaultDependencyResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DefaultDependencyToConfigurationResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DefaultModuleResolutionFilter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyToConfigurationResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/LatestModuleConflictResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleConflictResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleResolutionFilter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/StrictConflictResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/VersionSelectionReasonResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/CompositeDependencyGraphVisitor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/DependencyGraphBuilder.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/DependencyGraphVisitor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/ResolutionResultDependencyGraphVisitor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/ResolvedConfigurationDependencyGraphVisitor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/ResolvedProjectConfigurationResultGraphVisitor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/conflicts/CandidateModule.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/conflicts/CompositeConflictResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/conflicts/ConflictContainer.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/conflicts/ConflictHandler.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/conflicts/ConflictResolutionResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/conflicts/DefaultConflictHandler.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/conflicts/DefaultConflictResolutionResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/conflicts/PotentialConflict.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/conflicts/PotentialConflictFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultResolvedConfigurationBuilder.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultTransientConfigurationResults.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/ResolvedConfigurationBuilder.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/ResolvedConfigurationResults.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/ResolvedContentsMapping.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResults.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResultsBuilder.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/projectresult/DefaultResolvedProjectConfigurationResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/projectresult/DefaultResolvedProjectConfigurationResultBuilder.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/projectresult/DefaultResolvedProjectConfigurationResults.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/projectresult/ResolvedProjectConfigurationResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/projectresult/ResolvedProjectConfigurationResultBuilder.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/projectresult/ResolvedProjectConfigurationResults.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/CachingDependencyResultFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentIdentifierSerializer.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentSelectionReasonSerializer.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentSelectorSerializer.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultInternalDependencyResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultModuleVersionSelection.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultResolutionResultBuilder.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/InternalDependencyResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/InternalDependencyResultSerializer.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ModuleVersionSelection.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ModuleVersionSelectionSerializer.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ResolutionResultBuilder.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/StreamingResolutionResultBuilder.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/VersionSelectionReasons.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/CachedStoreFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/DefaultBinaryStore.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/ResolutionResultsStoreFactory.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/StoreSet.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/metadata/ModuleVersionArtifactIdentifierSerializer.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/mvnsettings/CannotLocateLocalMavenRepositoryException.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/mvnsettings/DefaultLocalMavenRepositoryLocator.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/mvnsettings/DefaultMavenFileLocations.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/mvnsettings/DefaultMavenSettingsProvider.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/mvnsettings/LocalMavenRepositoryLocator.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/mvnsettings/MavenFileLocations.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/mvnsettings/MavenSettingsProvider.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/query/DefaultArtifactResolutionQuery.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/query/DefaultArtifactResolutionQueryFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/AbstractArtifactRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/AbstractAuthenticationSupportedRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/DefaultFlatDirArtifactRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/DefaultIvyArtifactRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/DefaultMavenArtifactRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalArtifactRepository.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/repositories/DefaultPasswordCredentials.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/repositories/PublicationAwareRepository.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/ResolutionAwareRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/layout/AbstractRepositoryLayout.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/layout/DefaultIvyPatternRepositoryLayout.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/layout/GradleRepositoryLayout.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/layout/IvyRepositoryLayout.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/layout/MavenRepositoryLayout.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/repositories/layout/ResolvedPattern.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/AbstractResourcePattern.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/ChainedVersionLister.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/ComponentMetadataDetailsAdapter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/DefaultExternalResourceArtifactResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceArtifactResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolverDescriptorParseContext.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/IvyResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/IvyResourcePattern.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/M2ResourcePattern.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/MavenLocalResolver.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/repositories/resolver/MavenMetadata.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/MavenMetadataLoader.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/repositories/resolver/MavenPattern.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/MavenResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotComponentIdentifier.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotExternalResourceArtifactResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotModuleSource.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/MavenVersionLister.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/PatternBasedResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/ResourcePattern.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/ResourceVersionLister.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/VersionLister.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/VersionPatternVisitor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransport.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransportFactory.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/result/AbstractDependencyResult.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/result/DefaultArtifactResolutionResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/result/DefaultComponentArtifactsResult.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/result/DefaultResolutionResult.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/result/DefaultResolvedArtifactResult.java
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentResult.java (100%)
 rename subprojects/{core-impl/src/main/groovy => dependency-management/src/main/java}/org/gradle/api/internal/artifacts/result/DefaultResolvedDependencyResult.java (100%)
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/result/DefaultUnresolvedArtifactResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/result/DefaultUnresolvedComponentResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/result/DefaultUnresolvedDependencyResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/result/jvm/AbstractArtifact.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/filestore/ivy/ArtifactIdentifierFileStore.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/notations/ClientModuleNotationParserFactory.java
 create mode 100755 subprojects/dependency-management/src/main/java/org/gradle/api/internal/notations/DependencyClassPathNotationConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/notations/DependencyFilesNotationConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/notations/DependencyMapNotationConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/notations/DependencyNotationParser.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/notations/DependencyProjectNotationConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/notations/DependencyStringNotationConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/notations/ModuleIdentiferNotationConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/notations/ProjectDependencyFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/AbstractModuleComponentResolveMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/BuildableIvyModulePublishMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/BuildableIvyModuleResolveMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModulePublishMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultMavenModuleResolveMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultModuleComponentArtifactIdentifier.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultModuleComponentArtifactMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultModuleComponentIdentifier.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultModuleComponentSelector.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/IvyModuleArtifactPublishMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/IvyModulePublishMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/IvyModuleResolveMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/MavenModuleResolveMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/ModuleComponentArtifactIdentifier.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/ModuleComponentArtifactMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/ModuleComponentResolveMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/MutableModuleComponentResolveMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/DefaultLocalArtifactIdentifier.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/DefaultLocalComponentMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/DefaultProjectComponentIdentifier.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/DefaultProjectComponentSelector.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/DefaultProjectDependencyMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/DslOriginDependencyMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/DslOriginDependencyMetaDataWrapper.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/LocalArtifactMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/LocalComponentMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/MutableLocalComponentMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/OpaqueComponentIdentifier.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/AbstractModuleDescriptorBackedMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/ComponentArtifactIdentifier.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/ComponentArtifactMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/ComponentResolveMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/ComponentUsage.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/ConfigurationMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/DefaultComponentUsage.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/DefaultDependencyMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/DefaultIvyArtifactName.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/DependencyMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/IvyArtifactName.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/ModuleSource.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/ArtifactNotFoundException.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/ArtifactResolveException.java
 create mode 100755 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/ModuleVersionNotFoundException.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/ModuleVersionResolveException.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/resolver/ArtifactResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/resolver/ComponentMetaDataResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/resolver/DependencyToComponentIdResolver.java
 create mode 100755 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/resolver/DependencyToComponentResolver.java
 create mode 100755 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/resolver/ModuleToComponentResolver.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/ArtifactResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/ArtifactSetResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/BuildableArtifactResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/BuildableArtifactSetResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/BuildableComponentIdResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/BuildableComponentResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/BuildableComponentSelectionResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/BuildableModuleComponentMetaDataResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/BuildableModuleVersionListingResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/ComponentIdResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/ComponentResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/DefaultBuildableArtifactResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/DefaultBuildableArtifactSetResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/DefaultBuildableComponentIdResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/DefaultBuildableComponentResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/DefaultBuildableComponentSelectionResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/DefaultBuildableModuleComponentMetaDataResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/DefaultBuildableModuleVersionListingResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/DefaultResourceAwareResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/ResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/ResourceAwareResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/cached/ByUrlCachedExternalResourceIndex.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/cached/CachedArtifact.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/cached/CachedArtifactIndex.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/cached/CachedExternalResource.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/cached/CachedExternalResourceIndex.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/cached/CachedItem.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/cached/DefaultCachedArtifact.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/cached/DefaultCachedExternalResource.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/cached/DefaultCachedExternalResourceIndex.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/cached/ivy/AbstractCachedIndex.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/cached/ivy/ArtifactAtRepositoryCachedArtifactIndex.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/cached/ivy/ArtifactAtRepositoryKey.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/local/ivy/LocallyAvailableResourceFinderFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/local/ivy/PatternBasedLocallyAvailableResourceFinder.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/transfer/AbstractProgressLoggingHandler.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/transfer/CacheAwareExternalResourceAccessor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/transfer/DefaultCacheAwareExternalResourceAccessor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceAccessor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceUploader.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/transfer/ResourceOperation.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/transport/AbstractRepositoryTransport.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/transport/DefaultExternalResourceRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/transport/ExternalResourceRepository.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/transport/ResourceConnectorRepositoryTransport.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/transport/file/FileResourceConnector.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resource/transport/file/FileTransport.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/rules/ClosureBackedRuleAction.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/rules/DefaultRuleActionAdapter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/rules/DefaultRuleActionValidator.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/rules/NoInputsRuleAction.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/rules/RuleAction.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/rules/RuleActionAdapter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/rules/RuleActionValidationException.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/rules/RuleActionValidator.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/rules/RuleSourceBackedRuleAction.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/rules/SpecRuleAction.java
 rename subprojects/{core-impl => dependency-management}/src/main/resources/META-INF/services/org.gradle.api.internal.artifacts.DependencyManagementServices (100%)
 rename subprojects/{core-impl => dependency-management}/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry (100%)
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/DefaultArtifactIdentifierTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/DefaultComponentSelectionTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/DefaultDependencyManagementServicesTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/DefaultModuleIdentifierSpec.groovy (100%)
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/DefaultModuleVersionIdentifierSpec.groovy (100%)
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/DefaultModuleVersionSelectorTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedArtifactTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedDependencySpec.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedDependencyTest.java
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/DependencyManagementBuildScopeServicesTest.groovy (100%)
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/DependencyManagementGlobalScopeServicesTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ModuleVersionSelectorSerializerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ResolvedConfigurationIdentifierSerializerTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/ResolvedConfigurationIdentifierSpec.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ResolverResultsSpec.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/component/DefaultComponentIdentifierFactoryTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/configurations/ConfigurationsTest.java (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationContainerSpec.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationContainerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationSpec.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationTest.java
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromDependentProjectsTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromProjectDependenciesTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/dsl/ArtifactFileTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/dsl/ComponentModuleMetadataContainerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/dsl/ComponentSelectorParsersTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/dsl/DefaultArtifactHandlerTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandlerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/dsl/ModuleVersionSelectorParsersTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/dsl/PublishArtifactNotationConverterFactoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactTypeTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLayoutTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLockingArtifactDependencyResolverTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultCacheLockingManagerTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultDependencyResolveDetailsSpec.groovy
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyContextManagerTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyExtraInfoTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyModuleDescriptorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultModuleDependencySubstitutionTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultProjectDependencySubstitutionTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultUnresolvedDependencySpec.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DependencySubstitutionResolverSpec.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ErrorHandlingArtifactDependencyResolverTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyUtilTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyXmlModuleDescriptorWriterTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/NamespaceIdTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/SelfResolvingDependencyResolverTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ShortcircuitEmptyConfigsArtifactDependencyResolverSpec.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/clientmodule/ClientModuleResolverTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BaseModuleComponentRepositoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleComponentRepositoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ComponentSelectionRulesProcessorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultVersionedComponentChooserTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DependencyResolverIdentifierTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolverTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleComponentRepositoryAccessTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/MetadataProviderTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainAdapterTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainArtifactResolverTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolverTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ResolveIvyFactoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedModuleVersionResultTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryArtifactsCacheTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedModuleComponentRepositoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedRepositoryFactoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryMetaDataCacheTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractGradlePomModuleDescriptorParserTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractPomReaderTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParserTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DownloadedIvyModuleDescriptorParserTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParserProfileTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParserTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParserTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReaderProfileTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReaderTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/data/MavenDependencyKeyTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/AbstractVersionSelectorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/DefaultVersionComparatorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/DefaultVersionSelectorSchemeTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ExactVersionSelectorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/LatestVersionSelectorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/MavenVersionSelectorSchemeTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/SubVersionSelectorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/VersionParserTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/VersionRangeSelectorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorStoreTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToArtifactsConverterTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToModuleDescriptorConverterTest.java
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultExcludeRuleConverterTest.java (100%)
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/IvyConverterTestUtil.java (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ResolveLocalComponentFactoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/AbstractDependencyDescriptorFactoryInternalTest.java
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverterTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependencyDescriptorFactoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ExternalModuleDependencyDescriptorFactoryTest.java
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ProjectDependencyDescriptorFactoryTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ReflectiveDependencyDescriptorFactoryTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectDependencyResolverTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultCachePolicySpec.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultComponentSelectionRulesTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultDependencySubstitutionsSpec.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultResolutionStrategySpec.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/ModuleForcingResolveRuleSpec.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DefaultModuleResolutionFilterTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilderTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/VersionSelectionReasonResolverTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/conflicts/ConflictContainerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/conflicts/DefaultConflictHandlerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/CachingDependencyResultFactoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentIdentifierSerializerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentSelectionReasonSerializerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentSelectorSerializerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultResolutionResultBuilderSpec.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DummyBinaryStore.groovy
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DummyStore.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/InternalDependencyResultSerializerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ModuleVersionSelectionSerializerTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ResolutionResultPrinter.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/StreamingResolutionResultBuilderTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/VersionSelectionReasonsTest.groovy
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/CachedStoreFactoryTest.groovy (100%)
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/DefaultBinaryStoreTest.groovy (100%)
 rename subprojects/{core-impl => dependency-management}/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/ResolutionResultsStoreFactoryTest.groovy (100%)
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultLocalMavenRepositoryLocatorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/query/DefaultArtifactResolutionQueryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/AbstractArtifactRepositoryChangingNameAfterContainerInclusion.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/AbstractAuthenticationSupportedRepositoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultFlatDirArtifactRepositoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultIvyArtifactRepositoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenArtifactRepositoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalRepositoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ChainedVersionListerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolverTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResolverTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResourcePatternTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/M2ResourcePatternTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenResolverTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotComponentIdentifierTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotExternalResourceArtifactResolverTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenVersionListerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourceVersionListerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransportFactoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultArtifactResolutionResultTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultComponentArtifactsResultTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolutionResultTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentResultTest.groovy
 create mode 100755 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/notations/DependencyClassPathNotationConverterTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/notations/DependencyMapNotationConverterTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/notations/DependencyStringNotationConverterTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/notations/ModuleIdentiferNotationConverterTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/notations/ProjectDependencyFactoryTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/AbstractModuleComponentResolveMetaDataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/BuildableIvyModuleResolveMetaDataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/DefaultIvyModulePublishMetaDataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaDataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/DefaultMavenModuleResolveMetaDataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/DefaultModuleComponentArtifactIdentifierTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/DefaultModuleComponentArtifactMetaDataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/DefaultModuleComponentIdentifierTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/DefaultModuleComponentSelectorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/local/model/DefaultLocalArtifactIdentifierTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/local/model/DefaultLocalComponentMetaDataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/local/model/DefaultProjectComponentIdentifierTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/local/model/DefaultProjectComponentSelectorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/local/model/OpaqueComponentIdentifierTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/model/DefaultDependencyMetaDataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/model/DefaultIvyArtifactNameTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resolve/ArtifactNotFoundExceptionTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resolve/ModuleVersionNotFoundExceptionTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resolve/ModuleVersionResolveExceptionTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resolve/result/DefaultBuildableArtifactResolveResultTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resolve/result/DefaultBuildableArtifactSetResolveResultTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resolve/result/DefaultBuildableComponentIdResolveResultTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resolve/result/DefaultBuildableComponentResolveResultTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resolve/result/DefaultBuildableComponentSelectionResultTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resolve/result/DefaultBuildableModuleComponentMetaDataResolveResultTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resolve/result/DefaultBuildableModuleVersionListingResolveResultTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resolve/result/DefaultResourceAwareResolveResultTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resource/cached/DefaultArtifactResolutionCacheTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resource/local/CompositeLocallyAvailableResourceFinderTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resource/local/LazyLocallyAvailableResourceCandidatesTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resource/transfer/DefaultCacheAwareExternalResourceAccessorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceAccessorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceUploaderTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resource/transfer/ResourceOperationTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/rules/ClosureBackedRuleActionTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/rules/DefaultRuleActionAdapterTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/rules/DefaultRuleActionValidatorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/rules/NoInputsRuleActionTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/rules/RuleSourceBackedRuleActionTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/resources/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/test-full.xml
 create mode 100644 subprojects/dependency-management/src/test/resources/org/gradle/internal/resource/ivy/ArtifactAtRepositoryCachedArtifactIndexTest.groovy
 create mode 100644 subprojects/dependency-management/src/testFixtures/groovy/org/gradle/api/internal/artifacts/result/ResolutionResultDataBuilder.groovy
 create mode 100644 subprojects/dependency-management/src/testFixtures/groovy/org/gradle/integtests/resolve/ivy/AbstractIvyRemoteRepoResolveIntegrationTest.groovy
 create mode 100644 subprojects/diagnostics/src/integTest/groovy/org/gradle/api/plugins/HelpTasksPluginIntegrationTest.groovy
 create mode 100644 subprojects/diagnostics/src/integTest/groovy/org/gradle/api/reporting/components/ComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/diagnostics/src/integTest/groovy/org/gradle/api/reporting/model/ModelReportIntegrationTest.groovy
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/plugins/HelpTasksPlugin.groovy
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/plugins/HelpTasksPlugin.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/components/ComponentReport.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/components/internal/AbstractBinaryRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/components/internal/BinaryRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/components/internal/ComponentRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/components/internal/ComponentReportRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/components/internal/DiagnosticsServices.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/components/internal/SourceSetRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/components/internal/TypeAwareBinaryRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/components/package-info.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/internal/JsonDependencyReportIndexRenderer.groovy
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/internal/ProjectPageRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/internal/ProjectsPageRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/model/ModelReport.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/model/internal/ModelReportRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/model/package-info.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/dsl/DependencyResultSpecNotationConverter.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/dsl/DependencyResultSpecNotationParser.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/text/DefaultTextReportBuilder.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/text/TextReportBuilder.java
 rename subprojects/diagnostics/src/main/resources/META-INF/gradle-plugins/{help-tasks.properties => org.gradle.help-tasks.properties} (100%)
 rename subprojects/diagnostics/src/main/resources/META-INF/gradle-plugins/{project-report.properties => org.gradle.project-report.properties} (100%)
 rename subprojects/diagnostics/src/main/resources/META-INF/gradle-plugins/{project-reports.properties => org.gradle.project-reports.properties} (100%)
 create mode 100644 subprojects/diagnostics/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 delete mode 100644 subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/index.html
 delete mode 100644 subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/template.html
 create mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/reporting/components/internal/ComponentRendererTest.groovy
 create mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/reporting/components/internal/ComponentReportRendererTest.groovy
 create mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/reporting/components/internal/SourceSetRendererTest.groovy
 create mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/tasks/diagnostics/internal/text/DefaultTextReportBuilderTest.groovy
 create mode 100644 subprojects/diagnostics/src/testFixtures/groovy/org/gradle/api/reporting/components/AbstractComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/diagnostics/src/testFixtures/groovy/org/gradle/api/reporting/components/ComponentReportOutputFormatter.groovy
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectCollection.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectContainer.xml
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.language.objectivec.tasks.ObjectiveCCompile.xml => org.gradle.api.NamedDomainObjectList.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.language.objectivecpp.tasks.ObjectiveCppCompile.xml => org.gradle.api.NamedDomainObjectSet.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.artifacts.ComponentSelection.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.artifacts.ComponentSelectionRules.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.artifacts.dsl.ComponentMetadataHandler.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.artifacts.dsl.ComponentModuleMetadataHandler.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.artifacts.query.ArtifactResolutionQuery.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.artifacts.repositories.ArtifactRepository.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.artifacts.repositories.AuthenticationSupported.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.plugins.PluginAware.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.plugins.PluginManager.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.GroovyCodeQualityPluginConvention.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.JavaCodeQualityPluginConvention.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.publish.ivy.IvyModuleDescriptor.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.publish.ivy.IvyModuleDescriptorSpec.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.publish.maven.tasks.AbstractPublishToMaven.xml
 copy subprojects/docs/src/docs/dsl/{org.gradle.api.DefaultTask.xml => org.gradle.api.reporting.components.ComponentReport.xml} (100%)
 copy subprojects/docs/src/docs/dsl/{org.gradle.language.objectivec.ObjectiveCSourceSet.xml => org.gradle.api.reporting.model.ModelReport.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.resources.ResourceHandler.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.resources.TextResource.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.resources.TextResourceFactory.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.tasks.AbstractExecTask.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.tasks.application.CreateStartScripts.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.jvm.application.tasks.CreateStartScripts.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.jvm.tasks.Jar.xml
 copy subprojects/docs/src/docs/dsl/{org.gradle.api.DefaultTask.xml => org.gradle.jvm.toolchain.JavaToolChain.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.language.PreprocessingTool.xml => org.gradle.language.PreprocessingTool.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.language.assembler.tasks.Assemble.xml => org.gradle.language.assembler.tasks.Assemble.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.language.base.BinaryContainer.xml => org.gradle.language.c.tasks.CCompile.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.BuildType.xml => org.gradle.language.cpp.plugins.CppPlugin.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.BuildTypeContainer.xml => org.gradle.language.cpp.tasks.CppCompile.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.language.c.tasks.AbstractNativeCompileTask.xml => org.gradle.language.nativeplatform.tasks.AbstractNativeCompileTask.xml} (100%)
 copy subprojects/docs/src/docs/dsl/{org.gradle.language.objectivec.ObjectiveCSourceSet.xml => org.gradle.language.objectivec.tasks.ObjectiveCCompile.xml} (100%)
 copy subprojects/docs/src/docs/dsl/{org.gradle.language.objectivec.ObjectiveCSourceSet.xml => org.gradle.language.objectivecpp.tasks.ObjectiveCppCompile.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.language.rc.tasks.WindowsResourceCompile.xml => org.gradle.language.rc.tasks.WindowsResourceCompile.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.language.scala.tasks.AbstractScalaCompile.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ProjectNativeBinary.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ProjectNativeComponent.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.TargetedNativeComponent.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.platform.Platform.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.ProjectComponentTestSuite.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.Gcc.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.PlatformConfigurableToolChain.xml
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.Executable.xml => org.gradle.nativeplatform.BuildType.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.ExecutableBinary.xml => org.gradle.nativeplatform.BuildTypeContainer.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.ExecutableContainer.xml => org.gradle.nativeplatform.Flavor.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.Flavor.xml => org.gradle.nativeplatform.FlavorContainer.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.NativeBinary.xml => org.gradle.nativeplatform.NativeBinary.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativeplatform.NativeBinarySpec.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativeplatform.NativeComponentExtension.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativeplatform.NativeComponentSpec.xml
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.FlavorContainer.xml => org.gradle.nativeplatform.NativeExecutable.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.LibraryBinary.xml => org.gradle.nativeplatform.NativeExecutableBinary.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.LibraryContainer.xml => org.gradle.nativeplatform.NativeExecutableBinarySpec.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.language.c.tasks.CCompile.xml => org.gradle.nativeplatform.NativeExecutableSpec.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.language.cpp.plugins.CppExeConventionPlugin.xml => org.gradle.nativeplatform.NativeLibrary.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.language.cpp.plugins.CppLibConventionPlugin.xml => org.gradle.nativeplatform.NativeLibraryBinary.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.Library.xml => org.gradle.nativeplatform.NativeLibrarySpec.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.language.cpp.plugins.CppPlugin.xml => org.gradle.nativeplatform.PrebuiltLibrary.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.language.cpp.tasks.CppCompile.xml => org.gradle.nativeplatform.PrebuiltSharedLibraryBinary.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.platform.PlatformContainer.xml => org.gradle.nativeplatform.PrebuiltStaticLibraryBinary.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.SharedLibraryBinary.xml => org.gradle.nativeplatform.SharedLibraryBinary.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativeplatform.SharedLibraryBinarySpec.xml
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.StaticLibraryBinary.xml => org.gradle.nativeplatform.StaticLibraryBinary.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.tasks.LinkExecutable.xml => org.gradle.nativeplatform.StaticLibraryBinarySpec.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativeplatform.TargetedNativeComponent.xml
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.Tool.xml => org.gradle.nativeplatform.Tool.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.tasks.LinkSharedLibrary.xml => org.gradle.nativeplatform.platform.PlatformContainer.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.tasks.AbstractLinkTask.xml => org.gradle.nativeplatform.tasks.AbstractLinkTask.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.tasks.CreateStaticLibrary.xml => org.gradle.nativeplatform.tasks.CreateStaticLibrary.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.tasks.InstallExecutable.xml => org.gradle.nativeplatform.tasks.InstallExecutable.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.test.TestSuite.xml => org.gradle.nativeplatform.tasks.LinkExecutable.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.test.TestSuiteContainer.xml => org.gradle.nativeplatform.tasks.LinkSharedLibrary.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.test.TestSuiteExecutableBinary.xml => org.gradle.nativeplatform.test.NativeTestSuiteBinarySpec.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.test.cunit.CUnitTestSuite.xml => org.gradle.nativeplatform.test.NativeTestSuiteSpec.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.toolchain.ToolChain.xml => org.gradle.nativeplatform.test.TestSuiteContainer.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.toolchain.ToolChainRegistry.xml => org.gradle.nativeplatform.test.cunit.CUnitTestSuiteSpec.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativeplatform.test.googletest.GoogleTestTestSuiteSpec.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativeplatform.test.tasks.RunTestExecutable.xml
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.toolchain.plugins.GppCompilerPlugin.xml => org.gradle.nativeplatform.toolchain.Clang.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativeplatform.toolchain.ConfigurableToolChain.xml
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.toolchain.plugins.MicrosoftVisualCppPlugin.xml => org.gradle.nativeplatform.toolchain.Gcc.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.toolchain.Clang.xml => org.gradle.nativeplatform.toolchain.GccCompatibleToolChain.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativeplatform.toolchain.PlatformConfigurableToolChain.xml
 copy subprojects/docs/src/docs/dsl/{org.gradle.language.assembler.AssemblerSourceSet.xml => org.gradle.nativeplatform.toolchain.ToolChainRegistry.xml} (100%)
 rename subprojects/docs/src/docs/dsl/{org.gradle.nativebinaries.toolchain.VisualCpp.xml => org.gradle.nativeplatform.toolchain.VisualCpp.xml} (100%)
 copy subprojects/docs/src/docs/dsl/{org.gradle.language.assembler.AssemblerSourceSet.xml => org.gradle.nativeplatform.toolchain.plugins.GppCompilerPlugin.xml} (100%)
 copy subprojects/docs/src/docs/dsl/{org.gradle.language.assembler.AssemblerSourceSet.xml => org.gradle.nativeplatform.toolchain.plugins.MicrosoftVisualCppPlugin.xml} (100%)
 copy subprojects/docs/src/docs/dsl/{org.gradle.language.assembler.AssemblerSourceSet.xml => org.gradle.platform.base.Application.xml} (100%)
 copy subprojects/docs/src/docs/dsl/{org.gradle.language.assembler.AssemblerSourceSet.xml => org.gradle.platform.base.Binary.xml} (100%)
 copy subprojects/docs/src/docs/dsl/{org.gradle.language.assembler.AssemblerSourceSet.xml => org.gradle.platform.base.BinaryContainer.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.platform.base.BinarySpec.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.platform.base.ComponentSpec.xml
 copy subprojects/docs/src/docs/dsl/{org.gradle.language.objectivec.ObjectiveCSourceSet.xml => org.gradle.platform.base.ComponentSpecContainer.xml} (100%)
 copy subprojects/docs/src/docs/dsl/{org.gradle.language.assembler.AssemblerSourceSet.xml => org.gradle.platform.base.Library.xml} (100%)
 copy subprojects/docs/src/docs/dsl/{org.gradle.language.objectivec.ObjectiveCSourceSet.xml => org.gradle.platform.base.LibrarySpec.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.platform.base.PlatformAwareComponentSpec.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.plugin.use.PluginDependenciesSpec.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.plugin.use.PluginDependencySpec.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.sonar.runner.SonarProperties.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.sonar.runner.SonarRunnerExtension.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.sonar.runner.SonarRunnerRootExtension.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.sonar.runner.tasks.SonarRunner.xml
 create mode 100644 subprojects/docs/src/docs/release/notes-next.md
 delete mode 100644 subprojects/docs/src/docs/userguide/img/codeQualityPluginTasks.graphml
 delete mode 100644 subprojects/docs/src/docs/userguide/img/codeQualityPluginTasks.png
 create mode 100644 subprojects/docs/src/docs/userguide/javaGradlePlugin.xml
 create mode 100644 subprojects/docs/src/docs/userguide/newModel.xml
 delete mode 100644 subprojects/docs/src/docs/userguide/thisAndThat.xml
 create mode 100644 subprojects/docs/src/samples/componentMetadataRules/build.gradle
 create mode 100644 subprojects/docs/src/samples/componentMetadataRules/repo/org.sample/api/1.9/ivy-1.9.xml
 create mode 100644 subprojects/docs/src/samples/componentMetadataRules/repo/org.sample/api/2.0/ivy-2.0.xml
 create mode 100644 subprojects/docs/src/samples/componentMetadataRules/repo/org.sample/client/1.3/ivy-1.3.xml
 create mode 100644 subprojects/docs/src/samples/componentMetadataRules/repo/org.sample/client/1.4/ivy-1.4.xml
 create mode 100644 subprojects/docs/src/samples/componentMetadataRules/repo/org.sample/client/1.5/ivy-1.5.xml
 create mode 100644 subprojects/docs/src/samples/componentMetadataRules/repo/org.sample/lib/1.9/ivy-1.9.xml
 create mode 100644 subprojects/docs/src/samples/componentMetadataRules/repo/org.sample/lib/2.0/ivy-2.0.xml
 create mode 100644 subprojects/docs/src/samples/componentSelectionRules/build.gradle
 create mode 100644 subprojects/docs/src/samples/componentSelectionRules/repo/org.sample/api/1.3.0/ivy-1.3.0.xml
 create mode 100644 subprojects/docs/src/samples/componentSelectionRules/repo/org.sample/api/1.4/ivy-1.4.xml
 create mode 100644 subprojects/docs/src/samples/componentSelectionRules/repo/org.sample/api/1.5/ivy-1.5.xml
 create mode 100644 subprojects/docs/src/samples/componentSelectionRules/repo/org.sample/lib/1.9/ivy-1.9.xml
 create mode 100644 subprojects/docs/src/samples/componentSelectionRules/repo/org.sample/lib/2.0/ivy-2.0.xml
 create mode 100644 subprojects/docs/src/samples/customModel/componentType/build.gradle
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/build.gradle
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/buildSrc/build.gradle
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/buildSrc/src/main/groovy/sample/documentation/DefaultDocumentationBinary.groovy
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/buildSrc/src/main/groovy/sample/documentation/DefaultDocumentationComponent.groovy
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/buildSrc/src/main/groovy/sample/documentation/DocumentationBinary.groovy
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/buildSrc/src/main/groovy/sample/documentation/DocumentationComponent.groovy
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/buildSrc/src/main/groovy/sample/documentation/DocumentationPlugin.groovy
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/buildSrc/src/main/groovy/sample/documentation/DocumentationSourceSet.groovy
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/buildSrc/src/main/groovy/sample/markdown/DefaultMarkdownSourceSet.groovy
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/buildSrc/src/main/groovy/sample/markdown/MarkdownHtmlCompile.groovy
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/buildSrc/src/main/groovy/sample/markdown/MarkdownPlugin.groovy
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/buildSrc/src/main/groovy/sample/markdown/MarkdownSourceSet.groovy
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/src/docs/userguide/chapter1.md
 create mode 100644 subprojects/docs/src/samples/customModel/languageType/src/docs/userguide/chapter2.md
 rename subprojects/docs/src/samples/customPlugin/plugin/src/main/resources/META-INF/gradle-plugins/{greeting.properties => org.samples.greeting.properties} (100%)
 create mode 100755 subprojects/docs/src/samples/javaGradlePlugin/build.gradle
 create mode 100644 subprojects/docs/src/samples/javaGradlePlugin/readme.xml
 create mode 100644 subprojects/docs/src/samples/javaGradlePlugin/src/main/java/org/gradle/sample/SimplePlugin.java
 create mode 100644 subprojects/docs/src/samples/javaGradlePlugin/src/main/resources/META-INF/gradle-plugins/simple-plugin.properties
 create mode 100644 subprojects/docs/src/samples/jvmComponents/java/build.gradle
 create mode 100644 subprojects/docs/src/samples/jvmComponents/java/src/main/java/org/gradle/samples/HelloWorld.java
 create mode 100644 subprojects/docs/src/samples/jvmComponents/scala/build.gradle
 create mode 100644 subprojects/docs/src/samples/jvmComponents/scala/src/main/scala/org/gradle/samples/Greeter.scala
 create mode 100644 subprojects/docs/src/samples/jvmComponents/scala/src/main/scala/org/gradle/samples/HelloWorld.scala
 create mode 100644 subprojects/docs/src/samples/jvmComponents/scala/src/main/scala/org/gradle/samples/Person.java
 create mode 100644 subprojects/docs/src/samples/modelRules/basicRuleSourcePlugin/build.gradle
 create mode 100644 subprojects/docs/src/samples/modelRules/modelDsl/build.gradle
 delete mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/Automated.h
 delete mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/Basic.h
 delete mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/CUError.h
 delete mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/CUnit.h
 delete mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/CUnit_intl.h
 delete mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/Console.h
 delete mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/MyMem.h
 delete mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/TestDB.h
 delete mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/TestRun.h
 delete mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/Util.h
 rename subprojects/{cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared => docs/src/samples/native-binaries/cunit}/libs/cunit/2.1-2/include/CUnit/Automated.h (100%)
 rename subprojects/{cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared => docs/src/samples/native-binaries/cunit}/libs/cunit/2.1-2/include/CUnit/Basic.h (100%)
 rename subprojects/{cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared => docs/src/samples/native-binaries/cunit}/libs/cunit/2.1-2/include/CUnit/CUError.h (100%)
 rename subprojects/{cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared => docs/src/samples/native-binaries/cunit}/libs/cunit/2.1-2/include/CUnit/CUnit.h (100%)
 rename subprojects/{cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared => docs/src/samples/native-binaries/cunit}/libs/cunit/2.1-2/include/CUnit/CUnit_intl.h (100%)
 rename subprojects/{cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared => docs/src/samples/native-binaries/cunit}/libs/cunit/2.1-2/include/CUnit/Console.h (100%)
 rename subprojects/{cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared => docs/src/samples/native-binaries/cunit}/libs/cunit/2.1-2/include/CUnit/MyMem.h (100%)
 rename subprojects/{cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared => docs/src/samples/native-binaries/cunit}/libs/cunit/2.1-2/include/CUnit/TestDB.h (100%)
 rename subprojects/{cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared => docs/src/samples/native-binaries/cunit}/libs/cunit/2.1-2/include/CUnit/TestRun.h (100%)
 rename subprojects/{cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared => docs/src/samples/native-binaries/cunit}/libs/cunit/2.1-2/include/CUnit/Util.h (100%)
 rename subprojects/docs/src/samples/native-binaries/cunit/src/operatorsTest/{cunit => c}/suite_operators.c (100%)
 rename subprojects/docs/src/samples/native-binaries/cunit/src/operatorsTest/{cunit => c}/test_minus.c (100%)
 rename subprojects/docs/src/samples/native-binaries/cunit/src/operatorsTest/{cunit => c}/test_plus.c (100%)
 rename subprojects/docs/src/samples/native-binaries/flavors/src/{lib => hello}/cpp/hello.cpp (100%)
 create mode 100755 subprojects/docs/src/samples/native-binaries/flavors/src/hello/headers/hello.h
 delete mode 100755 subprojects/docs/src/samples/native-binaries/flavors/src/lib/headers/hello.h
 rename subprojects/docs/src/samples/native-binaries/flavors/src/{exe => main}/cpp/main.cpp (100%)
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/README.md
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/build.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/gtest-death-test.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/gtest-message.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/gtest-param-test.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/gtest-param-test.h.pump
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/gtest-printers.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/gtest-spi.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/gtest-test-part.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/gtest-typed-test.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/gtest.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/gtest_pred_impl.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/gtest_prod.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/internal/gtest-death-test-internal.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/internal/gtest-filepath.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/internal/gtest-internal.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/internal/gtest-linked_ptr.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/internal/gtest-param-util-generated.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/internal/gtest-param-util-generated.h.pump
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/internal/gtest-param-util.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/internal/gtest-port.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/internal/gtest-string.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/internal/gtest-tuple.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/internal/gtest-tuple.h.pump
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/internal/gtest-type-util.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/include/gtest/internal/gtest-type-util.h.pump
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/lib/linux/libgtest.a
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/libs/googleTest/1.7.0/lib/osx/libgtest.a
 copy subprojects/docs/src/samples/native-binaries/{cunit/src/operators/c/minus.c => google-test/src/operators/cpp/minus.cpp} (100%)
 copy subprojects/docs/src/samples/native-binaries/{cunit/src/operators/c/plus.c => google-test/src/operators/cpp/plus.cpp} (100%)
 copy subprojects/docs/src/samples/native-binaries/{cunit => google-test}/src/operators/headers/operators.h (100%)
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/src/operatorsTest/cpp/test_main.cpp
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/src/operatorsTest/cpp/test_minus.cpp
 create mode 100644 subprojects/docs/src/samples/native-binaries/google-test/src/operatorsTest/cpp/test_plus.cpp
 create mode 100644 subprojects/docs/src/samples/native-binaries/objective-c/src/main/headers/greeter.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/objective-c/src/main/objc/greeter.m
 create mode 100644 subprojects/docs/src/samples/native-binaries/objective-cpp/src/main/headers/greeter.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/objective-cpp/src/main/objcpp/greeter.mm
 create mode 100644 subprojects/docs/src/samples/native-binaries/target-platforms/build.gradle
 copy subprojects/docs/src/samples/native-binaries/{tool-chains => target-platforms}/src/main/cpp/main.cpp (100%)
 create mode 100644 subprojects/docs/src/samples/play/advanced/app/assets/coffeescript/console.coffee
 create mode 100644 subprojects/docs/src/samples/play/advanced/app/assets/coffeescript/squareit.coffee
 create mode 100644 subprojects/docs/src/samples/play/advanced/app/assets/javascripts/sample.js
 create mode 100644 subprojects/docs/src/samples/play/advanced/app/controllers/Application.scala
 create mode 100644 subprojects/docs/src/samples/play/advanced/app/controllers/QuestionsThreeController.scala
 create mode 100644 subprojects/docs/src/samples/play/advanced/app/controllers/hello/HelloController.java
 create mode 100644 subprojects/docs/src/samples/play/advanced/app/models/Person.scala
 create mode 100644 subprojects/docs/src/samples/play/advanced/app/views/fields.scala.html
 create mode 100644 subprojects/docs/src/samples/play/advanced/app/views/index.scala.html
 create mode 100644 subprojects/docs/src/samples/play/advanced/app/views/main.scala.html
 create mode 100644 subprojects/docs/src/samples/play/advanced/app/views/pass.scala.html
 create mode 100644 subprojects/docs/src/samples/play/advanced/app/views/person.scala.html
 create mode 100644 subprojects/docs/src/samples/play/advanced/app/views/square.scala.html
 create mode 100644 subprojects/docs/src/samples/play/advanced/build.gradle
 create mode 100644 subprojects/docs/src/samples/play/advanced/conf/application.conf
 create mode 100644 subprojects/docs/src/samples/play/advanced/conf/hello.routes
 create mode 100644 subprojects/docs/src/samples/play/advanced/conf/routes
 create mode 100644 subprojects/docs/src/samples/play/advanced/public/images/favicon.png
 create mode 100644 subprojects/docs/src/samples/play/advanced/public/javascripts/hello.js
 create mode 100644 subprojects/docs/src/samples/play/advanced/public/javascripts/jquery-2.1.3.min.js
 create mode 100644 subprojects/docs/src/samples/play/advanced/public/stylesheets/bootstrap.min.css
 rename subprojects/{core/src/test/resources/org/gradle/api/internal/xml/xml-transformer-test.dtd => docs/src/samples/play/advanced/public/stylesheets/main.css} (100%)
 create mode 100644 subprojects/docs/src/samples/play/advanced/test/ApplicationSpec.scala
 create mode 100644 subprojects/docs/src/samples/play/advanced/test/IntegrationSpec.scala
 create mode 100644 subprojects/docs/src/samples/play/basic/app/controllers/Application.scala
 create mode 100644 subprojects/docs/src/samples/play/basic/app/views/index.scala.html
 create mode 100644 subprojects/docs/src/samples/play/basic/app/views/main.scala.html
 create mode 100644 subprojects/docs/src/samples/play/basic/build.gradle
 create mode 100644 subprojects/docs/src/samples/play/basic/conf/application.conf
 create mode 100644 subprojects/docs/src/samples/play/basic/conf/routes
 create mode 100644 subprojects/docs/src/samples/play/basic/public/images/favicon.png
 create mode 100644 subprojects/docs/src/samples/play/basic/public/javascripts/hello.js
 copy subprojects/{core/src/integTest/resources/org/gradle/api/tasks/copyTestResources/src/one/sub/ignore/bad.file => docs/src/samples/play/basic/public/stylesheets/main.css} (100%)
 create mode 100644 subprojects/docs/src/samples/play/basic/test/ApplicationSpec.scala
 create mode 100644 subprojects/docs/src/samples/play/basic/test/IntegrationSpec.scala
 create mode 100644 subprojects/docs/src/samples/play/multiproject/app/controllers/Application.scala
 create mode 100644 subprojects/docs/src/samples/play/multiproject/app/views/index.scala.html
 create mode 100644 subprojects/docs/src/samples/play/multiproject/build.gradle
 create mode 100644 subprojects/docs/src/samples/play/multiproject/conf/application.conf
 create mode 100644 subprojects/docs/src/samples/play/multiproject/conf/routes
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/admin/app/controllers/admin/Application.scala
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/admin/app/controllers/admin/Assets.scala
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/admin/app/views/admin/index.scala.html
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/admin/build.gradle
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/admin/conf/admin.routes
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/admin/conf/application.conf
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/admin/public/javascript/admin.js
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/user/app/controllers/user/Application.scala
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/user/app/views/user/index.scala.html
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/user/build.gradle
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/user/conf/application.conf
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/user/conf/user.routes
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/util/build.gradle
 create mode 100644 subprojects/docs/src/samples/play/multiproject/modules/util/src/main/java/org/sample/util/BuiltBy.java
 create mode 100644 subprojects/docs/src/samples/play/multiproject/public/images/gradle.ico
 create mode 100644 subprojects/docs/src/samples/play/multiproject/public/javascript/timestamp.js
 create mode 100644 subprojects/docs/src/samples/play/multiproject/settings.gradle
 create mode 100644 subprojects/docs/src/samples/plugins/buildscript/build.gradle
 create mode 100644 subprojects/docs/src/samples/plugins/dsl/build.gradle
 create mode 100644 subprojects/docs/src/samples/sonarRunner/advanced/src/main/java/org/gradle/Person.java
 create mode 100644 subprojects/docs/src/samples/sonarRunner/advanced/src/test/java/org/gradle/PersonTest.java
 create mode 100644 subprojects/docs/src/samples/userguide/ant/renameTask/build.gradle
 copy subprojects/docs/src/samples/userguide/ant/{addBehaviourToAntTarget => renameTask}/build.xml (100%)
 delete mode 100644 subprojects/docs/src/samples/userguide/artifacts/componentMetadata/build.gradle
 delete mode 100644 subprojects/docs/src/samples/userguide/artifacts/componentMetadata/repo/air.birds/albatros/1.9/ivy-1.9.xml
 delete mode 100644 subprojects/docs/src/samples/userguide/artifacts/componentMetadata/repo/air.birds/albatros/2.0/ivy-2.0.xml
 delete mode 100644 subprojects/docs/src/samples/userguide/artifacts/componentMetadata/repo/sea.fish/tuna/1.3/ivy-1.3.xml
 delete mode 100644 subprojects/docs/src/samples/userguide/artifacts/componentMetadata/repo/sea.fish/tuna/1.4/ivy-1.4.xml
 delete mode 100644 subprojects/docs/src/samples/userguide/artifacts/componentMetadata/repo/sea.fish/tuna/1.5/ivy-1.5.xml
 create mode 100644 subprojects/docs/src/samples/userguide/artifacts/componentModuleMetadata/build.gradle
 delete mode 100644 subprojects/docs/src/samples/userguide/tutorial/makeDirectory/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguideOutput/basicRuleSourcePlugin-all.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/basicRuleSourcePlugin-model-task.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/completeCUnitExample.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/completeGoogleTestExample.out
 delete mode 100644 subprojects/docs/src/samples/userguideOutput/customStatusScheme.out
 delete mode 100644 subprojects/docs/src/samples/userguideOutput/makeDirectory.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/modelDslCreate.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/nativeComponentReport.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/renameAntDelegate.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/wrapperCommandLine.out
 delete mode 100644 subprojects/docs/src/samples/water/bluewhale/build.gradle
 delete mode 100644 subprojects/docs/src/samples/water/build.gradle
 delete mode 100644 subprojects/docs/src/samples/water/krill/build.gradle
 delete mode 100644 subprojects/docs/src/samples/water/phytoplankton/build.gradle
 delete mode 100644 subprojects/docs/src/samples/water/settings.gradle
 create mode 100644 subprojects/ear/src/integTest/resources/org/gradle/plugins/ear/application_1_3.dtd
 rename subprojects/ear/src/main/resources/META-INF/gradle-plugins/{ear.properties => org.gradle.ear.properties} (100%)
 create mode 100644 subprojects/ide-native/ide-native.gradle
 create mode 100644 subprojects/ide-native/src/integTest/groovy/org/gradle/ide/AutoTestedSamplesIdeNativeIntegrationTest.groovy
 create mode 100644 subprojects/ide-native/src/integTest/groovy/org/gradle/ide/visualstudio/NativeIdeSamplesIntegrationTest.groovy
 create mode 100755 subprojects/ide-native/src/integTest/groovy/org/gradle/ide/visualstudio/VisualStudioFileCustomizationIntegrationTest.groovy
 create mode 100755 subprojects/ide-native/src/integTest/groovy/org/gradle/ide/visualstudio/VisualStudioMultiProjectIntegrationTest.groovy
 create mode 100755 subprojects/ide-native/src/integTest/groovy/org/gradle/ide/visualstudio/VisualStudioSingleProjectIntegrationTest.groovy
 create mode 100644 subprojects/ide-native/src/integTest/groovy/org/gradle/ide/visualstudio/plugins/VisualStudioPluginIntegrationTest.groovy
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/cdt/model/CprojectDescriptor.groovy
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/cdt/model/CprojectSettings.groovy
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/cdt/model/ProjectDescriptor.groovy
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/cdt/model/ProjectSettings.groovy (100%)
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/cdt/tasks/GenerateMetadataFileTask.groovy (100%)
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/visualstudio/ConfigFile.java (100%)
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/visualstudio/TextConfigFile.java (100%)
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/visualstudio/TextProvider.java (100%)
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioExtension.java
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioProject.java
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioSolution.java
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/visualstudio/XmlConfigFile.java (100%)
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioExtension.java
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioProject.groovy
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioSolution.groovy
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/internal/ExecutableVisualStudioProjectConfiguration.groovy
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioExtensionInternal.java
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfiguration.groovy
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapper.java
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistry.java
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectResolver.java
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioSolutionRegistry.java (100%)
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/visualstudio/package-info.java (100%)
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/plugins/VisualStudioPlugin.java
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/plugins/package-info.java
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/visualstudio/tasks/GenerateFiltersFileTask.groovy (100%)
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/visualstudio/tasks/GenerateProjectFileTask.groovy (100%)
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/visualstudio/tasks/GenerateSolutionFileTask.groovy (100%)
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/visualstudio/tasks/internal/AbsoluteFileNameTransformer.java (100%)
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/visualstudio/tasks/internal/RelativeFileNameTransformer.java (100%)
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioFiltersFile.groovy
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioProjectFile.groovy
 rename subprojects/{cpp => ide-native}/src/main/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioSolutionFile.groovy (100%)
 rename subprojects/{cpp/src/main/resources/META-INF/gradle-plugins/eclipse-cdt.properties => ide-native/src/main/resources/META-INF/gradle-plugins/org.gradle.eclipse-cdt.properties} (100%)
 rename subprojects/{cpp/src/main/resources/META-INF/gradle-plugins/visual-studio.properties => ide-native/src/main/resources/META-INF/gradle-plugins/org.gradle.visual-studio.properties} (100%)
 rename subprojects/{cpp => ide-native}/src/main/resources/org/gradle/ide/cdt/model/defaultCproject-linux.xml (100%)
 rename subprojects/{cpp => ide-native}/src/main/resources/org/gradle/ide/cdt/model/defaultCproject-macos.xml (100%)
 rename subprojects/{cpp => ide-native}/src/main/resources/org/gradle/ide/cdt/model/defaultProject.xml (100%)
 rename subprojects/{cpp => ide-native}/src/main/resources/org/gradle/ide/visualstudio/tasks/internal/default.sln (100%)
 rename subprojects/{cpp => ide-native}/src/main/resources/org/gradle/ide/visualstudio/tasks/internal/default.vcxproj (100%)
 rename subprojects/{cpp => ide-native}/src/main/resources/org/gradle/ide/visualstudio/tasks/internal/default.vcxproj.filters (100%)
 create mode 100644 subprojects/ide-native/src/test/groovy/org/gradle/ide/cdt/model/CprojectSettingsSpec.groovy
 rename subprojects/{cpp => ide-native}/src/test/groovy/org/gradle/ide/cdt/model/ProjectDescriptorSpec.groovy (100%)
 create mode 100644 subprojects/ide-native/src/test/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioProjectTest.groovy
 create mode 100644 subprojects/ide-native/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfigurationTest.groovy
 create mode 100644 subprojects/ide-native/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapperTest.groovy
 create mode 100644 subprojects/ide-native/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistryTest.groovy
 rename subprojects/{cpp => ide-native}/src/test/groovy/org/gradle/ide/visualstudio/tasks/internal/RelativeFileNameTransformerTest.groovy (100%)
 create mode 100644 subprojects/ide-native/src/test/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioFiltersFileTest.groovy
 create mode 100644 subprojects/ide-native/src/test/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioProjectFileTest.groovy
 create mode 100644 subprojects/ide-native/src/test/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioSolutionFileTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/AbstractEclipseIntegrationSpec.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseDependencySubstitutionIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseProjectFixture.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpComponentFixture.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpEarAndWebAndEjbProjectIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpEarProjectIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpEmptyProjectIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpFacetsFixture.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpJavaEarSingleProjectIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpJavaProjectIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpWebAndJavaProjectIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpWebProjectIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaDependencySubstitutionIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaModuleFixture.groovy
 create mode 100644 subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/eclipse/EclipseIntegrationTest/canCreateAndDeleteMetaData/common/build.gradle
 create mode 100644 subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/eclipse/EclipseIntegrationTest/canCreateAndDeleteMetaData/common/src/main/java/org/gradle/api/PersonList.java
 copy subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/eclipse/EclipseIntegrationTest/canCreateAndDeleteMetaData/{api => common}/src/main/resources/someprops.properties (100%)
 copy subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/eclipse/EclipseIntegrationTest/canCreateAndDeleteMetaData/{groovyproject => common}/src/test/java/org/gradle/shared/PersonTest.java (100%)
 create mode 100644 subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/eclipse/EclipseIntegrationTest/canCreateAndDeleteMetaData/expectedFiles/apiWtpComponent.xml
 create mode 100644 subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/eclipse/EclipseIntegrationTest/canCreateAndDeleteMetaData/expectedFiles/apiWtpFacet.xml
 create mode 100644 subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/eclipse/EclipseIntegrationTest/canCreateAndDeleteMetaData/expectedFiles/commonClasspath.xml
 create mode 100644 subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/eclipse/EclipseIntegrationTest/canCreateAndDeleteMetaData/expectedFiles/commonJdt.properties
 create mode 100644 subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/eclipse/EclipseIntegrationTest/canCreateAndDeleteMetaData/expectedFiles/commonProject.xml
 create mode 100644 subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/eclipse/EclipseIntegrationTest/canCreateAndDeleteMetaData/expectedFiles/commonWtpComponent.xml
 create mode 100644 subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/eclipse/EclipseIntegrationTest/canCreateAndDeleteMetaData/expectedFiles/commonWtpFacet.xml
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/IdeDependenciesExtractor.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/IdeDependenciesExtractor.java
 rename subprojects/ide/src/main/resources/META-INF/gradle-plugins/{eclipse-wtp.properties => org.gradle.eclipse-wtp.properties} (100%)
 rename subprojects/ide/src/main/resources/META-INF/gradle-plugins/{eclipse.properties => org.gradle.eclipse.properties} (100%)
 rename subprojects/ide/src/main/resources/META-INF/gradle-plugins/{idea.properties => org.gradle.idea.properties} (100%)
 rename subprojects/ide/src/test/groovy/org/gradle/plugins/ide/idea/{ GenerateIdeaModuleTest.groovy => GenerateIdeaModuleTest.groovy} (100%)
 create mode 100644 subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaContentRootTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/AntlrPluginGoodBehaviourTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ApplicationIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/BuildScriptExecutionIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/CharacterEncodingIntegTest.groovy
 delete mode 100755 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ExternalScriptExecutionIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/IncrementalBuildIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/IncrementalTasksIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/InitScriptExecutionIntegrationTest.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/MixedLegacyAndComponentJvmPluginIntegrationTest.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ParallelTaskExecutionIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/SettingsScriptExecutionIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/WaterProjectIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvySFtpPublishIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/samples/SamplesAntlrIntegrationTest.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/samples/SamplesComponentMetadataRulesIntegrationTest.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/samples/SamplesComponentSelectionRulesIntegrationTest.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/samples/SamplesJavaTestListenerIntegrationTest.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/samples/UserGuideSamplesRunner.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AbstractHttpDependencyResolutionTest.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/ClassFile.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/CompilationOutputsFixture.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/EnableModelDsl.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/ForkScalaCompileInDaemonModeFixture.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/SourceFile.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/TestDependency.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/UserGuideSamplesRunner.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/EmbeddedDaemonGradleExecuter.java
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/RedirectMavenCentral.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/InstalledJvmLocator.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/JvmInstallation.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/OsXInstalledJvmLocator.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/OsXJavaHomeParser.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/UbuntuJvmLocator.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/WindowsOracleJvmLocator.java
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/bintray/BintrayApi.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/bintray/BintrayTestServer.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyHttpModule.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyHttpRepository.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/M2CompatibleIvyPatternHelper.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/RemoteIvyModule.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/RemoteIvyRepository.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/keystore/TestKeyStore.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/BasicHttpResource.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/DelegatingMavenModule.java
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/HttpArtifact.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/HttpResource.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenDependencyExclusion.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenHttpArtifact.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenHttpModule.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenHttpRepository.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MetaDataArtifact.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/PomHttpArtifact.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/resource/RemoteArtifact.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/resource/RemoteResource.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/ExpectOne.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/RepositoryServer.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/ServerExpectation.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/ServerWithExpectations.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/AbstractHttpResource.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/BasicHttpResource.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/CyclicBarrierHttpServer.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpArtifact.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpDirectoryResource.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpResource.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpResourceInteraction.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/IvyHttpModule.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/IvyHttpRepository.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MavenHttpArtifact.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MavenHttpModule.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MavenHttpRepository.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MetaDataArtifact.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/PomHttpArtifact.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/RepositoryHttpServer.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/IvySftpModule.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/IvySftpRepository.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/MavenSftpModule.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/MavenSftpRepository.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/SftpArtifact.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/SftpDirectoryResource.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/SftpResource.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/resources/logback.xml
 rename subprojects/{core-impl/src/integTest/resources/org/gradle/integtests/resolve/http/AbstractHttpsRepoResolveIntegrationTest/shared/clientStore => internal-integ-testing/src/main/resources/test-key-store/keyStore} (100%)
 rename subprojects/{core-impl/src/integTest/resources/org/gradle/integtests/resolve/http/AbstractHttpsRepoResolveIntegrationTest/shared/serverStore => internal-integ-testing/src/main/resources/test-key-store/trustStore} (100%)
 create mode 100644 subprojects/internal-integ-testing/src/test/groovy/org/gradle/integtests/fixtures/jvm/OsXJavaHomeParserTest.groovy
 create mode 100644 subprojects/internal-integ-testing/src/test/groovy/org/gradle/integtests/fixtures/jvm/UbuntuJvmLocatorTest.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/integtests/fixtures/UrlValidator.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/AbstractTestDirectoryProvider.java
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/ClassFile.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/TestDistributionDirectoryProvider.java
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/testfixtures/internal/NativeServicesTestFixture.java
 delete mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/util/Assertions.groovy
 mode change 100755 => 100644 subprojects/internal-testing/src/main/groovy/org/gradle/util/TestPrecondition.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/util/UsesNativeServices.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/util/UsesNativeServicesExtension.groovy
 delete mode 100644 subprojects/internal-testing/src/test/groovy/org/gradle/util/AssertionsTest.groovy
 delete mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/AbstractIvyPublishIntegTest.groovy
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyHttpsLegacyPublishIntegrationTest.groovy
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishHttpsIntegTest.groovy
 delete mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishIdentifierValidationIntegTest.groovy
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishValidationIntegTest.groovy
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyHttpLegacyPublishIntegrationTest.groovy
 delete mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyUrlResolverPublishIntegrationTest.groovy
 create mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/IvyExtraInfoSpec.java
 delete mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/IvyModuleDescriptor.java
 create mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/IvyModuleDescriptorSpec.java
 delete mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/IvyPublicationTasksModelRule.java
 create mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/IvyPublishServices.java
 create mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/publication/DefaultIvyExtraInfoSpec.java
 delete mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/publication/DefaultIvyModuleDescriptor.java
 create mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/publication/DefaultIvyModuleDescriptorSpec.java
 delete mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/publication/IvyModuleDescriptorInternal.java
 create mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/publication/IvyModuleDescriptorSpecInternal.java
 create mode 100644 subprojects/ivy/src/main/java/org/gradle/ivy/IvyDescriptorArtifact.java
 create mode 100644 subprojects/ivy/src/main/java/org/gradle/ivy/IvyModule.java
 create mode 100644 subprojects/ivy/src/main/java/org/gradle/ivy/package-info.java
 rename subprojects/ivy/src/main/resources/META-INF/gradle-plugins/{ivy-publish.properties => org.gradle.ivy-publish.properties} (100%)
 create mode 100644 subprojects/ivy/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/ivy/src/test/groovy/org/gradle/api/publish/ivy/internal/publication/DefaultIvyExtraInfoSpecTest.groovy
 create mode 100644 subprojects/ivy/src/test/groovy/org/gradle/api/publish/ivy/internal/publication/DefaultIvyModuleDescriptorSpecTest.groovy
 create mode 100644 subprojects/ivy/src/testFixtures/groovy/org/gradle/api/publish/ivy/AbstractIvyPublishIntegTest.groovy
 create mode 100644 subprojects/ivy/src/testFixtures/groovy/org/gradle/api/publish/ivy/AbstractIvyRemoteLegacyPublishIntegrationTest.groovy
 rename subprojects/jacoco/src/main/resources/META-INF/gradle-plugins/{jacoco.properties => org.gradle.jacoco.properties} (100%)
 create mode 100644 subprojects/jacoco/src/test/groovy/org/gradle/testing/jacoco/plugins/JacocoReportFixture.groovy
 create mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/base/SourceTransformationException.java
 rename subprojects/javascript/src/main/resources/META-INF/gradle-plugins/{coffeescript-base.properties => org.gradle.coffeescript-base.properties} (100%)
 rename subprojects/javascript/src/main/resources/META-INF/gradle-plugins/{envjs.properties => org.gradle.envjs.properties} (100%)
 rename subprojects/javascript/src/main/resources/META-INF/gradle-plugins/{javascript-base.properties => org.gradle.javascript-base.properties} (100%)
 rename subprojects/javascript/src/main/resources/META-INF/gradle-plugins/{jshint.properties => org.gradle.jshint.properties} (100%)
 rename subprojects/javascript/src/main/resources/META-INF/gradle-plugins/{rhino.properties => org.gradle.rhino.properties} (100%)
 rename subprojects/jetty/src/main/resources/META-INF/gradle-plugins/{jetty.properties => org.gradle.jetty.properties} (100%)
 delete mode 100644 subprojects/language-base/language-base.gradle
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/Binary.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/BinaryContainer.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/BuildableModelElement.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/FunctionalSourceSet.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/LanguageSourceSet.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/ProjectSourceSet.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/AbstractBuildableModelElement.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/AbstractLanguageSourceSet.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryInternal.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryNamingScheme.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryNamingSchemeBuilder.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryContainer.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryNamingScheme.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryNamingSchemeBuilder.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultFunctionalSourceSet.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultProjectSourceSet.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/LanguageSourceSetInternal.java
 delete mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/plugins/LanguageBasePlugin.java
 delete mode 100644 subprojects/language-base/src/test/groovy/org/gradle/language/base/internal/BuildableModelElementTest.groovy
 delete mode 100644 subprojects/language-base/src/test/groovy/org/gradle/language/base/internal/DefaultBinaryNamingSchemeTest.groovy
 delete mode 100644 subprojects/language-base/src/test/groovy/org/gradle/language/base/internal/DefaultFunctionalSourceSetTest.groovy
 create mode 100644 subprojects/language-groovy/language-groovy.gradle
 create mode 100644 subprojects/language-groovy/src/integTest/groovy/org/gradle/groovy/GroovyDocIntegrationTest.groovy
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/ApiGroovyCompiler.java
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/CleaningGroovyCompiler.java
 rename subprojects/{plugins/src/main/groovy => language-groovy/src/main/java}/org/gradle/api/internal/tasks/compile/DefaultGroovyJavaJointCompileSpec.java (100%)
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/DefaultGroovyJavaJointCompileSpecFactory.java
 rename subprojects/{plugins/src/main/groovy => language-groovy/src/main/java}/org/gradle/api/internal/tasks/compile/GroovyCompileSpec.java (100%)
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/GroovyCompileTransformingClassLoader.java
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/GroovyCompilerFactory.java
 rename subprojects/{plugins/src/main/groovy => language-groovy/src/main/java}/org/gradle/api/internal/tasks/compile/GroovyJavaJointCompileSpec.java (100%)
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/GroovyJavaJointCompiler.java
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/NormalizingGroovyCompiler.java
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/compile/daemon/DaemonGroovyCompiler.java
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/tasks/compile/GroovyCompile.java
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/tasks/compile/GroovyCompileOptions.java
 rename subprojects/{plugins/src/main/groovy => language-groovy/src/main/java}/org/gradle/api/tasks/compile/GroovyForkOptions.java (100%)
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/tasks/compile/package-info.java
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/tasks/javadoc/AntGroovydoc.java
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/tasks/javadoc/Groovydoc.java
 create mode 100644 subprojects/language-groovy/src/test/groovy/org/gradle/api/internal/tasks/compile/DefaultGroovyJavaJointCompileSpecFactoryTest.groovy
 create mode 100644 subprojects/language-groovy/src/test/groovy/org/gradle/api/internal/tasks/compile/GroovyCompileTransformingClassLoaderTest.groovy
 create mode 100644 subprojects/language-groovy/src/test/groovy/org/gradle/api/internal/tasks/compile/NormalizingGroovyCompilerTest.groovy
 create mode 100644 subprojects/language-groovy/src/test/groovy/org/gradle/api/tasks/compile/GroovyCompileOptionsTest.groovy
 rename subprojects/{plugins => language-groovy}/src/test/groovy/org/gradle/api/tasks/compile/GroovyForkOptionsTest.groovy (100%)
 rename subprojects/{plugins => language-groovy}/src/test/groovy/org/gradle/api/tasks/javadoc/GroovydocTest.java (100%)
 create mode 100644 subprojects/language-java/language-java.gradle
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/api/tasks/compile/JavaCompileIntegrationTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/api/tasks/compile/JavaCompileParallelIntegrationTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/java/compile/incremental/CrossTaskIncrementalJavaCompilationIntegrationTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/java/compile/incremental/SourceIncrementalJavaCompilationIntegrationTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/javadoc/JavadocIntegrationTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/language/java/JavaLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/language/java/JavaLanguageIntegrationTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/language/java/SampleJavaLanguageIntegrationTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/language/java/plugins/JavaLanguagePluginGoodBehaviourTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/language/java/plugins/JavaLanguagePluginIntegrationTest.groovy
 rename subprojects/{plugins => language-java}/src/integTest/resources/org/gradle/javadoc/JavadocIntegrationTest/canCombineLocalOptionWithOtherOptions/build.gradle (100%)
 rename subprojects/{plugins => language-java}/src/integTest/resources/org/gradle/javadoc/JavadocIntegrationTest/canCombineLocalOptionWithOtherOptions/src/main/java/Person.java (100%)
 rename subprojects/{plugins => language-java}/src/integTest/resources/org/gradle/javadoc/JavadocIntegrationTest/canCombineLocalOptionWithOtherOptions/src/taglet/java/LocaleAwareTaglet.java (100%)
 rename subprojects/{plugins => language-java}/src/integTest/resources/org/gradle/javadoc/JavadocIntegrationTest/handlesTagsAndTaglets/build.gradle (100%)
 rename subprojects/{plugins => language-java}/src/integTest/resources/org/gradle/javadoc/JavadocIntegrationTest/handlesTagsAndTaglets/src/main/java/Person.java (100%)
 rename subprojects/{plugins => language-java}/src/integTest/resources/org/gradle/javadoc/JavadocIntegrationTest/handlesTagsAndTaglets/src/taglet/java/CustomTaglet.java (100%)
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/DefaultJavaToolChain.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/AbstractJavaCompileSpecFactory.java
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/api/internal/tasks/compile/AntDepend.java (100%)
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/AntDependsStaleClassCleaner.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/CleaningJavaCompiler.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/CleaningJavaCompilerSupport.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/CommandLineJavaCompileSpec.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/CommandLineJavaCompiler.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/CommandLineJavaCompilerArgumentsGenerator.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/DaemonJavaCompiler.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/DefaultJavaCompileSpec.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/DefaultJavaCompileSpecFactory.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/DefaultJavaCompilerFactory.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/ForkingJavaCompileSpec.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/JavaCompileSpec.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/JavaCompilerArgumentsBuilder.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/JavaCompilerFactory.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/JavaHomeBasedJavaCompilerFactory.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/JdkJavaCompiler.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/NormalizingJavaCompiler.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/ClassSetAnalysisUpdater.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/CompilationSourceDirs.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationFinalizer.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationInitializer.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilerDecorator.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilerFactory.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/JavaChangeProcessor.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/RecompilationNotNecessary.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/RecompilationSpecProvider.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/SelectiveCompiler.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/SourceToNameConverter.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/analyzer/CachingClassDependenciesAnalyzer.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassAnalysis.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassAnalysisCache.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassAnalysisSerializer.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesAnalyzer.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesVisitor.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassFilesAnalyzer.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassRelevancyFilter.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/analyzer/DefaultClassAnalysisCache.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/analyzer/DefaultClassDependenciesAnalyzer.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/cache/CompileCaches.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/cache/DefaultGeneralCompileCaches.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/cache/GeneralCompileCaches.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/deps/AffectedClasses.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependentsAccumulator.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/deps/ClassSetAnalysis.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/deps/ClassSetAnalysisData.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/deps/DefaultDependentsSet.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/deps/DependencyToAll.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/deps/DependentsSet.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/deps/LocalClassSetAnalysisStore.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/deps/OutputToNameConverter.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/CachingJarSnapshotter.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/ClasspathJarFinder.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/DefaultJarSnapshotCache.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/DefaultJarSnapshotter.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarArchive.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarChangeDependentsFinder.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarChangeProcessor.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarClasspathSnapshot.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarClasspathSnapshotData.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarClasspathSnapshotDataSerializer.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarClasspathSnapshotFactory.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarClasspathSnapshotMaker.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarClasspathSnapshotProvider.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarClasspathSnapshotWriter.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshot.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotCache.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotData.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotDataSerializer.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotter.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/LocalJarClasspathSnapshotStore.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/jar/PreviousCompilation.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/recomp/RecompilationSpec.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/tasks/compile/CompileOptions.java
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/api/tasks/compile/DebugOptions.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/api/tasks/compile/DependOptions.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/api/tasks/compile/ForkOptions.java (100%)
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/tasks/compile/JavaCompile.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/tasks/compile/package-info.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/tasks/javadoc/Javadoc.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/tasks/javadoc/internal/JavadocGenerator.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/tasks/javadoc/internal/JavadocSpec.java
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/api/tasks/javadoc/package-info.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/CoreJavadocOptions.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/JavadocMemberLevel.java (100%)
 create mode 100755 subprojects/language-java/src/main/java/org/gradle/external/javadoc/JavadocOfflineLink.java
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/JavadocOptionFileOption.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/JavadocOutputLevel.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/MinimalJavadocOptions.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/OptionLessJavadocOptionFileOption.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/StandardJavadocDocletOptions.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/internal/AbstractJavadocOptionFileOption.java (100%)
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/external/javadoc/internal/AbstractListJavadocOptionFileOption.java
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/internal/BooleanJavadocOptionFileOption.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/internal/EnumJavadocOptionFileOption.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/internal/FileJavadocOptionFileOption.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/internal/GroupsJavadocOptionFileOption.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/internal/JavadocExecHandleBuilder.java (100%)
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/external/javadoc/internal/JavadocOptionFile.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/external/javadoc/internal/JavadocOptionFileWriter.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/external/javadoc/internal/JavadocOptionFileWriterContext.java
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/internal/LinksOfflineJavadocOptionFileOption.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/internal/MultilineStringsJavadocOptionFileOption.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/internal/OptionLessStringsJavadocOptionFileOption.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/internal/PathJavadocOptionFileOption.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/internal/StringJavadocOptionFileOption.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/internal/StringsJavadocOptionFileOption.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-java/src/main/java}/org/gradle/external/javadoc/package-info.java (100%)
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/language/java/JavaSourceSet.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/language/java/artifact/JavadocArtifact.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/language/java/artifact/package-info.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/language/java/internal/DefaultJavaLanguageSourceSet.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/language/java/internal/JavaLanguagePluginServiceRegistry.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/language/java/internal/JavaToolChainServiceRegistry.java
 rename subprojects/{language-jvm/src/main/groovy => language-java/src/main/java}/org/gradle/language/java/package-info.java (100%)
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/language/java/plugins/JavaLanguagePlugin.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/language/java/plugins/package-info.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/language/java/tasks/PlatformJavaCompile.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/language/java/tasks/package-info.java
 create mode 100644 subprojects/language-java/src/main/resources/META-INF/gradle-plugins/org.gradle.java-lang.properties
 create mode 100644 subprojects/language-java/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/DefaultJavaToolChainTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/CleaningJavaCompilerTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/CommandLineJavaCompilerArgumentsGeneratorTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/DefaultJavaCompileSpecFactoryTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/DefaultJavaCompilerFactoryTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/JavaCompilerArgumentsBuilderTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/JavaHomeBasedJavaCompilerFactoryTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/NormalizingJavaCompilerTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassSetAnalysisUpdaterTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationFinalizerTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationInitializerTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/SourceToNameConverterTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/DefaultClassDependenciesAnalyzerTest.groovy
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/SomeClassAnnotation.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/SomeRuntimeAnnotation.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/SomeSourceAnnotation.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/UsesAnnotationInField.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/UsesClassAnnotation.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/UsesRuntimeAnnotation.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/UsesSourceAnnotation.java (100%)
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependentsAccumulatorTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassFilesAnalyzerTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassSetAnalysisDataSerializerTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassSetAnalysisTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/OutputToNameConverterTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/DefaultJarSnapshotterTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarClasspathSnapshotFactoryTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarClasspathSnapshotMakerTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/AccessedFromPrivateClass.java
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/HasNonPrivateConstants.java
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/HasPrivateConstants.java
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/HasPublicConstants.java
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/SomeClass.java
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/SomeOtherClass.java
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/UsedByNonPrivateConstantsClass.java
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/YetAnotherClass.java
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/tasks/compile/CompileOptionsTest.groovy
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/api/tasks/compile/DebugOptionsTest.groovy (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/api/tasks/compile/ForkOptionsTest.groovy (100%)
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/tasks/compile/JavaCompileTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/tasks/javadoc/JavadocTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/external/javadoc/StandardJavadocDocletOptionsTest.java
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/external/javadoc/internal/BooleanJavadocOptionFileOptionTest.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/external/javadoc/internal/EnumJavadocOptionFileOptionTest.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/external/javadoc/internal/FileJavadocOptionFileOptionTest.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/external/javadoc/internal/GroupsJavadocOptionFileOptionTest.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/external/javadoc/internal/JavadocExecHandleBuilderTest.groovy (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/external/javadoc/internal/JavadocOptionFileTest.java (100%)
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/external/javadoc/internal/JavadocOptionFileWriterContextTest.groovy
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/external/javadoc/internal/JavadocOptionFileWriterTest.groovy (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/external/javadoc/internal/LinksOfflineJavadocOptionFileOptionTest.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/external/javadoc/internal/MultilineStringsJavadocOptionFileOptionTest.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/external/javadoc/internal/OptionLessStringsJavadocOptionFileOptionTest.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/external/javadoc/internal/PathJavadocOptionFileOptionTest.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/external/javadoc/internal/StringJavadocOptionFileOptionTest.java (100%)
 rename subprojects/{plugins => language-java}/src/test/groovy/org/gradle/external/javadoc/internal/StringsJavadocOptionFileOptionTest.java (100%)
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/language/java/plugins/JavaLanguagePluginTest.groovy
 create mode 100644 subprojects/language-java/src/testFixtures/groovy/org/gradle/language/fixtures/BadJavaComponent.groovy
 create mode 100644 subprojects/language-java/src/testFixtures/groovy/org/gradle/language/fixtures/TestJavaComponent.groovy
 create mode 100644 subprojects/language-jvm/src/integTest/groovy/org/gradle/language/jvm/JvmResourcesPluginIntegrationTest.groovy
 create mode 100644 subprojects/language-jvm/src/integTest/groovy/org/gradle/language/jvm/ResourceOnlyJvmLibraryIntegrationTest.groovy
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/java/JavaSourceSet.java
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/java/internal/DefaultJavaSourceSet.java
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/ClassDirectoryBinary.java
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/Classpath.java
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/ResourceSet.java
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/ClassDirectoryBinaryNamingScheme.java
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/DefaultClassDirectoryBinary.java
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/DefaultClasspath.java
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/DefaultResourceSet.java
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/SimpleStaleClassCleaner.java
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/StaleClassCleaner.java
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/plugins/JvmLanguagePlugin.java
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/plugins/package-info.java
 delete mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/tasks/ProcessResources.java
 rename subprojects/{plugins/src/main/groovy => language-jvm/src/main/java}/org/gradle/api/internal/tasks/compile/CompilationFailedException.java (100%)
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/CompileSpecToArguments.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/DefaultJvmLanguageCompileSpec.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/ExecSpecBackedArgCollector.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/JvmLanguageCompileSpec.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/NoOpStaleClassCleaner.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/daemon/AbstractDaemonCompiler.java
 rename subprojects/{plugins/src/main/groovy => language-jvm/src/main/java}/org/gradle/api/internal/tasks/compile/daemon/CompileResult.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-jvm/src/main/java}/org/gradle/api/internal/tasks/compile/daemon/CompilerClientsManager.java (100%)
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemon.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonClient.java
 rename subprojects/{plugins/src/main/groovy => language-jvm/src/main/java}/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonClientProtocol.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-jvm/src/main/java}/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonFactory.java (100%)
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonManager.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonServer.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonServerProtocol.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonStarter.java
 rename subprojects/{plugins/src/main/groovy => language-jvm/src/main/java}/org/gradle/api/internal/tasks/compile/daemon/DaemonForkOptions.java (100%)
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/daemon/InProcessCompilerDaemonFactory.java
 rename subprojects/{plugins/src/main/groovy => language-jvm/src/main/java}/org/gradle/api/tasks/compile/AbstractCompile.java (100%)
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/tasks/compile/AbstractOptions.java
 rename subprojects/{plugins/src/main/groovy => language-jvm/src/main/java}/org/gradle/api/tasks/compile/BaseForkOptions.java (100%)
 rename subprojects/{plugins/src/main/groovy => language-jvm/src/main/java}/org/gradle/api/tasks/compile/package-info.java (100%)
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/language/jvm/JvmResourceSet.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/language/jvm/internal/DefaultJvmResourceLanguageSourceSet.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/language/jvm/internal/EmptyClasspath.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/language/jvm/internal/JvmPluginServiceRegistry.java
 rename subprojects/language-jvm/src/main/{groovy => java}/org/gradle/language/jvm/package-info.java (100%)
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/language/jvm/plugins/JvmResourcesPlugin.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/language/jvm/plugins/package-info.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/language/jvm/tasks/ProcessResources.java
 rename subprojects/language-jvm/src/main/{groovy => java}/org/gradle/language/jvm/tasks/package-info.java (100%)
 create mode 100644 subprojects/language-jvm/src/main/resources/META-INF/gradle-plugins/org.gradle.jvm-resources.properties
 create mode 100644 subprojects/language-jvm/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 rename subprojects/{plugins => language-jvm}/src/test/groovy/org/gradle/api/internal/tasks/compile/daemon/CompilerClientsManagerTest.groovy (100%)
 create mode 100644 subprojects/language-jvm/src/test/groovy/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonManagerTest.groovy
 rename subprojects/{plugins => language-jvm}/src/test/groovy/org/gradle/api/internal/tasks/compile/daemon/DaemonForkOptionsMergeTest.groovy (100%)
 rename subprojects/{plugins => language-jvm}/src/test/groovy/org/gradle/api/internal/tasks/compile/daemon/DaemonForkOptionsTest.groovy (100%)
 rename subprojects/{plugins => language-jvm}/src/test/groovy/org/gradle/api/tasks/compile/AbstractOptionsTest.groovy (100%)
 delete mode 100644 subprojects/language-jvm/src/test/groovy/org/gradle/language/java/internal/DefaultJavaSourceSetTest.groovy
 delete mode 100644 subprojects/language-jvm/src/test/groovy/org/gradle/language/jvm/internal/ClassDirectoryBinaryNamingSchemeTest.groovy
 delete mode 100644 subprojects/language-jvm/src/test/groovy/org/gradle/language/jvm/internal/DefaultClassDirectoryBinaryTest.groovy
 delete mode 100644 subprojects/language-jvm/src/test/groovy/org/gradle/language/jvm/internal/DefaultResourceSetTest.groovy
 create mode 100644 subprojects/language-jvm/src/testFixtures/groovy/org/gradle/integtests/fixtures/jvm/IncrementalTestJvmComponent.groovy
 create mode 100644 subprojects/language-jvm/src/testFixtures/groovy/org/gradle/integtests/fixtures/jvm/JvmSourceFile.java
 create mode 100644 subprojects/language-jvm/src/testFixtures/groovy/org/gradle/integtests/fixtures/jvm/TestJvmComponent.groovy
 create mode 100644 subprojects/language-jvm/src/testFixtures/groovy/org/gradle/integtests/language/AbstractJvmLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100644 subprojects/language-jvm/src/testFixtures/groovy/org/gradle/integtests/language/AbstractJvmLanguageIntegrationTest.groovy
 create mode 100644 subprojects/language-jvm/src/testFixtures/groovy/org/gradle/integtests/language/AbstractJvmPluginLanguageIntegrationTest.groovy
 create mode 100644 subprojects/language-native/language-native.gradle
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/AbstractNativeLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/AbstractNativeLanguageIncrementalCompileIntegrationTest.groovy
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/AbstractNativeLanguageIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/AbstractNativePreCompiledHeaderIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/AutoTestedSamplesLanguageNativeIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/DuplicateBaseNamesIntegrationTest.groovy
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/assembler/AssemblyLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/assembler/AssemblyLanguageIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/assembler/plugins/AssemblerLangPluginIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/assembler/plugins/AssemblerPluginIntegrationTest.groovy
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/c/CCallingMixedCAndCppLanguageIntegrationTest.groovy
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/c/CLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/c/CLanguageIncrementalCompileIntegrationTest.groovy
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/c/CLanguageIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/c/CPreCompiledHeaderSourcesIntegrationTest.groovy
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/c/CppCallingCLanguageIntegrationTest.groovy
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/c/MixedLanguageIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/c/plugins/CLangPluginIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/c/plugins/CPluginIntegrationTest.groovy
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/cpp/CppLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/cpp/CppLanguageIncrementalCompileIntegrationTest.groovy
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/cpp/CppLanguageIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/cpp/CppPreCompiledHeaderSourcesIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/cpp/plugins/CppLangPluginIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/cpp/plugins/CppPluginIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/fixtures/app/DuplicateAssemblerBaseNamesTestApp.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/fixtures/app/DuplicateCBaseNamesTestApp.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/fixtures/app/DuplicateCppBaseNamesTestApp.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/fixtures/app/DuplicateMixedSameBaseNamesTestApp.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/fixtures/app/DuplicateObjectiveCBaseNamesTestApp.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/fixtures/app/DuplicateObjectiveCppBaseNamesTestApp.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/fixtures/app/DuplicateWindowsResourcesBaseNamesTestApp.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/nativeplatform/NativeLanguageSamplesIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/nativeplatform/ParallelNativePluginsIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivec/MixedObjectiveCIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivec/ObjectiveCLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivec/ObjectiveCLanguageIncrementalCompileIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivec/ObjectiveCLanguageIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivec/ObjectiveCPreCompiledHeaderSourcesIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivec/ObjectiveCUnsupportedIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivec/plugins/ObjectiveCLangPluginIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivec/plugins/ObjectiveCPluginIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivecpp/ObjectiveCppLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivecpp/ObjectiveCppLanguageIncrementalCompileIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivecpp/ObjectiveCppLanguageIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivecpp/ObjectiveCppPreCompiledHeaderSourcesIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivecpp/ObjectiveCppUnsupportedIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivecpp/plugins/ObjectiveCppLangPluginIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/objectivecpp/plugins/ObjectiveCppPluginIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/rc/WindowsResourcesIncrementalBuildIntegrationTest.groovy
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/rc/WindowsResourcesIntegrationTest.groovy
 create mode 100755 subprojects/language-native/src/integTest/groovy/org/gradle/language/rc/WindowsResourcesUnsupportedIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/rc/plugins/WindowsResourceScriptPluginIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/integTest/groovy/org/gradle/language/rc/plugins/WindowsResourcesPluginIntegrationTest.groovy
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/PreprocessingTool.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/assembler/AssemblerSourceSet.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/assembler/internal/DefaultAssembleSpec.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/assembler/internal/DefaultAssemblerSourceSet.java
 rename subprojects/{cpp/src/main/groovy => language-native/src/main/java}/org/gradle/language/assembler/package-info.java (100%)
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/assembler/plugins/AssemblerLangPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/assembler/plugins/AssemblerPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/assembler/plugins/internal/AssembleTaskConfig.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/assembler/plugins/package-info.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/assembler/tasks/Assemble.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/assembler/tasks/package-info.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/c/CSourceSet.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/c/internal/DefaultCCompileSpec.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/c/internal/DefaultCPCHCompileSpec.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/c/internal/DefaultCSourceSet.java
 rename subprojects/{cpp/src/main/groovy => language-native/src/main/java}/org/gradle/language/c/package-info.java (100%)
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/c/plugins/CLangPCHPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/c/plugins/CLangPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/c/plugins/CPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/c/plugins/package-info.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/c/tasks/CCompile.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/c/tasks/CPreCompiledHeaderCompile.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/c/tasks/package-info.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/cpp/CppSourceSet.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/cpp/internal/DefaultCppCompileSpec.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/cpp/internal/DefaultCppPCHCompileSpec.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/cpp/internal/DefaultCppSourceSet.java
 rename subprojects/{cpp/src/main/groovy => language-native/src/main/java}/org/gradle/language/cpp/package-info.java (100%)
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/cpp/plugins/CppLangPCHPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/cpp/plugins/CppLangPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/cpp/plugins/CppPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/cpp/plugins/package-info.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/cpp/tasks/CppCompile.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/cpp/tasks/CppPreCompiledHeaderCompile.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/cpp/tasks/package-info.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/AbstractHeaderExportingDependentSourceSet.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/AbstractHeaderExportingSourceSet.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/AbstractNativeCompileSpec.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/CompileTaskConfig.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/DefaultPreprocessingTool.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/NativeLanguageTransform.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/PCHCompileTaskConfig.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/CompilationFileState.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/CompilationState.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/CompilationStateCacheFactory.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/CompilationStateSerializer.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/DefaultCompilationStateCacheFactory.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/DefaultIncrementalCompilation.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/DefaultSourceIncludes.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/DefaultSourceIncludesParser.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/DefaultSourceIncludesResolver.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/IncrementalCompilation.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/IncrementalCompileProcessor.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/IncrementalCompilerBuilder.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/IncrementalNativeCompiler.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/ResolvedInclude.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/SourceIncludesParser.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/SourceIncludesResolver.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/sourceparser/CSourceParser.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/sourceparser/PreprocessingReader.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/incremental/sourceparser/RegexBackedCSourceParser.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/registry/NativeLanguageServices.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/tasks/AbstractNativeCompileTask.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/tasks/AbstractNativePCHCompileTask.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/tasks/package-info.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivec/ObjectiveCSourceSet.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivec/internal/DefaultObjectiveCCompileSpec.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivec/internal/DefaultObjectiveCPCHCompileSpec.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivec/internal/DefaultObjectiveCSourceSet.java
 rename subprojects/{cpp/src/main/groovy => language-native/src/main/java}/org/gradle/language/objectivec/package-info.java (100%)
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivec/plugins/ObjectiveCLangPCHPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivec/plugins/ObjectiveCLangPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivec/plugins/ObjectiveCPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivec/plugins/package-info.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivec/tasks/ObjectiveCCompile.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivec/tasks/ObjectiveCPreCompiledHeaderCompile.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivec/tasks/package-info.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivecpp/ObjectiveCppSourceSet.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivecpp/internal/DefaultObjectiveCppCompileSpec.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivecpp/internal/DefaultObjectiveCppPCHCompileSpec.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivecpp/internal/DefaultObjectiveCppSourceSet.java
 rename subprojects/{cpp/src/main/groovy => language-native/src/main/java}/org/gradle/language/objectivecpp/package-info.java (100%)
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivecpp/plugins/ObjectiveCppLangPCHPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivecpp/plugins/ObjectiveCppLangPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivecpp/plugins/ObjectiveCppPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivecpp/plugins/package-info.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivecpp/tasks/ObjectiveCppCompile.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivecpp/tasks/ObjectiveCppPreCompiledHeaderCompile.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/objectivecpp/tasks/package-info.java
 rename subprojects/{cpp/src/main/groovy => language-native/src/main/java}/org/gradle/language/package-info.java (100%)
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/rc/WindowsResourceSet.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/rc/internal/DefaultWindowsResourceCompileSpec.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/rc/internal/DefaultWindowsResourceSet.java
 rename subprojects/{cpp/src/main/groovy => language-native/src/main/java}/org/gradle/language/rc/package-info.java (100%)
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/rc/plugins/WindowsResourceScriptPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/rc/plugins/WindowsResourcesPlugin.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/rc/plugins/internal/WindowsResourcesCompileTaskConfig.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/rc/plugins/package-info.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/rc/tasks/WindowsResourceCompile.java
 create mode 100644 subprojects/language-native/src/main/java/org/gradle/language/rc/tasks/package-info.java
 create mode 100644 subprojects/language-native/src/main/resources/META-INF/gradle-plugins/org.gradle.assembler-lang.properties
 create mode 100644 subprojects/language-native/src/main/resources/META-INF/gradle-plugins/org.gradle.assembler.properties
 create mode 100644 subprojects/language-native/src/main/resources/META-INF/gradle-plugins/org.gradle.c-lang.properties
 create mode 100644 subprojects/language-native/src/main/resources/META-INF/gradle-plugins/org.gradle.c.properties
 create mode 100644 subprojects/language-native/src/main/resources/META-INF/gradle-plugins/org.gradle.cpp-lang.properties
 create mode 100644 subprojects/language-native/src/main/resources/META-INF/gradle-plugins/org.gradle.cpp.properties
 create mode 100644 subprojects/language-native/src/main/resources/META-INF/gradle-plugins/org.gradle.objective-c-lang.properties
 create mode 100644 subprojects/language-native/src/main/resources/META-INF/gradle-plugins/org.gradle.objective-c.properties
 create mode 100644 subprojects/language-native/src/main/resources/META-INF/gradle-plugins/org.gradle.objective-cpp-lang.properties
 create mode 100644 subprojects/language-native/src/main/resources/META-INF/gradle-plugins/org.gradle.objective-cpp.properties
 create mode 100644 subprojects/language-native/src/main/resources/META-INF/gradle-plugins/org.gradle.windows-resource-script.properties
 create mode 100644 subprojects/language-native/src/main/resources/META-INF/gradle-plugins/org.gradle.windows-resources.properties
 create mode 100644 subprojects/language-native/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/AbstractNativeComponentPluginTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/assembler/plugins/AssemblerLangPluginTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/assembler/plugins/AssemblerPluginTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/assembler/tasks/AssemblerTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/c/plugins/CLangPluginTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/c/plugins/CPluginTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/c/tasks/CCompileTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/cpp/internal/DefaultCppSourceSetTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/cpp/plugins/CppLangPluginTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/cpp/plugins/CppPluginTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/cpp/tasks/CppCompileTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/nativeplatform/internal/incremental/CompilationStateSerializerTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/nativeplatform/internal/incremental/DefaultSourceIncludesParserTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/nativeplatform/internal/incremental/DefaultSourceIncludesResolverTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/nativeplatform/internal/incremental/IncrementalCompileProcessorTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/nativeplatform/internal/incremental/IncrementalNativeCompilerTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/nativeplatform/internal/incremental/sourceparser/PreprocessingReaderTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/nativeplatform/internal/incremental/sourceparser/RegexBackedCSourceParserTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/objectivec/plugins/ObjectiveCLangPluginTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/objectivec/plugins/ObjectiveCPluginTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/objectivecpp/plugins/ObjectiveCppLangPluginTest.groovy
 create mode 100644 subprojects/language-native/src/test/groovy/org/gradle/language/objectivecpp/plugins/ObjectiveCppPluginTest.groovy
 create mode 100644 subprojects/language-scala/language-scala.gradle
 create mode 100644 subprojects/language-scala/src/integTest/groovy/org/gradle/language/scala/JointScalaLangIntegrationTest.groovy
 create mode 100644 subprojects/language-scala/src/integTest/groovy/org/gradle/language/scala/SampleScalaLanguageIntegrationTest.groovy
 create mode 100644 subprojects/language-scala/src/integTest/groovy/org/gradle/language/scala/ScalaLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100644 subprojects/language-scala/src/integTest/groovy/org/gradle/language/scala/ScalaLanguageIntegrationTest.groovy
 create mode 100644 subprojects/language-scala/src/integTest/groovy/org/gradle/language/scala/ScalaToolProviderNotAvailableIntegrationTest.groovy
 create mode 100644 subprojects/language-scala/src/integTest/groovy/org/gradle/language/scala/plugins/ScalaLanguagePluginGoodBehaviourTest.groovy
 create mode 100644 subprojects/language-scala/src/integTest/groovy/org/gradle/language/scala/plugins/ScalaLanguagePluginIntegrationTest.groovy
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/api/internal/tasks/scala/DaemonScalaCompiler.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/api/internal/tasks/scala/DefaultScalaJavaJointCompileSpec.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/api/internal/tasks/scala/DefaultScalaJavaJointCompileSpecFactory.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/api/internal/tasks/scala/NormalizingScalaCompiler.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/api/internal/tasks/scala/ScalaCompileSpec.java
 rename subprojects/{scala/src/main/groovy => language-scala/src/main/java}/org/gradle/api/internal/tasks/scala/ScalaJavaJointCompileSpec.java (100%)
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/api/internal/tasks/scala/ZincScalaCompiler.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/api/internal/tasks/scala/ZincScalaCompilerArgumentsGenerator.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/api/tasks/scala/IncrementalCompileOptions.java
 rename subprojects/{scala/src/main/groovy => language-scala/src/main/java}/org/gradle/api/tasks/scala/ScalaForkOptions.java (100%)
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/api/tasks/scala/package-info.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/ScalaLanguageSourceSet.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/ScalaPlatform.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/DefaultScalaLanguageSourceSet.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/DefaultScalaPlatform.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/toolchain/DefaultScalaToolProvider.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/toolchain/DownloadingScalaToolChain.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/toolchain/NotFoundScalaToolProvider.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/toolchain/ScalaToolChainInternal.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/toolchain/ScalaToolChainServiceRegistry.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/package-info.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/plugins/ScalaLanguagePlugin.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/plugins/package-info.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/tasks/AbstractScalaCompile.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/tasks/BaseScalaCompileOptions.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/tasks/PlatformScalaCompile.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/tasks/package-info.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/toolchain/ScalaToolChain.java
 create mode 100644 subprojects/language-scala/src/main/java/org/gradle/language/scala/toolchain/package-info.java
 create mode 100644 subprojects/language-scala/src/main/resources/META-INF/gradle-plugins/org.gradle.scala-lang.properties
 create mode 100644 subprojects/language-scala/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/language-scala/src/test/groovy/org/gradle/api/internal/tasks/scala/DefaultScalaJavaJointCompileSpecFactoryTest.groovy
 create mode 100644 subprojects/language-scala/src/test/groovy/org/gradle/api/internal/tasks/scala/NormalizingScalaCompilerTest.groovy
 create mode 100644 subprojects/language-scala/src/test/groovy/org/gradle/api/internal/tasks/scala/ZincScalaCompilerArgumentsGeneratorTest.groovy
 create mode 100644 subprojects/language-scala/src/test/groovy/org/gradle/language/scala/internal/toolchain/DefaultScalaToolProviderTest.groovy
 create mode 100644 subprojects/language-scala/src/test/groovy/org/gradle/language/scala/internal/toolchain/DownloadingScalaToolChainTest.groovy
 create mode 100644 subprojects/language-scala/src/test/groovy/org/gradle/language/scala/plugins/ScalaLanguagePluginTest.groovy
 create mode 100644 subprojects/language-scala/src/testFixtures/groovy/org/gradle/language/scala/fixtures/BadScalaLibrary.groovy
 create mode 100644 subprojects/language-scala/src/testFixtures/groovy/org/gradle/language/scala/fixtures/TestJointCompiledComponent.groovy
 create mode 100644 subprojects/language-scala/src/testFixtures/groovy/org/gradle/language/scala/fixtures/TestScalaComponent.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/BuildEnvironmentIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/CommandLineIntegrationSpec.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/GradleNativeIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/DaemonHealthLoggingIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/DaemonNativeServicesIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/DaemonOutputToggleIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/DaemonPerformanceMonitoringIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/DaemonReuseIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/DaemonStartupMessageIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/DaemonUsageSuggestionIntegrationTest.groovy
 delete mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/EmbeddedDaemonSmokeTest.groovy
 delete mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/ExecuteBuildAction.java
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/IsolatedDaemonSpec.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/LocaleSupportDaemonIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/ProcessCrashHandlingIntegrationTest.groovy
 delete mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/testing/DaemonContextParser.java
 delete mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/testing/DaemonLogsAnalyzer.groovy
 delete mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/testing/TestableDaemon.groovy
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/cli/JavaRuntimeValidationAction.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/bootstrap/ForegroundDaemonAction.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/bootstrap/ForegroundDaemonMain.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DaemonCancelForwarder.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DaemonClientFactory.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DaemonClientGlobalServices.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DaemonClientInterruptedException.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DaemonStartListener.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DaemonStopClient.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/JvmVersionValidator.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/StopDaemonClientServices.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/StubDaemonHealthServices.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/configuration/DaemonUsage.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/context/DaemonInstanceDetails.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/protocol/BuildEvent.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/protocol/Cancel.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/protocol/Message.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/protocol/StopWhenIdle.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/DaemonStoppedException.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/api/DaemonCommandAction.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/api/DaemonCommandExecution.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/api/DaemonConnection.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/api/DaemonStateControl.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/api/DaemonStoppedException.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/api/DaemonUnavailableException.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/api/StdinHandler.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/CatchAndForwardDaemonFailure.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/DaemonCommandAction.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/DaemonCommandExecution.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/DaemonConnection.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/DaemonHygieneAction.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/DaemonStateControl.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/DaemonUnavailableException.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/HandleCancel.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/HandleStop.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/RequestStopIfSingleUsedDaemon.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/StartStopIfBuildAndStop.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/StdinHandler.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/StopHandlingCommandExecuter.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/DaemonHealthServices.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/DaemonHealthTracker.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/DaemonStats.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/DaemonStatus.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/DefaultDaemonHealthServices.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/HealthLogger.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/HintGCAfterBuild.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/MemoryInfo.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/ChainingBuildActionRunner.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/DaemonUsageSuggestingBuildActionExecuter.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/DefaultBuildInvocations.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableImplementation.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ClassLoaderCache.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ClientSidePayloadClassLoaderFactory.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ConfiguringBuildAction.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DaemonSidePayloadClassLoaderFactory.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DefaultBuildController.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ExecuteBuildActionRunner.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/InternalCancellationTokenAdapter.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/JarCache.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/LauncherServices.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/PayloadClassLoaderFactory.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ProviderStartParameterConverter.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ReflectionClassLookup.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ShutdownCoordinator.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ToolingGlobalScopeServices.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ToolingServices.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/connection/AdaptedOperationParameters.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/events/AbstractTestProgressEvent.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/events/AbstractTestResult.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/events/DefaultFailure.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/events/DefaultTestDescriptor.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/events/DefaultTestFailureResult.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/events/DefaultTestFinishedProgressEvent.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/events/DefaultTestSkippedResult.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/events/DefaultTestStartedProgressEvent.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/events/DefaultTestSuccessResult.java
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/client/DaemonCancelForwarderTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/client/DaemonStopClientTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/client/JvmVersionValidatorTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/exec/DaemonHygieneActionTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/DaemonHealthTrackerTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/DaemonStatsTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/DaemonStatusTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/HealthLoggerTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/HintGCAfterBuildTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/exec/ChainingBuildActionRunnerTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/exec/DaemonUsageSuggestingBuildActionExecuterTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ClientSidePayloadClassLoaderFactoryTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ConfiguringBuildActionTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/DaemonSidePayloadClassLoaderFactoryTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/DefaultBuildControllerTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/JarCacheTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ModelClassLoaderFactoryTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ProviderStartParameterConverterTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ToolingGlobalScopeServicesTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/connection/AdaptedOperationParametersTest.groovy
 create mode 100644 subprojects/launcher/src/testFixtures/groovy/org/gradle/launcher/daemon/testing/AbstractDaemonFixture.groovy
 create mode 100644 subprojects/launcher/src/testFixtures/groovy/org/gradle/launcher/daemon/testing/DaemonContextParser.java
 create mode 100644 subprojects/launcher/src/testFixtures/groovy/org/gradle/launcher/daemon/testing/DaemonFixture.java
 create mode 100644 subprojects/launcher/src/testFixtures/groovy/org/gradle/launcher/daemon/testing/DaemonLogFileStateProbe.groovy
 create mode 100644 subprojects/launcher/src/testFixtures/groovy/org/gradle/launcher/daemon/testing/DaemonLogsAnalyzer.groovy
 create mode 100644 subprojects/launcher/src/testFixtures/groovy/org/gradle/launcher/daemon/testing/DaemonRegistryStateProbe.groovy
 create mode 100644 subprojects/launcher/src/testFixtures/groovy/org/gradle/launcher/daemon/testing/DaemonStateProbe.java
 create mode 100644 subprojects/launcher/src/testFixtures/groovy/org/gradle/launcher/daemon/testing/DaemonsFixture.java
 create mode 100644 subprojects/launcher/src/testFixtures/groovy/org/gradle/launcher/daemon/testing/LegacyDaemon.groovy
 create mode 100644 subprojects/launcher/src/testFixtures/groovy/org/gradle/launcher/daemon/testing/TestableDaemon.groovy
 delete mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/AbstractMavenPublishIntegTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublicationVersionRangeIntegTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishDependenciesIntegTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishHttpsIntegTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishPomPackagingIntegTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishVersionRangeIntegrationTest.groovy
 create mode 100644 subprojects/maven/src/main/groovy/org/apache/maven/artifact/ant/Authentication.java
 create mode 100644 subprojects/maven/src/main/groovy/org/apache/maven/artifact/ant/Proxy.java
 create mode 100644 subprojects/maven/src/main/groovy/org/apache/maven/artifact/ant/RemoteRepository.java
 create mode 100644 subprojects/maven/src/main/groovy/org/apache/maven/artifact/ant/Repository.java
 create mode 100644 subprojects/maven/src/main/groovy/org/apache/maven/artifact/ant/RepositoryPolicy.java
 create mode 100644 subprojects/maven/src/main/groovy/org/apache/maven/artifact/ant/package-info.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/CustomModelBuilder.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/DefaultConf2ScopeMappingContainer.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/DefaultMavenFactory.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/DefaultMavenPom.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/DefaultMavenPomFactory.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ExcludeRuleConverter.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/MavenVersionRangeMapper.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/PomDependenciesConverter.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/VersionRangeMapper.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/LoggingMavenTransferListener.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/MavenDeployAction.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/MavenInstallAction.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/MavenPublishAction.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/MavenWagonDeployAction.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/ParsedMavenPom.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/AbstractMavenResolver.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/BaseMavenDeployer.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/BaseMavenInstaller.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomDeployTask.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomInstallDeployTaskSupport.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomInstallTask.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/DefaultExcludeRuleConverter.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/DefaultGroovyMavenDeployer.groovy
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/DefaultPomDependenciesConverter.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/EmptyMavenSettingsSupplier.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/LoggingHelper.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/MavenSettingsSupplier.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/MaybeUserMavenSettingsSupplier.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/ProjectDependencyArtifactIdExtractorHack.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/RepositoryBuilder.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/RepositoryFactory.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/deployer/AbstractMavenResolver.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/deployer/BaseMavenDeployer.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/deployer/BaseMavenInstaller.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/deployer/DefaultGroovyMavenDeployer.groovy
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/deployer/RepositoryBuilder.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/deployer/RepositoryFactory.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/CustomModelBuilder.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/DefaultConf2ScopeMappingContainer.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/DefaultExcludeRuleConverter.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/DefaultMavenFactory.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/DefaultMavenPom.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/DefaultMavenPomFactory.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/DefaultPomDependenciesConverter.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/ExcludeRuleConverter.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/PlexusLoggerAdapter.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/PomDependenciesConverter.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/ProjectDependencyArtifactIdExtractorHack.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/wagon/RepositoryTransportDeployWagon.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/wagon/RepositoryTransportWagonAdapter.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/wagon/WagonRegistry.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/MavenPublishServices.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/MavenPublishTaskModelRule.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AbstractAntTaskBackedMavenPublisher.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AbstractMavenPublisher.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AntTaskBackedMavenLocalPublisher.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AntTaskBackedMavenPublisher.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/MavenLocalPublisher.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/MavenRemotePublisher.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/MavenRemoteRepositoryFactory.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/AbstractPublishToMaven.java
 create mode 100644 subprojects/maven/src/main/java/org/gradle/maven/MavenModule.java
 create mode 100644 subprojects/maven/src/main/java/org/gradle/maven/MavenPomArtifact.java
 create mode 100644 subprojects/maven/src/main/java/org/gradle/maven/package-info.java
 rename subprojects/maven/src/main/resources/META-INF/gradle-plugins/{maven-publish.properties => org.gradle.maven-publish.properties} (100%)
 rename subprojects/maven/src/main/resources/META-INF/gradle-plugins/{maven.properties => org.gradle.maven.properties} (100%)
 create mode 100644 subprojects/maven/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/DefaultConf2ScopeMappingContainerTest.java
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/DefaultMavenPomFactoryTest.groovy
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/DefaultMavenPomTest.groovy
 create mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/MavenVersionRangeMapperTest.groovy
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/ant/DefaultExcludeRuleConverterTest.java
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/ant/DefaultGroovyMavenDeployerTest.groovy
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/ant/DefaultGroovyPomFilterContainerTest.groovy
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/ant/DefaultPomDependenciesConverterTest.java
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/ant/EmptyMavenSettingsSupplierTest.groovy
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/ant/MaybeUserMavenSettingsSupplierTest.groovy
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/ant/ProjectDependencyArtifactIdExtractorHackTest.groovy
 create mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/deployer/DefaultGroovyMavenDeployerTest.groovy
 create mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/pom/DefaultConf2ScopeMappingContainerTest.java
 create mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/pom/DefaultExcludeRuleConverterTest.java
 create mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/pom/DefaultGroovyPomFilterContainerTest.groovy
 create mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/pom/DefaultMavenPomFactoryTest.groovy
 create mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/pom/DefaultMavenPomTest.groovy
 create mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/pom/DefaultPomDependenciesConverterTest.groovy
 create mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/pom/ProjectDependencyArtifactIdExtractorHackTest.groovy
 create mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/wagon/RepositoryTransportDeployWagonTest.groovy
 create mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/wagon/RepositoryTransportWagonAdapterTest.groovy
 create mode 100644 subprojects/maven/src/testFixtures/groovy/org/gradle/integtests/fixtures/publish/maven/AbstractMavenPublishIntegTest.groovy
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/event/BroadcastDispatch.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/event/DefaultListenerManager.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/event/ListenerBroadcast.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/event/ListenerManager.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/event/ListenerNotificationException.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/AbstractCollectionSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/AbstractDecoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/AbstractEncoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/BaseSerializerFactory.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/Decoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/DefaultSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/DefaultSerializerRegistry.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/Encoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/FlushableEncoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/InputStreamBackedDecoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/ListSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/LongSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/MapSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/NullSafeStringSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/ObjectReader.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/ObjectWriter.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/OutputStreamBackedEncoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/Serializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/SerializerRegistry.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/SetSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/kryo/JavaSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/kryo/KryoBackedDecoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/kryo/KryoBackedEncoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/kryo/StatefulSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/kryo/TypeSafeSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/ContextClassLoaderProxy.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/RemoteConnection.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/AbstractCollectionSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/AbstractDecoder.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/AbstractEncoder.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/BaseSerializerFactory.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/Decoder.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/DefaultSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/DefaultSerializerRegistry.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/Encoder.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/FlushableEncoder.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/InputStreamBackedDecoder.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/ListSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/LongSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/MapSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/NullSafeStringSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/ObjectReader.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/ObjectWriter.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/OutputStreamBackedEncoder.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/Serializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/SerializerRegistry.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/SetSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/kryo/JavaSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/kryo/KryoBackedDecoder.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/kryo/KryoBackedEncoder.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/kryo/StatefulSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/kryo/TypeSafeSerializer.java
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/event/DefaultListenerManagerTest.java
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/event/ListenerBroadcastTest.java
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/serialize/AbstractCodecTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/serialize/BaseSerializerFactoryTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/serialize/DefaultSerializerRegistryTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/serialize/DefaultSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/serialize/ListSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/serialize/LongSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/serialize/MapSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/serialize/SetSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/serialize/StreamBackedCodecTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/serialize/kryo/KryoBackedCodecTest.groovy
 create mode 100755 subprojects/messaging/src/test/groovy/org/gradle/messaging/dispatch/MethodInvocationTest.groovy
 delete mode 100755 subprojects/messaging/src/test/groovy/org/gradle/messaging/dispatch/MethodInvocationTest.java
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/MulticastConnectionTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/AbstractCodecTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/BaseSerializerFactoryTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/DefaultSerializerRegistryTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/DefaultSerializerTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/ListSerializerTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/LongSerializerTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/MapSerializerTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/SetSerializerTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/StreamBackedCodecTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/kryo/KryoBackedCodecTest.groovy
 create mode 100644 subprojects/messaging/src/testFixtures/groovy/org/gradle/internal/serialize/SerializerSpec.groovy
 delete mode 100644 subprojects/messaging/src/testFixtures/groovy/org/gradle/messaging/serialize/SerializerSpec.groovy
 create mode 100644 subprojects/model-core/model-core.gradle
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/ConfigurationCycleIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/ModelReuseIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/ModelRuleBindingFailureIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/ModelRuleBindingValidationIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/ModelRuleCachingIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/ModelRuleSamplesIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/ModelRuleValidationIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/MutationRuleApplicationOrderIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/PluginRuleSourceIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/ScopedRuleSourceIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/TaskCreationIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/AbstractClassBackedManagedTypeIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/ComplexManagedTypeIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/CyclicalManagedTypeIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/EnumsInManagedModelIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/InterfaceBackedManagedTypeIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/InvalidManagedModelMutationIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/InvalidManagedModelRuleIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/ManagedModelPropertyTargetingRuleIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/ManagedSetIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/ManagedTypeImplementationClassCachingSpec.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/ManagedTypeWithUnmanagedPropertiesIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/PolymorphicManagedTypeIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/PrimitivesInManagedModelIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/ConfigurationCycleException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/Defaults.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/Finalize.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/InvalidModelRuleDeclarationException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/InvalidModelRuleException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/Managed.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/Model.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/ModelRuleBindingException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/ModelViewClosedException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/Mutate.java
 rename subprojects/{core/src/main/groovy => model-core/src/main/java}/org/gradle/model/Path.java (100%)
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/RuleSource.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/Unmanaged.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/Validate.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/WriteOnlyModelViewException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/collection/CollectionBuilder.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/collection/ManagedSet.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/collection/package-info.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ActionBackedModelAction.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/BiActionBackedModelAction.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ChainingModelProjection.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/CollectionBuilderModelView.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/DefaultCollectionBuilder.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/DelegatingCollectionBuilder.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/DependencyOnlyExtractedModelRule.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/DirectNodeModelAction.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/DuplicateModelException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/EmptyModelProjection.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ExtractedModelAction.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ExtractedModelCreator.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ExtractedModelRule.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/InstanceModelView.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelAction.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelActionRole.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelAdapter.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelCreator.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelCreatorFactory.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelCreators.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelNode.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelPath.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelProjection.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelPromise.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelReference.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelRegistrar.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelRule.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelRuleExecutionException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelView.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelViews.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/MutableModelNode.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/NamedEntityInstantiator.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ProjectionBackedModelCreator.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/TypeCompatibilityModelProjectionSupport.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/UnmanagedModelProjection.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/rule/describe/AbstractModelRuleDescriptor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/rule/describe/MethodModelRuleDescriptor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/rule/describe/ModelRuleDescriptor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/rule/describe/NestedModelRuleDescriptor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/rule/describe/SimpleModelRuleDescriptor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/AbstractAnnotationDrivenModelRuleExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/AbstractModelCreationRuleExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/AbstractMutationModelRuleExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/DefaultMethodRuleDefinition.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/DefaultModelCreatorFactory.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/DefaultModelRuleInvoker.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/DefaultsModelRuleExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/FinalizeModelRuleExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/ManagedModelCreationRuleExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/ManagedModelInitializer.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/ManagedSetInitializer.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/MethodBackedModelAction.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/MethodModelRuleExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/MethodModelRuleExtractors.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/MethodRuleDefinition.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/ModelRuleExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/ModelRuleInvoker.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/ModelRuleSourceDetector.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/MutateModelRuleExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/RuleMethodBackedMutationAction.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/UnmanagedModelCreationRuleExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/ValidateModelRuleExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/instance/ManagedInstance.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/instance/ManagedProxyFactory.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/instance/ModelElementState.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/projection/ManagedModelProjection.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/projection/ManagedSetModelProjection.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ModelCollectionSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ModelProperty.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ModelSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ModelSchemaStore.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ModelStructSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/cache/ModelSchemaCache.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/cache/MultiWeakClassSet.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/cache/SingleWeakClassSet.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/cache/WeakClassSet.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/DefaultModelSchemaStore.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/EnumStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/InvalidManagedModelElementTypeException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/JdkValueTypeStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ManagedProxyClassGenerator.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ManagedSetStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ModelSchemaExtractionContext.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ModelSchemaExtractionResult.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ModelSchemaExtractionStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ModelSchemaExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/PrimitiveStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/StructStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/UnmanagedModelElementTypeException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/UnmanagedStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/method/WeaklyTypeReferencingMethod.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/BinderCreationListener.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/CreatorRuleBinder.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/DefaultModelRegistry.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/ModelBinding.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/ModelCreationListener.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/ModelGraph.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/ModelNodeInternal.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/ModelPathSuggestionProvider.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/ModelRegistry.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/ModelRegistryScope.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/MutatorRuleBinder.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/OneOfTypeBinderCreationListener.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/PathBinderCreationListener.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/RuleBinder.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/UnboundModelRulesException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/UnboundRulesProcessor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/report/AmbiguousBindingReporter.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/report/IncompatibleTypeReferenceReporter.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/report/unbound/UnboundRule.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/report/unbound/UnboundRuleInput.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/report/unbound/UnboundRulesReporter.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/type/ClassTypeWrapper.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/type/ModelType.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/type/ModelTypes.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/type/NullTypeWrapper.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/type/ParameterizedTypeWrapper.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/type/TypeWrapper.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/type/WildcardTypeWrapper.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/package-info.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/collection/internal/CollectionBuilderModelViewTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/collection/internal/DefaultCollectionBuilderTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/collection/internal/HasDependencies.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/collection/internal/Special.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/core/InstanceBackedModelCreatorTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/core/ModelPathTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/core/ModelPathValidationTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/core/ModelTypeJavaTest.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/core/ModelTypeTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/core/rule/describe/MethodModelRuleDescriptorTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/AnotherManagedWithPropertyOfInvalidManagedType.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/ClassModelRuleSourceValidationTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/HasStrings.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/ManagedAnnotatedClass.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/ManagedWithNestedPropertyOfInvalidManagedType.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/ManagedWithNestedReferenceOfInvalidManagedType.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/ManagedWithNonManageableParents.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/ManagedWithPropertyOfInvalidManagedType.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/ManagedWithReferenceOfInvalidManagedType.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/ModelRuleBindingTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/ModelRuleExtractorTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/ModelRuleSourceDetectorTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/MutationRuleExecutionOrderTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/NonManaged.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/OuterClass.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/ParametrizedManaged.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/instance/ManagedProxyTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/projection/ManagedSetModelProjectionTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/DefaultModelSchemaStoreTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/ManagedProxyClassGeneratorTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/ModelSchemaExtractorTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/SimpleManagedType.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/SpecialManagedSet.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/registry/DefaultModelRegistryTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/registry/ModelGraphTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/registry/ModelNodeReplacementTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/registry/ModelPathSuggestionProviderTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/registry/ModelRegistryEphemeralNodeTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/registry/ScopedRuleTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/registry/UnboundRulesProcessorTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/report/unbound/UnboundRulesReporterTest.groovy
 create mode 100644 subprojects/model-core/src/testFixtures/groovy/org/gradle/model/internal/fixture/ModelRegistryHelper.java
 create mode 100644 subprojects/model-core/src/testFixtures/groovy/org/gradle/model/report/unbound/UnboundRulesReportMatchers.groovy
 create mode 100644 subprojects/model-groovy/model-groovy.gradle
 create mode 100644 subprojects/model-groovy/src/integTest/groovy/org/gradle/model/dsl/ModelDslCreationIntegrationTest.groovy
 create mode 100644 subprojects/model-groovy/src/integTest/groovy/org/gradle/model/dsl/ModelDslIntegrationTest.groovy
 create mode 100644 subprojects/model-groovy/src/integTest/groovy/org/gradle/model/dsl/internal/transform/ModelDslRuleDetectionIntegrationSpec.groovy
 create mode 100644 subprojects/model-groovy/src/integTest/groovy/org/gradle/model/dsl/internal/transform/ModelDslRuleInputDetectionIntegrationSpec.groovy
 create mode 100644 subprojects/model-groovy/src/integTest/groovy/org/gradle/model/dsl/internal/transform/NestedModelDslUsageIntegrationSpec.groovy
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/NonTransformedModelDslBacking.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/TransformedModelDslBacking.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/inputs/RuleInputAccess.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/inputs/RuleInputAccessBacking.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/transform/ClosureCreationInterceptingVerifier.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/transform/ModelBlockTransformer.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/transform/RuleMetadata.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/transform/RuleVisitor.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/transform/RulesBlock.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/transform/RulesVisitor.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/transform/SourceLocation.java
 create mode 100644 subprojects/model-groovy/src/test/groovy/org/gradle/model/dsl/internal/NonTransformedModelDslBackingTest.groovy
 create mode 100644 subprojects/model-groovy/src/test/groovy/org/gradle/model/dsl/internal/TransformedModelDslBackingTest.groovy
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/NativeIntegrationException.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/NativeIntegrationUnavailableException.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/ProcessEnvironment.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/ReflectiveEnvironment.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/console/ConsoleDetector.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/console/ConsoleMetaData.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/console/FallbackConsoleMetaData.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/console/NativePlatformConsoleDetector.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/console/NativePlatformConsoleMetaData.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/console/NoOpConsoleDetector.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/console/UnixConsoleMetaData.java
 create mode 100755 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/console/WindowsConsoleDetector.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/Chmod.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/FileCanonicalizer.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/FileException.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/FileModeAccessor.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/FileModeMutator.java
 create mode 100755 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/FileSystem.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/Stat.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/Symlink.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/jdk7/Jdk7FileCanonicalizer.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/jdk7/PosixFilePermissionConverter.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/jdk7/PosixJdk7FilePermissionHandler.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/services/EmptyChmod.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/services/FallbackFileCanonicalizer.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/services/FallbackStat.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/services/FileSystemServices.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/services/GenericFileSystem.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/services/NativePlatformBackedChmod.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/services/NativePlatformBackedStat.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/services/NativePlatformBackedSymlink.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/services/UnavailablePosixFiles.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/services/UnsupportedFilePermissions.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/services/UnsupportedSymlink.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/filesystem/services/WindowsSymlink.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/jna/JnaBootPathConfigurer.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/jna/UnsupportedEnvironment.java
 create mode 100755 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/processenvironment/AbstractProcessEnvironment.java
 create mode 100755 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/processenvironment/NativePlatformBackedProcessEnvironment.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/services/FileSystems.java
 create mode 100755 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/services/NativeServices.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/NativeIntegrationException.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/NativeIntegrationUnavailableException.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/ProcessEnvironment.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/ReflectiveEnvironment.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/console/ConsoleDetector.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/console/ConsoleMetaData.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/console/FallbackConsoleMetaData.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/console/NativePlatformConsoleDetector.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/console/NativePlatformConsoleMetaData.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/console/NoOpConsoleDetector.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/console/UnixConsoleMetaData.java
 delete mode 100755 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/console/WindowsConsoleDetector.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Chmod.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/DefaultFilePathEncoder.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/EmptyChmod.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackStat.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackSymlink.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FilePathEncoder.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/GenericFileSystem.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibcChmod.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibcSymlink.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedChmod.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedStat.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedSymlink.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixStat.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Stat.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Symlink.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/jdk7/PosixFilePermissionConverter.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/jdk7/PosixJdk7FilePermissionHandler.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/JnaBootPathConfigurer.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/LibC.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/LibCBackedConsoleDetector.java
 delete mode 100755 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/LibCBackedProcessEnvironment.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/UnsupportedEnvironment.java
 delete mode 100755 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/processenvironment/AbstractProcessEnvironment.java
 delete mode 100755 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/processenvironment/NativePlatformBackedProcessEnvironment.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/services/FileSystems.java
 delete mode 100755 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/services/NativeServices.java
 create mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeintegration/console/NativePlatformConsoleDetectorTest.groovy
 create mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeintegration/filesystem/CommonFileSystemTest.groovy
 create mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeintegration/filesystem/LinuxFileSystemTest.groovy
 create mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeintegration/filesystem/MacOsFileSystemTest.groovy
 create mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeintegration/filesystem/WindowsFileSystemTest.groovy
 create mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeintegration/filesystem/jdk7/PosixFilePermissionConverterTest.groovy
 create mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeintegration/filesystem/jdk7/PosixJdk7FilePermissionHandlerTest.groovy
 create mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeintegration/filesystem/services/GenericFileSystemTest.groovy
 create mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeintegration/filesystem/services/UnsupportedFilePermissionsTest.groovy
 create mode 100755 subprojects/native/src/test/groovy/org/gradle/internal/nativeintegration/processenvironment/ProcessEnvironmentTest.groovy
 create mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeintegration/services/NativeServicesInitializationTest.groovy
 create mode 100755 subprojects/native/src/test/groovy/org/gradle/internal/nativeintegration/services/NativeServicesTest.groovy
 delete mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/console/NativePlatformConsoleDetectorTest.groovy
 delete mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/CommonFileSystemTest.groovy
 delete mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/LibcStatTest.groovy
 delete mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/LinuxFileSystemTest.groovy
 delete mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/MacOsFileSystemTest.groovy
 delete mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/WindowsFileSystemTest.groovy
 delete mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/jdk7/PosixFilePermissionConverterTest.groovy
 delete mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/jdk7/PosixJdk7FilePermissionHandlerTest.groovy
 delete mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/jna/LibCBackedProcessEnvironmentTest.groovy
 delete mode 100755 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/processenvironment/ProcessEnvironmentTest.groovy
 delete mode 100755 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/services/NativeServicesTest.groovy
 delete mode 100644 subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/BlockingRequestObserver.java
 delete mode 100644 subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/CrossVersionBuilder.java
 delete mode 100644 subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/ExtraTestCommandLineOptionsListener.java
 delete mode 100644 subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/GradleRunnerTest.groovy
 delete mode 100644 subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/OpenApiFixture.java
 delete mode 100644 subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/OpenApiUiTest.groovy
 delete mode 100644 subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/OutputUILordTest.groovy
 delete mode 100644 subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/TestAlternateUIInteractionVersion1.java
 delete mode 100644 subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/TestSettingsNodeVersion1.java
 delete mode 100644 subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/TestSingleDualPaneUIInteractionVersion1.java
 delete mode 100644 subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/CrossVersionCompatibilityIntegrationTest/shared/build.gradle
 delete mode 100644 subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/CrossVersionCompatibilityIntegrationTest/shared/settings.gradle
 delete mode 100644 subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/testproject/build.gradle
 delete mode 100644 subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/testproject/settings.gradle
 delete mode 100644 subprojects/open-api/src/main/java/org/gradle/foundation/BootstrapLoader.java
 delete mode 100644 subprojects/open-api/src/main/java/org/gradle/foundation/ParentLastClassLoader.java
 delete mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ExternalUtility.java
 delete mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/runner/GradleRunnerFactory.java
 delete mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/runner/GradleRunnerVersion1.java
 delete mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/DualPaneUIVersion1.java
 delete mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/UIFactory.java
 delete mode 100644 subprojects/open-api/src/test/groovy/org/gradle/openapi/external/ExternalUtilityTest.groovy
 rename subprojects/osgi/src/main/resources/META-INF/gradle-plugins/{osgi.properties => org.gradle.osgi.properties} (100%)
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/DaemonPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/ManyEmptyProjectsHelpPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/NativeParallelPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/NativePerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/NativeScenarioPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/OldJavaPluginBigProjectPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/OldVsNewJavaPluginPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/ParallelBuildPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/ProjectDependenciesPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/VariantsPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/templates/build-event-timestamps/build.gradle
 create mode 100644 subprojects/performance/src/templates/init.gradle
 copy subprojects/performance/src/templates/{project-with-source => java-source}/Production.java (100%)
 create mode 100644 subprojects/performance/src/templates/native-component/build.gradle
 create mode 100644 subprojects/performance/src/templates/native-scenario/build.gradle
 create mode 100644 subprojects/performance/src/templates/native-source/lib.c
 create mode 100644 subprojects/performance/src/templates/new-java-plugin/build.gradle
 create mode 100644 subprojects/performance/src/templates/old-java-plugin/build.gradle
 create mode 100644 subprojects/performance/src/templates/variants-new-model/build.gradle
 create mode 100644 subprojects/performance/src/templates/variants-old-model/build.gradle
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/BuildEventTimestampCollectorTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/CrossVersionPerformanceResultsTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/CrossVersionPerformanceTestRunnerTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/GCEventParserTest.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/PerformanceResultsTest.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/PerformanceTestRunnerTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/WaitingReaderTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/results/CompositeResultsStoreTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/results/CrossBuildResultsStoreTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/results/CrossVersionResultsStoreTest.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/results/ResultsStoreTest.groovy
 create mode 100644 subprojects/performance/src/test/resources/org/gradle/performance/fixture/gc-4.txt
 create mode 100644 subprojects/performance/src/test/resources/org/gradle/performance/fixture/mac-jdk8.0.25.txt
 create mode 100644 subprojects/performance/src/test/resources/org/gradle/performance/fixture/win-1.txt
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/AbstractCrossBuildPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/AbstractCrossVersionPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/Experiment.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/PerformanceTest.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/AbstractPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/BuildDisplayInfo.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/BuildEventTimestampCollector.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/BuildExperimentRunner.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/BuildExperimentSpec.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/CrossBuildPerformanceResults.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/CrossBuildPerformanceTestRunner.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/CrossVersionPerformanceResults.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/CrossVersionPerformanceTestRunner.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/GCEventParser.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/GradleExecuterBackedSession.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/GradleInvocationSpec.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/GradleSession.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/GradleSessionProvider.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/PerformanceResults.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/PerformanceTestResult.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/PerformanceTestRunner.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/PerformanceTestSpec.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/ToolingApiBackedGradleSession.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/WaitingReader.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/AllResultsStore.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/CompositeResultsStore.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/ConnectionAction.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/CrossBuildResultsStore.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/CrossBuildTestExecutionHistory.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/CrossVersionResultsStore.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/CrossVersionTestExecutionHistory.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/H2FileDb.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/PerformanceResults.java
 create mode 100644 subprojects/platform-base/platform-base.gradle
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/AssembleTaskIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/AutoTestedSamplePlatformBaseIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/ComponentTypeSampleIntegTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/CustomBinaryIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/CustomBinaryTasksIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/CustomComponentBinariesIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/CustomComponentPluginIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/LanguageTypeIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/LanguageTypeSampleIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/plugins/LanguageBasePluginIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/plugins/LifecycleBasePluginIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/api/internal/tasks/compile/Compiler.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/FunctionalSourceSet.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/LanguageSourceSet.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/ProjectSourceSet.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/artifact/SourcesArtifact.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/artifact/package-info.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/DefaultFunctionalSourceSet.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/DefaultProjectSourceSet.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/LanguageSourceSetContainer.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/LanguageSourceSetInternal.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/SourceSetNotationParser.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/SourceTransformTaskConfig.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/compile/CompileSpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/compile/Compiler.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/compile/CompilerFactory.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/compile/CompilerUtil.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/plugins/CleanRule.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/registry/DefaultLanguageRegistry.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/registry/DefaultLanguageTransformContainer.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/registry/LanguageRegistration.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/registry/LanguageRegistry.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/registry/LanguageTransform.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/registry/LanguageTransformContainer.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/registry/RuleBasedLanguageRegistration.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/tasks/SimpleStaleClassCleaner.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/tasks/StaleClassCleaner.java
 rename subprojects/{language-base/src/main/groovy => platform-base/src/main/java}/org/gradle/language/base/package-info.java (100%)
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/plugins/ComponentModelBasePlugin.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/plugins/LanguageBasePlugin.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/plugins/LifecycleBasePlugin.java
 rename subprojects/{language-base/src/main/groovy => platform-base/src/main/java}/org/gradle/language/base/plugins/package-info.java (100%)
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/sources/BaseLanguageSourceSet.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/sources/package-info.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/Application.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ApplicationBinarySpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ApplicationSpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/Binary.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/BinaryContainer.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/BinarySpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/BinaryTasks.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/BinaryTasksCollection.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/BinaryType.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/BinaryTypeBuilder.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ComponentBinaries.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ComponentSpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ComponentSpecContainer.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ComponentSpecIdentifier.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ComponentType.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ComponentTypeBuilder.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/InvalidModelException.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/LanguageType.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/LanguageTypeBuilder.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/Library.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/LibraryBinarySpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/LibrarySpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ModelInstantiationException.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/Platform.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/PlatformAwareComponentSpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/PlatformContainer.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ToolChain.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ToolChainRegistry.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/TransformationFileType.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/TypeBuilder.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/binary/BaseBinarySpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/binary/package-info.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/component/BaseComponentSpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/component/package-info.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/BinaryBuildAbility.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/BinaryNamingScheme.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/BinaryNamingSchemeBuilder.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/BinarySpecInternal.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/BinaryTasksCollectionWrapper.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/ComponentSpecInternal.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultBinaryContainer.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultBinaryNamingScheme.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultBinaryNamingSchemeBuilder.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultBinaryTasksCollection.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultComponentSpecContainer.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultComponentSpecIdentifier.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultPlatformContainer.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultPlatformRequirement.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultPlatformResolvers.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/FixedBuildAbility.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/PlatformAwareComponentSpecInternal.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/PlatformRequirement.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/PlatformResolver.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/PlatformResolvers.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/ToolSearchBuildAbility.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/builder/LanguageTypeBuilderInternal.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/builder/TypeBuilderInternal.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/AbstractAnnotationDrivenComponentModelRuleExtractor.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/AbstractTypeBuilder.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/BinaryTasksModelRuleExtractor.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/BinaryTypeModelRuleExtractor.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/CollectionBuilderBasedRule.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/ComponentBinariesModelRuleExtractor.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/ComponentModelBaseServiceRegistry.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/ComponentTypeModelRuleExtractor.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/LanguageTypeModelRuleExtractor.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/TypeModelRuleExtractor.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/rules/RuleAwarePolymorphicDomainObjectContainer.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/test/DefaultTestSuiteContainer.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/toolchain/ArgCollector.java
 create mode 100755 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/toolchain/ArgWriter.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/toolchain/DefaultResolvedCompiler.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/toolchain/DefaultResolvedTool.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/toolchain/DefaultToolResolver.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/toolchain/ResolvedTool.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/toolchain/ToolChainAvailability.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/toolchain/ToolChainInternal.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/toolchain/ToolProvider.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/toolchain/ToolResolver.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/toolchain/ToolSearchResult.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/util/ImplementationTypeDetermer.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/package-info.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/test/TestSuiteBinarySpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/test/TestSuiteContainer.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/test/TestSuiteSpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/test/package-info.java
 rename subprojects/{language-base/src/main/resources/META-INF/gradle-plugins/language-base.properties => platform-base/src/main/resources/META-INF/gradle-plugins/org.gradle.language-base.properties} (100%)
 create mode 100644 subprojects/platform-base/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/ComponentTypeModelRuleExtractorTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/DefaultFunctionalSourceSetTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/SourceSetNotationParserTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/registry/LanguageTypeModelRuleExtractorTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/tasks/SimpleStaleClassCleanerTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/plugins/ComponentModelBasePluginTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/plugins/LanguageBasePluginTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/plugins/LifecycleBasePluginTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/binary/BaseBinarySpecTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/component/BaseComponentSpecTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/BuildableModelElementTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/DefaultBinaryNamingSchemeTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/DefaultBinaryTasksCollectionTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/FixedBuildAbilityTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/ToolSearchBuildAbilityTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/registry/AbstractAnnotationModelRuleExtractorTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/registry/BinaryTasksModelRuleExtractorTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/registry/BinaryTypeModelRuleExtractorTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/registry/ComponentBinariesModelRuleExtractorTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/rules/RuleAwarePolymorphicDomainObjectContainerTest.groovy
 create mode 100755 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/toolchain/ArgWriterTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/toolchain/DefaultToolResolverTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/toolchain/ToolChainAvailabilityTest.groovy
 create mode 100644 subprojects/platform-base/src/testFixtures/groovy/org/gradle/test/fixtures/plugin/AbstractLanguagePluginSpec.groovy
 create mode 100644 subprojects/platform-jvm/platform-jvm.gradle
 create mode 100644 subprojects/platform-jvm/src/integTest/groovy/org/gradle/jvm/ComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/platform-jvm/src/integTest/groovy/org/gradle/jvm/JarBinariesIntegrationTest.groovy
 create mode 100644 subprojects/platform-jvm/src/integTest/groovy/org/gradle/jvm/plugins/AutoTestedSamplePlatformJvmIntegrationTest.groovy
 create mode 100644 subprojects/platform-jvm/src/integTest/groovy/org/gradle/jvm/plugins/JvmComponentPluginGoodBehaviourTest.groovy
 create mode 100644 subprojects/platform-jvm/src/integTest/groovy/org/gradle/jvm/plugins/JvmComponentPluginIntegrationTest.groovy
 rename subprojects/{plugins/src/main/groovy => platform-jvm/src/main/java}/org/gradle/api/java/archives/Attributes.java (100%)
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/api/java/archives/Manifest.java
 rename subprojects/{plugins/src/main/groovy => platform-jvm/src/main/java}/org/gradle/api/java/archives/ManifestException.java (100%)
 rename subprojects/{plugins/src/main/groovy => platform-jvm/src/main/java}/org/gradle/api/java/archives/ManifestMergeDetails.java (100%)
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/api/java/archives/ManifestMergeSpec.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/api/java/archives/internal/DefaultAttributes.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/api/java/archives/internal/DefaultManifest.java
 rename subprojects/{plugins/src/main/groovy => platform-jvm/src/main/java}/org/gradle/api/java/archives/internal/DefaultManifestMergeDetails.java (100%)
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/api/java/archives/internal/DefaultManifestMergeSpec.java
 rename subprojects/{plugins/src/main/groovy => platform-jvm/src/main/java}/org/gradle/api/java/archives/package-info.java (100%)
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/Classpath.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/JarBinarySpec.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/JvmBinarySpec.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/JvmBinaryTasks.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/JvmByteCode.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/JvmComponentExtension.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/JvmComponentSpec.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/JvmLibrary.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/JvmLibrarySpec.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/JvmResources.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/AbstractJvmBinaryRenderer.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/DefaultClasspath.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/DefaultJarBinarySpec.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/DefaultJvmBinaryTasks.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/DefaultJvmLibrarySpec.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/JarBinaryRenderer.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/JarBinarySpecInternal.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/JavaPlatformResolver.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/JvmLibrarySpecInternal.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/PlatformJvmServices.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/plugins/DefaultJvmComponentExtension.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/toolchain/JavaToolChainInternal.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/package-info.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/platform/JavaPlatform.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/platform/internal/DefaultJavaPlatform.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/platform/package-info.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/plugins/JvmComponentPlugin.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/plugins/package-info.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/Jar.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/package-info.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/toolchain/JavaToolChain.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/toolchain/JavaToolChainRegistry.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/toolchain/internal/DefaultJavaToolChainRegistry.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/toolchain/package-info.java
 create mode 100644 subprojects/platform-jvm/src/main/resources/META-INF/gradle-plugins/org.gradle.jvm-component.properties
 create mode 100644 subprojects/platform-jvm/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 rename subprojects/{plugins => platform-jvm}/src/test/groovy/org/gradle/api/java/archives/internal/DefaultAttributesTest.groovy (100%)
 rename subprojects/{plugins => platform-jvm}/src/test/groovy/org/gradle/api/java/archives/internal/DefaultManifestMergeSpecTest.groovy (100%)
 rename subprojects/{plugins => platform-jvm}/src/test/groovy/org/gradle/api/java/archives/internal/DefaultManifestTest.groovy (100%)
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/DefaultJarBinarySpecTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/DefaultJvmBinaryTasksTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/DefaultJvmLibrarySpecTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/plugins/CreateJvmBinariesTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/platform/internal/DefaultJavaPlatformTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/tasks/JarTest.groovy
 create mode 100644 subprojects/platform-native/platform-native.gradle
 create mode 100644 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/AutoTestedSamplesRuntimeNativeIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/BinaryBuildTypesIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/BinaryConfigurationIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/BinaryFlavorsIntegrationTest.groovy
 create mode 100644 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/ComponentReportIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/LibraryApiDependenciesIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/LibraryBinariesIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/LibraryDependenciesIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/NativeBinariesIntegrationTest.groovy
 create mode 100644 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/NativePlatformSamplesIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/PrebuiltLibrariesIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/SharedLibrarySoNameIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/platform/BinaryNativePlatformIntegrationTest.groovy
 create mode 100644 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/plugins/NativeComponentPluginIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/sourceset/GeneratedSourcesIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/sourceset/SourceSetCompileDependenciesIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/sourceset/SourceSetDependenciesIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/sourceset/SourceSetLinkDependenciesIntegrationTest.groovy
 create mode 100644 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/toolchain/CommonToolchainCustomizationIntegTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/toolchain/GccToolChainCrossCompilationIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/toolchain/GccToolChainCustomisationIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/toolchain/GccToolChainDiscoveryIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/toolchain/MultipleNativeToolChainIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/toolchain/NativeToolChainDiscoveryIntegrationTest.groovy
 create mode 100755 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/toolchain/VisualCppToolChainDiscoveryIntegrationTest.groovy
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/language/nativeplatform/DependentSourceSet.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/language/nativeplatform/HeaderExportingSourceSet.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/language/nativeplatform/NativeResourceSet.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/language/nativeplatform/internal/SourceIncludes.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/language/nativeplatform/package-info.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/BuildType.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/BuildTypeContainer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/Flavor.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/FlavorContainer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeBinary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeBinarySpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeComponentExtension.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeComponentSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeDependencySet.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeExecutable.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeExecutableBinary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeExecutableBinarySpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeExecutableSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeLibrary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeLibraryBinary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeLibraryBinarySpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeLibraryRequirement.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeLibrarySpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/ObjectFile.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/PrebuiltLibraries.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/PrebuiltLibrary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/PrebuiltSharedLibraryBinary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/PrebuiltStaticLibraryBinary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/Repositories.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/SharedLibraryBinary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/SharedLibraryBinarySpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/StaticLibraryBinary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/StaticLibraryBinarySpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/TargetedNativeComponent.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/Tool.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/AbstractBinaryToolSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/AbstractNativeBinaryRenderer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/AbstractNativeBinarySpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/AbstractNativeComponentSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/AbstractNativeLibraryBinarySpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/AbstractTargetedNativeComponentSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/BinaryToolSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/BuildOperationLoggingCompilerDecorator.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/CompilerOutputFileNamingScheme.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultBuildType.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultBuildTypeContainer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultFlavor.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultFlavorContainer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultLinkerSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultNativeExecutableBinarySpec.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultNativeExecutableSpec.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultNativeLibrarySpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultSharedLibraryBinarySpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultStaticLibraryArchiverSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultStaticLibraryBinarySpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultTool.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/LinkerSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/NativeBinarySpecInternal.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/NativeExecutableBinaryRenderer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/NativeExecutableBinarySpecInternal.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/NativePlatformResolver.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/ProjectNativeLibraryRequirement.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/SharedLibraryBinaryRenderer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/SharedLibraryBinarySpecInternal.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/SharedLibraryLinkerSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/StaticLibraryArchiverSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/StaticLibraryBinaryRenderer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/StaticLibraryBinarySpecInternal.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/TargetedNativeComponentInternal.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/configure/DefaultNativeBinariesFactory.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/configure/DefaultNativeComponentExtension.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/configure/NativeBinariesFactory.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/configure/NativeBinarySpecInitializer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/configure/NativeComponentSpecInitializer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/configure/ToolSettingNativeBinaryInitializer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/pch/DefaultPreCompiledHeaderTransformContainer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/pch/PreCompiledHeaderTransformContainer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/prebuilt/AbstractPrebuiltLibraryBinary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/prebuilt/DefaultPrebuiltLibraries.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/prebuilt/DefaultPrebuiltLibrary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/prebuilt/DefaultPrebuiltSharedLibraryBinary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/prebuilt/DefaultPrebuiltStaticLibraryBinary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/prebuilt/PrebuiltLibraryBinaryLocator.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/prebuilt/PrebuiltLibraryInitializer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/prebuilt/PrebuiltLibraryResolveException.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/ApiRequirementNativeDependencyResolver.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/ChainedLibraryBinaryLocator.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/DefaultLibraryResolver.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/DefaultNativeDependencySet.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/DefaultProjectLocator.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/InputHandlingNativeDependencyResolver.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/LibraryBinaryLocator.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/LibraryNativeDependencyResolver.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/LibraryResolveException.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/NativeBinaryRequirementResolveResult.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/NativeBinaryResolveResult.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/NativeDependencyNotationParser.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/NativeDependencyResolver.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/NativeDependencyResolverServices.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/ProjectLibraryBinaryLocator.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/ProjectLocator.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/RequirementParsingNativeDependencyResolver.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/SourceSetNativeDependencyResolver.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/services/NativeBinaryServices.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/package-info.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/Architecture.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/NativePlatform.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/OperatingSystem.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/ArchitectureInternal.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/Architectures.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/DefaultArchitecture.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/DefaultNativePlatform.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/DefaultOperatingSystem.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/NativePlatformInternal.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/NativePlatforms.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/OperatingSystemInternal.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/package-info.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/plugins/NativeComponentModelPlugin.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/plugins/NativeComponentPlugin.groovy
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/plugins/package-info.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/AbstractLinkTask.groovy
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/CreateStaticLibrary.groovy
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/InstallExecutable.groovy
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/LinkExecutable.groovy
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/LinkSharedLibrary.groovy
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/ObjectFilesToBinary.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/PrefixHeaderFileGenerateTask.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/package-info.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/test/NativeTestSuiteBinarySpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/test/NativeTestSuiteSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/test/internal/DefaultNativeTestSuiteBinarySpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/test/internal/NativeTestSuiteBinaryRenderer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/test/internal/NativeTestSuiteBinarySpecInternal.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/test/package-info.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/test/plugins/NativeBinariesTestPlugin.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/test/plugins/package-info.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/test/tasks/RunTestExecutable.groovy
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/test/tasks/package-info.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/Clang.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/CommandLineToolConfiguration.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/Gcc.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/GccCommandLineToolConfiguration.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/GccCompatibleToolChain.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/GccPlatformToolChain.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/NativePlatformToolChain.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/NativeToolChain.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/NativeToolChainRegistry.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/VisualCpp.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/VisualCppPlatformToolChain.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/AbstractPlatformToolProvider.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/ArgsTransformer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/CommandLineToolContext.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/CommandLineToolInvocation.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/CommandLineToolInvocationFailure.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/CommandLineToolInvocationWorker.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/DefaultCommandLineToolInvocation.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/DefaultCommandLineToolInvocationWorker.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/DefaultMutableCommandLineToolContext.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/DefaultNativeToolChainRegistry.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/ExtendableToolChain.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/MacroArgsConverter.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/MutableCommandLineToolContext.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/NativeCompileSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/NativeCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/NativeToolChainInternal.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/NativeToolChainRegistryInternal.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/OptionsFileArgsWriter.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/OutputCleaningCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/PCHObjectDirectoryGeneratorUtil.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/PlatformToolProvider.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/PrefixHeaderFileGeneratorUtil.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/ToolType.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/UnavailablePlatformToolProvider.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/clang/ClangToolChain.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/compilespec/AssembleSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/compilespec/CCompileSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/compilespec/CPCHCompileSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/compilespec/CppCompileSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/compilespec/CppPCHCompileSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/compilespec/ObjectiveCCompileSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/compilespec/ObjectiveCPCHCompileSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/compilespec/ObjectiveCppCompileSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/compilespec/ObjectiveCppPCHCompileSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/compilespec/WindowsResourceCompileSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/AbstractGccCompatibleToolChain.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/ArStaticLibraryArchiver.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/Assembler.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/CCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/CPCHCompiler.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/CppCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/CppPCHCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/DefaultGccPlatformToolChain.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/GccCompatibleNativeCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/GccCompilerArgsTransformer.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/GccLinker.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/GccOptionsFileArgsWriter.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/GccPlatformToolProvider.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/GccToolChain.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/ObjectiveCCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/ObjectiveCPCHCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/ObjectiveCppCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/ObjectiveCppPCHCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/TargetPlatformConfiguration.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/version/CompilerMetaDataProvider.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/version/CompilerMetaDataProviderFactory.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/version/GccVersionDeterminer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/version/GccVersionResult.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/Assembler.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/CCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/CPCHCompiler.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/CppCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/CppPCHCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/DefaultVisualCppPlatformToolChain.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/DefaultVisualStudioLocator.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/DefaultWindowsSdkLocator.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/EscapeUserArgs.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/LibExeStaticLibraryArchiver.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/LinkExeLinker.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppCompilerArgsTransformer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppInstall.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppNativeCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppOptionsFileArgsWriter.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppPCHCompilerArgsTransformer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppPCHSourceFileGeneratorUtil.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppPCHSourceFileTransformer.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppPlatformToolProvider.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppToolChain.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualStudioInstall.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualStudioLocator.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/WindowsResourceCompiler.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/WindowsSdk.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/WindowsSdkLocator.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/plugins/StandardToolChainsPlugin.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/tools/CommandLineToolConfigurationInternal.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/tools/CommandLineToolSearchResult.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/tools/DefaultCommandLineToolConfiguration.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/tools/DefaultGccCommandLineToolConfiguration.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/tools/GccCommandLineToolConfigurationInternal.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/tools/ToolRegistry.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/tools/ToolSearchPath.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/package-info.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/plugins/ClangCompilerPlugin.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/plugins/GccCompilerPlugin.java
 create mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/plugins/MicrosoftVisualCppPlugin.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/plugins/package-info.java
 create mode 100644 subprojects/platform-native/src/main/resources/META-INF/gradle-plugins/org.gradle.native-component.properties
 create mode 100644 subprojects/platform-native/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/DefaultBuildTypeTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/DefaultFlavorTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/DefaultNativeComponentTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/DefaultNativeExecutableBinarySpecTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/DefaultNativeExecutableSpecTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/DefaultNativeLibrarySpecTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/DefaultSharedLibraryBinarySpecTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/DefaultStaticLibraryBinarySpecTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/NativeBinarySpecTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/configure/CreateDefaultBuildTypesTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/configure/CreateDefaultFlavorsTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/configure/DefaultNativeBinariesFactoryTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/configure/NativeBinarySpecInitializerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/configure/NativeComponentSpecInitializerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/configure/ToolSettingNativeBinaryInitializerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/prebuilt/DefaultPrebuiltSharedLibraryBinaryTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/prebuilt/DefaultPrebuiltStaticLibraryBinaryTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/resolve/NativeDependencyNotationParserTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/resolve/ProjectLibraryBinaryLocatorTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/platform/internal/ArchitecturesTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/platform/internal/DefaultArchitectureTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/platform/internal/DefaultNativePlatformTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/platform/internal/DefaultOperatingSystemTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/platform/internal/ReadelfBinaryInfoTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/plugins/NativeComponentModelPluginTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/plugins/NativeComponentPluginTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/test/internal/DefaultNativeTestSuiteBinarySpecTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/test/plugins/NativeBinariesTestPluginTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/DefaultCommandLineToolInvocationWorkerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/DefaultNativeToolChainRegistryTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/NativeCompilerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/OptionsFileArgsWriterTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/OutputCleaningCompilerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/PrefixHeaderFileGeneratorUtilTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/UnavailableNativePlatformToolProviderTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/AbstractGccCompatibleToolChainTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/AssemblerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/CCompilerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/ClangToolChainTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/CppCompilerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/GccCompatibleNativeCompilerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/GccLinkerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/GccOptionsFileArgsWriterTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/GccToolChainTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/version/GccVersionDeterminerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/AssemblerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/CCompilerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/CppCompilerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/DefaultVisualStudioLocatorTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/DefaultWindowsSdkLocatorTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppNativeCompilerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppOptionsFileArgsWriterTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppPCHSourceFileGeneratorUtilTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppPCHSourceFileTransformerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppPlatformToolProviderTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppToolChainTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/WindowsResourceCompilerTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/internal/tools/ToolSearchPathTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/plugins/ClangCompilerPluginTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/plugins/GccCompilerPluginTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/plugins/MicrosoftVisualCppPluginTest.groovy
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/plugins/NativeToolChainPluginTest.groovy
 rename subprojects/{cpp => platform-native}/src/testFixtures/groovy/org/gradle/ide/visualstudio/fixtures/FiltersFile.groovy (100%)
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/ide/visualstudio/fixtures/ProjectFile.groovy
 rename subprojects/{cpp => platform-native}/src/testFixtures/groovy/org/gradle/ide/visualstudio/fixtures/SolutionFile.groovy (100%)
 create mode 100755 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/AbstractInstalledToolChainIntegrationSpec.groovy
 create mode 100755 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/AvailableToolChains.java
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/ExecutableFixture.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/NativeBinaryFixture.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/NativeInstallationFixture.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/NativePlatformsTestFixture.java
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/RequiresInstalledToolChain.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/RequiresInstalledToolChainExtension.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/SharedLibraryFixture.groovy
 create mode 100755 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/SingleToolChainTestRunner.java
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/StaticLibraryFixture.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/ToolChainRequirement.java
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/CCallingMixedCAndCppHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/CCompilerDetectingTestApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/CHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/CPCHHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/CppCallingCHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/CppCompilerDetectingTestApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/CppHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/CppPCHHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/ExeWithDiamondDependencyHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/ExeWithLibraryUsingLibraryHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/HelloWorldApp.java
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/IncrementalHelloWorldApp.java
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/MixedLanguageHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/MixedObjectiveCHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/ObjectiveCHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/ObjectiveCPCHHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/ObjectiveCppHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/ObjectiveCppPCHHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/PCHHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/PlatformDetectingTestApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/TestApp.java
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/TestNativeComponent.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/app/WindowsResourceHelloWorldApp.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/binaryinfo/BinaryInfo.java
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/binaryinfo/DumpbinBinaryInfo.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/binaryinfo/OtoolBinaryInfo.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/binaryinfo/ReadelfBinaryInfo.groovy
 create mode 100644 subprojects/platform-play/platform-play.gradle
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/MixedPlayAndJavaLangProjectIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/MixedPlayAndScalaLangProjectIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/PlayAppWithFailingTestsIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/PlayApplicationBinariesIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/PlayBinaryApplicationIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/PlayDistributionApplicationIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/PlayMultiProjectApplicationIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/PlayPlatformIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/PlayTestApplicationIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/advanced/AdvancedAppContentVerifier.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/advanced/PlayBinaryAdvancedAppIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/advanced/PlayDistributionAdvancedAppIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/basic/PlayBinaryBasicAppIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/basic/PlayDistributionBasicAppIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/basic/PlayTestBasicAppIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/dependencies/PlayBinaryAppWithDependenciesIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/dependencies/PlayDistributionAppWithDependenciesIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/dependencies/PlayTestAppWithDependenciesIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/fixtures/DistributionTestExecHandleBuilder.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/fixtures/PlayCoverage.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/fixtures/PlayMultiVersionApplicationIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/fixtures/PlayMultiVersionIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/fixtures/PlayMultiVersionRunApplicationIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/fixtures/app/AdvancedPlayApp.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/fixtures/app/BasicPlayApp.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/fixtures/app/PlayApp.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/fixtures/app/PlayAppWithDependencies.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/fixtures/app/PlayMultiProject.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/fixtures/app/WithFailingTestsApp.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/samples/AbstractPlaySampleIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/samples/AdvancedPlaySampleIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/samples/BasicPlaySampleIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/samples/MultiprojectPlaySampleIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/plugins/PlayApplicationPluginGoodBehaviourIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/plugins/PlayApplicationPluginIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/plugins/PlayCoffeeScriptPluginGoodBehaviourIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/plugins/PlayCoffeeScriptPluginIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/plugins/PlayDistributionPluginIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/plugins/PlayJavaScriptPluginGoodBehaviourIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/plugins/PlayJavaScriptPluginIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/tasks/AbstractCoffeeScriptCompileIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/tasks/AbstractJavaScriptMinifyIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/tasks/CoffeeScriptCompileIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/tasks/CustomCoffeeScriptImplementationIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/tasks/DistributionZipIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/tasks/JavaScriptMinifyIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/tasks/PlayAssetsJarIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/tasks/RoutesCompileIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/tasks/TwirlCompileIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/tasks/TwirlVersionIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/resources/coffee-script.min.js
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/app/assets/javascripts/sample.js
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/app/assets/javascripts/test.coffee
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/app/controllers/Application.scala
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/app/controllers/jva/PureJava.java
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/app/controllers/scala/MixedJava.java
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/app/models/DataType.java
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/app/models/ScalaClass.scala
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/app/special/strangename/Application.scala
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/app/views/awesome/index.scala.html
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/app/views/index.scala.html
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/app/views/main.scala.html
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/build.gradle
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/conf/jva.routes
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/conf/routes
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/conf/scala.routes
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/basicplayapp/app/controllers/Application.scala
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/basicplayapp/app/views/index.scala.html
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/basicplayapp/app/views/main.scala.html
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/basicplayapp/build.gradle
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/basicplayapp/conf/routes
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/basicplayapp/test/ApplicationSpec.scala
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/basicplayapp/test/IntegrationSpec.scala
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playappwithdependencies/app/controllers/Application.scala
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playappwithdependencies/app/views/index.scala.html
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playappwithdependencies/app/views/main.scala.html
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playappwithdependencies/build.gradle
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playappwithdependencies/conf/routes
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playappwithdependencies/test/ApplicationSpec.scala
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playappwithdependencies/test/IntegrationSpec.scala
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playmultiproject/build.gradle
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playmultiproject/javalibrary/build.gradle
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playmultiproject/javalibrary/src/main/java/org/test/Util.java
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playmultiproject/primary/app/controllers/Application.scala
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playmultiproject/primary/build.gradle
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playmultiproject/primary/conf/application.conf
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playmultiproject/primary/conf/routes
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playmultiproject/primary/public/primary.txt
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playmultiproject/settings.gradle
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playmultiproject/submodule/app/controllers/submodule/Application.scala
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playmultiproject/submodule/build.gradle
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/playmultiproject/submodule/public/submodule.txt
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/shared/README
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/shared/conf/application.conf
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/shared/public/images/favicon.svg
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/shared/public/javascripts/hello.js
 copy subprojects/{core/src/integTest/resources/org/gradle/api/tasks/copyTestResources/src/one/sub/ignore/bad.file => platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/shared/public/stylesheets/main.css} (100%)
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/withfailingtestsapp/test/FailingApplicationSpec.scala
 create mode 100644 subprojects/platform-play/src/integTest/resources/org/gradle/play/integtest/fixtures/app/withfailingtestsapp/test/FailingIntegrationSpec.scala
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/language/coffeescript/CoffeeScriptSourceSet.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/language/coffeescript/internal/DefaultCoffeeScriptSourceSet.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/language/coffeescript/package-info.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/language/javascript/JavaScriptSourceSet.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/language/javascript/internal/DefaultJavaScriptSourceSet.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/language/javascript/package-info.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/language/routes/RoutesSourceSet.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/language/routes/internal/DefaultRoutesSourceSet.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/language/routes/package-info.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/language/twirl/TwirlSourceSet.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/language/twirl/internal/DefaultTwirlSourceSet.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/language/twirl/package-info.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/JvmClasses.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/PlayApplicationBinarySpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/PlayApplicationSpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/PublicAssets.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/distribution/PlayDistribution.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/distribution/PlayDistributionContainer.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/distribution/package-info.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/CleaningPlayToolCompiler.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/DefaultPlayApplicationBinarySpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/DefaultPlayApplicationSpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/DefaultPlayPlatform.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/PlayApplicationBinarySpecInternal.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/PlayApplicationSpecInternal.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/PlayPlatformNotationParser.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/PlayPlatformRequirement.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/PlayPlatformResolver.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/distribution/DefaultPlayDistribution.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/distribution/DefaultPlayDistributionContainer.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/javascript/DefaultJavaScriptCompileSpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/javascript/GoogleClosureCompiler.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/javascript/JavaScriptCompileDestinationCalculator.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/javascript/JavaScriptCompileSpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/platform/PlayMajorVersion.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/platform/PlayPlatformInternal.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/routes/DefaultRoutesCompileSpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/routes/DefaultVersionedRoutesCompilerAdapter.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/routes/RoutesCompileSpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/routes/RoutesCompiler.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/routes/RoutesCompilerAdapterV22X.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/routes/RoutesCompilerAdapterV23X.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/routes/RoutesCompilerFactory.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/routes/VersionedRoutesCompilerAdapter.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/DefaultPlayRunSpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/DefaultVersionedPlayRunAdapter.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/PlayAppLifecycleUpdate.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/PlayApplicationRunner.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/PlayApplicationRunnerToken.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/PlayRunAdapterV22X.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/PlayRunAdapterV23X.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/PlayRunSpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/PlayRunWorkerClientProtocol.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/PlayRunWorkerServerProtocol.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/PlayWorkerClient.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/PlayWorkerServer.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/VersionedPlayRunAdapter.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/spec/PlayApplicationBinaryRenderer.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/spec/PlayCompileSpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/toolchain/DaemonPlayCompiler.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/toolchain/DefaultPlayToolChain.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/toolchain/DefaultPlayToolProvider.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/toolchain/PlayToolChainInternal.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/toolchain/PlayToolChainServiceRegistry.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/toolchain/PlayToolProvider.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/twirl/DefaultTwirlCompileSpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/twirl/TwirlCompileSpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/twirl/TwirlCompiler.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/twirl/TwirlCompilerAdapterV10X.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/twirl/TwirlCompilerAdapterV22X.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/twirl/TwirlCompilerFactory.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/twirl/VersionedTwirlCompilerAdapter.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/package-info.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/platform/PlayPlatform.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/platform/package-info.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/plugins/PlayApplicationPlugin.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/plugins/PlayCoffeeScriptPlugin.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/plugins/PlayDistributionPlugin.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/plugins/PlayJavaScriptPlugin.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/plugins/PlayPlugin.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/plugins/PlayPluginConfigurations.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/plugins/PlayTestPlugin.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/plugins/package-info.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/tasks/JavaScriptMinify.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/tasks/PlayCoffeeScriptCompile.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/tasks/PlayRun.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/tasks/RoutesCompile.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/tasks/TwirlCompile.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/tasks/package-info.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/toolchain/PlayToolChain.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/toolchain/package-info.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/scala/internal/reflect/ScalaCodecMapper.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/scala/internal/reflect/ScalaListBuffer.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/scala/internal/reflect/ScalaMethod.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/scala/internal/reflect/ScalaOptionInvocationWrapper.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/scala/internal/reflect/ScalaReflectionUtil.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/scala/internal/reflect/package-info.java
 create mode 100644 subprojects/platform-play/src/main/resources/META-INF/gradle-plugins/org.gradle.play-application.properties
 create mode 100644 subprojects/platform-play/src/main/resources/META-INF/gradle-plugins/org.gradle.play-coffeescript.properties
 create mode 100644 subprojects/platform-play/src/main/resources/META-INF/gradle-plugins/org.gradle.play-javascript.properties
 create mode 100644 subprojects/platform-play/src/main/resources/META-INF/gradle-plugins/org.gradle.play.properties
 create mode 100644 subprojects/platform-play/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/language/coffeescript/internal/DefaultCoffeeScriptSourceSetTest.groovy
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/org/gradle/language/javascript/internal/DefaultJavaScriptSourceSetTest.groovy
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/play/internal/DefaultPlayApplicationBinarySpecTest.groovy
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/play/internal/DefaultPlayToolChainTest.groovy
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/play/internal/PlayPlatformResolverTest.groovy
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/play/internal/javascript/JavaScriptCompileDestinationCalculatorTest.groovy
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/play/internal/toolchain/DaemonPlayCompilerTest.groovy
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/play/internal/toolchain/DefaultPlayToolProviderTest.groovy
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/play/plugins/PlayCoffeeScriptPluginTest.groovy
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/play/plugins/PlayDistributionPluginTest.groovy
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/play/plugins/PlayJavaScriptPluginTest.groovy
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/play/plugins/PlayTestPluginTest.groovy
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/play/tasks/PlayRunTest.groovy
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/play/tasks/TwirlCompileTest.groovy
 create mode 100644 subprojects/plugin-development/plugin-development.gradle
 create mode 100644 subprojects/plugin-development/src/integTest/groovy/org/gradle/plugin/devel/plugins/JavaGradlePluginPluginIntegrationTest.groovy
 create mode 100644 subprojects/plugin-development/src/main/java/org/gradle/plugin/devel/plugins/JavaGradlePluginPlugin.java
 create mode 100644 subprojects/plugin-development/src/main/java/org/gradle/plugin/devel/plugins/package-info.java
 create mode 100644 subprojects/plugin-development/src/main/resources/META-INF/gradle-plugins/org.gradle.java-gradle-plugin.properties
 create mode 100644 subprojects/plugin-development/src/test/groovy/org/gradle/plugin/devel/plugins/JavaGradlePluginPluginTest.groovy
 create mode 100644 subprojects/plugin-use/plugin-use.gradle
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/CorePluginUseIntegrationSpec.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/DeployedPortalIntegrationSpec.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/NonCorePluginAlreadyOnClasspathDetectionIntegrationSpec.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/NonCorePluginUseIntegrationSpec.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/NonDeclarativePluginUseIntegrationSpec.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/PluginUseClassLoadingIntegrationSpec.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/PluginUseDslIntegrationSpec.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/PostPluginResolutionFailuresIntegrationSpec.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/RuleSourcePluginUseIntegrationSpec.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/resolve/service/PluginResolutionCachingCrossVersionIntegrationTest.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/resolve/service/PluginResolutionCachingIntegrationTest.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/resolve/service/PluginResolutionDeprecatedClientIntegrationTest.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/resolve/service/PluginResolutionServiceCommsIntegrationTest.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/resolve/service/PluginResolutionServiceIntegrationSpec.groovy
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/DefaultPluginRequestApplicator.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/PluginResolverFactory.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/PluginUsePluginServiceRegistry.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/ClassPathPluginResolution.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/CompositePluginResolver.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/CorePluginResolver.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/NoopPluginResolver.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/NotNonCorePluginOnClasspathCheckPluginResolver.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/PluginResolution.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/PluginResolutionResult.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/PluginResolveContext.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/PluginResolver.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/SimplePluginResolution.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/service/internal/ClientStatus.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/service/internal/DeprecationListeningPluginResolutionServiceClient.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/service/internal/ErrorResponse.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/service/internal/HttpPluginResolutionServiceClient.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/service/internal/InMemoryCachingPluginResolutionServiceClient.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/service/internal/OfflinePluginResolutionServiceClient.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/service/internal/PersistentCachingPluginResolutionServiceClient.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/service/internal/PluginResolutionServiceClient.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/service/internal/PluginResolutionServiceResolver.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/service/internal/PluginUseMetaData.java
 create mode 100644 subprojects/plugin-use/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/plugin-use/src/test/groovy/org/gradle/plugin/use/resolve/internal/CorePluginResolverTest.groovy
 create mode 100644 subprojects/plugin-use/src/test/groovy/org/gradle/plugin/use/resolve/service/internal/DeprecationListeningPluginResolutionServiceClientTest.groovy
 create mode 100644 subprojects/plugin-use/src/test/groovy/org/gradle/plugin/use/resolve/service/internal/HttpPluginResolutionServiceClientTest.groovy
 create mode 100644 subprojects/plugin-use/src/test/groovy/org/gradle/plugin/use/resolve/service/internal/InMemoryCachingPluginResolutionServiceClientTest.groovy
 create mode 100644 subprojects/plugin-use/src/test/groovy/org/gradle/plugin/use/resolve/service/internal/PersistentCachingPluginResolutionServiceClientTest.groovy
 create mode 100644 subprojects/plugin-use/src/testFixtures/groovy/org/gradle/plugin/use/resolve/service/PluginResolutionServiceTestServer.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/api/plugins/ApplicationPluginIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/api/plugins/ParallelJavaPluginTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/groovy/GroovyPluginIntegrationTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/AntForkingGroovyCompilerIntegrationTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/AntInProcessGroovyCompilerIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/java/ComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/java/JavaCrossCompilationIntegrationTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/java/JavaPluginGoodBehaviourTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/AntForkingJavaCompilerIntegrationTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/AntInProcessJavaCompilerIntegrationTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/IncrementalJavaCompilationIntegrationTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/javadoc/JavadocIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitConsoleLoggingIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitJnaIntegrationTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitLoggingIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitLoggingOutputCaptureIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGConsoleLoggingIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGFailurePolicyIntegrationTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGLoggingIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGLoggingOutputCaptureIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGParallelSuiteIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGStaticLoggingIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/api/plugins/ParallelJavaPluginTest/shared/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/api/plugins/ParallelJavaPluginTest/shared/src/custom/java/SomeClass.java
 copy subprojects/{docs/src/samples/userguide/multiproject/dependencies/java/api/src/main/resources/org/gradle => plugins/src/integTest/resources/org/gradle/api/plugins/ParallelJavaPluginTest/shared/src/custom/resources}/resource.txt (100%)
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/api/plugins/ParallelJavaPluginTest/shared/src/customTest/java/SomeTest.java
 copy subprojects/{docs/src/samples/groovy/quickstart/src/test => plugins/src/integTest/resources/org/gradle/api/plugins/ParallelJavaPluginTest/shared/src/customTest}/resources/testResource.txt (100%)
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/api/plugins/ParallelJavaPluginTest/shared/src/main/java/SomeClass.java
 copy subprojects/{docs/src/samples/userguide/multiproject/dependencies/java/api/src/main/resources/org/gradle => plugins/src/integTest/resources/org/gradle/api/plugins/ParallelJavaPluginTest/shared/src/main/resources}/resource.txt (100%)
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/api/plugins/ParallelJavaPluginTest/shared/src/test/java/SomeTest.java
 copy subprojects/{docs/src/samples/groovy/quickstart => plugins/src/integTest/resources/org/gradle/api/plugins/ParallelJavaPluginTest/shared}/src/test/resources/testResource.txt (100%)
 copy subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/{compileBadCode => compileJavaFx8Code}/build.gradle (100%)
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/compileJavaFx8Code/src/main/groovy/FxApp.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/configurationScriptNotSupported/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/configurationScriptNotSupported/groovycompilerconfig.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/configurationScriptNotSupported/src/main/groovy/BrokenClass.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/failsBecauseOfInvalidConfigFile/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/failsBecauseOfInvalidConfigFile/groovycompilerconfig.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/failsBecauseOfInvalidConfigFile/src/main/groovy/BrokenClass.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/failsBecauseOfMissingConfigFile/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/failsBecauseOfMissingConfigFile/src/main/groovy/BrokenClass.groovy
 copy subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/{compileBadCode => groovyToolClassesAreNotVisible}/build.gradle (100%)
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/groovyToolClassesAreNotVisible/src/main/groovy/Thing.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/useConfigurationScript/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/useConfigurationScript/groovycompilerconfig.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec/useConfigurationScript/src/main/groovy/BrokenClass.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/gradle3235/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/gradle3235/src/main/groovy/com/example/Country.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/gradle3235/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/gradle3235/src/test/groovy/DummyFileForCompilation.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/IncrementalGroovyCompileIntegrationTest/failsCompilationWhenConfigScriptIsUpdated/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/IncrementalGroovyCompileIntegrationTest/failsCompilationWhenConfigScriptIsUpdated/groovycompilerconfig.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/IncrementalGroovyCompileIntegrationTest/failsCompilationWhenConfigScriptIsUpdated/newbuild.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/IncrementalGroovyCompileIntegrationTest/failsCompilationWhenConfigScriptIsUpdated/newgroovycompilerconfig.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/IncrementalGroovyCompileIntegrationTest/failsCompilationWhenConfigScriptIsUpdated/src/main/groovy/BrokenClass.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitConsoleLoggingIntegrationTest/shared/build.gradle
 rename subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/{JUnitLoggingIntegrationTest => JUnitConsoleLoggingIntegrationTest}/shared/src/test/groovy/org/gradle/JUnit4Test.groovy (100%)
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitConsoleLoggingIntegrationTest/standardOutputLogging/build.gradle
 rename subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/{JUnitLoggingIntegrationTest => JUnitConsoleLoggingIntegrationTest}/standardOutputLogging/src/test/groovy/org/gradle/JUnit4StandardOutputTest.groovy (100%)
 delete mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/canHandleMultipleThreadsWritingToSystemErr/build.gradle
 delete mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/canHandleMultipleThreadsWritingToSystemErr/src/test/groovy/org/gradle/SystemErrTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/canHandleMultipleThreadsWritingToSystemOut/build.gradle
 delete mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/canHandleMultipleThreadsWritingToSystemOut/src/test/groovy/org/gradle/SystemOutTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/createsRunnerBeforeTests/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/createsRunnerBeforeTests/src/test/java/org/gradle/CustomRunner.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/createsRunnerBeforeTests/src/test/java/org/gradle/ExecutionOrderTest.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitJnaIntegrationTest/canRunTestsUsingJna/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitJnaIntegrationTest/canRunTestsUsingJna/src/test/java/OkTest.java
 delete mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitLoggingIntegrationTest/shared/build.gradle
 delete mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitLoggingIntegrationTest/standardOutputLogging/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGFailurePolicyIntegrationTest/shared/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGFailurePolicyIntegrationTest/shared/src/test/java/org/gradle/failurepolicy/TestWithFailureInConfigMethod.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/java/AbstractLanguageSourceSet.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/java/DefaultJavaSourceSet.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/java/DefaultJvmResourceSet.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/jvm/ClassDirectoryBinaryNamingScheme.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/jvm/ClassDirectoryBinaryRenderer.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/jvm/ClassDirectoryBinarySpecInternal.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/jvm/DefaultClassDirectoryBinarySpec.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/CleanRule.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/ProcessResources.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/StartScriptGenerator.groovy
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/StartScriptGenerator.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/AntDependsStaleClassCleaner.groovy
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/AntGroovyCompiler.groovy
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/AntJavaCompiler.groovy
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/ApiGroovyCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/ArgCollector.java
 delete mode 100755 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/ArgWriter.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CleaningGroovyCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CleaningJavaCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CleaningJavaCompilerSupport.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CommandLineJavaCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CommandLineJavaCompilerArgumentsGenerator.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CompileSpec.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CompileSpecToArguments.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/Compiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/DefaultJavaCompileSpec.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/DefaultJavaCompilerFactory.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/DefaultJvmLanguageCompileSpec.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/DelegatingGroovyCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/DelegatingJavaCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/ExecSpecBackedArgCollector.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/GroovyCompileTransformingClassLoader.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/GroovyCompilerFactory.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/InProcessJavaCompilerFactory.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/JavaCompileSpec.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/JavaCompilerArgumentsBuilder.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/JavaCompilerFactory.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/JvmLanguageCompileSpec.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/NoOpStaleClassCleaner.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/NormalizingGroovyCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/NormalizingJavaCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/SunJavaCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemon.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonClient.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonManager.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonServer.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonServerProtocol.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonStarter.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/daemon/DaemonGroovyCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/daemon/DaemonJavaCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/daemon/InProcessCompilerDaemonFactory.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/AllFromJarRebuildInfo.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassDependents.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassNameProvider.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/DefaultRebuildInfo.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/DummySerializer.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationSupport.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/InputOutputMapper.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarArchive.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarChangeProcessor.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarDelta.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshot.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotCache.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotFeeder.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotter.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JavaSourceClass.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/OutputClassMapper.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/RebuildInfo.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SelectiveCompilation.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SelectiveJavaCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SpecificClassesRebuildInfo.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassAnalysis.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesAnalyzer.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesVisitor.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassRelevancyFilter.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfo.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoExtractor.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoSerializer.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/jdk6/Jdk6JavaCompiler.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/TestClassLoaderFactory.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/processors/TestOutputRedirector.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/results/TestListenerInternal.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/java/archives/Manifest.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/java/archives/ManifestMergeSpec.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/java/archives/internal/DefaultAttributes.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/java/archives/internal/DefaultManifest.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/java/archives/internal/DefaultManifestMergeSpec.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JavaLanguagePlugin.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/LegacyJavaComponentPlugin.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/AbstractOptions.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/Compile.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/CompileOptions.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/GroovyCompile.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/GroovyCompileOptions.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/JavaCompile.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/AntGroovydoc.groovy
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/AntJavadoc.groovy
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/Groovydoc.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/Javadoc.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/TestLogging.java
 delete mode 100755 subprojects/plugins/src/main/groovy/org/gradle/external/javadoc/JavadocOfflineLink.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/external/javadoc/internal/AbstractListJavadocOptionFileOption.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/external/javadoc/internal/JavadocOptionFile.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/external/javadoc/internal/JavadocOptionFileWriter.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/external/javadoc/internal/JavadocOptionFileWriterContext.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/jvm/ClassDirectoryBinarySpec.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/jvm/application/tasks/CreateStartScripts.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/jvm/application/tasks/package-info.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/jvm/package-info.java
 create mode 100644 subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/DefaultJavaAppStartScriptGenerationDetails.java
 create mode 100644 subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/DefaultTemplateBasedStartScriptGenerator.java
 create mode 100644 subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/StartScriptTemplateBindingFactory.java
 create mode 100644 subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/UnixStartScriptGenerator.java
 create mode 100644 subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/WindowsStartScriptGenerator.java
 create mode 100644 subprojects/plugins/src/main/java/org/gradle/jvm/application/scripts/JavaAppStartScriptGenerationDetails.java
 create mode 100644 subprojects/plugins/src/main/java/org/gradle/jvm/application/scripts/ScriptGenerator.java
 create mode 100644 subprojects/plugins/src/main/java/org/gradle/jvm/application/scripts/TemplateBasedScriptGenerator.java
 create mode 100644 subprojects/plugins/src/main/java/org/gradle/jvm/application/scripts/package-info.java
 delete mode 100644 subprojects/plugins/src/main/resources/META-INF/gradle-plugins/github-dependencies.properties
 delete mode 100644 subprojects/plugins/src/main/resources/META-INF/gradle-plugins/java-lang.properties
 delete mode 100644 subprojects/plugins/src/main/resources/META-INF/gradle-plugins/jvm-lang.properties
 delete mode 100644 subprojects/plugins/src/main/resources/META-INF/gradle-plugins/lang-base.properties
 rename subprojects/plugins/src/main/resources/META-INF/gradle-plugins/{application.properties => org.gradle.application.properties} (100%)
 rename subprojects/plugins/src/main/resources/META-INF/gradle-plugins/{base.properties => org.gradle.base.properties} (100%)
 rename subprojects/plugins/src/main/resources/META-INF/gradle-plugins/{distribution.properties => org.gradle.distribution.properties} (100%)
 rename subprojects/plugins/src/main/resources/META-INF/gradle-plugins/{groovy-base.properties => org.gradle.groovy-base.properties} (100%)
 rename subprojects/plugins/src/main/resources/META-INF/gradle-plugins/{groovy.properties => org.gradle.groovy.properties} (100%)
 rename subprojects/plugins/src/main/resources/META-INF/gradle-plugins/{java-base.properties => org.gradle.java-base.properties} (100%)
 rename subprojects/plugins/src/main/resources/META-INF/gradle-plugins/{java-library-distribution.properties => org.gradle.java-library-distribution.properties} (100%)
 rename subprojects/plugins/src/main/resources/META-INF/gradle-plugins/{java.properties => org.gradle.java.properties} (100%)
 rename subprojects/plugins/src/main/resources/META-INF/gradle-plugins/{war.properties => org.gradle.war.properties} (100%)
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/java/DefaultJavaSourceSetTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/java/DefaultJvmResourceSetTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/jvm/ClassDirectoryBinaryNamingSchemeTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/jvm/DefaultClassDirectoryBinarySpecTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/plugins/UnixStartScriptGeneratorTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/plugins/WindowsStartScriptGeneratorTest.groovy
 delete mode 100755 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/ArgWriterTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/CleaningJavaCompilerTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/CommandLineJavaCompilerArgumentsGeneratorTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/DefaultJavaCompilerFactoryTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/DelegatingJavaCompilerTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/GroovyCompileTransformingClassLoaderTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/InProcessJavaCompilerFactoryTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/JavaCompilerArgumentsBuilderTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/NormalizingGroovyCompilerTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/NormalizingJavaCompilerTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/SimpleStaleClassCleanerTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonManagerTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/AllFromJarRebuildInfoTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassNameProviderTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationSupportTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/InputOutputMapperTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotCacheTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotFeederTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotterTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JavaSourceClassTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/OutputClassMapperTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/AccessedFromPrivateClass.java
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesAnalyzerTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasNonPrivateConstants.java
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasPrivateConstants.java
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasPublicConstants.java
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/SomeClass.java
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/SomeOtherClass.java
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/UsedByNonPrivateConstantsClass.java
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/YetAnotherClass.java
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoExtractorTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoSerializerTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/processors/TestOutputRedirectorTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/results/StateTrackingTestResultProcessorTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/results/TestListenerAdapterTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaLanguagePluginTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JvmLanguagePluginTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/plugins/LanguageBasePluginTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/plugins/LegacyJavaComponentPluginTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/tasks/bundling/JarTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/CompileOptionsTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/GroovyCompileOptionsTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/JavaCompileTest.java
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/tasks/javadoc/JavadocTest.java
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/external/javadoc/StandardJavadocDocletOptionsTest.java
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/external/javadoc/internal/JavadocOptionFileWriterContextTest.java
 rename subprojects/publish/src/main/resources/META-INF/gradle-plugins/{publishing.properties => org.gradle.publishing.properties} (100%)
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/plugins/ReportingBasePluginConvention.java
 rename subprojects/reporting/src/main/resources/META-INF/gradle-plugins/{build-dashboard.properties => org.gradle.build-dashboard.properties} (100%)
 delete mode 100644 subprojects/reporting/src/test/groovy/org/gradle/api/plugins/ReportingBasePluginConventionTest.groovy
 create mode 100644 subprojects/resources-http/resources-http.gradle
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/ApacheDirectoryListingParser.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/DefaultHttpSettings.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpClientConfigurer.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpClientHelper.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpConnectorFactory.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpProxySettings.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpRequestException.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResourceAccessor.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResourceLister.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResourceUploader.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResourcesPluginServiceRegistry.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResponseResource.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpSettings.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/JavaSystemPropertiesHttpProxySettings.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/JavaSystemPropertiesProxySettings.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/JavaSystemPropertiesSecureHttpProxySettings.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/RepeatableInputStreamEntity.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/ntlm/NTLMCredentials.java
 create mode 100644 subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/ntlm/NTLMSchemeFactory.java
 create mode 100644 subprojects/resources-http/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/ApacheDirectoryListingParserTest.groovy
 create mode 100644 subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpClientConfigurerTest.groovy
 create mode 100644 subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpClientHelperTest.groovy
 create mode 100644 subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpResourceListerTest.groovy
 create mode 100644 subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpResponseResourceTest.groovy
 create mode 100644 subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/JavaSystemPropertiesHttpProxySettingsTest.groovy
 create mode 100644 subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/JavaSystemPropertiesProxySettingsTest.groovy
 create mode 100644 subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/JavaSystemPropertiesSecureHttpProxySettingsTest.groovy
 create mode 100644 subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/ntlm/NTLMCredentialsTest.groovy
 rename subprojects/{core-impl/src/test/resources/org/gradle/api/internal/externalresource => resources-http/src/test/resources/org/gradle/internal/resource}/transport/http/artifactory_dirlisting.html (100%)
 rename subprojects/{core-impl/src/test/resources/org/gradle/api/internal/externalresource => resources-http/src/test/resources/org/gradle/internal/resource}/transport/http/mavencentral_dirlisting.html (100%)
 rename subprojects/{core-impl/src/test/resources/org/gradle/api/internal/externalresource => resources-http/src/test/resources/org/gradle/internal/resource}/transport/http/nexus_dirlisting.html (100%)
 create mode 100644 subprojects/resources-s3/resources-s3.gradle
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/AbstractS3DependencyResolutionTest.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/S3ClientIntegrationTest.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/fixtures/IvyS3Module.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/fixtures/IvyS3Repository.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/fixtures/MavenS3Module.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/fixtures/MavenS3Repository.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/fixtures/S3Artifact.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/fixtures/S3DirectoryResource.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/fixtures/S3Resource.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/fixtures/S3Server.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/fixtures/stub/HttpMessage.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/fixtures/stub/HttpStub.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/fixtures/stub/StubRequest.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/fixtures/stub/StubResponse.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/ivy/IvyPublishS3IntegrationTest.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/ivy/IvyS3RepoResolveIntegrationTest.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/ivy/IvyS3UploadArchivesIntegrationTest.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/maven/MavenPublishS3ErrorsIntegrationTest.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/maven/MavenPublishS3IntegrationTest.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/maven/MavenS3ProxiedRepoIntegrationTest.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/maven/MavenS3RepoErrorsIntegrationTest.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/maven/MavenS3RepoResolveIntegrationTest.groovy
 create mode 100644 subprojects/resources-s3/src/integTest/groovy/org/gradle/integtests/resource/s3/maven/MavenS3SnapshotRepoIntegrationTest.groovy
 create mode 100644 subprojects/resources-s3/src/main/java/org/gradle/internal/resource/transport/aws/s3/S3Client.java
 create mode 100644 subprojects/resources-s3/src/main/java/org/gradle/internal/resource/transport/aws/s3/S3ConnectionProperties.java
 create mode 100644 subprojects/resources-s3/src/main/java/org/gradle/internal/resource/transport/aws/s3/S3ConnectorFactory.java
 create mode 100644 subprojects/resources-s3/src/main/java/org/gradle/internal/resource/transport/aws/s3/S3RegionalResource.java
 create mode 100644 subprojects/resources-s3/src/main/java/org/gradle/internal/resource/transport/aws/s3/S3Resource.java
 create mode 100644 subprojects/resources-s3/src/main/java/org/gradle/internal/resource/transport/aws/s3/S3ResourceConnector.java
 create mode 100644 subprojects/resources-s3/src/main/java/org/gradle/internal/resource/transport/aws/s3/S3ResourcesPluginServiceRegistry.java
 create mode 100644 subprojects/resources-s3/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/resources-s3/src/test/groovy/org/gradle/internal/resource/transport/aws/s3/S3ClientTest.groovy
 create mode 100644 subprojects/resources-s3/src/test/groovy/org/gradle/internal/resource/transport/aws/s3/S3ConnectionPropertiesTest.groovy
 create mode 100644 subprojects/resources-s3/src/test/groovy/org/gradle/internal/resource/transport/aws/s3/S3ConnectorFactoryTest.groovy
 create mode 100644 subprojects/resources-s3/src/test/groovy/org/gradle/internal/resource/transport/aws/s3/S3RegionalResourceTest.groovy
 create mode 100644 subprojects/resources-s3/src/test/groovy/org/gradle/internal/resource/transport/aws/s3/S3ResourceConnectorTest.groovy
 create mode 100644 subprojects/resources-sftp/resources-sftp.gradle
 create mode 100644 subprojects/resources-sftp/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishSftpIntegrationTest.groovy
 create mode 100644 subprojects/resources-sftp/src/integTest/groovy/org/gradle/api/publish/ivy/IvySftpLegacyPublishIntegrationTest.groovy
 create mode 100644 subprojects/resources-sftp/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishSftpIntegrationTest.groovy
 create mode 100644 subprojects/resources-sftp/src/integTest/groovy/org/gradle/integtests/resolve/resource/sftp/AbstractSftpDependencyResolutionTest.groovy
 create mode 100644 subprojects/resources-sftp/src/integTest/groovy/org/gradle/integtests/resolve/resource/sftp/ivy/IvySftpRepoDynamicRevisionIntegrationTest.groovy
 create mode 100644 subprojects/resources-sftp/src/integTest/groovy/org/gradle/integtests/resolve/resource/sftp/ivy/IvySftpRepoErrorsIntegrationTest.groovy
 create mode 100644 subprojects/resources-sftp/src/integTest/groovy/org/gradle/integtests/resolve/resource/sftp/ivy/IvySftpRepoResolveIntegrationTest.groovy
 create mode 100644 subprojects/resources-sftp/src/integTest/groovy/org/gradle/integtests/resolve/resource/sftp/maven/MavenSftpRepoResolveIntegrationTest.groovy
 create mode 100644 subprojects/resources-sftp/src/main/java/org/gradle/internal/resource/transport/sftp/LockableSftpClient.java
 create mode 100644 subprojects/resources-sftp/src/main/java/org/gradle/internal/resource/transport/sftp/SftpClientFactory.java
 create mode 100644 subprojects/resources-sftp/src/main/java/org/gradle/internal/resource/transport/sftp/SftpConnectorFactory.java
 create mode 100644 subprojects/resources-sftp/src/main/java/org/gradle/internal/resource/transport/sftp/SftpHost.java
 create mode 100644 subprojects/resources-sftp/src/main/java/org/gradle/internal/resource/transport/sftp/SftpResource.java
 create mode 100644 subprojects/resources-sftp/src/main/java/org/gradle/internal/resource/transport/sftp/SftpResourceAccessor.java
 create mode 100644 subprojects/resources-sftp/src/main/java/org/gradle/internal/resource/transport/sftp/SftpResourceLister.java
 create mode 100644 subprojects/resources-sftp/src/main/java/org/gradle/internal/resource/transport/sftp/SftpResourceUploader.java
 create mode 100644 subprojects/resources-sftp/src/main/java/org/gradle/internal/resource/transport/sftp/SftpResourcesPluginServiceRegistry.java
 create mode 100644 subprojects/resources-sftp/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/resources-sftp/src/test/groovy/org/gradle/internal/resource/transport/sftp/SftpClientFactoryTest.groovy
 delete mode 100644 subprojects/resources/src/main/java/org/gradle/internal/filestore/FileStore.java
 delete mode 100644 subprojects/resources/src/main/java/org/gradle/internal/filestore/FileStoreSearcher.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/AbstractExternalResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/CachingResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/CharsetUtil.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/DelegatingResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/ExternalResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/ExternalResourceName.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/LocalFileStandInExternalResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/PasswordCredentials.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/Resource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/ResourceException.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/ResourceNotFoundException.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/StringResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/UriResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/connector/ResourceConnectorFactory.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/connector/ResourceConnectorSpecification.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/AbstractLocallyAvailableResourceFinder.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/ByteArrayLocalResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/CompositeLocallyAvailableResourceFinder.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/DefaultLocallyAvailableExternalResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/FileLocalResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/FileStore.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/FileStoreSearcher.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/LazyLocallyAvailableResourceCandidates.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocalResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableExternalResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableResourceCandidates.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableResourceFinder.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableResourceFinderSearchableFileStoreAdapter.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/metadata/DefaultExternalResourceMetaData.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/metadata/ExternalResourceMetaData.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/metadata/ExternalResourceMetaDataCompare.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/DefaultExternalResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/DefaultExternalResourceConnector.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceAccessor.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceConnector.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceLister.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceReadResponse.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceUploader.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/UrlExternalResource.java
 create mode 100644 subprojects/resources/src/test/groovy/org/gradle/internal/resource/AbstractExternalResourceTest.groovy
 create mode 100644 subprojects/resources/src/test/groovy/org/gradle/internal/resource/CachingResourceTest.groovy
 create mode 100644 subprojects/resources/src/test/groovy/org/gradle/internal/resource/ExternalResourceNameTest.groovy
 create mode 100644 subprojects/resources/src/test/groovy/org/gradle/internal/resource/ResourceExceptionTest.groovy
 create mode 100644 subprojects/resources/src/test/groovy/org/gradle/internal/resource/StringResourceTest.groovy
 create mode 100644 subprojects/resources/src/test/groovy/org/gradle/internal/resource/UriResourceTest.groovy
 create mode 100644 subprojects/resources/src/test/groovy/org/gradle/internal/resource/metadata/DefaultExternalResourceMetaDataTest.groovy
 create mode 100644 subprojects/resources/src/test/groovy/org/gradle/internal/resource/metadata/ExternalResourceMetaDataCompareTest.groovy
 create mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/integtests/fixtures/ScalaCoverage.groovy
 create mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/scala/ScalaPluginIntegrationTest.groovy
 create mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/AbstractAntForkingScalaCompilerIntegrationTest.groovy
 create mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/AbstractAntInProcessScalaCompilerIntegrationTest.groovy
 create mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/AntForkingOlderScalaCompilerIntegrationTest.groovy
 create mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/AntInProcessOlderScalaCompilerIntegrationTest.groovy
 delete mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/jdk6/AntForkingScalaCompilerJdk6IntegrationTest.groovy
 delete mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/jdk6/AntInProcessScalaCompilerJdk6IntegrationTest.groovy
 delete mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/jdk6/ZincScalaCompilerJdk6IntegrationTest.groovy
 rename subprojects/scala/src/integTest/resources/org/gradle/scala/compile/{jdk6/ZincScalaCompilerJdk6IntegrationTest => ZincScalaCompilerIntegrationTest}/compilesIncrementallyAcrossProjectBoundaries/build.gradle (100%)
 rename subprojects/scala/src/integTest/resources/org/gradle/scala/compile/{jdk6/ZincScalaCompilerJdk6IntegrationTest => ZincScalaCompilerIntegrationTest}/compilesIncrementallyAcrossProjectBoundaries/prj1/src/main/scala/Person.scala (100%)
 rename subprojects/scala/src/integTest/resources/org/gradle/scala/compile/{jdk6/ZincScalaCompilerJdk6IntegrationTest => ZincScalaCompilerIntegrationTest}/compilesIncrementallyAcrossProjectBoundaries/prj2/src/main/scala/House.scala (100%)
 rename subprojects/scala/src/integTest/resources/org/gradle/scala/compile/{jdk6/ZincScalaCompilerJdk6IntegrationTest => ZincScalaCompilerIntegrationTest}/compilesIncrementallyAcrossProjectBoundaries/prj2/src/main/scala/Other.scala (100%)
 rename subprojects/scala/src/integTest/resources/org/gradle/scala/compile/{jdk6/ZincScalaCompilerJdk6IntegrationTest => ZincScalaCompilerIntegrationTest}/compilesIncrementallyAcrossProjectBoundaries/settings.gradle (100%)
 rename subprojects/scala/src/integTest/resources/org/gradle/scala/compile/{jdk6/ZincScalaCompilerJdk6IntegrationTest => ZincScalaCompilerIntegrationTest}/compilesJavaCodeIncrementally/build.gradle (100%)
 create mode 100644 subprojects/scala/src/integTest/resources/org/gradle/scala/compile/ZincScalaCompilerIntegrationTest/compilesJavaCodeIncrementally/src/main/scala/House.java
 rename subprojects/scala/src/integTest/resources/org/gradle/scala/compile/{jdk6/ZincScalaCompilerJdk6IntegrationTest => ZincScalaCompilerIntegrationTest}/compilesJavaCodeIncrementally/src/main/scala/Other.java (100%)
 rename subprojects/scala/src/integTest/resources/org/gradle/scala/compile/{jdk6/ZincScalaCompilerJdk6IntegrationTest => ZincScalaCompilerIntegrationTest}/compilesJavaCodeIncrementally/src/main/scala/Person.java (100%)
 rename subprojects/scala/src/integTest/resources/org/gradle/scala/compile/{jdk6/ZincScalaCompilerJdk6IntegrationTest => ZincScalaCompilerIntegrationTest}/compilesScalaCodeIncrementally/build.gradle (100%)
 rename subprojects/scala/src/integTest/resources/org/gradle/scala/compile/{jdk6/ZincScalaCompilerJdk6IntegrationTest => ZincScalaCompilerIntegrationTest}/compilesScalaCodeIncrementally/src/main/scala/House.scala (100%)
 rename subprojects/scala/src/integTest/resources/org/gradle/scala/compile/{jdk6/ZincScalaCompilerJdk6IntegrationTest => ZincScalaCompilerIntegrationTest}/compilesScalaCodeIncrementally/src/main/scala/Other.scala (100%)
 rename subprojects/scala/src/integTest/resources/org/gradle/scala/compile/{jdk6/ZincScalaCompilerJdk6IntegrationTest => ZincScalaCompilerIntegrationTest}/compilesScalaCodeIncrementally/src/main/scala/Person.scala (100%)
 delete mode 100644 subprojects/scala/src/integTest/resources/org/gradle/scala/compile/jdk6/ZincScalaCompilerJdk6IntegrationTest/compilesJavaCodeIncrementally/src/main/scala/House.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/DaemonScalaCompiler.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/DefaultScalaCompileSpec.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/DefaultScalaJavaJointCompileSpec.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/DelegatingScalaCompiler.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/NormalizingScalaCompiler.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaCompileSpec.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaCompilerArgumentsGenerator.java
 create mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaJavaJointCompiler.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/jdk6/ZincScalaCompiler.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/tasks/ScalaRuntime.groovy
 create mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/tasks/ScalaRuntime.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/tasks/scala/IncrementalCompileOptions.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/tasks/scala/ScalaDocOptions.groovy
 create mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/tasks/scala/ScalaDocOptions.java
 rename subprojects/scala/src/main/resources/META-INF/gradle-plugins/{scala-base.properties => org.gradle.scala-base.properties} (100%)
 rename subprojects/scala/src/main/resources/META-INF/gradle-plugins/{scala.properties => org.gradle.scala.properties} (100%)
 delete mode 100644 subprojects/scala/src/test/groovy/org/gradle/api/internal/tasks/scala/NormalizingScalaCompilerTest.groovy
 delete mode 100644 subprojects/scala/src/test/groovy/org/gradle/api/internal/tasks/scala/ScalaCompilerArgumentsGeneratorTest.groovy
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/SigningPluginConvention.groovy
 rename subprojects/signing/src/main/resources/META-INF/gradle-plugins/{signing.properties => org.gradle.signing.properties} (100%)
 delete mode 100644 subprojects/sonar/src/integTest/groovy/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest.groovy
 create mode 100644 subprojects/sonar/src/integTest/groovy/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest.groovy
 create mode 100644 subprojects/sonar/src/integTest/groovy/org/gradle/sonar/runner/SonarTestServer.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/settings.gradle
 create mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/build.gradle
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/customizedProject/build.gradle (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/customizedProject/src/org/gradle/test/customizedProject/Production1.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/customizedProject/test/org/gradle/test/customizedProject/Test1.java (100%)
 create mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/emptyJavaProject/build.gradle
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/gradle.properties (100%)
 create mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/build.gradle
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy1.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy10.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy2.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy3.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy4.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy5.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy6.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy7.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy8.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy9.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy1.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy10.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy2.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy3.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy4.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy5.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy6.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy7.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy8.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy9.groovy (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/build.gradle (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production1.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production10.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production2.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production3.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production4.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production5.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production6.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production7.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production8.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production9.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/resources/org/gradle/test/javaProject/productionResource.xml (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test1.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test10.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test2.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test3.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test4.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test5.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test6.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test7.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test8.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test9.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/resources/org/gradle/test/javaProject/testResource.xml (100%)
 create mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithSkippedTestTask/build.gradle
 create mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithSkippedTestTask/src/test/java/Test1.java
 create mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithoutTestClasses/build.gradle
 create mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithoutTestClasses/src/main/java/Production1.java
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/nested/nested2/nestedProject/build.gradle (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/nested/nested2/nestedProject/src/main/java/org/gradle/test/nestedProject/Production1.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/nested/nested2/nestedProject/src/test/java/org/gradle/test/nestedProject/Test1.java (100%)
 create mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/settings.gradle
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/skippedProject/build.gradle (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/skippedProject/src/main/java/org/gradle/test/skippedProject/Production1.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/{api => }/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/skippedProject/src/test/java/org/gradle/test/skippedProject/Test1.java (100%)
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/api/sonar/runner/SonarProperties.groovy
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/api/sonar/runner/SonarRunner.groovy
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/api/sonar/runner/SonarRunnerExtension.groovy
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/api/sonar/runner/SonarRunnerPlugin.groovy
 create mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/SonarProperties.java
 create mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/SonarRunnerExtension.java
 create mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/SonarRunnerRootExtension.java
 create mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/package-info.java
 create mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/plugins/SonarRunnerPlugin.java
 create mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/plugins/package-info.java
 create mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/tasks/SonarRunner.java
 create mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/tasks/package-info.java
 create mode 100644 subprojects/sonar/src/main/resources/META-INF/gradle-plugins/org.gradle.sonar-runner.properties
 rename subprojects/sonar/src/main/resources/META-INF/gradle-plugins/{sonar.properties => org.gradle.sonar.properties} (100%)
 delete mode 100644 subprojects/sonar/src/main/resources/META-INF/gradle-plugins/sonar-runner.properties
 create mode 100644 subprojects/sonar/src/main/resources/logback.xml
 delete mode 100644 subprojects/sonar/src/test/groovy/org/gradle/api/sonar/runner/SonarPropertiesTest.groovy
 delete mode 100644 subprojects/sonar/src/test/groovy/org/gradle/api/sonar/runner/SonarRunnerExtensionTest.groovy
 delete mode 100644 subprojects/sonar/src/test/groovy/org/gradle/api/sonar/runner/SonarRunnerPluginTest.groovy
 create mode 100644 subprojects/sonar/src/test/groovy/org/gradle/sonar/runner/SonarPropertiesTest.groovy
 create mode 100644 subprojects/sonar/src/test/groovy/org/gradle/sonar/runner/SonarRunnerExtensionTest.groovy
 create mode 100644 subprojects/sonar/src/test/groovy/org/gradle/sonar/runner/plugins/SonarRunnerPluginTest.groovy
 create mode 100755 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/cunit/CUnitIntegrationTest.groovy
 create mode 100644 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/cunit/CUnitSamplesIntegrationTest.groovy
 create mode 100644 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/cunit/CUnitTestResults.groovy
 create mode 100644 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/cunit/ComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/cunit/plugins/CUnitPluginIntegrationTest.groovy
 create mode 100644 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/googletest/ComponentReportIntegrationTest.groovy
 create mode 100755 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/googletest/GoogleTestIntegrationTest.groovy
 create mode 100644 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/googletest/GoogleTestSamplesIntegrationTest.groovy
 create mode 100644 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/googletest/GoogleTestTestResults.groovy
 create mode 100644 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/googletest/plugins/GoogleTestPluginIntegrationTest.groovy
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/cunit/CUnitTestSuiteBinarySpec.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/cunit/CUnitTestSuiteSpec.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/cunit/internal/DefaultCUnitTestSuiteBinary.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/cunit/internal/DefaultCUnitTestSuiteSpec.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/cunit/package-info.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/cunit/plugins/CUnitPlugin.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/cunit/plugins/package-info.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/cunit/tasks/GenerateCUnitLauncher.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/cunit/tasks/package-info.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/googletest/GoogleTestTestSuiteBinarySpec.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/googletest/GoogleTestTestSuiteSpec.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/googletest/internal/DefaultGoogleTestTestSuiteBinary.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/googletest/internal/DefaultGoogleTestTestSuiteSpec.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/googletest/package-info.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/googletest/plugins/GoogleTestPlugin.java
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/googletest/plugins/package-info.java
 create mode 100644 subprojects/testing-native/src/main/resources/META-INF/gradle-plugins/org.gradle.cunit.properties
 create mode 100644 subprojects/testing-native/src/main/resources/META-INF/gradle-plugins/org.gradle.google-test.properties
 rename subprojects/{cpp/src/main/resources/org/gradle/nativebinaries => testing-native/src/main/resources/org/gradle/nativeplatform}/test/cunit/tasks/gradle_cunit_main.c (100%)
 rename subprojects/{cpp/src/main/resources/org/gradle/nativebinaries => testing-native/src/main/resources/org/gradle/nativeplatform}/test/cunit/tasks/gradle_cunit_register.h (100%)
 create mode 100644 subprojects/testing-native/src/test/groovy/org/gradle/nativeplatform/test/cunit/CUnitTest.groovy
 create mode 100644 subprojects/testing-native/src/test/groovy/org/gradle/nativeplatform/test/googletest/GoogleTestTest.groovy
 create mode 100644 subprojects/testing-native/testing-native.gradle
 create mode 100644 subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/BuildModelActionRunner.java
 create mode 100644 subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/ClientForwardingTestListener.java
 create mode 100644 subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/ClientProvidedBuildActionRunner.java
 create mode 100644 subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/DefaultBuildController.java
 create mode 100644 subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/ToolingBuilderServices.java
 create mode 100644 subprojects/tooling-api-builders/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/tooling-api-builders/src/test/groovy/org/gradle/tooling/internal/provider/runner/ClientProvidedBuildActionRunnerTest.groovy
 create mode 100644 subprojects/tooling-api-builders/src/test/groovy/org/gradle/tooling/internal/provider/runner/DefaultBuildControllerTest.groovy
 create mode 100644 subprojects/tooling-api-builders/tooling-api-builders.gradle
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/UnsupportedModelFeedbackCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/StrictLongRunningOperationCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/VersionOnlyBuildEnvironmentCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/CounterAction.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r20/BrokenAction.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r20/GradleProjectModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r20/ToolingApiUnsupportedBuildJvmCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r20/ToolingApiUnsupportedClientJvmCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r21/CancellationCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r21/HangingBuildAction.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r21/PreCancellationCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r21/R21CancellationCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r21/TaskVisibilityCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r22/BuildActionCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r22/CancellationCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r22/ClientShutdownCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r22/Idea13ModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r23/GradleProjectCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r23/ImplicitTasksToolingApiCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r23/ModelBuilderCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r23/StandardStreamsCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r24/BuildEnvironmentCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r24/BuildInvocationsCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r24/DaemonUsageSuggestionCrossVersionTest.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r24/GradleProjectCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r24/ModelTasksToolingApiCrossVersionTest.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r24/TestProgressCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r24/TestProgressDaemonErrorsCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/BuildCancelledException.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/CancellationToken.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/CancellationTokenSource.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/Failure.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/FailureResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/FinishEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/OperationDescriptor.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/OperationResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/ProgressEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/SkippedResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/StartEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/SuccessResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/internal/BaseFinishEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/internal/BaseProgressEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/internal/BaseStartEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/package-info.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/JvmTestKind.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/JvmTestOperationDescriptor.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestFailureResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestFinishEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOperationDescriptor.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOperationResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestProgressEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestProgressListener.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestSkippedResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestStartEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestSuccessResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestFailureResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestFinishEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestSkippedResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestStartEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestSuccessResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/package-info.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/CancellationTokenInternal.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/DefaultCancellationTokenSource.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/DefaultExecutorServiceFactory.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/DefaultFailure.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/ExecutorServiceFactory.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/AbstractModelProducer.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/AbstractPre12ConsumerConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ActionRunner.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/CancellableConsumerConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/CancellableModelBuilderBackedModelProducer.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/InternalBuildActionAdapter.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/LoggingInitializerConsumerActionExecutor.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/NonCancellableConsumerConnectionAdapter.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ShutdownAwareConsumerConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/UnsupportedActionRunner.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/ConsumerProvidedBuildInvocations.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/GradleProjectConverter.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/GradleProjectMixInHandler.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/PropertyHandlerFactory.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/parameters/BuildCancellationTokenAdapter.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/parameters/BuildProgressListenerAdapter.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/BasicGradleTaskSelector.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/ConsumerProvidedTask.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/ConsumerProvidedTaskSelector.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultBuildInvocations.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultConvertedGradleProject.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultGradleProjectTask.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultGradleTask.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalBuildCancelledException.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalBuildProgressListener.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalCancellableConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalCancellationToken.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalFailure.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/ShutdownParameters.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/StoppableConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/events/InternalJvmTestDescriptor.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/events/InternalTestDescriptor.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/events/InternalTestFailureResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/events/InternalTestFinishedProgressEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/events/InternalTestProgressEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/events/InternalTestResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/events/InternalTestSkippedResult.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/events/InternalTestStartedProgressEvent.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/events/InternalTestSuccessResult.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/eclipse/EclipseTask.java
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/ConnectionFactoryTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/DefaultCancellationTokenSourceTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/CancellableConsumerConnectionTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/CancellableModelBuilderBackedModelProducerTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/NonCancellableConsumerConnectionAdapterTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/parameters/BuildProgressListenerAdapterTest.groovy
 create mode 100644 subprojects/tooling-api/src/testFixtures/groovy/org/gradle/integtests/tooling/fixture/TestOutputStream.groovy
 create mode 100644 subprojects/tooling-api/src/testFixtures/groovy/org/gradle/integtests/tooling/fixture/TestResultHandler.groovy
 create mode 100644 subprojects/ui/src/integTest/groovy/org/gradle/integtests/BlockingRequestObserver.java
 create mode 100644 subprojects/ui/src/integTest/groovy/org/gradle/integtests/ExtraTestCommandLineOptionsListenerWrapper.java
 create mode 100644 subprojects/ui/src/integTest/groovy/org/gradle/integtests/ModelTasksGradleUIIntegrationTest.groovy
 create mode 100644 subprojects/ui/src/integTest/groovy/org/gradle/integtests/OpenApiFixture.java
 create mode 100644 subprojects/ui/src/integTest/groovy/org/gradle/integtests/OpenApiUiTest.groovy
 create mode 100644 subprojects/ui/src/integTest/groovy/org/gradle/integtests/OutputUILordTest.groovy
 create mode 100644 subprojects/ui/src/integTest/groovy/org/gradle/integtests/TestAlternateUIInteractionVersion1.java
 create mode 100644 subprojects/ui/src/integTest/groovy/org/gradle/integtests/TestExecutionInteraction.groovy
 create mode 100644 subprojects/ui/src/integTest/groovy/org/gradle/integtests/TestSettingsNodeVersion1.java
 create mode 100644 subprojects/ui/src/integTest/groovy/org/gradle/integtests/TestSingleDualPaneUIInteractionVersion1.java
 delete mode 100644 subprojects/ui/src/main/java/org/gradle/gradleplugin/foundation/runner/GradleRunner.java
 delete mode 100644 subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/generic/DualPaneUIInstance.java
 create mode 100644 subprojects/ui/src/main/java/org/gradle/openapi/wrappers/NoLongerSupportedException.java
 delete mode 100644 subprojects/ui/src/main/java/org/gradle/openapi/wrappers/RunnerWrapperFactory.java
 delete mode 100644 subprojects/ui/src/main/java/org/gradle/openapi/wrappers/UIWrapperFactory.java
 delete mode 100644 subprojects/ui/src/main/java/org/gradle/openapi/wrappers/runner/GradleRunnerInteractionWrapper.java
 create mode 100644 subprojects/wrapper/src/integTest/groovy/org/gradle/integtests/WrapperLoggingIntegrationTest.groovy
 create mode 100644 subprojects/wrapper/src/main/java/org/gradle/wrapper/Logger.java

-- 
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