[gradle] branch master updated (7fd780b -> d84282c)

Kai-Chung Yan seamlik-guest at moszumanska.debian.org
Wed Nov 2 10:13:15 UTC 2016


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

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

      from  7fd780b   d/generate_pom.gradle: Normalize the Artifact IDs of all Gradle projects to match the real JAR names
       new  7e1d66d   d/watch: Use version 4
       new  936c482   d/gradle.desktop: Improve zh-TW translation
       new  79d806b   Bump to version 3.1-1
      adds  19536c7   New upstream version 3.1
       new  c73cb7e   Merge tag 'upstream/3.1' into 3.1
       new  93c34c6   Refresh patches and build scripts.
       new  d36e592   Improve d/.gitignore
       new  b4baac7   Update d/gradle.1.md
       new  57dbfd2   d/gradle-doc.lintian-overrides: Override duplicate-files since they are annoying
       new  f7f7d14   Install new JAR: gradle-installation-beacon.jar
       new  a6314f8   Align and sort entries in *.poms *.links *.install
       new  dc122dc   Move the symlink to gradle-wrapper.jar to libgradle-plugins-java
       new  19105e0   d/.gitignore: Ignore *.doc-base.javadoc which is generated by javahelper
       new  7a8be63   d/control: Build-Depends on default-jdk-headless | default-jdk (>= 1:1.6)
       new  ba7c1f7   d/control: Restrict groovy >= 2.4.7, gradle >= 2.13, libnative-platform-java >= 0.11
       new  793d961   Update to debhelper 10
       new  50075ca   d/control: Build-Depends on libfindbugs-java instead of findbugs
       new  29d3b62   d/control: Sort entries
       new  f274892   generate_pom.gradle: Add publishCompile and publishRuntime dependencies to the POMs
       new  edc750d   Simplify Groovy_projects_depends_on_localGroovy.patch
       new  02859d7   Drop disable_tests.diff
       new  7557230   Move jquery.tipTip.js to d/additionalSrc/javascript
       new  d84282c   New drop_jmh-gradle-plugin.patch

The 22 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                                       |  159 ++-
 buildSrc/build.gradle                              |   26 +-
 buildSrc/src/main/groovy/org/gradle/ShadedJar.java |  362 +++++
 .../src/main/groovy/org/gradle/build/JarJar.groovy |   65 -
 .../main/groovy/org/gradle/build/JarJarJar.groovy  |   86 --
 .../org/gradle/build/ReleasedVersions.groovy       |   31 +-
 .../build/docs/UserGuideSectionVerifier.groovy     |  114 ++
 .../build/docs/UserGuideTransformTask.groovy       |    9 +-
 .../build/docs/dsl/source/TypeNameResolver.java    |    9 +-
 .../org/gradle/cleanup/EmptyDirectoryCheck.groovy  |   53 +
 .../gradle/modules/ClasspathManifestPatcher.groovy |  100 ++
 .../org/gradle/modules/ExcludeEntryPatcher.groovy  |   67 +
 .../generator/DependencyGenerator.groovy           |  120 --
 .../performance/generator/DependencyGraph.groovy   |   27 -
 .../performance/generator/MavenJarCreator.groovy   |   76 -
 .../performance/generator/MavenModule.groovy       |  162 ---
 .../gradle/performance/generator/MavenPom.groovy   |   35 -
 .../performance/generator/MavenRepository.groovy   |   51 -
 .../gradle/performance/generator/MavenScope.groovy |   25 -
 .../performance/generator/RepositoryBuilder.groovy |   80 --
 .../performance/generator/TestProject.groovy       |   46 -
 .../generator/tasks/JvmProjectGeneratorTask.groovy |  124 --
 .../MonolithicNativeProjectGeneratorTask.groovy    |   80 --
 .../tasks/NativeProjectGeneratorTask.groovy        |   44 -
 .../generator/tasks/ProjectGeneratorTask.groovy    |  240 ----
 .../testing/DistributedPerformanceTest.groovy      |  304 ++++
 .../org/gradle/testing/DistributionTest.java       |   25 +
 .../groovy/org/gradle/testing/IntegrationTest.java |   25 +
 .../groovy/org/gradle/testing/PerformanceTest.java |  115 ++
 .../gradle/testing/ScenarioReportRenderer.groovy   |  100 ++
 .../main/groovy/org/gradle/testing/SmokeTest.java  |   23 +
 .../main/groovy/org/gradle/testing/SoakTest.java   |   23 +
 .../generator/DependencyGenerator.groovy           |  120 ++
 .../performance/generator/DependencyGraph.groovy   |   27 +
 .../performance/generator/MavenJarCreator.groovy   |   76 +
 .../performance/generator/MavenModule.groovy       |  163 +++
 .../testing/performance/generator/MavenPom.groovy  |   35 +
 .../performance/generator/MavenRepository.groovy   |   51 +
 .../performance/generator/MavenScope.groovy        |   25 +
 .../performance/generator/RepositoryBuilder.groovy |   80 ++
 .../performance/generator/TestProject.groovy       |   46 +
 .../generator/tasks/JvmProjectGeneratorTask.groovy |  124 ++
 .../MonolithicNativeProjectGeneratorTask.groovy    |   80 ++
 .../tasks/NativeProjectGeneratorTask.groovy        |   44 +
 .../generator/tasks/ProjectGeneratorTask.groovy    |  257 ++++
 .../generator/tasks/RemoteProject.groovy           |   59 +
 .../org/gradle/testing/scenario-report-style.css   |   55 +
 .../build/docs/UserGuideSectionVerifierTest.groovy |  233 +++
 .../gradle/cleanup/EmptyDirectoryCheckTest.groovy  |  117 ++
 .../generator/DependencyGeneratorTest.groovy       |   48 -
 .../testing/ScenarioReportRendererTest.groovy      |   72 +
 .../generator/DependencyGeneratorTest.groovy       |   48 +
 .../resources/org/gradle/testing/TEST-sample.xml   |   42 +
 .../gradle/testing/sample-build-result-failure.xml |   43 +
 .../gradle/testing/sample-build-result-success.xml |   43 +
 config/checkstyle/checkstyle.xml                   |    3 +
 config/checkstyle/suppressions.xml                 |   19 +-
 debian/.gitignore                                  |   29 +-
 .../javascript/jquery.tipTip.js                    |    0
 .../resources/all-released-versions.json           | 1387 ++++++++++++++++++
 debian/changelog                                   |    6 +
 debian/compat                                      |    2 +-
 debian/control                                     |   26 +-
 debian/generate_pom.gradle                         |   14 +
 debian/gradle-doc.doc-base.gradle-dsl              |    8 +
 debian/gradle-doc.doc-base.gradle-groovydoc        |    9 -
 debian/gradle-doc.doc-base.gradle-javadoc          |    1 -
 debian/gradle-doc.doc-base.gradle-userguide        |   11 +
 debian/gradle-doc.install                          |    3 +-
 debian/gradle-doc.javadoc                          |    1 +
 debian/gradle-doc.lintian-overrides                |    2 +
 debian/gradle.1.md                                 |   64 +-
 debian/gradle.desktop                              |    6 +-
 debian/gradle.install                              |    4 +-
 debian/gradle.poms                                 |    2 +-
 debian/libgradle-core-java.links                   |    9 +-
 debian/libgradle-core-java.poms                    |   26 +-
 debian/libgradle-plugins-java.install              |    2 +-
 debian/libgradle-plugins-java.links                |    6 +-
 debian/libgradle-plugins-java.poms                 |   83 +-
 debian/patches/33_scala_zinc.diff                  |   54 +-
 debian/patches/34_disable_code_quality.diff        |   67 +-
 .../Groovy_projects_depends_on_localGroovy.patch   |   15 +
 .../dependency-management_depends_on_testkit.patch |   11 +
 debian/patches/disable_Kotlin.patch                |   13 +
 debian/patches/disable_aws.diff                    |   54 +-
 debian/patches/disable_buildSrc_tests.patch        |   17 +
 debian/patches/disable_sonar.diff                  |   76 -
 debian/patches/disable_tests.diff                  |  534 -------
 debian/patches/docs.diff                           |   38 +-
 debian/patches/drop_http-builder.patch             |  151 ++
 debian/patches/drop_jmh-gradle-plugin.patch        |   16 +
 debian/patches/eclipse-aether.diff                 |   26 +-
 debian/patches/generate_pom.diff                   |    4 +-
 debian/patches/groovy-jar.patch                    |   10 +-
 debian/patches/ivy-2.4.0.patch                     |   25 +-
 debian/patches/jcommander.diff                     |   13 +-
 debian/patches/maven-3.3-compatibility.patch       |   10 +-
 debian/patches/nekohtml.diff                       |    4 +-
 debian/patches/new_APIs_in_3.0.patch               |   17 +
 debian/patches/relax_warnings.diff                 |    2 +-
 debian/patches/removeTimestampInManifest.patch     |   54 +-
 debian/patches/search_system_jar.diff              |   12 +-
 debian/patches/series                              |    9 +-
 debian/patches/upgrade-to-jetty9.patch             |   63 +-
 debian/patches/use_local_artifacts.diff            |   85 +-
 debian/rules                                       |   20 +-
 debian/watch                                       |    4 +-
 gradle/buildReceipt.gradle                         |   32 +-
 gradle/buildReceiptInit.gradle                     |   20 -
 gradle/buildScanInit.gradle                        |   14 +
 gradle/buildSplits.gradle                          |  104 +-
 gradle/buildTagging.gradle                         |   27 +
 gradle/classycle.gradle                            |    4 +-
 gradle/codeQuality.gradle                          |   12 +-
 gradle/dependencies.gradle                         |   31 +-
 gradle/distributionTesting.gradle                  |  324 +++++
 gradle/eclipse.gradle                              |   12 +-
 gradle/groovyProject.gradle                        |   44 +-
 gradle/idea.gradle                                 |   28 +-
 gradle/integTest.gradle                            |  331 +----
 gradle/java9.gradle                                |  205 +--
 gradle/jmh.gradle                                  |   37 +
 gradle/performanceTest.gradle                      |  302 ++++
 gradle/publish.gradle                              |    4 -
 gradle/taskProperties.gradle                       |    9 +
 gradle/testGroupings.gradle                        |    2 +-
 gradle/versioning.gradle                           |   82 +-
 gradle/wrapper.gradle                              |   26 +-
 gradle/wrapper/gradle-wrapper.properties           |    4 +-
 gradlew                                            |   51 +-
 gradlew.bat                                        |   12 +-
 settings.gradle                                    |   12 +-
 subprojects/announce/announce.gradle               |    3 +-
 .../api/plugins/announce/AnnouncePlugin.groovy     |   30 -
 .../announce/AnnouncePluginExtension.groovy        |   95 --
 .../announce/BuildAnnouncementsPlugin.groovy       |   34 -
 .../announce/internal/AnnouncerFactory.groovy      |   22 -
 .../internal/AnnouncingBuildListener.groovy        |   87 --
 .../internal/DefaultAnnouncerFactory.groovy        |   79 --
 .../announce/internal/DefaultIconProvider.groovy   |   34 -
 .../api/plugins/announce/internal/Growl.groovy     |   21 -
 .../internal/GrowlNotifyBackedAnnouncer.groovy     |   49 -
 .../internal/IgnoreUnavailableAnnouncer.groovy     |   38 -
 .../plugins/announce/internal/NotifySend.groovy    |   51 -
 .../api/plugins/announce/internal/Snarl.groovy     |   78 -
 .../api/plugins/announce/internal/Twitter.groovy   |   62 -
 .../jdk6/AppleScriptBackedGrowlAnnouncer.groovy    |   69 -
 .../api/plugins/announce/AnnouncePlugin.java       |   29 +
 .../plugins/announce/AnnouncePluginExtension.java  |  137 ++
 .../org/gradle/api/plugins/announce/Announcer.java |    0
 .../plugins/announce/BuildAnnouncementsPlugin.java |   33 +
 .../announce/internal/AnnouncerFactory.java        |   23 +
 .../internal/AnnouncerUnavailableException.java    |    0
 .../announce/internal/AnnouncingBuildListener.java |   92 ++
 .../announce/internal/DefaultAnnouncerFactory.java |   73 +
 .../announce/internal/DefaultIconProvider.java     |   38 +
 .../api/plugins/announce/internal/Growl.java       |   22 +
 .../internal/GrowlNotifyBackedAnnouncer.java       |   55 +
 .../plugins/announce/internal/IconProvider.java    |    0
 .../internal/IgnoreUnavailableAnnouncer.java       |   41 +
 .../api/plugins/announce/internal/NotifySend.java  |   59 +
 .../api/plugins/announce/internal/Snarl.java       |  101 ++
 .../api/plugins/announce/internal/Twitter.java     |   76 +
 .../announce/internal/UnknownAnnouncer.java        |   27 +
 .../jdk6/AppleScriptBackedGrowlAnnouncer.java      |   72 +
 .../gradle/api/plugins/announce/package-info.java  |    0
 .../announce/AnnouncePluginExtensionTest.groovy    |   12 +-
 .../api/plugins/announce/AnnouncePluginTest.groovy |    7 +-
 .../announce/BuildAnnouncementsPluginTest.groovy   |    7 +-
 .../internal/DefaultAnnouncerFactoryTest.groovy    |   17 +-
 .../org/gradle/api/plugins/antlr/AntlrPlugin.java  |  114 --
 .../plugins/antlr/AntlrSourceVirtualDirectory.java |   47 -
 .../org/gradle/api/plugins/antlr/AntlrTask.java    |  251 ----
 .../internal/AntlrSourceVirtualDirectoryImpl.java  |   45 -
 .../plugins/antlr/internal/AntlrWorkerManager.java |   49 -
 .../org/gradle/api/plugins/antlr/AntlrPlugin.java  |  112 ++
 .../plugins/antlr/AntlrSourceVirtualDirectory.java |   46 +
 .../org/gradle/api/plugins/antlr/AntlrTask.java    |  268 ++++
 .../api/plugins/antlr/internal/AntlrExecuter.java  |    0
 .../api/plugins/antlr/internal/AntlrResult.java    |    0
 .../internal/AntlrSourceGenerationException.java   |    0
 .../internal/AntlrSourceVirtualDirectoryImpl.java  |   45 +
 .../api/plugins/antlr/internal/AntlrSpec.java      |    0
 .../plugins/antlr/internal/AntlrSpecFactory.java   |    0
 .../api/plugins/antlr/internal/AntlrWorker.java    |    0
 .../plugins/antlr/internal/AntlrWorkerManager.java |   49 +
 .../antlr/internal/antlr2/GenerationPlan.java      |    0
 .../internal/antlr2/GenerationPlanBuilder.java     |    0
 .../antlr/internal/antlr2/GrammarDelegate.java     |    0
 .../antlr/internal/antlr2/GrammarFileMetadata.java |    0
 .../antlr/internal/antlr2/GrammarMetadata.java     |    0
 .../antlr/internal/antlr2/MetadataExtracter.java   |    0
 .../api/plugins/antlr/internal/antlr2/XRef.java    |    0
 .../org/gradle/api/plugins/antlr/package-info.java |    0
 .../api/plugins/antlr/AntlrPluginTest.groovy       |    7 +-
 .../base-services-groovy.gradle                    |    2 +
 .../gradle/api/internal/ClosureBackedAction.java   |  109 --
 .../main/groovy/org/gradle/api/specs/AndSpec.java  |   62 -
 .../main/groovy/org/gradle/api/specs/Specs.java    |  220 ---
 .../gradle/groovy/scripts/internal/AstUtils.java   |  262 ----
 .../gradle/api/InvalidActionClosureException.java  |    0
 .../gradle/api/internal/ClosureBackedAction.java   |  112 ++
 .../main/java/org/gradle/api/specs/AndSpec.java    |   80 ++
 .../src/main/java/org/gradle/api/specs/Specs.java  |  158 +++
 .../org/gradle/api/specs/internal/ClosureSpec.java |    0
 .../org/gradle/groovy/scripts/Transformer.java     |    0
 .../internal/AbstractScriptTransformer.java        |    0
 .../gradle/groovy/scripts/internal/AstUtils.java   |  267 ++++
 .../ExpressionReplacingVisitorSupport.java         |    0
 .../scripts/internal/RestrictiveCodeVisitor.java   |    0
 .../groovy/scripts/internal/ScriptBlock.java       |    0
 .../internal/StatementReplacingVisitorSupport.java |    0
 .../scripts/internal/StatementTransformer.java     |    0
 .../org/gradle/internal/reflect/GroovyMethods.java |   53 +
 .../org/gradle/util/Configurable.java              |    0
 .../api/specs/AbstractCompositeSpecTest.java       |   25 +
 .../groovy/org/gradle/api/specs/AndSpecTest.java   |   10 +-
 .../groovy/org/gradle/api/specs/OrSpecTest.java    |    6 +-
 subprojects/base-services/base-services.gradle     |    5 +-
 .../reflect/CachedConstructorsBenchmark.java       |   56 +
 .../src/main/java/org/gradle/api/JavaVersion.java  |   29 +-
 .../main/java/org/gradle/api/internal/Factory.java |   25 -
 .../api/internal/project/ServiceRegistry.java      |   25 -
 .../java/org/gradle/api/specs/CompositeSpec.java   |   46 +-
 .../src/main/java/org/gradle/api/specs/OrSpec.java |   11 +-
 .../src/main/java/org/gradle/internal/Actions.java |    2 +-
 .../main/java/org/gradle/internal/FileUtils.java   |   16 +-
 .../main/java/org/gradle/internal/IoActions.java   |   29 +-
 .../java/org/gradle/internal/TimeProvider.java     |    4 +-
 .../internal/classloader/CachingClassLoader.java   |    9 +-
 .../internal/classloader/ClassLoaderFactory.java   |   17 +-
 .../internal/classloader/ClassLoaderHasher.java    |   26 +
 .../classloader/ClassLoaderHierarchyHasher.java    |   36 +
 .../internal/classloader/ClassLoaderSpec.java      |   18 -
 .../internal/classloader/ClassLoaderUtils.java     |   47 +
 .../internal/classloader/ClassLoaderVisitor.java   |   37 +-
 .../internal/classloader/ClassPathSnapshot.java    |   35 +
 .../internal/classloader/ClassPathSnapshotter.java |   26 +
 .../ConfigurableClassLoaderHierarchyHasher.java    |  102 ++
 .../classloader/DefaultClassLoaderFactory.java     |   95 +-
 .../DefaultHashingClassLoaderFactory.java          |   89 ++
 .../internal/classloader/FilteringClassLoader.java |  185 ++-
 .../classloader/HashingClassLoaderFactory.java     |   32 +
 .../classloader/MultiParentClassLoader.java        |    8 +-
 .../classloader/MutableURLClassLoader.java         |   94 --
 .../classloader/SystemClassLoaderSpec.java         |   39 +
 .../classloader/TransformingClassLoader.java       |   50 +-
 .../classloader/VisitableURLClassLoader.java       |   76 +
 .../internal/concurrent/ThreadFactoryImpl.java     |    2 +-
 .../java/org/gradle/internal/hash/HashUtil.java    |   31 +-
 .../gradle/internal/id/CompositeIdGenerator.java   |    4 +-
 .../io/LinePerThreadBufferingOutputStream.java     |  214 +++
 .../internal/io/RandomAccessFileInputStream.java   |    5 +
 .../internal/io/RandomAccessFileOutputStream.java  |    5 +
 .../java/org/gradle/internal/jvm/JavaInfo.java     |    9 +-
 .../java/org/gradle/internal/jvm/JdkTools.java     |   78 -
 .../src/main/java/org/gradle/internal/jvm/Jvm.java |  154 +-
 .../jvm/UnsupportedJavaRuntimeException.java       |   21 +-
 .../operations/BuildOperationWorkerRegistry.java   |   56 +
 .../operations/DefaultBuildOperationProcessor.java |    3 +
 .../DefaultBuildOperationWorkerRegistry.java       |  188 +++
 .../org/gradle/internal/os/OperatingSystem.java    |   51 +-
 .../org/gradle/internal/process/ArgWriter.java     |    2 +-
 .../internal/reflect/DirectInstantiator.java       |   77 +-
 .../internal/reflect/JavaReflectionUtil.java       |   90 +-
 .../internal/reflect/PropertyAccessorType.java     |  149 ++
 .../java/org/gradle/internal/reflect/Types.java    |   75 +
 .../internal/service/CachingServiceLocator.java    |   77 +
 .../internal/service/DefaultServiceLocator.java    |  176 +++
 .../internal/service/DefaultServiceRegistry.java   |  317 ++++-
 .../gradle/internal/service/ServiceLocator.java    |  152 +-
 .../main/java/org/gradle/util/CollectionUtils.java |   27 +-
 .../src/main/java/org/gradle/util/GUtil.java       |   17 +
 .../main/java/org/gradle/util/GradleVersion.java   |   56 +-
 .../groovy/org/gradle/api/JavaVersionSpec.groovy   |   24 +-
 ...nfigurableClassLoaderHierarchyHasherTest.groovy |  102 ++
 .../DefaultClassLoaderFactoryTest.groovy           |   22 +-
 .../classloader/FilteringClassLoaderTest.groovy    |   87 +-
 .../classloader/MutableURLClassLoaderTest.groovy   |   39 -
 .../classloader/TransformingClassLoaderTest.groovy |   37 +
 .../classloader/VisitableURLClassLoaderTest.groovy |   39 +
 .../LinePerThreadBufferingOutputStreamTest.groovy  |   46 +
 .../org/gradle/internal/jvm/AppleJvmTest.groovy    |   60 +-
 .../org/gradle/internal/jvm/JdkToolsTest.groovy    |   55 -
 .../groovy/org/gradle/internal/jvm/JvmTest.groovy  |  107 +-
 .../DefaultBuildOperationWorkerRegistryTest.groovy |  222 +++
 .../gradle/internal/os/OperatingSystemTest.groovy  |   88 +-
 .../internal/reflect/ClassInspectorTest.groovy     |    9 -
 .../reflect/DirectInstantiatorCacheTest.groovy     |   42 +
 .../reflect/PropertyAccessorTypeTest.groovy        |  144 ++
 .../org/gradle/internal/reflect/TypesTest.groovy   |   52 +
 .../internal/service/ServiceLocatorTest.groovy     |    6 +-
 .../org/gradle/util/CollectionUtilsTest.groovy     |   34 +-
 .../org/gradle/util/GradleVersionTest.groovy       |   28 +-
 .../ClassLoaderFactoryHelperExtension.java         |   27 +
 .../org.codehaus.groovy.runtime.ExtensionModule    |   19 +
 .../gradle/BuildComparisonIntegrationSpec.groovy   |   16 +-
 ...Pre12CompareGradleBuildsCrossVersionSpec.groovy |  171 ---
 .../gradle/CompareGradleBuilds.java                |   32 +-
 .../gradle/CompareGradleBuildsPlugin.groovy        |   42 -
 .../gradle/CompareGradleBuildsPlugin.java          |   53 +
 .../gradle/GradleBuildInvocationSpec.java          |    6 +
 .../internal/ComparableGradleBuildExecuter.java    |   37 +-
 .../gradle/internal/GradleBuildComparison.java     |   98 +-
 .../internal/GradleBuildOutcomeSetInferrer.java    |   73 -
 .../internal/GradleBuildOutcomeSetTransformer.java |    2 +-
 .../GradleBuildComparisonResultHtmlRenderer.groovy |   22 -
 .../render/internal/html/HtmlRenderContext.java    |    4 +-
 .../DefaultGradleBuildInvocationSpecTest.groovy    |   11 +-
 .../GradleBuildOutcomeSetInferrerTest.groovy       |   97 --
 ...neratedArchiveBuildOutcomeComparatorTest.groovy |   17 +-
 .../internal/archive/entry/ArchiveEntryTest.groovy |   12 +-
 ...rtifactToFileBuildOutcomeTransformerTest.groovy |    8 +-
 subprojects/build-init/build-init.gradle           |   23 +-
 .../plugins/JavaLibraryInitIntegrationTest.groovy  |   15 -
 .../plugins/MavenConversionIntegrationTest.groovy  |   24 +-
 .../plugins/ScalaLibraryInitIntegrationTest.groovy |    1 -
 .../org/gradle/api/tasks/wrapper/Wrapper.java      |   85 +-
 .../internal/ConditionalTemplateOperation.groovy   |   38 -
 .../internal/ConditionalTemplateOperation.java     |   37 +
 .../DefaultTemplateLibraryVersionProvider.groovy   |   31 -
 .../DefaultTemplateLibraryVersionProvider.java     |   38 +
 .../internal/JavaLibraryProjectInitDescriptor.java |    7 -
 .../LanguageLibraryProjectInitDescriptor.java      |    4 +-
 .../internal/PomProjectInitDescriptor.groovy       |   53 -
 .../plugins/internal/PomProjectInitDescriptor.java |   57 +
 .../plugins/internal/ProjectInitDescriptor.groovy  |   24 -
 .../plugins/internal/ProjectInitDescriptor.java    |   22 +
 .../internal/ProjectLayoutSetupRegistry.groovy     |   52 -
 .../internal/ProjectLayoutSetupRegistry.java       |   56 +
 .../ProjectLayoutSetupRegistryFactory.groovy       |   52 -
 .../ProjectLayoutSetupRegistryFactory.java         |   45 +
 .../internal/SimpleTemplateOperation.groovy        |   47 -
 .../plugins/internal/SimpleTemplateOperation.java  |   69 +
 .../internal/TemplateLibraryVersionProvider.groovy |   21 -
 .../internal/TemplateLibraryVersionProvider.java   |   21 +
 .../plugins/internal/TemplateOperation.groovy      |   21 -
 .../plugins/internal/TemplateOperation.java        |   21 +
 .../buildinit/plugins/internal/TemplateValue.java  |    2 +-
 .../action/WrapperPluginAutoApplyAction.groovy     |   29 -
 .../action/WrapperPluginAutoApplyAction.java       |   28 +
 .../plugins/internal/maven/Maven2Gradle.groovy     |   25 +-
 .../org/gradle/buildinit/tasks/InitBuild.groovy    |  102 --
 .../org/gradle/buildinit/tasks/InitBuild.java      |  128 ++
 .../org/gradle/buildinit/tasks/package-info.java   |   21 +
 .../gradle/api/tasks/wrapper/WrapperTest.groovy    |  167 +++
 .../org/gradle/api/tasks/wrapper/WrapperTest.java  |  161 ---
 .../buildinit/plugins/BuildInitPluginSpec.groovy   |   12 +-
 .../buildinit/plugins/WrapperPluginSpec.groovy     |    8 +-
 .../internal/SimpleTemplateOperationSpec.groovy    |   19 +-
 .../internal/maven/MavenProjectsCreatorSpec.groovy |    1 -
 .../gradle/buildinit/tasks/InitBuildSpec.groovy    |   20 +-
 .../SimpleTemplateOperationSpec-binding.template   |    1 +
 .../build-scan-performance.gradle                  |   33 +
 .../BuildScanPluginPerformanceTest.groovy          |  169 +++
 .../project-with-source/Production.groovy          |    0
 .../templates/project-with-source/Production.java  |    0
 .../templates/project-with-source/Production.scala |    0
 .../src/templates/project-with-source/Test.groovy  |    0
 .../src/templates/project-with-source/Test.java    |    0
 .../src/templates/project-with-source/Test.scala   |    0
 .../src/templates/project-with-source/build.gradle |   91 ++
 .../src/templates/project-with-source/build.xml    |    0
 .../src/templates/project-with-source/pom.xml      |    0
 .../src/templates/with-verbose-junit/Test.java     |   33 +
 .../fixture/BuildScanPerformanceTestRunner.groovy  |   48 +
 .../performance/results/BuildScanResultsStore.java |   25 +
 .../build-scan-performance/templates.gradle        |   46 +
 subprojects/cli/cli.gradle                         |    5 +-
 subprojects/code-quality/code-quality.gradle       |    1 -
 .../AbstractPmdPluginVersionIntegrationTest.groovy |    6 +
 .../CheckstylePluginVersionIntegrationTest.groovy  |   57 +-
 .../quality/CodeNarcPluginIntegrationTest.groovy   |  262 ++--
 .../CodeNarcPluginVersionIntegrationTest.groovy    |  184 +++
 ...ndBugsClasspathValidationIntegrationTest.groovy |    7 -
 .../FindBugsForOldJavaIntegrationTest.groovy       |   32 -
 .../plugins/quality/FindBugsIntegrationTest.groovy |    4 -
 .../quality/FindBugsPluginIntegrationTest.groovy   |    3 -
 .../PmdPluginAuxclasspathIntegrationTest.groovy    |   15 +-
 .../PmdPluginDependenciesIntegrationTest.groovy    |   11 +-
 .../PmdPluginSubtypeParamIntegrationTest.groovy    |  113 ++
 .../quality/PmdPluginVersionIntegrationTest.groovy |   16 +-
 .../gradle/api/plugins/quality/Checkstyle.groovy   |  188 ---
 .../org/gradle/api/plugins/quality/Checkstyle.java |  240 ++++
 .../api/plugins/quality/CheckstyleExtension.groovy |   63 -
 .../api/plugins/quality/CheckstyleExtension.java   |   94 ++
 .../api/plugins/quality/CheckstylePlugin.groovy    |   77 -
 .../api/plugins/quality/CheckstylePlugin.java      |  126 ++
 .../api/plugins/quality/CheckstyleReports.java     |    3 +
 .../org/gradle/api/plugins/quality/CodeNarc.groovy |  155 --
 .../org/gradle/api/plugins/quality/CodeNarc.java   |  193 +++
 .../api/plugins/quality/CodeNarcExtension.groovy   |   79 --
 .../api/plugins/quality/CodeNarcExtension.java     |  123 ++
 .../api/plugins/quality/CodeNarcPlugin.groovy      |   88 --
 .../gradle/api/plugins/quality/CodeNarcPlugin.java |  150 ++
 .../api/plugins/quality/CodeNarcReports.java       |    4 +
 .../plugins/quality/CodeQualityExtension.groovy    |   42 -
 .../api/plugins/quality/CodeQualityExtension.java  |   78 +
 .../org/gradle/api/plugins/quality/FindBugs.groovy |  321 -----
 .../org/gradle/api/plugins/quality/FindBugs.java   |  493 +++++++
 .../api/plugins/quality/FindBugsExtension.groovy   |  161 ---
 .../api/plugins/quality/FindBugsExtension.java     |  241 ++++
 .../api/plugins/quality/FindBugsPlugin.groovy      |  118 --
 .../gradle/api/plugins/quality/FindBugsPlugin.java |  201 +++
 .../api/plugins/quality/FindBugsReports.java       |    5 +
 .../api/plugins/quality/FindBugsXmlReport.java     |    6 +-
 .../org/gradle/api/plugins/quality/JDepend.groovy  |  123 --
 .../org/gradle/api/plugins/quality/JDepend.java    |  153 ++
 .../api/plugins/quality/JDependExtension.groovy    |   24 -
 .../api/plugins/quality/JDependExtension.java      |   24 +
 .../api/plugins/quality/JDependPlugin.groovy       |   93 --
 .../gradle/api/plugins/quality/JDependPlugin.java  |  117 ++
 .../gradle/api/plugins/quality/JDependReports.java |    3 +
 .../org/gradle/api/plugins/quality/Pmd.groovy      |  248 ----
 .../groovy/org/gradle/api/plugins/quality/Pmd.java |  270 ++++
 .../gradle/api/plugins/quality/PmdExtension.groovy |  128 --
 .../gradle/api/plugins/quality/PmdExtension.java   |  164 +++
 .../gradle/api/plugins/quality/PmdPlugin.groovy    |  119 --
 .../org/gradle/api/plugins/quality/PmdPlugin.java  |  192 +++
 .../org/gradle/api/plugins/quality/PmdReports.java |    3 +
 .../internal/AbstractCodeQualityPlugin.groovy      |  124 --
 .../internal/AbstractCodeQualityPlugin.java        |  209 +++
 .../quality/internal/CheckstyleInvoker.groovy      |  103 ++
 .../quality/internal/CodeNarcInvoker.groovy        |   76 +
 .../quality/internal/FindBugsReportsImpl.java      |    8 +-
 .../quality/internal/FindBugsReportsInternal.java  |   32 +
 .../plugins/quality/internal/JDependInvoker.groovy |   49 +
 .../api/plugins/quality/internal/PmdInvoker.groovy |  111 ++
 .../findbugs/FindBugsClasspathValidator.java       |   13 +-
 .../internal/findbugs/FindBugsWorkerManager.groovy |   40 -
 .../internal/findbugs/FindBugsWorkerManager.java   |   44 +
 .../plugins/quality/CheckstylePluginTest.groovy    |    7 +-
 .../api/plugins/quality/CodeNarcPluginTest.groovy  |  145 +-
 .../api/plugins/quality/FindBugsPluginTest.groovy  |    7 +-
 .../api/plugins/quality/JDependPluginTest.groovy   |    7 +-
 .../api/plugins/quality/PmdPluginTest.groovy       |   11 +-
 .../findbugs/FindBugsClasspathValidatorTest.groovy |   29 +-
 .../composite-builds/composite-builds.gradle       |   14 +
 .../AbstractCompositeBuildIntegrationTest.groovy   |  104 ++
 ...ompositeBuildClassloadingIntegrationTest.groovy |   73 +
 ...ositeBuildCommandLineArgsIntegrationTest.groovy |  146 ++
 ...uildDeclaredSubstitutionsIntegrationTest.groovy |  176 +++
 ...eBuildDependencyArtifactsIntegrationTest.groovy |  508 +++++++
 ...ositeBuildDependencyCycleIntegrationTest.groovy |  241 ++++
 ...ositeBuildDependencyGraphIntegrationTest.groovy |  682 +++++++++
 .../CompositeBuildDetectionIntegrationTest.groovy  |   93 ++
 ...CompositeBuildIdeaProjectIntegrationTest.groovy |  370 +++++
 .../CompositeBuildInitScriptIntegrationTest.groovy |   81 ++
 ...BuildMinimalConfigurationIntegrationTest.groovy |  212 +++
 ...iteBuildPluginDevelopmentIntegrationTest.groovy |  156 ++
 ...positeBuildTaskDependencyIntegrationTest.groovy |  308 ++++
 .../IncludedBuildValidationIntegrationTest.groovy  |  130 ++
 .../SamplesCompositeBuildIntegrationTest.groovy    |  139 ++
 .../CompositeBuildDependencySubstitutions.java     |   95 ++
 .../composite/internal/CompositeBuildServices.java |   91 ++
 .../internal/CompositeBuildTaskDelegate.java       |   63 +
 .../internal/CompositeProjectArtifactBuilder.java  |   41 +
 .../CompositeProjectComponentArtifactMetadata.java |   99 ++
 .../DefaultBuildableCompositeBuildContext.java     |  171 +++
 .../internal/DefaultCompositeContextBuilder.java   |   55 +
 .../composite/internal/DefaultIncludedBuild.java   |  135 ++
 .../internal/DefaultIncludedBuildExecuter.java     |  161 +++
 .../internal/DefaultIncludedBuildFactory.java      |  117 ++
 .../composite/internal/DefaultIncludedBuilds.java  |   41 +
 .../internal/IncludedBuildArtifactBuilder.java     |   90 ++
 .../IncludedBuildDependencyMetadataBuilder.java    |  134 ++
 ...ncludedBuildDependencySubstitutionsBuilder.java |   52 +
 .../composite/internal/IncludedBuildInternal.java  |   30 +
 .../internal/IncludedBuildTaskReference.java       |   42 +
 .../IncludedBuildTaskReferenceResolver.java        |   59 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 subprojects/core/core.gradle                       |   30 +-
 .../DeprecationHandlingIntegrationTest.groovy      |  116 --
 .../api/AntBuilderLoggingIntegrationTest.groovy    |   89 ++
 .../org/gradle/api/ApplyPluginIntegSpec.groovy     |   46 +-
 .../api/BuildScriptClassPathIntegrationTest.groovy |   52 +
 .../ConfigurationOnDemandIntegrationTest.groovy    |    1 +
 .../CrossBuildScriptCachingIntegrationSpec.groovy  |    1 +
 .../ExternalScriptExecutionIntegrationTest.groovy  |    6 +-
 .../api/ExtraPropertiesIntegrationTest.groovy      |   99 ++
 .../api/InitScriptErrorIntegrationTest.groovy      |    3 +-
 .../api/InitScriptExecutionIntegrationTest.groovy  |    6 +-
 .../ParallelExecutionWarningIntegrationTest.groovy |   94 ++
 .../PluginApplicationErrorIntegrationTest.groovy   |    2 -
 .../gradle/api/SettingsDslIntegrationSpec.groovy   |   35 +
 .../SettingsScriptExecutionIntegrationTest.groovy  |    6 +-
 .../dsl/DynamicMethodLookupIntegrationTest.groovy  |  118 ++
 .../api/dsl/DynamicObjectIntegrationTest.groovy    |  619 ++++++--
 .../dsl/NestedConfigureDslIntegrationTest.groovy   |  459 ++++++
 .../api/dsl/PluginDetectionIntegrationTest.groovy  |    4 +-
 .../state/DirectoryScanningIntegTest.groovy        |  253 ----
 .../state/TaskTypeUpToDateIntegrationTest.groovy   |  187 +++
 .../changedetection/state/UpToDateIntegTest.groovy |   17 +
 .../ClassLoadersCachingIntegrationTest.groovy      |   10 +-
 .../TaskPropertyNamingIntegrationTest.groovy       |  103 ++
 .../AbstractPathSensitivityIntegrationSpec.groovy  |  248 ++++
 .../api/tasks/AntArchiveIntegrationTest.groovy     |  128 ++
 .../CachedPathSensitivityIntegrationTest.groovy    |   45 +
 .../CachedTaskExecutionIntegrationTest.groovy      |  295 ++++
 .../api/tasks/CopySpecIntegrationSpec.groovy       |  169 +++
 .../api/tasks/CopyTaskIntegrationSpec.groovy       |  891 ++++++++++++
 .../api/tasks/CopyTaskIntegrationTest.groovy       |  736 ----------
 ...tionTimeTaskConfigurationIntegrationTest.groovy |    3 +
 .../api/tasks/FileTreeCopyIntegrationTest.groovy   |    4 +
 .../tasks/IncrementalBuildIntegrationTest.groovy   |   83 +-
 .../tasks/IncrementalTasksIntegrationTest.groovy   |   20 +-
 .../TaskInputPropertiesIntegrationTest.groovy      |  265 ++++
 .../UpToDatePathSensitivityIntegrationTest.groovy  |   28 +
 .../api/tasks/bundling/ZipIntegrationTest.groovy   |   85 +-
 .../RuleTaskBridgingIntegrationTest.groovy         |   74 +-
 .../RuleTaskCreationIntegrationTest.groovy         |   10 +-
 .../PropertiesLoaderIntegrationTest.groovy         |    6 +-
 .../BuildScriptClasspathIntegrationSpec.groovy     |  223 +++
 .../filewatch/AbstractFileWatcherTest.groovy       |   77 +
 .../DefaultFileSystemChangeWaiterTest.groovy       |  183 +++
 .../filewatch/DefaultFileWatcherFactoryTest.groovy |  374 +++++
 .../jdk7/WatchServiceFileWatcherBackingTest.groovy |    0
 .../ScriptPluginClassLoadingIntegrationTest.groovy |    8 +-
 .../AbstractWorkerProcessIntegrationSpec.groovy    |   32 +-
 .../process/internal/BrokenRemoteProcess.java      |    1 +
 .../gradle/process/internal/BrokenTestWorker.java  |    2 +-
 .../process/internal/CrashingRemoteProcess.java    |    1 +
 .../gradle/process/internal/CrashingWorker.java    |   34 +
 .../gradle/process/internal/LoggingProcess.java    |    1 +
 ...MultiRequestWorkerProcessIntegrationTest.groovy |  211 +++
 .../process/internal/NoCleanUpRemoteProcess.java   |    1 +
 .../gradle/process/internal/NotDeserializable.java |    1 +
 .../process/internal/OtherRemoteProcess.java       |    1 +
 .../internal/PathLimitationIntegrationTest.groovy  |    3 +
 .../gradle/process/internal/PingRemoteProcess.java |    1 +
 .../org/gradle/process/internal/RemoteProcess.java |    1 +
 ...ingleRequestWorkerProcessIntegrationTest.groovy |  197 +++
 .../SingleUseWorkerProcessIntegrationTest.groovy   |  157 --
 .../process/internal/StatefulTestWorker.java       |   31 +
 .../org/gradle/process/internal/TestProtocol.java  |   23 +
 .../gradle/process/internal/TestWorkInterface.java |   23 -
 .../gradle/process/internal/TestWorkProcess.java   |   22 +
 .../org/gradle/process/internal/TestWorker.java    |    2 +-
 .../internal/WorkerProcessIntegrationTest.groovy   |    5 +-
 .../api/tasks/copyTestResources/src/accents.c      |    1 +
 .../groovy/org/gradle/BuildExceptionReporter.java  |  260 ----
 .../src/main/groovy/org/gradle/BuildLogger.java    |   80 --
 .../src/main/groovy/org/gradle/BuildResult.java    |   53 -
 .../main/groovy/org/gradle/BuildResultLogger.java  |   51 -
 .../src/main/groovy/org/gradle/StartParameter.java |  709 ----------
 .../groovy/org/gradle/TaskExecutionLogger.java     |   73 -
 .../src/main/groovy/org/gradle/api/AntBuilder.java |   68 -
 .../main/groovy/org/gradle/api/DefaultTask.java    |   29 -
 .../org/gradle/api/DomainObjectCollection.java     |  145 --
 .../gradle/api/NamedDomainObjectCollection.java    |  194 ---
 .../src/main/groovy/org/gradle/api/Project.java    | 1494 -------------------
 .../core/src/main/groovy/org/gradle/api/Task.java  |  699 ---------
 .../api/artifacts/ArtifactRepositoryContainer.java |   87 --
 .../api/artifacts/ComponentSelectionRules.java     |  143 --
 .../org/gradle/api/artifacts/Configuration.java    |  424 ------
 .../api/artifacts/ConfigurationContainer.java      |  106 --
 .../gradle/api/artifacts/ConflictResolution.java   |   22 -
 .../gradle/api/artifacts/DependencyArtifact.java   |   58 -
 .../gradle/api/artifacts/LenientConfiguration.java |   60 -
 .../groovy/org/gradle/api/artifacts/Module.java    |   35 -
 .../org/gradle/api/artifacts/ModuleDependency.java |  131 --
 .../component/LibraryComponentSelector.java        |   49 -
 .../component/ProjectComponentIdentifier.java      |   33 -
 .../component/ProjectComponentSelector.java        |   34 -
 .../artifacts/repositories/ArtifactRepository.java |   46 -
 .../artifacts/result/ArtifactResolutionResult.java |   50 -
 .../artifacts/result/ResolvedArtifactResult.java   |   33 -
 .../artifacts/result/UnresolvedArtifactResult.java |   31 -
 .../gradle/api/execution/TaskExecutionGraph.java   |  115 --
 .../org/gradle/api/file/ContentFilterable.java     |   82 --
 .../org/gradle/api/file/CopyProcessingSpec.java    |  129 --
 .../groovy/org/gradle/api/file/CopySourceSpec.java |   40 -
 .../main/groovy/org/gradle/api/file/CopySpec.java  |  327 -----
 .../groovy/org/gradle/api/file/DeleteAction.java   |   32 -
 .../groovy/org/gradle/api/file/RelativePath.java   |  244 ----
 .../org/gradle/api/initialization/Settings.java    |  175 ---
 .../api/internal/AbstractClassGenerator.java       |  432 ------
 .../gradle/api/internal/AbstractDynamicObject.java |   91 --
 .../AbstractNamedDomainObjectContainer.java        |   76 -
 .../AbstractPolymorphicDomainObjectContainer.java  |  153 --
 .../org/gradle/api/internal/AbstractTask.java      |  751 ----------
 .../api/internal/AsmBackedClassGenerator.java      |  924 ------------
 .../org/gradle/api/internal/BeanDynamicObject.java |  288 ----
 .../api/internal/CompositeDomainObjectSet.java     |  125 --
 .../api/internal/CompositeDynamicObject.java       |  177 ---
 .../org/gradle/api/internal/ConfigureDelegate.java |  126 --
 .../gradle/api/internal/ConventionAwareHelper.java |  150 --
 .../api/internal/DefaultClassPathProvider.java     |   62 -
 .../internal/DefaultDomainObjectCollection.java    |  296 ----
 .../DefaultNamedDomainObjectCollection.java        |  452 ------
 .../api/internal/DefaultNamedDomainObjectSet.java  |   88 --
 .../api/internal/DelegatingDomainObjectSet.java    |  135 --
 .../api/internal/DependencyClassPathProvider.java  |   62 -
 .../internal/DependencyInjectingInstantiator.java  |  131 --
 .../org/gradle/api/internal/DynamicObject.java     |   50 -
 .../gradle/api/internal/DynamicObjectAware.java    |   33 -
 .../gradle/api/internal/DynamicObjectHelper.java   |   60 -
 .../org/gradle/api/internal/DynamicObjectUtil.java |   30 -
 .../api/internal/DynamicPropertyNamer.groovy       |   47 -
 .../api/internal/ExtensibleDynamicObject.java      |  214 ---
 .../org/gradle/api/internal/GradleInternal.java    |   77 -
 ...amedDomainObjectContainerConfigureDelegate.java |   41 -
 .../api/internal/NoNamingPropertyException.java    |   23 -
 .../api/internal/NullNamingPropertyException.java  |   23 -
 ...phicDomainObjectContainerConfigureDelegate.java |   49 -
 .../org/gradle/api/internal/SettingsInternal.java  |   47 -
 .../org/gradle/api/internal/TaskInternal.java      |   73 -
 .../gradle/api/internal/TaskOutputsInternal.java   |   30 -
 .../api/internal/ThreadGlobalInstantiator.java     |   63 -
 .../TypedDomainObjectContainerWrapper.java         |  221 ---
 .../DefaultArtifactRepositoryContainer.java        |  116 --
 .../internal/artifacts/DefaultDependencySet.java   |   58 -
 .../artifacts/DefaultExcludeRuleContainer.java     |   42 -
 .../api/internal/artifacts/DefaultModule.java      |   56 -
 .../api/internal/artifacts/ModuleInternal.java     |   25 -
 .../internal/artifacts/ProjectBackedModule.java    |   71 -
 .../configurations/DependencyMetaDataProvider.java |   22 -
 .../dependencies/AbstractModuleDependency.java     |  125 --
 .../dependencies/DefaultDependencyArtifact.java    |   97 --
 .../artifacts/dsl/DefaultRepositoryHandler.java    |  105 --
 .../dsl/dependencies/DefaultDependencyHandler.java |  159 ---
 .../dsl/dependencies/DependencyFactory.java        |   34 -
 .../dsl/dependencies/ModuleFactoryDelegate.groovy  |   62 -
 .../artifacts/dsl/dependencies/ProjectFinder.java  |   27 -
 .../artifacts/publish/AbstractPublishArtifact.java |   43 -
 .../internal/cache/HeapProportionalCacheSizer.java |   58 -
 .../changedetection/TaskArtifactState.java         |   55 -
 .../changes/ChangesOnlyIncrementalTaskInputs.java  |   59 -
 .../DefaultTaskArtifactStateRepository.java        |  148 --
 .../changes/IncrementalTaskInputsInternal.java     |   28 -
 .../changes/NoHistoryArtifactState.java            |   54 -
 .../changes/RebuildIncrementalTaskInputs.java      |   75 -
 .../ShortCircuitTaskArtifactStateRepository.java   |   99 --
 .../changes/StatefulIncrementalTaskInputs.java     |   74 -
 .../AbstractFileSnapshotTaskStateChanges.java      |  100 --
 .../internal/changedetection/rules/ChangeType.java |   33 -
 .../rules/DiscoveredInputsTaskStateChanges.java    |   71 -
 .../internal/changedetection/rules/FileChange.java |   62 -
 .../rules/InputFilesTaskStateChanges.java          |   56 -
 .../rules/OutputFilesTaskStateChanges.java         |   79 --
 .../rules/TaskTypeTaskStateChanges.java            |   45 -
 .../changedetection/rules/TaskUpToDateState.java   |   89 --
 .../state/AbstractFileCollectionSnapshotter.java   |   95 --
 .../state/CacheBackedTaskHistoryRepository.java    |  315 -----
 .../state/CachingFileSnapshotter.java              |  118 --
 .../changedetection/state/CachingTreeVisitor.java  |   80 --
 .../state/DefaultFileCollectionSnapshotter.java    |   47 -
 .../state/DefaultFileSnapshotterSerializer.java    |   71 -
 .../changedetection/state/DirSnapshot.java         |   37 -
 .../state/FileCollectionSnapshot.java              |   60 -
 .../state/FileCollectionSnapshotImpl.java          |  147 --
 .../state/FileCollectionSnapshotter.java           |   42 -
 .../changedetection/state/FileHashSnapshot.java    |   60 -
 .../changedetection/state/FileSnapshot.java        |   23 -
 .../changedetection/state/FilesSnapshotSet.java    |   37 -
 .../state/InMemoryTaskArtifactCache.java           |  175 ---
 .../state/IncrementalFileSnapshot.java             |   23 -
 .../state/MinimalFileSetSnapshotter.java           |   52 -
 .../changedetection/state/MissingFileSnapshot.java |   37 -
 .../state/OutputFilesCollectionSnapshotter.java    |  146 --
 .../state/OutputFilesSnapshotSerializer.java       |   58 -
 .../changedetection/state/TaskExecution.java       |   70 -
 .../LeakyOnJava7GroovySystemLoader.java            |  114 --
 .../internal/classpath/DefaultModuleRegistry.java  |  274 ----
 .../coerce/MethodArgumentsTransformer.java         |   36 -
 .../internal/coerce/PropertySetTransformer.java    |   25 -
 .../internal/coerce/StringToEnumTransformer.java   |   91 --
 .../api/internal/component/ArtifactType.java       |   26 -
 .../api/internal/file/AbstractFileCollection.java  |  245 ----
 .../api/internal/file/AbstractFileResolver.java    |  271 ----
 .../internal/file/AntFileCollectionBuilder.groovy  |   36 -
 .../file/AntFileCollectionMatchingTaskBuilder.java |   74 -
 .../api/internal/file/AntFileSetBuilder.groovy     |   38 -
 .../api/internal/file/AntFileTreeBuilder.groovy    |   36 -
 .../api/internal/file/BasicFileResolver.java       |   63 -
 .../api/internal/file/DefaultFileTreeElement.java  |   69 -
 .../api/internal/file/DefaultFileVisitDetails.java |   72 -
 .../internal/file/DefaultSourceDirectorySet.java   |  193 ---
 .../file/DefaultTemporaryFileProvider.java         |   64 -
 .../internal/file/FileTreeElementComparator.java   |   33 -
 .../api/internal/file/FileTreeElementHasher.java   |   53 -
 .../internal/file/TmpDirTemporaryFileProvider.java |   33 -
 .../api/internal/file/archive/TarFileTree.java     |  220 ---
 .../api/internal/file/archive/ZipFileTree.java     |  187 ---
 .../file/archive/compression/Bzip2Archiver.java    |   67 -
 ...pendenciesOnlyFileCollectionResolveContext.java |   94 --
 .../collections/DefaultConfigurableFileTree.java   |  178 ---
 .../DefaultDirectoryFileTreeFactory.java           |   33 -
 .../collections/DefaultDirectoryWalkerFactory.java |   76 -
 .../DefaultFileCollectionResolveContext.java       |  243 ----
 .../file/collections/DirectoryFileTree.java        |  167 ---
 .../internal/file/collections/DirectoryTrees.java  |   45 -
 .../api/internal/file/collections/MapFileTree.java |  244 ----
 .../file/collections/SingletonFileTree.java        |   56 -
 .../api/internal/file/copy/CopyActionImpl.java     |   28 -
 .../api/internal/file/copy/CopySpecResolver.java   |   54 -
 .../api/internal/file/copy/CopySpecWrapper.java    |  222 ---
 .../api/internal/file/copy/DefaultCopySpec.java    |  506 -------
 .../internal/file/copy/DefaultFileCopyDetails.java |  222 ---
 .../file/copy/DelegatingCopySpecInternal.java      |  216 ---
 .../api/internal/file/copy/FileCopyActionImpl.java |   28 -
 .../gradle/api/internal/file/copy/FilterChain.java |  103 --
 .../gradle/api/internal/file/copy/LineFilter.java  |  122 --
 .../file/copy/NormalizingCopyActionDecorator.java  |  205 ---
 .../internal/file/copy/PathNotationConverter.java  |   74 -
 .../api/internal/file/copy/ReadableCopySpec.java   |   27 -
 .../internal/file/copy/SingleParentCopySpec.java   |   63 -
 .../file/copy/SyncCopyActionDecorator.java         |   92 --
 .../gradle/api/internal/file/delete/Deleter.java   |  112 --
 .../file/pattern/HasSuffixPatternStep.java         |   43 -
 .../file/pattern/PatternMatcherFactory.java        |   82 --
 .../gradle/api/internal/hash/DefaultHasher.java    |   27 -
 .../org/gradle/api/internal/hash/Hasher.java       |   24 -
 .../initialization/DefaultScriptHandler.java       |  120 --
 .../DefaultScriptHandlerFactory.java               |   56 -
 .../internal/initialization/ScriptClassLoader.java |   41 -
 .../loadercache/ClassPathSnapshot.java             |   25 -
 .../loadercache/ClassPathSnapshotter.java          |   26 -
 .../loadercache/DefaultClassLoaderCache.java       |  223 ---
 .../loadercache/FileClassPathSnapshotter.java      |   50 -
 .../loadercache/HashClassPathSnapshotter.java      |  103 --
 .../ClassloaderBackedPluginDescriptorLocator.java  |   38 -
 .../api/internal/plugins/DefaultConvention.java    |  243 ----
 .../plugins/DefaultExtraPropertiesExtension.java   |   81 --
 .../api/internal/plugins/DefaultPluginManager.java |  216 ---
 .../internal/plugins/DefaultPluginRegistry.java    |  229 ---
 .../plugins/DefaultPotentialPluginWithId.java      |   67 -
 .../org/gradle/api/internal/plugins/DslObject.java |   92 --
 .../api/internal/plugins/ExtensionsStorage.java    |  196 ---
 .../ExtraPropertiesDynamicObjectAdapter.java       |   61 -
 .../api/internal/project/AbstractPluginAware.java  |   55 -
 .../api/internal/project/AbstractProject.java      | 1034 --------------
 .../api/internal/project/DefaultAntBuilder.java    |  180 ---
 .../internal/project/DefaultAntBuilderFactory.java |   48 -
 .../api/internal/project/DefaultProject.java       |   33 -
 .../api/internal/project/ProjectInternal.java      |  100 --
 .../api/internal/project/ProjectScript.groovy      |   65 -
 .../internal/project/ant/AntLoggingAdapter.java    |   86 --
 .../api/internal/project/ant/BasicAntBuilder.java  |  114 --
 .../project/antbuilder/AntBuilderDelegate.groovy   |   86 --
 .../antbuilder/ClassPathToClassLoaderCache.java    |  149 --
 .../api/internal/project/antbuilder/Cleanup.java   |   55 -
 .../antbuilder/DefaultIsolatedAntBuilder.java      |  212 ---
 .../project/antbuilder/FinalizerThread.java        |  102 --
 .../AnnotationProcessingTaskFactory.java           |  483 -------
 .../InputDirectoryPropertyAnnotationHandler.java   |   57 -
 .../InputFilePropertyAnnotationHandler.java        |   50 -
 .../InputFilesPropertyAnnotationHandler.java       |   42 -
 .../InputPropertyAnnotationHandler.java            |   36 -
 .../NestedBeanPropertyAnnotationHandler.java       |   47 -
 .../OutputDirectoryPropertyAnnotationHandler.java  |   84 --
 .../OutputFilePropertyAnnotationHandler.java       |   83 --
 .../project/taskfactory/PropertyActionContext.java |   57 -
 .../taskfactory/PropertyAnnotationHandler.java     |   35 -
 .../internal/project/taskfactory/TaskFactory.java  |  150 --
 .../api/internal/tasks/ContextAwareTaskAction.java |   24 -
 .../api/internal/tasks/DefaultTaskContainer.java   |  299 ----
 .../tasks/DefaultTaskContainerFactory.java         |  103 --
 .../api/internal/tasks/DefaultTaskDependency.java  |  126 --
 .../api/internal/tasks/DefaultTaskInputs.java      |  167 ---
 .../api/internal/tasks/DefaultTaskOutputs.java     |  108 --
 .../internal/tasks/RealizableTaskCollection.java   |  244 ----
 .../api/internal/tasks/TaskContainerInternal.java  |   60 -
 .../tasks/TaskDependencyResolveContext.java        |   43 -
 .../org/gradle/api/internal/tasks/TaskMutator.java |   95 --
 .../gradle/api/internal/tasks/TaskResolver.java    |   22 -
 .../api/internal/tasks/TaskStateInternal.java      |  122 --
 .../execution/ExecuteActionsTaskExecuter.java      |   85 --
 .../tasks/execution/SkipUpToDateTaskExecuter.java  |   93 --
 .../api/internal/tasks/options/OptionValues.groovy |   34 -
 .../groovy/org/gradle/api/invocation/Gradle.java   |  274 ----
 .../groovy/org/gradle/api/logging/Logging.java     |   64 -
 .../org/gradle/api/logging/LoggingManager.java     |   73 -
 .../groovy/org/gradle/api/plugins/Convention.java  |   63 -
 .../org/gradle/api/plugins/ExtensionAware.java     |   72 -
 .../org/gradle/api/plugins/ExtensionContainer.java |  105 --
 .../api/plugins/ExtraPropertiesExtension.java      |  177 ---
 .../org/gradle/api/resources/TextResource.java     |   89 --
 .../org/gradle/api/tasks/AbstractCopyTask.java     |  402 ------
 .../org/gradle/api/tasks/AbstractExecTask.java     |  279 ----
 .../org/gradle/api/tasks/ConventionValue.java      |   38 -
 .../main/groovy/org/gradle/api/tasks/Delete.java   |  134 --
 .../groovy/org/gradle/api/tasks/GradleBuild.java   |  122 --
 .../main/groovy/org/gradle/api/tasks/JavaExec.java |  471 ------
 .../org/gradle/api/tasks/OutputDirectories.java    |   33 -
 .../groovy/org/gradle/api/tasks/OutputFiles.java   |   33 -
 .../groovy/org/gradle/api/tasks/SourceTask.java    |  178 ---
 .../src/main/groovy/org/gradle/api/tasks/Sync.java |   72 -
 .../groovy/org/gradle/api/tasks/TaskInputs.java    |  138 --
 .../groovy/org/gradle/api/tasks/TaskOutputs.java   |   92 --
 .../groovy/org/gradle/api/tasks/ant/AntTarget.java |   89 --
 .../api/tasks/bundling/AbstractArchiveTask.java    |  187 ---
 .../groovy/org/gradle/api/tasks/bundling/Tar.java  |   72 -
 .../groovy/org/gradle/api/tasks/bundling/Zip.java  |  131 --
 .../org/gradle/api/tasks/util/PatternSet.java      |  294 ----
 .../internal/PatternSetAntBuilderDelegate.java     |  102 --
 .../gradle/cache/internal/AbstractFileAccess.java  |   35 -
 .../cache/internal/CacheRepositoryServices.java    |   39 -
 .../gradle/cache/internal/DefaultCacheFactory.java |  190 ---
 .../cache/internal/DefaultCacheScopeMapping.java   |   77 -
 .../cache/internal/DefaultFileLockManager.java     |  343 -----
 .../internal/DefaultPersistentDirectoryCache.java  |  102 --
 .../internal/DefaultPersistentDirectoryStore.java  |  116 --
 .../groovy/org/gradle/cache/internal/FileLock.java |   56 -
 .../cache/internal/FileLockCommunicator.java       |   96 --
 .../cache/internal/LockTimeoutException.java       |   25 -
 .../cache/internal/MapBackedInMemoryStore.java     |   87 --
 .../gradle/cache/internal/SimpleStateCache.java    |   93 --
 .../btree/BTreePersistentIndexedCache.java         |  727 ----------
 .../org/gradle/cache/internal/btree/Block.java     |   59 -
 .../gradle/cache/internal/btree/BlockPayload.java  |   51 -
 .../cache/internal/btree/FileBackedBlockStore.java |  251 ----
 .../cache/internal/btree/FreeListBlockStore.java   |  271 ----
 .../cache/internal/btree/LockingBlockStore.java    |   94 --
 .../filelock/DefaultLockStateSerializer.java       |   91 --
 .../gradle/cache/internal/filelock/LockState.java  |   36 -
 .../filelock/Version1LockStateSerializer.java      |   72 -
 .../DefaultFileLockContentionHandler.java          |  160 ---
 .../configuration/DefaultBuildConfigurer.java      |   48 -
 .../configuration/DefaultScriptPluginFactory.java  |  184 ---
 .../gradle/configuration/DefaultScriptTarget.java  |   71 -
 .../gradle/configuration/ProjectScriptTarget.java  |   75 -
 .../org/gradle/configuration/ScriptTarget.java     |   54 -
 ...DefaultProjectConfigurationActionContainer.java |   45 -
 .../project/PluginsProjectConfigureActions.java    |   35 -
 .../gradle/execution/TaskSelectionException.java   |   39 -
 .../commandline/TaskConfigurationException.java    |   44 -
 .../taskgraph/AbstractTaskPlanExecutor.java        |   74 -
 .../taskgraph/DefaultTaskExecutionPlan.java        |  766 ----------
 .../taskgraph/DefaultTaskGraphExecuter.java        |  211 ---
 .../taskgraph/DefaultTaskPlanExecutor.java         |   28 -
 .../taskgraph/ParallelTaskPlanExecutor.java        |   62 -
 .../taskgraph/TaskPlanExecutorFactory.java         |   48 -
 .../groovy/scripts/AbstractUriScriptSource.java    |   58 -
 .../org/gradle/groovy/scripts/BasicScript.java     |   83 --
 .../org/gradle/groovy/scripts/DefaultScript.java   |  259 ----
 .../groovy/org/gradle/groovy/scripts/Script.java   |   59 -
 .../scripts/internal/BuildScriptTransformer.java   |   60 -
 .../CrossBuildInMemoryCachingScriptClassCache.java |   61 -
 .../internal/DefaultScriptCompilationHandler.java  |  336 -----
 .../internal/DefaultScriptRunnerFactory.java       |  102 --
 .../FileCacheBackedScriptClassCompiler.java        |  445 ------
 .../internal/InitialPassStatementTransformer.java  |  103 --
 .../org/gradle/initialization/BaseSettings.java    |  231 ---
 .../gradle/initialization/BuildEventConsumer.java  |   25 -
 .../initialization/BuildLayoutParameters.java      |   86 --
 .../initialization/DefaultClassLoaderRegistry.java |   74 -
 .../DefaultCommandLineConverter.java               |  225 ---
 .../initialization/DefaultGradleLauncher.java      |  200 ---
 .../DefaultGradleLauncherFactory.java              |  153 --
 .../DefaultGradlePropertiesLoader.java             |  115 --
 .../initialization/DefaultProjectDescriptor.java   |  147 --
 .../org/gradle/initialization/DefaultSettings.java |   36 -
 .../initialization/DependencyResolutionLogger.java |   56 -
 .../org/gradle/initialization/GradleLauncher.java  |   65 -
 .../initialization/GradleLauncherFactory.java      |   42 -
 .../org/gradle/initialization/InitScript.groovy    |   33 -
 .../initialization/NotifyingSettingsLoader.java    |   39 -
 .../ScriptEvaluatingSettingsProcessor.java         |   75 -
 .../org/gradle/initialization/SettingsFactory.java |   50 -
 .../org/gradle/initialization/SettingsHandler.java |   97 --
 .../gradle/initialization/SettingsScript.groovy    |   24 -
 .../buildsrc/BuildSourceBuilder.java               |  113 --
 .../AuthenticationSupportedInternal.java           |   32 -
 .../composite/CompositeBuildActionParameters.java  |   21 -
 .../composite/CompositeBuildActionRunner.java      |   24 -
 .../composite/CompositeBuildController.java        |   40 -
 .../internal/composite/CompositeParameters.java    |   59 -
 .../composite/DefaultGradleParticipantBuild.java   |   60 -
 .../internal/composite/GradleParticipantBuild.java |   30 -
 .../exceptions/FailureResolutionAware.java         |   28 -
 .../exceptions/LocationAwareException.java         |  171 ---
 .../featurelifecycle/DeprecatedFeatureUsage.java   |   77 -
 .../LoggingDeprecatedFeatureHandler.java           |   76 -
 .../gradle/internal/filewatch/ChangeReporter.java  |   94 --
 .../filewatch/DefaultFileWatcherFactory.java       |   82 --
 .../filewatch/jdk7/WatchServiceRegistrar.java      |  251 ----
 .../internal/graph/DirectedGraphRenderer.java      |   80 --
 .../gradle/internal/graph/GraphNodeRenderer.java   |   22 -
 .../org/gradle/internal/graph/GraphRenderer.java   |   69 -
 .../gradle/internal/installation/GradleFatJar.java |   88 --
 .../logging/DefaultBuildOperationLogger.java       |   96 --
 .../DefaultBuildOperationLoggerFactory.java        |   73 -
 .../internal/progress/BuildProgressLogger.java     |  108 --
 .../progress/DefaultBuildOperationExecutor.java    |  122 --
 .../gradle/internal/progress/LoggerProvider.java   |   30 -
 .../internal/progress/OperationIdentifier.java     |   54 -
 .../progress/PercentageProgressFormatter.java      |   40 -
 .../internal/progress/ProgressLoggerProvider.java  |   33 -
 .../local/GroupedAndNamedUniqueFileStore.java      |   80 --
 .../service/scopes/BuildScopeServices.java         |  369 -----
 .../service/scopes/BuildSessionScopeServices.java  |   88 --
 .../service/scopes/GlobalScopeServices.java        |  306 ----
 .../service/scopes/GradleScopeServices.java        |  139 --
 .../service/scopes/ProjectScopeServices.java       |  201 ---
 .../service/scopes/SettingsScopeServices.java      |   56 -
 .../service/scopes/TaskExecutionServices.java      |  137 --
 .../internal/service/scopes/TaskScopeServices.java |   58 -
 .../org/gradle/internal/text/TreeFormatter.java    |  146 --
 .../org/gradle/internal/xml/XmlTransformer.java    |  359 -----
 .../org/gradle/internal/xml/XmlValidation.java     |  146 --
 .../org/gradle/invocation/DefaultGradle.java       |  258 ----
 .../ClosureBackedMethodInvocationDispatch.java     |   71 -
 .../org/gradle/listener/ListenerBroadcast.java     |   26 -
 .../org/gradle/listener/ListenerManager.java       |   26 -
 .../groovy/org/gradle/logging/ConsoleOutput.java   |   39 -
 .../groovy/org/gradle/logging/ConsoleRenderer.java |   42 -
 .../org/gradle/logging/LoggingConfiguration.java   |   72 -
 .../org/gradle/logging/LoggingManagerInternal.java |   37 -
 .../org/gradle/logging/LoggingServiceRegistry.java |  154 --
 .../groovy/org/gradle/logging/ProgressLogger.java  |  126 --
 .../org/gradle/logging/ProgressLoggerFactory.java  |   40 -
 .../groovy/org/gradle/logging/ShowStacktrace.java  |   23 -
 .../org/gradle/logging/StandardOutputCapture.java  |   32 -
 .../org/gradle/logging/StyledTextOutput.java       |  160 ---
 .../gradle/logging/StyledTextOutputFactory.java    |   55 -
 .../AbstractLineChoppingStyledTextOutput.java      |   82 --
 .../logging/internal/AbstractStyledTextOutput.java |  170 ---
 .../internal/AbstractStyledTextOutputFactory.java  |   34 -
 .../org/gradle/logging/internal/AnsiConsole.java   |  227 ---
 .../internal/BufferingStyledTextOutput.java        |   77 -
 .../logging/internal/CategorisedOutputEvent.java   |   42 -
 .../org/gradle/logging/internal/ColorMap.java      |   31 -
 .../org/gradle/logging/internal/Console.java       |   29 -
 .../internal/ConsoleBackedProgressRenderer.java    |  131 --
 .../logging/internal/ConsoleConfigureAction.java   |   64 -
 .../gradle/logging/internal/DefaultColorMap.java   |  138 --
 .../logging/internal/DefaultLoggingConfigurer.java |   37 -
 .../logging/internal/DefaultLoggingManager.java    |  235 ---
 .../internal/DefaultLoggingManagerFactory.java     |   55 -
 .../internal/DefaultProgressLoggerFactory.java     |  183 ---
 .../internal/DefaultStatusBarFormatter.java        |   56 -
 .../internal/DefaultStdErrLoggingSystem.java       |   37 -
 .../internal/DefaultStdOutLoggingSystem.java       |   37 -
 .../internal/DefaultStyledTextOutputFactory.java   |   35 -
 .../logging/internal/EmbeddedLoggingServices.java  |   27 -
 .../logging/internal/FlushToOutputsEvent.java      |   31 -
 .../logging/internal/JavaUtilLoggingSystem.java    |   88 --
 .../groovy/org/gradle/logging/internal/Label.java  |   21 -
 .../internal/LinePrefixingStyledTextOutput.java    |   62 -
 .../org/gradle/logging/internal/LogEvent.java      |   53 -
 .../logging/internal/LogLevelChangeEvent.java      |   43 -
 .../internal/LoggingBackedStyledTextOutput.java    |   65 -
 .../internal/LoggingCommandLineConverter.java      |  178 ---
 .../gradle/logging/internal/LoggingConfigurer.java |   22 -
 .../logging/internal/LoggingOutputInternal.java    |   74 -
 .../org/gradle/logging/internal/LoggingSystem.java |   44 -
 .../logging/internal/LoggingSystemAdapter.java     |   63 -
 .../gradle/logging/internal/NoOpLoggingSystem.java |   40 -
 .../org/gradle/logging/internal/OutputEvent.java   |   30 -
 .../logging/internal/OutputEventListener.java      |   20 -
 .../logging/internal/OutputEventRenderer.java      |  253 ----
 .../logging/internal/PrintStreamLoggingSystem.java |  139 --
 .../logging/internal/ProgressCompleteEvent.java    |   49 -
 .../org/gradle/logging/internal/ProgressEvent.java |   43 -
 .../gradle/logging/internal/ProgressListener.java  |   25 -
 .../internal/ProgressLogEventGenerator.java        |  192 ---
 .../logging/internal/ProgressLoggingBridge.java    |   37 -
 .../logging/internal/ProgressStartEvent.java       |   71 -
 .../logging/internal/RenderableOutputEvent.java    |   35 -
 .../logging/internal/StdErrLoggingSystem.java      |   20 -
 .../logging/internal/StdOutLoggingSystem.java      |   20 -
 .../StreamBackedStandardOutputListener.java        |   51 -
 .../internal/StreamingStyledTextOutput.java        |   65 -
 .../internal/StreamingStyledTextOutputFactory.java |   31 -
 .../internal/StyledTextOutputBackedRenderer.java   |   86 --
 .../logging/internal/StyledTextOutputEvent.java    |  116 --
 .../org/gradle/logging/internal/TextArea.java      |   22 -
 .../internal/TextStreamOutputEventListener.java    |   55 -
 .../internal/progress/ProgressOperation.java       |   50 -
 .../internal/progress/ProgressOperations.java      |   55 -
 .../slf4j/OutputEventListenerBackedLogger.java     |  472 ------
 .../OutputEventListenerBackedLoggerContext.java    |  417 ------
 .../internal/slf4j/Slf4jLoggingConfigurer.java     |   51 -
 .../gradle/plugin/use/PluginDependenciesSpec.java  |  110 --
 .../gradle/plugin/use/PluginDependencySpec.java    |   52 -
 .../plugin/use/internal/DefaultPluginRequest.java  |  106 --
 .../gradle/plugin/use/internal/PluginRequest.java  |   34 -
 .../use/internal/PluginRequestCollector.java       |  101 --
 .../use/internal/PluginRequestsSerializer.java     |   53 -
 .../PluginUseScriptBlockMetadataExtractor.java     |  164 ---
 .../groovy/org/gradle/process/JavaExecSpec.java    |   94 --
 .../groovy/org/gradle/process/JavaForkOptions.java |  214 ---
 .../org/gradle/process/ProcessForkOptions.java     |  109 --
 .../internal/AbstractExecHandleBuilder.java        |  153 --
 .../gradle/process/internal/DefaultExecAction.java |   35 -
 .../process/internal/DefaultExecActionFactory.java |   47 -
 .../gradle/process/internal/DefaultExecHandle.java |  384 -----
 .../DefaultSingleUseWorkerProcessBuilder.java      |  216 ---
 .../process/internal/DefaultWorkerProcess.java     |  182 ---
 .../internal/DefaultWorkerProcessBuilder.java      |  167 ---
 .../internal/DefaultWorkerProcessFactory.java      |   75 -
 .../gradle/process/internal/ExecHandleBuilder.java |  152 --
 .../gradle/process/internal/ExecHandleFactory.java |   23 -
 .../process/internal/JavaExecHandleBuilder.java    |  222 ---
 .../org/gradle/process/internal/JvmOptions.java    |  324 -----
 .../internal/SingleUseWorkerProcessBuilder.java    |   24 -
 .../org/gradle/process/internal/WorkerProcess.java |   35 -
 .../process/internal/WorkerProcessBuilder.java     |   61 -
 .../process/internal/WorkerProcessContext.java     |   38 -
 .../process/internal/WorkerProcessException.java   |   27 -
 .../process/internal/WorkerProcessFactory.java     |   33 -
 .../process/internal/WorkerProcessSettings.java    |   52 -
 .../internal/child/ActionExecutionWorker.java      |   82 --
 ...ionClassesInSystemClassLoaderWorkerFactory.java |  145 --
 .../internal/child/BootstrapSecurityManager.java   |   94 --
 .../process/internal/child/EncodedStream.java      |   86 --
 .../child/SystemApplicationClassLoaderWorker.java  |  112 --
 .../process/internal/child/WorkerContext.java      |   24 -
 .../process/internal/child/WorkerFactory.java      |   31 -
 .../child/WorkerProcessClassPathProvider.java      |  194 ---
 .../internal/launcher/GradleWorkerMain.java        |   73 -
 .../process/internal/streams/StreamsForwarder.java |   80 --
 .../groovy/org/gradle/profile/BuildProfile.java    |  254 ----
 .../org/gradle/profile/ProfileEventAdapter.java    |  122 --
 .../org/gradle/reporting/TabbedPageRenderer.java   |   96 --
 .../groovy/org/gradle/reporting/TabsRenderer.java  |   68 -
 .../org/gradle/testfixtures/ProjectBuilder.java    |  101 --
 .../testfixtures/internal/ProjectBuilderImpl.java  |  115 --
 .../provider/model/ToolingModelBuilder.java        |   29 -
 .../DefaultToolingModelBuilderRegistry.java        |   64 -
 .../src/main/groovy/org/gradle/util/AntUtil.java   |   45 -
 .../org/gradle/util/AvailablePortFinder.java       |  117 --
 .../main/groovy/org/gradle/util/ConfigureUtil.java |  133 --
 .../src/main/groovy/org/gradle/util/DiffUtil.java  |   61 -
 .../org/gradle/util/DistributionLocator.java       |   47 -
 .../main/groovy/org/gradle/util/GFileUtils.java    |  298 ----
 .../util/LinePerThreadBufferingOutputStream.java   |  217 ---
 .../org/gradle/util/SingleMessageLogger.java       |  190 ---
 .../groovy/org/slf4j/impl/StaticLoggerBinder.java  |   51 -
 .../{groovy => java}/org/gradle/BuildAdapter.java  |    0
 .../{groovy => java}/org/gradle/BuildListener.java |    0
 .../core/src/main/java/org/gradle/BuildResult.java |   66 +
 .../src/main/java/org/gradle/StartParameter.java   |  776 ++++++++++
 .../org/gradle/TaskExecutionRequest.java           |    0
 .../src/main/java/org/gradle/api/AntBuilder.java   |  120 ++
 .../org/gradle/api/BuildCancelledException.java    |    0
 .../{groovy => java}/org/gradle/api/Buildable.java |    0
 .../org/gradle/api/CircularReferenceException.java |    0
 .../src/main/java/org/gradle/api/DefaultTask.java  |   31 +
 .../org/gradle/api/DomainObjectCollection.java     |  145 ++
 .../org/gradle/api/DomainObjectSet.java            |    0
 ...ExtensiblePolymorphicDomainObjectContainer.java |    0
 .../org/gradle/api/GradleScriptException.java      |    0
 .../org/gradle/api/IllegalDependencyNotation.java  |    0
 .../org/gradle/api/InvalidUserCodeException.java   |    0
 .../org/gradle/api/InvalidUserDataException.java   |    0
 .../gradle/api/NamedDomainObjectCollection.java    |  206 +++
 .../org/gradle/api/NamedDomainObjectContainer.java |    0
 .../org/gradle/api/NamedDomainObjectFactory.java   |    0
 .../org/gradle/api/NamedDomainObjectList.java      |    0
 .../org/gradle/api/NamedDomainObjectSet.java       |    0
 .../org/gradle/api/NonExtensible.java              |    0
 .../org/gradle/api/PathValidation.java             |    0
 .../{groovy => java}/org/gradle/api/Plugin.java    |    0
 .../api/PolymorphicDomainObjectContainer.java      |    0
 .../core/src/main/java/org/gradle/api/Project.java | 1496 ++++++++++++++++++++
 .../gradle/api/ProjectConfigurationException.java  |    0
 .../org/gradle/api/ProjectEvaluationListener.java  |    0
 .../org/gradle/api/ProjectState.java               |    0
 .../main/{groovy => java}/org/gradle/api/Rule.java |    0
 .../{groovy => java}/org/gradle/api/Script.java    |    0
 .../core/src/main/java/org/gradle/api/Task.java    |  697 +++++++++
 .../gradle/api/UnknownDomainObjectException.java   |    0
 .../org/gradle/api/UnknownProjectException.java    |    0
 .../org/gradle/api/UnknownTaskException.java       |    0
 .../org/gradle/api/XmlProvider.java                |    0
 .../gradle/api/artifacts/ArtifactIdentifier.java   |    0
 .../api/artifacts/ArtifactRepositoryContainer.java |   94 ++
 .../org/gradle/api/artifacts/ClientModule.java     |    0
 .../gradle/api/artifacts/ComponentMetadata.java    |    0
 .../api/artifacts/ComponentMetadataDetails.java    |    0
 .../api/artifacts/ComponentModuleMetadata.java     |    0
 .../artifacts/ComponentModuleMetadataDetails.java  |    0
 .../gradle/api/artifacts/ComponentSelection.java   |    0
 .../api/artifacts/ComponentSelectionRules.java     |  143 ++
 .../api/artifacts/ConfigurablePublishArtifact.java |    0
 .../org/gradle/api/artifacts/Configuration.java    |  435 ++++++
 .../api/artifacts/ConfigurationContainer.java      |  113 ++
 .../org/gradle/api/artifacts/Dependency.java       |    0
 .../gradle/api/artifacts/DependencyArtifact.java   |   83 ++
 .../artifacts/DependencyResolutionListener.java    |    0
 .../api/artifacts/DependencyResolveDetails.java    |    0
 .../org/gradle/api/artifacts/DependencySet.java    |    0
 .../api/artifacts/DependencySubstitution.java      |    0
 .../api/artifacts/DependencySubstitutions.java     |    0
 .../org/gradle/api/artifacts/ExcludeRule.java      |    0
 .../gradle/api/artifacts/ExcludeRuleContainer.java |    0
 .../gradle/api/artifacts/ExternalDependency.java   |    0
 .../api/artifacts/ExternalModuleDependency.java    |    0
 .../api/artifacts/FileCollectionDependency.java    |    0
 .../gradle/api/artifacts/LenientConfiguration.java |   68 +
 .../org/gradle/api/artifacts/ModuleDependency.java |  149 ++
 .../org/gradle/api/artifacts/ModuleIdentifier.java |    0
 .../api/artifacts/ModuleVersionIdentifier.java     |    0
 .../api/artifacts/ModuleVersionSelector.java       |    0
 .../gradle/api/artifacts/ProjectDependency.java    |    0
 .../org/gradle/api/artifacts/PublishArtifact.java  |    0
 .../gradle/api/artifacts/PublishArtifactSet.java   |    0
 .../org/gradle/api/artifacts/PublishException.java |    0
 .../gradle/api/artifacts/ResolutionStrategy.java   |    0
 .../api/artifacts/ResolvableDependencies.java      |    0
 .../org/gradle/api/artifacts/ResolveException.java |    0
 .../org/gradle/api/artifacts/ResolvedArtifact.java |    0
 .../api/artifacts/ResolvedConfiguration.java       |    0
 .../gradle/api/artifacts/ResolvedDependency.java   |    0
 .../api/artifacts/ResolvedModuleVersion.java       |    0
 .../api/artifacts/SelfResolvingDependency.java     |    0
 .../artifacts/UnknownConfigurationException.java   |    0
 .../api/artifacts/UnknownRepositoryException.java  |    0
 .../gradle/api/artifacts/UnresolvedDependency.java |    0
 .../artifacts/cache/ArtifactResolutionControl.java |    0
 .../cache/DependencyResolutionControl.java         |    0
 .../artifacts/cache/ModuleResolutionControl.java   |    0
 .../api/artifacts/cache/ResolutionControl.java     |    0
 .../api/artifacts/cache/ResolutionRules.java       |    0
 .../gradle/api/artifacts/cache/package-info.java   |    0
 .../api/artifacts/component/BuildIdentifier.java   |   37 +
 .../component/ComponentArtifactIdentifier.java     |    0
 .../artifacts/component/ComponentIdentifier.java   |    0
 .../api/artifacts/component/ComponentSelector.java |    0
 .../component/LibraryBinaryIdentifier.java         |    0
 .../component/LibraryComponentSelector.java        |   48 +
 .../component/ModuleComponentIdentifier.java       |    0
 .../component/ModuleComponentSelector.java         |    0
 .../component/ProjectComponentIdentifier.java      |   40 +
 .../component/ProjectComponentSelector.java        |   41 +
 .../api/artifacts/component/package-info.java      |    0
 .../gradle/api/artifacts/dsl/ArtifactHandler.java  |    0
 .../artifacts/dsl/ComponentMetadataHandler.java    |    0
 .../dsl/ComponentModuleMetadataHandler.java        |    0
 .../api/artifacts/dsl/DependencyHandler.java       |    0
 .../api/artifacts/dsl/RepositoryHandler.java       |    0
 .../org/gradle/api/artifacts/dsl/package-info.java |    0
 .../org/gradle/api/artifacts/ivy/IvyExtraInfo.java |    0
 .../api/artifacts/ivy/IvyModuleDescriptor.java     |    0
 .../org/gradle/api/artifacts/ivy/package-info.java |    0
 .../org/gradle/api/artifacts/package-info.java     |    0
 .../artifacts/query/ArtifactResolutionQuery.java   |    0
 .../gradle/api/artifacts/query/package-info.java   |    0
 .../artifacts/repositories/ArtifactRepository.java |   46 +
 .../repositories/AuthenticationContainer.java      |    0
 .../repositories/AuthenticationSupported.java      |    0
 .../FlatDirectoryArtifactRepository.java           |    0
 .../repositories/IvyArtifactRepository.java        |    0
 .../IvyArtifactRepositoryMetaDataProvider.java     |    0
 .../repositories/IvyPatternRepositoryLayout.java   |    0
 .../repositories/MavenArtifactRepository.java      |    0
 .../repositories/PasswordCredentials.java          |    0
 .../artifacts/repositories/RepositoryLayout.java   |    0
 .../api/artifacts/repositories/package-info.java   |    0
 .../artifacts/result/ArtifactResolutionResult.java |   50 +
 .../api/artifacts/result/ArtifactResult.java       |    0
 .../artifacts/result/ComponentArtifactsResult.java |    0
 .../api/artifacts/result/ComponentResult.java      |    0
 .../artifacts/result/ComponentSelectionReason.java |    0
 .../api/artifacts/result/DependencyResult.java     |    0
 .../api/artifacts/result/ResolutionResult.java     |    0
 .../artifacts/result/ResolvedArtifactResult.java   |   33 +
 .../artifacts/result/ResolvedComponentResult.java  |    0
 .../artifacts/result/ResolvedDependencyResult.java |    0
 .../artifacts/result/UnresolvedArtifactResult.java |   31 +
 .../result/UnresolvedComponentResult.java          |    0
 .../result/UnresolvedDependencyResult.java         |    0
 .../gradle/api/artifacts/result/package-info.java  |    0
 .../org/gradle/api/component/Artifact.java         |    0
 .../org/gradle/api/component/Component.java        |    0
 .../gradle/api/component/SoftwareComponent.java    |    0
 .../api/component/SoftwareComponentContainer.java  |    0
 .../org/gradle/api/component/package-info.java     |    0
 .../org/gradle/api/credentials/AwsCredentials.java |    0
 .../org/gradle/api/credentials/Credentials.java    |    0
 .../org/gradle/api/credentials/package-info.java   |    0
 .../org/gradle/api/dsl/ConventionProperty.java     |    0
 .../org/gradle/api/dsl/package-info.java           |    0
 .../gradle/api/execution/TaskActionListener.java   |    0
 .../gradle/api/execution/TaskExecutionAdapter.java |    0
 .../gradle/api/execution/TaskExecutionGraph.java   |  147 ++
 .../api/execution/TaskExecutionGraphListener.java  |    0
 .../api/execution/TaskExecutionListener.java       |    0
 .../internal/InternalTaskExecutionListener.java    |    0
 .../api/execution/internal/TaskInputsListener.java |    0
 .../execution/internal/TaskOperationInternal.java  |    0
 .../org/gradle/api/execution/package-info.java     |    0
 .../api/file/ConfigurableFileCollection.java       |    0
 .../org/gradle/api/file/ConfigurableFileTree.java  |    0
 .../org/gradle/api/file/ContentFilterable.java     |   93 ++
 .../org/gradle/api/file/CopyProcessingSpec.java    |  141 ++
 .../java/org/gradle/api/file/CopySourceSpec.java   |   50 +
 .../main/java/org/gradle/api/file/CopySpec.java    |  396 ++++++
 .../org/gradle/api/file/DeleteSpec.java            |    0
 .../org/gradle/api/file/DirectoryTree.java         |    0
 .../api/file/DuplicateFileCopyingException.java    |    0
 .../org/gradle/api/file/DuplicatesStrategy.java    |    0
 .../org/gradle/api/file/EmptyFileVisitor.java      |    0
 .../org/gradle/api/file/FileCollection.java        |    0
 .../org/gradle/api/file/FileCopyDetails.java       |    0
 .../org/gradle/api/file/FileTree.java              |    0
 .../org/gradle/api/file/FileTreeElement.java       |    0
 .../org/gradle/api/file/FileVisitDetails.java      |    0
 .../org/gradle/api/file/FileVisitor.java           |    0
 .../java/org/gradle/api/file/RelativePath.java     |  250 ++++
 .../org/gradle/api/file/SourceDirectorySet.java    |    0
 .../api/file/UnableToDeleteFileException.java      |    0
 .../org/gradle/api/file/package-info.java          |    0
 .../initialization/ConfigurableIncludedBuild.java  |   43 +
 .../gradle/api/initialization/IncludedBuild.java   |   45 +
 .../api/initialization/ProjectDescriptor.java      |    0
 .../org/gradle/api/initialization/Settings.java    |  193 +++
 .../api/initialization/dsl/ScriptHandler.java      |    0
 .../api/initialization/dsl/package-info.java       |    0
 .../gradle/api/initialization/package-info.java    |    0
 .../api/internal/AbstractClassGenerator.java       |  432 ++++++
 .../AbstractNamedDomainObjectContainer.java        |   82 ++
 .../AbstractPolymorphicDomainObjectContainer.java  |  150 ++
 .../java/org/gradle/api/internal/AbstractTask.java |  798 +++++++++++
 .../api/internal/AsmBackedClassGenerator.java      |  970 +++++++++++++
 .../gradle/api/internal/ChainingTransformer.java   |    0
 .../org/gradle/api/internal/ClassGenerator.java    |    0
 .../internal/ClassGeneratorBackedInstantiator.java |    0
 .../org/gradle/api/internal/ClassPathProvider.java |    0
 .../org/gradle/api/internal/ClassPathRegistry.java |    0
 .../api/internal/CompositeDomainObjectSet.java     |  184 +++
 .../gradle/api/internal/ConfigureByMapAction.java  |    0
 .../gradle/api/internal/ConventionAwareHelper.java |  147 ++
 .../org/gradle/api/internal/ConventionMapping.java |    0
 .../org/gradle/api/internal/ConventionTask.java    |    0
 .../api/internal/DefaultClassPathProvider.java     |   53 +
 .../api/internal/DefaultClassPathRegistry.java     |    0
 .../internal/DefaultDomainObjectCollection.java    |  303 ++++
 .../api/internal/DefaultDomainObjectSet.java       |    0
 .../DefaultNamedDomainObjectCollection.java        |  476 +++++++
 .../api/internal/DefaultNamedDomainObjectList.java |    0
 .../api/internal/DefaultNamedDomainObjectSet.java  |   88 ++
 .../DefaultPolymorphicDomainObjectContainer.java   |    0
 .../DefaultPolymorphicNamedEntityInstantiator.java |    0
 .../api/internal/DelegatingDomainObjectSet.java    |  136 ++
 .../api/internal/DependencyClassPathProvider.java  |   71 +
 .../internal/DependencyInjectingInstantiator.java  |  182 +++
 .../internal/DependencyInjectingServiceLoader.java |   65 +
 .../gradle/api/internal/DocumentationRegistry.java |    0
 .../org/gradle/api/internal/DomNode.java           |    0
 .../gradle/api/internal/DomainObjectContext.java   |    0
 .../internal/DynamicModulesClassPathProvider.java  |    0
 .../gradle/api/internal/DynamicObjectAware.java    |   35 +
 .../org/gradle/api/internal/DynamicObjectUtil.java |   33 +
 .../gradle/api/internal/DynamicPropertyNamer.java  |   48 +
 .../org/gradle/api/internal/ExceptionAnalyser.java |    0
 .../api/internal/ExtensibleDynamicObject.java      |  255 ++++
 ...lePolymorphicDomainObjectContainerInternal.java |    0
 .../FactoryNamedDomainObjectContainer.java         |    0
 .../org/gradle/api/internal/GradleInternal.java    |   94 ++
 .../org/gradle/api/internal/HasConvention.java     |    0
 .../org/gradle/api/internal/IConventionAware.java  |    0
 ...amedDomainObjectContainerConfigureDelegate.java |   43 +
 .../gradle/api/internal/NoConventionMapping.java   |    0
 .../NoFactoryRegisteredForTypeException.java       |    0
 .../api/internal/NoNamingPropertyException.java    |   23 +
 .../api/internal/NullNamingPropertyException.java  |   23 +
 ...phicDomainObjectContainerConfigureDelegate.java |   48 +
 .../PolymorphicDomainObjectContainerInternal.java  |    0
 .../PolymorphicNamedEntityInstantiator.java        |    0
 .../org/gradle/api/internal/ProcessOperations.java |    0
 .../gradle/api/internal/PropertiesTransformer.java |    0
 .../ReflectiveNamedDomainObjectFactory.java        |    0
 .../org/gradle/api/internal/SettingsInternal.java  |   53 +
 .../gradle/api/internal/TaskExecutionHistory.java  |    0
 .../gradle/api/internal/TaskInputsInternal.java    |   26 +
 .../java/org/gradle/api/internal/TaskInternal.java |   80 ++
 .../gradle/api/internal/TaskOutputsInternal.java   |   77 +
 .../api/internal/ThreadGlobalInstantiator.java     |   63 +
 .../TypedDomainObjectContainerWrapper.java         |  231 +++
 .../org/gradle/api/internal/UserCodeAction.java    |    0
 .../internal/artifacts/BaseRepositoryFactory.java  |    0
 .../artifacts/CachingDependencyResolveContext.java |    0
 .../DefaultArtifactRepositoryContainer.java        |  116 ++
 .../internal/artifacts/DefaultDependencySet.java   |   58 +
 .../api/internal/artifacts/DefaultExcludeRule.java |    0
 .../artifacts/DefaultExcludeRuleContainer.java     |   45 +
 .../api/internal/artifacts/DefaultModule.java      |   56 +
 .../artifacts/DefaultPublishArtifactSet.java       |    0
 .../artifacts/DependencyManagementServices.java    |    0
 .../artifacts/DependencyResolutionServices.java    |    0
 .../artifacts/DependencyResolveContext.java        |    0
 .../DependencyResolveDetailsInternal.java          |    0
 .../artifacts/DependencySubstitutionInternal.java  |    0
 .../artifacts/ExcludeRuleNotationConverter.java    |    0
 .../org/gradle/api/internal/artifacts/Module.java  |   38 +
 .../artifacts/ModuleVersionSelectorStrictSpec.java |    0
 .../internal/artifacts/ProjectBackedModule.java    |   71 +
 .../internal/artifacts/ResolvableDependency.java   |    0
 .../configurations/DependencyMetaDataProvider.java |   22 +
 .../configurations/dynamicversion/CachePolicy.java |    0
 .../artifacts/dependencies/AbstractDependency.java |    0
 .../AbstractExternalModuleDependency.java          |    0
 .../dependencies/AbstractModuleDependency.java     |  132 ++
 .../dependencies/DefaultClientModule.java          |    0
 .../dependencies/DefaultDependencyArtifact.java    |  122 ++
 .../DefaultExternalModuleDependency.java           |    0
 .../dependencies/DefaultProjectDependency.java     |    0
 .../DefaultSelfResolvingDependency.java            |    0
 .../dependencies/ProjectDependencyInternal.java    |    0
 .../artifacts/dsl/DefaultRepositoryHandler.java    |  103 ++
 .../dsl/dependencies/DefaultDependencyHandler.java |  151 ++
 .../dsl/dependencies/DependencyFactory.java        |   34 +
 .../dsl/dependencies/ModuleFactoryDelegate.java    |   93 ++
 .../dsl/dependencies/ModuleFactoryHelper.java      |    0
 .../artifacts/dsl/dependencies/ProjectFinder.java  |   36 +
 .../dsl/dependencies/UnknownProjectFinder.java     |   38 +
 .../artifacts/publish/AbstractPublishArtifact.java |   43 +
 .../artifacts/publish/ArchivePublishArtifact.java  |    0
 .../artifacts/publish/DefaultPublishArtifact.java  |    0
 .../query/ArtifactResolutionQueryFactory.java      |    0
 .../repositories/ArtifactRepositoryInternal.java   |    0
 .../repositories/DefaultPasswordCredentials.java   |    0
 .../org/gradle/api/internal/cache/BinaryStore.java |    0
 .../org/gradle/api/internal/cache/Cache.java       |    0
 .../api/internal/cache/CacheAccessSerializer.java  |    0
 .../gradle/api/internal/cache/CacheSupport.java    |    0
 .../cache/DefaultGeneratedGradleJarCache.java      |   67 +
 .../internal/cache/GeneratedGradleJarCache.java    |   42 +
 .../internal/cache/HeapProportionalCacheSizer.java |   61 +
 .../org/gradle/api/internal/cache/Loader.java      |    0
 .../gradle/api/internal/cache/MapBackedCache.java  |    0
 .../api/internal/cache/MinimalPersistentCache.java |    0
 .../cache/SingleOperationPersistentStore.java      |    0
 .../org/gradle/api/internal/cache/Stash.java       |    0
 .../org/gradle/api/internal/cache/Store.java       |    0
 .../changedetection/TaskArtifactState.java         |   61 +
 .../TaskArtifactStateRepository.java               |    0
 .../changes/ChangesOnlyIncrementalTaskInputs.java  |   57 +
 .../DefaultTaskArtifactStateRepository.java        |  168 +++
 .../changes/DiscoveredInputRecorder.java           |    0
 .../changes/IncrementalTaskInputsInternal.java     |   26 +
 .../changes/NoHistoryArtifactState.java            |   60 +
 .../changes/RebuildIncrementalTaskInputs.java      |   73 +
 .../ShortCircuitTaskArtifactStateRepository.java   |  104 ++
 .../changes/StatefulIncrementalTaskInputs.java     |   67 +
 .../AbstractNamedFileSnapshotTaskStateChanges.java |  137 ++
 .../rules/CachingTaskStateChanges.java             |    0
 .../internal/changedetection/rules/ChangeType.java |   34 +
 .../changedetection/rules/DescriptiveChange.java   |    0
 .../rules/DiscoveredInputsListener.java            |    0
 .../rules/DiscoveredInputsTaskStateChanges.java    |   92 ++
 .../internal/changedetection/rules/FileChange.java |   86 ++
 .../rules/InputFilesTaskStateChanges.java          |   42 +
 .../rules/InputPropertiesTaskStateChanges.java     |    0
 .../rules/NoHistoryTaskStateChanges.java           |    0
 .../rules/OutputFilesTaskStateChanges.java         |   74 +
 .../rules/SimpleTaskStateChanges.java              |    0
 .../rules/SummaryTaskStateChanges.java             |    0
 .../changedetection/rules/TaskStateChange.java     |    0
 .../changedetection/rules/TaskStateChanges.java    |    0
 .../rules/TaskTypeTaskStateChanges.java            |   83 ++
 .../changedetection/rules/TaskUpToDateState.java   |   88 ++
 .../state/AbstractFileCollectionSnapshotter.java   |  108 ++
 .../state/AbstractNormalizedFileSnapshot.java      |   73 +
 .../state/CacheAccessingFileSnapshotter.java       |   75 +
 .../state/CacheBackedFileSnapshotRepository.java   |    0
 .../state/CacheBackedTaskHistoryRepository.java    |  388 +++++
 .../state/CachingFileSnapshotter.java              |  128 ++
 .../state/DefaultFileCollectionSnapshot.java       |   90 ++
 .../state/DefaultFileCollectionSnapshotter.java    |   55 +
 .../state/DefaultTaskArtifactStateCacheAccess.java |    0
 .../changedetection/state/DirSnapshot.java         |   52 +
 .../state/FileCollectionSnapshot.java              |   43 +
 .../state/FileCollectionSnapshotter.java           |   49 +
 .../changedetection/state/FileHashSnapshot.java    |   78 +
 .../changedetection/state/FileSnapshot.java        |   23 +
 .../state/FileSnapshotRepository.java              |    0
 .../changedetection/state/FileSnapshotter.java     |    0
 .../state/InMemoryTaskArtifactCache.java           |  183 +++
 .../state/IncrementalFileSnapshot.java             |   23 +
 .../state/InputPropertiesSerializer.java           |    0
 .../state/MapMergeChangeListener.java              |    0
 .../state/MinimalFileSetSnapshotter.java           |  134 ++
 .../changedetection/state/MissingFileSnapshot.java |   52 +
 .../changedetection/state/NoOpDecorator.java       |    0
 .../state/NormalizedFileSnapshot.java              |   25 +
 ...InsensitiveTaskFilePropertyCompareStrategy.java |  163 +++
 ...erSensitiveTaskFilePropertyCompareStrategy.java |   83 ++
 .../state/OutputFilesCollectionSnapshot.java       |  154 ++
 .../state/OutputFilesCollectionSnapshotter.java    |  139 ++
 .../state/SnapshotMapSerializer.java               |  134 ++
 .../state/TaskArtifactStateCacheAccess.java        |    0
 .../changedetection/state/TaskExecution.java       |  200 +++
 .../state/TaskFilePropertyCompareStrategy.java     |  136 ++
 .../state/TaskFilePropertyPathSensitivity.java     |  211 +++
 .../state/TaskHistoryRepository.java               |    0
 .../internal/classloading/GroovySystemLoader.java  |    0
 .../classloading/GroovySystemLoaderFactory.java    |    0
 .../LeakyOnJava7GroovySystemLoader.java            |  114 ++
 .../classloading/NoOpGroovySystemLoader.java       |    0
 .../internal/classpath/DefaultModuleRegistry.java  |  316 +++++
 .../classpath/DefaultPluginModuleRegistry.java     |    0
 .../api/internal/classpath/EffectiveClassPath.java |    0
 .../api/internal/classpath/ManifestUtil.java       |    0
 .../org/gradle/api/internal/classpath/Module.java  |    0
 .../api/internal/classpath/ModuleRegistry.java     |    0
 .../internal/classpath/PluginModuleRegistry.java   |    0
 .../internal/classpath/UnknownModuleException.java |    0
 .../coerce/MethodArgumentsTransformer.java         |   33 +
 .../internal/coerce/PropertySetTransformer.java    |   21 +
 .../internal/coerce/StringToEnumTransformer.java   |   77 +
 .../collections/CollectionEventRegister.java       |    0
 .../api/internal/collections/CollectionFilter.java |    0
 .../internal/collections/FilteredCollection.java   |    0
 .../api/internal/collections/FilteredList.java     |    0
 .../api/internal/collections/FilteredSet.java      |    0
 .../api/internal/component/ArtifactType.java       |   26 +
 .../internal/component/BuildableJavaComponent.java |    0
 .../api/internal/component/ComponentRegistry.java  |    0
 .../component/ComponentTypeRegistration.java       |    0
 .../internal/component/ComponentTypeRegistry.java  |    0
 .../component/DefaultComponentTypeRegistry.java    |    0
 .../DefaultSoftwareComponentContainer.java         |    0
 .../component/SoftwareComponentInternal.java       |    0
 .../org/gradle/api/internal/component/Usage.java   |    0
 .../api/internal/file/AbstractFileCollection.java  |  238 ++++
 .../api/internal/file/AbstractFileResolver.java    |  193 +++
 .../api/internal/file/AbstractFileResource.java    |    0
 .../gradle/api/internal/file/AbstractFileTree.java |    0
 .../api/internal/file/AbstractFileTreeElement.java |    0
 .../internal/file/AntFileCollectionBuilder.java    |   49 +
 .../file/AntFileCollectionMatchingTaskBuilder.java |   74 +
 .../api/internal/file/AntFileSetBuilder.java       |   51 +
 .../api/internal/file/AntFileTreeBuilder.java      |   54 +
 .../api/internal/file/BaseDirFileResolver.java     |    0
 .../api/internal/file/BasicFileResolver.java       |   63 +
 .../api/internal/file/CompositeFileCollection.java |    0
 .../api/internal/file/CompositeFileTree.java       |    0
 .../file/CopyActionProcessingStreamAction.java     |    0
 .../internal/file/DefaultCompositeFileTree.java    |    0
 .../file/DefaultFileCollectionFactory.java         |    0
 .../api/internal/file/DefaultFileLookup.java       |    0
 .../api/internal/file/DefaultFileOperations.java   |    0
 .../api/internal/file/DefaultFileTreeElement.java  |   69 +
 .../api/internal/file/DefaultFileVisitDetails.java |   72 +
 .../internal/file/DefaultSourceDirectorySet.java   |  206 +++
 .../file/DefaultSourceDirectorySetFactory.java     |    0
 .../file/DefaultTemporaryFileProvider.java         |   65 +
 .../api/internal/file/FileCollectionFactory.java   |    0
 .../api/internal/file/FileCollectionInternal.java  |    0
 .../org/gradle/api/internal/file/FileLookup.java   |    0
 .../gradle/api/internal/file/FileNormaliser.java   |  155 ++
 .../gradle/api/internal/file/FileOperations.java   |    0
 .../internal/file/FileOrUriNotationConverter.java  |    0
 .../org/gradle/api/internal/file/FileResolver.java |    0
 .../org/gradle/api/internal/file/FileResource.java |    0
 .../gradle/api/internal/file/FileSystemSubset.java |    0
 .../gradle/api/internal/file/FileTreeInternal.java |    0
 .../api/internal/file/IdentityFileResolver.java    |    0
 .../api/internal/file/ImmutableDirectoryTree.java  |    0
 .../api/internal/file/ImmutablePatternSet.java     |    0
 .../internal/file/MaybeCompressedFileResource.java |    0
 .../org/gradle/api/internal/file/RelativeFile.java |    0
 .../gradle/api/internal/file/RelativePathSpec.java |    0
 .../internal/file/SourceDirectorySetFactory.java   |    0
 .../api/internal/file/TemporaryFileProvider.java   |    0
 .../internal/file/TmpDirTemporaryFileProvider.java |   33 +
 .../api/internal/file/UnionFileCollection.java     |    0
 .../gradle/api/internal/file/UnionFileTree.java    |    0
 .../file/UnknownBackingFileReadableResource.java   |    0
 .../api/internal/file/ant/AntFileResource.java     |    0
 .../api/internal/file/ant/BaseDirSelector.java     |    0
 .../api/internal/file/archive/TarCopyAction.java   |    0
 .../api/internal/file/archive/TarFileTree.java     |  220 +++
 .../api/internal/file/archive/ZipCopyAction.java   |    0
 .../api/internal/file/archive/ZipFileTree.java     |  187 +++
 .../file/archive/compression/AbstractArchiver.java |    0
 .../compression/ArchiveOutputStreamFactory.java    |    0
 .../file/archive/compression/Bzip2Archiver.java    |   67 +
 .../compression/CompressedReadableResource.java    |    0
 .../file/archive/compression/GzipArchiver.java     |    0
 .../file/archive/compression/SimpleCompressor.java |    0
 ...pendenciesOnlyFileCollectionResolveContext.java |   90 ++
 .../DefaultConfigurableFileCollection.java         |    0
 .../collections/DefaultConfigurableFileTree.java   |  178 +++
 .../DefaultDirectoryFileTreeFactory.java           |   49 +
 .../file/collections/DefaultDirectoryWalker.java   |    0
 .../collections/DefaultDirectoryWalkerFactory.java |   67 +
 .../DefaultFileCollectionResolveContext.java       |  243 ++++
 .../file/collections/DirectoryFileTree.java        |  167 +++
 .../file/collections/DirectoryFileTreeFactory.java |    0
 .../internal/file/collections/DirectoryTrees.java  |   40 +
 .../internal/file/collections/DirectoryWalker.java |    0
 .../collections/FileBackedDirectoryFileTree.java   |    0
 .../file/collections/FileCollectionAdapter.java    |    0
 .../file/collections/FileCollectionContainer.java  |    0
 .../collections/FileCollectionResolveContext.java  |    0
 .../collections/FileSystemMirroringFileTree.java   |    0
 .../internal/file/collections/FileTreeAdapter.java |    0
 .../LazilyInitializedFileCollection.java           |    0
 .../file/collections/ListBackedFileSet.java        |    0
 .../internal/file/collections/LocalFileTree.java   |    0
 .../api/internal/file/collections/MapFileTree.java |  252 ++++
 .../file/collections/MinimalFileCollection.java    |    0
 .../internal/file/collections/MinimalFileSet.java  |    0
 .../internal/file/collections/MinimalFileTree.java |    0
 .../collections/PatternFilterableFileTree.java     |    0
 .../collections/RandomAccessFileCollection.java    |    0
 .../ResolvableFileCollectionResolveContext.java    |    0
 .../file/collections/SimpleFileCollection.java     |    0
 .../collections/SingleIncludePatternFileTree.java  |    0
 .../file/collections/SingletonFileSet.java         |   42 +
 .../file/collections/SingletonFileTree.java        |   63 +
 .../file/collections/jdk7/Jdk7DirectoryWalker.java |    0
 .../file/copy/ClosureBackedTransformer.java        |   33 +
 .../gradle/api/internal/file/copy/CopyAction.java  |    0
 .../api/internal/file/copy/CopyActionExecuter.java |    0
 .../file/copy/CopyActionProcessingStream.java      |    0
 .../internal/file/copy/CopyFileVisitorImpl.java    |    0
 .../api/internal/file/copy/CopySpecActionImpl.java |    0
 .../CopySpecBackedCopyActionProcessingStream.java  |    0
 .../api/internal/file/copy/CopySpecInternal.java   |    0
 .../api/internal/file/copy/CopySpecResolver.java   |   55 +
 .../api/internal/file/copy/CopySpecSource.java     |    0
 .../api/internal/file/copy/CopySpecWrapper.java    |  272 ++++
 .../api/internal/file/copy/DefaultCopySpec.java    |  590 ++++++++
 .../internal/file/copy/DefaultFileCopyDetails.java |  229 +++
 .../internal/file/copy/DefaultZipCompressor.java   |    0
 .../file/copy/DelegatingCopySpecInternal.java      |  254 ++++
 .../file/copy/DestinationRootCopySpec.java         |    0
 .../copy/DuplicateHandlingCopyActionDecorator.java |    0
 .../gradle/api/internal/file/copy/FileCopier.java  |    0
 .../api/internal/file/copy/FileCopyAction.java     |    0
 .../file/copy/FileCopyDetailsInternal.java         |    0
 .../gradle/api/internal/file/copy/FilterChain.java |  129 ++
 .../gradle/api/internal/file/copy/LineFilter.java  |  121 ++
 .../api/internal/file/copy/MatchingCopyAction.java |    0
 .../file/copy/NormalizingCopyActionDecorator.java  |  210 +++
 .../internal/file/copy/PathNotationConverter.java  |   71 +
 .../api/internal/file/copy/RegExpNameMapper.java   |    0
 .../api/internal/file/copy/RenamingCopyAction.java |    0
 .../internal/file/copy/SingleParentCopySpec.java   |   66 +
 .../file/copy/SyncCopyActionDecorator.java         |  113 ++
 .../api/internal/file/copy/ZipCompressor.java      |    0
 .../internal/file/delete/DefaultDeleteSpec.java    |    0
 .../internal/file/delete/DeleteSpecInternal.java   |    0
 .../gradle/api/internal/file/delete/Deleter.java   |  112 ++
 .../file/pattern/AnyWildcardPatternStep.java       |    0
 .../internal/file/pattern/EndOfPathMatcher.java    |    0
 .../internal/file/pattern/FixedPatternStep.java    |    0
 .../file/pattern/FixedStepsPathMatcher.java        |    0
 .../internal/file/pattern/GreedyPathMatcher.java   |    0
 .../pattern/HasPrefixAndSuffixPatternStep.java     |    0
 .../file/pattern/HasPrefixPatternStep.java         |    0
 .../file/pattern/HasSuffixPatternStep.java         |   48 +
 .../api/internal/file/pattern/PathMatcher.java     |    0
 .../file/pattern/PatternMatcherFactory.java        |   84 ++
 .../api/internal/file/pattern/PatternStep.java     |    0
 .../internal/file/pattern/PatternStepFactory.java  |    0
 .../internal/file/pattern/RegExpPatternStep.java   |    0
 .../gradle/api/internal/hash/DefaultHasher.java    |   41 +
 .../java/org/gradle/api/internal/hash/Hasher.java  |   24 +
 .../initialization/BasicDomainObjectContext.java   |    0
 .../internal/initialization/ClassLoaderIds.java    |    0
 .../internal/initialization/ClassLoaderScope.java  |    0
 .../initialization/ClassLoaderScopeIdentifier.java |    0
 .../initialization/DefaultClassLoaderScope.java    |    0
 .../initialization/DefaultScriptHandler.java       |  128 ++
 .../DefaultScriptHandlerFactory.java               |   51 +
 .../initialization/RootClassLoaderScope.java       |    0
 .../initialization/ScriptHandlerFactory.java       |    0
 .../initialization/ScriptHandlerInternal.java      |    0
 .../loadercache/ClassLoaderCache.java              |    0
 .../initialization/loadercache/ClassLoaderId.java  |    0
 .../loadercache/DefaultClassLoaderCache.java       |  211 +++
 .../loadercache/HashClassPathSnapshotter.java      |  106 ++
 .../ClassloaderBackedPluginDescriptorLocator.java  |   38 +
 .../api/internal/plugins/DefaultAppliedPlugin.java |    0
 .../api/internal/plugins/DefaultConvention.java    |  245 ++++
 .../plugins/DefaultExtraPropertiesExtension.java   |   81 ++
 .../plugins/DefaultObjectConfigurationAction.java  |    0
 .../internal/plugins/DefaultPluginCollection.java  |    0
 .../internal/plugins/DefaultPluginContainer.java   |    0
 .../api/internal/plugins/DefaultPluginManager.java |  220 +++
 .../internal/plugins/DefaultPluginRegistry.java    |  229 +++
 .../plugins/DefaultPotentialPluginWithId.java      |   67 +
 .../org/gradle/api/internal/plugins/DslObject.java |   93 ++
 .../plugins/ExtensionContainerInternal.java        |    0
 .../api/internal/plugins/ExtensionsStorage.java    |  196 +++
 .../ExtraPropertiesDynamicObjectAdapter.java       |   64 +
 .../plugins/ImperativeOnlyPluginApplicator.java    |    0
 .../plugins/PluginApplicationException.java        |    0
 .../api/internal/plugins/PluginApplicator.java     |    0
 .../api/internal/plugins/PluginAwareInternal.java  |    0
 .../api/internal/plugins/PluginDescriptor.java     |    0
 .../internal/plugins/PluginDescriptorLocator.java  |    0
 .../api/internal/plugins/PluginImplementation.java |    0
 .../api/internal/plugins/PluginInspector.java      |    0
 .../internal/plugins/PluginManagerInternal.java    |    0
 .../api/internal/plugins/PluginRegistry.java       |    0
 .../api/internal/plugins/PotentialPlugin.java      |    0
 .../plugins/RuleBasedPluginApplicator.java         |    0
 .../api/internal/project/AbstractPluginAware.java  |   53 +
 .../api/internal/project/DefaultAntBuilder.java    |  193 +++
 .../internal/project/DefaultAntBuilderFactory.java |   50 +
 .../api/internal/project/DefaultProject.java       | 1082 ++++++++++++++
 .../project/DefaultProjectAccessListener.java      |    0
 .../internal/project/DefaultProjectRegistry.java   |    0
 .../internal/project/DefaultProjectTaskLister.java |    0
 .../project/DeferredProjectConfiguration.java      |    0
 .../api/internal/project/IProjectFactory.java      |    0
 .../api/internal/project/IsolatedAntBuilder.java   |    0
 .../api/internal/project/ProjectFactory.java       |    0
 .../api/internal/project/ProjectIdentifier.java    |    0
 .../api/internal/project/ProjectInternal.java      |  100 ++
 .../api/internal/project/ProjectRegistry.java      |    0
 .../gradle/api/internal/project/ProjectScript.java |   65 +
 .../api/internal/project/ProjectStateInternal.java |    0
 .../api/internal/project/ProjectTaskLister.java    |    0
 .../internal/project/ant/AntLoggingAdapter.java    |  119 ++
 .../project/ant/AntLoggingAdapterFactory.java      |   22 +
 .../api/internal/project/ant/BasicAntBuilder.java  |  124 ++
 .../ant/DefaultAntLoggingAdapterFactory.java       |   24 +
 .../project/antbuilder/AntBuilderDelegate.java     |  128 ++
 .../internal/project/antbuilder/CacheEntry.java    |    0
 .../project/antbuilder/CachedClassLoader.java      |    0
 .../antbuilder/ClassPathToClassLoaderCache.java    |  149 ++
 .../api/internal/project/antbuilder/Cleanup.java   |   64 +
 .../antbuilder/DefaultIsolatedAntBuilder.java      |  224 +++
 .../project/antbuilder/FinalizerThread.java        |  105 ++
 .../AbstractOutputPropertyAnnotationHandler.java   |   50 +
 ...tractPluralOutputPropertyAnnotationHandler.java |   76 +
 .../AnnotationProcessingTaskFactory.java           |   83 ++
 .../taskfactory/DefaultTaskClassInfoStore.java     |  162 +++
 .../taskfactory/DependencyAutoWireTaskFactory.java |    0
 .../internal/project/taskfactory/ITaskFactory.java |    0
 .../InputDirectoryPropertyAnnotationHandler.java   |   65 +
 .../InputFilePropertyAnnotationHandler.java        |   60 +
 .../InputFilesPropertyAnnotationHandler.java       |   50 +
 .../InputPropertyAnnotationHandler.java            |   42 +
 .../NestedBeanPropertyAnnotationHandler.java       |   51 +
 .../taskfactory/NoOpPropertyAnnotationHandler.java |   40 +
 ...OutputDirectoriesPropertyAnnotationHandler.java |   44 +
 .../OutputDirectoryPropertyAnnotationHandler.java  |   59 +
 .../OutputFilePropertyAnnotationHandler.java       |   59 +
 .../OutputFilesPropertyAnnotationHandler.java      |   43 +
 .../taskfactory/OutputPropertyAnnotationUtil.java  |   49 +
 .../taskfactory/PropertyAnnotationHandler.java     |   40 +
 .../taskfactory/PropertyAnnotationUtils.java       |   29 +
 .../project/taskfactory/TaskClassInfo.java         |   64 +
 .../project/taskfactory/TaskClassInfoStore.java    |   23 +
 .../project/taskfactory/TaskClassValidator.java    |  206 +++
 .../internal/project/taskfactory/TaskFactory.java  |  150 ++
 .../taskfactory/TaskPropertyActionContext.java     |   56 +
 .../project/taskfactory/TaskPropertyInfo.java      |  186 +++
 .../taskfactory/TaskPropertyValidationAccess.java  |   36 +
 .../project/taskfactory/TaskPropertyValue.java     |   27 +
 .../internal/project/taskfactory/UpdateAction.java |    0
 .../project/taskfactory/ValidationAction.java      |    0
 .../resources/CharSourceBackedTextResource.java    |    0
 .../internal/resources/DefaultResourceHandler.java |    0
 .../resources/DefaultTextResourceFactory.java      |    0
 .../FileCollectionBackedArchiveTextResource.java   |    0
 .../FileCollectionBackedTextResource.java          |    0
 .../resources/StringBackedTextResource.java        |    0
 .../gradle/api/internal/resources/URIBuilder.java  |    0
 .../rules/NamedDomainObjectFactoryRegistry.java    |    0
 .../gradle/api/internal/specs/ExplainingSpec.java  |    0
 .../gradle/api/internal/specs/ExplainingSpecs.java |    0
 .../api/internal/tasks/AbstractTaskDependency.java |    0
 .../tasks/AbstractTaskPropertyBuilder.java         |   57 +
 .../tasks/CacheableTaskOutputFilePropertySpec.java |   27 +
 .../tasks/CachingTaskDependencyResolveContext.java |    0
 .../internal/tasks/ClassLoaderAwareTaskAction.java |   28 +
 .../api/internal/tasks/ContextAwareTaskAction.java |   21 +
 .../api/internal/tasks/DefaultTaskCollection.java  |    0
 .../api/internal/tasks/DefaultTaskContainer.java   |  311 ++++
 .../tasks/DefaultTaskContainerFactory.java         |  108 ++
 .../api/internal/tasks/DefaultTaskDependency.java  |  126 ++
 .../api/internal/tasks/DefaultTaskInputs.java      |  407 ++++++
 .../api/internal/tasks/DefaultTaskOutputs.java     |  469 ++++++
 .../internal/tasks/PublicTaskSpecification.java    |    0
 .../internal/tasks/RealizableTaskCollection.java   |  249 ++++
 .../api/internal/tasks/SimpleWorkResult.java       |    0
 .../api/internal/tasks/TaskContainerInternal.java  |   59 +
 .../internal/tasks/TaskDependencyContainer.java    |    0
 .../api/internal/tasks/TaskDependencyInternal.java |    0
 .../tasks/TaskDependencyResolveContext.java        |   45 +
 .../gradle/api/internal/tasks/TaskExecuter.java    |    0
 .../api/internal/tasks/TaskExecutionContext.java   |    0
 .../api/internal/tasks/TaskFilePropertySpec.java   |   27 +
 .../internal/tasks/TaskInputFilePropertySpec.java  |   20 +
 .../org/gradle/api/internal/tasks/TaskMutator.java |  113 ++
 .../internal/tasks/TaskOutputFilePropertySpec.java |   20 +
 .../gradle/api/internal/tasks/TaskOutputsUtil.java |   32 +
 .../internal/tasks/TaskPropertyFileCollection.java |   55 +
 .../api/internal/tasks/TaskPropertySpec.java       |   21 +
 .../api/internal/tasks/TaskPropertyUtils.java      |   52 +
 .../api/internal/tasks/TaskReferenceResolver.java  |   34 +
 .../gradle/api/internal/tasks/TaskResolver.java    |   24 +
 .../api/internal/tasks/TaskStateInternal.java      |  129 ++
 .../tasks/cache/DefaultTaskCacheKeyBuilder.java    |  146 ++
 .../tasks/cache/LocalDirectoryTaskOutputCache.java |   83 ++
 .../tasks/cache/MapBasedTaskOutputCache.java       |   54 +
 .../api/internal/tasks/cache/TaskCacheKey.java     |   21 +
 .../internal/tasks/cache/TaskCacheKeyBuilder.java  |   29 +
 .../api/internal/tasks/cache/TaskOutputCache.java  |   46 +
 .../tasks/cache/TaskOutputCacheFactory.java        |   23 +
 .../api/internal/tasks/cache/TaskOutputPacker.java |   29 +
 .../api/internal/tasks/cache/TaskOutputReader.java |   24 +
 .../api/internal/tasks/cache/TaskOutputWriter.java |   24 +
 .../internal/tasks/cache/ZipTaskOutputPacker.java  |  138 ++
 .../tasks/cache/config/DefaultTaskCaching.java     |   63 +
 .../tasks/cache/config/TaskCachingInternal.java    |   24 +
 .../execution/DefaultTaskExecutionContext.java     |    0
 .../execution/ExecuteActionsTaskExecuter.java      |   85 ++
 .../execution/ExecuteAtMostOnceTaskExecuter.java   |    0
 .../PostExecutionAnalysisTaskExecuter.java         |    0
 .../tasks/execution/SkipCachedTaskExecuter.java    |  136 ++
 .../SkipEmptySourceFilesTaskExecuter.java          |    0
 .../tasks/execution/SkipOnlyIfTaskExecuter.java    |    0
 .../execution/SkipTaskWithNoActionsExecuter.java   |    0
 .../tasks/execution/SkipUpToDateTaskExecuter.java  |   89 ++
 .../internal/tasks/execution/TaskValidator.java    |    0
 .../tasks/execution/ValidatingTaskExecuter.java    |    0
 .../tasks/options/AbstractOptionElement.java       |    0
 .../internal/tasks/options/FieldOptionElement.java |    0
 .../tasks/options/InstanceOptionDescriptor.java    |    0
 .../tasks/options/MethodOptionElement.java         |    0
 .../gradle/api/internal/tasks/options/Option.java  |    0
 .../internal/tasks/options/OptionDescriptor.java   |    0
 .../api/internal/tasks/options/OptionElement.java  |    0
 .../api/internal/tasks/options/OptionReader.java   |    0
 .../tasks/options/OptionValidationException.java   |    0
 .../options/OptionValueNotationParserFactory.java  |    0
 .../api/internal/tasks/options/OptionValues.java   |   28 +
 .../java/org/gradle/api/invocation/Gradle.java     |  289 ++++
 .../org/gradle/api/invocation/package-info.java    |    0
 .../org/gradle/api/package-info.java               |    0
 .../org/gradle/api/plugins/AppliedPlugin.java      |    0
 .../java/org/gradle/api/plugins/Convention.java    |   63 +
 .../gradle/api/plugins/DeferredConfigurable.java   |    0
 .../org/gradle/api/plugins/ExtensionAware.java     |   89 ++
 .../org/gradle/api/plugins/ExtensionContainer.java |  107 ++
 .../api/plugins/ExtraPropertiesExtension.java      |  181 +++
 .../gradle/api/plugins/InvalidPluginException.java |    0
 .../api/plugins/ObjectConfigurationAction.java     |    0
 .../org/gradle/api/plugins/PluginAware.java        |    0
 .../org/gradle/api/plugins/PluginCollection.java   |    0
 .../org/gradle/api/plugins/PluginContainer.java    |    0
 .../api/plugins/PluginInstantiationException.java  |    0
 .../org/gradle/api/plugins/PluginManager.java      |    0
 .../gradle/api/plugins/UnknownPluginException.java |    0
 .../org/gradle/api/plugins/package-info.java       |    0
 .../org/gradle/api/resources/ReadableResource.java |    0
 .../org/gradle/api/resources/Resource.java         |    0
 .../org/gradle/api/resources/ResourceHandler.java  |    0
 .../org/gradle/api/resources/TextResource.java     |   95 ++
 .../gradle/api/resources/TextResourceFactory.java  |    0
 .../internal/ReadableResourceInternal.java         |    0
 .../resources/internal/TextResourceInternal.java   |    0
 .../org/gradle/api/resources/package-info.java     |    0
 .../org/gradle/api/specs/package-info.java         |    0
 .../org/gradle/api/tasks/AbstractCopyTask.java     |  485 +++++++
 .../org/gradle/api/tasks/AbstractExecTask.java     |  290 ++++
 .../org/gradle/api/tasks/AntBuilderAware.java      |    0
 .../java/org/gradle/api/tasks/CacheableTask.java   |   39 +
 .../tasks/CompatibilityAdapterForTaskInputs.java   |   50 +
 .../tasks/CompatibilityAdapterForTaskOutputs.java  |   49 +
 .../main/java/org/gradle/api/tasks/Console.java    |   40 +
 .../org/gradle/api/tasks/Copy.java                 |    0
 .../src/main/java/org/gradle/api/tasks/Delete.java |  137 ++
 .../org/gradle/api/tasks/Exec.java                 |    0
 .../java/org/gradle/api/tasks/GradleBuild.java     |  126 ++
 .../org/gradle/api/tasks/Input.java                |    0
 .../org/gradle/api/tasks/InputDirectory.java       |    0
 .../org/gradle/api/tasks/InputFile.java            |    0
 .../org/gradle/api/tasks/InputFiles.java           |    0
 .../main/java/org/gradle/api/tasks/Internal.java   |   42 +
 .../main/java/org/gradle/api/tasks/JavaExec.java   |  479 +++++++
 .../org/gradle/api/tasks/Nested.java               |    0
 .../org/gradle/api/tasks/Optional.java             |    0
 .../java/org/gradle/api/tasks/OrderSensitive.java  |   40 +
 .../org/gradle/api/tasks/OutputDirectories.java    |   37 +
 .../org/gradle/api/tasks/OutputDirectory.java      |    0
 .../org/gradle/api/tasks/OutputFile.java           |    0
 .../java/org/gradle/api/tasks/OutputFiles.java     |   37 +
 .../org/gradle/api/tasks/ParallelizableTask.java   |    0
 .../java/org/gradle/api/tasks/PathSensitive.java   |   38 +
 .../java/org/gradle/api/tasks/PathSensitivity.java |   48 +
 .../org/gradle/api/tasks/SkipWhenEmpty.java        |    0
 .../main/java/org/gradle/api/tasks/SourceTask.java |  180 +++
 .../org/gradle/api/tasks/StopActionException.java  |    0
 .../gradle/api/tasks/StopExecutionException.java   |    0
 .../src/main/java/org/gradle/api/tasks/Sync.java   |  139 ++
 .../org/gradle/api/tasks/TaskAction.java           |    0
 .../java/org/gradle/api/tasks/TaskCaching.java     |   47 +
 .../org/gradle/api/tasks/TaskCollection.java       |    0
 .../org/gradle/api/tasks/TaskContainer.java        |    0
 .../org/gradle/api/tasks/TaskDependency.java       |    0
 .../gradle/api/tasks/TaskExecutionException.java   |    0
 .../gradle/api/tasks/TaskFilePropertyBuilder.java  |   36 +
 .../api/tasks/TaskInputFilePropertyBuilder.java    |  201 +++
 .../main/java/org/gradle/api/tasks/TaskInputs.java |  149 ++
 .../api/tasks/TaskInstantiationException.java      |    0
 .../api/tasks/TaskOutputFilePropertyBuilder.java   |  120 ++
 .../java/org/gradle/api/tasks/TaskOutputs.java     |  106 ++
 .../org/gradle/api/tasks/TaskPropertyBuilder.java  |   38 +
 .../java/org/gradle/api/tasks/TaskReference.java   |   27 +
 .../org/gradle/api/tasks/TaskState.java            |    0
 .../gradle/api/tasks/TaskValidationException.java  |    0
 .../org/gradle/api/tasks/VerificationTask.java     |    0
 .../org/gradle/api/tasks/WorkResult.java           |    0
 .../java/org/gradle/api/tasks/ant/AntTarget.java   |   92 ++
 .../org/gradle/api/tasks/ant/package-info.java     |    0
 .../api/tasks/bundling/AbstractArchiveTask.java    |  211 +++
 .../org/gradle/api/tasks/bundling/Compression.java |    0
 .../java/org/gradle/api/tasks/bundling/Tar.java    |   77 +
 .../java/org/gradle/api/tasks/bundling/Zip.java    |  144 ++
 .../api/tasks/bundling/ZipEntryCompression.java    |    0
 .../bundling/internal/Zip64RequiredException.java  |    0
 .../gradle/api/tasks/bundling/package-info.java    |    0
 .../tasks/incremental/IncrementalTaskInputs.java   |    0
 .../api/tasks/incremental/InputFileDetails.java    |    0
 .../gradle/api/tasks/incremental/package-info.java |    0
 .../org/gradle/api/tasks/package-info.java         |    0
 .../gradle/api/tasks/util/PatternFilterable.java   |    0
 .../java/org/gradle/api/tasks/util/PatternSet.java |  318 +++++
 .../util/internal/CachingPatternSpecFactory.java   |    0
 .../internal/PatternSetAntBuilderDelegate.java     |  103 ++
 .../api/tasks/util/internal/PatternSets.java       |    0
 .../tasks/util/internal/PatternSpecFactory.java    |    0
 .../org/gradle/api/tasks/util/package-info.java    |    0
 .../org/gradle/cache/CacheAccess.java              |    0
 .../org/gradle/cache/CacheBuilder.java             |    0
 .../org/gradle/cache/CacheOpenException.java       |    0
 .../org/gradle/cache/CacheRepository.java          |    0
 .../org/gradle/cache/CacheValidator.java           |    0
 .../org/gradle/cache/PersistentCache.java          |    0
 .../org/gradle/cache/PersistentIndexedCache.java   |    0
 .../cache/PersistentIndexedCacheParameters.java    |    0
 .../org/gradle/cache/PersistentStateCache.java     |    0
 .../org/gradle/cache/PersistentStore.java          |    0
 .../gradle/cache/internal/AbstractFileAccess.java  |   32 +
 .../gradle/cache/internal/CacheCoordinator.java    |    0
 .../org/gradle/cache/internal/CacheDecorator.java  |    0
 .../org/gradle/cache/internal/CacheFactory.java    |    0
 .../cache/internal/CacheInitializationAction.java  |    0
 .../cache/internal/CacheRepositoryServices.java    |   42 +
 .../gradle/cache/internal/CacheScopeMapping.java   |    0
 .../gradle/cache/internal/DefaultCacheAccess.java  |    0
 .../gradle/cache/internal/DefaultCacheFactory.java |  190 +++
 .../cache/internal/DefaultCacheRepository.java     |    0
 .../cache/internal/DefaultCacheScopeMapping.java   |   77 +
 .../cache/internal/DefaultFileLockManager.java     |  348 +++++
 ...aultMultiProcessSafePersistentIndexedCache.java |    0
 .../internal/DefaultPersistentDirectoryCache.java  |  104 ++
 .../internal/DefaultPersistentDirectoryStore.java  |  116 ++
 .../internal/DefaultProcessMetaDataProvider.java   |    0
 .../org/gradle/cache/internal/FileAccess.java      |    0
 .../internal/FileIntegrityViolationException.java  |    0
 ...onSuppressingPersistentStateCacheDecorator.java |    0
 .../java/org/gradle/cache/internal/FileLock.java   |   57 +
 .../cache/internal/FileLockCommunicator.java       |   96 ++
 .../org/gradle/cache/internal/FileLockManager.java |    0
 .../cache/internal/GracefullyStoppedException.java |    0
 .../internal/InsufficientLockModeException.java    |    0
 .../cache/internal/LockTimeoutException.java       |   64 +
 .../cache/internal/MapBackedInMemoryStore.java     |   98 ++
 .../MultiProcessSafePersistentIndexedCache.java    |    0
 .../gradle/cache/internal/OnDemandFileAccess.java  |    0
 .../cache/internal/ProcessMetaDataProvider.java    |    0
 .../internal/ReferencablePersistentCache.java      |    0
 .../gradle/cache/internal/SimpleStateCache.java    |  105 ++
 .../cache/internal/UnitOfWorkParticipant.java      |    0
 .../btree/BTreePersistentIndexedCache.java         |  696 +++++++++
 .../org/gradle/cache/internal/btree/Block.java     |   59 +
 .../gradle/cache/internal/btree/BlockPayload.java  |   51 +
 .../gradle/cache/internal/btree/BlockPointer.java  |    0
 .../gradle/cache/internal/btree/BlockStore.java    |    0
 .../org/gradle/cache/internal/btree/ByteInput.java |   75 +
 .../gradle/cache/internal/btree/ByteOutput.java    |   75 +
 .../cache/internal/btree/CachingBlockStore.java    |    0
 .../internal/btree/CorruptedCacheException.java    |    0
 .../cache/internal/btree/FileBackedBlockStore.java |  248 ++++
 .../cache/internal/btree/FreeListBlockStore.java   |  271 ++++
 .../org/gradle/cache/internal/btree/KeyHasher.java |   76 +
 .../cache/internal/btree/StateCheckBlockStore.java |    0
 .../cacheops/CacheAccessOperationsStack.java       |    0
 .../cache/internal/cacheops/CacheOperation.java    |    0
 .../internal/cacheops/CacheOperationStack.java     |    0
 .../filelock/DefaultLockStateSerializer.java       |   95 ++
 .../cache/internal/filelock/LockFileAccess.java    |    0
 .../gradle/cache/internal/filelock/LockInfo.java   |    0
 .../cache/internal/filelock/LockInfoAccess.java    |    0
 .../internal/filelock/LockInfoSerializer.java      |    0
 .../cache/internal/filelock/LockOptions.java       |    0
 .../internal/filelock/LockOptionsBuilder.java      |    0
 .../gradle/cache/internal/filelock/LockState.java  |   38 +
 .../cache/internal/filelock/LockStateAccess.java   |    0
 .../internal/filelock/LockStateSerializer.java     |    0
 .../filelock/Version1LockStateSerializer.java      |   76 +
 .../DefaultFileLockContentionHandler.java          |  160 +++
 .../locklistener/FileLockContentionHandler.java    |    0
 .../org/gradle/configuration/BuildConfigurer.java  |    0
 .../configuration/DefaultBuildConfigurer.java      |   64 +
 .../gradle/configuration/DefaultImportsReader.java |    0
 .../configuration/DefaultInitScriptProcessor.java  |    0
 .../configuration/DefaultScriptPluginFactory.java  |  213 +++
 .../gradle/configuration/DefaultScriptTarget.java  |   76 +
 .../configuration/GradleLauncherMetaData.java      |    0
 .../org/gradle/configuration/ImportsReader.java    |    0
 .../gradle/configuration/InitScriptProcessor.java  |    0
 .../org/gradle/configuration/InitScriptTarget.java |    0
 .../InitialPassSettingScriptTarget.java            |   37 +
 .../gradle/configuration/ProjectScriptTarget.java  |   80 ++
 .../org/gradle/configuration/ScriptPlugin.java     |    0
 .../gradle/configuration/ScriptPluginFactory.java  |    0
 .../configuration/ScriptPluginFactoryProvider.java |   40 +
 .../configuration/ScriptPluginFactorySelector.java |   82 ++
 .../org/gradle/configuration/ScriptTarget.java     |   56 +
 .../gradle/configuration/SettingScriptTarget.java  |    0
 .../project/BuildScriptProcessor.java              |    0
 .../project/ConfigureActionsProjectEvaluator.java  |    0
 ...DefaultProjectConfigurationActionContainer.java |   45 +
 .../project/DelayedConfigurationActions.java       |    0
 .../project/LifecycleProjectEvaluator.java         |    0
 .../project/PluginsProjectConfigureActions.java    |   35 +
 .../ProjectConfigurationActionContainer.java       |    0
 .../project/ProjectConfigureAction.java            |    0
 .../configuration/project/ProjectEvaluator.java    |    0
 .../internal/DefaultDeploymentRegistry.java        |    0
 .../deployment/internal/DeploymentHandle.java      |    0
 .../deployment/internal/DeploymentRegistry.java    |    0
 .../gradle/execution/BuildConfigurationAction.java |    0
 .../BuildConfigurationActionExecuter.java          |    0
 .../org/gradle/execution/BuildExecuter.java        |    0
 .../org/gradle/execution/BuildExecutionAction.java |    0
 .../gradle/execution/BuildExecutionContext.java    |    0
 .../execution/CancellableOperationManager.java     |    0
 .../DefaultBuildConfigurationActionExecuter.java   |    0
 .../org/gradle/execution/DefaultBuildExecuter.java |    0
 .../DefaultCancellableOperationManager.java        |    0
 .../DefaultTasksBuildExecutionAction.java          |    0
 .../execution/DryRunBuildExecutionAction.java      |    0
 ...ludedTaskFilteringBuildConfigurationAction.java |    0
 .../gradle/execution/MultipleBuildFailures.java    |    0
 .../PassThruCancellableOperationManager.java       |    0
 .../org/gradle/execution/ProjectConfigurer.java    |    0
 .../execution/SelectedTaskExecutionAction.java     |    0
 .../org/gradle/execution/TaskFailureHandler.java   |    0
 .../org/gradle/execution/TaskGraphExecuter.java    |    0
 .../org/gradle/execution/TaskNameResolver.java     |    0
 .../TaskNameResolvingBuildConfigurationAction.java |    0
 .../gradle/execution/TaskPathProjectEvaluator.java |    0
 .../gradle/execution/TaskSelectionException.java   |   39 +
 .../org/gradle/execution/TaskSelectionResult.java  |    0
 .../org/gradle/execution/TaskSelector.java         |    0
 .../commandline/CommandLineTaskConfigurer.java     |    0
 .../commandline/CommandLineTaskParser.java         |    0
 .../commandline/TaskConfigurationException.java    |   44 +
 .../taskgraph/AbstractTaskPlanExecutor.java        |   82 ++
 .../taskgraph/DefaultTaskExecutionPlan.java        |  767 ++++++++++
 .../taskgraph/DefaultTaskGraphExecuter.java        |  241 ++++
 .../taskgraph/DefaultTaskPlanExecutor.java         |   35 +
 .../taskgraph/ParallelTaskPlanExecutor.java        |   65 +
 .../execution/taskgraph/TaskDependencyGraph.java   |    0
 .../execution/taskgraph/TaskExecutionPlan.java     |    0
 .../org/gradle/execution/taskgraph/TaskInfo.java   |    0
 .../execution/taskgraph/TaskPlanExecutor.java      |    0
 .../taskgraph/TaskPlanExecutorFactory.java         |   43 +
 .../taskpath/ProjectFinderByTaskPath.java          |    0
 .../execution/taskpath/ResolvedTaskPath.java       |    0
 .../execution/taskpath/TaskPathResolver.java       |    0
 .../groovy/scripts/AbstractUriScriptSource.java    |   63 +
 .../org/gradle/groovy/scripts/BasicScript.java     |   87 ++
 .../gradle/groovy/scripts/CachingScriptSource.java |    0
 .../org/gradle/groovy/scripts/DefaultScript.java   |  262 ++++
 .../scripts/DefaultScriptCompilerFactory.java      |    0
 .../groovy/scripts/DelegatingScriptSource.java     |    0
 .../scripts/NonExistentFileScriptSource.java       |    0
 .../java/org/gradle/groovy/scripts/Script.java     |   59 +
 .../groovy/scripts/ScriptCompilationException.java |    0
 .../org/gradle/groovy/scripts/ScriptCompiler.java  |    0
 .../groovy/scripts/ScriptCompilerFactory.java      |    0
 .../groovy/scripts/ScriptExecutionListener.java    |    0
 .../org/gradle/groovy/scripts/ScriptRunner.java    |    0
 .../org/gradle/groovy/scripts/ScriptSource.java    |    0
 .../gradle/groovy/scripts/StringScriptSource.java  |    0
 .../org/gradle/groovy/scripts/UriScriptSource.java |    0
 ...ildScopeInMemoryCachingScriptClassCompiler.java |    0
 .../groovy/scripts/internal/BuildScriptData.java   |    0
 .../internal/BuildScriptDataSerializer.java        |    0
 .../scripts/internal/BuildScriptTransformer.java   |   61 +
 .../groovy/scripts/internal/CompileOperation.java  |    0
 .../groovy/scripts/internal/CompiledScript.java    |    0
 .../CrossBuildInMemoryCachingScriptClassCache.java |   61 +
 .../internal/DefaultScriptCompilationHandler.java  |  347 +++++
 .../internal/DefaultScriptRunnerFactory.java       |   99 ++
 .../internal/FactoryBackedCompileOperation.java    |    0
 .../FileCacheBackedScriptClassCompiler.java        |  403 ++++++
 .../internal/FilteringScriptTransformer.java       |    0
 .../scripts/internal/FixMainScriptTransformer.java |    0
 .../scripts/internal/GradleResolveVisitor.java     |    0
 .../ImperativeStatementDetectingTransformer.java   |    0
 .../internal/InitialPassStatementTransformer.java  |  129 ++
 .../RegistryAwareClassLoaderHierarchyHasher.java   |   56 +
 .../scripts/internal/RemappingScriptSource.java    |    0
 .../groovy/scripts/internal/ScriptCacheKey.java    |    0
 .../scripts/internal/ScriptClassCompiler.java      |    0
 .../scripts/internal/ScriptCompilationHandler.java |    0
 .../scripts/internal/ScriptRunnerFactory.java      |    0
 .../internal/StatementLabelsScriptTransformer.java |    0
 .../scripts/internal/SubsetScriptTransformer.java  |    0
 .../internal/TaskDefinitionScriptTransformer.java  |    0
 .../gradle/initialization/AbstractProjectSpec.java |    0
 .../initialization/BuildCancellationToken.java     |    0
 .../gradle/initialization/BuildClientMetaData.java |    0
 .../initialization/BuildCompletionListener.java    |    0
 .../gradle/initialization/BuildEventConsumer.java  |   25 +
 .../initialization/BuildFileProjectSpec.java       |    0
 .../org/gradle/initialization/BuildIdentity.java   |   23 +
 .../initialization/BuildLayoutParameters.java      |   86 ++
 .../org/gradle/initialization/BuildLoader.java     |    0
 .../gradle/initialization/BuildRequestContext.java |    0
 .../initialization/BuildRequestMetaData.java       |    0
 .../gradle/initialization/ClassLoaderRegistry.java |    0
 .../initialization/ClassLoaderScopeRegistry.java   |    0
 .../initialization/CompositeInitScriptFinder.java  |    0
 .../DefaultBuildCancellationToken.java             |    0
 .../initialization/DefaultBuildIdentity.java       |   32 +
 .../initialization/DefaultBuildRequestContext.java |    0
 .../DefaultBuildRequestMetaData.java               |    0
 .../initialization/DefaultClassLoaderRegistry.java |   67 +
 .../DefaultClassLoaderScopeRegistry.java           |    0
 .../DefaultCommandLineConverter.java               |  224 +++
 .../initialization/DefaultExceptionAnalyser.java   |    0
 .../initialization/DefaultGradleLauncher.java      |  230 +++
 .../DefaultGradleLauncherFactory.java              |  170 +++
 .../DefaultGradlePropertiesLoader.java             |  115 ++
 .../initialization/DefaultJdkToolsInitializer.java |    0
 .../initialization/DefaultProjectDescriptor.java   |  147 ++
 .../DefaultProjectDescriptorRegistry.java          |    0
 .../gradle/initialization/DefaultProjectSpec.java  |    0
 .../org/gradle/initialization/DefaultSettings.java |  265 ++++
 .../initialization/DefaultSettingsFinder.java      |    0
 .../initialization/DefaultSettingsLoader.java      |   97 ++
 .../DefaultSettingsLoaderFactory.java              |   63 +
 .../initialization/DependencyResolutionLogger.java |   56 +
 .../initialization/DirectoryInitScriptFinder.java  |    0
 .../DistributionInitScriptFinder.java              |    0
 .../initialization/FlatClassLoaderRegistry.java    |    0
 .../org/gradle/initialization/GradleLauncher.java  |   78 +
 .../initialization/GradleLauncherFactory.java      |   55 +
 .../initialization/IGradlePropertiesLoader.java    |    0
 .../org/gradle/initialization/ISettingsFinder.java |    0
 .../initialization/IncludedBuildExecuter.java      |   23 +
 .../initialization/IncludedBuildFactory.java       |   25 +
 .../org/gradle/initialization/IncludedBuilds.java  |   24 +
 .../java/org/gradle/initialization/InitScript.java |   34 +
 .../gradle/initialization/InitScriptFinder.java    |    0
 .../gradle/initialization/InitScriptHandler.java   |    0
 .../initialization/InitialPassSettingsScript.java  |   64 +
 .../initialization/InstantiatingBuildLoader.java   |    0
 .../gradle/initialization/JdkToolsInitializer.java |    0
 .../initialization/LayoutCommandLineConverter.java |    0
 .../MixInLegacyTypesClassLoader.java               |  358 +++++
 .../initialization/ModelConfigurationListener.java |    0
 .../MultipleBuildFailuresExceptionAnalyser.java    |    0
 .../gradle/initialization/NestedBuildTracker.java  |    0
 .../initialization/NoOpBuildEventConsumer.java     |    0
 .../initialization/NotifyingSettingsLoader.java    |   39 +
 .../initialization/NotifyingSettingsProcessor.java |    0
 .../initialization/ProjectAccessListener.java      |    0
 .../initialization/ProjectDescriptorRegistry.java  |    0
 .../ProjectDirectoryProjectSpec.java               |    0
 .../ProjectPropertySettingBuildLoader.java         |    0
 .../org/gradle/initialization/ProjectSpec.java     |    0
 .../org/gradle/initialization/ProjectSpecs.java    |    0
 .../PropertiesLoadingSettingsProcessor.java        |    0
 .../gradle/initialization/ReportedException.java   |    0
 .../ScriptEvaluatingSettingsProcessor.java         |   75 +
 .../org/gradle/initialization/SettingsFactory.java |   51 +
 .../org/gradle/initialization/SettingsLoader.java  |    0
 .../initialization/SettingsLoaderFactory.java      |   29 +
 .../gradle/initialization/SettingsLocation.java    |    0
 .../gradle/initialization/SettingsProcessor.java   |    0
 .../org/gradle/initialization/SettingsScript.java  |   24 +
 .../StackTraceSanitizingExceptionAnalyser.java     |    0
 .../initialization/UserHomeInitScriptFinder.java   |    0
 .../buildsrc/BuildSourceBuilder.java               |  116 ++
 .../buildsrc/BuildSrcBuildListenerFactory.java     |    0
 .../buildsrc/BuildSrcUpdateFactory.java            |    0
 .../gradle/initialization/layout/BuildLayout.java  |    0
 .../layout/BuildLayoutConfiguration.java           |    0
 .../initialization/layout/BuildLayoutFactory.java  |    0
 .../internal/DefaultTaskExecutionRequest.java      |    0
 .../AuthenticationSupportedInternal.java           |   41 +
 .../authentication/AbstractAuthentication.java     |    0
 .../authentication/AllSchemesAuthentication.java   |    0
 .../authentication/AuthenticationInternal.java     |    0
 .../DefaultAuthenticationContainer.java            |    0
 .../buildevents/BuildExceptionReporter.java        |  261 ++++
 .../gradle/internal/buildevents/BuildLogger.java   |   82 ++
 .../internal/buildevents/BuildResultLogger.java    |   53 +
 .../internal/buildevents/TaskExecutionLogger.java  |   72 +
 .../classpath/CachedClasspathTransformer.java      |   36 +
 .../DefaultCachedClasspathTransformer.java         |  122 ++
 .../composite/CompositeBuildSettingsLoader.java    |   90 ++
 .../composite/CompositeContextBuilder.java         |   26 +
 .../credentials/DefaultAwsCredentials.java         |    0
 .../environment/GradleBuildEnvironment.java        |    0
 .../exceptions/FailureResolutionAware.java         |   28 +
 .../exceptions/LocationAwareException.java         |  171 +++
 .../ScriptUsageLocationReporter.java               |    0
 .../java/org/gradle/internal/file/JarCache.java    |  103 ++
 .../gradle/internal/filewatch/ChangeReporter.java  |   94 ++
 .../DefaultFileSystemChangeWaiterFactory.java      |    0
 .../filewatch/DefaultFileWatcherFactory.java       |   62 +
 .../internal/filewatch/FileSystemChangeWaiter.java |    0
 .../filewatch/FileSystemChangeWaiterFactory.java   |    0
 .../org/gradle/internal/filewatch/FileWatcher.java |    0
 .../internal/filewatch/FileWatcherEvent.java       |    0
 .../filewatch/FileWatcherEventListener.java        |    0
 .../internal/filewatch/FileWatcherFactory.java     |    0
 .../internal/filewatch/FileWatcherListener.java    |    0
 .../filewatch/jdk7/Jdk7FileWatcherFactory.java     |    0
 .../filewatch/jdk7/WatchPointsRegistry.java        |    0
 .../jdk7/WatchServiceFileWatcherBacking.java       |    0
 .../filewatch/jdk7/WatchServicePoller.java         |    0
 .../filewatch/jdk7/WatchServiceRegistrar.java      |  279 ++++
 .../internal/graph/CachingDirectedGraphWalker.java |    0
 .../org/gradle/internal/graph/DirectedGraph.java   |    0
 .../internal/graph/DirectedGraphRenderer.java      |   80 ++
 .../graph/DirectedGraphWithEdgeValues.java         |    0
 .../org/gradle/internal/graph/GraphAggregator.java |    0
 .../gradle/internal/graph/GraphNodeRenderer.java   |   22 +
 .../org/gradle/internal/graph/GraphRenderer.java   |   69 +
 .../org/gradle/internal/html/SimpleHtmlWriter.java |    0
 .../installation/CurrentGradleInstallation.java    |    0
 .../CurrentGradleInstallationLocator.java          |    0
 .../internal/installation/GradleInstallation.java  |    0
 .../GradleRuntimeShadedJarDetector.java            |   89 ++
 .../gradle/internal/invocation/BuildAction.java    |    0
 .../internal/invocation/BuildActionRunner.java     |    0
 .../internal/invocation/BuildController.java       |    0
 .../internal/metaobject/AbstractDynamicObject.java |  198 +++
 .../internal/metaobject/BeanDynamicObject.java     |  516 +++++++
 .../metaobject/CompositeDynamicObject.java         |  102 ++
 .../internal/metaobject/ConfigureDelegate.java     |  139 ++
 .../gradle/internal/metaobject/DynamicObject.java  |   95 ++
 .../internal/metaobject/GetPropertyResult.java     |   38 +
 .../internal/metaobject/InvokeMethodResult.java    |   35 +
 ...xInClosurePropertiesAsMethodsDynamicObject.java |   50 +
 .../internal/metaobject/SetPropertyResult.java     |   32 +
 .../operations/logging/BuildOperationLogInfo.java  |    0
 .../operations/logging/BuildOperationLogger.java   |    0
 .../logging/BuildOperationLoggerFactory.java       |    0
 .../logging/DefaultBuildOperationLogger.java       |  116 ++
 .../DefaultBuildOperationLoggerFactory.java        |   61 +
 .../internal/progress/BuildOperationDetails.java   |    0
 .../internal/progress/BuildOperationExecutor.java  |    0
 .../internal/progress/BuildOperationInternal.java  |    0
 .../internal/progress/BuildProgressFilter.java     |    0
 .../internal/progress/BuildProgressLogger.java     |  108 ++
 .../progress/DefaultBuildOperationExecutor.java    |  123 ++
 .../internal/progress/InternalBuildListener.java   |    0
 .../gradle/internal/progress/LoggerProvider.java   |   30 +
 .../internal/progress/OperationIdGenerator.java    |    0
 .../gradle/internal/progress/OperationResult.java  |    0
 .../internal/progress/OperationStartEvent.java     |    0
 .../progress/PercentageProgressFormatter.java      |   44 +
 .../internal/progress/ProgressFormatter.java       |    0
 .../internal/progress/ProgressLoggerProvider.java  |   33 +
 .../internal/progress/SimpleProgressFormatter.java |    0
 .../local/GroupedAndNamedUniqueFileStore.java      |   80 ++
 .../internal/resource/local/PathKeyFileStore.java  |    0
 .../local/PathNormalisingKeyFileStore.java         |    0
 .../resource/local/UniquePathKeyFileStore.java     |    0
 .../scopes/BuildScopeServiceRegistryFactory.java   |    0
 .../service/scopes/BuildScopeServices.java         |  438 ++++++
 .../service/scopes/BuildSessionScopeServices.java  |  112 ++
 .../service/scopes/GlobalScopeServices.java        |  369 +++++
 .../service/scopes/GradleScopeServices.java        |  162 +++
 .../service/scopes/PluginServiceRegistry.java      |    0
 .../service/scopes/ProjectScopeServices.java       |  225 +++
 .../service/scopes/ServiceRegistryFactory.java     |    0
 .../service/scopes/SettingsScopeServices.java      |   56 +
 .../service/scopes/TaskExecutionServices.java      |  184 +++
 .../org/gradle/internal/text/TreeFormatter.java    |  146 ++
 .../CharSequenceNotationConverter.java             |    0
 .../typeconversion/CharSequenceNotationParser.java |    0
 .../ClosureToSpecNotationConverter.java            |    0
 .../typeconversion/CompositeNotationConverter.java |    0
 .../typeconversion/DefaultTypeConverter.java       |    0
 .../EnumFromCharSequenceNotationParser.java        |    0
 .../ErrorHandlingNotationParser.java               |    0
 .../typeconversion/FlatteningNotationParser.java   |    0
 .../typeconversion/JustReturningConverter.java     |    0
 .../org/gradle/internal/typeconversion/MapKey.java |    0
 .../typeconversion/MapNotationConverter.java       |    0
 .../typeconversion/NormalizedTimeUnit.java         |    0
 .../typeconversion/NotationConvertResult.java      |    0
 .../internal/typeconversion/NotationConverter.java |    0
 .../NotationConverterToNotationParserAdapter.java  |    0
 .../internal/typeconversion/NotationParser.java    |    0
 .../typeconversion/NotationParserBuilder.java      |    0
 .../internal/typeconversion/TimeUnitsParser.java   |    0
 .../TypeFilteringNotationConverter.java            |    0
 .../gradle/internal/typeconversion/TypeInfo.java   |    0
 .../typeconversion/TypedNotationConverter.java     |    0
 .../gradle/internal/xml/SimpleMarkupWriter.java    |    0
 .../org/gradle/internal/xml/SimpleXmlWriter.java   |    0
 .../org/gradle/internal/xml/XmlTransformer.java    |  368 +++++
 .../org/gradle/internal/xml/XmlValidation.java     |  148 ++
 .../java/org/gradle/invocation/DefaultGradle.java  |  296 ++++
 .../org/gradle/listener/ActionBroadcast.java       |    0
 .../ClosureBackedMethodInvocationDispatch.java     |   71 +
 .../collection/internal/BridgedCollections.java    |    0
 .../{groovy => java}/org/gradle/package-info.java  |    0
 .../plugin/internal/InvalidPluginIdException.java  |    0
 .../org/gradle/plugin/internal/PluginId.java       |    0
 .../plugin/repository/GradlePluginPortal.java      |   26 +
 .../plugin/repository/IvyPluginRepository.java     |   47 +
 .../plugin/repository/MavenPluginRepository.java   |   47 +
 .../plugin/repository/PluginRepositoriesSpec.java  |   52 +
 .../gradle/plugin/repository/PluginRepository.java |   31 +
 .../internal/DefaultPluginRepositoriesSpec.java    |   60 +
 .../internal/PluginRepositoryFactory.java          |   50 +
 .../internal/PluginRepositoryRegistry.java         |   28 +
 .../org/gradle/plugin/repository/package-info.java |   21 +
 .../gradle/plugin/use/PluginDependenciesSpec.java  |  120 ++
 .../gradle/plugin/use/PluginDependencySpec.java    |   78 +
 .../plugin/use/internal/DefaultPluginRequest.java  |  116 ++
 .../plugin/use/internal/DefaultPluginRequests.java |    0
 .../use/internal/InjectedPluginClasspath.java      |    0
 .../internal/InvalidPluginRequestException.java    |    0
 .../gradle/plugin/use/internal/PluginRequest.java  |   36 +
 .../use/internal/PluginRequestApplicator.java      |    0
 .../use/internal/PluginRequestCollector.java       |  110 ++
 .../gradle/plugin/use/internal/PluginRequests.java |    0
 .../use/internal/PluginRequestsSerializer.java     |   55 +
 .../PluginUseScriptBlockMetadataExtractor.java     |  166 +++
 .../org/gradle/plugin/use/package-info.java        |    0
 .../main/java/org/gradle/process/JavaExecSpec.java |  102 ++
 .../java/org/gradle/process/JavaForkOptions.java   |  229 +++
 .../internal/AbstractExecHandleBuilder.java        |  153 ++
 .../process/internal/BadExitCodeException.java     |    0
 .../gradle/process/internal/CurrentProcess.java    |    0
 .../gradle/process/internal/DefaultExecAction.java |   35 +
 .../process/internal/DefaultExecActionFactory.java |   47 +
 .../gradle/process/internal/DefaultExecHandle.java |  386 +++++
 .../process/internal/DefaultExecHandleBuilder.java |  145 ++
 .../process/internal/DefaultJavaExecAction.java    |    0
 .../process/internal/DefaultJavaForkOptions.java   |    0
 .../internal/DefaultProcessForkOptions.java        |    0
 .../org/gradle/process/internal/ExecAction.java    |    0
 .../gradle/process/internal/ExecActionFactory.java |    0
 .../gradle/process/internal/ExecHandleRunner.java  |    0
 .../internal/ExecHandleShutdownHookAction.java     |    0
 .../gradle/process/internal/JavaExecAction.java    |    0
 .../process/internal/JavaExecHandleBuilder.java    |  222 +++
 .../process/internal/JavaExecHandleFactory.java    |   21 +
 .../org/gradle/process/internal/JvmOptions.java    |  335 +++++
 .../process/internal/ProcessBuilderFactory.java    |    0
 .../gradle/process/internal/ProcessSettings.java   |    0
 .../org/gradle/process/internal/package.html       |    0
 .../shutdown/ShutdownHookActionRegister.java       |    0
 .../process/internal/streams/EncodedStream.java    |   86 ++
 .../internal/streams/ExecOutputHandleRunner.java   |    0
 .../process/internal/streams/SafeStreams.java      |    0
 .../process/internal/streams/StreamsForwarder.java |   80 ++
 .../process/internal/streams/StreamsHandler.java   |    0
 .../DefaultMultiRequestWorkerProcessBuilder.java   |  161 +++
 .../DefaultSingleRequestWorkerProcessBuilder.java  |  131 ++
 .../internal/worker/DefaultWorkerProcess.java      |  184 +++
 .../worker/DefaultWorkerProcessBuilder.java        |  174 +++
 .../worker/DefaultWorkerProcessFactory.java        |   81 ++
 .../process/internal/worker/GradleWorkerMain.java  |   74 +
 .../worker/MultiRequestWorkerProcessBuilder.java   |   35 +
 .../worker/SingleRequestWorkerProcessBuilder.java  |   31 +
 .../process/internal/worker/WorkerControl.java     |   31 +
 .../process/internal/worker/WorkerProcess.java     |   35 +
 .../internal/worker/WorkerProcessBuilder.java      |   61 +
 .../internal/worker/WorkerProcessContext.java      |   38 +
 .../internal/worker/WorkerProcessException.java    |   31 +
 .../internal/worker/WorkerProcessFactory.java      |   54 +
 .../internal/worker/WorkerProcessSettings.java     |   53 +
 .../worker/child/ActionExecutionWorker.java        |   82 ++
 ...ionClassesInSystemClassLoaderWorkerFactory.java |  161 +++
 .../worker/child/BootstrapSecurityManager.java     |   96 ++
 .../child/SystemApplicationClassLoaderWorker.java  |  112 ++
 .../internal/worker/child/WorkerContext.java       |   24 +
 .../internal/worker/child/WorkerFactory.java       |   31 +
 .../child/WorkerProcessClassPathProvider.java      |  192 +++
 .../process/internal/worker/request/Receiver.java  |  101 ++
 .../internal/worker/request/RequestProtocol.java   |   23 +
 .../internal/worker/request/ResponseProtocol.java  |   27 +
 .../internal/worker/request/WorkerAction.java      |  103 ++
 .../org/gradle/process/package-info.java           |    0
 .../main/java/org/gradle/profile/BuildProfile.java |  254 ++++
 .../org/gradle/profile/CompositeOperation.java     |    0
 .../org/gradle/profile/ContinuousOperation.java    |    0
 .../org/gradle/profile/Operation.java              |    0
 .../org/gradle/profile/ProfileEventAdapter.java    |  124 ++
 .../org/gradle/profile/ProfileListener.java        |    0
 .../org/gradle/profile/ProfileReportRenderer.java  |    0
 .../org/gradle/profile/ProjectProfile.java         |    0
 .../profile/ReportGeneratingProfileListener.java   |    0
 .../org/gradle/profile/TaskExecution.java          |    0
 .../org/gradle/reporting/CodePanelRenderer.java    |    0
 .../org/gradle/reporting/DurationFormatter.java    |    0
 .../org/gradle/reporting/HtmlPageBuilder.java      |    0
 .../org/gradle/reporting/HtmlReportBuilder.java    |    0
 .../org/gradle/reporting/HtmlReportRenderer.java   |    0
 .../org/gradle/reporting/ReportRenderer.java       |    0
 .../org/gradle/reporting/TabbedPageRenderer.java   |   96 ++
 .../java/org/gradle/reporting/TabsRenderer.java    |   68 +
 .../org/gradle/testfixtures/ProjectBuilder.java    |  114 ++
 .../internal/InMemoryCacheFactory.java             |    0
 .../internal/InMemoryIndexedCache.java             |    0
 .../testfixtures/internal/ProjectBuilderImpl.java  |  119 ++
 .../internal/TestBuildScopeServices.java           |    0
 .../internal/TestGlobalScopeServices.java          |    0
 .../org/gradle/testfixtures/package-info.java      |    0
 .../provider/model/ToolingModelBuilder.java        |   56 +
 .../model/ToolingModelBuilderRegistry.java         |    0
 .../provider/model/UnknownModelException.java      |    0
 .../DefaultToolingModelBuilderRegistry.java        |   74 +
 .../model/internal/LegacyConsumerInterface.java    |    0
 .../ProjectSensitiveToolingModelBuilder.java       |   41 +
 .../tooling/provider/model/package-info.java       |    0
 .../src/main/java/org/gradle/util/AntUtil.java     |   56 +
 .../gradle/util/BuildCommencedTimeProvider.java    |    0
 .../org/gradle/util/BulkReadInputStream.java       |    0
 .../org/gradle/util/ChangeListener.java            |    0
 .../{groovy => java}/org/gradle/util/Clock.java    |    0
 .../main/java/org/gradle/util/ConfigureUtil.java   |  162 +++
 .../src/main/java/org/gradle/util/DiffUtil.java    |   84 ++
 .../org/gradle/util/DisconnectableInputStream.java |    0
 .../java/org/gradle/util/DistributionLocator.java  |   51 +
 .../src/main/java/org/gradle/util/GFileUtils.java  |  298 ++++
 .../{groovy => java}/org/gradle/util/JarUtil.java  |    0
 .../org/gradle/util/NameMatcher.java               |    0
 .../org/gradle/util/NoOpChangeListener.java        |    0
 .../{groovy => java}/org/gradle/util/Path.java     |    0
 .../org/gradle/util/StdinSwapper.java              |    0
 .../{groovy => java}/org/gradle/util/Swapper.java  |    0
 .../org/gradle/util/TreeVisitor.java               |    0
 .../org/gradle/util/VersionNumber.java             |    0
 .../{groovy => java}/org/gradle/util/WrapUtil.java |    0
 .../gradle/util/internal/ArgumentsSplitter.java    |    0
 .../org/gradle/util/internal/Java9ClassReader.java |   40 +
 .../gradle/util/internal/LimitedDescription.java   |    0
 .../org/gradle/initialization/converted-types.txt  |  116 ++
 .../org/gradle/initialization/removed-types.txt    |   15 +
 .../org/gradle/BuildExceptionReporterTest.groovy   |  339 -----
 .../groovy/org/gradle/BuildResultLoggerTest.java   |   74 -
 .../groovy/org/gradle/StartParameterTest.groovy    |   38 +-
 .../org/gradle/TaskExecutionLoggerTest.groovy      |  110 --
 .../api/file/MicroBenchmarkPerformanceTest.groovy  |   11 +-
 .../org/gradle/api/file/ProjectCopySpecTest.groovy |   22 +-
 .../gradle/api/file/RelativePathSpockTest.groovy   |    4 +-
 .../api/internal/AbstractDynamicObjectTest.java    |   62 -
 .../AbstractNamedDomainObjectContainerTest.groovy  |   13 +-
 .../gradle/api/internal/AbstractTaskSpec.groovy    |   88 ++
 .../gradle/api/internal/AbstractTaskTest.groovy    |   84 --
 .../AsmBackedClassGeneratorGroovyTest.groovy       |   22 +-
 .../api/internal/AsmBackedClassGeneratorTest.java  |   27 +-
 .../api/internal/BeanWithDynamicProperties.groovy  |   46 +
 .../api/internal/ChainingTransformerTest.groovy    |   84 ++
 .../api/internal/ChainingTransformerTest.java      |  104 --
 .../api/internal/ConventionAwareHelperTest.java    |   13 +-
 .../DefaultDomainObjectCollectionTest.java         |   66 +-
 .../internal/DefaultNamedDomainObjectSetTest.java  |   15 +
 ...tPolymorphicDomainObjectContainerDslTest.groovy |   13 +-
 .../org/gradle/api/internal/DefaultTaskTest.groovy |  508 ++++---
 .../DependencyInjectingInstantiatorTest.groovy     |    2 +-
 .../DependencyInjectingServiceLoaderTest.groovy    |   81 ++
 .../api/internal/ExtensibleDynamicObjectTest.java  |   91 +-
 .../artifacts/DefaultExcludeRuleContainerTest.java |    2 +-
 .../artifacts/ProjectBackedModuleTest.groovy       |    6 +-
 .../DefaultProjectDependencyTest.groovy            |   11 +-
 .../DefaultSelfResolvingDependencyTest.java        |    2 +-
 .../publish/ArchivePublishArtifactTest.groovy      |   18 +-
 .../cache/GeneratedGradleJarCacheTest.groovy       |  117 ++
 .../DefaultTaskArtifactStateRepositoryTest.groovy  |  112 +-
 ...rtCircuitTaskArtifactStateRepositoryTest.groovy |   18 +-
 .../rules/FileSnapshotTaskStateChangesTest.groovy  |   87 --
 .../rules/TaskTypeTaskStateChangesTest.groovy      |  104 ++
 .../rules/TaskUpToDateStateTest.groovy             |   84 +-
 .../changedetection/state/CacheCapSizerTest.groovy |   25 +
 .../state/CachingFileSnapshotterTest.groovy        |    5 +-
 .../state/CachingTreeVisitorTest.groovy            |  140 --
 ...aultFileCollectionSnapshotSerializerTest.groovy |   64 +
 .../state/DefaultFileCollectionSnapshotTest.groovy |   86 ++
 .../DefaultFileCollectionSnapshotterTest.groovy    |  314 +---
 .../DefaultFileSnapshotterSerializerTest.groovy    |   41 -
 .../state/MinimalFileSetSnapshotterTest.groovy     |   15 +-
 ...putFilesCollectionSnapshotSerializerTest.groovy |   42 +
 .../state/OutputFilesSnapshotSerializerTest.groovy |   42 -
 .../TaskFilePropertyCompareStrategyTest.groovy     |  189 +++
 .../TaskFilePropertyPathSensitivityTest.groovy     |  147 ++
 .../classpath/DefaultModuleRegistryTest.groovy     |  140 +-
 .../coerce/StringToEnumTransformerTest.groovy      |   50 +-
 .../file/AbstractFileCollectionTest.groovy         |    8 +-
 .../file/AbstractFileTreeElementTest.groovy        |  127 ++
 .../internal/file/AbstractFileTreeElementTest.java |  143 --
 .../internal/file/CompositeFileCollectionTest.java |   44 +-
 .../api/internal/file/CompositeFileTreeTest.java   |   16 +-
 .../internal/file/DefaultFileOperationsTest.groovy |   18 +-
 .../api/internal/file/FileNormaliserTest.groovy    |   49 +
 .../internal/file/archive/TarCopyActionSpec.groovy |  170 +++
 .../internal/file/archive/TarCopyActionTest.java   |  246 ----
 .../DefaultConfigurableFileCollectionTest.java     |   22 +-
 .../DefaultConfigurableFileTreeTest.groovy         |    3 +-
 .../collections/DefaultDirectoryWalkerTest.groovy  |  265 ++++
 .../collections/DefaultDirectoryWalkerTest.java    |  394 ------
 .../jdk7/Jdk7DirectoryWalkerTest.groovy            |    1 -
 .../internal/file/copy/CopySpecMatchingTest.groovy |   92 +-
 .../internal/file/copy/DefaultCopySpecTest.groovy  |  551 +++----
 .../DuplicateHandlingCopyActionExecutorTest.groovy |    4 +-
 .../api/internal/file/copy/FilterChainTest.java    |  198 +--
 .../internal/file/copy/RenamingCopyActionTest.java |    4 +-
 .../api/internal/file/delete/DeleterTest.groovy    |    4 +-
 .../DefaultClassLoaderScopeTest.groovy             |    4 +-
 .../initialization/DefaultScriptHandlerTest.groovy |    2 +-
 .../loadercache/DefaultClassLoaderCacheTest.groovy |    4 +-
 .../loadercache/FileClassPathSnapshotter.java      |   58 +
 .../HashClassPathSnapshotterTest.groovy            |   29 +-
 .../internal/plugins/ExtensionContainerTest.groovy |    7 +
 .../ExtraPropertiesDynamicObjectAdapterTest.groovy |   26 +-
 .../project/DefaultAntBuilderFactoryTest.groovy    |   52 +-
 .../internal/project/DefaultAntBuilderTest.groovy  |  216 ++-
 .../project/DefaultIsolatedAntBuilderTest.groovy   |    8 +-
 .../project/DefaultProjectRegistryTest.java        |   23 +-
 .../api/internal/project/DefaultProjectTest.groovy |   47 +-
 .../DeferredProjectConfigurationTest.groovy        |   16 +-
 .../internal/project/NewDefaultProjectTest.groovy  |   58 +-
 .../project/ant/AntLoggingAdapterTest.groovy       |   92 ++
 .../antbuilder/AntBuilderMemoryLeakTest.groovy     |    8 +-
 .../AnnotationProcessingTaskFactoryTest.groovy     |  653 +++++++++
 .../AnnotationProcessingTaskFactoryTest.java       | 1231 ----------------
 .../taskfactory/AnnotationProcessingTasks.java     |  502 +++++++
 .../DefaultTaskClassInfoStoreTest.groovy           |  183 +++
 .../DependencyAutoWireTaskFactoryTest.java         |    4 +-
 .../project/taskfactory/TaskFactoryTest.groovy     |   11 +-
 .../resources/AbstractTextResourceTest.groovy      |   14 +-
 ...llectionBackedTarArchiveTextResourceTest.groovy |    2 -
 .../FileCollectionBackedTextResourceTest.groovy    |    4 +-
 ...llectionBackedZipArchiveTextResourceTest.groovy |    3 -
 .../resources/StringBackedTextResourceTest.groovy  |    2 -
 .../tasks/AbstractTaskPropertyBuilderTest.groovy   |   52 +
 .../internal/tasks/DefaultTaskInputsTest.groovy    |   90 +-
 .../internal/tasks/DefaultTaskOutputsTest.groovy   |  134 +-
 .../execution/ExecuteActionsTaskExecuterTest.java  |  144 +-
 .../execution/SkipCachedTaskExecuterTest.groovy    |  253 ++++
 .../SkipEmptySourceFilesTaskExecuterTest.groovy    |    4 +-
 .../execution/SkipUpToDateTaskExecuterTest.groovy  |    6 +-
 .../tasks/util/DefaultJavaForkOptionsTest.groovy   |   10 +-
 .../groovy/org/gradle/api/logging/LoggingTest.java |  123 --
 .../gradle/api/tasks/AbstractCopyTaskTest.groovy   |    7 +-
 .../groovy/org/gradle/api/tasks/CopyTest.groovy    |    6 +-
 .../groovy/org/gradle/api/tasks/DeleteTest.groovy  |  145 +-
 .../groovy/org/gradle/api/tasks/ExecTest.groovy    |  143 +-
 .../org/gradle/api/tasks/GradleBuildTest.groovy    |   10 +-
 .../org/gradle/api/tasks/SourceTaskTest.groovy     |   20 +-
 .../groovy/org/gradle/api/tasks/SyncTest.groovy    |    5 +-
 .../org/gradle/api/tasks/ant/AntTargetTest.java    |    9 +-
 .../org/gradle/api/tasks/bundling/TarTest.groovy   |   43 +-
 .../org/gradle/api/tasks/bundling/ZipTest.groovy   |   17 +-
 .../gradle/api/tasks/util/PatternSetTest.groovy    |   14 +
 .../DefaultPersistentDirectoryCacheTest.groovy     |  198 +++
 .../DefaultPersistentDirectoryCacheTest.java       |  185 ---
 .../cache/internal/FileLockCommunicatorTest.groovy |    2 +-
 .../cache/internal/SimpleStateCacheTest.groovy     |   24 +-
 .../btree/BTreePersistentIndexedCacheTest.java     |   26 +-
 .../cache/internal/btree/ByteInputTest.groovy      |   68 +
 .../cache/internal/btree/ByteOutputTest.groovy     |  102 ++
 .../cache/internal/btree/KeyHasherTest.groovy      |   57 +
 .../DefaultFileLockContentionHandlerTest.groovy    |    2 +-
 .../DefaultScriptPluginFactoryTest.groovy          |   23 +-
 .../PluginsProjectConfigureActionsTest.groovy      |    3 +-
 .../org/gradle/execution/TaskSelectorTest.groovy   |    6 +-
 ...askExecutionPlanParallelTaskHandlingTest.groovy |   14 +-
 .../taskgraph/DefaultTaskExecutionPlanTest.groovy  |   30 +-
 .../taskgraph/DefaultTaskGraphExecuterSpec.groovy  |    3 +-
 .../taskgraph/DefaultTaskGraphExecuterTest.java    |   99 +-
 .../taskgraph/DefaultTaskPlanExecutorTest.groovy   |    3 +-
 .../taskgraph/TaskPlanExecutorFactoryTest.groovy   |    9 +-
 .../taskpath/ProjectFinderByTaskPathTest.groovy    |   12 +-
 .../DefaultScriptCompilerFactoryTest.groovy        |    2 +-
 .../gradle/groovy/scripts/DefaultScriptTest.groovy |   12 +-
 .../internal/BuildScriptTransformerSpec.groovy     |    7 +-
 .../DefaultScriptCompilationHandlerTest.groovy     |   34 +
 .../internal/DefaultScriptRunnerFactoryTest.java   |    2 +-
 .../FileCacheBackedScriptClassCompilerTest.groovy  |   40 +-
 .../initialization/BuildFileProjectSpecTest.groovy |  108 ++
 .../initialization/BuildFileProjectSpecTest.java   |  120 --
 .../BuildLayoutParametersTest.groovy               |    6 +-
 .../CommandLineConverterTestSupport.java           |   10 +-
 .../DefaultCommandLineConverterTest.java           |   26 +-
 .../DefaultExceptionAnalyserTest.java              |   10 +-
 .../DefaultGradleLauncherFactoryTest.groovy        |   17 +-
 .../DefaultGradleLauncherSpec.groovy               |  301 ++++
 .../initialization/DefaultGradleLauncherTest.java  |  392 -----
 .../DefaultSettingsLoaderTest.groovy               |   62 +
 .../DependencyResolutionLoggerTest.groovy          |    4 +-
 .../InstantiatingBuildLoaderTest.groovy            |    3 +-
 .../LayoutCommandLineConverterTest.groovy          |    6 +-
 .../MixInLegacyTypesClassLoaderTest.groovy         |  231 +++
 .../ParallelOptionsCommandLineConverterTest.groovy |   22 +-
 .../ProjectDirectoryProjectSpecTest.groovy         |  106 ++
 .../ProjectDirectoryProjectSpecTest.java           |  121 --
 .../initialization/SettingsHandlerTest.groovy      |   62 -
 .../UserHomeInitScriptFinderTest.groovy            |   70 +
 .../UserHomeInitScriptFinderTest.java              |   71 -
 .../buildsrc/BuildSourceBuilderTest.groovy         |    6 +-
 .../buildevents/BuildExceptionReporterTest.groovy  |  342 +++++
 .../buildevents/BuildResultLoggerTest.java         |   76 +
 .../buildevents/TaskExecutionLoggerTest.groovy     |  110 ++
 .../DefaultCachedClasspathTransformerTest.groovy   |   90 ++
 .../LoggingDeprecatedFeatureHandlerTest.groovy     |   57 -
 .../org/gradle/internal/file/JarCacheTest.groovy   |  130 ++
 .../filewatch/AbstractFileWatcherTest.groovy       |   77 -
 .../internal/filewatch/ChangeReporterTest.groovy   |    2 +-
 .../DefaultFileSystemChangeWaiterTest.groovy       |  185 ---
 .../DefaultFileWatcherFactoryNonJava7Test.groovy   |   33 -
 .../filewatch/DefaultFileWatcherFactoryTest.groovy |  377 -----
 .../graph/DirectedGraphRendererTest.groovy         |    4 +-
 .../CurrentGradleInstallationLocatorTest.groovy    |    8 +-
 .../internal/installation/GradleFatJarTest.groovy  |  122 --
 .../GradleRuntimeShadedJarDetectorTest.groovy      |  117 ++
 .../metaobject/AbstractDynamicObjectTest.java      |   75 +
 .../metaobject/BeanDynamicObjectTest.groovy        |  758 ++++++++++
 .../metaobject/CompositeDynamicObjectTest.groovy   |  157 ++
 ...surePropertiesAsMethodsDynamicObjectTest.groovy |  123 ++
 .../logging/DefaultBuildOperationLoggerTest.groovy |   27 +-
 .../progress/BuildProgressLoggerTest.groovy        |    2 +-
 .../DefaultBuildOperationExecutorTest.groovy       |    4 +-
 .../service/scopes/BuildScopeServicesTest.groovy   |   54 +-
 .../scopes/BuildSessionScopeServicesTest.groovy    |   14 +-
 .../service/scopes/GlobalScopeServicesTest.java    |   34 +-
 .../service/scopes/GradleScopeServicesTest.groovy  |    7 +-
 .../service/scopes/ProjectScopeServicesTest.groovy |   31 +-
 .../scopes/TaskExecutionServicesTest.groovy        |   14 +-
 .../service/scopes/TaskScopeServicesTest.java      |   91 --
 .../gradle/internal/xml/XmlValidationTest.groovy   |   21 +-
 .../org/gradle/logging/ConsoleRendererTest.groovy  |   38 -
 .../logging/LoggingServiceRegistryTest.groovy      |  548 -------
 ...AbstractLineChoppingStyledTextOutputTest.groovy |  166 ---
 .../internal/AbstractStyledTextOutputTest.groovy   |  177 ---
 .../gradle/logging/internal/AnsiConsoleTest.groovy |  462 ------
 .../ConsoleBackedProgressRendererTest.groovy       |  396 ------
 .../org/gradle/logging/internal/ConsoleStub.java   |   47 -
 .../logging/internal/DefaultColorMapTest.groovy    |  106 --
 .../internal/DefaultLoggingManagerTest.java        |  445 ------
 .../DefaultProgressLoggerFactoryTest.groovy        |  379 -----
 .../internal/DefaultStatusBarFormatterTest.groovy  |   57 -
 .../internal/JavaUtilLoggingSystemTest.groovy      |   40 -
 .../LinePrefixingStyledTextOutputTest.groovy       |  135 --
 .../gradle/logging/internal/LogEventTest.groovy    |   47 -
 .../LoggingBackedStyledTextOutputTest.groovy       |  145 --
 .../LoggingCommandLineConverterTest.groovy         |  124 --
 .../internal/LoggingSystemAdapterTest.groovy       |   73 -
 .../internal/OutputEventRendererTest.groovy        |  317 -----
 .../logging/internal/OutputSpecification.groovy    |   84 --
 .../internal/PrintStreamLoggingSystemTest.groovy   |  189 ---
 .../internal/ProgressLogEventGeneratorTest.groovy  |  478 -------
 .../StreamBackedStandardOutputListenerTest.groovy  |   56 -
 .../internal/StreamingStyledTextOutputTest.groovy  |   77 -
 .../StyledTextOutputBackedRendererTest.groovy      |  106 --
 .../internal/StyledTextOutputEventTest.groovy      |   64 -
 .../gradle/logging/internal/TestColorMap.groovy    |   60 -
 .../TextStreamOutputEventListenerTest.groovy       |   63 -
 .../progress/ProgressOperationsTest.groovy         |  117 --
 ...tputEventListenerBackedLoggerContextTest.groovy |   64 -
 ...enerBackedLoggerDefaultConfigurationTest.groovy |   99 --
 .../OutputEventListenerBackedLoggerTest.groovy     |  907 ------------
 .../slf4j/Slf4jLoggingConfigurerTest.groovy        |  178 ---
 .../use/internal/PluginRequestCollectorTest.groovy |    4 +-
 .../internal/PluginRequestsSerializerTest.groovy   |    7 +-
 .../internal/DefaultExecHandleBuilderTest.groovy   |   44 +
 .../process/internal/DefaultExecHandleSpec.groovy  |    4 +-
 .../internal/DefaultWorkerProcessTest.groovy       |  204 ---
 .../process/internal/ExecHandleBuilderTest.groovy  |   44 -
 .../gradle/process/internal/JvmOptionsTest.groovy  |    6 +-
 .../child/BootstrapSecurityManagerTest.groovy      |  104 --
 .../internal/child/EncodedStreamTest.groovy        |   70 -
 .../internal/child/SerializableMockHelper.groovy   |   72 -
 .../WorkerProcessClassPathProviderTest.groovy      |   75 -
 .../internal/streams/EncodedStreamTest.groovy      |   70 +
 .../worker/DefaultWorkerProcessTest.groovy         |  205 +++
 .../child/BootstrapSecurityManagerTest.groovy      |  105 ++
 .../worker/child/SerializableMockHelper.groovy     |   72 +
 .../WorkerProcessClassPathProviderTest.groovy      |   73 +
 .../org/gradle/util/AvailablePortFinderTest.groovy |   37 -
 .../org/gradle/util/ConfigureUtilTest.groovy       |   36 +-
 .../groovy/org/gradle/util/DiffUtilTest.groovy     |  203 ++-
 .../LinePerThreadBufferingOutputStreamTest.groovy  |   44 -
 .../org/gradle/util/SingleMessageLoggerTest.groovy |  114 --
 .../util/ports/AbstractPortAllocatorTest.groovy    |   12 +
 .../ports/FixedAvailablePortAllocatorTest.groovy   |    2 +-
 .../org/gradle/api/internal/file/TestFiles.java    |    5 +
 .../api/tasks/AbstractConventionTaskTest.groovy    |   42 +
 .../api/tasks/AbstractConventionTaskTest.java      |   41 -
 .../api/tasks/AbstractCopyTaskContractTest.groovy  |   19 +-
 .../gradle/api/tasks/AbstractSpockTaskTest.groovy  |   37 +-
 .../org/gradle/api/tasks/AbstractTaskTest.groovy   |  289 ++++
 .../org/gradle/api/tasks/AbstractTaskTest.java     |  272 ----
 .../gradle/api/tasks/AntBuilderAwareUtil.groovy    |    2 +-
 .../tasks/bundling/AbstractArchiveTaskTest.groovy  |   97 +-
 .../org/gradle/logging/ConfigureLogging.groovy     |   63 -
 .../gradle/logging/TestOutputEventListener.groovy  |   44 -
 .../org/gradle/logging/TestStyledTextOutput.groovy |   80 --
 .../logging/TestStyledTextOutputFactory.java       |   53 -
 .../gradle/messaging/actor/TestActorFactory.java   |   44 -
 .../fixtures/AbstractProjectBuilderSpec.groovy     |   48 +
 .../groovy/org/gradle/util/MockTimeProvider.java   |   12 +-
 .../org/gradle/util/MultithreadedTestCase.java     |   21 +-
 .../groovy/org/gradle/util/TestUtil.groovy         |  193 +--
 .../ports/AbstractAvailablePortAllocator.groovy    |   45 +-
 .../util/ports/FixedAvailablePortAllocator.groovy  |    8 +-
 .../dependency-management.gradle                   |   37 +-
 .../AddingConfigurationIntegrationTest.groovy      |   18 +-
 .../ArtifactDependenciesIntegrationTest.groovy     |    4 +-
 ...etadataRulesErrorHandlingIntegrationTest.groovy |    2 +-
 .../ConfigurationDefaultsIntegrationTest.groovy    |    9 +-
 ...pendencyHandlerApiResolveIntegrationTest.groovy |   15 +-
 .../DependencyResolveRulesIntegrationTest.groovy   |    2 +-
 ...pendencySubstitutionRulesIntegrationTest.groovy |  697 ++++-----
 .../resolve/ForcedModulesIntegrationTest.groovy    |    6 +-
 .../ProjectDependenciesIntegrationTest.groovy      |    2 +-
 .../ProjectDependencyResolveIntegrationTest.groovy |  116 +-
 .../ResolutionResultApiIntegrationTest.groovy      |   12 +-
 ...ResolutionStrategySamplesIntegrationTest.groovy |    4 +-
 .../integtests/resolve/ResolveTestFixture.groovy   |  363 -----
 .../ScriptDependencyResolveIntegrationTest.groovy  |    4 +-
 .../UnsupportedConfigurationMutationTest.groovy    |  139 +-
 ...VersionConflictResolutionIntegrationTest.groovy |    3 +-
 ...actCacheReuseCrossVersionIntegrationTest.groovy |    2 +-
 .../CacheReuseCrossVersionIntegrationTest.groovy   |    9 +-
 .../M3CacheReuseCrossVersionIntegrationTest.groovy |   83 --
 ...ameCacheUsageCrossVersionIntegrationTest.groovy |    4 +-
 .../ivy/IvyBrokenDescriptorIntegrationTest.groovy  |   67 +-
 .../IvyBrokenRemoteResolveIntegrationTest.groovy   |  136 +-
 ...rDependencyExcludeResolveIntegrationTest.groovy |  112 +-
 ...iptorModuleExcludeResolveIntegrationTest.groovy |  137 +-
 ...amicRevisionRemoteResolveIntegrationTest.groovy |    2 +-
 ...IvyDynamicRevisionResolveIntegrationTest.groovy |    2 +-
 .../ivy/IvyHttpRepoResolveIntegrationTest.groovy   |   43 +
 .../ivy/IvyModuleResolveIntegrationTest.groovy     |   61 +
 .../maven/BadPomFileResolveIntegrationTest.groovy  |   42 +-
 .../MavenBrokenRemoteResolveIntegrationTest.groovy |  216 +++
 ...venCustomPackagingResolveIntegrationTest.groovy |  102 +-
 .../MavenDependencyResolveIntegrationTest.groovy   |  232 +--
 .../MavenPomExcludeResolveIntegrationTest.groovy   |   96 +-
 .../MavenPomPackagingResolveIntegrationTest.groovy |   27 +-
 .../MavenProfileResolveIntegrationTest.groovy      |    2 +-
 ...ectDependencySubstitutionIntegrationTest.groovy |  234 +++
 .../maven/MavenScopesIntegrationTest.groovy        |  379 +++++
 .../MavenSnapshotResolveIntegrationTest.groovy     |   67 +-
 .../MavenVersionRangeResolveIntegrationTest.groovy |    4 +-
 .../MixedMavenAndIvyModulesIntegrationTest.groovy  |  344 +++++
 .../api/internal/artifacts/ArtifactPublisher.java  |    2 +-
 .../artifacts/ComponentMetadataProcessor.java      |    9 +-
 .../artifacts/ComponentSelectionRulesInternal.java |    3 +
 .../DefaultDependencyManagementServices.java       |   60 +-
 .../DefaultGlobalDependencyResolutionRules.java    |   48 +-
 .../artifacts/DefaultModuleVersionIdentifier.java  |    6 -
 .../artifacts/DefaultModuleVersionSelector.java    |    7 +-
 .../DependencyManagementBuildScopeServices.java    |  106 +-
 .../DependencyManagementGlobalScopeServices.java   |   18 +-
 .../artifacts/GlobalDependencyResolutionRules.java |    8 +
 .../internal/artifacts/ModuleVersionPublisher.java |    4 +-
 .../api/internal/artifacts/ResolveContext.java     |    4 +-
 .../component/ComponentIdentifierFactory.java      |   10 +-
 .../component/DefaultBuildIdentifier.java          |   66 +
 .../DefaultComponentIdentifierFactory.java         |   31 +-
 .../configurations/ConflictResolution.java         |   21 +
 .../configurations/DefaultConfiguration.java       |  119 +-
 .../DefaultConfigurationContainer.java             |   18 +-
 .../configurations/ResolutionStrategyInternal.java |    1 -
 .../artifacts/dsl/ComponentSelectorParsers.java    |    2 +-
 .../dsl/DefaultComponentMetadataHandler.java       |   61 +-
 .../artifacts/dsl/ParsedModuleStringNotation.java  |   37 +-
 .../dsl/PublishArtifactNotationParserFactory.java  |    2 +-
 .../internal/artifacts/ivyservice/CacheLayout.java |    2 +-
 .../CacheLockingArtifactDependencyResolver.java    |    2 +-
 .../ivyservice/CacheLockingArtifactResolver.java   |   65 +
 .../ivyservice/ContextualArtifactResolver.java     |   73 -
 .../ivyservice/DefaultConfigurationResolver.java   |   20 +-
 .../ivyservice/DefaultIvyDependencyPublisher.java  |   72 -
 .../ivyservice/DefaultLenientConfiguration.java    |   34 +-
 .../ErrorHandlingConfigurationResolver.java        |    9 +
 .../ivyservice/IvyBackedArtifactPublisher.java     |   92 --
 .../ivyservice/IvyContextualArtifactPublisher.java |   47 +
 .../ivyservice/IvyContextualMetaDataParser.java    |   67 +
 .../ivyservice/IvyDependencyPublisher.java         |   26 -
 .../artifacts/ivyservice/IvyLoggingAdaper.java     |    3 +-
 .../ivyservice/IvyModuleDescriptorWriter.java      |   28 -
 .../api/internal/artifacts/ivyservice/IvyUtil.java |   52 +-
 .../ivyservice/IvyXmlModuleDescriptorWriter.java   |  422 ------
 .../ShortCircuitEmptyConfigurationResolver.java    |   22 +-
 .../clientmodule/ClientModuleResolver.java         |   23 +-
 .../DefaultDependencySubstitutions.java            |   97 +-
 .../DependencySubstitutionResolver.java            |    4 +-
 .../DependencySubstitutionRules.java               |   42 +
 .../DependencySubstitutionsInternal.java           |    7 +-
 .../BaseModuleComponentRepositoryAccess.java       |   24 +-
 ...cheLockReleasingModuleComponentsRepository.java |   37 +-
 .../CachingModuleComponentRepository.java          |  120 +-
 .../ComponentSelectionRulesProcessor.java          |    7 +-
 .../DefaultVersionedComponentChooser.java          |   10 +-
 .../ivyresolve/DependencyResolverIdentifier.java   |   46 -
 .../ivyresolve/DynamicVersionResolver.java         |   30 +-
 .../ivyresolve/ErrorHandlingArtifactResolver.java  |   19 +-
 .../ErrorHandlingModuleComponentRepository.java    |   19 +-
 ...amicResolveModuleComponentRepositoryAccess.java |   16 +-
 .../ivyresolve/LocalModuleComponentRepository.java |   46 +-
 .../ivyservice/ivyresolve/MetadataProvider.java    |   17 +-
 .../ModuleComponentRepositoryAccess.java           |   17 +-
 .../ivyresolve/NoRepositoriesResolver.java         |   23 +-
 .../RepositoryChainArtifactResolver.java           |   29 +-
 .../RepositoryChainComponentMetaDataResolver.java  |    6 +-
 ...sitoryChainDependencyToComponentIdResolver.java |    8 +-
 .../RepositoryChainModuleResolution.java           |    6 +-
 .../ivyresolve/RepositoryChainModuleSource.java    |    5 +
 .../ivyservice/ivyresolve/ResolveIvyFactory.java   |   32 +-
 .../StartParameterResolutionOverride.java          |   20 +-
 .../ivyservice/ivyresolve/UserResolverChain.java   |    9 +-
 .../ivyresolve/VersionedComponentChooser.java      |    4 +-
 .../memcache/CachedModuleVersionResult.java        |    8 +-
 .../memcache/InMemoryArtifactsCache.java           |   71 +-
 .../ivyresolve/memcache/InMemoryCacheStats.java    |   29 -
 .../InMemoryCachedModuleComponentRepository.java   |   44 +-
 .../memcache/InMemoryCachedRepositoryFactory.java  |    9 +-
 .../ivyresolve/memcache/InMemoryMetaDataCache.java |    8 +-
 .../InMemoryModuleComponentRepositoryCaches.java   |   13 +-
 .../parser/AbstractModuleDescriptorParser.java     |    4 +-
 .../ivyresolve/parser/BuildableIvyArtifact.java    |    5 +-
 .../DisconnectedIvyXmlModuleDescriptorParser.java  |   16 +-
 .../DownloadedIvyModuleDescriptorParser.java       |    5 -
 .../parser/GradlePomModuleDescriptorBuilder.java   |  300 ++--
 .../parser/GradlePomModuleDescriptorParser.java    |   52 +-
 .../parser/IvyModuleDescriptorConverter.java       |  167 +++
 .../parser/IvyModuleResolveMetaDataBuilder.java    |   56 +
 .../parser/IvyXmlModuleDescriptorParser.java       |  153 +-
 .../ivyresolve/parser/MetaDataParser.java          |    4 +-
 .../ivyservice/ivyresolve/parser/PomReader.java    |  165 ++-
 .../ivyresolve/parser/data/MavenDependencyKey.java |   27 +-
 .../ivyresolve/parser/data/PomDependencyMgt.java   |    4 +-
 .../ivyresolve/strategy/ResolverStrategy.java      |   41 -
 .../modulecache/DefaultCachedMetaData.java         |    8 +-
 .../modulecache/DefaultModuleMetaDataCache.java    |   51 +-
 .../modulecache/IvyModuleCacheEntry.java           |   35 -
 .../modulecache/MavenModuleCacheEntry.java         |   41 -
 .../modulecache/MissingModuleCacheEntry.java       |    2 +-
 .../modulecache/ModuleDescriptorCacheEntry.java    |   77 -
 .../ModuleDescriptorCacheEntrySerializer.java      |   84 --
 .../modulecache/ModuleDescriptorStore.java         |   74 -
 .../modulecache/ModuleMetaDataCache.java           |    7 +-
 .../modulecache/ModuleMetadataCacheEntry.java      |   59 +
 .../ModuleMetadataCacheEntrySerializer.java        |   65 +
 .../modulecache/ModuleMetadataSerializer.java      |  516 +++++++
 .../modulecache/ModuleMetadataStore.java           |   83 ++
 .../ConfigurationComponentMetaDataBuilder.java     |    4 +-
 ...faultConfigurationComponentMetaDataBuilder.java |   10 +-
 .../AbstractIvyDependencyDescriptorFactory.java    |   20 +-
 ...ultDependenciesToModuleDescriptorConverter.java |   13 +-
 .../DefaultDependencyDescriptorFactory.java        |    4 +-
 .../dependencies/DefaultExcludeRuleConverter.java  |   21 +-
 .../DependenciesToModuleDescriptorConverter.java   |    4 +-
 .../dependencies/DependencyDescriptorFactory.java  |    4 +-
 .../dependencies/ExcludeRuleConverter.java         |    5 +-
 ...ternalModuleIvyDependencyDescriptorFactory.java |   12 +-
 .../IvyDependencyDescriptorFactory.java            |    6 +-
 .../ProjectIvyDependencyDescriptorFactory.java     |   16 +-
 .../ReflectiveDependencyDescriptorFactory.java     |   82 --
 .../AggregatingProjectArtifactBuilder.java         |   43 +
 .../CacheLockReleasingProjectArtifactBuilder.java  |   45 +
 .../DefaultLocalComponentRegistry.java             |   62 +
 .../DefaultProjectComponentRegistry.java           |   54 -
 .../DefaultProjectLocalComponentProvider.java      |   88 ++
 .../projectmodule/LocalComponentProvider.java      |   37 +
 .../projectmodule/LocalComponentRegistry.java      |   37 +
 .../projectmodule/ProjectArtifactBuilder.java      |   31 +
 .../projectmodule/ProjectComponentRegistry.java    |   22 -
 .../ProjectDependencyComponentArtifacts.java       |   42 +
 .../projectmodule/ProjectDependencyResolver.java   |   66 +-
 .../ProjectLocalComponentProvider.java             |   28 +
 .../publisher/DefaultIvyDependencyPublisher.java   |   72 +
 .../publisher/IvyBackedArtifactPublisher.java      |   84 ++
 .../publisher/IvyDependencyPublisher.java          |   26 +
 .../publisher/IvyModuleDescriptorWriter.java       |   25 +
 .../publisher/IvyXmlModuleDescriptorWriter.java    |  280 ++++
 .../DefaultComponentSelectionRules.java            |   33 +-
 .../DefaultResolutionStrategy.java                 |   33 +-
 .../LatestConflictResolution.java                  |    2 +-
 .../StrictConflictResolution.java                  |    4 +-
 .../resolveengine/ComponentResolutionState.java    |    4 +-
 .../resolveengine/ComponentResolversChain.java     |   19 +-
 .../DefaultArtifactDependencyResolver.java         |   41 +-
 .../DefaultDependencyToConfigurationResolver.java  |   80 --
 .../DefaultModuleResolutionFilter.java             |  842 -----------
 .../DependencyToConfigurationResolver.java         |   30 -
 .../LatestModuleConflictResolver.java              |    4 +-
 .../resolveengine/ModuleResolutionFilter.java      |   61 -
 .../resolveengine/artifact/DefaultArtifactSet.java |   22 +-
 .../artifact/DefaultResolvedArtifactsBuilder.java  |   11 +-
 .../artifact/DependencyArtifactsVisitor.java       |    4 +-
 .../artifact/ResolvedArtifactsGraphVisitor.java    |   48 +-
 .../excludes/AbstractCompositeExclusion.java       |   72 +
 .../excludes/AbstractModuleExclusion.java          |  101 ++
 .../excludes/ArtifactExcludeSpec.java              |   82 ++
 .../excludes/ExcludeAllModulesSpec.java            |   46 +
 .../resolveengine/excludes/ExcludeNone.java        |   46 +
 .../excludes/GroupNameExcludeSpec.java             |   58 +
 .../excludes/IntersectionExclusion.java            |   84 ++
 .../excludes/IvyPatternMatcherExcludeRuleSpec.java |   94 ++
 .../resolveengine/excludes/ModuleExclusion.java    |   49 +
 .../resolveengine/excludes/ModuleExclusions.java   |  306 ++++
 .../excludes/ModuleIdExcludeSpec.java              |   58 +
 .../excludes/ModuleNameExcludeSpec.java            |   57 +
 .../resolveengine/excludes/PatternMatchers.java    |   68 +
 .../resolveengine/excludes/UnionExclusion.java     |   87 ++
 .../resolveengine/graph/ComponentResult.java       |   41 +
 .../graph/CompositeDependencyArtifactsVisitor.java |    3 +-
 .../graph/DependencyGraphBuilder.java              |  263 ++--
 .../graph/DependencyGraphComponent.java            |   30 +
 .../resolveengine/graph/DependencyGraphEdge.java   |   18 +-
 .../resolveengine/graph/DependencyGraphNode.java   |   26 +-
 .../graph/DependencyGraphPathResolver.java         |   54 +-
 .../graph/DependencyGraphVisitor.java              |   20 +
 .../resolveengine/graph/DependencyResult.java      |   42 +
 .../DefaultResolvedConfigurationBuilder.java       |   26 +-
 .../oldresult/DefaultResolvedGraphResults.java     |    7 +-
 .../oldresult/ResolvedConfigurationBuilder.java    |   10 +-
 ...esolvedConfigurationDependencyGraphVisitor.java |   28 +-
 .../oldresult/ResolvedContentsMapping.java         |    3 +-
 .../oldresult/ResolvedGraphResults.java            |    3 +-
 .../TransientConfigurationResultsBuilder.java      |   65 +-
 .../TransientConfigurationResultsLoader.java       |    3 +-
 .../ResolvedLocalComponentsResultGraphVisitor.java |   16 +-
 .../result/BuildIdentifierSerializer.java          |   40 +
 .../result/ComponentIdentifierSerializer.java      |    8 +-
 .../result/ComponentResultSerializer.java          |   50 +
 .../result/ComponentSelectionReasonSerializer.java |    1 +
 .../result/ComponentSelectorSerializer.java        |   14 +-
 .../result/DefaultComponentResult.java             |   53 +
 .../result/DefaultDependencyResult.java            |   59 +
 .../result/DefaultInternalDependencyResult.java    |   59 -
 .../result/DefaultModuleVersionSelection.java      |   45 -
 .../result/DefaultResolutionResultBuilder.java     |   50 +-
 .../result/DependencyResultSerializer.java         |   60 +
 .../result/InternalDependencyResult.java           |   40 -
 .../result/InternalDependencyResultSerializer.java |   62 -
 .../result/ModuleVersionSelection.java             |   30 -
 .../result/ModuleVersionSelectionSerializer.java   |   47 -
 .../result/ResolutionResultBuilder.java            |   31 -
 .../ResolutionResultDependencyGraphVisitor.java    |   44 -
 .../result/StreamingResolutionResultBuilder.java   |  103 +-
 .../result/VersionSelectionReasons.java            |    5 +-
 .../ModuleVersionArtifactIdentifierSerializer.java |   12 +-
 .../DefaultLocalMavenRepositoryLocator.java        |    2 +-
 .../query/DefaultArtifactResolutionQuery.java      |   14 +-
 .../AbstractAuthenticationSupportedRepository.java |  104 +-
 .../repositories/AuthenticationSupporter.java      |  152 ++
 .../repositories/DefaultBaseRepositoryFactory.java |   31 +-
 .../DefaultFlatDirArtifactRepository.java          |   28 +-
 .../repositories/DefaultIvyArtifactRepository.java |   32 +-
 .../DefaultMavenArtifactRepository.java            |   24 +-
 .../DefaultMavenLocalArtifactRepository.java       |   12 +-
 .../resolver/AbstractResourcePattern.java          |    4 +-
 .../resolver/ComponentMetadataAdapter.java         |   46 +
 .../resolver/ComponentMetadataDetailsAdapter.java  |    6 +-
 .../DefaultExternalResourceArtifactResolver.java   |   28 +-
 .../resolver/ExternalResourceArtifactResolver.java |    8 +-
 .../resolver/ExternalResourceResolver.java         |  220 ++-
 ...rnalResourceResolverDescriptorParseContext.java |   15 +-
 .../repositories/resolver/IvyResolver.java         |   69 +-
 .../repositories/resolver/IvyResourcePattern.java  |    6 +-
 .../repositories/resolver/M2ResourcePattern.java   |    8 +-
 .../repositories/resolver/MavenLocalResolver.java  |   28 +-
 .../repositories/resolver/MavenResolver.java       |   89 +-
 ...ueSnapshotExternalResourceArtifactResolver.java |   26 +-
 .../repositories/resolver/ResourcePattern.java     |    4 +-
 .../transport/RepositoryTransportFactory.java      |    2 +-
 .../artifacts/result/DefaultResolutionResult.java  |    6 +-
 .../result/DefaultResolvedComponentResult.java     |   10 +-
 .../result/DefaultResolvedDependencyResult.java    |    4 +-
 .../result/DefaultUnresolvedDependencyResult.java  |    2 +-
 .../internal/composite/CompositeBuildContext.java  |   41 +
 .../CompositeBuildIdeProjectResolver.java          |   74 +
 .../filestore/ivy/ArtifactIdentifierFileStore.java |   10 +-
 .../internal/impldeps/GradleImplDepsJarType.java   |   31 -
 .../internal/impldeps/GradleImplDepsProvider.java  |   78 -
 .../impldeps/GradleImplDepsRelocatedJar.java       |   44 -
 .../GradleImplDepsRelocatedJarCreator.java         |  269 ----
 .../internal/impldeps/GradleImplDepsRelocator.java |   63 -
 .../api/internal/impldeps/RelocatedJarCreator.java |   23 -
 .../DependencyClassPathNotationConverter.java      |   49 +-
 .../notations/DependencyNotationParser.java        |    6 +-
 .../DependencyStringNotationConverter.java         |   22 +-
 .../ImplementationDependencyRelocator.java         |  125 ++
 .../runtimeshaded/PackageListGenerator.java        |  194 +++
 .../runtimeshaded/RuntimeShadedJarCreator.java     |  411 ++++++
 .../runtimeshaded/RuntimeShadedJarFactory.java     |   54 +
 .../runtimeshaded/RuntimeShadedJarType.java        |   33 +
 .../gradle/api/internal/runtimeshaded/Trie.java    |  154 ++
 .../component/external/descriptor/Artifact.java    |   44 +
 .../external/descriptor/Configuration.java         |   52 +
 .../external/descriptor/DefaultExclude.java        |   80 ++
 .../component/external/descriptor/MavenScope.java  |   25 +
 .../external/descriptor/ModuleDescriptorState.java |  110 ++
 .../descriptor/MutableModuleDescriptorState.java   |   68 +
 .../AbstractModuleComponentResolveMetaData.java    |  116 --
 .../AbstractModuleComponentResolveMetadata.java    |  374 +++++
 ...tractMutableModuleComponentResolveMetadata.java |  163 +++
 .../model/BuildableIvyModulePublishMetaData.java   |   26 -
 .../model/BuildableIvyModulePublishMetadata.java   |   26 +
 .../model/BuildableIvyModuleResolveMetaData.java   |   76 -
 .../DefaultIvyModuleArtifactPublishMetadata.java   |   65 +
 .../model/DefaultIvyModulePublishMetaData.java     |  164 ---
 .../model/DefaultIvyModulePublishMetadata.java     |  141 ++
 .../model/DefaultIvyModuleResolveMetaData.java     |   66 -
 .../model/DefaultIvyModuleResolveMetadata.java     |   49 +
 .../model/DefaultMavenModuleResolveMetaData.java   |   93 --
 .../model/DefaultMavenModuleResolveMetadata.java   |   76 +
 .../DefaultModuleComponentArtifactIdentifier.java  |    9 +-
 .../DefaultModuleComponentArtifactMetaData.java    |   56 -
 .../DefaultModuleComponentArtifactMetadata.java    |   56 +
 .../DefaultMutableIvyModuleResolveMetadata.java    |   63 +
 .../DefaultMutableMavenModuleResolveMetadata.java  |   97 ++
 .../external/model/FixedComponentArtifacts.java    |   44 +
 .../external/model/IvyDependencyMetadata.java      |  200 +++
 .../model/IvyModuleArtifactPublishMetaData.java    |   36 -
 .../model/IvyModuleArtifactPublishMetadata.java    |   32 +
 .../external/model/IvyModulePublishMetaData.java   |   33 -
 .../external/model/IvyModulePublishMetadata.java   |   40 +
 .../external/model/IvyModuleResolveMetaData.java   |   39 -
 .../external/model/IvyModuleResolveMetadata.java   |   52 +
 .../external/model/MavenDependencyMetadata.java    |  140 ++
 .../external/model/MavenModuleResolveMetaData.java |   28 -
 .../external/model/MavenModuleResolveMetadata.java |   42 +
 .../model/MetadataSourcedComponentArtifacts.java   |   33 +
 .../model/ModuleComponentArtifactMetaData.java     |   33 -
 .../model/ModuleComponentArtifactMetadata.java     |   33 +
 .../model/ModuleComponentResolveMetaData.java      |   41 -
 .../model/ModuleComponentResolveMetadata.java      |   69 +
 .../model/MutableIvyModuleResolveMetadata.java     |   25 +
 .../model/MutableMavenModuleResolveMetadata.java   |   37 +
 .../MutableModuleComponentResolveMetaData.java     |   50 -
 .../MutableModuleComponentResolveMetadata.java     |   94 ++
 .../model/BuildableLocalComponentMetaData.java     |   34 -
 .../model/BuildableLocalComponentMetadata.java     |   37 +
 .../model/DefaultLibraryBinaryIdentifier.java      |    2 +-
 .../model/DefaultLibraryComponentSelector.java     |    6 +-
 .../local/model/DefaultLocalComponentMetaData.java |  254 ----
 .../local/model/DefaultLocalComponentMetadata.java |  252 ++++
 .../model/DefaultProjectComponentIdentifier.java   |   47 +-
 .../model/DefaultProjectComponentSelector.java     |   69 +-
 .../model/DefaultProjectDependencyMetaData.java    |   35 -
 .../model/DefaultProjectDependencyMetadata.java    |  107 ++
 .../local/model/DslOriginDependencyMetaData.java   |   30 -
 .../model/DslOriginDependencyMetaDataWrapper.java  |  101 --
 .../local/model/DslOriginDependencyMetadata.java   |   30 +
 .../model/DslOriginDependencyMetadataWrapper.java  |  131 ++
 .../model/LocalComponentArtifactIdentifier.java    |   25 -
 .../model/LocalComponentArtifactMetadata.java      |   25 +
 .../local/model/LocalComponentMetaData.java        |   22 -
 .../local/model/LocalComponentMetadata.java        |   22 +
 .../local/model/LocalConfigurationMetaData.java    |   34 -
 .../local/model/LocalConfigurationMetadata.java    |   34 +
 .../local/model/MissingLocalArtifactMetaData.java  |   84 --
 .../local/model/MissingLocalArtifactMetadata.java  |   84 ++
 .../PublishArtifactLocalArtifactMetaData.java      |  111 --
 .../PublishArtifactLocalArtifactMetadata.java      |  111 ++
 .../internal/component/local/model/UsageKind.java  |   30 -
 .../AbstractModuleDescriptorBackedMetaData.java    |  280 ----
 .../component/model/ComponentArtifactMetaData.java |   40 -
 .../component/model/ComponentArtifactMetadata.java |   40 +
 .../component/model/ComponentArtifacts.java        |   26 +
 .../component/model/ComponentResolveMetaData.java  |   77 -
 .../component/model/ComponentResolveMetadata.java  |   79 ++
 .../internal/component/model/ComponentUsage.java   |   20 -
 .../component/model/ConfigurationMetaData.java     |   52 -
 .../component/model/ConfigurationMetadata.java     |   59 +
 .../model/ConfigurationNotFoundException.java      |   26 +
 .../model/DefaultComponentOverrideMetadata.java    |   12 +-
 .../component/model/DefaultComponentUsage.java     |   33 -
 .../component/model/DefaultDependencyMetaData.java |  174 ---
 .../component/model/DefaultDependencyMetadata.java |  138 ++
 .../component/model/DefaultIvyArtifactName.java    |   62 +-
 .../DefaultModuleDescriptorArtifactMetaData.java   |   50 -
 .../DefaultModuleDescriptorArtifactMetadata.java   |   50 +
 .../component/model/DependencyMetaData.java        |   79 --
 .../component/model/DependencyMetadata.java        |   83 ++
 .../gradle/internal/component/model/Exclude.java   |   32 +
 .../internal/component/model/IvyArtifactName.java  |    5 +-
 .../model/LocalComponentDependencyMetaData.java    |  155 --
 .../model/LocalComponentDependencyMetadata.java    |  181 +++
 .../model/LocalOriginDependencyMetadata.java       |   38 +
 .../model/ModuleDescriptorArtifactMetaData.java    |   22 -
 .../model/ModuleDescriptorArtifactMetadata.java    |   25 +
 .../resolve/ModuleVersionResolveException.java     |   17 +-
 .../resolve/resolver/ArtifactResolver.java         |   16 +-
 .../resolver/DependencyToComponentIdResolver.java  |    4 +-
 .../resolve/result/ArtifactResolveResult.java      |   37 -
 .../resolve/result/ArtifactSetResolveResult.java   |   35 -
 .../result/BuildableArtifactResolveResult.java     |   14 +-
 .../result/BuildableArtifactSetResolveResult.java  |   10 +-
 .../BuildableComponentArtifactsResolveResult.java  |   23 +
 .../result/BuildableComponentIdResolveResult.java  |    4 +-
 .../result/BuildableComponentResolveResult.java    |    6 +-
 ...ldableModuleComponentMetaDataResolveResult.java |   20 +-
 .../result/BuildableTypedResolveResult.java        |   45 +
 .../resolve/result/ComponentIdResolveResult.java   |    4 +-
 .../resolve/result/ComponentResolveResult.java     |    4 +-
 .../DefaultBuildableArtifactResolveResult.java     |   40 +-
 .../DefaultBuildableArtifactSetResolveResult.java  |   44 +-
 ...ltBuildableComponentArtifactsResolveResult.java |   23 +
 .../DefaultBuildableComponentIdResolveResult.java  |    8 +-
 .../DefaultBuildableComponentResolveResult.java    |   10 +-
 ...ldableModuleComponentMetaDataResolveResult.java |   23 +-
 .../result/DefaultBuildableTypedResolveResult.java |   67 +
 .../resource/cached/ivy/AbstractCachedIndex.java   |    2 +-
 .../ivy/LocallyAvailableResourceFinderFactory.java |   26 +-
 ...PatternBasedLocallyAvailableResourceFinder.java |   12 +-
 .../transfer/AbstractProgressLoggingHandler.java   |    6 +-
 .../DefaultCacheAwareExternalResourceAccessor.java |    2 +-
 .../ProgressLoggingExternalResourceAccessor.java   |    2 +-
 .../ProgressLoggingExternalResourceUploader.java   |    2 +-
 .../resource/transfer/ResourceOperation.java       |    2 +-
 .../ResourceConnectorRepositoryTransport.java      |    2 +-
 .../DefaultDependencyManagementServicesTest.groovy |    8 +-
 .../DefaultModuleVersionSelectorTest.groovy        |   13 -
 .../DefaultComponentIdentifierFactoryTest.groovy   |   17 +-
 .../DefaultConfigurationContainerSpec.groovy       |   17 +-
 .../DefaultConfigurationContainerTest.groovy       |  104 +-
 .../configurations/DefaultConfigurationSpec.groovy |    4 +-
 .../TasksFromDependentProjectsTest.groovy          |    6 +-
 .../TasksFromProjectDependenciesTest.groovy        |    6 +-
 .../dsl/ComponentSelectorParsersTest.groovy        |   14 +-
 .../dsl/DefaultComponentMetadataHandlerTest.groovy |  122 +-
 ...lishArtifactNotationConverterFactoryTest.groovy |    4 +-
 .../artifacts/ivyservice/CacheLayoutTest.groovy    |    8 +-
 .../DefaultLenientConfigurationTest.groovy         |  135 ++
 .../artifacts/ivyservice/IvyUtilTest.groovy        |   14 +-
 .../IvyXmlModuleDescriptorWriterTest.groovy        |  123 +-
 .../clientmodule/ClientModuleResolverTest.groovy   |   29 +-
 .../DefaultDependencySubstitutionSpec.groovy       |   12 +-
 .../DefaultDependencySubstitutionsSpec.groovy      |   43 +-
 .../DependencySubstitutionResolverSpec.groovy      |    7 +-
 .../CachingModuleComponentRepositoryTest.groovy    |   44 +-
 .../ComponentSelectionRulesProcessorTest.groovy    |   60 +-
 .../DefaultVersionedComponentChooserTest.groovy    |   38 +-
 .../DependencyResolverIdentifierTest.groovy        |   39 +-
 .../ErrorHandlingArtifactResolverTest.groovy       |   26 +-
 ...solveModuleComponentRepositoryAccessTest.groovy |   16 +-
 .../ivyresolve/MetadataProviderTest.groovy         |   25 +-
 .../ivyresolve/ResolveIvyFactoryTest.groovy        |    6 +-
 .../ResolverProviderArtifactResolverTest.groovy    |   48 +-
 ...verProviderComponentMetaDataResolverTest.groovy |   35 +-
 .../memcache/CachedModuleVersionResultTest.groovy  |   19 +-
 .../memcache/InMemoryArtifactsCacheTest.groovy     |  139 +-
 ...emoryCachedModuleComponentRepositoryTest.groovy |  176 ++-
 .../InMemoryCachedRepositoryFactoryTest.groovy     |    3 -
 .../memcache/InMemoryMetaDataCacheTest.groovy      |   26 +-
 ...tractGradlePomModuleDescriptorParserTest.groovy |   46 +-
 ...onnectedIvyXmlModuleDescriptorParserTest.groovy |   11 +-
 .../DownloadedIvyModuleDescriptorParserTest.groovy |    5 +-
 ...adlePomModuleDescriptorParserProfileTest.groovy |  252 ++--
 .../GradlePomModuleDescriptorParserTest.groovy     |  438 +++---
 .../IvyModuleResolveMetadataBuilderTest.groovy     |  103 ++
 .../parser/IvyXmlModuleDescriptorParserTest.groovy |  796 +++++------
 .../ivyresolve/parser/PomReaderTest.groovy         |   26 +-
 .../modulecache/ModuleDescriptorStoreTest.groovy   |   76 -
 .../modulecache/ModuleMetadataStoreTest.groovy     |   72 +
 ...onfigurationComponentMetaDataBuilderTest.groovy |   46 +-
 ...actDependencyDescriptorFactoryInternalTest.java |   47 +-
 ...endenciesToModuleDescriptorConverterTest.groovy |   15 +-
 .../DefaultDependencyDescriptorFactoryTest.groovy  |    4 +-
 .../DefaultExcludeRuleConverterTest.java           |   33 +-
 ...ernalModuleDependencyDescriptorFactoryTest.java |   10 +-
 .../ProjectDependencyDescriptorFactoryTest.groovy  |   17 +-
 ...eflectiveDependencyDescriptorFactoryTest.groovy |   90 --
 .../ProjectDependencyResolverTest.groovy           |   50 +-
 .../DefaultResolutionStrategySpec.groovy           |   12 +-
 .../DefaultModuleResolutionFilterTest.groovy       |  673 ---------
 .../DependencyGraphBuilderTest.groovy              |  466 +++---
 .../excludes/DefaultModuleExclusionTest.groovy     |  798 +++++++++++
 .../ComponentIdentifierSerializerTest.groovy       |    5 +-
 .../result/ComponentResultSerializerTest.groovy    |   41 +
 .../result/ComponentSelectorSerializerTest.groovy  |    4 +-
 .../DefaultResolutionResultBuilderSpec.groovy      |   66 +-
 .../result/DependencyResultSerializerTest.groovy   |   80 ++
 .../InternalDependencyResultSerializerTest.groovy  |   80 --
 .../ModuleVersionSelectionSerializerTest.groovy    |   40 -
 .../StreamingResolutionResultBuilderTest.groovy    |  149 +-
 .../result/VersionSelectionReasonsTest.groovy      |    8 +-
 .../DefaultArtifactResolutionQueryTest.groovy      |    4 +-
 ...itoryChangingNameAfterContainerInclusion.groovy |    7 +-
 ...actAuthenticationSupportedRepositoryTest.groovy |    3 +-
 .../DefaultBaseRepositoryFactoryTest.groovy        |    8 +-
 .../DefaultFlatDirArtifactRepositoryTest.groovy    |   11 +-
 .../DefaultIvyArtifactRepositoryTest.groovy        |    8 +-
 .../DefaultMavenLocalRepositoryTest.groovy         |    2 +-
 .../resolver/ExternalResourceResolverTest.groovy   |    6 +-
 .../repositories/resolver/IvyResolverTest.groovy   |    4 +-
 .../resolver/IvyResourcePatternTest.groovy         |    8 +-
 .../resolver/M2ResourcePatternTest.groovy          |   10 +-
 ...shotExternalResourceArtifactResolverTest.groovy |   10 +-
 .../impldeps/GradleImplDepsProviderTest.groovy     |  130 --
 .../GradleImplDepsRelocatedJarCreatorTest.groovy   |  219 ---
 ...DependencyClassPathNotationConverterTest.groovy |   35 +-
 .../RuntimeShadedJarCreatorTest.groovy             |  372 +++++
 ...stractModuleComponentResolveMetaDataTest.groovy |  242 ----
 ...stractModuleComponentResolveMetadataTest.groovy |  160 +++
 ...utableModuleComponentResolveMetadataTest.groovy |  151 ++
 .../BuildableIvyModuleResolveMetaDataTest.groovy   |   92 --
 .../DefaultIvyModulePublishMetaDataTest.groovy     |   94 --
 .../DefaultIvyModulePublishMetadataTest.groovy     |   64 +
 .../DefaultIvyModuleResolveMetaDataTest.groovy     |   66 -
 .../DefaultIvyModuleResolveMetadataTest.groovy     |   69 +
 .../DefaultMavenModuleResolveMetaDataTest.groovy   |   74 -
 .../DefaultMavenModuleResolveMetadataTest.groovy   |   68 +
 ...ultModuleComponentArtifactIdentifierTest.groovy |   24 +-
 ...faultModuleComponentArtifactMetaDataTest.groovy |   56 -
 ...faultModuleComponentArtifactMetadataTest.groovy |   56 +
 .../DefaultModuleComponentSelectorTest.groovy      |    6 +-
 ...faultMutableIvyModuleResolveMetadataTest.groovy |  209 +++
 ...ultMutableMavenModuleResolveMetadataTest.groovy |  253 ++++
 .../model/IvyDependencyMetadataTest.groovy         |  385 +++++
 .../model/MavenDependencyMetadataTest.groovy       |  268 ++++
 .../model/DefaultLocalComponentMetaDataTest.groovy |  181 ---
 .../model/DefaultLocalComponentMetadataTest.groovy |  225 +++
 .../DefaultProjectComponentIdentifierTest.groovy   |   24 +-
 .../DefaultProjectComponentSelectorTest.groovy     |   40 +-
 .../DefaultProjectDependencyMetadataTest.groovy    |   44 +
 .../model/MissingLocalArtifactMetaDataTest.groovy  |   75 -
 .../model/MissingLocalArtifactMetadataTest.groovy  |   75 +
 .../model/DefaultDependencyMetaDataTest.groovy     |  203 ---
 .../model/DefaultDependencyMetadataTest.groovy     |  149 ++
 .../model/DefaultIvyArtifactNameTest.groovy        |   38 +-
 .../LocalComponentDependencyMetadataTest.groovy    |  106 ++
 .../ModuleVersionNotFoundExceptionTest.groovy      |    7 +-
 .../ModuleVersionResolveExceptionTest.groovy       |    2 +-
 ...efaultBuildableArtifactResolveResultTest.groovy |   10 +-
 ...ultBuildableArtifactSetResolveResultTest.groovy |   13 +-
 ...ultBuildableComponentIdResolveResultTest.groovy |    4 +-
 ...faultBuildableComponentResolveResultTest.groovy |   10 +-
 ...ModuleComponentMetaDataResolveResultTest.groovy |   36 +-
 .../DefaultBuildableTypedResolveResultTest.groovy  |  110 ++
 ...gressLoggingExternalResourceAccessorTest.groovy |    4 +-
 ...gressLoggingExternalResourceUploaderTest.groovy |    4 +-
 .../resource/transfer/ResourceOperationTest.groovy |    2 +-
 .../fixtures/resolve/ResolveTestFixture.groovy     |  509 +++++++
 .../local/model/TestComponentIdentifiers.java      |   38 +
 subprojects/diagnostics/diagnostics.gradle         |    4 +
 ...iagnosticsComponentReportIntegrationTest.groovy |    4 +-
 .../HtmlDependencyReportTaskIntegrationTest.groovy |    6 +-
 .../DetailedModelReportIntegrationTest.groovy      |    6 +-
 .../model/ModelReportIntegrationTest.groovy        |   16 +-
 ...uildEnvironmentReportTaskIntegrationTest.groovy |    2 +
 ...pendencyInsightReportTaskIntegrationTest.groovy |   56 +-
 .../DependencyReportTaskIntegrationTest.groovy     |   54 +-
 .../diagnostics/HelpTaskIntegrationTest.groovy     |    4 +-
 .../org/gradle/configuration/HelpTest.groovy       |    8 +-
 .../plugins/ProjectReportsPluginConvention.groovy  |   43 -
 .../api/reporting/components/ComponentReport.java  |  110 --
 .../internal/ComponentReportRenderer.java          |   98 --
 .../dependencies/DependencyReportContainer.java    |   33 -
 .../dependencies/HtmlDependencyReportTask.java     |  127 --
 .../internal/HtmlDependencyReporter.groovy         |   93 --
 .../internal/JsonProjectDependencyRenderer.groovy  |  256 ----
 .../dependencies/internal/ProjectPageRenderer.java |   88 --
 .../internal/ProjectsPageRenderer.java             |   85 --
 .../gradle/api/reporting/model/ModelReport.java    |  104 --
 .../model/internal/ModelNodeRenderer.java          |  174 ---
 .../diagnostics/AbstractDependencyReportTask.java  |   99 --
 .../api/tasks/diagnostics/AbstractReportTask.java  |  124 --
 .../diagnostics/BuildEnvironmentReportTask.java    |   95 --
 .../diagnostics/DependencyInsightReportTask.groovy |  215 ---
 .../api/tasks/diagnostics/ProjectReportTask.java   |  100 --
 .../api/tasks/diagnostics/TaskReportTask.java      |   97 --
 .../diagnostics/internal/ReportGenerator.java      |   87 --
 .../tasks/diagnostics/internal/ReportRenderer.java |   70 -
 .../diagnostics/internal/TaskReportRenderer.java   |  164 ---
 .../diagnostics/internal/TextReportRenderer.java   |  119 --
 .../AsciiDependencyReportRenderer.java             |  109 --
 .../internal/graph/DependencyGraphRenderer.groovy  |   77 -
 .../diagnostics/internal/graph/NodeRenderer.groovy |   24 -
 .../internal/graph/SimpleNodeRenderer.java         |   35 -
 .../internal/graph/nodes/RequestedVersion.java     |   67 -
 .../insight/DependencyInsightReporter.groovy       |   70 -
 .../internal/text/DefaultTextReportBuilder.java    |  189 ---
 .../internal/text/TextReportBuilder.java           |   50 -
 .../main/groovy/org/gradle/configuration/Help.java |   99 --
 .../gradle/configuration/TaskDetailPrinter.java    |  227 ---
 .../org/gradle/api/plugins/HelpTasksPlugin.java    |    0
 .../gradle/api/plugins/ProjectReportsPlugin.java   |    0
 .../plugins/ProjectReportsPluginConvention.java    |   58 +
 .../plugins/internal/HelpTasksAutoApplyAction.java |    0
 .../api/reporting/components/ComponentReport.java  |  110 ++
 .../internal/AbstractBinaryRenderer.java           |    0
 .../components/internal/BinaryRenderer.java        |    0
 .../components/internal/ComponentRenderer.java     |    0
 .../internal/ComponentReportRenderer.java          |   98 ++
 .../components/internal/DiagnosticsServices.java   |    0
 .../components/internal/RendererUtils.java         |    0
 .../components/internal/SourceSetRenderer.java     |    0
 .../internal/TrackingReportRenderer.java           |    0
 .../internal/TypeAwareBinaryRenderer.java          |    0
 .../api/reporting/components/package-info.java     |    0
 .../dependencies/DependencyReportContainer.java    |   35 +
 .../dependencies/HtmlDependencyReportTask.java     |  138 ++
 .../internal/DefaultDependencyReportContainer.java |    0
 .../internal/HtmlDependencyReporter.java           |  100 ++
 .../internal/JsonProjectDependencyRenderer.java    |  304 ++++
 .../dependencies/internal/ProjectPageRenderer.java |   88 ++
 .../internal/ProjectsPageRenderer.java             |   85 ++
 .../internal/StrictDependencyResultSpec.java       |    0
 .../api/reporting/dependencies/package-info.java   |    0
 .../gradle/api/reporting/model/ModelReport.java    |  107 ++
 .../model/internal/ModelNodeRenderer.java          |  174 +++
 .../model/internal/TextModelReportRenderer.java    |    0
 .../gradle/api/reporting/model/package-info.java   |    0
 .../diagnostics/AbstractDependencyReportTask.java  |  107 ++
 .../api/tasks/diagnostics/AbstractReportTask.java  |  128 ++
 .../diagnostics/BuildEnvironmentReportTask.java    |   95 ++
 .../diagnostics/DependencyInsightReportTask.java   |  233 +++
 .../tasks/diagnostics/DependencyReportTask.java    |    0
 .../api/tasks/diagnostics/ProjectReportTask.java   |   99 ++
 .../api/tasks/diagnostics/PropertyReportTask.java  |    0
 .../api/tasks/diagnostics/TaskReportTask.java      |  105 ++
 .../AggregateMultiProjectTaskReportModel.java      |    0
 .../internal/DefaultGroupTaskReportModel.java      |    0
 .../internal/DependencyReportRenderer.java         |    0
 .../internal/ProjectReportGenerator.java           |    0
 .../internal/PropertyReportRenderer.java           |    0
 .../diagnostics/internal/ReportGenerator.java      |   87 ++
 .../tasks/diagnostics/internal/ReportRenderer.java |   70 +
 .../internal/SingleProjectTaskReportModel.java     |    0
 .../tasks/diagnostics/internal/TaskDetails.java    |    0
 .../diagnostics/internal/TaskDetailsFactory.java   |    0
 .../diagnostics/internal/TaskReportModel.java      |    0
 .../diagnostics/internal/TaskReportRenderer.java   |  164 +++
 .../diagnostics/internal/TextReportRenderer.java   |  119 ++
 .../AsciiDependencyReportRenderer.java             |  109 ++
 .../internal/dsl/DependencyResultSpec.java         |    0
 .../dsl/DependencyResultSpecNotationConverter.java |    0
 .../internal/graph/DependencyGraphRenderer.java    |   85 ++
 .../diagnostics/internal/graph/NodeRenderer.java   |   24 +
 .../internal/graph/SimpleNodeRenderer.java         |   35 +
 .../nodes/AbstractRenderableDependencyResult.java  |    0
 .../nodes/AbstractRenderableModuleResult.java      |    0
 .../internal/graph/nodes/DependencyEdge.java       |    0
 .../graph/nodes/DependencyReportHeader.java        |    0
 .../nodes/InvertedRenderableModuleResult.java      |    0
 .../internal/graph/nodes/RenderableDependency.java |    0
 .../graph/nodes/RenderableDependencyResult.java    |    0
 .../graph/nodes/RenderableModuleResult.java        |    0
 .../RenderableUnresolvedDependencyResult.java      |    0
 .../internal/graph/nodes/RequestedVersion.java     |   67 +
 .../graph/nodes/ResolvedDependencyEdge.java        |    0
 .../graph/nodes/UnresolvedDependencyEdge.java      |    0
 .../insight/DependencyInsightReporter.java         |   86 ++
 .../internal/insight/DependencyResultSorter.java   |    0
 .../internal/text/DefaultTextReportBuilder.java    |  189 +++
 .../internal/text/TextReportBuilder.java           |   50 +
 .../gradle/api/tasks/diagnostics/package-info.java |    0
 .../main/java/org/gradle/configuration/Help.java   |   99 ++
 .../gradle/configuration/TaskDetailPrinter.java    |  227 +++
 .../gradle/api/plugins/HelpTasksPluginSpec.groovy  |   12 +-
 .../api/plugins/ProjectReportsPluginTest.groovy    |    9 +-
 .../internal/ComponentRendererTest.groovy          |    2 +-
 .../internal/ComponentReportRendererTest.groovy    |    2 +-
 .../internal/SourceSetRendererTest.groovy          |    2 +-
 .../reporting/model/ModelReportParserTest.groovy   |   39 +-
 .../tasks/diagnostics/AbstractReportTaskTest.java  |    9 +-
 .../BuildEnvironmentReportTaskTest.groovy          |    8 +-
 .../DependencyInsightReportTaskSpec.groovy         |   10 +-
 .../diagnostics/DependencyReportTaskTest.groovy    |   22 +-
 .../tasks/diagnostics/ProjectReportTaskTest.groovy |    8 +-
 .../tasks/diagnostics/PropertyReportTaskTest.java  |   19 +-
 .../api/tasks/diagnostics/TaskReportTaskTest.java  |   16 +-
 .../internal/PropertyReportRendererTest.java       |    2 +-
 .../internal/ReportGeneratorTest.groovy            |   18 +-
 .../internal/TaskReportRendererTest.groovy         |    2 +-
 .../internal/TextReportRendererSpec.groovy         |  108 ++
 .../internal/TextReportRendererTest.groovy         |  116 --
 .../AsciiDependencyReportRendererTest.groovy       |    9 +-
 .../internal/dsl/DependencyResultSpecTest.groovy   |    6 +-
 .../graph/DependencyGraphRendererSpec.groovy       |    2 +-
 .../AbstractRenderableDependencyResultSpec.groovy  |   13 +-
 .../insight/DependencyResultSorterSpec.groovy      |   39 +-
 .../text/DefaultTextReportBuilderTest.groovy       |    2 +-
 .../AbstractComponentReportIntegrationTest.groovy  |    3 +-
 .../api/reporting/model/ModelReportParser.groovy   |   11 +-
 subprojects/distributions/distributions.gradle     |    3 -
 .../gradle/AllDistributionIntegrationSpec.groovy   |   10 -
 .../gradle/BinDistributionIntegrationSpec.groovy   |    5 -
 .../org/gradle/DistributionIntegrationSpec.groovy  |   14 +-
 .../gradle/SrcDistributionIntegrationSpec.groovy   |    2 +-
 .../distributions/src/toplevel/changelog.txt       |    3 +-
 subprojects/docs/docs.gradle                       |   65 +-
 subprojects/docs/src/docs/css/icon-link.svg        |   17 +
 subprojects/docs/src/docs/css/userguide.css        |   33 +-
 subprojects/docs/src/docs/dsl/dsl.xml              |   54 +-
 ...pi.initialization.ConfigurableIncludedBuild.xml |   41 +
 ...org.gradle.api.initialization.IncludedBuild.xml |   47 +
 .../dsl/org.gradle.api.initialization.Settings.xml |    5 +-
 .../docs/dsl/org.gradle.api.invocation.Gradle.xml  |    8 +-
 .../dsl/org.gradle.api.plugins.quality.Pmd.xml     |    5 +-
 .../src/docs/dsl/org.gradle.api.tasks.Sync.xml     |    9 +-
 .../docs/dsl/org.gradle.api.tasks.bundling.Jar.xml |    7 +-
 .../docs/dsl/org.gradle.api.tasks.bundling.Zip.xml |    6 +-
 .../dsl/org.gradle.api.tasks.javadoc.Groovydoc.xml |    2 +-
 ....gradle.api.tasks.scala.ScalaCompileOptions.xml |   10 +-
 .../docs/dsl/org.gradle.api.tasks.testing.Test.xml |    4 -
 .../dsl/org.gradle.api.tasks.wrapper.Wrapper.xml   |    4 +
 ...tSpec.xml => org.gradle.model.ModelElement.xml} |    0
 ...atform.test.cunit.CUnitTestSuiteBinarySpec.xml} |    0
 ...t.googletest.GoogleTestTestSuiteBinarySpec.xml} |    0
 .../dsl/org.gradle.platform.base.ComponentSpec.xml |    5 +-
 ...gradle.plugin.repository.GradlePluginPortal.xml |   38 +
 ...radle.plugin.repository.IvyPluginRepository.xml |   44 +
 ...dle.plugin.repository.MavenPluginRepository.xml |   44 +
 ...le.plugin.repository.PluginRepositoriesSpec.xml |   47 +
 ...g.gradle.plugin.repository.PluginRepository.xml |   38 +
 ...rg.gradle.plugins.ide.idea.model.IdeaModule.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 -
 subprojects/docs/src/docs/dsl/plugins.xml          |    4 -
 .../docs/src/docs/release/notes-template.md        |    6 +-
 subprojects/docs/src/docs/release/notes.md         |  364 +++--
 .../docs/src/docs/stylesheets/userGuideHtml.xsl    |   24 +-
 .../src/docs/stylesheets/userGuideHtmlCommon.xsl   |    7 +-
 .../src/docs/stylesheets/userGuideSingleHtml.xsl   |   13 +-
 .../docs/src/docs/userguide/announcePlugin.xml     |    4 +-
 subprojects/docs/src/docs/userguide/ant.xml        |   87 +-
 .../docs/src/docs/userguide/antlrPlugin.xml        |   14 +-
 .../docs/src/docs/userguide/applicationPlugin.xml  |   10 +-
 .../userguide/artifactDependenciesTutorial.xml     |   12 +-
 .../docs/src/docs/userguide/artifactMngmt.xml      |   12 +-
 .../docs/userguide/buildAnnouncementsPlugin.xml    |    2 +-
 .../src/docs/userguide/buildDashboardPlugin.xml    |   10 +-
 .../docs/src/docs/userguide/buildEnvironment.xml   |   25 +-
 .../docs/src/docs/userguide/buildInitPlugin.xml    |   22 +-
 .../docs/src/docs/userguide/buildLifecycle.xml     |   28 +-
 .../src/docs/userguide/buildScriptsTutorial.xml    |   27 +-
 .../src/docs/userguide/buildingJavaLibraries.xml   |   44 +-
 .../docs/src/docs/userguide/checkstylePlugin.xml   |   13 +-
 .../docs/src/docs/userguide/codeNarcPlugin.xml     |   12 +-
 .../docs/src/docs/userguide/commandLine.xml        |   45 +-
 .../src/docs/userguide/commandLineTutorial.xml     |   31 +-
 .../docs/src/docs/userguide/comparingBuilds.xml    |   16 +-
 .../docs/src/docs/userguide/compositeBuilds.xml    |  199 +++
 .../docs/src/docs/userguide/continuousBuild.xml    |   23 +-
 .../docs/src/docs/userguide/customPlugins.xml      |   44 +-
 .../docs/src/docs/userguide/customTasks.xml        |   20 +-
 subprojects/docs/src/docs/userguide/depMngmt.xml   |  128 +-
 .../docs/src/docs/userguide/distributionPlugin.xml |    8 +-
 subprojects/docs/src/docs/userguide/earPlugin.xml  |   16 +-
 .../docs/src/docs/userguide/eclipsePlugin.xml      |   35 +-
 subprojects/docs/src/docs/userguide/embedding.xml  |   84 +-
 .../docs/src/docs/userguide/featureLifecycle.xml   |    8 +-
 .../docs/src/docs/userguide/findBugsPlugin.xml     |   11 +-
 subprojects/docs/src/docs/userguide/glossary.xml   |    2 +-
 .../docs/src/docs/userguide/gradleDaemon.xml       |  140 +-
 .../docs/src/docs/userguide/gradleWrapper.xml      |   15 +-
 .../docs/src/docs/userguide/groovyPlugin.xml       |   33 +-
 .../docs/src/docs/userguide/groovyTutorial.xml     |    4 +-
 .../docs/src/docs/userguide/guiTutorial.xml        |    8 +-
 subprojects/docs/src/docs/userguide/ideaPlugin.xml |   20 +-
 .../docs/src/docs/userguide/img/pluginMarkers.png  |  Bin 0 -> 69520 bytes
 .../docs/userguide/img/taskInputsOutputs.graffle   |  776 ++++++++++
 .../src/docs/userguide/img/taskInputsOutputs.png   |  Bin 0 -> 133210 bytes
 .../docs/src/docs/userguide/initscripts.xml        |   14 +-
 .../docs/src/docs/userguide/installation.xml       |   23 +-
 .../src/docs/userguide/introMultiProjectBuilds.xml |   12 +-
 .../docs/src/docs/userguide/introduction.xml       |    2 +-
 .../docs/src/docs/userguide/jacocoPlugin.xml       |   12 +-
 .../docs/src/docs/userguide/javaGradlePlugin.xml   |   22 +-
 .../userguide/javaLibraryDistributionPlugin.xml    |    4 +-
 subprojects/docs/src/docs/userguide/javaPlugin.xml |   84 +-
 .../docs/src/docs/userguide/javaTutorial.xml       |   28 +-
 .../docs/src/docs/userguide/jdependPlugin.xml      |   11 +-
 .../docs/src/docs/userguide/jettyPlugin.xml        |   19 +-
 subprojects/docs/src/docs/userguide/licenses.xml   |   60 +
 subprojects/docs/src/docs/userguide/logging.xml    |    6 +-
 .../docs/src/docs/userguide/mavenPlugin.xml        |   24 +-
 .../docs/src/docs/userguide/multiproject.xml       |   64 +-
 .../docs/src/docs/userguide/nativeBinaries.xml     |   74 +-
 .../docs/src/docs/userguide/organizeBuildLogic.xml |    8 +-
 subprojects/docs/src/docs/userguide/osgi.xml       |   38 +-
 subprojects/docs/src/docs/userguide/overview.xml   |    4 +-
 subprojects/docs/src/docs/userguide/playPlugin.xml |   65 +-
 subprojects/docs/src/docs/userguide/plugins.xml    |  384 +++--
 subprojects/docs/src/docs/userguide/pmdPlugin.xml  |   11 +-
 .../docs/src/docs/userguide/potentialTraps.xml     |    4 +-
 .../docs/src/docs/userguide/projectReports.xml     |   10 +-
 .../docs/src/docs/userguide/publishingIvy.xml      |   12 +-
 .../docs/src/docs/userguide/publishingMaven.xml    |   20 +-
 subprojects/docs/src/docs/userguide/ruleSource.xml |    4 +-
 .../docs/src/docs/userguide/scalaPlugin.xml        |   88 +-
 .../docs/src/docs/userguide/signingPlugin.xml      |   18 +-
 .../docs/src/docs/userguide/softwareModel.xml      |   53 +-
 .../src/docs/userguide/softwareModelConcepts.xml   |    2 +-
 .../src/docs/userguide/softwareModelExtend.xml     |   26 +-
 .../docs/src/docs/userguide/sonarPlugin.xml        |  231 ---
 .../docs/src/docs/userguide/sonarRunnerPlugin.xml  |  356 -----
 .../docs/src/docs/userguide/standardPlugins.xml    |   48 +-
 subprojects/docs/src/docs/userguide/tasks.xml      |  785 +++++++++-
 subprojects/docs/src/docs/userguide/testKit.xml    |    8 +-
 .../docs/src/docs/userguide/troubleshooting.xml    |    6 +-
 subprojects/docs/src/docs/userguide/tutorials.xml  |    4 +-
 subprojects/docs/src/docs/userguide/userguide.xml  |    8 +-
 subprojects/docs/src/docs/userguide/warPlugin.xml  |   14 +-
 .../docs/src/docs/userguide/webTutorial.xml        |    6 +-
 .../docs/src/docs/userguide/workingWithFiles.xml   |   15 +-
 .../docs/src/docs/userguide/wrapperPlugin.xml      |    4 +-
 .../src/docs/userguide/writingBuildScripts.xml     |   30 +-
 .../docs/src/samples/compositeBuild/build.gradle   |   21 -
 .../compositeBuild/projects/project1/build.gradle  |    4 -
 .../projects/project1/settings.gradle              |   18 -
 .../compositeBuild/projects/project2/build.gradle  |   20 -
 .../projects/project2/settings.gradle              |   17 -
 .../compositeBuild/projects/project3/build.gradle  |   20 -
 .../projects/project3/settings.gradle              |   18 -
 .../docs/src/samples/compositeBuild/readme.xml     |   19 -
 .../src/samples/compositeBuild/settings.gradle     |    1 -
 .../src/samples/compositeBuilds/basic/README.md    |   66 +
 .../compositeBuilds/basic/composite/build.gradle   |   15 +
 .../basic/composite/settings.gradle                |    4 +
 .../compositeBuilds/basic/my-app/build.gradle      |   17 +
 .../basic/my-app/settings-composite.gradle         |    3 +
 .../compositeBuilds/basic/my-app/settings.gradle   |    1 +
 .../src/main/java/org/sample/myapp/Main.java       |   32 +
 .../compositeBuilds/basic/my-utils/build.gradle    |   19 +
 .../main/java/org/sample/numberutils/Numbers.java  |    5 +
 .../compositeBuilds/basic/my-utils/settings.gradle |    3 +
 .../main/java/org/sample/stringutils/Strings.java  |   13 +
 .../declared-substitution/README.md                |   37 +
 .../anonymous-library/build.gradle                 |    1 +
 .../anonymous-library/settings.gradle              |    1 +
 .../main/java/org/sample/numberutils/Numbers.java  |    5 +
 .../declared-substitution/my-app/build.gradle      |    8 +
 .../settings-without-declared-substitution.gradle  |   19 +
 .../declared-substitution/my-app/settings.gradle   |    7 +
 .../src/main/java/org/sample/myapp/Main.java       |   31 +
 .../hierarchical-multirepo/README.md               |  100 ++
 .../multirepo-app/build.gradle                     |   26 +
 .../modules/number-utils/build.gradle              |   18 +
 .../modules/number-utils/settings.gradle           |    1 +
 .../main/java/org/sample/numberutils/Numbers.java  |    5 +
 .../modules/string-utils/build.gradle              |   23 +
 .../modules/string-utils/settings.gradle           |    1 +
 .../main/java/org/sample/stringutils/Strings.java  |   13 +
 .../multirepo-app/settings.gradle                  |    5 +
 .../src/main/java/org/sample/myapp/Main.java       |   32 +
 .../samples/compositeBuilds/plugin-dev/README.md   |   60 +
 .../plugin-dev/consumer/build.gradle               |   13 +
 .../plugin-dev/consumer/settings.gradle            |    1 +
 .../plugin-dev/greeting-plugin/build.gradle        |   14 +
 .../plugin-dev/greeting-plugin/settings.gradle     |    1 +
 .../src/main/java/org/sample/GreetingPlugin.java   |   14 +
 .../src/main/java/org/sample/GreetingTask.java     |   15 +
 .../docs/src/samples/ear/earWithWar/build.gradle   |    4 +-
 .../samples/groovy/crossCompilation/build.gradle   |   40 +
 .../groovy/crossCompilation/gradle.properties      |    2 +
 .../src/samples/groovy/crossCompilation/readme.xml |    3 +
 .../src/main/groovy/org/gradle/GroovyPerson.groovy |    0
 .../src/main/groovy/org/gradle/JavaPerson.java     |    7 +
 .../src/main/groovy/org/gradle/PersonList.groovy   |    0
 .../src/main/java/org/gradle/Person.java           |    0
 .../src/test/groovy/org/gradle/PersonTest.groovy   |    0
 .../samples/groovy/customizedLayout/build.gradle   |    2 +-
 .../samples/groovy/mixedJavaAndGroovy/build.gradle |    2 +-
 .../multiproject/groovycDetector/build.gradle      |    2 +-
 .../groovy/multiproject/testproject/build.gradle   |    2 +-
 .../src/test/groovy/org/gradle/VersionTest.groovy  |    4 +-
 .../src/samples/groovy/quickstart/build.gradle     |    2 +-
 .../src/test/groovy/org/gradle/PersonTest.groovy   |    2 +-
 .../ivy-publish/multiple-publications/build.gradle |    2 +-
 .../docs/src/samples/java/base/build.gradle        |    2 +-
 .../src/samples/java/crossCompilation/build.gradle |   39 +
 .../java/crossCompilation/gradle.properties        |    2 +
 .../src/samples/java/crossCompilation/readme.xml   |    3 +
 .../src/main/java/org/gradle/Person.java           |    0
 .../src/main/resources/org/gradle/resource.xml     |    0
 .../src/test/java/org/gradle/PersonTest.java       |   34 +
 .../test/resources/org/gradle/test-resource.xml    |    0
 .../src/samples/java/customizedLayout/build.gradle |    4 +-
 .../docs/src/samples/java/quickstart/build.gradle  |    2 +-
 .../docs/src/samples/javaGradlePlugin/build.gradle |   15 +-
 .../gradle-plugins/simple-plugin.properties        |    1 -
 .../src/samples/maven/pomGeneration/build.gradle   |    1 +
 .../samples/native-binaries/cpp-exe/build.gradle   |   18 +-
 subprojects/docs/src/samples/osgi/build.gradle     |    2 +-
 .../samples/play/configure-compiler/build.gradle   |    3 +
 .../src/samples/plugins/consuming/build.gradle     |    6 +
 .../1.0.0/ivy-1.0.0.xml                            |    9 +
 .../1.0.0/ivy-1.0.0.xml.sha1                       |    1 +
 .../1.0.0/ivy-1.0.0.xml                            |    9 +
 .../1.0.0/ivy-1.0.0.xml.sha1                       |    1 +
 .../sample-plugins/1.0.0/ivy-1.0.0.xml             |   12 +
 .../sample-plugins/1.0.0/ivy-1.0.0.xml.sha1        |    1 +
 .../1.0.0/sample-plugins-1.0.0.jar.sha1            |    1 +
 ...g.gradle.sample.goodbye.gradle.plugin-1.0.0.pom |   15 +
 ...adle.sample.goodbye.gradle.plugin-1.0.0.pom.md5 |    1 +
 ...dle.sample.goodbye.gradle.plugin-1.0.0.pom.sha1 |    1 +
 .../maven-metadata.xml                             |   12 +
 .../maven-metadata.xml.md5                         |    1 +
 .../maven-metadata.xml.sha1                        |    1 +
 ...org.gradle.sample.hello.gradle.plugin-1.0.0.pom |   15 +
 ...gradle.sample.hello.gradle.plugin-1.0.0.pom.md5 |    1 +
 ...radle.sample.hello.gradle.plugin-1.0.0.pom.sha1 |    1 +
 .../maven-metadata.xml                             |   12 +
 .../maven-metadata.xml.md5                         |    1 +
 .../maven-metadata.xml.sha1                        |    1 +
 .../1.0.0/sample-plugins-1.0.0.jar.md5             |    1 +
 .../1.0.0/sample-plugins-1.0.0.jar.sha1            |    1 +
 .../sample-plugins/1.0.0/sample-plugins-1.0.0.pom  |    8 +
 .../1.0.0/sample-plugins-1.0.0.pom.md5             |    1 +
 .../1.0.0/sample-plugins-1.0.0.pom.sha1            |    1 +
 .../sample/sample-plugins/maven-metadata.xml       |   12 +
 .../sample/sample-plugins/maven-metadata.xml.md5   |    1 +
 .../sample/sample-plugins/maven-metadata.xml.sha1  |    1 +
 .../src/samples/plugins/consuming/settings.gradle  |   13 +
 .../src/samples/plugins/multiproject/build.gradle  |   31 +
 ...g.gradle.sample.goodbye.gradle.plugin-1.0.0.pom |   15 +
 ...adle.sample.goodbye.gradle.plugin-1.0.0.pom.md5 |    1 +
 ...dle.sample.goodbye.gradle.plugin-1.0.0.pom.sha1 |    1 +
 .../maven-metadata.xml                             |   12 +
 .../maven-metadata.xml.md5                         |    1 +
 .../maven-metadata.xml.sha1                        |    1 +
 ...org.gradle.sample.hello.gradle.plugin-1.0.0.pom |   15 +
 ...gradle.sample.hello.gradle.plugin-1.0.0.pom.md5 |    1 +
 ...radle.sample.hello.gradle.plugin-1.0.0.pom.sha1 |    1 +
 .../maven-metadata.xml                             |   12 +
 .../maven-metadata.xml.md5                         |    1 +
 .../maven-metadata.xml.sha1                        |    1 +
 .../1.0.0/sample-plugins-1.0.0.jar.md5             |    1 +
 .../1.0.0/sample-plugins-1.0.0.jar.sha1            |    1 +
 .../sample-plugins/1.0.0/sample-plugins-1.0.0.pom  |    8 +
 .../1.0.0/sample-plugins-1.0.0.pom.md5             |    1 +
 .../1.0.0/sample-plugins-1.0.0.pom.sha1            |    1 +
 .../sample/sample-plugins/maven-metadata.xml       |   12 +
 .../sample/sample-plugins/maven-metadata.xml.md5   |    1 +
 .../sample/sample-plugins/maven-metadata.xml.sha1  |    1 +
 .../samples/plugins/multiproject/settings.gradle   |   29 +
 .../src/samples/plugins/publishing/build.gradle    |   34 +
 .../src/samples/plugins/publishing/settings.gradle |    1 +
 .../org/gradle/sample/goodbye/GoodbyePlugin.java   |   18 +
 .../java/org/gradle/sample/hello/HelloPlugin.java  |   18 +
 subprojects/docs/src/samples/plugins/readme.xml    |   23 +
 .../samples/scala/crossCompilation/build.gradle    |   40 +
 .../scala/crossCompilation/gradle.properties       |    2 +
 .../src/samples/scala/crossCompilation/readme.xml  |    3 +
 .../src/main/java/org/gradle/sample/Person.java    |    0
 .../scala/org/gradle/sample/impl/JavaPerson.java   |    7 +
 .../scala/org/gradle/sample/impl/PersonImpl.scala  |    0
 .../scala/org/gradle/sample/impl/PersonList.scala  |    0
 .../test/scala/org/gradle/sample/PersonTest.scala  |   19 +
 .../docs/src/samples/sonar/advanced/build.gradle   |   42 -
 .../src/samples/sonar/multiProject/build.gradle    |   49 -
 .../src/samples/sonar/multiProject/settings.gradle |    1 -
 .../docs/src/samples/sonar/quickstart/build.gradle |   36 -
 .../src/samples/sonarRunner/advanced/build.gradle  |   32 -
 .../advanced/src/main/java/org/gradle/Person.java  |   32 -
 .../src/test/java/org/gradle/PersonTest.java       |   28 -
 .../samples/sonarRunner/multiProject/build.gradle  |   43 -
 .../sonarRunner/multiProject/settings.gradle       |    1 -
 .../samples/sonarRunner/quickstart/build.gradle    |   32 -
 .../src/test/java/org/gradle/PersonTest.java       |   12 -
 .../testing/testng/java-jdk14-passing/build.gradle |   16 -
 .../src/test/java/org/gradle/OkTest.java           |    7 -
 .../testing/testng/java-jdk15-passing/build.gradle |   17 -
 .../src/main/java/org/gradle/Ok.java               |    4 -
 .../testing/testng/java-passing/build.gradle       |   15 +
 .../src/main/java/org/gradle/Ok.java               |    0
 .../src/test/java/org/gradle/AbstractTest.java     |    0
 .../src/test/java/org/gradle/ConcreteTest.java     |    0
 .../src/test/java/org/gradle/OkTest.java           |    0
 .../src/test/java/org/gradle/SuiteCleanup.java     |    0
 .../src/test/java/org/gradle/SuiteSetup.java       |    0
 .../src/test/java/org/gradle/TestCleanup.java      |    0
 .../src/test/java/org/gradle/TestSetup.java        |    0
 .../toolingApi/composite-models/build.gradle       |   25 -
 .../projects/project1/build.gradle                 |    4 -
 .../projects/project1/settings.gradle              |    2 -
 .../projects/project2/build.gradle                 |    4 -
 .../projects/project2/settings.gradle              |    1 -
 .../projects/project3/build.gradle                 |    4 -
 .../projects/project3/settings.gradle              |    2 -
 .../samples/toolingApi/composite-models/readme.xml |    3 -
 .../src/main/java/org/gradle/sample/Main.java      |   91 --
 .../toolingApi/composite-tasks/build.gradle        |   25 -
 .../composite-tasks/projects/project1/build.gradle |    4 -
 .../projects/project1/settings.gradle              |    2 -
 .../composite-tasks/projects/project2/build.gradle |    4 -
 .../projects/project2/settings.gradle              |    1 -
 .../composite-tasks/projects/project3/build.gradle |    4 -
 .../projects/project3/settings.gradle              |    2 -
 .../samples/toolingApi/composite-tasks/readme.xml  |    3 -
 .../src/main/java/org/gradle/sample/Main.java      |  108 --
 .../toolingApi/customModel/tooling/build.gradle    |    9 +-
 .../src/samples/toolingApi/eclipse/build.gradle    |    7 +-
 .../docs/src/samples/toolingApi/idea/build.gradle  |    5 +-
 .../docs/src/samples/toolingApi/model/build.gradle |    5 +-
 .../src/samples/toolingApi/runBuild/build.gradle   |    9 +-
 .../samples/userguide/ant/antLogging/build.gradle  |    7 +
 .../artifacts/externalDependencies/build.gradle    |    4 +-
 .../src/samples/userguide/files/copy/build.gradle  |    1 +
 .../userguide/groovy/groovyDependency/build.gradle |    2 +-
 .../userguide/scala/zincDependency/build.gradle    |   11 +
 .../userguide/scala/zincOverride/build.gradle      |   17 +
 .../incrementalBuild/customTaskClass/build.gradle  |   85 ++
 .../main/java/org/example/ProcessTemplates.java    |   57 +
 .../org/example/ProcessTemplatesNoAnnotations.java |   45 +
 .../src/main/java/org/example/TemplateData.java    |   23 +
 .../main/java/org/example/TemplateEngineType.java  |    5 +
 .../customTaskClass/src/templates/README.md        |    1 +
 .../incrementalBuildAdvanced/build.gradle          |   84 ++
 .../src/main/java/org/example/Instrument.java      |   36 +
 .../main/java/org/example/ProcessTemplates.java    |   73 +
 .../src/main/java/org/example/TemplateData.java    |   23 +
 .../main/java/org/example/TemplateEngineType.java  |    5 +
 .../src/main/java/org/gradle/Person.java           |    0
 .../src/main/resources/org/gradle/resource.xml     |    0
 .../src/templates/README.md                        |    1 +
 .../src/test/java/org/gradle/PersonTest.java       |    0
 .../test/resources/org/gradle/test-resource.xml    |    0
 .../tutorial/groovyWithFlatDir/build.gradle        |   10 +-
 .../userguide/tutorial/projectReports/build.gradle |    2 +-
 .../src/samples/userguide/tutorial/rerun/README.md |    3 +
 .../samples/userguide/tutorial/rerun/build.gradle  |    8 +
 .../userguide/tutorial/rerun/build/README.md       |    3 +
 .../src/samples/userguideOutput/antLogging.out     |    6 +
 .../basicRuleSourcePlugin-model-task.out           |   32 +-
 .../userguideOutput/compositeBuilds_basic_cli.out  |   16 +
 .../customTaskClassWithInputOutputAnnotations.out  |    3 +
 ...TaskClassWithInputOutputAnnotationsUpToDate.out |    3 +
 .../userguideOutput/dependencyInsightReport.out    |    2 +-
 .../userguideOutput/dependencyListReport.out       |    4 +-
 .../userguideOutput/incrementalAdHocTask.out       |    3 +
 .../incrementalAdHocTaskUpToDate.out               |    3 +
 .../incrementalBuildBadInputFilesConfig.out        |    4 +
 .../incrementalBuildCustomMethods.out              |    3 +
 .../incrementalBuildCustomMethodsWithTaskArg.out   |    4 +
 .../incrementalBuildInputFilesConfig.out           |    5 +
 .../incrementalBuildInputFilesConfigUsingTask.out  |    5 +
 .../incrementalBuildUpToDateWhen.out               |    4 +
 .../incrementalBuildUpToDateWhenAgain.out          |    4 +
 .../samples/userguideOutput/inferredTaskDep.out    |    4 +
 .../samples/userguideOutput/inferredTaskDep2.out   |    4 +
 .../inferredTaskDependencyWithBuiltBy.out          |    5 +
 .../src/samples/userguideOutput/noRerunTasks.out   |    1 +
 .../samples/userguideOutput/propertyListReport.out |    2 +-
 .../src/samples/userguideOutput/rerunTasks.out     |    1 +
 .../userguideOutput/runtimeIncrementalApi.out      |    3 +
 .../runtimeIncrementalApiConfiguration.out         |    3 +
 .../runtimeIncrementalApiUpToDate.out              |    3 +
 .../softwareModelExtend-iv-model.out               |    8 +-
 .../plugins/ear/EarPluginIntegrationTest.groovy    |  161 ++-
 .../main/groovy/org/gradle/plugins/ear/Ear.groovy  |  138 --
 .../gradle/plugins/ear/EarPluginConvention.groovy  |  100 --
 .../ear/descriptor/DeploymentDescriptor.java       |  225 ---
 .../gradle/plugins/ear/descriptor/EarModule.java   |   52 -
 .../plugins/ear/descriptor/EarSecurityRole.java    |   37 -
 .../plugins/ear/descriptor/EarWebModule.java       |   29 -
 .../internal/DefaultDeploymentDescriptor.groovy    |  289 ----
 .../descriptor/internal/DefaultEarModule.groovy    |   69 -
 .../internal/DefaultEarSecurityRole.groovy         |   60 -
 .../descriptor/internal/DefaultEarWebModule.groovy |   42 -
 .../src/main/java/org/gradle/plugins/ear/Ear.java  |  192 +++
 .../org/gradle/plugins/ear/EarPlugin.java          |    0
 .../gradle/plugins/ear/EarPluginConvention.java    |  126 ++
 .../ear/descriptor/DeploymentDescriptor.java       |  225 +++
 .../gradle/plugins/ear/descriptor/EarModule.java   |   52 +
 .../plugins/ear/descriptor/EarSecurityRole.java    |   37 +
 .../plugins/ear/descriptor/EarWebModule.java       |   29 +
 .../internal/DefaultDeploymentDescriptor.java      |  439 ++++++
 .../ear/descriptor/internal/DefaultEarModule.java  |   91 ++
 .../internal/DefaultEarSecurityRole.java           |   80 ++
 .../descriptor/internal/DefaultEarWebModule.java   |   54 +
 .../plugins/ear/descriptor/package-info.java       |    0
 .../org/gradle/plugins/ear/package-info.java       |    0
 .../org/gradle/plugins/ear/EarPluginTest.groovy    |  236 +--
 .../groovy/org/gradle/plugins/ear/EarTest.groovy   |   80 +-
 .../DefaultDeploymentDescriptorTest.groovy         |   69 +-
 .../internal/DefaultEarModuleTest.groovy           |   39 +
 subprojects/ide-native/ide-native.gradle           |    1 -
 .../groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy  |   80 --
 .../gradle/ide/cdt/model/CprojectDescriptor.groovy |  117 --
 .../gradle/ide/cdt/model/CprojectSettings.groovy   |  102 --
 .../gradle/ide/cdt/model/ProjectDescriptor.groovy  |   48 -
 .../gradle/ide/cdt/model/ProjectSettings.groovy    |   43 -
 .../ide/cdt/tasks/GenerateMetadataFileTask.groovy  |   53 -
 .../internal/DefaultVisualStudioProject.groovy     |  152 --
 .../internal/DefaultVisualStudioProject.java       |  172 +++
 .../internal/DefaultVisualStudioSolution.groovy    |  111 --
 .../internal/DefaultVisualStudioSolution.java      |  125 ++
 ...ecutableVisualStudioProjectConfiguration.groovy |   47 -
 ...ExecutableVisualStudioProjectConfiguration.java |   52 +
 .../VisualStudioProjectConfiguration.groovy        |  107 --
 .../internal/VisualStudioProjectConfiguration.java |  128 ++
 .../visualstudio/plugins/VisualStudioPlugin.java   |    4 +-
 .../tasks/GenerateFiltersFileTask.groovy           |   66 -
 .../tasks/GenerateFiltersFileTask.java             |   78 +
 .../tasks/GenerateProjectFileTask.groovy           |  112 --
 .../tasks/GenerateProjectFileTask.java             |  150 ++
 .../tasks/GenerateSolutionFileTask.groovy          |   71 -
 .../tasks/GenerateSolutionFileTask.java            |   90 ++
 .../ide/visualstudio/tasks/package-info.java       |   21 +
 .../org.gradle.eclipse-cdt.properties              |    1 -
 .../gradle/ide/cdt/model/defaultCproject-linux.xml |  114 --
 .../gradle/ide/cdt/model/defaultCproject-macos.xml |  115 --
 .../org/gradle/ide/cdt/model/defaultProject.xml    |   83 --
 .../ide/cdt/model/CprojectSettingsSpec.groovy      |   58 -
 .../ide/cdt/model/ProjectDescriptorSpec.groovy     |   48 -
 .../internal/VisualStudioFiltersFileTest.groovy    |    6 +-
 .../internal/VisualStudioProjectFileTest.groovy    |   10 +-
 .../internal/VisualStudioSolutionFileTest.groovy   |    8 +-
 subprojects/ide-play/ide-play.gradle               |   31 +
 .../ide/PlayIdePluginIntegrationTest.groovy        |   50 +
 .../PlayIdeaPluginAdvancedIntegrationTest.groovy   |   42 +
 .../ide/PlayIdeaPluginBasicIntegrationTest.groovy  |  130 ++
 .../ide/PlayIdeaPluginIntegrationTest.groovy       |  155 ++
 ...layIdeaPluginMultiprojectIntegrationTest.groovy |   59 +
 .../org/gradle/play/plugins/ide/PlayIdePlugin.java |   43 +
 .../play/plugins/ide/internal/PlayIdeaPlugin.java  |  139 ++
 .../org/gradle/play/plugins/ide/package-info.java  |   21 +
 .../gradle-plugins/org.gradle.play-ide.properties  |   17 +
 subprojects/ide/ide.gradle                         |    4 +
 .../AbstractIdeDeduplicationIntegrationTest.groovy |   26 +-
 .../plugins/ide/AbstractIdeIntegrationSpec.groovy  |   19 +-
 .../plugins/ide/AbstractIdeIntegrationTest.groovy  |   11 +-
 .../eclipse/AbstractEclipseIntegrationTest.groovy  |    4 +
 .../eclipse/EclipseClasspathIntegrationTest.groovy |   38 +-
 ...mSourceAndJavadocLocationIntegrationTest.groovy |   58 +
 .../ide/eclipse/EclipseIntegrationTest.groovy      |    1 +
 .../EclipseLinkedResourceIntegrationTest.groovy    |   29 +
 .../EclipseMultiModuleIntegrationTest.groovy       |   32 +
 .../eclipse/EclipseProjectIntegrationTest.groovy   |    7 +-
 .../ide/eclipse/EclipseWtpComponentFixture.groovy  |    9 +
 .../EclipseWtpEarProjectIntegrationTest.groovy     |   94 +-
 .../EclipseWtpEmptyProjectIntegrationTest.groovy   |    9 +-
 .../ide/eclipse/EclipseWtpIntegrationTest.groovy   |   54 +-
 ...seWtpJavaEarSingleProjectIntegrationTest.groovy |  103 +-
 .../EclipseWtpJavaProjectIntegrationTest.groovy    |   30 +-
 .../eclipse/EclipseWtpModelIntegrationTest.groovy  |  155 +-
 ...lipseWtpWebAndJavaProjectIntegrationTest.groovy |   75 +-
 .../EclipseWtpWebProjectIntegrationTest.groovy     |   35 +-
 .../plugins/ide/idea/IdeaIntegrationTest.groovy    |   22 +-
 .../IdeaJavaLanguageSettingsIntegrationTest.groovy |    7 +-
 .../plugins/ide/idea/IdeaModuleFixture.groovy      |  151 --
 .../ide/idea/IdeaModuleIntegrationTest.groovy      |    2 +-
 .../ide/idea/IdeaMultiModuleIntegrationTest.groovy |   38 +
 .../plugins/ide/idea/IdeaProjectFixture.groovy     |   47 -
 ...IdeaSourcesAndJavadocJarsIntegrationTest.groovy |    3 +-
 .../expectedFiles/apiClasspath.xml                 |    8 +-
 .../expectedFiles/commonClasspath.xml              |   15 +-
 .../expectedFiles/webAppJava6Classpath.xml         |   15 +-
 .../expectedFiles/webAppJava6WtpComponent.xml      |    9 -
 .../expectedFiles/webAppWithVarsClasspath.xml      |    7 +-
 .../expectedFiles/webAppWithVarsWtpComponent.xml   |    3 -
 .../expectedFiles/webserviceClasspath.xml          |   21 +-
 .../expectedFiles/webserviceWtpComponent.xml       |    6 -
 .../canCreateAndDeleteMetaData/master/build.gradle |    9 -
 .../expectedFiles/root.ipr.xml                     |    2 +
 .../expectedFiles/root.ipr.xml                     |    2 +
 .../expectedFiles/root.ipr.xml                     |    2 +
 .../expectedFiles/root/root.ipr.xml                |    2 +
 .../plugins/ide/api/FileContentMerger.groovy       |   61 -
 .../gradle/plugins/ide/api/FileContentMerger.java  |  110 ++
 .../org/gradle/plugins/ide/api/GeneratorTask.java  |   26 +-
 .../ide/api/PropertiesFileContentMerger.groovy     |   44 -
 .../ide/api/PropertiesFileContentMerger.java       |   74 +
 .../plugins/ide/api/PropertiesGeneratorTask.java   |    6 +-
 .../plugins/ide/api/XmlFileContentMerger.groovy    |   46 -
 .../plugins/ide/api/XmlFileContentMerger.java      |   72 +
 .../gradle/plugins/ide/api/XmlGeneratorTask.java   |    6 +-
 .../plugins/ide/eclipse/EclipsePlugin.groovy       |  222 ---
 .../gradle/plugins/ide/eclipse/EclipsePlugin.java  |  401 ++++++
 .../plugins/ide/eclipse/EclipseWtpPlugin.groovy    |  241 ----
 .../plugins/ide/eclipse/EclipseWtpPlugin.java      |  370 +++++
 .../ide/eclipse/GenerateEclipseClasspath.groovy    |   46 -
 .../ide/eclipse/GenerateEclipseClasspath.java      |   57 +
 .../plugins/ide/eclipse/GenerateEclipseJdt.groovy  |   50 -
 .../plugins/ide/eclipse/GenerateEclipseJdt.java    |   62 +
 .../ide/eclipse/GenerateEclipseProject.groovy      |   48 -
 .../ide/eclipse/GenerateEclipseProject.java        |   59 +
 .../ide/eclipse/GenerateEclipseWtpComponent.groovy |   47 -
 .../ide/eclipse/GenerateEclipseWtpComponent.java   |   60 +
 .../ide/eclipse/GenerateEclipseWtpFacet.groovy     |   48 -
 .../ide/eclipse/GenerateEclipseWtpFacet.java       |   61 +
 .../ide/eclipse/internal/AfterEvaluateHelper.java  |   43 +
 .../ide/eclipse/internal/EclipseNameDeduper.groovy |   36 -
 .../ide/eclipse/internal/EclipseNameDeduper.java   |   89 ++
 .../eclipse/internal/LinkedResourcesCreator.groovy |   31 -
 .../eclipse/internal/LinkedResourcesCreator.java   |   46 +
 .../eclipse/model/AbstractClasspathEntry.groovy    |  153 --
 .../ide/eclipse/model/AbstractClasspathEntry.java  |  240 ++++
 .../ide/eclipse/model/AbstractLibrary.groovy       |  110 --
 .../plugins/ide/eclipse/model/AbstractLibrary.java |  128 ++
 .../plugins/ide/eclipse/model/AccessRule.groovy    |   55 -
 .../plugins/ide/eclipse/model/AccessRule.java      |   77 +
 .../plugins/ide/eclipse/model/BuildCommand.groovy  |   57 -
 .../plugins/ide/eclipse/model/BuildCommand.java    |   79 ++
 .../plugins/ide/eclipse/model/Classpath.groovy     |  109 --
 .../plugins/ide/eclipse/model/Classpath.java       |  161 +++
 .../plugins/ide/eclipse/model/Container.groovy     |   34 -
 .../plugins/ide/eclipse/model/Container.java       |   43 +
 .../ide/eclipse/model/EclipseClasspath.groovy      |  238 ----
 .../ide/eclipse/model/EclipseClasspath.java        |  323 +++++
 .../ide/eclipse/model/EclipseDomainModel.groovy    |   26 -
 .../plugins/ide/eclipse/model/EclipseJdt.groovy    |  113 --
 .../plugins/ide/eclipse/model/EclipseJdt.java      |  141 ++
 .../plugins/ide/eclipse/model/EclipseModel.groovy  |  139 --
 .../plugins/ide/eclipse/model/EclipseModel.java    |  177 +++
 .../ide/eclipse/model/EclipseProject.groovy        |  278 ----
 .../plugins/ide/eclipse/model/EclipseProject.java  |  312 ++++
 .../plugins/ide/eclipse/model/EclipseWtp.groovy    |   95 --
 .../plugins/ide/eclipse/model/EclipseWtp.java      |  102 ++
 .../ide/eclipse/model/EclipseWtpComponent.groovy   |  273 ----
 .../ide/eclipse/model/EclipseWtpComponent.java     |  373 +++++
 .../ide/eclipse/model/EclipseWtpFacet.groovy       |  115 --
 .../plugins/ide/eclipse/model/EclipseWtpFacet.java |  133 ++
 .../gradle/plugins/ide/eclipse/model/Facet.groovy  |   98 --
 .../gradle/plugins/ide/eclipse/model/Facet.java    |  122 ++
 .../plugins/ide/eclipse/model/Library.groovy       |   37 -
 .../gradle/plugins/ide/eclipse/model/Library.java  |   44 +
 .../gradle/plugins/ide/eclipse/model/Link.groovy   |   62 -
 .../org/gradle/plugins/ide/eclipse/model/Link.java |  112 ++
 .../ide/eclipse/model/NonRenamableProject.java     |  127 ++
 .../gradle/plugins/ide/eclipse/model/Output.groovy |   62 -
 .../gradle/plugins/ide/eclipse/model/Output.java   |   86 ++
 .../plugins/ide/eclipse/model/Project.groovy       |  213 ---
 .../gradle/plugins/ide/eclipse/model/Project.java  |  285 ++++
 .../ide/eclipse/model/ProjectDependency.groovy     |   61 -
 .../ide/eclipse/model/ProjectDependency.java       |   80 ++
 .../plugins/ide/eclipse/model/SourceFolder.groovy  |  105 --
 .../plugins/ide/eclipse/model/SourceFolder.java    |  165 +++
 .../plugins/ide/eclipse/model/Variable.groovy      |   37 -
 .../gradle/plugins/ide/eclipse/model/Variable.java |   44 +
 .../ide/eclipse/model/WbDependentModule.groovy     |   67 -
 .../ide/eclipse/model/WbDependentModule.java       |  101 ++
 .../plugins/ide/eclipse/model/WbModuleEntry.java   |   26 +
 .../plugins/ide/eclipse/model/WbProperty.groovy    |   64 -
 .../plugins/ide/eclipse/model/WbProperty.java      |   92 ++
 .../plugins/ide/eclipse/model/WbResource.groovy    |   66 -
 .../plugins/ide/eclipse/model/WbResource.java      |   95 ++
 .../plugins/ide/eclipse/model/WtpComponent.groovy  |  119 --
 .../plugins/ide/eclipse/model/WtpComponent.java    |  166 +++
 .../plugins/ide/eclipse/model/WtpFacet.groovy      |   77 -
 .../gradle/plugins/ide/eclipse/model/WtpFacet.java |  114 ++
 .../model/internal/ClassFoldersCreator.groovy      |   39 -
 .../model/internal/ClassFoldersCreator.java        |   44 +
 .../eclipse/model/internal/ClasspathFactory.groovy |  117 --
 .../eclipse/model/internal/ClasspathFactory.java   |   79 ++
 .../model/internal/EclipseDependenciesCreator.java |  109 ++
 .../model/internal/FileReferenceFactory.groovy     |  139 --
 .../model/internal/FileReferenceFactory.java       |  165 +++
 .../ide/eclipse/model/internal/PathUtil.groovy     |   24 -
 .../ide/eclipse/model/internal/PathUtil.java       |   25 +
 .../model/internal/ProjectDependencyBuilder.java   |   38 +-
 .../model/internal/SourceFoldersCreator.groovy     |  149 --
 .../model/internal/SourceFoldersCreator.java       |  220 +++
 .../internal/WtpClasspathAttributeSupport.java     |  117 ++
 .../model/internal/WtpComponentFactory.groovy      |  119 --
 .../model/internal/WtpComponentFactory.java        |  143 ++
 .../plugins/ide/idea/GenerateIdeaModule.groovy     |   59 -
 .../plugins/ide/idea/GenerateIdeaModule.java       |   74 +
 .../plugins/ide/idea/GenerateIdeaProject.groovy    |   53 -
 .../plugins/ide/idea/GenerateIdeaProject.java      |   69 +
 .../plugins/ide/idea/GenerateIdeaWorkspace.groovy  |   39 -
 .../plugins/ide/idea/GenerateIdeaWorkspace.java    |   52 +
 .../org/gradle/plugins/ide/idea/IdeaPlugin.groovy  |  240 ----
 .../org/gradle/plugins/ide/idea/IdeaPlugin.java    |  443 ++++++
 .../ide/idea/internal/IdeaNameDeduper.groovy       |   33 -
 .../plugins/ide/idea/internal/IdeaNameDeduper.java |   83 ++
 .../ide/idea/internal/IdeaScalaConfigurer.groovy   |  167 ---
 .../ide/idea/internal/IdeaScalaConfigurer.java     |  240 ++++
 .../gradle/plugins/ide/idea/model/FilePath.groovy  |   33 -
 .../gradle/plugins/ide/idea/model/FilePath.java    |   35 +
 .../ide/idea/model/IdeaLanguageLevel.groovy        |   53 -
 .../plugins/ide/idea/model/IdeaLanguageLevel.java  |   60 +
 .../gradle/plugins/ide/idea/model/IdeaModel.groovy |  100 --
 .../gradle/plugins/ide/idea/model/IdeaModel.java   |  114 ++
 .../plugins/ide/idea/model/IdeaModule.groovy       |  378 -----
 .../gradle/plugins/ide/idea/model/IdeaModule.java  |  566 ++++++++
 .../plugins/ide/idea/model/IdeaModuleIml.groovy    |   40 -
 .../plugins/ide/idea/model/IdeaModuleIml.java      |   49 +
 .../plugins/ide/idea/model/IdeaProject.groovy      |  220 ---
 .../gradle/plugins/ide/idea/model/IdeaProject.java |  313 ++++
 .../plugins/ide/idea/model/IdeaWorkspace.groovy    |   65 -
 .../plugins/ide/idea/model/IdeaWorkspace.java      |   71 +
 .../plugins/ide/idea/model/JarDirectory.groovy     |   64 -
 .../plugins/ide/idea/model/JarDirectory.java       |   86 ++
 .../org/gradle/plugins/ide/idea/model/Jdk.groovy   |   85 --
 .../org/gradle/plugins/ide/idea/model/Jdk.java     |  127 ++
 .../gradle/plugins/ide/idea/model/Module.groovy    |  390 -----
 .../org/gradle/plugins/ide/idea/model/Module.java  |  506 +++++++
 .../plugins/ide/idea/model/ModuleDependency.groovy |   89 --
 .../plugins/ide/idea/model/ModuleDependency.java   |  136 ++
 .../plugins/ide/idea/model/ModuleLibrary.groovy    |  135 --
 .../plugins/ide/idea/model/ModuleLibrary.java      |  212 +++
 .../org/gradle/plugins/ide/idea/model/Path.groovy  |   73 -
 .../org/gradle/plugins/ide/idea/model/Path.java    |   82 ++
 .../plugins/ide/idea/model/PathFactory.groovy      |  170 ---
 .../gradle/plugins/ide/idea/model/PathFactory.java |  218 +++
 .../gradle/plugins/ide/idea/model/Project.groovy   |  249 ----
 .../org/gradle/plugins/ide/idea/model/Project.java |  349 +++++
 .../plugins/ide/idea/model/ProjectLibrary.groovy   |  135 --
 .../plugins/ide/idea/model/ProjectLibrary.java     |  175 +++
 .../ide/idea/model/SingleEntryModuleLibrary.groovy |   98 --
 .../ide/idea/model/SingleEntryModuleLibrary.java   |  114 ++
 .../gradle/plugins/ide/idea/model/Workspace.groovy |   39 -
 .../gradle/plugins/ide/idea/model/Workspace.java   |   42 +
 .../idea/model/internal/GeneratedIdeaScope.java    |    2 +-
 .../model/internal/IdeaDependenciesProvider.java   |   45 +-
 .../model/internal/ModuleDependencyBuilder.java    |   23 +-
 .../org/gradle/plugins/ide/idea/package-info.java  |    0
 .../ide/internal/IdeDependenciesExtractor.java     |   17 +-
 .../gradle/plugins/ide/internal/IdePlugin.groovy   |   75 -
 .../org/gradle/plugins/ide/internal/IdePlugin.java |   98 ++
 .../internal/configurer/DeduplicationTarget.groovy |   27 -
 .../HierarchicalElementDeduplicator.java           |  242 ++++
 .../internal/configurer/ModuleNameDeduper.groovy   |  111 --
 .../configurer/NameDeduplicationAdapter.java       |   41 +
 .../ide/internal/configurer/ProjectDeduper.groovy  |   42 -
 .../AbstractPersistableConfigurationObject.groovy  |   71 -
 .../AbstractPersistableConfigurationObject.java    |   82 ++
 ...PropertiesPersistableConfigurationObject.groovy |   49 -
 .../PropertiesPersistableConfigurationObject.java  |   55 +
 .../XmlPersistableConfigurationObject.groovy       |   65 -
 .../XmlPersistableConfigurationObject.java         |  122 ++
 .../PersistableConfigurationObjectGenerator.java   |    3 +
 .../internal/tooling/BasicIdeaModelBuilder.java    |    2 +
 .../internal/tooling/BuildEnvironmentBuilder.java  |    2 +
 .../internal/tooling/BuildInvocationsBuilder.java  |    7 +-
 .../ide/internal/tooling/EclipseModelBuilder.java  |  149 +-
 .../ide/internal/tooling/GradleBuildBuilder.java   |    3 +
 .../ide/internal/tooling/GradleProjectBuilder.java |    4 +-
 .../ide/internal/tooling/IdeaModelBuilder.java     |   60 +-
 .../ide/internal/tooling/PublicationsBuilder.java  |    4 +-
 .../ide/internal/tooling/ToolingModelServices.java |   66 +
 .../tooling/ToolingRegistrationAction.java         |   42 -
 .../tooling/eclipse/DefaultAccessRule.java         |   38 +
 .../tooling/eclipse/DefaultClasspathAttribute.java |   37 +
 .../eclipse/DefaultEclipseBuildCommand.java        |    2 +-
 .../eclipse/DefaultEclipseClasspathContainer.java  |   42 +
 .../eclipse/DefaultEclipseClasspathEntry.java      |   39 +
 .../tooling/eclipse/DefaultEclipseDependency.java  |   31 +
 .../eclipse/DefaultEclipseExternalDependency.java  |   23 +-
 .../eclipse/DefaultEclipseOutputLocation.java      |   32 +
 .../tooling/eclipse/DefaultEclipseProject.java     |   22 +-
 .../eclipse/DefaultEclipseProjectDependency.java   |   24 +-
 .../eclipse/DefaultEclipseProjectNature.java       |    2 +-
 .../eclipse/DefaultEclipseSourceDirectory.java     |   27 +-
 .../tooling/eclipse/DefaultEclipseTask.java        |    2 +-
 .../tooling/idea/DefaultIdeaCompilerOutput.java    |    3 +
 .../tooling/idea/DefaultIdeaContentRoot.java       |    3 +-
 .../tooling/idea/DefaultIdeaDependencyScope.java   |    9 +-
 .../tooling/idea/DefaultIdeaLanguageLevel.java     |    9 +-
 .../internal/tooling/idea/DefaultIdeaModule.java   |    1 +
 .../tooling/idea/DefaultIdeaModuleDependency.java  |   13 +-
 .../DefaultIdeaSingleEntryLibraryDependency.java   |    2 +
 .../internal/idea/DefaultIdeaModuleDependency.java |   27 -
 .../DefaultIdeaSingleEntryLibraryDependency.java   |   27 -
 .../resolver/DefaultIdeDependencyResolver.java     |   30 +-
 .../resolver/UnresolvedDependenciesLogger.java     |    1 +
 .../ide/internal/resolver/model/IdeDependency.java |    8 -
 .../internal/resolver/model/IdeDependencyKey.java  |    8 +-
 .../model/IdeExtendedRepoFileDependency.java       |    4 +-
 .../resolver/model/IdeLocalFileDependency.java     |    3 +-
 .../resolver/model/IdeProjectDependency.java       |   35 +-
 .../resolver/model/IdeRepoFileDependency.java      |    3 +-
 .../model/UnresolvedIdeRepoFileDependency.java     |    4 +-
 ...le.configuration.project.ProjectConfigureAction |    1 -
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../plugins/ide/eclipse/EclipsePluginTest.groovy   |   14 +-
 .../ide/eclipse/EclipseWtpPluginTest.groovy        |   29 +-
 .../eclipse/GenerateEclipseWtpComponentTest.groovy |    3 +-
 .../ide/eclipse/GenerateEclipseWtpFacetTest.groovy |    3 +-
 .../plugins/ide/eclipse/model/ClasspathTest.groovy |   55 +-
 .../ide/eclipse/model/EclipseModelTest.groovy      |    8 +-
 .../ide/eclipse/model/EclipseProjectTest.groovy    |    6 +-
 .../ide/eclipse/model/ProjectDependencyTest.groovy |    4 +-
 .../internal/ProjectDependencyBuilderTest.groovy   |   37 +-
 .../plugins/ide/idea/GenerateIdeaModuleTest.groovy |   15 +-
 .../gradle/plugins/ide/idea/IdeaPluginTest.groovy  |   18 +-
 .../plugins/ide/idea/model/IdeaModuleTest.groovy   |   10 +-
 .../plugins/ide/idea/model/IdeaProjectTest.groovy  |   12 +-
 .../plugins/ide/idea/model/ModuleTest.groovy       |    8 +
 .../internal/IdeaDependenciesProviderTest.groovy   |   28 +-
 .../internal/ModuleDependencyBuilderTest.groovy    |   31 +-
 .../plugins/ide/internal/GeneratorTaskTest.groovy  |   15 +-
 .../plugins/ide/internal/IdePluginTest.groovy      |    6 +-
 .../HierarchicalElementDeduplicatorTest.groovy     |  314 ++++
 .../configurer/ModuleNameDeduperTest.groovy        |  163 ---
 .../internal/configurer/ProjectDeduperTest.groovy  |   43 -
 .../tooling/BuildInvocationsBuilderTest.groovy     |   18 +-
 .../internal/tooling/GradleBuildBuilderTest.groovy |   16 +-
 .../tooling/GradleProjectBuilderTest.groovy        |   16 +-
 .../tooling/ProjectPublicationsBuilderTest.groovy  |   10 +-
 .../ide/internal/tooling/TasksFactoryTest.groovy   |    6 +-
 .../tooling/eclipse/EclipseModelBuilderTest.groovy |   71 +-
 .../tooling/idea/IdeaModelBuilderTest.groovy       |   20 +-
 .../ide/idea/model/moduleWithoutContent.xml        |    6 +
 .../plugins/ide/fixtures/IdeaFixtures.groovy       |   33 +
 .../plugins/ide/fixtures/IdeaModuleFixture.groovy  |  214 +++
 .../plugins/ide/fixtures/IdeaProjectFixture.groovy |   76 +
 subprojects/integ-test/integ-test.gradle           |    4 +-
 .../integtests/ApplicationIntegrationSpec.groovy   |   22 +-
 .../BuildAggregationIntegrationTest.groovy         |   62 +-
 .../BuildScriptClasspathIntegrationTest.java       |    4 -
 .../integtests/CacheProjectIntegrationTest.groovy  |    6 +-
 .../integtests/ClosureScopeIntegrationTest.groovy  |   53 +
 .../integtests/CommandLineIntegrationTest.groovy   |    2 +-
 ...figurationOnDemandPluginsIntegrationTest.groovy |   54 +
 .../integtests/CustomPluginIntegrationTest.groovy  |   10 +-
 ...fferentJnaVersionInPluginIntegrationSpec.groovy |   56 +
 .../gradle/integtests/ExecIntegrationTest.groovy   |  123 +-
 .../GroovyToJavaConversionIntegrationTest.groovy   |   69 +
 ...ementalGroovyProjectBuildIntegrationTest.groovy |    1 +
 ...latedAntBuilderMemoryLeakIntegrationTest.groovy |   11 +-
 .../JavaProjectCrossVersionIntegrationTest.groovy  |    7 +-
 .../OsgiProjectSampleIntegrationTest.groovy        |   33 +-
 .../ParallelProjectExecutionIntegrationTest.groovy |    1 -
 .../ParallelTaskExecutionIntegrationTest.groovy    |    2 -
 ...luginBinaryCompatibilityCrossVersionSpec.groovy |   82 ++
 .../integtests/ProjectLayoutIntegrationTest.groovy |    2 +-
 .../ScriptClassloadingIntegrationTest.groovy       |   96 ++
 .../integtests/SyncTaskIntegrationTest.groovy      |  291 +++-
 ...ssingBinaryCompatibilityCrossVersionSpec.groovy |  156 +-
 .../TaskUpToDateCrossVersionIntegrationTest.groovy |   40 +
 .../integtests/TaskUpToDateIntegrationTest.groovy  |   71 +
 .../BuildEnvironmentIntegrationTest.groovy         |    5 +-
 .../logging/LoggerIsEnabledIntegrationTest.groovy  |   37 -
 .../AutoTestedSamplesCoreIntegrationTest.groovy    |    2 +-
 .../SamplesCodeQualityIntegrationTest.groovy       |    7 +-
 .../SamplesCustomPluginIntegrationTest.groovy      |    2 -
 .../samples/SamplesJavaBaseIntegrationTest.groovy  |   11 +-
 .../SamplesJavaOnlyIfIntegrationTest.groovy        |   18 +-
 ...esJavaProjectWithIntTestsIntegrationTest.groovy |    5 +-
 .../SamplesJavaQuickstartIntegrationTest.groovy    |   26 +-
 ...mplesMultiProjectBuildSrcIntegrationTest.groovy |    2 -
 .../SamplesWebProjectIntegrationTest.groovy        |   16 +-
 .../SamplesWebQuickstartIntegrationTest.groovy     |    6 +-
 .../samples/UserGuideSamplesRunner.groovy          |   27 +-
 .../canExecuteCommands/canExecuteCommands.gradle   |   31 -
 .../canExecuteJava/canExecuteJava.gradle           |   29 -
 .../shared/build.gradle                            |   20 -
 .../logging/project1/build.gradle                  |    2 +-
 .../multiThreaded/build.gradle                     |    4 +-
 .../internal-android-performance-testing.gradle    |   41 +
 .../org/gradle/performance/android/GetModel.java   |   44 +
 .../org/gradle/performance/android/Inspector.java  |  118 ++
 .../org/gradle/performance/android/SyncAction.java |   51 +
 .../java/org/gradle/performance/android/Timer.java |   32 +
 .../internal-integ-testing.gradle                  |    1 +
 .../fixtures/AbstractCompatibilityTestRunner.java  |   32 +-
 .../fixtures/AbstractIntegrationSpec.groovy        |   23 +-
 .../fixtures/AbstractMultiTestRunner.java          |    4 +-
 .../integtests/fixtures/AvailableJavaHomes.java    |  115 +-
 .../fixtures/CrossVersionIntegrationSpec.groovy    |    2 +-
 .../fixtures/CrossVersionTestRunner.groovy         |    8 +
 .../PersistentBuildProcessIntegrationTest.groovy   |   37 -
 .../integtests/fixtures/ScriptExecuter.groovy      |    4 +-
 .../fixtures/TestNGExecutionResult.groovy          |    4 +-
 .../fixtures/ZincScalaCompileFixture.groovy        |    2 +-
 .../integtests/fixtures/build/BuildTestFile.groovy |   48 +
 .../fixtures/build/BuildTestFixture.groovy         |   93 ++
 .../fixtures/daemon/AbstractDaemonFixture.groovy   |   28 +-
 .../integtests/fixtures/daemon/DaemonFixture.java  |   22 +
 .../fixtures/daemon/DaemonIntegrationSpec.groovy   |   14 +-
 .../fixtures/daemon/DaemonLogFileStateProbe.groovy |   16 +-
 .../fixtures/daemon/DaemonLogsAnalyzer.groovy      |    2 +-
 .../daemon/DaemonRegistryStateProbe.groovy         |   28 +-
 .../fixtures/daemon/DaemonStateProbe.java          |    4 +-
 .../fixtures/daemon/DaemonTestFixture.groovy       |   29 +
 .../integtests/fixtures/daemon/LegacyDaemon.groovy |   17 +
 .../fixtures/daemon/TestableDaemon.groovy          |   14 +-
 .../fixtures/executer/AbstractGradleExecuter.java  |  238 ++--
 .../fixtures/executer/DaemonGradleExecuter.java    |   14 +-
 .../executer/DefaultGradleDistribution.java        |   55 +-
 .../ExecuterDecoratingGradleDistribution.java      |  142 ++
 .../fixtures/executer/ExecutionResult.java         |   12 +
 .../fixtures/executer/ForkingGradleExecuter.java   |   17 +-
 .../fixtures/executer/ForkingGradleHandle.java     |   10 +
 .../executer/GradleBackedArtifactBuilder.java      |    9 +
 .../fixtures/executer/GradleDistribution.java      |    5 +
 .../fixtures/executer/GradleExecuter.java          |   25 +-
 .../fixtures/executer/GradleExecuterDecorator.java |   20 +
 .../fixtures/executer/GradleVersions.java          |    2 -
 .../fixtures/executer/InProcessGradleExecuter.java |  122 +-
 .../executer/IntegrationTestBuildContext.java      |   18 +-
 .../executer/OutputScrapingExecutionResult.java    |   70 +-
 .../executer/ParallelForkingGradleExecuter.java    |    4 +-
 .../executer/ParallelForkingGradleHandle.java      |    6 +-
 .../executer/ProgressLoggingFixture.groovy         |   14 +-
 .../PersistentBuildProcessIntegrationTest.groovy   |   37 +
 .../versions/ReleasedVersionDistributions.java     |   10 +
 .../org/gradle/test/fixtures/AbstractModule.groovy |   42 +-
 .../org/gradle/test/fixtures/HttpRepository.groovy |    6 +-
 .../groovy/org/gradle/test/fixtures/Module.groovy  |   12 +-
 .../org/gradle/test/fixtures/Repository.groovy     |    7 +-
 .../gradle/test/fixtures/ivy/IvyDescriptor.groovy  |    5 +-
 .../fixtures/ivy/IvyDescriptorDependency.groovy    |   18 +-
 .../ivy/IvyDescriptorDependencyExclusion.groovy    |    8 +
 .../gradle/test/fixtures/ivy/IvyFileModule.groovy  |   25 +
 .../test/fixtures/ivy/IvyFileRepository.groovy     |    2 +-
 .../org/gradle/test/fixtures/ivy/IvyModule.java    |   24 +
 .../gradle/test/fixtures/ivy/IvyRepository.groovy  |    4 +-
 .../test/fixtures/ivy/RemoteIvyRepository.groovy   |    7 +-
 .../test/fixtures/maven/AbstractMavenModule.groovy |   38 +-
 .../test/fixtures/maven/DelegatingMavenModule.java |   23 +-
 .../fixtures/maven/MavenDependencyExclusion.groovy |    3 +
 .../test/fixtures/maven/MavenFileModule.groovy     |   21 +-
 .../test/fixtures/maven/MavenFileRepository.groovy |    2 +-
 .../fixtures/maven/MavenLocalRepository.groovy     |    2 +-
 .../gradle/test/fixtures/maven/MavenModule.groovy  |    6 +-
 .../test/fixtures/maven/MavenRepository.groovy     |    4 +-
 .../gradle/test/fixtures/maven/MavenScope.groovy   |    5 +
 .../test/fixtures/plugin/PluginBuilder.groovy      |   60 +
 .../fixtures/server/http/BlockingHttpServer.groovy |    6 +
 .../test/fixtures/server/http/HttpServer.groovy    |   11 +-
 .../test/fixtures/server/http/IvyHttpModule.groovy |   23 +
 .../fixtures/server/http/IvyHttpRepository.groovy  |    2 +-
 .../server/http/MavenHttpRepository.groovy         |    2 +-
 .../test/fixtures/server/sftp/IvySftpModule.groovy |   23 +-
 .../fixtures/server/sftp/IvySftpRepository.groovy  |    2 +-
 .../server/sftp/MavenSftpRepository.groovy         |    4 +-
 .../executer/AbstractGradleExecuterTest.groovy     |   81 ++
 .../ReleasedVersionDistributionsTest.groovy        |   12 +-
 .../ivy/IvyDescriptorDependencyTest.groovy         |   96 ++
 .../test/fixtures/maven/MavenFileModuleTest.groovy |    2 +-
 .../fixtures/maven/MavenLocalModuleTest.groovy     |    2 +-
 .../test/fixtures/maven/MavenScopeTest.groovy      |   70 +
 .../internal-performance-testing.gradle            |   86 ++
 .../performance/fixture/MavenDownloaderTest.groovy |   64 +
 ...dStudioMockupCrossVersionPerformanceTest.groovy |   64 +
 .../AbstractCrossBuildPerformanceTest.groovy       |   71 +
 .../AbstractCrossVersionPerformanceTest.groovy     |   53 +
 .../AbstractGradleVsMavenPerformanceTest.groovy    |   73 +
 ...actToolingApiCrossVersionPerformanceTest.groovy |  230 +++
 .../categories/AndroidPerformanceTest.java         |   21 +
 .../categories/BasicPerformanceTest.java           |    0
 .../gradle/performance/categories/Experiment.java  |    0
 .../categories/GradleCorePerformanceTest.java      |    0
 .../categories/JavaPerformanceTest.java            |    0
 .../categories/NativePerformanceTest.java          |    0
 .../performance/categories/PerformanceTest.java    |    0
 .../categories/ToolingApiPerformanceTest.java      |    0
 ...AbstractGradleBuildPerformanceTestRunner.groovy |  118 ++
 .../fixture/BuildEventTimestampCollector.java      |   99 ++
 .../fixture/BuildExperimentInvocationInfo.java     |    0
 .../fixture/BuildExperimentListener.java           |    0
 .../fixture/BuildExperimentListenerAdapter.java    |    0
 .../performance/fixture/BuildExperimentRunner.java |  272 ++++
 .../performance/fixture/BuildExperimentSpec.groovy |   69 +
 .../fixture/CompilationLoggingCollector.java       |    0
 .../fixture/CompositeDataCollector.java            |    0
 .../performance/fixture/CompositeDataReporter.java |   42 +
 .../fixture/CrossBuildPerformanceTestRunner.groovy |   72 +
 .../CrossVersionPerformanceTestRunner.groovy       |  251 ++++
 .../gradle/performance/fixture/DataCollector.java  |    0
 .../DefaultBuildExperimentInvocationInfo.java      |    0
 .../performance/fixture/FlameGraphSanitizer.java   |  118 ++
 .../gradle/performance/fixture/GCEventParser.java  |    0
 .../performance/fixture/GCLoggingCollector.java    |    0
 .../org/gradle/performance/fixture/Git.groovy      |    0
 .../fixture/GradleBuildExperimentSpec.groovy       |   97 ++
 .../fixture/GradleExecuterBackedSession.groovy     |   83 ++
 .../fixture/GradleInvocationCustomizer.java        |    0
 .../fixture/GradleInvocationSpec.groovy            |  194 +++
 .../gradle/performance/fixture/GradleSession.java  |    0
 .../performance/fixture/GradleSessionProvider.java |    0
 .../GradleVsMavenBuildExperimentRunner.java        |   88 ++
 .../GradleVsMavenPerformanceTestRunner.groovy      |  102 ++
 .../fixture/HonestProfilerCollector.groovy         |  180 +++
 .../performance/fixture/InvocationCustomizer.java  |    0
 .../fixture/InvocationExecutorProvider.java        |    0
 .../performance/fixture/InvocationSpec.groovy      |   38 +
 .../org/gradle/performance/fixture/LogFiles.java   |    0
 .../fixture/MavenBuildExperimentSpec.groovy        |  104 ++
 .../performance/fixture/MavenInstallation.groovy   |    0
 .../fixture/MavenInstallationDownloader.groovy     |  117 ++
 .../performance/fixture/MavenInvocationSpec.groovy |  168 +++
 .../performance/fixture/MemoryInfoCollector.groovy |    0
 .../gradle/performance/fixture/OperationTimer.java |    0
 .../fixture/PerformanceCounterCollector.java       |  128 ++
 .../PerformanceTestDirectoryProvider.groovy        |   27 +
 .../performance/fixture/PerformanceTestSpec.java   |    0
 .../org/gradle/performance/fixture/Profiler.java   |    0
 .../performance/fixture/TestProjectLocator.groovy  |   28 +
 .../performance/fixture/TestScenarioSelector.java  |   81 ++
 .../fixture/ToolingApiBackedGradleSession.groovy   |   74 +
 .../gradle/performance/fixture/WaitingReader.java  |    0
 .../performance/fixture/YourKitProfiler.groovy     |    0
 .../org/gradle/performance/measure/Amount.java     |  179 +++
 .../org/gradle/performance/measure/DataAmount.java |    0
 .../org/gradle/performance/measure/DataSeries.java |   99 ++
 .../org/gradle/performance/measure/Duration.java   |    0
 .../performance/measure/MeasuredOperation.groovy   |   57 +
 .../org/gradle/performance/measure/Units.java      |    0
 .../performance/results/AllResultsStore.java       |   49 +
 .../results/BaseCrossBuildResultsStore.java        |  313 ++++
 .../performance/results/BaselineVersion.groovy     |  105 ++
 .../performance/results/BuildDisplayInfo.groovy    |   43 +
 .../org/gradle/performance/results/Checks.java     |   39 +
 .../performance/results/CompositeResultsStore.java |   79 ++
 .../performance/results/ConnectionAction.java      |   24 +
 .../results/CrossBuildPerformanceResults.groovy    |   68 +
 .../results/CrossBuildPerformanceTestHistory.java  |  201 +++
 .../results/CrossBuildResultsStore.java            |   32 +
 .../results/CrossVersionPerformanceResults.groovy  |  123 ++
 .../CrossVersionPerformanceTestHistory.java        |  230 +++
 .../results/CrossVersionResultsStore.java          |  379 +++++
 .../gradle/performance/results/DataReporter.groovy |   21 +
 .../gradle/performance/results/FileRenderer.java   |   39 +
 .../gradle/performance/results/FormatSupport.java  |    0
 .../GradleVsMavenBuildPerformanceResults.groovy    |   39 +
 .../results/GradleVsMavenBuildResultsStore.java    |   25 +
 .../results/GraphIndexPageGenerator.java           |   87 ++
 .../performance/results/HtmlPageGenerator.java     |  198 +++
 .../performance/results/IndexPageGenerator.java    |  121 ++
 .../results/MeasuredOperationList.groovy           |   81 ++
 .../performance/results/NoResultsStore.groovy      |   45 +
 .../performance/results/PerformanceDatabase.java   |   81 ++
 .../results/PerformanceTestExecution.java          |   74 +
 .../results/PerformanceTestHistory.java            |    0
 .../performance/results/PerformanceTestResult.java |  130 ++
 .../performance/results/PrettyCalculator.groovy    |   42 +
 .../performance/results/ReportGenerator.java       |   77 +
 .../gradle/performance/results/ResultsStore.java   |   37 +
 .../performance/results/ResultsStoreHelper.java    |   57 +
 .../performance/results/ScenarioDefinition.java    |    0
 .../performance/results/TestDataGenerator.java     |  132 ++
 .../performance/results/TestPageGenerator.java     |  288 ++++
 .../gradle/performance/results/VersionResults.java |   21 +
 .../org/gradle/reporting/performanceGraph.js       |   52 +
 .../main}/resources/org/gradle/reporting/report.js |    0
 .../main/resources/org/gradle/reporting/style.css  |  138 ++
 .../performance/plugin/BuildEventTimeStamps.java   |   97 ++
 .../performance/plugin/ExternalResources.java      |   33 +
 .../org/gradle/performance/plugin/HeapDumper.java  |   84 ++
 .../gradle/performance/plugin/HeapMeasurement.java |   74 +
 .../performance/plugin/MeasurementPlugin.java      |   59 +
 .../plugin/PerformanceCounterDumper.java           |   70 +
 .../plugin/PerformanceCounterMeasurement.java      |   65 +
 .../gradle/performance/plugin/ReflectionUtil.java  |  151 ++
 .../src/templates/init.gradle                      |    0
 .../src/templates/measurement-plugin/build.gradle  |   15 +
 .../src/templates/root-project/build.gradle        |   29 +
 .../src/templates/root-project/build.xml           |    0
 .../src/templates/root-project/checkstyle.xml      |    0
 .../src/templates/root-project/pom.xml             |    0
 .../src/templates/settings.gradle                  |    0
 .../gradle/performance/ResultSpecification.groovy  |   94 ++
 .../BuildEventTimestampCollectorTest.groovy        |    0
 ...CrossVersionPerformanceTestExecutionTest.groovy |  260 ++++
 .../CrossVersionPerformanceTestRunnerTest.groovy   |  428 ++++++
 .../performance/fixture/GCEventParserTest.groovy   |    0
 .../fixture/GCLoggingCollectorTest.groovy          |    0
 .../fixture/PerformanceCounterCollectorTest.groovy |   49 +
 .../fixture/PrettyCalculatorSpec.groovy            |   44 +
 .../performance/fixture/WaitingReaderTest.groovy   |    0
 .../performance/fixture/YourKitProfilerTest.groovy |    0
 .../gradle/performance/measure/AmountTest.groovy   |  244 ++++
 .../performance/measure/DataSeriesTest.groovy      |   60 +
 .../gradle/performance/measure/DurationTest.groovy |    0
 .../gradle/performance/measure/UnitsTest.groovy    |    0
 .../results/CompositeResultsStoreTest.groovy       |   46 +
 .../results/CrossBuildResultsStoreTest.groovy      |  443 ++++++
 .../results/CrossVersionResultsStoreTest.groovy    |  339 +++++
 .../performance/results/ReportGeneratorTest.groovy |   48 +
 .../results/TestPageGeneratorTest.groovy           |    0
 .../org/gradle/performance/fixture/gc-1.txt        |    0
 .../org/gradle/performance/fixture/gc-2.txt        |    0
 .../org/gradle/performance/fixture/gc-3.txt        |    0
 .../org/gradle/performance/fixture/gc-4.txt        |    0
 .../gradle/performance/fixture/mac-jdk8.0.25.txt   |    0
 .../performance/fixture/perf_counters_finish.txt   |  257 ++++
 .../performance/fixture/perf_counters_start.txt    |  257 ++++
 .../org/gradle/performance/fixture/win-1.txt       |    0
 .../fixtures/DefaultTestExecutionResult.groovy     |   13 +-
 .../fixtures/HtmlTestExecutionResult.groovy        |    2 +-
 .../fixtures/JUnitXmlTestExecutionResult.groovy    |    4 +-
 .../gradle/integtests/fixtures/UrlValidator.groovy |   18 +-
 .../fixtures/archive/ArchiveTestFixture.groovy     |    2 +-
 .../test/fixtures/archive/JarTestFixture.groovy    |   29 +-
 .../test/fixtures/archive/TarTestFixture.groovy    |    7 +-
 .../test/fixtures/archive/ZipTestFixture.groovy    |   13 +-
 .../file/AbstractTestDirectoryProvider.java        |   29 +-
 .../org/gradle/test/fixtures/file/ClassFile.groovy |   68 +-
 .../org/gradle/test/fixtures/file/TestFile.java    |   35 +-
 .../internal/NativeServicesTestFixture.java        |    6 +-
 .../org/gradle/util/RedirectStdOutAndErr.java      |   33 +-
 .../groovy/org/gradle/util/TestClassLoader.groovy  |    1 -
 .../groovy/org/gradle/util/TestPrecondition.groovy |   27 +-
 .../gradle/util/TestPreconditionExtension.groovy   |    2 +-
 .../gradle/util/UsesNativeServicesExtension.groovy |    2 +
 subprojects/ivy/ivy.gradle                         |    5 +-
 .../IvyPublishCrossVersionIntegrationTest.groovy   |    4 +-
 .../api/publish/ivy/IvyPublishHttpIntegTest.groovy |    5 +
 .../api/publish/ivy/IvyPublishJavaIntegTest.groovy |   33 +-
 .../ivy/IvyHttpPublishIntegrationTest.groovy       |    5 +
 .../org/gradle/api/publish/ivy/IvyDependency.java  |    7 +
 .../internal/artifact/DefaultIvyArtifactSet.java   |    2 +-
 .../internal/dependency/DefaultIvyDependency.java  |   21 +-
 .../DefaultIvyModuleDescriptorSpec.java            |    2 +-
 .../publication/DefaultIvyPublication.java         |    4 +-
 .../publisher/DependencyResolverIvyPublisher.java  |   41 +-
 .../publisher/IvyDescriptorFileGenerator.java      |   16 +-
 .../internal/publisher/ValidatingIvyPublisher.java |   11 +-
 .../api/publish/ivy/plugins/IvyPublishPlugin.java  |   19 +-
 .../publish/ivy/tasks/GenerateIvyDescriptor.java   |    2 +
 .../publish/ivy/tasks/PublishToIvyRepository.java  |    8 +-
 .../IvyArtifactNotationParserFactoryTest.groovy    |   11 +-
 .../publication/DefaultIvyPublicationTest.groovy   |    8 +-
 .../IvyDescriptorFileGeneratorTest.groovy          |   15 +-
 .../publisher/ValidatingIvyPublisherTest.groovy    |   31 +-
 .../ivy/tasks/PublishToIvyRepositoryTest.groovy    |   11 +-
 ...actIvyRemoteLegacyPublishIntegrationTest.groovy |   37 +-
 subprojects/jacoco/jacoco.gradle                   |    2 +-
 .../plugins/JacocoPluginIntegrationTest.groovy     |   61 +-
 .../gradle/internal/jacoco/JacocoAgentJar.groovy   |   72 -
 .../testing/jacoco/plugins/JacocoPlugin.groovy     |  177 ---
 .../jacoco/plugins/JacocoPluginExtension.groovy    |   88 --
 .../jacoco/plugins/JacocoTaskExtension.groovy      |  201 ---
 .../gradle/testing/jacoco/tasks/JacocoBase.groovy  |   33 -
 .../gradle/testing/jacoco/tasks/JacocoMerge.groovy |  102 --
 .../testing/jacoco/tasks/JacocoReport.groovy       |  271 ----
 .../jacoco/tasks/JacocoReportsContainer.java       |   47 -
 .../org/gradle/internal/jacoco/AntJacocoMerge.java |   56 +
 .../gradle/internal/jacoco/AntJacocoReport.java    |   98 ++
 .../org/gradle/internal/jacoco/JacocoAgentJar.java |  111 ++
 .../jacoco/JacocoReportsContainerImpl.java         |    0
 .../testing/jacoco/plugins/JacocoPlugin.java       |  250 ++++
 .../jacoco/plugins/JacocoPluginExtension.java      |  141 ++
 .../jacoco/plugins/JacocoTaskExtension.java        |  323 +++++
 .../testing/jacoco/plugins/package-info.java       |   21 +
 .../gradle/testing/jacoco/tasks/JacocoBase.java    |   44 +
 .../gradle/testing/jacoco/tasks/JacocoMerge.java   |  119 ++
 .../gradle/testing/jacoco/tasks/JacocoReport.java  |  337 +++++
 .../jacoco/tasks/JacocoReportsContainer.java       |   51 +
 .../gradle/testing/jacoco/tasks/package-info.java  |    0
 .../testing/jacoco/plugins/JacocoPluginSpec.groovy |   77 +-
 .../jacoco/plugins/JacocoReportFixture.groovy      |    5 +-
 .../javascript/base/JavaScriptBasePlugin.groovy    |   31 -
 .../coffeescript/CoffeeScriptBasePlugin.groovy     |   69 -
 .../coffeescript/CoffeeScriptCompile.java          |  102 --
 .../coffeescript/CoffeeScriptCompileOptions.java   |   32 -
 .../CoffeeScriptCompileDestinationCalculator.java  |   52 -
 .../internal/rhino/RhinoCoffeeScriptCompiler.java  |   59 -
 .../plugins/javascript/envjs/EnvJsPlugin.groovy    |   97 --
 .../javascript/envjs/browser/BrowserEvaluate.java  |   98 --
 .../envjs/http/simple/SimpleHttpFileServer.java    |   51 -
 .../envjs/internal/EnvJsBrowserEvaluator.java      |   64 -
 .../gradle/plugins/javascript/jshint/JsHint.java   |  158 ---
 .../plugins/javascript/jshint/JsHintPlugin.groovy  |   72 -
 .../plugins/javascript/rhino/RhinoPlugin.groovy    |   70 -
 .../plugins/javascript/rhino/RhinoShellExec.java   |  112 --
 .../javascript/rhino/worker/RhinoWorker.java       |   23 -
 .../rhino/worker/RhinoWorkerHandleFactory.java     |   27 -
 .../javascript/rhino/worker/RhinoWorkerUtils.java  |  142 --
 .../internal/DefaultRhinoWorkerHandleFactory.java  |   52 -
 .../javascript/base/JavaScriptBasePlugin.java      |   33 +
 .../javascript/base/JavaScriptExtension.java       |    0
 .../base/JavaScriptRepositoriesExtension.java      |    0
 .../base/SourceTransformationException.java        |    0
 .../coffeescript/CoffeeScriptBasePlugin.java       |   93 ++
 .../coffeescript/CoffeeScriptCompile.java          |  106 ++
 .../coffeescript/CoffeeScriptCompileOptions.java   |   36 +
 .../coffeescript/CoffeeScriptCompileSpec.java      |    0
 .../coffeescript/CoffeeScriptCompiler.java         |    0
 .../coffeescript/CoffeeScriptExtension.java        |    0
 .../CoffeeScriptCompileDestinationCalculator.java  |   52 +
 .../internal/DefaultCoffeeScriptCompileSpec.java   |    0
 .../SerializableCoffeeScriptCompileSpec.java       |    0
 .../rhino/CoffeeScriptCompilerProtocol.java        |    0
 .../internal/rhino/CoffeeScriptCompilerWorker.java |    0
 .../internal/rhino/RhinoCoffeeScriptCompiler.java  |   53 +
 .../plugins/javascript/envjs/EnvJsExtension.java   |    0
 .../plugins/javascript/envjs/EnvJsPlugin.java      |  107 ++
 .../javascript/envjs/browser/BrowserEvaluate.java  |   99 ++
 .../javascript/envjs/browser/BrowserEvaluator.java |    0
 .../javascript/envjs/http/HttpFileServer.java      |    0
 .../envjs/http/HttpFileServerFactory.java          |    0
 .../envjs/http/simple/SimpleHttpFileServer.java    |   51 +
 .../http/simple/SimpleHttpFileServerFactory.java   |    0
 .../simple/internal/SimpleFileServerContainer.java |    0
 .../envjs/internal/EnvJsBrowserEvaluator.java      |   58 +
 .../envjs/internal/EnvJsEvaluateSpec.java          |    0
 .../envjs/internal/EnvJsEvaluateWorker.java        |    0
 .../envjs/internal/EnvJvEvaluateProtocol.java      |    0
 .../gradle/plugins/javascript/jshint/JsHint.java   |  153 ++
 .../plugins/javascript/jshint/JsHintExtension.java |    0
 .../plugins/javascript/jshint/JsHintPlugin.java    |   97 ++
 .../javascript/jshint/internal/JsHintProtocol.java |    0
 .../javascript/jshint/internal/JsHintResult.java   |    0
 .../javascript/jshint/internal/JsHintSpec.java     |    0
 .../javascript/jshint/internal/JsHintWorker.java   |    0
 .../plugins/javascript/rhino/RhinoExtension.java   |    0
 .../plugins/javascript/rhino/RhinoPlugin.java      |   90 ++
 .../plugins/javascript/rhino/RhinoShellExec.java   |  114 ++
 .../javascript/rhino/worker/RhinoWorker.java       |   27 +
 .../rhino/worker/RhinoWorkerHandleFactory.java     |   29 +
 .../javascript/rhino/worker/RhinoWorkerUtils.java  |  146 ++
 .../internal/DefaultRhinoWorkerHandleFactory.java  |   48 +
 .../api/plugins/jetty/JettyIntegrationSpec.groovy  |  150 ++
 .../api/plugins/jetty/AbstractJettyRunTask.java    |   56 +-
 .../org/gradle/api/plugins/jetty/JettyPlugin.java  |    5 +
 .../api/plugins/jetty/JettyPluginConvention.java   |    3 +
 .../org/gradle/api/plugins/jetty/JettyRun.java     |   70 +-
 .../org/gradle/api/plugins/jetty/JettyRunWar.java  |   21 +-
 .../org/gradle/api/plugins/jetty/JettyStop.java    |   16 +-
 .../api/plugins/jetty/ScanTargetPattern.java       |    3 +
 .../api/plugins/jetty/internal/ConsoleScanner.java |   16 +-
 .../plugins/jetty/internal/Jetty6PluginServer.java |    9 +-
 .../plugins/jetty/internal/JettyConfiguration.java |   21 +-
 .../api/plugins/jetty/JettyPluginTest.groovy       |   15 +-
 subprojects/jvm-services/jvm-services.gradle       |   14 +
 .../jvm/inspection/CachingJvmVersionDetector.java  |   61 +
 .../jvm/inspection/DefaultJvmVersionDetector.java  |   77 +
 .../jvm/inspection/JvmVersionDetector.java         |   35 +
 .../CachingJvmVersionDetectorTest.groovy           |   42 +
 .../DefaultJvmVersionDetectorTest.groovy           |   82 ++
 subprojects/language-groovy/language-groovy.gradle |    7 +-
 .../gradle/groovy/GroovyDocIntegrationTest.groovy  |   53 +-
 .../gradle/api/internal/tasks/AntGroovydoc.java    |  172 +++
 .../internal/tasks/compile/ApiGroovyCompiler.java  |   18 +-
 .../GroovyCompileTransformingClassLoader.java      |    2 +-
 .../gradle/api/tasks/compile/GroovyCompile.java    |   11 +-
 .../api/tasks/compile/GroovyCompileOptions.java    |   12 +
 .../org/gradle/api/tasks/javadoc/AntGroovydoc.java |  167 ---
 .../org/gradle/api/tasks/javadoc/Groovydoc.java    |   55 +-
 .../gradle/api/tasks/javadoc/GroovydocTest.groovy  |   99 ++
 .../gradle/api/tasks/javadoc/GroovydocTest.java    |   93 --
 .../testing/fixture/GroovydocCoverage.groovy       |    6 +-
 subprojects/language-java/language-java.gradle     |    6 +
 .../compile/JavaCompileIntegrationTest.groovy      |  138 ++
 .../JavaCompileParallelIntegrationTest.groovy      |   19 +-
 ...ncrementalJavaCompilationIntegrationTest.groovy |    2 +-
 ...ncrementalJavaCompilationIntegrationTest.groovy |   74 +-
 ...aCompilationAgainstApiJarIntegrationTest.groovy |    5 +
 .../java/JavaJvmAssemblyIntegrationTest.groovy     |   52 +-
 ...braryDependencyResolutionIntegrationTest.groovy |   10 -
 ...guageDependencyResolutionIntegrationTest.groovy |    3 -
 .../java/JavaLanguageIntegrationTest.groovy        |    3 -
 .../java/JavaSourceSetIntegrationTest.groovy       |    3 -
 .../language/java/JvmApiSpecIntegrationTest.groovy |   47 +
 .../java/SingleBinaryTypeWithVariantsTest.groovy   |    6 -
 .../build.gradle                                   |    6 +-
 .../handlesTagsAndTaglets/build.gradle             |    6 +-
 .../api/internal/tasks/DefaultJavaToolChain.java   |    4 +-
 .../tasks/compile/CommandLineJavaCompiler.java     |    3 +-
 .../compile/JavaCompilerArgumentsBuilder.java      |   32 +-
 .../compile/JavaHomeBasedJavaCompilerFactory.java  |    1 -
 .../api/internal/tasks/compile/JdkTools.java       |  112 ++
 .../compile/incremental/ClassChangeProcessor.java  |   57 +
 .../incremental/IncrementalCompilerFactory.java    |   11 +-
 .../incremental/RecompilationSpecProvider.java     |   12 +-
 .../analyzer/CachingClassDependenciesAnalyzer.java |    4 +-
 .../incremental/analyzer/ClassAnalysisCache.java   |    6 +-
 .../analyzer/DefaultClassAnalysisCache.java        |   10 +-
 .../analyzer/DefaultClassDependenciesAnalyzer.java |    4 +-
 .../incremental/jar/CachingJarSnapshotter.java     |   16 +-
 .../incremental/jar/ClasspathJarFinder.java        |    2 +-
 .../incremental/jar/DefaultJarSnapshotCache.java   |   14 +-
 .../incremental/jar/DefaultJarSnapshotter.java     |   14 +-
 .../tasks/compile/incremental/jar/JarArchive.java  |    6 +-
 .../incremental/jar/JarChangeProcessor.java        |    2 +-
 .../incremental/jar/JarClasspathSnapshotData.java  |   10 +-
 .../jar/JarClasspathSnapshotDataSerializer.java    |   13 +-
 .../jar/JarClasspathSnapshotFactory.java           |   14 +-
 .../tasks/compile/incremental/jar/JarSnapshot.java |   22 +-
 .../compile/incremental/jar/JarSnapshotCache.java  |    8 +-
 .../compile/incremental/jar/JarSnapshotData.java   |   10 +-
 .../incremental/jar/JarSnapshotDataSerializer.java |   22 +-
 .../gradle/api/tasks/compile/CompileOptions.java   |   16 +
 .../gradle/api/tasks/compile/DependOptions.java    |   11 +-
 .../org/gradle/api/tasks/compile/ForkOptions.java  |    4 +-
 .../org/gradle/api/tasks/compile/JavaCompile.java  |   30 +-
 .../java/org/gradle/api/tasks/javadoc/Javadoc.java |   27 +-
 .../external/javadoc/MinimalJavadocOptions.java    |   14 +-
 .../internal/EnumJavadocOptionFileOption.java      |    4 +-
 .../internal/JavaToolChainServiceRegistry.java     |    2 +-
 .../language/java/plugins/JavaLanguagePlugin.java  |    7 +-
 .../language/java/tasks/PlatformJavaCompile.java   |    1 +
 .../internal/tasks/DefaultJavaToolChainTest.groovy |    5 +
 .../JavaCompilerArgumentsBuilderTest.groovy        |   18 +-
 .../api/internal/tasks/compile/JdkToolsTest.groovy |   63 +
 .../incremental/ClassChangeProcessorTest.groovy    |  102 ++
 .../jar/DefaultJarSnapshotterTest.groovy           |    8 +-
 .../jar/JarClasspathSnapshotFactoryTest.groovy     |   15 +-
 .../jar/JarClasspathSnapshotMakerTest.groovy       |    7 +-
 .../compile/incremental/jar/JarSnapshotTest.groovy |   36 +-
 .../api/tasks/compile/JavaCompileTest.groovy       |    2 +-
 .../gradle/api/tasks/javadoc/JavadocTest.groovy    |    2 +-
 .../javadoc/StandardJavadocDocletOptionsTest.java  |   96 +-
 .../BooleanJavadocOptionFileOptionTest.java        |    2 +-
 .../internal/EnumJavadocOptionFileOptionTest.java  |    2 +-
 .../internal/FileJavadocOptionFileOptionTest.java  |    4 +-
 .../GroupsJavadocOptionFileOptionTest.java         |   10 +-
 .../javadoc/internal/JavadocOptionFileTest.java    |    2 +-
 .../LinksOfflineJavadocOptionFileOptionTest.java   |    2 +-
 ...ultilineStringsJavadocOptionFileOptionTest.java |    6 +-
 ...tionLessStringsJavadocOptionFileOptionTest.java |    8 +-
 .../internal/PathJavadocOptionFileOptionTest.java  |    2 +-
 .../StringJavadocOptionFileOptionTest.java         |    2 +-
 .../StringsJavadocOptionFileOptionTest.java        |    2 +-
 subprojects/language-jvm/language-jvm.gradle       |    3 +
 .../tasks/compile/NoOpStaleClassCleaner.java       |   26 -
 .../tasks/compile/daemon/CompilerDaemonClient.java |   35 +-
 .../daemon/CompilerDaemonClientProtocol.java       |   23 -
 .../compile/daemon/CompilerDaemonProtocol.java     |   24 +
 .../tasks/compile/daemon/CompilerDaemonServer.java |   41 +-
 .../daemon/CompilerDaemonServerProtocol.java       |   27 -
 .../compile/daemon/CompilerDaemonStarter.java      |   16 +-
 .../tasks/compile/daemon/CompilerDaemonWorker.java |   22 +
 .../daemon/InProcessCompilerDaemonFactory.java     |   23 +-
 .../gradle/api/tasks/compile/AbstractCompile.java  |   10 +-
 .../gradle/api/tasks/compile/AbstractOptions.java  |   19 +-
 .../gradle/api/tasks/compile/BaseForkOptions.java  |    2 +
 .../api/tasks/compile/AbstractOptionsTest.groovy   |    6 +-
 .../AbstractJvmLanguageIntegrationTest.groovy      |    2 +-
 ...AbstractJvmPluginLanguageIntegrationTest.groovy |    2 +-
 subprojects/language-native/language-native.gradle |    1 +
 ...eLanguageIncrementalBuildIntegrationTest.groovy |   25 +-
 ...anguageIncrementalCompileIntegrationTest.groovy |   83 +-
 .../AbstractNativeLanguageIntegrationTest.groovy   |    5 +-
 .../DuplicateBaseNamesIntegrationTest.groovy       |   11 +-
 ...yLanguageIncrementalBuildIntegrationTest.groovy |    3 -
 .../AssemblyLanguageIntegrationTest.groovy         |    2 -
 ...CLanguageIncrementalBuildIntegrationTest.groovy |    3 +-
 .../language/c/CLanguageIntegrationTest.groovy     |    3 +-
 ...CPreCompiledHeaderSourcesIntegrationTest.groovy |    4 +-
 .../c/CppCallingCLanguageIntegrationTest.groovy    |    2 -
 .../language/c/MixedLanguageIntegrationTest.groovy |    2 -
 ...pLanguageIncrementalBuildIntegrationTest.groovy |    2 -
 ...anguageIncrementalCompileIntegrationTest.groovy |    2 -
 .../language/cpp/CppLanguageIntegrationTest.groovy |    2 -
 ...pPreCompiledHeaderSourcesIntegrationTest.groovy |    4 +-
 .../NativeLanguageSamplesIntegrationTest.groovy    |    3 +-
 .../ParallelNativePluginsIntegrationTest.groovy    |   10 +-
 .../ObjectiveCUnsupportedIntegrationTest.groovy    |    3 -
 .../ObjectiveCppUnsupportedIntegrationTest.groovy  |    4 -
 ...ResourcesIncrementalBuildIntegrationTest.groovy |    4 +-
 .../rc/WindowsResourcesIntegrationTest.groovy      |    4 +-
 .../plugins/internal/AssembleTaskConfig.java       |    2 +-
 .../gradle/language/assembler/tasks/Assemble.java  |   12 +-
 .../internal/PCHCompileTaskConfig.java             |    2 +-
 .../internal/SourceCompileTaskConfig.java          |    2 +-
 .../internal/incremental/CompilationFileState.java |    8 +-
 .../incremental/CompilationStateSerializer.java    |   13 +-
 .../incremental/DefaultSourceIncludesResolver.java |   13 +-
 .../incremental/IncrementalCompileProcessor.java   |    2 +-
 .../internal/incremental/ResolvedInclude.java      |    2 +-
 .../tasks/AbstractNativeCompileTask.java           |   10 +-
 .../WindowsResourcesCompileTaskConfig.java         |    2 +-
 .../language/rc/tasks/WindowsResourceCompile.java  |   11 +-
 .../AbstractNativeComponentPluginTest.groovy       |   15 +-
 .../language/assembler/tasks/AssemblerTest.groovy  |   13 +-
 .../gradle/language/c/tasks/CCompileTest.groovy    |   18 +-
 .../c/tasks/CPreCompiledHeaderCompileTest.groovy   |    8 +-
 .../language/cpp/tasks/CppCompileTest.groovy       |   17 +-
 .../tasks/CppPreCompiledHeaderCompileTest.groovy   |   10 +-
 .../CompilationStateSerializerTest.groovy          |   10 +-
 .../IncrementalCompileProcessorTest.groovy         |    5 +-
 .../IncrementalNativeCompilerTest.groovy           |    2 +-
 .../objectivec/tasks/ObjectiveCCompileTest.groovy  |   20 +-
 .../ObjectiveCPreCompiledHeaderCompileTest.groovy  |   10 +-
 .../tasks/ObjectiveCppCompileTest.groovy           |   18 +-
 ...ObjectiveCppPreCompiledHeaderCompileTest.groovy |   10 +-
 subprojects/language-scala/language-scala.gradle   |    3 +
 .../ScalaCompileParallelIntegrationTest.groovy     |   50 +-
 .../ScalaCompilerContinuousIntegrationTest.groovy  |    5 +
 .../internal/tasks/scala/ZincScalaCompiler.java    |    3 +-
 .../api/tasks/scala/IncrementalCompileOptions.java |    3 +
 .../gradle/api/tasks/scala/ScalaForkOptions.java   |    4 +-
 .../org/gradle/language/scala/ScalaPlatform.java   |    3 +
 .../scala/internal/DefaultScalaPlatform.java       |    8 +-
 .../toolchain/DownloadingScalaToolChain.java       |    8 +-
 .../scala/plugins/ScalaLanguagePlugin.java         |    6 +-
 .../language/scala/tasks/AbstractScalaCompile.java |    4 +-
 .../scala/tasks/BaseScalaCompileOptions.java       |   15 +-
 .../language/scala/tasks/PlatformScalaCompile.java |    4 +-
 subprojects/launcher/launcher.gradle               |   10 +-
 .../BuildEnvironmentIntegrationTest.groovy         |   20 +-
 .../launcher/CommandLineIntegrationSpec.groovy     |   43 +-
 ...EnablingParallelExecutionIntegrationTest.groovy |   28 +-
 .../GradleConfigurabilityIntegrationSpec.groovy    |   24 +-
 .../launcher/GradleNativeIntegrationTest.groovy    |    4 +-
 .../SupportedBuildJvmIntegrationTest.groovy        |   52 +
 ...ionServiceReuseContinuousIntegrationTest.groovy |   10 +-
 .../JdkVersionsContinuousIntegrationTest.groovy    |   72 -
 .../MultiProjectContinuousIntegrationTest.groovy   |    2 +-
 .../SimpleJavaContinuousIntegrationTest.groovy     |    1 -
 .../SmokeContinuousIntegrationTest.groovy          |    5 +-
 .../DaemonAuthenticationIntegrationSpec.groovy     |   63 +
 .../daemon/DaemonFeedbackIntegrationSpec.groovy    |    3 +
 ...itialCommunicationFailureIntegrationSpec.groovy |   60 +-
 .../launcher/daemon/DaemonLifecycleSpec.groovy     |  227 ++-
 ...emonPerformanceMonitoringIntegrationTest.groovy |   69 -
 .../DaemonReportStatusIntegrationSpec.groovy       |   86 ++
 .../daemon/DaemonReuseIntegrationTest.groovy       |  178 +++
 .../DaemonStartupMessageIntegrationTest.groovy     |   13 +-
 .../DaemonSystemPropertiesIntegrationTest.groovy   |   45 +-
 .../DaemonUsageSuggestionIntegrationTest.groovy    |   72 -
 .../ProcessCrashHandlingIntegrationTest.groovy     |   47 +-
 .../daemon/SingleUseDaemonIntegrationTest.groovy   |   35 +-
 .../daemon/StoppingDaemonIntegrationSpec.groovy    |    4 +-
 .../server/health/MemoryInfoIntegrationTest.groovy |   51 +
 .../scaninfo/DaemonScanInfoIntegrationSpec.groovy  |  221 +++
 .../daemon/testing/DaemonsEventSequence.groovy     |    4 +-
 .../org/gradle/launcher/bootstrap/EntryPoint.java  |   10 +-
 .../launcher/bootstrap/ProcessBootstrap.java       |   23 +-
 .../gradle/launcher/cli/BuildActionsFactory.java   |   62 +-
 .../launcher/cli/CommandLineActionFactory.java     |   37 +-
 .../launcher/cli/JavaRuntimeValidationAction.java  |    4 +-
 .../launcher/cli/ReportDaemonStatusAction.java     |   32 +
 .../org/gradle/launcher/cli/RunBuildAction.java    |   27 +-
 .../cli/converter/DaemonCommandLineConverter.java  |   21 +-
 .../PropertiesToDaemonParametersConverter.java     |   15 +-
 .../PropertiesToStartParameterConverter.java       |    5 +
 .../launcher/daemon/DaemonExecHandleBuilder.java   |    4 +-
 .../launcher/daemon/bootstrap/DaemonMain.java      |   45 +-
 .../bootstrap/DaemonStartupCommunication.java      |    8 +-
 .../daemon/bootstrap/ForegroundDaemonAction.java   |   17 +-
 .../daemon/client/DaemonCancelForwarder.java       |    7 +-
 .../launcher/daemon/client/DaemonClient.java       |   12 +-
 .../daemon/client/DaemonClientConnection.java      |   16 +-
 .../daemon/client/DaemonClientFactory.java         |    2 +-
 .../daemon/client/DaemonClientGlobalServices.java  |    5 +-
 .../daemon/client/DaemonClientInputForwarder.java  |    4 +-
 .../daemon/client/DaemonClientServices.java        |    5 +-
 .../daemon/client/DaemonClientServicesSupport.java |   30 +-
 .../launcher/daemon/client/DaemonConnector.java    |    4 +-
 .../daemon/client/DaemonStartListener.java         |    4 +-
 .../daemon/client/DaemonStartupMessage.java        |   50 +
 .../launcher/daemon/client/DaemonStopClient.java   |   45 +-
 .../daemon/client/DefaultDaemonConnector.java      |  175 ++-
 .../daemon/client/DefaultDaemonStarter.java        |   21 +-
 .../client/EmbeddedDaemonClientServices.java       |  111 --
 .../daemon/client/EmbeddedDaemonStarter.java       |   67 -
 .../launcher/daemon/client/JvmVersionDetector.java |   78 -
 .../daemon/client/JvmVersionValidator.java         |    5 +-
 .../daemon/client/ReportDaemonStatusClient.java    |  117 ++
 .../daemon/client/ReportStatusDispatcher.java      |   53 +
 .../daemon/client/SingleUseDaemonClient.java       |    4 +-
 .../client/SingleUseDaemonClientServices.java      |    2 +-
 .../launcher/daemon/client/StopDispatcher.java     |    8 +-
 .../daemon/client/StubDaemonHealthServices.java    |   34 -
 .../daemon/configuration/DaemonJvmOptions.java     |    3 +-
 .../daemon/configuration/DaemonParameters.java     |   35 +-
 .../configuration/DaemonServerConfiguration.java   |    2 +
 .../launcher/daemon/configuration/DaemonUsage.java |   39 -
 .../DefaultDaemonServerConfiguration.java          |   15 +-
 .../ForegroundDaemonConfiguration.java             |    4 +-
 .../daemon/configuration/GradleProperties.java     |    6 +-
 .../daemon/context/DaemonCompatibilitySpec.java    |    4 +-
 .../daemon/context/DaemonConnectDetails.java       |   32 +
 .../daemon/context/DaemonContextBuilder.java       |    4 +-
 .../daemon/context/DaemonInstanceDetails.java      |   30 -
 .../daemon/context/DefaultDaemonContext.java       |   47 +-
 .../daemon/diagnostics/DaemonStartupInfo.java      |    7 +-
 .../launcher/daemon/logging/DaemonMessages.java    |    5 +-
 .../org/gradle/launcher/daemon/protocol/Build.java |    4 +-
 .../launcher/daemon/protocol/BuildAndStop.java     |    4 +-
 .../launcher/daemon/protocol/BuildEvent.java       |    2 +-
 .../gradle/launcher/daemon/protocol/Cancel.java    |    6 +-
 .../gradle/launcher/daemon/protocol/Command.java   |   16 +-
 .../daemon/protocol/DaemonMessageSerializer.java   |    6 +-
 .../launcher/daemon/protocol/OutputMessage.java    |    2 +-
 .../launcher/daemon/protocol/ReportStatus.java     |   23 +
 .../gradle/launcher/daemon/protocol/Result.java    |    4 +-
 .../gradle/launcher/daemon/protocol/Status.java    |   47 +
 .../org/gradle/launcher/daemon/protocol/Stop.java  |    4 +-
 .../launcher/daemon/protocol/StopWhenIdle.java     |    4 +-
 .../gradle/launcher/daemon/registry/DaemonDir.java |    4 +-
 .../launcher/daemon/registry/DaemonInfo.java       |  110 +-
 .../launcher/daemon/registry/DaemonRegistry.java   |   22 +-
 .../daemon/registry/DaemonRegistryContent.java     |  165 ++-
 .../daemon/registry/DaemonRegistryServices.java    |    7 +-
 .../launcher/daemon/registry/DaemonStopEvent.java  |  132 ++
 .../launcher/daemon/registry/DaemonStopEvents.java |   71 +
 .../daemon/registry/EmbeddedDaemonRegistry.java    |  102 --
 .../daemon/registry/PersistentDaemonRegistry.java  |  116 +-
 .../daemon/server/BadlyFormedRequestException.java |   23 +
 .../server/CompatibleDaemonExpirationStrategy.java |   62 +
 .../org/gradle/launcher/daemon/server/Daemon.java  |  161 ++-
 .../DaemonIdleTimeoutExpirationStrategy.java       |   57 +
 ...aemonRegistryUnavailableExpirationStrategy.java |   73 +
 .../daemon/server/DaemonRegistryUpdater.java       |   98 ++
 .../daemon/server/DaemonServerConnector.java       |    2 +-
 .../launcher/daemon/server/DaemonServices.java     |  117 +-
 .../daemon/server/DaemonStateCoordinator.java      |  204 ++-
 .../daemon/server/DaemonTcpServerConnector.java    |   14 +-
 .../daemon/server/DefaultDaemonConnection.java     |   16 +-
 .../server/DefaultIncomingConnectionHandler.java   |   15 +-
 .../daemon/server/DomainRegistryUpdater.java       |   76 -
 .../daemon/server/IncomingConnectionHandler.java   |    2 +-
 .../daemon/server/MasterExpirationStrategy.java    |   85 ++
 ...otMostRecentlyUsedDaemonExpirationStrategy.java |   56 +
 .../server/SynchronizedDispatchConnection.java     |    8 +-
 .../daemon/server/api/DaemonCommandAction.java     |    2 +-
 .../daemon/server/api/DaemonConnection.java        |    2 +-
 .../daemon/server/api/DaemonStateControl.java      |   20 +-
 .../daemon/server/api/DaemonStoppedException.java  |    6 +-
 .../daemon/server/api/HandleReportStatus.java      |   36 +
 .../launcher/daemon/server/api/HandleStop.java     |   17 +-
 .../daemon/server/exec/BuildCommandOnly.java       |    6 +-
 .../daemon/server/exec/DaemonCommandExecuter.java  |   35 +-
 .../server/exec/DefaultDaemonCommandExecuter.java  |   83 --
 .../server/exec/EstablishBuildEnvironment.java     |    4 +-
 .../launcher/daemon/server/exec/ExecuteBuild.java  |   14 +-
 .../daemon/server/exec/HintGCAfterBuild.java       |   55 +
 .../daemon/server/exec/LogAndCheckHealth.java      |   61 +
 .../launcher/daemon/server/exec/LogToClient.java   |    6 +-
 .../server/exec/RequestStopIfSingleUsedDaemon.java |    4 +-
 .../daemon/server/exec/WatchForDisconnection.java  |   18 +-
 .../server/expiry/AllDaemonExpirationStrategy.java |   61 +
 .../server/expiry/AnyDaemonExpirationStrategy.java |   56 +
 .../server/expiry/DaemonExpirationListener.java    |   30 +
 .../server/expiry/DaemonExpirationResult.java      |   39 +
 .../server/expiry/DaemonExpirationStatus.java      |   36 +
 .../server/expiry/DaemonExpirationStrategy.java    |   21 +
 .../daemon/server/health/DaemonHealthCheck.java    |   43 +
 .../daemon/server/health/DaemonHealthServices.java |   32 -
 .../daemon/server/health/DaemonHealthStats.java    |  100 ++
 .../daemon/server/health/DaemonHealthTracker.java  |   56 -
 .../daemon/server/health/DaemonMemoryStatus.java   |  151 ++
 .../launcher/daemon/server/health/DaemonStats.java |   98 --
 .../daemon/server/health/DaemonStatus.java         |   48 -
 .../server/health/DefaultDaemonHealthServices.java |   42 -
 .../GcThrashingDaemonExpirationStrategy.java       |   45 +
 .../server/health/HealthExpirationStrategy.java    |   41 +
 .../daemon/server/health/HealthLogger.java         |    7 +-
 .../daemon/server/health/HintGCAfterBuild.java     |   52 -
 .../health/LowMemoryDaemonExpirationStrategy.java  |   62 +
 .../health/LowPermGenDaemonExpirationStrategy.java |   45 +
 .../LowTenuredSpaceDaemonExpirationStrategy.java   |   45 +
 .../launcher/daemon/server/health/MemoryInfo.java  |   61 -
 .../server/health/gc/DefaultSlidingWindow.java     |   54 +
 .../server/health/gc/GarbageCollectionCheck.java   |   58 +
 .../server/health/gc/GarbageCollectionEvent.java   |   43 +
 .../server/health/gc/GarbageCollectionInfo.java    |   36 +
 .../server/health/gc/GarbageCollectionMonitor.java |  146 ++
 .../server/health/gc/GarbageCollectionStats.java   |  133 ++
 .../gc/GarbageCollectorMonitoringStrategy.java     |   72 +
 .../daemon/server/health/gc/SlidingWindow.java     |   35 +
 .../server/health/memory/AvailableMemory.java      |   21 +
 .../health/memory/MBeanAttributeProvider.java      |   53 +
 .../server/health/memory/MBeanAvailableMemory.java |   29 +
 .../health/memory/MeminfoAvailableMemory.java      |  132 ++
 .../daemon/server/health/memory/MemoryInfo.java    |   69 +
 .../health/memory/VmstatAvailableMemory.java       |  127 ++
 .../daemon/server/scaninfo/DaemonScanInfo.java     |   57 +
 .../server/scaninfo/DefaultDaemonScanInfo.java     |   94 ++
 .../daemon/server/stats/DaemonRunningStats.java    |   67 +
 .../launcher/exec/BuildActionParameters.java       |    3 +-
 .../exec/ChainingCompositeBuildActionRunner.java   |   44 -
 .../exec/CompositeBuildActionExecuter.java         |   39 -
 .../exec/ContinuousBuildActionExecuter.java        |  189 ---
 .../DaemonUsageSuggestingBuildActionExecuter.java  |   70 -
 .../exec/DefaultBuildActionParameters.java         |   15 +-
 .../DefaultCompositeBuildActionParameters.java     |   47 -
 .../exec/DefaultCompositeBuildController.java      |   54 -
 .../launcher/exec/GradleBuildController.java       |   79 ++
 .../exec/InProcessBuildActionExecuter.java         |   69 +-
 .../internal/provider/ClassLoaderCache.java        |   24 +
 .../internal/provider/ClassLoaderDetails.java      |    5 +
 .../internal/provider/ClasspathInferer.java        |   18 +-
 .../ClientSidePayloadClassLoaderFactory.java       |   18 +-
 .../ClientSidePayloadClassLoaderRegistry.java      |   57 +-
 .../internal/provider/ConnectionScopeServices.java |   22 +-
 .../provider/ContinuousBuildActionExecuter.java    |  183 +++
 .../provider/DaemonBuildActionExecuter.java        |    3 +-
 .../DaemonSidePayloadClassLoaderFactory.java       |   67 +-
 .../internal/provider/DefaultConnection.java       |   89 +-
 .../provider/DefaultConnectionMetaData.java        |    2 +-
 .../DefaultPayloadClassLoaderRegistry.java         |   20 +-
 .../provider/ExecuteBuildActionRunner.java         |    2 +-
 .../gradle/tooling/internal/provider/JarCache.java |  102 --
 .../internal/provider/LauncherServices.java        |   36 +-
 .../LoggingBridgingBuildActionExecuter.java        |   12 +-
 .../internal/provider/ModelClassLoaderFactory.java |   39 +-
 .../provider/PayloadClassLoaderRegistry.java       |   11 +
 .../internal/provider/PayloadSerializer.java       |   13 +-
 .../internal/provider/ProviderConnection.java      |   20 +-
 .../tooling/internal/provider/SerializeMap.java    |    4 +-
 .../internal/provider/ShutdownCoordinator.java     |   16 +-
 .../provider/connection/BuildLogLevelMixIn.java    |    7 +-
 .../DefaultOperationFinishedProgressEvent.java     |    2 +-
 .../DefaultOperationStartedProgressEvent.java      |    2 +-
 .../events/DefaultTaskFinishedProgressEvent.java   |    2 +-
 .../events/DefaultTaskStartedProgressEvent.java    |    2 +-
 .../events/DefaultTestFinishedProgressEvent.java   |    2 +-
 .../events/DefaultTestStartedProgressEvent.java    |    2 +-
 .../internal/provider/jdk6/Jdk6ClassLookup.java    |   27 -
 .../launcher/cli/BuildActionsFactoryTest.groovy    |   45 +-
 .../cli/CommandLineActionFactoryTest.groovy        |   11 +-
 .../cli/ReportDaemonStatusActionTest.groovy        |   34 +
 .../gradle/launcher/cli/RunBuildActionTest.groovy  |    5 +-
 .../DaemonCommandLineConverterTest.groovy          |   60 +-
 ...ropertiesToDaemonParametersConverterTest.groovy |   55 +-
 .../PropertiesToStartParameterConverterTest.groovy |    2 +-
 .../daemon/DaemonExecHandleBuilderSpec.groovy      |    4 +-
 .../daemon/bootstrap/DaemonGreeterTest.groovy      |    2 +-
 .../DaemonStartupCommunicationSpec.groovy          |    2 +-
 .../daemon/client/DaemonCancelForwarderTest.groovy |    5 +-
 .../client/DaemonClientConnectionTest.groovy       |    8 +-
 .../client/DaemonClientInputForwarderTest.groovy   |    4 +-
 .../daemon/client/DaemonClientServicesTest.groovy  |    2 +-
 .../launcher/daemon/client/DaemonClientTest.groovy |   24 +-
 .../daemon/client/DaemonStartupMessageTest.groovy  |   50 +
 .../daemon/client/DaemonStopClientTest.groovy      |   76 +-
 .../client/DefaultDaemonConnectorTest.groovy       |   27 +-
 .../daemon/client/JvmVersionDetectorTest.groovy    |   67 -
 .../client/ReportDaemonStatusClientTest.groovy     |  136 ++
 .../client/ReportStatusDispatcherTest.groovy       |   53 +
 .../daemon/client/StopDispatcherTest.groovy        |    2 +-
 .../configuration/DaemonParametersTest.groovy      |   20 +-
 .../protocol/DaemonMessageSerializerTest.groovy    |   10 +-
 .../DaemonStatusAndErrorReportingTest.groovy       |   62 +
 .../registry/DaemonRegistryServicesTest.groovy     |   15 +-
 .../registry/DaemonRegistryUpdaterTest.groovy      |  102 ++
 .../daemon/registry/DaemonStopEventsTest.groovy    |   58 +
 .../registry/DomainRegistryUpdaterTest.groovy      |   89 --
 .../daemon/registry/EmbeddedDaemonRegistry.java    |  129 ++
 .../registry/EmbeddedDaemonRegistrySpec.groovy     |   32 +-
 .../registry/PersistentDaemonRegistryTest.groovy   |   54 +-
 .../CompatibleDaemonExpirationStrategyTest.groovy  |   93 ++
 .../server/DaemonExpirationStrategyTest.groovy     |   58 +
 .../DaemonIdleTimeoutExpirationStrategyTest.groovy |   71 +
 ...egistryUnavailableExpirationStrategyTest.groovy |   77 +
 .../DaemonServerExceptionHandlingTest.groovy       |  132 --
 .../daemon/server/DaemonServicesTest.groovy        |    9 +-
 .../server/DaemonStateCoordinatorTest.groovy       |  202 ++-
 .../server/DefaultDaemonConnectionTest.groovy      |    4 +-
 ...RecentlyUsedDaemonExpirationStrategyTest.groovy |   51 +
 .../daemon/server/exec/HintGCAfterBuildTest.groovy |   52 +
 .../server/exec/LogAndCheckHealthTest.groovy       |   51 +
 .../expiry/AllDaemonExpirationStrategyTest.groovy  |   96 ++
 .../expiry/AnyDaemonExpirationStrategyTest.groovy  |   81 ++
 .../server/health/DaemonHealthStatsTest.groovy     |   81 ++
 .../server/health/DaemonHealthTrackerTest.groovy   |   69 -
 .../server/health/DaemonMemoryStatusTest.groovy    |  170 +++
 .../daemon/server/health/DaemonStatsTest.groovy    |   92 --
 .../daemon/server/health/DaemonStatusTest.groovy   |   76 -
 .../GcThrashingDaemonExpirationStrategyTest.groovy |   53 +
 .../daemon/server/health/HealthLoggerTest.groovy   |    2 +-
 .../server/health/HintGCAfterBuildTest.groovy      |   52 -
 .../LowMemoryDaemonExpirationStrategyTest.groovy   |  101 ++
 .../LowPermGenDaemonExpirationStrategyTest.groovy  |   53 +
 ...TenuredSpaceDaemonExpirationStrategyTest.groovy |   53 +
 .../health/gc/DefaultSlidingWindowTest.groovy      |   45 +
 .../health/gc/GarbageCollectionMonitorTest.groovy  |   74 +
 .../health/gc/GarbageCollectionStatsTest.groovy    |   44 +
 .../memory/MeminfoAvailableMemoryTest.groovy       |  132 ++
 .../server/health/memory/MemoryInfoTest.groovy     |   57 +
 .../health/memory/VmstatAvailableMemoryTest.groovy |   53 +
 .../ChainingCompositeBuildActionRunnerTest.groovy  |   50 -
 .../exec/ContinuousBuildActionExecuterTest.groovy  |  266 ----
 ...onUsageSuggestingBuildActionExecuterTest.groovy |  113 --
 .../exec/DefaultBuildActionParametersTest.groovy   |    4 +-
 .../provider/AbstractClassGraphSpec.groovy         |   22 +-
 .../internal/provider/ClasspathInfererTest.groovy  |   22 +-
 .../ClientSidePayloadClassLoaderFactoryTest.groovy |    6 +-
 .../provider/ConnectionScopeServicesTest.groovy    |   11 +-
 .../ContinuousBuildActionExecuterTest.groovy       |  222 +++
 .../DaemonSidePayloadClassLoaderFactoryTest.groovy |   35 +-
 .../tooling/internal/provider/JarCacheTest.groovy  |  130 --
 .../LoggingBridgingBuildActionExecuterTest.groovy  |    4 +-
 .../internal/provider/PayloadSerializerTest.groovy |   18 +-
 .../Java7RequiringContinuousIntegrationTest.groovy |    4 -
 subprojects/logging/logging.gradle                 |   25 +
 .../DeprecationHandlingIntegrationTest.groovy      |  118 ++
 .../java}/org/gradle/api/logging/LogLevel.java     |    0
 .../main/java}/org/gradle/api/logging/Logger.java  |    0
 .../main/java/org/gradle/api/logging/Logging.java  |   50 +
 .../org/gradle/api/logging/LoggingManager.java     |   65 +
 .../org/gradle/api/logging/LoggingOutput.java      |    0
 .../gradle/api/logging/StandardOutputListener.java |    0
 .../api/logging/configuration/ConsoleOutput.java   |   39 +
 .../configuration/LoggingConfiguration.java        |   56 +
 .../api/logging/configuration/ShowStacktrace.java  |   24 +
 .../api/logging/configuration/package-info.java    |   20 +
 .../java}/org/gradle/api/logging/package-info.java |    0
 .../featurelifecycle/DeprecatedFeatureHandler.java |    0
 .../featurelifecycle/DeprecatedFeatureUsage.java   |   89 ++
 .../LoggingDeprecatedFeatureHandler.java           |   76 +
 .../featurelifecycle/UsageLocationReporter.java    |    0
 .../gradle/internal/logging/ConsoleRenderer.java   |   42 +
 .../logging/DefaultLoggingConfiguration.java       |   72 +
 .../gradle/internal/logging/LogLevelMapping.java   |   38 +
 .../logging/LoggingCommandLineConverter.java       |  172 +++
 .../internal/logging/LoggingManagerInternal.java   |   47 +
 .../internal/logging/LoggingOutputInternal.java    |   71 +
 .../internal/logging/StandardOutputCapture.java    |   32 +
 .../LoggingManagerInternalCompatibilityBridge.java |  127 ++
 .../internal/logging/config/LoggingConfigurer.java |   23 +
 .../internal/logging/config/LoggingRouter.java     |   24 +
 .../logging/config/LoggingSourceSystem.java        |   34 +
 .../internal/logging/config/LoggingSystem.java     |   35 +
 .../logging/config/LoggingSystemAdapter.java       |   63 +
 .../internal/logging/console/AnsiConsole.java      |  252 ++++
 .../gradle/internal/logging/console/ColorMap.java  |   32 +
 .../gradle/internal/logging/console/Console.java   |   29 +
 .../console/ConsoleBackedProgressRenderer.java     |  137 ++
 .../internal/logging/console/DefaultColorMap.java  |  138 ++
 .../logging/console/DefaultStatusBarFormatter.java |   55 +
 .../org/gradle/internal/logging/console/Label.java |   21 +
 .../logging/console/ProgressOperation.java         |   50 +
 .../logging/console/ProgressOperations.java        |   55 +
 .../console/StyledTextOutputBackedRenderer.java    |   93 ++
 .../gradle/internal/logging/console/TextArea.java  |   22 +
 .../logging/events/CategorisedOutputEvent.java     |   43 +
 .../internal/logging/events/EndOutputEvent.java    |   31 +
 .../gradle/internal/logging/events/LogEvent.java   |   54 +
 .../logging/events/LogLevelChangeEvent.java        |   44 +
 .../logging/events/OperationIdentifier.java        |   54 +
 .../internal/logging/events/OutputEvent.java       |   31 +
 .../logging/events/OutputEventListener.java        |   21 +
 .../logging/events/ProgressCompleteEvent.java      |   49 +
 .../internal/logging/events/ProgressEvent.java     |   43 +
 .../logging/events/ProgressStartEvent.java         |   71 +
 .../logging/events/RenderableOutputEvent.java      |   36 +
 .../logging/events/StyledTextOutputEvent.java      |  115 ++
 .../progress/DefaultProgressLoggerFactory.java     |  184 +++
 .../logging/progress/ProgressListener.java         |   29 +
 .../internal/logging/progress/ProgressLogger.java  |  126 ++
 .../logging/progress/ProgressLoggerFactory.java    |   40 +
 .../logging/services/DefaultLoggingConfigurer.java |   38 +
 .../logging/services/DefaultLoggingManager.java    |  314 ++++
 .../services/DefaultLoggingManagerFactory.java     |   57 +
 .../services/DefaultStyledTextOutputFactory.java   |   38 +
 .../services/LoggingBackedStyledTextOutput.java    |   69 +
 .../logging/services/LoggingServiceRegistry.java   |  160 +++
 .../logging/services/ProgressLoggingBridge.java    |   43 +
 .../services/TextStreamOutputEventListener.java    |   60 +
 .../logging/sink/ConsoleConfigureAction.java       |   63 +
 .../internal/logging/sink/OutputEventRenderer.java |  292 ++++
 .../logging/sink/ProgressLogEventGenerator.java    |  194 +++
 .../slf4j/OutputEventListenerBackedLogger.java     |  476 +++++++
 .../OutputEventListenerBackedLoggerContext.java    |  416 ++++++
 .../logging/slf4j/Slf4jLoggingConfigurer.java      |   51 +
 .../logging/source/DefaultStdErrLoggingSystem.java |   39 +
 .../logging/source/DefaultStdOutLoggingSystem.java |   39 +
 .../logging/source/JavaUtilLoggingSystem.java      |   89 ++
 .../internal/logging/source/NoOpLoggingSystem.java |   41 +
 .../logging/source/PrintStreamLoggingSystem.java   |  144 ++
 .../logging/source/StdErrLoggingSystem.java        |   25 +
 .../logging/source/StdOutLoggingSystem.java        |   25 +
 .../text/AbstractLineChoppingStyledTextOutput.java |   83 ++
 .../logging/text/AbstractStyledTextOutput.java     |  170 +++
 .../text/AbstractStyledTextOutputFactory.java      |   33 +
 .../logging/text/BufferingStyledTextOutput.java    |   77 +
 .../text/LinePrefixingStyledTextOutput.java        |   61 +
 .../text/StreamBackedStandardOutputListener.java   |   52 +
 .../logging/text/StreamingStyledTextOutput.java    |   66 +
 .../text/StreamingStyledTextOutputFactory.java     |   31 +
 .../internal/logging/text/StyledTextOutput.java    |  161 +++
 .../logging/text/StyledTextOutputFactory.java      |   56 +
 .../org/gradle/logging/LoggingManagerInternal.java |   64 +
 .../org/gradle/logging/ProgressLoggerFactory.java  |   26 +
 .../org/gradle/logging/StandardOutputCapture.java  |   27 +
 .../gradle/logging/StyledTextOutputFactory.java    |   24 +
 .../java}/org/gradle/util/DeprecationLogger.java   |    0
 .../java/org/gradle/util/SingleMessageLogger.java  |  214 +++
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |   51 +
 .../org/gradle/api/logging/LogLevelTest.groovy     |    0
 .../groovy/org/gradle/api/logging/LoggingTest.java |  123 ++
 .../DeprecatedFeatureUsageTest.groovy              |    0
 .../LoggingDeprecatedFeatureHandlerTest.groovy     |   57 +
 .../internal/logging/ConsoleRendererTest.groovy    |   38 +
 .../logging/LoggingCommandLineConverterTest.groovy |  117 ++
 .../internal/logging/OutputSpecification.groovy    |   84 ++
 .../logging/config/LoggingSystemAdapterTest.groovy |   73 +
 .../logging/console/AnsiConsoleTest.groovy         |  553 ++++++++
 .../ConsoleBackedProgressRendererTest.groovy       |  386 +++++
 .../internal/logging/console/ConsoleStub.java      |   47 +
 .../logging/console/DefaultColorMapTest.groovy     |  106 ++
 .../console/DefaultStatusBarFormatterTest.groovy   |   56 +
 .../logging/console/ProgressOperationsTest.groovy  |  117 ++
 .../StyledTextOutputBackedRendererTest.groovy      |  110 ++
 .../internal/logging/console/TestColorMap.groovy   |   42 +
 .../internal/logging/events/LogEventTest.groovy    |   47 +
 .../events/StyledTextOutputEventTest.groovy        |   64 +
 .../DefaultProgressLoggerFactoryTest.groovy        |  382 +++++
 .../services/DefaultLoggingManagerTest.groovy      |  498 +++++++
 .../services/LoggingServiceRegistryTest.groovy     |  551 +++++++
 .../StreamBackedStandardOutputListenerTest.groovy  |   57 +
 .../TextStreamOutputEventListenerTest.groovy       |   66 +
 .../logging/sink/OutputEventRendererTest.groovy    |  346 +++++
 .../sink/ProgressLogEventGeneratorTest.groovy      |  484 +++++++
 ...tputEventListenerBackedLoggerContextTest.groovy |   64 +
 ...enerBackedLoggerDefaultConfigurationTest.groovy |   99 ++
 .../OutputEventListenerBackedLoggerTest.groovy     |  941 ++++++++++++
 .../slf4j/Slf4jLoggingConfigurerTest.groovy        |  178 +++
 .../source/JavaUtilLoggingSystemTest.groovy        |   40 +
 .../source/PrintStreamLoggingSystemTest.groovy     |  192 +++
 ...AbstractLineChoppingStyledTextOutputTest.groovy |  165 +++
 .../text/AbstractStyledTextOutputTest.groovy       |  177 +++
 .../text/LinePrefixingStyledTextOutputTest.groovy  |  134 ++
 .../text/LoggingBackedStyledTextOutputTest.groovy  |  149 ++
 .../text/StreamingStyledTextOutputTest.groovy      |   78 +
 .../org/gradle/util/SingleMessageLoggerTest.groovy |  114 ++
 .../internal/logging/ConfigureLogging.groovy       |   72 +
 .../logging/TestOutputEventListener.groovy         |   44 +
 .../logging/text/TestStyledTextOutput.groovy       |   79 ++
 .../logging/text/TestStyledTextOutputFactory.java  |   52 +
 subprojects/maven/maven.gradle                     |    4 +
 .../maven/MavenPublishBasicIntegTest.groovy        |   40 +
 .../MavenPublishCrossVersionIntegrationTest.groovy |    4 +-
 .../maven/MavenPublishHttpsIntegTest.groovy        |    7 +-
 .../maven/MavenPublishIssuesIntegTest.groovy       |   14 +-
 .../publish/maven/MavenPublishJavaIntegTest.groovy |   28 +-
 .../maven/MavenPublishMultiProjectIntegTest.groovy |    9 +-
 .../MavenJavaProjectPublishIntegrationTest.groovy  |   24 +-
 .../MavenMultiProjectPublishIntegrationTest.groovy |  372 +++++
 .../maven/MavenPublishIntegrationTest.groovy       |  250 +++-
 .../MavenPublishRepoDslIntegrationTest.groovy      |   48 +
 .../MavenSettingsPublishIntegrationTest.groovy     |    2 +-
 .../publish/maven/pomGeneration/expectedNewPom.txt |   18 +
 .../publish/maven/pomGeneration/expectedPom.txt    |   20 +-
 .../api/artifacts/maven/GroovyMavenDeployer.java   |   37 -
 .../groovy/org/gradle/api/plugins/MavenPlugin.java |  187 ---
 .../maven/internal/DefaultDeployerFactory.java     |   83 --
 .../DefaultMavenRepositoryHandlerConvention.java   |   83 --
 .../internal/deployer/AbstractMavenResolver.java   |  197 ---
 .../maven/internal/deployer/BaseMavenDeployer.java |   98 --
 .../internal/deployer/BaseMavenInstaller.java      |   39 -
 .../deployer/DefaultGroovyMavenDeployer.groovy     |   49 -
 .../maven/internal/deployer/RepositoryBuilder.java |   32 -
 .../maven/internal/deployer/RepositoryFactory.java |   51 -
 .../internal/pom/DefaultExcludeRuleConverter.java  |   35 -
 .../maven/internal/pom/DefaultMavenPom.java        |  229 ---
 .../pom/DefaultPomDependenciesConverter.java       |  157 --
 .../wagon/RepositoryTransportDeployWagon.java      |  313 ----
 .../internal/artifact/DefaultMavenArtifact.java    |   71 -
 .../internal/artifact/DefaultMavenArtifactSet.java |   87 --
 .../publication/DefaultMavenPublication.java       |  235 ---
 .../internal/publisher/AbstractMavenPublisher.java |   76 -
 .../internal/publisher/MavenLocalPublisher.java    |   38 -
 .../internal/publisher/MavenRemotePublisher.java   |  100 --
 .../publish/maven/plugins/MavenPublishPlugin.java  |  184 ---
 .../maven/tasks/AbstractPublishToMaven.java        |  107 --
 .../api/publish/maven/tasks/GenerateMavenPom.java  |  110 --
 .../maven/tasks/PublishToMavenRepository.java      |   93 --
 .../apache/maven/artifact/ant/Authentication.java  |    0
 .../org/apache/maven/artifact/ant/Proxy.java       |    0
 .../maven/artifact/ant/RemoteRepository.java       |    0
 .../org/apache/maven/artifact/ant/Repository.java  |    0
 .../maven/artifact/ant/RepositoryPolicy.java       |    0
 .../apache/maven/artifact/ant/package-info.java    |    0
 .../api/artifacts/maven/Conf2ScopeMapping.java     |    0
 .../maven/Conf2ScopeMappingContainer.java          |    0
 .../api/artifacts/maven/GroovyMavenDeployer.java   |   37 +
 .../gradle/api/artifacts/maven/MavenDeployer.java  |    0
 .../api/artifacts/maven/MavenDeployment.java       |    0
 .../org/gradle/api/artifacts/maven/MavenPom.java   |    0
 .../gradle/api/artifacts/maven/MavenResolver.java  |    0
 .../api/artifacts/maven/PomFilterContainer.java    |    0
 .../gradle/api/artifacts/maven/PublishFilter.java  |    0
 .../gradle/api/artifacts/maven/package-info.java   |    0
 .../java/org/gradle/api/plugins/MavenPlugin.java   |  187 +++
 .../gradle/api/plugins/MavenPluginConvention.java  |    0
 .../plugins/MavenRepositoryHandlerConvention.java  |    0
 .../publication/maven/internal/ArtifactPom.java    |    0
 .../maven/internal/ArtifactPomContainer.java       |    0
 .../maven/internal/ArtifactPomFactory.java         |    0
 .../maven/internal/BasePomFilterContainer.java     |    0
 .../maven/internal/DefaultArtifactPom.java         |    0
 .../internal/DefaultArtifactPomContainer.java      |    0
 .../maven/internal/DefaultArtifactPomFactory.java  |    0
 .../maven/internal/DefaultDeployerFactory.java     |   83 ++
 .../maven/internal/DefaultMavenDeployment.java     |    0
 .../DefaultMavenRepositoryHandlerConvention.java   |   83 ++
 .../maven/internal/DefaultPomFilter.java           |    0
 .../maven/internal/DeployerFactory.java            |    0
 .../publication/maven/internal/MavenFactory.java   |    0
 .../maven/internal/MavenPomMetaInfoProvider.java   |    0
 .../maven/internal/MavenVersionRangeMapper.java    |    0
 .../publication/maven/internal/ModelFactory.java   |    0
 .../api/publication/maven/internal/PomFilter.java  |    0
 .../maven/internal/VersionRangeMapper.java         |    0
 .../action/AbstractMavenPublishAction.java         |    0
 .../action/LoggingMavenTransferListener.java       |    0
 .../maven/internal/action/MavenDeployAction.java   |    0
 .../maven/internal/action/MavenInstallAction.java  |    0
 .../maven/internal/action/MavenPublishAction.java  |    0
 .../internal/action/MavenWagonDeployAction.java    |    0
 .../internal/action/SnapshotVersionManager.java    |    0
 .../internal/deployer/AbstractMavenResolver.java   |  210 +++
 .../maven/internal/deployer/BaseMavenDeployer.java |   98 ++
 .../internal/deployer/BaseMavenInstaller.java      |   39 +
 .../deployer/DefaultGroovyMavenDeployer.java       |   75 +
 .../internal/deployer/MavenRemoteRepository.java   |   55 +
 .../maven/internal/pom/CustomModelBuilder.java     |    0
 .../pom/DefaultConf2ScopeMappingContainer.java     |    0
 .../internal/pom/DefaultExcludeRuleConverter.java  |   39 +
 .../maven/internal/pom/DefaultMavenFactory.java    |    0
 .../maven/internal/pom/DefaultMavenPom.java        |  229 +++
 .../maven/internal/pom/DefaultMavenPomFactory.java |    0
 .../pom/DefaultPomDependenciesConverter.java       |  244 ++++
 .../maven/internal/pom/ExcludeRuleConverter.java   |    0
 .../maven/internal/pom/PlexusLoggerAdapter.java    |    0
 .../internal/pom/PomDependenciesConverter.java     |    0
 .../ProjectDependencyArtifactIdExtractorHack.java  |    0
 .../wagon/RepositoryTransportDeployWagon.java      |  313 ++++
 .../wagon/RepositoryTransportWagonAdapter.java     |    0
 .../maven/InvalidMavenPublicationException.java    |    0
 .../gradle/api/publish/maven/MavenArtifact.java    |    0
 .../gradle/api/publish/maven/MavenArtifactSet.java |    0
 .../gradle/api/publish/maven/MavenDependency.java  |    0
 .../org/gradle/api/publish/maven/MavenPom.java     |    0
 .../gradle/api/publish/maven/MavenPublication.java |    0
 .../maven/internal/MavenPublishServices.java       |    0
 .../internal/artifact/DefaultMavenArtifact.java    |   71 +
 .../internal/artifact/DefaultMavenArtifactSet.java |   87 ++
 .../MavenArtifactNotationParserFactory.java        |    0
 .../dependencies/DefaultMavenDependency.java       |    0
 .../dependencies/MavenDependencyInternal.java      |    0
 .../internal/publication/DefaultMavenPom.java      |    0
 .../publication/DefaultMavenProjectIdentity.java   |    0
 .../publication/DefaultMavenPublication.java       |  244 ++++
 .../internal/publication/MavenPomInternal.java     |    0
 .../publication/MavenPublicationInternal.java      |    0
 .../internal/publisher/AbstractMavenPublisher.java |   76 +
 .../internal/publisher/MavenLocalPublisher.java    |   38 +
 .../publisher/MavenNormalizedPublication.java      |    0
 .../internal/publisher/MavenProjectIdentity.java   |    0
 .../maven/internal/publisher/MavenPublisher.java   |    0
 .../internal/publisher/MavenRemotePublisher.java   |  100 ++
 .../publisher/StaticLockingMavenPublisher.java     |    0
 .../publisher/ValidatingMavenPublisher.java        |    0
 .../internal/tasks/MavenPomFileGenerator.java      |    0
 .../org/gradle/api/publish/maven/package-info.java |    0
 .../publish/maven/plugins/MavenPublishPlugin.java  |  184 +++
 .../api/publish/maven/plugins/package-info.java    |    0
 .../maven/tasks/AbstractPublishToMaven.java        |  110 ++
 .../api/publish/maven/tasks/GenerateMavenPom.java  |  112 ++
 .../publish/maven/tasks/PublishToMavenLocal.java   |    0
 .../maven/tasks/PublishToMavenRepository.java      |   95 ++
 .../api/publish/maven/tasks/package-info.java      |    0
 .../api/plugins/MavenPluginConventionTest.groovy   |   16 +-
 .../org/gradle/api/plugins/MavenPluginTest.java    |   13 +-
 .../maven/internal/DefaultArtifactPomTest.java     |    4 +-
 ...aultMavenRepositoryHandlerConventionTest.groovy |   41 +-
 .../deployer/DefaultGroovyMavenDeployerTest.groovy |    9 +-
 .../pom/DefaultExcludeRuleConverterTest.groovy     |   52 +
 .../pom/DefaultExcludeRuleConverterTest.java       |   54 -
 .../pom/DefaultPomDependenciesConverterTest.groovy |   26 +-
 ...ectDependencyArtifactIdExtractorHackTest.groovy |   12 +-
 .../MavenArtifactNotationParserFactoryTest.groovy  |   11 +-
 .../publication/DefaultMavenPublicationTest.groovy |   41 +-
 .../publisher/ValidatingMavenPublisherTest.groovy  |   20 +-
 .../maven/plugins/MavenPublishPluginTest.groovy    |    7 +-
 .../tasks/PublishToMavenRepositoryTest.groovy      |    7 +-
 subprojects/messaging/messaging.gradle             |    3 +
 .../remote/UnicastMessagingIntegrationTest.groovy  |  303 ++++
 .../internal/hub/MessageHubIntegrationTest.groovy  |  233 +++
 .../remote/UnicastMessagingIntegrationTest.groovy  |  303 ----
 .../internal/hub/MessageHubIntegrationTest.groovy  |  233 ---
 .../main/java/org/gradle/internal/actor/Actor.java |   62 +
 .../org/gradle/internal/actor/ActorFactory.java    |   35 +
 .../actor/internal/DefaultActorFactory.java        |  157 ++
 .../gradle/internal/dispatch/AsyncDispatch.java    |  193 +++
 .../gradle/internal/dispatch/BoundedDispatch.java  |   29 +
 .../dispatch/ContextClassLoaderDispatch.java       |   37 +
 .../internal/dispatch/ContextClassLoaderProxy.java |   37 +
 .../dispatch/DiscardingFailureHandler.java         |   30 +
 .../org/gradle/internal/dispatch/Dispatch.java     |   31 +
 .../internal/dispatch/DispatchException.java       |   23 +
 .../internal/dispatch/DispatchFailureHandler.java  |   23 +
 .../dispatch/ExceptionTrackingFailureHandler.java  |   47 +
 .../internal/dispatch/FailureHandlingDispatch.java |   34 +
 .../gradle/internal/dispatch/MethodInvocation.java |   68 +
 .../internal/dispatch/ProxyDispatchAdapter.java    |   97 ++
 .../java/org/gradle/internal/dispatch/Receive.java |   31 +
 .../internal/dispatch/ReflectionDispatch.java      |   42 +
 .../gradle/internal/dispatch/StreamCompletion.java |   24 +
 .../internal/event/AbstractBroadcastDispatch.java  |    6 +-
 .../gradle/internal/event/BroadcastDispatch.java   |    6 +-
 .../internal/event/DefaultListenerManager.java     |    8 +-
 .../gradle/internal/event/ListenerBroadcast.java   |    8 +-
 .../java/org/gradle/internal/remote/Address.java   |   30 +
 .../gradle/internal/remote/ConnectionAcceptor.java |   33 +
 .../gradle/internal/remote/MessagingClient.java    |   28 +
 .../gradle/internal/remote/MessagingServer.java    |   32 +
 .../gradle/internal/remote/ObjectConnection.java   |   43 +
 .../internal/remote/ObjectConnectionBuilder.java   |   57 +
 .../remote/internal/ConnectCompletion.java         |   32 +
 .../internal/remote/internal/ConnectException.java |   22 +
 .../internal/remote/internal/Connection.java       |   37 +
 .../remote/internal/IncomingConnector.java         |   31 +
 .../internal/KryoBackedMessageSerializer.java      |   37 +
 .../remote/internal/MessageIOException.java        |   22 +
 .../remote/internal/MessageSerializer.java         |   35 +
 .../remote/internal/OutgoingConnector.java         |   27 +
 .../internal/remote/internal/RemoteConnection.java |   42 +
 .../remote/internal/hub/ConnectionSet.java         |   72 +
 .../remote/internal/hub/ConnectionState.java       |   62 +
 .../internal/hub/DefaultMethodArgsSerializer.java  |   79 ++
 .../remote/internal/hub/IncomingQueue.java         |   32 +
 .../internal/hub/InterHubMessageSerializer.java    |  122 ++
 ...avaSerializationBackedMethodArgsSerializer.java |   62 +
 .../internal/remote/internal/hub/MessageHub.java   |  400 ++++++
 .../internal/hub/MessageHubBackedClient.java       |   37 +
 .../hub/MessageHubBackedObjectConnection.java      |  131 ++
 .../internal/hub/MessageHubBackedServer.java       |   52 +
 .../remote/internal/hub/MethodArgsSerializer.java  |   23 +
 .../internal/hub/MethodInvocationSerializer.java   |  154 ++
 .../remote/internal/hub/OutgoingQueue.java         |   51 +
 .../internal/hub/RejectedMessageListener.java      |   27 +
 .../internal/hub/protocol/ChannelIdentifier.java   |   51 +
 .../internal/hub/protocol/ChannelMessage.java      |   45 +
 .../remote/internal/hub/protocol/EndOfStream.java  |   29 +
 .../internal/hub/protocol/InterHubMessage.java     |   39 +
 .../internal/hub/protocol/RejectedMessage.java     |   45 +
 .../remote/internal/hub/protocol/Routable.java     |   21 +
 .../remote/internal/hub/queue/EndPointQueue.java   |   61 +
 .../internal/hub/queue/MultiChannelQueue.java      |   61 +
 .../internal/hub/queue/MultiEndPointQueue.java     |  101 ++
 .../internal/hub/queue/QueueInitializer.java       |   39 +
 .../remote/internal/inet/InetAddressFactory.java   |  148 ++
 .../remote/internal/inet/InetAddresses.java        |  121 ++
 .../remote/internal/inet/InetEndpoint.java         |   31 +
 .../remote/internal/inet/MultiChoiceAddress.java   |   78 +
 .../inet/MultiChoiceAddressSerializer.java         |   54 +
 .../internal/inet/SocketConnectCompletion.java     |   41 +
 .../remote/internal/inet/SocketConnection.java     |  291 ++++
 .../remote/internal/inet/SocketInetAddress.java    |   96 ++
 .../remote/internal/inet/TcpIncomingConnector.java |  130 ++
 .../remote/internal/inet/TcpOutgoingConnector.java |  108 ++
 .../remote/services/MessagingServices.java         |   86 ++
 .../internal/serialize/BaseSerializerFactory.java  |    1 -
 .../internal/serialize/HashCodeSerializer.java     |   38 +
 .../internal/serialize/HashValueSerializer.java    |   36 -
 .../org/gradle/internal/serialize/Message.java     |  220 +++
 .../internal/serialize/PlaceholderException.java   |   58 +
 .../java/org/gradle/messaging/actor/Actor.java     |   62 -
 .../org/gradle/messaging/actor/ActorFactory.java   |   35 -
 .../actor/internal/DefaultActorFactory.java        |  161 ---
 .../gradle/messaging/dispatch/AsyncDispatch.java   |  193 ---
 .../dispatch/ContextClassLoaderDispatch.java       |   37 -
 .../dispatch/ContextClassLoaderProxy.java          |   37 -
 .../dispatch/DiscardingFailureHandler.java         |   30 -
 .../org/gradle/messaging/dispatch/Dispatch.java    |   29 -
 .../messaging/dispatch/DispatchException.java      |   23 -
 .../messaging/dispatch/DispatchFailureHandler.java |   23 -
 .../dispatch/ExceptionTrackingFailureHandler.java  |   47 -
 .../dispatch/FailureHandlingDispatch.java          |   34 -
 .../messaging/dispatch/MethodInvocation.java       |   68 -
 .../messaging/dispatch/ProxyDispatchAdapter.java   |   97 --
 .../org/gradle/messaging/dispatch/Receive.java     |   31 -
 .../messaging/dispatch/ReflectionDispatch.java     |   42 -
 .../java/org/gradle/messaging/remote/Address.java  |   30 -
 .../messaging/remote/ConnectionAcceptor.java       |   33 -
 .../gradle/messaging/remote/MessagingClient.java   |   28 -
 .../gradle/messaging/remote/MessagingServer.java   |   32 -
 .../gradle/messaging/remote/ObjectConnection.java  |   43 -
 .../messaging/remote/ObjectConnectionBuilder.java  |   49 -
 .../remote/internal/ConnectCompletion.java         |   32 -
 .../remote/internal/ConnectException.java          |   22 -
 .../messaging/remote/internal/Connection.java      |   37 -
 .../remote/internal/IncomingConnector.java         |   31 -
 .../internal/KryoBackedMessageSerializer.java      |   37 -
 .../gradle/messaging/remote/internal/Message.java  |  220 ---
 .../remote/internal/MessageIOException.java        |   22 -
 .../remote/internal/MessageSerializer.java         |   35 -
 .../remote/internal/MessagingServices.java         |   83 --
 .../remote/internal/OutgoingConnector.java         |   27 -
 .../remote/internal/PlaceholderException.java      |   57 -
 .../remote/internal/RemoteConnection.java          |   42 -
 .../remote/internal/hub/ConnectionSet.java         |   67 -
 .../remote/internal/hub/ConnectionState.java       |   62 -
 .../internal/hub/DefaultMethodArgsSerializer.java  |   79 --
 .../remote/internal/hub/HubStateListener.java      |   32 -
 .../remote/internal/hub/IncomingQueue.java         |   32 -
 .../internal/hub/InterHubMessageSerializer.java    |  122 --
 ...avaSerializationBackedMethodArgsSerializer.java |   62 -
 .../messaging/remote/internal/hub/MessageHub.java  |  391 -----
 .../internal/hub/MessageHubBackedClient.java       |   37 -
 .../hub/MessageHubBackedObjectConnection.java      |  108 --
 .../internal/hub/MessageHubBackedServer.java       |   52 -
 .../remote/internal/hub/MethodArgsSerializer.java  |   23 -
 .../internal/hub/MethodInvocationSerializer.java   |  154 --
 .../remote/internal/hub/OutgoingQueue.java         |   51 -
 .../internal/hub/RejectedMessageListener.java      |   27 -
 .../internal/hub/protocol/ChannelIdentifier.java   |   51 -
 .../internal/hub/protocol/ChannelMessage.java      |   45 -
 .../internal/hub/protocol/ConnectionClosed.java    |   36 -
 .../hub/protocol/ConnectionEstablished.java        |   36 -
 .../remote/internal/hub/protocol/EndOfStream.java  |   29 -
 .../internal/hub/protocol/InterHubMessage.java     |   39 -
 .../internal/hub/protocol/RejectedMessage.java     |   45 -
 .../remote/internal/hub/protocol/Routable.java     |   21 -
 .../remote/internal/hub/queue/EndPointQueue.java   |   61 -
 .../internal/hub/queue/MultiChannelQueue.java      |   63 -
 .../internal/hub/queue/MultiEndPointQueue.java     |  101 --
 .../internal/hub/queue/QueueInitializer.java       |   56 -
 .../remote/internal/inet/InetAddressFactory.java   |  284 ----
 .../remote/internal/inet/InetEndpoint.java         |   31 -
 .../remote/internal/inet/MultiChoiceAddress.java   |   78 -
 .../inet/MultiChoiceAddressSerializer.java         |   54 -
 .../internal/inet/SocketConnectCompletion.java     |   41 -
 .../remote/internal/inet/SocketConnection.java     |  291 ----
 .../remote/internal/inet/SocketInetAddress.java    |   68 -
 .../remote/internal/inet/TcpIncomingConnector.java |  129 --
 .../remote/internal/inet/TcpOutgoingConnector.java |  109 --
 .../actor/internal/DefaultActorFactorySpec.groovy  |  306 ++++
 .../internal/dispatch/AsyncDispatchTest.groovy     |  239 ++++
 .../dispatch/ContextClassLoaderDispatchTest.groovy |   70 +
 .../ExceptionTrackingFailureHandlerTest.groovy     |   61 +
 .../dispatch/FailureHandlingDispatchTest.groovy    |   57 +
 .../internal/dispatch/MethodInvocationTest.groovy  |   45 +
 .../dispatch/ProxyDispatchAdapterTest.groovy       |   62 +
 .../internal/event/ListenerBroadcastTest.groovy    |  265 ++++
 .../internal/event/ListenerBroadcastTest.java      |  268 ----
 .../internal/remote/internal/TestConnection.groovy |   60 +
 .../remote/internal/hub/ConnectionSetTest.groovy   |   83 ++
 .../hub/DefaultMethodArgsSerializerTest.groovy     |   43 +
 .../hub/InterHubMessageSerializerTest.groovy       |  124 ++
 ...ializationBackedMethodArgsSerializerTest.groovy |   43 +
 .../internal/hub/MessageHubBackedClientTest.groovy |   59 +
 .../MessageHubBackedObjectConnectionTest.groovy    |   84 ++
 .../internal/hub/MessageHubBackedServerTest.groovy |   70 +
 .../remote/internal/hub/MessageHubTest.groovy      |  722 ++++++++++
 .../hub/MethodInvocationSerializerTest.groovy      |  137 ++
 .../hub/protocol/ChannelIdentifierTest.groovy      |   34 +
 .../internal/hub/queue/AbstractQueueTest.groovy    |   53 +
 .../hub/queue/MultiChannelQueueTest.groovy         |  130 ++
 .../hub/queue/MultiEndPointQueueTest.groovy        |  165 +++
 .../internal/hub/queue/QueueInitializerTest.groovy |   48 +
 .../internal/inet/InetAddressFactoryTest.groovy    |  109 ++
 .../remote/internal/inet/InetAddressesTest.groovy  |   46 +
 .../inet/MultiChoiceAddressSerializerTest.groovy   |   27 +
 .../internal/inet/MultiChoiceAddressTest.groovy    |   52 +
 .../internal/inet/SocketInetAddressTest.groovy     |   43 +
 .../remote/internal/inet/TcpConnectorTest.groovy   |  324 +++++
 .../remote/services/MessagingServicesTest.groovy   |   38 +
 .../gradle/internal/serialize/MessageTest.groovy   |  410 ++++++
 .../serialize/PlaceholderExceptionTest.groovy      |   42 +
 .../actor/internal/DefaultActorFactorySpec.groovy  |  306 ----
 .../messaging/dispatch/AsyncDispatchTest.groovy    |  210 ---
 .../dispatch/ContextClassLoaderDispatchTest.groovy |   81 --
 .../ExceptionTrackingFailureHandlerTest.groovy     |   61 -
 .../dispatch/FailureHandlingDispatchTest.groovy    |   57 -
 .../messaging/dispatch/MethodInvocationTest.groovy |   45 -
 .../dispatch/ProxyDispatchAdapterTest.groovy       |   61 -
 .../messaging/remote/internal/MessageTest.groovy   |  410 ------
 .../remote/internal/MessagingServicesTest.groovy   |   38 -
 .../internal/PlaceholderExceptionTest.groovy       |   42 -
 .../remote/internal/hub/ConnectionSetTest.groovy   |   79 --
 .../hub/DefaultMethodArgsSerializerTest.groovy     |   43 -
 .../hub/InterHubMessageSerializerTest.groovy       |  124 --
 ...ializationBackedMethodArgsSerializerTest.groovy |   43 -
 .../internal/hub/MessageHubBackedClientTest.groovy |   62 -
 .../internal/hub/MessageHubBackedServerTest.groovy |   73 -
 .../remote/internal/hub/MessageHubTest.groovy      |  689 ---------
 .../hub/MethodInvocationSerializerTest.groovy      |  137 --
 .../hub/protocol/ChannelIdentifierTest.groovy      |   34 -
 .../internal/hub/queue/AbstractQueueTest.groovy    |   46 -
 .../hub/queue/MultiChannelQueueTest.groovy         |  132 --
 .../hub/queue/MultiEndPointQueueTest.groovy        |  165 ---
 .../internal/hub/queue/QueueInitializerTest.groovy |   87 --
 .../internal/inet/InetAddressFactoryTest.groovy    |   55 -
 .../inet/MultiChoiceAddressSerializerTest.groovy   |   28 -
 .../internal/inet/MultiChoiceAddressTest.groovy    |   52 -
 .../internal/inet/SocketInetAddressTest.groovy     |   43 -
 .../remote/internal/inet/TcpConnectorTest.groovy   |  323 -----
 .../gradle/internal/actor/TestActorFactory.java    |   44 +
 .../internal/serialize/SerializerSpec.groovy       |    1 -
 subprojects/model-core/model-core.gradle           |    3 +
 .../model/ConfigurationCycleIntegrationTest.groovy |   12 +-
 .../gradle/model/ModelMapIntegrationTest.groovy    |   77 +-
 .../ModelRuleBindingFailureIntegrationTest.groovy  |   26 +-
 ...odelRuleBindingValidationIntegrationTest.groovy |    2 +-
 .../model/ModelRuleCachingIntegrationTest.groovy   |    2 +-
 ...rceAppliedAsProjectPluginIntegrationTest.groovy |    6 +-
 ...SourceAppliedByRuleMethodIntegrationTest.groovy |   72 +-
 ...eAppliedToModelMapElementIntegrationTest.groovy |    2 +-
 .../model/ScalarCollectionIntegrationTest.groovy   |   90 ++
 .../model/UnmanagedElementIntegrationTest.groovy   |   56 +
 ...nterfaceBackedManagedTypeIntegrationTest.groovy |   38 +
 ...validManagedModelMutationIntegrationTest.groovy |   55 +-
 .../InvalidManagedModelRuleIntegrationTest.groovy  |   10 +-
 .../managed/ManagedModelMapIntegrationTest.groovy  |   84 +-
 .../ManagedScalarCollectionsIntegrationTest.groovy |   49 +-
 ...peWithUnmanagedPropertiesIntegrationTest.groovy |   43 +
 .../model/managed/ModelSetIntegrationTest.groovy   |  128 +-
 ...ScalarTypesInManagedModelIntegrationTest.groovy |   47 +-
 .../main/java/org/gradle/model/ModelElement.java   |   38 +
 .../src/main/java/org/gradle/model/ModelMap.java   |    2 +-
 .../src/main/java/org/gradle/model/ModelSet.java   |    2 +-
 .../org/gradle/model/ModelViewClosedException.java |   12 +-
 .../gradle/model/ReadOnlyModelViewException.java   |   52 +
 .../gradle/model/WriteOnlyModelViewException.java  |    3 +-
 .../model/internal/core/AbstractModelAction.java   |    8 +-
 .../internal/core/ChainingModelProjection.java     |   18 -
 .../ChildNodeInitializerStrategyAccessors.java     |    6 +-
 .../model/internal/core/DefaultModelViewState.java |   12 +-
 .../gradle/model/internal/core/ModelAdapter.java   |    4 -
 .../model/internal/core/ModelMapGroovyView.java    |   11 +
 .../internal/core/ModelMapModelProjection.java     |   33 +-
 .../org/gradle/model/internal/core/ModelMaps.java  |   31 +-
 .../org/gradle/model/internal/core/ModelPath.java  |  107 +-
 .../gradle/model/internal/core/ModelPromise.java   |    4 -
 .../gradle/model/internal/core/ModelReference.java |   19 +-
 .../model/internal/core/MutableModelNode.java      |    4 +-
 .../model/internal/core/NodeBackedModelMap.java    |   60 +-
 .../model/internal/core/NodeBackedModelSet.java    |   18 +-
 .../core/SpecializedModelMapProjection.java        |   34 +-
 .../TypeCompatibilityModelProjectionSupport.java   |   18 -
 .../model/internal/core/TypedModelProjection.java  |   25 -
 .../internal/core/UnmanagedModelProjection.java    |    6 +-
 .../rule/describe/MethodModelRuleDescriptor.java   |   88 +-
 .../inspect/DefaultMethodRuleDefinition.java       |   11 +-
 .../internal/inspect/ModelElementProjection.java   |   61 +
 .../model/internal/inspect/ModelRuleExtractor.java |  124 +-
 .../inspect/ProjectionOnlyNodeInitializer.java     |    9 +-
 .../internal/inspect/StructNodeInitializer.java    |   12 +-
 .../UnmanagedModelCreationRuleExtractor.java       |    1 +
 .../manage/binding/AbstractDelegationBinding.java  |    2 +-
 .../binding/AbstractStructMethodBinding.java       |    2 +-
 .../manage/binding/BridgeMethodBinding.java        |    2 +-
 .../manage/binding/DefaultStructBindingsStore.java |   39 +-
 .../manage/binding/DelegateMethodBinding.java      |    2 +-
 .../manage/binding/DirectMethodBinding.java        |    2 +-
 .../binding/ManagedPropertyMethodBinding.java      |    4 +-
 .../manage/binding/StructMethodBinding.java        |    2 +-
 .../manage/projection/ManagedModelProjection.java  |   34 +-
 .../internal/manage/schema/ModelProperty.java      |    4 +-
 .../DefaultModelSchemaExtractionContext.java       |    2 +-
 .../schema/extract/ManagedProxyClassGenerator.java |   36 +-
 .../ModelMapNodeInitializerExtractionStrategy.java |    2 +-
 .../extract/ModelPropertyExtractionContext.java    |   11 +-
 .../manage/schema/extract/ModelSchemaUtils.java    |   79 +-
 .../ModelSetNodeInitializerExtractionStrategy.java |    2 +-
 .../extract/PropertyAccessorExtractionContext.java |    1 +
 .../schema/extract/PropertyAccessorType.java       |  142 --
 .../RuleSourceSchemaExtractionStrategy.java        |    5 +-
 ...ollectionNodeInitializerExtractionStrategy.java |   22 +-
 .../extract/SpecializedMapNodeInitializer.java     |   17 +-
 .../StructSchemaExtractionStrategySupport.java     |   11 +-
 .../method/WeaklyTypeReferencingMethod.java        |   10 +-
 .../internal/registry/DefaultModelRegistry.java    |    4 +-
 .../model/internal/registry/ModelElementNode.java  |   49 +-
 .../model/internal/registry/ModelNodeInternal.java |   50 +-
 .../internal/registry/ModelReferenceNode.java      |    5 +
 .../model/internal/registry/RuleBindings.java      |   45 +-
 .../typeregistration/BaseInstanceFactory.java      |   12 +-
 .../org/gradle/model/NodeBackedModelMapSpec.groovy |   45 +-
 .../describe/MethodModelRuleDescriptorTest.groovy  |   25 +-
 .../internal/inspect/ModelRuleBindingTest.groovy   |   42 +-
 .../internal/inspect/ModelRuleExtractorTest.groovy |   18 +-
 .../AbstractCollectionModelProjectionTest.groovy   |    6 +-
 .../projection/ModelSetModelProjectionTest.groovy  |    4 +-
 .../extract/DefaultModelSchemaExtractorTest.groovy |    1 +
 .../schema/extract/ModelSchemaUtilsTest.groovy     |   25 +-
 .../schema/extract/PropertyAccessorTypeTest.groovy |  126 --
 .../model/internal/registry/RegistrySpec.groovy    |    5 +
 .../model/internal/registry/ScopedRuleTest.groovy  |    4 +-
 .../internal/fixture/ProjectRegistrySpec.groovy    |   11 +-
 subprojects/model-groovy/model-groovy.gradle       |    2 +
 .../internal/NonTransformedModelDslBacking.java    |   10 +-
 .../transform/ClosureBackedRuleFactory.java        |    2 +-
 .../dsl/internal/transform/SourceLocation.java     |    4 +-
 subprojects/native/native.gradle                   |   10 +-
 .../nativeintegration/console/ConsoleMetaData.java |    2 +-
 .../console/NativePlatformConsoleDetector.java     |    3 +-
 .../filesystem/jdk7/Jdk7Symlink.java               |    5 +-
 .../services/NativePlatformBackedSymlink.java      |    4 +-
 .../jna/JnaBootPathConfigurer.java                 |   66 -
 .../jna/UnsupportedEnvironment.java                |   38 +-
 .../nativeintegration/services/NativeServices.java |   49 +-
 .../NativePlatformConsoleDetectorTest.groovy       |   16 +
 .../filesystem/jdk7/Jdk7SymlinkTest.groovy         |    1 -
 .../jdk7/PosixFilePermissionConverterTest.groovy   |    7 +-
 .../services/UnsupportedFilePermissionsTest.groovy |    4 +-
 .../NativeServicesInitializationTest.groovy        |    3 +
 subprojects/open-api/open-api.gradle               |    2 +
 ...CrossVersionCompatibilityIntegrationTest.groovy |    3 +-
 .../plugins/osgi/OsgiPluginIntegrationSpec.groovy  |  109 +-
 .../org/gradle/api/plugins/osgi/OsgiPlugin.groovy  |   42 -
 .../plugins/osgi/ContainedVersionAnalyzer.java     |    0
 .../plugins/osgi/DefaultAnalyzerFactory.java       |    0
 .../internal/plugins/osgi/DefaultOsgiManifest.java |    0
 .../api/internal/plugins/osgi/OsgiHelper.java      |    0
 .../org/gradle/api/plugins/osgi/OsgiManifest.java  |    0
 .../org/gradle/api/plugins/osgi/OsgiPlugin.java    |   48 +
 .../api/plugins/osgi/OsgiPluginConvention.java     |    0
 .../org/gradle/api/plugins/osgi/package-info.java  |    0
 .../plugins/osgi/OsgiPluginConventionTest.groovy   |   13 +-
 .../gradle/api/plugins/osgi/OsgiPluginTest.groovy  |   14 +-
 subprojects/performance/performance.gradle         |  741 +---------
 .../performance/src/configPlugin/ConfigPlugin.java |   31 -
 .../performance/BaseJavalSourceFileUpdater.groovy  |  148 --
 .../BuildReceiptPluginPerformanceTest.groovy       |   99 --
 .../DependencyReportPerformanceTest.groovy         |   48 -
 .../DependencyResolutionStressTest.groovy          |  285 ----
 .../performance/FirstBuildPerformanceTest.groovy   |   48 -
 .../IdeIntegrationPerformanceTest.groovy           |   72 -
 .../JavaCleanDaemonPerformanceTest.groovy          |   78 -
 .../JavaConfigurationDaemonPerformanceTest.groovy  |   81 --
 .../JavaConfigurationPerformanceTest.groovy        |   50 -
 .../JavaFullAssembleDaemonPerformanceTest.groovy   |   86 --
 .../JavaFullBuildDaemonPerformanceTest.groovy      |   52 -
 .../JavaFullBuildPerformanceTest.groovy            |   49 -
 ...JavaPartialAssembleDaemonPerformanceTest.groovy |   80 --
 .../JavaSoftwareModelBuildPerformanceTest.groovy   |   53 -
 ...wareModelCompileAvoidancePerformanceTest.groovy |   70 -
 ...ChangesFullAssembleDaemonPerformanceTest.groovy |   53 -
 .../JavaTestExecutionPerformanceTest.groovy        |   70 -
 .../JavaTestGradleVsMavenPerformanceTest.groovy    |  100 --
 ...pToDateFullAssembleDaemonPerformanceTest.groovy |   81 --
 .../JavaUpToDateFullBuildPerformanceTest.groovy    |   70 -
 .../ManyEmptyProjectsHelpPerformanceTest.groovy    |   60 -
 .../performance/NativeBuildPerformanceTest.groovy  |   66 -
 .../NativeParallelPerformanceTest.groovy           |   47 -
 .../NativeScenarioPerformanceTest.groovy           |   67 -
 .../ProjectDependenciesPerformanceTest.groovy      |   42 -
 .../RealWorldNativePluginPerformanceTest.groovy    |  146 --
 .../TestExecutionPerformanceTest.groovy            |   51 -
 ...ngApiIdeModelCrossVersionPerformanceTest.groovy |  195 ---
 .../performance/VariantsPerformanceTest.groovy     |  112 --
 .../AbstractAndroidPerformanceTest.groovy          |   31 +
 .../performance/BaseJavalSourceFileUpdater.groovy  |  148 ++
 .../DependencyReportPerformanceTest.groovy         |   45 +
 .../DependencyResolutionPerformanceTest.groovy     |   45 +
 .../performance/FirstBuildPerformanceTest.groovy   |   44 +
 .../IdeIntegrationPerformanceTest.groovy           |   68 +
 .../JavaCleanDaemonPerformanceTest.groovy          |   75 +
 .../JavaConfigurationDaemonPerformanceTest.groovy  |   73 +
 .../JavaConfigurationPerformanceTest.groovy        |   48 +
 .../JavaFullAssembleDaemonPerformanceTest.groovy   |   83 ++
 .../JavaFullBuildDaemonPerformanceTest.groovy      |   48 +
 .../JavaFullBuildPerformanceTest.groovy            |   47 +
 .../JavaOldModelSourceFileUpdater.groovy           |    0
 ...JavaPartialAssembleDaemonPerformanceTest.groovy |   72 +
 .../JavaSoftwareModelBuildPerformanceTest.groovy   |   46 +
 ...wareModelCompileAvoidancePerformanceTest.groovy |   70 +
 .../JavaSoftwareModelSourceFileUpdater.groovy      |    0
 ...ChangesFullAssembleDaemonPerformanceTest.groovy |   46 +
 .../JavaTestExecutionPerformanceTest.groovy        |   67 +
 .../JavaTestGradleVsMavenPerformanceTest.groovy    |   97 ++
 ...pToDateFullAssembleDaemonPerformanceTest.groovy |   66 +
 .../JavaUpToDateFullBuildPerformanceTest.groovy    |   64 +
 .../ManyEmptyProjectsHelpPerformanceTest.groovy    |   53 +
 .../performance/NativeBuildPerformanceTest.groovy  |   63 +
 .../NativeParallelPerformanceTest.groovy           |   47 +
 .../NativePreCompiledHeaderPerformanceTest.groovy  |    0
 .../NativeScenarioPerformanceTest.groovy           |   71 +
 .../ParallelBuildPerformanceTest.groovy            |    0
 .../ProjectDependenciesPerformanceTest.groovy      |   39 +
 .../RealLifeAndroidBuildPerformanceTest.groovy     |   51 +
 ...alLifeAndroidStudioMockupPerformanceTest.groovy |   45 +
 .../RealWorldNativePluginPerformanceTest.groovy    |  163 +++
 .../performance/SourceUpdateCardinality.java       |    0
 .../performance/TaskCreationPerformanceTest.groovy |   46 +
 .../TestExecutionPerformanceTest.groovy            |   44 +
 ...ngApiIdeModelCrossVersionPerformanceTest.groovy |  192 +++
 .../performance/VariantsPerformanceTest.groovy     |  116 ++
 .../templates/build-event-timestamps/build.gradle  |   26 -
 .../src/templates/config-inject/build.gradle       |   13 +-
 .../src/templates/heap-capture/build.gradle        |   56 -
 .../src/templates/java-config/build.gradle         |    7 -
 .../templates/java-sw-model-project/build.gradle   |   17 +-
 .../src/templates/native-scenario/build.gradle     |    6 +-
 .../src/templates/new-java-plugin/build.gradle     |    6 +-
 .../src/templates/old-java-plugin/build.gradle     |    6 +-
 .../src/templates/project-with-source/build.gradle |   23 +-
 .../src/templates/root-project/build.gradle        |   16 -
 .../src/templates/task-creation/build.gradle       |   24 +
 .../src/templates/variants-new-model/build.gradle  |    4 +-
 .../src/templates/variants-old-model/build.gradle  |    6 +-
 .../src/templates/with-verbose-junit/Test.java     |    3 +-
 .../gradle/performance/ResultSpecification.groovy  |   90 --
 ...CrossVersionPerformanceTestExecutionTest.groovy |  287 ----
 .../CrossVersionPerformanceTestRunnerTest.groovy   |  179 ---
 .../performance/fixture/MavenDownloaderTest.groovy |   52 -
 .../fixture/PrettyCalculatorSpec.groovy            |   44 -
 .../gradle/performance/measure/AmountTest.groovy   |  231 ---
 .../performance/measure/DataSeriesTest.groovy      |   58 -
 .../results/CompositeResultsStoreTest.groovy       |   46 -
 .../results/CrossBuildResultsStoreTest.groovy      |  440 ------
 .../results/CrossVersionResultsStoreTest.groovy    |  330 -----
 .../performance/results/ReportGeneratorTest.groovy |   46 -
 .../AbstractCrossBuildPerformanceTest.groovy       |   65 -
 .../AbstractCrossVersionPerformanceTest.groovy     |   56 -
 .../AbstractGradleVsMavenPerformanceTest.groovy    |   67 -
 ...actToolingApiCrossVersionPerformanceTest.groovy |  213 ---
 .../BuildReceiptPluginPerformanceTest.java         |   23 -
 ...AbstractGradleBuildPerformanceTestRunner.groovy |   95 --
 .../performance/fixture/BaselineVersion.groovy     |   81 --
 .../performance/fixture/BuildDisplayInfo.groovy    |   43 -
 .../fixture/BuildEventTimestampCollector.java      |   95 --
 .../performance/fixture/BuildExperimentRunner.java |  218 ---
 .../performance/fixture/BuildExperimentSpec.groovy |   63 -
 .../BuildReceiptPerformanceTestRunner.groovy       |   45 -
 .../performance/fixture/CompositeDataReporter.java |   39 -
 .../fixture/CrossBuildPerformanceResults.groovy    |   68 -
 .../fixture/CrossBuildPerformanceTestRunner.groovy |   65 -
 .../fixture/CrossVersionPerformanceResults.groovy  |  120 --
 .../CrossVersionPerformanceTestRunner.groovy       |  173 ---
 .../gradle/performance/fixture/DataReporter.groovy |   21 -
 .../fixture/GradleBuildExperimentSpec.groovy       |   94 --
 .../fixture/GradleExecuterBackedSession.groovy     |   75 -
 .../fixture/GradleInvocationSpec.groovy            |  181 ---
 .../GradleVsMavenBuildExperimentRunner.java        |   87 --
 .../GradleVsMavenBuildPerformanceResults.groovy    |   49 -
 .../GradleVsMavenPerformanceTestRunner.groovy      |   99 --
 .../performance/fixture/InvocationSpec.groovy      |   30 -
 .../fixture/MavenBuildExperimentSpec.groovy        |  102 --
 .../fixture/MavenInstallationDownloader.groovy     |   89 --
 .../performance/fixture/MavenInvocationSpec.groovy |  158 ---
 .../fixture/MeasuredOperationList.groovy           |   70 -
 .../performance/fixture/PerformanceTestResult.java |   97 --
 .../performance/fixture/PrettyCalculator.groovy    |   42 -
 .../performance/fixture/TestProjectLocator.groovy  |   35 -
 .../fixture/ToolingApiBackedGradleSession.groovy   |   73 -
 .../gradle/performance/fixture/VersionResults.java |   21 -
 .../org/gradle/performance/measure/Amount.java     |  172 ---
 .../org/gradle/performance/measure/DataSeries.java |   90 --
 .../performance/measure/MeasuredOperation.groovy   |   38 -
 .../performance/results/AllResultsStore.java       |   49 -
 .../results/BaseCrossBuildResultsStore.java        |  270 ----
 .../results/BuildReceiptsResultsStore.java         |   29 -
 .../performance/results/CompositeResultsStore.java |   68 -
 .../performance/results/ConnectionAction.java      |   23 -
 .../results/CrossBuildPerformanceTestHistory.java  |  199 ---
 .../results/CrossBuildResultsStore.java            |   36 -
 .../CrossVersionPerformanceTestHistory.java        |  227 ---
 .../results/CrossVersionResultsStore.java          |  273 ----
 .../gradle/performance/results/FileRenderer.java   |   34 -
 .../results/GradleVsMavenBuildResultsStore.java    |   29 -
 .../org/gradle/performance/results/H2FileDb.java   |   61 -
 .../performance/results/HtmlPageGenerator.java     |  163 ---
 .../performance/results/IndexPageGenerator.java    |  112 --
 .../performance/results/NoResultsStore.groovy      |   47 -
 .../results/PerformanceTestExecution.java          |   74 -
 .../performance/results/ReportGenerator.java       |   56 -
 .../gradle/performance/results/ResultsStore.java   |   36 -
 .../performance/results/ResultsStoreHelper.java    |   63 -
 .../performance/results/TestDataGenerator.java     |   93 --
 .../performance/results/TestPageGenerator.java     |  268 ----
 .../resources/org/gradle/reporting/style.css       |  110 --
 subprojects/performance/templates.gradle           |  576 ++++++++
 subprojects/platform-base/platform-base.gradle     |    2 +
 .../language/base/BaseModelIntegrationTest.groovy  |    4 +-
 .../BinariesLifecycleTaskIntegrationTest.groovy    |    2 +-
 .../base/ComponentBinariesIntegrationTest.groovy   |    2 +-
 .../base/ComponentModelIntegrationTest.groovy      |   11 +-
 .../ComponentModelReportIntegrationTest.groovy     |   56 +-
 .../base/CustomBinaryIntegrationTest.groovy        |   27 +
 ...CustomBinaryInternalViewsIntegrationTest.groovy |    6 +-
 .../CustomComponentBinariesIntegrationTest.groovy  |    6 +-
 .../base/CustomComponentIntegrationTest.groovy     |   49 +-
 ...tomComponentInternalViewsIntegrationTest.groovy |    8 +-
 ...eprecatedAnnotationErrorsIntegrationTest.groovy |   45 -
 .../base/FunctionalSourceSetIntegrationTest.groovy |   47 +-
 .../base/InternalViewsSampleIntegrationTest.groovy |    6 +-
 .../base/LanguageSourceSetIntegrationTest.groovy   |   14 +-
 .../LifecycleBasePluginIntegrationTest.groovy      |    9 +-
 ...efaultLibraryResolutionErrorMessageBuilder.java |  107 --
 .../resolve/DefaultLocalLibraryResolver.java       |   54 +
 .../LibraryResolutionErrorMessageBuilder.java      |  144 +-
 .../internal/resolve/LibraryResolutionResult.java  |  161 +++
 .../resolve/LocalLibraryDependencyResolver.java    |  192 +--
 .../resolve/LocalLibraryMetaDataAdapter.java       |    6 +-
 .../api/internal/resolve/LocalLibraryResolver.java |   26 +
 .../api/internal/resolve/VariantSelector.java      |   27 +
 .../api/internal/resolve/VariantsMatcher.java      |  136 --
 .../api/internal/tasks/compile/Compiler.java       |   26 -
 .../base/internal/AbstractLanguageSourceSet.java   |    4 +-
 .../DefaultLibraryLocalComponentMetaData.java      |  165 ---
 .../DefaultLibraryLocalComponentMetadata.java      |  165 +++
 .../model/DefaultVariantAxisCompatibility.java     |   35 -
 .../DefaultVariantAxisCompatibilityFactory.java    |   41 -
 .../internal/model/DefaultVariantsMetaData.java    |  103 --
 .../internal/model/VariantAxisCompatibility.java   |   39 -
 .../model/VariantAxisCompatibilityFactory.java     |   20 -
 .../base/internal/model/VariantsMetaData.java      |   35 -
 .../internal/model/VariantsMetaDataHelper.java     |   35 -
 .../language/base/internal/plugins/CleanRule.java  |    4 +-
 .../resolve/LocalComponentResolveContext.java      |   74 -
 .../internal/tasks/SimpleStaleClassCleaner.java    |    2 +-
 .../base/plugins/ComponentModelBasePlugin.java     |    6 +
 .../language/base/plugins/LifecycleBasePlugin.java |   13 +-
 .../base/sources/BaseLanguageSourceSet.java        |    8 +-
 .../core/DomainObjectCollectionBackedModelMap.java |   34 +-
 .../java/org/gradle/platform/base/BinarySpec.java  |    2 +-
 .../java/org/gradle/platform/base/BinaryType.java  |   36 -
 .../org/gradle/platform/base/ComponentSpec.java    |    9 +-
 .../org/gradle/platform/base/LanguageType.java     |   36 -
 .../java/org/gradle/platform/base/Platform.java    |    6 +
 .../org/gradle/platform/base/VariantComponent.java |   32 +
 .../gradle/platform/base/VariantComponentSpec.java |    6 +-
 .../platform/base/binary/BaseBinarySpec.java       |   13 +-
 .../platform/base/component/BaseComponentSpec.java |   18 +-
 .../component/internal/AbstractComponentSpec.java  |    2 +-
 .../component/internal/DefaultComponentSpec.java   |    8 +-
 .../DefaultLibraryBinaryDependencySpec.java        |   11 +-
 .../base/internal/DefaultModuleDependencySpec.java |    2 +-
 .../internal/VariantAspectExtractionStrategy.java  |    8 +-
 .../registry/BinaryTasksModelRuleExtractor.java    |    1 +
 .../ComponentModelBaseServiceRegistry.java         |    4 -
 .../registry/ComponentTypeModelRuleExtractor.java  |   30 +-
 .../registry/DeprecatedAnnotationsInspector.java   |   52 -
 .../org.gradle.component-base.properties           |    2 +-
 ... => org.gradle.component-model-base.properties} |    0
 .../org.gradle.lifecycle-base.properties           |    1 +
 .../internal/resolve/VariantsMatcherTest.groovy    |  244 ----
 .../model/DefaultVariantsMetaDataTest.groovy       |   75 -
 .../internal/model/ParametrizedBinaryString.java   |   26 -
 .../model/ParametrizedBinaryVariantDimension1.java |   26 -
 .../base/internal/model/ParametrizedVariant.java   |   24 -
 .../base/internal/model/VariantDimension1.java     |   22 -
 .../base/internal/model/VariantDimension2.java     |   22 -
 .../base/internal/model/VariantDimension3.java     |   20 -
 .../model/VariantsMetaDataHelperTest.groovy        |  107 --
 .../LocalComponentResolveContextTest.groovy        |   50 -
 .../tasks/SimpleStaleClassCleanerTest.groovy       |    8 +-
 .../base/plugins/LifecycleBasePluginTest.groovy    |   17 +-
 ...DomainObjectCollectionBackedModelMapTest.groovy |    4 +-
 .../internal/BuildableComponentSpecTest.groovy     |    6 +-
 ...AbstractAnnotationModelRuleExtractorTest.groovy |    5 +
 .../base/plugins/ComponentBasePluginTest.groovy    |   10 +
 .../platform/base/PlatformBaseSpecification.groovy |    6 +-
 subprojects/platform-jvm/platform-jvm.gradle       |    2 +
 ...ustomJarBinarySpecSubtypeIntegrationTest.groovy |   24 +-
 ...latformJvmComponentReportIntegrationTest.groovy |   11 +-
 .../resolve/JvmLocalLibraryMetaDataAdapter.java    |  151 --
 .../internal/resolve/LibraryPublishArtifact.java   |   37 -
 .../org/gradle/api/java/archives/Manifest.java     |   17 +-
 .../api/java/archives/ManifestMergeSpec.java       |   26 +-
 .../internal/CustomManifestInternalWrapper.java    |   97 ++
 .../java/archives/internal/DefaultManifest.java    |  254 +++-
 .../internal/DefaultManifestMergeSpec.java         |   39 +-
 .../java/archives/internal/ManifestInternal.java   |   50 +
 ...efaultJavaPlatformVariantAxisCompatibility.java |   31 -
 .../jvm/internal/DependencyResolvingClasspath.java |   17 +-
 .../SourceSetDependencyResolvingClasspath.java     |   45 -
 ...efaultJavaPlatformVariantAxisCompatibility.java |   31 +
 ...efaultLibraryResolutionErrorMessageBuilder.java |  111 ++
 .../resolve/DefaultVariantAxisCompatibility.java   |   35 +
 .../DefaultVariantAxisCompatibilityFactory.java    |   41 +
 .../internal/resolve/DefaultVariantsMetaData.java  |  103 ++
 .../internal/resolve/JvmLibraryResolveContext.java |   74 +
 .../resolve/JvmLocalLibraryMetaDataAdapter.java    |  168 +++
 .../jvm/internal/resolve/JvmVariantSelector.java   |   64 +
 .../internal/resolve/LibraryPublishArtifact.java   |   37 +
 .../SourceSetDependencyResolvingClasspath.java     |   43 +
 .../org/gradle/jvm/internal/resolve/UsageKind.java |   31 +
 .../internal/resolve/VariantAxisCompatibility.java |   39 +
 .../resolve/VariantAxisCompatibilityFactory.java   |   20 +
 .../jvm/internal/resolve/VariantsMatcher.java      |  135 ++
 .../jvm/internal/resolve/VariantsMetaData.java     |   35 +
 .../internal/resolve/VariantsMetaDataHelper.java   |   35 +
 .../jvm/internal/services/PlatformJvmServices.java |   31 +-
 .../jvm/platform/internal/DefaultJavaPlatform.java |    2 +-
 .../org/gradle/jvm/plugins/JvmComponentPlugin.java |   62 +-
 .../src/main/java/org/gradle/jvm/tasks/Jar.java    |   81 +-
 .../main/java/org/gradle/jvm/tasks/api/ApiJar.java |    8 +-
 .../org/gradle/jvm/tasks/api/internal/Member.java  |    4 +-
 .../api/internal/SortingAnnotationVisitor.java     |   10 +-
 .../toolchain/internal/JavaInstallationProbe.java  |    2 +-
 .../JvmLocalLibraryDependencyResolverTest.groovy   |  282 ----
 .../archives/internal/DefaultManifestTest.groovy   |  218 ++-
 ...JavaPlatformVariantAxisCompatibilityTest.groovy |   74 -
 ...JavaPlatformVariantAxisCompatibilityTest.groovy |   73 +
 .../resolve/DefaultVariantsMetaDataTest.groovy     |   75 +
 .../resolve/JvmLibraryResolveContextTest.groovy    |   49 +
 .../JvmLocalLibraryDependencyResolverTest.groovy   |  292 ++++
 .../internal/resolve/ParametrizedBinaryString.java |   26 +
 .../ParametrizedBinaryVariantDimension1.java       |   26 +
 .../jvm/internal/resolve/ParametrizedVariant.java  |   24 +
 .../jvm/internal/resolve/VariantDimension1.java    |   22 +
 .../jvm/internal/resolve/VariantDimension2.java    |   22 +
 .../jvm/internal/resolve/VariantDimension3.java    |   20 +
 .../internal/resolve/VariantsMatcherTest.groovy    |  241 ++++
 .../resolve/VariantsMetaDataHelperTest.groovy      |  107 ++
 .../groovy/org/gradle/jvm/tasks/JarTest.groovy     |   33 +-
 .../ApiClassExtractorAnnotationsTest.groovy        |   47 +-
 .../ApiClassExtractorInnerClassTest.groovy         |    3 -
 .../api/internal/ApiClassExtractorTest.groovy      |   10 +-
 .../internal/ApiClassExtractorTestSupport.groovy   |    9 +-
 .../ApiClassExtractorTestSupportTest.groovy        |    3 -
 subprojects/platform-native/platform-native.gradle |    1 +
 .../BinaryBuildTypesIntegrationTest.groovy         |    4 -
 .../BinaryConfigurationIntegrationTest.groovy      |   43 +-
 .../BinaryFlavorsIntegrationTest.groovy            |   11 +-
 .../LibraryApiDependenciesIntegrationTest.groovy   |    5 +-
 .../LibraryBinariesIntegrationTest.groovy          |   11 +-
 .../LibraryDependenciesIntegrationTest.groovy      |   20 +-
 .../NativeBinariesIntegrationTest.groovy           |    3 -
 .../NativePlatformSamplesIntegrationTest.groovy    |   12 +-
 ...formNativeComponentReportIntegrationTest.groovy |    6 +-
 .../PrebuiltLibrariesIntegrationTest.groovy        |    7 +-
 .../BinaryNativePlatformIntegrationTest.groovy     |   53 +-
 .../GeneratedSourcesIntegrationTest.groovy         |    8 +-
 ...rceSetCompileDependenciesIntegrationTest.groovy |    2 -
 .../SourceSetDependenciesIntegrationTest.groovy    |   10 +-
 ...SourceSetLinkDependenciesIntegrationTest.groovy |    4 +-
 .../CommonToolchainCustomizationIntegTest.groovy   |    4 +-
 ...GccToolChainCustomisationIntegrationTest.groovy |    6 +-
 .../GccToolChainDiscoveryIntegrationTest.groovy    |    2 -
 .../MultipleNativeToolChainIntegrationTest.groovy  |    6 +-
 .../NativeToolChainDiscoveryIntegrationTest.groovy |    3 +-
 ...sualCppToolChainDiscoveryIntegrationTest.groovy |    3 -
 .../internal/CompilerOutputFileNamingScheme.java   |   44 -
 .../nativeplatform/internal/DefaultBuildType.java  |   41 -
 .../nativeplatform/internal/DefaultFlavor.java     |   43 -
 .../internal/configure/NativeBinaryRules.java      |  118 --
 .../DefaultPrebuiltSharedLibraryBinary.java        |   74 -
 .../DefaultPrebuiltStaticLibraryBinary.java        |   60 -
 .../internal/resolve/DefaultLibraryResolver.java   |  117 --
 .../nativeplatform/platform/Architecture.java      |   65 -
 .../nativeplatform/platform/NativePlatform.java    |   69 -
 .../nativeplatform/platform/OperatingSystem.java   |   83 --
 .../platform/internal/ArchitectureInternal.java    |   30 -
 .../platform/internal/DefaultArchitecture.java     |   76 -
 .../platform/internal/DefaultNativePlatform.java   |   91 --
 .../platform/internal/DefaultOperatingSystem.java  |  101 --
 .../platform/internal/NativePlatforms.java         |  110 --
 .../platform/internal/OperatingSystemInternal.java |   23 -
 .../plugins/NativeComponentModelPlugin.java        |  361 -----
 .../nativeplatform/tasks/AbstractLinkTask.groovy   |  130 --
 .../tasks/CreateStaticLibrary.groovy               |  111 --
 .../nativeplatform/tasks/InstallExecutable.groovy  |  168 ---
 .../nativeplatform/tasks/LinkExecutable.groovy     |   33 -
 .../nativeplatform/tasks/LinkSharedLibrary.groovy  |   46 -
 .../tasks/PrefixHeaderFileGenerateTask.java        |   60 -
 .../DefaultCommandLineToolInvocationWorker.java    |   92 --
 .../toolchain/internal/ExtendableToolChain.java    |   72 -
 .../toolchain/internal/MacroArgsConverter.java     |   36 -
 .../internal/NativeToolChainInternal.java          |   40 -
 .../toolchain/internal/PreCompiledHeader.java      |   63 -
 .../internal/gcc/ArStaticLibraryArchiver.java      |   96 --
 .../toolchain/internal/gcc/GccLinker.java          |  119 --
 .../msvcpp/DefaultVisualStudioLocator.java         |  443 ------
 .../internal/msvcpp/DefaultWindowsSdkLocator.java  |  282 ----
 .../msvcpp/LibExeStaticLibraryArchiver.java        |   87 --
 .../toolchain/internal/msvcpp/LinkExeLinker.java   |   94 --
 .../internal/msvcpp/VisualCppToolChain.java        |  145 --
 .../internal/msvcpp/VisualStudioInstall.java       |   49 -
 .../internal/plugins/StandardToolChainsPlugin.java |   35 -
 .../plugins/MicrosoftVisualCppPlugin.java          |   69 -
 .../nativeplatform/DependentSourceSet.java         |    0
 .../nativeplatform/HeaderExportingSourceSet.java   |    0
 .../language/nativeplatform/NativeResourceSet.java |    0
 .../internal/DependentSourceSetInternal.java       |    0
 .../language/nativeplatform/internal/Include.java  |    0
 .../nativeplatform/internal/IncludeDirectives.java |    0
 .../nativeplatform/internal/IncludeType.java       |    0
 .../language/nativeplatform/package-info.java      |    0
 .../org/gradle/nativeplatform/BuildType.java       |    0
 .../gradle/nativeplatform/BuildTypeContainer.java  |    0
 .../org/gradle/nativeplatform/Flavor.java          |    0
 .../org/gradle/nativeplatform/FlavorContainer.java |    0
 .../org/gradle/nativeplatform/NativeBinary.java    |    0
 .../gradle/nativeplatform/NativeBinarySpec.java    |    0
 .../nativeplatform/NativeComponentExtension.java   |    0
 .../gradle/nativeplatform/NativeComponentSpec.java |    0
 .../gradle/nativeplatform/NativeDependencySet.java |    0
 .../gradle/nativeplatform/NativeExecutable.java    |    0
 .../nativeplatform/NativeExecutableBinary.java     |    0
 .../nativeplatform/NativeExecutableBinarySpec.java |    0
 .../nativeplatform/NativeExecutableFileSpec.java   |    0
 .../nativeplatform/NativeExecutableSpec.java       |    0
 .../nativeplatform/NativeInstallationSpec.java     |    0
 .../org/gradle/nativeplatform/NativeLibrary.java   |    0
 .../gradle/nativeplatform/NativeLibraryBinary.java |    0
 .../nativeplatform/NativeLibraryBinarySpec.java    |    0
 .../nativeplatform/NativeLibraryRequirement.java   |    0
 .../gradle/nativeplatform/NativeLibrarySpec.java   |    0
 .../org/gradle/nativeplatform/ObjectFile.java      |    0
 .../gradle/nativeplatform/PrebuiltLibraries.java   |    0
 .../org/gradle/nativeplatform/PrebuiltLibrary.java |    0
 .../PrebuiltSharedLibraryBinary.java               |    0
 .../PrebuiltStaticLibraryBinary.java               |    0
 .../gradle/nativeplatform/PreprocessingTool.java   |    0
 .../org/gradle/nativeplatform/Repositories.java    |    0
 .../gradle/nativeplatform/SharedLibraryBinary.java |    0
 .../nativeplatform/SharedLibraryBinarySpec.java    |    0
 .../gradle/nativeplatform/StaticLibraryBinary.java |    0
 .../nativeplatform/StaticLibraryBinarySpec.java    |    0
 .../nativeplatform/TargetedNativeComponent.java    |    0
 .../org/gradle/nativeplatform/Tool.java            |    0
 .../internal/AbstractBinaryToolSpec.java           |    0
 .../internal/AbstractNativeBinaryRenderer.java     |    0
 .../internal/AbstractNativeBinarySpec.java         |    0
 .../internal/AbstractNativeComponentSpec.java      |    0
 .../internal/AbstractNativeLibraryBinarySpec.java  |    0
 .../AbstractTargetedNativeComponentSpec.java       |    0
 .../nativeplatform/internal/BinaryToolSpec.java    |    0
 .../BuildOperationLoggingCompilerDecorator.java    |    0
 .../internal/CompilerOutputFileNamingScheme.java   |   44 +
 .../nativeplatform/internal/DefaultBuildType.java  |   41 +
 .../internal/DefaultBuildTypeContainer.java        |    0
 .../nativeplatform/internal/DefaultFlavor.java     |   43 +
 .../internal/DefaultFlavorContainer.java           |    0
 .../nativeplatform/internal/DefaultLinkerSpec.java |    0
 .../DefaultNativeExecutableBinarySpec.java         |    0
 .../internal/DefaultNativeExecutableSpec.java      |    0
 .../internal/DefaultNativeLibrarySpec.java         |    0
 .../internal/DefaultPreprocessingTool.java         |    0
 .../internal/DefaultSharedLibraryBinarySpec.java   |    0
 .../internal/DefaultStaticLibraryArchiverSpec.java |    0
 .../internal/DefaultStaticLibraryBinarySpec.java   |    0
 .../nativeplatform/internal/DefaultTool.java       |    0
 .../gradle/nativeplatform/internal/LinkerSpec.java |    0
 .../internal/NativeBinaryRenderer.java             |    0
 .../internal/NativeBinarySpecInternal.java         |    0
 .../nativeplatform/internal/NativeComponents.java  |    0
 .../internal/NativeExecutableBinaryRenderer.java   |    0
 .../NativeExecutableBinarySpecInternal.java        |    0
 .../internal/NativePlatformResolver.java           |    0
 .../internal/ProjectNativeLibraryRequirement.java  |    0
 .../internal/SharedLibraryBinaryRenderer.java      |    0
 .../internal/SharedLibraryBinarySpecInternal.java  |    0
 .../internal/SharedLibraryLinkerSpec.java          |    0
 .../internal/StaticLibraryArchiverSpec.java        |    0
 .../internal/StaticLibraryBinaryRenderer.java      |    0
 .../internal/StaticLibraryBinarySpecInternal.java  |    0
 .../internal/TargetedNativeComponentInternal.java  |    0
 .../configure/DefaultNativeComponentExtension.java |    0
 .../internal/configure/NativeBinaries.java         |    0
 .../internal/configure/NativeBinaryRules.java      |  123 ++
 .../internal/configure/NativeComponentRules.java   |    0
 .../internal/pch/PchEnabledLanguageTransform.java  |    0
 .../prebuilt/AbstractPrebuiltLibraryBinary.java    |    0
 .../prebuilt/DefaultPrebuiltLibraries.java         |    0
 .../internal/prebuilt/DefaultPrebuiltLibrary.java  |    0
 .../DefaultPrebuiltSharedLibraryBinary.java        |   74 +
 .../DefaultPrebuiltStaticLibraryBinary.java        |   60 +
 .../prebuilt/PrebuiltLibraryBinaryLocator.java     |    0
 .../prebuilt/PrebuiltLibraryInitializer.java       |    0
 .../prebuilt/PrebuiltLibraryResolveException.java  |    0
 .../ApiRequirementNativeDependencyResolver.java    |    0
 .../resolve/ChainedLibraryBinaryLocator.java       |    0
 .../resolve/CurrentProjectModelResolver.java       |    0
 .../internal/resolve/DefaultLibraryResolver.java   |  121 ++
 .../resolve/DefaultNativeDependencySet.java        |    0
 .../InputHandlingNativeDependencyResolver.java     |    0
 .../internal/resolve/LibraryBinaryLocator.java     |    0
 .../resolve/LibraryNativeDependencyResolver.java   |    0
 .../NativeBinaryRequirementResolveResult.java      |    0
 .../resolve/NativeBinaryResolveResult.java         |    0
 .../resolve/NativeDependencyNotationParser.java    |    0
 .../internal/resolve/NativeDependencyResolver.java |    0
 .../resolve/NativeDependencyResolverServices.java  |    0
 .../resolve/ProjectLibraryBinaryLocator.java       |    0
 ...RequirementParsingNativeDependencyResolver.java |    0
 .../resolve/SourceSetNativeDependencyResolver.java |    0
 .../internal/services/NativeBinaryServices.java    |    0
 .../org/gradle/nativeplatform/package-info.java    |    0
 .../nativeplatform/platform/Architecture.java      |   72 +
 .../nativeplatform/platform/NativePlatform.java    |   72 +
 .../nativeplatform/platform/OperatingSystem.java   |   96 ++
 .../platform/internal/ArchitectureInternal.java    |   35 +
 .../platform/internal/Architectures.java           |    0
 .../platform/internal/DefaultArchitecture.java     |   76 +
 .../platform/internal/DefaultNativePlatform.java   |   91 ++
 .../platform/internal/DefaultOperatingSystem.java  |  101 ++
 .../platform/internal/NativePlatformInternal.java  |    0
 .../platform/internal/NativePlatforms.java         |  110 ++
 .../platform/internal/OperatingSystemInternal.java |   25 +
 .../nativeplatform/platform/package-info.java      |    0
 .../plugins/NativeComponentModelPlugin.java        |  361 +++++
 .../plugins/NativeComponentPlugin.java             |    0
 .../nativeplatform/plugins/package-info.java       |    0
 .../nativeplatform/tasks/AbstractLinkTask.java     |  204 +++
 .../nativeplatform/tasks/CreateStaticLibrary.java  |  157 ++
 .../nativeplatform/tasks/InstallExecutable.java    |  213 +++
 .../nativeplatform/tasks/LinkExecutable.java       |   33 +
 .../nativeplatform/tasks/LinkSharedLibrary.java    |   62 +
 .../nativeplatform/tasks/ObjectFilesToBinary.java  |    0
 .../tasks/PrefixHeaderFileGenerateTask.java        |   59 +
 .../gradle/nativeplatform/tasks/package-info.java  |    0
 .../org/gradle/nativeplatform/toolchain/Clang.java |    0
 .../toolchain/CommandLineToolConfiguration.java    |    0
 .../org/gradle/nativeplatform/toolchain/Gcc.java   |    0
 .../toolchain/GccCommandLineToolConfiguration.java |    0
 .../toolchain/GccCompatibleToolChain.java          |    0
 .../toolchain/GccPlatformToolChain.java            |    0
 .../toolchain/NativePlatformToolChain.java         |    0
 .../nativeplatform/toolchain/NativeToolChain.java  |    0
 .../toolchain/NativeToolChainRegistry.java         |    0
 .../gradle/nativeplatform/toolchain/VisualCpp.java |    0
 .../toolchain/VisualCppPlatformToolChain.java      |    0
 .../internal/AbstractPlatformToolProvider.java     |    0
 .../toolchain/internal/ArgsTransformer.java        |    0
 .../toolchain/internal/CommandLineToolContext.java |    0
 .../internal/CommandLineToolInvocation.java        |    0
 .../internal/CommandLineToolInvocationFailure.java |    0
 .../internal/CommandLineToolInvocationWorker.java  |    0
 .../internal/DefaultCommandLineToolInvocation.java |    0
 .../DefaultCommandLineToolInvocationWorker.java    |   92 ++
 .../DefaultMutableCommandLineToolContext.java      |    0
 .../internal/DefaultNativeToolChainRegistry.java   |    0
 .../toolchain/internal/ExtendableToolChain.java    |   72 +
 .../toolchain/internal/MacroArgsConverter.java     |   36 +
 .../internal/MutableCommandLineToolContext.java    |    0
 .../toolchain/internal/NativeCompileSpec.java      |    0
 .../toolchain/internal/NativeCompiler.java         |    0
 .../internal/NativeToolChainInternal.java          |   40 +
 .../internal/NativeToolChainRegistryInternal.java  |    0
 .../toolchain/internal/OptionsFileArgsWriter.java  |    0
 .../toolchain/internal/OutputCleaningCompiler.java |    0
 .../toolchain/internal/PCHUtils.java               |    0
 .../toolchain/internal/PlatformToolProvider.java   |    0
 .../toolchain/internal/PreCompiledHeader.java      |  114 ++
 .../toolchain/internal/ToolType.java               |    0
 .../internal/UnavailablePlatformToolProvider.java  |    0
 .../toolchain/internal/clang/ClangToolChain.java   |    0
 .../internal/compilespec/AssembleSpec.java         |    0
 .../internal/compilespec/CCompileSpec.java         |    0
 .../internal/compilespec/CPCHCompileSpec.java      |    0
 .../internal/compilespec/CppCompileSpec.java       |    0
 .../internal/compilespec/CppPCHCompileSpec.java    |    0
 .../compilespec/ObjectiveCCompileSpec.java         |    0
 .../compilespec/ObjectiveCPCHCompileSpec.java      |    0
 .../compilespec/ObjectiveCppCompileSpec.java       |    0
 .../compilespec/ObjectiveCppPCHCompileSpec.java    |    0
 .../compilespec/WindowsResourceCompileSpec.java    |    0
 .../gcc/AbstractGccCompatibleToolChain.java        |    0
 .../internal/gcc/ArStaticLibraryArchiver.java      |   96 ++
 .../toolchain/internal/gcc/Assembler.java          |    0
 .../toolchain/internal/gcc/CCompiler.java          |    0
 .../toolchain/internal/gcc/CPCHCompiler.java       |    0
 .../toolchain/internal/gcc/CppCompiler.java        |    0
 .../toolchain/internal/gcc/CppPCHCompiler.java     |    0
 .../internal/gcc/DefaultGccPlatformToolChain.java  |    0
 .../internal/gcc/GccCompatibleNativeCompiler.java  |    0
 .../internal/gcc/GccCompilerArgsTransformer.java   |    0
 .../toolchain/internal/gcc/GccLinker.java          |  119 ++
 .../internal/gcc/GccOptionsFileArgsWriter.java     |    0
 .../internal/gcc/GccPlatformToolProvider.java      |    0
 .../toolchain/internal/gcc/GccToolChain.java       |    0
 .../toolchain/internal/gcc/ObjectiveCCompiler.java |    0
 .../internal/gcc/ObjectiveCPCHCompiler.java        |    0
 .../internal/gcc/ObjectiveCppCompiler.java         |    0
 .../internal/gcc/ObjectiveCppPCHCompiler.java      |    0
 .../internal/gcc/TargetPlatformConfiguration.java  |    0
 .../gcc/version/CompilerMetaDataProvider.java      |    0
 .../version/CompilerMetaDataProviderFactory.java   |    0
 .../internal/gcc/version/GccVersionDeterminer.java |    0
 .../internal/gcc/version/GccVersionResult.java     |    0
 .../internal/msvcpp/ArchitectureDescriptor.java    |    0
 .../toolchain/internal/msvcpp/Assembler.java       |    0
 .../toolchain/internal/msvcpp/CCompiler.java       |    0
 .../toolchain/internal/msvcpp/CPCHCompiler.java    |    0
 .../toolchain/internal/msvcpp/CppCompiler.java     |    0
 .../toolchain/internal/msvcpp/CppPCHCompiler.java  |    0
 .../msvcpp/DefaultVisualCppPlatformToolChain.java  |    0
 .../msvcpp/DefaultVisualStudioLocator.java         |  444 ++++++
 .../internal/msvcpp/DefaultWindowsSdkLocator.java  |  282 ++++
 .../toolchain/internal/msvcpp/EscapeUserArgs.java  |    0
 .../msvcpp/LibExeStaticLibraryArchiver.java        |   87 ++
 .../toolchain/internal/msvcpp/LinkExeLinker.java   |   94 ++
 .../msvcpp/VisualCppCompilerArgsTransformer.java   |    0
 .../internal/msvcpp/VisualCppInstall.java          |    0
 .../internal/msvcpp/VisualCppNativeCompiler.java   |    0
 .../msvcpp/VisualCppOptionsFileArgsWriter.java     |    0
 .../VisualCppPCHCompilerArgsTransformer.java       |    0
 .../msvcpp/VisualCppPlatformToolProvider.java      |    0
 .../internal/msvcpp/VisualCppToolChain.java        |  145 ++
 .../internal/msvcpp/VisualStudioInstall.java       |   50 +
 .../internal/msvcpp/VisualStudioLocator.java       |    0
 .../internal/msvcpp/WindowsResourceCompiler.java   |    0
 .../toolchain/internal/msvcpp/WindowsSdk.java      |    0
 .../internal/msvcpp/WindowsSdkLocator.java         |    0
 .../internal/plugins/StandardToolChainsPlugin.java |   35 +
 .../CommandLineToolConfigurationInternal.java      |    0
 .../tools/CommandLineToolSearchResult.java         |    0
 .../tools/DefaultCommandLineToolConfiguration.java |    0
 .../DefaultGccCommandLineToolConfiguration.java    |    0
 .../GccCommandLineToolConfigurationInternal.java   |    0
 .../toolchain/internal/tools/ToolRegistry.java     |    0
 .../toolchain/internal/tools/ToolSearchPath.java   |    0
 .../nativeplatform/toolchain/package-info.java     |    0
 .../toolchain/plugins/ClangCompilerPlugin.java     |    0
 .../toolchain/plugins/GccCompilerPlugin.java       |    0
 .../plugins/MicrosoftVisualCppCompilerPlugin.java  |   69 +
 .../toolchain/plugins/package-info.java            |    0
 .../org.gradle.clang-compiler.properties           |    1 +
 .../org.gradle.gcc-compiler.properties             |    1 +
 ...gradle.microsoft-visual-cpp-compiler.properties |    1 +
 .../org.gradle.native-component-model.properties   |    1 +
 .../org.gradle.standard-tool-chains.properties     |    1 +
 .../DefaultNativeExecutableBinarySpecTest.groovy   |   10 +-
 .../DefaultSharedLibraryBinarySpecTest.groovy      |    2 +-
 .../DefaultStaticLibraryBinarySpecTest.groovy      |    2 +-
 .../configure/CreateDefaultFlavorsTest.groovy      |    2 +-
 .../plugins/NativeComponentModelPluginTest.groovy  |   75 +-
 .../plugins/NativeComponentPluginTest.groovy       |    6 +-
 .../DefaultNativeToolChainRegistryTest.groovy      |    8 +-
 .../plugins/ClangCompilerPluginTest.groovy         |   10 +-
 .../toolchain/plugins/GccCompilerPluginTest.groovy |   12 +-
 .../MicrosoftVisualCppCompilerPluginTest.groovy    |   68 +
 .../plugins/MicrosoftVisualCppPluginTest.groovy    |   64 -
 .../plugins/NativeToolChainPluginTest.groovy       |    9 +-
 .../fixtures/AvailableToolChains.java              |   15 +-
 .../fixtures/NativeBinaryFixture.groovy            |   13 +
 .../fixtures/binaryinfo/DumpbinBinaryInfo.groovy   |    7 +-
 .../binaryinfo/FileArchOnlyBinaryInfo.groovy       |   62 +
 .../fixtures/binaryinfo/ReadelfBinaryInfo.groovy   |    6 +
 subprojects/platform-play/platform-play.gradle     |    6 +
 ...ayPlatformComponentReportIntegrationTest.groovy |    2 +-
 .../integtest/PlayPlatformIntegrationTest.groovy   |    8 +-
 .../AbstractPlaySampleIntegrationTest.groovy       |    4 +-
 .../UserGuidePlaySamplesIntegrationTest.groovy     |    1 -
 .../PlayDistributionPluginIntegrationTest.groovy   |    4 +-
 .../AbstractJavaScriptMinifyIntegrationTest.groovy |    3 -
 .../Play23RoutesCompileIntegrationTest.groovy      |    3 -
 .../play/tasks/PlayAssetsJarIntegrationTest.groovy |    4 +-
 .../play/tasks/PlayRunIntegrationTest.groovy       |    1 -
 .../internal/DefaultPlayApplicationBinarySpec.java |    4 +-
 .../gradle/play/internal/DefaultPlayPlatform.java  |    4 +-
 .../play/internal/PlayPlatformNotationParser.java  |   10 +-
 .../gradle/play/internal/PlayPlatformResolver.java |    4 +-
 .../internal/javascript/GoogleClosureCompiler.java |    2 +-
 .../JavaScriptCompileDestinationCalculator.java    |    2 +-
 .../play/internal/platform/PlayMajorVersion.java   |   31 +-
 .../DefaultVersionedRoutesCompilerAdapter.java     |    2 +-
 .../internal/routes/RoutesCompilerAdapterV24X.java |    4 +-
 .../internal/routes/RoutesCompilerFactory.java     |   15 +-
 .../play/internal/run/PlayApplicationRunner.java   |    6 +-
 .../internal/run/PlayApplicationRunnerFactory.java |    4 +-
 .../internal/run/PlayApplicationRunnerToken.java   |    2 +-
 .../play/internal/run/PlayRunAdapterV23X.java      |    4 +-
 .../play/internal/run/PlayRunAdapterV25X.java      |   33 +
 .../gradle/play/internal/run/PlayWorkerServer.java |   25 +-
 .../internal/toolchain/DefaultPlayToolChain.java   |    6 +-
 .../toolchain/DefaultPlayToolProvider.java         |    2 +-
 .../toolchain/PlayToolChainServiceRegistry.java    |    2 +-
 .../internal/twirl/TwirlCompilerAdapterV10X.java   |    2 +-
 .../internal/twirl/TwirlCompilerAdapterV22X.java   |    2 +-
 .../play/internal/twirl/TwirlCompilerFactory.java  |    1 +
 .../gradle/play/plugins/PlayApplicationPlugin.java |   12 +-
 .../play/plugins/PlayCoffeeScriptPlugin.java       |    4 +-
 .../play/plugins/PlayDistributionPlugin.java       |   19 +-
 .../java/org/gradle/play/plugins/PlayPlugin.java   |    1 +
 .../org/gradle/play/plugins/PlayTestPlugin.java    |   10 +-
 .../org/gradle/play/tasks/JavaScriptMinify.java    |    6 +-
 .../main/java/org/gradle/play/tasks/PlayRun.java   |   27 +-
 .../java/org/gradle/play/tasks/RoutesCompile.java  |    5 +
 .../java/org/gradle/play/tasks/TwirlCompile.java   |    8 +-
 .../gradle/scala/internal/reflect/ScalaMethod.java |    2 +-
 .../play/internal/DefaultPlayToolChainTest.groovy  |    2 +-
 .../play/internal/PlayPlatformResolverTest.groovy  |   53 +-
 .../routes/RoutesCompilerFactoryTest.groovy        |   42 +
 .../run/PlayApplicationRunnerTokenTest.groovy      |    2 +-
 .../toolchain/DefaultPlayToolProviderTest.groovy   |    8 +-
 ...istributionPluginRenameArtifactFilesTest.groovy |   12 +-
 .../org/gradle/play/tasks/PlayRunTest.groovy       |    7 +-
 .../org/gradle/play/tasks/TwirlCompileTest.groovy  |   11 +-
 .../DistributionTestExecHandleBuilder.groovy       |    4 +-
 .../play/integtest/fixtures/PlayCoverage.groovy    |    3 +-
 .../PlayMultiVersionIntegrationTest.groovy         |    5 -
 .../plugin-development/plugin-development.gradle   |    6 +
 .../BaseGradleImplDepsIntegrationTest.groovy       |    9 +-
 ...adleImplDepsCompatibilityIntegrationTest.groovy |   76 +-
 ...GradleImplDepsConcurrencyIntegrationTest.groovy |  189 +--
 .../GradleImplDepsGenerationIntegrationTest.groovy |    5 +-
 ...GradleImplDepsPerformanceIntegrationTest.groovy |    4 +-
 ...adleImplDepsShadingIssuesIntegrationTest.groovy |  150 ++
 .../PackageListGeneratorIntegrationTest.groovy     |  132 ++
 .../JavaGradlePluginPluginIntegrationTest.groovy   |  125 +-
 ...dlePluginPluginPublishingIntegrationTest.groovy |  207 +++
 ...ePluginPluginTestKitSetupIntegrationTest.groovy |    2 +-
 ...pertiesConfiguredByPluginIntegrationTest.groovy |  121 ++
 .../ValidateTaskPropertiesIntegrationTest.groovy   |  157 ++
 .../devel/GradlePluginDevelopmentExtension.java    |   54 +-
 .../org/gradle/plugin/devel/PluginDeclaration.java |   80 ++
 .../devel/plugins/IvyPluginPublishingRules.java    |  101 ++
 .../devel/plugins/JavaGradlePluginPlugin.java      |  159 ++-
 .../devel/plugins/MavenPluginPublishingRules.java  |   91 ++
 .../devel/tasks/GeneratePluginDescriptors.java     |   97 ++
 .../devel/tasks/PluginUnderTestMetadata.java       |    6 +-
 .../plugin/devel/tasks/ValidateTaskProperties.java |  359 +++++
 .../plugins/JavaGradlePluginPluginTest.groovy      |   63 +-
 .../JavaGradlePluginPluginTestKitSetupTest.groovy  |   13 +-
 subprojects/plugin-use/plugin-use.gradle           |    4 +-
 .../AuthenticatedPluginRepositorySpec.groovy       |  143 ++
 .../repository/PluginRepositoriesDslSpec.groovy    |  256 ++++
 ...ngFromMultipleCustomPluginRepositorySpec.groovy |  283 ++++
 ...vingFromSingleCustomPluginRepositorySpec.groovy |  290 ++++
 .../plugin/use/CorePluginUseIntegrationSpec.groovy |   18 +
 .../use/DeployedPortalIntegrationSpec.groovy       |   45 +-
 ...readyOnClasspathDetectionIntegrationSpec.groovy |    2 -
 .../NonDeclarativePluginUseIntegrationSpec.groovy  |    2 +-
 .../PluginUseClassLoadingIntegrationSpec.groovy    |   17 +-
 .../plugin/use/PluginUseDslIntegrationSpec.groovy  |   33 +-
 ...esolutionDeprecatedClientIntegrationTest.groovy |    4 +-
 .../internal/AbstractPluginRepository.java         |  132 ++
 .../internal/BackedByArtifactRepository.java       |   25 +
 .../internal/DefaultGradlePluginPortal.java        |   48 +
 .../internal/DefaultIvyPluginRepository.java       |   60 +
 .../internal/DefaultMavenPluginRepository.java     |   61 +
 .../internal/DefaultPluginRepositoryFactory.java   |   91 ++
 .../internal/DefaultPluginRepositoryRegistry.java  |   78 +
 .../internal/PluginRepositoryInternal.java         |   24 +
 .../internal/DefaultPluginRequestApplicator.java   |   72 +-
 .../plugin/use/internal/PluginResolverFactory.java |   47 +-
 .../internal/PluginUsePluginServiceRegistry.java   |   68 +-
 .../internal/ArtifactRepositoryPluginResolver.java |   97 ++
 .../use/resolve/internal/CorePluginResolver.java   |    6 +
 .../use/resolve/internal/PluginResolveContext.java |    2 +
 ...tionListeningPluginResolutionServiceClient.java |    2 +-
 .../HttpPluginResolutionServiceClient.java         |    2 +-
 .../ArtifactRepositoryPluginResolverTest.groovy    |   59 +
 .../resolve/internal/CorePluginResolverTest.groovy |    2 +-
 ...steningPluginResolutionServiceClientTest.groovy |    2 +-
 ...CachingPluginResolutionServiceClientTest.groovy |    2 +-
 ...CachingPluginResolutionServiceClientTest.groovy |    2 +-
 .../PluginResolutionServiceTestServer.groovy       |    2 -
 subprojects/plugins/plugins.gradle                 |    5 +
 .../api/plugins/BasePluginIntegrationTest.groovy   |   11 +-
 .../plugins/BuildSrcPluginIntegrationTest.groovy   |  134 ++
 .../gradle/api/plugins/BuildSrcPluginTest.groovy   |   95 --
 .../api/tasks/JavaExecIntegrationTest.groovy       |   17 +-
 .../api/tasks/bundling/JarIntegrationTest.groovy   |  281 ++++
 .../tasks/bundling/WarTaskIntegrationTest.groovy   |   25 +
 .../groovy/GroovyBasePluginIntegrationTest.groovy  |    8 +-
 .../GroovyCrossCompilationIntegrationTest.groovy   |  102 ++
 .../BasicGroovyCompilerIntegrationSpec.groovy      |   10 +-
 .../InProcessGroovyCompilerIntegrationTest.groovy  |    7 +
 .../compile/InvokeDynamicGroovyCompilerSpec.groovy |   13 +-
 .../JavaCrossCompilationIntegrationTest.groovy     |   44 +-
 .../java/ParallelTestTaskIntegrationTest.groovy    |   94 ++
 .../PluginsComponentReportIntegrationTest.groovy   |    6 +-
 ...vaVersionCrossCompilationIntegrationTest.groovy |   90 ++
 .../BasicJavaCompilerIntegrationSpec.groovy        |   49 +-
 .../InProcessJavaCompilerIntegrationTest.groovy    |    9 +
 .../IncrementalJavaCompileIntegrationTest.groovy   |    4 +-
 .../compile/JavaCompilerIntegrationSpec.groovy     |   13 +-
 .../build.gradle                                   |    2 +-
 .../distribution/plugins/DistributionPlugin.groovy |  135 --
 .../distribution/plugins/DistributionPlugin.java   |  159 +++
 .../api/distribution/plugins/package-info.java     |   21 +
 .../jvm/ClassDirectoryBinaryNamingScheme.java      |    4 +-
 .../gradle/api/internal/plugins/AbstractRule.java  |    2 +-
 .../internal/plugins/BuildConfigurationRule.java   |    4 +-
 .../gradle/api/internal/plugins/UploadRule.java    |    4 +-
 .../api/internal/tasks/DefaultGroovySourceSet.java |    4 +-
 .../api/internal/tasks/DefaultSourceSet.java       |   16 +-
 .../api/internal/tasks/DefaultSourceSetOutput.java |    4 +-
 .../gradle/api/plugins/ApplicationPlugin.groovy    |  139 --
 .../org/gradle/api/plugins/ApplicationPlugin.java  |  194 +++
 .../api/plugins/ApplicationPluginConvention.groovy |   65 -
 .../api/plugins/ApplicationPluginConvention.java   |  109 ++
 .../groovy/org/gradle/api/plugins/BasePlugin.java  |    4 +-
 .../gradle/api/plugins/BasePluginConvention.groovy |   64 -
 .../gradle/api/plugins/BasePluginConvention.java   |  101 ++
 .../org/gradle/api/plugins/GroovyBasePlugin.java   |   18 +-
 .../org/gradle/api/plugins/JavaBasePlugin.java     |   42 +-
 .../plugins/JavaLibraryDistributionPlugin.groovy   |   46 -
 .../api/plugins/JavaLibraryDistributionPlugin.java |   58 +
 .../groovy/org/gradle/api/plugins/JavaPlugin.java  |    8 -
 .../gradle/api/plugins/JavaPluginConvention.groovy |  177 ---
 .../gradle/api/plugins/JavaPluginConvention.java   |  233 +++
 .../gradle/api/plugins/WarPluginConvention.groovy  |   38 -
 .../gradle/api/plugins/WarPluginConvention.java    |   56 +
 .../main/groovy/org/gradle/api/tasks/Upload.java   |    8 +-
 .../tasks/application/CreateStartScripts.groovy    |   20 -
 .../api/tasks/application/CreateStartScripts.java  |   84 ++
 .../org/gradle/api/tasks/bundling/Jar.groovy       |   33 -
 .../groovy/org/gradle/api/tasks/bundling/Jar.java  |   35 +
 .../org/gradle/api/tasks/bundling/War.groovy       |  133 --
 .../groovy/org/gradle/api/tasks/bundling/War.java  |  173 +++
 .../jvm/application/tasks/CreateStartScripts.java  |    6 +
 .../api/internal/plugins/unixStartScript.txt       |    5 +
 .../api/internal/plugins/windowsStartScript.txt    |    6 -
 .../plugins/DistributionPluginTest.groovy          |    7 +-
 .../plugins/UnixStartScriptGeneratorTest.groovy    |    2 +-
 .../plugins/WindowsStartScriptGeneratorTest.groovy |    2 +-
 .../api/plugins/ApplicationPluginTest.groovy       |   31 +-
 .../api/plugins/BasePluginConventionTest.groovy    |    9 +-
 .../org/gradle/api/plugins/BasePluginTest.groovy   |    9 +-
 .../gradle/api/plugins/GroovyBasePluginTest.groovy |   15 +-
 .../org/gradle/api/plugins/GroovyPluginTest.groovy |    2 +-
 .../gradle/api/plugins/JavaBasePluginTest.groovy   |   12 +-
 .../JavaLibraryDistributionPluginTest.groovy       |    6 +-
 .../api/plugins/JavaPluginConventionTest.groovy    |   14 +-
 .../org/gradle/api/plugins/JavaPluginTest.groovy   |  399 ++++--
 .../org/gradle/api/plugins/WarPluginTest.groovy    |    6 +-
 .../org/gradle/api/tasks/GroovyRuntimeTest.groovy  |    6 +-
 .../groovy/org/gradle/api/tasks/UploadTest.groovy  |    6 +-
 .../application/CreateStartScriptsTest.groovy      |    8 +-
 .../org/gradle/api/tasks/bundling/WarTest.groovy   |   16 +-
 .../api/tasks/compile/GroovyCompileTest.groovy     |  102 ++
 .../api/tasks/compile/GroovyCompileTest.java       |  114 --
 .../gradle/api/tasks/testing/TestReportTest.groovy |   17 +-
 .../gradle/api/tasks/testing/TestTaskSpec.groovy   |    7 +-
 .../org/gradle/api/tasks/testing/TestTest.groovy   |  235 +++
 .../org/gradle/api/tasks/testing/TestTest.java     |  282 ----
 .../tasks/testing/testng/TestNGOptionsTest.groovy  |   24 -
 .../api/tasks/compile/AbstractCompileTest.groovy   |   92 ++
 .../api/tasks/compile/AbstractCompileTest.java     |   92 --
 .../process-services/process-services.gradle       |   14 +
 .../java}/org/gradle/process/BaseExecSpec.java     |    0
 .../main/java}/org/gradle/process/ExecResult.java  |    0
 .../main/java}/org/gradle/process/ExecSpec.java    |    0
 .../org/gradle/process/ProcessForkOptions.java     |  109 ++
 .../org/gradle/process/internal/ExecException.java |    0
 .../org/gradle/process/internal/ExecHandle.java    |    0
 .../gradle/process/internal/ExecHandleBuilder.java |   25 +
 .../gradle/process/internal/ExecHandleFactory.java |   21 +
 .../process/internal/ExecHandleListener.java       |    0
 .../gradle/process/internal/ExecHandleState.java   |    0
 .../org/gradle/api/publish/Publication.java        |    0
 .../gradle/api/publish/PublicationContainer.java   |    0
 .../gradle/api/publish/PublishingExtension.java    |    0
 .../internal/DefaultPublicationContainer.java      |    0
 .../internal/DefaultPublishingExtension.java       |    0
 .../ProjectDependencyPublicationResolver.java      |    0
 .../internal/PublicationFieldValidator.java        |    0
 .../api/publish/internal/PublicationInternal.java  |    0
 .../api/publish/internal/PublishOperation.java     |    0
 .../api/publish/internal/PublishServices.java      |    0
 .../org/gradle/api/publish/package-info.java       |    0
 .../api/publish/plugins/PublishingPlugin.java      |    0
 .../gradle/api/publish/plugins/package-info.java   |    0
 .../publish/plugins/PublishingPluginTest.groovy    |    7 +-
 subprojects/reporting/reporting.gradle             |    2 +
 .../BuildDashboardPluginIntegrationTest.groovy     |    4 +
 .../api/reporting/BuildDashboardReports.java       |   32 -
 .../org/gradle/api/reporting/DirectoryReport.java  |   47 -
 .../api/reporting/GenerateBuildDashboard.java      |  160 ---
 .../groovy/org/gradle/api/reporting/Report.java    |  119 --
 .../org/gradle/api/reporting/ReportContainer.java  |   60 -
 .../groovy/org/gradle/api/reporting/Reporting.java |   84 --
 .../gradle/api/reporting/ReportingExtension.java   |  110 --
 .../org/gradle/api/reporting/SingleFileReport.java |   30 -
 .../internal/BuildDashboardGenerator.java          |  105 --
 .../reporting/internal/DefaultReportContainer.java |   80 --
 .../api/reporting/internal/SimpleReport.java       |   83 --
 .../reporting/internal/TaskGeneratedReport.java    |   32 -
 .../reporting/internal/TaskReportContainer.java    |   86 --
 .../gradle/api/plugins/ReportingBasePlugin.java    |    0
 .../api/reporting/BuildDashboardReports.java       |   34 +
 .../gradle/api/reporting/ConfigurableReport.java   |    0
 .../api/reporting/CustomizableHtmlReport.java      |    0
 .../org/gradle/api/reporting/DirectoryReport.java  |   56 +
 .../api/reporting/GenerateBuildDashboard.java      |  188 +++
 .../main/java/org/gradle/api/reporting/Report.java |  124 ++
 .../org/gradle/api/reporting/ReportContainer.java  |   87 ++
 .../java/org/gradle/api/reporting/Reporting.java   |  103 ++
 .../gradle/api/reporting/ReportingExtension.java   |  110 ++
 .../org/gradle/api/reporting/SingleFileReport.java |   38 +
 .../internal/BuildDashboardGenerator.java          |  105 ++
 .../internal/CustomizableHtmlReportImpl.java       |    0
 .../internal/DefaultBuildDashboardReports.java     |    0
 .../reporting/internal/DefaultReportContainer.java |   80 ++
 .../api/reporting/internal/SimpleReport.java       |   83 ++
 .../reporting/internal/TaskGeneratedReport.java    |   32 +
 .../TaskGeneratedSingleDirectoryReport.java        |    0
 .../internal/TaskGeneratedSingleFileReport.java    |    0
 .../reporting/internal/TaskReportContainer.java    |   89 ++
 .../org/gradle/api/reporting/package-info.java     |    0
 .../reporting/plugins/BuildDashboardPlugin.java    |    0
 .../gradle/api/reporting/plugins/package-info.java |    0
 .../org.gradle.reporting-base.properties           |    1 +
 .../api/plugins/ReportingBasePluginTest.groovy     |   17 +-
 .../reporting/GenerateBuildDashboardSpec.groovy    |    7 +-
 .../internal/TaskReportContainerTest.groovy        |   56 +-
 .../http/ApacheDirectoryListingParser.java         |    4 +-
 .../resource/transport/http/HttpClientHelper.java  |   30 +-
 .../transport/http/HttpResourceAccessor.java       |   10 +-
 .../transport/http/HttpResourceUploader.java       |   17 +-
 .../transport/http/HttpResponseResource.java       |   11 +-
 .../transport/http/AbstractHttpClientTest.groovy   |   56 +
 .../http/AlwaysRedirectRedirectStrategyTest.groovy |    4 +-
 .../http/ApacheDirectoryListingParserTest.groovy   |   12 +-
 .../transport/http/HttpClientHelperTest.groovy     |   24 +-
 .../transport/http/HttpResourceUploaderTest.groovy |   40 +
 .../transport/http/HttpResponseResourceTest.groovy |   22 +-
 subprojects/resources-s3/resources-s3.gradle       |    3 +
 .../resource/s3/S3ClientIntegrationTest.groovy     |   42 +-
 .../resource/s3/fixtures/IvyS3Module.groovy        |   21 +
 .../resource/s3/fixtures/IvyS3Repository.groovy    |    2 +-
 .../resource/s3/fixtures/MavenS3Repository.groovy  |    2 +-
 .../resource/s3/fixtures/S3Server.groovy           |  212 ++-
 .../resource/transport/aws/s3/S3Client.java        |   87 +-
 .../transport/aws/s3/S3RegionalResource.java       |    9 +-
 .../transport/aws/s3/S3ResourceConnector.java      |    2 +-
 .../transport/aws/s3/S3ResourceResolver.java       |   87 ++
 .../resource/transport/aws/s3/S3ClientTest.groovy  |   42 +-
 .../transport/aws/s3/S3RegionalResourceTest.groovy |   17 +-
 .../aws/s3/S3ResourceConnectorTest.groovy          |    2 +-
 .../transport/aws/s3/S3ResourceResolverTest.groovy |   94 ++
 subprojects/resources-sftp/resources-sftp.gradle   |    3 +
 .../ivy/IvySftpRepoErrorsIntegrationTest.groovy    |    2 +-
 subprojects/resources/resources.gradle             |    3 +
 .../gradle/internal/resource/UriTextResource.java  |    7 +
 .../transfer/DefaultExternalResourceConnector.java |  203 +++
 .../resource/transfer/ExternalResourceLister.java  |    9 +-
 .../internal/resource/UriTextResourceTest.groovy   |  332 +++--
 subprojects/scala/scala.gradle                     |    4 +-
 .../samples/SamplesScalaZincIntegrationTest.groovy |    2 +-
 .../ScalaCrossCompilationIntegrationTest.groovy    |  109 ++
 ...ctAntForkingScalaCompilerIntegrationTest.groovy |   46 -
 ...AntInProcessScalaCompilerIntegrationTest.groovy |   47 -
 ...ForkingOlderScalaCompilerIntegrationTest.groovy |   28 -
 .../AntForkingScalaCompilerIntegrationTest.groovy  |   24 -
 ...ProcessOlderScalaCompilerIntegrationTest.groovy |   28 -
 ...AntInProcessScalaCompilerIntegrationTest.groovy |   25 -
 .../BasicScalaCompilerIntegrationTest.groovy       |   15 +-
 .../IncrementalScalaCompileIntegrationTest.groovy  |    8 +-
 .../ZincScalaCompilerIntegrationTest.groovy        |   21 +-
 ...ScalaCompilerMultiVersionIntegrationTest.groovy |    2 +-
 .../JreJavaHomeScalaIntegrationTest.groovy         |   29 +-
 .../api/internal/tasks/DefaultScalaSourceSet.java  |   48 -
 .../internal/tasks/scala/AntScalaCompiler.groovy   |  106 --
 .../tasks/scala/ScalaCompileOptionsInternal.java   |   42 -
 .../internal/tasks/scala/ScalaCompilerFactory.java |   71 -
 .../tasks/scala/ScalaJavaJointCompiler.java        |   26 -
 .../api/plugins/scala/ScalaBasePlugin.groovy       |  129 --
 .../gradle/api/plugins/scala/ScalaPlugin.groovy    |   44 -
 .../groovy/org/gradle/api/tasks/ScalaRuntime.java  |  149 --
 .../org/gradle/api/tasks/scala/AntScalaDoc.groovy  |   63 -
 .../org/gradle/api/tasks/scala/ScalaCompile.java   |  116 --
 .../api/tasks/scala/ScalaCompileOptions.java       |  168 ---
 .../org/gradle/api/tasks/scala/ScalaDoc.java       |  115 --
 .../api/internal/tasks/DefaultScalaSourceSet.java  |   48 +
 .../api/internal/tasks/scala/AntScalaDoc.java      |   76 +
 .../tasks/scala/CleaningScalaCompiler.java         |    0
 .../tasks/scala/DefaultScalaJavaJointCompiler.java |    0
 .../internal/tasks/scala/ScalaCompilerFactory.java |   54 +
 .../gradle/api/plugins/scala/ScalaBasePlugin.java  |  193 +++
 .../org/gradle/api/plugins/scala/ScalaPlugin.java  |   70 +
 .../org/gradle/api/plugins/scala/package-info.java |   20 +
 .../java/org/gradle/api/tasks/ScalaRuntime.java    |  144 ++
 .../org/gradle/api/tasks/ScalaSourceSet.java       |    0
 .../org/gradle/api/tasks/scala/ScalaCompile.java   |  112 ++
 .../api/tasks/scala/ScalaCompileOptions.java       |   25 +
 .../java/org/gradle/api/tasks/scala/ScalaDoc.java  |  118 ++
 .../gradle/api/tasks/scala/ScalaDocOptions.java    |    0
 .../api/plugins/scala/ScalaBasePluginTest.groovy   |   20 +-
 .../api/plugins/scala/ScalaPluginTest.groovy       |    9 +-
 .../org/gradle/api/tasks/ScalaRuntimeTest.groovy   |    6 +-
 .../api/tasks/scala/ScalaCompileOptionsTest.groovy |  125 --
 .../gradle/api/tasks/scala/ScalaCompileTest.groovy |   86 ++
 .../gradle/api/tasks/scala/ScalaCompileTest.java   |  178 ---
 .../org/gradle/api/tasks/scala/ScalaDocSpec.groovy |   55 +
 .../org/gradle/api/tasks/scala/ScalaDocTest.java   |   61 -
 subprojects/signing/signing.gradle                 |    4 +-
 .../groovy/org/gradle/plugins/signing/Sign.groovy  |  209 ---
 .../groovy/org/gradle/plugins/signing/Sign.java    |  358 +++++
 .../gradle/plugins/signing/SignOperation.groovy    |  179 ---
 .../org/gradle/plugins/signing/SignOperation.java  |  238 ++++
 .../org/gradle/plugins/signing/Signature.groovy    |  330 -----
 .../org/gradle/plugins/signing/Signature.java      |  404 ++++++
 .../gradle/plugins/signing/SignatureSpec.groovy    |   72 -
 .../org/gradle/plugins/signing/SignatureSpec.java  |   71 +
 .../gradle/plugins/signing/SigningExtension.groovy |  379 -----
 .../gradle/plugins/signing/SigningExtension.java   |  454 ++++++
 .../gradle/plugins/signing/SigningPlugin.groovy    |   42 -
 .../org/gradle/plugins/signing/SigningPlugin.java  |   40 +
 .../org/gradle/plugins/signing/package-info.java   |   20 +
 .../plugins/signing/signatory/Signatory.groovy     |   48 -
 .../plugins/signing/signatory/Signatory.java       |   48 +
 .../signing/signatory/SignatoryProvider.groovy     |   52 -
 .../signing/signatory/SignatoryProvider.java       |   53 +
 .../signing/signatory/SignatorySupport.groovy      |   26 -
 .../signing/signatory/SignatorySupport.java        |   32 +
 .../plugins/signing/signatory/package-info.java    |   20 +
 .../gradle/plugins/signing/signatory/pgp/Dsl.java  |   60 +
 .../plugins/signing/signatory/pgp/PgpKeyId.groovy  |  100 --
 .../plugins/signing/signatory/pgp/PgpKeyId.java    |  112 ++
 .../signing/signatory/pgp/PgpSignatory.groovy      |   86 --
 .../signing/signatory/pgp/PgpSignatory.java        |  121 ++
 .../signatory/pgp/PgpSignatoryFactory.groovy       |  109 --
 .../signing/signatory/pgp/PgpSignatoryFactory.java |  167 +++
 .../signatory/pgp/PgpSignatoryProvider.groovy      |   76 -
 .../signatory/pgp/PgpSignatoryProvider.java        |   52 +
 .../signing/signatory/pgp/package-info.java        |   20 +
 .../signing/type/AbstractSignatureType.groovy      |   50 -
 .../signing/type/AbstractSignatureType.java        |   83 ++
 .../type/AbstractSignatureTypeProvider.groovy      |   48 -
 .../type/AbstractSignatureTypeProvider.java        |   62 +
 .../signing/type/BinarySignatureType.groovy        |   24 -
 .../plugins/signing/type/BinarySignatureType.java  |   27 +
 .../type/DefaultSignatureTypeProvider.groovy       |   29 -
 .../signing/type/DefaultSignatureTypeProvider.java |   32 +
 .../plugins/signing/type/SignatureType.groovy      |   32 -
 .../gradle/plugins/signing/type/SignatureType.java |   68 +
 .../signing/type/SignatureTypeProvider.groovy      |   27 -
 .../signing/type/SignatureTypeProvider.java        |   30 +
 .../gradle/plugins/signing/type/package-info.java  |   20 +
 .../signing/type/pgp/ArmoredSignatureType.groovy   |   34 -
 .../signing/type/pgp/ArmoredSignatureType.java     |   46 +
 .../plugins/signing/type/pgp/package-info.java     |   20 +
 .../plugins/signing/SigningProjectSpec.groovy      |   66 +-
 subprojects/smoke-test/smoke-test.gradle           |   46 +
 .../org/gradle/smoketests/AbstractSmokeTest.groovy |   70 +
 .../smoketests/AndroidPluginsSmokeTest.groovy      |  250 ++++
 .../org/gradle/smoketests/GrettySmokeTest.groovy   |   53 +
 .../smoketests/JavascriptPluginsSmokeTest.groovy   |  125 ++
 .../gradle/smoketests/KotlinPluginSmokeTest.groovy |   50 +
 .../smoketests/NebulaPluginsSmokeTest.groovy       |  100 ++
 .../smoketests/ThirdPartyPluginsSmokeTest.groovy   |  265 ++++
 .../smoketests/android-kotlin-example/build.gradle |  108 ++
 .../src/main/AndroidManifest.xml                   |    8 +
 .../kotlin/android/StringPrinterFragment.kt        |   12 +
 .../smoketest/kotlin/android/StringPrinterTest.kt  |   17 +
 .../gradle/smoketests/gretty-example/build.gradle  |   33 +
 .../src/main/java/org/gradle/sample/Greeter.java   |   11 +
 .../gretty-example/src/main/webapp/index.jsp       |    6 +
 .../gradle/smoketests/kotlin-example/build.gradle  |   21 +
 .../src/main/kotlin/pkg/HelloWorld.kt              |   13 +
 subprojects/soak/soak.gradle                       |   21 +
 .../launcher/daemon/AndroidDexingSoakTest.groovy   |  251 ++++
 .../DaemonPerformanceMonitoringCoverage.groovy     |   33 +
 .../DaemonPerformanceMonitoringSoakTest.groovy     |  321 +++++
 .../resolve/DependencyResolutionStressTest.groovy  |  286 ++++
 .../fixtures/DaemonMultiJdkIntegrationTest.groovy  |  103 ++
 .../fixtures/FullyQualifiedGarbageCollector.groovy |   81 ++
 .../daemon/fixtures/JavaGarbageCollector.groovy    |   49 +
 .../launcher/daemon/fixtures/JdkVendor.groovy      |   34 +
 .../org/gradle/soak/categories/SoakTest.java       |   20 +
 subprojects/sonar/sonar.gradle                     |   52 -
 .../plugins/sonar/SonarSmokeIntegrationTest.groovy |   88 --
 .../runner/SonarRunnerSmokeIntegrationTest.groovy  |   84 --
 .../org/gradle/sonar/runner/SonarTestServer.groovy |  138 --
 .../SonarSmokeIntegrationTest/shared/build.gradle  |   24 -
 .../shared/customizedProject/build.gradle          |   14 -
 .../gradle/test/customizedProject/Production1.java |   14 -
 .../org/gradle/test/customizedProject/Test1.java   |   12 -
 .../shared/gradle.properties                       |    1 -
 .../shared/javaProjectWithJacoco/build.gradle      |    9 -
 .../org/gradle/test/javaProject/Production1.java   |   14 -
 .../org/gradle/test/javaProject/Production10.java  |   14 -
 .../org/gradle/test/javaProject/Production2.java   |   14 -
 .../org/gradle/test/javaProject/Production3.java   |   14 -
 .../org/gradle/test/javaProject/Production4.java   |   14 -
 .../org/gradle/test/javaProject/Production5.java   |   14 -
 .../org/gradle/test/javaProject/Production6.java   |   14 -
 .../org/gradle/test/javaProject/Production7.java   |   14 -
 .../org/gradle/test/javaProject/Production8.java   |   14 -
 .../org/gradle/test/javaProject/Production9.java   |   14 -
 .../gradle/test/javaProject/productionResource.xml |    6 -
 .../java/org/gradle/test/javaProject/Test1.java    |   12 -
 .../java/org/gradle/test/javaProject/Test10.java   |   12 -
 .../java/org/gradle/test/javaProject/Test2.java    |   12 -
 .../java/org/gradle/test/javaProject/Test3.java    |   12 -
 .../java/org/gradle/test/javaProject/Test4.java    |   12 -
 .../java/org/gradle/test/javaProject/Test5.java    |   12 -
 .../java/org/gradle/test/javaProject/Test6.java    |   12 -
 .../java/org/gradle/test/javaProject/Test7.java    |   12 -
 .../java/org/gradle/test/javaProject/Test8.java    |   12 -
 .../java/org/gradle/test/javaProject/Test9.java    |   12 -
 .../org/gradle/test/javaProject/testResource.xml   |    6 -
 .../nested/nested2/nestedProject/build.gradle      |    1 -
 .../org/gradle/test/nestedProject/Production1.java |   14 -
 .../java/org/gradle/test/nestedProject/Test1.java  |   12 -
 .../shared/settings.gradle                         |    3 -
 .../shared/skippedProject/build.gradle             |    3 -
 .../gradle/test/skippedProject/Production1.java    |   14 -
 .../java/org/gradle/test/skippedProject/Test1.java |   12 -
 .../shared/src/main/java/Person.java               |    5 -
 .../shared/build.gradle                            |   20 -
 .../shared/customizedProject/build.gradle          |   14 -
 .../gradle/test/customizedProject/Production1.java |   14 -
 .../org/gradle/test/customizedProject/Test1.java   |   12 -
 .../shared/emptyJavaProject/build.gradle           |   17 -
 .../shared/gradle.properties                       |    1 -
 .../shared/groovyProject/build.gradle              |   14 -
 .../test/groovyProject/ProductionGroovy1.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy10.groovy   |   13 -
 .../test/groovyProject/ProductionGroovy2.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy3.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy4.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy5.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy6.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy7.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy8.groovy    |   13 -
 .../test/groovyProject/ProductionGroovy9.groovy    |   13 -
 .../gradle/test/groovyProject/TestGroovy1.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy10.groovy  |   12 -
 .../gradle/test/groovyProject/TestGroovy2.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy3.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy4.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy5.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy6.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy7.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy8.groovy   |   12 -
 .../gradle/test/groovyProject/TestGroovy9.groovy   |   12 -
 .../shared/javaProjectWithJacoco/build.gradle      |    9 -
 .../org/gradle/test/javaProject/Production1.java   |   14 -
 .../org/gradle/test/javaProject/Production10.java  |   14 -
 .../org/gradle/test/javaProject/Production2.java   |   14 -
 .../org/gradle/test/javaProject/Production3.java   |   14 -
 .../org/gradle/test/javaProject/Production4.java   |   14 -
 .../org/gradle/test/javaProject/Production5.java   |   14 -
 .../org/gradle/test/javaProject/Production6.java   |   14 -
 .../org/gradle/test/javaProject/Production7.java   |   14 -
 .../org/gradle/test/javaProject/Production8.java   |   14 -
 .../org/gradle/test/javaProject/Production9.java   |   14 -
 .../gradle/test/javaProject/productionResource.xml |    6 -
 .../java/org/gradle/test/javaProject/Test1.java    |   12 -
 .../java/org/gradle/test/javaProject/Test10.java   |   12 -
 .../java/org/gradle/test/javaProject/Test2.java    |   12 -
 .../java/org/gradle/test/javaProject/Test3.java    |   12 -
 .../java/org/gradle/test/javaProject/Test4.java    |   12 -
 .../java/org/gradle/test/javaProject/Test5.java    |   12 -
 .../java/org/gradle/test/javaProject/Test6.java    |   12 -
 .../java/org/gradle/test/javaProject/Test7.java    |   12 -
 .../java/org/gradle/test/javaProject/Test8.java    |   12 -
 .../java/org/gradle/test/javaProject/Test9.java    |   12 -
 .../org/gradle/test/javaProject/testResource.xml   |    6 -
 .../javaProjectWithSkippedTestTask/build.gradle    |   21 -
 .../src/test/java/Test1.java                       |   25 -
 .../javaProjectWithoutTestClasses/build.gradle     |    1 -
 .../src/main/java/Production1.java                 |   12 -
 .../nested/nested2/nestedProject/build.gradle      |    1 -
 .../org/gradle/test/nestedProject/Production1.java |   14 -
 .../java/org/gradle/test/nestedProject/Test1.java  |   12 -
 .../shared/settings.gradle                         |    3 -
 .../shared/skippedProject/build.gradle             |    3 -
 .../gradle/test/skippedProject/Production1.java    |   14 -
 .../java/org/gradle/test/skippedProject/Test1.java |   12 -
 .../gradle/api/plugins/sonar/SonarAnalyze.groovy   |   83 --
 .../gradle/api/plugins/sonar/SonarPlugin.groovy    |  164 ---
 .../sonar/internal/SonarCodeAnalyzer.groovy        |  117 --
 .../plugins/sonar/model/IncludeProperties.groovy   |   31 -
 .../sonar/model/ModelToPropertiesConverter.groovy  |   89 --
 .../api/plugins/sonar/model/SonarProperty.groovy   |   30 -
 .../api/plugins/sonar/model/SonarRootModel.groovy  |  473 -------
 .../org/gradle/sonar/runner/SonarProperties.java   |   69 -
 .../gradle/sonar/runner/SonarRunnerExtension.java  |  101 --
 .../sonar/runner/SonarRunnerRootExtension.java     |   94 --
 .../org/gradle/sonar/runner/package-info.java      |   24 -
 .../sonar/runner/plugins/SonarRunnerPlugin.java    |  350 -----
 .../gradle/sonar/runner/plugins/package-info.java  |   22 -
 .../org/gradle/sonar/runner/tasks/SonarRunner.java |  133 --
 .../gradle/sonar/runner/tasks/package-info.java    |   22 -
 .../org.gradle.sonar-runner.properties             |    1 -
 .../gradle-plugins/org.gradle.sonar.properties     |    1 -
 subprojects/sonar/src/main/resources/logback.xml   |   28 -
 .../api/plugins/sonar/SonarAnalyzeTest.groovy      |   43 -
 .../api/plugins/sonar/SonarPluginTest.groovy       |  142 --
 .../model/ModelToPropertiesConverterTest.groovy    |  113 --
 .../gradle/sonar/runner/SonarPropertiesTest.groovy |   48 -
 .../sonar/runner/SonarRunnerExtensionTest.groovy   |   46 -
 .../runner/plugins/SonarRunnerPluginTest.groovy    |  449 ------
 .../http/HttpTaskOutputCacheIntegrationTest.groovy |  248 ++++
 .../tasks/http/HttpTaskOutputCacheTest.groovy      |   62 +
 .../cache/tasks/http/HttpTaskOutputCache.java      |  121 ++
 .../tasks/http/HttpTaskOutputCacheFactory.java     |   47 +
 subprojects/task-cache-http/task-cache-http.gradle |   30 +
 ...DependencyClassVisibilityIntegrationTest.groovy |    2 -
 .../runner/BaseGradleRunnerIntegrationTest.groovy  |   17 +-
 .../GradleRunnerBuildFailureIntegrationTest.groovy |   42 +-
 .../GradleRunnerDaemonIntegrationTest.groovy       |   12 +-
 ...leRunnerMechanicalFailureIntegrationTest.groovy |    7 +-
 ...rPluginClasspathInjectionIntegrationTest.groovy |   12 +-
 ...leRunnerSupportedBuildJvmIntegrationTest.groovy |   46 +
 ...UnsupportedFeatureFailureIntegrationTest.groovy |   15 +-
 ...ortedGradleVersionFailureIntegrationTest.groovy |   39 +
 .../BaseTestKitEndUserIntegrationTest.groovy       |    3 +-
 .../CheckstyleEndUserIntegrationTest.groovy        |  114 ++
 ...ClasspathInjectionEndUserIntegrationTest.groovy |    4 +-
 .../GradleRunnerMiscEndUserIntegationTest.groovy   |    1 +
 ...radleRunnerSamplesEndUserIntegrationTest.groovy |    3 +-
 ...eRunnerUserLoggingEndUserIntegrationTest.groovy |   81 ++
 .../runner/UnsupportedFeatureException.java        |    4 +
 .../testkit/runner/internal/DefaultBuildTask.java  |    2 +-
 .../runner/internal/ToolingApiGradleExecutor.java  |   26 +-
 .../runner/internal/feature/TestKitFeature.java    |    1 +
 subprojects/test-kit/test-kit.gradle               |   46 +-
 .../testing/JULRedirectorIntegrationTest.groovy    |   98 ++
 .../loggingConfig}/build.gradle                    |    0
 .../src/main/java/com/example/LumberJack.java      |   33 +
 .../src/test/java/com/example/LumberJackTest.java  |   30 +
 .../src/test/resources/logging.properties          |    6 +
 .../tasks/testing/DefaultTestClassDescriptor.java  |    2 +-
 .../tasks/testing/DefaultTestDescriptor.java       |    2 +-
 .../tasks/testing/DefaultTestMethodDescriptor.java |    2 +-
 .../tasks/testing/DefaultTestSuiteDescriptor.java  |    2 +-
 .../api/internal/tasks/testing/JULRedirector.java  |   22 +-
 .../tasks/testing/logging/AbstractTestLogger.java  |    4 +-
 .../testing/logging/GroovyStackTraceSpec.java      |    1 +
 .../testing/logging/ShortExceptionFormatter.java   |    2 +-
 .../tasks/testing/logging/TestCountLogger.java     |    9 +-
 .../tasks/testing/logging/TestEventLogger.java     |    2 +-
 .../DefaultStandardOutputRedirector.java           |    4 +-
 .../processors/MaxNParallelTestClassProcessor.java |    7 +-
 .../processors/StandardOutputRedirector.java       |    2 +-
 .../testing/worker/ForkingTestClassProcessor.java  |   24 +-
 .../internal/tasks/testing/worker/TestWorker.java  |   10 +-
 .../org/gradle/api/tasks/testing/TestFilter.java   |    3 +
 .../platform/base/test/TestSuiteBinarySpec.java    |   36 -
 .../platform/base/test/TestSuiteContainer.java     |   28 -
 .../gradle/platform/base/test/TestSuiteSpec.java   |   45 -
 .../testing/logging/AbstractTestLoggerTest.groovy  |    4 +-
 .../logging/FullExceptionFormatterTest.groovy      |    2 +-
 .../logging/ShortExceptionFormatterTest.groovy     |    2 +-
 .../testing/logging/TestCountLoggerTest.groovy     |    4 +-
 .../testing/logging/TestEventLoggerTest.groovy     |    2 +-
 .../testing/processors/JULRedirectorTest.groovy    |  175 +++
 .../MaxNParallelTestClassProcessorTest.groovy      |    6 +-
 .../RestartEveryNTestClassProcessorTest.groovy     |  159 +++
 .../RestartEveryNTestClassProcessorTest.java       |  156 --
 .../testing/processors/TestMainActionTest.groovy   |  196 ++-
 .../worker/ForkingTestClassProcessorTest.groovy    |   28 +-
 .../tasks/testing/worker/TestWorkerTest.groovy     |  148 +-
 subprojects/testing-base/testing-base.gradle       |    3 +
 .../JUnitComponentUnderTestIntegrationTest.groovy  |    3 -
 ...tTestSuiteComponentReportIntegrationTest.groovy |   11 +-
 .../testing/TestEnvironmentIntegrationTest.groovy  |    2 -
 .../TestProgressLoggingIntegrationTest.groovy      |   24 +-
 .../testing/TestReportIntegrationTest.groovy       |    1 -
 .../gradle/testing/TestTaskIntegrationTest.groovy  |   83 +-
 .../gradle/testing/TestingIntegrationTest.groovy   |   64 +-
 .../junit/BuildSrcSpockIntegrationTest.groovy      |   78 +
 .../junit/JUnitCategoriesIntegrationSpec.groovy    |    7 +-
 .../JUnitConsoleLoggingIntegrationTest.groovy      |    3 +-
 .../testing/junit/JUnitIntegrationTest.groovy      |   27 +-
 .../testng/SampleTestNGIntegrationTest.groovy      |   21 +-
 .../TestNGConsoleLoggingIntegrationTest.groovy     |    7 +-
 .../testing/testng/TestNGIntegrationTest.groovy    |  104 +-
 .../testng/TestNGSuiteIntegrationTest.groovy       |   29 +
 .../shared/build.gradle                            |    2 +-
 .../standardOutputLogging/build.gradle             |    2 +-
 .../src/test/java/org/gradle/OkTest.java           |   25 +-
 .../groovyJdk15Failing/build.gradle                |   16 -
 .../src/main/groovy/org/gradle/Ok.groovy           |    4 -
 .../src/test/groovy/org/gradle/BadTest.groovy      |    5 -
 .../groovyJdk15Passing/build.gradle                |   16 -
 .../src/main/groovy/org/gradle/Ok.groovy           |    4 -
 .../src/test/groovy/org/gradle/OkTest.groovy       |    5 -
 .../javaJdk14Failing/build.gradle                  |   16 -
 .../src/main/java/org/gradle/Ok.java               |    4 -
 .../src/test/java/org/gradle/BadTest.java          |    7 -
 .../javaJdk15Failing/build.gradle                  |   17 -
 .../src/main/java/org/gradle/Ok.java               |    4 -
 .../src/test/java/org/gradle/BadTest.java          |    5 -
 .../src/test/java/org/gradle/BrokenAfterSuite.java |   26 -
 .../org/gradle/TestWithBrokenMethodDependency.java |   30 -
 .../test/java/org/gradle/TestWithBrokenSetup.java  |   31 -
 .../tasks/testing/DefaultJUnitXmlReport.java       |    2 -
 .../tasks/testing/DefaultTestTaskReports.java      |    7 +-
 .../api/internal/tasks/testing/TestFramework.java  |    2 +-
 .../detection/AbstractTestFrameworkDetector.java   |    9 +-
 .../testing/detection/DefaultTestExecuter.java     |   14 +-
 .../testing/junit/JUnitTestClassExecuter.java      |   10 +
 .../testing/junit/JUnitTestClassProcessor.java     |    4 +-
 .../tasks/testing/junit/JUnitTestFramework.java    |   26 +-
 .../testing/junit/report/ClassPageRenderer.java    |    2 +-
 .../testing/junit/report/ClassTestResults.java     |    4 +-
 .../testing/junit/report/PackagePageRenderer.java  |    2 +-
 .../testing/junit/report/PackageTestResults.java   |    4 +-
 .../tasks/testing/junit/report/PageRenderer.java   |   14 +-
 .../tasks/testing/junit/report/TestResult.java     |    2 +-
 .../result/Binary2JUnitXmlReportGenerator.java     |   14 +-
 .../junit/result/TestReportDataCollector.java      |    2 +-
 .../testng/TestNGListenerAdapterFactory.java       |   72 +-
 .../internal/tasks/testing/testng/TestNGSpec.java  |   19 -
 .../testing/testng/TestNGTestClassProcessor.java   |   20 +-
 .../tasks/testing/testng/TestNGTestFramework.java  |   12 +-
 .../gradle/api/tasks/testing/JUnitXmlReport.java   |    2 +
 .../java/org/gradle/api/tasks/testing/Test.java    |  153 +-
 .../gradle/api/tasks/testing/TestTaskReports.java  |    3 +
 .../api/tasks/testing/testng/TestNGOptions.java    |   90 +-
 .../gradle/jvm/plugins/JvmTestSuiteBasePlugin.java |   10 +-
 .../detection/DefaultTestClassScannerTest.groovy   |  113 +-
 .../detection/DefaultTestExecuterTest.groovy       |   10 +-
 .../junit/JUnitTestClassProcessorTest.groovy       |    2 +-
 .../Binary2JUnitXmlReportGeneratorSpec.groovy      |    2 +-
 .../result/TestReportDataCollectorSpec.groovy      |    2 +-
 .../testng/TestNGListenerAdapterFactorySpec.groovy |   15 +
 .../testng/TestNGTestClassProcessorTest.groovy     |    4 +-
 .../testing/testng/TestNGTestFrameworkTest.groovy  |   22 +-
 subprojects/testing-jvm/testing-jvm.gradle         |    5 +-
 .../CUnitComponentReportIntegrationTest.groovy     |    2 +-
 .../test/cunit/CUnitIntegrationTest.groovy         |    4 +-
 .../googletest/GoogleTestIntegrationTest.groovy    |    5 +-
 ...tingNativeComponentReportIntegrationTest.groovy |    2 +-
 .../test/cunit/plugins/CUnitPlugin.java            |    2 +-
 .../test/internal/NativeTestSuites.java            |    4 +-
 .../test/plugins/NativeBinariesTestPlugin.java     |    2 +-
 .../test/tasks/RunTestExecutable.java              |    2 +-
 .../test/cunit/tasks/gradle_cunit_register.h       |    2 +-
 .../nativeplatform/test/cunit/CUnitTest.groovy     |    6 +-
 .../test/googletest/GoogleTestTest.groovy          |    6 +-
 .../DefaultNativeTestSuiteBinarySpecTest.groovy    |   12 +-
 .../provider/runner/BuildModelActionRunner.java    |   10 +-
 .../runner/ClientForwardingTaskListener.java       |    2 +-
 .../runner/CompositeBuildModelActionRunner.java    |  213 ---
 .../provider/runner/DefaultBuildController.java    |    2 +-
 .../ProgressListenerToProgressLoggerAdapter.java   |    4 +-
 .../provider/runner/ToolingBuilderServices.java    |    7 +-
 .../runner/DefaultBuildControllerTest.groovy       |    2 +-
 ...gressListenerToProgressLoggerAdapterTest.groovy |    4 +-
 .../tooling-api-builders.gradle                    |    1 +
 subprojects/tooling-api/buildship.gradle           |    6 +-
 .../tooling/AutoTestedSamplesToolingApiTest.groovy |    1 -
 .../ConcurrentToolingApiIntegrationSpec.groovy     |    2 +-
 .../SamplesCompositeBuildIntegrationTest.groovy    |   72 -
 .../SamplesToolingApiIntegrationTest.groovy        |   34 +-
 .../ToolingApiClasspathIntegrationTest.groovy      |    2 +-
 .../tooling/ToolingApiIntegrationTest.groovy       |   22 +-
 .../tooling/ToolingApiRemoteIntegrationTest.groovy |    7 +-
 ...ngApiUnsupportedBuildJvmCrossVersionSpec.groovy |  109 ++
 ...gApiUnsupportedClientJvmCrossVersionSpec.groovy |  101 ++
 ...ingApiUnsupportedVersionCrossVersionSpec.groovy |  161 +++
 ...lingApiUnsupportedVersionIntegrationTest.groovy |    4 +-
 .../m5/ToolingApiIdeaModelCrossVersionSpec.groovy  |   13 +-
 ...ReceivingStandardStreamsCrossVersionSpec.groovy |    2 -
 .../BuildEnvironmentModelCrossVersionSpec.groovy   |   20 +-
 .../m8/ToolingApiLoggingCrossVersionSpec.groovy    |    3 +-
 .../m9/DaemonErrorFeedbackCrossVersionSpec.groovy  |    2 -
 ...adlePropertiesToolingApiCrossVersionSpec.groovy |    2 -
 .../M9JavaConfigurabilityCrossVersionSpec.groovy   |    8 +-
 ...singCommandLineArgumentsCrossVersionSpec.groovy |   27 -
 .../r112/BuildInvocationsCrossVersionSpec.groovy   |   34 +-
 .../r112/PublicationsCrossVersionSpec.groovy       |    4 +-
 .../r112/TaskDisplayNameCrossVersionSpec.groovy    |    2 -
 ...ingApiUnsupportedVersionCrossVersionSpec.groovy |  121 --
 .../r112/UserHomeDirCrossVersionSpec.groovy        |    2 -
 .../DependencyMetaDataCrossVersionSpec.groovy      |    4 +-
 .../r12rc1/BuildModelCrossVersionSpec.groovy       |    2 -
 .../ProjectOutcomesModuleCrossVersionSpec.groovy   |    4 -
 ...pportedOperationFeedbackCrossVersionSpec.groovy |   37 -
 ...ApiInitScriptCrossVersionIntegrationTest.groovy |    4 +-
 ...ApiConfigurationOnDemandCrossVersionSpec.groovy |    4 -
 .../gradle/integtests/tooling/r16/CustomModel.java |    6 +-
 .../r16/CustomToolingModelCrossVersionSpec.groovy  |    4 +-
 ...knownCustomModelFeedbackCrossVersionSpec.groovy |    2 +-
 .../integtests/tooling/r18/BrokenAction.java       |    2 +-
 .../tooling/r18/BuildActionCrossVersionSpec.groovy |   33 +-
 .../r18/BuildScriptModelCrossVersionSpec.groovy    |    6 +-
 .../integtests/tooling/r18/CounterAction.java      |    6 +-
 .../r18/GradleBuildModelCrossVersionSpec.groovy    |    4 +-
 .../r18/ProjectLevelModelCrossVersionSpec.groovy   |    2 -
 .../integtests/tooling/r20/BrokenAction.java       |   26 -
 .../r20/GradleProjectModelCrossVersionSpec.groovy  |    6 +-
 ...ngApiUnsupportedBuildJvmCrossVersionSpec.groovy |   86 --
 ...gApiUnsupportedClientJvmCrossVersionSpec.groovy |  109 --
 .../r21/PreCancellationCrossVersionSpec.groovy     |    2 +-
 .../r21/TaskVisibilityCrossVersionSpec.groovy      |    2 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |    2 +-
 .../ToolingApiIdeaModelCrossVersionSpec.groovy     |   12 +-
 ...oolingModelSerializationCrossVersionSpec.groovy |   64 -
 ...raryModelsCompositeBuildCrossVersionSpec.groovy |  247 ----
 ...entPassingCompositeBuildCrossVersionSpec.groovy |  222 ---
 .../r213/BuildActionCrossVersionSpec.groovy        |   38 +
 ...ncellationCompositeBuildCrossVersionSpec.groovy |  185 ---
 ...oordinatorCompositeBuildCrossVersionSpec.groovy |   53 -
 ...ecuteBuildCompositeBuildCrossVersionSpec.groovy |  377 -----
 ...delBuilderCompositeBuildCrossVersionSpec.groovy |   51 -
 .../r213/FetchProjectModelsBuildAction.java        |   41 +
 ...erogeneousCompositeBuildCrossVersionSpec.groovy |  165 ---
 ...odelResultCompositeBuildCrossVersionSpec.groovy |  232 ---
 ...ithGradleBuildIdentifierCrossVersionSpec.groovy |   96 --
 .../ModelsWithGradleProjectCrossVersionSpec.groovy |   92 +-
 ...hGradleProjectIdentifierCrossVersionSpec.groovy |  112 +-
 ...ltiProjectCompositeBuildCrossVersionSpec.groovy |  170 ---
 ...ssListenerCompositeBuildCrossVersionSpec.groovy |  203 ---
 ...gleProjectCompositeBuildCrossVersionSpec.groovy |  138 --
 .../SmokeCompositeBuildCrossVersionSpec.groovy     |  118 --
 ...dardStreamCompositeBuildCrossVersionSpec.groovy |  194 ---
 ...lNaturesAndBuildCommandsCrossVersionSpec.groovy |   75 +
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |   77 +
 ...elWtpClasspathAttributesCrossVersionSpec.groovy |  285 ++++
 ...lipseProjectDependenciesCrossVersionSpec.groovy |   67 +
 ...iIdeaProjectDependenciesCrossVersionSpec.groovy |   66 +
 .../tooling/r22/BuildActionCrossVersionSpec.groovy |   43 +-
 .../r22/CancellationCrossVersionSpec.groovy        |    2 +-
 .../r22/ClientShutdownCrossVersionSpec.groovy      |    2 -
 .../r23/StandardStreamsCrossVersionSpec.groovy     |    2 +-
 .../r24/BuildInvocationsCrossVersionSpec.groovy    |    3 +-
 .../DaemonUsageSuggestionCrossVersionTest.groovy   |   41 -
 ...TestProgressDaemonErrorsCrossVersionSpec.groovy |   12 +-
 .../r25/BuildProgressCrossVersionSpec.groovy       |    2 +-
 ...usUnsupportedJavaVersionCrossVersionSpec.groovy |   54 -
 ...pportedToolingApiVersionCrossVersionSpec.groovy |    4 +-
 ...entHandleContinuousBuildCrossVersionSpec.groovy |    3 -
 .../gradle/integtests/tooling/r25/NullAction.java  |   26 -
 .../tooling/r25/ProgressCrossVersionSpec.groovy    |    1 +
 .../r25/TaskProgressCrossVersionSpec.groovy        |    2 +-
 .../r25/TestProgressCrossVersionSpec.groovy        |    2 +-
 ...TestProgressDaemonErrorsCrossVersionSpec.groovy |   13 +-
 .../r26/TestLauncherCrossVersionSpec.groovy        |   12 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |    5 +-
 .../r30/ComplexCustomModelBuildingAction.java      |   42 +
 .../tooling/r30/CustomModelBuildingAction.java     |   31 +
 .../r30/CustomToolingModelCrossVersionSpec.groovy  |  111 ++
 ...ModelClasspathAttributesCrossVersionSpec.groovy |   81 ++
 ...spathContainerAccessRuleCrossVersionSpec.groovy |   81 ++
 ...eModelClasspathContainerCrossVersionSpec.groovy |  218 +++
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |   67 +
 ...mLibrarySourceAndJavadocCrossVersionSpec.groovy |   70 +
 ...odelDependencyAccessRuleCrossVersionSpec.groovy |  130 ++
 ...lipseModelOutputLocationCrossVersionSpec.groovy |  165 +++
 ...ourceDirectoryAccessRuleCrossVersionSpec.groovy |   90 ++
 ...oryExcludeIncludePatternCrossVersionSpec.groovy |  110 ++
 ...delSourceDirectoryOutputCrossVersionSpec.groovy |   85 ++
 ...olderClasspathAttributesCrossVersionSpec.groovy |  122 ++
 .../tooling/r31/BuildActionCrossVersionSpec.groovy |   34 +
 .../integtests/tooling/r31/FetchTaskAction.java    |   35 +
 .../integtests/tooling/r31/ReturnValueAction.java  |   34 +
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |   53 +
 .../r31/ToolingApiIdeaModelCrossVersionSpec.groovy |  114 ++
 .../java/org/gradle/tooling/GradleConnector.java   |   36 +-
 .../java/org/gradle/tooling/ProjectConnection.java |    2 +-
 .../tooling/connection/FailedModelResult.java      |   46 -
 .../tooling/connection/GradleConnection.java       |  133 --
 .../connection/GradleConnectionBuilder.java        |  108 --
 .../org/gradle/tooling/connection/ModelResult.java |   47 -
 .../gradle/tooling/connection/ModelResults.java    |   27 -
 .../gradle/tooling/connection/package-info.java    |   20 -
 .../tooling/internal/adapter/CollectionMapper.java |   11 +-
 .../internal/adapter/CompatibleIntrospector.java   |   76 -
 .../tooling/internal/adapter/MethodInvocation.java |   18 +-
 .../tooling/internal/adapter/MethodInvoker.java    |    2 +-
 .../internal/adapter/NoOpMethodInvoker.java        |   24 -
 .../internal/adapter/ObjectGraphAdapter.java       |   26 +
 .../internal/adapter/ProtocolToModelAdapter.java   |  588 +++++---
 .../internal/adapter/SourceObjectMapping.java      |   28 -
 .../tooling/internal/adapter/TypeInspector.java    |  107 ++
 .../tooling/internal/adapter/ViewBuilder.java      |   49 +
 .../connection/CompositeBuildLauncher.java         |   25 -
 .../connection/DefaultBuildIdentifier.java         |    2 +-
 .../connection/DefaultCompositeModelBuilder.java   |  116 --
 .../connection/DefaultFailedModelResult.java       |   65 -
 .../connection/DefaultGradleConnection.java        |   68 -
 .../connection/DefaultGradleConnectionBuilder.java |  156 --
 .../internal/connection/DefaultModelResult.java    |   43 -
 .../connection/GradleConnectionBuildLauncher.java  |   84 --
 .../GradleConnectionBuilderInternal.java           |   28 -
 .../connection/GradleConnectionFactory.java        |   62 -
 .../internal/connection/ParticipantConnector.java  |   98 --
 .../ToolingClientCompositeBuildLauncher.java       |   61 -
 .../ToolingClientCompositeModelBuilder.java        |  263 ----
 .../connection/ToolingClientCompositeUtil.java     |   38 -
 .../ToolingClientConsumerConnection.java           |   65 -
 .../consumer/AbstractConnectionParameters.java     |  110 --
 .../internal/consumer/BlockingResultHandler.java   |    2 +-
 .../consumer/CompositeConnectionParameters.java    |   24 -
 .../internal/consumer/ConnectionFactory.java       |    8 +-
 .../internal/consumer/ConnectionParameters.java    |    7 +
 .../internal/consumer/ConnectorServices.java       |   34 +-
 .../DefaultCompositeConnectionParameters.java      |   71 -
 .../consumer/DefaultConnectionParameters.java      |  108 +-
 .../internal/consumer/DefaultGradleConnector.java  |    2 +-
 .../internal/consumer/DefaultModelBuilder.java     |    2 +-
 .../consumer/DefaultProjectConnection.java         |   12 +-
 .../tooling/internal/consumer/Distribution.java    |    2 +-
 .../internal/consumer/DistributionFactory.java     |   23 +-
 .../tooling/internal/consumer/LoggingProvider.java |    2 +-
 .../consumer/ProjectConnectionBuildLauncher.java   |    2 +-
 .../consumer/ProjectConnectionParameters.java      |   27 -
 .../internal/consumer/SynchronizedLogging.java     |    6 +-
 .../connection/AbstractConsumerConnection.java     |    7 +-
 .../AbstractPost12ConsumerConnection.java          |    4 +-
 .../connection/ActionAwareConsumerConnection.java  |   18 +-
 .../BuildActionRunnerBackedConsumerConnection.java |    6 +-
 .../connection/BuildControllerAdapter.java         |   36 +-
 .../connection/CancellableConsumerConnection.java  |   18 +-
 ...CancellableModelBuilderBackedModelProducer.java |    4 +-
 .../consumer/connection/ConsumerConnection.java    |    3 -
 .../connection/GradleBuildAdapterProducer.java     |    6 +-
 .../connection/HasCompatibilityMapperAction.java   |   57 -
 .../connection/HasCompatibilityMapping.java        |   57 +
 .../connection/InternalBuildActionAdapter.java     |   11 +-
 ...InternalConnectionBackedConsumerConnection.java |  150 --
 .../ModelBuilderBackedModelProducer.java           |    4 +-
 .../consumer/connection/MultiModelProducer.java    |   24 -
 .../connection/NoToolingApiConnection.java         |    7 +-
 .../NonCancellableConsumerConnectionAdapter.java   |    5 -
 ...sspathInjectionSupportedCheckModelProducer.java |    2 +-
 .../ProgressLoggingConsumerActionExecutor.java     |   10 +-
 .../UnsupportedOlderVersionConnection.java         |   23 +-
 .../BasicGradleProjectIdentifierMixin.java         |   13 +-
 .../CompatibilityIdeaProjectMapping.java           |   46 -
 .../converters/CompositeMappingAction.java         |   63 -
 .../converters/ConsumerTargetTypeProvider.java     |    2 +-
 .../converters/FixedBuildIdentifierProvider.java   |   29 +-
 .../converters/GradleProjectIdentifierMapping.java |   37 -
 .../converters/GradleProjectIdentifierMixin.java   |   13 +-
 .../GradleTaskDisplayNameMixInHandler.java         |   31 -
 .../converters/IdeaModelCompatibilityMapping.java  |   54 +
 .../IdeaModuleDependencyTargetNameMixin.java       |   36 +
 .../converters/IdeaProjectCompatibilityMapper.java |   48 -
 .../IdeaProjectJavaLanguageSettingsMixin.java      |   46 +
 .../TaskDisplayNameCompatibilityMapping.java       |   37 +
 .../consumer/converters/TaskDisplayNameMixin.java  |   31 +
 .../converters/TaskPropertyHandlerFactory.java     |   44 -
 .../loader/CachingToolingImplementationLoader.java |    2 +-
 .../loader/DefaultToolingImplementationLoader.java |   39 +-
 .../SynchronizedToolingImplementationLoader.java   |    4 +-
 .../loader/ToolingImplementationLoader.java        |    2 +-
 .../parameters/ConsumerOperationParameters.java    |   21 +-
 .../internal/consumer/versioning/ModelMapping.java |    2 +-
 .../internal/gradle/ConsumerProvidedTask.java      |    2 +-
 .../internal/protocol/BuildActionRunner.java       |    2 +-
 .../internal/protocol/ConnectionVersion4.java      |    9 +-
 .../internal/protocol/InternalConnection.java      |    6 +-
 .../java/org/gradle/tooling/model/BuildModel.java  |   32 +
 .../org/gradle/tooling/model/GradleProject.java    |    2 +-
 .../java/org/gradle/tooling/model/Launchable.java  |    2 +-
 .../org/gradle/tooling/model/ProjectModel.java     |   32 +
 .../main/java/org/gradle/tooling/model/Task.java   |   11 -
 .../tooling/model/build/BuildEnvironment.java      |    5 +-
 .../gradle/tooling/model/eclipse/AccessRule.java   |   49 +
 .../tooling/model/eclipse/ClasspathAttribute.java  |   45 +
 .../model/eclipse/EclipseClasspathContainer.java   |   42 +
 .../model/eclipse/EclipseClasspathEntry.java       |   47 +
 .../model/eclipse/EclipseExternalDependency.java   |   29 +
 .../model/eclipse/EclipseOutputLocation.java       |   35 +
 .../tooling/model/eclipse/EclipseProject.java      |   22 +-
 .../model/eclipse/EclipseProjectDependency.java    |    5 +-
 .../model/eclipse/EclipseSourceDirectory.java      |   52 +-
 .../tooling/model/gradle/BasicGradleProject.java   |    3 +-
 .../tooling/model/gradle/BuildInvocations.java     |    2 +-
 .../gradle/tooling/model/gradle/GradleBuild.java   |    3 +-
 .../tooling/model/gradle/ProjectPublications.java  |    3 +-
 .../tooling/model/idea/IdeaModuleDependency.java   |   12 +-
 .../tooling/model/idea/IdeaModuleIdentifier.java   |   27 +
 .../gradle/tooling/model/internal/Exceptions.java  |    6 -
 .../ProjectSensitiveToolingModelBuilder.java       |   41 -
 .../tooling/fixture/GradleVersionSpecTest.groovy   |   25 +-
 .../adapter/CompatibleIntrospectorTest.groovy      |   79 --
 .../adapter/ProtocolToModelAdapterTest.groovy      |  410 ++++--
 .../internal/adapter/TypeInspectorTest.groovy      |   43 +
 .../internal/adapter/TypeInspectorTestHelper.java  |   64 +
 .../DefaultCompositeModelBuilderTest.groovy        |   41 -
 .../DefaultGradleConnectionBuilderTest.groovy      |  119 --
 .../connection/DefaultGradleConnectionTest.groovy  |   50 -
 .../GradleConnectionBuildLauncherTest.groovy       |   37 -
 .../internal/consumer/ConnectorServicesTest.groovy |    5 -
 .../consumer/DefaultBuildLauncherTest.groovy       |    9 +-
 .../consumer/DefaultModelBuilderTest.groovy        |    2 +-
 .../consumer/DefaultProjectConnectionTest.groovy   |    2 +-
 .../consumer/DistributionFactoryTest.groovy        |    8 +-
 ...ActionRunnerBackedConsumerConnectionTest.groovy |   16 +-
 .../connection/BuildControllerAdapterTest.groovy   |   12 +-
 .../CancellableConsumerConnectionTest.groovy       |   11 +-
 ...lableModelBuilderBackedModelProducerTest.groovy |   19 +-
 .../GradleBuildAdapterProducerTest.groovy          |   21 +-
 ...alConnectionBackedConsumerConnectionTest.groovy |  163 ---
 .../LazyConsumerActionExecutorTest.groovy          |    2 +-
 ...ModelBuilderBackedConsumerConnectionTest.groovy |   10 +-
 .../ModelBuilderBackedModelProducerTest.groovy     |   14 +-
 ...CancellableConsumerConnectionAdapterTest.groovy |    4 +-
 ...rogressLoggingConsumerActionExecutorTest.groovy |    4 +-
 .../UnsupportedOlderVersionConnectionTest.groovy   |    4 +-
 .../CachingToolingImplementationLoaderTest.groovy  |    2 +-
 .../DefaultToolingImplementationLoaderTest.groovy  |   38 +-
 ...chronizedToolingImplementationLoaderTest.groovy |    4 +-
 .../ConsumerOperationParametersTest.groovy         |    6 +-
 .../fixture/AbstractToolingApiSpecification.groovy |    5 +-
 .../CompositeToolingApiSpecification.groovy        |  182 ---
 .../ContinuousBuildToolingApiSpecification.groovy  |   10 +-
 .../fixture/ExternalToolingApiDistribution.groovy  |    9 +-
 .../tooling/fixture/GradleVersionSpec.java         |   12 +-
 .../tooling/fixture/IgnoreIntegratedComposite.java |   28 +
 .../fixture/RequiresIntegratedComposite.java       |   28 +
 .../integtests/tooling/fixture/ToolingApi.groovy   |   25 +-
 .../fixture/ToolingApiClasspathProvider.groovy     |   56 +-
 .../ToolingApiCompatibilitySuiteRunner.groovy      |  109 +-
 .../fixture/ToolingApiDistributionResolver.groovy  |    9 +-
 .../tooling/fixture/ToolingApiExecution.groovy     |  112 ++
 .../tooling/fixture/ToolingApiSpecification.groovy |    6 +-
 .../tooling/fixture/ToolingApiVersion.java         |    2 +-
 .../tooling/fixture/ToolingApiVersions.java        |   10 +-
 subprojects/tooling-api/tooling-api.gradle         |   65 +-
 .../ExtraTestCommandLineOptionsListener.java       |    2 +-
 ...ExtraTestCommandLineOptionsListenerWrapper.java |    2 +-
 .../gradle/foundation/CommandLineAssistant.java    |    2 +-
 .../ipc/basic/ProcessLauncherServer.java           |    5 +-
 .../ipc/gradle/AbstractGradleServerProtocol.java   |    2 +-
 .../gradle/ExecuteGradleCommandServerProtocol.java |    2 +-
 .../ipc/gradle/TaskListServerProtocol.java         |    2 +-
 .../gradleplugin/foundation/GradlePluginLord.java  |    2 +-
 .../foundation/request/ExecutionRequest.java       |    2 +-
 .../foundation/request/RefreshTaskListRequest.java |    2 +-
 .../gradleplugin/foundation/request/Request.java   |    2 +-
 .../userinterface/swing/generic/OutputPanel.java   |    2 +-
 .../userinterface/swing/generic/tabs/SetupTab.java |    4 +-
 .../gradle/foundation/CommandLineParsingTest.java  |    2 +-
 subprojects/ui/ui.gradle                           |    5 +
 .../AbstractWrapperIntegrationSpec.groovy          |   49 +
 .../NonInteractiveLaunchIntegrationTest.groovy     |   46 +
 .../WrapperChecksumVerificationTest.groovy         |   35 +-
 .../WrapperConcurrentDownloadTest.groovy           |   20 +-
 .../WrapperCrossVersionIntegrationTest.groovy      |   94 +-
 .../WrapperGenerationIntegrationTest.groovy        |   19 +
 .../integtests/WrapperHttpIntegrationTest.groovy   |   24 +-
 .../WrapperLoggingIntegrationTest.groovy           |   31 +-
 .../WrapperProjectIntegrationTest.groovy           |   23 +-
 .../org/gradle/integtests/WrapperSetup.groovy      |   28 -
 .../WrapperSupportedBuildJvmIntegrationTest.groovy |   52 +
 .../WrapperUserHomeIntegrationTest.groovy          |   46 +-
 .../org/gradle/wrapper/BootstrapMainStarter.java   |    4 +
 .../gradle/wrapper/ExclusiveFileAccessManager.java |    6 +-
 .../java/org/gradle/wrapper/GradleWrapperMain.java |    8 +-
 .../java/org/gradle/wrapper/PathAssembler.java     |    6 +-
 .../java/org/gradle/wrapper/WrapperExecutor.java   |   35 +-
 .../wrapper/ExclusiveFileAccessManagerTest.groovy  |   39 +
 .../groovy/org/gradle/wrapper/InstallTest.groovy   |   12 +-
 .../wrapper/SystemPropertiesHandlerTest.groovy     |   20 +-
 .../org/gradle/wrapper/WrapperExecutorTest.groovy  |   52 +-
 subprojects/wrapper/wrapper.gradle                 |    4 +
 version.txt                                        |    2 +-
 7113 files changed, 238795 insertions(+), 174669 deletions(-)
 create mode 100644 buildSrc/src/main/groovy/org/gradle/ShadedJar.java
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/build/JarJar.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/build/JarJarJar.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/build/docs/UserGuideSectionVerifier.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/cleanup/EmptyDirectoryCheck.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/modules/ClasspathManifestPatcher.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/modules/ExcludeEntryPatcher.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/DependencyGenerator.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/DependencyGraph.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/MavenJarCreator.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/MavenModule.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/MavenPom.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/MavenRepository.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/MavenScope.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/RepositoryBuilder.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/TestProject.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/tasks/JvmProjectGeneratorTask.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/tasks/MonolithicNativeProjectGeneratorTask.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/tasks/NativeProjectGeneratorTask.groovy
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/tasks/ProjectGeneratorTask.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/DistributedPerformanceTest.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/DistributionTest.java
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/IntegrationTest.java
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/PerformanceTest.java
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/ScenarioReportRenderer.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/SmokeTest.java
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/SoakTest.java
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/DependencyGenerator.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/DependencyGraph.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/MavenJarCreator.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/MavenModule.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/MavenPom.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/MavenRepository.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/MavenScope.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/RepositoryBuilder.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/TestProject.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/tasks/JvmProjectGeneratorTask.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/tasks/MonolithicNativeProjectGeneratorTask.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/tasks/NativeProjectGeneratorTask.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/tasks/ProjectGeneratorTask.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/testing/performance/generator/tasks/RemoteProject.groovy
 create mode 100644 buildSrc/src/main/resources/org/gradle/testing/scenario-report-style.css
 create mode 100644 buildSrc/src/test/groovy/org/gradle/build/docs/UserGuideSectionVerifierTest.groovy
 create mode 100644 buildSrc/src/test/groovy/org/gradle/cleanup/EmptyDirectoryCheckTest.groovy
 delete mode 100644 buildSrc/src/test/groovy/org/gradle/performance/generator/DependencyGeneratorTest.groovy
 create mode 100644 buildSrc/src/test/groovy/org/gradle/testing/ScenarioReportRendererTest.groovy
 create mode 100644 buildSrc/src/test/groovy/org/gradle/testing/performance/generator/DependencyGeneratorTest.groovy
 create mode 100644 buildSrc/src/test/resources/org/gradle/testing/TEST-sample.xml
 create mode 100644 buildSrc/src/test/resources/org/gradle/testing/sample-build-result-failure.xml
 create mode 100644 buildSrc/src/test/resources/org/gradle/testing/sample-build-result-success.xml
 rename debian/{ => additionalSrc}/javascript/jquery.tipTip.js (100%)
 create mode 100644 debian/additionalSrc/resources/all-released-versions.json
 create mode 100644 debian/gradle-doc.doc-base.gradle-dsl
 delete mode 100644 debian/gradle-doc.doc-base.gradle-groovydoc
 create mode 100644 debian/gradle-doc.doc-base.gradle-userguide
 create mode 100644 debian/gradle-doc.javadoc
 create mode 100644 debian/gradle-doc.lintian-overrides
 create mode 100644 debian/patches/Groovy_projects_depends_on_localGroovy.patch
 create mode 100644 debian/patches/dependency-management_depends_on_testkit.patch
 create mode 100644 debian/patches/disable_Kotlin.patch
 create mode 100644 debian/patches/disable_buildSrc_tests.patch
 delete mode 100644 debian/patches/disable_sonar.diff
 delete mode 100644 debian/patches/disable_tests.diff
 create mode 100644 debian/patches/drop_http-builder.patch
 create mode 100644 debian/patches/drop_jmh-gradle-plugin.patch
 create mode 100644 debian/patches/new_APIs_in_3.0.patch
 delete mode 100644 gradle/buildReceiptInit.gradle
 create mode 100644 gradle/buildScanInit.gradle
 create mode 100644 gradle/buildTagging.gradle
 create mode 100644 gradle/distributionTesting.gradle
 create mode 100644 gradle/jmh.gradle
 create mode 100644 gradle/performanceTest.gradle
 create mode 100644 gradle/taskProperties.gradle
 delete mode 100644 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/AnnouncePlugin.groovy
 delete mode 100644 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/AnnouncePluginExtension.groovy
 delete mode 100644 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/BuildAnnouncementsPlugin.groovy
 delete mode 100644 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/AnnouncerFactory.groovy
 delete mode 100644 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/AnnouncingBuildListener.groovy
 delete mode 100755 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/DefaultAnnouncerFactory.groovy
 delete mode 100644 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/DefaultIconProvider.groovy
 delete mode 100644 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/Growl.groovy
 delete mode 100644 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/GrowlNotifyBackedAnnouncer.groovy
 delete mode 100644 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/IgnoreUnavailableAnnouncer.groovy
 delete mode 100644 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/NotifySend.groovy
 delete mode 100755 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/Snarl.groovy
 delete mode 100644 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/Twitter.groovy
 delete mode 100644 subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/jdk6/AppleScriptBackedGrowlAnnouncer.groovy
 create mode 100644 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/AnnouncePlugin.java
 create mode 100644 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/AnnouncePluginExtension.java
 rename subprojects/announce/src/main/{groovy => java}/org/gradle/api/plugins/announce/Announcer.java (100%)
 create mode 100644 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/BuildAnnouncementsPlugin.java
 create mode 100644 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/internal/AnnouncerFactory.java
 rename subprojects/announce/src/main/{groovy => java}/org/gradle/api/plugins/announce/internal/AnnouncerUnavailableException.java (100%)
 create mode 100644 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/internal/AnnouncingBuildListener.java
 create mode 100755 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/internal/DefaultAnnouncerFactory.java
 create mode 100644 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/internal/DefaultIconProvider.java
 create mode 100644 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/internal/Growl.java
 create mode 100644 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/internal/GrowlNotifyBackedAnnouncer.java
 rename subprojects/announce/src/main/{groovy => java}/org/gradle/api/plugins/announce/internal/IconProvider.java (100%)
 create mode 100644 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/internal/IgnoreUnavailableAnnouncer.java
 create mode 100644 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/internal/NotifySend.java
 create mode 100755 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/internal/Snarl.java
 create mode 100644 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/internal/Twitter.java
 create mode 100644 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/internal/UnknownAnnouncer.java
 create mode 100644 subprojects/announce/src/main/java/org/gradle/api/plugins/announce/internal/jdk6/AppleScriptBackedGrowlAnnouncer.java
 rename subprojects/announce/src/main/{groovy => java}/org/gradle/api/plugins/announce/package-info.java (100%)
 delete mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/AntlrPlugin.java
 delete mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/AntlrSourceVirtualDirectory.java
 delete mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/AntlrTask.java
 delete mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/AntlrSourceVirtualDirectoryImpl.java
 delete mode 100644 subprojects/antlr/src/main/groovy/org/gradle/api/plugins/antlr/internal/AntlrWorkerManager.java
 create mode 100644 subprojects/antlr/src/main/java/org/gradle/api/plugins/antlr/AntlrPlugin.java
 create mode 100644 subprojects/antlr/src/main/java/org/gradle/api/plugins/antlr/AntlrSourceVirtualDirectory.java
 create mode 100644 subprojects/antlr/src/main/java/org/gradle/api/plugins/antlr/AntlrTask.java
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/internal/AntlrExecuter.java (100%)
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/internal/AntlrResult.java (100%)
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/internal/AntlrSourceGenerationException.java (100%)
 create mode 100644 subprojects/antlr/src/main/java/org/gradle/api/plugins/antlr/internal/AntlrSourceVirtualDirectoryImpl.java
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/internal/AntlrSpec.java (100%)
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/internal/AntlrSpecFactory.java (100%)
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/internal/AntlrWorker.java (100%)
 create mode 100644 subprojects/antlr/src/main/java/org/gradle/api/plugins/antlr/internal/AntlrWorkerManager.java
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/internal/antlr2/GenerationPlan.java (100%)
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/internal/antlr2/GenerationPlanBuilder.java (100%)
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/internal/antlr2/GrammarDelegate.java (100%)
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/internal/antlr2/GrammarFileMetadata.java (100%)
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/internal/antlr2/GrammarMetadata.java (100%)
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/internal/antlr2/MetadataExtracter.java (100%)
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/internal/antlr2/XRef.java (100%)
 rename subprojects/antlr/src/main/{groovy => java}/org/gradle/api/plugins/antlr/package-info.java (100%)
 delete mode 100644 subprojects/base-services-groovy/src/main/groovy/org/gradle/api/internal/ClosureBackedAction.java
 delete mode 100644 subprojects/base-services-groovy/src/main/groovy/org/gradle/api/specs/AndSpec.java
 delete mode 100644 subprojects/base-services-groovy/src/main/groovy/org/gradle/api/specs/Specs.java
 delete mode 100644 subprojects/base-services-groovy/src/main/groovy/org/gradle/groovy/scripts/internal/AstUtils.java
 rename subprojects/base-services-groovy/src/main/{groovy => java}/org/gradle/api/InvalidActionClosureException.java (100%)
 create mode 100644 subprojects/base-services-groovy/src/main/java/org/gradle/api/internal/ClosureBackedAction.java
 create mode 100644 subprojects/base-services-groovy/src/main/java/org/gradle/api/specs/AndSpec.java
 create mode 100644 subprojects/base-services-groovy/src/main/java/org/gradle/api/specs/Specs.java
 rename subprojects/base-services-groovy/src/main/{groovy => java}/org/gradle/api/specs/internal/ClosureSpec.java (100%)
 rename subprojects/base-services-groovy/src/main/{groovy => java}/org/gradle/groovy/scripts/Transformer.java (100%)
 rename subprojects/base-services-groovy/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/AbstractScriptTransformer.java (100%)
 create mode 100644 subprojects/base-services-groovy/src/main/java/org/gradle/groovy/scripts/internal/AstUtils.java
 rename subprojects/base-services-groovy/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/ExpressionReplacingVisitorSupport.java (100%)
 rename subprojects/base-services-groovy/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/RestrictiveCodeVisitor.java (100%)
 rename subprojects/base-services-groovy/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/ScriptBlock.java (100%)
 rename subprojects/base-services-groovy/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/StatementReplacingVisitorSupport.java (100%)
 rename subprojects/base-services-groovy/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/StatementTransformer.java (100%)
 create mode 100644 subprojects/base-services-groovy/src/main/java/org/gradle/internal/reflect/GroovyMethods.java
 rename subprojects/base-services-groovy/src/main/{groovy => java}/org/gradle/util/Configurable.java (100%)
 create mode 100644 subprojects/base-services/src/jmh/java/org/gradle/internal/reflect/CachedConstructorsBenchmark.java
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/api/internal/Factory.java
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/api/internal/project/ServiceRegistry.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/ClassLoaderHasher.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/ClassLoaderHierarchyHasher.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/ClassLoaderUtils.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/ClassPathSnapshot.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/ClassPathSnapshotter.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/ConfigurableClassLoaderHierarchyHasher.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/DefaultHashingClassLoaderFactory.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/HashingClassLoaderFactory.java
 delete mode 100755 subprojects/base-services/src/main/java/org/gradle/internal/classloader/MutableURLClassLoader.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/SystemClassLoaderSpec.java
 create mode 100755 subprojects/base-services/src/main/java/org/gradle/internal/classloader/VisitableURLClassLoader.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/io/LinePerThreadBufferingOutputStream.java
 delete 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/operations/BuildOperationWorkerRegistry.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/operations/DefaultBuildOperationWorkerRegistry.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/reflect/PropertyAccessorType.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/reflect/Types.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/service/CachingServiceLocator.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/service/DefaultServiceLocator.java
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/classloader/ConfigurableClassLoaderHierarchyHasherTest.groovy
 delete mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/classloader/MutableURLClassLoaderTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/classloader/TransformingClassLoaderTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/classloader/VisitableURLClassLoaderTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/io/LinePerThreadBufferingOutputStreamTest.groovy
 delete 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/DefaultBuildOperationWorkerRegistryTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/reflect/DirectInstantiatorCacheTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/reflect/PropertyAccessorTypeTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/reflect/TypesTest.groovy
 create mode 100644 subprojects/base-services/src/testFixtures/groovy/org/gradle/internal/classloader/ClassLoaderFactoryHelperExtension.java
 create mode 100644 subprojects/base-services/src/testFixtures/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
 delete mode 100644 subprojects/build-comparison/src/integTest/groovy/org/gradle/api/plugins/buildcomparison/gradle/Pre12CompareGradleBuildsCrossVersionSpec.groovy
 delete mode 100644 subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/CompareGradleBuildsPlugin.groovy
 create mode 100644 subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/CompareGradleBuildsPlugin.java
 delete mode 100644 subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetInferrer.java
 delete mode 100644 subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetInferrerTest.groovy
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/ConditionalTemplateOperation.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/ConditionalTemplateOperation.java
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/DefaultTemplateLibraryVersionProvider.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/DefaultTemplateLibraryVersionProvider.java
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/PomProjectInitDescriptor.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/PomProjectInitDescriptor.java
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/ProjectInitDescriptor.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/ProjectInitDescriptor.java
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/ProjectLayoutSetupRegistry.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/ProjectLayoutSetupRegistry.java
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/ProjectLayoutSetupRegistryFactory.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/ProjectLayoutSetupRegistryFactory.java
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/SimpleTemplateOperation.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/SimpleTemplateOperation.java
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/TemplateLibraryVersionProvider.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/TemplateLibraryVersionProvider.java
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/TemplateOperation.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/TemplateOperation.java
 delete 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/internal/action/WrapperPluginAutoApplyAction.java
 delete mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/tasks/InitBuild.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/tasks/InitBuild.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/tasks/package-info.java
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/api/tasks/wrapper/WrapperTest.groovy
 delete mode 100644 subprojects/build-init/src/test/groovy/org/gradle/api/tasks/wrapper/WrapperTest.java
 create mode 100644 subprojects/build-init/src/test/resources/org/gradle/buildinit/plugins/internal/SimpleTemplateOperationSpec-binding.template
 create mode 100644 subprojects/build-scan-performance/build-scan-performance.gradle
 create mode 100644 subprojects/build-scan-performance/src/performanceTest/groovy/org/gradle/performance/BuildScanPluginPerformanceTest.groovy
 copy subprojects/{performance => build-scan-performance}/src/templates/project-with-source/Production.groovy (100%)
 copy subprojects/{performance => build-scan-performance}/src/templates/project-with-source/Production.java (100%)
 copy subprojects/{performance => build-scan-performance}/src/templates/project-with-source/Production.scala (100%)
 copy subprojects/{performance => build-scan-performance}/src/templates/project-with-source/Test.groovy (100%)
 copy subprojects/{performance => build-scan-performance}/src/templates/project-with-source/Test.java (100%)
 copy subprojects/{performance => build-scan-performance}/src/templates/project-with-source/Test.scala (100%)
 create mode 100644 subprojects/build-scan-performance/src/templates/project-with-source/build.gradle
 copy subprojects/{performance => build-scan-performance}/src/templates/project-with-source/build.xml (100%)
 copy subprojects/{performance => build-scan-performance}/src/templates/project-with-source/pom.xml (100%)
 create mode 100644 subprojects/build-scan-performance/src/templates/with-verbose-junit/Test.java
 create mode 100644 subprojects/build-scan-performance/src/testFixtures/groovy/org/gradle/performance/fixture/BuildScanPerformanceTestRunner.groovy
 create mode 100644 subprojects/build-scan-performance/src/testFixtures/groovy/org/gradle/performance/results/BuildScanResultsStore.java
 create mode 100644 subprojects/build-scan-performance/templates.gradle
 create mode 100644 subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/CodeNarcPluginVersionIntegrationTest.groovy
 delete 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/PmdPluginSubtypeParamIntegrationTest.groovy
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstyleExtension.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstyleExtension.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcExtension.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcExtension.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeQualityExtension.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeQualityExtension.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugs.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugs.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugsExtension.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugsExtension.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugsPlugin.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugsPlugin.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JDepend.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JDepend.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JDependExtension.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JDependExtension.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JDependPlugin.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JDependPlugin.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Pmd.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Pmd.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/PmdExtension.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/PmdExtension.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/PmdPlugin.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/PmdPlugin.java
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/AbstractCodeQualityPlugin.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/AbstractCodeQualityPlugin.java
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/CheckstyleInvoker.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/CodeNarcInvoker.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/FindBugsReportsInternal.java
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/JDependInvoker.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/PmdInvoker.groovy
 delete mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsWorkerManager.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsWorkerManager.java
 create mode 100644 subprojects/composite-builds/composite-builds.gradle
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/AbstractCompositeBuildIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/CompositeBuildClassloadingIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/CompositeBuildCommandLineArgsIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/CompositeBuildDeclaredSubstitutionsIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/CompositeBuildDependencyArtifactsIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/CompositeBuildDependencyCycleIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/CompositeBuildDependencyGraphIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/CompositeBuildDetectionIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/CompositeBuildIdeaProjectIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/CompositeBuildInitScriptIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/CompositeBuildMinimalConfigurationIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/CompositeBuildPluginDevelopmentIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/CompositeBuildTaskDependencyIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/IncludedBuildValidationIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/integTest/groovy/org/gradle/integtests/composite/SamplesCompositeBuildIntegrationTest.groovy
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/CompositeBuildDependencySubstitutions.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/CompositeBuildServices.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/CompositeBuildTaskDelegate.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/CompositeProjectArtifactBuilder.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/CompositeProjectComponentArtifactMetadata.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/DefaultBuildableCompositeBuildContext.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/DefaultCompositeContextBuilder.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/DefaultIncludedBuild.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/DefaultIncludedBuildExecuter.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/DefaultIncludedBuildFactory.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/DefaultIncludedBuilds.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/IncludedBuildArtifactBuilder.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/IncludedBuildDependencyMetadataBuilder.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/IncludedBuildDependencySubstitutionsBuilder.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/IncludedBuildInternal.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/IncludedBuildTaskReference.java
 create mode 100644 subprojects/composite-builds/src/main/java/org/gradle/composite/internal/IncludedBuildTaskReferenceResolver.java
 create mode 100644 subprojects/composite-builds/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 delete mode 100644 subprojects/core/src/integTest/groovy/org/gradle/DeprecationHandlingIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/AntBuilderLoggingIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/BuildScriptClassPathIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/ExtraPropertiesIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/ParallelExecutionWarningIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/SettingsDslIntegrationSpec.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/dsl/DynamicMethodLookupIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/dsl/NestedConfigureDslIntegrationTest.groovy
 delete mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/internal/changedetection/state/DirectoryScanningIntegTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/internal/changedetection/state/TaskTypeUpToDateIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/internal/project/taskfactory/TaskPropertyNamingIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/AbstractPathSensitivityIntegrationSpec.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/AntArchiveIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/CachedPathSensitivityIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/CachedTaskExecutionIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/CopySpecIntegrationSpec.groovy
 delete mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/CopyTaskIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/UpToDatePathSensitivityIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/initialization/buildsrc/BuildScriptClasspathIntegrationSpec.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/internal/filewatch/AbstractFileWatcherTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/internal/filewatch/DefaultFileSystemChangeWaiterTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/internal/filewatch/DefaultFileWatcherFactoryTest.groovy
 rename subprojects/core/src/{test => integTest}/groovy/org/gradle/internal/filewatch/jdk7/WatchServiceFileWatcherBackingTest.groovy (100%)
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/process/internal/CrashingWorker.java
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/process/internal/MultiRequestWorkerProcessIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/process/internal/SingleRequestWorkerProcessIntegrationTest.groovy
 delete mode 100644 subprojects/core/src/integTest/groovy/org/gradle/process/internal/SingleUseWorkerProcessIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/process/internal/StatefulTestWorker.java
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/process/internal/TestProtocol.java
 delete mode 100644 subprojects/core/src/integTest/groovy/org/gradle/process/internal/TestWorkInterface.java
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/process/internal/TestWorkProcess.java
 create mode 100644 subprojects/core/src/integTest/resources/org/gradle/api/tasks/copyTestResources/src/accents.c
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/BuildExceptionReporter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/BuildLogger.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/BuildResult.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/BuildResultLogger.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/StartParameter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/TaskExecutionLogger.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/AntBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/DefaultTask.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/DomainObjectCollection.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/NamedDomainObjectCollection.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/Project.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/Task.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ArtifactRepositoryContainer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ComponentSelectionRules.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/Configuration.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ConfigurationContainer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ConflictResolution.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/DependencyArtifact.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/LenientConfiguration.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/Module.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ModuleDependency.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/component/LibraryComponentSelector.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/component/ProjectComponentIdentifier.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/component/ProjectComponentSelector.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/repositories/ArtifactRepository.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ArtifactResolutionResult.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ResolvedArtifactResult.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/UnresolvedArtifactResult.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/execution/TaskExecutionGraph.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/file/ContentFilterable.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/file/CopyProcessingSpec.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/file/CopySourceSpec.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/file/CopySpec.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/file/DeleteAction.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/file/RelativePath.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/initialization/Settings.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassGenerator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractDynamicObject.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractNamedDomainObjectContainer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractPolymorphicDomainObjectContainer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractTask.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/AsmBackedClassGenerator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/BeanDynamicObject.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/CompositeDomainObjectSet.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/CompositeDynamicObject.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/ConfigureDelegate.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/ConventionAwareHelper.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/DefaultClassPathProvider.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/DefaultDomainObjectCollection.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/DefaultNamedDomainObjectCollection.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/DefaultNamedDomainObjectSet.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/DelegatingDomainObjectSet.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/DependencyClassPathProvider.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/DependencyInjectingInstantiator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/DynamicObject.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/DynamicObjectAware.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/DynamicObjectHelper.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/DynamicObjectUtil.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/DynamicPropertyNamer.groovy
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/ExtensibleDynamicObject.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/GradleInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/NamedDomainObjectContainerConfigureDelegate.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/NoNamingPropertyException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/NullNamingPropertyException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/PolymorphicDomainObjectContainerConfigureDelegate.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/SettingsInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/TaskInternal.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/TaskOutputsInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/ThreadGlobalInstantiator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/TypedDomainObjectContainerWrapper.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/DefaultArtifactRepositoryContainer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/DefaultDependencySet.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/DefaultExcludeRuleContainer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/DefaultModule.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/ModuleInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/ProjectBackedModule.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/configurations/DependencyMetaDataProvider.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractModuleDependency.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultDependencyArtifact.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/DefaultRepositoryHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/DefaultDependencyHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/DependencyFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/ModuleFactoryDelegate.groovy
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/ProjectFinder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/AbstractPublishArtifact.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/cache/HeapProportionalCacheSizer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/TaskArtifactState.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/ChangesOnlyIncrementalTaskInputs.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/DefaultTaskArtifactStateRepository.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/IncrementalTaskInputsInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/NoHistoryArtifactState.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/RebuildIncrementalTaskInputs.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/ShortCircuitTaskArtifactStateRepository.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/StatefulIncrementalTaskInputs.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/AbstractFileSnapshotTaskStateChanges.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/ChangeType.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/DiscoveredInputsTaskStateChanges.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/FileChange.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/InputFilesTaskStateChanges.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/OutputFilesTaskStateChanges.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/TaskTypeTaskStateChanges.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/TaskUpToDateState.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/AbstractFileCollectionSnapshotter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/CacheBackedTaskHistoryRepository.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/CachingFileSnapshotter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/CachingTreeVisitor.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/DefaultFileCollectionSnapshotter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/DefaultFileSnapshotterSerializer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/DirSnapshot.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/FileCollectionSnapshot.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/FileCollectionSnapshotImpl.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/FileCollectionSnapshotter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/FileHashSnapshot.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/FileSnapshot.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/FilesSnapshotSet.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/InMemoryTaskArtifactCache.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/IncrementalFileSnapshot.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/MinimalFileSetSnapshotter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/MissingFileSnapshot.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/OutputFilesCollectionSnapshotter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/OutputFilesSnapshotSerializer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/TaskExecution.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/classloading/LeakyOnJava7GroovySystemLoader.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/coerce/MethodArgumentsTransformer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/coerce/PropertySetTransformer.java
 delete 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/component/ArtifactType.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/AbstractFileCollection.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/AbstractFileResolver.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/AntFileCollectionBuilder.groovy
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/AntFileCollectionMatchingTaskBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/AntFileSetBuilder.groovy
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/AntFileTreeBuilder.groovy
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/BasicFileResolver.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/DefaultFileTreeElement.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/DefaultFileVisitDetails.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/DefaultSourceDirectorySet.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/file/DefaultTemporaryFileProvider.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/FileTreeElementComparator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/FileTreeElementHasher.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/TmpDirTemporaryFileProvider.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/archive/TarFileTree.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/archive/ZipFileTree.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/archive/compression/Bzip2Archiver.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/BuildDependenciesOnlyFileCollectionResolveContext.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/DefaultConfigurableFileTree.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/DefaultDirectoryFileTreeFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/DefaultDirectoryWalkerFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/DefaultFileCollectionResolveContext.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/DirectoryFileTree.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/DirectoryTrees.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/MapFileTree.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/SingletonFileTree.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopyActionImpl.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecResolver.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecWrapper.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DefaultCopySpec.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DefaultFileCopyDetails.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DelegatingCopySpecInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/FileCopyActionImpl.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/FilterChain.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/LineFilter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/NormalizingCopyActionDecorator.java
 delete 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/ReadableCopySpec.java
 delete 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/file/copy/SyncCopyActionDecorator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/delete/Deleter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/pattern/HasSuffixPatternStep.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/pattern/PatternMatcherFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/hash/DefaultHasher.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/hash/Hasher.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/DefaultScriptHandler.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/DefaultScriptHandlerFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ScriptClassLoader.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/loadercache/ClassPathSnapshot.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/loadercache/ClassPathSnapshotter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/loadercache/DefaultClassLoaderCache.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/loadercache/FileClassPathSnapshotter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/loadercache/HashClassPathSnapshotter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/ClassloaderBackedPluginDescriptorLocator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultConvention.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultExtraPropertiesExtension.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultPluginManager.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultPluginRegistry.java
 delete 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/DslObject.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/ExtensionsStorage.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/ExtraPropertiesDynamicObjectAdapter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/AbstractPluginAware.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/AbstractProject.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/DefaultAntBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/DefaultAntBuilderFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/DefaultProject.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectScript.groovy
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/ant/AntLoggingAdapter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/ant/BasicAntBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/antbuilder/AntBuilderDelegate.groovy
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/antbuilder/ClassPathToClassLoaderCache.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/antbuilder/Cleanup.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/antbuilder/DefaultIsolatedAntBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/antbuilder/FinalizerThread.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/InputDirectoryPropertyAnnotationHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/InputFilePropertyAnnotationHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/InputFilesPropertyAnnotationHandler.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/InputPropertyAnnotationHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/NestedBeanPropertyAnnotationHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/OutputDirectoryPropertyAnnotationHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/OutputFilePropertyAnnotationHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/PropertyActionContext.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/PropertyAnnotationHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/TaskFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/ContextAwareTaskAction.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/DefaultTaskContainer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/DefaultTaskContainerFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/DefaultTaskDependency.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/DefaultTaskInputs.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/DefaultTaskOutputs.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/RealizableTaskCollection.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/TaskContainerInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/TaskDependencyResolveContext.java
 delete 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/TaskResolver.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/TaskStateInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/execution/ExecuteActionsTaskExecuter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/execution/SkipUpToDateTaskExecuter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/options/OptionValues.groovy
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/invocation/Gradle.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/logging/Logging.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/logging/LoggingManager.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/plugins/Convention.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/plugins/ExtensionAware.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/plugins/ExtensionContainer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/plugins/ExtraPropertiesExtension.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/resources/TextResource.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/AbstractCopyTask.java
 delete 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/ConventionValue.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/Delete.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/tasks/GradleBuild.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/JavaExec.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/OutputDirectories.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/OutputFiles.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/SourceTask.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/Sync.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/TaskInputs.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/TaskOutputs.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/ant/AntTarget.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/bundling/AbstractArchiveTask.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/bundling/Tar.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/bundling/Zip.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/util/PatternSet.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/util/internal/PatternSetAntBuilderDelegate.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/AbstractFileAccess.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/CacheRepositoryServices.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultCacheFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultCacheScopeMapping.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultFileLockManager.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultPersistentDirectoryCache.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultPersistentDirectoryStore.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/FileLock.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/FileLockCommunicator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/LockTimeoutException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/MapBackedInMemoryStore.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/SimpleStateCache.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/btree/BTreePersistentIndexedCache.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/cache/internal/btree/Block.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/cache/internal/btree/BlockPayload.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/cache/internal/btree/FileBackedBlockStore.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/cache/internal/btree/FreeListBlockStore.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/btree/LockingBlockStore.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/DefaultLockStateSerializer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/LockState.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/Version1LockStateSerializer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/locklistener/DefaultFileLockContentionHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/DefaultBuildConfigurer.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/configuration/DefaultScriptPluginFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/DefaultScriptTarget.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/ProjectScriptTarget.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/ScriptTarget.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/DefaultProjectConfigurationActionContainer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/PluginsProjectConfigureActions.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/TaskSelectionException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/commandline/TaskConfigurationException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/taskgraph/AbstractTaskPlanExecutor.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/taskgraph/DefaultTaskExecutionPlan.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/taskgraph/DefaultTaskGraphExecuter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/taskgraph/DefaultTaskPlanExecutor.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/taskgraph/ParallelTaskPlanExecutor.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/taskgraph/TaskPlanExecutorFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/AbstractUriScriptSource.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/BasicScript.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/DefaultScript.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/Script.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/BuildScriptTransformer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/CrossBuildInMemoryCachingScriptClassCache.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptRunnerFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/FileCacheBackedScriptClassCompiler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/InitialPassStatementTransformer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/BaseSettings.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/BuildEventConsumer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/BuildLayoutParameters.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderRegistry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/DefaultCommandLineConverter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/DefaultGradleLauncher.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/DefaultGradleLauncherFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/DefaultGradlePropertiesLoader.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/DefaultProjectDescriptor.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/DefaultSettings.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/DependencyResolutionLogger.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/GradleLauncher.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/GradleLauncherFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/InitScript.groovy
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/NotifyingSettingsLoader.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/ScriptEvaluatingSettingsProcessor.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/SettingsFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/SettingsHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/SettingsScript.groovy
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/buildsrc/BuildSourceBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/artifacts/repositories/AuthenticationSupportedInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/composite/CompositeBuildActionParameters.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/composite/CompositeBuildActionRunner.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/composite/CompositeBuildController.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/composite/CompositeParameters.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/composite/DefaultGradleParticipantBuild.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/composite/GradleParticipantBuild.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/exceptions/FailureResolutionAware.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/internal/exceptions/LocationAwareException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/featurelifecycle/DeprecatedFeatureUsage.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/featurelifecycle/LoggingDeprecatedFeatureHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/filewatch/ChangeReporter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/filewatch/DefaultFileWatcherFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/filewatch/jdk7/WatchServiceRegistrar.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/graph/DirectedGraphRenderer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/graph/GraphNodeRenderer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/graph/GraphRenderer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/installation/GradleFatJar.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/operations/logging/DefaultBuildOperationLogger.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/operations/logging/DefaultBuildOperationLoggerFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/BuildProgressLogger.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/DefaultBuildOperationExecutor.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/LoggerProvider.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/OperationIdentifier.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/PercentageProgressFormatter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/ProgressLoggerProvider.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/resource/local/GroupedAndNamedUniqueFileStore.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/BuildScopeServices.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/BuildSessionScopeServices.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/GlobalScopeServices.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/GradleScopeServices.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/ProjectScopeServices.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/SettingsScopeServices.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/TaskExecutionServices.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/TaskScopeServices.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/text/TreeFormatter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/xml/XmlTransformer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/xml/XmlValidation.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/invocation/DefaultGradle.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/listener/ClosureBackedMethodInvocationDispatch.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/listener/ListenerBroadcast.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/listener/ListenerManager.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/ConsoleOutput.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/ConsoleRenderer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/LoggingConfiguration.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/LoggingManagerInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/LoggingServiceRegistry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/ProgressLogger.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/ProgressLoggerFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/ShowStacktrace.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/StandardOutputCapture.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/StyledTextOutput.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/StyledTextOutputFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/AbstractLineChoppingStyledTextOutput.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/AbstractStyledTextOutput.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/AbstractStyledTextOutputFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/AnsiConsole.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/BufferingStyledTextOutput.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/CategorisedOutputEvent.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/ColorMap.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/Console.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/ConsoleBackedProgressRenderer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/ConsoleConfigureAction.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/DefaultColorMap.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/DefaultLoggingConfigurer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/DefaultLoggingManager.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/DefaultLoggingManagerFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/DefaultProgressLoggerFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/DefaultStatusBarFormatter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/DefaultStdErrLoggingSystem.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/DefaultStdOutLoggingSystem.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/DefaultStyledTextOutputFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/EmbeddedLoggingServices.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/FlushToOutputsEvent.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/JavaUtilLoggingSystem.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/Label.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/LinePrefixingStyledTextOutput.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/LogEvent.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/LogLevelChangeEvent.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/LoggingBackedStyledTextOutput.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/LoggingCommandLineConverter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/LoggingConfigurer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/LoggingOutputInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/LoggingSystem.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/LoggingSystemAdapter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/NoOpLoggingSystem.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/OutputEvent.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/OutputEventListener.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/OutputEventRenderer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/PrintStreamLoggingSystem.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/ProgressCompleteEvent.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/ProgressEvent.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/ProgressListener.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/ProgressLogEventGenerator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/ProgressLoggingBridge.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/ProgressStartEvent.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/RenderableOutputEvent.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/StdErrLoggingSystem.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/StdOutLoggingSystem.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/StreamBackedStandardOutputListener.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/StreamingStyledTextOutput.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/StreamingStyledTextOutputFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/StyledTextOutputBackedRenderer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/StyledTextOutputEvent.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/TextArea.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/TextStreamOutputEventListener.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/progress/ProgressOperation.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/progress/ProgressOperations.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/slf4j/OutputEventListenerBackedLogger.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/slf4j/OutputEventListenerBackedLoggerContext.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/slf4j/Slf4jLoggingConfigurer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/PluginDependenciesSpec.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/PluginDependencySpec.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/DefaultPluginRequest.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequest.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequestCollector.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequestsSerializer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginUseScriptBlockMetadataExtractor.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/JavaExecSpec.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/process/JavaForkOptions.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/process/ProcessForkOptions.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/AbstractExecHandleBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/DefaultExecAction.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/DefaultExecActionFactory.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/process/internal/DefaultExecHandle.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/DefaultSingleUseWorkerProcessBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/DefaultWorkerProcess.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/DefaultWorkerProcessBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/DefaultWorkerProcessFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/ExecHandleBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/ExecHandleFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/JavaExecHandleBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/JvmOptions.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/SingleUseWorkerProcessBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/WorkerProcess.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/WorkerProcessBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/WorkerProcessContext.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/WorkerProcessException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/WorkerProcessFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/WorkerProcessSettings.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/child/ActionExecutionWorker.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/child/ApplicationClassesInSystemClassLoaderWorkerFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/child/BootstrapSecurityManager.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/child/EncodedStream.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/child/SystemApplicationClassLoaderWorker.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerContext.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/launcher/GradleWorkerMain.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/streams/StreamsForwarder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/profile/BuildProfile.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/profile/ProfileEventAdapter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/reporting/TabbedPageRenderer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/reporting/TabsRenderer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/testfixtures/ProjectBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/testfixtures/internal/ProjectBuilderImpl.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/tooling/provider/model/ToolingModelBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/tooling/provider/model/internal/DefaultToolingModelBuilderRegistry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/AntUtil.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/AvailablePortFinder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/ConfigureUtil.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/DiffUtil.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/DistributionLocator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/GFileUtils.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/LinePerThreadBufferingOutputStream.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/SingleMessageLogger.java
 delete mode 100644 subprojects/core/src/main/groovy/org/slf4j/impl/StaticLoggerBinder.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/BuildAdapter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/BuildListener.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/BuildResult.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/StartParameter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/TaskExecutionRequest.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/AntBuilder.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/BuildCancelledException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/Buildable.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/CircularReferenceException.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/DefaultTask.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/DomainObjectCollection.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/DomainObjectSet.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/ExtensiblePolymorphicDomainObjectContainer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/GradleScriptException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/IllegalDependencyNotation.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/InvalidUserCodeException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/InvalidUserDataException.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/NamedDomainObjectCollection.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/NamedDomainObjectContainer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/NamedDomainObjectFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/NamedDomainObjectList.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/NamedDomainObjectSet.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/NonExtensible.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/PathValidation.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/Plugin.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/PolymorphicDomainObjectContainer.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/Project.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/ProjectConfigurationException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/ProjectEvaluationListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/ProjectState.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/Rule.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/Script.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/Task.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/UnknownDomainObjectException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/UnknownProjectException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/UnknownTaskException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/XmlProvider.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ArtifactIdentifier.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/ArtifactRepositoryContainer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ClientModule.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ComponentMetadata.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ComponentMetadataDetails.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ComponentModuleMetadata.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ComponentModuleMetadataDetails.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ComponentSelection.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/ComponentSelectionRules.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ConfigurablePublishArtifact.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/Configuration.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/ConfigurationContainer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/Dependency.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/DependencyArtifact.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/DependencyResolutionListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/DependencyResolveDetails.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/DependencySet.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/DependencySubstitution.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/DependencySubstitutions.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ExcludeRule.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ExcludeRuleContainer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ExternalDependency.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ExternalModuleDependency.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/FileCollectionDependency.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/LenientConfiguration.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/ModuleDependency.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ModuleIdentifier.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ModuleVersionIdentifier.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ModuleVersionSelector.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ProjectDependency.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/PublishArtifact.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/PublishArtifactSet.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/PublishException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ResolutionStrategy.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ResolvableDependencies.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ResolveException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ResolvedArtifact.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ResolvedConfiguration.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ResolvedDependency.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ResolvedModuleVersion.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/SelfResolvingDependency.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/UnknownConfigurationException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/UnknownRepositoryException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/UnresolvedDependency.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/cache/ArtifactResolutionControl.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/cache/DependencyResolutionControl.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/cache/ModuleResolutionControl.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/cache/ResolutionControl.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/cache/ResolutionRules.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/cache/package-info.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/component/BuildIdentifier.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/component/ComponentArtifactIdentifier.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/component/ComponentIdentifier.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/component/ComponentSelector.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/component/LibraryBinaryIdentifier.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/component/LibraryComponentSelector.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/component/ModuleComponentIdentifier.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/component/ModuleComponentSelector.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/component/ProjectComponentIdentifier.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/component/ProjectComponentSelector.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/component/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/dsl/ArtifactHandler.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/dsl/ComponentMetadataHandler.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/dsl/ComponentModuleMetadataHandler.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/dsl/DependencyHandler.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/dsl/RepositoryHandler.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/dsl/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ivy/IvyExtraInfo.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ivy/IvyModuleDescriptor.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/ivy/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/query/ArtifactResolutionQuery.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/query/package-info.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/repositories/ArtifactRepository.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/repositories/AuthenticationContainer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/repositories/AuthenticationSupported.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/repositories/FlatDirectoryArtifactRepository.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/repositories/IvyArtifactRepository.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/repositories/IvyArtifactRepositoryMetaDataProvider.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/repositories/IvyPatternRepositoryLayout.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/repositories/MavenArtifactRepository.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/repositories/PasswordCredentials.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/repositories/RepositoryLayout.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/repositories/package-info.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/result/ArtifactResolutionResult.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/result/ArtifactResult.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/result/ComponentArtifactsResult.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/result/ComponentResult.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/result/ComponentSelectionReason.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/result/DependencyResult.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/result/ResolutionResult.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/result/ResolvedArtifactResult.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/result/ResolvedComponentResult.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/result/ResolvedDependencyResult.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/artifacts/result/UnresolvedArtifactResult.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/result/UnresolvedComponentResult.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/result/UnresolvedDependencyResult.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/artifacts/result/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/component/Artifact.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/component/Component.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/component/SoftwareComponent.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/component/SoftwareComponentContainer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/component/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/credentials/AwsCredentials.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/credentials/Credentials.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/credentials/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/dsl/ConventionProperty.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/dsl/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/execution/TaskActionListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/execution/TaskExecutionAdapter.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/execution/TaskExecutionGraph.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/execution/TaskExecutionGraphListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/execution/TaskExecutionListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/execution/internal/InternalTaskExecutionListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/execution/internal/TaskInputsListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/execution/internal/TaskOperationInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/execution/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/ConfigurableFileCollection.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/ConfigurableFileTree.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/file/ContentFilterable.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/file/CopyProcessingSpec.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/file/CopySourceSpec.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/file/CopySpec.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/DeleteSpec.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/DirectoryTree.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/DuplicateFileCopyingException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/DuplicatesStrategy.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/EmptyFileVisitor.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/FileCollection.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/FileCopyDetails.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/FileTree.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/FileTreeElement.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/FileVisitDetails.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/FileVisitor.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/file/RelativePath.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/SourceDirectorySet.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/UnableToDeleteFileException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/file/package-info.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/initialization/ConfigurableIncludedBuild.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/initialization/IncludedBuild.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/initialization/ProjectDescriptor.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/initialization/Settings.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/initialization/dsl/ScriptHandler.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/initialization/dsl/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/initialization/package-info.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/AbstractClassGenerator.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/AbstractNamedDomainObjectContainer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/AbstractPolymorphicDomainObjectContainer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/AbstractTask.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/AsmBackedClassGenerator.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/ChainingTransformer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/ClassGenerator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/ClassGeneratorBackedInstantiator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/ClassPathProvider.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/ClassPathRegistry.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/CompositeDomainObjectSet.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/ConfigureByMapAction.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/ConventionAwareHelper.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/ConventionMapping.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/ConventionTask.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/DefaultClassPathProvider.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/DefaultClassPathRegistry.java (100%)
 create mode 100755 subprojects/core/src/main/java/org/gradle/api/internal/DefaultDomainObjectCollection.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/DefaultDomainObjectSet.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/DefaultNamedDomainObjectCollection.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/DefaultNamedDomainObjectList.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/DefaultNamedDomainObjectSet.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/DefaultPolymorphicDomainObjectContainer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/DefaultPolymorphicNamedEntityInstantiator.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/DelegatingDomainObjectSet.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/DependencyClassPathProvider.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/DependencyInjectingInstantiator.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/DependencyInjectingServiceLoader.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/DocumentationRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/DomNode.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/DomainObjectContext.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/DynamicModulesClassPathProvider.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/DynamicObjectAware.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/DynamicObjectUtil.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/DynamicPropertyNamer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/ExceptionAnalyser.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/ExtensibleDynamicObject.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/ExtensiblePolymorphicDomainObjectContainerInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/FactoryNamedDomainObjectContainer.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/GradleInternal.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/HasConvention.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/IConventionAware.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/NamedDomainObjectContainerConfigureDelegate.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/NoConventionMapping.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/NoFactoryRegisteredForTypeException.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/NoNamingPropertyException.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/NullNamingPropertyException.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/PolymorphicDomainObjectContainerConfigureDelegate.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/PolymorphicDomainObjectContainerInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/PolymorphicNamedEntityInstantiator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/ProcessOperations.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/PropertiesTransformer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/ReflectiveNamedDomainObjectFactory.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/SettingsInternal.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/TaskExecutionHistory.java (100%)
 create mode 100755 subprojects/core/src/main/java/org/gradle/api/internal/TaskInputsInternal.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/TaskInternal.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/api/internal/TaskOutputsInternal.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/ThreadGlobalInstantiator.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/TypedDomainObjectContainerWrapper.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/UserCodeAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/BaseRepositoryFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/CachingDependencyResolveContext.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/DefaultArtifactRepositoryContainer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/DefaultDependencySet.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/DefaultExcludeRule.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/DefaultExcludeRuleContainer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/DefaultModule.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/DefaultPublishArtifactSet.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/DependencyManagementServices.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/DependencyResolutionServices.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/DependencyResolveContext.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/DependencyResolveDetailsInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/DependencySubstitutionInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/ExcludeRuleNotationConverter.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/Module.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/ModuleVersionSelectorStrictSpec.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/ProjectBackedModule.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/ResolvableDependency.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/configurations/DependencyMetaDataProvider.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/configurations/dynamicversion/CachePolicy.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/dependencies/AbstractDependency.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/dependencies/AbstractExternalModuleDependency.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/dependencies/AbstractModuleDependency.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/dependencies/DefaultClientModule.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/dependencies/DefaultDependencyArtifact.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/dependencies/DefaultExternalModuleDependency.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/dependencies/DefaultProjectDependency.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/dependencies/DefaultSelfResolvingDependency.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/dependencies/ProjectDependencyInternal.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/dsl/DefaultRepositoryHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/dsl/dependencies/DefaultDependencyHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/dsl/dependencies/DependencyFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/dsl/dependencies/ModuleFactoryDelegate.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/dsl/dependencies/ModuleFactoryHelper.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/dsl/dependencies/ProjectFinder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/dsl/dependencies/UnknownProjectFinder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/artifacts/publish/AbstractPublishArtifact.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/publish/ArchivePublishArtifact.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/publish/DefaultPublishArtifact.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/query/ArtifactResolutionQueryFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/repositories/ArtifactRepositoryInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/artifacts/repositories/DefaultPasswordCredentials.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/cache/BinaryStore.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/cache/Cache.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/cache/CacheAccessSerializer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/cache/CacheSupport.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/cache/DefaultGeneratedGradleJarCache.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/cache/GeneratedGradleJarCache.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/cache/HeapProportionalCacheSizer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/cache/Loader.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/cache/MapBackedCache.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/cache/MinimalPersistentCache.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/cache/SingleOperationPersistentStore.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/cache/Stash.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/cache/Store.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/TaskArtifactState.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/TaskArtifactStateRepository.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/changes/ChangesOnlyIncrementalTaskInputs.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/changes/DefaultTaskArtifactStateRepository.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/changes/DiscoveredInputRecorder.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/changes/IncrementalTaskInputsInternal.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/changes/NoHistoryArtifactState.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/changes/RebuildIncrementalTaskInputs.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/changes/ShortCircuitTaskArtifactStateRepository.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/changes/StatefulIncrementalTaskInputs.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/rules/AbstractNamedFileSnapshotTaskStateChanges.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/rules/CachingTaskStateChanges.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/rules/ChangeType.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/rules/DescriptiveChange.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/rules/DiscoveredInputsListener.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/rules/DiscoveredInputsTaskStateChanges.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/rules/FileChange.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/rules/InputFilesTaskStateChanges.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/rules/InputPropertiesTaskStateChanges.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/rules/NoHistoryTaskStateChanges.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/rules/OutputFilesTaskStateChanges.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/rules/SimpleTaskStateChanges.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/rules/SummaryTaskStateChanges.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/rules/TaskStateChange.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/rules/TaskStateChanges.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/rules/TaskTypeTaskStateChanges.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/rules/TaskUpToDateState.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/AbstractFileCollectionSnapshotter.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/AbstractNormalizedFileSnapshot.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/CacheAccessingFileSnapshotter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/state/CacheBackedFileSnapshotRepository.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/CacheBackedTaskHistoryRepository.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/CachingFileSnapshotter.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/DefaultFileCollectionSnapshot.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/DefaultFileCollectionSnapshotter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/state/DefaultTaskArtifactStateCacheAccess.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/DirSnapshot.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/FileCollectionSnapshot.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/FileCollectionSnapshotter.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/FileHashSnapshot.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/FileSnapshot.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/state/FileSnapshotRepository.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/state/FileSnapshotter.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/InMemoryTaskArtifactCache.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/IncrementalFileSnapshot.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/state/InputPropertiesSerializer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/state/MapMergeChangeListener.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/MinimalFileSetSnapshotter.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/MissingFileSnapshot.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/state/NoOpDecorator.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/NormalizedFileSnapshot.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/OrderInsensitiveTaskFilePropertyCompareStrategy.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/OrderSensitiveTaskFilePropertyCompareStrategy.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/OutputFilesCollectionSnapshot.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/OutputFilesCollectionSnapshotter.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/SnapshotMapSerializer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/state/TaskArtifactStateCacheAccess.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/TaskExecution.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/TaskFilePropertyCompareStrategy.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/changedetection/state/TaskFilePropertyPathSensitivity.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/changedetection/state/TaskHistoryRepository.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/classloading/GroovySystemLoader.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/classloading/GroovySystemLoaderFactory.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/classloading/LeakyOnJava7GroovySystemLoader.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/classloading/NoOpGroovySystemLoader.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/classpath/DefaultPluginModuleRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/classpath/EffectiveClassPath.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/classpath/ManifestUtil.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/classpath/Module.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/classpath/ModuleRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/classpath/PluginModuleRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/classpath/UnknownModuleException.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/coerce/MethodArgumentsTransformer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/coerce/PropertySetTransformer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/coerce/StringToEnumTransformer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/collections/CollectionEventRegister.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/collections/CollectionFilter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/collections/FilteredCollection.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/collections/FilteredList.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/collections/FilteredSet.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/component/ArtifactType.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/component/BuildableJavaComponent.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/component/ComponentRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/component/ComponentTypeRegistration.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/component/ComponentTypeRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/component/DefaultComponentTypeRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/component/DefaultSoftwareComponentContainer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/component/SoftwareComponentInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/component/Usage.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/AbstractFileCollection.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/AbstractFileResolver.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/AbstractFileResource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/AbstractFileTree.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/AbstractFileTreeElement.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/AntFileCollectionBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/AntFileCollectionMatchingTaskBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/AntFileSetBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/AntFileTreeBuilder.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/BaseDirFileResolver.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/BasicFileResolver.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/CompositeFileCollection.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/CompositeFileTree.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/CopyActionProcessingStreamAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/DefaultCompositeFileTree.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/DefaultFileCollectionFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/DefaultFileLookup.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/DefaultFileOperations.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/DefaultFileTreeElement.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/DefaultFileVisitDetails.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/DefaultSourceDirectorySet.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/DefaultSourceDirectorySetFactory.java (100%)
 create mode 100755 subprojects/core/src/main/java/org/gradle/api/internal/file/DefaultTemporaryFileProvider.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/FileCollectionFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/FileCollectionInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/FileLookup.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/FileNormaliser.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/FileOperations.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/FileOrUriNotationConverter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/FileResolver.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/FileResource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/FileSystemSubset.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/FileTreeInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/IdentityFileResolver.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/ImmutableDirectoryTree.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/ImmutablePatternSet.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/MaybeCompressedFileResource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/RelativeFile.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/RelativePathSpec.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/SourceDirectorySetFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/TemporaryFileProvider.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/TmpDirTemporaryFileProvider.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/UnionFileCollection.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/UnionFileTree.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/UnknownBackingFileReadableResource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/ant/AntFileResource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/ant/BaseDirSelector.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/archive/TarCopyAction.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/archive/TarFileTree.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/archive/ZipCopyAction.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/archive/ZipFileTree.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/archive/compression/AbstractArchiver.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/archive/compression/ArchiveOutputStreamFactory.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/archive/compression/Bzip2Archiver.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/archive/compression/CompressedReadableResource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/archive/compression/GzipArchiver.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/archive/compression/SimpleCompressor.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/collections/BuildDependenciesOnlyFileCollectionResolveContext.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/DefaultConfigurableFileCollection.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/collections/DefaultConfigurableFileTree.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/collections/DefaultDirectoryFileTreeFactory.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/DefaultDirectoryWalker.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/collections/DefaultDirectoryWalkerFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/collections/DefaultFileCollectionResolveContext.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/collections/DirectoryFileTree.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/DirectoryFileTreeFactory.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/collections/DirectoryTrees.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/DirectoryWalker.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/FileBackedDirectoryFileTree.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/FileCollectionAdapter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/FileCollectionContainer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/FileCollectionResolveContext.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/FileSystemMirroringFileTree.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/FileTreeAdapter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/LazilyInitializedFileCollection.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/ListBackedFileSet.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/LocalFileTree.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/collections/MapFileTree.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/MinimalFileCollection.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/MinimalFileSet.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/MinimalFileTree.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/PatternFilterableFileTree.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/RandomAccessFileCollection.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/ResolvableFileCollectionResolveContext.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/SimpleFileCollection.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/SingleIncludePatternFileTree.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/collections/SingletonFileSet.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/collections/SingletonFileTree.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/collections/jdk7/Jdk7DirectoryWalker.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/copy/ClosureBackedTransformer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/CopyAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/CopyActionExecuter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/CopyActionProcessingStream.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/CopyFileVisitorImpl.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/CopySpecActionImpl.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/CopySpecBackedCopyActionProcessingStream.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/CopySpecInternal.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/copy/CopySpecResolver.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/CopySpecSource.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/copy/CopySpecWrapper.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/copy/DefaultCopySpec.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/copy/DefaultFileCopyDetails.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/DefaultZipCompressor.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/copy/DelegatingCopySpecInternal.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/DestinationRootCopySpec.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionDecorator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/FileCopier.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/FileCopyAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/FileCopyDetailsInternal.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/copy/FilterChain.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/copy/LineFilter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/MatchingCopyAction.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/copy/NormalizingCopyActionDecorator.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/copy/PathNotationConverter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/RegExpNameMapper.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/RenamingCopyAction.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/copy/SingleParentCopySpec.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/copy/SyncCopyActionDecorator.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/copy/ZipCompressor.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/delete/DefaultDeleteSpec.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/delete/DeleteSpecInternal.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/delete/Deleter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/pattern/AnyWildcardPatternStep.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/pattern/EndOfPathMatcher.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/pattern/FixedPatternStep.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/pattern/FixedStepsPathMatcher.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/pattern/GreedyPathMatcher.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/pattern/HasPrefixAndSuffixPatternStep.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/pattern/HasPrefixPatternStep.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/pattern/HasSuffixPatternStep.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/pattern/PathMatcher.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/file/pattern/PatternMatcherFactory.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/pattern/PatternStep.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/pattern/PatternStepFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/file/pattern/RegExpPatternStep.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/hash/DefaultHasher.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/hash/Hasher.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/initialization/BasicDomainObjectContext.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/initialization/ClassLoaderIds.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/initialization/ClassLoaderScope.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/initialization/ClassLoaderScopeIdentifier.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/initialization/DefaultClassLoaderScope.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/initialization/DefaultScriptHandler.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/api/internal/initialization/DefaultScriptHandlerFactory.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/initialization/RootClassLoaderScope.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/initialization/ScriptHandlerFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/initialization/ScriptHandlerInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/initialization/loadercache/ClassLoaderCache.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/initialization/loadercache/ClassLoaderId.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/initialization/loadercache/DefaultClassLoaderCache.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/initialization/loadercache/HashClassPathSnapshotter.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/plugins/ClassloaderBackedPluginDescriptorLocator.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/DefaultAppliedPlugin.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/plugins/DefaultConvention.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/plugins/DefaultExtraPropertiesExtension.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/DefaultObjectConfigurationAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/DefaultPluginCollection.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/DefaultPluginContainer.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/plugins/DefaultPluginManager.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/plugins/DefaultPluginRegistry.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/plugins/DefaultPotentialPluginWithId.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/plugins/DslObject.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/ExtensionContainerInternal.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/plugins/ExtensionsStorage.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/plugins/ExtraPropertiesDynamicObjectAdapter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/ImperativeOnlyPluginApplicator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/PluginApplicationException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/PluginApplicator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/PluginAwareInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/PluginDescriptor.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/PluginDescriptorLocator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/PluginImplementation.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/PluginInspector.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/PluginManagerInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/PluginRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/PotentialPlugin.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/plugins/RuleBasedPluginApplicator.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/AbstractPluginAware.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/DefaultAntBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/DefaultAntBuilderFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/DefaultProject.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/DefaultProjectAccessListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/DefaultProjectRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/DefaultProjectTaskLister.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/DeferredProjectConfiguration.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/IProjectFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/IsolatedAntBuilder.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/ProjectFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/ProjectIdentifier.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/ProjectInternal.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/ProjectRegistry.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/ProjectScript.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/ProjectStateInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/ProjectTaskLister.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/ant/AntLoggingAdapter.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/ant/AntLoggingAdapterFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/ant/BasicAntBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/ant/DefaultAntLoggingAdapterFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/antbuilder/AntBuilderDelegate.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/antbuilder/CacheEntry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/antbuilder/CachedClassLoader.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/antbuilder/ClassPathToClassLoaderCache.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/antbuilder/Cleanup.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/antbuilder/DefaultIsolatedAntBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/antbuilder/FinalizerThread.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/AbstractOutputPropertyAnnotationHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/AbstractPluralOutputPropertyAnnotationHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/DefaultTaskClassInfoStore.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/taskfactory/DependencyAutoWireTaskFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/taskfactory/ITaskFactory.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/InputDirectoryPropertyAnnotationHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/InputFilePropertyAnnotationHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/InputFilesPropertyAnnotationHandler.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/InputPropertyAnnotationHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/NestedBeanPropertyAnnotationHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/NoOpPropertyAnnotationHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/OutputDirectoriesPropertyAnnotationHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/OutputDirectoryPropertyAnnotationHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/OutputFilePropertyAnnotationHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/OutputFilesPropertyAnnotationHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/OutputPropertyAnnotationUtil.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/PropertyAnnotationHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/PropertyAnnotationUtils.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/TaskClassInfo.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/TaskClassInfoStore.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/TaskClassValidator.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/TaskFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/TaskPropertyActionContext.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/TaskPropertyInfo.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/TaskPropertyValidationAccess.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/project/taskfactory/TaskPropertyValue.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/taskfactory/UpdateAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/project/taskfactory/ValidationAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/resources/CharSourceBackedTextResource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/resources/DefaultResourceHandler.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/resources/DefaultTextResourceFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/resources/FileCollectionBackedArchiveTextResource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/resources/FileCollectionBackedTextResource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/resources/StringBackedTextResource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/resources/URIBuilder.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/rules/NamedDomainObjectFactoryRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/specs/ExplainingSpec.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/specs/ExplainingSpecs.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/AbstractTaskDependency.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/AbstractTaskPropertyBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/CacheableTaskOutputFilePropertySpec.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/CachingTaskDependencyResolveContext.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/ClassLoaderAwareTaskAction.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/ContextAwareTaskAction.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/DefaultTaskCollection.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/DefaultTaskContainer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/DefaultTaskContainerFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/DefaultTaskDependency.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/DefaultTaskInputs.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/DefaultTaskOutputs.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/PublicTaskSpecification.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/RealizableTaskCollection.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/SimpleWorkResult.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/TaskContainerInternal.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/TaskDependencyContainer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/TaskDependencyInternal.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/TaskDependencyResolveContext.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/TaskExecuter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/TaskExecutionContext.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/TaskFilePropertySpec.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/TaskInputFilePropertySpec.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/TaskMutator.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/TaskOutputFilePropertySpec.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/TaskOutputsUtil.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/TaskPropertyFileCollection.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/TaskPropertySpec.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/TaskPropertyUtils.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/TaskReferenceResolver.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/TaskResolver.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/TaskStateInternal.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/cache/DefaultTaskCacheKeyBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/cache/LocalDirectoryTaskOutputCache.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/cache/MapBasedTaskOutputCache.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/cache/TaskCacheKey.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/cache/TaskCacheKeyBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/cache/TaskOutputCache.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/cache/TaskOutputCacheFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/cache/TaskOutputPacker.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/cache/TaskOutputReader.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/cache/TaskOutputWriter.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/cache/ZipTaskOutputPacker.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/cache/config/DefaultTaskCaching.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/cache/config/TaskCachingInternal.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/execution/DefaultTaskExecutionContext.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/execution/ExecuteActionsTaskExecuter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/execution/ExecuteAtMostOnceTaskExecuter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/execution/PostExecutionAnalysisTaskExecuter.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/execution/SkipCachedTaskExecuter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/execution/SkipEmptySourceFilesTaskExecuter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/execution/SkipOnlyIfTaskExecuter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/execution/SkipTaskWithNoActionsExecuter.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/execution/SkipUpToDateTaskExecuter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/execution/TaskValidator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/execution/ValidatingTaskExecuter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/options/AbstractOptionElement.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/options/FieldOptionElement.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/options/InstanceOptionDescriptor.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/options/MethodOptionElement.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/options/Option.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/options/OptionDescriptor.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/options/OptionElement.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/options/OptionReader.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/options/OptionValidationException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/internal/tasks/options/OptionValueNotationParserFactory.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/internal/tasks/options/OptionValues.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/invocation/Gradle.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/invocation/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/plugins/AppliedPlugin.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/plugins/Convention.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/plugins/DeferredConfigurable.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/plugins/ExtensionAware.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/plugins/ExtensionContainer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/plugins/ExtraPropertiesExtension.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/plugins/InvalidPluginException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/plugins/ObjectConfigurationAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/plugins/PluginAware.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/plugins/PluginCollection.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/plugins/PluginContainer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/plugins/PluginInstantiationException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/plugins/PluginManager.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/plugins/UnknownPluginException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/plugins/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/resources/ReadableResource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/resources/Resource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/resources/ResourceHandler.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/resources/TextResource.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/resources/TextResourceFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/resources/internal/ReadableResourceInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/resources/internal/TextResourceInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/resources/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/specs/package-info.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/AbstractCopyTask.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/AbstractExecTask.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/AntBuilderAware.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/CacheableTask.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/CompatibilityAdapterForTaskInputs.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/CompatibilityAdapterForTaskOutputs.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/api/tasks/Console.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/Copy.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/Delete.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/Exec.java (100%)
 create mode 100755 subprojects/core/src/main/java/org/gradle/api/tasks/GradleBuild.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/Input.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/InputDirectory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/InputFile.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/InputFiles.java (100%)
 create mode 100755 subprojects/core/src/main/java/org/gradle/api/tasks/Internal.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/JavaExec.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/Nested.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/Optional.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/OrderSensitive.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/OutputDirectories.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/OutputDirectory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/OutputFile.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/OutputFiles.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/ParallelizableTask.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/PathSensitive.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/PathSensitivity.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/SkipWhenEmpty.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/SourceTask.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/StopActionException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/StopExecutionException.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/Sync.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/TaskAction.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/TaskCaching.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/TaskCollection.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/TaskContainer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/TaskDependency.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/TaskExecutionException.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/TaskFilePropertyBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/TaskInputFilePropertyBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/TaskInputs.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/TaskInstantiationException.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/TaskOutputFilePropertyBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/TaskOutputs.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/TaskPropertyBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/TaskReference.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/TaskState.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/TaskValidationException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/VerificationTask.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/WorkResult.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/ant/AntTarget.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/ant/package-info.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/bundling/AbstractArchiveTask.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/bundling/Compression.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/bundling/Tar.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/bundling/Zip.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/bundling/ZipEntryCompression.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/bundling/internal/Zip64RequiredException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/bundling/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/incremental/IncrementalTaskInputs.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/incremental/InputFileDetails.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/incremental/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/util/PatternFilterable.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/util/PatternSet.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/util/internal/CachingPatternSpecFactory.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/api/tasks/util/internal/PatternSetAntBuilderDelegate.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/util/internal/PatternSets.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/util/internal/PatternSpecFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/api/tasks/util/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/CacheAccess.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/CacheBuilder.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/CacheOpenException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/CacheRepository.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/CacheValidator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/PersistentCache.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/PersistentIndexedCache.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/PersistentIndexedCacheParameters.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/PersistentStateCache.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/PersistentStore.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/AbstractFileAccess.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/CacheCoordinator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/CacheDecorator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/CacheFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/CacheInitializationAction.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/CacheRepositoryServices.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/CacheScopeMapping.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/DefaultCacheAccess.java (100%)
 create mode 100755 subprojects/core/src/main/java/org/gradle/cache/internal/DefaultCacheFactory.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/DefaultCacheRepository.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/DefaultCacheScopeMapping.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/DefaultFileLockManager.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/DefaultMultiProcessSafePersistentIndexedCache.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/DefaultPersistentDirectoryCache.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/DefaultPersistentDirectoryStore.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/DefaultProcessMetaDataProvider.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/FileAccess.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/FileIntegrityViolationException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/FileIntegrityViolationSuppressingPersistentStateCacheDecorator.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/FileLock.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/FileLockCommunicator.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/FileLockManager.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/GracefullyStoppedException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/InsufficientLockModeException.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/LockTimeoutException.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/MapBackedInMemoryStore.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/MultiProcessSafePersistentIndexedCache.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/OnDemandFileAccess.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/ProcessMetaDataProvider.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/ReferencablePersistentCache.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/SimpleStateCache.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/UnitOfWorkParticipant.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/btree/BTreePersistentIndexedCache.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/cache/internal/btree/Block.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/cache/internal/btree/BlockPayload.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/btree/BlockPointer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/btree/BlockStore.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/btree/ByteInput.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/btree/ByteOutput.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/btree/CachingBlockStore.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/btree/CorruptedCacheException.java (100%)
 create mode 100755 subprojects/core/src/main/java/org/gradle/cache/internal/btree/FileBackedBlockStore.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/cache/internal/btree/FreeListBlockStore.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/btree/KeyHasher.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/btree/StateCheckBlockStore.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/cacheops/CacheAccessOperationsStack.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/cacheops/CacheOperation.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/cacheops/CacheOperationStack.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/filelock/DefaultLockStateSerializer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/filelock/LockFileAccess.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/filelock/LockInfo.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/filelock/LockInfoAccess.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/filelock/LockInfoSerializer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/filelock/LockOptions.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/filelock/LockOptionsBuilder.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/filelock/LockState.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/filelock/LockStateAccess.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/filelock/LockStateSerializer.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/filelock/Version1LockStateSerializer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/cache/internal/locklistener/DefaultFileLockContentionHandler.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/cache/internal/locklistener/FileLockContentionHandler.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/BuildConfigurer.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/configuration/DefaultBuildConfigurer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/DefaultImportsReader.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/DefaultInitScriptProcessor.java (100%)
 create mode 100755 subprojects/core/src/main/java/org/gradle/configuration/DefaultScriptPluginFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/configuration/DefaultScriptTarget.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/GradleLauncherMetaData.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/ImportsReader.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/InitScriptProcessor.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/InitScriptTarget.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/configuration/InitialPassSettingScriptTarget.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/configuration/ProjectScriptTarget.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/ScriptPlugin.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/ScriptPluginFactory.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/configuration/ScriptPluginFactoryProvider.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/configuration/ScriptPluginFactorySelector.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/configuration/ScriptTarget.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/SettingScriptTarget.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/project/BuildScriptProcessor.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/project/ConfigureActionsProjectEvaluator.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/configuration/project/DefaultProjectConfigurationActionContainer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/project/DelayedConfigurationActions.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/project/LifecycleProjectEvaluator.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/configuration/project/PluginsProjectConfigureActions.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/project/ProjectConfigurationActionContainer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/project/ProjectConfigureAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/configuration/project/ProjectEvaluator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/deployment/internal/DefaultDeploymentRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/deployment/internal/DeploymentHandle.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/deployment/internal/DeploymentRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/BuildConfigurationAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/BuildConfigurationActionExecuter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/BuildExecuter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/BuildExecutionAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/BuildExecutionContext.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/CancellableOperationManager.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/DefaultBuildConfigurationActionExecuter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/DefaultBuildExecuter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/DefaultCancellableOperationManager.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/DefaultTasksBuildExecutionAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/DryRunBuildExecutionAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/ExcludedTaskFilteringBuildConfigurationAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/MultipleBuildFailures.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/PassThruCancellableOperationManager.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/ProjectConfigurer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/SelectedTaskExecutionAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/TaskFailureHandler.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/TaskGraphExecuter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/TaskNameResolver.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/TaskNameResolvingBuildConfigurationAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/TaskPathProjectEvaluator.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/execution/TaskSelectionException.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/TaskSelectionResult.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/TaskSelector.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/commandline/CommandLineTaskConfigurer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/commandline/CommandLineTaskParser.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/execution/commandline/TaskConfigurationException.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/execution/taskgraph/AbstractTaskPlanExecutor.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/execution/taskgraph/DefaultTaskExecutionPlan.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/execution/taskgraph/DefaultTaskGraphExecuter.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/execution/taskgraph/DefaultTaskPlanExecutor.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/execution/taskgraph/ParallelTaskPlanExecutor.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/taskgraph/TaskDependencyGraph.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/taskgraph/TaskExecutionPlan.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/taskgraph/TaskInfo.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/taskgraph/TaskPlanExecutor.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/execution/taskgraph/TaskPlanExecutorFactory.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/taskpath/ProjectFinderByTaskPath.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/taskpath/ResolvedTaskPath.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/execution/taskpath/TaskPathResolver.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/groovy/scripts/AbstractUriScriptSource.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/groovy/scripts/BasicScript.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/CachingScriptSource.java (100%)
 create mode 100755 subprojects/core/src/main/java/org/gradle/groovy/scripts/DefaultScript.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/DefaultScriptCompilerFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/DelegatingScriptSource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/NonExistentFileScriptSource.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/groovy/scripts/Script.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/ScriptCompilationException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/ScriptCompiler.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/ScriptCompilerFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/ScriptExecutionListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/ScriptRunner.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/ScriptSource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/StringScriptSource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/UriScriptSource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/BuildScopeInMemoryCachingScriptClassCompiler.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/BuildScriptData.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/BuildScriptDataSerializer.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/groovy/scripts/internal/BuildScriptTransformer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/CompileOperation.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/CompiledScript.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/groovy/scripts/internal/CrossBuildInMemoryCachingScriptClassCache.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/groovy/scripts/internal/DefaultScriptRunnerFactory.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/FactoryBackedCompileOperation.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/groovy/scripts/internal/FileCacheBackedScriptClassCompiler.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/FilteringScriptTransformer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/FixMainScriptTransformer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/GradleResolveVisitor.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/ImperativeStatementDetectingTransformer.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/groovy/scripts/internal/InitialPassStatementTransformer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/groovy/scripts/internal/RegistryAwareClassLoaderHierarchyHasher.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/RemappingScriptSource.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/ScriptCacheKey.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/ScriptClassCompiler.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/ScriptCompilationHandler.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/ScriptRunnerFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/StatementLabelsScriptTransformer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/SubsetScriptTransformer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/groovy/scripts/internal/TaskDefinitionScriptTransformer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/AbstractProjectSpec.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/BuildCancellationToken.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/BuildClientMetaData.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/BuildCompletionListener.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/BuildEventConsumer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/BuildFileProjectSpec.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/BuildIdentity.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/BuildLayoutParameters.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/BuildLoader.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/BuildRequestContext.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/BuildRequestMetaData.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/ClassLoaderRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/ClassLoaderScopeRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/CompositeInitScriptFinder.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/DefaultBuildCancellationToken.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/DefaultBuildIdentity.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/DefaultBuildRequestContext.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/DefaultBuildRequestMetaData.java (100%)
 create mode 100755 subprojects/core/src/main/java/org/gradle/initialization/DefaultClassLoaderRegistry.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/DefaultClassLoaderScopeRegistry.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/DefaultCommandLineConverter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/DefaultExceptionAnalyser.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/DefaultGradleLauncher.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/DefaultGradleLauncherFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/DefaultGradlePropertiesLoader.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/DefaultJdkToolsInitializer.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/DefaultProjectDescriptor.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/DefaultProjectDescriptorRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/DefaultProjectSpec.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/DefaultSettings.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/DefaultSettingsFinder.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/DefaultSettingsLoader.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/DefaultSettingsLoaderFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/DependencyResolutionLogger.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/DirectoryInitScriptFinder.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/DistributionInitScriptFinder.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/FlatClassLoaderRegistry.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/GradleLauncher.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/GradleLauncherFactory.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/IGradlePropertiesLoader.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/ISettingsFinder.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/IncludedBuildExecuter.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/IncludedBuildFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/IncludedBuilds.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/InitScript.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/InitScriptFinder.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/InitScriptHandler.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/InitialPassSettingsScript.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/InstantiatingBuildLoader.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/JdkToolsInitializer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/LayoutCommandLineConverter.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/MixInLegacyTypesClassLoader.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/ModelConfigurationListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/MultipleBuildFailuresExceptionAnalyser.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/NestedBuildTracker.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/NoOpBuildEventConsumer.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/NotifyingSettingsLoader.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/NotifyingSettingsProcessor.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/ProjectAccessListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/ProjectDescriptorRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/ProjectDirectoryProjectSpec.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/ProjectPropertySettingBuildLoader.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/ProjectSpec.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/ProjectSpecs.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/PropertiesLoadingSettingsProcessor.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/ReportedException.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/ScriptEvaluatingSettingsProcessor.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/SettingsFactory.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/SettingsLoader.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/SettingsLoaderFactory.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/SettingsLocation.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/SettingsProcessor.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/SettingsScript.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/StackTraceSanitizingExceptionAnalyser.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/UserHomeInitScriptFinder.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/initialization/buildsrc/BuildSourceBuilder.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/buildsrc/BuildSrcBuildListenerFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/buildsrc/BuildSrcUpdateFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/layout/BuildLayout.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/layout/BuildLayoutConfiguration.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/initialization/layout/BuildLayoutFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/DefaultTaskExecutionRequest.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/artifacts/repositories/AuthenticationSupportedInternal.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/authentication/AbstractAuthentication.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/authentication/AllSchemesAuthentication.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/authentication/AuthenticationInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/authentication/DefaultAuthenticationContainer.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/buildevents/BuildExceptionReporter.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/buildevents/BuildLogger.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/buildevents/BuildResultLogger.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/buildevents/TaskExecutionLogger.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/classpath/CachedClasspathTransformer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/classpath/DefaultCachedClasspathTransformer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/composite/CompositeBuildSettingsLoader.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/composite/CompositeContextBuilder.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/credentials/DefaultAwsCredentials.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/environment/GradleBuildEnvironment.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/exceptions/FailureResolutionAware.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/internal/exceptions/LocationAwareException.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/featurelifecycle/ScriptUsageLocationReporter.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/file/JarCache.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/filewatch/ChangeReporter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/filewatch/DefaultFileSystemChangeWaiterFactory.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/filewatch/DefaultFileWatcherFactory.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/filewatch/FileSystemChangeWaiter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/filewatch/FileSystemChangeWaiterFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/filewatch/FileWatcher.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/filewatch/FileWatcherEvent.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/filewatch/FileWatcherEventListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/filewatch/FileWatcherFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/filewatch/FileWatcherListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/filewatch/jdk7/Jdk7FileWatcherFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/filewatch/jdk7/WatchPointsRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/filewatch/jdk7/WatchServiceFileWatcherBacking.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/filewatch/jdk7/WatchServicePoller.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/filewatch/jdk7/WatchServiceRegistrar.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/graph/CachingDirectedGraphWalker.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/graph/DirectedGraph.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/graph/DirectedGraphRenderer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/graph/DirectedGraphWithEdgeValues.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/graph/GraphAggregator.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/graph/GraphNodeRenderer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/graph/GraphRenderer.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/html/SimpleHtmlWriter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/installation/CurrentGradleInstallation.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/installation/CurrentGradleInstallationLocator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/installation/GradleInstallation.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/installation/GradleRuntimeShadedJarDetector.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/invocation/BuildAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/invocation/BuildActionRunner.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/invocation/BuildController.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/metaobject/AbstractDynamicObject.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/metaobject/BeanDynamicObject.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/internal/metaobject/CompositeDynamicObject.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/metaobject/ConfigureDelegate.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/metaobject/DynamicObject.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/metaobject/GetPropertyResult.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/metaobject/InvokeMethodResult.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/metaobject/MixInClosurePropertiesAsMethodsDynamicObject.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/metaobject/SetPropertyResult.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/operations/logging/BuildOperationLogInfo.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/operations/logging/BuildOperationLogger.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/operations/logging/BuildOperationLoggerFactory.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/operations/logging/DefaultBuildOperationLogger.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/operations/logging/DefaultBuildOperationLoggerFactory.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/progress/BuildOperationDetails.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/progress/BuildOperationExecutor.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/progress/BuildOperationInternal.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/progress/BuildProgressFilter.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/progress/BuildProgressLogger.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/progress/DefaultBuildOperationExecutor.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/progress/InternalBuildListener.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/progress/LoggerProvider.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/progress/OperationIdGenerator.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/progress/OperationResult.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/progress/OperationStartEvent.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/progress/PercentageProgressFormatter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/progress/ProgressFormatter.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/progress/ProgressLoggerProvider.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/progress/SimpleProgressFormatter.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/resource/local/GroupedAndNamedUniqueFileStore.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/resource/local/PathKeyFileStore.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/resource/local/PathNormalisingKeyFileStore.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/resource/local/UniquePathKeyFileStore.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/service/scopes/BuildScopeServiceRegistryFactory.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/service/scopes/BuildScopeServices.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/service/scopes/BuildSessionScopeServices.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/internal/service/scopes/GlobalScopeServices.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/service/scopes/GradleScopeServices.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/service/scopes/PluginServiceRegistry.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/service/scopes/ProjectScopeServices.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/service/scopes/ServiceRegistryFactory.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/service/scopes/SettingsScopeServices.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/service/scopes/TaskExecutionServices.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/text/TreeFormatter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/CharSequenceNotationConverter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/CharSequenceNotationParser.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/ClosureToSpecNotationConverter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/CompositeNotationConverter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/DefaultTypeConverter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/EnumFromCharSequenceNotationParser.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/ErrorHandlingNotationParser.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/FlatteningNotationParser.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/JustReturningConverter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/MapKey.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/MapNotationConverter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/NormalizedTimeUnit.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/NotationConvertResult.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/NotationConverter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/NotationConverterToNotationParserAdapter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/NotationParser.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/NotationParserBuilder.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/TimeUnitsParser.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/TypeFilteringNotationConverter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/TypeInfo.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/typeconversion/TypedNotationConverter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/xml/SimpleMarkupWriter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/internal/xml/SimpleXmlWriter.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/xml/XmlTransformer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/internal/xml/XmlValidation.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/invocation/DefaultGradle.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/listener/ActionBroadcast.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/listener/ClosureBackedMethodInvocationDispatch.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/model/collection/internal/BridgedCollections.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/package-info.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/plugin/internal/InvalidPluginIdException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/plugin/internal/PluginId.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/repository/GradlePluginPortal.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/repository/IvyPluginRepository.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/repository/MavenPluginRepository.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/repository/PluginRepositoriesSpec.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/repository/PluginRepository.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/repository/internal/DefaultPluginRepositoriesSpec.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/repository/internal/PluginRepositoryFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/repository/internal/PluginRepositoryRegistry.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/repository/package-info.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/use/PluginDependenciesSpec.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/use/PluginDependencySpec.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/use/internal/DefaultPluginRequest.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/plugin/use/internal/DefaultPluginRequests.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/plugin/use/internal/InjectedPluginClasspath.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/plugin/use/internal/InvalidPluginRequestException.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/use/internal/PluginRequest.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/plugin/use/internal/PluginRequestApplicator.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/use/internal/PluginRequestCollector.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/plugin/use/internal/PluginRequests.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/use/internal/PluginRequestsSerializer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/plugin/use/internal/PluginUseScriptBlockMetadataExtractor.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/plugin/use/package-info.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/JavaExecSpec.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/process/JavaForkOptions.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/AbstractExecHandleBuilder.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/BadExitCodeException.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/CurrentProcess.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/DefaultExecAction.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/DefaultExecActionFactory.java
 create mode 100755 subprojects/core/src/main/java/org/gradle/process/internal/DefaultExecHandle.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/DefaultExecHandleBuilder.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/DefaultJavaExecAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/DefaultJavaForkOptions.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/DefaultProcessForkOptions.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/ExecAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/ExecActionFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/ExecHandleRunner.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/ExecHandleShutdownHookAction.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/JavaExecAction.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/JavaExecHandleBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/JavaExecHandleFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/JvmOptions.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/ProcessBuilderFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/ProcessSettings.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/package.html (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/shutdown/ShutdownHookActionRegister.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/streams/EncodedStream.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/streams/ExecOutputHandleRunner.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/streams/SafeStreams.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/streams/StreamsForwarder.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/internal/streams/StreamsHandler.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/DefaultMultiRequestWorkerProcessBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/DefaultSingleRequestWorkerProcessBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/DefaultWorkerProcess.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/DefaultWorkerProcessBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/DefaultWorkerProcessFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/GradleWorkerMain.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/MultiRequestWorkerProcessBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/SingleRequestWorkerProcessBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/WorkerControl.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/WorkerProcess.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/WorkerProcessBuilder.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/WorkerProcessContext.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/WorkerProcessException.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/WorkerProcessFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/WorkerProcessSettings.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/child/ActionExecutionWorker.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/child/ApplicationClassesInSystemClassLoaderWorkerFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/child/BootstrapSecurityManager.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/child/SystemApplicationClassLoaderWorker.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/child/WorkerContext.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/child/WorkerFactory.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/child/WorkerProcessClassPathProvider.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/request/Receiver.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/request/RequestProtocol.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/request/ResponseProtocol.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/process/internal/worker/request/WorkerAction.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/process/package-info.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/profile/BuildProfile.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/profile/CompositeOperation.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/profile/ContinuousOperation.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/profile/Operation.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/profile/ProfileEventAdapter.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/profile/ProfileListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/profile/ProfileReportRenderer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/profile/ProjectProfile.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/profile/ReportGeneratingProfileListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/profile/TaskExecution.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/reporting/CodePanelRenderer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/reporting/DurationFormatter.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/reporting/HtmlPageBuilder.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/reporting/HtmlReportBuilder.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/reporting/HtmlReportRenderer.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/reporting/ReportRenderer.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/reporting/TabbedPageRenderer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/reporting/TabsRenderer.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/testfixtures/ProjectBuilder.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/testfixtures/internal/InMemoryCacheFactory.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/testfixtures/internal/InMemoryIndexedCache.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/testfixtures/internal/ProjectBuilderImpl.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/testfixtures/internal/TestBuildScopeServices.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/testfixtures/internal/TestGlobalScopeServices.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/testfixtures/package-info.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/tooling/provider/model/ToolingModelBuilder.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/tooling/provider/model/ToolingModelBuilderRegistry.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/tooling/provider/model/UnknownModelException.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/tooling/provider/model/internal/DefaultToolingModelBuilderRegistry.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/tooling/provider/model/internal/LegacyConsumerInterface.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/tooling/provider/model/internal/ProjectSensitiveToolingModelBuilder.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/tooling/provider/model/package-info.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/util/AntUtil.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/BuildCommencedTimeProvider.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/BulkReadInputStream.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/ChangeListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/Clock.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/util/ConfigureUtil.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/util/DiffUtil.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/DisconnectableInputStream.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/util/DistributionLocator.java
 create mode 100644 subprojects/core/src/main/java/org/gradle/util/GFileUtils.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/JarUtil.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/NameMatcher.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/NoOpChangeListener.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/Path.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/StdinSwapper.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/Swapper.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/TreeVisitor.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/VersionNumber.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/WrapUtil.java (100%)
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/internal/ArgumentsSplitter.java (100%)
 create mode 100644 subprojects/core/src/main/java/org/gradle/util/internal/Java9ClassReader.java
 rename subprojects/core/src/main/{groovy => java}/org/gradle/util/internal/LimitedDescription.java (100%)
 create mode 100644 subprojects/core/src/main/resources/org/gradle/initialization/converted-types.txt
 create mode 100644 subprojects/core/src/main/resources/org/gradle/initialization/removed-types.txt
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/BuildExceptionReporterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/BuildResultLoggerTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/TaskExecutionLoggerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/AbstractDynamicObjectTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/AbstractTaskSpec.groovy
 delete 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/BeanWithDynamicProperties.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/ChainingTransformerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/ChainingTransformerTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/DependencyInjectingServiceLoaderTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/cache/GeneratedGradleJarCacheTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/rules/FileSnapshotTaskStateChangesTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/rules/TaskTypeTaskStateChangesTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/CachingTreeVisitorTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/DefaultFileCollectionSnapshotSerializerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/DefaultFileCollectionSnapshotTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/DefaultFileSnapshotterSerializerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/OutputFilesCollectionSnapshotSerializerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/OutputFilesSnapshotSerializerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/TaskFilePropertyCompareStrategyTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/TaskFilePropertyPathSensitivityTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/AbstractFileTreeElementTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/AbstractFileTreeElementTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/FileNormaliserTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/archive/TarCopyActionSpec.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/archive/TarCopyActionTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/collections/DefaultDirectoryWalkerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/collections/DefaultDirectoryWalkerTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/loadercache/FileClassPathSnapshotter.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/ant/AntLoggingAdapterTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactoryTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactoryTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTasks.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/taskfactory/DefaultTaskClassInfoStoreTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/AbstractTaskPropertyBuilderTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/execution/SkipCachedTaskExecuterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/logging/LoggingTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/DefaultPersistentDirectoryCacheTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/DefaultPersistentDirectoryCacheTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/btree/ByteInputTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/btree/ByteOutputTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/btree/KeyHasherTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/BuildFileProjectSpecTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/BuildFileProjectSpecTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/DefaultGradleLauncherSpec.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/DefaultGradleLauncherTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/DefaultSettingsLoaderTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/MixInLegacyTypesClassLoaderTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/ProjectDirectoryProjectSpecTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/ProjectDirectoryProjectSpecTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/SettingsHandlerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/UserHomeInitScriptFinderTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/UserHomeInitScriptFinderTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/buildevents/BuildExceptionReporterTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/buildevents/BuildResultLoggerTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/buildevents/TaskExecutionLoggerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/classpath/DefaultCachedClasspathTransformerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/featurelifecycle/LoggingDeprecatedFeatureHandlerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/file/JarCacheTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/filewatch/AbstractFileWatcherTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/filewatch/DefaultFileSystemChangeWaiterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/filewatch/DefaultFileWatcherFactoryNonJava7Test.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/filewatch/DefaultFileWatcherFactoryTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/installation/GradleFatJarTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/installation/GradleRuntimeShadedJarDetectorTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/metaobject/AbstractDynamicObjectTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/metaobject/BeanDynamicObjectTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/metaobject/CompositeDynamicObjectTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/metaobject/MixInClosurePropertiesAsMethodsDynamicObjectTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/service/scopes/TaskScopeServicesTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/ConsoleRendererTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/LoggingServiceRegistryTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/AbstractLineChoppingStyledTextOutputTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/AbstractStyledTextOutputTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/AnsiConsoleTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/ConsoleBackedProgressRendererTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/ConsoleStub.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/DefaultColorMapTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/DefaultLoggingManagerTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/DefaultProgressLoggerFactoryTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/DefaultStatusBarFormatterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/JavaUtilLoggingSystemTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/LinePrefixingStyledTextOutputTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/LogEventTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/LoggingBackedStyledTextOutputTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/LoggingCommandLineConverterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/LoggingSystemAdapterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/OutputEventRendererTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/OutputSpecification.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/PrintStreamLoggingSystemTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/ProgressLogEventGeneratorTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/StreamBackedStandardOutputListenerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/StreamingStyledTextOutputTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/StyledTextOutputBackedRendererTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/StyledTextOutputEventTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/TestColorMap.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/TextStreamOutputEventListenerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/progress/ProgressOperationsTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/slf4j/OutputEventListenerBackedLoggerContextTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/slf4j/OutputEventListenerBackedLoggerDefaultConfigurationTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/slf4j/OutputEventListenerBackedLoggerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/slf4j/Slf4jLoggingConfigurerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/process/internal/DefaultExecHandleBuilderTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/process/internal/DefaultWorkerProcessTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/process/internal/ExecHandleBuilderTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/process/internal/child/BootstrapSecurityManagerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/process/internal/child/EncodedStreamTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/process/internal/child/SerializableMockHelper.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProviderTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/process/internal/streams/EncodedStreamTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/process/internal/worker/DefaultWorkerProcessTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/process/internal/worker/child/BootstrapSecurityManagerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/process/internal/worker/child/SerializableMockHelper.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/process/internal/worker/child/WorkerProcessClassPathProviderTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/util/AvailablePortFinderTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/util/LinePerThreadBufferingOutputStreamTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/util/SingleMessageLoggerTest.groovy
 create mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/api/tasks/AbstractConventionTaskTest.groovy
 delete mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/api/tasks/AbstractConventionTaskTest.java
 create mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/api/tasks/AbstractTaskTest.groovy
 delete mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/api/tasks/AbstractTaskTest.java
 delete mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/logging/ConfigureLogging.groovy
 delete mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/logging/TestOutputEventListener.groovy
 delete mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/logging/TestStyledTextOutput.groovy
 delete mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/logging/TestStyledTextOutputFactory.java
 delete mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/messaging/actor/TestActorFactory.java
 create mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/test/fixtures/AbstractProjectBuilderSpec.groovy
 delete mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/ResolveTestFixture.groovy
 delete 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/maven/MavenScopesAndProjectDependencySubstitutionIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenScopesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/maven/MixedMavenAndIvyModulesIntegrationTest.groovy
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/component/DefaultBuildIdentifier.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/configurations/ConflictResolution.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/CacheLockingArtifactResolver.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ContextualArtifactResolver.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyDependencyPublisher.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/IvyBackedArtifactPublisher.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/IvyContextualArtifactPublisher.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/IvyContextualMetaDataParser.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/IvyDependencyPublisher.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/IvyModuleDescriptorWriter.java
 delete 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/dependencysubstitution/DependencySubstitutionRules.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DependencyResolverIdentifier.java
 delete 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/parser/IvyModuleDescriptorConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyModuleResolveMetaDataBuilder.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ResolverStrategy.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/IvyModuleCacheEntry.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/MavenModuleCacheEntry.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorCacheEntry.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorCacheEntrySerializer.java
 delete 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/ModuleMetadataCacheEntry.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleMetadataCacheEntrySerializer.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleMetadataSerializer.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleMetadataStore.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ReflectiveDependencyDescriptorFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/projectmodule/AggregatingProjectArtifactBuilder.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/projectmodule/CacheLockReleasingProjectArtifactBuilder.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/projectmodule/DefaultLocalComponentRegistry.java
 delete 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/DefaultProjectLocalComponentProvider.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/projectmodule/LocalComponentProvider.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/projectmodule/LocalComponentRegistry.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectArtifactBuilder.java
 delete 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/ProjectDependencyComponentArtifacts.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectLocalComponentProvider.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/publisher/DefaultIvyDependencyPublisher.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/publisher/IvyBackedArtifactPublisher.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/publisher/IvyDependencyPublisher.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/publisher/IvyModuleDescriptorWriter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/publisher/IvyXmlModuleDescriptorWriter.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DefaultDependencyToConfigurationResolver.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DefaultModuleResolutionFilter.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyToConfigurationResolver.java
 delete 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/excludes/AbstractCompositeExclusion.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/excludes/AbstractModuleExclusion.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/excludes/ArtifactExcludeSpec.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/excludes/ExcludeAllModulesSpec.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/excludes/ExcludeNone.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/excludes/GroupNameExcludeSpec.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/excludes/IntersectionExclusion.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/excludes/IvyPatternMatcherExcludeRuleSpec.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/excludes/ModuleExclusion.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/excludes/ModuleExclusions.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/excludes/ModuleIdExcludeSpec.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/excludes/ModuleNameExcludeSpec.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/excludes/PatternMatchers.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/excludes/UnionExclusion.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/ComponentResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/DependencyGraphComponent.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/DependencyResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/BuildIdentifierSerializer.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentResultSerializer.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultComponentResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultDependencyResult.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultInternalDependencyResult.java
 delete 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/DependencyResultSerializer.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/InternalDependencyResult.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/InternalDependencyResultSerializer.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ModuleVersionSelection.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ModuleVersionSelectionSerializer.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ResolutionResultBuilder.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ResolutionResultDependencyGraphVisitor.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/AuthenticationSupporter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/repositories/resolver/ComponentMetadataAdapter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/composite/CompositeBuildContext.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/composite/CompositeBuildIdeProjectResolver.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/impldeps/GradleImplDepsJarType.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/impldeps/GradleImplDepsProvider.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/impldeps/GradleImplDepsRelocatedJar.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/impldeps/GradleImplDepsRelocatedJarCreator.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/impldeps/GradleImplDepsRelocator.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/impldeps/RelocatedJarCreator.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/runtimeshaded/ImplementationDependencyRelocator.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/runtimeshaded/PackageListGenerator.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/runtimeshaded/RuntimeShadedJarCreator.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/runtimeshaded/RuntimeShadedJarFactory.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/runtimeshaded/RuntimeShadedJarType.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/runtimeshaded/Trie.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/descriptor/Artifact.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/descriptor/Configuration.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/descriptor/DefaultExclude.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/descriptor/MavenScope.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/descriptor/ModuleDescriptorState.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/descriptor/MutableModuleDescriptorState.java
 delete 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/AbstractModuleComponentResolveMetadata.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/AbstractMutableModuleComponentResolveMetadata.java
 delete 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/BuildableIvyModulePublishMetadata.java
 delete 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/DefaultIvyModuleArtifactPublishMetadata.java
 delete 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/DefaultIvyModulePublishMetadata.java
 delete 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/DefaultIvyModuleResolveMetadata.java
 delete 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/DefaultMavenModuleResolveMetadata.java
 delete 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/DefaultModuleComponentArtifactMetadata.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultMutableIvyModuleResolveMetadata.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultMutableMavenModuleResolveMetadata.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/FixedComponentArtifacts.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/IvyDependencyMetadata.java
 delete 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/IvyModuleArtifactPublishMetadata.java
 delete 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/IvyModulePublishMetadata.java
 delete 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/IvyModuleResolveMetadata.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/MavenDependencyMetadata.java
 delete 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/MavenModuleResolveMetadata.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/MetadataSourcedComponentArtifacts.java
 delete 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/ModuleComponentArtifactMetadata.java
 delete 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/ModuleComponentResolveMetadata.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/MutableIvyModuleResolveMetadata.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/MutableMavenModuleResolveMetadata.java
 delete 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/external/model/MutableModuleComponentResolveMetadata.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/BuildableLocalComponentMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/BuildableLocalComponentMetadata.java
 delete 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/DefaultLocalComponentMetadata.java
 delete 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/DefaultProjectDependencyMetadata.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/DslOriginDependencyMetaData.java
 delete 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/DslOriginDependencyMetadata.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/DslOriginDependencyMetadataWrapper.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/LocalComponentArtifactIdentifier.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/LocalComponentArtifactMetadata.java
 delete 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/LocalComponentMetadata.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/LocalConfigurationMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/LocalConfigurationMetadata.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/MissingLocalArtifactMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/MissingLocalArtifactMetadata.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/PublishArtifactLocalArtifactMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/PublishArtifactLocalArtifactMetadata.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/local/model/UsageKind.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/AbstractModuleDescriptorBackedMetaData.java
 delete 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/ComponentArtifactMetadata.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/ComponentArtifacts.java
 delete 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/ComponentResolveMetadata.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/ComponentUsage.java
 delete 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/ConfigurationMetadata.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/ConfigurationNotFoundException.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/DefaultComponentUsage.java
 delete 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/DefaultDependencyMetadata.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/DefaultModuleDescriptorArtifactMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/DefaultModuleDescriptorArtifactMetadata.java
 delete 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/DependencyMetadata.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/Exclude.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/LocalComponentDependencyMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/LocalComponentDependencyMetadata.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/LocalOriginDependencyMetadata.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/ModuleDescriptorArtifactMetaData.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/component/model/ModuleDescriptorArtifactMetadata.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/ArtifactResolveResult.java
 delete 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/BuildableComponentArtifactsResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/BuildableTypedResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/DefaultBuildableComponentArtifactsResolveResult.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/internal/resolve/result/DefaultBuildableTypedResolveResult.java
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultLenientConfigurationTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyModuleResolveMetadataBuilderTest.groovy
 delete 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/modulecache/ModuleMetadataStoreTest.groovy
 delete mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ReflectiveDependencyDescriptorFactoryTest.groovy
 delete 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/excludes/DefaultModuleExclusionTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentResultSerializerTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DependencyResultSerializerTest.groovy
 delete mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/InternalDependencyResultSerializerTest.groovy
 delete mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ModuleVersionSelectionSerializerTest.groovy
 delete mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/impldeps/GradleImplDepsProviderTest.groovy
 delete mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/impldeps/GradleImplDepsRelocatedJarCreatorTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/runtimeshaded/RuntimeShadedJarCreatorTest.groovy
 delete 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/AbstractModuleComponentResolveMetadataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/AbstractMutableModuleComponentResolveMetadataTest.groovy
 delete mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/BuildableIvyModuleResolveMetaDataTest.groovy
 delete 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/DefaultIvyModulePublishMetadataTest.groovy
 delete 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/DefaultIvyModuleResolveMetadataTest.groovy
 delete 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/DefaultMavenModuleResolveMetadataTest.groovy
 delete 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/DefaultModuleComponentArtifactMetadataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/DefaultMutableIvyModuleResolveMetadataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/DefaultMutableMavenModuleResolveMetadataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/IvyDependencyMetadataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/MavenDependencyMetadataTest.groovy
 delete 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/DefaultLocalComponentMetadataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/local/model/DefaultProjectDependencyMetadataTest.groovy
 delete mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/local/model/MissingLocalArtifactMetaDataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/local/model/MissingLocalArtifactMetadataTest.groovy
 delete 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/DefaultDependencyMetadataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/component/model/LocalComponentDependencyMetadataTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/internal/resolve/result/DefaultBuildableTypedResolveResultTest.groovy
 create mode 100644 subprojects/dependency-management/src/testFixtures/groovy/org/gradle/integtests/fixtures/resolve/ResolveTestFixture.groovy
 create mode 100644 subprojects/dependency-management/src/testFixtures/groovy/org/gradle/internal/component/local/model/TestComponentIdentifiers.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/plugins/ProjectReportsPluginConvention.groovy
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/components/ComponentReport.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/components/internal/ComponentReportRenderer.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/DependencyReportContainer.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/HtmlDependencyReportTask.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/internal/HtmlDependencyReporter.groovy
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/internal/JsonProjectDependencyRenderer.groovy
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/internal/ProjectPageRenderer.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/internal/ProjectsPageRenderer.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/model/ModelReport.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/model/internal/ModelNodeRenderer.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/AbstractDependencyReportTask.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/AbstractReportTask.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/BuildEnvironmentReportTask.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/DependencyInsightReportTask.groovy
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/ProjectReportTask.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/TaskReportTask.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/ReportGenerator.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/ReportRenderer.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/TaskReportRenderer.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/TextReportRenderer.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/dependencies/AsciiDependencyReportRenderer.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/graph/DependencyGraphRenderer.groovy
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/graph/NodeRenderer.groovy
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/graph/SimpleNodeRenderer.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/graph/nodes/RequestedVersion.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/insight/DependencyInsightReporter.groovy
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/text/DefaultTextReportBuilder.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/text/TextReportBuilder.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/configuration/Help.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/configuration/TaskDetailPrinter.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/plugins/HelpTasksPlugin.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/plugins/ProjectReportsPlugin.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/plugins/ProjectReportsPluginConvention.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/plugins/internal/HelpTasksAutoApplyAction.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/reporting/components/ComponentReport.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/components/internal/AbstractBinaryRenderer.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/components/internal/BinaryRenderer.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/components/internal/ComponentRenderer.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/reporting/components/internal/ComponentReportRenderer.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/components/internal/DiagnosticsServices.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/components/internal/RendererUtils.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/components/internal/SourceSetRenderer.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/components/internal/TrackingReportRenderer.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/components/internal/TypeAwareBinaryRenderer.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/components/package-info.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependencies/DependencyReportContainer.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependencies/HtmlDependencyReportTask.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/dependencies/internal/DefaultDependencyReportContainer.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependencies/internal/HtmlDependencyReporter.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependencies/internal/JsonProjectDependencyRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependencies/internal/ProjectPageRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/reporting/dependencies/internal/ProjectsPageRenderer.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/dependencies/internal/StrictDependencyResultSpec.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/dependencies/package-info.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/reporting/model/ModelReport.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/reporting/model/internal/ModelNodeRenderer.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/model/internal/TextModelReportRenderer.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/reporting/model/package-info.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/AbstractDependencyReportTask.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/AbstractReportTask.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/BuildEnvironmentReportTask.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/DependencyInsightReportTask.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/DependencyReportTask.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/ProjectReportTask.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/PropertyReportTask.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/TaskReportTask.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/AggregateMultiProjectTaskReportModel.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/DefaultGroupTaskReportModel.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/DependencyReportRenderer.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/ProjectReportGenerator.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/PropertyReportRenderer.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/internal/ReportGenerator.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/internal/ReportRenderer.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/SingleProjectTaskReportModel.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/TaskDetails.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/TaskDetailsFactory.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/TaskReportModel.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/internal/TaskReportRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/internal/TextReportRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/internal/dependencies/AsciiDependencyReportRenderer.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/dsl/DependencyResultSpec.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/dsl/DependencyResultSpecNotationConverter.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/internal/graph/DependencyGraphRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/internal/graph/NodeRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/internal/graph/SimpleNodeRenderer.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/graph/nodes/AbstractRenderableDependencyResult.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/graph/nodes/AbstractRenderableModuleResult.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/graph/nodes/DependencyEdge.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/graph/nodes/DependencyReportHeader.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/graph/nodes/InvertedRenderableModuleResult.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/graph/nodes/RenderableDependency.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/graph/nodes/RenderableDependencyResult.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/graph/nodes/RenderableModuleResult.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/graph/nodes/RenderableUnresolvedDependencyResult.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/internal/graph/nodes/RequestedVersion.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/graph/nodes/ResolvedDependencyEdge.java (100%)
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/graph/nodes/UnresolvedDependencyEdge.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/internal/insight/DependencyInsightReporter.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/internal/insight/DependencyResultSorter.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/internal/text/DefaultTextReportBuilder.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/api/tasks/diagnostics/internal/text/TextReportBuilder.java
 rename subprojects/diagnostics/src/main/{groovy => java}/org/gradle/api/tasks/diagnostics/package-info.java (100%)
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/configuration/Help.java
 create mode 100644 subprojects/diagnostics/src/main/java/org/gradle/configuration/TaskDetailPrinter.java
 create mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/tasks/diagnostics/internal/TextReportRendererSpec.groovy
 delete mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/tasks/diagnostics/internal/TextReportRendererTest.groovy
 create mode 100644 subprojects/docs/src/docs/css/icon-link.svg
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.initialization.ConfigurableIncludedBuild.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.initialization.IncludedBuild.xml
 copy subprojects/docs/src/docs/dsl/{org.gradle.platform.base.ComponentSpec.xml => org.gradle.model.ModelElement.xml} (100%)
 copy subprojects/docs/src/docs/dsl/{org.gradle.api.artifacts.repositories.AuthenticationContainer.xml => org.gradle.nativeplatform.test.cunit.CUnitTestSuiteBinarySpec.xml} (100%)
 copy subprojects/docs/src/docs/dsl/{org.gradle.nativeplatform.test.googletest.GoogleTestTestSuiteSpec.xml => org.gradle.nativeplatform.test.googletest.GoogleTestTestSuiteBinarySpec.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.plugin.repository.GradlePluginPortal.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.plugin.repository.IvyPluginRepository.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.plugin.repository.MavenPluginRepository.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.plugin.repository.PluginRepositoriesSpec.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.plugin.repository.PluginRepository.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.sonar.runner.SonarProperties.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.sonar.runner.SonarRunnerExtension.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.sonar.runner.SonarRunnerRootExtension.xml
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.sonar.runner.tasks.SonarRunner.xml
 create mode 100644 subprojects/docs/src/docs/userguide/compositeBuilds.xml
 create mode 100644 subprojects/docs/src/docs/userguide/img/pluginMarkers.png
 create mode 100644 subprojects/docs/src/docs/userguide/img/taskInputsOutputs.graffle
 create mode 100644 subprojects/docs/src/docs/userguide/img/taskInputsOutputs.png
 create mode 100644 subprojects/docs/src/docs/userguide/licenses.xml
 delete mode 100644 subprojects/docs/src/docs/userguide/sonarPlugin.xml
 delete mode 100644 subprojects/docs/src/docs/userguide/sonarRunnerPlugin.xml
 delete mode 100644 subprojects/docs/src/samples/compositeBuild/build.gradle
 delete mode 100644 subprojects/docs/src/samples/compositeBuild/projects/project1/build.gradle
 delete mode 100644 subprojects/docs/src/samples/compositeBuild/projects/project1/settings.gradle
 delete mode 100644 subprojects/docs/src/samples/compositeBuild/projects/project2/build.gradle
 delete mode 100644 subprojects/docs/src/samples/compositeBuild/projects/project2/settings.gradle
 delete mode 100644 subprojects/docs/src/samples/compositeBuild/projects/project3/build.gradle
 delete mode 100644 subprojects/docs/src/samples/compositeBuild/projects/project3/settings.gradle
 delete mode 100644 subprojects/docs/src/samples/compositeBuild/readme.xml
 delete mode 100644 subprojects/docs/src/samples/compositeBuild/settings.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/basic/README.md
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/basic/composite/build.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/basic/composite/settings.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/basic/my-app/build.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/basic/my-app/settings-composite.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/basic/my-app/settings.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/basic/my-app/src/main/java/org/sample/myapp/Main.java
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/basic/my-utils/build.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/basic/my-utils/number-utils/src/main/java/org/sample/numberutils/Numbers.java
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/basic/my-utils/settings.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/basic/my-utils/string-utils/src/main/java/org/sample/stringutils/Strings.java
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/declared-substitution/README.md
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/declared-substitution/anonymous-library/build.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/declared-substitution/anonymous-library/settings.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/declared-substitution/anonymous-library/src/main/java/org/sample/numberutils/Numbers.java
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/declared-substitution/my-app/build.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/declared-substitution/my-app/settings-without-declared-substitution.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/declared-substitution/my-app/settings.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/declared-substitution/my-app/src/main/java/org/sample/myapp/Main.java
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/hierarchical-multirepo/README.md
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/hierarchical-multirepo/multirepo-app/build.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/hierarchical-multirepo/multirepo-app/modules/number-utils/build.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/hierarchical-multirepo/multirepo-app/modules/number-utils/settings.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/hierarchical-multirepo/multirepo-app/modules/number-utils/src/main/java/org/sample/numberutils/Numbers.java
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/hierarchical-multirepo/multirepo-app/modules/string-utils/build.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/hierarchical-multirepo/multirepo-app/modules/string-utils/settings.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/hierarchical-multirepo/multirepo-app/modules/string-utils/src/main/java/org/sample/stringutils/Strings.java
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/hierarchical-multirepo/multirepo-app/settings.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/hierarchical-multirepo/multirepo-app/src/main/java/org/sample/myapp/Main.java
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/plugin-dev/README.md
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/plugin-dev/consumer/build.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/plugin-dev/consumer/settings.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/plugin-dev/greeting-plugin/build.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/plugin-dev/greeting-plugin/settings.gradle
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/plugin-dev/greeting-plugin/src/main/java/org/sample/GreetingPlugin.java
 create mode 100644 subprojects/docs/src/samples/compositeBuilds/plugin-dev/greeting-plugin/src/main/java/org/sample/GreetingTask.java
 create mode 100644 subprojects/docs/src/samples/groovy/crossCompilation/build.gradle
 create mode 100644 subprojects/docs/src/samples/groovy/crossCompilation/gradle.properties
 create mode 100755 subprojects/docs/src/samples/groovy/crossCompilation/readme.xml
 copy subprojects/docs/src/samples/groovy/{mixedJavaAndGroovy => crossCompilation}/src/main/groovy/org/gradle/GroovyPerson.groovy (100%)
 create mode 100644 subprojects/docs/src/samples/groovy/crossCompilation/src/main/groovy/org/gradle/JavaPerson.java
 copy subprojects/docs/src/samples/groovy/{mixedJavaAndGroovy => crossCompilation}/src/main/groovy/org/gradle/PersonList.groovy (100%)
 copy subprojects/docs/src/samples/groovy/{mixedJavaAndGroovy => crossCompilation}/src/main/java/org/gradle/Person.java (100%)
 copy subprojects/docs/src/samples/groovy/{mixedJavaAndGroovy => crossCompilation}/src/test/groovy/org/gradle/PersonTest.groovy (100%)
 create mode 100644 subprojects/docs/src/samples/java/crossCompilation/build.gradle
 create mode 100644 subprojects/docs/src/samples/java/crossCompilation/gradle.properties
 create mode 100755 subprojects/docs/src/samples/java/crossCompilation/readme.xml
 rename subprojects/docs/src/samples/{sonar/quickstart => java/crossCompilation}/src/main/java/org/gradle/Person.java (100%)
 copy subprojects/docs/src/samples/java/{quickstart => crossCompilation}/src/main/resources/org/gradle/resource.xml (100%)
 create mode 100644 subprojects/docs/src/samples/java/crossCompilation/src/test/java/org/gradle/PersonTest.java
 copy subprojects/docs/src/samples/java/{quickstart => crossCompilation}/src/test/resources/org/gradle/test-resource.xml (100%)
 delete mode 100644 subprojects/docs/src/samples/javaGradlePlugin/src/main/resources/META-INF/gradle-plugins/simple-plugin.properties
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/build.gradle
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/ivy-repo/org.gradle.sample.goodbye/org.gradle.sample.goodbye.gradle.plugin/1.0.0/ivy-1.0.0.xml
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/ivy-repo/org.gradle.sample.goodbye/org.gradle.sample.goodbye.gradle.plugin/1.0.0/ivy-1.0.0.xml.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/ivy-repo/org.gradle.sample.hello/org.gradle.sample.hello.gradle.plugin/1.0.0/ivy-1.0.0.xml
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/ivy-repo/org.gradle.sample.hello/org.gradle.sample.hello.gradle.plugin/1.0.0/ivy-1.0.0.xml.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/ivy-repo/org.gradle.sample/sample-plugins/1.0.0/ivy-1.0.0.xml
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/ivy-repo/org.gradle.sample/sample-plugins/1.0.0/ivy-1.0.0.xml.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/ivy-repo/org.gradle.sample/sample-plugins/1.0.0/sample-plugins-1.0.0.jar.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/goodbye/org.gradle.sample.goodbye.gradle.plugin/1.0.0/org.gradle.sample.goodbye.gradle.plugin-1.0.0.pom
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/goodbye/org.gradle.sample.goodbye.gradle.plugin/1.0.0/org.gradle.sample.goodbye.gradle.plugin-1.0.0.pom.md5
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/goodbye/org.gradle.sample.goodbye.gradle.plugin/1.0.0/org.gradle.sample.goodbye.gradle.plugin-1.0.0.pom.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/goodbye/org.gradle.sample.goodbye.gradle.plugin/maven-metadata.xml
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/goodbye/org.gradle.sample.goodbye.gradle.plugin/maven-metadata.xml.md5
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/goodbye/org.gradle.sample.goodbye.gradle.plugin/maven-metadata.xml.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/hello/org.gradle.sample.hello.gradle.plugin/1.0.0/org.gradle.sample.hello.gradle.plugin-1.0.0.pom
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/hello/org.gradle.sample.hello.gradle.plugin/1.0.0/org.gradle.sample.hello.gradle.plugin-1.0.0.pom.md5
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/hello/org.gradle.sample.hello.gradle.plugin/1.0.0/org.gradle.sample.hello.gradle.plugin-1.0.0.pom.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/hello/org.gradle.sample.hello.gradle.plugin/maven-metadata.xml
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/hello/org.gradle.sample.hello.gradle.plugin/maven-metadata.xml.md5
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/hello/org.gradle.sample.hello.gradle.plugin/maven-metadata.xml.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/sample-plugins/1.0.0/sample-plugins-1.0.0.jar.md5
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/sample-plugins/1.0.0/sample-plugins-1.0.0.jar.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/sample-plugins/1.0.0/sample-plugins-1.0.0.pom
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/sample-plugins/1.0.0/sample-plugins-1.0.0.pom.md5
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/sample-plugins/1.0.0/sample-plugins-1.0.0.pom.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/sample-plugins/maven-metadata.xml
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/sample-plugins/maven-metadata.xml.md5
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/maven-repo/org/gradle/sample/sample-plugins/maven-metadata.xml.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/consuming/settings.gradle
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/build.gradle
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/goodbye/org.gradle.sample.goodbye.gradle.plugin/1.0.0/org.gradle.sample.goodbye.gradle.plugin-1.0.0.pom
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/goodbye/org.gradle.sample.goodbye.gradle.plugin/1.0.0/org.gradle.sample.goodbye.gradle.plugin-1.0.0.pom.md5
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/goodbye/org.gradle.sample.goodbye.gradle.plugin/1.0.0/org.gradle.sample.goodbye.gradle.plugin-1.0.0.pom.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/goodbye/org.gradle.sample.goodbye.gradle.plugin/maven-metadata.xml
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/goodbye/org.gradle.sample.goodbye.gradle.plugin/maven-metadata.xml.md5
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/goodbye/org.gradle.sample.goodbye.gradle.plugin/maven-metadata.xml.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/hello/org.gradle.sample.hello.gradle.plugin/1.0.0/org.gradle.sample.hello.gradle.plugin-1.0.0.pom
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/hello/org.gradle.sample.hello.gradle.plugin/1.0.0/org.gradle.sample.hello.gradle.plugin-1.0.0.pom.md5
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/hello/org.gradle.sample.hello.gradle.plugin/1.0.0/org.gradle.sample.hello.gradle.plugin-1.0.0.pom.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/hello/org.gradle.sample.hello.gradle.plugin/maven-metadata.xml
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/hello/org.gradle.sample.hello.gradle.plugin/maven-metadata.xml.md5
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/hello/org.gradle.sample.hello.gradle.plugin/maven-metadata.xml.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/sample-plugins/1.0.0/sample-plugins-1.0.0.jar.md5
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/sample-plugins/1.0.0/sample-plugins-1.0.0.jar.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/sample-plugins/1.0.0/sample-plugins-1.0.0.pom
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/sample-plugins/1.0.0/sample-plugins-1.0.0.pom.md5
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/sample-plugins/1.0.0/sample-plugins-1.0.0.pom.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/sample-plugins/maven-metadata.xml
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/sample-plugins/maven-metadata.xml.md5
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/maven-repo/org/gradle/sample/sample-plugins/maven-metadata.xml.sha1
 create mode 100644 subprojects/docs/src/samples/plugins/multiproject/settings.gradle
 create mode 100644 subprojects/docs/src/samples/plugins/publishing/build.gradle
 create mode 100644 subprojects/docs/src/samples/plugins/publishing/settings.gradle
 create mode 100644 subprojects/docs/src/samples/plugins/publishing/src/main/java/org/gradle/sample/goodbye/GoodbyePlugin.java
 create mode 100644 subprojects/docs/src/samples/plugins/publishing/src/main/java/org/gradle/sample/hello/HelloPlugin.java
 create mode 100644 subprojects/docs/src/samples/plugins/readme.xml
 create mode 100644 subprojects/docs/src/samples/scala/crossCompilation/build.gradle
 create mode 100644 subprojects/docs/src/samples/scala/crossCompilation/gradle.properties
 create mode 100755 subprojects/docs/src/samples/scala/crossCompilation/readme.xml
 copy subprojects/docs/src/samples/scala/{mixedJavaAndScala => crossCompilation}/src/main/java/org/gradle/sample/Person.java (100%)
 create mode 100644 subprojects/docs/src/samples/scala/crossCompilation/src/main/scala/org/gradle/sample/impl/JavaPerson.java
 copy subprojects/docs/src/samples/scala/{mixedJavaAndScala => crossCompilation}/src/main/scala/org/gradle/sample/impl/PersonImpl.scala (100%)
 copy subprojects/docs/src/samples/scala/{mixedJavaAndScala => crossCompilation}/src/main/scala/org/gradle/sample/impl/PersonList.scala (100%)
 create mode 100644 subprojects/docs/src/samples/scala/crossCompilation/src/test/scala/org/gradle/sample/PersonTest.scala
 delete mode 100644 subprojects/docs/src/samples/sonar/advanced/build.gradle
 delete mode 100644 subprojects/docs/src/samples/sonar/multiProject/build.gradle
 delete mode 100644 subprojects/docs/src/samples/sonar/multiProject/settings.gradle
 delete mode 100644 subprojects/docs/src/samples/sonar/quickstart/build.gradle
 delete mode 100644 subprojects/docs/src/samples/sonarRunner/advanced/build.gradle
 delete mode 100644 subprojects/docs/src/samples/sonarRunner/advanced/src/main/java/org/gradle/Person.java
 delete mode 100644 subprojects/docs/src/samples/sonarRunner/advanced/src/test/java/org/gradle/PersonTest.java
 delete mode 100644 subprojects/docs/src/samples/sonarRunner/multiProject/build.gradle
 delete mode 100644 subprojects/docs/src/samples/sonarRunner/multiProject/settings.gradle
 delete mode 100644 subprojects/docs/src/samples/sonarRunner/quickstart/build.gradle
 delete mode 100644 subprojects/docs/src/samples/sonarRunner/quickstart/src/test/java/org/gradle/PersonTest.java
 delete mode 100644 subprojects/docs/src/samples/testing/testng/java-jdk14-passing/build.gradle
 delete mode 100644 subprojects/docs/src/samples/testing/testng/java-jdk14-passing/src/test/java/org/gradle/OkTest.java
 delete mode 100644 subprojects/docs/src/samples/testing/testng/java-jdk15-passing/build.gradle
 delete mode 100644 subprojects/docs/src/samples/testing/testng/java-jdk15-passing/src/main/java/org/gradle/Ok.java
 create mode 100644 subprojects/docs/src/samples/testing/testng/java-passing/build.gradle
 rename subprojects/docs/src/samples/testing/testng/{java-jdk14-passing => java-passing}/src/main/java/org/gradle/Ok.java (100%)
 rename subprojects/docs/src/samples/testing/testng/{java-jdk15-passing => java-passing}/src/test/java/org/gradle/AbstractTest.java (100%)
 rename subprojects/docs/src/samples/testing/testng/{java-jdk15-passing => java-passing}/src/test/java/org/gradle/ConcreteTest.java (100%)
 rename subprojects/docs/src/samples/testing/testng/{java-jdk15-passing => java-passing}/src/test/java/org/gradle/OkTest.java (100%)
 rename subprojects/docs/src/samples/testing/testng/{java-jdk15-passing => java-passing}/src/test/java/org/gradle/SuiteCleanup.java (100%)
 rename subprojects/docs/src/samples/testing/testng/{java-jdk15-passing => java-passing}/src/test/java/org/gradle/SuiteSetup.java (100%)
 rename subprojects/docs/src/samples/testing/testng/{java-jdk15-passing => java-passing}/src/test/java/org/gradle/TestCleanup.java (100%)
 rename subprojects/docs/src/samples/testing/testng/{java-jdk15-passing => java-passing}/src/test/java/org/gradle/TestSetup.java (100%)
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-models/build.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-models/projects/project1/build.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-models/projects/project1/settings.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-models/projects/project2/build.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-models/projects/project2/settings.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-models/projects/project3/build.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-models/projects/project3/settings.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-models/readme.xml
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-models/src/main/java/org/gradle/sample/Main.java
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-tasks/build.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-tasks/projects/project1/build.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-tasks/projects/project1/settings.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-tasks/projects/project2/build.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-tasks/projects/project2/settings.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-tasks/projects/project3/build.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-tasks/projects/project3/settings.gradle
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-tasks/readme.xml
 delete mode 100644 subprojects/docs/src/samples/toolingApi/composite-tasks/src/main/java/org/gradle/sample/Main.java
 create mode 100644 subprojects/docs/src/samples/userguide/ant/antLogging/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/scala/zincDependency/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/scala/zincOverride/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/incrementalBuild/customTaskClass/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/incrementalBuild/customTaskClass/buildSrc/src/main/java/org/example/ProcessTemplates.java
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/incrementalBuild/customTaskClass/buildSrc/src/main/java/org/example/ProcessTemplatesNoAnnotations.java
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/incrementalBuild/customTaskClass/buildSrc/src/main/java/org/example/TemplateData.java
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/incrementalBuild/customTaskClass/buildSrc/src/main/java/org/example/TemplateEngineType.java
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/incrementalBuild/customTaskClass/src/templates/README.md
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/incrementalBuild/incrementalBuildAdvanced/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/incrementalBuild/incrementalBuildAdvanced/buildSrc/src/main/java/org/example/Instrument.java
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/incrementalBuild/incrementalBuildAdvanced/buildSrc/src/main/java/org/example/ProcessTemplates.java
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/incrementalBuild/incrementalBuildAdvanced/buildSrc/src/main/java/org/example/TemplateData.java
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/incrementalBuild/incrementalBuildAdvanced/buildSrc/src/main/java/org/example/TemplateEngineType.java
 rename subprojects/docs/src/samples/{sonarRunner/quickstart => userguide/tasks/incrementalBuild/incrementalBuildAdvanced}/src/main/java/org/gradle/Person.java (100%)
 copy subprojects/docs/src/samples/{java/quickstart => userguide/tasks/incrementalBuild/incrementalBuildAdvanced}/src/main/resources/org/gradle/resource.xml (100%)
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/incrementalBuild/incrementalBuildAdvanced/src/templates/README.md
 rename subprojects/docs/src/samples/{sonar/quickstart => userguide/tasks/incrementalBuild/incrementalBuildAdvanced}/src/test/java/org/gradle/PersonTest.java (100%)
 copy subprojects/docs/src/samples/{java/quickstart => userguide/tasks/incrementalBuild/incrementalBuildAdvanced}/src/test/resources/org/gradle/test-resource.xml (100%)
 create mode 100644 subprojects/docs/src/samples/userguide/tutorial/rerun/README.md
 create mode 100644 subprojects/docs/src/samples/userguide/tutorial/rerun/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/tutorial/rerun/build/README.md
 create mode 100644 subprojects/docs/src/samples/userguideOutput/antLogging.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/compositeBuilds_basic_cli.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/customTaskClassWithInputOutputAnnotations.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/customTaskClassWithInputOutputAnnotationsUpToDate.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalAdHocTask.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalAdHocTaskUpToDate.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalBuildBadInputFilesConfig.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalBuildCustomMethods.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalBuildCustomMethodsWithTaskArg.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalBuildInputFilesConfig.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalBuildInputFilesConfigUsingTask.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalBuildUpToDateWhen.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalBuildUpToDateWhenAgain.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/inferredTaskDep.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/inferredTaskDep2.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/inferredTaskDependencyWithBuiltBy.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/noRerunTasks.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/rerunTasks.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/runtimeIncrementalApi.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/runtimeIncrementalApiConfiguration.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/runtimeIncrementalApiUpToDate.out
 delete mode 100644 subprojects/ear/src/main/groovy/org/gradle/plugins/ear/Ear.groovy
 delete mode 100644 subprojects/ear/src/main/groovy/org/gradle/plugins/ear/EarPluginConvention.groovy
 delete mode 100644 subprojects/ear/src/main/groovy/org/gradle/plugins/ear/descriptor/DeploymentDescriptor.java
 delete mode 100644 subprojects/ear/src/main/groovy/org/gradle/plugins/ear/descriptor/EarModule.java
 delete mode 100644 subprojects/ear/src/main/groovy/org/gradle/plugins/ear/descriptor/EarSecurityRole.java
 delete mode 100644 subprojects/ear/src/main/groovy/org/gradle/plugins/ear/descriptor/EarWebModule.java
 delete mode 100644 subprojects/ear/src/main/groovy/org/gradle/plugins/ear/descriptor/internal/DefaultDeploymentDescriptor.groovy
 delete mode 100644 subprojects/ear/src/main/groovy/org/gradle/plugins/ear/descriptor/internal/DefaultEarModule.groovy
 delete mode 100644 subprojects/ear/src/main/groovy/org/gradle/plugins/ear/descriptor/internal/DefaultEarSecurityRole.groovy
 delete mode 100644 subprojects/ear/src/main/groovy/org/gradle/plugins/ear/descriptor/internal/DefaultEarWebModule.groovy
 create mode 100644 subprojects/ear/src/main/java/org/gradle/plugins/ear/Ear.java
 rename subprojects/ear/src/main/{groovy => java}/org/gradle/plugins/ear/EarPlugin.java (100%)
 create mode 100644 subprojects/ear/src/main/java/org/gradle/plugins/ear/EarPluginConvention.java
 create mode 100644 subprojects/ear/src/main/java/org/gradle/plugins/ear/descriptor/DeploymentDescriptor.java
 create mode 100644 subprojects/ear/src/main/java/org/gradle/plugins/ear/descriptor/EarModule.java
 create mode 100644 subprojects/ear/src/main/java/org/gradle/plugins/ear/descriptor/EarSecurityRole.java
 create mode 100644 subprojects/ear/src/main/java/org/gradle/plugins/ear/descriptor/EarWebModule.java
 create mode 100644 subprojects/ear/src/main/java/org/gradle/plugins/ear/descriptor/internal/DefaultDeploymentDescriptor.java
 create mode 100644 subprojects/ear/src/main/java/org/gradle/plugins/ear/descriptor/internal/DefaultEarModule.java
 create mode 100644 subprojects/ear/src/main/java/org/gradle/plugins/ear/descriptor/internal/DefaultEarSecurityRole.java
 create mode 100644 subprojects/ear/src/main/java/org/gradle/plugins/ear/descriptor/internal/DefaultEarWebModule.java
 rename subprojects/ear/src/main/{groovy => java}/org/gradle/plugins/ear/descriptor/package-info.java (100%)
 rename subprojects/ear/src/main/{groovy => java}/org/gradle/plugins/ear/package-info.java (100%)
 create mode 100644 subprojects/ear/src/test/groovy/org/gradle/plugins/ear/descriptor/internal/DefaultEarModuleTest.groovy
 delete mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy
 delete mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/cdt/model/CprojectDescriptor.groovy
 delete mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/cdt/model/CprojectSettings.groovy
 delete mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/cdt/model/ProjectDescriptor.groovy
 delete mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/cdt/model/ProjectSettings.groovy
 delete mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/cdt/tasks/GenerateMetadataFileTask.groovy
 delete 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/DefaultVisualStudioProject.java
 delete 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/DefaultVisualStudioSolution.java
 delete 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/ExecutableVisualStudioProjectConfiguration.java
 delete 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/VisualStudioProjectConfiguration.java
 delete mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/tasks/GenerateFiltersFileTask.groovy
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/tasks/GenerateFiltersFileTask.java
 delete mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/tasks/GenerateProjectFileTask.groovy
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/tasks/GenerateProjectFileTask.java
 delete mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/tasks/GenerateSolutionFileTask.groovy
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/tasks/GenerateSolutionFileTask.java
 create mode 100644 subprojects/ide-native/src/main/groovy/org/gradle/ide/visualstudio/tasks/package-info.java
 delete mode 100644 subprojects/ide-native/src/main/resources/META-INF/gradle-plugins/org.gradle.eclipse-cdt.properties
 delete mode 100644 subprojects/ide-native/src/main/resources/org/gradle/ide/cdt/model/defaultCproject-linux.xml
 delete mode 100644 subprojects/ide-native/src/main/resources/org/gradle/ide/cdt/model/defaultCproject-macos.xml
 delete mode 100644 subprojects/ide-native/src/main/resources/org/gradle/ide/cdt/model/defaultProject.xml
 delete mode 100644 subprojects/ide-native/src/test/groovy/org/gradle/ide/cdt/model/CprojectSettingsSpec.groovy
 delete mode 100644 subprojects/ide-native/src/test/groovy/org/gradle/ide/cdt/model/ProjectDescriptorSpec.groovy
 create mode 100644 subprojects/ide-play/ide-play.gradle
 create mode 100644 subprojects/ide-play/src/integTest/groovy/org/gradle/play/plugins/ide/PlayIdePluginIntegrationTest.groovy
 create mode 100644 subprojects/ide-play/src/integTest/groovy/org/gradle/play/plugins/ide/PlayIdeaPluginAdvancedIntegrationTest.groovy
 create mode 100644 subprojects/ide-play/src/integTest/groovy/org/gradle/play/plugins/ide/PlayIdeaPluginBasicIntegrationTest.groovy
 create mode 100644 subprojects/ide-play/src/integTest/groovy/org/gradle/play/plugins/ide/PlayIdeaPluginIntegrationTest.groovy
 create mode 100644 subprojects/ide-play/src/integTest/groovy/org/gradle/play/plugins/ide/PlayIdeaPluginMultiprojectIntegrationTest.groovy
 create mode 100644 subprojects/ide-play/src/main/java/org/gradle/play/plugins/ide/PlayIdePlugin.java
 create mode 100644 subprojects/ide-play/src/main/java/org/gradle/play/plugins/ide/internal/PlayIdeaPlugin.java
 create mode 100644 subprojects/ide-play/src/main/java/org/gradle/play/plugins/ide/package-info.java
 create mode 100644 subprojects/ide-play/src/main/resources/META-INF/gradle-plugins/org.gradle.play-ide.properties
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseCustomSourceAndJavadocLocationIntegrationTest.groovy
 delete mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaModuleFixture.groovy
 delete mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaProjectFixture.groovy
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/api/FileContentMerger.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/api/FileContentMerger.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/api/PropertiesFileContentMerger.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/api/PropertiesFileContentMerger.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/api/XmlFileContentMerger.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/api/XmlFileContentMerger.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/EclipsePlugin.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/EclipsePlugin.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpPlugin.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpPlugin.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseClasspath.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseClasspath.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseJdt.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseJdt.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseProject.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseProject.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseWtpComponent.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseWtpComponent.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseWtpFacet.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseWtpFacet.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/internal/AfterEvaluateHelper.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/internal/EclipseNameDeduper.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/internal/EclipseNameDeduper.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/internal/LinkedResourcesCreator.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/internal/LinkedResourcesCreator.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/AbstractClasspathEntry.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/AbstractClasspathEntry.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/AbstractLibrary.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/AbstractLibrary.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/AccessRule.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/AccessRule.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/BuildCommand.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/BuildCommand.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Classpath.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Classpath.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Container.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Container.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseClasspath.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseClasspath.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseDomainModel.groovy
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseJdt.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseJdt.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseModel.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseModel.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseProject.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseProject.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseWtp.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseWtp.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseWtpComponent.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseWtpComponent.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseWtpFacet.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseWtpFacet.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Facet.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Facet.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Library.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Library.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Link.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Link.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/NonRenamableProject.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Output.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Output.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Project.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Project.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/ProjectDependency.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/ProjectDependency.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/SourceFolder.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/SourceFolder.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Variable.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/Variable.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/WbDependentModule.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/WbDependentModule.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/WbModuleEntry.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/WbProperty.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/WbProperty.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/WbResource.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/WbResource.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/WtpComponent.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/WtpComponent.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/WtpFacet.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/WtpFacet.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/ClassFoldersCreator.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/ClassFoldersCreator.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/ClasspathFactory.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/ClasspathFactory.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/EclipseDependenciesCreator.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/FileReferenceFactory.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/FileReferenceFactory.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/PathUtil.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/PathUtil.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/SourceFoldersCreator.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/SourceFoldersCreator.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/WtpClasspathAttributeSupport.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/WtpComponentFactory.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/WtpComponentFactory.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/GenerateIdeaModule.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/GenerateIdeaModule.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/GenerateIdeaProject.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/GenerateIdeaProject.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/GenerateIdeaWorkspace.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/GenerateIdeaWorkspace.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/IdeaPlugin.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/IdeaPlugin.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/internal/IdeaNameDeduper.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/internal/IdeaNameDeduper.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/internal/IdeaScalaConfigurer.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/internal/IdeaScalaConfigurer.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/FilePath.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/FilePath.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/IdeaLanguageLevel.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/IdeaLanguageLevel.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/IdeaModel.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/IdeaModel.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/IdeaModule.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/IdeaModule.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/IdeaModuleIml.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/IdeaModuleIml.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/IdeaProject.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/IdeaProject.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/IdeaWorkspace.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/IdeaWorkspace.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/JarDirectory.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/JarDirectory.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/Jdk.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/Jdk.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/Module.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/Module.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/ModuleDependency.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/ModuleDependency.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/ModuleLibrary.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/ModuleLibrary.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/Path.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/Path.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/PathFactory.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/PathFactory.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/Project.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/Project.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/ProjectLibrary.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/ProjectLibrary.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/SingleEntryModuleLibrary.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/SingleEntryModuleLibrary.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/Workspace.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/Workspace.java
 rename subprojects/ide/src/main/{resources => groovy}/org/gradle/plugins/ide/idea/package-info.java (100%)
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/IdePlugin.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/IdePlugin.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/configurer/DeduplicationTarget.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/configurer/HierarchicalElementDeduplicator.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/configurer/ModuleNameDeduper.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/configurer/NameDeduplicationAdapter.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/configurer/ProjectDeduper.groovy
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/generator/AbstractPersistableConfigurationObject.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/generator/AbstractPersistableConfigurationObject.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/generator/PropertiesPersistableConfigurationObject.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/generator/PropertiesPersistableConfigurationObject.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/generator/XmlPersistableConfigurationObject.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/generator/XmlPersistableConfigurationObject.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/ToolingModelServices.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/ToolingRegistrationAction.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultAccessRule.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultClasspathAttribute.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseClasspathContainer.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseClasspathEntry.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseDependency.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseOutputLocation.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/idea/DefaultIdeaModuleDependency.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/idea/DefaultIdeaSingleEntryLibraryDependency.java
 delete mode 100644 subprojects/ide/src/main/resources/META-INF/services/org.gradle.configuration.project.ProjectConfigureAction
 create mode 100644 subprojects/ide/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/configurer/HierarchicalElementDeduplicatorTest.groovy
 delete mode 100644 subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/configurer/ModuleNameDeduperTest.groovy
 delete mode 100644 subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/configurer/ProjectDeduperTest.groovy
 create mode 100644 subprojects/ide/src/test/resources/org/gradle/plugins/ide/idea/model/moduleWithoutContent.xml
 create mode 100644 subprojects/ide/src/testFixtures/groovy/org/gradle/plugins/ide/fixtures/IdeaFixtures.groovy
 create mode 100644 subprojects/ide/src/testFixtures/groovy/org/gradle/plugins/ide/fixtures/IdeaModuleFixture.groovy
 create mode 100644 subprojects/ide/src/testFixtures/groovy/org/gradle/plugins/ide/fixtures/IdeaProjectFixture.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ClosureScopeIntegrationTest.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ConfigurationOnDemandPluginsIntegrationTest.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/DifferentJnaVersionInPluginIntegrationSpec.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/GroovyToJavaConversionIntegrationTest.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/PluginBinaryCompatibilityCrossVersionSpec.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ScriptClassloadingIntegrationTest.groovy
 create mode 100755 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/TaskUpToDateCrossVersionIntegrationTest.groovy
 create mode 100755 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/TaskUpToDateIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/logging/LoggerIsEnabledIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/resources/org/gradle/integtests/ExecIntegrationTest/canExecuteCommands/canExecuteCommands.gradle
 delete mode 100644 subprojects/integ-test/src/integTest/resources/org/gradle/integtests/ExecIntegrationTest/canExecuteJava/canExecuteJava.gradle
 delete mode 100644 subprojects/integ-test/src/integTest/resources/org/gradle/integtests/logging/LoggerIsEnabledIntegrationTest/shared/build.gradle
 create mode 100644 subprojects/internal-android-performance-testing/internal-android-performance-testing.gradle
 create mode 100644 subprojects/internal-android-performance-testing/src/main/java/org/gradle/performance/android/GetModel.java
 create mode 100644 subprojects/internal-android-performance-testing/src/main/java/org/gradle/performance/android/Inspector.java
 create mode 100644 subprojects/internal-android-performance-testing/src/main/java/org/gradle/performance/android/SyncAction.java
 create mode 100644 subprojects/internal-android-performance-testing/src/main/java/org/gradle/performance/android/Timer.java
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/PersistentBuildProcessIntegrationTest.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/build/BuildTestFile.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/build/BuildTestFixture.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/daemon/DaemonTestFixture.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/ExecuterDecoratingGradleDistribution.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/GradleExecuterDecorator.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/longlived/PersistentBuildProcessIntegrationTest.groovy
 create mode 100644 subprojects/internal-integ-testing/src/test/groovy/org/gradle/integtests/fixtures/executer/AbstractGradleExecuterTest.groovy
 create mode 100644 subprojects/internal-integ-testing/src/test/groovy/org/gradle/test/fixtures/ivy/IvyDescriptorDependencyTest.groovy
 create mode 100644 subprojects/internal-integ-testing/src/test/groovy/org/gradle/test/fixtures/maven/MavenScopeTest.groovy
 create mode 100644 subprojects/internal-performance-testing/internal-performance-testing.gradle
 create mode 100644 subprojects/internal-performance-testing/src/integTest/groovy/org/gradle/performance/fixture/MavenDownloaderTest.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/AbstractAndroidStudioMockupCrossVersionPerformanceTest.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/AbstractCrossBuildPerformanceTest.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/AbstractCrossVersionPerformanceTest.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/AbstractGradleVsMavenPerformanceTest.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/AbstractToolingApiCrossVersionPerformanceTest.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/categories/AndroidPerformanceTest.java
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/categories/BasicPerformanceTest.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/categories/Experiment.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/categories/GradleCorePerformanceTest.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/categories/JavaPerformanceTest.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/categories/NativePerformanceTest.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/categories/PerformanceTest.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/categories/ToolingApiPerformanceTest.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/AbstractGradleBuildPerformanceTestRunner.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/BuildEventTimestampCollector.java
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/BuildExperimentInvocationInfo.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/BuildExperimentListener.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/BuildExperimentListenerAdapter.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/BuildExperimentRunner.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/BuildExperimentSpec.groovy
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/CompilationLoggingCollector.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/CompositeDataCollector.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/CompositeDataReporter.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/CrossBuildPerformanceTestRunner.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/CrossVersionPerformanceTestRunner.groovy
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/DataCollector.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/DefaultBuildExperimentInvocationInfo.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/FlameGraphSanitizer.java
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/GCEventParser.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/GCLoggingCollector.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/Git.groovy (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/GradleBuildExperimentSpec.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/GradleExecuterBackedSession.groovy
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/GradleInvocationCustomizer.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/GradleInvocationSpec.groovy
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/GradleSession.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/GradleSessionProvider.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/GradleVsMavenBuildExperimentRunner.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/GradleVsMavenPerformanceTestRunner.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/HonestProfilerCollector.groovy
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/InvocationCustomizer.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/InvocationExecutorProvider.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/InvocationSpec.groovy
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/LogFiles.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/MavenBuildExperimentSpec.groovy
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/MavenInstallation.groovy (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/MavenInstallationDownloader.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/MavenInvocationSpec.groovy
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/MemoryInfoCollector.groovy (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/OperationTimer.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/PerformanceCounterCollector.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/PerformanceTestDirectoryProvider.groovy
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/PerformanceTestSpec.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/Profiler.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/TestProjectLocator.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/TestScenarioSelector.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/fixture/ToolingApiBackedGradleSession.groovy
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/WaitingReader.java (100%)
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/fixture/YourKitProfiler.groovy (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/measure/Amount.java
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/measure/DataAmount.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/measure/DataSeries.java
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/measure/Duration.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/measure/MeasuredOperation.groovy
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/measure/Units.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/AllResultsStore.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/BaseCrossBuildResultsStore.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/BaselineVersion.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/BuildDisplayInfo.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/Checks.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/CompositeResultsStore.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/ConnectionAction.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/CrossBuildPerformanceResults.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/CrossBuildPerformanceTestHistory.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/CrossBuildResultsStore.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/CrossVersionPerformanceResults.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/CrossVersionPerformanceTestHistory.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/CrossVersionResultsStore.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/DataReporter.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/FileRenderer.java
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/results/FormatSupport.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/GradleVsMavenBuildPerformanceResults.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/GradleVsMavenBuildResultsStore.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/GraphIndexPageGenerator.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/HtmlPageGenerator.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/IndexPageGenerator.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/MeasuredOperationList.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/NoResultsStore.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/PerformanceDatabase.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/PerformanceTestExecution.java
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/results/PerformanceTestHistory.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/PerformanceTestResult.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/PrettyCalculator.groovy
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/ReportGenerator.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/ResultsStore.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/ResultsStoreHelper.java
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/groovy/org/gradle/performance/results/ScenarioDefinition.java (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/TestDataGenerator.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/TestPageGenerator.java
 create mode 100644 subprojects/internal-performance-testing/src/main/groovy/org/gradle/performance/results/VersionResults.java
 create mode 100644 subprojects/internal-performance-testing/src/main/resources/org/gradle/reporting/performanceGraph.js
 rename subprojects/{performance/src/testFixtures => internal-performance-testing/src/main}/resources/org/gradle/reporting/report.js (100%)
 create mode 100644 subprojects/internal-performance-testing/src/main/resources/org/gradle/reporting/style.css
 create mode 100644 subprojects/internal-performance-testing/src/measurementPlugin/java/org/gradle/performance/plugin/BuildEventTimeStamps.java
 create mode 100644 subprojects/internal-performance-testing/src/measurementPlugin/java/org/gradle/performance/plugin/ExternalResources.java
 create mode 100644 subprojects/internal-performance-testing/src/measurementPlugin/java/org/gradle/performance/plugin/HeapDumper.java
 create mode 100644 subprojects/internal-performance-testing/src/measurementPlugin/java/org/gradle/performance/plugin/HeapMeasurement.java
 create mode 100644 subprojects/internal-performance-testing/src/measurementPlugin/java/org/gradle/performance/plugin/MeasurementPlugin.java
 create mode 100644 subprojects/internal-performance-testing/src/measurementPlugin/java/org/gradle/performance/plugin/PerformanceCounterDumper.java
 create mode 100644 subprojects/internal-performance-testing/src/measurementPlugin/java/org/gradle/performance/plugin/PerformanceCounterMeasurement.java
 create mode 100644 subprojects/internal-performance-testing/src/measurementPlugin/java/org/gradle/performance/plugin/ReflectionUtil.java
 rename subprojects/{performance => internal-performance-testing}/src/templates/init.gradle (100%)
 create mode 100644 subprojects/internal-performance-testing/src/templates/measurement-plugin/build.gradle
 create mode 100644 subprojects/internal-performance-testing/src/templates/root-project/build.gradle
 rename subprojects/{performance => internal-performance-testing}/src/templates/root-project/build.xml (100%)
 rename subprojects/{performance => internal-performance-testing}/src/templates/root-project/checkstyle.xml (100%)
 rename subprojects/{performance => internal-performance-testing}/src/templates/root-project/pom.xml (100%)
 rename subprojects/{performance => internal-performance-testing}/src/templates/settings.gradle (100%)
 create mode 100644 subprojects/internal-performance-testing/src/test/groovy/org/gradle/performance/ResultSpecification.groovy
 rename subprojects/{performance => internal-performance-testing}/src/test/groovy/org/gradle/performance/fixture/BuildEventTimestampCollectorTest.groovy (100%)
 create mode 100644 subprojects/internal-performance-testing/src/test/groovy/org/gradle/performance/fixture/CrossVersionPerformanceTestExecutionTest.groovy
 create mode 100644 subprojects/internal-performance-testing/src/test/groovy/org/gradle/performance/fixture/CrossVersionPerformanceTestRunnerTest.groovy
 rename subprojects/{performance => internal-performance-testing}/src/test/groovy/org/gradle/performance/fixture/GCEventParserTest.groovy (100%)
 rename subprojects/{performance => internal-performance-testing}/src/test/groovy/org/gradle/performance/fixture/GCLoggingCollectorTest.groovy (100%)
 create mode 100644 subprojects/internal-performance-testing/src/test/groovy/org/gradle/performance/fixture/PerformanceCounterCollectorTest.groovy
 create mode 100644 subprojects/internal-performance-testing/src/test/groovy/org/gradle/performance/fixture/PrettyCalculatorSpec.groovy
 rename subprojects/{performance => internal-performance-testing}/src/test/groovy/org/gradle/performance/fixture/WaitingReaderTest.groovy (100%)
 rename subprojects/{performance => internal-performance-testing}/src/test/groovy/org/gradle/performance/fixture/YourKitProfilerTest.groovy (100%)
 create mode 100644 subprojects/internal-performance-testing/src/test/groovy/org/gradle/performance/measure/AmountTest.groovy
 create mode 100644 subprojects/internal-performance-testing/src/test/groovy/org/gradle/performance/measure/DataSeriesTest.groovy
 rename subprojects/{performance => internal-performance-testing}/src/test/groovy/org/gradle/performance/measure/DurationTest.groovy (100%)
 rename subprojects/{performance => internal-performance-testing}/src/test/groovy/org/gradle/performance/measure/UnitsTest.groovy (100%)
 create mode 100644 subprojects/internal-performance-testing/src/test/groovy/org/gradle/performance/results/CompositeResultsStoreTest.groovy
 create mode 100644 subprojects/internal-performance-testing/src/test/groovy/org/gradle/performance/results/CrossBuildResultsStoreTest.groovy
 create mode 100644 subprojects/internal-performance-testing/src/test/groovy/org/gradle/performance/results/CrossVersionResultsStoreTest.groovy
 create mode 100644 subprojects/internal-performance-testing/src/test/groovy/org/gradle/performance/results/ReportGeneratorTest.groovy
 rename subprojects/{performance => internal-performance-testing}/src/test/groovy/org/gradle/performance/results/TestPageGeneratorTest.groovy (100%)
 rename subprojects/{performance => internal-performance-testing}/src/test/resources/org/gradle/performance/fixture/gc-1.txt (100%)
 rename subprojects/{performance => internal-performance-testing}/src/test/resources/org/gradle/performance/fixture/gc-2.txt (100%)
 rename subprojects/{performance => internal-performance-testing}/src/test/resources/org/gradle/performance/fixture/gc-3.txt (100%)
 rename subprojects/{performance => internal-performance-testing}/src/test/resources/org/gradle/performance/fixture/gc-4.txt (100%)
 rename subprojects/{performance => internal-performance-testing}/src/test/resources/org/gradle/performance/fixture/mac-jdk8.0.25.txt (100%)
 create mode 100644 subprojects/internal-performance-testing/src/test/resources/org/gradle/performance/fixture/perf_counters_finish.txt
 create mode 100644 subprojects/internal-performance-testing/src/test/resources/org/gradle/performance/fixture/perf_counters_start.txt
 rename subprojects/{performance => internal-performance-testing}/src/test/resources/org/gradle/performance/fixture/win-1.txt (100%)
 delete mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/internal/jacoco/JacocoAgentJar.groovy
 delete mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/plugins/JacocoPlugin.groovy
 delete mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/plugins/JacocoPluginExtension.groovy
 delete mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/plugins/JacocoTaskExtension.groovy
 delete mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoBase.groovy
 delete mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoMerge.groovy
 delete mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoReport.groovy
 delete mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoReportsContainer.java
 create mode 100644 subprojects/jacoco/src/main/java/org/gradle/internal/jacoco/AntJacocoMerge.java
 create mode 100644 subprojects/jacoco/src/main/java/org/gradle/internal/jacoco/AntJacocoReport.java
 create mode 100644 subprojects/jacoco/src/main/java/org/gradle/internal/jacoco/JacocoAgentJar.java
 rename subprojects/jacoco/src/main/{groovy => java}/org/gradle/internal/jacoco/JacocoReportsContainerImpl.java (100%)
 create mode 100644 subprojects/jacoco/src/main/java/org/gradle/testing/jacoco/plugins/JacocoPlugin.java
 create mode 100644 subprojects/jacoco/src/main/java/org/gradle/testing/jacoco/plugins/JacocoPluginExtension.java
 create mode 100644 subprojects/jacoco/src/main/java/org/gradle/testing/jacoco/plugins/JacocoTaskExtension.java
 create mode 100644 subprojects/jacoco/src/main/java/org/gradle/testing/jacoco/plugins/package-info.java
 create mode 100644 subprojects/jacoco/src/main/java/org/gradle/testing/jacoco/tasks/JacocoBase.java
 create mode 100644 subprojects/jacoco/src/main/java/org/gradle/testing/jacoco/tasks/JacocoMerge.java
 create mode 100644 subprojects/jacoco/src/main/java/org/gradle/testing/jacoco/tasks/JacocoReport.java
 create mode 100644 subprojects/jacoco/src/main/java/org/gradle/testing/jacoco/tasks/JacocoReportsContainer.java
 rename subprojects/jacoco/src/main/{groovy => java}/org/gradle/testing/jacoco/tasks/package-info.java (100%)
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/base/JavaScriptBasePlugin.groovy
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/coffeescript/CoffeeScriptBasePlugin.groovy
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/coffeescript/CoffeeScriptCompile.java
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/coffeescript/CoffeeScriptCompileOptions.java
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/coffeescript/compile/internal/CoffeeScriptCompileDestinationCalculator.java
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/coffeescript/compile/internal/rhino/RhinoCoffeeScriptCompiler.java
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/envjs/EnvJsPlugin.groovy
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/envjs/browser/BrowserEvaluate.java
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/envjs/http/simple/SimpleHttpFileServer.java
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/envjs/internal/EnvJsBrowserEvaluator.java
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/jshint/JsHint.java
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/jshint/JsHintPlugin.groovy
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/rhino/RhinoPlugin.groovy
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/rhino/RhinoShellExec.java
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/rhino/worker/RhinoWorker.java
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/rhino/worker/RhinoWorkerHandleFactory.java
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/rhino/worker/RhinoWorkerUtils.java
 delete mode 100644 subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/rhino/worker/internal/DefaultRhinoWorkerHandleFactory.java
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/base/JavaScriptBasePlugin.java
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/base/JavaScriptExtension.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/base/JavaScriptRepositoriesExtension.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/base/SourceTransformationException.java (100%)
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/coffeescript/CoffeeScriptBasePlugin.java
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/coffeescript/CoffeeScriptCompile.java
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/coffeescript/CoffeeScriptCompileOptions.java
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/coffeescript/CoffeeScriptCompileSpec.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/coffeescript/CoffeeScriptCompiler.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/coffeescript/CoffeeScriptExtension.java (100%)
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/coffeescript/compile/internal/CoffeeScriptCompileDestinationCalculator.java
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/coffeescript/compile/internal/DefaultCoffeeScriptCompileSpec.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/coffeescript/compile/internal/SerializableCoffeeScriptCompileSpec.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/coffeescript/compile/internal/rhino/CoffeeScriptCompilerProtocol.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/coffeescript/compile/internal/rhino/CoffeeScriptCompilerWorker.java (100%)
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/coffeescript/compile/internal/rhino/RhinoCoffeeScriptCompiler.java
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/envjs/EnvJsExtension.java (100%)
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/envjs/EnvJsPlugin.java
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/envjs/browser/BrowserEvaluate.java
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/envjs/browser/BrowserEvaluator.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/envjs/http/HttpFileServer.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/envjs/http/HttpFileServerFactory.java (100%)
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/envjs/http/simple/SimpleHttpFileServer.java
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/envjs/http/simple/SimpleHttpFileServerFactory.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/envjs/http/simple/internal/SimpleFileServerContainer.java (100%)
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/envjs/internal/EnvJsBrowserEvaluator.java
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/envjs/internal/EnvJsEvaluateSpec.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/envjs/internal/EnvJsEvaluateWorker.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/envjs/internal/EnvJvEvaluateProtocol.java (100%)
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/jshint/JsHint.java
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/jshint/JsHintExtension.java (100%)
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/jshint/JsHintPlugin.java
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/jshint/internal/JsHintProtocol.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/jshint/internal/JsHintResult.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/jshint/internal/JsHintSpec.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/jshint/internal/JsHintWorker.java (100%)
 rename subprojects/javascript/src/main/{groovy => java}/org/gradle/plugins/javascript/rhino/RhinoExtension.java (100%)
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/rhino/RhinoPlugin.java
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/rhino/RhinoShellExec.java
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/rhino/worker/RhinoWorker.java
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/rhino/worker/RhinoWorkerHandleFactory.java
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/rhino/worker/RhinoWorkerUtils.java
 create mode 100644 subprojects/javascript/src/main/java/org/gradle/plugins/javascript/rhino/worker/internal/DefaultRhinoWorkerHandleFactory.java
 create mode 100644 subprojects/jetty/src/integTest/groovy/org/gradle/api/plugins/jetty/JettyIntegrationSpec.groovy
 create mode 100644 subprojects/jvm-services/jvm-services.gradle
 create mode 100644 subprojects/jvm-services/src/main/java/org/gradle/internal/jvm/inspection/CachingJvmVersionDetector.java
 create mode 100644 subprojects/jvm-services/src/main/java/org/gradle/internal/jvm/inspection/DefaultJvmVersionDetector.java
 create mode 100644 subprojects/jvm-services/src/main/java/org/gradle/internal/jvm/inspection/JvmVersionDetector.java
 create mode 100644 subprojects/jvm-services/src/test/groovy/org/gradle/internal/jvm/inspection/CachingJvmVersionDetectorTest.groovy
 create mode 100644 subprojects/jvm-services/src/test/groovy/org/gradle/internal/jvm/inspection/DefaultJvmVersionDetectorTest.groovy
 create mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/internal/tasks/AntGroovydoc.java
 delete mode 100644 subprojects/language-groovy/src/main/java/org/gradle/api/tasks/javadoc/AntGroovydoc.java
 create mode 100644 subprojects/language-groovy/src/test/groovy/org/gradle/api/tasks/javadoc/GroovydocTest.groovy
 delete mode 100644 subprojects/language-groovy/src/test/groovy/org/gradle/api/tasks/javadoc/GroovydocTest.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/JdkTools.java
 create mode 100644 subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/incremental/ClassChangeProcessor.java
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/JdkToolsTest.groovy
 create mode 100644 subprojects/language-java/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassChangeProcessorTest.groovy
 delete mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/NoOpStaleClassCleaner.java
 delete mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonClientProtocol.java
 create mode 100644 subprojects/language-jvm/src/main/java/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonProtocol.java
 delete 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/CompilerDaemonWorker.java
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/SupportedBuildJvmIntegrationTest.groovy
 delete mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/continuous/JdkVersionsContinuousIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/DaemonAuthenticationIntegrationSpec.groovy
 delete 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/DaemonReportStatusIntegrationSpec.groovy
 delete mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/DaemonUsageSuggestionIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/server/health/MemoryInfoIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/server/scaninfo/DaemonScanInfoIntegrationSpec.groovy
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/cli/ReportDaemonStatusAction.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DaemonStartupMessage.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/EmbeddedDaemonClientServices.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/EmbeddedDaemonStarter.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/JvmVersionDetector.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/ReportDaemonStatusClient.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/ReportStatusDispatcher.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/StubDaemonHealthServices.java
 delete 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/DaemonConnectDetails.java
 delete 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/ReportStatus.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/protocol/Status.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/registry/DaemonStopEvent.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/registry/DaemonStopEvents.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/registry/EmbeddedDaemonRegistry.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/BadlyFormedRequestException.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/CompatibleDaemonExpirationStrategy.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/DaemonIdleTimeoutExpirationStrategy.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/DaemonRegistryUnavailableExpirationStrategy.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/DaemonRegistryUpdater.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/DomainRegistryUpdater.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/MasterExpirationStrategy.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/NotMostRecentlyUsedDaemonExpirationStrategy.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/api/HandleReportStatus.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/DefaultDaemonCommandExecuter.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/HintGCAfterBuild.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/LogAndCheckHealth.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/expiry/AllDaemonExpirationStrategy.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/expiry/AnyDaemonExpirationStrategy.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/expiry/DaemonExpirationListener.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/expiry/DaemonExpirationResult.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/expiry/DaemonExpirationStatus.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/expiry/DaemonExpirationStrategy.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/DaemonHealthCheck.java
 delete 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/DaemonHealthStats.java
 delete 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/DaemonMemoryStatus.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/DaemonStats.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/DaemonStatus.java
 delete 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/GcThrashingDaemonExpirationStrategy.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/HealthExpirationStrategy.java
 delete 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/LowMemoryDaemonExpirationStrategy.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/LowPermGenDaemonExpirationStrategy.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/LowTenuredSpaceDaemonExpirationStrategy.java
 delete 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/daemon/server/health/gc/DefaultSlidingWindow.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/gc/GarbageCollectionCheck.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/gc/GarbageCollectionEvent.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/gc/GarbageCollectionInfo.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/gc/GarbageCollectionMonitor.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/gc/GarbageCollectionStats.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/gc/GarbageCollectorMonitoringStrategy.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/gc/SlidingWindow.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/memory/AvailableMemory.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/memory/MBeanAttributeProvider.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/memory/MBeanAvailableMemory.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/memory/MeminfoAvailableMemory.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/memory/MemoryInfo.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/health/memory/VmstatAvailableMemory.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/scaninfo/DaemonScanInfo.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/scaninfo/DefaultDaemonScanInfo.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/stats/DaemonRunningStats.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/ChainingCompositeBuildActionRunner.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/CompositeBuildActionExecuter.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/ContinuousBuildActionExecuter.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/DaemonUsageSuggestingBuildActionExecuter.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/DefaultCompositeBuildActionParameters.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/DefaultCompositeBuildController.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/GradleBuildController.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ContinuousBuildActionExecuter.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/JarCache.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/jdk6/Jdk6ClassLookup.java
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/cli/ReportDaemonStatusActionTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/client/DaemonStartupMessageTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/client/JvmVersionDetectorTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/client/ReportDaemonStatusClientTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/client/ReportStatusDispatcherTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/protocol/DaemonStatusAndErrorReportingTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/registry/DaemonRegistryUpdaterTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/registry/DaemonStopEventsTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/registry/DomainRegistryUpdaterTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/registry/EmbeddedDaemonRegistry.java
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/CompatibleDaemonExpirationStrategyTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/DaemonExpirationStrategyTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/DaemonIdleTimeoutExpirationStrategyTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/DaemonRegistryUnavailableExpirationStrategyTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/DaemonServerExceptionHandlingTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/NotMostRecentlyUsedDaemonExpirationStrategyTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/exec/HintGCAfterBuildTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/exec/LogAndCheckHealthTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/expiry/AllDaemonExpirationStrategyTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/expiry/AnyDaemonExpirationStrategyTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/DaemonHealthStatsTest.groovy
 delete 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/DaemonMemoryStatusTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/DaemonStatsTest.groovy
 delete 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/GcThrashingDaemonExpirationStrategyTest.groovy
 delete 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/daemon/server/health/LowMemoryDaemonExpirationStrategyTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/LowPermGenDaemonExpirationStrategyTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/LowTenuredSpaceDaemonExpirationStrategyTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/gc/DefaultSlidingWindowTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/gc/GarbageCollectionMonitorTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/gc/GarbageCollectionStatsTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/memory/MeminfoAvailableMemoryTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/memory/MemoryInfoTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/health/memory/VmstatAvailableMemoryTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/exec/ChainingCompositeBuildActionRunnerTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/exec/ContinuousBuildActionExecuterTest.groovy
 delete 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/ContinuousBuildActionExecuterTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/JarCacheTest.groovy
 create mode 100644 subprojects/logging/logging.gradle
 create mode 100644 subprojects/logging/src/integTest/groovy/org/gradle/DeprecationHandlingIntegrationTest.groovy
 rename subprojects/{core/src/main/groovy => logging/src/main/java}/org/gradle/api/logging/LogLevel.java (100%)
 rename subprojects/{core/src/main/groovy => logging/src/main/java}/org/gradle/api/logging/Logger.java (100%)
 create mode 100644 subprojects/logging/src/main/java/org/gradle/api/logging/Logging.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/api/logging/LoggingManager.java
 rename subprojects/{core/src/main/groovy => logging/src/main/java}/org/gradle/api/logging/LoggingOutput.java (100%)
 rename subprojects/{core/src/main/groovy => logging/src/main/java}/org/gradle/api/logging/StandardOutputListener.java (100%)
 create mode 100644 subprojects/logging/src/main/java/org/gradle/api/logging/configuration/ConsoleOutput.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/api/logging/configuration/LoggingConfiguration.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/api/logging/configuration/ShowStacktrace.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/api/logging/configuration/package-info.java
 rename subprojects/{core/src/main/groovy => logging/src/main/java}/org/gradle/api/logging/package-info.java (100%)
 rename subprojects/{core/src/main/groovy => logging/src/main/java}/org/gradle/internal/featurelifecycle/DeprecatedFeatureHandler.java (100%)
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/featurelifecycle/DeprecatedFeatureUsage.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/featurelifecycle/LoggingDeprecatedFeatureHandler.java
 rename subprojects/{core/src/main/groovy => logging/src/main/java}/org/gradle/internal/featurelifecycle/UsageLocationReporter.java (100%)
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/ConsoleRenderer.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/DefaultLoggingConfiguration.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/LogLevelMapping.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/LoggingCommandLineConverter.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/LoggingManagerInternal.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/LoggingOutputInternal.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/StandardOutputCapture.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/compatbridge/LoggingManagerInternalCompatibilityBridge.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/config/LoggingConfigurer.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/config/LoggingRouter.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/config/LoggingSourceSystem.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/config/LoggingSystem.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/config/LoggingSystemAdapter.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/console/AnsiConsole.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/console/ColorMap.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/console/Console.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/console/ConsoleBackedProgressRenderer.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/console/DefaultColorMap.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/console/DefaultStatusBarFormatter.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/console/Label.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/console/ProgressOperation.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/console/ProgressOperations.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/console/StyledTextOutputBackedRenderer.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/console/TextArea.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/events/CategorisedOutputEvent.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/events/EndOutputEvent.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/events/LogEvent.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/events/LogLevelChangeEvent.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/events/OperationIdentifier.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/events/OutputEvent.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/events/OutputEventListener.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/events/ProgressCompleteEvent.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/events/ProgressEvent.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/events/ProgressStartEvent.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/events/RenderableOutputEvent.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/events/StyledTextOutputEvent.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/progress/DefaultProgressLoggerFactory.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/progress/ProgressListener.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/progress/ProgressLogger.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/progress/ProgressLoggerFactory.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/services/DefaultLoggingConfigurer.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/services/DefaultLoggingManager.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/services/DefaultLoggingManagerFactory.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/services/DefaultStyledTextOutputFactory.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/services/LoggingBackedStyledTextOutput.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/services/LoggingServiceRegistry.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/services/ProgressLoggingBridge.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/services/TextStreamOutputEventListener.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/sink/ConsoleConfigureAction.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/sink/OutputEventRenderer.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/sink/ProgressLogEventGenerator.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/slf4j/OutputEventListenerBackedLogger.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/slf4j/OutputEventListenerBackedLoggerContext.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/slf4j/Slf4jLoggingConfigurer.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/source/DefaultStdErrLoggingSystem.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/source/DefaultStdOutLoggingSystem.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/source/JavaUtilLoggingSystem.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/source/NoOpLoggingSystem.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/source/PrintStreamLoggingSystem.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/source/StdErrLoggingSystem.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/source/StdOutLoggingSystem.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/text/AbstractLineChoppingStyledTextOutput.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/text/AbstractStyledTextOutput.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/text/AbstractStyledTextOutputFactory.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/text/BufferingStyledTextOutput.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/text/LinePrefixingStyledTextOutput.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/text/StreamBackedStandardOutputListener.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/text/StreamingStyledTextOutput.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/text/StreamingStyledTextOutputFactory.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/text/StyledTextOutput.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/internal/logging/text/StyledTextOutputFactory.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/logging/LoggingManagerInternal.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/logging/ProgressLoggerFactory.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/logging/StandardOutputCapture.java
 create mode 100644 subprojects/logging/src/main/java/org/gradle/logging/StyledTextOutputFactory.java
 rename subprojects/{core/src/main/groovy => logging/src/main/java}/org/gradle/util/DeprecationLogger.java (100%)
 create mode 100644 subprojects/logging/src/main/java/org/gradle/util/SingleMessageLogger.java
 create mode 100644 subprojects/logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
 rename subprojects/{core => logging}/src/test/groovy/org/gradle/api/logging/LogLevelTest.groovy (100%)
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/api/logging/LoggingTest.java
 rename subprojects/{core => logging}/src/test/groovy/org/gradle/internal/featurelifecycle/DeprecatedFeatureUsageTest.groovy (100%)
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/featurelifecycle/LoggingDeprecatedFeatureHandlerTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/ConsoleRendererTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/LoggingCommandLineConverterTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/OutputSpecification.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/config/LoggingSystemAdapterTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/console/AnsiConsoleTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/console/ConsoleBackedProgressRendererTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/console/ConsoleStub.java
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/console/DefaultColorMapTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/console/DefaultStatusBarFormatterTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/console/ProgressOperationsTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/console/StyledTextOutputBackedRendererTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/console/TestColorMap.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/events/LogEventTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/events/StyledTextOutputEventTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/progress/DefaultProgressLoggerFactoryTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/services/DefaultLoggingManagerTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/services/LoggingServiceRegistryTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/services/StreamBackedStandardOutputListenerTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/services/TextStreamOutputEventListenerTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/sink/OutputEventRendererTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/sink/ProgressLogEventGeneratorTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/slf4j/OutputEventListenerBackedLoggerContextTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/slf4j/OutputEventListenerBackedLoggerDefaultConfigurationTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/slf4j/OutputEventListenerBackedLoggerTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/slf4j/Slf4jLoggingConfigurerTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/source/JavaUtilLoggingSystemTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/source/PrintStreamLoggingSystemTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/text/AbstractLineChoppingStyledTextOutputTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/text/AbstractStyledTextOutputTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/text/LinePrefixingStyledTextOutputTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/text/LoggingBackedStyledTextOutputTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/internal/logging/text/StreamingStyledTextOutputTest.groovy
 create mode 100644 subprojects/logging/src/test/groovy/org/gradle/util/SingleMessageLoggerTest.groovy
 create mode 100644 subprojects/logging/src/testFixtures/groovy/org/gradle/internal/logging/ConfigureLogging.groovy
 create mode 100644 subprojects/logging/src/testFixtures/groovy/org/gradle/internal/logging/TestOutputEventListener.groovy
 create mode 100644 subprojects/logging/src/testFixtures/groovy/org/gradle/internal/logging/text/TestStyledTextOutput.groovy
 create mode 100644 subprojects/logging/src/testFixtures/groovy/org/gradle/internal/logging/text/TestStyledTextOutputFactory.java
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishRepoDslIntegrationTest.groovy
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/artifacts/maven/GroovyMavenDeployer.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/plugins/MavenPlugin.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/DefaultDeployerFactory.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/DefaultMavenRepositoryHandlerConvention.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/deployer/AbstractMavenResolver.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/deployer/BaseMavenDeployer.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/deployer/BaseMavenInstaller.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/deployer/DefaultGroovyMavenDeployer.groovy
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/deployer/RepositoryBuilder.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/deployer/RepositoryFactory.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/DefaultExcludeRuleConverter.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/DefaultMavenPom.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pom/DefaultPomDependenciesConverter.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/wagon/RepositoryTransportDeployWagon.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/artifact/DefaultMavenArtifact.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/artifact/DefaultMavenArtifactSet.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publication/DefaultMavenPublication.java
 delete 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/MavenLocalPublisher.java
 delete 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/plugins/MavenPublishPlugin.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/AbstractPublishToMaven.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/GenerateMavenPom.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/PublishToMavenRepository.java
 rename subprojects/maven/src/main/{groovy => java}/org/apache/maven/artifact/ant/Authentication.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/apache/maven/artifact/ant/Proxy.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/apache/maven/artifact/ant/RemoteRepository.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/apache/maven/artifact/ant/Repository.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/apache/maven/artifact/ant/RepositoryPolicy.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/apache/maven/artifact/ant/package-info.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/artifacts/maven/Conf2ScopeMapping.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/artifacts/maven/Conf2ScopeMappingContainer.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/artifacts/maven/GroovyMavenDeployer.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/artifacts/maven/MavenDeployer.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/artifacts/maven/MavenDeployment.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/artifacts/maven/MavenPom.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/artifacts/maven/MavenResolver.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/artifacts/maven/PomFilterContainer.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/artifacts/maven/PublishFilter.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/artifacts/maven/package-info.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/plugins/MavenPlugin.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/plugins/MavenPluginConvention.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/plugins/MavenRepositoryHandlerConvention.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/ArtifactPom.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/ArtifactPomContainer.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/ArtifactPomFactory.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/BasePomFilterContainer.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/DefaultArtifactPom.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/DefaultArtifactPomContainer.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/DefaultArtifactPomFactory.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publication/maven/internal/DefaultDeployerFactory.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/DefaultMavenDeployment.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publication/maven/internal/DefaultMavenRepositoryHandlerConvention.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/DefaultPomFilter.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/DeployerFactory.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/MavenFactory.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/MavenPomMetaInfoProvider.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/MavenVersionRangeMapper.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/ModelFactory.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/PomFilter.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/VersionRangeMapper.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/action/LoggingMavenTransferListener.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/action/MavenDeployAction.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/action/MavenInstallAction.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/action/MavenPublishAction.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/action/MavenWagonDeployAction.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/action/SnapshotVersionManager.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publication/maven/internal/deployer/AbstractMavenResolver.java
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publication/maven/internal/deployer/BaseMavenDeployer.java
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publication/maven/internal/deployer/BaseMavenInstaller.java
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publication/maven/internal/deployer/DefaultGroovyMavenDeployer.java
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publication/maven/internal/deployer/MavenRemoteRepository.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/pom/CustomModelBuilder.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/pom/DefaultConf2ScopeMappingContainer.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publication/maven/internal/pom/DefaultExcludeRuleConverter.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/pom/DefaultMavenFactory.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publication/maven/internal/pom/DefaultMavenPom.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/pom/DefaultMavenPomFactory.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publication/maven/internal/pom/DefaultPomDependenciesConverter.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/pom/ExcludeRuleConverter.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/pom/PlexusLoggerAdapter.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/pom/PomDependenciesConverter.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/pom/ProjectDependencyArtifactIdExtractorHack.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publication/maven/internal/wagon/RepositoryTransportDeployWagon.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publication/maven/internal/wagon/RepositoryTransportWagonAdapter.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/InvalidMavenPublicationException.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/MavenArtifact.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/MavenArtifactSet.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/MavenDependency.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/MavenPom.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/MavenPublication.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/MavenPublishServices.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publish/maven/internal/artifact/DefaultMavenArtifact.java
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publish/maven/internal/artifact/DefaultMavenArtifactSet.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/artifact/MavenArtifactNotationParserFactory.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/dependencies/DefaultMavenDependency.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/dependencies/MavenDependencyInternal.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/publication/DefaultMavenPom.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/publication/DefaultMavenProjectIdentity.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publish/maven/internal/publication/DefaultMavenPublication.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/publication/MavenPomInternal.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/publication/MavenPublicationInternal.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publish/maven/internal/publisher/AbstractMavenPublisher.java
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publish/maven/internal/publisher/MavenLocalPublisher.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/publisher/MavenNormalizedPublication.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/publisher/MavenProjectIdentity.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/publisher/MavenPublisher.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publish/maven/internal/publisher/MavenRemotePublisher.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/publisher/StaticLockingMavenPublisher.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/publisher/ValidatingMavenPublisher.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/internal/tasks/MavenPomFileGenerator.java (100%)
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/package-info.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publish/maven/plugins/MavenPublishPlugin.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/plugins/package-info.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publish/maven/tasks/AbstractPublishToMaven.java
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publish/maven/tasks/GenerateMavenPom.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/tasks/PublishToMavenLocal.java (100%)
 create mode 100644 subprojects/maven/src/main/java/org/gradle/api/publish/maven/tasks/PublishToMavenRepository.java
 rename subprojects/maven/src/main/{groovy => java}/org/gradle/api/publish/maven/tasks/package-info.java (100%)
 create mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/pom/DefaultExcludeRuleConverterTest.groovy
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/pom/DefaultExcludeRuleConverterTest.java
 create mode 100644 subprojects/messaging/src/integTest/groovy/org/gradle/internal/remote/UnicastMessagingIntegrationTest.groovy
 create mode 100644 subprojects/messaging/src/integTest/groovy/org/gradle/internal/remote/internal/hub/MessageHubIntegrationTest.groovy
 delete mode 100644 subprojects/messaging/src/integTest/groovy/org/gradle/messaging/remote/UnicastMessagingIntegrationTest.groovy
 delete mode 100644 subprojects/messaging/src/integTest/groovy/org/gradle/messaging/remote/internal/hub/MessageHubIntegrationTest.groovy
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/actor/Actor.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/actor/ActorFactory.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/actor/internal/DefaultActorFactory.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/AsyncDispatch.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/BoundedDispatch.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/ContextClassLoaderDispatch.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/ContextClassLoaderProxy.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/DiscardingFailureHandler.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/Dispatch.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/DispatchException.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/DispatchFailureHandler.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/ExceptionTrackingFailureHandler.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/FailureHandlingDispatch.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/MethodInvocation.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/ProxyDispatchAdapter.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/Receive.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/ReflectionDispatch.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/dispatch/StreamCompletion.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/Address.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/ConnectionAcceptor.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/remote/MessagingClient.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/remote/MessagingServer.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/remote/ObjectConnection.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/remote/ObjectConnectionBuilder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/ConnectCompletion.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/ConnectException.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/Connection.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/IncomingConnector.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/KryoBackedMessageSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/MessageIOException.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/MessageSerializer.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/OutgoingConnector.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/RemoteConnection.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/ConnectionSet.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/ConnectionState.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/DefaultMethodArgsSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/IncomingQueue.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/InterHubMessageSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/JavaSerializationBackedMethodArgsSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/MessageHub.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/MessageHubBackedClient.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/MessageHubBackedObjectConnection.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/MessageHubBackedServer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/MethodArgsSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/MethodInvocationSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/OutgoingQueue.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/RejectedMessageListener.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/protocol/ChannelIdentifier.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/protocol/ChannelMessage.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/protocol/EndOfStream.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/protocol/InterHubMessage.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/protocol/RejectedMessage.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/protocol/Routable.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/queue/EndPointQueue.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/queue/MultiChannelQueue.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/queue/MultiEndPointQueue.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/hub/queue/QueueInitializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/inet/InetAddressFactory.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/inet/InetAddresses.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/inet/InetEndpoint.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/inet/MultiChoiceAddress.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/inet/MultiChoiceAddressSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/inet/SocketConnectCompletion.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/inet/SocketConnection.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/inet/SocketInetAddress.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/inet/TcpIncomingConnector.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/remote/internal/inet/TcpOutgoingConnector.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/remote/services/MessagingServices.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/HashCodeSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/internal/serialize/HashValueSerializer.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/serialize/Message.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/internal/serialize/PlaceholderException.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/actor/Actor.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/actor/ActorFactory.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/actor/internal/DefaultActorFactory.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/AsyncDispatch.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/ContextClassLoaderDispatch.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/ContextClassLoaderProxy.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/DiscardingFailureHandler.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/Dispatch.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/DispatchException.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/DispatchFailureHandler.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/ExceptionTrackingFailureHandler.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/FailureHandlingDispatch.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/MethodInvocation.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/ProxyDispatchAdapter.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/Receive.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/dispatch/ReflectionDispatch.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/Address.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/ConnectionAcceptor.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/MessagingClient.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/MessagingServer.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/ObjectConnection.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/ObjectConnectionBuilder.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/ConnectCompletion.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/ConnectException.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/Connection.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/IncomingConnector.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/KryoBackedMessageSerializer.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/Message.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/MessageIOException.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/MessageSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/MessagingServices.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/OutgoingConnector.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/PlaceholderException.java
 delete 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/remote/internal/hub/ConnectionSet.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/ConnectionState.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/DefaultMethodArgsSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/HubStateListener.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/IncomingQueue.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/InterHubMessageSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/JavaSerializationBackedMethodArgsSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/MessageHub.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/MessageHubBackedClient.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/MessageHubBackedObjectConnection.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/MessageHubBackedServer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/MethodArgsSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/MethodInvocationSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/OutgoingQueue.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/RejectedMessageListener.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/protocol/ChannelIdentifier.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/protocol/ChannelMessage.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/protocol/ConnectionClosed.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/protocol/ConnectionEstablished.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/protocol/EndOfStream.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/protocol/InterHubMessage.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/protocol/RejectedMessage.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/protocol/Routable.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/queue/EndPointQueue.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/queue/MultiChannelQueue.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/queue/MultiEndPointQueue.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/hub/queue/QueueInitializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/InetAddressFactory.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/InetEndpoint.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/MultiChoiceAddress.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/MultiChoiceAddressSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/SocketConnectCompletion.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/SocketConnection.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/SocketInetAddress.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/TcpIncomingConnector.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/TcpOutgoingConnector.java
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/actor/internal/DefaultActorFactorySpec.groovy
 create mode 100755 subprojects/messaging/src/test/groovy/org/gradle/internal/dispatch/AsyncDispatchTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/dispatch/ContextClassLoaderDispatchTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/dispatch/ExceptionTrackingFailureHandlerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/dispatch/FailureHandlingDispatchTest.groovy
 create mode 100755 subprojects/messaging/src/test/groovy/org/gradle/internal/dispatch/MethodInvocationTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/dispatch/ProxyDispatchAdapterTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/event/ListenerBroadcastTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/event/ListenerBroadcastTest.java
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/TestConnection.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/ConnectionSetTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/DefaultMethodArgsSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/InterHubMessageSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/JavaSerializationBackedMethodArgsSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/MessageHubBackedClientTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/MessageHubBackedObjectConnectionTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/MessageHubBackedServerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/MessageHubTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/MethodInvocationSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/protocol/ChannelIdentifierTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/queue/AbstractQueueTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/queue/MultiChannelQueueTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/queue/MultiEndPointQueueTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/hub/queue/QueueInitializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/inet/InetAddressFactoryTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/inet/InetAddressesTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/inet/MultiChoiceAddressSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/inet/MultiChoiceAddressTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/inet/SocketInetAddressTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/internal/inet/TcpConnectorTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/remote/services/MessagingServicesTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/serialize/MessageTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/internal/serialize/PlaceholderExceptionTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/actor/internal/DefaultActorFactorySpec.groovy
 delete mode 100755 subprojects/messaging/src/test/groovy/org/gradle/messaging/dispatch/AsyncDispatchTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/dispatch/ContextClassLoaderDispatchTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/dispatch/ExceptionTrackingFailureHandlerTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/dispatch/FailureHandlingDispatchTest.groovy
 delete mode 100755 subprojects/messaging/src/test/groovy/org/gradle/messaging/dispatch/MethodInvocationTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/dispatch/ProxyDispatchAdapterTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/MessageTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/MessagingServicesTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/PlaceholderExceptionTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/hub/ConnectionSetTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/hub/DefaultMethodArgsSerializerTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/hub/InterHubMessageSerializerTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/hub/JavaSerializationBackedMethodArgsSerializerTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/hub/MessageHubBackedClientTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/hub/MessageHubBackedServerTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/hub/MessageHubTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/hub/MethodInvocationSerializerTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/hub/protocol/ChannelIdentifierTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/hub/queue/AbstractQueueTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/hub/queue/MultiChannelQueueTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/hub/queue/MultiEndPointQueueTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/hub/queue/QueueInitializerTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/InetAddressFactoryTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/MultiChoiceAddressSerializerTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/MultiChoiceAddressTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/SocketInetAddressTest.groovy
 delete mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/TcpConnectorTest.groovy
 create mode 100644 subprojects/messaging/src/testFixtures/groovy/org/gradle/internal/actor/TestActorFactory.java
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/ScalarCollectionIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/UnmanagedElementIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/ModelElement.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/ReadOnlyModelViewException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/ModelElementProjection.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/PropertyAccessorType.java
 delete mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/PropertyAccessorTypeTest.groovy
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeintegration/jna/JnaBootPathConfigurer.java
 delete mode 100644 subprojects/osgi/src/main/groovy/org/gradle/api/plugins/osgi/OsgiPlugin.groovy
 rename subprojects/osgi/src/main/{groovy => java}/org/gradle/api/internal/plugins/osgi/ContainedVersionAnalyzer.java (100%)
 rename subprojects/osgi/src/main/{groovy => java}/org/gradle/api/internal/plugins/osgi/DefaultAnalyzerFactory.java (100%)
 rename subprojects/osgi/src/main/{groovy => java}/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifest.java (100%)
 rename subprojects/osgi/src/main/{groovy => java}/org/gradle/api/internal/plugins/osgi/OsgiHelper.java (100%)
 rename subprojects/osgi/src/main/{groovy => java}/org/gradle/api/plugins/osgi/OsgiManifest.java (100%)
 create mode 100644 subprojects/osgi/src/main/java/org/gradle/api/plugins/osgi/OsgiPlugin.java
 rename subprojects/osgi/src/main/{groovy => java}/org/gradle/api/plugins/osgi/OsgiPluginConvention.java (100%)
 rename subprojects/osgi/src/main/{groovy => java}/org/gradle/api/plugins/osgi/package-info.java (100%)
 delete mode 100644 subprojects/performance/src/configPlugin/ConfigPlugin.java
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/BaseJavalSourceFileUpdater.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/BuildReceiptPluginPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/DependencyReportPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/DependencyResolutionStressTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/FirstBuildPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/IdeIntegrationPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaCleanDaemonPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaConfigurationDaemonPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaConfigurationPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaFullAssembleDaemonPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaFullBuildDaemonPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaFullBuildPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaPartialAssembleDaemonPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaSoftwareModelBuildPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaSoftwareModelCompileAvoidancePerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaSourceChangesFullAssembleDaemonPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaTestExecutionPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaTestGradleVsMavenPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaUpToDateFullAssembleDaemonPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaUpToDateFullBuildPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/ManyEmptyProjectsHelpPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/NativeBuildPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/NativeParallelPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/NativeScenarioPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/ProjectDependenciesPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/RealWorldNativePluginPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/TestExecutionPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/ToolingApiIdeModelCrossVersionPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/VariantsPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/AbstractAndroidPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/BaseJavalSourceFileUpdater.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/DependencyReportPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/DependencyResolutionPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/FirstBuildPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/IdeIntegrationPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaCleanDaemonPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaConfigurationDaemonPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaConfigurationPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaFullAssembleDaemonPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaFullBuildDaemonPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaFullBuildPerformanceTest.groovy
 rename subprojects/performance/src/{integTest => performanceTest}/groovy/org/gradle/performance/JavaOldModelSourceFileUpdater.groovy (100%)
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaPartialAssembleDaemonPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaSoftwareModelBuildPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaSoftwareModelCompileAvoidancePerformanceTest.groovy
 rename subprojects/performance/src/{integTest => performanceTest}/groovy/org/gradle/performance/JavaSoftwareModelSourceFileUpdater.groovy (100%)
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaSourceChangesFullAssembleDaemonPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaTestExecutionPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaTestGradleVsMavenPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaUpToDateFullAssembleDaemonPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/JavaUpToDateFullBuildPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/ManyEmptyProjectsHelpPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/NativeBuildPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/NativeParallelPerformanceTest.groovy
 rename subprojects/performance/src/{integTest => performanceTest}/groovy/org/gradle/performance/NativePreCompiledHeaderPerformanceTest.groovy (100%)
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/NativeScenarioPerformanceTest.groovy
 rename subprojects/performance/src/{integTest => performanceTest}/groovy/org/gradle/performance/ParallelBuildPerformanceTest.groovy (100%)
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/ProjectDependenciesPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/RealLifeAndroidBuildPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/RealLifeAndroidStudioMockupPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/RealWorldNativePluginPerformanceTest.groovy
 rename subprojects/performance/src/{integTest => performanceTest}/groovy/org/gradle/performance/SourceUpdateCardinality.java (100%)
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/TaskCreationPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/TestExecutionPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/ToolingApiIdeModelCrossVersionPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/performanceTest/groovy/org/gradle/performance/VariantsPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/templates/build-event-timestamps/build.gradle
 delete mode 100644 subprojects/performance/src/templates/heap-capture/build.gradle
 delete mode 100644 subprojects/performance/src/templates/java-config/build.gradle
 delete mode 100644 subprojects/performance/src/templates/root-project/build.gradle
 create mode 100644 subprojects/performance/src/templates/task-creation/build.gradle
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/ResultSpecification.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/CrossVersionPerformanceTestExecutionTest.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/CrossVersionPerformanceTestRunnerTest.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/MavenDownloaderTest.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/PrettyCalculatorSpec.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/measure/AmountTest.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/measure/DataSeriesTest.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/results/CompositeResultsStoreTest.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/results/CrossBuildResultsStoreTest.groovy
 delete 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/ReportGeneratorTest.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/AbstractCrossBuildPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/AbstractCrossVersionPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/AbstractGradleVsMavenPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/AbstractToolingApiCrossVersionPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/categories/BuildReceiptPluginPerformanceTest.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/AbstractGradleBuildPerformanceTestRunner.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/BaselineVersion.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/BuildDisplayInfo.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/BuildEventTimestampCollector.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/BuildExperimentRunner.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/BuildExperimentSpec.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/BuildReceiptPerformanceTestRunner.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/CompositeDataReporter.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/CrossBuildPerformanceResults.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/CrossBuildPerformanceTestRunner.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/CrossVersionPerformanceResults.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/CrossVersionPerformanceTestRunner.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/DataReporter.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/GradleBuildExperimentSpec.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/GradleExecuterBackedSession.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/GradleInvocationSpec.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/GradleVsMavenBuildExperimentRunner.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/GradleVsMavenBuildPerformanceResults.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/GradleVsMavenPerformanceTestRunner.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/InvocationSpec.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/MavenBuildExperimentSpec.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/MavenInstallationDownloader.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/MavenInvocationSpec.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/MeasuredOperationList.groovy
 delete 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/PrettyCalculator.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/TestProjectLocator.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/ToolingApiBackedGradleSession.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/VersionResults.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/measure/Amount.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/measure/DataSeries.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/measure/MeasuredOperation.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/AllResultsStore.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/BaseCrossBuildResultsStore.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/BuildReceiptsResultsStore.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/CompositeResultsStore.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/ConnectionAction.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/CrossBuildPerformanceTestHistory.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/CrossBuildResultsStore.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/CrossVersionPerformanceTestHistory.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/CrossVersionResultsStore.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/FileRenderer.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/GradleVsMavenBuildResultsStore.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/H2FileDb.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/HtmlPageGenerator.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/IndexPageGenerator.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/NoResultsStore.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/PerformanceTestExecution.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/ReportGenerator.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/ResultsStore.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/ResultsStoreHelper.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/TestDataGenerator.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/TestPageGenerator.java
 delete mode 100644 subprojects/performance/src/testFixtures/resources/org/gradle/reporting/style.css
 create mode 100644 subprojects/performance/templates.gradle
 delete mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/DeprecatedAnnotationErrorsIntegrationTest.groovy
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/DefaultLibraryResolutionErrorMessageBuilder.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/DefaultLocalLibraryResolver.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/LibraryResolutionResult.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/LocalLibraryResolver.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/VariantSelector.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/VariantsMatcher.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/api/internal/tasks/compile/Compiler.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/DefaultLibraryLocalComponentMetaData.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/DefaultLibraryLocalComponentMetadata.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/DefaultVariantAxisCompatibility.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/DefaultVariantAxisCompatibilityFactory.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/DefaultVariantsMetaData.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/VariantAxisCompatibility.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/VariantAxisCompatibilityFactory.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/VariantsMetaData.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/VariantsMetaDataHelper.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/resolve/LocalComponentResolveContext.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/BinaryType.java
 delete 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/VariantComponent.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/registry/DeprecatedAnnotationsInspector.java
 copy subprojects/platform-base/src/main/resources/META-INF/gradle-plugins/{org.gradle.component-base.properties => org.gradle.component-model-base.properties} (100%)
 create mode 100644 subprojects/platform-base/src/main/resources/META-INF/gradle-plugins/org.gradle.lifecycle-base.properties
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/api/internal/resolve/VariantsMatcherTest.groovy
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/model/DefaultVariantsMetaDataTest.groovy
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/model/ParametrizedBinaryString.java
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/model/ParametrizedBinaryVariantDimension1.java
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/model/ParametrizedVariant.java
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/model/VariantDimension1.java
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/model/VariantDimension2.java
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/model/VariantDimension3.java
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/model/VariantsMetaDataHelperTest.groovy
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/resolve/LocalComponentResolveContextTest.groovy
 delete mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/api/internal/resolve/JvmLocalLibraryMetaDataAdapter.java
 delete mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/api/internal/resolve/LibraryPublishArtifact.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/api/java/archives/internal/CustomManifestInternalWrapper.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/api/java/archives/internal/ManifestInternal.java
 delete mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/DefaultJavaPlatformVariantAxisCompatibility.java
 delete mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/SourceSetDependencyResolvingClasspath.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/DefaultJavaPlatformVariantAxisCompatibility.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/DefaultLibraryResolutionErrorMessageBuilder.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/DefaultVariantAxisCompatibility.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/DefaultVariantAxisCompatibilityFactory.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/DefaultVariantsMetaData.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/JvmLibraryResolveContext.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/JvmLocalLibraryMetaDataAdapter.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/JvmVariantSelector.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/LibraryPublishArtifact.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/SourceSetDependencyResolvingClasspath.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/UsageKind.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/VariantAxisCompatibility.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/VariantAxisCompatibilityFactory.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/VariantsMatcher.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/VariantsMetaData.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/resolve/VariantsMetaDataHelper.java
 delete mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/api/internal/resolve/JvmLocalLibraryDependencyResolverTest.groovy
 delete mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/DefaultJavaPlatformVariantAxisCompatibilityTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/resolve/DefaultJavaPlatformVariantAxisCompatibilityTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/resolve/DefaultVariantsMetaDataTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/resolve/JvmLibraryResolveContextTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/resolve/JvmLocalLibraryDependencyResolverTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/resolve/ParametrizedBinaryString.java
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/resolve/ParametrizedBinaryVariantDimension1.java
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/resolve/ParametrizedVariant.java
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/resolve/VariantDimension1.java
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/resolve/VariantDimension2.java
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/resolve/VariantDimension3.java
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/resolve/VariantsMatcherTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/resolve/VariantsMetaDataHelperTest.groovy
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/CompilerOutputFileNamingScheme.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultBuildType.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultFlavor.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/configure/NativeBinaryRules.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/prebuilt/DefaultPrebuiltSharedLibraryBinary.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/prebuilt/DefaultPrebuiltStaticLibraryBinary.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/resolve/DefaultLibraryResolver.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/Architecture.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/NativePlatform.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/OperatingSystem.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/ArchitectureInternal.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/DefaultArchitecture.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/DefaultNativePlatform.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/DefaultOperatingSystem.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/NativePlatforms.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/platform/internal/OperatingSystemInternal.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/plugins/NativeComponentModelPlugin.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/AbstractLinkTask.groovy
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/CreateStaticLibrary.groovy
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/InstallExecutable.groovy
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/LinkExecutable.groovy
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/LinkSharedLibrary.groovy
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/tasks/PrefixHeaderFileGenerateTask.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/DefaultCommandLineToolInvocationWorker.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/ExtendableToolChain.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/MacroArgsConverter.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/NativeToolChainInternal.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/PreCompiledHeader.java
 delete mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/ArStaticLibraryArchiver.java
 delete mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/gcc/GccLinker.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/DefaultVisualStudioLocator.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/DefaultWindowsSdkLocator.java
 delete mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/LibExeStaticLibraryArchiver.java
 delete mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/LinkExeLinker.java
 delete mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppToolChain.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualStudioInstall.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/internal/plugins/StandardToolChainsPlugin.java
 delete mode 100755 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/toolchain/plugins/MicrosoftVisualCppPlugin.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/language/nativeplatform/DependentSourceSet.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/language/nativeplatform/HeaderExportingSourceSet.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/language/nativeplatform/NativeResourceSet.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/language/nativeplatform/internal/DependentSourceSetInternal.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/language/nativeplatform/internal/Include.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/language/nativeplatform/internal/IncludeDirectives.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/language/nativeplatform/internal/IncludeType.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/language/nativeplatform/package-info.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/BuildType.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/BuildTypeContainer.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/Flavor.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/FlavorContainer.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeBinary.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeBinarySpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeComponentExtension.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeComponentSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeDependencySet.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeExecutable.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeExecutableBinary.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeExecutableBinarySpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeExecutableFileSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeExecutableSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeInstallationSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeLibrary.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeLibraryBinary.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeLibraryBinarySpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeLibraryRequirement.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/NativeLibrarySpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/ObjectFile.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/PrebuiltLibraries.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/PrebuiltLibrary.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/PrebuiltSharedLibraryBinary.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/PrebuiltStaticLibraryBinary.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/PreprocessingTool.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/Repositories.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/SharedLibraryBinary.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/SharedLibraryBinarySpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/StaticLibraryBinary.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/StaticLibraryBinarySpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/TargetedNativeComponent.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/Tool.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/AbstractBinaryToolSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/AbstractNativeBinaryRenderer.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/AbstractNativeBinarySpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/AbstractNativeComponentSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/AbstractNativeLibraryBinarySpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/AbstractTargetedNativeComponentSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/BinaryToolSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/BuildOperationLoggingCompilerDecorator.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/internal/CompilerOutputFileNamingScheme.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/internal/DefaultBuildType.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/DefaultBuildTypeContainer.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/internal/DefaultFlavor.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/DefaultFlavorContainer.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/DefaultLinkerSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/DefaultNativeExecutableBinarySpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/DefaultNativeExecutableSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/DefaultNativeLibrarySpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/DefaultPreprocessingTool.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/DefaultSharedLibraryBinarySpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/DefaultStaticLibraryArchiverSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/DefaultStaticLibraryBinarySpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/DefaultTool.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/LinkerSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/NativeBinaryRenderer.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/NativeBinarySpecInternal.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/NativeComponents.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/NativeExecutableBinaryRenderer.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/NativeExecutableBinarySpecInternal.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/NativePlatformResolver.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/ProjectNativeLibraryRequirement.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/SharedLibraryBinaryRenderer.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/SharedLibraryBinarySpecInternal.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/SharedLibraryLinkerSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/StaticLibraryArchiverSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/StaticLibraryBinaryRenderer.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/StaticLibraryBinarySpecInternal.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/TargetedNativeComponentInternal.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/configure/DefaultNativeComponentExtension.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/configure/NativeBinaries.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/internal/configure/NativeBinaryRules.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/configure/NativeComponentRules.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/pch/PchEnabledLanguageTransform.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/prebuilt/AbstractPrebuiltLibraryBinary.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/prebuilt/DefaultPrebuiltLibraries.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/prebuilt/DefaultPrebuiltLibrary.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/internal/prebuilt/DefaultPrebuiltSharedLibraryBinary.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/internal/prebuilt/DefaultPrebuiltStaticLibraryBinary.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/prebuilt/PrebuiltLibraryBinaryLocator.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/prebuilt/PrebuiltLibraryInitializer.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/prebuilt/PrebuiltLibraryResolveException.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/ApiRequirementNativeDependencyResolver.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/ChainedLibraryBinaryLocator.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/CurrentProjectModelResolver.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/internal/resolve/DefaultLibraryResolver.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/DefaultNativeDependencySet.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/InputHandlingNativeDependencyResolver.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/LibraryBinaryLocator.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/LibraryNativeDependencyResolver.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/NativeBinaryRequirementResolveResult.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/NativeBinaryResolveResult.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/NativeDependencyNotationParser.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/NativeDependencyResolver.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/NativeDependencyResolverServices.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/ProjectLibraryBinaryLocator.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/RequirementParsingNativeDependencyResolver.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/resolve/SourceSetNativeDependencyResolver.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/internal/services/NativeBinaryServices.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/package-info.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/platform/Architecture.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/platform/NativePlatform.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/platform/OperatingSystem.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/platform/internal/ArchitectureInternal.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/platform/internal/Architectures.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/platform/internal/DefaultArchitecture.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/platform/internal/DefaultNativePlatform.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/platform/internal/DefaultOperatingSystem.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/platform/internal/NativePlatformInternal.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/platform/internal/NativePlatforms.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/platform/internal/OperatingSystemInternal.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/platform/package-info.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/plugins/NativeComponentModelPlugin.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/plugins/NativeComponentPlugin.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/plugins/package-info.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/tasks/AbstractLinkTask.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/tasks/CreateStaticLibrary.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/tasks/InstallExecutable.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/tasks/LinkExecutable.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/tasks/LinkSharedLibrary.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/tasks/ObjectFilesToBinary.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/tasks/PrefixHeaderFileGenerateTask.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/tasks/package-info.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/Clang.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/CommandLineToolConfiguration.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/Gcc.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/GccCommandLineToolConfiguration.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/GccCompatibleToolChain.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/GccPlatformToolChain.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/NativePlatformToolChain.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/NativeToolChain.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/NativeToolChainRegistry.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/VisualCpp.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/VisualCppPlatformToolChain.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/AbstractPlatformToolProvider.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/ArgsTransformer.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/CommandLineToolContext.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/CommandLineToolInvocation.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/CommandLineToolInvocationFailure.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/CommandLineToolInvocationWorker.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/DefaultCommandLineToolInvocation.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/DefaultCommandLineToolInvocationWorker.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/DefaultMutableCommandLineToolContext.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/DefaultNativeToolChainRegistry.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/ExtendableToolChain.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/MacroArgsConverter.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/MutableCommandLineToolContext.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/NativeCompileSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/NativeCompiler.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/NativeToolChainInternal.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/NativeToolChainRegistryInternal.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/OptionsFileArgsWriter.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/OutputCleaningCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/PCHUtils.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/PlatformToolProvider.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/PreCompiledHeader.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/ToolType.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/UnavailablePlatformToolProvider.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/clang/ClangToolChain.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/compilespec/AssembleSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/compilespec/CCompileSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/compilespec/CPCHCompileSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/compilespec/CppCompileSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/compilespec/CppPCHCompileSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/compilespec/ObjectiveCCompileSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/compilespec/ObjectiveCPCHCompileSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/compilespec/ObjectiveCppCompileSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/compilespec/ObjectiveCppPCHCompileSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/compilespec/WindowsResourceCompileSpec.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/AbstractGccCompatibleToolChain.java (100%)
 create mode 100755 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/gcc/ArStaticLibraryArchiver.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/Assembler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/CCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/CPCHCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/CppCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/CppPCHCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/DefaultGccPlatformToolChain.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/GccCompatibleNativeCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/GccCompilerArgsTransformer.java (100%)
 create mode 100755 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/gcc/GccLinker.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/GccOptionsFileArgsWriter.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/GccPlatformToolProvider.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/GccToolChain.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/ObjectiveCCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/ObjectiveCPCHCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/ObjectiveCppCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/ObjectiveCppPCHCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/TargetPlatformConfiguration.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/version/CompilerMetaDataProvider.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/version/CompilerMetaDataProviderFactory.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/version/GccVersionDeterminer.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/gcc/version/GccVersionResult.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/ArchitectureDescriptor.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/Assembler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/CCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/CPCHCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/CppCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/CppPCHCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/DefaultVisualCppPlatformToolChain.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/msvcpp/DefaultVisualStudioLocator.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/msvcpp/DefaultWindowsSdkLocator.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/EscapeUserArgs.java (100%)
 create mode 100755 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/msvcpp/LibExeStaticLibraryArchiver.java
 create mode 100755 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/msvcpp/LinkExeLinker.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppCompilerArgsTransformer.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppInstall.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppNativeCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppOptionsFileArgsWriter.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppPCHCompilerArgsTransformer.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppPlatformToolProvider.java (100%)
 create mode 100755 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualCppToolChain.java
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualStudioInstall.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/VisualStudioLocator.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/WindowsResourceCompiler.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/WindowsSdk.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/msvcpp/WindowsSdkLocator.java (100%)
 create mode 100644 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/plugins/StandardToolChainsPlugin.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/tools/CommandLineToolConfigurationInternal.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/tools/CommandLineToolSearchResult.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/tools/DefaultCommandLineToolConfiguration.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/tools/DefaultGccCommandLineToolConfiguration.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/tools/GccCommandLineToolConfigurationInternal.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/tools/ToolRegistry.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/internal/tools/ToolSearchPath.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/package-info.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/plugins/ClangCompilerPlugin.java (100%)
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/plugins/GccCompilerPlugin.java (100%)
 create mode 100755 subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/plugins/MicrosoftVisualCppCompilerPlugin.java
 rename subprojects/platform-native/src/main/{groovy => java}/org/gradle/nativeplatform/toolchain/plugins/package-info.java (100%)
 create mode 100644 subprojects/platform-native/src/main/resources/META-INF/gradle-plugins/org.gradle.clang-compiler.properties
 create mode 100644 subprojects/platform-native/src/main/resources/META-INF/gradle-plugins/org.gradle.gcc-compiler.properties
 create mode 100644 subprojects/platform-native/src/main/resources/META-INF/gradle-plugins/org.gradle.microsoft-visual-cpp-compiler.properties
 create mode 100644 subprojects/platform-native/src/main/resources/META-INF/gradle-plugins/org.gradle.native-component-model.properties
 create mode 100644 subprojects/platform-native/src/main/resources/META-INF/gradle-plugins/org.gradle.standard-tool-chains.properties
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/plugins/MicrosoftVisualCppCompilerPluginTest.groovy
 delete mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/toolchain/plugins/MicrosoftVisualCppPluginTest.groovy
 create mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/fixtures/binaryinfo/FileArchOnlyBinaryInfo.groovy
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/run/PlayRunAdapterV25X.java
 create mode 100644 subprojects/platform-play/src/test/groovy/org/gradle/play/internal/routes/RoutesCompilerFactoryTest.groovy
 create mode 100644 subprojects/plugin-development/src/integTest/groovy/org/gradle/plugin/devel/impldeps/GradleImplDepsShadingIssuesIntegrationTest.groovy
 create mode 100644 subprojects/plugin-development/src/integTest/groovy/org/gradle/plugin/devel/impldeps/PackageListGeneratorIntegrationTest.groovy
 create mode 100644 subprojects/plugin-development/src/integTest/groovy/org/gradle/plugin/devel/plugins/JavaGradlePluginPluginPublishingIntegrationTest.groovy
 create mode 100644 subprojects/plugin-development/src/integTest/groovy/org/gradle/plugin/devel/tasks/ValidateTaskPropertiesConfiguredByPluginIntegrationTest.groovy
 create mode 100644 subprojects/plugin-development/src/integTest/groovy/org/gradle/plugin/devel/tasks/ValidateTaskPropertiesIntegrationTest.groovy
 create mode 100644 subprojects/plugin-development/src/main/java/org/gradle/plugin/devel/PluginDeclaration.java
 create mode 100644 subprojects/plugin-development/src/main/java/org/gradle/plugin/devel/plugins/IvyPluginPublishingRules.java
 create mode 100644 subprojects/plugin-development/src/main/java/org/gradle/plugin/devel/plugins/MavenPluginPublishingRules.java
 create mode 100644 subprojects/plugin-development/src/main/java/org/gradle/plugin/devel/tasks/GeneratePluginDescriptors.java
 create mode 100644 subprojects/plugin-development/src/main/java/org/gradle/plugin/devel/tasks/ValidateTaskProperties.java
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/repository/AuthenticatedPluginRepositorySpec.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/repository/PluginRepositoriesDslSpec.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/repository/ResolvingFromMultipleCustomPluginRepositorySpec.groovy
 create mode 100644 subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/repository/ResolvingFromSingleCustomPluginRepositorySpec.groovy
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/repository/internal/AbstractPluginRepository.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/repository/internal/BackedByArtifactRepository.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/repository/internal/DefaultGradlePluginPortal.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/repository/internal/DefaultIvyPluginRepository.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/repository/internal/DefaultMavenPluginRepository.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/repository/internal/DefaultPluginRepositoryFactory.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/repository/internal/DefaultPluginRepositoryRegistry.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/repository/internal/PluginRepositoryInternal.java
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/ArtifactRepositoryPluginResolver.java
 create mode 100644 subprojects/plugin-use/src/test/groovy/org/gradle/plugin/use/resolve/internal/ArtifactRepositoryPluginResolverTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/api/plugins/BuildSrcPluginIntegrationTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/api/plugins/BuildSrcPluginTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/groovy/GroovyCrossCompilationIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/java/ParallelTestTaskIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/java/UnsupportedJavaVersionCrossCompilationIntegrationTest.groovy
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/distribution/plugins/DistributionPlugin.groovy
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/distribution/plugins/DistributionPlugin.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/distribution/plugins/package-info.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/ApplicationPlugin.groovy
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/ApplicationPlugin.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/ApplicationPluginConvention.groovy
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/ApplicationPluginConvention.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/BasePluginConvention.groovy
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/BasePluginConvention.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JavaLibraryDistributionPlugin.groovy
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JavaLibraryDistributionPlugin.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JavaPluginConvention.groovy
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JavaPluginConvention.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/WarPluginConvention.groovy
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/WarPluginConvention.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/application/CreateStartScripts.groovy
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/application/CreateStartScripts.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/bundling/Jar.groovy
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/bundling/Jar.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/bundling/War.groovy
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/bundling/War.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/GroovyCompileTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/GroovyCompileTest.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/tasks/testing/TestTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/tasks/testing/TestTest.java
 create mode 100644 subprojects/plugins/src/testFixtures/groovy/org/gradle/api/tasks/compile/AbstractCompileTest.groovy
 delete mode 100644 subprojects/plugins/src/testFixtures/groovy/org/gradle/api/tasks/compile/AbstractCompileTest.java
 create mode 100644 subprojects/process-services/process-services.gradle
 rename subprojects/{core/src/main/groovy => process-services/src/main/java}/org/gradle/process/BaseExecSpec.java (100%)
 rename subprojects/{core/src/main/groovy => process-services/src/main/java}/org/gradle/process/ExecResult.java (100%)
 rename subprojects/{core/src/main/groovy => process-services/src/main/java}/org/gradle/process/ExecSpec.java (100%)
 create mode 100755 subprojects/process-services/src/main/java/org/gradle/process/ProcessForkOptions.java
 rename subprojects/{core/src/main/groovy => process-services/src/main/java}/org/gradle/process/internal/ExecException.java (100%)
 rename subprojects/{core/src/main/groovy => process-services/src/main/java}/org/gradle/process/internal/ExecHandle.java (100%)
 create mode 100644 subprojects/process-services/src/main/java/org/gradle/process/internal/ExecHandleBuilder.java
 create mode 100644 subprojects/process-services/src/main/java/org/gradle/process/internal/ExecHandleFactory.java
 rename subprojects/{core/src/main/groovy => process-services/src/main/java}/org/gradle/process/internal/ExecHandleListener.java (100%)
 rename subprojects/{core/src/main/groovy => process-services/src/main/java}/org/gradle/process/internal/ExecHandleState.java (100%)
 rename subprojects/publish/src/main/{groovy => java}/org/gradle/api/publish/Publication.java (100%)
 rename subprojects/publish/src/main/{groovy => java}/org/gradle/api/publish/PublicationContainer.java (100%)
 rename subprojects/publish/src/main/{groovy => java}/org/gradle/api/publish/PublishingExtension.java (100%)
 rename subprojects/publish/src/main/{groovy => java}/org/gradle/api/publish/internal/DefaultPublicationContainer.java (100%)
 rename subprojects/publish/src/main/{groovy => java}/org/gradle/api/publish/internal/DefaultPublishingExtension.java (100%)
 rename subprojects/publish/src/main/{groovy => java}/org/gradle/api/publish/internal/ProjectDependencyPublicationResolver.java (100%)
 rename subprojects/publish/src/main/{groovy => java}/org/gradle/api/publish/internal/PublicationFieldValidator.java (100%)
 rename subprojects/publish/src/main/{groovy => java}/org/gradle/api/publish/internal/PublicationInternal.java (100%)
 rename subprojects/publish/src/main/{groovy => java}/org/gradle/api/publish/internal/PublishOperation.java (100%)
 rename subprojects/publish/src/main/{groovy => java}/org/gradle/api/publish/internal/PublishServices.java (100%)
 rename subprojects/publish/src/main/{groovy => java}/org/gradle/api/publish/package-info.java (100%)
 rename subprojects/publish/src/main/{groovy => java}/org/gradle/api/publish/plugins/PublishingPlugin.java (100%)
 rename subprojects/publish/src/main/{groovy => java}/org/gradle/api/publish/plugins/package-info.java (100%)
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/BuildDashboardReports.java
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/DirectoryReport.java
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/GenerateBuildDashboard.java
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/Report.java
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/ReportContainer.java
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/Reporting.java
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/ReportingExtension.java
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/SingleFileReport.java
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/internal/BuildDashboardGenerator.java
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/internal/DefaultReportContainer.java
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/internal/SimpleReport.java
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/internal/TaskGeneratedReport.java
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/internal/TaskReportContainer.java
 rename subprojects/reporting/src/main/{groovy => java}/org/gradle/api/plugins/ReportingBasePlugin.java (100%)
 create mode 100644 subprojects/reporting/src/main/java/org/gradle/api/reporting/BuildDashboardReports.java
 rename subprojects/reporting/src/main/{groovy => java}/org/gradle/api/reporting/ConfigurableReport.java (100%)
 rename subprojects/reporting/src/main/{groovy => java}/org/gradle/api/reporting/CustomizableHtmlReport.java (100%)
 create mode 100644 subprojects/reporting/src/main/java/org/gradle/api/reporting/DirectoryReport.java
 create mode 100644 subprojects/reporting/src/main/java/org/gradle/api/reporting/GenerateBuildDashboard.java
 create mode 100644 subprojects/reporting/src/main/java/org/gradle/api/reporting/Report.java
 create mode 100644 subprojects/reporting/src/main/java/org/gradle/api/reporting/ReportContainer.java
 create mode 100644 subprojects/reporting/src/main/java/org/gradle/api/reporting/Reporting.java
 create mode 100644 subprojects/reporting/src/main/java/org/gradle/api/reporting/ReportingExtension.java
 create mode 100644 subprojects/reporting/src/main/java/org/gradle/api/reporting/SingleFileReport.java
 create mode 100644 subprojects/reporting/src/main/java/org/gradle/api/reporting/internal/BuildDashboardGenerator.java
 rename subprojects/reporting/src/main/{groovy => java}/org/gradle/api/reporting/internal/CustomizableHtmlReportImpl.java (100%)
 rename subprojects/reporting/src/main/{groovy => java}/org/gradle/api/reporting/internal/DefaultBuildDashboardReports.java (100%)
 create mode 100644 subprojects/reporting/src/main/java/org/gradle/api/reporting/internal/DefaultReportContainer.java
 create mode 100644 subprojects/reporting/src/main/java/org/gradle/api/reporting/internal/SimpleReport.java
 create mode 100644 subprojects/reporting/src/main/java/org/gradle/api/reporting/internal/TaskGeneratedReport.java
 rename subprojects/reporting/src/main/{groovy => java}/org/gradle/api/reporting/internal/TaskGeneratedSingleDirectoryReport.java (100%)
 rename subprojects/reporting/src/main/{groovy => java}/org/gradle/api/reporting/internal/TaskGeneratedSingleFileReport.java (100%)
 create mode 100644 subprojects/reporting/src/main/java/org/gradle/api/reporting/internal/TaskReportContainer.java
 rename subprojects/reporting/src/main/{groovy => java}/org/gradle/api/reporting/package-info.java (100%)
 rename subprojects/reporting/src/main/{groovy => java}/org/gradle/api/reporting/plugins/BuildDashboardPlugin.java (100%)
 rename subprojects/reporting/src/main/{groovy => java}/org/gradle/api/reporting/plugins/package-info.java (100%)
 create mode 100644 subprojects/reporting/src/main/resources/META-INF/gradle-plugins/org.gradle.reporting-base.properties
 create mode 100644 subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/AbstractHttpClientTest.groovy
 create mode 100644 subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpResourceUploaderTest.groovy
 create mode 100644 subprojects/resources-s3/src/main/java/org/gradle/internal/resource/transport/aws/s3/S3ResourceResolver.java
 create mode 100644 subprojects/resources-s3/src/test/groovy/org/gradle/internal/resource/transport/aws/s3/S3ResourceResolverTest.groovy
 create mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/scala/ScalaCrossCompilationIntegrationTest.groovy
 delete mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/AbstractAntForkingScalaCompilerIntegrationTest.groovy
 delete mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/AbstractAntInProcessScalaCompilerIntegrationTest.groovy
 delete mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/AntForkingOlderScalaCompilerIntegrationTest.groovy
 delete mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/AntForkingScalaCompilerIntegrationTest.groovy
 delete 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/AntInProcessScalaCompilerIntegrationTest.groovy
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/DefaultScalaSourceSet.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/AntScalaCompiler.groovy
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaCompileOptionsInternal.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java
 delete 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/plugins/scala/ScalaBasePlugin.groovy
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/plugins/scala/ScalaPlugin.groovy
 delete 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/AntScalaDoc.groovy
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/tasks/scala/ScalaCompile.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/tasks/scala/ScalaCompileOptions.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/tasks/scala/ScalaDoc.java
 create mode 100644 subprojects/scala/src/main/java/org/gradle/api/internal/tasks/DefaultScalaSourceSet.java
 create mode 100644 subprojects/scala/src/main/java/org/gradle/api/internal/tasks/scala/AntScalaDoc.java
 rename subprojects/scala/src/main/{groovy => java}/org/gradle/api/internal/tasks/scala/CleaningScalaCompiler.java (100%)
 rename subprojects/scala/src/main/{groovy => java}/org/gradle/api/internal/tasks/scala/DefaultScalaJavaJointCompiler.java (100%)
 create mode 100644 subprojects/scala/src/main/java/org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java
 create mode 100644 subprojects/scala/src/main/java/org/gradle/api/plugins/scala/ScalaBasePlugin.java
 create mode 100644 subprojects/scala/src/main/java/org/gradle/api/plugins/scala/ScalaPlugin.java
 create mode 100644 subprojects/scala/src/main/java/org/gradle/api/plugins/scala/package-info.java
 create mode 100644 subprojects/scala/src/main/java/org/gradle/api/tasks/ScalaRuntime.java
 rename subprojects/scala/src/main/{groovy => java}/org/gradle/api/tasks/ScalaSourceSet.java (100%)
 create mode 100644 subprojects/scala/src/main/java/org/gradle/api/tasks/scala/ScalaCompile.java
 create mode 100644 subprojects/scala/src/main/java/org/gradle/api/tasks/scala/ScalaCompileOptions.java
 create mode 100644 subprojects/scala/src/main/java/org/gradle/api/tasks/scala/ScalaDoc.java
 rename subprojects/scala/src/main/{groovy => java}/org/gradle/api/tasks/scala/ScalaDocOptions.java (100%)
 delete mode 100644 subprojects/scala/src/test/groovy/org/gradle/api/tasks/scala/ScalaCompileOptionsTest.groovy
 create mode 100644 subprojects/scala/src/test/groovy/org/gradle/api/tasks/scala/ScalaCompileTest.groovy
 delete mode 100644 subprojects/scala/src/test/groovy/org/gradle/api/tasks/scala/ScalaCompileTest.java
 create mode 100644 subprojects/scala/src/test/groovy/org/gradle/api/tasks/scala/ScalaDocSpec.groovy
 delete mode 100644 subprojects/scala/src/test/groovy/org/gradle/api/tasks/scala/ScalaDocTest.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/Sign.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/Sign.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/SignOperation.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/SignOperation.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/Signature.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/Signature.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/SignatureSpec.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/SignatureSpec.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/SigningExtension.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/SigningExtension.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/SigningPlugin.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/SigningPlugin.java
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/package-info.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/Signatory.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/Signatory.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/SignatoryProvider.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/SignatoryProvider.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/SignatorySupport.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/SignatorySupport.java
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/package-info.java
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/pgp/Dsl.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/pgp/PgpKeyId.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/pgp/PgpKeyId.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/pgp/PgpSignatory.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/pgp/PgpSignatory.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/pgp/PgpSignatoryFactory.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/pgp/PgpSignatoryFactory.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/pgp/PgpSignatoryProvider.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/pgp/PgpSignatoryProvider.java
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/pgp/package-info.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/AbstractSignatureType.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/AbstractSignatureType.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/AbstractSignatureTypeProvider.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/AbstractSignatureTypeProvider.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/BinarySignatureType.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/BinarySignatureType.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/DefaultSignatureTypeProvider.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/DefaultSignatureTypeProvider.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/SignatureType.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/SignatureType.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/SignatureTypeProvider.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/SignatureTypeProvider.java
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/package-info.java
 delete mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/pgp/ArmoredSignatureType.groovy
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/pgp/ArmoredSignatureType.java
 create mode 100644 subprojects/signing/src/main/groovy/org/gradle/plugins/signing/type/pgp/package-info.java
 create mode 100644 subprojects/smoke-test/smoke-test.gradle
 create mode 100644 subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AbstractSmokeTest.groovy
 create mode 100644 subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AndroidPluginsSmokeTest.groovy
 create mode 100644 subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/GrettySmokeTest.groovy
 create mode 100644 subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/JavascriptPluginsSmokeTest.groovy
 create mode 100644 subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/KotlinPluginSmokeTest.groovy
 create mode 100644 subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/NebulaPluginsSmokeTest.groovy
 create mode 100644 subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/ThirdPartyPluginsSmokeTest.groovy
 create mode 100644 subprojects/smoke-test/src/smokeTest/resources/org/gradle/smoketests/android-kotlin-example/build.gradle
 create mode 100644 subprojects/smoke-test/src/smokeTest/resources/org/gradle/smoketests/android-kotlin-example/src/main/AndroidManifest.xml
 create mode 100644 subprojects/smoke-test/src/smokeTest/resources/org/gradle/smoketests/android-kotlin-example/src/main/kotlin/org/gradle/smoketest/kotlin/android/StringPrinterFragment.kt
 create mode 100644 subprojects/smoke-test/src/smokeTest/resources/org/gradle/smoketests/android-kotlin-example/src/test/kotlin/org/gradle/smoketest/kotlin/android/StringPrinterTest.kt
 create mode 100644 subprojects/smoke-test/src/smokeTest/resources/org/gradle/smoketests/gretty-example/build.gradle
 create mode 100644 subprojects/smoke-test/src/smokeTest/resources/org/gradle/smoketests/gretty-example/src/main/java/org/gradle/sample/Greeter.java
 create mode 100644 subprojects/smoke-test/src/smokeTest/resources/org/gradle/smoketests/gretty-example/src/main/webapp/index.jsp
 create mode 100644 subprojects/smoke-test/src/smokeTest/resources/org/gradle/smoketests/kotlin-example/build.gradle
 create mode 100644 subprojects/smoke-test/src/smokeTest/resources/org/gradle/smoketests/kotlin-example/src/main/kotlin/pkg/HelloWorld.kt
 create mode 100644 subprojects/soak/soak.gradle
 create mode 100644 subprojects/soak/src/integTest/groovy/org/gradle/launcher/daemon/AndroidDexingSoakTest.groovy
 create mode 100644 subprojects/soak/src/integTest/groovy/org/gradle/launcher/daemon/DaemonPerformanceMonitoringCoverage.groovy
 create mode 100644 subprojects/soak/src/integTest/groovy/org/gradle/launcher/daemon/DaemonPerformanceMonitoringSoakTest.groovy
 create mode 100644 subprojects/soak/src/integTest/groovy/org/gradle/resolve/DependencyResolutionStressTest.groovy
 create mode 100644 subprojects/soak/src/testFixtures/groovy/org/gradle/launcher/daemon/fixtures/DaemonMultiJdkIntegrationTest.groovy
 create mode 100644 subprojects/soak/src/testFixtures/groovy/org/gradle/launcher/daemon/fixtures/FullyQualifiedGarbageCollector.groovy
 create mode 100644 subprojects/soak/src/testFixtures/groovy/org/gradle/launcher/daemon/fixtures/JavaGarbageCollector.groovy
 create mode 100644 subprojects/soak/src/testFixtures/groovy/org/gradle/launcher/daemon/fixtures/JdkVendor.groovy
 create mode 100644 subprojects/soak/src/testFixtures/groovy/org/gradle/soak/categories/SoakTest.java
 delete mode 100644 subprojects/sonar/sonar.gradle
 delete mode 100644 subprojects/sonar/src/integTest/groovy/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest.groovy
 delete mode 100644 subprojects/sonar/src/integTest/groovy/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest.groovy
 delete mode 100644 subprojects/sonar/src/integTest/groovy/org/gradle/sonar/runner/SonarTestServer.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/customizedProject/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/customizedProject/src/org/gradle/test/customizedProject/Production1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/customizedProject/test/org/gradle/test/customizedProject/Test1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/gradle.properties
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production10.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production2.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production3.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production4.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production5.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production6.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production7.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production8.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production9.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/resources/org/gradle/test/javaProject/productionResource.xml
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test10.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test2.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test3.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test4.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test5.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test6.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test7.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test8.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test9.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/resources/org/gradle/test/javaProject/testResource.xml
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/nested/nested2/nestedProject/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/nested/nested2/nestedProject/src/main/java/org/gradle/test/nestedProject/Production1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/nested/nested2/nestedProject/src/test/java/org/gradle/test/nestedProject/Test1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/settings.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/skippedProject/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/skippedProject/src/main/java/org/gradle/test/skippedProject/Production1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/skippedProject/src/test/java/org/gradle/test/skippedProject/Test1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/src/main/java/Person.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/customizedProject/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/customizedProject/src/org/gradle/test/customizedProject/Production1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/customizedProject/test/org/gradle/test/customizedProject/Test1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/emptyJavaProject/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/gradle.properties
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy1.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy10.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy2.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy3.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy4.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy5.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy6.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy7.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy8.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/main/groovy/org/gradle/test/groovyProject/ProductionGroovy9.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy1.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy10.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy2.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy3.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy4.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy5.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy6.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy7.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy8.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/src/test/groovy/org/gradle/test/groovyProject/TestGroovy9.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production10.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production2.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production3.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production4.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production5.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production6.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production7.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production8.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/java/org/gradle/test/javaProject/Production9.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/main/resources/org/gradle/test/javaProject/productionResource.xml
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test10.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test2.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test3.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test4.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test5.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test6.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test7.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test8.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/java/org/gradle/test/javaProject/Test9.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/src/test/resources/org/gradle/test/javaProject/testResource.xml
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithSkippedTestTask/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithSkippedTestTask/src/test/java/Test1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithoutTestClasses/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithoutTestClasses/src/main/java/Production1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/nested/nested2/nestedProject/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/nested/nested2/nestedProject/src/main/java/org/gradle/test/nestedProject/Production1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/nested/nested2/nestedProject/src/test/java/org/gradle/test/nestedProject/Test1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/settings.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/skippedProject/build.gradle
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/skippedProject/src/main/java/org/gradle/test/skippedProject/Production1.java
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/skippedProject/src/test/java/org/gradle/test/skippedProject/Test1.java
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/api/plugins/sonar/SonarAnalyze.groovy
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/api/plugins/sonar/SonarPlugin.groovy
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/api/plugins/sonar/internal/SonarCodeAnalyzer.groovy
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/api/plugins/sonar/model/IncludeProperties.groovy
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/api/plugins/sonar/model/ModelToPropertiesConverter.groovy
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/api/plugins/sonar/model/SonarProperty.groovy
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/api/plugins/sonar/model/SonarRootModel.groovy
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/SonarProperties.java
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/SonarRunnerExtension.java
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/SonarRunnerRootExtension.java
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/package-info.java
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/plugins/SonarRunnerPlugin.java
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/plugins/package-info.java
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/tasks/SonarRunner.java
 delete mode 100644 subprojects/sonar/src/main/groovy/org/gradle/sonar/runner/tasks/package-info.java
 delete mode 100644 subprojects/sonar/src/main/resources/META-INF/gradle-plugins/org.gradle.sonar-runner.properties
 delete mode 100644 subprojects/sonar/src/main/resources/META-INF/gradle-plugins/org.gradle.sonar.properties
 delete mode 100644 subprojects/sonar/src/main/resources/logback.xml
 delete mode 100644 subprojects/sonar/src/test/groovy/org/gradle/api/plugins/sonar/SonarAnalyzeTest.groovy
 delete mode 100644 subprojects/sonar/src/test/groovy/org/gradle/api/plugins/sonar/SonarPluginTest.groovy
 delete mode 100644 subprojects/sonar/src/test/groovy/org/gradle/api/plugins/sonar/model/ModelToPropertiesConverterTest.groovy
 delete mode 100644 subprojects/sonar/src/test/groovy/org/gradle/sonar/runner/SonarPropertiesTest.groovy
 delete mode 100644 subprojects/sonar/src/test/groovy/org/gradle/sonar/runner/SonarRunnerExtensionTest.groovy
 delete mode 100644 subprojects/sonar/src/test/groovy/org/gradle/sonar/runner/plugins/SonarRunnerPluginTest.groovy
 create mode 100644 subprojects/task-cache-http/src/integTest/groovy/org/gradle/cache/tasks/http/HttpTaskOutputCacheIntegrationTest.groovy
 create mode 100644 subprojects/task-cache-http/src/integTest/groovy/org/gradle/cache/tasks/http/HttpTaskOutputCacheTest.groovy
 create mode 100644 subprojects/task-cache-http/src/main/java/org/gradle/cache/tasks/http/HttpTaskOutputCache.java
 create mode 100644 subprojects/task-cache-http/src/main/java/org/gradle/cache/tasks/http/HttpTaskOutputCacheFactory.java
 create mode 100644 subprojects/task-cache-http/task-cache-http.gradle
 create mode 100644 subprojects/test-kit/src/integTest/groovy/org/gradle/testkit/runner/GradleRunnerSupportedBuildJvmIntegrationTest.groovy
 create mode 100644 subprojects/test-kit/src/integTest/groovy/org/gradle/testkit/runner/GradleRunnerUnsupportedGradleVersionFailureIntegrationTest.groovy
 create mode 100644 subprojects/test-kit/src/integTest/groovy/org/gradle/testkit/runner/enduser/CheckstyleEndUserIntegrationTest.groovy
 create mode 100644 subprojects/test-kit/src/integTest/groovy/org/gradle/testkit/runner/enduser/GradleRunnerUserLoggingEndUserIntegrationTest.groovy
 create mode 100644 subprojects/testing-base/src/integTest/groovy/org/gradle/api/internal/tasks/testing/JULRedirectorIntegrationTest.groovy
 copy subprojects/{testing-jvm/src/integTest/resources/org/gradle/testing/IncrementalTestIntegrationTest/shared => testing-base/src/integTest/resources/org/gradle/api/internal/tasks/testing/JULRedirectorIntegrationTest/loggingConfig}/build.gradle (100%)
 create mode 100644 subprojects/testing-base/src/integTest/resources/org/gradle/api/internal/tasks/testing/JULRedirectorIntegrationTest/loggingConfig/src/main/java/com/example/LumberJack.java
 create mode 100644 subprojects/testing-base/src/integTest/resources/org/gradle/api/internal/tasks/testing/JULRedirectorIntegrationTest/loggingConfig/src/test/java/com/example/LumberJackTest.java
 create mode 100644 subprojects/testing-base/src/integTest/resources/org/gradle/api/internal/tasks/testing/JULRedirectorIntegrationTest/loggingConfig/src/test/resources/logging.properties
 delete mode 100644 subprojects/testing-base/src/main/java/org/gradle/platform/base/test/TestSuiteBinarySpec.java
 delete mode 100644 subprojects/testing-base/src/main/java/org/gradle/platform/base/test/TestSuiteContainer.java
 delete mode 100644 subprojects/testing-base/src/main/java/org/gradle/platform/base/test/TestSuiteSpec.java
 create mode 100644 subprojects/testing-base/src/test/groovy/org/gradle/api/internal/tasks/testing/processors/JULRedirectorTest.groovy
 create mode 100755 subprojects/testing-base/src/test/groovy/org/gradle/api/internal/tasks/testing/processors/RestartEveryNTestClassProcessorTest.groovy
 delete mode 100755 subprojects/testing-base/src/test/groovy/org/gradle/api/internal/tasks/testing/processors/RestartEveryNTestClassProcessorTest.java
 create mode 100644 subprojects/testing-jvm/src/integTest/groovy/org/gradle/testing/junit/BuildSrcSpockIntegrationTest.groovy
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Failing/build.gradle
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Failing/src/main/groovy/org/gradle/Ok.groovy
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Failing/src/test/groovy/org/gradle/BadTest.groovy
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Passing/build.gradle
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Passing/src/main/groovy/org/gradle/Ok.groovy
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Passing/src/test/groovy/org/gradle/OkTest.groovy
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/javaJdk14Failing/build.gradle
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/javaJdk14Failing/src/main/java/org/gradle/Ok.java
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/javaJdk14Failing/src/test/java/org/gradle/BadTest.java
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/javaJdk15Failing/build.gradle
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/javaJdk15Failing/src/main/java/org/gradle/Ok.java
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/javaJdk15Failing/src/test/java/org/gradle/BadTest.java
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/javaJdk15Failing/src/test/java/org/gradle/BrokenAfterSuite.java
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/javaJdk15Failing/src/test/java/org/gradle/TestWithBrokenMethodDependency.java
 delete mode 100644 subprojects/testing-jvm/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/javaJdk15Failing/src/test/java/org/gradle/TestWithBrokenSetup.java
 delete mode 100644 subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/CompositeBuildModelActionRunner.java
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/SamplesCompositeBuildIntegrationTest.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/ToolingApiUnsupportedBuildJvmCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/ToolingApiUnsupportedClientJvmCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/ToolingApiUnsupportedVersionCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/ToolingApiUnsupportedVersionCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r12rc1/UnsupportedOperationFeedbackCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r20/BrokenAction.java
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r20/ToolingApiUnsupportedBuildJvmCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r20/ToolingApiUnsupportedClientJvmCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r212/ToolingModelSerializationCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/ArbitraryModelsCompositeBuildCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/ArgumentPassingCompositeBuildCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/BuildActionCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/CancellationCompositeBuildCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/CoordinatorCompositeBuildCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/ExecuteBuildCompositeBuildCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/ExecuteTaskModelBuilderCompositeBuildCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/FetchProjectModelsBuildAction.java
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/HeterogeneousCompositeBuildCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/ModelResultCompositeBuildCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/ModelsWithGradleBuildIdentifierCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/MultiProjectCompositeBuildCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/ProgressListenerCompositeBuildCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/SingleProjectCompositeBuildCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/SmokeCompositeBuildCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r213/StandardStreamCompositeBuildCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r214/ToolingApEclipseModelNaturesAndBuildCommandsCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r214/ToolingApiEclipseModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r214/ToolingApiEclipseModelWtpClasspathAttributesCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r214/ToolingApiEclipseProjectDependenciesCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r214/ToolingApiIdeaProjectDependenciesCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r24/DaemonUsageSuggestionCrossVersionTest.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r25/ContinuousUnsupportedJavaVersionCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r25/NullAction.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/ComplexCustomModelBuildingAction.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/CustomModelBuildingAction.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/CustomToolingModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/ToolingApiEclipseModelClasspathAttributesCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/ToolingApiEclipseModelClasspathContainerAccessRuleCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/ToolingApiEclipseModelClasspathContainerCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/ToolingApiEclipseModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/ToolingApiEclipseModelCustomLibrarySourceAndJavadocCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/ToolingApiEclipseModelDependencyAccessRuleCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/ToolingApiEclipseModelOutputLocationCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/ToolingApiEclipseModelSourceDirectoryAccessRuleCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/ToolingApiEclipseModelSourceDirectoryExcludeIncludePatternCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/ToolingApiEclipseModelSourceDirectoryOutputCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r30/ToolingApiEclipseModelSourceFolderClasspathAttributesCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r31/BuildActionCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r31/FetchTaskAction.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r31/ReturnValueAction.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r31/ToolingApiEclipseModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r31/ToolingApiIdeaModelCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/connection/FailedModelResult.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/connection/GradleConnection.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/connection/GradleConnectionBuilder.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/connection/ModelResult.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/connection/ModelResults.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/connection/package-info.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/adapter/CompatibleIntrospector.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/adapter/NoOpMethodInvoker.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/adapter/ObjectGraphAdapter.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/adapter/SourceObjectMapping.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/adapter/TypeInspector.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/adapter/ViewBuilder.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/CompositeBuildLauncher.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/DefaultCompositeModelBuilder.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/DefaultFailedModelResult.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/DefaultGradleConnection.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/DefaultGradleConnectionBuilder.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/DefaultModelResult.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/GradleConnectionBuildLauncher.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/GradleConnectionBuilderInternal.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/GradleConnectionFactory.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/ParticipantConnector.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/ToolingClientCompositeBuildLauncher.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/ToolingClientCompositeModelBuilder.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/ToolingClientCompositeUtil.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/connection/ToolingClientConsumerConnection.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/AbstractConnectionParameters.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/CompositeConnectionParameters.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/DefaultCompositeConnectionParameters.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/ProjectConnectionParameters.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/HasCompatibilityMapperAction.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/HasCompatibilityMapping.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/InternalConnectionBackedConsumerConnection.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/MultiModelProducer.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/CompatibilityIdeaProjectMapping.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/CompositeMappingAction.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/GradleProjectIdentifierMapping.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/GradleTaskDisplayNameMixInHandler.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/IdeaModelCompatibilityMapping.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/IdeaModuleDependencyTargetNameMixin.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/IdeaProjectCompatibilityMapper.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/IdeaProjectJavaLanguageSettingsMixin.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/TaskDisplayNameCompatibilityMapping.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/TaskDisplayNameMixin.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/TaskPropertyHandlerFactory.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/BuildModel.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/ProjectModel.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/eclipse/AccessRule.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/eclipse/ClasspathAttribute.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/eclipse/EclipseClasspathContainer.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/eclipse/EclipseClasspathEntry.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/eclipse/EclipseExternalDependency.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/eclipse/EclipseOutputLocation.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/idea/IdeaModuleIdentifier.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/internal/ProjectSensitiveToolingModelBuilder.java
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/adapter/CompatibleIntrospectorTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/adapter/TypeInspectorTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/adapter/TypeInspectorTestHelper.java
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/connection/DefaultCompositeModelBuilderTest.groovy
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/connection/DefaultGradleConnectionBuilderTest.groovy
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/connection/DefaultGradleConnectionTest.groovy
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/connection/GradleConnectionBuildLauncherTest.groovy
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/InternalConnectionBackedConsumerConnectionTest.groovy
 delete mode 100644 subprojects/tooling-api/src/testFixtures/groovy/org/gradle/integtests/tooling/fixture/CompositeToolingApiSpecification.groovy
 create mode 100644 subprojects/tooling-api/src/testFixtures/groovy/org/gradle/integtests/tooling/fixture/IgnoreIntegratedComposite.java
 create mode 100644 subprojects/tooling-api/src/testFixtures/groovy/org/gradle/integtests/tooling/fixture/RequiresIntegratedComposite.java
 create mode 100644 subprojects/tooling-api/src/testFixtures/groovy/org/gradle/integtests/tooling/fixture/ToolingApiExecution.groovy
 create mode 100644 subprojects/wrapper/src/integTest/groovy/org/gradle/integtests/AbstractWrapperIntegrationSpec.groovy
 create mode 100644 subprojects/wrapper/src/integTest/groovy/org/gradle/integtests/NonInteractiveLaunchIntegrationTest.groovy
 delete mode 100644 subprojects/wrapper/src/integTest/groovy/org/gradle/integtests/WrapperSetup.groovy
 create mode 100644 subprojects/wrapper/src/integTest/groovy/org/gradle/integtests/WrapperSupportedBuildJvmIntegrationTest.groovy
 create mode 100644 subprojects/wrapper/src/test/groovy/org/gradle/wrapper/ExclusiveFileAccessManagerTest.groovy

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