[gradle] branch master updated (640410b -> 4389152)

Kai-Chung Yan seamlik-guest at moszumanska.debian.org
Wed Jun 17 13:33:28 UTC 2015


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

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

      from  640410b   Upload to unstable
       new  efaf20b   Import upstream 1.12
       new  850544b   Merge upstream 1.12
       new  cd790dc   debian/changelog: Refresh version for new upstream
       new  dda1ebe   debian/.gitignore: Ignore build time files
       new  3a11d9e   debian/rules: Clean up
       new  7b11d34   Refresh patches
       new  f143961   debian/control: Add more Build-Depends
       new  ad3ba4f   Prepare for building binaries
       new  8459ef6   d/patches/use_local_jars.diff: Rename to use_local_artifact.diff
       new  3a05260   Follow patch format by removing index
       new  01d7d02   New patch: d/patches/do_not_use_jdk5_guava.diff
       new  f54a5ab   d/patches/use_local_artifacts.diff: buildSrc now use local artifacts
       new  b383e19   Add patch fix_DocGenerationException.diff
       new  f6ee300   d/rules: Clean buildSrc/.gradle as well
       new  b1aabce   d/rules: Add program options to Gradle command
       new  52e4a34   Provide codes of base-services for buildSrc
       new  9c5ea9f   d/control: Add quilt to Build-Depends
       new  9d321a7   Update dates of refreshed patches
       new  3967561   d/rules: Rename test source set to disable buildSrc tests
       new  9d6adf4   Restore dates of unchanged patches
       new  2b6afb5   Reintroduce and refresh 34_disable_code_quality.diff
       new  2d4aa35   The whole project build scripts can now be loaded and built
       new  3c23920   d/control: Changed-By - Kai-Chung Yan
       new  3bddf63   d/rules: Remove mv operation in dh_clean task
       new  8745ff7   Remove the Changed-By section and add myself to Uploaders
       new  631b513   d/changlog: Correct the format
       new  3da976c   d/control: Remove myself from Uploaders
       new  c4161eb   buildSrc must be prepared well before all Gradle operations
       new  bece00c   Abandon 90_respect_user_java_home.diff
       new  98f8abc   d/patches/fix_asm5_version.diff: Fix ASM version mismatch
       new  e14b2a0   d/control: Depends on libbintray-client-java
       new  ca3ff95   Reintroduce 33_scala_zinc.diff: Won't package Zinc for now
       new  9d3ab4d   disable_buildSrc_tests.diff: Disabling buildSrc tests now happens in build scripts
       new  59914c1   Remove debian/docs
       new  45e3ba8   fix_asm5_version.diff: Fix typo
       new  11b2dc9   fix_bintray_name.diff: Correct the name of bintray library
       new  564d79a   Resolve more dependencies
       new  9f708a4   Merge remote-tracking branch 'origin/master'
       new  9a78ec2   Import upstream 2.4
       new  5c4dacd   Imported Upstream version 1.12+dfsg
       new  f0e52f7   Merge tag 'upstream/1.12+dfsg'
       new  9ed7320   debian/changelog: Update version
       new  eaf0c68   Refresh patches
       new  40396f2   Fix bintray
       new  4deb823   debian/rules: Rearrange Gradle tasks
       new  68b839a   Resolve more dependencies
       new  84fe6bb   Fix Ivy
       new  3b1c10d   Fix Xerces dependencies
       new  439a358   Resolve more dependencies, now buildable
       new  223f4cf   debian/control: Can depend on higher version libgradle-core-java and libgradle-plugins-java
       new  63a2b7e   Fine tune install file list
       new  557fef1   Update debian/changelog
       new  0598810   No longer need launcher.diff
       new  f8fe9c6   Update package description
       new  0800db2   debian/orig-tar.excludes: Add *.tar
       new  daeb21b   Update package dependencies
       new  a196fd9   Re-enable building documentations
       new  cd1a2ce   Reintroduce 11_fix_jni_path.diff
       new  7e47abd   Delete unused patches
       new  28f4c0c   Install jarjar files to app home
       new  ab871b0   Reintroduce 30_envjs.diff for simpleframework is still not in Debian
       new  2b4f84f   d/gradle.links: Correct executable path
       new  8937206   d/control: Remove dependencies on libsimple-htto-java
       new  c50acb2   Make all dependencies versionless in build scripts
       new  82c7d4b   Bring back symlinks
       new  a04ed84   Fix: Won't build if not specify Groovy version
       new  b4d1dea   New patch: search_system_jar.diff, package now functional
       new  5e744c6   d/control: gradle Recommends default-jdk
       new  c5cfedf   d/libgradle-core-java.links: Fix asm4.jar link path
       new  4e6870b   d/gradle.install: Install init.d directory into gradle home directory
       new  dc4cbf4   No longer need the many symlinks since Gradle can find libraries in /usr/share/java/
       new  2dcf2ba   Removing guava version in buildSrc produces errors
       new  bdc2c59   use_local_artifacts.diff: Use matched-version JarJar library
       new  41f1953   Add libxslthl-java to Build-Depends
       new  c155bcb   Close the WNPP RFH bug and the wishlist bug about updating to 1.10
       new  558deb3   d/bootstrap.sh: Use Gradle 1.5 for bootstrap
       new  0727b68   Updated man page using Pandoc Markdown
       new  f04ca5d   Reintroduce 26_disable_commitid.diff
       new  9a77232   Delete asm5_version.diff: No longer used
       new  f868005   Remove debian/.gitignore
       new  4389152   d/gradle.links: Add comments

The 81 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                                       |   35 +-
 buildSrc/build.gradle                              |    4 +-
 .../main/groovy/org/gradle/build/BuildTypes.groovy |    2 +-
 .../main/groovy/org/gradle/build/JarJarJar.groovy  |    6 +-
 .../org/gradle/build/ReleasedVersions.groovy       |   93 +
 .../gradle/build/docs/DocGenerationException.java  |    2 +-
 .../org/gradle/build/docs/Docbook2XHtml.groovy     |    2 +-
 .../build/docs/SampleElementValidator.groovy       |    2 -
 .../build/docs/UserGuideTransformTask.groovy       |    7 +-
 .../build/docs/dsl/docbook/BasicJavadocLexer.java  |   20 +
 .../build/docs/dsl/docbook/BlocksRenderer.java     |   48 +-
 .../docs/dsl/docbook/ClassDocMemberRenderer.java   |   25 +
 .../docs/dsl/docbook/ClassDocMethodsBuilder.java   |    3 +-
 .../dsl/docbook/ClassDocPropertiesBuilder.java     |   13 +-
 .../build/docs/dsl/docbook/ClassDocRenderer.java   |   34 +-
 .../docs/dsl/docbook/ClassDocSuperTypeBuilder.java |   19 +-
 .../build/docs/dsl/docbook/JavadocConverter.java   |   17 +
 .../build/docs/dsl/docbook/MethodsRenderer.java    |   48 +-
 .../build/docs/dsl/docbook/PropertiesRenderer.java |   46 +-
 .../build/docs/dsl/docbook/model/ClassDoc.groovy   |    5 +
 .../docs/dsl/source/ExtractDslMetaDataTask.groovy  |    4 +-
 .../dsl/source/GenerateDefaultImportsTask.java     |  148 +
 .../docs/model/SimpleClassMetaDataRepository.java  |   10 +-
 .../docs/dsl/docbook/BasicJavadocLexerTest.groovy  |   26 +
 .../dsl/docbook/ClassDocMethodsBuilderTest.groovy  |   12 +-
 .../docbook/ClassDocPropertiesBuilderTest.groovy   |   22 +-
 .../docs/dsl/docbook/ClassDocRendererTest.groovy   |  249 +-
 .../docs/dsl/docbook/JavadocConverterTest.groovy   |   20 +
 .../model/SimpleClassMetaDataRepositoryTest.groovy |   26 +-
 config/checkstyle/checkstyle-groovy.xml            |    3 +
 config/checkstyle/checkstyle.xml                   |    3 +
 debian/bootstrap.sh                                |    4 +-
 debian/changelog                                   |   42 +-
 debian/control                                     |  263 +-
 debian/gradle-doc.docs                             |    3 -
 debian/gradle-doc.install                          |    3 +
 debian/gradle.1.md                                 |  164 +
 debian/gradle.install                              |   12 +-
 debian/gradle.jlibs                                |    2 +
 debian/gradle.links                                |   22 +-
 debian/gradle.manpages                             |    2 +-
 debian/gradle.pod                                  |  137 -
 debian/libgradle-core-java.install                 |    1 -
 debian/libgradle-core-java.jlibs                   |   14 +-
 debian/libgradle-core-java.links                   |   43 +-
 debian/libgradle-plugins-java.install              |    2 +
 debian/libgradle-plugins-java.jlibs                |   41 +-
 debian/libgradle-plugins-java.links                |   37 -
 debian/orig-tar.excludes                           |    1 +
 debian/patches/01_use_debian_jars.diff             |  367 --
 debian/patches/02_sonar.diff                       |   76 -
 debian/patches/03_plexus.diff                      |    2 +-
 debian/patches/11_fix_jni_path.diff                |    4 +-
 debian/patches/13_fix_javadocs_links.diff          |   31 -
 debian/patches/21_docs.diff                        |  197 -
 .../23_replace_jna-posix_with_jnr-posix.diff       |  119 -
 debian/patches/24_pegdown.diff                     |  101 -
 debian/patches/27_maven.diff                       |   15 -
 debian/patches/28_findbugs.diff                    |   66 -
 debian/patches/30_envjs.diff                       |   11 +-
 debian/patches/31_hamcrest_12.diff                 |   36 -
 debian/patches/32_disable_it.diff                  |   51 -
 debian/patches/33_scala_zinc.diff                  |   59 +-
 debian/patches/34_disable_code_quality.diff        |    8 +-
 debian/patches/35_ivy_23.diff                      |   79 +-
 debian/patches/36_java8_compatibility.diff         |    7 +-
 debian/patches/37_replace_internal_testng_api.diff |    8 +-
 debian/patches/38_use_jdk7_nio_file_api.diff       |   46 +-
 debian/patches/90_respect_user_java_home.diff      |   20 -
 debian/patches/bintray_api.diff                    |   43 +
 debian/patches/bintray_dependencies.diff           |   24 +
 debian/patches/build_init.diff                     |   36 +
 debian/patches/disable_buildSrc_tests.diff         |   23 +
 debian/patches/disable_distributions.diff          |   33 +
 debian/patches/disable_release_notes.diff          |   65 +
 debian/patches/disable_sonar.diff                  |   64 +
 debian/patches/disable_tests.diff                  |  142 +
 debian/patches/docs.diff                           |  214 +
 debian/patches/fix_DocGenerationException.diff     |   29 +
 debian/patches/jetty.diff                          |   17 +
 debian/patches/remove_test_dependencies.diff       |  192 +
 debian/patches/search_system_jar.diff              |   35 +
 debian/patches/series                              |   30 +-
 debian/patches/use_local_artifacts.diff            |  318 ++
 debian/rules                                       |   57 +-
 gradle/buildReceipt.gradle                         |    1 +
 gradle/dependencies.gradle                         |   33 +-
 gradle/eclipse.gradle                              |    7 +
 gradle/groovyProject.gradle                        |   35 +-
 gradle/idea.gradle                                 |   14 +
 gradle/ideaTestSourcesWorkaround.gradle            |    3 +
 gradle/intTestImage.gradle                         |    2 +-
 gradle/integTest.gradle                            |   87 +-
 gradle/providedConfiguration.gradle                |    7 +-
 gradle/publish.gradle                              |    2 +-
 gradle/testGroupings.gradle                        |   13 +
 gradle/testSetup.gradle                            |    7 +
 gradle/versioning.gradle                           |    4 +
 gradle/wrapper.gradle                              |   30 +-
 gradle/wrapper/gradle-wrapper.properties           |    4 +-
 settings.gradle                                    |    5 +
 subprojects/announce/announce.gradle               |    7 +-
 .../api/plugins/announce/AnnouncePlugin.groovy     |    5 +-
 .../announce/AnnouncePluginExtension.groovy        |   36 +-
 .../announce/internal/AnnouncerFactory.groovy      |    3 -
 .../internal/DefaultAnnouncerFactory.groovy        |    3 -
 .../plugins/announce/internal/NotifySend.groovy    |    3 -
 .../api/plugins/announce/internal/Twitter.groovy   |    8 +-
 .../announce/AnnouncePluginExtensionTest.groovy    |    8 +-
 .../api/plugins/announce/AnnouncePluginTest.groovy |    9 +-
 .../announce/BuildAnnouncementsPluginTest.groovy   |    4 +-
 .../internal/DefaultAnnouncerFactoryTest.groovy    |    7 +-
 subprojects/antlr/antlr.gradle                     |    2 +-
 .../org/gradle/api/plugins/antlr/AntlrPlugin.java  |    6 +-
 .../plugins/antlr/AntlrSourceVirtualDirectory.java |    2 -
 .../org/gradle/api/plugins/antlr/AntlrTask.java    |   14 +-
 .../internal/AntlrSourceVirtualDirectoryImpl.java  |    2 -
 .../api/plugins/antlr/internal/GenerationPlan.java |    2 -
 .../antlr/internal/GenerationPlanBuilder.java      |   12 +-
 .../plugins/antlr/internal/GrammarDelegate.java    |   10 +-
 .../antlr/internal/GrammarFileMetadata.java        |    6 +-
 .../plugins/antlr/internal/GrammarMetadata.java    |    8 +-
 .../plugins/antlr/internal/MetadataExtracter.java  |   10 +-
 .../gradle/api/plugins/antlr/internal/XRef.java    |    8 +-
 .../api/plugins/antlr/AntlrPluginTest.groovy       |    8 +-
 .../base-services-groovy.gradle                    |    2 +-
 .../main/groovy/org/gradle/api/specs/AndSpec.java  |    1 -
 .../api/specs/AbstractCompositeSpecTest.java       |    2 +-
 .../groovy/org/gradle/api/specs/AndSpecTest.java   |    4 +-
 subprojects/base-services/base-services.gradle     |    4 +-
 .../main/java/org/gradle/api/GradleException.java  |    2 -
 .../src/main/java/org/gradle/api/JavaVersion.java  |   26 +-
 .../main/java/org/gradle/api/internal/Actions.java |  208 -
 .../main/java/org/gradle/api/internal/Cast.java    |   46 -
 .../org/gradle/api/internal/ErroringAction.java    |   44 -
 .../main/java/org/gradle/api/internal/Factory.java |    4 +-
 .../gradle/api/internal/HasInternalProtocol.java   |   35 -
 .../java/org/gradle/api/internal/IoActions.java    |   93 -
 .../java/org/gradle/api/internal/Transformers.java |   95 -
 .../api/internal/project/ServiceRegistry.java      |    4 +-
 .../java/org/gradle/api/specs/CompositeSpec.java   |    1 -
 .../main/java/org/gradle/api/specs/NotSpec.java    |    1 -
 .../src/main/java/org/gradle/api/specs/OrSpec.java |    1 -
 .../src/main/java/org/gradle/api/specs/Spec.java   |    1 -
 .../src/main/java/org/gradle/internal/Actions.java |  208 +
 .../src/main/java/org/gradle/internal/Cast.java    |   46 +
 .../org/gradle/internal/CompositeStoppable.java    |  142 -
 .../java/org/gradle/internal/ErroringAction.java   |   43 +
 .../main/java/org/gradle/internal/Factories.java   |    8 +
 .../main/java/org/gradle/internal/FileUtils.java   |   57 +
 .../org/gradle/internal/HasInternalProtocol.java   |   35 +
 .../main/java/org/gradle/internal/IoActions.java   |  120 +
 .../java/org/gradle/internal/LazyIterable.java     |   33 -
 .../main/java/org/gradle/internal/Stoppable.java   |   28 -
 .../main/java/org/gradle/internal/Supplier.java    |   25 +
 .../main/java/org/gradle/internal/Suppliers.java   |   64 +
 .../java/org/gradle/internal/SystemProperties.java |   24 +-
 .../java/org/gradle/internal/Transformers.java     |  151 +
 .../internal/classloader/CachingClassLoader.java   |   66 +
 .../internal/classloader/ClassLoaderFactory.java   |   47 +
 .../internal/classloader/ClassLoaderHierarchy.java |   21 +
 .../internal/classloader/ClassLoaderSpec.java      |   45 +
 .../internal/classloader/ClassLoaderVisitor.java   |   52 +
 .../gradle/internal/classloader/ClasspathUtil.java |  105 +
 .../classloader/DefaultClassLoaderFactory.java     |  111 +
 .../internal/classloader/FilteringClassLoader.java |  258 ++
 .../classloader/MultiParentClassLoader.java        |  126 +
 .../classloader/MutableURLClassLoader.java         |   89 +
 .../classloader/TransformingClassLoader.java       |   63 +
 .../gradle/internal/concurrent/AsyncStoppable.java |    4 +-
 .../internal/concurrent/CompositeStoppable.java    |  133 +
 .../concurrent/DefaultExecutorFactory.java         |    2 -
 .../internal/concurrent/ServiceLifecycle.java      |  127 +
 .../org/gradle/internal/concurrent/Stoppable.java  |   28 +
 .../java/org/gradle/internal/hash/HashUtil.java    |   85 +
 .../java/org/gradle/internal/hash/HashValue.java   |   90 +
 .../gradle/internal/id/CompositeIdGenerator.java   |   12 +-
 .../internal/io/RandomAccessFileInputStream.java   |   49 +
 .../internal/io/RandomAccessFileOutputStream.java  |   43 +
 .../java/org/gradle/internal/io/TextStream.java    |   33 +
 .../org/gradle/internal/jvm/JavaHomeException.java |    3 -
 .../java/org/gradle/internal/jvm/JavaInfo.java     |    3 -
 .../src/main/java/org/gradle/internal/jvm/Jre.java |   26 +
 .../src/main/java/org/gradle/internal/jvm/Jvm.java |   80 +-
 .../org/gradle/internal/os/OperatingSystem.java    |   94 +-
 .../internal/reflect/DirectInstantiator.java       |    2 +-
 .../org/gradle/internal/reflect/Instantiator.java  |    2 +-
 .../org/gradle/internal/reflect/JavaMethod.java    |   79 +
 .../internal/reflect/JavaReflectionUtil.java       |  324 +-
 .../internal/reflect/NoSuchMethodException.java    |   26 +
 .../internal/reflect/NoSuchPropertyException.java  |   26 +
 .../gradle/internal/reflect/PropertyAccessor.java  |   25 +
 .../gradle/internal/reflect/PropertyMutator.java   |   25 +
 .../internal/service/AbstractServiceRegistry.java  |   74 -
 .../internal/service/DefaultServiceRegistry.java   |  904 +++-
 .../internal/service/ServiceCreationException.java |   30 +
 .../gradle/internal/service/ServiceLocator.java    |  106 +-
 .../internal/service/ServiceRegistration.java      |   43 +
 .../gradle/internal/service/ServiceRegistry.java   |   20 +
 .../internal/service/ServiceRegistryBuilder.java   |   56 +
 .../service/ServiceValidationException.java        |   26 +
 .../service/SynchronizedServiceRegistry.java       |   78 -
 .../internal/service/UnknownServiceException.java  |    8 +-
 .../main/java/org/gradle/util/CollectionUtils.java |  132 +-
 .../groovy/org/gradle/api/JavaVersionSpec.groovy   |   29 +-
 .../org/gradle/api/internal/ActionsTest.groovy     |  157 -
 .../groovy/org/gradle/api/internal/CastTest.groovy |   44 -
 .../gradle/api/internal/ErroringActionTest.groovy  |   52 -
 .../org/gradle/api/internal/IoActionsTest.groovy   |   92 -
 .../gradle/api/internal/TransformersTest.groovy    |   74 -
 .../groovy/org/gradle/internal/ActionsTest.groovy  |  157 +
 .../groovy/org/gradle/internal/CastTest.groovy     |   44 +
 .../gradle/internal/CompositeStoppableTest.groovy  |  145 -
 .../org/gradle/internal/ErroringActionTest.groovy  |   52 +
 .../org/gradle/internal/FileUtilsTest.groovy       |   54 +
 .../org/gradle/internal/IoActionsTest.groovy       |  167 +
 .../org/gradle/internal/LazyIterableTest.groovy    |   37 -
 .../org/gradle/internal/SuppliersTest.groovy       |   82 +
 .../org/gradle/internal/TransformersTest.groovy    |   98 +
 .../classloader/CachingClassLoaderTest.groovy      |   78 +
 .../DefaultClassLoaderFactoryTest.groovy           |   91 +
 .../DefaultClassLoaderFactoryTestHelper.java       |   35 +
 .../classloader/FilteringClassLoaderTest.groovy    |  261 ++
 .../classloader/MultiParentClassLoaderTest.groovy  |  123 +
 .../classloader/MutableURLClassLoaderTest.groovy   |   39 +
 .../concurrent/CompositeStoppableTest.groovy       |  145 +
 .../concurrent/DefaultExecutorFactorySpec.groovy   |   48 -
 .../concurrent/DefaultExecutorFactoryTest.groovy   |  181 +-
 .../concurrent/ServiceLifecycleTest.groovy         |  246 ++
 .../org/gradle/internal/hash/HashValueTest.groovy  |   64 +
 .../groovy/org/gradle/internal/jvm/JvmTest.groovy  |  224 +-
 .../gradle/internal/os/OperatingSystemTest.groovy  |   40 +
 .../internal/reflect/JavaReflectionUtilTest.groovy |  232 +-
 .../gradle/internal/reflect/JavaTestSubject.java   |  114 +
 .../internal/reflect/JavaTestSubjectSubclass.java  |   31 +
 .../DefaultServiceRegistryConcurrencyTest.groovy   |  134 +
 .../service/DefaultServiceRegistryTest.groovy      | 1239 ++++++
 .../service/DefaultServiceRegistryTest.java        |  579 ---
 .../gradle/internal/service/GenericRunnable.java   |   20 +
 .../internal/service/ProviderWithGenericType.java  |   31 +
 .../internal/service/ServiceLocatorTest.groovy     |  162 +-
 .../service/SynchronizedServiceRegistryTest.groovy |   44 -
 .../org/gradle/util/CollectionUtilsTest.groovy     |   59 +-
 .../resources/org/gradle/util/ClassLoaderTest.txt  |    0
 .../build-comparison/build-comparison.gradle       |    6 +-
 .../gradle/CompareGradleBuilds.java                |    2 +-
 .../internal/ComparableGradleBuildExecuter.java    |    2 +-
 .../internal/DefaultGradleBuildInvocationSpec.java |    3 -
 .../gradle/internal/GradleBuildComparison.java     |    4 +-
 .../internal/GradleBuildOutcomeSetInferrer.java    |   10 +-
 .../internal/GradleBuildOutcomeSetTransformer.java |   12 +-
 .../outcome/internal/FileOutcomeIdentifier.java    |   41 +
 .../archive/GeneratedArchiveBuildOutcome.java      |   10 +-
 .../tooling/DefaultGradleBuildOutcome.java         |   46 +
 .../tooling/DefaultGradleFileBuildOutcome.java     |   42 +
 .../internal/tooling/DefaultProjectOutcomes.java   |   79 +
 .../tooling/ProjectOutcomesModelBuilder.java       |   67 +
 ...blishArtifactToFileBuildOutcomeTransformer.java |   97 +
 .../tooling/ToolingRegistrationAction.java         |   27 +
 .../GradleBuildComparisonResultHtmlRenderer.groovy |    5 +-
 ...le.configuration.project.ProjectConfigureAction |    1 +
 .../DefaultGradleBuildInvocationSpecTest.groovy    |    4 +-
 .../GradleBuildOutcomeSetInferrerTest.groovy       |    2 +-
 .../GradleBuildOutcomeSetTransformerTest.groovy    |   26 +-
 ...neratedArchiveBuildOutcomeComparatorTest.groovy |    8 +-
 ...rtifactToFileBuildOutcomeTransformerTest.groovy |   87 +
 subprojects/build-init/build-init.gradle           |   86 +
 .../plugins/BuildInitPluginIntegrationTest.groovy  |  204 +
 .../GroovyLibraryInitIntegrationTest.groovy        |   76 +
 .../plugins/JavaLibraryInitIntegrationTest.groovy  |   75 +
 .../plugins/MavenConversionIntegrationTest.groovy  |  343 ++
 .../plugins/ScalaLibraryInitIntegrationTest.groovy |   78 +
 .../plugins/WrapperPluginIntegrationTest.groovy    |   35 +
 .../plugins/fixtures/WrapperTestFixture.groovy     |   50 +
 .../WrapperPluginAutoApplyActionIntegTest.groovy   |   99 +
 .../enforcerplugin/pom.xml                         |    0
 .../enforcerplugin/src/main/java/Foo.java          |    0
 .../expandProperties/pom.xml                       |   27 +
 .../expandProperties/src/main/java/Foo.java        |   10 +
 .../expandProperties/src/test/java/FooTest.java    |   10 +
 .../flatmultimodule/webinar-api/pom.xml            |    0
 .../src/main/java/webinar/Demoable.java            |    0
 .../flatmultimodule/webinar-impl/pom.xml           |    0
 .../src/main/java/webinar/Webinar.java             |    0
 .../src/test/java/webinar/WebinarTest.java         |    0
 .../flatmultimodule/webinar-parent/pom.xml         |    0
 .../flatmultimodule/webinar-war/pom.xml            |    0
 .../webinar-war/src/main/webapp/WEB-INF/web.xml    |    0
 .../webinar-war/src/main/webapp/index.jsp          |    0
 .../mavenExtensions/pom.xml                        |   47 +
 .../mavenExtensions/test-core/pom.xml              |   22 +
 .../multiModule/pom.xml                            |    0
 .../multiModule/webinar-api/pom.xml                |    0
 .../src/main/java/webinar/Demoable.java            |    0
 .../multiModule/webinar-impl/pom.xml               |    0
 .../src/main/java/webinar/Webinar.java             |    0
 .../src/test/java/webinar/WebinarTest.java         |    0
 .../multiModule/webinar-war/pom.xml                |    0
 .../webinar-war/src/main/webapp/WEB-INF/web.xml    |    0
 .../webinar-war/src/main/webapp/index.jsp          |    0
 .../nested-parent/pom.xml                          |   21 +
 .../multiModuleWithNestedParent/pom.xml            |   22 +
 .../webinar-api/pom.xml                            |    0
 .../src/main/java/webinar/Demoable.java            |    0
 .../webinar-impl/pom.xml                           |    0
 .../src/main/java/webinar/Webinar.java             |    0
 .../src/test/java/webinar/WebinarTest.java         |    0
 .../webinar-war/pom.xml                            |    0
 .../webinar-war/src/main/webapp/WEB-INF/web.xml    |    0
 .../webinar-war/src/main/webapp/index.jsp          |    0
 .../multiModuleWithRemoteParent/pom.xml            |   44 +
 .../util-parent/pom.xml                            |   13 +
 .../webinar-api/pom.xml                            |    0
 .../src/main/java/webinar/Demoable.java            |    0
 .../webinar-impl/pom.xml                           |   32 +
 .../src/main/java/webinar/Webinar.java             |    0
 .../src/test/java/webinar/WebinarTest.java         |    0
 .../webinar-war/pom.xml                            |    0
 .../webinar-war/src/main/webapp/WEB-INF/web.xml    |    0
 .../webinar-war/src/main/webapp/index.jsp          |    0
 .../providedNotWar/pom.xml                         |   30 +
 .../remoteparent/pom.xml                           |   21 +
 .../remoteparent/src/main/java/Bar.java            |    7 +
 .../maven_home/m2_home/conf/settings.xml           |   13 +
 .../util/parent/util-parent/3/util-parent-3.pom    |   17 +
 .../singleModule/pom.xml                           |    0
 .../singleModule/src/main/java/Foo.java            |    0
 .../singleModule/src/test/java/FooTest.java        |    0
 .../MavenConversionIntegrationTest/testjar/pom.xml |    0
 .../testjar/src/main/java/Foo.java                 |    0
 .../testjar/src/test/java/FooTest.java             |    0
 .../org/gradle/api/tasks/wrapper/Wrapper.java      |  279 ++
 .../org/gradle/api/tasks/wrapper/package-info.java |    0
 .../buildinit/plugins/BuildInitPlugin.groovy       |   62 +
 .../gradle/buildinit/plugins/WrapperPlugin.groovy  |   34 +
 .../BasicTemplateBasedProjectInitDescriptor.java   |   31 +
 .../plugins/internal/BuildInitAutoApplyAction.java |   33 +
 .../plugins/internal/BuildInitException.java       |   25 +
 .../plugins/internal/BuildInitServices.java        |   44 +
 .../plugins/internal/BuildInitTypeIds.java         |   29 +
 .../internal/ConditionalTemplateOperation.groovy   |   38 +
 .../DefaultTemplateLibraryVersionProvider.groovy   |   31 +
 .../GroovyLibraryProjectInitDescriptor.java        |   43 +
 .../internal/JavaLibraryProjectInitDescriptor.java |   44 +
 .../LanguageLibraryProjectInitDescriptor.java      |   49 +
 .../internal/PomProjectInitDescriptor.groovy       |   47 +
 .../plugins/internal/ProjectInitDescriptor.groovy  |   20 +
 .../internal/ProjectLayoutSetupRegistry.groovy     |   52 +
 .../ProjectLayoutSetupRegistryFactory.groovy       |   63 +
 .../ScalaLibraryProjectInitDescriptor.java         |   47 +
 .../SimpleGlobalFilesBuildSettingsDescriptor.java  |   32 +
 .../internal/SimpleTemplateOperation.groovy        |   47 +
 .../TemplateBasedProjectInitDescriptor.java        |   34 +
 .../internal/TemplateLibraryVersionProvider.groovy |   21 +
 .../plugins/internal/TemplateOperation.groovy      |   21 +
 .../plugins/internal/TemplateOperationFactory.java |  101 +
 .../buildinit/plugins/internal/TemplateValue.java  |   67 +
 .../internal/WrapperPluginAutoApplyAction.groovy   |   32 +
 .../plugins/internal/maven/Maven2Gradle.groovy     |  526 +++
 .../internal/maven/MavenConversionException.java   |   29 +
 .../internal/maven/MavenProjectXmlWriter.java      |   58 +
 .../internal/maven/MavenProjectsCreator.java       |   96 +
 .../org/gradle/buildinit/tasks/InitBuild.groovy    |   73 +
 .../META-INF/gradle-plugins/build-init.properties  |    1 +
 .../META-INF/gradle-plugins/wrapper.properties     |   17 +
 ...le.configuration.project.ProjectConfigureAction |    2 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../tasks/templates/build.gradle.template          |   32 +
 .../groovylibrary/Library.groovy.template          |   11 +
 .../groovylibrary/LibraryTest.groovy.template      |   19 +
 .../templates/groovylibrary/build.gradle.template  |   28 +
 .../templates/javalibrary/Library.java.template    |   11 +
 .../javalibrary/LibraryTest.java.template          |   15 +
 .../templates/javalibrary/build.gradle.template    |   30 +
 .../templates/scalalibrary/Library.scala.template  |    9 +
 .../scalalibrary/LibrarySuite.scala.template       |   18 +
 .../templates/scalalibrary/build.gradle.template   |   29 +
 .../tasks/templates/settings.gradle.template       |   19 +
 .../org/gradle/api/tasks/wrapper/WrapperTest.java  |  161 +
 .../buildinit/plugins/BuildInitPluginSpec.groovy   |   77 +
 .../buildinit/plugins/WrapperPluginSpec.groovy     |   36 +
 .../internal/BuildInitAutoApplyActionSpec.groovy   |   72 +
 .../ConditionalTemplateOperationSpec.groovy        |   41 +
 ...LanguageLibraryProjectInitDescriptorSpec.groovy |   77 +
 .../ProjectLayoutSetupRegistryFactoryTest.groovy   |   50 +
 .../internal/ProjectLayoutSetupRegistrySpec.groovy |   61 +
 .../internal/SimpleTemplateOperationSpec.groovy    |   58 +
 .../TemplateBasedProjectInitDescriptorSpec.groovy  |   44 +
 .../internal/TemplateOperationFactorySpec.groovy   |   84 +
 .../plugins/internal/TemplateValueTest.groovy      |   48 +
 .../maven/MavenProjectXmlWriterTest.groovy         |   31 +
 .../internal/maven/MavenProjectsCreatorSpec.groovy |  117 +
 .../gradle/buildinit/tasks/InitBuildSpec.groovy    |   67 +
 subprojects/cli/cli.gradle                         |    2 +-
 .../gradle/cli/CommandLineArgumentException.java   |    2 -
 .../java/org/gradle/cli/CommandLineConverter.java  |    3 -
 .../java/org/gradle/cli/CommandLineOption.java     |   31 +-
 .../java/org/gradle/cli/CommandLineParser.java     |   36 +-
 .../java/org/gradle/cli/ParsedCommandLine.java     |    4 +
 .../org/gradle/cli/CommandLineParserTest.groovy    |  136 +-
 .../gradle/cli/ParsedCommandLineOptionSpec.groovy  |    3 -
 .../org/gradle/cli/ParsedCommandLineTest.groovy    |    3 -
 subprojects/code-quality/code-quality.gradle       |    2 +-
 .../quality/CheckstylePluginIntegrationTest.groovy |   24 +-
 .../quality/CodeNarcPluginIntegrationTest.groovy   |   36 +-
 .../CodeQualityPluginIntegrationTest.groovy        |   18 +-
 .../quality/FindBugsPluginIntegrationTest.groovy   |  182 +-
 .../quality/PmdPluginIntegrationTest.groovy        |   22 +-
 .../quality/PmdPluginVersionIntegrationTest.groovy |    4 +-
 .../internal/FindBugsSpecBuilderTest.groovy        |   36 +-
 .../api/plugins/quality/CheckstylePlugin.groovy    |   17 +-
 .../api/plugins/quality/CheckstyleReports.java     |    7 +-
 .../org/gradle/api/plugins/quality/CodeNarc.groovy |   22 +-
 .../api/plugins/quality/CodeNarcExtension.groovy   |   15 +
 .../api/plugins/quality/CodeNarcPlugin.groovy      |   24 +-
 .../api/plugins/quality/CodeNarcReports.java       |   11 +-
 .../api/plugins/quality/FindBugsPlugin.groovy      |   18 +-
 .../api/plugins/quality/FindBugsReports.java       |   27 +-
 .../api/plugins/quality/FindBugsXmlReport.java     |   46 +
 .../org/gradle/api/plugins/quality/JDepend.groovy  |    2 +-
 .../gradle/api/plugins/quality/JDependReports.java |    9 +-
 .../quality/JavaCodeQualityPluginConvention.groovy |    3 +-
 .../gradle/api/plugins/quality/PmdExtension.groovy |    1 +
 .../gradle/api/plugins/quality/PmdPlugin.groovy    |   25 +-
 .../org/gradle/api/plugins/quality/PmdReports.java |   10 +-
 .../internal/AbstractCodeQualityPlugin.groovy      |    4 +-
 .../quality/internal/FindBugsReportsImpl.java      |   27 +-
 .../internal/findbugs/FindBugsSpecBuilder.java     |   22 +-
 .../internal/findbugs/FindBugsWorkerManager.groovy |    3 +
 .../internal/findbugs/FindBugsWorkerServer.java    |    1 +
 .../internal/findbugs/FindBugsXmlReportImpl.java   |   39 +
 .../plugins/quality/CheckstylePluginTest.groovy    |   10 +-
 .../api/plugins/quality/CheckstyleTest.groovy      |    2 +-
 .../api/plugins/quality/CodeNarcPluginTest.groovy  |   37 +-
 .../plugins/quality/CodeQualityPluginTest.groovy   |   33 +-
 .../api/plugins/quality/FindBugsPluginTest.groovy  |   11 +-
 .../gradle/api/plugins/quality/FindBugsTest.groovy |    2 +-
 .../api/plugins/quality/JDependPluginTest.groovy   |   10 +-
 .../api/plugins/quality/PmdPluginTest.groovy       |   10 +-
 subprojects/core-impl/core-impl.gradle             |    9 +-
 .../ArtifactDeclarationIntegrationTest.groovy      |   38 +
 .../ArtifactDependenciesIntegrationTest.groovy     |   40 +-
 .../ArtifactOnlyResolutionIntegrationTest.groovy   |   86 -
 .../resolve/CacheResolveIntegrationTest.groovy     |   20 +-
 ...ModuleDependenciesResolveIntegrationTest.groovy |   15 +-
 ...adataRulesChangingModulesIntegrationTest.groovy |  170 +
 .../ComponentMetadataRulesIntegrationTest.groovy   |  118 +
 ...ponentMetadataRulesStatusIntegrationTest.groovy |   45 +
 .../DependencyNotationIntegrationSpec.groovy       |   39 +-
 .../DependencyResolveRulesIntegrationTest.groovy   |   64 +-
 .../DetachedConfigurationsIntegrationTest.groovy   |   62 +
 .../ExtendingConfigurationsIntegrationTest.groovy  |   60 +
 ...LibraryArtifactResolutionIntegrationTest.groovy |  105 +
 .../resolve/ForcedModulesIntegrationTest.groovy    |    5 +-
 .../JvmLibraryArtifactResolveTestFixture.groovy    |  214 +
 .../ProjectDependenciesIntegrationTest.groovy      |    5 +-
 .../ProjectDependencyResolveIntegrationTest.groovy |  132 +-
 .../ResolutionResultApiIntegrationTest.groovy      |   80 +
 ...ResolutionStrategySamplesIntegrationTest.groovy |    7 +-
 .../ResolveCrossVersionIntegrationTest.groovy      |   20 +-
 .../integtests/resolve/ResolveTestFixture.groovy   |  333 ++
 .../ResolvedConfigurationIntegrationTest.groovy    |    6 +-
 ...VersionConflictResolutionIntegrationTest.groovy |  240 +-
 ...actCacheReuseCrossVersionIntegrationTest.groovy |    3 -
 ...AliasedArtifactResolutionIntegrationTest.groovy |   43 +-
 .../CacheReuseCrossVersionIntegrationTest.groovy   |    6 +-
 .../CachedChangingModulesIntegrationTest.groovy    |   20 +-
 ...achedDependencyResolutionIntegrationTest.groovy |   69 +-
 .../CachedMissingModulesIntegrationTest.groovy     |   51 +-
 ...ependencyMetadataInMemoryIntegrationTest.groovy |  197 +
 ...coverFromBrokenResolutionIntegrationTest.groovy |   57 +-
 .../FileSystemResolverIntegrationTest.groovy       |   12 +-
 .../custom/IvySFtpResolverIntegrationTest.groovy   |    8 +-
 .../custom/IvyUrlResolverIntegrationTest.groovy    |  176 +-
 .../ivy/IvyBrokenDescriptorIntegrationTest.groovy  |  119 +
 .../IvyBrokenRemoteResolveIntegrationTest.groovy   |   56 +-
 ...angingModuleRemoteResolveIntegrationTest.groovy |  109 +-
 ...adataRulesChangingModulesIntegrationTest.groovy |   41 +
 ...IvyComponentMetadataRulesIntegrationTest.groovy |   42 +
 ...ponentMetadataRulesStatusIntegrationTest.groovy |   98 +
 ...CustomStatusLatestVersionIntegrationTest.groovy |  107 +
 .../ivy/IvyDescriptorResolveIntegrationTest.groovy |  181 +-
 .../IvyDescriptorValidationIntegrationTest.groovy  |   54 +
 ...amicRevisionRemoteResolveIntegrationTest.groovy |  879 ++--
 ...IvyDynamicRevisionResolveIntegrationTest.groovy |  249 +-
 .../ivy/IvyHttpRepoResolveIntegrationTest.groovy   |  108 +-
 ...LibraryArtifactResolutionIntegrationTest.groovy |  325 ++
 .../ivy/IvyModuleResolveIntegrationTest.groovy     |  223 +
 .../resolve/ivy/IvyResolveIntegrationTest.groovy   |  164 +-
 .../maven/BadPomFileResolveIntegrationTest.groovy  |  148 +-
 .../LegacyMavenRepoResolveIntegrationTest.groovy   |   21 +-
 .../MavenBrokenRemoteResolveIntegrationTest.groovy |  101 +
 ...adataRulesChangingModulesIntegrationTest.groovy |   70 +
 ...venComponentMetadataRulesIntegrationTest.groovy |   42 +
 ...ponentMetadataRulesStatusIntegrationTest.groovy |   65 +
 ...venCustomPackagingResolveIntegrationTest.groovy |   68 +
 .../MavenDependencyResolveIntegrationTest.groovy   |   37 +
 .../MavenDynamicResolveIntegrationTest.groovy      |   72 +-
 .../MavenHttpRepoResolveIntegrationTest.groovy     |  156 +-
 ...nJcenterDependencyResolveIntegrationTest.groovy |   72 +
 ...LibraryArtifactResolutionIntegrationTest.groovy |  321 ++
 .../maven/MavenLatestResolveIntegrationTest.groovy |   98 +
 .../MavenLocalRepoResolveIntegrationTest.groovy    |  193 +-
 .../MavenParentPomResolveIntegrationTest.groovy    |  306 +-
 .../MavenPomPackagingResolveIntegrationTest.groovy |  245 +-
 .../maven/MavenPomResolveIntegrationTest.groovy    |   65 +
 .../MavenProfileResolveIntegrationTest.groovy      |  218 +
 .../MavenSnapshotResolveIntegrationTest.groovy     |  141 +-
 .../canNestModules/projectWithNestedModules.gradle |    2 +-
 .../projectWithConflicts.gradle                    |    2 +-
 .../artifacts/ArtifactDependencyResolver.java      |    8 +-
 .../artifacts/ArtifactPublicationServices.java     |   24 +
 .../api/internal/artifacts/ArtifactPublisher.java  |   26 +
 .../internal/artifacts/ConfigurationResolver.java  |    3 -
 .../artifacts/DefaultArtifactIdentifier.java       |  107 +
 .../artifacts/DefaultDependencyFactory.java        |   13 +-
 .../DefaultDependencyManagementServices.java       |  444 +-
 .../artifacts/DefaultModuleVersionIdentifier.java  |   15 +
 .../artifacts/DefaultModuleVersionSelector.java    |    8 +-
 .../artifacts/DefaultProjectDependencyFactory.java |    3 -
 .../artifacts/DefaultResolvedArtifact.java         |   64 +-
 .../artifacts/DefaultResolvedDependency.java       |   17 +-
 .../DependencyManagementBuildScopeServices.java    |  284 ++
 .../DependencyManagementGlobalScopeServices.java   |   86 +
 .../api/internal/artifacts/DependencyServices.java |   33 +
 .../artifacts/ModuleMetadataProcessor.java         |   22 +
 .../ModuleVersionIdentifierSerializer.java         |   26 +-
 .../internal/artifacts/ModuleVersionPublisher.java |   28 +
 .../artifacts/ModuleVersionSelectorSerializer.java |   41 +
 .../internal/artifacts/PlexusLoggerAdapter.java    |    3 -
 .../artifacts/ResolvedConfigurationIdentifier.java |    6 +-
 .../ResolvedConfigurationIdentifierSerializer.java |   39 +
 .../api/internal/artifacts/ResolverResults.java    |   48 +-
 .../component/ComponentIdentifierFactory.java      |   24 +
 .../DefaultComponentIdentifierFactory.java         |   32 +
 .../DefaultModuleComponentIdentifier.java          |   98 +
 .../component/DefaultModuleComponentSelector.java  |  107 +
 .../DefaultProjectComponentIdentifier.java         |   69 +
 .../component/DefaultProjectComponentSelector.java |   82 +
 .../artifacts/configurations/Configurations.java   |    8 -
 .../configurations/ConfigurationsProvider.java     |    3 -
 .../configurations/DefaultConfiguration.java       |    6 +-
 .../DefaultConfigurationContainer.java             |   10 +-
 .../DetachedConfigurationsProvider.java            |    3 -
 .../artifacts/dsl/DefaultArtifactHandler.groovy    |    9 +-
 .../dsl/DefaultComponentMetadataHandler.java       |   47 +
 .../dsl/ModuleVersionSelectorParsers.java          |   17 +-
 .../artifacts/dsl/ParsedModuleStringNotation.java  |    3 -
 .../dsl/PublishArtifactNotationParserFactory.java  |   20 +-
 .../ivyservice/ArtifactResolveContext.java         |   21 +
 .../artifacts/ivyservice/ArtifactResolver.java     |   12 +-
 .../ivyservice/ArtifactSetResolveResult.java       |   32 +
 .../ivyservice/ArtifactTypeResolveContext.java     |   38 +
 .../ivyservice/BuildableArtifactResolveResult.java |    6 +-
 .../BuildableArtifactSetResolveResult.java         |   29 +
 .../BuildableComponentResolveResult.java           |   42 +
 .../BuildableModuleVersionResolveResult.java       |   54 -
 .../internal/artifacts/ivyservice/CacheLayout.java |   59 +
 .../CacheLockingArtifactDependencyResolver.java    |   13 +-
 .../artifacts/ivyservice/CacheLockingManager.java  |   16 +-
 .../ivyservice/ComponentResolveResult.java         |   42 +
 .../ivyservice/ConfigurationResolveContext.java    |   41 +
 .../ivyservice/ContextualArtifactResolver.java     |   58 +
 .../DefaultBuildableArtifactResolveResult.java     |    4 +-
 .../DefaultBuildableArtifactSetResolveResult.java  |   64 +
 .../DefaultBuildableComponentResolveResult.java    |   73 +
 ...DefaultBuildableModuleVersionResolveResult.java |   95 -
 .../ivyservice/DefaultCacheLockingManager.java     |   35 +-
 .../ivyservice/DefaultConfigurationResolver.java   |   11 +-
 .../DefaultDependencyResolveDetails.java           |   11 +-
 .../ivyservice/DefaultIvyContextManager.java       |  104 +
 .../ivyservice/DefaultIvyDependencyPublisher.java  |  147 +-
 .../artifacts/ivyservice/DefaultIvyFactory.java    |   38 -
 .../ivyservice/DefaultLenientConfiguration.java    |  113 +-
 .../ivyservice/DefaultResolvedConfiguration.java   |   13 +-
 .../ivyservice/DefaultSettingsConverter.java       |   70 -
 .../ivyservice/DefaultUnresolvedDependency.java    |    3 +-
 .../ivyservice/DependencyToModuleResolver.java     |   28 -
 .../DependencyToModuleVersionIdResolver.java       |    2 +-
 .../DependencyToModuleVersionResolver.java         |   28 +
 .../ErrorHandlingArtifactDependencyResolver.java   |  120 +-
 .../ivyservice/IvyBackedArtifactPublisher.java     |   80 +-
 .../artifacts/ivyservice/IvyContextManager.java    |   39 +
 .../ivyservice/IvyDependencyPublisher.java         |   16 +-
 .../internal/artifacts/ivyservice/IvyFactory.java  |   26 -
 .../artifacts/ivyservice/IvyLoggingAdaper.java     |   18 +-
 .../ivyservice/IvyModuleDescriptorWriter.java      |    0
 .../IvyResolverBackedModuleVersionPublisher.java   |   67 +
 .../artifacts/ivyservice/IvySettingsFactory.java   |   40 -
 .../api/internal/artifacts/ivyservice/IvyUtil.java |   51 +-
 .../ivyservice/IvyXmlModuleDescriptorWriter.java   |  620 +--
 .../ivyservice/LocalComponentFactory.java          |   26 +
 .../ivyservice/ModuleToModuleVersionResolver.java  |   29 +
 .../ivyservice/ModuleVersionIdResolveResult.java   |    6 +-
 .../ivyservice/ModuleVersionNotFoundException.java |   10 +-
 .../ivyservice/ModuleVersionResolveException.java  |   24 +-
 .../ivyservice/ModuleVersionResolveResult.java     |   49 -
 .../ivyservice/ResolvedArtifactFactory.java        |   46 -
 .../ivyservice/ResolvedConfigurationBuilder.java   |   31 -
 .../SelfResolvingDependencyResolver.java           |   10 +-
 .../artifacts/ivyservice/SettingsConverter.java    |   34 -
 ...cuitEmptyConfigsArtifactDependencyResolver.java |   24 +-
 .../SubstitutedModuleVersionIdResolveResult.java   |   13 +-
 .../VersionForcingDependencyToModuleResolver.java  |    8 +-
 .../clientmodule/ClientModuleResolver.java         |   28 +-
 .../DefaultCachedModuleResolution.java             |   45 -
 .../DefaultCachedModuleVersionList.java            |   37 +
 .../DefaultResolvedModuleVersion.java              |   10 +-
 .../dynamicversions/ModuleResolutionCache.java     |   35 -
 .../ModuleResolutionCacheEntry.java                |   28 -
 .../dynamicversions/ModuleVersionsCache.java       |   33 +
 .../dynamicversions/ModuleVersionsCacheEntry.java  |   28 +
 .../SingleFileBackedModuleResolutionCache.java     |  139 -
 .../SingleFileBackedModuleVersionsCache.java       |  140 +
 .../AbstractDependencyResolverAdapter.java         |   55 -
 .../ivyresolve/ArtifactNotFoundException.java      |   14 +-
 .../ivyresolve/ArtifactResolveException.java       |   40 +-
 .../ivyresolve/BuildableModuleVersionMetaData.java |   78 -
 ...uildableModuleVersionMetaDataResolveResult.java |   72 +
 ...ildableModuleVersionSelectionResolveResult.java |   60 +
 .../CacheLockingModuleVersionRepository.java       |   39 +-
 .../ivyresolve/CachingModuleVersionRepository.java |  234 +-
 .../ivyresolve/ChangingModuleDetector.java         |   18 +-
 .../ConfiguredModuleVersionRepository.java         |   23 +
 .../DefaultBuildableModuleVersionMetaData.java     |  137 -
 ...uildableModuleVersionMetaDataResolveResult.java |   95 +
 ...ildableModuleVersionSelectionResolveResult.java |   58 +
 .../ivyresolve/DefaultDependencyMetaData.java      |   88 -
 .../ivyservice/ivyresolve/DefaultIvyAdapter.java   |   37 -
 .../ivyresolve/DefaultModuleVersionListing.java    |   94 +
 .../ivyresolve/DelegatingDependencyResolver.java   |  149 -
 .../ivyservice/ivyresolve/DependencyMetaData.java  |   43 -
 .../ivyresolve/DependencyResolverIdentifier.java   |   44 +-
 .../ivyresolve/ErrorHandlingArtifactResolver.java  |   47 +
 .../ExternalResourceResolverAdapter.java           |   47 -
 .../ivyservice/ivyresolve/IvyAdapter.java          |   25 -
 .../IvyAwareModuleVersionRepository.java           |    6 +-
 .../ivyservice/ivyresolve/IvyContextualiser.java   |   36 +-
 .../ivyresolve/IvyDependencyResolverAdapter.java   |   90 -
 .../IvyDynamicResolveModuleVersionRepository.java  |   36 +-
 .../ivyresolve/LazyDependencyToModuleResolver.java |   44 +-
 .../LocalArtifactsModuleVersionRepository.java     |   31 +
 .../LocalAwareModuleVersionRepository.java         |   19 +-
 .../ivyresolve/LocalModuleVersionRepository.java   |   33 +-
 .../ivyresolve/LoopbackDependencyResolver.java     |  120 +-
 .../ivyservice/ivyresolve/ModuleSource.java        |    8 +-
 .../ivyresolve/ModuleVersionListing.java           |   30 +
 .../ivyresolve/ModuleVersionMetaData.java          |   34 -
 .../ivyresolve/ModuleVersionRepository.java        |   18 +-
 .../ivyservice/ivyresolve/RepositoryChain.java     |   24 +
 .../RepositoryChainArtifactResolver.java           |   64 +
 .../RepositoryChainDependencyResolver.java         |  297 ++
 .../RepositoryChainModuleResolution.java           |   38 +
 .../ivyresolve/RepositoryChainModuleSource.java    |   34 +
 .../ivyservice/ivyresolve/ResolveIvyFactory.java   |  172 +-
 .../ivyresolve/RestrictedDependencyResolver.java   |   36 -
 .../StartParameterResolutionOverride.java          |   32 +-
 .../ivyservice/ivyresolve/UserResolverChain.java   |  206 +-
 .../ivyservice/ivyresolve/VersionInfo.java         |   39 +
 .../artifacts/ivyservice/ivyresolve/Versioned.java |   20 +
 .../memcache/CachedModuleVersionResult.java        |   55 +
 .../ivyresolve/memcache/CachedRepository.java      |   90 +
 .../memcache/DependencyMetadataCache.java          |  123 +
 .../memcache/DependencyMetadataCacheStats.java     |   29 +
 .../memcache/InMemoryDependencyMetadataCache.java  |   62 +
 .../parser/AbstractModuleDescriptorParser.java     |   55 +
 .../ivyresolve/parser/DescriptorParseContext.java  |   27 +
 .../parser/DisconnectedDescriptorParseContext.java |   37 +
 .../DisconnectedIvyXmlModuleDescriptorParser.java  |   65 +
 .../parser/DisconnectedParserSettings.java         |  110 -
 .../DownloadedIvyModuleDescriptorParser.java       |   17 +-
 .../parser/GradlePomModuleDescriptorBuilder.java   |  325 +-
 .../parser/GradlePomModuleDescriptorParser.java    |  392 +-
 .../parser/IvyXmlModuleDescriptorParser.java       |  583 ++-
 .../ivyresolve/parser/MetaDataParseException.java  |   32 +
 .../ivyresolve/parser/MetaDataParser.java          |   29 +
 .../parser/ModuleScopedParserSettings.java         |  102 -
 .../ivyresolve/parser/ParserRegistry.java          |   40 -
 .../ivyservice/ivyresolve/parser/PomParent.java    |   54 +
 .../ivyservice/ivyresolve/parser/PomReader.java    |  776 ++++
 .../ivyresolve/parser/RootPomParent.java           |   46 +
 .../UnresolvedDependencyVersionException.java      |   24 +
 .../ivyresolve/parser/data/MavenDependencyKey.java |   95 +
 .../ivyresolve/parser/data/PomDependencyMgt.java   |   32 +
 .../ivyresolve/parser/data/PomProfile.java         |   29 +
 .../ivyresolve/strategy/ChainVersionMatcher.java   |   64 +
 .../ivyresolve/strategy/ExactVersionMatcher.java   |  113 +
 .../ivyresolve/strategy/LatestStrategy.java        |   42 +
 .../ivyresolve/strategy/LatestVersionMatcher.java  |   47 +
 .../ivyresolve/strategy/LatestVersionStrategy.java |   65 +
 .../ivyresolve/strategy/ResolverStrategy.java      |   53 +
 .../ivyresolve/strategy/SubVersionMatcher.java     |   59 +
 .../ivyresolve/strategy/VersionMatcher.java        |   67 +
 .../ivyresolve/strategy/VersionRangeMatcher.java   |  180 +
 .../CachedModuleDescriptorParseContext.java        |   38 +
 .../modulecache/DefaultCachedMetaData.java         |   71 +
 .../modulecache/DefaultCachedModuleDescriptor.java |   70 -
 .../modulecache/DefaultModuleArtifactsCache.java   |  182 +
 .../modulecache/DefaultModuleDescriptorCache.java  |  188 -
 .../modulecache/DefaultModuleMetaDataCache.java    |  176 +
 .../modulecache/ModuleArtifactsCache.java          |   37 +
 .../modulecache/ModuleDescriptorCache.java         |   46 -
 .../modulecache/ModuleDescriptorCacheEntry.java    |    4 +-
 .../modulecache/ModuleDescriptorStore.java         |   43 +-
 .../modulecache/ModuleMetaDataCache.java           |   47 +
 .../ArtifactsExtraAttributesStrategy.java          |   27 -
 .../ArtifactsToModuleDescriptorConverter.java      |   26 -
 .../ConfigurationsToArtifactsConverter.java        |   23 +
 .../ConfigurationsToModuleDescriptorConverter.java |    3 -
 ...efaultArtifactsToModuleDescriptorConverter.java |   76 -
 .../DefaultConfigurationsToArtifactsConverter.java |   60 +
 ...tConfigurationsToModuleDescriptorConverter.java |    3 -
 .../DefaultExcludeRuleConverter.java               |    7 +-
 .../DefaultModuleDescriptorFactory.java            |   24 +-
 .../moduleconverter/ExcludeRuleConverter.java      |    3 -
 .../moduleconverter/ModuleDescriptorFactory.java   |    3 -
 .../PublishLocalComponentFactory.java              |   47 +
 .../PublishModuleDescriptorConverter.java          |   59 -
 .../ResolveLocalComponentFactory.java              |   55 +
 .../ResolveModuleDescriptorConverter.java          |   64 -
 .../AbstractIvyDependencyDescriptorFactory.java    |    3 -
 .../ClientModuleDependencyDescriptor.java          |    7 +-
 ...ClientModuleIvyDependencyDescriptorFactory.java |   14 +-
 .../dependencies/ClientModuleMetaDataFactory.java  |   26 +
 .../DefaultClientModuleMetaDataFactory.java        |   54 +
 ...ultDependenciesToModuleDescriptorConverter.java |    3 -
 .../DefaultDependencyDescriptorFactory.java        |    3 -
 ...aultModuleDescriptorFactoryForClientModule.java |   60 -
 .../DependenciesToModuleDescriptorConverter.java   |    3 -
 .../dependencies/DependencyDescriptorFactory.java  |    3 -
 ...ternalModuleIvyDependencyDescriptorFactory.java |    3 -
 .../ModuleDescriptorFactoryForClientModule.java    |   29 -
 .../ProjectIvyDependencyDescriptorFactory.java     |    9 +-
 .../DefaultProjectComponentRegistry.java           |   36 +
 .../DefaultProjectModuleRegistry.java              |   53 -
 .../projectmodule/DefaultProjectPublication.java   |   40 +
 .../DefaultProjectPublicationRegistry.java         |   33 +
 .../projectmodule/ProjectArtifactResolver.java     |   65 +
 .../projectmodule/ProjectComponentRegistry.java    |   22 +
 .../projectmodule/ProjectDependencyResolver.java   |   56 +-
 .../projectmodule/ProjectModuleRegistry.java       |   26 -
 .../projectmodule/ProjectPublication.java          |   28 +
 .../projectmodule/ProjectPublicationRegistry.java  |   29 +
 .../resolutionstrategy/DefaultCachePolicy.java     |   22 +-
 .../DefaultExternalResourceCachePolicy.java        |   22 +
 .../DefaultResolutionStrategy.java                 |    9 +-
 .../ExternalResourceCachePolicy.java               |   22 +
 .../LatestConflictResolution.java                  |    2 -
 .../ModuleForcingResolveRule.java                  |    3 -
 .../StrictConflictResolution.java                  |    2 -
 .../resolveengine/DefaultDependencyResolver.java   |  111 +-
 .../DefaultDependencyToConfigurationResolver.java  |   81 +
 .../resolveengine/DependencyGraphBuilder.java      |  634 +--
 .../DependencyToConfigurationResolver.java         |   30 +
 .../LatestModuleConflictResolver.java              |   19 +-
 .../resolveengine/ModuleConflictResolver.java      |    2 +-
 .../resolveengine/ModuleRevisionResolveState.java  |   11 +-
 .../resolveengine/ModuleVersionSpec.java           |    4 +-
 .../resolveengine/StrictConflictResolver.java      |    2 +-
 .../VersionSelectionReasonResolver.java            |    7 +-
 .../DefaultResolvedConfigurationBuilder.java       |  151 +
 .../DefaultTransientConfigurationResults.java      |   45 +
 .../oldresult/ResolvedConfigurationBuilder.java    |   44 +
 .../oldresult/ResolvedConfigurationResults.java    |   32 +
 .../oldresult/ResolvedContentsMapping.java         |   28 +
 .../oldresult/TransientConfigurationResults.java   |   32 +
 .../TransientConfigurationResultsBuilder.java      |  186 +
 .../result/CachingDependencyResultFactory.java     |   16 +-
 .../result/ComponentIdentifierSerializer.java      |   76 +
 .../result/ComponentSelectionReasonSerializer.java |   59 +
 .../result/ComponentSelectorSerializer.java        |   76 +
 .../result/DefaultInternalDependencyResult.java    |   59 +
 .../result/DefaultModuleVersionSelection.java      |   45 +
 .../result/DefaultResolutionResultBuilder.java     |   85 +
 .../result/InternalDependencyResult.java           |   18 +-
 .../result/InternalDependencyResultSerializer.java |   62 +
 .../result/ModuleVersionSelection.java             |   10 +-
 .../result/ModuleVersionSelectionSerializer.java   |   47 +
 .../result/ResolutionResultBuilder.java            |   63 +-
 .../result/ResolvedConfigurationListener.java      |   30 -
 .../result/StreamingResolutionResultBuilder.java   |  200 +
 .../result/VersionSelectionReasons.java            |   29 +-
 .../resolveengine/store/CachedStoreFactory.java    |  102 +
 .../resolveengine/store/DefaultBinaryStore.java    |  147 +
 .../store/ResolutionResultsStoreFactory.java       |  120 +
 .../ivyservice/resolveengine/store/StoreSet.java   |   29 +
 .../AbstractModuleDescriptorBackedMetaData.java    |  233 +
 .../BuildableModuleVersionPublishMetaData.java     |   27 +
 .../metadata/ComponentArtifactIdentifier.java      |   34 +
 .../metadata/ComponentArtifactMetaData.java        |   39 +
 .../artifacts/metadata/ComponentMetaData.java      |   85 +
 .../artifacts/metadata/ConfigurationMetaData.java  |   41 +
 .../metadata/DefaultDependencyMetaData.java        |  122 +
 .../artifacts/metadata/DefaultIvyArtifactName.java |   97 +
 .../metadata/DefaultLocalArtifactIdentifier.java   |   69 +
 .../metadata/DefaultLocalComponentMetaData.java    |  157 +
 .../DefaultModuleVersionArtifactIdentifier.java    |   79 +
 .../DefaultModuleVersionArtifactMetaData.java      |   63 +
 .../DefaultModuleVersionPublishMetaData.java       |   84 +
 .../artifacts/metadata/DependencyMetaData.java     |   65 +
 .../artifacts/metadata/IvyArtifactName.java        |   37 +
 .../artifacts/metadata/LocalArtifactMetaData.java  |   23 +
 .../artifacts/metadata/LocalComponentMetaData.java |   40 +
 .../metadata/ModuleDescriptorAdapter.java          |  112 +
 .../metadata/ModuleVersionArtifactIdentifier.java  |   29 +
 .../ModuleVersionArtifactIdentifierSerializer.java |   51 +
 .../metadata/ModuleVersionArtifactMetaData.java    |   38 +
 .../ModuleVersionArtifactPublishMetaData.java      |   35 +
 .../artifacts/metadata/ModuleVersionMetaData.java  |   41 +
 .../metadata/ModuleVersionPublishMetaData.java     |   28 +
 .../metadata/MutableLocalComponentMetaData.java    |   28 +
 .../metadata/MutableModuleVersionMetaData.java     |   34 +
 .../CannotLocateLocalMavenRepositoryException.java |    2 +-
 .../DefaultLocalMavenRepositoryLocator.java        |    7 +-
 .../mvnsettings/DefaultMavenFileLocations.java     |    3 -
 .../mvnsettings/DefaultMavenSettingsProvider.java  |    3 -
 .../CustomResolverArtifactRepository.java          |   72 -
 .../repositories/DefaultBaseRepositoryFactory.java |   56 +-
 .../DefaultFlatDirArtifactRepository.java          |   43 +-
 .../repositories/DefaultIvyArtifactRepository.java |   38 +-
 .../DefaultMavenArtifactRepository.java            |   38 +-
 .../DefaultMavenLocalArtifactRepository.java       |   50 +
 .../FixedResolverArtifactRepository.java           |   57 -
 .../repositories/LegacyDependencyResolver.java     |   44 +-
 .../repositories/LegacyMavenResolver.java          |    5 +-
 .../repositories/PublicationAwareRepository.java   |   23 +
 .../repositories/ResolutionAwareRepository.java    |    7 +-
 .../AbstractRepositoryCacheManager.java            |   86 -
 .../DownloadingRepositoryArtifactCache.java        |   73 +
 .../DownloadingRepositoryCacheManager.java         |  164 -
 .../EnhancedArtifactDownloadReport.java            |   38 -
 .../LocalFileRepositoryArtifactCache.java          |   43 +
 .../LocalFileRepositoryCacheManager.java           |   88 -
 .../cachemanager/RepositoryArtifactCache.java      |   45 +
 .../repositories/layout/MavenRepositoryLayout.java |    2 +-
 .../legacy/AbstractRepositoryCacheManager.java     |   85 +
 .../legacy/CustomIvyResolverRepositoryFactory.java |   41 +
 .../legacy/CustomResolverArtifactRepository.java   |   72 +
 .../legacy/DownloadingRepositoryCacheManager.java  |  161 +
 .../legacy/EnhancedArtifactDownloadReport.java     |   38 +
 .../legacy/FixedResolverArtifactRepository.java    |   60 +
 .../legacy/IvyDependencyResolverAdapter.java       |  202 +
 .../LegacyDependencyResolverRepositoryFactory.java |   24 +
 .../legacy/LegacyResolverParserSettings.java       |   98 +
 .../legacy/LocalFileRepositoryCacheManager.java    |   88 +
 .../repositories/resolver/AbstractVersionList.java |   40 +-
 .../resolver/ChainedVersionLister.java             |   20 +-
 .../resolver/ComponentMetadataDetailsAdapter.java  |   58 +
 .../repositories/resolver/DefaultVersionList.java  |   34 +-
 .../resolver/ExternalResourceResolver.java         |  913 ++--
 ...rnalResourceResolverDescriptorParseContext.java |   72 +
 .../repositories/resolver/IvyResolver.java         |   55 +-
 .../repositories/resolver/IvyResourcePattern.java  |   37 +-
 .../repositories/resolver/M2ResourcePattern.java   |   29 +-
 .../repositories/resolver/MavenLocalResolver.java  |   57 +
 .../repositories/resolver/MavenMetadataLoader.java |   37 +-
 .../repositories/resolver/MavenResolver.java       |  134 +-
 .../repositories/resolver/MavenVersionLister.java  |   15 +-
 .../resolver/PatternBasedResolver.java             |    4 +-
 .../repositories/resolver/ResourcePattern.java     |   16 +-
 .../resolver/ResourceVersionLister.java            |   21 +-
 .../VerifyingExternalResourceDownloader.java       |   86 +
 .../repositories/resolver/VersionList.java         |   47 +-
 .../repositories/resolver/VersionLister.java       |    6 +-
 .../transport/RepositoryTransportFactory.java      |   18 +-
 .../resolution/AbstractSoftwareArtifact.java       |   51 +
 .../resolution/AbstractSoftwareComponent.java      |   49 +
 .../resolution/ComponentMetaDataArtifact.java      |   21 +
 .../resolution/DefaultArtifactResolutionQuery.java |  156 +
 .../DefaultArtifactResolutionQueryFactory.java     |   46 +
 .../DefaultArtifactResolutionQueryResult.java      |   46 +
 .../artifacts/resolution/DefaultJvmLibrary.java    |   45 +
 .../DefaultJvmLibraryJavadocArtifact.java          |   31 +
 .../DefaultJvmLibrarySourcesArtifact.java          |   31 +
 .../DefaultUnresolvedSoftwareComponent.java        |   37 +
 .../resolution/IvyDescriptorArtifact.java          |   21 +
 .../artifacts/resolution/MavenPomArtifact.java     |   22 +
 .../artifacts/result/AbstractDependencyResult.java |   17 +-
 .../artifacts/result/DefaultResolutionResult.java  |   42 +-
 .../result/DefaultResolvedComponentResult.java     |   82 +
 .../result/DefaultResolvedDependencyResult.java    |   13 +-
 .../result/DefaultResolvedModuleVersionResult.java |   81 -
 .../result/DefaultUnresolvedDependencyResult.java  |   23 +-
 .../externalresource/AbstractExternalResource.java |   24 +-
 .../DefaultLocallyAvailableExternalResource.java   |   53 +
 .../externalresource/ExternalResource.java         |   60 +-
 .../LocalFileStandInExternalResource.java          |    4 +-
 .../LocallyAvailableExternalResource.java          |   34 +-
 .../externalresource/UrlExternalResource.java      |   65 +
 .../cached/ByUrlCachedExternalResourceIndex.java   |    6 +-
 .../cached/CachedExternalResource.java             |    8 -
 .../cached/DefaultCachedExternalResource.java      |   15 -
 .../cached/DefaultCachedExternalResourceIndex.java |    6 +-
 .../externalresource/ivy/AbstractCachedIndex.java  |    6 +-
 .../ArtifactAtRepositoryCachedArtifactIndex.java   |   62 +-
 .../ivy/ArtifactAtRepositoryKey.java               |   31 +-
 .../CompositeLocallyAvailableResourceFinder.java   |    3 +-
 .../local/DefaultLocallyAvailableResource.java     |   65 -
 .../LazyLocallyAvailableResourceCandidates.java    |    6 +-
 .../local/LocallyAvailableResource.java            |   31 -
 .../local/LocallyAvailableResourceCandidates.java  |    3 +-
 .../local/LocallyAvailableResourceFinder.java      |    2 +-
 ...leResourceFinderSearchableFileStoreAdapter.java |   10 +-
 .../ivy/LocallyAvailableResourceFinderFactory.java |   81 +-
 ...PatternBasedLocallyAvailableResourceFinder.java |   24 +-
 .../metadata/DefaultExternalResourceMetaData.java  |    2 +-
 .../metadata/ExternalResourceMetaData.java         |    2 +-
 .../DefaultCacheAwareExternalResourceAccessor.java |   22 +-
 .../transfer/ExternalResourceAccessor.java         |    2 +-
 .../ProgressLoggingExternalResourceAccessor.java   |   17 +-
 .../DefaultExternalResourceRepository.java         |    4 +-
 .../transport/file/FileResourceConnector.java      |   13 +-
 .../transport/file/FileTransport.java              |    6 +-
 .../http/ApacheDirectoryListingParser.java         |    9 +-
 .../transport/http/HttpRequestException.java       |    2 +-
 .../transport/http/HttpResourceAccessor.java       |    2 +-
 .../transport/http/HttpResourceLister.java         |   33 +-
 .../transport/http/HttpResponseResource.java       |    2 +-
 .../transport/http/HttpTransport.java              |   15 +-
 .../JavaSystemPropertiesHttpProxySettings.java     |    7 +-
 .../filestore/ivy/ArtifactIdentifierFileStore.java |   44 +
 .../filestore/ivy/ArtifactRevisionIdFileStore.java |   46 -
 .../ClientModuleNotationParserFactory.java         |   10 +-
 .../DependencyClassPathNotationParser.java         |    8 +-
 .../notations/DependencyFilesNotationParser.java   |    8 +-
 .../notations/DependencyMapNotationParser.java     |    9 +-
 .../notations/DependencyNotationParser.java        |   14 +-
 .../notations/DependencyProjectNotationParser.java |    5 +-
 .../notations/DependencyStringNotationParser.java  |    5 +-
 .../notations/ProjectDependencyFactory.java        |    7 +-
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../gradle/api/artifacts/ArtifactsTestUtils.java   |   62 -
 .../artifacts/DefaultArtifactIdentifierTest.groovy |   46 +
 .../DefaultDependencyManagementServicesTest.groovy |  119 +-
 .../DefaultModuleVersionSelectorTest.groovy        |   16 +-
 .../artifacts/DefaultResolvedArtifactTest.groovy   |   53 +-
 .../artifacts/DefaultResolvedDependencySpec.groovy |    2 +-
 .../artifacts/DefaultResolvedDependencyTest.java   |   70 +-
 ...pendencyManagementBuildScopeServicesTest.groovy |   28 +
 ...endencyManagementGlobalScopeServicesTest.groovy |   31 +
 .../ModuleVersionSelectorSerializerTest.groovy     |   33 +
 ...vedConfigurationIdentifierSerializerTest.groovy |   37 +
 .../ResolvedConfigurationIdentifierSpec.groovy     |   14 +-
 .../internal/artifacts/ResolverResultsSpec.groovy  |    9 +-
 .../DefaultComponentIdentifierFactoryTest.groovy   |   53 +
 .../DefaultModuleComponentIdentifierTest.groovy    |   81 +
 .../DefaultModuleComponentSelectorTest.groovy      |  117 +
 .../DefaultProjectComponentIdentifierTest.groovy   |   58 +
 .../DefaultProjectComponentSelectorTest.groovy     |   91 +
 .../configurations/ConfigurationsTest.java         |    8 -
 .../DefaultConfigurationContainerSpec.groovy       |    2 +-
 .../DefaultConfigurationContainerTest.groovy       |   33 +-
 .../configurations/DefaultConfigurationSpec.groovy |    8 +-
 .../configurations/DefaultConfigurationTest.java   |   16 +-
 .../internal/artifacts/dsl/ArtifactFileTest.groovy |    3 -
 .../dsl/DefaultArtifactHandlerTest.groovy          |   12 +-
 .../dsl/DefaultComponentMetadataHandlerTest.groovy |   42 +
 .../dsl/ModuleVersionSelectorParsersTest.groovy    |    3 -
 ...PublishArtifactNotationParserFactoryTest.groovy |   23 +-
 .../artifacts/ivyservice/CacheLayoutTest.groovy    |   54 +
 ...cheLockingArtifactDependencyResolverTest.groovy |   13 +-
 ...efaultBuildableArtifactResolveResultTest.groovy |    5 +-
 ...ultBuildableArtifactSetResolveResultTest.groovy |   75 +
 ...faultBuildableComponentResolveResultTest.groovy |  109 +
 ...tBuildableModuleVersionResolveResultTest.groovy |  148 -
 .../DefaultCacheLockingManagerTest.groovy          |   74 +
 .../DefaultDependencyResolveDetailsSpec.groovy     |    5 +-
 .../ivyservice/DefaultIvyContextManagerTest.groovy |  225 +
 .../ivyservice/DefaultIvyFactoryTest.groovy        |   40 -
 .../ivyservice/DefaultSettingsConverterTest.groovy |  114 -
 .../DefaultUnresolvedDependencySpec.groovy         |    3 -
 ...orHandlingArtifactDependencyResolverTest.groovy |   88 +-
 .../ivyservice/IvyBackedArtifactPublisherTest.java |  173 -
 .../ivyservice/IvySettingsFactoryTest.groovy       |   37 -
 .../artifacts/ivyservice/IvyUtilTest.groovy        |    6 +-
 .../IvyXmlModuleDescriptorWriterTest.groovy        |   78 +-
 .../ModuleVersionNotFoundExceptionTest.groovy      |   18 +-
 .../ModuleVersionResolveExceptionTest.groovy       |   13 +-
 .../ivyservice/ResolvedArtifactFactoryTest.groovy  |   54 -
 .../SelfResolvingDependencyResolverTest.groovy     |   16 +-
 ...ptyConfigsArtifactDependencyResolverSpec.groovy |   47 +-
 ...ionForcingDependencyToModuleResolverSpec.groovy |    8 +-
 .../clientmodule/ClientModuleResolverTest.groovy   |   39 +-
 .../CachingModuleVersionRepositoryTest.groovy      |  109 +-
 ...leModuleVersionMetaDataResolveResultTest.groovy |  174 +
 ...efaultBuildableModuleVersionMetaDataTest.groovy |  244 --
 .../DefaultDependencyMetaDataTest.groovy           |   77 -
 .../DependencyResolverIdentifierTest.groovy        |   15 +-
 .../ErrorHandlingArtifactResolverTest.groovy       |   82 +
 ...ynamicResolveModuleVersionRepositoryTest.groovy |   18 +-
 .../LazyDependencyToModuleResolverTest.groovy      |  109 +-
 .../RepositoryChainDependencyResolverTest.groovy   |  639 +++
 .../ivyresolve/UserResolverChainTest.groovy        |  588 ---
 .../memcache/CachedModuleVersionResultTest.groovy  |   99 +
 .../memcache/CachedRepositoryTest.groovy           |  178 +
 .../memcache/DependencyMetadataCacheTest.groovy    |  225 +
 .../InMemoryDependencyMetadataCacheTest.groovy     |   76 +
 ...tractGradlePomModuleDescriptorParserTest.groovy |   76 +
 .../ivyresolve/parser/AbstractPomReaderTest.groovy |   71 +
 ...onnectedIvyXmlModuleDescriptorParserTest.groovy |   80 +
 .../DownloadedIvyModuleDescriptorParserTest.groovy |   14 +-
 ...adlePomModuleDescriptorParserProfileTest.groovy |  827 ++++
 .../GradlePomModuleDescriptorParserTest.groovy     | 2028 ++++++++-
 .../parser/IvyXmlModuleDescriptorParserTest.groovy |  451 +-
 .../ivyresolve/parser/PomReaderProfileTest.groovy  | 1566 +++++++
 .../ivyresolve/parser/PomReaderTest.groovy         |  818 ++++
 .../parser/data/MavenDependencyKeyTest.groovy      |   51 +
 .../strategy/ChainVersionMatcherTest.groovy        |  129 +
 .../strategy/ExactVersionMatcherTest.groovy        |  181 +
 .../strategy/LatestVersionMatcherTest.groovy       |   83 +
 .../strategy/LatestVersionStrategyTest.groovy      |   78 +
 .../strategy/SubVersionMatcherTest.groovy          |   84 +
 .../strategy/VersionRangeMatcherTest.groovy        |  208 +
 .../modulecache/ModuleDescriptorStoreTest.groovy   |   12 +-
 ...ltArtifactsToModuleDescriptorConverterTest.java |  129 -
 ...ltConfigurationsToArtifactsConverterTest.groovy |  103 +
 ...figurationsToModuleDescriptorConverterTest.java |   14 +-
 .../DefaultExcludeRuleConverterTest.java           |    3 -
 .../DefaultModuleDescriptorFactoryTest.groovy      |   38 +-
 .../moduleconverter/IvyConverterTestUtil.java      |    3 -
 .../PublishLocalComponentFactoryTest.groovy        |   56 +
 .../PublishModuleDescriptorConverterTest.groovy    |   54 -
 .../ResolveLocalComponentFactoryTest.groovy        |   91 +
 .../ResolveModuleDescriptorConverterTest.groovy    |   59 -
 ...actDependencyDescriptorFactoryInternalTest.java |   11 +-
 ...lientModuleDependencyDescriptorFactoryTest.java |   92 -
 ...ntModuleIvyDependencyDescriptorFactoryTest.java |   89 +
 .../DefaultClientModuleMetaDataFactoryTest.java    |   89 +
 ...ependenciesToModuleDescriptorConverterTest.java |    7 +-
 ...ModuleDescriptorFactoryForClientModuleTest.java |   89 -
 ...ernalModuleDependencyDescriptorFactoryTest.java |    3 -
 .../ProjectDependencyDescriptorFactoryTest.groovy  |   63 +
 .../ProjectDependencyDescriptorFactoryTest.java    |   65 -
 ...eflectiveDependencyDescriptorFactoryTest.groovy |   13 +-
 .../ProjectDependencyResolverTest.groovy           |   52 +-
 .../DefaultCachePolicySpec.groovy                  |   21 +-
 .../DefaultResolutionStrategySpec.groovy           |    3 -
 .../ModuleForcingResolveRuleSpec.groovy            |    3 -
 .../DependencyGraphBuilderTest.groovy              |  224 +-
 .../resolveengine/ModuleVersionSpecTest.groovy     |   49 +-
 .../VersionSelectionReasonResolverTest.groovy      |   10 +-
 .../CachingDependencyResultFactoryTest.groovy      |   24 +-
 .../ComponentIdentifierSerializerTest.groovy       |   60 +
 .../ComponentSelectionReasonSerializerTest.groovy  |   54 +
 .../result/ComponentSelectorSerializerTest.groovy  |   60 +
 .../DefaultResolutionResultBuilderSpec.groovy      |  284 ++
 .../resolveengine/result/DummyBinaryStore.groovy   |   48 +
 .../resolveengine/result/DummyStore.groovy         |   24 +
 .../InternalDependencyResultSerializerTest.groovy  |   80 +
 .../ModuleVersionSelectionSerializerTest.groovy    |   40 +
 .../result/ResolutionResultBuilderSpec.groovy      |  268 --
 .../result/ResolutionResultPrinter.groovy          |   47 +
 .../StreamingResolutionResultBuilderTest.groovy    |  139 +
 .../result/VersionSelectionReasonsTest.groovy      |    3 -
 .../store/CachedStoreFactoryTest.groovy            |   40 +
 .../store/DefaultBinaryStoreTest.groovy            |  108 +
 .../store/ResolutionResultsStoreFactoryTest.groovy |   93 +
 .../metadata/DefaultDependencyMetaDataTest.groovy  |  162 +
 .../metadata/DefaultIvyArtifactNameTest.groovy     |   53 +
 .../DefaultLocalArtifactIdentifierTest.groovy      |   67 +
 .../DefaultLocalComponentMetaDataTest.groovy       |  146 +
 ...faultModuleVersionArtifactIdentifierTest.groovy |   67 +
 ...DefaultModuleVersionArtifactMetaDataTest.groovy |   71 +
 .../DefaultModuleVersionPublishMetaDataTest.groovy |   42 +
 .../metadata/ModuleDescriptorAdapterTest.groovy    |  296 ++
 .../DefaultLocalMavenRepositoryLocatorTest.groovy  |    4 +-
 .../DefaultBaseRepositoryFactoryTest.groovy        |  167 +-
 .../DefaultFlatDirArtifactRepositoryTest.groovy    |   30 +-
 .../DefaultIvyArtifactRepositoryTest.groovy        |   76 +-
 .../DefaultMavenArtifactRepositoryTest.groovy      |   51 +-
 .../DefaultMavenLocalRepositoryTest.groovy         |   69 +
 .../DownloadingRepositoryCacheManagerTest.groovy   |   71 -
 .../DownloadingRepositoryCacheManagerTest.groovy   |   67 +
 .../resolver/ChainedVersionListerTest.groovy       |   44 +-
 .../resolver/ExternalResourceResolverTest.groovy   |   80 +-
 .../resolver/IvyResourcePatternTest.groovy         |   25 +-
 .../resolver/M2ResourcePatternTest.groovy          |   58 +-
 .../repositories/resolver/MavenResolverTest.groovy |    7 +-
 .../resolver/MavenVersionListerTest.groovy         |   77 +-
 .../resolver/ResourceVersionListerTest.groovy      |   65 +-
 .../DefaultArtifactResolutionCacheTest.groovy      |   80 -
 .../result/DefaultResolutionResultTest.groovy      |   28 +-
 .../DefaultResolvedModuleVersionResultSpec.groovy  |    4 -
 .../CachedExternalResourceAdapterTest.groovy       |   83 -
 .../CachedExternalResourceAdapterTest.groovy       |   78 +
 .../DefaultArtifactResolutionCacheTest.groovy      |   84 +
 ...ifactAtRepositoryCachedArtifactIndexTest.groovy |   18 +-
 ...positeLocallyAvailableResourceFinderTest.groovy |    3 +-
 .../DefaultLocallyAvailableResourceTest.groovy     |   66 -
 ...zyLocallyAvailableResourceCandidatesTest.groovy |    2 +-
 .../DefaultExternalResourceMetaDataTest.groovy     |    2 +-
 ...ltCacheAwareExternalResourceAccessorTest.groovy |   14 +-
 ...gressLoggingExternalResourceAccessorTest.groovy |   15 +-
 .../http/ApacheDirectoryListingParserTest.groovy   |   16 +-
 .../transport/http/HttpResourceListerTest.groovy   |    3 +-
 ...avaSystemPropertiesHttpProxySettingsTest.groovy |   15 +-
 .../DependencyMapNotationParserTest.groovy         |    8 +-
 .../notations/DependencyNotationParserTest.groovy  |    5 +-
 .../DependencyStringNotationParserTest.groovy      |   12 +-
 .../notations/ProjectDependencyFactoryTest.groovy  |    3 -
 .../ivyresolve/parser/test-bad-confs.xml           |   27 -
 .../ivyresolve/parser/test-cyclic-confs1.xml       |   28 -
 .../ivyresolve/parser/test-empty-dependencies.xml  |   28 -
 .../ivyservice/ivyresolve/parser/test-full.xml     |    4 +-
 .../result/ResolutionResultDataBuilder.groovy      |   26 +-
 subprojects/core/core.gradle                       |   17 +-
 .../DeprecationHandlingIntegrationTest.groovy      |  125 +
 .../org/gradle/api/ApplyPluginIntegSpec.groovy     |  129 +
 .../api/BuildEventsErrorIntegrationTest.groovy     |   94 +
 .../api/BuildScriptErrorIntegrationTest.groovy     |   98 +
 .../ConfigurationOnDemandIntegrationTest.groovy    |   99 +-
 .../api/CrossProcessFileLockIntegrationTest.groovy |   71 +
 ...rredConfigurableExtensionIntegrationTest.groovy |  174 +
 .../api/ExternalScriptErrorIntegrationTest.groovy  |   87 +
 .../gradle/api/FinalizerTaskIntegrationTest.groovy |  248 ++
 .../gradle/api/GradlePluginIntegrationTest.groovy  |   97 +
 .../api/InitScriptErrorIntegrationTest.groovy      |   58 +
 .../org/gradle/api/ProfilingIntegrationTest.groovy |   46 +
 .../api/ProjectConfigurationIntegrationTest.groovy |    3 -
 ...ojectConfigureEventsErrorIntegrationTest.groovy |   78 +
 .../api/SettingsPluginIntegrationSpec.groovy       |   86 +
 .../api/SettingsScriptErrorIntegrationTest.groovy  |   41 +
 .../api/dsl/ConcurrentClassDecorationSpec.groovy   |   48 +
 .../BuildExecutionEventsIntegrationTest.groovy     |   57 +
 .../gradle/api/tasks/ArchiveIntegrationTest.groovy |   80 +-
 .../api/tasks/CopyErrorIntegrationTest.groovy      |    3 +-
 .../api/tasks/CopyTaskIntegrationSpec.groovy       |  121 +
 .../api/tasks/CopyTaskIntegrationTest.groovy       |   74 +
 .../tasks/IncrementalTaskIntegrationTest.groovy    |   47 +
 ...kCommandLineConfigurationIntegrationSpec.groovy |  299 ++
 .../api/tasks/TaskRemovalIntegrationTest.groovy    |   88 +
 .../api/tasks/bundling/ZipIntegrationTest.groovy   |  119 +
 .../plugin/PluginHandlerScriptIntegTest.groovy     |  554 +++
 .../ScriptPluginClassLoadingIntegrationTest.groovy |   54 +
 .../BintrayPluginResolutionIntegTest.groovy        |  115 +
 .../internal/PathLimitationIntegTest.groovy        |  255 ++
 .../internal/WorkerProcessIntegrationTest.java     |   48 +-
 .../compressedTarWithWrongExtension.tar            |  Bin 472 -> 0 bytes
 .../groovy/org/gradle/BuildExceptionReporter.java  |   52 +-
 .../src/main/groovy/org/gradle/BuildListener.java  |    4 +-
 .../src/main/groovy/org/gradle/CacheUsage.java     |    1 -
 .../src/main/groovy/org/gradle/GradleLauncher.java |   54 +-
 .../src/main/groovy/org/gradle/StartParameter.java |   90 +-
 .../groovy/org/gradle/TaskExecutionLogger.java     |    9 +-
 .../org/gradle/api/CircularReferenceException.java |    2 -
 .../main/groovy/org/gradle/api/DefaultTask.java    |   12 -
 ...ExtensiblePolymorphicDomainObjectContainer.java |   28 +
 .../org/gradle/api/GradleScriptException.java      |    4 +-
 .../org/gradle/api/IllegalDependencyNotation.java  |    2 -
 .../IllegalOperationAtExecutionTimeException.java  |    3 +-
 .../org/gradle/api/InvalidUserCodeException.java   |    2 +-
 .../org/gradle/api/InvalidUserDataException.java   |    2 -
 .../gradle/api/NamedDomainObjectCollection.java    |   14 +-
 .../org/gradle/api/NamedDomainObjectContainer.java |   11 +-
 .../main/groovy/org/gradle/api/NonExtensible.java  |   31 +
 .../src/main/groovy/org/gradle/api/Plugin.java     |    3 +-
 .../api/PolymorphicDomainObjectContainer.java      |   15 +
 .../src/main/groovy/org/gradle/api/Project.java    |   13 +-
 .../gradle/api/ProjectConfigurationException.java  |   29 +
 .../org/gradle/api/ProjectEvaluationListener.java  |    2 -
 .../main/groovy/org/gradle/api/ProjectState.java   |    3 +
 .../core/src/main/groovy/org/gradle/api/Rule.java  |    2 -
 .../src/main/groovy/org/gradle/api/Script.java     |    1 +
 .../core/src/main/groovy/org/gradle/api/Task.java  |  160 +-
 .../org/gradle/api/UnknownProjectException.java    |    2 -
 .../org/gradle/api/UnknownTaskException.java       |    2 -
 .../main/groovy/org/gradle/api/XmlProvider.java    |    2 -
 .../gradle/api/artifacts/ArtifactIdentifier.java   |   12 +-
 .../api/artifacts/ArtifactRepositoryContainer.java |   42 +-
 .../org/gradle/api/artifacts/ClientModule.java     |    2 -
 .../api/artifacts/ComponentMetadataDetails.java    |   86 +
 .../org/gradle/api/artifacts/Configuration.java    |    8 +-
 .../api/artifacts/ConfigurationContainer.java      |   16 +-
 .../org/gradle/api/artifacts/Dependency.java       |    5 +-
 .../gradle/api/artifacts/DependencyArtifact.java   |    6 +-
 .../org/gradle/api/artifacts/ExcludeRule.java      |    4 +-
 .../gradle/api/artifacts/ExcludeRuleContainer.java |    2 -
 .../gradle/api/artifacts/ExternalDependency.java   |    2 -
 .../api/artifacts/ExternalModuleDependency.java    |    2 -
 .../groovy/org/gradle/api/artifacts/Module.java    |    5 +-
 .../gradle/api/artifacts/ProjectDependency.java    |    4 +-
 .../org/gradle/api/artifacts/PublishArtifact.java  |    6 +-
 .../org/gradle/api/artifacts/PublishException.java |    2 +-
 .../org/gradle/api/artifacts/ResolveException.java |    6 +-
 .../org/gradle/api/artifacts/ResolvedArtifact.java |    2 -
 .../gradle/api/artifacts/ResolvedDependency.java   |    2 -
 .../api/artifacts/UnknownRepositoryException.java  |    2 -
 .../cache/DependencyResolutionControl.java         |    6 +-
 .../artifacts/component/ComponentIdentifier.java   |   35 +
 .../api/artifacts/component/ComponentSelector.java |   44 +
 .../component/ModuleComponentIdentifier.java       |   50 +
 .../component/ModuleComponentSelector.java         |   48 +
 .../component/ProjectComponentIdentifier.java      |   33 +
 .../component/ProjectComponentSelector.java        |   34 +
 .../api/artifacts/component/package-info.java      |   20 +
 .../gradle/api/artifacts/dsl/ArtifactHandler.java  |    2 -
 .../artifacts/dsl/ComponentMetadataHandler.java    |   54 +
 .../api/artifacts/dsl/DependencyHandler.java       |   39 +-
 .../api/artifacts/dsl/RepositoryHandler.java       |   68 +-
 .../artifacts/repositories/ArtifactRepository.java |    2 +-
 .../repositories/IvyArtifactRepository.java        |    2 +-
 .../resolution/ArtifactResolutionQuery.java        |   32 +
 .../resolution/ArtifactResolutionQueryResult.java  |   32 +
 .../api/artifacts/resolution/JvmLibrary.java       |   31 +
 .../artifacts/resolution/JvmLibraryArtifact.java   |   27 +
 .../resolution/JvmLibraryJavadocArtifact.java      |   27 +
 .../resolution/JvmLibrarySourcesArtifact.java      |   27 +
 .../api/artifacts/resolution/SoftwareArtifact.java |   45 +
 .../artifacts/resolution/SoftwareComponent.java    |   32 +
 .../resolution/UnresolvedSoftwareComponent.java    |   41 +
 .../api/artifacts/resolution/package-info.java     |   20 +
 .../artifacts/result/ComponentSelectionReason.java |   64 +
 .../api/artifacts/result/DependencyResult.java     |   18 +-
 .../result/ModuleVersionSelectionReason.java       |   56 -
 .../api/artifacts/result/ResolutionResult.java     |   32 +-
 .../artifacts/result/ResolvedComponentResult.java  |   85 +
 .../artifacts/result/ResolvedDependencyResult.java |    4 +-
 .../result/ResolvedModuleVersionResult.java        |   60 -
 .../result/UnresolvedDependencyResult.java         |    8 +-
 .../gradle/api/component/SoftwareComponent.java    |    3 +-
 .../org/gradle/api/dsl/ConventionProperty.java     |    2 -
 .../gradle/api/execution/TaskExecutionAdapter.java |    2 +-
 .../groovy/org/gradle/api/file/CopySourceSpec.java |    2 -
 .../main/groovy/org/gradle/api/file/CopySpec.java  |   53 +-
 .../groovy/org/gradle/api/file/DeleteAction.java   |    2 -
 .../api/file/DuplicateFileCopyingException.java    |   31 +
 .../org/gradle/api/file/DuplicatesStrategy.java    |   59 +
 .../org/gradle/api/file/EmptyFileVisitor.java      |    2 -
 .../org/gradle/api/file/FileCopyDetails.java       |   41 +
 .../main/groovy/org/gradle/api/file/FileTree.java  |    2 +-
 .../groovy/org/gradle/api/file/FileVisitor.java    |    2 -
 .../groovy/org/gradle/api/file/RelativePath.java   |    2 -
 .../api/initialization/ProjectDescriptor.java      |    2 -
 .../org/gradle/api/initialization/Settings.java    |    5 +-
 .../api/internal/AbstractClassGenerator.java       |   29 +-
 .../api/internal/AbstractMultiCauseException.java  |  101 -
 .../AbstractNamedDomainObjectContainer.java        |   13 +-
 .../AbstractPolymorphicDomainObjectContainer.java  |   17 +-
 .../org/gradle/api/internal/AbstractTask.java      |  169 +-
 .../api/internal/AsmBackedClassGenerator.java      |  181 +-
 .../org/gradle/api/internal/BeanDynamicObject.java |   37 +-
 .../api/internal/CachingDirectedGraphWalker.java   |  176 -
 .../internal/ClassGeneratorBackedInstantiator.java |    2 +-
 .../api/internal/CompositeDomainObjectSet.java     |    9 +-
 .../org/gradle/api/internal/ConfigureDelegate.java |   62 +-
 .../groovy/org/gradle/api/internal/Contextual.java |   29 -
 .../gradle/api/internal/ConventionAwareHelper.java |   17 +-
 .../org/gradle/api/internal/ConventionTask.java    |    3 -
 .../DefaultNamedDomainObjectCollection.java        |    8 +
 .../DefaultPolymorphicDomainObjectContainer.java   |   45 +-
 .../internal/DependencyInjectingInstantiator.java  |    2 +-
 .../org/gradle/api/internal/DirectedGraph.java     |   26 -
 .../api/internal/DirectedGraphWithEdgeValues.java  |   25 -
 .../gradle/api/internal/DocumentationRegistry.java |   31 +-
 .../org/gradle/api/internal/GradleInternal.java    |   22 +-
 .../org/gradle/api/internal/GraphAggregator.java   |   90 -
 .../org/gradle/api/internal/IConventionAware.java  |    2 -
 .../api/internal/LocationAwareException.java       |  179 -
 .../gradle/api/internal/MultiCauseException.java   |   22 -
 ...amedDomainObjectContainerConfigureDelegate.java |   17 +-
 ...phicDomainObjectContainerConfigureDelegate.java |   25 +-
 .../org/gradle/api/internal/SettingsInternal.java  |    9 +-
 .../org/gradle/api/internal/TaskInternal.java      |    8 +-
 .../gradle/api/internal/TaskOutputsInternal.java   |    1 +
 .../artifacts/ArtifactPublicationServices.java     |   31 -
 .../api/internal/artifacts/ArtifactPublisher.java  |   31 -
 .../internal/artifacts/BaseRepositoryFactory.java  |    5 +
 .../artifacts/CachingDependencyResolveContext.java |    6 +-
 .../artifacts/DefaultArtifactIdentifier.java       |   55 -
 .../DefaultArtifactRepositoryContainer.java        |   12 +-
 .../api/internal/artifacts/DefaultExcludeRule.java |    5 -
 .../artifacts/DefaultExcludeRuleContainer.java     |    7 +-
 .../api/internal/artifacts/DefaultModule.java      |   11 +-
 .../artifacts/DependencyManagementServices.java    |   14 +-
 .../artifacts/DependencyResolutionServices.java    |    7 -
 .../DependencyResolveDetailsInternal.java          |    7 +-
 .../artifacts/ExcludeRuleNotationParser.java       |   13 +-
 .../api/internal/artifacts/ModuleInternal.java     |   25 +
 .../artifacts/ModuleVersionSelectorStrictSpec.java |    3 -
 .../internal/artifacts/ProjectBackedModule.java    |   30 +-
 .../ConfigurationContainerInternal.java            |    2 +
 .../configurations/ConfigurationInternal.java      |    2 +
 .../configurations/DependencyMetaDataProvider.java |    7 +-
 .../configurations/dynamicversion/CachePolicy.java |    7 +-
 .../artifacts/dependencies/AbstractDependency.java |    5 +-
 .../dependencies/DefaultClientModule.java          |    3 -
 .../DefaultExternalModuleDependency.java           |    3 -
 .../dependencies/DefaultProjectDependency.java     |    9 +-
 .../dependencies/ProjectDependencyInternal.java    |   28 +
 .../artifacts/dsl/DefaultRepositoryHandler.java    |   27 +-
 .../ArtifactResolutionQueryFactory.java            |   22 +
 .../dependencies/DefaultDependencyHandler.groovy   |  109 -
 .../dsl/dependencies/DefaultDependencyHandler.java |  135 +
 .../dsl/dependencies/DependencyFactory.java        |    3 -
 .../dependencies/ModuleDescriptorDelegate.groovy   |    3 -
 .../dsl/dependencies/ModuleFactoryHelper.java      |    5 +-
 .../artifacts/dsl/dependencies/ProjectFinder.java  |    3 -
 .../ivyservice/ModuleDescriptorConverter.java      |   35 -
 .../artifacts/publish/AbstractPublishArtifact.java |    3 -
 .../artifacts/publish/ArchivePublishArtifact.java  |   21 +-
 .../artifacts/publish/DefaultPublishArtifact.java  |    3 -
 .../repositories/PublicationAwareRepository.java   |   23 -
 .../version/LatestVersionSemanticComparator.java   |   49 -
 .../org/gradle/api/internal/cache/BinaryStore.java |   42 +
 .../org/gradle/api/internal/cache/Store.java       |   22 +
 .../CacheBackedFileSnapshotRepository.java         |   44 -
 .../CacheBackedTaskHistoryRepository.java          |  174 -
 .../CacheLockHandlingTaskExecuter.java             |   38 -
 .../internal/changedetection/CachingHasher.java    |   78 -
 .../changedetection/CompositeUpToDateRule.java     |   52 -
 .../changedetection/DefaultFileCacheListener.java  |   45 -
 .../changedetection/DefaultFileSnapshotter.java    |  158 -
 .../internal/changedetection/DefaultHasher.java    |   26 -
 .../DefaultTaskArtifactStateCacheAccess.java       |   85 -
 .../DefaultTaskArtifactStateRepository.java        |  172 -
 ...eCacheBroadcastTaskArtifactStateRepository.java |   63 -
 .../changedetection/FileCacheListener.java         |   35 -
 .../changedetection/FileCollectionSnapshot.java    |   59 -
 .../changedetection/FileSnapshotRepository.java    |   24 -
 .../internal/changedetection/FileSnapshotter.java  |   35 -
 .../api/internal/changedetection/Hasher.java       |   22 -
 .../changedetection/InMemoryIndexedCache.java      |   65 -
 .../InputFilesChangedUpToDateRule.java             |   63 -
 .../InputPropertiesChangedUpToDateRule.java        |   55 -
 .../changedetection/MapMergeChangeListener.java    |   67 -
 .../OutputFilesChangedUpToDateRule.java            |   85 -
 .../changedetection/OutputFilesSnapshotter.java    |  154 -
 .../ShortCircuitTaskArtifactStateRepository.java   |   96 -
 .../changedetection/TaskArtifactState.java         |   11 +-
 .../TaskArtifactStateCacheAccess.java              |   50 -
 .../TaskCacheLockHandlingBuildExecuter.java        |   35 -
 .../internal/changedetection/TaskExecution.java    |   67 -
 .../changedetection/TaskHistoryRepository.java     |   30 -
 .../TaskTypeChangedUpToDateRule.java               |   42 -
 .../api/internal/changedetection/UpToDateRule.java |   48 -
 .../changes/ChangesOnlyIncrementalTaskInputs.java  |   57 +
 .../DefaultTaskArtifactStateRepository.java        |  132 +
 .../changes/NoHistoryArtifactState.java            |   52 +
 .../changes/RebuildIncrementalTaskInputs.java      |   73 +
 .../ShortCircuitTaskArtifactStateRepository.java   |   96 +
 .../changes/StatefulIncrementalTaskInputs.java     |   49 +
 .../rules/CachingTaskStateChanges.java             |   86 +
 .../internal/changedetection/rules/ChangeType.java |   33 +
 .../changedetection/rules/DescriptiveChange.java   |   29 +
 .../internal/changedetection/rules/FileChange.java |   60 +
 .../changedetection/rules/InputFileChange.java     |   31 +
 .../rules/InputFilesStateChangeRule.java           |   77 +
 .../rules/InputPropertiesStateChangeRule.java      |   54 +
 .../rules/NoHistoryStateChangeRule.java            |   35 +
 .../changedetection/rules/OutputFileChange.java    |   29 +
 .../rules/OutputFilesStateChangeRule.java          |  100 +
 .../rules/SimpleTaskStateChanges.java              |   38 +
 .../rules/SummaryTaskStateChanges.java             |   76 +
 .../changedetection/rules/TaskStateChange.java     |   21 +
 .../changedetection/rules/TaskStateChanges.java    |   25 +
 .../rules/TaskTypeStateChangeRule.java             |   43 +
 .../changedetection/rules/TaskUpToDateState.java   |   66 +
 .../state/CacheBackedFileSnapshotRepository.java   |   45 +
 .../state/CacheBackedTaskHistoryRepository.java    |  279 ++
 .../state/CachingFileSnapshotter.java              |   87 +
 .../state/DefaultFileCollectionSnapshotter.java    |  190 +
 .../state/DefaultFileSnapshotterSerializer.java    |   67 +
 .../state/DefaultTaskArtifactStateCacheAccess.java |   68 +
 .../state/FileCollectionSnapshot.java              |   61 +
 .../state/FileCollectionSnapshotter.java           |   41 +
 .../state/FileSnapshotRepository.java              |   24 +
 .../changedetection/state/FileSnapshotter.java     |   37 +
 .../state/InMemoryTaskArtifactCache.java           |  126 +
 .../state/MapMergeChangeListener.java              |   67 +
 .../changedetection/state/NoOpDecorator.java       |   26 +
 .../state/OutputFilesCollectionSnapshotter.java    |  226 +
 .../state/OutputFilesSnapshotSerializer.java       |   63 +
 .../state/TaskArtifactStateCacheAccess.java        |   25 +
 .../changedetection/state/TaskExecution.java       |   66 +
 .../state/TaskHistoryRepository.java               |   30 +
 .../internal/classpath/DefaultModuleRegistry.java  |    2 +-
 .../api/internal/classpath/EffectiveClassPath.java |    2 +-
 .../api/internal/classpath/ManifestUtil.java       |    1 -
 .../coerce/MethodArgumentsTransformer.java         |   36 +
 .../TypeCoercingMethodArgumentsTransformer.java    |   91 +
 .../collections/CollectionEventRegister.java       |    2 +-
 .../api/internal/file/AbstractFileResolver.java    |   16 +-
 .../api/internal/file/AbstractFileResource.java    |    3 -
 .../api/internal/file/AbstractFileTreeElement.java |   17 +-
 .../internal/file/AntFileCollectionBuilder.groovy  |    5 +-
 .../api/internal/file/BaseDirFileResolver.java     |    3 -
 .../file/CopyActionProcessingStreamAction.java     |   25 +
 .../internal/file/DefaultCompositeFileTree.java    |   45 +
 .../api/internal/file/DefaultFileLookup.java       |   43 +
 .../api/internal/file/DefaultFileOperations.java   |   66 +-
 .../api/internal/file/DefaultFileTreeElement.java  |   12 +-
 .../api/internal/file/DefaultFileVisitDetails.java |    6 +-
 .../file/DefaultTemporaryFileProvider.java         |    3 +-
 .../org/gradle/api/internal/file/FileLookup.java   |   38 +
 .../gradle/api/internal/file/FileOperations.java   |    5 +
 .../api/internal/file/FileOrUriNotationParser.java |    7 +-
 .../org/gradle/api/internal/file/FileResolver.java |   13 +-
 .../org/gradle/api/internal/file/FileResource.java |    3 -
 .../api/internal/file/IdentityFileResolver.java    |    9 +-
 .../internal/file/MaybeCompressedFileResource.java |    3 -
 .../api/internal/file/archive/TarCopyAction.java   |  114 +
 .../internal/file/archive/TarCopySpecVisitor.java  |   88 -
 .../api/internal/file/archive/TarFileTree.java     |   15 +-
 .../api/internal/file/archive/ZipCopyAction.java   |  101 +-
 .../internal/file/archive/ZipCopySpecVisitor.java  |   81 -
 .../api/internal/file/archive/ZipFileTree.java     |   14 +-
 .../file/archive/compression/Bzip2Archiver.java    |    3 -
 .../file/archive/compression/GzipArchiver.java     |    3 -
 .../file/archive/compression/SimpleCompressor.java |    3 -
 .../collections/DefaultConfigurableFileTree.java   |   37 +-
 .../file/collections/DelegatingFileCollection.java |  111 +
 .../file/collections/DirectoryFileTree.java        |   13 +-
 .../LazilyInitializedFileCollection.java           |   35 +
 .../api/internal/file/collections/MapFileTree.java |   18 +-
 .../collections/SingleIncludePatternFileTree.java  |   14 +-
 .../file/collections/SingletonFileTree.java        |   19 +-
 .../internal/file/copy/AbstractZipCompressor.java  |   37 -
 .../api/internal/file/copy/ArchiveCopyAction.java  |   25 -
 .../gradle/api/internal/file/copy/CopyAction.java  |   49 +-
 .../api/internal/file/copy/CopyActionExecuter.java |   41 +
 .../api/internal/file/copy/CopyActionImpl.java     |  235 +-
 .../file/copy/CopyActionProcessingStream.java      |   25 +
 .../internal/file/copy/CopyFileVisitorImpl.java    |   66 +
 .../api/internal/file/copy/CopySpecActionImpl.java |   39 +
 .../CopySpecBackedCopyActionProcessingStream.java  |   38 +
 .../api/internal/file/copy/CopySpecImpl.java       |  461 --
 .../api/internal/file/copy/CopySpecInternal.java   |   47 +
 .../api/internal/file/copy/CopySpecSource.java     |    2 +-
 .../api/internal/file/copy/CopySpecVisitor.java    |   36 -
 .../api/internal/file/copy/CopySpecWrapper.java    |  222 +
 .../api/internal/file/copy/DefaultCopySpec.java    |  469 ++
 .../internal/file/copy/DefaultFileCopyDetails.java |  217 +
 .../internal/file/copy/DefaultZipCompressor.java   |   45 +
 .../file/copy/DelegatingCopySpecInternal.java      |  228 +
 .../file/copy/DelegatingCopySpecVisitor.java       |   54 -
 .../api/internal/file/copy/DeleteActionImpl.java   |    3 -
 .../file/copy/DestinationRootCopySpec.java         |   51 +
 .../copy/DuplicateHandlingCopyActionDecorator.java |   66 +
 .../internal/file/copy/EmptyCopySpecVisitor.java   |   39 -
 .../gradle/api/internal/file/copy/FileCopier.java  |   67 +
 .../api/internal/file/copy/FileCopyAction.java     |   32 +-
 .../api/internal/file/copy/FileCopyActionImpl.java |   33 +-
 .../file/copy/FileCopyDetailsInternal.java         |   25 +
 .../internal/file/copy/FileCopySpecVisitor.java    |   61 -
 .../internal/file/copy/MappingCopySpecVisitor.java |  230 -
 .../api/internal/file/copy/MatchingCopyAction.java |   40 +
 .../file/copy/NormalizingCopyActionDecorator.java  |  193 +
 .../file/copy/NormalizingCopySpecVisitor.java      |  121 -
 .../api/internal/file/copy/PathNotationParser.java |    4 +-
 .../api/internal/file/copy/ReadableCopySpec.java   |   32 +-
 .../api/internal/file/copy/RegExpNameMapper.java   |    3 -
 .../internal/file/copy/RelativizedCopySpec.java    |   51 +
 .../file/copy/SyncCopyActionDecorator.java         |   92 +
 .../internal/file/copy/SyncCopySpecVisitor.java    |   90 -
 .../api/internal/file/copy/ZipCompressor.java      |    5 +-
 .../internal/file/copy/ZipDeflatedCompressor.java  |   31 -
 .../internal/file/copy/ZipStoredCompressor.java    |   28 -
 .../file/pattern/AnyWildcardPatternStep.java       |   23 +
 .../file/pattern/DefaultPatternMatcher.java        |  159 -
 .../internal/file/pattern/EndOfPathMatcher.java    |   35 +
 .../internal/file/pattern/FixedPatternStep.java    |   34 +
 .../file/pattern/FixedStepsPathMatcher.java        |   70 +
 .../internal/file/pattern/GreedyPathMatcher.java   |   48 +
 .../internal/file/pattern/GreedyPatternStep.java   |   29 -
 .../file/pattern/NameOnlyPatternMatcher.java       |   58 -
 .../api/internal/file/pattern/PathMatcher.java     |   39 +
 .../file/pattern/PatternMatcherFactory.java        |   69 +-
 .../api/internal/file/pattern/PatternStep.java     |    6 +-
 .../internal/file/pattern/PatternStepFactory.java  |   46 +-
 .../internal/file/pattern/RegExpPatternStep.java   |   21 +-
 .../file/pattern/WildcardPrefixPatternStep.java    |   36 +
 .../internal/filestore/AbstractFileStoreEntry.java |   28 -
 .../gradle/api/internal/filestore/FileStore.java   |   31 -
 .../api/internal/filestore/FileStoreEntry.java     |   29 -
 .../api/internal/filestore/FileStoreSearcher.java  |   25 -
 .../filestore/GroupedAndNamedUniqueFileStore.java  |   13 +-
 .../api/internal/filestore/PathKeyFileStore.java   |   29 +-
 .../filestore/PathNormalisingKeyFileStore.java     |   11 +-
 .../internal/filestore/UniquePathKeyFileStore.java |    7 +-
 .../gradle/api/internal/hash/DefaultHasher.java    |   26 +
 .../org/gradle/api/internal/hash/Hasher.java       |   22 +
 .../initialization/AbstractScriptHandler.java      |   14 +-
 .../internal/initialization/ClassLoaderCache.java  |   27 +
 .../internal/initialization/ClassLoaderScope.java  |   89 +
 .../initialization/DefaultClassLoaderCache.java    |  102 +
 .../initialization/DefaultClassLoaderScope.java    |  168 +
 .../initialization/DefaultScriptHandler.java       |   75 +-
 .../DefaultScriptHandlerFactory.java               |   24 +-
 .../NoClassLoaderUpdateScriptHandler.java          |   33 -
 .../initialization/RootClassLoaderScope.java       |   70 +
 .../internal/initialization/ScriptClassLoader.java |   41 +
 .../initialization/ScriptClassLoaderProvider.java  |   22 -
 .../ScriptHandlerClassLoaderFactory.java           |   43 +
 .../initialization/ScriptHandlerFactory.java       |    5 +-
 .../initialization/ScriptHandlerInternal.java      |   21 -
 .../internal/notations/NotationParserBuilder.java  |   84 -
 .../gradle/api/internal/notations/TypeInfo.java    |   35 -
 .../api/internal/notations/api/NotationParser.java |   28 -
 .../api/UnsupportedNotationException.java          |   28 -
 .../parsers/CharSequenceNotationParser.java        |   28 -
 .../parsers/ClosureToSpecNotationParser.java       |   41 -
 .../notations/parsers/CompositeNotationParser.java |   53 -
 .../parsers/ErrorHandlingNotationParser.java       |   71 -
 .../parsers/FlatteningNotationParser.java          |   51 -
 .../notations/parsers/JustReturningParser.java     |   44 -
 .../api/internal/notations/parsers/MapKey.java     |   28 -
 .../notations/parsers/MapNotationParser.java       |  133 -
 .../notations/parsers/NormalizedTimeUnit.java      |   45 -
 .../notations/parsers/TimeUnitsParser.java         |   46 -
 .../notations/parsers/TypedNotationParser.java     |   48 -
 .../ClassloaderBackedPluginDescriptorLocator.java  |   38 +
 .../api/internal/plugins/DefaultConvention.java    |   13 +-
 .../plugins/DefaultObjectConfigurationAction.java  |   39 +-
 .../internal/plugins/DefaultPluginContainer.java   |  107 +
 .../internal/plugins/DefaultPluginRegistry.java    |   44 +-
 .../plugins/DefaultProjectsPluginContainer.java    |  110 -
 .../org/gradle/api/internal/plugins/DslObject.java |    4 +
 .../plugins/ExtensionContainerInternal.java        |   29 +
 .../api/internal/plugins/ExtensionsStorage.java    |   31 +-
 .../api/internal/plugins/PluginDescriptor.java     |   41 +
 .../internal/plugins/PluginDescriptorLocator.java  |   23 +
 .../api/internal/plugins/PluginRegistry.java       |    9 +-
 .../api/internal/project/AbstractPluginAware.java  |   52 +
 .../api/internal/project/AbstractProject.java      |  180 +-
 .../api/internal/project/DefaultAntBuilder.groovy  |   96 -
 .../api/internal/project/DefaultAntBuilder.java    |  138 +
 .../internal/project/DefaultAntBuilderFactory.java |   12 +-
 .../project/DefaultIsolatedAntBuilder.groovy       |    4 +
 .../api/internal/project/DefaultProject.java       |    6 +-
 .../project/DefaultProjectAccessListener.java      |    3 -
 .../internal/project/DefaultProjectRegistry.java   |    9 +-
 .../internal/project/GlobalServicesRegistry.java   |  113 -
 .../project/GradleInternalServiceRegistry.java     |   92 -
 .../api/internal/project/IProjectFactory.java      |    5 +-
 .../api/internal/project/IProjectRegistry.java     |   40 -
 .../api/internal/project/ProjectFactory.java       |   18 +-
 .../api/internal/project/ProjectInternal.java      |   21 +-
 .../project/ProjectInternalServiceRegistry.java    |  180 -
 .../api/internal/project/ProjectRegistry.java      |   37 +
 .../api/internal/project/ProjectScript.groovy      |    2 +-
 .../api/internal/project/ProjectStateInternal.java |    4 +
 .../internal/project/ServiceRegistryFactory.java   |   31 -
 .../internal/project/TaskExecutionServices.java    |   86 -
 .../project/TaskInternalServiceRegistry.java       |   61 -
 .../project/TopLevelBuildServiceRegistry.java      |  253 --
 .../internal/project/ant/AntLoggingAdapter.java    |    3 -
 .../api/internal/project/ant/BasicAntBuilder.java  |    5 +
 .../AnnotationProcessingTaskFactory.java           |  200 +-
 .../internal/project/taskfactory/ITaskFactory.java |    3 -
 .../internal/project/taskfactory/TaskFactory.java  |   27 +-
 .../api/internal/resource/ResourceException.java   |    2 +-
 .../internal/resources/DefaultResourceHandler.java |    3 -
 .../gradle/api/internal/resources/URIBuilder.java  |    3 -
 .../gradle/api/internal/specs/ExplainingSpecs.java |    3 -
 .../tasks/CachingTaskDependencyResolveContext.java |    6 +-
 .../api/internal/tasks/CommandLineOption.java      |   40 -
 .../api/internal/tasks/ContextAwareTaskAction.java |   24 +
 .../api/internal/tasks/DefaultTaskContainer.java   |  124 +-
 .../api/internal/tasks/SimpleWorkResult.java       |   30 +
 .../api/internal/tasks/TaskContainerInternal.java  |   26 +-
 .../gradle/api/internal/tasks/TaskExecuter.java    |    2 +-
 .../api/internal/tasks/TaskExecutionContext.java   |   24 +
 .../api/internal/tasks/TaskStatusNagger.java       |    9 +-
 .../execution/DefaultTaskExecutionContext.java     |   31 +
 .../execution/ExecuteActionsTaskExecuter.java      |   26 +-
 .../execution/ExecuteAtMostOnceTaskExecuter.java   |    5 +-
 .../PostExecutionAnalysisTaskExecuter.java         |    5 +-
 .../SkipEmptySourceFilesTaskExecuter.java          |    5 +-
 .../tasks/execution/SkipOnlyIfTaskExecuter.java    |    5 +-
 .../execution/SkipTaskWithNoActionsExecuter.java   |    5 +-
 .../tasks/execution/SkipUpToDateTaskExecuter.java  |   39 +-
 .../tasks/execution/ValidatingTaskExecuter.java    |    5 +-
 .../tasks/options/AbstractOptionElement.java       |   96 +
 .../internal/tasks/options/FieldOptionElement.java |   85 +
 .../tasks/options/InstanceOptionDescriptor.java    |   85 +
 .../tasks/options/MethodOptionElement.java         |   81 +
 .../gradle/api/internal/tasks/options/Option.java  |   40 +
 .../internal/tasks/options/OptionDescriptor.java   |   38 +
 .../api/internal/tasks/options/OptionElement.java  |   40 +
 .../tasks/options/OptionNotationParserFactory.java |   83 +
 .../api/internal/tasks/options/OptionReader.java   |  148 +
 .../tasks/options/OptionValidationException.java   |   28 +
 .../api/internal/tasks/options/OptionValues.groovy |   34 +
 .../api/internal/xml/SimpleMarkupWriter.java       |    8 +-
 .../gradle/api/internal/xml/SimpleXmlWriter.java   |    4 +-
 .../gradle/api/internal/xml/XmlTransformer.java    |    2 +-
 .../groovy/org/gradle/api/invocation/Gradle.java   |    7 +-
 .../groovy/org/gradle/api/logging/LogLevel.java    |    2 -
 .../groovy/org/gradle/api/logging/Logging.java     |    2 -
 .../groovy/org/gradle/api/plugins/Convention.java  |    2 -
 .../org/gradle/api/plugins/ExtensionContainer.java |    2 +
 .../groovy/org/gradle/api/plugins/PluginAware.java |   62 +
 .../org/gradle/api/plugins/PluginCollection.java   |    8 +-
 .../org/gradle/api/plugins/PluginContainer.java    |    2 -
 .../api/plugins/PluginInstantiationException.java  |    2 -
 .../gradle/api/plugins/UnknownPluginException.java |    2 -
 .../main/groovy/org/gradle/api/specs/Specs.java    |    2 -
 .../org/gradle/api/tasks/AbstractCopyTask.java     |   83 +-
 .../org/gradle/api/tasks/AntBuilderAware.groovy    |    2 -
 .../org/gradle/api/tasks/ConventionValue.java      |    1 -
 .../src/main/groovy/org/gradle/api/tasks/Copy.java |   86 +-
 .../main/groovy/org/gradle/api/tasks/Delete.java   |    2 -
 .../src/main/groovy/org/gradle/api/tasks/Exec.java |    7 +-
 .../groovy/org/gradle/api/tasks/GradleBuild.java   |   12 +-
 .../main/groovy/org/gradle/api/tasks/JavaExec.java |   12 +-
 .../groovy/org/gradle/api/tasks/SourceTask.java    |    2 +-
 .../org/gradle/api/tasks/StopActionException.java  |    2 -
 .../gradle/api/tasks/StopExecutionException.java   |    2 -
 .../src/main/groovy/org/gradle/api/tasks/Sync.java |   31 +-
 .../groovy/org/gradle/api/tasks/TaskContainer.java |  123 +-
 .../gradle/api/tasks/TaskExecutionException.java   |    2 +-
 .../gradle/api/tasks/TaskValidationException.java  |    4 +-
 .../main/groovy/org/gradle/api/tasks/Upload.java   |  147 -
 .../groovy/org/gradle/api/tasks/ant/AntTarget.java |    7 +-
 .../api/tasks/bundling/AbstractArchiveTask.java    |    3 +-
 .../org/gradle/api/tasks/bundling/Compression.java |    2 -
 .../groovy/org/gradle/api/tasks/bundling/Tar.java  |   42 +-
 .../groovy/org/gradle/api/tasks/bundling/Zip.java  |   89 +-
 .../bundling/internal/Zip64RequiredException.java  |   26 +
 .../tasks/incremental/IncrementalTaskInputs.java   |  122 +
 .../api/tasks/incremental/InputFileDetails.java    |   50 +
 .../gradle/api/tasks/incremental/package-info.java |   20 +
 .../org/gradle/api/tasks/util/PatternSet.java      |    9 +-
 .../main/groovy/org/gradle/cache/CacheBuilder.java |   47 +-
 .../org/gradle/cache/CacheOpenException.java       |    2 +-
 .../groovy/org/gradle/cache/CacheRepository.java   |   59 +-
 .../groovy/org/gradle/cache/CacheValidator.java    |   11 +-
 .../org/gradle/cache/DirectoryCacheBuilder.java    |   49 -
 .../org/gradle/cache/ObjectCacheBuilder.java       |   39 -
 .../groovy/org/gradle/cache/PersistentCache.java   |   30 +-
 .../org/gradle/cache/PersistentIndexedCache.java   |    3 +
 .../cache/PersistentIndexedCacheParameters.java    |   66 +
 .../groovy/org/gradle/cache/PersistentStore.java   |   39 +
 .../gradle/cache/internal/CacheCoordinator.java    |   35 +
 .../org/gradle/cache/internal/CacheDecorator.java  |   25 +
 .../org/gradle/cache/internal/CacheFactory.java    |   15 +-
 .../cache/internal/CacheInitializationAction.java  |   30 +
 .../gradle/cache/internal/CacheScopeMapping.java   |   26 +
 .../gradle/cache/internal/DefaultCacheAccess.java  |  389 +-
 .../gradle/cache/internal/DefaultCacheFactory.java |  274 +-
 .../cache/internal/DefaultCacheRepository.java     |  234 +-
 .../cache/internal/DefaultCacheScopeMapping.java   |   77 +
 .../cache/internal/DefaultFileLockManager.java     |  317 +-
 ...aultMultiProcessSafePersistentIndexedCache.java |   99 +
 .../internal/DefaultPersistentDirectoryCache.java  |  113 +-
 .../internal/DefaultPersistentDirectoryStore.java  |   78 +-
 .../DelegateOnDemandPersistentDirectoryCache.java  |  114 -
 .../org/gradle/cache/internal/FileAccess.java      |    2 +-
 .../groovy/org/gradle/cache/internal/FileLock.java |   14 +-
 .../cache/internal/FileLockCommunicator.java       |   96 +
 .../org/gradle/cache/internal/FileLockManager.java |   20 +-
 .../cache/internal/GracefullyStoppedException.java |   19 +
 .../MultiProcessSafePersistentIndexedCache.java    |   90 +-
 .../gradle/cache/internal/OnDemandFileAccess.java  |    8 +-
 .../internal/ReferencablePersistentCache.java      |    6 +-
 .../gradle/cache/internal/SimpleStateCache.java    |   14 +-
 .../cache/internal/UnitOfWorkParticipant.java      |    7 +-
 .../btree/BTreePersistentIndexedCache.java         |   16 +-
 .../cache/internal/btree/FileBackedBlockStore.java |   49 +-
 .../cacheops/CacheAccessOperationsStack.java       |   68 +
 .../cache/internal/cacheops/CacheOperation.java    |   27 +
 .../internal/cacheops/CacheOperationStack.java     |   74 +
 .../filelock/DefaultLockStateSerializer.java       |   91 +
 .../cache/internal/filelock/LockFileAccess.java    |   92 +
 .../gradle/cache/internal/filelock/LockInfo.java   |   23 +
 .../cache/internal/filelock/LockInfoAccess.java    |   71 +
 .../internal/filelock/LockInfoSerializer.java      |   54 +
 .../cache/internal/filelock/LockOptions.java       |   30 +
 .../internal/filelock/LockOptionsBuilder.java      |   83 +
 .../gradle/cache/internal/filelock/LockState.java  |   36 +
 .../cache/internal/filelock/LockStateAccess.java   |   89 +
 .../internal/filelock/LockStateSerializer.java     |   49 +
 .../filelock/Version1LockStateSerializer.java      |   72 +
 .../DefaultFileLockContentionHandler.java          |  163 +
 .../locklistener/FileLockContentionHandler.java    |   27 +
 .../gradle/configuration/BuildScriptProcessor.java |   45 -
 .../configuration/DefaultBuildConfigurer.java      |   22 +-
 .../configuration/DefaultInitScriptProcessor.java  |   15 +-
 .../configuration/DefaultScriptPluginFactory.java  |  148 +-
 .../configuration/ImplicitTasksConfigurer.java     |   13 +-
 .../org/gradle/configuration/ImportsReader.java    |   34 +-
 .../configuration/LifecycleProjectEvaluator.java   |   51 -
 .../ProjectDependencies2TaskResolver.java          |   47 -
 .../org/gradle/configuration/ProjectEvaluator.java |   23 -
 .../org/gradle/configuration/ScriptPlugin.java     |   19 +-
 .../gradle/configuration/ScriptPluginFactory.java  |    5 +-
 .../project/BuildScriptProcessor.java              |   45 +
 .../project/ConfigureActionsProjectEvaluator.java  |   37 +
 ...DefaultProjectConfigurationActionContainer.java |   45 +
 .../project/DelayedConfigurationActions.java       |   33 +
 .../project/LifecycleProjectEvaluator.java         |   82 +
 .../project/PluginsProjectConfigureActions.java    |   34 +
 .../ProjectConfigurationActionContainer.java       |   40 +
 .../project/ProjectConfigureAction.java            |   30 +
 .../project/ProjectDependencies2TaskResolver.java  |   41 +
 .../configuration/project/ProjectEvaluator.java    |   23 +
 .../TaskModelRealizingConfigurationAction.java     |   31 +
 ...ludedTaskFilteringBuildConfigurationAction.java |    6 +-
 .../gradle/execution/MultipleBuildFailures.java    |    2 +-
 .../gradle/execution/ProjectEvaluatingAction.java  |    2 -
 .../org/gradle/execution/TaskNameResolver.java     |   47 +-
 .../TaskNameResolvingBuildConfigurationAction.java |   18 +-
 .../gradle/execution/TaskPathProjectEvaluator.java |    3 -
 .../gradle/execution/TaskSelectionException.java   |   14 +-
 .../org/gradle/execution/TaskSelectionResult.java  |   23 +
 .../groovy/org/gradle/execution/TaskSelector.java  |   27 +-
 .../commandline/CommandLineTaskConfigurer.java     |   68 +-
 .../commandline/CommandLineTaskParser.java         |    8 +-
 .../commandline/TaskConfigurationException.java    |   44 +
 .../taskgraph/AbstractTaskPlanExecutor.java        |   87 +
 .../taskgraph/DefaultTaskExecutionPlan.java        |  377 +-
 .../taskgraph/DefaultTaskGraphExecuter.java        |   42 +-
 .../taskgraph/DefaultTaskPlanExecutor.java         |   37 +-
 .../execution/taskgraph/ExecutionOptions.java      |   36 -
 .../taskgraph/ParallelTaskPlanExecutor.java        |   84 +-
 .../execution/taskgraph/TaskDependencyGraph.java   |   52 +
 .../taskgraph/TaskDependencyGraphEdge.groovy       |   36 +
 .../execution/taskgraph/TaskExecutionPlan.java     |   17 +-
 .../org/gradle/execution/taskgraph/TaskInfo.java   |  131 +-
 .../taskgraph/TaskPlanExecutorFactory.java         |   26 +-
 .../taskpath/ProjectFinderByTaskPath.java          |    3 -
 .../execution/taskpath/ResolvedTaskPath.java       |    3 -
 .../execution/taskpath/TaskPathResolver.java       |    3 -
 .../org/gradle/groovy/scripts/BasicScript.java     |    8 +-
 .../org/gradle/groovy/scripts/DefaultScript.java   |   44 +-
 .../scripts/DefaultScriptCompilerFactory.java      |    7 +-
 .../org/gradle/groovy/scripts/ScriptAware.java     |    6 +-
 .../groovy/scripts/ScriptCompilerFactory.java      |    2 -
 .../gradle/groovy/scripts/StringScriptSource.java  |    2 +-
 .../org/gradle/groovy/scripts/UriScriptSource.java |    2 +-
 .../internal/AbstractScriptTransformer.java        |   36 -
 .../internal/AsmBackedEmptyScriptGenerator.java    |   10 +-
 .../gradle/groovy/scripts/internal/AstUtils.java   |   91 +
 .../BuildScriptClasspathScriptTransformer.java     |   38 -
 .../scripts/internal/BuildScriptTransformer.java   |   13 +-
 .../internal/ClasspathScriptTransformer.java       |  177 -
 .../internal/DefaultScriptCompilationHandler.java  |    3 -
 .../FileCacheBackedScriptClassCompiler.java        |   41 +-
 .../scripts/internal/FilteredTransformer.java      |   28 +
 .../internal/FilteringStatementTransformer.java    |   43 +
 .../scripts/internal/FixMainScriptTransformer.java |    4 +-
 .../internal/PluginsAndBuildscriptTransformer.java |  127 +
 .../groovy/scripts/internal/ScriptBlock.java       |   37 +
 ...riptBlockToServiceConfigurationTransformer.java |   54 +
 .../scripts/internal/ScriptCompilationHandler.java |    3 -
 .../StatementExtractingScriptTransformer.java      |  145 +
 .../internal/StatementLabelsScriptTransformer.java |    2 +-
 .../scripts/internal/StatementTransformer.java     |   30 +
 .../internal/TaskDefinitionScriptTransformer.java  |    6 +-
 .../gradle/initialization/AbstractProjectSpec.java |    8 +-
 .../org/gradle/initialization/BaseSettings.java    |   81 +-
 .../org/gradle/initialization/BuildAction.java     |   31 +
 .../org/gradle/initialization/BuildController.java |   45 +
 .../initialization/BuildFileProjectSpec.java       |    4 +-
 .../initialization/BuildLayoutParameters.java      |   25 +-
 .../org/gradle/initialization/BuildLoader.java     |    3 +-
 .../gradle/initialization/BuildProgressLogger.java |   65 -
 .../gradle/initialization/BuildSourceBuilder.java  |  155 -
 .../gradle/initialization/ClassLoaderRegistry.java |   16 +-
 .../initialization/DefaultClassLoaderRegistry.java |   38 +-
 .../DefaultCommandLineConverter.java               |   49 +-
 .../initialization/DefaultExceptionAnalyser.java   |   20 +-
 .../initialization/DefaultGradleLauncher.java      |    4 +-
 .../DefaultGradleLauncherFactory.java              |   44 +-
 .../DefaultGradlePropertiesLoader.java             |    3 -
 .../initialization/DefaultProjectDescriptor.java   |   16 +-
 .../DefaultProjectDescriptorRegistry.java          |    5 +-
 .../gradle/initialization/DefaultProjectSpec.java  |    4 +-
 .../gradle/initialization/DefaultSettings.groovy   |   36 -
 .../org/gradle/initialization/DefaultSettings.java |   36 +
 .../initialization/DefaultSettingsFinder.java      |    3 -
 .../initialization/DependencyResolutionLogger.java |    5 +-
 .../initialization/GradleLauncherAction.java       |   43 -
 .../initialization/GradleLauncherFactory.java      |    2 -
 .../initialization/IGradlePropertiesLoader.java    |    3 -
 .../initialization/IProjectDescriptorRegistry.java |   26 -
 .../org/gradle/initialization/ISettingsFinder.java |    3 -
 .../initialization/InstantiatingBuildLoader.java   |   22 +-
 .../gradle/initialization/JdkToolsInitializer.java |   25 +
 .../initialization/LayoutCommandLineConverter.java |   19 +-
 .../initialization/ProjectAccessListener.java      |    2 -
 .../initialization/ProjectDescriptorRegistry.java  |   23 +
 .../ProjectDirectoryProjectSpec.java               |    4 +-
 .../initialization/ProjectPathProjectSpec.java     |   66 +
 .../ProjectPropertySettingBuildLoader.java         |    8 +-
 .../org/gradle/initialization/ProjectSpec.java     |    6 +-
 .../org/gradle/initialization/ProjectSpecs.java    |   36 +
 .../PropertiesLoadingSettingsProcessor.java        |    9 +-
 .../ScriptEvaluatingSettingsProcessor.java         |   27 +-
 .../org/gradle/initialization/SettingsFactory.java |   16 +-
 .../org/gradle/initialization/SettingsHandler.java |   18 +-
 .../gradle/initialization/SettingsProcessor.java   |    7 +-
 .../buildsrc/BuildSourceBuilder.java               |  101 +
 .../buildsrc/BuildSrcBuildListenerFactory.java     |   61 +
 .../buildsrc/BuildSrcUpdateFactory.java            |   61 +
 .../environment/GradleBuildEnvironment.java        |   22 +
 .../exceptions/AbstractMultiCauseException.java    |  111 +
 .../org/gradle/internal/exceptions/Contextual.java |   29 +
 .../exceptions/FailureResolutionAware.java         |   28 +
 .../exceptions/LocationAwareException.java         |  168 +
 .../internal/exceptions/MultiCauseException.java   |   22 +
 .../featurelifecycle/DeprecatedFeatureHandler.java |   26 +
 .../featurelifecycle/DeprecatedFeatureUsage.java   |   77 +
 .../LoggingDeprecatedFeatureHandler.java           |   76 +
 .../ScriptUsageLocationReporter.java               |   91 +
 .../featurelifecycle/UsageLocationReporter.java    |   21 +
 .../internal/graph/CachingDirectedGraphWalker.java |  203 +
 .../org/gradle/internal/graph/DirectedGraph.java   |   26 +
 .../internal/graph/DirectedGraphRenderer.java      |   80 +
 .../graph/DirectedGraphWithEdgeValues.java         |   25 +
 .../org/gradle/internal/graph/GraphAggregator.java |   90 +
 .../gradle/internal/graph/GraphNodeRenderer.java   |   22 +
 .../org/gradle/internal/graph/GraphRenderer.java   |   69 +
 .../internal/progress/BuildProgressFilter.java     |   94 +
 .../internal/progress/BuildProgressLogger.java     |  108 +
 .../gradle/internal/progress/LoggerProvider.java   |   30 +
 .../internal/progress/OperationIdentifier.java     |   40 +
 .../internal/progress/OperationsHierarchy.java     |   92 +
 .../progress/OperationsHierarchyKeeper.java        |   40 +
 .../progress/PercentageProgressFormatter.java      |   40 +
 .../internal/progress/ProgressFormatter.java       |   21 +
 .../internal/progress/ProgressLoggerProvider.java  |   33 +
 .../internal/progress/SimpleProgressFormatter.java |   39 +
 .../scopes/BuildScopeServiceRegistryFactory.java   |   50 +
 .../service/scopes/BuildScopeServices.java         |  299 ++
 .../service/scopes/GlobalScopeServices.java        |  172 +
 .../service/scopes/GradleScopeServices.java        |  120 +
 .../service/scopes/PluginServiceRegistry.java      |   43 +
 .../service/scopes/ProjectScopeServices.java       |  176 +
 .../service/scopes/ServiceRegistryFactory.java     |   31 +
 .../service/scopes/SettingsScopeServices.java      |   55 +
 .../service/scopes/TaskExecutionServices.java      |   97 +
 .../internal/service/scopes/TaskScopeServices.java |   58 +
 .../org/gradle/internal/text/TreeFormatter.java    |  146 +
 .../typeconversion/CharSequenceNotationParser.java |   28 +
 .../ClosureToSpecNotationParser.java               |   36 +
 .../typeconversion/CompositeNotationParser.java    |   46 +
 .../EnumFromCharSequenceNotationParser.java        |   63 +
 .../ErrorHandlingNotationParser.java               |   66 +
 .../typeconversion/FlatteningNotationParser.java   |   50 +
 .../typeconversion/JustReturningParser.java        |   38 +
 .../org/gradle/internal/typeconversion/MapKey.java |   28 +
 .../internal/typeconversion/MapNotationParser.java |  131 +
 .../typeconversion/NormalizedTimeUnit.java         |   42 +
 .../internal/typeconversion/NotationParser.java    |   32 +
 .../typeconversion/NotationParserBuilder.java      |   84 +
 .../internal/typeconversion/TimeUnitsParser.java   |   43 +
 .../typeconversion/TypeConversionException.java    |   26 +
 .../gradle/internal/typeconversion/TypeInfo.java   |   33 +
 .../typeconversion/TypedNotationParser.java        |   47 +
 .../UnsupportedNotationException.java              |   28 +
 .../typeconversion/ValueAwareNotationParser.java   |   23 +
 .../org/gradle/invocation/DefaultGradle.java       |   79 +-
 .../org/gradle/listener/ActionBroadcast.java       |   21 +-
 .../org/gradle/listener/BroadcastDispatch.java     |   42 +-
 .../org/gradle/listener/ListenerBroadcast.java     |   18 +-
 .../listener/ListenerNotificationException.java    |   10 +-
 .../org/gradle/logging/LoggingServiceRegistry.java |    2 +-
 .../groovy/org/gradle/logging/ProgressLogger.java  |    9 +
 .../org/gradle/logging/ProgressLoggerFactory.java  |    4 +
 .../org/gradle/logging/StandardOutputCapture.java  |    3 -
 .../AbstractLineChoppingStyledTextOutput.java      |    2 +-
 .../internal/ConsoleBackedProgressRenderer.java    |   65 +-
 .../logging/internal/DefaultLoggingConfigurer.java |    4 -
 .../logging/internal/DefaultLoggingManager.java    |    7 +-
 .../internal/DefaultProgressLoggerFactory.java     |   38 +-
 .../internal/DefaultStandardOutputRedirector.java  |   10 +-
 .../internal/DefaultStatusBarFormatter.java        |   24 +-
 .../logging/internal/EmbeddedLoggingServices.java  |    3 -
 .../internal/LoggingBackedStyledTextOutput.java    |   79 +-
 .../internal/LoggingCommandLineConverter.java      |   59 +-
 .../gradle/logging/internal/LoggingConfigurer.java |    3 -
 .../gradle/logging/internal/NoOpLoggingSystem.java |    3 -
 .../logging/internal/PrintStreamLoggingSystem.java |   10 +-
 .../logging/internal/ProgressCompleteEvent.java    |    8 +-
 .../org/gradle/logging/internal/ProgressEvent.java |    8 +-
 .../logging/internal/ProgressStartEvent.java       |   14 +-
 .../logging/internal/StatusBarFormatter.java       |   23 -
 .../logging/internal/StdErrLoggingSystem.java      |    3 -
 .../logging/internal/StdOutLoggingSystem.java      |    3 -
 .../internal/StyledTextOutputBackedRenderer.java   |    3 -
 .../internal/logback/LogbackLoggingConfigurer.java |    6 +-
 .../internal/progress/ProgressOperation.java       |   50 +
 .../internal/progress/ProgressOperations.java      |   52 +
 .../groovy/org/gradle/model/ModelFinalizer.java    |   30 +
 .../main/groovy/org/gradle/model/ModelPath.java    |   90 +
 .../main/groovy/org/gradle/model/ModelRule.java    |   40 +
 .../main/groovy/org/gradle/model/ModelRules.java   |   57 +
 .../src/main/groovy/org/gradle/model/Path.java     |   34 +
 .../main/groovy/org/gradle/model/dsl/ModelDsl.java |   26 +
 .../gradle/model/dsl/internal/GroovyModelDsl.java  |   84 +
 .../org/gradle/model/internal/DefaultInputs.java   |   42 +
 .../model/internal/DefaultModelRegistry.java       |  253 ++
 .../groovy/org/gradle/model/internal/Inputs.java   |   25 +
 .../model/internal/ModelCreationListener.java      |   25 +
 .../org/gradle/model/internal/ModelCreator.java    |   25 +
 .../org/gradle/model/internal/ModelMutation.java   |   39 +
 .../org/gradle/model/internal/ModelMutator.java    |   25 +
 .../org/gradle/model/internal/ModelRegistry.java   |   38 +
 .../internal/ModelRegistryBackedModelRules.java    |  129 +
 .../model/internal/rules/ReflectiveRule.java       |  207 +
 .../groovy/org/gradle/plugin/PluginHandler.java    |   31 +
 .../plugin/internal/DefaultPluginHandler.java      |   48 +
 .../internal/NonPluggableTargetPluginHandler.java  |   38 +
 .../plugin/internal/PluginRequestApplicator.java   |   50 +
 .../internal/PluginResolutionApplicator.java       |   39 +
 .../plugin/internal/PluginResolverFactory.java     |   95 +
 .../gradle/plugin/internal/PluginResolvers.java    |   59 +
 .../internal/ClassPathPluginResolution.java        |   46 +
 .../resolve/internal/CompositePluginResolver.java  |   48 +
 .../resolve/internal/DefaultPluginRequest.java     |   78 +
 .../DependencyResolvingClasspathProvider.java      |   46 +
 .../internal/InvalidPluginRequestException.java    |   25 +
 .../resolve/internal/JCenterPluginMapper.java      |  113 +
 .../internal/JCenterRepositoryConfigurer.java      |   26 +
 .../internal/ModuleMappingPluginResolver.java      |   68 +
 .../NotInPluginRegistryPluginResolverCheck.java    |   61 +
 .../internal/PluginRegistryPluginResolver.java     |   56 +
 .../plugin/resolve/internal/PluginRequest.java     |   33 +
 .../resolve/internal/PluginRequestSerializer.java  |   34 +
 .../plugin/resolve/internal/PluginResolution.java  |   31 +
 .../plugin/resolve/internal/PluginResolver.java    |   33 +
 .../resolve/internal/SimplePluginResolution.java   |   34 +
 .../groovy/org/gradle/process/BaseExecSpec.java    |    2 -
 .../main/groovy/org/gradle/process/ExecResult.java |    2 -
 .../main/groovy/org/gradle/process/ExecSpec.java   |    2 -
 .../groovy/org/gradle/process/JavaExecSpec.java    |    2 -
 .../internal/AbstractExecHandleBuilder.java        |    3 -
 .../process/internal/BadExitCodeException.java     |    3 -
 .../gradle/process/internal/DefaultExecAction.java |    8 -
 .../gradle/process/internal/DefaultExecHandle.java |   19 +-
 .../process/internal/DefaultJavaExecAction.java    |    3 -
 .../process/internal/DefaultWorkerProcess.java     |   11 +-
 .../internal/DefaultWorkerProcessFactory.java      |   15 +-
 .../org/gradle/process/internal/ExecAction.java    |    5 +-
 .../gradle/process/internal/ExecActionFactory.java |   21 +
 .../org/gradle/process/internal/ExecException.java |    3 -
 .../org/gradle/process/internal/ExecHandle.java    |    3 -
 .../gradle/process/internal/ExecHandleBuilder.java |    3 -
 .../process/internal/ExecHandleListener.java       |    3 -
 .../gradle/process/internal/ExecHandleRunner.java  |   22 +-
 .../internal/ExecHandleShutdownHookAction.java     |    2 -
 .../gradle/process/internal/ExecHandleState.java   |    3 -
 .../gradle/process/internal/JavaExecAction.java    |    5 +-
 .../process/internal/JavaExecHandleBuilder.java    |    6 +-
 .../org/gradle/process/internal/JvmOptions.java    |    2 +-
 .../process/internal/ProcessBuilderFactory.java    |    2 -
 .../internal/ProcessParentingInitializer.java      |   87 -
 .../gradle/process/internal/ProcessSettings.java   |    3 -
 .../org/gradle/process/internal/WorkerProcess.java |    9 +-
 .../process/internal/WorkerProcessBuilder.java     |   10 +
 .../process/internal/WorkerProcessContext.java     |    2 +-
 ...ionClassesInSystemClassLoaderWorkerFactory.java |    4 +-
 .../process/internal/child/EncodedStream.java      |    2 -
 .../child/ImplementationClassLoaderWorker.java     |    6 +-
 .../IsolatedApplicationClassLoaderWorker.java      |    2 +-
 .../child/SystemApplicationClassLoaderWorker.java  |    1 -
 .../child/WorkerProcessClassPathProvider.java      |   24 +-
 .../shutdown/ShutdownHookActionRegister.java       |   19 -
 .../internal/streams/ExecOutputHandleRunner.java   |    5 +-
 .../process/internal/streams/SafeStreams.java      |    3 -
 .../process/internal/streams/StreamsForwarder.java |    8 +-
 .../process/internal/streams/StreamsHandler.java   |    5 +-
 .../groovy/org/gradle/profile/BuildProfile.java    |  126 +-
 .../org/gradle/profile/CompositeOperation.java     |    4 +
 .../org/gradle/profile/ContinuousOperation.java    |   20 +-
 .../gradle/profile/DependencyResolveProfile.java   |   30 -
 .../org/gradle/profile/EvalutationOperation.java   |   31 -
 .../main/groovy/org/gradle/profile/Operation.java  |   21 +
 .../org/gradle/profile/ProfileEventAdapter.java    |   40 +-
 .../org/gradle/profile/ProfileReportRenderer.java  |   59 +-
 .../groovy/org/gradle/profile/ProjectProfile.java  |   54 +-
 .../groovy/org/gradle/profile/TaskExecution.java   |   23 +-
 .../org/gradle/reporting/HtmlReportRenderer.java   |    4 +-
 .../org/gradle/reporting/ReportRenderer.java       |    4 +-
 .../org/gradle/reporting/TabbedPageRenderer.java   |   12 +-
 .../org/gradle/reporting/TextReportRenderer.java   |    4 +-
 .../testfixtures/internal/GlobalTestServices.java  |   60 -
 .../internal/InMemoryCacheFactory.java             |   48 +-
 .../internal/InMemoryIndexedCache.java             |   70 +
 .../testfixtures/internal/ProjectBuilderImpl.java  |   31 +-
 .../internal/TestBuildScopeServices.java           |   46 +
 .../internal/TestGlobalScopeServices.java          |   67 +
 .../internal/TestTopLevelBuildServiceRegistry.java |   52 -
 .../provider/model/ToolingModelBuilder.java        |   29 +
 .../model/ToolingModelBuilderRegistry.java         |   29 +
 .../provider/model/UnknownModelException.java      |   31 +
 .../DefaultToolingModelBuilderRegistry.java        |   64 +
 .../model/internal/LegacyConsumerInterface.java    |   29 +
 .../tooling/provider/model/package-info.java       |   20 +
 .../src/main/groovy/org/gradle/util/AntUtil.java   |    7 +-
 .../org/gradle/util/AvailablePortFinder.java       |    2 -
 .../gradle/util/BuildCommencedTimeProvider.java    |    4 +-
 .../util/ClassLoaderBackedClasspathSource.java     |   43 -
 .../groovy/org/gradle/util/ClassLoaderFactory.java |   41 -
 .../groovy/org/gradle/util/ClasspathSource.java    |   23 -
 .../main/groovy/org/gradle/util/ClasspathUtil.java |   98 -
 .../src/main/groovy/org/gradle/util/Clock.java     |    3 -
 .../main/groovy/org/gradle/util/ConfigureUtil.java |    3 -
 .../org/gradle/util/DefaultClassLoaderFactory.java |   86 -
 .../main/groovy/org/gradle/util/DeleteOnExit.java  |   52 -
 .../org/gradle/util/DistributionLocator.java       |    4 +-
 .../org/gradle/util/FilteringClassLoader.java      |  212 -
 .../main/groovy/org/gradle/util/GFileUtils.java    |   18 +-
 .../src/main/groovy/org/gradle/util/GUtil.java     |   12 +-
 .../main/groovy/org/gradle/util/GradleVersion.java |  116 +-
 .../src/main/groovy/org/gradle/util/JarUtil.java   |    5 +-
 .../main/groovy/org/gradle/util/JavaMethod.java    |   75 -
 .../org/gradle/util/LineBufferingOutputStream.java |   27 +-
 .../util/LinePerThreadBufferingOutputStream.java   |   10 +-
 .../org/gradle/util/MultiParentClassLoader.java    |  103 -
 .../org/gradle/util/MutableURLClassLoader.java     |   48 -
 .../core/src/main/groovy/org/gradle/util/Path.java |    3 -
 .../groovy/org/gradle/util/ReflectionUtil.groovy   |   46 -
 .../org/gradle/util/SingleMessageLogger.java       |  187 +-
 .../main/groovy/org/gradle/util/StdoutSwapper.java |   39 -
 .../src/main/groovy/org/gradle/util/TextUtil.java  |    7 +
 .../main/groovy/org/gradle/util/VersionNumber.java |   19 +-
 .../main/groovy/org/gradle/util/hash/HashUtil.java |   84 -
 .../groovy/org/gradle/util/hash/HashValue.java     |   90 -
 .../gradle/util/internal/LimitedDescription.java   |    2 -
 .../org/gradle/configuration/default-imports.txt   |   38 -
 .../buildsrc/defaultBuildSourceScript.txt          |    6 +
 .../initialization/defaultBuildSourceScript.txt    |    5 -
 .../resources/org/gradle/reporting/base-style.css  |    2 +-
 .../org/gradle/BuildExceptionReporterTest.groovy   |   91 +-
 .../groovy/org/gradle/StartParameterTest.groovy    |   28 -
 .../org/gradle/TaskExecutionLoggerTest.groovy      |    6 +-
 .../org/gradle/api/AllGradleExceptionsTest.groovy  |    6 +-
 .../org/gradle/api/file/ProjectCopySpecTest.groovy |  104 +
 .../AbstractMultiCauseExceptionTest.groovy         |   97 -
 .../AbstractNamedDomainObjectContainerTest.groovy  |  263 +-
 .../gradle/api/internal/AbstractTaskSpec.groovy    |    4 +-
 .../AsmBackedClassGeneratorGroovyTest.groovy       |  221 +-
 .../api/internal/AsmBackedClassGeneratorTest.java  |   67 +-
 .../internal/CachingDirectedGraphWalkerTest.groovy |  197 -
 .../api/internal/ChainingTransformerTest.java      |   12 +-
 .../internal/CompositeDomainObjectSetTest.groovy   |   29 +-
 .../api/internal/ConventionAwareHelperTest.java    |   15 +-
 .../DefaultDomainObjectCollectionTest.java         |   24 +-
 .../DefaultNamedDomainObjectCollectionTest.groovy  |   57 +
 .../internal/DefaultNamedDomainObjectSetTest.java  |   20 +-
 ...PolymorphicDomainObjectContainerBaseTest.groovy |   42 +
 ...tPolymorphicDomainObjectContainerDslTest.groovy |   88 +-
 ...aultPolymorphicDomainObjectContainerTest.groovy |  101 +-
 .../org/gradle/api/internal/DefaultTaskTest.groovy |  218 +-
 .../api/internal/DocumentationRegistryTest.groovy  |   47 +-
 .../api/internal/ExtensibleDynamicObjectTest.java  |    6 +-
 .../gradle/api/internal/GraphAggregatorTest.groovy |   65 -
 .../api/internal/LocationAwareExceptionTest.groovy |  184 -
 .../org/gradle/api/internal/TestContainer.java     |    6 +-
 .../artifacts/DefaultExcludeRuleContainerTest.java |    3 -
 .../artifacts/ProjectBackedModuleTest.groovy       |    5 +-
 .../AbstractModuleDependencySpec.groovy            |    4 +-
 .../dependencies/AbstractModuleDependencyTest.java |    7 +-
 .../dependencies/DefaultClientModuleTest.java      |    3 -
 .../DefaultDependencyArtifactTest.java             |    6 +-
 .../DefaultExternalModuleDependencyTest.java       |    3 -
 .../DefaultProjectDependencyTest.groovy            |   14 +-
 .../DefaultDependencyHandlerTest.groovy            |   17 +-
 .../dependencies/ModuleFactoryDelegateTest.java    |    9 +-
 .../publish/AbstractPublishArtifactTest.java       |    6 +-
 .../publish/ArchivePublishArtifactTest.groovy      |   90 +-
 .../publish/DefaultPublishArtifactTest.java        |    3 -
 ...meAfterContainerInclusionDeprecationTest.groovy |   11 +-
 .../LatestVersionSemanticComparatorSpec.groovy     |   76 -
 .../CacheBackedFileSnapshotRepositoryTest.groovy   |   65 -
 .../changedetection/CachingHasherTest.java         |  108 -
 .../CompositeUpToDateRuleTest.groovy               |   69 -
 .../DefaultFileSnapshotterTest.groovy              |  330 --
 .../DefaultTaskArtifactStateCacheAccessTest.groovy |   53 -
 .../DefaultTaskArtifactStateRepositoryTest.java    |  606 ---
 ...BroadcastTaskArtifactStateRepositoryTest.groovy |  107 -
 ...hortCircuitTaskArtifactStateRepositoryTest.java |  165 -
 .../DefaultTaskArtifactStateRepositoryTest.groovy  |  695 +++
 ...rtCircuitTaskArtifactStateRepositoryTest.groovy |  112 +
 .../rules/CachingTaskStateChangesTest.groovy       |   84 +
 .../rules/InputFilesStateChangeRuleTest.groovy     |   78 +
 .../rules/OutputFilesStateChangeRuleTest.groovy    |   82 +
 .../rules/SimpleTaskStateChangesTest.groovy        |   56 +
 .../rules/SummaryTaskStateChangesTest.groovy       |   89 +
 .../CacheBackedFileSnapshotRepositoryTest.groovy   |   68 +
 .../state/CachingFileSnapshotterTest.groovy        |  106 +
 .../DefaultFileCollectionSnapshotterTest.groovy    |  352 ++
 .../DefaultFileSnapshotterSerializerTest.groovy    |   38 +
 .../DefaultTaskArtifactStateCacheAccessTest.groovy |   44 +
 .../state/InMemoryTaskArtifactCacheTest.groovy     |  136 +
 .../state/OutputFilesSnapshotSerializerTest.groovy |   41 +
 ...peCoercingMethodArgumentsTransformerTest.groovy |   68 +
 .../internal/file/AbstractFileCollectionTest.java  |   10 +-
 .../internal/file/AbstractFileTreeElementTest.java |    6 +-
 .../internal/file/BaseDirFileResolverSpec.groovy   |    8 +-
 .../internal/file/BaseDirFileResolverTest.groovy   |    6 +-
 .../internal/file/CompositeFileCollectionTest.java |    6 +-
 .../api/internal/file/CompositeFileTreeTest.java   |    6 +-
 .../file/DefaultCompositeFileTreeTest.groovy       |   67 +
 .../internal/file/DefaultFileOperationsTest.groovy |   48 +-
 .../file/DefaultFileTreeElementTest.groovy         |   15 +-
 .../file/DelegatingFileCollectionTest.groovy       |  104 +
 .../file/FileOrUriNotationParserTest.groovy        |    3 +-
 .../LazilyInitializedFileCollectionTest.groovy     |   52 +
 .../file/MaybeCompressedFileResourceTest.groovy    |    3 -
 .../internal/file/archive/TarCopyActionTest.java   |  245 ++
 .../file/archive/TarCopySpecVisitorTest.java       |  250 --
 .../api/internal/file/archive/TarFileTreeTest.java |    7 +-
 .../internal/file/archive/ZipCopyActionTest.groovy |  193 +
 .../file/archive/ZipCopySpecVisitorTest.java       |  245 --
 .../api/internal/file/archive/ZipFileTreeTest.java |    3 +-
 .../file/archive/compression/ArchiversTest.groovy  |    3 -
 .../DefaultConfigurableFileCollectionTest.java     |   12 +-
 .../DefaultConfigurableFileTreeTest.groovy         |   24 +-
 .../file/collections/DirectoryFileTreeTest.java    |    6 +-
 .../internal/file/collections/MapFileTreeTest.java |   11 +-
 .../file/copy/CopyActionExecuterTest.groovy        |   72 +
 .../internal/file/copy/CopyActionImplTest.groovy   |   95 -
 .../file/copy/CopyFileVisitorImplTest.groovy       |  106 +
 .../file/copy/CopySpecActionImplTest.groovy        |   45 +
 ...SpecBackedCopyActionProcessingStreamTest.groovy |   41 +
 .../api/internal/file/copy/CopySpecImplTest.groovy |  350 --
 .../internal/file/copy/CopySpecMatchingTest.groovy |   88 +
 .../internal/file/copy/DefaultCopySpecTest.groovy  |  505 +++
 .../internal/file/copy/DeleteActionImplTest.groovy |    3 -
 ...DuplicateHandlingCopyActionDecoratorTest.groovy |  196 +
 .../internal/file/copy/FileCopyActionImplTest.java |   54 -
 .../api/internal/file/copy/FileCopyActionTest.java |   66 +
 .../file/copy/FileCopySpecVisitorTest.java         |   92 -
 .../api/internal/file/copy/FilterChainTest.java    |    4 +-
 .../file/copy/MappingCopySpecVisitorTest.java      |  400 --
 .../copy/NormalizingCopyActionDecoratorTest.java   |  152 +
 .../file/copy/NormalizingCopySpecVisitorTest.java  |  226 -
 .../file/copy/SyncCopyActionDecoratorTest.groovy   |   57 +
 .../file/copy/SyncCopySpecVisitorTest.java         |  169 -
 .../file/pattern/DefaultPatternMatcherTest.java    |  218 -
 .../file/pattern/FixedPatternStepTest.groovy       |   42 +
 .../file/pattern/FixedStepsPathMatcherTest.groovy  |  112 +
 .../file/pattern/GreedyPathMatcherTest.groovy      |   69 +
 .../file/pattern/NameOnlyPatternMatcherTest.java   |   70 -
 .../file/pattern/PatternMatcherFactoryTest.java    |  195 +-
 .../file/pattern/PatternStepFactoryTest.groovy     |  116 +
 .../file/pattern/PatternStepFactoryTest.java       |   40 -
 .../file/pattern/RegExpPatternStepTest.java        |   66 +-
 .../pattern/WildcardPrefixPatternStepTest.groovy   |   47 +
 .../DefaultClassLoaderCacheTest.groovy             |   80 +
 .../DefaultClassLoaderScopeTest.groovy             |  241 ++
 .../DefaultScriptHandlerFactoryTest.groovy         |   48 +-
 .../initialization/DefaultScriptHandlerTest.groovy |   92 +-
 .../parsers/CharSequenceNotationParserTest.groovy  |   47 -
 .../parsers/ClosureToSpecNotationParserTest.groovy |   40 -
 .../parsers/ErrorHandlingNotationParserTest.groovy |   62 -
 .../notations/parsers/MapNotationParserTest.groovy |  110 -
 .../notations/parsers/TimeUnitsParserTest.groovy   |   54 -
 .../parsers/TypedNotationParserTest.groovy         |   53 -
 .../internal/plugins/DefaultConventionTest.groovy  |    6 +-
 .../DefaultObjectConfigurationActionTest.groovy    |   95 +-
 .../plugins/DefaultPluginContainerTest.java        |  128 +
 .../plugins/DefaultPluginRegistryTest.groovy       |   23 +-
 .../DefaultProjectsPluginContainerTest.java        |  131 -
 .../internal/plugins/ExtensionContainerTest.groovy |    3 -
 .../internal/plugins/ExtensionsStorageTest.groovy  |   76 +
 .../project/DefaultAntBuilderFactoryTest.groovy    |    4 +-
 .../internal/project/DefaultAntBuilderTest.groovy  |    4 +-
 .../project/DefaultIsolatedAntBuilderTest.groovy   |    4 +-
 .../project/DefaultProjectRegistryTest.java        |   23 +-
 .../api/internal/project/DefaultProjectTest.groovy |  413 +-
 .../project/GlobalServicesRegistryTest.java        |  142 -
 .../GradleInternalServiceRegistryTest.groovy       |  102 -
 .../internal/project/NewDefaultProjectTest.groovy  |    7 +-
 .../api/internal/project/ProjectFactoryTest.groovy |  100 +
 .../api/internal/project/ProjectFactoryTest.java   |  208 -
 .../ProjectInternalServiceRegistryTest.java        |  276 --
 .../project/TaskExecutionServicesTest.groovy       |   54 -
 .../project/TaskInternalServiceRegistryTest.java   |   90 -
 .../gradle/api/internal/project/TestPlugin1.groovy |    3 -
 .../gradle/api/internal/project/TestPlugin2.groovy |    3 -
 .../TopLevelBuildServiceRegistryTest.groovy        |  264 --
 .../AnnotationProcessingTaskFactoryTest.java       |  116 +-
 .../project/taskfactory/TaskFactoryTest.groovy     |   25 +-
 .../api/internal/resource/UriResourceTest.groovy   |    5 +-
 .../api/internal/resources/URIBuilderTest.groovy   |    3 -
 .../internal/tasks/DefaultTaskContainerTest.groovy |  144 +-
 .../execution/ExecuteActionsTaskExecuterTest.java  |   79 +-
 .../ExecuteAtMostOnceTaskExecuterTest.groovy       |   22 +-
 .../PostExecutionAnalysisTaskExecuterTest.groovy   |   66 +-
 .../SkipEmptySourceFilesTaskExecuterTest.groovy    |   12 +-
 .../execution/SkipOnlyIfTaskExecuterTest.java      |   11 +-
 .../SkipTaskWithNoActionsExecuterTest.groovy       |   14 +-
 .../execution/SkipUpToDateTaskExecuterTest.groovy  |  110 +
 .../execution/SkipUpToDateTaskExecuterTest.java    |  141 -
 .../execution/ValidatingTaskExecuterTest.groovy    |   16 +-
 .../options/InstanceOptionDescriptorSpec.groovy    |   54 +
 .../options/OptionNotationParserFactorySpec.groovy |   56 +
 .../internal/tasks/options/OptionReaderTest.groovy |  315 ++
 .../tasks/util/DefaultJavaForkOptionsTest.groovy   |    9 +-
 .../api/internal/xml/SimpleXmlWriterSpec.groovy    |   17 +-
 .../api/plugins/TestPluginConvention1.groovy       |    3 -
 .../api/plugins/TestPluginConvention2.groovy       |    3 -
 .../gradle/api/tasks/AbstractCopyTaskTest.groovy   |   80 +
 .../org/gradle/api/tasks/AbstractCopyTaskTest.java |   99 -
 .../groovy/org/gradle/api/tasks/CopyTest.groovy    |   67 +-
 .../groovy/org/gradle/api/tasks/DeleteTest.java    |   33 +-
 .../org/gradle/api/tasks/DirectoryTest.groovy      |    8 +-
 .../org/gradle/api/tasks/GradleBuildTest.groovy    |   63 +-
 .../groovy/org/gradle/api/tasks/SyncTest.groovy    |   27 +
 .../groovy/org/gradle/api/tasks/UploadTest.groovy  |   32 -
 .../org/gradle/api/tasks/ant/AntTargetTest.java    |   10 +-
 .../org/gradle/api/tasks/bundling/TarTest.groovy   |   11 +-
 .../org/gradle/api/tasks/bundling/ZipTest.groovy   |    7 +-
 .../tasks/util/AbstractTestForPatternSet.groovy    |   12 +-
 .../internal/AbstractFileLockManagerTest.groovy    |  532 +++
 .../cache/internal/DefaultCacheAccessTest.groovy   |  609 +--
 .../cache/internal/DefaultCacheFactoryTest.groovy  |  309 +-
 .../internal/DefaultCacheRepositoryTest.groovy     |  102 +-
 .../internal/DefaultCacheScopeMappingTest.groovy   |  142 +
 .../internal/DefaultFileLockManagerTest.groovy     |  474 --
 ...eLockManagerWithCrossVersionProtocolTest.groovy |   54 +
 ...efaultFileLockManagerWithNewProtocolTest.groovy |  281 ++
 .../DefaultPersistentDirectoryCacheSpec.groovy     |    3 +-
 .../DefaultPersistentDirectoryCacheTest.java       |   49 +-
 .../DefaultPersistentDirectoryStoreTest.groovy     |   10 +-
 ...gateOnDemandPersistentDirectoryCacheSpec.groovy |  103 -
 .../cache/internal/FileLockCommunicatorTest.groovy |   99 +
 ...ltiProcessSafePersistentIndexedCacheTest.groovy |   14 +-
 .../cache/internal/OnDemandFileAccessTest.groovy   |    8 +-
 .../cacheops/CacheAccessOperationsStackTest.groovy |   43 +
 .../cacheops/CacheOperationStackTest.groovy        |  117 +
 .../filelock/LockOptionsBuilderTest.groovy         |   35 +
 .../DefaultFileLockContentionHandlerTest.groovy    |  185 +
 .../configuration/BuildScriptProcessorTest.java    |   59 -
 .../DefaultBuildConfigurerTest.groovy              |   21 +-
 .../DefaultInitScriptProcessorTest.groovy          |   51 +
 .../DefaultInitScriptProcessorTest.java            |   51 -
 .../DefaultScriptPluginFactoryTest.groovy          |  119 +
 .../DefaultScriptPluginFactoryTest.java            |  194 -
 .../ImplicitTasksConfigurerTest.groovy             |   33 -
 .../gradle/configuration/ImportsReaderTest.groovy  |   33 +-
 .../LifecycleProjectEvaluatorTest.groovy           |   90 -
 .../ProjectDependencies2TaskResolverTest.groovy    |   40 -
 .../project/BuildScriptProcessorTest.groovy        |   51 +
 .../ConfigureActionsProjectEvaluatorTest.groovy    |   59 +
 ...tProjectConfigurationActionContainerTest.groovy |   52 +
 .../project/DelayedConfigurationActionsTest.groovy |   70 +
 .../project/LifecycleProjectEvaluatorTest.groovy   |  152 +
 .../PluginsProjectConfigureActionsTest.groovy      |   52 +
 .../ProjectDependencies2TaskResolverTest.groovy    |   37 +
 ...askFilteringBuildConfigurationActionTest.groovy |    7 +-
 .../execution/ProjectEvaluatingActionTest.groovy   |    3 -
 .../gradle/execution/TaskNameResolverTest.groovy   |   50 +-
 ...kNameResolvingBuildConfigurationActionTest.java |   61 +-
 .../execution/TaskPathProjectEvaluatorTest.groovy  |    3 -
 .../CommandLineTaskConfigurerSpec.groovy           |   86 +-
 .../commandline/CommandLineTaskParserSpec.groovy   |   34 +-
 .../taskgraph/DefaultTaskExecutionPlanTest.groovy  |  759 +++-
 .../taskgraph/DefaultTaskGraphExecuterTest.java    |   51 +-
 .../taskgraph/DefaultTaskPlanExecutorTest.groovy   |   58 +
 .../taskgraph/ParallelTaskExecutionPlanTest.groovy |   26 -
 .../taskgraph/TaskDependencyGraphTest.groovy       |   78 +
 .../taskgraph/TaskPlanExecutorFactoryTest.groovy   |    8 +-
 .../taskpath/ProjectFinderByTaskPathTest.groovy    |   11 +-
 .../execution/taskpath/ResolvedTaskPathTest.groovy |    3 -
 .../execution/taskpath/TaskPathResolverTest.groovy |    3 -
 .../gradle/groovy/scripts/DefaultScriptTest.groovy |   18 +-
 .../org/gradle/groovy/scripts/EmptyScript.java     |    3 -
 .../DefaultScriptCompilationHandlerTest.java       |    3 -
 .../FileCacheBackedScriptClassCompilerTest.groovy  |   42 +-
 .../initialization/BuildFileProjectSpecTest.java   |    6 +-
 .../BuildLayoutParametersTest.groovy               |   51 +
 .../initialization/BuildProgressLoggerTest.groovy  |   80 -
 .../initialization/BuildSourceBuilderTest.groovy   |  171 -
 .../DefaultCommandLineConverterTest.java           |    3 -
 .../DefaultExceptionAnalyserTest.java              |   61 +-
 .../DefaultGradleLauncherFactoryTest.groovy        |    8 +-
 .../initialization/DefaultGradleLauncherTest.java  |   32 +-
 .../DefaultGradlePropertiesLoaderTest.java         |    3 -
 .../DefaultProjectDescriptorRegistryTest.java      |   18 +-
 .../DefaultProjectDescriptorTest.java              |   41 +-
 .../initialization/DefaultSettingsTest.groovy      |  107 +-
 .../DependencyResolutionLoggerTest.groovy          |    4 +-
 .../InstantiatingBuildLoaderTest.groovy            |  112 +-
 .../LayoutCommandLineConverterTest.groovy          |   46 +-
 .../ProjectDirectoryProjectSpecTest.java           |    6 +-
 .../initialization/ProjectPathProjectSpecTest.java |  117 +
 .../ProjectPropertySettingBuildLoaderTest.groovy   |   17 +-
 .../gradle/initialization/ProjectSpecsTest.groovy  |   79 +
 .../PropertiesLoadingSettingsProcessorTest.java    |    9 +-
 .../ScriptEvaluatingSettingsProcessorTest.groovy   |  101 -
 .../initialization/SettingsFactoryTest.groovy      |   76 +
 .../gradle/initialization/SettingsFactoryTest.java |   70 -
 .../initialization/SettingsHandlerTest.groovy      |   64 +
 .../gradle/initialization/SettingsHandlerTest.java |  132 -
 .../buildsrc/BuildSourceBuilderTest.groovy         |   58 +
 .../BuildSrcBuildListenerFactoryTest.groovy        |   62 +
 .../buildsrc/BuildSrcUpdateFactoryTest.groovy      |   67 +
 .../AbstractMultiCauseExceptionTest.groovy         |  125 +
 .../exceptions/LocationAwareExceptionTest.groovy   |  184 +
 .../DeprecatedFeatureUsageTest.groovy              |   38 +
 .../LoggingDeprecatedFeatureHandlerTest.groovy     |   57 +
 .../ScriptUsageLocationReporterTest.groovy         |  126 +
 .../graph/CachingDirectedGraphWalkerTest.groovy    |  266 ++
 .../graph/DirectedGraphRendererTest.groovy         |  140 +
 .../internal/graph/GraphAggregatorTest.groovy      |   65 +
 .../progress/BuildProgressFilterTest.groovy        |   86 +
 .../progress/BuildProgressLoggerTest.groovy        |  175 +
 .../progress/OperationsHierarchyKeeperTest.groovy  |   64 +
 .../progress/OperationsHierarchyTest.groovy        |  136 +
 .../PercentageProgressFormatterTest.groovy         |   39 +
 .../progress/SimpleProgressFormatterTest.groovy    |   45 +
 .../service/scopes/BuildScopeServicesTest.groovy   |  305 ++
 .../service/scopes/GlobalScopeServicesTest.java    |  172 +
 .../service/scopes/GradleScopeServicesTest.groovy  |  153 +
 .../service/scopes/ProjectScopeServicesTest.groovy |  219 +
 .../scopes/SettingsScopeServicesTest.groovy        |   75 +
 .../scopes/TaskExecutionServicesTest.groovy        |   58 +
 .../service/scopes/TaskScopeServicesTest.java      |   91 +
 .../gradle/internal/text/TreeFormatterTest.groovy  |  144 +
 .../CharSequenceNotationParserTest.groovy          |   47 +
 .../ClosureToSpecNotationParserTest.groovy         |   36 +
 .../EnumFromCharSequenceNotationParserSpec.groovy  |   46 +
 .../ErrorHandlingNotationParserTest.groovy         |   60 +
 .../typeconversion/MapNotationParserTest.groovy    |  109 +
 .../NotationParserBuilderSpec.groovy               |   47 +
 .../typeconversion/TimeUnitsParserTest.groovy      |   51 +
 .../typeconversion/TypedNotationParserTest.groovy  |   49 +
 .../org/gradle/invocation/DefaultGradleTest.java   |   52 +-
 .../org/gradle/listener/ActionBroadcastTest.groovy |   53 +-
 .../org/gradle/listener/ListenerBroadcastTest.java |   46 +-
 .../ConsoleBackedProgressRendererTest.groovy       |   21 +-
 .../internal/DefaultLoggingManagerTest.java        |    6 +-
 .../DefaultProgressLoggerFactoryTest.groovy        |   10 +
 .../internal/DefaultStatusBarFormatterTest.groovy  |   33 +-
 .../LoggingBackedStyledTextOutputTest.groovy       |   14 +-
 .../LoggingCommandLineConverterTest.groovy         |   16 +-
 .../logging/internal/OutputSpecification.groovy    |   16 +-
 .../progress/ProgressOperationsTest.groovy         |  116 +
 .../model/dsl/internal/GroovyModelDslTest.groovy   |  101 +
 .../ModelRegistryBackedModelRulesTest.groovy       |  102 +
 .../plugin/bintray/JCenterPluginMapperSpec.groovy  |   80 +
 .../internal/DefaultPluginHandlerTest.groovy       |   62 +
 .../process/internal/DefaultExecHandleSpec.groovy  |    3 -
 .../internal/DefaultWorkerProcessTest.groovy       |    5 +-
 .../internal/JavaExecHandleBuilderTest.groovy      |   20 +-
 .../gradle/process/internal/JvmOptionsTest.groovy  |   30 +-
 .../child/ImplementationClassLoaderWorkerTest.java |    2 +-
 .../internal/child/SerializableMockHelper.groovy   |    8 +-
 .../WorkerProcessClassPathProviderTest.groovy      |    6 +-
 .../org/gradle/profile/BuildProfileTest.groovy     |   80 +-
 .../profile/ProfileReportRendererTest.groovy       |  227 +
 .../org/gradle/profile/ProjectProfileTest.groovy   |   34 +
 .../org/gradle/profile/TaskExecutionTest.groovy    |   43 +
 .../gradle/reporting/HtmlReportRendererTest.groovy |    2 +-
 .../DefaultToolingModelBuilderRegistryTest.groovy  |   76 +
 .../util/DefaultClassLoaderFactoryTest.groovy      |   91 -
 .../util/DefaultClassLoaderFactoryTestHelper.java  |   35 -
 .../gradle/util/FilteringClassLoaderTest.groovy    |  182 -
 .../groovy/org/gradle/util/GFileUtilsTest.groovy   |    3 -
 .../test/groovy/org/gradle/util/GUtilTest.groovy   |   19 +
 .../org/gradle/util/GradleVersionTest.groovy       |  124 +-
 .../groovy/org/gradle/util/JavaMethodTest.java     |   68 -
 .../gradle/util/LineBufferingOutputStreamTest.java |  112 +-
 .../LinePerThreadBufferingOutputStreamTest.groovy  |    4 +-
 .../groovy/org/gradle/util/MatchersTest.groovy     |    3 -
 .../gradle/util/MultiParentClassLoaderTest.groovy  |  152 -
 .../test/groovy/org/gradle/util/PathTest.groovy    |    6 +-
 .../org/gradle/util/SingleMessageLoggerTest.groovy |   49 +-
 .../test/groovy/org/gradle/util/StageTest.groovy   |    3 -
 .../org/gradle/util/StdoutSwapperTest.groovy       |   44 -
 .../groovy/org/gradle/util/TextUtilTest.groovy     |   26 +-
 .../org/gradle/util/VersionNumberTest.groovy       |   19 +-
 .../org/gradle/util/hash/HashValueTest.groovy      |   64 -
 .../util/internal/ArgumentsSplitterTest.groovy     |    4 +-
 .../util/internal/LimitedDescriptionTest.groovy    |    3 -
 .../api/internal/file/archive/permissions.tar      |  Bin 10240 -> 0 bytes
 .../gradle/api/RecordingAntBuildListener.groovy    |   60 +
 .../gradle/api/file/FileCollectionMatchers.java    |   71 +
 .../org/gradle/api/internal/file/TestFiles.java    |   18 +-
 .../internal/file/copy/CopyActionExecuterUtil.java |   40 +
 .../api/tasks/AbstractConventionTaskTest.java      |   12 +-
 .../api/tasks/AbstractCopyTaskContractTest.groovy  |  127 +
 .../gradle/api/tasks/AbstractSpockTaskTest.groovy  |   25 +-
 .../org/gradle/api/tasks/AbstractTaskTest.java     |   22 +-
 .../gradle/api/tasks/TaskDependencyMatchers.java   |   98 +
 .../tasks/bundling/AbstractArchiveTaskTest.groovy  |   11 +-
 .../DefaultFileLockManagerTestHelper.groovy        |    9 +-
 .../NoOpFileLockContentionHandler.java             |   31 +
 .../org/gradle/util/ConcurrentSpecification.groovy |    3 -
 .../groovy/org/gradle/util/HelperUtil.groovy       |  143 -
 .../groovy/org/gradle/util/Matchers.java           |  429 --
 .../groovy/org/gradle/util/TestTask.groovy         |    3 -
 .../groovy/org/gradle/util/TestUtil.groovy         |  146 +
 subprojects/cpp/cpp.gradle                         |   14 +-
 ...alStudioFileCustomizationIntegrationTest.groovy |  207 +
 .../VisualStudioMultiProjectIntegrationTest.groovy |  316 ++
 ...VisualStudioSingleProjectIntegrationTest.groovy |  840 ++++
 .../VisualStudioPluginIntegrationTest.groovy       |   26 +
 .../CppAutoTestedSamplesIntegrationTest.groovy     |   31 +
 .../plugins/AssemblerPluginIntegrationTest.groovy  |   22 +
 .../c/plugins/CPluginIntegrationTest.groovy        |   22 +
 ...tLanguageIncrementalBuildIntegrationTest.groovy |  513 +++
 ...anguageIncrementalCompileIntegrationTest.groovy |  529 +++
 .../cpp/AbstractLanguageIntegrationTest.groovy     |  198 +
 ...yLanguageIncrementalBuildIntegrationTest.groovy |  136 +
 .../cpp/AssemblyLanguageIntegrationTest.groovy     |  110 +
 .../cpp/BinaryBuildTypesIntegrationTest.groovy     |  206 +
 .../cpp/BinaryFlavorsIntegrationTest.groovy        |  227 +
 .../cpp/BinaryPlatformIntegrationTest.groovy       |  349 ++
 ...llingMixedCAndCppLanguageIntegrationTest.groovy |   25 +
 ...CLanguageIncrementalBuildIntegrationTest.groovy |   27 +
 ...anguageIncrementalCompileIntegrationTest.groovy |   26 +
 .../language/cpp/CLanguageIntegrationTest.groovy   |  201 +
 .../language/cpp/CUnitIntegrationTest.groovy       |  387 ++
 .../language/cpp/CppBinariesIntegrationTest.groovy |  371 ++
 .../cpp/CppCallingCLanguageIntegrationTest.groovy  |   25 +
 ...pLanguageIncrementalBuildIntegrationTest.groovy |   25 +
 ...anguageIncrementalCompileIntegrationTest.groovy |   26 +
 .../language/cpp/CppLanguageIntegrationTest.groovy |  114 +
 .../language/cpp/CppPluginGoodBehaviourTest.groovy |   25 +
 .../cpp/DuplicateBaseNamesIntegrationTest.groovy   |  118 +
 ...GccToolChainCustomisationIntegrationTest.groovy |  193 +
 .../GccToolChainDiscoveryIntegrationTest.groovy    |  124 +
 .../cpp/GeneratedSourcesIntegrationTest.groovy     |  383 ++
 .../LibraryApiDependenciesIntegrationTest.groovy   |  237 +
 .../cpp/LibraryBinariesIntegrationTest.groovy      |  298 ++
 .../cpp/LibraryDependenciesIntegrationTest.groovy  |  350 ++
 .../cpp/MixedLanguageIntegrationTest.groovy        |  168 +
 .../cpp/MultipleToolChainIntegrationTest.groovy    |  115 +
 .../cpp/NativeBinariesPluginIntegrationTest.groovy |  226 +
 .../cpp/NativeSamplesIntegrationTest.groovy        |  409 ++
 .../cpp/PrebuiltLibrariesIntegrationTest.groovy    |  349 ++
 .../cpp/SharedLibrarySoNameIntegrationTest.groovy  |   80 +
 .../SourceSetDependenciesIntegrationTest.groovy    |  153 +
 .../cpp/ToolChainDiscoveryIntegrationTest.groovy   |   89 +
 ...ResourcesIncrementalBuildIntegrationTest.groovy |  162 +
 .../cpp/WindowsResourcesIntegrationTest.groovy     |  143 +
 ...ndowsResourcesUnsupportedIntegrationTest.groovy |   55 +
 ...bstractInstalledToolChainIntegrationSpec.groovy |   81 +
 .../cpp/fixtures/SingleToolChainTestRunner.java    |   77 +
 .../cpp/plugins/CppPluginIntegrationTest.groovy    |   22 +
 .../MixedObjectiveCIntegrationTest.groovy          |   33 +
 ...CLanguageIncrementalBuildIntegrationTest.groovy |   86 +
 ...anguageIncrementalCompileIntegrationTest.groovy |  120 +
 .../ObjectiveCLanguageIntegrationTest.groovy       |   32 +
 .../ObjectiveCUnsupportedIntegrationTest.groovy    |   53 +
 .../plugins/ObjectiveCPluginIntegrationTest.groovy |   26 +
 ...pLanguageIncrementalBuildIntegrationTest.groovy |   31 +
 ...anguageIncrementalCompileIntegrationTest.groovy |   31 +
 .../ObjectiveCppLanguageIntegrationTest.groovy     |   32 +
 .../ObjectiveCppUnsupportedIntegrationTest.groovy  |   54 +
 .../ObjectiveCppPluginIntegrationTest.groovy       |   26 +
 .../WindowsResourcesPluginIntegrationTest.groovy   |   26 +
 .../NativeBinariesPluginIntegrationTest.groovy     |   26 +
 .../plugins/CUnitPluginIntegrationTest.groovy      |   22 +
 .../cpp/AbstractBinariesIntegrationSpec.groovy     |   33 -
 .../org/gradle/plugins/cpp/AvailableCompilers.java |  171 -
 .../cpp/CppExePluginGoodBehaviourTest.groovy       |   25 -
 .../plugins/cpp/CppIntegrationTestRunner.java      |   96 -
 .../cpp/CppLibPluginGoodBehaviourTest.groovy       |   25 -
 .../plugins/cpp/CppPluginIntegrationTest.groovy    |  220 -
 .../plugins/cpp/CppSamplesIntegrationTest.groovy   |   85 -
 .../libs/cunit/2.1-2/include/CUnit/Automated.h     |   90 +
 .../shared/libs/cunit/2.1-2/include/CUnit/Basic.h  |  113 +
 .../libs/cunit/2.1-2/include/CUnit/CUError.h       |  199 +
 .../shared/libs/cunit/2.1-2/include/CUnit/CUnit.h  |  383 ++
 .../libs/cunit/2.1-2/include/CUnit/CUnit_intl.h    |   62 +
 .../libs/cunit/2.1-2/include/CUnit/Console.h       |   60 +
 .../shared/libs/cunit/2.1-2/include/CUnit/MyMem.h  |  104 +
 .../shared/libs/cunit/2.1-2/include/CUnit/TestDB.h |  914 ++++
 .../libs/cunit/2.1-2/include/CUnit/TestRun.h       |  444 ++
 .../shared/libs/cunit/2.1-2/include/CUnit/Util.h   |  158 +
 .../shared/libs/cunit/2.1-2/lib/cygwin/cunit.lib   |  Bin 0 -> 81868 bytes
 .../shared/libs/cunit/2.1-2/lib/linux/libcunit.a   |  Bin 0 -> 117622 bytes
 .../shared/libs/cunit/2.1-2/lib/mingw/cunit.lib    |  Bin 0 -> 75800 bytes
 .../shared/libs/cunit/2.1-2/lib/osx/libcunit.a     |  Bin 0 -> 85768 bytes
 .../shared/libs/cunit/2.1-2/lib/vs2010/cunit.lib   |  Bin 0 -> 117792 bytes
 .../shared/libs/cunit/2.1-2/lib/vs2013/cunit.lib   |  Bin 0 -> 116230 bytes
 .../groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy  |   79 +
 .../gradle/ide/cdt/model/CprojectDescriptor.groovy |  117 +
 .../gradle/ide/cdt/model/CprojectSettings.groovy   |  103 +
 .../gradle/ide/cdt/model/ProjectDescriptor.groovy  |   48 +
 .../gradle/ide/cdt/model/ProjectSettings.groovy    |   43 +
 .../ide/cdt/tasks/GenerateMetadataFileTask.groovy  |   53 +
 .../org/gradle/ide/visualstudio/ConfigFile.java    |   37 +
 .../gradle/ide/visualstudio/TextConfigFile.java    |   32 +
 .../org/gradle/ide/visualstudio/TextProvider.java  |   40 +
 .../ide/visualstudio/VisualStudioExtension.java    |   36 +
 .../ide/visualstudio/VisualStudioProject.java      |   62 +
 .../ide/visualstudio/VisualStudioSolution.java     |   64 +
 .../org/gradle/ide/visualstudio/XmlConfigFile.java |   33 +
 .../internal/DefaultVisualStudioExtension.java     |   52 +
 .../internal/DefaultVisualStudioProject.groovy     |  154 +
 .../internal/DefaultVisualStudioSolution.groovy    |  114 +
 ...ecutableVisualStudioProjectConfiguration.groovy |   46 +
 .../VisualStudioProjectConfiguration.groovy        |  109 +
 .../internal/VisualStudioProjectMapper.java        |   90 +
 .../internal/VisualStudioProjectRegistry.java      |   65 +
 .../internal/VisualStudioProjectResolver.java      |   44 +
 .../internal/VisualStudioSolutionRegistry.java     |   43 +
 .../internal/rules/CreateVisualStudioModel.java    |   39 +
 .../internal/rules/CreateVisualStudioTasks.java    |   90 +
 .../org/gradle/ide/visualstudio/package-info.java  |   20 +
 .../visualstudio/plugins/VisualStudioPlugin.groovy |   73 +
 .../tasks/GenerateFiltersFileTask.groovy           |   65 +
 .../tasks/GenerateProjectFileTask.groovy           |  112 +
 .../tasks/GenerateSolutionFileTask.groovy          |   71 +
 .../internal/AbsoluteFileNameTransformer.java      |   26 +
 .../internal/RelativeFileNameTransformer.java      |   96 +
 .../tasks/internal/VisualStudioFiltersFile.groovy  |   58 +
 .../tasks/internal/VisualStudioProjectFile.groovy  |   98 +
 .../tasks/internal/VisualStudioSolutionFile.groovy |  114 +
 .../org/gradle/language/DependentSourceSet.java    |   57 +
 .../gradle/language/HeaderExportingSourceSet.java  |   45 +
 .../language/assembler/AssemblerSourceSet.java     |   42 +
 .../internal/DefaultAssemblerSourceSet.java        |   29 +
 .../gradle/language/assembler/package-info.java    |   20 +
 .../assembler/plugins/AssemblerLangPlugin.groovy   |   62 +
 .../groovy/org/gradle/language/c/CSourceSet.java   |   49 +
 .../language/c/internal/DefaultCSourceSet.java     |   32 +
 .../groovy/org/gradle/language/c/package-info.java |   20 +
 .../gradle/language/c/plugins/CLangPlugin.groovy   |   63 +
 .../org/gradle/language/cpp/CppSourceSet.java      |   49 +
 .../language/cpp/internal/DefaultCppSourceSet.java |   29 +
 .../org/gradle/language/cpp/package-info.java      |   20 +
 .../language/cpp/plugins/CppLangPlugin.groovy      |   62 +
 .../AbstractHeaderExportingDependentSourceSet.java |   64 +
 .../internal/AbstractHeaderExportingSourceSet.java |   53 +
 .../ConfigurationBasedNativeDependencySet.groovy   |   90 +
 .../language/objectivec/ObjectiveCSourceSet.java   |   52 +
 .../internal/DefaultObjectiveCSourceSet.java       |   32 +
 .../gradle/language/objectivec/package-info.java   |   20 +
 .../objectivec/plugins/ObjectiveCLangPlugin.groovy |   62 +
 .../objectivecpp/ObjectiveCppSourceSet.java        |   51 +
 .../internal/DefaultObjectiveCppSourceSet.java     |   32 +
 .../gradle/language/objectivecpp/package-info.java |   20 +
 .../plugins/ObjectiveCppLangPlugin.groovy          |   62 +
 .../groovy/org/gradle/language/package-info.java   |   20 +
 .../org/gradle/language/rc/WindowsResourceSet.java |   48 +
 .../rc/internal/DefaultWindowsResourceSet.java     |   28 +
 .../org/gradle/language/rc/package-info.java       |   20 +
 .../rc/plugins/WindowsResourceScriptPlugin.groovy  |   63 +
 .../org/gradle/nativebinaries/BuildType.java       |   30 +
 .../gradle/nativebinaries/BuildTypeContainer.java  |   27 +
 .../org/gradle/nativebinaries/Executable.java      |   26 +
 .../gradle/nativebinaries/ExecutableBinary.java    |   36 +
 .../gradle/nativebinaries/ExecutableContainer.java |   27 +
 .../groovy/org/gradle/nativebinaries/Flavor.java   |   31 +
 .../org/gradle/nativebinaries/FlavorContainer.java |   30 +
 .../groovy/org/gradle/nativebinaries/Library.java  |   39 +
 .../org/gradle/nativebinaries/LibraryBinary.java   |   26 +
 .../gradle/nativebinaries/LibraryContainer.java    |   27 +
 .../org/gradle/nativebinaries/NativeBinary.java    |   42 +
 .../gradle/nativebinaries/NativeBinaryTasks.java   |   43 +
 .../gradle/nativebinaries/NativeDependencySet.java |   40 +
 .../nativebinaries/NativeLibraryRequirement.java   |   40 +
 .../gradle/nativebinaries/PrebuiltLibraries.java   |   29 +
 .../org/gradle/nativebinaries/PrebuiltLibrary.java |   38 +
 .../gradle/nativebinaries/ProjectNativeBinary.java |  106 +
 .../nativebinaries/ProjectNativeComponent.java     |   66 +
 .../org/gradle/nativebinaries/Repositories.java    |   28 +
 .../gradle/nativebinaries/SharedLibraryBinary.java |   47 +
 .../gradle/nativebinaries/StaticLibraryBinary.java |   40 +
 .../nativebinaries/TargetedNativeComponent.java    |   42 +
 .../groovy/org/gradle/nativebinaries/Tool.java     |   39 +
 .../internal/AbstractBinaryToolSpec.java           |   59 +
 .../internal/AbstractProjectLibraryBinary.java     |  104 +
 .../internal/AbstractProjectNativeBinary.java      |  161 +
 .../internal/AbstractProjectNativeComponent.java   |   73 +
 .../AbstractTargetedProjectNativeComponent.java    |   82 +
 .../nativebinaries/internal/BinaryToolSpec.java    |   39 +
 .../nativebinaries/internal/DefaultBuildType.java  |   39 +
 .../internal/DefaultBuildTypeContainer.java        |   33 +
 .../nativebinaries/internal/DefaultExecutable.java |   28 +
 .../internal/DefaultExecutableContainer.java       |   38 +
 .../nativebinaries/internal/DefaultFlavor.java     |   41 +
 .../internal/DefaultFlavorContainer.java           |   33 +
 .../nativebinaries/internal/DefaultLibrary.java    |   42 +
 .../internal/DefaultLibraryContainer.java          |   38 +
 .../nativebinaries/internal/DefaultLinkerSpec.java |   68 +
 .../internal/DefaultNativeBinaryTasks.java         |   56 +
 .../internal/DefaultStaticLibraryArchiverSpec.java |   45 +
 .../nativebinaries/internal/DefaultTool.java       |   37 +
 .../internal/LibraryBinaryInternal.java            |   29 +
 .../gradle/nativebinaries/internal/LinkerSpec.java |   44 +
 .../internal/NativeBinaryServices.java             |   37 +
 .../internal/NativeProjectComponentIdentifier.java |   64 +
 .../internal/ProjectExecutableBinary.java          |   49 +
 .../internal/ProjectNativeBinaryInternal.java      |   36 +
 .../internal/ProjectNativeComponentInternal.java   |   24 +
 .../internal/ProjectNativeLibraryRequirement.java  |   48 +
 .../internal/ProjectSharedLibraryBinary.java       |  120 +
 .../internal/ProjectStaticLibraryBinary.java       |   86 +
 .../internal/SharedLibraryLinkerSpec.java          |   23 +
 .../internal/SourceSetNotationParser.java          |   73 +
 .../internal/StaticLibraryArchiverSpec.java        |   31 +
 .../internal/StaticLibraryBinaryInternal.java      |   26 +
 .../internal/TargetedNativeComponentInternal.java  |   29 +
 .../configure/ApplySourceSetConventions.java       |   50 +
 .../configure/ConfigureGeneratedSourceSets.java    |   54 +
 .../configure/CreateDefaultBuildTypes.java         |   30 +
 .../internal/configure/CreateDefaultFlavors.java   |   32 +
 .../internal/configure/CreateDefaultPlatform.java  |   29 +
 .../internal/configure/CreateNativeBinaries.java   |   79 +
 .../configure/DefaultNativeBinariesFactory.java    |   60 +
 .../internal/configure/NativeBinariesFactory.java  |   27 +
 .../configure/ProjectNativeBinaryInitializer.java  |   52 +
 .../ProjectNativeComponentInitializer.java         |   90 +
 .../internal/configure/RepositoriesFactory.java    |   69 +
 .../prebuilt/AbstractPrebuiltLibraryBinary.java    |  107 +
 .../prebuilt/DefaultPrebuiltLibraries.java         |   59 +
 .../internal/prebuilt/DefaultPrebuiltLibrary.java  |   50 +
 .../DefaultPrebuiltSharedLibraryBinary.java        |   66 +
 .../DefaultPrebuiltStaticLibraryBinary.java        |   55 +
 .../prebuilt/PrebuiltLibraryBinaryLocator.java     |   58 +
 .../prebuilt/PrebuiltLibraryInitializer.java       |   77 +
 .../prebuilt/PrebuiltLibraryResolveException.java  |   27 +
 .../ApiRequirementNativeDependencyResolver.java    |  104 +
 .../resolve/ChainedLibraryBinaryLocator.java       |   51 +
 .../internal/resolve/DefaultLibraryResolver.java   |  107 +
 .../resolve/DefaultNativeDependencySet.java        |   41 +
 .../internal/resolve/DefaultProjectLocator.java    |   41 +
 .../InputHandlingNativeDependencyResolver.java     |   36 +
 .../internal/resolve/LibraryBinaryLocator.java     |   25 +
 .../resolve/LibraryNativeDependencyResolver.java   |   36 +
 .../internal/resolve/LibraryResolveException.java  |   32 +
 .../NativeBinaryRequirementResolveResult.java      |   65 +
 .../resolve/NativeBinaryResolveResult.java         |   74 +
 .../resolve/NativeDependencyNotationParser.java    |   59 +
 .../internal/resolve/NativeDependencyResolver.java |   20 +
 .../resolve/NativeDependencyResolverServices.java  |   47 +
 .../resolve/ProjectLibraryBinaryLocator.java       |   44 +
 .../internal/resolve/ProjectLocator.java           |   22 +
 ...RequirementParsingNativeDependencyResolver.java |   38 +
 .../resolve/SourceSetNativeDependencyResolver.java |   97 +
 .../nativebinaries/language/PreprocessingTool.java |   45 +
 .../language/assembler/internal/AssembleSpec.java  |   35 +
 .../assembler/internal/DefaultAssembleSpec.java    |   47 +
 .../language/assembler/package-info.java           |   20 +
 .../plugins/AssemblerNativeBinariesPlugin.groovy   |   88 +
 .../assembler/plugins/AssemblerPlugin.groovy       |   35 +
 .../language/assembler/tasks/Assemble.groovy       |   95 +
 .../language/c/internal/CCompileSpec.java          |   23 +
 .../language/c/internal/DefaultCCompileSpec.java   |   22 +
 .../AbstractIncrementalNativeCompiler.java         |   86 +
 .../incremental/CleanCompilingNativeCompiler.java  |   57 +
 .../internal/incremental/CompilationFileState.java |   50 +
 .../c/internal/incremental/CompilationState.java   |   41 +
 .../incremental/CompilationStateSerializer.java    |  127 +
 .../incremental/DefaultIncrementalCompilation.java |   37 +
 .../incremental/DefaultSourceIncludes.java         |   79 +
 .../incremental/DefaultSourceIncludesParser.java   |   43 +
 .../incremental/DefaultSourceIncludesResolver.java |   67 +
 .../incremental/IncrementalCompilation.java        |   25 +
 .../incremental/IncrementalCompileProcessor.java   |  148 +
 .../incremental/IncrementalCompilerBuilder.java    |   75 +
 .../incremental/IncrementalNativeCompiler.java     |   45 +
 .../c/internal/incremental/ResolvedInclude.java    |   67 +
 .../c/internal/incremental/SourceIncludes.java     |   24 +
 .../internal/incremental/SourceIncludesParser.java |   24 +
 .../incremental/SourceIncludesResolver.java        |   23 +
 .../incremental/sourceparser/CSourceParser.java    |   33 +
 .../sourceparser/PreprocessingReader.java          |  145 +
 .../sourceparser/RegexBackedCSourceParser.java     |   82 +
 .../nativebinaries/language/c/package-info.java    |   20 +
 .../c/plugins/CNativeBinariesPlugin.groovy         |   91 +
 .../language/c/plugins/CPlugin.groovy              |   35 +
 .../c/tasks/AbstractNativeCompileTask.groovy       |  145 +
 .../language/c/tasks/CCompile.groovy               |   36 +
 .../language/cpp/internal/CppCompileSpec.java      |   23 +
 .../cpp/internal/DefaultCppCompileSpec.java        |   22 +
 .../nativebinaries/language/cpp/package-info.java  |   20 +
 .../cpp/plugins/CppNativeBinariesPlugin.groovy     |   89 +
 .../language/cpp/plugins/CppPlugin.groovy          |   35 +
 .../language/cpp/plugins/package-info.java         |   20 +
 .../language/cpp/tasks/CppCompile.groovy           |   38 +
 .../language/cpp/tasks/package-info.java           |   20 +
 .../internal/AbstractNativeCompileSpec.java        |  109 +
 .../internal/DefaultPreprocessingTool.java         |   39 +
 .../internal/DefaultObjectiveCCompileSpec.java     |   23 +
 .../objectivec/internal/ObjectiveCCompileSpec.java |   23 +
 .../language/objectivec/package-info.java          |   20 +
 .../plugins/ObjectiveCNativeBinariesPlugin.groovy  |   89 +
 .../objectivec/plugins/ObjectiveCPlugin.groovy     |   36 +
 .../language/objectivec/plugins/package-info.java  |   20 +
 .../objectivec/tasks/ObjectiveCCompile.groovy      |   38 +
 .../language/objectivec/tasks/package-info.java    |   20 +
 .../internal/DefaultObjectiveCppCompileSpec.java   |   23 +
 .../internal/ObjectiveCppCompileSpec.java          |   23 +
 .../language/objectivecpp/package-info.java        |   20 +
 .../ObjectiveCppNativeBinariesPlugin.groovy        |   90 +
 .../objectivecpp/plugins/ObjectiveCppPlugin.groovy |   36 +
 .../objectivecpp/plugins/package-info.java         |   20 +
 .../objectivecpp/tasks/ObjectiveCppCompile.groovy  |   38 +
 .../language/objectivecpp/tasks/package-info.java  |   20 +
 .../nativebinaries/language/package-info.java      |   20 +
 .../DefaultWindowsResourceCompileSpec.java         |   21 +
 .../rc/internal/WindowsResourceCompileSpec.java    |   21 +
 .../WindowsResourcesNativeBinariesPlugin.groovy    |  103 +
 .../rc/plugins/WindowsResourcesPlugin.groovy       |   36 +
 .../rc/tasks/WindowsResourceCompile.groovy         |  131 +
 .../org/gradle/nativebinaries/package-info.java    |   20 +
 .../nativebinaries/platform/Architecture.java      |   32 +
 .../nativebinaries/platform/OperatingSystem.java   |   60 +
 .../gradle/nativebinaries/platform/Platform.java   |  125 +
 .../nativebinaries/platform/PlatformContainer.java |   27 +
 .../platform/internal/ArchitectureInternal.java    |   38 +
 .../internal/ArchitectureNotationParser.java       |   91 +
 .../platform/internal/DefaultArchitecture.java     |  100 +
 .../platform/internal/DefaultOperatingSystem.java  |   68 +
 .../platform/internal/DefaultPlatform.java         |   74 +
 .../internal/DefaultPlatformContainer.java         |   39 +
 .../internal/OperatingSystemNotationParser.java    |   80 +
 .../platform/internal/PlatformInternal.java        |   22 +
 .../nativebinaries/platform/package-info.java      |   20 +
 .../plugins/NativeBinariesModelPlugin.java         |  142 +
 .../plugins/NativeBinariesPlugin.groovy            |  138 +
 .../nativebinaries/plugins/package-info.java       |   20 +
 .../nativebinaries/tasks/AbstractLinkTask.groovy   |  120 +
 .../nativebinaries/tasks/BuildBinaryTask.java      |   31 +
 .../tasks/CreateStaticLibrary.groovy               |   96 +
 .../nativebinaries/tasks/InstallExecutable.groovy  |  156 +
 .../nativebinaries/tasks/LinkExecutable.groovy     |   31 +
 .../nativebinaries/tasks/LinkSharedLibrary.groovy  |   43 +
 .../gradle/nativebinaries/tasks/package-info.java  |   20 +
 .../test/ProjectComponentTestSuite.java            |   31 +
 .../org/gradle/nativebinaries/test/TestSuite.java  |   26 +
 .../nativebinaries/test/TestSuiteContainer.java    |   27 +
 .../test/TestSuiteExecutableBinary.java            |   26 +
 .../nativebinaries/test/cunit/CUnitTestSuite.java  |   26 +
 .../cunit/internal/ConfigureCUnitTestSources.java  |   66 +
 .../test/cunit/internal/CreateCUnitBinaries.java   |   88 +
 .../test/cunit/internal/DefaultCUnitTestSuite.java |   39 +
 .../nativebinaries/test/cunit/package-info.java    |   20 +
 .../test/cunit/plugins/CUnitPlugin.groovy          |   72 +
 .../test/cunit/plugins/package-info.java           |   20 +
 .../test/cunit/tasks/GenerateCUnitLauncher.groovy  |   40 +
 .../test/cunit/tasks/package-info.java             |   20 +
 .../test/internal/DefaultTestSuiteContainer.java   |   30 +
 .../internal/DefaultTestSuiteExecutableBinary.java |   48 +
 .../gradle/nativebinaries/test/package-info.java   |   20 +
 .../test/plugins/NativeBinariesTestPlugin.groovy   |   75 +
 .../nativebinaries/test/plugins/package-info.java  |   20 +
 .../test/tasks/RunTestExecutable.groovy            |   79 +
 .../nativebinaries/test/tasks/package-info.java    |   20 +
 .../org/gradle/nativebinaries/toolchain/Clang.java |   41 +
 .../org/gradle/nativebinaries/toolchain/Gcc.java   |   41 +
 .../gradle/nativebinaries/toolchain/GccTool.java   |   42 +
 .../toolchain/PlatformConfigurableToolChain.java   |   55 +
 .../toolchain/TargetPlatformConfiguration.java     |   67 +
 .../gradle/nativebinaries/toolchain/ToolChain.java |   35 +
 .../toolchain/ToolChainRegistry.java               |   28 +
 .../gradle/nativebinaries/toolchain/VisualCpp.java |   47 +
 .../toolchain/internal/AbstractToolChain.java      |   73 +
 .../toolchain/internal/ArgsTransformer.java        |   25 +
 .../toolchain/internal/CommandLineTool.java        |  113 +
 .../CompileSpecToArgsTransformerChain.java         |   44 +
 .../internal/DefaultToolChainRegistry.java         |  149 +
 .../toolchain/internal/MacroArgsConverter.java     |   35 +
 .../toolchain/internal/NativeCompileSpec.java      |   63 +
 .../internal/OptionsFileArgsTransformer.java       |   64 +
 .../toolchain/internal/OutputCleaningCompiler.java |   67 +
 .../toolchain/internal/PlatformToolChain.java      |   40 +
 .../SingleSourceCompileArgTransformer.java         |   66 +
 .../toolchain/internal/ToolChainAvailability.java  |   68 +
 .../toolchain/internal/ToolChainInternal.java      |   41 +
 .../internal/ToolChainRegistryInternal.java        |   34 +
 .../toolchain/internal/ToolSearchResult.java       |   28 +
 .../toolchain/internal/ToolType.java               |   44 +
 .../internal/UnavailablePlatformToolChain.java     |   79 +
 .../toolchain/internal/clang/ClangToolChain.java   |   47 +
 .../gcc/AbstractGccCompatibleToolChain.java        |  267 ++
 .../internal/gcc/ArStaticLibraryArchiver.java      |   73 +
 .../toolchain/internal/gcc/Assembler.java          |   80 +
 .../toolchain/internal/gcc/CCompiler.java          |   36 +
 .../internal/gcc/CommandLineToolSearchResult.java  |   25 +
 .../toolchain/internal/gcc/CppCompiler.java        |   37 +
 .../internal/gcc/GccCompilerArgsTransformer.java   |   58 +
 .../toolchain/internal/gcc/GccLinker.java          |   94 +
 .../internal/gcc/GccOptionsFileArgTransformer.java |   52 +
 .../internal/gcc/GccPlatformToolChain.java         |  114 +
 .../toolchain/internal/gcc/GccToolChain.java       |   90 +
 .../toolchain/internal/gcc/GccToolSearchPath.java  |   49 +
 .../toolchain/internal/gcc/NativeCompiler.java     |   65 +
 .../toolchain/internal/gcc/ObjectiveCCompiler.java |   38 +
 .../internal/gcc/ObjectiveCppCompiler.java         |   37 +
 .../gcc/PostTransformActionArgsTransformer.java    |   39 +
 .../internal/gcc/ShortCircuitArgsTransformer.java  |   41 +
 .../internal/gcc/version/GccVersionDeterminer.java |  142 +
 .../internal/gcc/version/GccVersionResult.java     |   23 +
 .../toolchain/internal/msvcpp/Assembler.java       |   80 +
 .../toolchain/internal/msvcpp/CCompiler.java       |   33 +
 .../toolchain/internal/msvcpp/CppCompiler.java     |   33 +
 .../msvcpp/DefaultVisualStudioLocator.java         |  369 ++
 .../internal/msvcpp/DefaultWindowsSdkLocator.java  |  275 ++
 .../toolchain/internal/msvcpp/EscapeUserArgs.java  |   40 +
 .../internal/msvcpp/InstallationSearchResult.java  |   27 +
 .../msvcpp/LibExeStaticLibraryArchiver.java        |   58 +
 .../toolchain/internal/msvcpp/LinkExeLinker.java   |   70 +
 .../toolchain/internal/msvcpp/NativeCompiler.java  |   59 +
 .../msvcpp/VisualCppCompilerArgsTransformer.java   |   50 +
 .../internal/msvcpp/VisualCppInstall.java          |  116 +
 .../internal/msvcpp/VisualCppToolChain.java        |  245 ++
 .../internal/msvcpp/VisualStudioInstall.java       |   48 +
 .../internal/msvcpp/VisualStudioLocator.java       |   29 +
 .../internal/msvcpp/WindowsResourceCompiler.java   |   90 +
 .../toolchain/internal/msvcpp/WindowsSdk.java      |  138 +
 .../internal/msvcpp/WindowsSdkLocator.java         |   29 +
 .../internal/plugins/StandardToolChainsPlugin.java |   34 +
 .../toolchain/internal/tools/DefaultTool.java      |   58 +
 .../internal/tools/DefaultToolRegistry.java        |   35 +
 .../toolchain/internal/tools/GccToolInternal.java  |   29 +
 .../toolchain/internal/tools/PlatformGccTool.java  |   58 +
 .../internal/tools/PlatformToolRegistry.java       |   48 +
 .../toolchain/internal/tools/ToolRegistry.java     |   22 +
 .../toolchain/internal/tools/ToolSearchPath.java   |  135 +
 .../nativebinaries/toolchain/package-info.java     |   20 +
 .../toolchain/plugins/ClangCompilerPlugin.groovy   |   62 +
 .../toolchain/plugins/GccCompilerPlugin.groovy     |   63 +
 .../plugins/MicrosoftVisualCppPlugin.groovy        |   76 +
 .../toolchain/plugins/package-info.java            |   20 +
 .../gradle/plugins/binaries/BinariesPlugin.java    |   66 -
 .../org/gradle/plugins/binaries/model/Binary.java  |   39 -
 .../gradle/plugins/binaries/model/CompileSpec.java |   51 -
 .../gradle/plugins/binaries/model/Compiler.java    |   24 -
 .../plugins/binaries/model/CompilerRegistry.java   |   31 -
 .../gradle/plugins/binaries/model/Executable.java  |   23 -
 .../binaries/model/HeaderExportingSourceSet.java   |   27 -
 .../org/gradle/plugins/binaries/model/Library.java |   27 -
 .../plugins/binaries/model/LibraryCompileSpec.java |   32 -
 .../model/NativeDependencyCapableSourceSet.java    |   25 -
 .../binaries/model/NativeDependencySet.java        |   28 -
 .../gradle/plugins/binaries/model/SourceSet.java   |   25 -
 .../binaries/model/internal/BinaryCompileSpec.java |   23 -
 .../model/internal/BinaryCompileSpecFactory.java   |   27 -
 .../model/internal/CompileSpecFactory.java         |   29 -
 .../binaries/model/internal/CompileTaskAware.java  |   23 -
 .../binaries/model/internal/CompilerAdapter.java   |   32 -
 .../ConfigurationBasedNativeDependencySet.groovy   |   86 -
 .../binaries/model/internal/DefaultBinary.java     |   66 -
 .../model/internal/DefaultCompilerRegistry.java    |   90 -
 .../binaries/model/internal/DefaultExecutable.java |   31 -
 .../binaries/model/internal/DefaultLibrary.java    |   76 -
 .../binaries/model/internal/package-info.java      |   20 -
 .../plugins/binaries/model/package-info.java       |   20 -
 .../org/gradle/plugins/binaries/package-info.java  |   20 -
 .../plugins/binaries/tasks/package-info.java       |   20 -
 .../org/gradle/plugins/cpp/CppCompile.groovy       |   33 -
 .../plugins/cpp/CppExeConventionPlugin.groovy      |   58 -
 .../org/gradle/plugins/cpp/CppExtension.java       |   50 -
 .../plugins/cpp/CppLibConventionPlugin.groovy      |   68 -
 .../groovy/org/gradle/plugins/cpp/CppPlugin.groovy |   99 -
 .../org/gradle/plugins/cpp/CppSourceSet.java       |   65 -
 .../org/gradle/plugins/cpp/cdt/CdtIdePlugin.groovy |   77 -
 .../cpp/cdt/model/CprojectDescriptor.groovy        |  115 -
 .../plugins/cpp/cdt/model/CprojectSettings.groovy  |  107 -
 .../plugins/cpp/cdt/model/ProjectDescriptor.groovy |   46 -
 .../plugins/cpp/cdt/model/ProjectSettings.groovy   |   40 -
 .../cpp/cdt/tasks/GenerateMetadataFileTask.groovy  |   51 -
 .../cpp/compiler/capability/AgainstLibrary.java    |   31 -
 .../cpp/compiler/capability/CompilesCpp.java       |   30 -
 .../compiler/capability/StandardCppCompiler.java   |   23 -
 .../cpp/compiler/capability/package-info.java      |   20 -
 .../compiler/internal/CommandLineCppCompiler.java  |   68 -
 .../internal/CommandLineCppCompilerAdapter.java    |   59 -
 ...ommandLineCppCompilerArgumentsToOptionFile.java |   56 -
 .../plugins/cpp/compiler/internal/CppCompiler.java |   24 -
 .../gradle/plugins/cpp/gpp/GppCompileSpec.groovy   |  218 -
 .../plugins/cpp/gpp/GppCompilerPlugin.groovy       |   53 -
 .../plugins/cpp/gpp/GppLibraryCompileSpec.groovy   |   40 -
 .../cpp/gpp/internal/GppCompileSpecFactory.java    |   42 -
 .../gpp/internal/GppCompileSpecToArguments.java    |   55 -
 .../plugins/cpp/gpp/internal/GppCompiler.java      |   44 -
 .../cpp/gpp/internal/GppCompilerAdapter.java       |  106 -
 .../gpp/internal/version/GppVersionDeterminer.java |  105 -
 .../org/gradle/plugins/cpp/gpp/package-info.java   |   20 -
 .../plugins/cpp/internal/CppCompileSpec.java       |   33 -
 .../plugins/cpp/internal/DefaultCppSourceSet.java  |   90 -
 .../cpp/msvcpp/MicrosoftVisualCppPlugin.groovy     |   61 -
 .../internal/VisualCppCompileSpecToArguments.java  |   47 -
 .../cpp/msvcpp/internal/VisualCppCompiler.java     |   36 -
 .../msvcpp/internal/VisualCppCompilerAdapter.java  |   51 -
 .../org/gradle/plugins/cpp/package-info.java       |   20 -
 .../META-INF/gradle-plugins/assembler.properties   |    1 +
 .../META-INF/gradle-plugins/binaries.properties    |    1 -
 .../resources/META-INF/gradle-plugins/c.properties |    1 +
 .../META-INF/gradle-plugins/cpp-exe.properties     |    1 -
 .../META-INF/gradle-plugins/cpp-lib.properties     |    1 -
 .../META-INF/gradle-plugins/cpp.properties         |    2 +-
 .../META-INF/gradle-plugins/cunit.properties       |   17 +
 .../META-INF/gradle-plugins/eclipse-cdt.properties |    2 +-
 .../gradle-plugins/gpp-compiler.properties         |    1 -
 .../gradle-plugins/native-binaries.properties      |    1 +
 .../META-INF/gradle-plugins/objective-c.properties |    1 +
 .../gradle-plugins/objective-cpp.properties        |    1 +
 .../gradle-plugins/visual-studio.properties        |    1 +
 .../gradle-plugins/windows-resources.properties    |    1 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../cdt/model/defaultCproject-linux.xml            |    0
 .../cdt/model/defaultCproject-macos.xml            |    0
 .../cpp => ide}/cdt/model/defaultProject.xml       |    0
 .../ide/visualstudio/tasks/internal/default.sln    |    2 +
 .../visualstudio/tasks/internal/default.vcxproj    |   17 +
 .../tasks/internal/default.vcxproj.filters         |   16 +
 .../test/cunit/tasks/gradle_cunit_main.c           |   48 +
 .../test/cunit/tasks/gradle_cunit_register.h       |    4 +
 .../ide/cdt/model/CprojectSettingsSpec.groovy      |   58 +
 .../ide/cdt/model/ProjectDescriptorSpec.groovy     |   48 +
 .../internal/DefaultVisualStudioProjectTest.groovy |  115 +
 .../VisualStudioProjectConfigurationTest.groovy    |  196 +
 .../internal/VisualStudioProjectMapperTest.groovy  |  142 +
 .../VisualStudioProjectRegistryTest.groovy         |  109 +
 .../RelativeFileNameTransformerTest.groovy         |  122 +
 .../internal/VisualStudioFiltersFileTest.groovy    |   97 +
 .../internal/VisualStudioProjectFileTest.groovy    |  118 +
 .../internal/VisualStudioSolutionFileTest.groovy   |  190 +
 .../plugins/AssemblerLangPluginTest.groovy         |   42 +
 .../language/c/plugins/CLangPluginTest.groovy      |   42 +
 .../language/cpp/plugins/CppLangPluginTest.groovy  |   42 +
 .../internal/DefaultBuildTypeTest.groovy           |   29 +
 .../internal/DefaultExecutableBinaryTest.groovy    |   39 +
 .../internal/DefaultExecutableTest.groovy          |   29 +
 .../internal/DefaultFlavorTest.groovy              |   29 +
 .../internal/DefaultLibraryTest.groovy             |   59 +
 .../internal/DefaultNativeBinaryTasksTest.groovy   |   55 +
 .../internal/DefaultNativeComponentTest.groovy     |   77 +
 .../internal/ProjectNativeBinaryTest.groovy        |  210 +
 .../internal/ProjectSharedLibraryBinaryTest.groovy |  123 +
 .../internal/ProjectStaticLibraryBinaryTest.groovy |  125 +
 .../internal/SourceSetNotationParserTest.groovy    |   53 +
 .../configure/CreateDefaultBuildTypesTest.groovy   |   44 +
 .../configure/CreateDefaultFlavorsTest.groovy      |   67 +
 .../configure/CreateDefaultPlatformTest.groovy     |   44 +
 .../DefaultNativeBinariesFactoryTest.groovy        |   93 +
 .../ProjectNativeBinaryInitializerTest.groovy      |   99 +
 .../ProjectNativeComponentInitializerTest.groovy   |  145 +
 .../DefaultPrebuiltSharedLibraryBinaryTest.groovy  |   74 +
 .../DefaultPrebuiltStaticLibraryBinaryTest.groovy  |   56 +
 .../NativeDependencyNotationParserTest.groovy      |   72 +
 .../resolve/ProjectLibraryBinaryLocatorTest.groovy |  136 +
 .../AbstractNativeBinariesPluginTest.groovy        |  160 +
 .../AssemblerNativeBinariesPluginTest.groovy       |  183 +
 .../language/assembler/tasks/AssemblerTest.groovy  |   65 +
 .../CleanCompilingNativeCompilerTest.groovy        |   68 +
 .../CompilationStateSerializerTest.groovy          |   90 +
 .../DefaultSourceIncludesParserTest.groovy         |   68 +
 .../DefaultSourceIncludesResolverTest.groovy       |  154 +
 .../IncrementalCompileProcessorTest.groovy         |  422 ++
 .../IncrementalNativeCompilerTest.groovy           |   54 +
 .../sourceparser/PreprocessingReaderTest.groovy    |   72 +
 .../RegexBackedCSourceParserTest.groovy            |  386 ++
 .../c/plugins/CNativeBinariesPluginTest.groovy     |   48 +
 .../language/c/tasks/CCompileTest.groovy           |   68 +
 .../binaryinfo/ReadelfBinaryInfoTest.groovy        |   56 +
 .../cpp/internal/DefaultCppSourceSetTest.groovy    |   66 +
 .../cpp/plugins/CppNativeBinariesPluginTest.groovy |  206 +
 .../language/cpp/tasks/CppCompileTest.groovy       |   67 +
 .../ObjectiveCNativeBinariesPluginTest.groovy      |   46 +
 .../ObjectiveCppNativeBinariesPluginTest.groovy    |   45 +
 .../internal/ArchitectureNotationParserTest.groovy |  115 +
 .../internal/DefaultArchitectureTest.groovy        |   29 +
 .../internal/DefaultOperatingSystemTest.groovy     |   30 +
 .../platform/internal/DefaultPlatformTest.groovy   |   61 +
 .../OperatingSystemNotationParserTest.groovy       |  100 +
 .../plugins/NativeBinariesModelPluginTest.groovy   |  238 +
 .../plugins/NativeBinariesPluginTest.groovy        |  126 +
 .../internal/DefaultToolChainRegistryTest.groovy   |  182 +
 .../internal/OutputCleaningCompilerTest.groovy     |  115 +
 .../internal/ToolChainAvailabilityTest.groovy      |   67 +
 .../UnavailablePlatformToolChainTest.groovy        |   48 +
 .../gcc/AbstractGccCompatibleToolChainTest.groovy  |  237 +
 .../toolchain/internal/gcc/AssemblerTest.groovy    |   83 +
 .../toolchain/internal/gcc/CCompilerTest.groovy    |   98 +
 .../internal/gcc/ClangToolChainTest.groovy         |   48 +
 .../toolchain/internal/gcc/GccLinkerTest.groovy    |   86 +
 .../toolchain/internal/gcc/GccToolChainTest.groovy |   68 +
 .../gcc/ShortCircuitArgsTransformerTest.groovy     |   64 +
 .../gcc/version/GccVersionDeterminerTest.groovy    |  139 +
 .../msvcpp/DefaultVisualStudioLocatorTest.groovy   |  202 +
 .../msvcpp/DefaultWindowsSdkLocatorTest.groovy     |  256 ++
 .../internal/msvcpp/VisualCppToolChainTest.groovy  |  206 +
 .../internal/tools/ToolSearchPathTest.groovy       |  125 +
 .../plugins/ClangCompilerPluginTest.groovy         |   57 +
 .../toolchain/plugins/GccCompilerPluginTest.groovy |   59 +
 .../plugins/MicrosoftVisualCppPluginTest.groovy    |   64 +
 .../toolchain/plugins/ToolchainPluginTest.groovy   |   70 +
 .../internal/DefaultCompilerRegistryTest.groovy    |  130 -
 .../plugins/cpp/CppExeConventionPluginTest.groovy  |   37 -
 .../plugins/cpp/CppLibConventionPluginTest.groovy  |   39 -
 .../org/gradle/plugins/cpp/CppPluginTest.groovy    |  235 -
 .../cpp/cdt/model/CprojectSettingsSpec.groovy      |   58 -
 .../cpp/cdt/model/ProjectDescriptorSpec.groovy     |   48 -
 .../plugins/cpp/gpp/GppCompileSpecTest.groovy      |   40 -
 .../cpp/gpp/GppLibraryCompileSpecTest.groovy       |   37 -
 .../version/GppVersionDeterminerTest.groovy        |  142 -
 .../ide/visualstudio/fixtures/FiltersFile.groovy   |   29 +
 .../ide/visualstudio/fixtures/ProjectFile.groovy   |  128 +
 .../ide/visualstudio/fixtures/SolutionFile.groovy  |   82 +
 .../language/cpp/fixtures/AvailableToolChains.java |  503 +++
 .../language/cpp/fixtures/ExecutableFixture.groovy |   35 +
 .../cpp/fixtures/NativeBinaryFixture.groovy        |   89 +
 .../cpp/fixtures/NativeInstallationFixture.groovy  |   73 +
 .../cpp/fixtures/RequiresInstalledToolChain.groovy |   30 +
 .../RequiresInstalledToolChainExtension.groovy     |   39 +
 .../cpp/fixtures/SharedLibraryFixture.groovy       |   47 +
 .../cpp/fixtures/StaticLibraryFixture.groovy       |   29 +
 .../cpp/fixtures/ToolChainRequirement.java         |   30 +
 .../app/CCallingMixedCAndCppHelloWorldApp.groovy   |   83 +
 .../fixtures/app/CCompilerDetectingTestApp.groovy  |   80 +
 .../cpp/fixtures/app/CHelloWorldApp.groovy         |  167 +
 .../fixtures/app/CppCallingCHelloWorldApp.groovy   |   75 +
 .../app/CppCompilerDetectingTestApp.groovy         |   80 +
 .../cpp/fixtures/app/CppHelloWorldApp.groovy       |  116 +
 .../app/DuplicateAssemblerBaseNamesTestApp.groovy  |   88 +
 .../fixtures/app/DuplicateCBaseNamesTestApp.groovy |   61 +
 .../app/DuplicateCppBaseNamesTestApp.groovy        |   64 +
 .../app/DuplicateMixedSameBaseNamesTestApp.groovy  |  140 +
 .../app/DuplicateObjectiveCBaseNamesTestApp.groovy |   80 +
 .../DuplicateObjectiveCppBaseNamesTestApp.groovy   |   80 +
 ...uplicateWindowsResourcesBaseNamesTestApp.groovy |   91 +
 .../ExeWithDiamondDependencyHelloWorldApp.groovy   |   56 +
 .../ExeWithLibraryUsingLibraryHelloWorldApp.groovy |  132 +
 .../language/cpp/fixtures/app/HelloWorldApp.java   |  117 +
 .../cpp/fixtures/app/IncrementalHelloWorldApp.java |   49 +
 .../fixtures/app/MixedLanguageHelloWorldApp.groovy |  143 +
 .../app/MixedObjectiveCHelloWorldApp.groovy        |  120 +
 .../fixtures/app/ObjectiveCHelloWorldApp.groovy    |  139 +
 .../fixtures/app/ObjectiveCppHelloWorldApp.groovy  |  146 +
 .../fixtures/app/PlatformDetectingTestApp.groovy   |   85 +
 .../language/cpp/fixtures/app/SourceFile.java      |   61 +
 .../language/cpp/fixtures/app/TestApp.java         |   72 +
 .../language/cpp/fixtures/app/TestComponent.groovy |   39 +
 .../app/WindowsResourceHelloWorldApp.groovy        |  129 +
 .../cpp/fixtures/binaryinfo/BinaryInfo.java        |   28 +
 .../fixtures/binaryinfo/DumpbinBinaryInfo.groovy   |   99 +
 .../cpp/fixtures/binaryinfo/OtoolBinaryInfo.groovy |   59 +
 .../fixtures/binaryinfo/ReadelfBinaryInfo.groovy   |   82 +
 .../test/cunit/CUnitTestResults.groovy             |  104 +
 subprojects/diagnostics/diagnostics.gradle         |    3 +-
 .../HtmlDependencyReportTaskIntegrationTest.groovy |  529 +++
 ...pendencyInsightReportTaskIntegrationTest.groovy |  423 +-
 .../DependencyReportTaskIntegrationTest.groovy     |  108 +-
 .../diagnostics/HelpTaskIntegrationTest.groovy     |  282 ++
 .../ResolutionResultApiIntegrationTest.groovy      |   79 -
 .../TaskReportTaskIntegrationTest.groovy           |    2 +-
 .../org/gradle/configuration/HelpTest.groovy       |   41 +
 .../listsCommonDynamicAvailableValues/build.gradle |   21 +
 .../settings.gradle                                |   18 +
 .../build.gradle                                   |   23 +
 .../settings.gradle                                |    2 +
 .../org/gradle/api/plugins/HelpTasksPlugin.groovy  |   23 +-
 .../gradle/api/plugins/ProjectReportsPlugin.java   |   27 +-
 .../plugins/internal/HelpTasksAutoApplyAction.java |   26 +
 .../dependencies/DependencyReportContainer.java    |   33 +
 .../dependencies/HtmlDependencyReportTask.java     |  115 +
 .../internal/DefaultDependencyReportContainer.java |   35 +
 .../internal/HtmlDependencyReporter.groovy         |  128 +
 .../JsonDependencyReportIndexRenderer.groovy       |   79 +
 .../internal/JsonProjectDependencyRenderer.groovy  |  253 ++
 .../internal/StrictDependencyResultSpec.java       |   69 +
 .../api/reporting/dependencies/package-info.java   |   20 +
 .../api/tasks/diagnostics/AbstractReportTask.java  |    2 +-
 .../diagnostics/DependencyInsightReportTask.groovy |   25 +-
 .../tasks/diagnostics/DependencyReportTask.java    |    6 +-
 .../api/tasks/diagnostics/ProjectReportTask.java   |    9 +-
 .../api/tasks/diagnostics/TaskReportTask.java      |    4 +-
 .../internal/DependencyReportRenderer.java         |    2 -
 .../tasks/diagnostics/internal/GraphRenderer.java  |   69 -
 .../internal/SingleProjectTaskReportModel.java     |    6 +-
 .../diagnostics/internal/TaskReportRenderer.java   |    2 -
 .../AsciiDependencyReportRenderer.java             |    4 +-
 .../internal/dsl/DependencyResultSpec.java         |   20 +-
 .../dsl/DependencyResultSpecNotationParser.java    |   17 +-
 .../internal/graph/DependencyGraphRenderer.groovy  |   13 +-
 .../diagnostics/internal/graph/NodeRenderer.groovy |    3 -
 .../internal/graph/SimpleNodeRenderer.java         |    3 -
 .../nodes/AbstractRenderableDependencyResult.java  |   64 +-
 .../nodes/AbstractRenderableModuleResult.java      |   15 +-
 .../internal/graph/nodes/DependencyEdge.java       |   14 +-
 .../graph/nodes/DependencyReportHeader.java        |   55 +
 .../nodes/InvertedRenderableModuleResult.java      |   10 +-
 .../internal/graph/nodes/RenderableDependency.java |    7 +-
 .../graph/nodes/RenderableDependencyResult.java    |   12 +-
 .../graph/nodes/RenderableModuleResult.java        |    7 +-
 .../RenderableUnresolvedDependencyResult.java      |   47 +-
 .../internal/graph/nodes/RequestedVersion.java     |   20 +-
 .../graph/nodes/ResolvedDependencyEdge.java        |   14 +-
 .../internal/graph/nodes/SimpleDependency.java     |   64 -
 .../graph/nodes/UnresolvedDependencyEdge.java      |   25 +-
 .../insight/DependencyInsightReporter.groovy       |   28 +-
 .../internal/insight/DependencyResultSorter.java   |  151 +-
 .../main/groovy/org/gradle/configuration/Help.java |   25 +
 .../gradle/configuration/TaskDetailPrinter.java    |  206 +
 ...le.configuration.project.ProjectConfigureAction |    1 +
 .../tasks/diagnostics/htmldependencyreport/d.gif   |  Bin 0 -> 2944 bytes
 .../tasks/diagnostics/htmldependencyreport/d.png   |  Bin 0 -> 7635 bytes
 .../diagnostics/htmldependencyreport/index.html    |   48 +
 .../htmldependencyreport/jquery-1.10.1.min.js      |    6 +
 .../htmldependencyreport/jquery.jstree.js          | 4564 ++++++++++++++++++++
 .../diagnostics/htmldependencyreport/script.js     |  225 +
 .../diagnostics/htmldependencyreport/style.css     |   85 +
 .../diagnostics/htmldependencyreport/template.html |   41 +
 .../diagnostics/htmldependencyreport/throbber.gif  |  Bin 0 -> 1849 bytes
 .../diagnostics/htmldependencyreport/tree.css      |  102 +
 .../gradle/api/plugins/HelpTasksPluginSpec.groovy  |   26 +-
 .../api/plugins/ProjectReportsPluginTest.groovy    |   72 +
 .../api/plugins/ProjectReportsPluginTest.java      |   68 -
 .../ReportingBasePluginConventionTest.groovy       |   64 -
 .../api/plugins/ReportingBasePluginTest.groovy     |   46 -
 .../internal/StrictDependencyResultSpecTest.groovy |   61 +
 .../tasks/diagnostics/AbstractReportTaskTest.java  |    8 +-
 .../DependencyInsightReportTaskSpec.groovy         |   15 +-
 .../diagnostics/DependencyReportTaskTest.groovy    |   19 +-
 .../tasks/diagnostics/ProjectReportTaskTest.groovy |   14 +-
 .../tasks/diagnostics/PropertyReportTaskTest.java  |    4 +-
 .../api/tasks/diagnostics/TaskReportTaskTest.java  |    4 +-
 .../internal/TaskReportRendererTest.groovy         |    3 -
 .../AsciiDependencyReportRendererTest.groovy       |    4 +-
 .../DependencyResultSpecNotationParserSpec.groovy  |   13 +-
 .../internal/dsl/DependencyResultSpecTest.groovy   |   13 +-
 .../graph/DependencyGraphRendererSpec.groovy       |    5 +-
 .../AbstractRenderableDependencyResultSpec.groovy  |   45 +-
 .../nodes/RenderableDependencyResultTest.groovy    |   11 +-
 ...RenderableUnresolvedDependencyResultTest.groovy |    6 +-
 .../internal/graph/nodes/SimpleDependency.java     |   64 +
 .../insight/DependencyInsightReporterSpec.groovy   |   28 +-
 .../insight/DependencyResultSorterSpec.groovy      |  210 +-
 subprojects/distributions/distributions.gradle     |   22 +-
 .../gradle/AllDistributionIntegrationSpec.groovy   |    9 +-
 .../org/gradle/DistributionIntegrationSpec.groovy  |    7 +-
 subprojects/docs/docs.gradle                       |   54 +-
 subprojects/docs/src/docs/css/release-notes.css    |   29 +-
 subprojects/docs/src/docs/dsl/dsl.xml              |  146 +-
 .../docs/src/docs/dsl/org.gradle.api.Task.xml      |   12 +
 ....gradle.api.artifacts.dsl.DependencyHandler.xml |    6 +
 ....gradle.api.artifacts.dsl.RepositoryHandler.xml |    3 +
 ...dle.api.plugins.ApplicationPluginConvention.xml |    6 +-
 ...adle.api.plugins.jetty.AbstractJettyRunTask.xml |    8 +
 .../org.gradle.api.plugins.jetty.JettyRunWar.xml   |    8 +
 .../org.gradle.api.plugins.quality.CodeNarc.xml    |   12 +
 ...radle.api.plugins.quality.CodeNarcExtension.xml |   15 +
 ...org.gradle.api.publish.PublicationContainer.xml |    3 -
 .../org.gradle.api.publish.ivy.IvyPublication.xml  |   24 +
 ...g.gradle.api.publish.maven.MavenPublication.xml |    9 +
 ...gradle.api.reporting.GenerateBuildDashboard.xml |    3 -
 .../docs/dsl/org.gradle.api.reporting.Report.xml   |   37 +
 .../org.gradle.api.reporting.ReportContainer.xml   |   25 +
 .../dsl/org.gradle.api.reporting.Reporting.xml     |   28 +
 ...org.gradle.api.reporting.ReportingExtension.xml |   28 +
 ...rting.dependencies.HtmlDependencyReportTask.xml |   27 +
 .../dsl/org.gradle.api.tasks.AbstractCopyTask.xml  |   10 +
 .../src/docs/dsl/org.gradle.api.tasks.Copy.xml     |    2 +-
 .../dsl/org.gradle.api.tasks.GroovyRuntime.xml     |   25 +
 .../docs/dsl/org.gradle.api.tasks.ScalaRuntime.xml |   31 +
 ...le.api.tasks.application.CreateStartScripts.xml |    3 +-
 .../docs/dsl/org.gradle.api.tasks.bundling.Zip.xml |    6 +-
 .../org.gradle.api.tasks.compile.GroovyCompile.xml |    2 +-
 ...api.tasks.incremental.IncrementalTaskInputs.xml |   25 +
 .../org.gradle.api.tasks.incremental.InputFile.xml |   26 +
 .../org.gradle.api.tasks.scala.ScalaCompile.xml    |    2 +-
 .../dsl/org.gradle.api.tasks.scala.ScalaDoc.xml    |    2 +-
 .../docs/dsl/org.gradle.api.tasks.testing.Test.xml |   13 +-
 .../dsl/org.gradle.api.tasks.wrapper.Wrapper.xml   |    4 +-
 .../dsl/org.gradle.buildinit.tasks.InitBuild.xml   |   43 +
 ...adle.ide.visualstudio.VisualStudioExtension.xml |   44 +
 ...gradle.ide.visualstudio.VisualStudioProject.xml |   44 +
 ...radle.ide.visualstudio.VisualStudioSolution.xml |   44 +
 .../dsl/org.gradle.language.DependentSourceSet.xml |   47 +
 ...rg.gradle.language.HeaderExportingSourceSet.xml |   44 +
 ...radle.language.assembler.AssemblerSourceSet.xml |   38 +
 .../org.gradle.language.base.BinaryContainer.xml   |   38 +
 ...rg.gradle.language.base.FunctionalSourceSet.xml |   38 +
 .../org.gradle.language.base.LanguageSourceSet.xml |   44 +
 .../org.gradle.language.base.ProjectSourceSet.xml  |   38 +
 .../docs/dsl/org.gradle.language.c.CSourceSet.xml  |   38 +
 .../dsl/org.gradle.language.cpp.CppSourceSet.xml   |   38 +
 ...dle.language.objectivec.ObjectiveCSourceSet.xml |   38 +
 ...language.objectivecpp.ObjectiveCppSourceSet.xml |   38 +
 .../org.gradle.language.rc.WindowsResourceSet.xml  |   38 +
 .../dsl/org.gradle.nativebinaries.BuildType.xml    |   38 +
 ...rg.gradle.nativebinaries.BuildTypeContainer.xml |   38 +
 .../dsl/org.gradle.nativebinaries.Executable.xml   |   38 +
 .../org.gradle.nativebinaries.ExecutableBinary.xml |   38 +
 ...g.gradle.nativebinaries.ExecutableContainer.xml |   38 +
 .../docs/dsl/org.gradle.nativebinaries.Flavor.xml  |   38 +
 .../org.gradle.nativebinaries.FlavorContainer.xml  |   38 +
 .../docs/dsl/org.gradle.nativebinaries.Library.xml |   47 +
 .../org.gradle.nativebinaries.LibraryBinary.xml    |   38 +
 .../org.gradle.nativebinaries.LibraryContainer.xml |   38 +
 .../dsl/org.gradle.nativebinaries.NativeBinary.xml |   47 +
 ...g.gradle.nativebinaries.ProjectNativeBinary.xml |   68 +
 ...radle.nativebinaries.ProjectNativeComponent.xml |   53 +
 ...g.gradle.nativebinaries.SharedLibraryBinary.xml |   44 +
 ...g.gradle.nativebinaries.StaticLibraryBinary.xml |   41 +
 ...adle.nativebinaries.TargetedNativeComponent.xml |   48 +
 .../docs/dsl/org.gradle.nativebinaries.Tool.xml    |   44 +
 ...e.nativebinaries.language.PreprocessingTool.xml |   44 +
 ...ebinaries.language.assembler.tasks.Assemble.xml |   47 +
 ....language.c.tasks.AbstractNativeCompileTask.xml |   68 +
 ...le.nativebinaries.language.c.tasks.CCompile.xml |   38 +
 ...language.cpp.plugins.CppExeConventionPlugin.xml |   38 +
 ...language.cpp.plugins.CppLibConventionPlugin.xml |   38 +
 ...tivebinaries.language.cpp.plugins.CppPlugin.xml |   38 +
 ...ativebinaries.language.cpp.tasks.CppCompile.xml |   38 +
 ...language.objectivec.tasks.ObjectiveCCompile.xml |   38 +
 ...uage.objectivecpp.tasks.ObjectiveCppCompile.xml |   38 +
 ...es.language.rc.tasks.WindowsResourceCompile.xml |   65 +
 ...org.gradle.nativebinaries.platform.Platform.xml |   50 +
 ...e.nativebinaries.platform.PlatformContainer.xml |   38 +
 ...radle.nativebinaries.tasks.AbstractLinkTask.xml |   59 +
 ...le.nativebinaries.tasks.CreateStaticLibrary.xml |   53 +
 ...adle.nativebinaries.tasks.InstallExecutable.xml |   50 +
 ....gradle.nativebinaries.tasks.LinkExecutable.xml |   38 +
 ...adle.nativebinaries.tasks.LinkSharedLibrary.xml |   38 +
 ...tivebinaries.test.ProjectComponentTestSuite.xml |   41 +
 .../org.gradle.nativebinaries.test.TestSuite.xml   |   38 +
 ...adle.nativebinaries.test.TestSuiteContainer.xml |   38 +
 ...tivebinaries.test.TestSuiteExecutableBinary.xml |   38 +
 ...le.nativebinaries.test.cunit.CUnitTestSuite.xml |   38 +
 .../org.gradle.nativebinaries.toolchain.Clang.xml  |   40 +
 .../org.gradle.nativebinaries.toolchain.Gcc.xml    |   40 +
 ...ies.toolchain.PlatformConfigurableToolChain.xml |   44 +
 ...g.gradle.nativebinaries.toolchain.ToolChain.xml |   38 +
 ....nativebinaries.toolchain.ToolChainRegistry.xml |   38 +
 ...g.gradle.nativebinaries.toolchain.VisualCpp.xml |   40 +
 ...inaries.toolchain.plugins.GppCompilerPlugin.xml |   38 +
 ....toolchain.plugins.MicrosoftVisualCppPlugin.xml |   38 +
 ...g.gradle.plugins.ide.idea.model.IdeaProject.xml |    2 +-
 ...esting.jacoco.plugins.JacocoPluginExtension.xml |   50 +
 ....testing.jacoco.plugins.JacocoTaskExtension.xml |   77 +
 .../org.gradle.testing.jacoco.tasks.JacocoBase.xml |   45 +
 ...org.gradle.testing.jacoco.tasks.JacocoMerge.xml |   50 +
 ...rg.gradle.testing.jacoco.tasks.JacocoReport.xml |   69 +
 subprojects/docs/src/docs/dsl/plugins.xml          |   41 +
 .../docs/src/docs/release/content/script.js        |   26 +-
 .../docs/src/docs/release/notes-template.md        |   14 +-
 subprojects/docs/src/docs/release/notes.md         |  485 +--
 subprojects/docs/src/docs/stylesheets/dslHtml.xsl  |   10 +-
 .../src/docs/stylesheets/userGuideHtmlCommon.xsl   |    2 +-
 .../docs/src/docs/userguide/applicationPlugin.xml  |   12 +-
 .../docs/src/docs/userguide/artifactMngmt.xml      |    4 +-
 .../docs/src/docs/userguide/bootstrapPlugin.xml    |   88 -
 .../docs/userguide/buildAnnouncementsPlugin.xml    |    2 +-
 .../src/docs/userguide/buildDashboardPlugin.xml    |   20 +-
 .../docs/src/docs/userguide/buildInitPlugin.xml    |  222 +
 .../docs/src/docs/userguide/buildLifecycle.xml     |   12 +-
 .../src/docs/userguide/buildScriptsTutorial.xml    |   30 +-
 .../src/docs/userguide/commandLineTutorial.xml     |   12 +
 .../docs/src/docs/userguide/comparingBuilds.xml    |    8 +-
 subprojects/docs/src/docs/userguide/cpp.xml        |  188 -
 .../docs/src/docs/userguide/customPlugins.xml      |    2 +-
 .../docs/src/docs/userguide/customTasks.xml        |  142 +
 subprojects/docs/src/docs/userguide/depMngmt.xml   |  146 +-
 .../docs/src/docs/userguide/distributionPlugin.xml |  206 +-
 .../docs/src/docs/userguide/eclipsePlugin.xml      |    4 +-
 .../docs/src/docs/userguide/gradleDaemon.xml       |    4 +-
 .../docs/src/docs/userguide/gradleWrapper.xml      |   64 +-
 .../docs/src/docs/userguide/groovyPlugin.xml       |   70 +-
 .../docs/src/docs/userguide/groovyTutorial.xml     |    4 +-
 subprojects/docs/src/docs/userguide/ideSupport.xml |    2 +-
 subprojects/docs/src/docs/userguide/ideaPlugin.xml |    4 +-
 .../src/docs/userguide/img/jacocoHtmlReport.png    |  Bin 0 -> 103803 bytes
 .../docs/src/docs/userguide/initscripts.xml        |   19 +-
 .../docs/src/docs/userguide/jacocoPlugin.xml       |  248 ++
 .../userguide/javaLibraryDistributionPlugin.xml    |    3 +-
 subprojects/docs/src/docs/userguide/javaPlugin.xml |  142 +-
 .../docs/src/docs/userguide/javaTutorial.xml       |    8 +-
 .../docs/src/docs/userguide/jettyPlugin.xml        |   14 +
 subprojects/docs/src/docs/userguide/logging.xml    |    7 +-
 .../docs/src/docs/userguide/mavenPlugin.xml        |    2 +-
 .../docs/src/docs/userguide/multiproject.xml       |    4 +-
 .../docs/src/docs/userguide/nativeBinaries.xml     |  682 +++
 .../docs/src/docs/userguide/organizeBuildLogic.xml |    2 +-
 subprojects/docs/src/docs/userguide/plugins.xml    |    6 +-
 .../docs/src/docs/userguide/projectReports.xml     |   12 +-
 .../docs/src/docs/userguide/publishingIvy.xml      |   49 +-
 .../docs/src/docs/userguide/publishingMaven.xml    |   39 +-
 .../docs/src/docs/userguide/scalaPlugin.xml        |   35 +-
 .../docs/src/docs/userguide/sonarPlugin.xml        |   40 +-
 .../docs/src/docs/userguide/sonarRunnerPlugin.xml  |   10 +-
 .../docs/src/docs/userguide/standardPlugins.xml    |  251 +-
 subprojects/docs/src/docs/userguide/tasks.xml      |  142 +-
 .../docs/src/docs/userguide/thisAndThat.xml        |    5 +-
 subprojects/docs/src/docs/userguide/userguide.xml  |    8 +-
 subprojects/docs/src/docs/userguide/warPlugin.xml  |    2 +-
 .../docs/src/docs/userguide/workingWithFiles.xml   |   41 +-
 .../docs/src/docs/userguide/wrapperPlugin.xml      |   59 +
 .../src/docs/userguide/writingBuildScripts.xml     |    2 +-
 .../docs/src/samples/application/build.gradle      |    4 +
 .../src/main/java/org/gradle/sample/Main.java      |    6 +-
 .../docs/src/samples/buildDashboard/build.gradle   |    2 +-
 .../src/main/java/org/gradle/sample/Person.java    |    0
 .../docs/src/samples/codeQuality/build.gradle      |    2 +-
 .../docs/src/samples/cpp/dependencies/build.gradle |   63 -
 .../cpp/dependencies/lib/src/main/cpp/hello.cpp    |    5 -
 .../cpp/dependencies/lib/src/main/headers/hello.h  |    1 -
 subprojects/docs/src/samples/cpp/exe/build.gradle  |   11 -
 .../docs/src/samples/cpp/exewithlib/build.gradle   |   18 -
 .../src/samples/cpp/exewithlib/settings.gradle     |    1 -
 .../groovy/org/gradle/samples/ProductPlugin.groovy |    2 +-
 .../samples/customDistribution/plugin/build.gradle |    2 +-
 .../src/samples/customPlugin/plugin/build.gradle   |    2 +-
 .../samples/groovy/customizedLayout/build.gradle   |    2 +-
 .../samples/groovy/mixedJavaAndGroovy/build.gradle |    2 +-
 .../multiproject/groovycDetector/build.gradle      |    2 +-
 .../groovy/multiproject/testproject/build.gradle   |    2 +-
 .../main/groovy/org/gradle/GroovyJavaPerson.java   |    3 -
 .../src/main/groovy/org/gradle/GroovyPerson.groovy |    3 -
 .../src/main/java/org/gradle/JavaPerson.java       |    3 -
 .../src/test/groovy/org/gradle/VersionTest.groovy  |    4 +-
 .../src/samples/groovy/quickstart/build.gradle     |    2 +-
 .../src/test/groovy/org/gradle/PersonTest.groovy   |    2 +-
 .../descriptor-customization/build.gradle          |    6 +-
 .../ivy-publish/java-multi-project/build.gradle    |    2 +-
 .../ivy-publish/multiple-publications/build.gradle |   83 +
 .../multiple-publications/output/project1.ivy.xml  |   15 +
 .../output/project2-api.ivy.xml                    |   13 +
 .../output/project2-impl.ivy.xml                   |   16 +
 .../multiple-publications/settings.gradle          |    2 +
 .../samples/ivy-publish/quickstart/build.gradle    |    2 +-
 .../java/org/gradle/webservice/TestTestTest.java   |    3 -
 .../docs/src/samples/java/quickstart/build.gradle  |    8 +-
 .../samples/maven-publish/javaProject/build.gradle |    2 +-
 .../multiple-publications/build.gradle             |   69 +
 .../multiple-publications/output/project1.pom.xml  |   17 +
 .../output/project2-api.pom.xml                    |    9 +
 .../output/project2-impl.pom.xml                   |   23 +
 .../multiple-publications/settings.gradle          |    2 +
 .../maven-publish/pomCustomization/build.gradle    |    8 +-
 .../samples/maven-publish/quickstart/build.gradle  |    2 +-
 .../multiProjectBuildSrc/buildSrc/build.gradle     |    2 +-
 .../samples/native-binaries/assembler/build.gradle |   62 +
 .../assembler/src/main/asm_i386_gcc/sum.s          |    6 +
 .../assembler/src/main/asm_i386_masm/sum.s         |   12 +
 .../native-binaries/assembler/src/main/c/main.c    |    8 +
 .../assembler/src/main/headers/sum.h               |    6 +
 .../src/samples/native-binaries/c/build.gradle     |   61 +
 .../samples/native-binaries/c/src/hello/c/hello.c  |    6 +
 .../native-binaries/c/src/hello/headers/hello.h    |    8 +
 .../c/src/main/c/main.c}                           |    0
 .../samples/native-binaries/cpp-exe/build.gradle   |   27 +
 .../native-binaries/cpp-exe/settings.gradle        |    1 +
 .../cpp-exe}/src/main/cpp/hello.cpp                |    0
 .../samples/native-binaries/cpp-lib/build.gradle   |   14 +
 .../native-binaries/cpp-lib/settings.gradle        |    1 +
 .../native-binaries/cpp-lib/src/main/cpp/hello.cpp |   14 +
 .../cpp-lib}/src/main/headers/hello.h              |    0
 .../src/samples/native-binaries/cpp/build.gradle   |   51 +
 .../native-binaries/cpp/src/hello/cpp/hello.cpp    |    6 +
 .../native-binaries/cpp/src/hello/headers/hello.h  |    7 +
 .../cpp}/src/main/cpp/main.cpp                     |    0
 .../src/samples/native-binaries/cunit/README.md    |    7 +
 .../src/samples/native-binaries/cunit/build.gradle |   47 +
 .../lib/cunit/2.1-2/include/CUnit/Automated.h      |   90 +
 .../cunit/lib/cunit/2.1-2/include/CUnit/Basic.h    |  113 +
 .../cunit/lib/cunit/2.1-2/include/CUnit/CUError.h  |  199 +
 .../cunit/lib/cunit/2.1-2/include/CUnit/CUnit.h    |  383 ++
 .../lib/cunit/2.1-2/include/CUnit/CUnit_intl.h     |   62 +
 .../cunit/lib/cunit/2.1-2/include/CUnit/Console.h  |   60 +
 .../cunit/lib/cunit/2.1-2/include/CUnit/MyMem.h    |  104 +
 .../cunit/lib/cunit/2.1-2/include/CUnit/TestDB.h   |  914 ++++
 .../cunit/lib/cunit/2.1-2/include/CUnit/TestRun.h  |  444 ++
 .../cunit/lib/cunit/2.1-2/include/CUnit/Util.h     |  158 +
 .../cunit/lib/cunit/2.1-2/lib/cygwin/cunit.lib     |  Bin 0 -> 81868 bytes
 .../cunit/lib/cunit/2.1-2/lib/linux/libcunit.a     |  Bin 0 -> 117622 bytes
 .../cunit/lib/cunit/2.1-2/lib/mingw/cunit.lib      |  Bin 0 -> 75800 bytes
 .../cunit/lib/cunit/2.1-2/lib/osx/libcunit.a       |  Bin 0 -> 85768 bytes
 .../cunit/lib/cunit/2.1-2/lib/vs2010/cunit.lib     |  Bin 0 -> 117792 bytes
 .../cunit/lib/cunit/2.1-2/lib/vs2013/cunit.lib     |  Bin 0 -> 116230 bytes
 .../native-binaries/cunit/src/operators/c/minus.c  |    5 +
 .../native-binaries/cunit/src/operators/c/plus.c   |    9 +
 .../cunit/src/operators/headers/operators.h        |    2 +
 .../src/operatorsTest/cunit/suite_operators.c      |   17 +
 .../cunit/src/operatorsTest/cunit/test_minus.c     |    8 +
 .../cunit/src/operatorsTest/cunit/test_plus.c      |    8 +
 .../src/operatorsTest/headers/test_operators.h     |    2 +
 .../native-binaries/custom-layout/build.gradle     |   62 +
 .../custom-layout/src/include/hello.h              |    7 +
 .../custom-layout/src/source/hello.c               |    6 +
 .../custom-layout/src/source/main.cpp              |    8 +
 .../samples/native-binaries/flavors/build.gradle   |   37 +
 .../flavors/src/exe}/cpp/main.cpp                  |    0
 .../native-binaries/flavors/src/lib/cpp/hello.cpp  |   10 +
 .../flavors/src/lib/headers/hello.h                |   10 +
 .../src/samples/native-binaries/idl/build.gradle   |   44 +
 .../samples/native-binaries/idl/src/main/c/main.c  |    6 +
 .../native-binaries/idl/src/main/idl/hello.idl     |   16 +
 .../native-binaries/multi-project/build.gradle     |   24 +
 .../multi-project}/exe/src/main/cpp/main.cpp       |    0
 .../multi-project}/lib/src/main/cpp/hello.cpp      |    0
 .../multi-project}/lib/src/main/headers/hello.h    |    0
 .../multi-project}/settings.gradle                 |    0
 .../native-binaries/objective-c/build.gradle       |   23 +
 .../objective-c/src/main/objc/main.m               |   10 +
 .../native-binaries/objective-cpp/build.gradle     |   23 +
 .../objective-cpp/src/main/objcpp/main.mm          |   14 +
 .../prebuilt/3rd-party-lib/boost_1_55_0/README.txt |    2 +
 .../3rd-party-lib/boost_1_55_0/boost/version.hpp   |   32 +
 .../prebuilt/3rd-party-lib/util/README.txt         |    2 +
 .../prebuilt/3rd-party-lib/util/build.gradle       |   25 +
 .../prebuilt/3rd-party-lib/util/settings.gradle    |    1 +
 .../3rd-party-lib/util/src/util/cpp/util.cpp       |   10 +
 .../3rd-party-lib/util/src/util/headers/util.h     |    7 +
 .../samples/native-binaries/prebuilt/build.gradle  |   45 +
 .../native-binaries/prebuilt/src/main/cpp/main.cpp |    9 +
 .../native-binaries/tool-chains/build.gradle       |   29 +
 .../tool-chains/src/main/cpp/main.cpp              |   18 +
 .../samples/native-binaries/variants/build.gradle  |   76 +
 .../variants/src/hello/cpp/hello.cpp               |   10 +
 .../variants/src/hello/headers/hello.h             |   10 +
 .../variants}/src/main/cpp/main.cpp                |    0
 .../native-binaries/visual-studio/build.gradle     |   71 +
 .../visual-studio/src/hello/cpp/hello.cpp          |    6 +
 .../visual-studio/src/hello/headers/hello.h        |    7 +
 .../visual-studio}/src/main/cpp/main.cpp           |    0
 .../build-resource-only-dll.gradle                 |   27 +
 .../native-binaries/windows-resources/build.gradle |   33 +
 .../windows-resources/src/hello/cpp/hello.cpp      |   19 +
 .../windows-resources/src/hello/headers/hello.h    |    7 +
 .../src/hello/headers/resources.h                  |    1 +
 .../windows-resources/src/hello/rc/resources.rc    |    6 +
 .../windows-resources/src/main/cpp/main.cpp        |    6 +
 subprojects/docs/src/samples/osgi/build.gradle     |    4 +-
 .../main/groovy/org/gradle/GradleActivator.groovy  |    5 -
 .../samples/sonarRunner/multiProject/build.gradle  |    4 +-
 .../samples/sonarRunner/quickstart/build.gradle    |    4 +-
 .../src/main => src/main/cpp/library}/cpp/main.cpp |    0
 .../src/samples/testing/filtering/build.gradle     |   40 +
 .../filtering/src/test/java/SomeIntegTest.java     |    6 +
 .../filtering/src/test/java/SomeOtherTest.java     |    6 +
 .../testing/jacoco/application/build.gradle        |   35 +
 .../src/main/java/org/gradle/MyMain.java           |   30 +
 .../samples/testing/jacoco/quickstart/build.gradle |   58 +
 .../src/main/java/org/gradle/Person.java           |   24 +
 .../src/test/java/org/gradle/PersonTest.java       |   41 +
 .../samples/testing/junit/categories/build.gradle  |   18 +
 .../org/gradle/junit/CategorizedJUnitTest.java     |   35 +
 .../src/test/java/org/gradle/junit/CategoryA.java  |   21 +
 .../src/test/java/org/gradle/junit/CategoryB.java  |   21 +
 .../java/org/gradle/junit/SimpleJUnitTest.java     |   27 +
 .../src/samples/testing/testReport/build.gradle    |    2 +-
 .../src/samples/testing/testng/groups/build.gradle |   18 +
 .../org/gradle/testng/SimpleIntegrationTest.java   |   29 +
 .../java/org/gradle/testng/SimpleUnitTest.java     |   29 +
 .../src/main/java/org/gradle/testng/User.java      |    3 -
 .../src/main/java/org/gradle/testng/UserImpl.java  |    3 -
 .../test/java/org/gradle/testng/UserImplTest.java  |    3 -
 .../toolingApi/customModel/plugin/build.gradle     |   20 +
 .../java/org/gradle/sample/plugin/CustomModel.java |   14 +
 .../org/gradle/sample/plugin/CustomPlugin.java     |   39 +
 .../org/gradle/sample/plugin/DefaultModel.java     |   20 +
 .../gradle-plugins/custom-plugin.properties        |    1 +
 .../src/samples/toolingApi/customModel/readme.xml  |    3 +
 .../customModel/sampleBuild/build.gradle           |   10 +
 .../customModel/sampleBuild/settings.gradle        |   16 +
 .../toolingApi/customModel/tooling/build.gradle    |   22 +
 .../src/main/java/org/gradle/sample/Main.java      |   39 +
 .../src/samples/toolingApi/eclipse/build.gradle    |    2 +-
 .../src/main/java/org/gradle/sample/Main.java      |    5 +-
 .../docs/src/samples/toolingApi/idea/build.gradle  |    2 +-
 .../idea/src/main/java/org/gradle/sample/Main.java |    3 +-
 .../docs/src/samples/toolingApi/model/build.gradle |    2 +-
 .../src/main/java/org/gradle/sample/Main.java      |    5 +-
 .../src/samples/toolingApi/runBuild/build.gradle   |    2 +-
 .../src/main/java/org/gradle/sample/Main.java      |    3 -
 .../artifacts/componentMetadata/build.gradle       |   41 +
 .../repo/air.birds/albatros/1.9/ivy-1.9.xml        |    9 +
 .../repo/air.birds/albatros/2.0/ivy-2.0.xml        |    9 +
 .../repo/sea.fish/tuna/1.3/ivy-1.3.xml             |    9 +
 .../repo/sea.fish/tuna/1.4/ivy-1.4.xml             |    9 +
 .../repo/sea.fish/tuna/1.5/ivy-1.5.xml             |    9 +
 .../artifacts/defineRepository/build.gradle        |    6 +
 .../artifacts/externalDependencies/build.gradle    |   14 +-
 .../artifacts/resolutionStrategy/build.gradle      |    2 +-
 .../userguide/artifacts/uploading/build.gradle     |    4 +-
 .../samples/userguide/distribution/build.gradle    |   36 +-
 .../src/samples/userguide/files/copy/build.gradle  |   15 +
 .../userguide/groovy/groovyDependency/build.gradle |    8 +-
 .../userguide/initScripts/customLogger/init.gradle |    3 +
 .../userguide/initScripts/plugins/build.gradle     |   27 +
 .../userguide/initScripts/plugins/init.gradle      |   34 +
 .../firstMessages/messages/build.gradle            |    1 +
 .../firstMessages/messages/consumer/build.gradle   |    3 +-
 .../messages/build.gradle                          |    1 +
 .../messages/consumer/build.gradle                 |    2 +-
 .../messages/build.gradle                          |    1 +
 .../messages/consumer/build.gradle                 |    3 +-
 .../messages/build.gradle                          |    1 +
 .../messages/consumer/build.gradle                 |    2 +-
 .../messagesHack/messages/build.gradle             |    1 +
 .../messagesHack/messages/consumer/build.gradle    |    3 +-
 .../messagesTaskDependencies/messages/build.gradle |    1 +
 .../messages/consumer/build.gradle                 |    3 +-
 .../messagesWithDependencies/messages/build.gradle |    1 +
 .../messages/consumer/build.gradle                 |    3 +-
 .../multiproject/standardLayouts/settings.gradle   |    2 +-
 .../userguide/organizeBuildLogic/build.gradle      |    2 +-
 .../tasks/addToTaskContainer/build.gradle          |    4 +-
 .../tasks/configureUsingConfigure/build.gradle     |    7 -
 .../tasks/configureUsingLiterateStyle/build.gradle |    4 -
 .../tasks/customTaskWithProperty/build.gradle      |    2 +-
 .../tasks/defineAndConfigure/build.gradle          |    2 +-
 .../userguide/tasks/finalizers/build.gradle        |    8 +
 .../tasks/finalizersWithFailure/build.gradle       |    9 +
 .../userguide/tasks/incrementalTask/build.gradle   |   66 +
 .../userguide/tasks/mustRunAfter/build.gradle      |    7 +
 .../userguide/tasks/shouldRunAfter/build.gradle    |    7 +
 .../tasks/shouldRunAfterWithCycle/build.gradle     |   12 +
 .../tutorial/groovyWithFlatDir/build.gradle        |   10 +-
 .../userguide/tutorial/projectReports/build.gradle |    2 +-
 .../tutorial/properties/gradle.properties          |    2 +-
 .../userguide/wrapper/customized/build.gradle      |    4 -
 .../samples/userguide/wrapper/simple/build.gradle  |    2 +-
 .../configurationHandlingAllFiles.out              |    4 +-
 .../samples/userguideOutput/customStatusScheme.out |    1 +
 .../userguideOutput/dependencyInsightReport.out    |    4 +-
 .../userguideOutput/dependencyListReport.out       |    6 +-
 .../userguideOutput/externalDependencies.out       |    4 +-
 .../incrementalTaskChangedProperty.out             |    4 +
 .../userguideOutput/incrementalTaskFirstRun.out    |    4 +
 .../incrementalTaskNoChange.out}                   |    0
 .../incrementalTaskRemovedInput.out                |    2 +
 .../incrementalTaskRemovedOutput.out               |    4 +
 .../incrementalTaskUpdatedInputs.out               |    3 +
 .../src/samples/userguideOutput/latestSelector.out |    3 +
 .../src/samples/userguideOutput/mustRunAfter.out   |    2 +
 .../userguideOutput/mustRunAfterSingleTask.out     |    1 +
 .../publishingIvyGenerateDescriptor.out            |    2 +-
 .../publishingIvyPublishLifecycle.out              |    2 +-
 .../userguideOutput/publishingIvyPublishSingle.out |    2 +-
 .../src/samples/userguideOutput/shouldRunAfter.out |    2 +
 .../userguideOutput/shouldRunAfterWithCycle.out    |    3 +
 .../src/samples/userguideOutput/taskFinalizers.out |    2 +
 .../userguideOutput/taskFinalizersWithFailure.out  |    2 +
 .../docs/src/samples/userguideOutput/taskHelp.out  |   12 +
 .../samples/userguideOutput/taskListAllReport.out  |    5 +
 .../src/samples/userguideOutput/taskListReport.out |    5 +
 .../userguideOutput/usePluginsInInitScripts.out    |    1 +
 .../samples/webApplication/customised/readme.xml   |    3 -
 .../{customised => customized}/build.gradle        |    0
 .../samples/webApplication/customized/readme.xml   |    3 +
 .../src/additionalWebInf/additional.xml            |    0
 .../src/main/java/org/gradle/HelloServlet.java     |    0
 .../src/main/java/org/gradle/MyClass.java          |    0
 .../src/main/webapp/WEB-INF/webapp.xml             |    0
 .../src/main/webapp/webapp.html                    |    0
 .../src/rootContent/root.txt                       |    0
 .../{customised => customized}/src/someWeb.xml     |    0
 .../src/test/java/org/gradle/MyClassTest.java      |    0
 .../releasenotes/FunctionalReleaseNotesTest.groovy |    6 +-
 .../docs/src/transforms/release-notes.gradle       |   36 +-
 subprojects/ear/ear.gradle                         |    1 -
 .../plugins/ear/EarPluginIntegrationTest.groovy    |  111 +-
 .../main/groovy/org/gradle/plugins/ear/Ear.groovy  |   34 +-
 .../groovy/org/gradle/plugins/ear/EarPlugin.java   |    8 +-
 .../ear/descriptor/DeploymentDescriptor.java       |    2 -
 .../gradle/plugins/ear/descriptor/EarModule.java   |    2 -
 .../plugins/ear/descriptor/EarSecurityRole.java    |    2 -
 .../plugins/ear/descriptor/EarWebModule.java       |    2 -
 .../internal/DefaultDeploymentDescriptor.groovy    |    3 -
 .../descriptor/internal/DefaultEarModule.groovy    |    3 -
 .../internal/DefaultEarSecurityRole.groovy         |    3 -
 .../descriptor/internal/DefaultEarWebModule.groovy |    3 -
 .../org/gradle/plugins/ear/EarPluginTest.groovy    |   18 +-
 .../groovy/org/gradle/plugins/ear/EarTest.groovy   |    8 +-
 .../DefaultDeploymentDescriptorTest.groovy         |    3 -
 subprojects/ide/ide.gradle                         |    7 +-
 .../plugins/ide/AbstractIdeIntegrationSpec.groovy  |   33 +
 ...ractSourcesAndJavadocJarsIntegrationTest.groovy |  282 ++
 .../ide/AutoTestedSamplesIntegrationTest.groovy    |    3 -
 .../ide/eclipse/EclipseClasspathFixture.groovy     |   24 +-
 .../eclipse/EclipseClasspathIntegrationTest.groovy |    3 -
 ...ClasspathRemoteResolutionIntegrationTest.groovy |   71 -
 .../EclipseClasspathResolveIntegrationTest.groovy  |  108 -
 .../ide/eclipse/EclipseEarIntegrationTest.groovy   |    3 -
 .../EclipseMultiModuleIntegrationTest.groovy       |    3 -
 .../eclipse/EclipseProjectIntegrationTest.groovy   |    3 -
 ...ipseSourcesAndJavadocJarsIntegrationTest.groovy |   48 +
 .../eclipse/EclipseWtpModelIntegrationTest.groovy  |    3 -
 .../plugins/ide/idea/IdeaIntegrationTest.groovy    |   77 +-
 .../ide/idea/IdeaModuleIntegrationTest.groovy      |  198 +
 .../ide/idea/IdeaMultiModuleIntegrationTest.groovy |   53 +-
 ...IdeaSourcesAndJavadocJarsIntegrationTest.groovy |   55 +
 .../ide/idea/IdeaWorkspaceIntegrationTest.groovy   |    3 -
 .../expectedFiles/apiClasspath.xml                 |    6 +-
 .../expectedFiles/groovyprojectClasspath.xml       |    6 +-
 .../expectedFiles/webAppWithVarsClasspath.xml      |    8 +-
 .../expectedFiles/webAppWithVarsWtpComponent.xml   |    2 +-
 .../expectedFiles/webserviceClasspath.xml          |   12 +-
 .../expectedFiles/webserviceWtpComponent.xml       |    2 +-
 .../canCreateAndDeleteMetaData/master/build.gradle |    6 +-
 .../expectedFiles/project1/project1.iml.xml        |   32 -
 .../expectedFiles/project2/project2.iml.xml        |   32 -
 .../expectedFiles/project3/project3.iml.xml        |   32 -
 .../expectedFiles/root.ipr.xml                     |  123 -
 .../expectedFiles/api/api.iml.xml                  |    8 +-
 .../expectedFiles/webservice/webservice.iml.xml    |   24 +-
 .../expectedFiles/root.iml.xml                     |    8 +-
 .../plugins/ide/api/FileContentMerger.groovy       |    2 -
 .../org/gradle/plugins/ide/api/GeneratorTask.java  |    7 +-
 .../plugins/ide/api/XmlFileContentMerger.groovy    |    4 +-
 .../plugins/ide/eclipse/EclipsePlugin.groovy       |    6 +-
 .../plugins/ide/eclipse/EclipseWtpPlugin.groovy    |    9 +-
 .../ide/eclipse/GenerateEclipseClasspath.groovy    |    2 -
 .../ide/eclipse/GenerateEclipseProject.groovy      |    2 -
 .../ide/eclipse/GenerateEclipseWtpComponent.groovy |    2 -
 .../ide/eclipse/GenerateEclipseWtpFacet.groovy     |    2 -
 .../ide/eclipse/internal/EclipseNameDeduper.groovy |    3 -
 .../eclipse/internal/LinkedResourcesCreator.groovy |    5 +-
 .../eclipse/model/AbstractClasspathEntry.groovy    |    3 -
 .../ide/eclipse/model/AbstractLibrary.groovy       |    3 -
 .../plugins/ide/eclipse/model/AccessRule.groovy    |    3 -
 .../plugins/ide/eclipse/model/BuildCommand.groovy  |    3 -
 .../plugins/ide/eclipse/model/Classpath.groovy     |    4 +-
 .../plugins/ide/eclipse/model/ClasspathEntry.java  |    2 -
 .../plugins/ide/eclipse/model/Container.groovy     |    3 -
 .../ide/eclipse/model/EclipseClasspath.groovy      |    4 +-
 .../ide/eclipse/model/EclipseDomainModel.groovy    |    2 -
 .../plugins/ide/eclipse/model/EclipseJdt.groovy    |    2 -
 .../plugins/ide/eclipse/model/EclipseModel.groovy  |    2 -
 .../ide/eclipse/model/EclipseProject.groovy        |    8 +-
 .../plugins/ide/eclipse/model/EclipseWtp.groovy    |    2 -
 .../ide/eclipse/model/EclipseWtpComponent.groovy   |    8 +-
 .../ide/eclipse/model/EclipseWtpFacet.groovy       |    6 +-
 .../gradle/plugins/ide/eclipse/model/Facet.groovy  |    3 -
 .../plugins/ide/eclipse/model/Library.groovy       |    3 -
 .../gradle/plugins/ide/eclipse/model/Link.groovy   |    3 -
 .../gradle/plugins/ide/eclipse/model/Output.groovy |    3 -
 .../plugins/ide/eclipse/model/Project.groovy       |    2 -
 .../ide/eclipse/model/ProjectDependency.groovy     |    3 -
 .../plugins/ide/eclipse/model/SourceFolder.groovy  |    2 -
 .../plugins/ide/eclipse/model/Variable.groovy      |    3 -
 .../ide/eclipse/model/WbDependentModule.groovy     |    3 -
 .../plugins/ide/eclipse/model/WbProperty.groovy    |    3 -
 .../plugins/ide/eclipse/model/WbResource.groovy    |    3 -
 .../plugins/ide/eclipse/model/WtpComponent.groovy  |    2 -
 .../plugins/ide/eclipse/model/WtpFacet.groovy      |    2 -
 .../model/internal/ClassFoldersCreator.groovy      |    2 -
 .../eclipse/model/internal/ClasspathFactory.groovy |   17 +-
 .../model/internal/ExportedEntriesUpdater.groovy   |    3 -
 .../ide/eclipse/model/internal/PathUtil.groovy     |    3 -
 .../model/internal/ProjectDependencyBuilder.groovy |    3 -
 .../model/internal/SourceFoldersCreator.groovy     |    3 -
 .../model/internal/WtpComponentFactory.groovy      |    3 -
 .../plugins/ide/idea/GenerateIdeaModule.groovy     |    2 -
 .../plugins/ide/idea/GenerateIdeaProject.groovy    |    2 -
 .../plugins/ide/idea/GenerateIdeaWorkspace.groovy  |    2 -
 .../org/gradle/plugins/ide/idea/IdeaPlugin.groovy  |   22 +-
 .../ide/idea/internal/IdeaNameDeduper.groovy       |    3 -
 .../ide/idea/internal/IdeaScalaConfigurer.groovy   |   13 +-
 .../gradle/plugins/ide/idea/model/Dependency.java  |    2 -
 .../ide/idea/model/IdeaLanguageLevel.groovy        |    2 -
 .../gradle/plugins/ide/idea/model/IdeaModel.groovy |    1 -
 .../plugins/ide/idea/model/IdeaModule.groovy       |   10 +-
 .../plugins/ide/idea/model/IdeaModuleIml.groovy    |    2 -
 .../plugins/ide/idea/model/IdeaProject.groovy      |    6 +-
 .../plugins/ide/idea/model/IdeaWorkspace.groovy    |    6 +-
 .../plugins/ide/idea/model/JarDirectory.groovy     |    2 -
 .../org/gradle/plugins/ide/idea/model/Jdk.groovy   |    2 -
 .../gradle/plugins/ide/idea/model/Module.groovy    |    2 -
 .../plugins/ide/idea/model/ModuleDependency.groovy |    4 +-
 .../plugins/ide/idea/model/ModuleLibrary.groovy    |    4 +-
 .../org/gradle/plugins/ide/idea/model/Path.groovy  |    2 -
 .../gradle/plugins/ide/idea/model/Project.groovy   |    2 -
 .../gradle/plugins/ide/idea/model/Workspace.groovy |    2 -
 .../idea/model/internal/GeneratedIdeaScope.java    |   40 +
 .../model/internal/IdeaDependenciesProvider.groovy |   87 -
 .../model/internal/IdeaDependenciesProvider.java   |  267 ++
 .../idea/model/internal/IdeaScopeMappingRule.java  |   43 +
 .../model/internal/ModuleDependencyBuilder.groovy  |   34 -
 .../model/internal/ModuleDependencyBuilder.java    |   32 +
 .../ide/internal/IdeDependenciesExtractor.groovy   |  177 +-
 .../gradle/plugins/ide/internal/IdePlugin.groovy   |    2 +-
 .../internal/JavadocAndSourcesDownloader.groovy    |  125 -
 .../internal/configurer/DeduplicationTarget.groovy |    3 -
 .../internal/configurer/ModuleNameDeduper.groovy   |    1 -
 .../ide/internal/configurer/ProjectDeduper.groovy  |    3 -
 .../internal/tooling/BasicIdeaModelBuilder.java    |   39 +
 .../internal/tooling/BuildInvocationsBuilder.java  |   92 +
 .../ide/internal/tooling/EclipseModelBuilder.java  |  156 +
 .../ide/internal/tooling/GradleBuildBuilder.java   |   54 +
 .../ide/internal/tooling/GradleProjectBuilder.java |   84 +
 .../ide/internal/tooling/IdeaModelBuilder.java     |  143 +
 .../ide/internal/tooling/PublicationsBuilder.java  |   57 +
 .../plugins/ide/internal/tooling/TasksFactory.java |   46 +
 .../tooling/ToolingRegistrationAction.java         |   39 +
 .../eclipse/DefaultEclipseExternalDependency.java  |   54 +
 .../eclipse/DefaultEclipseLinkedResource.java      |   52 +
 .../tooling/eclipse/DefaultEclipseProject.java     |  135 +
 .../eclipse/DefaultEclipseProjectDependency.java   |   44 +
 .../eclipse/DefaultEclipseSourceDirectory.java     |   44 +
 .../tooling/eclipse/DefaultEclipseTask.java        |   56 +
 .../tooling/idea/DefaultIdeaCompilerOutput.java    |   65 +
 .../tooling/idea/DefaultIdeaContentRoot.java       |   80 +
 .../tooling/idea/DefaultIdeaDependency.java        |   22 +
 .../tooling/idea/DefaultIdeaDependencyScope.java   |   64 +
 .../tooling/idea/DefaultIdeaLanguageLevel.java     |   82 +
 .../internal/tooling/idea/DefaultIdeaModule.java   |  120 +
 .../tooling/idea/DefaultIdeaModuleDependency.java  |   61 +
 .../internal/tooling/idea/DefaultIdeaProject.java  |  107 +
 .../DefaultIdeaSingleEntryLibraryDependency.java   |   97 +
 .../tooling/idea/DefaultIdeaSourceDirectory.java   |   43 +
 .../internal/idea/DefaultIdeaModuleDependency.java |   27 +
 .../DefaultIdeaSingleEntryLibraryDependency.java   |   27 +
 .../internal/provider/BasicIdeaModelBuilder.java   |   36 -
 .../internal/provider/BuildModelAction.java        |   88 -
 .../tooling/internal/provider/BuildsModel.java     |   28 -
 .../internal/provider/EclipseModelBuilder.java     |  162 -
 .../internal/provider/FileOutcomeIdentifier.java   |   41 -
 .../internal/provider/GradleProjectBuilder.java    |   80 -
 .../internal/provider/IdeaModelBuilder.java        |  144 -
 .../internal/provider/NullResultBuilder.java       |   30 -
 .../provider/ProjectOutcomesModelBuilder.java      |   71 -
 ...blishArtifactToFileBuildOutcomeTransformer.java |   98 -
 .../tooling/internal/provider/TasksFactory.java    |   46 -
 .../resolver/DefaultIdeDependencyResolver.java     |  249 ++
 .../internal/resolver/IdeDependencyResolver.java   |   62 +
 .../ide/internal/resolver/model/IdeDependency.java |   31 +
 .../internal/resolver/model/IdeDependencyKey.java  |  157 +
 .../model/IdeExtendedRepoFileDependency.java       |   46 +
 .../resolver/model/IdeLocalFileDependency.java     |   34 +
 .../resolver/model/IdeProjectDependency.java       |   33 +
 .../resolver/model/IdeRepoFileDependency.java      |   44 +
 .../model/UnresolvedIdeRepoFileDependency.java     |   37 +
 .../ExternalModuleDependencyTranslator.java        |   27 +
 ...le.configuration.project.ProjectConfigureAction |    1 +
 .../plugins/ide/eclipse/EclipsePluginTest.groovy   |    7 +-
 .../ide/eclipse/EclipseWtpPluginTest.groovy        |    7 +-
 .../eclipse/GenerateEclipseClasspathTest.groovy    |    3 -
 .../eclipse/GenerateEclipseWtpComponentTest.groovy |    3 -
 .../ide/eclipse/GenerateEclipseWtpFacetTest.groovy |    3 -
 .../plugins/ide/eclipse/model/ClasspathTest.groovy |    3 -
 .../plugins/ide/eclipse/model/ContainerTest.groovy |    3 -
 .../ide/eclipse/model/EclipseModelTest.groovy      |    3 -
 .../ide/eclipse/model/EclipseProjectTest.groovy    |    3 -
 .../plugins/ide/eclipse/model/FacetTest.groovy     |    7 +-
 .../plugins/ide/eclipse/model/LibraryTest.groovy   |    3 -
 .../plugins/ide/eclipse/model/OutputTest.groovy    |    3 -
 .../ide/eclipse/model/ProjectDependencyTest.groovy |    3 -
 .../plugins/ide/eclipse/model/ProjectTest.groovy   |    3 -
 .../ide/eclipse/model/SourceFolderTest.groovy      |    3 -
 .../plugins/ide/eclipse/model/VariableTest.groovy  |    3 -
 .../ide/eclipse/model/WbDependentModuleTest.groovy |    3 -
 .../ide/eclipse/model/WbPropertyTest.groovy        |    3 -
 .../ide/eclipse/model/WbResourceTest.groovy        |    3 -
 .../ide/eclipse/model/WtpComponentTest.groovy      |    3 -
 .../plugins/ide/eclipse/model/WtpFacetTest.groovy  |    3 -
 .../internal/ProjectDependencyBuilderTest.groovy   |    7 +-
 .../ide/idea/ GenerateIdeaModuleTest.groovy        |   11 +-
 .../gradle/plugins/ide/idea/IdeaPluginTest.groovy  |   35 +-
 .../ide/idea/model/IdeaLanguageLevelTest.groovy    |    3 -
 .../ide/idea/model/ModuleDependencyTest.groovy     |    3 -
 .../ide/idea/model/ModuleLibraryTest.groovy        |    3 -
 .../plugins/ide/idea/model/ModuleTest.groovy       |    3 -
 .../ide/idea/model/ProjectLibraryTest.groovy       |    7 +-
 .../plugins/ide/idea/model/ProjectTest.groovy      |    3 -
 .../internal/IdeaDependenciesProviderTest.groovy   |  208 +
 .../internal/ModuleDependencyBuilderTest.groovy    |    7 +-
 .../plugins/ide/internal/GeneratorTaskTest.groovy  |    4 +-
 .../plugins/ide/internal/IdePluginTest.groovy      |    4 +-
 .../configurer/DeduplicationTargetTest.groovy      |   15 +-
 .../configurer/ModuleNameDeduperTest.groovy        |    3 -
 .../internal/configurer/ProjectDeduperTest.groovy  |   11 +-
 .../tooling/BuildInvocationsBuilderTest.groovy     |   79 +
 .../internal/tooling/GradleBuildBuilderTest.groovy |   46 +
 .../tooling/GradleProjectBuilderTest.groovy        |   42 +
 .../tooling/ProjectPublicationsBuilderTest.groovy  |   59 +
 .../ide/internal/tooling/TasksFactoryTest.groovy   |   52 +
 .../eclipse/DefaultEclipseProjectTest.groovy       |   27 +
 ...rtifactToFileBuildOutcomeTransformerTest.groovy |   86 -
 .../internal/provider/TasksFactoryTest.groovy      |   52 -
 subprojects/integ-test/integ-test.gradle           |    8 +-
 ...kCommandLineConfigurationIntegrationSpec.groovy |  252 --
 .../org/gradle/debug/GradleBuildRunner.groovy      |    2 -
 .../org/gradle/debug/GradleRunConfiguration.groovy |    2 -
 .../integtests/AntProjectIntegrationTest.groovy    |   63 +
 .../integtests/ApplicationIntegrationSpec.groovy   |    2 +-
 .../integtests/ApplicationIntegrationTest.groovy   |  146 +
 .../BuildAggregationIntegrationTest.groovy         |   26 +-
 .../BuildScriptClasspathIntegrationTest.java       |    3 +-
 .../BuildScriptErrorIntegrationTest.java           |  108 -
 .../BuildScriptExecutionIntegrationTest.groovy     |    1 -
 .../integtests/CacheProjectIntegrationTest.groovy  |   23 +-
 .../integtests/CommandLineIntegrationTest.groovy   |    9 +-
 .../integtests/CustomPluginIntegrationTest.groovy  |    4 +-
 .../DistributionLocatorIntegrationTest.groovy      |    8 +-
 .../ExternalScriptErrorIntegrationTest.groovy      |   93 -
 .../ExternalScriptExecutionIntegrationTest.groovy  |    3 -
 ...ementalGroovyProjectBuildIntegrationTest.groovy |    2 +-
 .../IncrementalTasksIntegrationTest.groovy         |  343 ++
 .../IncrementalTestIntegrationTest.groovy          |   94 -
 .../integtests/InitScriptErrorIntegrationTest.java |   51 -
 .../InitScriptExecutionIntegrationTest.groovy      |    1 -
 .../integtests/JavaProjectIntegrationTest.groovy   |   10 +-
 .../MixedNativeAndJvmProjectIntegrationTest.groovy |   41 +
 .../MultiProjectDependencyIntegrationTest.groovy   |   12 +-
 .../OsgiProjectSampleIntegrationTest.groovy        |    5 +-
 .../ParallelProjectExecutionIntegrationTest.groovy |   59 +-
 .../PluginCrossVersionIntegrationTest.groovy       |   72 -
 .../integtests/ProfilingIntegrationTest.groovy     |   41 -
 .../integtests/ProjectLayoutIntegrationTest.groovy |   21 +-
 .../SettingsScriptErrorIntegrationTest.java        |   39 -
 .../SettingsScriptExecutionIntegrationTest.groovy  |    1 -
 .../TaskDefinitionIntegrationSpec.groovy           |   30 +
 .../TaskErrorExecutionIntegrationTest.groovy       |   35 +-
 .../integtests/TaskExecutionIntegrationTest.groovy |  435 ++
 .../integtests/TaskExecutionIntegrationTest.java   |  180 -
 ...ssingBinaryCompatibilityCrossVersionSpec.groovy |   81 +
 .../integtests/WaterProjectIntegrationTest.groovy  |    3 -
 .../integtests/WebProjectIntegrationTest.java      |    2 +-
 .../BuildEnvironmentIntegrationTest.groovy         |    3 -
 .../fixture/TempDirIsUniquePerTestSpec.groovy      |    3 -
 .../logging/LoggingIntegrationTest.groovy          |   38 +-
 .../ivy/IvyHttpPublishIntegrationTest.groovy       |  334 --
 .../IvyJavaProjectPublishIntegrationTest.groovy    |   63 -
 .../ivy/IvyLocalPublishIntegrationTest.groovy      |  116 -
 .../ivy/IvySFtpPublishIntegrationTest.groovy       |   11 +-
 .../IvySingleProjectPublishIntegrationTest.groovy  |  128 -
 .../ivy/SamplesIvyPublishIntegrationTest.groovy    |   37 -
 .../maven/MavenPublishIntegrationTest.groovy       |  361 --
 ...SamplesMavenPomGenerationIntegrationTest.groovy |  109 -
 .../SamplesMavenQuickstartIntegrationTest.groovy   |   82 -
 .../AutoTestedSamplesCoreIntegrationTest.groovy    |    3 -
 .../AutoTestedSamplesPluginsIntegrationTest.groovy |    3 -
 .../samples/JUnitSamplesIntegrationTest.groovy     |   42 +
 .../samples/SamplesAntlrIntegrationTest.groovy     |    4 +-
 .../SamplesCodeQualityIntegrationTest.groovy       |    3 -
 .../SamplesCustomPluginIntegrationTest.groovy      |    4 +-
 ...lesExcludesAndClassifiersIntegrationTest.groovy |    3 -
 ...lesGroovyCustomizedLayoutIntegrationTest.groovy |    4 +-
 ...SamplesGroovyMultiProjectIntegrationTest.groovy |    3 -
 .../SamplesGroovyQuickstartIntegrationTest.groovy  |    4 +-
 .../samples/SamplesJUnitIntegrationTest.groovy     |   44 +
 .../samples/SamplesJavaBaseIntegrationTest.groovy  |    8 +-
 ...mplesJavaCustomizedLayoutIntegrationTest.groovy |    8 +-
 .../SamplesJavaMultiProjectIntegrationTest.groovy  |   11 +-
 ...esJavaProjectWithIntTestsIntegrationTest.groovy |    7 +-
 .../SamplesJavaQuickstartIntegrationTest.groovy    |    7 +-
 ...SamplesMixedJavaAndGroovyIntegrationTest.groovy |    4 +-
 .../SamplesMixedJavaAndScalaIntegrationTest.groovy |   74 -
 .../SamplesRepositoriesIntegrationTest.groovy      |    3 -
 ...plesScalaCustomizedLayoutIntegrationTest.groovy |   50 -
 .../SamplesScalaQuickstartIntegrationTest.groovy   |   66 -
 .../SamplesWebProjectIntegrationTest.groovy        |   11 +-
 .../SamplesWebQuickstartIntegrationTest.groovy     |    5 +-
 .../canExecuteCommands/canExecuteCommands.gradle   |    4 +-
 .../canExecuteJava/canExecuteJava.gradle           |    4 +-
 .../LoggingIntegrationTest/deprecated/build.gradle |    7 -
 .../logging/project1/build.gradle                  |    8 +-
 .../internal-integ-testing.gradle                  |   55 +-
 .../fixtures/AbstractAutoTestedSamplesTest.groovy  |    5 +-
 .../fixtures/AbstractCompatibilityTestRunner.java  |   22 +-
 .../fixtures/AbstractIntegrationSpec.groovy        |   34 +-
 .../fixtures/AbstractMultiTestRunner.java          |  329 +-
 .../fixtures/AutoTestedSamplesUtil.groovy          |    3 -
 .../integtests/fixtures/AvailableJavaHomes.java    |   41 +-
 .../fixtures/CrossVersionTestRunner.groovy         |    2 +-
 .../integtests/fixtures/IntegrationTestHint.java   |    3 -
 .../fixtures/KillProcessAvailability.groovy        |    3 -
 .../fixtures/MultiVersionSpecRunner.groovy         |   12 +-
 .../gradle/integtests/fixtures/TargetCoverage.java |   30 +
 .../fixtures/TestNGExecutionResult.groovy          |   49 +-
 .../fixtures/UserGuideSamplesRunner.groovy         |   14 +-
 .../fixtures/executer/AbstractGradleExecuter.java  |   25 +-
 .../fixtures/executer/AnyOrderOutputMatcher.groovy |   51 +
 .../fixtures/executer/DaemonGradleExecuter.java    |    3 +-
 .../executer/DefaultGradleDistribution.java        |   45 +-
 .../executer/DependencyResolutionFailure.groovy    |    3 -
 .../executer/DetailedExecutionFailure.groovy       |    5 +-
 .../executer/DownloadableGradleDistribution.groovy |    7 +-
 .../executer/EmbeddedDaemonGradleExecuter.java     |    5 +-
 .../fixtures/executer/ExecutionFailure.java        |   17 +
 .../fixtures/executer/ExecutionResult.java         |    2 +-
 .../fixtures/executer/ForkingGradleExecuter.java   |   14 +-
 .../fixtures/executer/GradleDistribution.java      |    8 +-
 .../fixtures/executer/GradleExecuter.java          |    5 +
 .../fixtures/executer/InProcessGradleExecuter.java |  130 +-
 .../executer/InitScriptExecuterFixture.groovy      |    7 +-
 .../executer/OutputScrapingExecutionFailure.java   |  104 +-
 .../executer/OutputScrapingExecutionResult.java    |   14 +-
 .../executer/ParallelForkingGradleHandle.java      |    5 +-
 .../fixtures/executer/ParallelOutputMatcher.groovy |   51 -
 .../executer/ProgressLoggingFixture.groovy         |    8 +
 .../versions/ClasspathVersionJsonSource.java       |   58 -
 .../fixtures/versions/ClasspathVersionSource.java  |   65 +
 .../versions/IsTestableGradleVersionSpec.groovy    |   39 -
 .../fixtures/versions/ReleasedGradleVersion.java   |   63 -
 .../versions/ReleasedVersionDistributions.java     |   47 +-
 .../versions/VersionWebServiceJsonParser.java      |   85 -
 .../org/gradle/test/fixtures/AbstractModule.groovy |   77 +
 .../org/gradle/test/fixtures/HttpModule.groovy     |   20 +
 .../org/gradle/test/fixtures/HttpRepository.groovy |   22 +
 .../groovy/org/gradle/test/fixtures/Module.groovy  |   23 +
 .../org/gradle/test/fixtures/Repository.groovy     |   24 +
 .../gradle/test/fixtures/bintray/BintrayApi.groovy |   83 +
 .../test/fixtures/bintray/BintrayTestServer.groovy |   62 +
 .../test/fixtures/ivy/AbstractIvyModule.groovy     |   25 -
 .../gradle/test/fixtures/ivy/IvyDescriptor.groovy  |    2 +
 .../gradle/test/fixtures/ivy/IvyFileModule.groovy  |  142 +-
 .../test/fixtures/ivy/IvyFileRepository.groovy     |   11 +-
 .../gradle/test/fixtures/ivy/IvyHttpModule.groovy  |  147 +-
 .../test/fixtures/ivy/IvyHttpRepository.groovy     |    9 +-
 .../org/gradle/test/fixtures/ivy/IvyModule.java    |   35 +-
 .../gradle/test/fixtures/ivy/IvyRepository.groovy  |    4 +-
 .../test/fixtures/maven/AbstractMavenModule.groovy |  341 ++
 .../test/fixtures/maven/BasicHttpResource.groovy   |    7 +-
 .../gradle/test/fixtures/maven/HttpArtifact.groovy |   15 +-
 .../gradle/test/fixtures/maven/HttpResource.groovy |   22 +-
 .../test/fixtures/maven/M2Installation.groovy      |    8 +-
 .../test/fixtures/maven/MavenDependency.groovy     |    5 +
 .../test/fixtures/maven/MavenFileModule.groovy     |  348 +-
 .../test/fixtures/maven/MavenFileRepository.groovy |    3 +-
 .../test/fixtures/maven/MavenHttpModule.groovy     |   30 +-
 .../test/fixtures/maven/MavenHttpRepository.groovy |   15 +-
 .../test/fixtures/maven/MavenLocalModule.groovy    |   67 +
 .../fixtures/maven/MavenLocalRepository.groovy     |   40 +
 .../gradle/test/fixtures/maven/MavenModule.groovy  |   23 +-
 .../test/fixtures/maven/MavenRepository.groovy     |    4 +-
 .../gradle/test/fixtures/maven/MavenScope.groovy   |    2 +-
 .../test/fixtures/plugin/PluginBuilder.groovy      |  104 +
 .../gradle/test/fixtures/publish/Identifier.java   |  101 -
 .../test/fixtures/server/http/HttpServer.groovy    |  100 +-
 .../fixtures/server/http/ServletContainer.groovy   |   43 +
 .../test/fixtures/server/sftp/SFTPServer.groovy    |   40 +-
 .../IsTestableGradleVersionSpecTest.groovy         |   59 -
 .../ReleasedVersionDistributionsTest.groovy        |   18 +-
 .../VersionWebServiceJsonParserTest.groovy         |  115 -
 .../test/fixtures/maven/MavenFileModuleTest.groovy |  228 +
 .../fixtures/maven/MavenLocalModuleTest.groovy     |  220 +
 .../internal-testing/internal-testing.gradle       |    7 +-
 .../fixtures/DefaultTestExecutionResult.groovy     |   17 +-
 .../fixtures/HtmlTestExecutionResult.groovy        |   83 +-
 .../fixtures/JUnitTestClassExecutionResult.groovy  |  173 +
 .../fixtures/JUnitXmlTestExecutionResult.groovy    |  135 +-
 .../fixtures/TestClassExecutionResult.java         |    4 +
 .../fixtures/TestResultOutputAssociation.java      |   22 +
 .../fixtures/archive/ArchiveTestFixture.groovy     |   81 +
 .../test/fixtures/archive/JarTestFixture.groovy    |   62 +
 .../test/fixtures/archive/TarTestFixture.groovy    |   41 +
 .../test/fixtures/archive/ZipTestFixture.groovy    |   37 +
 .../test/fixtures/concurrent/ConcurrentSpec.groovy |   18 +-
 .../test/fixtures/concurrent/Instants.groovy       |   45 +-
 .../test/fixtures/concurrent/TestExecutor.groovy   |   18 +-
 .../test/fixtures/concurrent/TestLogger.groovy     |   25 +
 .../fixtures/concurrent/TestThreadListener.groovy  |   22 -
 .../gradle/test/fixtures/encoding/Identifier.java  |  100 +
 .../gradle/test/fixtures/file/ExecOutput.groovy    |   29 +
 .../org/gradle/test/fixtures/file/TestFile.java    |   42 +-
 .../test/fixtures/file/TestFileHelper.groovy       |   18 +-
 .../gradle/test/fixtures/file/WorkspaceTest.groovy |   34 +
 .../gradle/testing/internal/util/Network.groovy    |   29 -
 .../main/groovy/org/gradle/util/Assertions.groovy  |    3 -
 .../org/gradle/util/JUnit4GroovyMockery.java       |    3 -
 .../src/main/groovy/org/gradle/util/Matchers.java  |  320 ++
 .../org/gradle/util/ReflectionEqualsMatcher.java   |    3 -
 .../src/main/groovy/org/gradle/util/Resources.java |    2 +-
 .../groovy/org/gradle/util/TestClassLoader.groovy  |   62 +
 .../groovy/org/gradle/util/TestPrecondition.groovy |   39 +-
 .../gradle/util/TestPreconditionExtension.groovy   |    4 +-
 .../fixtures/concurrent/ConcurrentSpecTest.groovy  |   25 +-
 .../groovy/org/gradle/util/AssertionsTest.groovy   |    3 -
 .../gradle/util/TempDirIsUniquePerTestSpec.groovy  |    3 -
 subprojects/ivy/ivy.gradle                         |    9 +-
 ...IvyPublishArtifactCustomisationIntegTest.groovy |  321 --
 ...IvyPublishArtifactCustomizationIntegTest.groovy |  324 ++
 .../publish/ivy/IvyPublishBasicIntegTest.groovy    |    9 +-
 .../ivy/IvyPublishCoordinatesIntegTest.groovy      |  132 +
 .../IvyPublishCrossVersionIntegrationTest.groovy   |   30 +-
 ...yPublishDescriptorCustomisationIntegTest.groovy |  147 -
 ...yPublishDescriptorCustomizationIntegTest.groovy |  151 +
 .../api/publish/ivy/IvyPublishEarIntegTest.groovy  |    2 +-
 .../api/publish/ivy/IvyPublishHttpIntegTest.groovy |  145 +-
 .../IvyPublishIdentifierValidationIntegTest.groovy |   11 +-
 .../api/publish/ivy/IvyPublishJavaIntegTest.groovy |    7 +-
 .../ivy/IvyPublishMultiProjectIntegTest.groovy     |   70 +-
 .../IvyPublishMultipleRepositoriesIntegTest.groovy |    4 +-
 .../api/publish/ivy/IvyPublishWarIntegTest.groovy  |    2 +-
 .../ivy/SamplesIvyPublishIntegrationTest.groovy    |   56 +-
 .../ivy/IvyEarProjectPublishIntegrationTest.groovy |    0
 .../ivy/IvyHttpPublishIntegrationTest.groovy       |  323 ++
 .../IvyJavaProjectPublishIntegrationTest.groovy    |   63 +
 .../ivy/IvyLocalPublishIntegrationTest.groovy      |  113 +
 .../IvySingleProjectPublishIntegrationTest.groovy  |  128 +
 .../IvyUrlResolverPublishIntegrationTest.groovy    |   75 +
 .../ivy/IvyWarProjectPublishIntegrationTest.groovy |    0
 .../ivy/SamplesIvyPublishIntegrationTest.groovy    |   34 +
 .../org/gradle/api/publish/ivy/IvyArtifactSet.java |    2 +-
 .../api/publish/ivy/IvyConfigurationContainer.java |    2 +-
 .../org/gradle/api/publish/ivy/IvyDependency.java  |   17 +-
 .../api/publish/ivy/IvyModuleDescriptor.java       |   12 +-
 .../org/gradle/api/publish/ivy/IvyPublication.java |   54 +-
 .../ivy/internal/IvyPublicationTasksModelRule.java |   82 +
 .../ivy/internal/artifact/DefaultIvyArtifact.java  |    5 +
 .../internal/artifact/DefaultIvyArtifactSet.java   |    6 +-
 .../artifact/IvyArtifactNotationParserFactory.java |   65 +-
 .../internal/dependency/DefaultIvyDependency.java  |   40 +-
 .../internal/dependency/IvyDependencyInternal.java |    4 +-
 ...tionDynamicDescriptorGenerationTaskCreator.java |   73 -
 .../plugins/IvyPublishDynamicTaskCreator.java      |   90 -
 .../publication/DefaultIvyModuleDescriptor.java    |    3 +-
 .../publication/DefaultIvyPublication.java         |   53 +-
 .../publication/IvyModuleDescriptorInternal.java   |    4 -
 .../publication/IvyPublicationInternal.java        |    3 +-
 .../publisher/ContextualizingIvyPublisher.java     |   40 +
 .../publisher/DependencyResolverIvyPublisher.java  |   20 +-
 .../publisher/IvyDescriptorFileGenerator.java      |   22 +-
 .../internal/publisher/ValidatingIvyPublisher.java |   22 +-
 .../api/publish/ivy/plugins/IvyPublishPlugin.java  |   55 +-
 .../publish/ivy/tasks/PublishToIvyRepository.java  |   11 +-
 .../IvyArtifactNotationParserFactoryTest.groovy    |   13 +-
 ...namicDescriptorGenerationTaskCreatorTest.groovy |   88 -
 .../IvyPublishDynamicTaskCreatorTest.groovy        |  104 -
 .../publication/DefaultIvyPublicationTest.groovy   |  124 +-
 .../IvyDescriptorFileGeneratorTest.groovy          |   34 +-
 .../publisher/ValidatingIvyPublisherTest.groovy    |    3 +-
 .../ivy/plugins/IvyPublishPluginTest.groovy        |   19 +-
 .../ivy/tasks/PublishToIvyRepositoryTest.groovy    |    6 +-
 subprojects/jacoco/jacoco.gradle                   |   27 +
 .../plugins/JacocoPluginGoodBehaviourTest.groovy   |   33 +
 .../plugins/JacocoPluginIntegrationTest.groovy     |  233 +
 .../jacoco/plugins/JacocoVersionIntegTest.groovy   |   69 +
 .../gradle/internal/jacoco/JacocoAgentJar.groovy   |   57 +
 .../jacoco/JacocoReportsContainerImpl.java         |   49 +
 .../testing/jacoco/plugins/JacocoPlugin.groovy     |  180 +
 .../jacoco/plugins/JacocoPluginExtension.groovy    |   87 +
 .../jacoco/plugins/JacocoTaskExtension.groovy      |  189 +
 .../gradle/testing/jacoco/tasks/JacocoBase.groovy  |   33 +
 .../gradle/testing/jacoco/tasks/JacocoMerge.groovy |   92 +
 .../testing/jacoco/tasks/JacocoReport.groovy       |  258 ++
 .../jacoco/tasks/JacocoReportsContainer.java       |   47 +
 .../gradle/testing/jacoco/tasks/package-info.java  |   20 +
 .../META-INF/gradle-plugins/jacoco.properties      |    1 +
 .../testing/jacoco/plugins/JacocoPluginSpec.groovy |   60 +
 .../jacoco/plugins/JacocoTaskExtensionSpec.groovy  |   99 +
 subprojects/javascript/javascript.gradle           |    4 +-
 .../base/JavaScriptRepositoriesExtension.java      |    2 +-
 .../coffeescript/CoffeeScriptBasePlugin.groovy     |    2 +-
 .../plugins/javascript/envjs/EnvJsPlugin.groovy    |    2 +-
 .../envjs/http/simple/SimpleHttpFileServer.java    |    2 +-
 .../http/simple/SimpleHttpFileServerFactory.java   |    2 +-
 .../plugins/javascript/jshint/JsHintPlugin.groovy  |    2 +-
 .../worker/internal/DefaultRhinoWorkerHandle.java  |    5 +
 .../internal/DefaultRhinoWorkerHandleFactory.java  |    1 +
 .../rhino/worker/internal/RhinoServer.java         |    1 +
 subprojects/jetty/jetty.gradle                     |    2 +-
 .../api/plugins/jetty/AbstractJettyRunTask.java    |   54 +-
 .../org/gradle/api/plugins/jetty/JettyPlugin.java  |    8 +-
 .../api/plugins/jetty/JettyPluginConvention.java   |    2 -
 .../org/gradle/api/plugins/jetty/JettyRun.java     |    4 +-
 .../org/gradle/api/plugins/jetty/JettyStop.java    |    6 +-
 .../api/plugins/jetty/JettyPluginTest.groovy       |   19 +-
 subprojects/language-base/language-base.gradle     |    7 +
 .../groovy/org/gradle/language/base/Binary.java    |   33 +
 .../org/gradle/language/base/BinaryContainer.java  |   25 +
 .../language/base/BuildableModelElement.java       |   41 +
 .../gradle/language/base/FunctionalSourceSet.java  |   27 +
 .../gradle/language/base/LanguageSourceSet.java    |   47 +
 .../org/gradle/language/base/ProjectSourceSet.java |   26 +
 .../internal/AbstractBuildableModelElement.java    |   55 +
 .../base/internal/AbstractLanguageSourceSet.java   |   81 +
 .../language/base/internal/BinaryInternal.java     |   23 +
 .../language/base/internal/BinaryNamingScheme.java |   35 +
 .../base/internal/BinaryNamingSchemeBuilder.java   |   26 +
 .../base/internal/DefaultBinaryContainer.java      |   27 +
 .../base/internal/DefaultBinaryNamingScheme.java   |  112 +
 .../internal/DefaultBinaryNamingSchemeBuilder.java |   64 +
 .../base/internal/DefaultFunctionalSourceSet.java  |   39 +
 .../base/internal/DefaultProjectSourceSet.java     |   32 +
 .../base/internal/LanguageSourceSetInternal.java   |   37 +
 .../org/gradle/language/base/package-info.java     |   23 +
 .../language/base/plugins/LanguageBasePlugin.java  |   67 +
 .../gradle/language/base/plugins/package-info.java |   23 +
 .../gradle-plugins/language-base.properties        |    1 +
 .../base/internal/BuildableModelElementTest.groovy |   54 +
 .../internal/DefaultBinaryNamingSchemeTest.groovy  |   79 +
 .../internal/DefaultFunctionalSourceSetTest.groovy |   29 +
 subprojects/language-jvm/language-jvm.gradle       |    7 +
 .../org/gradle/language/java/JavaSourceSet.java    |   28 +
 .../java/internal/DefaultJavaSourceSet.java        |   52 +
 .../org/gradle/language/java/package-info.java     |   23 +
 .../gradle/language/jvm/ClassDirectoryBinary.java  |   40 +
 .../groovy/org/gradle/language/jvm/Classpath.java  |   28 +
 .../org/gradle/language/jvm/ResourceSet.java       |   25 +
 .../internal/ClassDirectoryBinaryNamingScheme.java |   70 +
 .../jvm/internal/DefaultClassDirectoryBinary.java  |   83 +
 .../language/jvm/internal/DefaultClasspath.java    |   39 +
 .../language/jvm/internal/DefaultResourceSet.java  |   28 +
 .../jvm/internal/SimpleStaleClassCleaner.java      |   43 +
 .../language/jvm/internal/StaleClassCleaner.java   |   43 +
 .../org/gradle/language/jvm/package-info.java      |   23 +
 .../language/jvm/plugins/JvmLanguagePlugin.java    |  107 +
 .../gradle/language/jvm/plugins/package-info.java  |   23 +
 .../language/jvm/tasks/ProcessResources.java       |   35 +
 .../gradle/language/jvm/tasks/package-info.java    |   23 +
 .../java/internal/DefaultJavaSourceSetTest.groovy  |   33 +
 .../ClassDirectoryBinaryNamingSchemeTest.groovy    |   55 +
 .../DefaultClassDirectoryBinaryTest.groovy         |   79 +
 .../jvm/internal/DefaultResourceSetTest.groovy     |   32 +
 subprojects/launcher/launcher.gradle               |    8 +-
 .../ConfigurationOnDemandIntegrationTest.groovy    |    3 -
 ...EnablingParallelExecutionIntegrationTest.groovy |    3 -
 .../GradleConfigurabilityIntegrationSpec.groovy    |   30 +-
 .../daemon/DaemonFeedbackIntegrationSpec.groovy    |    3 -
 ...itialCommunicationFailureIntegrationSpec.groovy |   53 +-
 .../launcher/daemon/DaemonIntegrationSpec.groovy   |    3 -
 .../launcher/daemon/DaemonLifecycleSpec.groovy     |    2 +-
 .../daemon/DispachingFailureIntegrationSpec.groovy |    3 -
 .../launcher/daemon/EmbeddedDaemonSmokeTest.groovy |    4 +-
 .../gradle/launcher/daemon/ExecuteBuildAction.java |   28 +
 .../daemon/SingleUseDaemonIntegrationTest.groovy   |    3 +-
 .../daemon/StoppingDaemonIntegrationSpec.groovy    |    3 -
 .../DaemonParametersIntegrationTest.groovy         |   36 +
 .../daemon/testing/DaemonContextParser.java        |    3 -
 .../daemon/testing/DaemonLogsAnalyzer.groovy       |   15 +-
 .../daemon/testing/DaemonsEventSequence.groovy     |    2 +-
 .../main/java/org/gradle/launcher/GradleMain.java  |    3 -
 .../src/main/java/org/gradle/launcher/Main.java    |    4 +-
 .../launcher/bootstrap/ProcessBootstrap.java       |    6 +-
 .../gradle/launcher/cli/BuildActionsFactory.java   |  100 +-
 .../launcher/cli/CommandLineActionFactory.java     |    2 +-
 .../gradle/launcher/cli/ExecuteBuildAction.java    |   20 +-
 .../org/gradle/launcher/cli/GuiActionsFactory.java |    2 +-
 .../org/gradle/launcher/cli/RunBuildAction.java    |    6 +-
 .../cli/converter/DaemonCommandLineConverter.java  |   50 +
 .../cli/converter/LayoutToPropertiesConverter.java |   73 +
 .../PropertiesToDaemonParametersConverter.java     |   68 +
 .../PropertiesToStartParameterConverter.java       |   36 +
 .../launcher/daemon/DaemonExecHandleBuilder.java   |    3 -
 .../launcher/daemon/bootstrap/DaemonGreeter.java   |    3 -
 .../daemon/bootstrap/DaemonOutputConsumer.java     |    3 -
 .../bootstrap/DaemonStartupCommunication.java      |    3 -
 .../launcher/daemon/client/DaemonClient.java       |   30 +-
 .../daemon/client/DaemonClientConnection.java      |   42 +-
 .../daemon/client/DaemonClientInputForwarder.java  |   86 +-
 .../daemon/client/DaemonClientServices.java        |   35 +-
 .../daemon/client/DaemonClientServicesSupport.java |   37 +-
 .../daemon/client/DaemonConnectionException.java   |   30 +
 .../launcher/daemon/client/DaemonConnector.java    |    9 +-
 .../client/DaemonInitialConnectException.java      |    4 +
 .../daemon/client/DefaultDaemonConnector.java      |   63 +-
 .../client/EmbeddedDaemonClientServices.java       |   28 +-
 .../daemon/client/EmbeddedDaemonStarter.java       |    4 +-
 .../launcher/daemon/client/InputForwarder.java     |   39 +-
 .../client/NoUsableDaemonFoundException.java       |    3 -
 .../daemon/client/SingleUseDaemonClient.java       |   17 +-
 .../daemon/client/StaleDaemonAddressException.java |   29 +
 .../daemon/client/StopDaemonClientServices.java    |    2 +-
 .../launcher/daemon/client/StopDispatcher.java     |    3 -
 .../daemon/configuration/DaemonParameters.java     |   40 +-
 .../configuration/DaemonServerConfiguration.java   |    3 -
 .../DefaultDaemonServerConfiguration.java          |    3 -
 .../ForegroundDaemonConfiguration.java             |    3 -
 .../daemon/configuration/GradleProperties.java     |  177 +-
 .../configuration/GradlePropertiesConfigurer.java  |   48 -
 .../daemon/diagnostics/DaemonDiagnostics.java      |    2 -
 .../daemon/diagnostics/DaemonStartupInfo.java      |    3 -
 .../org/gradle/launcher/daemon/protocol/Build.java |    8 +-
 .../launcher/daemon/protocol/BuildAndStop.java     |    4 +-
 .../daemon/registry/DaemonRegistryContent.java     |    3 -
 .../daemon/registry/DaemonRegistryServices.java    |   26 +-
 .../daemon/registry/PersistentDaemonRegistry.java  |   30 +-
 .../org/gradle/launcher/daemon/server/Daemon.java  |    6 +-
 .../daemon/server/DaemonServerConnector.java       |    2 +-
 .../launcher/daemon/server/DaemonServices.java     |   23 +-
 .../daemon/server/DaemonStateCoordinator.java      |    2 +-
 .../daemon/server/DaemonTcpServerConnector.java    |   13 +-
 .../daemon/server/DefaultDaemonConnection.java     |    4 +-
 .../server/DefaultIncomingConnectionHandler.java   |    2 +-
 .../daemon/server/DomainRegistryUpdater.java       |    5 +-
 .../server/SynchronizedDispatchConnection.java     |    2 -
 .../daemon/server/exec/DaemonConnection.java       |    2 +-
 .../daemon/server/exec/DaemonHygieneAction.java    |   50 +
 .../server/exec/DefaultDaemonCommandExecuter.java  |    6 +-
 .../server/exec/EstablishBuildEnvironment.java     |    1 +
 .../launcher/daemon/server/exec/ExecuteBuild.java  |    4 +-
 .../daemon/server/exec/ForwardClientInput.java     |    4 +-
 .../server/exec/NoOpDaemonCommandAction.java       |   22 +
 .../gradle/launcher/exec/BuildActionExecuter.java  |   29 +
 .../exec/GradleLauncherActionExecuter.java         |   29 -
 .../exec/InProcessBuildActionExecuter.java         |   77 +
 .../InProcessGradleLauncherActionExecuter.java     |   46 -
 .../gradle/launcher/exec/InitializationAware.java  |   22 -
 .../internal/impl/LaunchableGradleProjectTask.java |   32 +
 .../internal/impl/LaunchableGradleTask.java        |   76 +
 .../impl/LaunchableGradleTaskSelector.java         |   86 +
 .../internal/impl/LaunchableImplementation.java    |   31 +
 .../internal/provider/BuildActionResult.java       |   33 +
 .../internal/provider/BuildModelAction.java        |  105 +
 .../internal/provider/ClassLoaderDetails.java      |   36 +
 .../internal/provider/ClasspathInferer.java        |  131 +
 .../provider/ClientProvidedBuildAction.java        |   81 +
 .../ClientSidePayloadClassLoaderRegistry.java      |  142 +
 .../internal/provider/ConfiguringBuildAction.java  |   91 +-
 .../internal/provider/ConnectionScopeServices.java |   55 +
 .../provider/DaemonBuildActionExecuter.java        |   47 +
 .../DaemonGradleLauncherActionExecuter.java        |   47 -
 .../internal/provider/DefaultBuildController.java  |   70 +
 .../internal/provider/DefaultConnection.java       |  223 +-
 .../provider/DefaultConnectionMetaData.java        |   30 +
 .../DefaultPayloadClassLoaderRegistry.java         |  174 +
 .../provider/DelegatingBuildModelAction.java       |   58 -
 .../tooling/internal/provider/DeserializeMap.java  |   24 +
 .../internal/provider/EmbeddedExecuterSupport.java |   45 -
 .../internal/provider/ExecuteBuildAction.java      |   33 -
 .../LoggingBridgingBuildActionExecuter.java        |   75 +
 ...oggingBridgingGradleLauncherActionExecuter.java |   75 -
 .../internal/provider/ModelClassLoaderFactory.java |  126 +
 .../provider/PayloadClassLoaderRegistry.java       |   26 +
 .../internal/provider/PayloadSerializer.java       |  155 +
 .../internal/provider/ProviderConnection.java      |  165 +
 .../internal/provider/ReflectionClassLookup.java   |   44 +
 .../tooling/internal/provider/SerializeMap.java    |   36 +
 .../internal/provider/SerializedPayload.java       |   37 +
 .../provider/ToolingGlobalScopeServices.java       |   25 +
 .../tooling/internal/provider/ToolingServices.java |   32 +
 .../connection/AdaptedOperationParameters.java     |   11 +-
 .../connection/ProviderOperationParameters.java    |    5 +-
 .../internal/provider/jdk6/Jdk6ClassLookup.java    |   27 +
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../groovy/org/gradle/launcher/MainTest.groovy     |    8 +-
 .../launcher/cli/BuildActionsFactoryTest.groovy    |   53 +-
 .../cli/CommandLineActionFactoryTest.groovy        |    2 +-
 .../gradle/launcher/cli/RunBuildActionTest.groovy  |    4 +-
 .../DaemonCommandLineConverterTest.groovy          |   39 +
 .../LayoutToPropertiesConverterTest.groovy         |   95 +
 ...ropertiesToDaemonParametersConverterTest.groovy |  106 +
 .../PropertiesToStartParameterConverterTest.groovy |   36 +
 .../daemon/DaemonExecHandleBuilderSpec.groovy      |    3 -
 .../daemon/bootstrap/DaemonGreeterTest.groovy      |    3 -
 .../bootstrap/DaemonOutputConsumerTest.groovy      |    3 -
 .../DaemonStartupCommunicationSpec.groovy          |    3 -
 .../client/DaemonClientConnectionTest.groovy       |   78 +-
 .../daemon/client/DaemonClientServicesTest.groovy  |    3 +-
 .../launcher/daemon/client/DaemonClientTest.groovy |   18 +-
 .../client/DefaultDaemonConnectorTest.groovy       |   47 +-
 .../daemon/client/InputForwarderTest.groovy        |   27 +-
 .../daemon/client/StopDispatcherTest.groovy        |    5 +-
 .../daemon/configuration/CurrentProcessTest.groovy |    3 +-
 .../configuration/DaemonParametersTest.groovy      |   82 +-
 .../GradlePropertiesConfigurerTest.groovy          |   77 -
 .../configuration/GradlePropertiesTest.groovy      |  218 -
 .../context/DaemonCompatibilitySpecSpec.groovy     |   10 +-
 .../diagnostics/DaemonDiagnosticsTest.groovy       |    3 -
 .../registry/DaemonRegistryServicesTest.groovy     |   14 +-
 .../registry/DomainRegistryUpdaterTest.groovy      |    3 -
 .../registry/PersistentDaemonRegistryTest.groovy   |   34 +-
 .../DaemonServerExceptionHandlingTest.groovy       |   21 +-
 .../daemon/server/DaemonServicesTest.groovy        |    1 -
 .../server/DaemonStateCoordinatorTest.groovy       |    3 -
 .../server/exec/DaemonHygieneActionTest.groovy     |   52 +
 .../exec/DefaultBuildActionParametersTest.groovy   |    8 +-
 .../exec/InProcessBuildActionExecuterTest.groovy   |  156 +
 ...nProcessGradleLauncherActionExecuterTest.groovy |  100 -
 .../provider/AbstractClassGraphSpec.groovy         |   63 +
 .../internal/provider/ClasspathInfererTest.groovy  |   66 +
 .../provider/ConfiguringBuildActionTest.groovy     |   51 +-
 .../provider/ConnectionScopeServicesTest.groovy    |   37 +
 .../tooling/internal/provider/CustomAction.java    |   34 +
 .../tooling/internal/provider/CustomModel.java     |   24 +
 .../tooling/internal/provider/CustomPayload.java   |   29 +
 .../provider/DaemonBuildActionExecuterTest.groovy  |   45 +
 .../DaemonGradleLauncherActionExecuterTest.groovy  |   45 -
 .../provider/DefaultBuildControllerTest.groovy     |  129 +
 .../provider/ExecuteBuildActionTest.groovy         |   37 -
 .../LoggingBridgingBuildActionExecuterTest.groovy  |   74 +
 ...BridgingGradleLauncherActionExecuterTest.groovy |   74 -
 .../provider/ModelClassLoaderFactoryTest.groovy    |   36 +
 .../internal/provider/PayloadInterface.java        |   21 +
 .../internal/provider/PayloadSerializerTest.groovy |  204 +
 .../provider/ToolingGlobalScopeServicesTest.groovy |   29 +
 .../tooling/internal/provider/WrapperPayload.java  |   27 +
 .../AdaptedOperationParametersTest.groovy          |    3 -
 .../connection/BuildLogLevelMixInTest.groovy       |    3 -
 subprojects/maven/maven.gradle                     |    4 +-
 .../maven/MavenConversionIntegrationTest.groovy    |  161 -
 .../maven/AbstractMavenPublishIntegTest.groovy     |   11 +-
 ...venPublishArtifactCustomisationIntegTest.groovy |  228 -
 ...venPublishArtifactCustomizationIntegTest.groovy |  255 ++
 .../maven/MavenPublishBasicIntegTest.groovy        |   53 +-
 .../maven/MavenPublishCoordinatesIntegTest.groovy  |  140 +
 .../MavenPublishCrossVersionIntegrationTest.groovy |   21 +-
 ...avenPublishIdentifierValidationIntegTest.groovy |    4 +-
 .../maven/MavenPublishIssuesIntegTest.groovy       |   51 +
 .../publish/maven/MavenPublishJavaIntegTest.groovy |   30 +-
 .../maven/MavenPublishMultiProjectIntegTest.groovy |   88 +-
 .../MavenPublishPomCustomisationIntegTest.groovy   |  174 -
 .../MavenPublishPomCustomizationIntegTest.groovy   |  212 +
 .../SamplesMavenPublishIntegrationTest.groovy      |   42 +-
 .../MavenEarProjectPublishIntegrationTest.groovy   |    0
 .../MavenJavaProjectPublishIntegrationTest.groovy  |    0
 .../MavenMultiProjectPublishIntegrationTest.groovy |    0
 .../maven/MavenPomGenerationIntegrationTest.groovy |    0
 .../MavenPublishIgnoresMavenSettingsTest.groovy    |    0
 .../maven/MavenPublishIntegrationTest.groovy       |  388 ++
 ...MavenPublishRespectsPomConfigurationTest.groovy |    0
 .../MavenWarProjectPublishIntegrationTest.groovy   |    0
 ...SamplesMavenPomGenerationIntegrationTest.groovy |  106 +
 .../SamplesMavenQuickstartIntegrationTest.groovy   |   79 +
 .../publish/maven/pomGeneration/expectedNewPom.txt |    0
 .../publish/maven/pomGeneration/expectedPom.txt    |    0
 .../maven/pomGeneration/expectedQuickstartPom.txt  |    0
 .../api/artifacts/maven/Conf2ScopeMapping.java     |    2 -
 .../maven/Conf2ScopeMappingContainer.java          |   10 +-
 .../api/artifacts/maven/GroovyMavenDeployer.java   |    2 -
 .../gradle/api/artifacts/maven/MavenDeployer.java  |    6 +-
 .../api/artifacts/maven/MavenDeployment.java       |    2 +-
 .../org/gradle/api/artifacts/maven/MavenPom.java   |   34 +-
 .../gradle/api/artifacts/maven/MavenResolver.java  |    4 +-
 .../api/artifacts/maven/PomFilterContainer.java    |   40 +-
 .../gradle/api/artifacts/maven/PublishFilter.java  |    2 -
 .../groovy/org/gradle/api/plugins/MavenPlugin.java |   69 +-
 .../gradle/api/plugins/MavenPluginConvention.java  |    2 -
 .../plugins/MavenRepositoryHandlerConvention.java  |    2 +-
 .../api/plugins/maven/ConvertMaven2Gradle.groovy   |   54 -
 .../api/plugins/maven/Maven2GradlePlugin.groovy    |   36 -
 .../api/plugins/maven/internal/Maven2Gradle.groovy |  552 ---
 .../maven/internal/MavenProjectXmlWriter.java      |   61 -
 .../maven/internal/MavenProjectsCreator.java       |   98 -
 .../publication/maven/internal/ArtifactPom.java    |    3 -
 .../maven/internal/ArtifactPomContainer.java       |    3 -
 .../maven/internal/ArtifactPomFactory.java         |    3 -
 .../maven/internal/BasePomFilterContainer.java     |    3 -
 .../internal/CustomTaskFactoryDeployerFactory.java |   43 -
 .../maven/internal/DefaultArtifactPom.java         |    6 +-
 .../internal/DefaultArtifactPomContainer.java      |    3 -
 .../maven/internal/DefaultArtifactPomFactory.java  |    3 -
 .../DefaultConf2ScopeMappingContainer.java         |    5 +-
 .../maven/internal/DefaultMavenDeployment.java     |    3 -
 .../maven/internal/DefaultMavenPom.java            |    9 +-
 .../maven/internal/DefaultMavenPomFactory.java     |    5 +-
 .../DefaultMavenRepositoryHandlerConvention.java   |    2 +-
 .../maven/internal/DefaultPomFilter.java           |    3 -
 .../maven/internal/ExcludeRuleConverter.java       |    3 -
 .../maven/internal/PomDependenciesConverter.java   |    3 -
 .../api/publication/maven/internal/PomFilter.java  |    3 -
 .../maven/internal/ant/AbstractMavenResolver.java  |   62 +-
 .../maven/internal/ant/BaseMavenDeployer.java      |   20 +-
 .../maven/internal/ant/BaseMavenInstaller.java     |   16 +-
 .../maven/internal/ant/CustomDeployTask.java       |    2 -
 .../ant/CustomInstallDeployTaskSupport.java        |    5 +-
 .../maven/internal/ant/CustomInstallTask.java      |    3 -
 .../internal/ant/DefaultDeployTaskFactory.java     |   27 -
 .../internal/ant/DefaultExcludeRuleConverter.java  |    3 -
 .../internal/ant/DefaultGroovyMavenDeployer.groovy |    4 -
 .../internal/ant/DefaultInstallTaskFactory.java    |   27 -
 .../ant/DefaultPomDependenciesConverter.java       |    3 -
 .../internal/ant/EmptyMavenSettingsSupplier.java   |    3 -
 .../maven/internal/ant/LoggingHelper.java          |    3 -
 .../maven/internal/ant/MavenSettingsSupplier.java  |    3 -
 .../ant/MaybeUserMavenSettingsSupplier.java        |    3 -
 .../internal/ant/NoInstallDeployTaskFactory.java   |   56 -
 .../ProjectDependencyArtifactIdExtractorHack.java  |    3 +-
 .../maven/internal/ant/RepositoryBuilder.java      |    3 -
 .../maven/internal/ant/RepositoryFactory.java      |    3 -
 .../gradle/api/publish/maven/MavenArtifactSet.java |    2 +-
 .../gradle/api/publish/maven/MavenDependency.java  |   41 +
 .../org/gradle/api/publish/maven/MavenPom.java     |   15 +-
 .../gradle/api/publish/maven/MavenPublication.java |   40 +-
 .../maven/internal/MavenPublishTaskModelRule.java  |  109 +
 .../internal/artifact/DefaultMavenArtifact.java    |    5 +
 .../internal/artifact/DefaultMavenArtifactSet.java |    6 +-
 .../MavenArtifactNotationParserFactory.java        |   26 +-
 .../dependencies/DefaultMavenDependency.java       |   56 +
 .../dependencies/MavenDependencyInternal.java      |   25 +
 .../internal/plugins/GeneratePomTaskCreator.java   |   71 -
 .../plugins/MavenPublishDynamicTaskCreator.java    |   86 -
 .../MavenPublishLocalDynamicTaskCreator.java       |   65 -
 .../internal/publication/DefaultMavenPom.java      |   14 +-
 .../publication/DefaultMavenPublication.java       |   70 +-
 .../internal/publication/MavenPomInternal.java     |    6 +-
 .../publication/MavenPublicationInternal.java      |    7 +-
 .../AbstractAntTaskBackedMavenPublisher.java       |  116 +
 .../AntTaskBackedMavenLocalPublisher.java          |   64 +
 .../publisher/AntTaskBackedMavenPublisher.java     |  103 +-
 .../publisher/MavenDeployerConfigurer.java         |   55 -
 .../publisher/MavenRemoteRepositoryFactory.java    |   50 +
 .../publisher/ValidatingMavenPublisher.java        |   22 +-
 .../internal/tasks/MavenPomFileGenerator.java      |   87 +-
 .../publish/maven/plugins/MavenPublishPlugin.java  |   46 +-
 .../api/publish/maven/tasks/GenerateMavenPom.java  |   39 +-
 .../publish/maven/tasks/PublishToMavenLocal.java   |   25 +-
 .../maven/tasks/PublishToMavenRepository.java      |    7 +-
 .../gradle-plugins/maven2Gradle.properties         |    1 -
 .../api/artifacts/maven/Conf2ScopeMappingTest.java |    3 -
 .../api/plugins/MavenPluginConventionTest.groovy   |   14 +-
 .../org/gradle/api/plugins/MavenPluginTest.java    |    9 +-
 .../plugins/maven/Maven2GradlePluginSpec.groovy    |   36 -
 .../internal/MavenProjectXmlWriterTest.groovy      |   34 -
 .../maven/internal/MavenProjectsCreatorSpec.groovy |  118 -
 .../maven/internal/BasePomFilterContainerTest.java |    3 -
 .../maven/internal/DefaultArtifactPomTest.java     |    7 +-
 .../DefaultConf2ScopeMappingContainerTest.java     |    3 -
 .../internal/DefaultMavenPomFactoryTest.groovy     |    7 +-
 ...aultMavenRepositoryHandlerConventionTest.groovy |    2 +-
 .../maven/internal/DefaultPomFilterTest.java       |    3 -
 .../internal/ant/AbstractMavenResolverTest.java    |  241 --
 .../maven/internal/ant/BaseMavenDeployerTest.java  |  108 -
 .../maven/internal/ant/BaseMavenInstallerTest.java |   72 -
 .../internal/ant/DefaultDeployTaskFactoryTest.java |   30 -
 .../ant/DefaultExcludeRuleConverterTest.java       |    3 -
 .../ant/DefaultGroovyMavenDeployerTest.groovy      |   26 +-
 .../ant/DefaultGroovyPomFilterContainerTest.groovy |    7 +-
 .../ant/DefaultPomDependenciesConverterTest.java   |    3 -
 .../ant/EmptyMavenSettingsSupplierTest.groovy      |    3 -
 .../ant/MaybeUserMavenSettingsSupplierTest.groovy  |    4 -
 ...ectDependencyArtifactIdExtractorHackTest.groovy |    5 +-
 .../MavenArtifactNotationParserFactoryTest.groovy  |    8 +-
 .../publication/DefaultMavenPublicationTest.groovy |  145 +-
 .../publisher/ValidatingMavenPublisherTest.groovy  |   41 +-
 .../tasks/MavenPomFileGeneratorTest.groovy         |   70 +-
 .../maven/plugins/MavenPublishPluginTest.groovy    |   51 +-
 .../tasks/PublishToMavenRepositoryTest.groovy      |    6 +-
 subprojects/messaging/messaging.gradle             |    2 +-
 .../remote/UnicastMessagingIntegrationTest.groovy  |   27 +-
 .../java/org/gradle/messaging/actor/Actor.java     |    2 +-
 .../actor/internal/DefaultActorFactory.java        |    4 +-
 .../gradle/messaging/dispatch/DelayedReceive.java  |    2 +-
 .../dispatch/ExceptionTrackingFailureHandler.java  |    2 +-
 .../gradle/messaging/dispatch/QueuingDispatch.java |    2 +-
 .../org/gradle/messaging/remote/Addressable.java   |   22 -
 .../org/gradle/messaging/remote/ConnectEvent.java  |   41 -
 .../gradle/messaging/remote/MessagingClient.java   |    2 +-
 .../gradle/messaging/remote/MessagingServer.java   |    8 +-
 .../gradle/messaging/remote/ObjectConnection.java  |   34 +-
 .../messaging/remote/ObjectConnectionBuilder.java  |   57 +
 .../remote/internal/AsyncConnectionAdapter.java    |    4 +-
 .../remote/internal/ConnectCompletion.java         |   37 +
 .../remote/internal/DefaultIncomingBroadcast.java  |   16 +-
 .../remote/internal/DefaultOutgoingBroadcast.java  |    6 +-
 .../remote/internal/IncomingConnector.java         |   15 +-
 .../gradle/messaging/remote/internal/Message.java  |  147 +-
 .../messaging/remote/internal/MessageHub.java      |   24 +-
 .../remote/internal/MessagingServices.java         |  103 +-
 .../remote/internal/OutgoingConnector.java         |   12 +-
 .../remote/internal/PlaceholderException.java      |   22 +-
 .../messaging/remote/internal/ProtocolStack.java   |    2 +-
 .../gradle/messaging/remote/internal/Router.java   |    2 +-
 .../internal/hub/InterHubMessageSerializer.java    |   61 +-
 .../internal/hub/MessageHubBackedClient.java       |   19 +-
 .../hub/MessageHubBackedObjectConnection.java      |   68 +-
 .../internal/hub/MessageHubBackedServer.java       |   37 +-
 .../internal/hub/MethodInvocationSerializer.java   |   59 +-
 .../remote/internal/inet/InetAddressFactory.java   |    7 +-
 .../internal/inet/SocketConnectCompletion.java     |   45 +
 .../remote/internal/inet/SocketConnection.java     |    2 +-
 .../remote/internal/inet/TcpIncomingConnector.java |   37 +-
 .../remote/internal/inet/TcpOutgoingConnector.java |   14 +-
 .../serialize/AbstractCollectionSerializer.java    |   40 +
 .../messaging/serialize/AbstractDecoder.java       |  105 +
 .../messaging/serialize/AbstractEncoder.java       |   80 +
 .../messaging/serialize/BaseSerializerFactory.java |   70 +
 .../serialize/DataStreamBackedSerializer.java      |   36 -
 .../org/gradle/messaging/serialize/Decoder.java    |  118 +
 .../messaging/serialize/DefaultSerializer.java     |   12 +-
 .../serialize/DefaultSerializerRegistry.java       |   85 +
 .../org/gradle/messaging/serialize/Encoder.java    |   91 +
 .../messaging/serialize/FlushableEncoder.java      |   24 +
 .../serialize/InputStreamBackedDecoder.java        |   65 +
 .../gradle/messaging/serialize/ListSerializer.java |   37 +
 .../gradle/messaging/serialize/LongSerializer.java |   29 +
 .../gradle/messaging/serialize/MapSerializer.java  |   48 +
 .../serialize/NullSafeStringSerializer.java        |   26 +
 .../serialize/OutputStreamBackedEncoder.java       |   65 +
 .../org/gradle/messaging/serialize/Serializer.java |    7 +-
 .../messaging/serialize/SerializerRegistry.java    |   23 +
 .../gradle/messaging/serialize/SetSerializer.java  |   38 +
 .../messaging/serialize/kryo/JavaSerializer.java   |   30 +-
 .../serialize/kryo/KryoAwareSerializer.java        |   28 -
 .../serialize/kryo/KryoBackedDecoder.java          |  156 +
 .../serialize/kryo/KryoBackedEncoder.java          |   91 +
 .../messaging/serialize/kryo/KryoSerializer.java   |   59 -
 .../serialize/kryo/StatefulSerializer.java         |   28 +
 .../serialize/kryo/TypeSafeSerializer.java         |   18 +-
 .../messaging/remote/internal/MessageTest.groovy   |  241 +-
 .../internal/PlaceholderExceptionTest.groovy       |    4 +-
 .../remote/internal/ProtocolStackTest.groovy       |    2 +-
 .../hub/InterHubMessageSerializerTest.groovy       |   13 +-
 .../internal/hub/MessageHubBackedClientTest.groovy |   16 +-
 .../internal/hub/MessageHubBackedServerTest.groovy |   33 +-
 .../hub/MethodInvocationSerializerTest.groovy      |   25 +-
 .../internal/inet/InetAddressFactoryTest.groovy    |   47 +
 .../remote/internal/inet/TcpConnectorTest.groovy   |   41 +-
 .../messaging/serialize/AbstractCodecTest.groovy   |  524 +++
 .../serialize/BaseSerializerFactoryTest.groovy     |   73 +
 .../serialize/DefaultSerializerRegistryTest.groovy |   92 +
 .../serialize/DefaultSerializerTest.groovy         |    8 +-
 .../messaging/serialize/ListSerializerTest.groovy  |   45 +
 .../messaging/serialize/LongSerializerTest.groovy  |   34 +
 .../messaging/serialize/MapSerializerTest.groovy   |   47 +
 .../messaging/serialize/SetSerializerTest.groovy   |   47 +
 .../serialize/StreamBackedCodecTest.groovy         |   31 +
 .../serialize/kryo/KryoBackedCodecTest.groovy      |   98 +
 .../messaging/serialize/SerializerSpec.groovy      |   39 +
 subprojects/native/native.gradle                   |    8 +-
 .../nativeplatform/ReflectiveEnvironment.java      |    2 -
 .../nativeplatform/filesystem/FileSystem.java      |    2 +-
 .../filesystem/FileSystemServices.java             |   72 +-
 .../nativeplatform/filesystem/FileSystems.java     |   33 -
 .../filesystem/GenericFileSystem.java              |    4 +-
 .../filesystem/MacFilePathEncoder.java             |   37 -
 .../filesystem/NativePlatformBackedChmod.java      |   34 +
 .../filesystem/NativePlatformBackedStat.java       |   34 +
 .../filesystem/NativePlatformBackedSymlink.java    |   35 +
 .../nativeplatform/jna/JnaBootPathConfigurer.java  |    3 -
 .../internal/nativeplatform/jna/Kernel32.java      |   66 -
 .../jna/WindowsHandlesManipulator.java             |   86 -
 .../jna/WindowsProcessEnvironment.java             |   61 -
 .../nativeplatform/services/FileSystems.java       |   24 +
 .../nativeplatform/services/NativeServices.java    |   69 +-
 .../filesystem/CommonFileSystemTest.groovy         |    3 +-
 .../FileSystemServicesOnLinuxTest.groovy           |   45 -
 .../filesystem/FileSystemServicesOnMacTest.groovy  |   45 -
 .../FileSystemServicesOnUnknownOsTest.groovy       |   55 -
 .../FileSystemServicesOnWindowsTest.groovy         |   45 -
 .../filesystem/LinuxFileSystemTest.groovy          |    3 +-
 .../filesystem/MacOsFileSystemTest.groovy          |    3 +-
 .../filesystem/WindowsFileSystemTest.groovy        |    3 +-
 .../jdk7/PosixFilePermissionConverterTest.groovy   |    2 +-
 .../services/NativeServicesTest.groovy             |   22 +
 subprojects/open-api/open-api.gradle               |    9 +-
 .../integtests/openapi/CrossVersionBuilder.java    |    6 +
 ...CrossVersionCompatibilityIntegrationTest.groovy |    4 +-
 .../integtests/openapi/GradleRunnerTest.groovy     |   12 +-
 .../gradle/integtests/openapi/OpenApiUiTest.groovy |    7 +
 .../integtests/openapi/OutputUILordTest.groovy     |    2 -
 .../TestAlternateUIInteractionVersion1.java        |    2 -
 .../openapi/TestSettingsNodeVersion1.java          |    2 -
 .../TestSingleDualPaneUIInteractionVersion1.java   |    1 -
 .../org/gradle/foundation/BootstrapLoader.java     |  189 -
 .../gradle/foundation/ParentLastClassLoader.java   |   73 -
 .../gradle/openapi/external/ExternalUtility.java   |  168 -
 .../foundation/GradleInterfaceVersion1.java        |   89 -
 .../foundation/GradleInterfaceVersion2.java        |   89 -
 .../external/foundation/ProjectVersion1.java       |   83 -
 .../foundation/RequestObserverVersion1.java        |   52 -
 .../external/foundation/RequestVersion1.java       |   62 -
 .../openapi/external/foundation/TaskVersion1.java  |   61 -
 .../foundation/favorites/FavoriteTaskVersion1.java |   48 -
 .../favorites/FavoritesEditorVersion1.java         |  105 -
 .../external/runner/GradleRunnerFactory.java       |  134 -
 .../runner/GradleRunnerInteractionVersion1.java    |   83 -
 .../external/runner/GradleRunnerVersion1.java      |   35 -
 .../ui/AlternateUIInteractionVersion1.java         |   59 -
 .../openapi/external/ui/BasicGradleUIVersion1.java |  199 -
 ...ommandLineArgumentAlteringListenerVersion1.java |   32 -
 .../external/ui/DualPaneUIInteractionVersion1.java |   29 -
 .../openapi/external/ui/DualPaneUIVersion1.java    |   56 -
 .../openapi/external/ui/GradleTabVersion1.java     |   51 -
 .../external/ui/GradleUIInteractionVersion1.java   |   42 -
 .../external/ui/OutputObserverVersion1.java        |   56 -
 .../openapi/external/ui/OutputUILordVersion1.java  |   70 -
 .../openapi/external/ui/SettingsNodeVersion1.java  |   67 -
 .../ui/SinglePaneUIInteractionVersion1.java        |   29 -
 .../openapi/external/ui/SinglePaneUIVersion1.java  |   39 -
 .../org/gradle/openapi/external/ui/UIFactory.java  |  239 -
 .../org/gradle/foundation/BootstrapLoader.java     |  187 +
 .../gradle/foundation/ParentLastClassLoader.java   |   72 +
 .../gradle/openapi/external/ExternalUtility.java   |  166 +
 .../foundation/GradleInterfaceVersion1.java        |   89 +
 .../foundation/GradleInterfaceVersion2.java        |   88 +
 .../external/foundation/ProjectVersion1.java       |   83 +
 .../foundation/RequestObserverVersion1.java        |   52 +
 .../external/foundation/RequestVersion1.java       |   62 +
 .../openapi/external/foundation/TaskVersion1.java  |   61 +
 .../foundation/favorites/FavoriteTaskVersion1.java |   45 +
 .../favorites/FavoritesEditorVersion1.java         |  105 +
 .../external/runner/GradleRunnerFactory.java       |  133 +
 .../runner/GradleRunnerInteractionVersion1.java    |   85 +
 .../external/runner/GradleRunnerVersion1.java      |   35 +
 .../ui/AlternateUIInteractionVersion1.java         |   59 +
 .../openapi/external/ui/BasicGradleUIVersion1.java |  199 +
 ...ommandLineArgumentAlteringListenerVersion1.java |   32 +
 .../external/ui/DualPaneUIInteractionVersion1.java |   30 +
 .../openapi/external/ui/DualPaneUIVersion1.java    |   59 +
 .../openapi/external/ui/GradleTabVersion1.java     |   48 +
 .../external/ui/GradleUIInteractionVersion1.java   |   41 +
 .../external/ui/OutputObserverVersion1.java        |   59 +
 .../openapi/external/ui/OutputUILordVersion1.java  |   70 +
 .../openapi/external/ui/SettingsNodeVersion1.java  |   67 +
 .../ui/SinglePaneUIInteractionVersion1.java        |   30 +
 .../openapi/external/ui/SinglePaneUIVersion1.java  |   40 +
 .../org/gradle/openapi/external/ui/UIFactory.java  |  238 +
 subprojects/osgi/osgi.gradle                       |    4 +-
 .../plugins/osgi/OsgiPluginIntegrationSpec.groovy  |    6 -
 .../plugins/osgi/ContainedVersionAnalyzer.java     |    2 +-
 .../plugins/osgi/DefaultAnalyzerFactory.java       |    3 -
 .../internal/plugins/osgi/DefaultOsgiManifest.java |   14 +-
 .../api/internal/plugins/osgi/OsgiHelper.java      |    3 -
 .../org/gradle/api/plugins/osgi/OsgiManifest.java  |    4 +-
 .../org/gradle/api/plugins/osgi/OsgiPlugin.groovy  |    2 -
 .../api/plugins/osgi/OsgiPluginConvention.java     |    2 -
 .../plugins/osgi/DefaultAnalyzerFactoryTest.java   |    4 +-
 .../plugins/osgi/DefaultOsgiManifestTest.groovy    |    8 +-
 .../plugins/osgi/OsgiPluginConventionTest.groovy   |   12 +-
 .../gradle/api/plugins/osgi/OsgiPluginTest.groovy  |    4 +-
 subprojects/performance/performance.gradle         |  118 +-
 .../performance/CleanBuildPerformanceTest.groovy   |   13 +-
 .../ConfigurationPerformanceTest.groovy            |   47 +
 .../DependencyReportPerformanceTest.groovy         |   15 +-
 .../DependencyResolutionStressTest.groovy          |    5 +-
 .../performance/FirstBuildPerformanceTest.groovy   |   46 +
 .../IdeIntegrationPerformanceTest.groovy           |   16 +-
 .../TestExecutionPerformanceTest.groovy            |   11 +-
 .../UpToDateBuildPerformanceTest.groovy            |   11 +-
 .../src/templates/config-inject/build.gradle       |    2 +-
 .../src/templates/project-with-source/build.gradle |    3 +-
 .../gradle/performance/ResultSpecification.groovy  |   52 +
 .../gradle/performance/fixture/AmountTest.groovy   |  231 -
 .../gradle/performance/fixture/DurationTest.groovy |   59 -
 .../fixture/GCLoggingCollectorTest.groovy          |   55 +
 .../fixture/PerformanceResultsTest.groovy          |  228 +-
 .../fixture/PerformanceTestRunnerTest.groovy       |  105 +
 .../fixture/PrettyCalculatorSpec.groovy            |    5 +-
 .../gradle/performance/fixture/UnitsTest.groovy    |   34 -
 .../gradle/performance/measure/AmountTest.groovy   |  231 +
 .../performance/measure/DataSeriesTest.groovy      |   56 +
 .../gradle/performance/measure/DurationTest.groovy |   59 +
 .../gradle/performance/measure/UnitsTest.groovy    |   34 +
 .../performance/results/ReportGeneratorTest.groovy |   44 +
 .../performance/results/ResultsStoreTest.groovy    |  248 ++
 .../org/gradle/performance/fixture/gc-1.txt        |   19 +
 .../org/gradle/performance/fixture/gc-2.txt        |   16 +
 .../org/gradle/performance/fixture/gc-3.txt        |   16 +
 .../fixture/AbstractPerformanceTest.groovy         |   27 +-
 .../org/gradle/performance/fixture/Amount.java     |  162 -
 .../performance/fixture/BaselineVersion.groovy     |   42 +-
 .../fixture/CompositeDataCollector.java            |   44 +
 .../performance/fixture/CompositeDataReporter.java |   39 +
 .../org/gradle/performance/fixture/DataAmount.java |   37 -
 .../gradle/performance/fixture/DataCollector.java  |    7 +-
 .../org/gradle/performance/fixture/Duration.java   |   45 -
 .../performance/fixture/GCLoggingCollector.java    |  141 +
 .../org/gradle/performance/fixture/Git.groovy      |   42 +
 .../performance/fixture/MeasuredOperation.groovy   |   41 -
 .../fixture/MeasuredOperationList.groovy           |   45 +-
 .../performance/fixture/MemoryInfoCollector.groovy |   11 +-
 .../gradle/performance/fixture/OperationTimer.java |   36 +
 .../performance/fixture/PerformanceResults.groovy  |   83 +-
 .../fixture/PerformanceTestRunner.groovy           |   74 +-
 .../performance/fixture/PrettyCalculator.groovy    |   15 +-
 .../performance/fixture/TestProjectLocator.groovy  |    5 +-
 .../fixture/TextFileDataReporter.groovy            |   13 +-
 .../org/gradle/performance/fixture/Units.java      |  193 -
 .../gradle/performance/fixture/VersionResults.java |   21 +
 .../org/gradle/performance/measure/Amount.java     |  172 +
 .../org/gradle/performance/measure/DataAmount.java |   41 +
 .../org/gradle/performance/measure/DataSeries.java |   68 +
 .../org/gradle/performance/measure/Duration.java   |   45 +
 .../performance/measure/MeasuredOperation.groovy   |   32 +
 .../org/gradle/performance/measure/Units.java      |  193 +
 .../gradle/performance/results/FileRenderer.java   |   34 +
 .../gradle/performance/results/FormatSupport.java  |   56 +
 .../performance/results/HtmlPageGenerator.java     |   54 +
 .../performance/results/IndexPageGenerator.java    |  108 +
 .../performance/results/ReportGenerator.java       |   54 +
 .../gradle/performance/results/ResultsStore.java   |  297 ++
 .../performance/results/TestDataGenerator.java     |   93 +
 .../performance/results/TestExecutionHistory.java  |   83 +
 .../performance/results/TestPageGenerator.java     |  221 +
 .../resources/org/gradle/reporting/report.js       |   63 +
 .../resources/org/gradle/reporting/style.css       |   89 +
 subprojects/plugins/plugins.gradle                 |    9 +-
 .../gradle/api/plugins/BuildSrcPluginTest.groovy   |    2 +-
 .../api/tasks/bundling/JarIntegrationTest.groovy   |  201 +-
 .../tasks/bundling/WarTaskIntegrationTest.groovy   |  181 +-
 .../groovy/GroovyBasePluginIntegrationTest.groovy  |   80 +-
 .../groovy/GroovyPluginIntegrationTest.groovy      |   52 +
 .../AntForkingGroovyCompilerIntegrationTest.groovy |    2 +-
 .../ApiGroovyCompilerIntegrationSpec.groovy        |    4 +-
 .../BasicGroovyCompilerIntegrationSpec.groovy      |    2 +-
 .../compile/GroovyCompilerIntegrationSpec.groovy   |   12 +
 .../compile/InvokeDynamicGroovyCompilerSpec.groovy |    2 +-
 .../JreJavaHomeGroovyIntegrationTest.groovy        |   29 +-
 .../gradle/java/JavaPluginGoodBehaviourTest.groovy |   22 +
 ...ncrementalJavaCompilationIntegrationTest.groovy |  219 +
 .../JreJavaHomeJavaIntegrationTest.groovy          |   30 +-
 .../testing/IncrementalTestIntegrationTest.groovy  |  123 +
 .../testing/SuiteTimestampIntegrationTest.groovy   |   52 +
 .../testing/TestEnvironmentIntegrationTest.groovy  |   14 +-
 .../testing/TestReportIntegrationTest.groovy       |  382 +-
 .../gradle/testing/TestTaskIntegrationTest.groovy  |   51 +
 .../gradle/testing/TestingIntegrationTest.groovy   |  188 +-
 .../CucumberJVMReportIntegrationTest.groovy        |   46 +
 .../AbstractTestFilteringIntegrationTest.groovy    |  187 +
 .../gradle/testing/fixture/JUnitCoverage.groovy    |   26 +
 .../gradle/testing/fixture/TestNGCoverage.groovy   |   22 +
 .../junit/JUnitAssumptionsIntegrationTest.groovy   |   47 +
 .../JUnitCategoriesCoverageIntegrationSpec.groovy  |   88 +
 .../junit/JUnitCategoriesIntegrationSpec.groovy    |   64 +
 .../junit/JUnitCrossVersionIntegrationSpec.groovy  |   61 -
 .../junit/JUnitFilteringIntegrationTest.groovy     |   32 +
 .../JUnitFilteringSupportIntegrationTest.groovy    |   62 +
 ...itIgnoreClassMultiVersionIntegrationSpec.groovy |   46 +
 .../testing/junit/JUnitIntegrationTest.groovy      |   27 +-
 .../junit/JUnitLoggingIntegrationTest.groovy       |    7 +-
 .../junit/JUnitMultiVersionIntegrationSpec.groovy  |   54 +
 ...JUnitTestFilteringSamplesIntegrationTest.groovy |   39 +
 .../testng/SampleTestNGIntegrationTest.groovy      |    7 +-
 .../testng/TestNGFilteringIntegrationTest.groovy   |   32 +
 .../testing/testng/TestNGIntegrationProject.groovy |   67 -
 .../testing/testng/TestNGIntegrationTest.groovy    |   23 +-
 .../testng/TestNGLoggingIntegrationTest.groovy     |  107 +-
 .../TestNGProducesOldReportsIntegrationTest.groovy |   22 +-
 ...TestNGSuiteInitialisationIntegrationTest.groovy |   53 +
 .../testng/TestNGSuiteIntegrationTest.groovy       |   74 +
 ...tNGXmlResultAndHtmlReportIntegrationTest.groovy |  299 +-
 .../shared/build.gradle                            |    2 +-
 .../build.gradle                                   |   10 +
 .../src/main/groovy/GroovyCode.groovy              |    1 +
 .../src/main/groovy/JavaCode.java                  |    3 +
 .../build.gradle                                   |    2 +-
 .../recompilesDependentClasses/build.gradle        |    2 +-
 .../build.gradle                                   |    2 +-
 .../doesNotRunStaleTests/src/test/java/Broken.java |    0
 .../NewMainClass.java                              |    0
 .../executesTestsWhenSourceChanges/NewOk.java      |    0
 .../src/main/java/MainClass.java                   |    0
 .../build.gradle                                   |    0
 .../src/test/java/JUnitExtra.java                  |    0
 .../src/test/java/JUnitTest.java                   |    0
 .../src/test/java/TestNGTest.java                  |    0
 .../shared/build.gradle                            |    0
 .../shared/src/test/java/Ok.java                   |    0
 .../build.gradle                                   |   34 +
 .../src/test/java/HelloStepdefs.java               |   20 +
 .../src/test/java/RunCukesTest.java                |    6 +
 .../src/test/resources/helloworld.feature          |    7 +
 .../supportsAssumptions/build.gradle               |   18 +
 .../test/java/org/gradle/TestWithAssumptions.java  |   32 +
 .../build.gradle                                   |   28 +
 .../src/test/java/org/gradle/CategoryA.java        |   20 +
 .../src/test/java/org/gradle/LocaleHolder.java     |   32 +
 .../src/test/java/org/gradle/Locales.java          |   80 +
 .../src/test/java/org/gradle/SomeLocaleTests.java  |   19 +
 .../test/java/org/gradle/SomeMoreLocalTests.java   |   35 +
 .../canSpecifyExcludesOnly/build.gradle            |   26 +
 .../src/test/java/org/gradle/CatATests.java        |   41 +
 .../src/test/java/org/gradle/CategoryA.java        |   20 +
 .../src/test/java/org/gradle/NoCatTests.java       |   30 +
 .../src/test/java/org/gradle/SomeOtherCat.java     |   20 +
 .../test/java/org/gradle/SomeOtherCatTests.java    |   32 +
 .../src/test/java/org/gradle/SomeTests.java        |   40 +
 .../build.gradle                                   |   28 +
 .../src/test/java/org/gradle/CatACTests.java       |   40 +
 .../src/test/java/org/gradle/CatADTests.java       |   42 +
 .../src/test/java/org/gradle/CatATests.java        |   40 +
 .../src/test/java/org/gradle/CatBTests.java        |   40 +
 .../src/test/java/org/gradle/CatCBTests.java       |   42 +
 .../src/test/java/org/gradle/CatCTests.java        |   40 +
 .../src/test/java/org/gradle/CatDTests.java        |   40 +
 .../src/test/java/org/gradle/CatZTests.java        |   40 +
 .../src/test/java/org/gradle/CategoryA.java        |   20 +
 .../src/test/java/org/gradle/CategoryB.java        |   20 +
 .../src/test/java/org/gradle/CategoryC.java        |   20 +
 .../src/test/java/org/gradle/CategoryD.java        |   20 +
 .../src/test/java/org/gradle/CategoryZ.java        |   20 +
 .../src/test/java/org/gradle/MixedTests.java       |   44 +
 .../src/test/java/org/gradle/NoCatTests.java       |   38 +
 .../reportsUnloadableCategories/build.gradle       |   27 +
 .../src/test/java/org/gradle/SomeTestClass.java    |   13 +
 .../build.gradle                                   |   16 +
 .../src/test/java/org/gradle/SomeTest.java         |   12 +
 .../canHandleClassLevelIgnoredTests/build.gradle   |   23 +
 .../test/java/org/gradle/CustomIgnoredTest.java    |   70 +
 .../src/test/java/org/gradle/IgnoredTest.java      |    0
 .../build.gradle                                   |    6 +-
 .../build.gradle                                   |    6 +-
 .../canRunTestsUsingJUnit3/build.gradle            |   25 +
 .../JUnitIntegrationTest/junit3Tests/build.gradle  |    9 -
 .../JUnitIntegrationTest/junit4Tests/build.gradle  |    9 -
 .../test/java/org/gradle/CustomIgnoredTest.java    |   71 -
 .../src/test/java/org/gradle/Junit4Test.java       |   11 +-
 .../build.gradle                                   |    8 +-
 .../supportsTestCategories/build.gradle            |   16 +
 .../src/test/java/org/gradle/CategoryA.java        |    4 +
 .../src/test/java/org/gradle/CategoryB.java        |    4 +
 .../src/test/java/org/gradle/CategoryC.java        |    4 +
 .../src/test/java/org/gradle/SomeTest.java         |   27 +
 .../canRunTestsUsingJUnit/build.gradle             |    0
 .../shared/build.gradle                            |   24 -
 .../src/test/groovy/org/gradle/TestNGTest.groovy   |   42 -
 .../standardOutputLogging/build.gradle             |   35 -
 .../org/gradle/TestNGStandardOutputTest.groovy     |   27 -
 .../org/gradle/api/distribution/Distribution.java  |   28 +-
 .../distribution/internal/DefaultDistribution.java |    8 +-
 .../internal/DefaultDistributionContainer.java     |   13 +-
 .../distribution/plugins/DistributionPlugin.groovy |   82 +-
 .../gradle/api/internal/java/WebApplication.java   |    2 +-
 .../internal/plugins/BuildConfigurationRule.java   |    2 +-
 .../org/gradle/api/internal/plugins/CleanRule.java |    2 +-
 .../api/internal/plugins/ProcessResources.java     |   21 +-
 .../internal/plugins/StartScriptGenerator.groovy   |   37 +
 .../gradle/api/internal/plugins/UploadRule.java    |    2 +-
 .../gradle/api/internal/tasks/CompileServices.java |   55 +
 .../internal/tasks/DefaultBinariesContainer.java   |   27 -
 .../tasks/DefaultClassDirectoryBinary.java         |  109 -
 .../api/internal/tasks/DefaultClasspath.java       |   38 -
 .../internal/tasks/DefaultFunctionalSourceSet.java |   34 -
 .../api/internal/tasks/DefaultJavaSourceSet.java   |   72 -
 .../internal/tasks/DefaultJvmBinaryContainer.java  |   36 -
 .../internal/tasks/DefaultProjectSourceSet.java    |   32 -
 .../api/internal/tasks/DefaultResourceSet.java     |   53 -
 .../api/internal/tasks/DefaultSourceSet.java       |    2 +-
 .../internal/tasks/DefaultSourceSetContainer.java  |    3 +
 .../api/internal/tasks/DefaultSourceSetOutput.java |    3 -
 .../internal/tasks/SourceSetCompileClasspath.java  |    5 +-
 .../compile/AntDependsStaleClassCleaner.groovy     |    6 +-
 .../tasks/compile/AntGroovyCompiler.groovy         |    2 -
 .../internal/tasks/compile/AntJavaCompiler.groovy  |    7 +-
 .../internal/tasks/compile/ApiGroovyCompiler.java  |    5 +-
 .../api/internal/tasks/compile/ArgCollector.java   |    2 +
 .../api/internal/tasks/compile/ArgWriter.java      |    7 +
 .../tasks/compile/CleaningGroovyCompiler.java      |   40 +
 .../tasks/compile/CleaningJavaCompiler.java        |   50 +
 .../tasks/compile/CleaningJavaCompilerSupport.java |   39 +
 .../tasks/compile/CommandLineJavaCompiler.java     |    4 +-
 .../CommandLineJavaCompilerArgumentsGenerator.java |    7 +-
 .../tasks/compile/DefaultJavaCompilerFactory.java  |   31 +-
 .../tasks/compile/ExecSpecBackedArgCollector.java  |    5 +
 .../GroovyCompileTransformingClassLoader.java      |  124 +
 .../tasks/compile/GroovyCompilerFactory.java       |   11 +-
 .../compile/InProcessJavaCompilerFactory.java      |    4 +-
 .../tasks/compile/IncrementalGroovyCompiler.java   |   38 -
 .../tasks/compile/IncrementalJavaCompiler.java     |   48 -
 .../compile/IncrementalJavaCompilerSupport.java    |   39 -
 .../tasks/compile/NoOpStaleClassCleaner.java       |    2 +
 .../tasks/compile/NormalizingGroovyCompiler.java   |    1 +
 .../tasks/compile/NormalizingJavaCompiler.java     |    1 +
 .../tasks/compile/SimpleStaleClassCleaner.java     |   38 -
 .../internal/tasks/compile/SimpleWorkResult.java   |   30 -
 .../internal/tasks/compile/StaleClassCleaner.java  |   53 -
 .../internal/tasks/compile/SunJavaCompiler.java    |    1 +
 .../tasks/compile/TransformingClassLoader.java     |  152 -
 .../compile/daemon/CompilerClientsManager.java     |   82 +
 .../tasks/compile/daemon/CompilerDaemonClient.java |   22 +-
 .../compile/daemon/CompilerDaemonFactory.java      |    5 +-
 .../compile/daemon/CompilerDaemonManager.java      |   96 +-
 .../tasks/compile/daemon/CompilerDaemonServer.java |    3 +-
 .../daemon/CompilerDaemonServerProtocol.java       |    2 +-
 .../compile/daemon/CompilerDaemonStarter.java      |   68 +
 .../tasks/compile/daemon/DaemonGroovyCompiler.java |    2 +-
 .../tasks/compile/daemon/DaemonJavaCompiler.java   |    6 +-
 .../daemon/InProcessCompilerDaemonFactory.java     |    7 +-
 .../compile/incremental/AllFromJarRebuildInfo.java |   41 +
 .../tasks/compile/incremental/ClassDependents.java |   44 +
 .../compile/incremental/ClassNameProvider.java     |   38 +
 .../compile/incremental/DefaultRebuildInfo.java    |   53 +
 .../tasks/compile/incremental/DummySerializer.java |   51 +
 .../incremental/IncrementalCompilationSupport.java |   51 +
 .../compile/incremental/InputOutputMapper.java     |   60 +
 .../tasks/compile/incremental/JarArchive.java      |   30 +
 .../compile/incremental/JarChangeProcessor.java    |   56 +
 .../tasks/compile/incremental/JarDelta.java        |   23 +
 .../tasks/compile/incremental/JarSnapshot.java     |   43 +
 .../compile/incremental/JarSnapshotCache.java      |   53 +
 .../compile/incremental/JarSnapshotFeeder.java     |   57 +
 .../tasks/compile/incremental/JarSnapshotter.java  |   46 +
 .../tasks/compile/incremental/JavaSourceClass.java |   41 +
 .../compile/incremental/OutputClassMapper.java     |   32 +
 .../tasks/compile/incremental/RebuildInfo.java     |   25 +
 .../compile/incremental/SelectiveCompilation.java  |  141 +
 .../compile/incremental/SelectiveJavaCompiler.java |   66 +
 .../incremental/SpecificClassesRebuildInfo.java    |   23 +
 .../incremental/analyzer/ClassAnalysis.java        |   37 +
 .../analyzer/ClassDependenciesAnalyzer.java        |   74 +
 .../analyzer/ClassDependenciesVisitor.java         |   58 +
 .../incremental/analyzer/ClassRelevancyFilter.java |   30 +
 .../incremental/graph/ClassDependencyInfo.java     |   59 +
 .../graph/ClassDependencyInfoExtractor.java        |   74 +
 .../graph/ClassDependencyInfoSerializer.java       |   47 +
 .../tasks/compile/jdk6/Jdk6JavaCompiler.java       |   26 +-
 .../tasks/testing/DefaultJUnitXmlReport.java       |   41 +
 .../tasks/testing/DefaultTestClassRunInfo.java     |    3 -
 .../tasks/testing/DefaultTestOutputEvent.java      |   28 +
 .../tasks/testing/DefaultTestTaskReports.java      |   46 +
 .../tasks/testing/NoMatchingTestsReporter.java     |   42 +
 .../tasks/testing/SuiteTestClassProcessor.java     |    5 +-
 .../internal/tasks/testing/TestClassProcessor.java |    4 +-
 .../internal/tasks/testing/TestClassRunInfo.java   |    3 -
 .../internal/tasks/testing/TestCompleteEvent.java  |    2 +
 .../api/internal/tasks/testing/TestFramework.java  |    5 +-
 .../api/internal/tasks/testing/TestStartEvent.java |    3 +
 .../detection/AbstractTestFrameworkDetector.java   |    3 -
 .../detection/ClassFileExtractionManager.java      |    2 -
 .../testing/detection/DefaultTestClassScanner.java |    2 -
 .../testing/detection/DefaultTestExecuter.java     |    2 -
 .../testing/detection/JarFilePackageListener.java  |    3 -
 .../testing/detection/JarFilePackageLister.java    |    3 -
 .../tasks/testing/detection/TestClassVisitor.java  |    2 -
 .../tasks/testing/detection/TestExecuter.java      |    3 -
 .../testing/detection/TestFrameworkDetector.java   |    3 -
 .../tasks/testing/filter/DefaultTestFilter.java    |   54 +
 .../tasks/testing/filter/TestSelectionMatcher.java |   62 +
 .../tasks/testing/junit/CategoryFilter.java        |  112 +
 .../tasks/testing/junit/JUnitDetector.java         |    3 -
 .../internal/tasks/testing/junit/JUnitSpec.java    |   50 +
 .../testing/junit/JUnitTestClassDetecter.java      |    3 -
 .../testing/junit/JUnitTestClassExecuter.java      |   62 +-
 .../testing/junit/JUnitTestClassProcessor.java     |   10 +-
 .../tasks/testing/junit/JUnitTestEventAdapter.java |    6 +-
 .../tasks/testing/junit/JUnitTestFramework.java    |   58 +-
 .../testing/junit/JUnitTestMethodDetecter.java     |    3 -
 .../tasks/testing/junit/report/AllTestResults.java |   13 +-
 .../testing/junit/report/ClassPageRenderer.java    |   33 +-
 .../testing/junit/report/ClassTestResults.java     |   14 +-
 .../testing/junit/report/CompositeTestResults.java |   75 +-
 .../testing/junit/report/DefaultTestReport.java    |   41 +-
 .../junit/report/LocaleSafeDecimalFormat.java      |    3 -
 .../testing/junit/report/OverviewPageRenderer.java |   13 +-
 .../testing/junit/report/PackagePageRenderer.java  |    9 +-
 .../testing/junit/report/PackageTestResults.java   |   12 +-
 .../tasks/testing/junit/report/PageRenderer.java   |   38 +-
 .../tasks/testing/junit/report/TestFailure.java    |   34 -
 .../tasks/testing/junit/report/TestResult.java     |   17 +-
 .../junit/result/AggregateTestResultsProvider.java |  120 +-
 .../result/Binary2JUnitXmlReportGenerator.java     |   13 +-
 .../BinaryResultBackedTestResultsProvider.java     |   36 +-
 .../testing/junit/result/CachingFileWriter.java    |  100 -
 .../junit/result/InMemoryTestResultsProvider.java  |   63 +
 .../testing/junit/result/JUnitXmlResultWriter.java |   90 +-
 .../testing/junit/result/TestClassResult.java      |   29 +-
 .../tasks/testing/junit/result/TestFailure.java    |   41 +
 .../testing/junit/result/TestMethodResult.java     |   47 +-
 .../junit/result/TestOutputAssociation.java        |   22 +
 .../testing/junit/result/TestOutputSerializer.java |   90 -
 .../testing/junit/result/TestOutputStore.java      |  388 ++
 .../junit/result/TestReportDataCollector.java      |  125 +-
 .../testing/junit/result/TestResultSerializer.java |  135 +-
 .../testing/junit/result/TestResultsProvider.java  |   23 +-
 .../tasks/testing/logging/AbstractTestLogger.java  |    2 +-
 .../processors/MaxNParallelTestClassProcessor.java |    2 +-
 .../internal/tasks/testing/results/TestState.java  |    5 -
 .../testing/results/UnknownTestDescriptor.java     |   10 +-
 .../tasks/testing/testng/TestNGDetector.java       |    3 -
 .../testng/TestNGListenerAdapterFactory.java       |   25 +-
 .../internal/tasks/testing/testng/TestNGSpec.java  |    9 +-
 .../testing/testng/TestNGTestClassDetecter.java    |    3 -
 .../testing/testng/TestNGTestClassProcessor.java   |   43 +-
 .../tasks/testing/testng/TestNGTestFramework.java  |   25 +-
 .../testing/testng/TestNGTestMethodDetecter.java   |    3 -
 .../testng/TestNGTestResultProcessorAdapter.java   |   42 +-
 .../testng/UnrepresentableParameterException.java  |   32 +
 .../testing/worker/ForkingTestClassProcessor.java  |   39 +-
 .../tasks/testing/worker/TestEventSerializer.java  |  265 ++
 .../internal/tasks/testing/worker/TestWorker.java  |    4 +-
 .../testing/worker/WorkerTestClassProcessor.java   |    6 +-
 .../org/gradle/api/java/archives/Attributes.java   |    2 -
 .../api/java/archives/ManifestException.java       |    2 -
 .../java/archives/internal/DefaultAttributes.java  |    3 -
 .../java/archives/internal/DefaultManifest.java    |    7 +-
 .../internal/DefaultManifestMergeDetails.java      |    3 -
 .../gradle/api/plugins/ApplicationPlugin.groovy    |   18 +-
 .../api/plugins/ApplicationPluginConvention.groovy |    7 +-
 .../groovy/org/gradle/api/plugins/BasePlugin.java  |   54 +-
 .../gradle/api/plugins/BasePluginConvention.groovy |    5 +-
 .../org/gradle/api/plugins/GroovyBasePlugin.java   |   91 +-
 .../org/gradle/api/plugins/GroovyPlugin.java       |    4 +-
 .../org/gradle/api/plugins/JavaBasePlugin.java     |   83 +-
 .../org/gradle/api/plugins/JavaLanguagePlugin.java |   77 +-
 .../plugins/JavaLibraryDistributionPlugin.groovy   |    2 -
 .../groovy/org/gradle/api/plugins/JavaPlugin.java  |   12 +-
 .../gradle/api/plugins/JavaPluginConvention.groovy |   11 +-
 .../org/gradle/api/plugins/JvmLanguagePlugin.java  |  128 -
 .../org/gradle/api/plugins/LanguageBasePlugin.java |   60 -
 .../groovy/org/gradle/api/plugins/WarPlugin.java   |   10 +-
 .../org/gradle/api/tasks/BinariesContainer.java    |   27 -
 .../org/gradle/api/tasks/ClassDirectoryBinary.java |   49 -
 .../groovy/org/gradle/api/tasks/Classpath.java     |   28 -
 .../org/gradle/api/tasks/FunctionalSourceSet.java  |   27 -
 .../groovy/org/gradle/api/tasks/GroovyRuntime.java |  131 +
 .../groovy/org/gradle/api/tasks/JavaSourceSet.java |   24 -
 .../org/gradle/api/tasks/JvmBinaryContainer.java   |   27 -
 .../org/gradle/api/tasks/JvmLanguageSourceSet.java |   26 -
 .../org/gradle/api/tasks/LanguageSourceSet.java    |   33 -
 .../org/gradle/api/tasks/ProjectSourceSet.java     |   26 -
 .../groovy/org/gradle/api/tasks/ResourceSet.java   |   24 -
 .../org/gradle/api/tasks/SourceSetContainer.java   |    4 +
 .../main/groovy/org/gradle/api/tasks/Upload.java   |  132 +
 .../tasks/application/CreateStartScripts.groovy    |   15 +-
 .../org/gradle/api/tasks/bundling/Jar.groovy       |   22 +-
 .../org/gradle/api/tasks/bundling/War.groovy       |    9 +-
 .../gradle/api/tasks/compile/AbstractCompile.java  |    1 -
 .../gradle/api/tasks/compile/AbstractOptions.java  |    6 +-
 .../gradle/api/tasks/compile/BaseForkOptions.java  |    3 -
 .../org/gradle/api/tasks/compile/Compile.java      |  143 +-
 .../gradle/api/tasks/compile/CompileOptions.java   |   47 +-
 .../org/gradle/api/tasks/compile/DebugOptions.java |    2 -
 .../gradle/api/tasks/compile/DependOptions.java    |    2 -
 .../org/gradle/api/tasks/compile/ForkOptions.java  |    2 -
 .../gradle/api/tasks/compile/GroovyCompile.java    |   21 +-
 .../api/tasks/compile/GroovyCompileOptions.java    |    5 +-
 .../api/tasks/compile/GroovyForkOptions.java       |    2 -
 .../org/gradle/api/tasks/compile/JavaCompile.java  |    8 +
 .../gradle/api/tasks/javadoc/AntGroovydoc.groovy   |    3 -
 .../org/gradle/api/tasks/javadoc/AntJavadoc.groovy |    3 +-
 .../org/gradle/api/tasks/javadoc/Groovydoc.java    |   16 +-
 .../org/gradle/api/tasks/javadoc/Javadoc.java      |    8 +-
 .../gradle/api/tasks/testing/JUnitXmlReport.java   |   39 +
 .../groovy/org/gradle/api/tasks/testing/Test.java  |  324 +-
 .../gradle/api/tasks/testing/TestDescriptor.java   |    3 +
 .../org/gradle/api/tasks/testing/TestFilter.java   |   87 +
 .../org/gradle/api/tasks/testing/TestListener.java |    4 +-
 .../org/gradle/api/tasks/testing/TestReport.java   |   39 +-
 .../gradle/api/tasks/testing/TestTaskReports.java  |   42 +
 .../api/tasks/testing/junit/JUnitOptions.groovy    |   51 +
 .../api/tasks/testing/junit/JUnitOptions.java      |   25 -
 .../api/tasks/testing/testng/TestNGOptions.groovy  |   40 +-
 .../org/gradle/api/tasks/wrapper/Wrapper.java      |  280 --
 .../external/javadoc/CoreJavadocOptions.java       |    2 -
 .../external/javadoc/JavadocMemberLevel.java       |    2 -
 .../external/javadoc/JavadocOfflineLink.java       |    2 -
 .../external/javadoc/JavadocOptionFileOption.java  |    1 -
 .../external/javadoc/JavadocOutputLevel.java       |    2 -
 .../external/javadoc/MinimalJavadocOptions.java    |    2 -
 .../javadoc/OptionLessJavadocOptionFileOption.java |    1 -
 .../javadoc/StandardJavadocDocletOptions.java      |   12 +-
 .../internal/AbstractJavadocOptionFileOption.java  |    1 -
 .../AbstractListJavadocOptionFileOption.java       |    3 +-
 .../internal/BooleanJavadocOptionFileOption.java   |    2 -
 .../internal/EnumJavadocOptionFileOption.java      |    1 -
 .../internal/FileJavadocOptionFileOption.java      |    2 -
 .../internal/GroupsJavadocOptionFileOption.java    |    2 -
 .../javadoc/internal/JavadocExecHandleBuilder.java |   14 +-
 .../javadoc/internal/JavadocOptionFile.java        |    3 -
 .../javadoc/internal/JavadocOptionFileWriter.java  |    7 +-
 .../internal/JavadocOptionFileWriterContext.java   |    5 +-
 .../LinksOfflineJavadocOptionFileOption.java       |    7 +-
 .../MultilineStringsJavadocOptionFileOption.java   |    7 +-
 .../OptionLessStringsJavadocOptionFileOption.java  |    7 +-
 .../internal/PathJavadocOptionFileOption.java      |    5 +-
 .../internal/StringJavadocOptionFileOption.java    |    3 -
 .../internal/StringsJavadocOptionFileOption.java   |    7 +-
 .../META-INF/gradle-plugins/jvm-lang.properties    |    2 +-
 .../META-INF/gradle-plugins/lang-base.properties   |    2 +-
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../api/internal/plugins/unixStartScript.txt       |    2 +-
 .../api/internal/plugins/windowsStartScript.txt    |    2 +-
 .../internal/tasks/testing/junit/report/style.css  |    6 +-
 .../plugins/DistributionPluginTest.groovy          |    4 +-
 .../plugins/StartScriptGeneratorTest.groovy        |   99 +
 .../api/internal/tasks/DefaultSourceSetTest.groovy |    2 +-
 .../tasks/compile/CleaningJavaCompilerTest.groovy  |   61 +
 .../compile/DefaultJavaCompilerFactoryTest.groovy  |    5 +-
 ...GroovyCompileTransformingClassLoaderTest.groovy |   96 +
 .../InProcessJavaCompilerFactoryTest.groovy        |    2 +-
 .../compile/IncrementalJavaCompilerTest.groovy     |   60 -
 .../compile/SimpleStaleClassCleanerTest.groovy     |   20 +
 .../compile/TransformingClassLoaderTest.groovy     |   96 -
 .../daemon/CompilerClientsManagerTest.groovy       |   97 +
 .../daemon/CompilerDaemonManagerTest.groovy        |  100 +
 .../incremental/AllFromJarRebuildInfoTest.groovy   |   44 +
 .../incremental/ClassNameProviderTest.groovy       |   42 +
 .../IncrementalCompilationSupportTest.groovy       |   52 +
 .../incremental/InputOutputMapperTest.groovy       |   53 +
 .../incremental/JarSnapshotCacheTest.groovy        |   50 +
 .../incremental/JarSnapshotFeederTest.groovy       |   72 +
 .../compile/incremental/JarSnapshotTest.groovy     |   49 +
 .../compile/incremental/JarSnapshotterTest.groovy  |   52 +
 .../compile/incremental/JavaSourceClassTest.groovy |   38 +
 .../incremental/OutputClassMapperTest.groovy       |   28 +
 .../analyzer/AccessedFromPrivateClass.java         |   24 +
 .../analyzer/ClassDependenciesAnalyzerTest.groovy  |   74 +
 .../analyzer/HasNonPrivateConstants.java           |   21 +
 .../incremental/analyzer/HasPrivateConstants.java  |   22 +
 .../incremental/analyzer/HasPublicConstants.java   |   21 +
 .../compile/incremental/analyzer/SomeClass.java    |   35 +
 .../incremental/analyzer/SomeOtherClass.java       |   24 +
 .../analyzer/UsedByNonPrivateConstantsClass.java   |   20 +
 .../incremental/analyzer/YetAnotherClass.java      |   20 +
 .../analyzer/annotations/SomeClassAnnotation.java  |   24 +
 .../annotations/SomeRuntimeAnnotation.java         |   24 +
 .../analyzer/annotations/SomeSourceAnnotation.java |   24 +
 .../annotations/UsesAnnotationInField.java         |   21 +
 .../analyzer/annotations/UsesClassAnnotation.java  |   20 +
 .../annotations/UsesRuntimeAnnotation.java         |   20 +
 .../analyzer/annotations/UsesSourceAnnotation.java |   20 +
 .../graph/ClassDependencyInfoExtractorTest.groovy  |   37 +
 .../graph/ClassDependencyInfoSerializerTest.groovy |   38 +
 .../tasks/testing/AbstractTestFrameworkTest.java   |   68 -
 .../testing/filter/DefaultTestFilterTest.groovy    |   53 +
 .../testing/filter/TestSelectionMatcherTest.groovy |  129 +
 .../junit/JUnitTestClassProcessorData.groovy       |  291 ++
 .../junit/JUnitTestClassProcessorTest.groovy       | 1098 +----
 .../testing/junit/JUnitTestFrameworkTest.java      |   99 -
 .../testing/junit/report/AllTestResultsTest.groovy |    4 +-
 .../junit/report/ClassTestResultsTest.groovy       |    4 +-
 .../junit/report/CompositeTestResultsTest.groovy   |   64 +-
 .../junit/report/DefaultTestReportTest.groovy      |  764 ++--
 .../junit/report/LocaleSafeDecimalFormatTest.java  |    3 -
 .../result/AggregateTestResultsProviderTest.groovy |  187 +
 .../Binary2JUnitXmlReportGeneratorSpec.groovy      |   23 +-
 .../junit/result/CachingFileWriterSpec.groovy      |   83 -
 .../junit/result/JUnitXmlResultWriterSpec.groovy   |  124 +-
 .../junit/result/TestClassResultSpec.groovy        |   11 +-
 .../junit/result/TestOutputSerializerTest.groovy   |   72 -
 .../junit/result/TestOutputStoreSpec.groovy        |  180 +
 .../result/TestReportDataCollectorSpec.groovy      |  215 +-
 .../junit/result/TestResultSerializerTest.groovy   |   54 +-
 .../logging/FullExceptionFormatterTest.groovy      |    6 +-
 .../logging/ShortExceptionFormatterTest.groovy     |    4 +-
 .../tasks/testing/logging/SimpleTestResult.groovy  |   31 -
 .../testing/logging/TestEventLoggerTest.groovy     |    6 +-
 .../testing/results/DefaultTestResultTest.groovy   |    3 -
 .../testng/TestNGTestClassProcessorTest.groovy     |  316 +-
 .../testing/testng/TestNGTestFrameworkTest.groovy  |   26 +-
 .../worker/ForkingTestClassProcessorTest.groovy    |   46 +
 .../worker/ForkingTestClassProcessorTest.java      |  141 -
 .../testing/worker/TestEventSerializerTest.groovy  |  202 +
 .../tasks/testing/worker/TestWorkerTest.groovy     |    3 +
 .../archives/internal/DefaultAttributesTest.groovy |    5 +-
 .../internal/DefaultManifestMergeSpecTest.groovy   |    3 -
 .../archives/internal/DefaultManifestTest.groovy   |    3 -
 .../api/plugins/ApplicationPluginTest.groovy       |   31 +-
 .../api/plugins/BasePluginConventionTest.groovy    |    8 +-
 .../org/gradle/api/plugins/BasePluginTest.groovy   |   49 +-
 .../gradle/api/plugins/GroovyBasePluginTest.groovy |   33 +-
 .../org/gradle/api/plugins/GroovyPluginTest.groovy |    9 +-
 .../gradle/api/plugins/JavaBasePluginTest.groovy   |   79 +-
 .../api/plugins/JavaLanguagePluginTest.groovy      |   17 +-
 .../JavaLibraryDistributionPluginTest.groovy       |    4 +-
 .../api/plugins/JavaPluginConventionTest.groovy    |    7 +-
 .../org/gradle/api/plugins/JavaPluginTest.groovy   |   68 +-
 .../api/plugins/JvmLanguagePluginTest.groovy       |   64 +-
 .../api/plugins/LanguageBasePluginTest.groovy      |   29 +-
 .../org/gradle/api/plugins/WarPluginTest.groovy    |   14 +-
 .../org/gradle/api/tasks/GroovyRuntimeTest.groovy  |  116 +
 .../groovy/org/gradle/api/tasks/UploadTest.groovy  |   32 +
 .../application/CreateStartScriptsTest.groovy      |    4 +-
 .../org/gradle/api/tasks/bundling/JarTest.groovy   |    4 +-
 .../org/gradle/api/tasks/bundling/WarTest.groovy   |    4 +-
 .../api/tasks/compile/CompileOptionsTest.groovy    |    8 +-
 .../api/tasks/compile/DebugOptionsTest.groovy      |    3 -
 .../api/tasks/compile/ForkOptionsTest.groovy       |    6 +-
 .../tasks/compile/GroovyCompileOptionsTest.groovy  |    6 +-
 .../api/tasks/compile/GroovyCompileTest.java       |   16 +-
 .../api/tasks/compile/GroovyForkOptionsTest.groovy |    6 +-
 .../gradle/api/tasks/compile/JavaCompileTest.java  |    3 -
 .../gradle/api/tasks/javadoc/GroovydocTest.java    |    7 +-
 .../org/gradle/api/tasks/javadoc/JavadocTest.java  |    2 +-
 .../testing/AbstractTestFrameworkOptionsTest.java  |    3 -
 .../gradle/api/tasks/testing/TestReportTest.groovy |    6 +-
 .../gradle/api/tasks/testing/TestTaskSpec.groovy   |   19 +-
 .../org/gradle/api/tasks/testing/TestTest.java     |   30 +-
 .../tasks/testing/testng/TestNGOptionsTest.groovy  |   13 +-
 .../org/gradle/api/tasks/wrapper/WrapperTest.java  |  164 -
 .../javadoc/StandardJavadocDocletOptionsTest.java  |   20 +-
 .../BooleanJavadocOptionFileOptionTest.java        |    9 +-
 .../internal/EnumJavadocOptionFileOptionTest.java  |    7 +-
 .../internal/FileJavadocOptionFileOptionTest.java  |    7 +-
 .../GroupsJavadocOptionFileOptionTest.java         |    7 +-
 .../internal/JavadocExecHandleBuilderTest.groovy   |   35 +-
 .../javadoc/internal/JavadocOptionFileTest.java    |    3 -
 .../JavadocOptionFileWriterContextTest.java        |    7 +-
 .../LinksOfflineJavadocOptionFileOptionTest.java   |    7 +-
 ...ultilineStringsJavadocOptionFileOptionTest.java |    5 +-
 ...tionLessStringsJavadocOptionFileOptionTest.java |    5 +-
 .../internal/PathJavadocOptionFileOptionTest.java  |    7 +-
 .../StringJavadocOptionFileOptionTest.java         |    5 +-
 .../StringsJavadocOptionFileOptionTest.java        |    5 +-
 .../tasks/testing/BuildableTestMethodResult.groovy |   71 +
 .../testing/BuildableTestResultsProvider.groovy    |  163 +
 .../tasks/testing/MethodTestOutputEvent.groovy     |   29 +
 .../internal/tasks/testing/SimpleTestResult.groovy |   35 +
 .../junit/report/HtmlTestResultsFixture.groovy     |  285 ++
 .../api/tasks/compile/AbstractCompileTest.java     |    5 +-
 subprojects/publish/publish.gradle                 |    4 +-
 .../gradle/api/publish/PublicationContainer.java   |   55 +-
 .../gradle/api/publish/PublishingExtension.java    |   23 +
 .../internal/CompositePublicationFactory.java      |   39 -
 .../internal/DefaultPublicationContainer.java      |   25 +-
 .../internal/GroovyPublicationContainer.groovy     |   35 -
 .../ProjectDependencyPublicationResolver.java      |   57 +
 .../internal/PublicationContainerInternal.java     |   23 -
 .../api/publish/internal/PublicationFactory.java   |   22 -
 .../api/publish/internal/PublicationInternal.java  |   23 +
 .../api/publish/internal/PublishServices.java      |   32 +
 .../api/publish/plugins/PublishingPlugin.java      |   44 +-
 ...e.internal.service.scopes.PluginServiceRegistry |    1 +
 .../DefaultPublicationContainerTest.groovy         |   48 +-
 ...ProjectDependencyPublicationResolverTest.groovy |  134 +
 .../publish/plugins/PublishingPluginTest.groovy    |   10 +-
 subprojects/reporting/reporting.gradle             |    3 +-
 .../internal/TaskReportContainerIntegTest.groovy   |    0
 .../BuildDashboardPluginIntegrationTest.groovy     |  328 +-
 .../api/plugins/ReportingBasePluginConvention.java |    3 +-
 .../api/reporting/BuildDashboardReports.java       |    8 +-
 .../gradle/api/reporting/ConfigurableReport.java   |   34 +
 .../org/gradle/api/reporting/DirectoryReport.java  |   47 +
 .../api/reporting/GenerateBuildDashboard.java      |   60 +-
 .../groovy/org/gradle/api/reporting/Report.java    |   20 +-
 .../org/gradle/api/reporting/ReportContainer.java  |   14 +-
 .../groovy/org/gradle/api/reporting/Reporting.java |   40 +-
 .../gradle/api/reporting/ReportingExtension.java   |   22 +-
 .../org/gradle/api/reporting/SingleFileReport.java |   12 +-
 .../internal/BuildDashboardGenerator.java          |   70 +-
 .../internal/DefaultBuildDashboardReports.java     |   14 +-
 .../reporting/internal/DefaultReportContainer.java |    5 +-
 .../TaskGeneratedSingleDirectoryReport.java        |   45 +
 .../reporting/plugins/BuildDashboardPlugin.groovy  |   58 -
 .../reporting/plugins/BuildDashboardPlugin.java    |   73 +
 .../org/gradle/api/reporting/internal/style.css    |    3 +
 .../ReportingBasePluginConventionTest.groovy       |   64 +
 .../api/plugins/ReportingBasePluginTest.groovy     |   46 +
 .../reporting/GenerateBuildDashboardSpec.groovy    |    4 +-
 .../internal/BuildDashboardGeneratorSpec.groovy    |   22 +-
 .../internal/DefaultReportContainerTest.groovy     |   12 +-
 subprojects/resources/resources.gradle             |   11 +
 .../org/gradle/internal/filestore/FileStore.java   |   32 +
 .../internal/filestore/FileStoreSearcher.java      |   27 +
 .../local/AbstractLocallyAvailableResource.java    |   55 +
 .../local/DefaultLocallyAvailableResource.java     |   42 +
 .../resource/local/LocallyAvailableResource.java   |   31 +
 .../DefaultLocallyAvailableResourceTest.groovy     |   66 +
 subprojects/scala/scala.gradle                     |   13 +-
 .../integtests/ScalaPluginGoodBehaviourTest.groovy |    0
 .../integtests/ScalaProjectIntegrationTest.java    |    0
 .../SamplesMixedJavaAndScalaIntegrationTest.groovy |   74 +
 ...plesScalaCustomizedLayoutIntegrationTest.groovy |   50 +
 .../SamplesScalaQuickstartIntegrationTest.groovy   |   66 +
 .../samples/SamplesScalaZincIntegrationTest.groovy |    0
 .../scala/ScalaBasePluginIntegrationTest.groovy    |   90 +-
 .../ZincScalaCompilerJdk6IntegrationTest.groovy    |    2 +-
 .../JreJavaHomeScalaIntegrationTest.groovy         |   12 +-
 .../scala/test/ScalaTestIntegrationTest.groovy     |    4 +-
 .../internal/tasks/scala/AntScalaCompiler.groovy   |    2 +-
 .../tasks/scala/CleaningScalaCompiler.java         |   46 +
 .../internal/tasks/scala/DaemonScalaCompiler.java  |    2 +-
 .../tasks/scala/IncrementalScalaCompiler.java      |   44 -
 .../tasks/scala/NormalizingScalaCompiler.java      |    4 +-
 .../internal/tasks/scala/ScalaCompilerFactory.java |    8 +-
 .../tasks/scala/jdk6/ZincScalaCompiler.java        |   28 +-
 .../api/plugins/scala/ScalaBasePlugin.groovy       |  144 +-
 .../gradle/api/plugins/scala/ScalaPlugin.groovy    |    5 +-
 .../org/gradle/api/tasks/ScalaRuntime.groovy       |  159 +
 .../org/gradle/api/tasks/scala/ScalaCompile.java   |   13 +-
 .../api/plugins/scala/ScalaBasePluginTest.groovy   |  142 +-
 .../api/plugins/scala/ScalaPluginTest.groovy       |   12 +-
 .../org/gradle/api/tasks/ScalaRuntimeTest.groovy   |  124 +
 .../gradle/api/tasks/scala/ScalaCompileTest.java   |    9 +-
 subprojects/signing/signing.gradle                 |    2 +-
 .../gradle/plugins/signing/SigningExtension.groovy |    8 +-
 .../plugins/signing/SigningPluginConvention.groovy |    8 +-
 .../plugins/signing/SigningProjectSpec.groovy      |    4 +-
 subprojects/sonar/sonar.gradle                     |    3 +-
 .../plugins/sonar/SonarSmokeIntegrationTest.groovy |   16 +-
 .../runner/SonarRunnerSmokeIntegrationTest.groovy  |   16 +-
 .../shared/javaProject/build.gradle                |    2 -
 .../shared/javaProjectWithJacoco/build.gradle      |    5 +
 .../org/gradle/test/javaProject/Production1.java   |    0
 .../org/gradle/test/javaProject/Production10.java  |    0
 .../org/gradle/test/javaProject/Production2.java   |    0
 .../org/gradle/test/javaProject/Production3.java   |    0
 .../org/gradle/test/javaProject/Production4.java   |    0
 .../org/gradle/test/javaProject/Production5.java   |    0
 .../org/gradle/test/javaProject/Production6.java   |    0
 .../org/gradle/test/javaProject/Production7.java   |    0
 .../org/gradle/test/javaProject/Production8.java   |    0
 .../org/gradle/test/javaProject/Production9.java   |    0
 .../gradle/test/javaProject/productionResource.xml |    0
 .../java/org/gradle/test/javaProject/Test1.java    |    0
 .../java/org/gradle/test/javaProject/Test10.java   |    0
 .../java/org/gradle/test/javaProject/Test2.java    |    0
 .../java/org/gradle/test/javaProject/Test3.java    |    0
 .../java/org/gradle/test/javaProject/Test4.java    |    0
 .../java/org/gradle/test/javaProject/Test5.java    |    0
 .../java/org/gradle/test/javaProject/Test6.java    |    0
 .../java/org/gradle/test/javaProject/Test7.java    |    0
 .../java/org/gradle/test/javaProject/Test8.java    |    0
 .../java/org/gradle/test/javaProject/Test9.java    |    0
 .../org/gradle/test/javaProject/testResource.xml   |    0
 .../shared/settings.gradle                         |    2 +-
 .../shared/javaProject/build.gradle                |    2 -
 .../shared/javaProjectWithJacoco/build.gradle      |    5 +
 .../org/gradle/test/javaProject/Production1.java   |    0
 .../org/gradle/test/javaProject/Production10.java  |    0
 .../org/gradle/test/javaProject/Production2.java   |    0
 .../org/gradle/test/javaProject/Production3.java   |    0
 .../org/gradle/test/javaProject/Production4.java   |    0
 .../org/gradle/test/javaProject/Production5.java   |    0
 .../org/gradle/test/javaProject/Production6.java   |    0
 .../org/gradle/test/javaProject/Production7.java   |    0
 .../org/gradle/test/javaProject/Production8.java   |    0
 .../org/gradle/test/javaProject/Production9.java   |    0
 .../gradle/test/javaProject/productionResource.xml |    0
 .../java/org/gradle/test/javaProject/Test1.java    |    0
 .../java/org/gradle/test/javaProject/Test10.java   |    0
 .../java/org/gradle/test/javaProject/Test2.java    |    0
 .../java/org/gradle/test/javaProject/Test3.java    |    0
 .../java/org/gradle/test/javaProject/Test4.java    |    0
 .../java/org/gradle/test/javaProject/Test5.java    |    0
 .../java/org/gradle/test/javaProject/Test6.java    |    0
 .../java/org/gradle/test/javaProject/Test7.java    |    0
 .../java/org/gradle/test/javaProject/Test8.java    |    0
 .../java/org/gradle/test/javaProject/Test9.java    |    0
 .../org/gradle/test/javaProject/testResource.xml   |    0
 .../shared/settings.gradle                         |    2 +-
 .../gradle/api/plugins/sonar/SonarAnalyze.groovy   |    2 +-
 .../gradle/api/plugins/sonar/SonarPlugin.groovy    |   17 +-
 .../api/sonar/runner/SonarRunnerPlugin.groovy      |   39 +-
 .../api/plugins/sonar/SonarAnalyzeTest.groovy      |    2 +-
 .../api/plugins/sonar/SonarPluginTest.groovy       |   27 +-
 .../api/sonar/runner/SonarRunnerPluginTest.groovy  |   38 +-
 .../tooling/AutoTestedSamplesToolingApiTest.groovy |    5 +-
 .../ConcurrentToolingApiIntegrationSpec.groovy     |    4 +-
 .../SamplesToolingApiIntegrationTest.groovy        |   44 +-
 .../ToolingApiClasspathIntegrationTest.groovy      |    9 +-
 .../tooling/ToolingApiIntegrationTest.groovy       |   23 +-
 .../tooling/ToolingApiRemoteIntegrationTest.groovy |   25 +-
 ...lingApiUnsupportedVersionIntegrationTest.groovy |   62 +
 .../tooling/fixture/ConfigurableOperation.groovy   |    9 +-
 .../fixture/ExternalToolingApiDistribution.groovy  |   18 +-
 .../tooling/fixture/IncludeAllPermutations.java    |   23 -
 .../tooling/fixture/MaxTargetGradleVersion.java    |   25 -
 .../tooling/fixture/MinTargetGradleVersion.java    |   25 -
 .../tooling/fixture/MinToolingApiVersion.java      |   25 -
 .../tooling/fixture/TargetGradleVersion.java       |   31 +
 .../TestClasspathToolingApiDistribution.groovy     |    7 +-
 .../integtests/tooling/fixture/ToolingApi.groovy   |   36 +-
 .../ToolingApiCompatibilitySuiteRunner.groovy      |   79 +-
 .../tooling/fixture/ToolingApiDistribution.groovy  |    6 +-
 .../fixture/ToolingApiDistributionResolver.groovy  |   37 +-
 .../tooling/fixture/ToolingApiSpecification.groovy |   31 +-
 .../tooling/fixture/ToolingApiVersion.java         |   31 +
 .../m3/ToolingApiLoggingCrossVersionSpec.groovy    |  103 +
 ...piEclipseLinkedResourcesCrossVersionSpec.groovy |   11 +-
 ...ngApiEclipseMinimalModelCrossVersionSpec.groovy |    4 +-
 ...EclipseModelWithFlatRepoCrossVersionSpec.groovy |    4 +-
 ...ToolingApiBuildExecutionCrossVersionSpec.groovy |    8 +-
 ...ildableEclipseModelFixesCrossVersionSpec.groovy |    8 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |    6 +-
 .../ToolingApiGradleProjectCrossVersionSpec.groovy |    6 +-
 ...orsProjectCustomizationsCrossVersionSpec.groovy |    8 +-
 .../m5/ToolingApiIdeaModelCrossVersionSpec.groovy  |    8 +-
 .../m5/ToolingApiModelCrossVersionSpec.groovy      |   10 +-
 ...ReceivingStandardStreamsCrossVersionSpec.groovy |    8 +-
 ...UnsupportedModelFeedbackCrossVersionSpec.groovy |   38 +
 .../BuildEnvironmentModelCrossVersionSpec.groovy   |    8 +-
 .../ConsumingStandardInputCrossVersionSpec.groovy  |    8 +-
 ...adlePropertiesToolingApiCrossVersionSpec.groovy |   72 -
 .../m8/JavaConfigurabilityCrossVersionSpec.groovy  |    8 +-
 ...rictLongRunningOperationCrossVersionSpec.groovy |   25 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |   10 +-
 .../m8/ToolingApiLoggingCrossVersionSpec.groovy    |   67 +-
 .../m8/UnknownModelFeedbackCrossVersionSpec.groovy |   42 -
 ...sionOnlyBuildEnvironmentCrossVersionSpec.groovy |   10 +-
 .../m9/DaemonErrorFeedbackCrossVersionSpec.groovy  |   10 +-
 ...adlePropertiesToolingApiCrossVersionSpec.groovy |   72 +
 .../M9JavaConfigurabilityCrossVersionSpec.groovy   |   10 +-
 ...singCommandLineArgumentsCrossVersionSpec.groovy |   13 +-
 .../r112/BuildInvocationsCrossVersionSpec.groovy   |  351 ++
 .../r112/FetchAllTaskSelectorsBuildAction.java     |   43 +
 .../r112/FetchTaskSelectorsBuildAction.java        |   39 +
 .../tooling/r112/FetchTasksBuildAction.java        |   46 +
 .../r112/PublicationsCrossVersionSpec.groovy       |  204 +
 .../r112/TaskDisplayNameCrossVersionSpec.groovy    |   50 +
 .../r112/TestFilteringCrossVersionSpec.groovy      |   48 +
 .../ToolingApiDeprecationsCrossVersionSpec.groovy  |  167 +
 .../r112/UserHomeDirCrossVersionSpec.groovy        |   47 +
 .../DependencyMetaDataCrossVersionSpec.groovy      |    8 +-
 .../r12rc1/BuildModelCrossVersionSpec.groovy       |    8 +-
 .../ProjectOutcomesModuleCrossVersionSpec.groovy   |    8 +-
 ...pportedOperationFeedbackCrossVersionSpec.groovy |   10 +-
 ...ApiInitScriptCrossVersionIntegrationTest.groovy |    4 +-
 ...ningCommandLineArgumentsCrossVersionSpec.groovy |    8 +-
 ...ApiConfigurationOnDemandCrossVersionSpec.groovy |    8 +-
 .../gradle/integtests/tooling/r16/CustomModel.java |   31 +
 .../r16/CustomToolingModelCrossVersionSpec.groovy  |   81 +
 ...knownCustomModelFeedbackCrossVersionSpec.groovy |   58 +
 .../integtests/tooling/r18/BrokenAction.java       |   29 +
 .../tooling/r18/BuildActionCrossVersionSpec.groovy |  104 +
 .../r18/BuildScriptModelCrossVersionSpec.groovy    |   94 +
 .../gradle/integtests/tooling/r18/CustomModel.java |   27 +
 .../integtests/tooling/r18/FetchCustomModel.java   |   31 +
 .../integtests/tooling/r18/FetchIdeaModel.java     |   27 +
 .../integtests/tooling/r18/FetchUnknownModel.java  |   32 +
 .../r18/GradleBuildModelCrossVersionSpec.groovy    |   77 +
 .../gradle/integtests/tooling/r18/NullAction.java  |   26 +
 .../r18/ProjectLevelModelCrossVersionSpec.groovy   |  111 +
 .../r18/UseGradleBuildToFetchProjectModel.java     |   37 +
 .../r18/UseOtherTypesToFetchProjectModel.java      |   56 +
 .../main/java/org/gradle/tooling/BuildAction.java  |   41 +
 .../org/gradle/tooling/BuildActionExecuter.java    |   60 +
 .../tooling/BuildActionFailureException.java       |   31 +
 .../java/org/gradle/tooling/BuildController.java   |  114 +
 .../java/org/gradle/tooling/BuildException.java    |    4 +-
 .../java/org/gradle/tooling/BuildLauncher.java     |   42 +-
 .../gradle/tooling/GradleConnectionException.java  |    2 +
 .../org/gradle/tooling/LongRunningOperation.java   |   26 +-
 .../main/java/org/gradle/tooling/ModelBuilder.java |   29 +-
 .../java/org/gradle/tooling/ProjectConnection.java |   63 +-
 .../org/gradle/tooling/UnknownModelException.java  |    4 +
 .../tooling/UnsupportedVersionException.java       |    2 +
 .../UnsupportedBuildArgumentException.java         |    6 +-
 .../tooling/internal/adapter/CollectionMapper.java |   50 +
 .../internal/adapter/CompatibleIntrospector.java   |   76 +
 .../tooling/internal/adapter/MethodInvocation.java |   79 +
 .../tooling/internal/adapter/MethodInvoker.java    |   21 +
 .../internal/adapter/NoOpMethodInvoker.java        |   24 +
 .../internal/adapter/ProtocolToModelAdapter.java   |  496 +++
 .../internal/adapter/SourceObjectMapping.java      |   28 +
 .../internal/adapter/TargetTypeProvider.java       |   26 +
 .../internal/build/DefaultBuildEnvironment.java    |   19 +-
 .../build/VersionOnlyBuildEnvironment.java         |   19 +-
 .../consumer/AbstractLongRunningOperation.java     |   77 +
 .../internal/consumer/BlockingResultHandler.java   |   16 +-
 .../internal/consumer/ConnectionFactory.java       |   24 +-
 .../internal/consumer/ConnectionParameters.java    |    2 +-
 .../internal/consumer/ConnectorServices.java       |   13 +-
 .../consumer/DefaultBuildActionExecuter.java       |   64 +
 .../internal/consumer/DefaultBuildLauncher.java    |  121 +-
 .../consumer/DefaultConnectionParameters.java      |  120 +-
 .../internal/consumer/DefaultGradleConnector.java  |   21 +-
 .../internal/consumer/DefaultModelBuilder.java     |  110 +-
 .../consumer/DefaultProjectConnection.java         |   40 +-
 .../tooling/internal/consumer/Distribution.java    |    4 +-
 .../internal/consumer/DistributionFactory.java     |   19 +-
 .../tooling/internal/consumer/LoggingProvider.java |    3 -
 .../tooling/internal/consumer/ModelProvider.java   |   80 -
 .../internal/consumer/SynchronizedLogging.java     |    4 +-
 .../internal/consumer/async/AsyncConnection.java   |   30 -
 .../async/AsyncConsumerActionExecutor.java         |   39 +
 .../consumer/async/DefaultAsyncConnection.java     |   88 -
 .../async/DefaultAsyncConsumerActionExecutor.java  |   66 +
 .../connection/AbstractConsumerConnection.java     |   17 +-
 .../consumer/connection/AbstractModelProducer.java |   33 +
 .../AbstractPost12ConsumerConnection.java          |   39 +
 .../AbstractPre12ConsumerConnection.java           |   57 +
 .../connection/ActionAwareConsumerConnection.java  |   61 +
 .../consumer/connection/AdaptedConnection.java     |   55 -
 .../BuildActionRunnerBackedConsumerConnection.java |   80 +-
 .../connection/BuildControllerAdapter.java         |   81 +
 .../BuildInvocationsAdapterProducer.java           |   49 +
 ...ConnectionVersion4BackedConsumerConnection.java |  175 +
 .../consumer/connection/ConsumerAction.java        |   25 +
 .../connection/ConsumerActionExecutor.java         |   29 +
 .../consumer/connection/ConsumerConnection.java    |    8 +-
 .../connection/ConsumerConnectionMetadata.java     |   44 -
 .../connection/GradleBuildAdapterProducer.java     |   44 +
 ...InternalConnectionBackedConsumerConnection.java |   74 +-
 .../consumer/connection/LazyConnection.java        |  143 -
 .../connection/LazyConsumerActionExecutor.java     |  115 +
 .../connection/LoggingInitializerConnection.java   |   54 -
 .../LoggingInitializerConsumerActionExecutor.java  |   46 +
 .../ModelBuilderBackedConsumerConnection.java      |  107 +
 .../ModelBuilderBackedModelProducer.java           |   55 +
 .../consumer/connection/ModelProducer.java         |   23 +
 .../connection/NoToolingApiConnection.java         |   49 +
 .../connection/ProgressLoggingConnection.java      |  102 -
 .../ProgressLoggingConsumerActionExecutor.java     |   85 +
 .../converters/BuildInvocationsConverter.java      |   86 +
 .../converters/ConsumerTargetTypeProvider.java     |   47 +
 .../consumer/converters/GradleBuildConverter.java  |   60 +
 .../converters/GradleProjectConverter.java         |   23 +-
 .../converters/GradleProjectMixInHandler.java      |   30 +
 .../GradleTaskDisplayNameMixInHandler.java         |   31 +
 .../converters/PropertyHandlerFactory.java         |   44 +
 .../consumer/converters/TaskNameComparator.java    |   54 +
 .../converters/TaskPropertyHandlerFactory.java     |   44 +
 .../loader/CachingToolingImplementationLoader.java |    6 +-
 .../loader/DefaultToolingImplementationLoader.java |   52 +-
 .../SynchronizedToolingImplementationLoader.java   |    7 +-
 .../loader/ToolingImplementationLoader.java        |    4 +-
 .../parameters/ConsumerConnectionParameters.java   |   36 -
 .../parameters/ConsumerOperationParameters.java    |  140 +-
 .../protocoladapter/ConsumerPropertyHandler.java   |   41 -
 .../consumer/protocoladapter/MethodInvocation.java |   76 -
 .../consumer/protocoladapter/MethodInvoker.java    |   21 -
 .../protocoladapter/ProtocolToModelAdapter.java    |  358 --
 .../protocoladapter/TargetTypeProvider.java        |   55 -
 .../internal/consumer/versioning/ModelMapping.java |  118 +-
 .../consumer/versioning/VersionDetails.java        |   54 +-
 .../eclipse/DefaultEclipseExternalDependency.java  |   54 -
 .../eclipse/DefaultEclipseLinkedResource.java      |   55 -
 .../internal/eclipse/DefaultEclipseProject.java    |  134 -
 .../eclipse/DefaultEclipseProjectDependency.java   |   44 -
 .../eclipse/DefaultEclipseSourceDirectory.java     |   44 -
 .../internal/eclipse/DefaultEclipseTask.java       |   56 -
 .../internal/gradle/BasicGradleProject.java        |   55 +
 .../internal/gradle/BasicGradleTaskSelector.java   |   76 +
 .../internal/gradle/DefaultBuildInvocations.java   |   46 +
 .../gradle/DefaultConvertedGradleProject.java      |   58 +
 .../internal/gradle/DefaultGradleBuild.java        |   43 +
 .../gradle/DefaultGradleModuleVersion.java         |    3 -
 .../internal/gradle/DefaultGradleProject.java      |  102 +-
 .../internal/gradle/DefaultGradleProjectTask.java  |   30 +
 .../internal/gradle/DefaultGradlePublication.java  |   41 +
 .../internal/gradle/DefaultGradleScript.java       |   34 +
 .../tooling/internal/gradle/DefaultGradleTask.java |   41 +-
 .../gradle/DefaultProjectPublications.java         |   33 +
 .../internal/gradle/GradleProjectIdentity.java     |   21 +
 .../internal/gradle/PartialBasicGradleProject.java |   69 +
 .../internal/gradle/PartialGradleProject.java      |   95 +
 .../internal/gradle/TaskListingLaunchable.java     |   23 +
 .../internal/idea/DefaultIdeaCompilerOutput.java   |   68 -
 .../internal/idea/DefaultIdeaContentRoot.java      |   83 -
 .../internal/idea/DefaultIdeaDependencyScope.java  |   67 -
 .../internal/idea/DefaultIdeaLanguageLevel.java    |   85 -
 .../tooling/internal/idea/DefaultIdeaModule.java   |  125 -
 .../internal/idea/DefaultIdeaModuleDependency.java |   69 -
 .../tooling/internal/idea/DefaultIdeaProject.java  |  117 -
 .../DefaultIdeaSingleEntryLibraryDependency.java   |  103 -
 .../internal/idea/DefaultIdeaSourceDirectory.java  |   46 -
 .../outcomes/DefaultGradleBuildOutcome.java        |   46 -
 .../outcomes/DefaultGradleFileBuildOutcome.java    |   42 -
 .../internal/outcomes/DefaultProjectOutcomes.java  |   80 -
 .../internal/protocol/BuildActionRunner.java       |   16 +
 .../internal/protocol/BuildExceptionVersion1.java  |    5 +-
 .../protocol/BuildOperationParametersVersion1.java |   23 +
 .../tooling/internal/protocol/BuildParameters.java |    4 +-
 .../internal/protocol/BuildParametersVersion1.java |    7 +
 .../internal/protocol/ConfigurableConnection.java  |   14 +
 .../internal/protocol/ConnectionParameters.java    |    2 +-
 .../internal/protocol/ConnectionVersion4.java      |   59 +-
 .../protocol/InternalBasicIdeaProject.java         |    4 +-
 .../internal/protocol/InternalBuildAction.java     |   36 +
 .../protocol/InternalBuildActionExecutor.java      |   51 +
 .../InternalBuildActionFailureException.java       |   30 +
 .../internal/protocol/InternalBuildController.java |   53 +
 .../protocol/InternalBuildEnvironment.java         |    3 +-
 .../internal/protocol/InternalConnection.java      |   17 +-
 .../internal/protocol/InternalGradleProject.java   |    2 +
 .../internal/protocol/InternalIdeaProject.java     |    2 +
 .../internal/protocol/InternalLaunchable.java      |   29 +
 .../internal/protocol/InternalProjectOutcomes.java |    7 +-
 .../protocol/InternalProtocolInterface.java        |   12 +-
 .../internal/protocol/InternalTestModel.java       |   24 -
 .../InternalUnsupportedModelException.java         |   31 +
 .../LongRunningOperationParametersVersion1.java    |    8 +
 .../tooling/internal/protocol/ModelBuilder.java    |   51 +
 .../tooling/internal/protocol/ModelIdentifier.java |   42 +
 .../tooling/internal/protocol/ProjectVersion3.java |   17 +
 .../eclipse/EclipseLinkedResourceVersion1.java     |    2 -
 .../protocol/eclipse/EclipseProjectVersion3.java   |    2 +
 .../HierarchicalEclipseProjectVersion1.java        |    2 +
 .../internal/reflect/CompatibleIntrospector.java   |   71 -
 .../org/gradle/tooling/model/BuildableElement.java |    1 +
 .../java/org/gradle/tooling/model/Element.java     |    2 +
 .../gradle/tooling/model/ExternalDependency.java   |    2 +-
 .../gradle/tooling/model/GradleModuleVersion.java  |    2 +-
 .../org/gradle/tooling/model/GradleProject.java    |   21 +-
 .../java/org/gradle/tooling/model/GradleTask.java  |    1 +
 .../gradle/tooling/model/HierarchicalElement.java  |    2 +
 .../java/org/gradle/tooling/model/Launchable.java  |   47 +
 .../main/java/org/gradle/tooling/model/Model.java  |    1 +
 .../main/java/org/gradle/tooling/model/Task.java   |   16 +-
 .../org/gradle/tooling/model/TaskSelector.java     |   34 +
 .../tooling/model/build/BuildEnvironment.java      |    7 +-
 .../tooling/model/build/GradleEnvironment.java     |    2 +
 .../tooling/model/build/JavaEnvironment.java       |    4 +
 .../gradle/tooling/model/build/package-info.java   |    2 +-
 .../model/eclipse/EclipseLinkedResource.java       |   10 +-
 .../tooling/model/eclipse/EclipseProject.java      |   15 +-
 .../gradle/tooling/model/eclipse/EclipseTask.java  |    5 +-
 .../model/eclipse/HierarchicalEclipseProject.java  |    5 +
 .../gradle/tooling/model/eclipse/package-info.java |    2 +-
 .../tooling/model/gradle/BasicGradleProject.java   |   69 +
 .../tooling/model/gradle/BuildInvocations.java     |   52 +
 .../gradle/tooling/model/gradle/GradleBuild.java   |   42 +
 .../tooling/model/gradle/GradlePublication.java    |   35 +
 .../gradle/tooling/model/gradle/GradleScript.java  |   40 +
 .../tooling/model/gradle/ProjectPublications.java  |   34 +
 .../gradle/tooling/model/gradle/package-info.java  |   20 +
 .../tooling/model/idea/BasicIdeaProject.java       |    2 +
 .../gradle/tooling/model/idea/IdeaDependency.java  |    2 +-
 .../org/gradle/tooling/model/idea/IdeaModule.java  |    9 +-
 .../org/gradle/tooling/model/idea/IdeaProject.java |    7 +-
 .../gradle/tooling/model/idea/package-info.java    |    2 +-
 .../gradle/tooling/model/internal/Exceptions.java  |   41 +-
 .../ProjectSensitiveToolingModelBuilder.java       |   41 +
 .../gradle/tooling/model/internal/TestModel.java   |   26 -
 .../org/gradle/tooling/model/package-info.java     |    2 +-
 .../tooling/fixture/GradleVersionSpecTest.groovy   |  146 +
 .../internal/adapter/CollectionMapperTest.groovy   |   49 +
 .../adapter/CompatibleIntrospectorTest.groovy      |   79 +
 .../adapter/ProtocolToModelAdapterTest.groovy      |  501 +++
 .../internal/consumer/ConnectionFactoryTest.groovy |   19 +-
 .../internal/consumer/ConnectorServicesTest.groovy |    3 -
 .../consumer/DefaultBuildActionExecuterTest.groovy |  164 +
 .../consumer/DefaultBuildLauncherTest.groovy       |  281 +-
 .../consumer/DefaultGradleConnectorTest.groovy     |   18 +
 .../consumer/DefaultModelBuilderTest.groovy        |  159 +-
 .../consumer/DefaultProjectConnectionTest.groovy   |   30 +-
 .../consumer/DistributionFactoryTest.groovy        |   56 +-
 .../consumer/ProtocolToModelAdapterTest.groovy     |   68 -
 .../consumer/SynchronizedLoggingTest.groovy        |    3 -
 .../DefaultAsyncConsumerActionExecutorTest.groovy  |   81 +
 .../ActionAwareConsumerConnectionTest.groovy       |   77 +
 .../connection/AdaptedConnectionTest.groovy        |   50 -
 ...ActionRunnerBackedConsumerConnectionTest.groovy |  115 +-
 .../connection/BuildControllerAdapterTest.groovy   |  122 +
 ...tionVersion4BackedConsumerConnectionTest.groovy |  288 ++
 .../GradleBuildAdapterProducerTest.groovy          |   88 +
 ...alConnectionBackedConsumerConnectionTest.groovy |  112 +-
 .../consumer/connection/LazyConnectionTest.groovy  |  107 -
 .../LazyConsumerActionExecutorTest.groovy          |  102 +
 ...ModelBuilderBackedConsumerConnectionTest.groovy |  186 +
 .../ModelBuilderBackedModelProducerTest.groovy     |   74 +
 .../ProgressLoggingConnectionTest.groovy           |   55 -
 ...rogressLoggingConsumerActionExecutorTest.groovy |   55 +
 .../BuildInvocationsConverterTest.groovy           |  101 +
 .../converters/GradleBuildConverterTest.groovy     |   89 +
 .../converters/TaskNameComparatorTest.groovy       |   41 +
 .../CachingToolingImplementationLoaderTest.groovy  |   19 +-
 .../DefaultToolingImplementationLoaderTest.groovy  |  104 +-
 ...chronizedToolingImplementationLoaderTest.groovy |    7 +-
 .../ConsumerOperationParametersTest.groovy         |   17 +-
 .../ProtocolToModelAdapterTest.groovy              |  271 --
 .../consumer/versioning/ModelMappingTest.groovy    |  115 +
 .../eclipse/DefaultEclipseProjectTest.groovy       |   27 -
 .../gradle/DefaultGradleProjectTest.groovy         |   12 +-
 .../reflect/CompatibleIntrospectorTest.groovy      |   59 -
 .../tooling/fixture/GradleVersionSpec.java         |   83 +
 subprojects/tooling-api/tooling-api.gradle         |    9 +-
 .../integtests/FavoritesIntegrationTest.java       |    2 -
 .../integtests/LiveOutputIntegrationTest.groovy    |   16 +-
 ...projectProjectAndTaskListIntegrationTest.groovy |    3 -
 .../gradle/foundation/CommandLineAssistant.java    |    2 -
 .../org/gradle/foundation/PathParserPortion.java   |    2 -
 .../org/gradle/foundation/ProjectConverter.java    |    2 -
 .../java/org/gradle/foundation/ProjectView.java    |    2 -
 .../main/java/org/gradle/foundation/TaskView.java  |    2 -
 .../gradle/foundation/common/ListReorderer.java    |    2 -
 .../org/gradle/foundation/common/ObserverLord.java |    3 -
 .../gradle/foundation/common/ReorderableList.java  |    3 -
 .../gradle/foundation/ipc/basic/ClientProcess.java |    2 -
 .../gradle/foundation/ipc/basic/ExecutionInfo.java |    4 -
 .../gradle/foundation/ipc/basic/MessageObject.java |    2 -
 .../foundation/ipc/basic/ObjectSocketWrapper.java  |    2 -
 .../ipc/basic/ProcessLauncherServer.java           |    2 -
 .../org/gradle/foundation/ipc/basic/Server.java    |    2 -
 .../ipc/gradle/AbstractGradleServerProtocol.java   |    4 +-
 .../gradle/ExecuteGradleCommandClientProtocol.java |    2 -
 .../gradle/ExecuteGradleCommandServerProtocol.java |    2 -
 .../gradle/foundation/ipc/gradle/IPCUtilities.java |    2 -
 .../ipc/gradle/KillGradleClientProtocol.java       |    2 -
 .../ipc/gradle/KillGradleServerProtocol.java       |    2 -
 .../foundation/ipc/gradle/ProtocolConstants.java   |    2 -
 .../ipc/gradle/TaskListClientProtocol.java         |    2 -
 .../ipc/gradle/TaskListServerProtocol.java         |    2 -
 .../org/gradle/foundation/output/FileLink.java     |    2 -
 .../foundation/output/FileLinkDefinitionLord.java  |    2 -
 .../gradle/foundation/output/LiveOutputParser.java |    2 -
 .../org/gradle/foundation/output/OutputParser.java |    2 -
 .../definitions/ExtensionFileLinkDefinition.java   |    2 -
 .../output/definitions/FileLinkDefinition.java     |    2 -
 .../OptionalLineNumberFileLinkDefinition.java      |    2 -
 .../definitions/PrefixedFileLinkDefinition.java    |    2 -
 .../definitions/TestReportFileLinkDefinition.java  |    2 -
 .../gradle/foundation/queue/ExecutionQueue.java    |   18 +-
 .../visitors/AllProjectsAndTasksVisitor.java       |   10 -
 .../visitors/TaskTreePopulationVisitor.java        |   17 +-
 .../visitors/UniqueNameProjectAndTaskVisitor.java  |   14 +-
 .../CommandLineArgumentAlteringListener.java       |    2 -
 .../gradleplugin/foundation/DOM4JSerializer.java   |    2 -
 .../gradleplugin/foundation/Dom4JUtility.java      |    1 -
 .../foundation/ExtensionFileFilter.java            |    2 -
 .../gradleplugin/foundation/GradlePluginLord.java  |  129 +-
 .../foundation/favorites/FavoriteTask.java         |    2 -
 .../foundation/favorites/FavoritesEditor.java      |    2 -
 .../favorites/FavoritesSerializable.java           |    5 +-
 .../filters/AllowAllProjectAndTaskFilter.java      |    2 -
 .../foundation/filters/BasicFilterEditor.java      |    2 -
 .../filters/BasicProjectAndTaskFilter.java         |    2 -
 .../foundation/filters/ProjectAndTaskFilter.java   |    3 -
 .../foundation/request/AbstractRequest.java        |   10 +-
 .../foundation/request/ExecutionRequest.java       |    6 +-
 .../foundation/request/RefreshTaskListRequest.java |    6 +-
 .../gradleplugin/foundation/request/Request.java   |    2 -
 .../foundation/runner/GradleRunner.java            |    2 -
 .../foundation/search/BasicTextSearchCriteria.java |    2 -
 .../foundation/search/TextBlockSearchEditor.java   |    3 -
 .../foundation/settings/DOM4JSettingsNode.java     |    2 -
 .../foundation/settings/SettingsNode.java          |    2 -
 .../foundation/settings/SettingsSerializable.java  |    3 -
 .../userinterface/AlternateUIInteraction.java      |    3 -
 .../swing/common/BorderlessImageButton.java        |    2 -
 .../swing/common/BorderlessImageToggleButton.java  |    3 -
 .../swing/common/BorderlessUtility.java            |    2 -
 .../swing/common/PreferencesAssistant.java         |    2 -
 .../userinterface/swing/common/SearchPanel.java    |   21 +-
 .../swing/common/TextPaneSearchInteraction.java    |    4 +-
 .../swing/generic/AbstractGradleUIInstance.java    |    3 -
 .../userinterface/swing/generic/BasicGradleUI.java |   10 -
 .../swing/generic/DualPaneUIInstance.java          |    2 -
 .../swing/generic/MainGradlePanel.java             |   14 +-
 .../userinterface/swing/generic/OutputPanel.java   |   26 +-
 .../swing/generic/OutputPanelLord.java             |    9 +-
 .../userinterface/swing/generic/OutputTab.java     |   16 +-
 .../swing/generic/SinglePaneUIInstance.java        |    2 -
 .../SwingAddMultipleFavoritesInteraction.java      |    2 -
 .../generic/SwingEditFavoriteInteraction.java      |   10 +-
 .../swing/generic/SwingExportInteraction.java      |    8 +-
 .../swing/generic/SwingImportInteraction.java      |    2 -
 .../swing/generic/TaskTreeComponent.java           |    6 +-
 .../userinterface/swing/generic/Utility.java       |   18 +-
 .../generic/filter/AbstractFilterEditorPanel.java  |    2 -
 .../generic/filter/ProjectAndTaskFilterDialog.java |    2 -
 .../swing/generic/tabs/CommandLineTab.java         |    2 -
 .../swing/generic/tabs/FavoriteTasksTab.java       |    2 -
 .../swing/generic/tabs/GradleTab.java              |    3 -
 .../userinterface/swing/generic/tabs/SetupTab.java |    2 -
 .../swing/generic/tabs/TaskTreeTab.java            |   13 +-
 .../swing/standalone/Application.java              |    2 -
 .../swing/standalone/BlockingApplication.java      |    2 -
 .../openapi/wrappers/RunnerWrapperFactory.java     |    3 -
 .../gradle/openapi/wrappers/UIWrapperFactory.java  |    2 -
 .../foundation/GradleInterfaceWrapperVersion1.java |    2 -
 .../foundation/GradleInterfaceWrapperVersion2.java |    2 -
 .../wrappers/foundation/ProjectWrapper.java        |    2 -
 .../foundation/RequestObserverWrapper.java         |    2 -
 .../wrappers/foundation/RequestWrapper.java        |    2 -
 .../openapi/wrappers/foundation/TaskWrapper.java   |    2 -
 .../foundation/favorites/FavoriteTaskWrapper.java  |    2 -
 .../favorites/FavoritesEditorWrapper.java          |    2 -
 .../runner/GradleRunnerInteractionWrapper.java     |    2 -
 .../wrappers/runner/GradleRunnerWrapper.java       |    2 -
 .../wrappers/ui/AbstractOpenAPIUIWrapper.java      |    3 -
 .../ui/AlternateUIInteractionVersionWrapper.java   |    2 -
 ...CommandLineArgumentAlteringListenerWrapper.java |    2 -
 .../openapi/wrappers/ui/DualPaneUIWrapper.java     |    2 -
 .../wrappers/ui/GradleTabVersionWrapper.java       |    2 -
 .../openapi/wrappers/ui/OutputObserverWrapper.java |    2 -
 .../openapi/wrappers/ui/OutputUILordWrapper.java   |    2 -
 .../wrappers/ui/SettingsNodeVersionWrapper.java    |    2 -
 .../openapi/wrappers/ui/SinglePaneUIWrapper.java   |    2 -
 .../org/gradle/foundation/BuildInformation.java    |    7 +-
 .../gradle/foundation/CommandLineParsingTest.java  |    2 -
 .../gradle/foundation/DOM4JSettingsNodeTest.java   |    2 -
 .../org/gradle/foundation/FavoritesTest.java       |    2 -
 .../org/gradle/foundation/FileLinkTests.java       |    1 -
 .../groovy/org/gradle/foundation/FilterTest.java   |    2 -
 .../gradle/foundation/LiveOutputParserTests.java   |    2 -
 .../groovy/org/gradle/foundation/TestUtility.java  |    8 +-
 .../foundation/TextBlockSearchEditorTests.java     |    2 -
 subprojects/ui/ui.gradle                           |    2 +-
 .../WrapperConcurrentDownloadTest.groovy           |   89 +
 .../WrapperGenerationIntegrationTest.groovy        |   49 +
 .../integtests/WrapperHttpIntegrationTest.groovy   |  148 +
 .../WrapperProjectIntegrationTest.groovy           |  125 +-
 .../org/gradle/integtests/WrapperSetup.groovy      |   28 +
 .../WrapperUserHomeIntegrationTest.groovy          |   72 +
 .../org/gradle/wrapper/BootstrapMainStarter.java   |    3 -
 .../src/main/java/org/gradle/wrapper/Download.java |    7 -
 .../gradle/wrapper/ExclusiveFileAccessManager.java |   95 +
 .../org/gradle/wrapper/GradleUserHomeLookup.java   |   36 +
 .../java/org/gradle/wrapper/GradleWrapperMain.java |   51 +-
 .../main/java/org/gradle/wrapper/IDownload.java    |    3 -
 .../src/main/java/org/gradle/wrapper/Install.java  |  111 +-
 .../java/org/gradle/wrapper/PathAssembler.java     |    3 -
 .../gradle/wrapper/SystemPropertiesHandler.java    |    3 -
 .../org/gradle/wrapper/WrapperConfiguration.java   |   21 -
 .../java/org/gradle/wrapper/WrapperExecutor.java   |    3 -
 .../groovy/org/gradle/wrapper/DownloadTest.groovy  |    3 -
 .../groovy/org/gradle/wrapper/InstallTest.groovy   |   97 +-
 .../org/gradle/wrapper/PathAssemblerTest.java      |    3 -
 .../wrapper/SystemPropertiesHandlerTest.groovy     |    3 -
 subprojects/wrapper/wrapper.gradle                 |    3 +-
 version.txt                                        |    2 +-
 5753 files changed, 221514 insertions(+), 80120 deletions(-)
 create mode 100644 buildSrc/src/main/groovy/org/gradle/build/ReleasedVersions.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/build/docs/dsl/docbook/ClassDocMemberRenderer.java
 create mode 100644 buildSrc/src/main/groovy/org/gradle/build/docs/dsl/source/GenerateDefaultImportsTask.java
 delete mode 100644 debian/gradle-doc.docs
 create mode 100644 debian/gradle-doc.install
 create mode 100644 debian/gradle.1.md
 create mode 100644 debian/gradle.jlibs
 delete mode 100644 debian/gradle.pod
 delete mode 100644 debian/libgradle-core-java.install
 create mode 100644 debian/libgradle-plugins-java.install
 delete mode 100644 debian/libgradle-plugins-java.links
 delete mode 100644 debian/patches/01_use_debian_jars.diff
 delete mode 100644 debian/patches/02_sonar.diff
 delete mode 100644 debian/patches/13_fix_javadocs_links.diff
 delete mode 100644 debian/patches/21_docs.diff
 delete mode 100644 debian/patches/23_replace_jna-posix_with_jnr-posix.diff
 delete mode 100644 debian/patches/24_pegdown.diff
 delete mode 100644 debian/patches/27_maven.diff
 delete mode 100644 debian/patches/28_findbugs.diff
 delete mode 100644 debian/patches/31_hamcrest_12.diff
 delete mode 100644 debian/patches/32_disable_it.diff
 delete mode 100644 debian/patches/90_respect_user_java_home.diff
 create mode 100644 debian/patches/bintray_api.diff
 create mode 100644 debian/patches/bintray_dependencies.diff
 create mode 100644 debian/patches/build_init.diff
 create mode 100644 debian/patches/disable_buildSrc_tests.diff
 create mode 100644 debian/patches/disable_distributions.diff
 create mode 100644 debian/patches/disable_release_notes.diff
 create mode 100644 debian/patches/disable_sonar.diff
 create mode 100644 debian/patches/disable_tests.diff
 create mode 100644 debian/patches/docs.diff
 create mode 100644 debian/patches/fix_DocGenerationException.diff
 create mode 100644 debian/patches/jetty.diff
 create mode 100644 debian/patches/remove_test_dependencies.diff
 create mode 100644 debian/patches/search_system_jar.diff
 create mode 100644 debian/patches/use_local_artifacts.diff
 create mode 100644 gradle/ideaTestSourcesWorkaround.gradle
 create mode 100644 gradle/testGroupings.gradle
 create mode 100644 gradle/testSetup.gradle
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/api/internal/Actions.java
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/api/internal/Cast.java
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/api/internal/ErroringAction.java
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/api/internal/HasInternalProtocol.java
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/api/internal/IoActions.java
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/api/internal/Transformers.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/Actions.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/Cast.java
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/CompositeStoppable.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/ErroringAction.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/FileUtils.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/HasInternalProtocol.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/IoActions.java
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/LazyIterable.java
 delete mode 100755 subprojects/base-services/src/main/java/org/gradle/internal/Stoppable.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/Supplier.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/Suppliers.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/Transformers.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/CachingClassLoader.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/ClassLoaderFactory.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/ClassLoaderHierarchy.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/ClassLoaderSpec.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/ClassLoaderVisitor.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/ClasspathUtil.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/DefaultClassLoaderFactory.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/FilteringClassLoader.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/classloader/MultiParentClassLoader.java
 create 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/TransformingClassLoader.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/concurrent/CompositeStoppable.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/concurrent/ServiceLifecycle.java
 create mode 100755 subprojects/base-services/src/main/java/org/gradle/internal/concurrent/Stoppable.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/hash/HashUtil.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/hash/HashValue.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/io/RandomAccessFileInputStream.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/io/RandomAccessFileOutputStream.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/io/TextStream.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/jvm/Jre.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/reflect/JavaMethod.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/reflect/NoSuchMethodException.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/reflect/NoSuchPropertyException.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/reflect/PropertyAccessor.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/reflect/PropertyMutator.java
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/service/AbstractServiceRegistry.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/service/ServiceCreationException.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/service/ServiceRegistration.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/service/ServiceRegistryBuilder.java
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/service/ServiceValidationException.java
 delete mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/service/SynchronizedServiceRegistry.java
 delete mode 100644 subprojects/base-services/src/test/groovy/org/gradle/api/internal/ActionsTest.groovy
 delete mode 100644 subprojects/base-services/src/test/groovy/org/gradle/api/internal/CastTest.groovy
 delete mode 100644 subprojects/base-services/src/test/groovy/org/gradle/api/internal/ErroringActionTest.groovy
 delete mode 100644 subprojects/base-services/src/test/groovy/org/gradle/api/internal/IoActionsTest.groovy
 delete mode 100644 subprojects/base-services/src/test/groovy/org/gradle/api/internal/TransformersTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/ActionsTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/CastTest.groovy
 delete mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/CompositeStoppableTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/ErroringActionTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/FileUtilsTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/IoActionsTest.groovy
 delete mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/LazyIterableTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/SuppliersTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/TransformersTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/classloader/CachingClassLoaderTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/classloader/DefaultClassLoaderFactoryTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/classloader/DefaultClassLoaderFactoryTestHelper.java
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/classloader/FilteringClassLoaderTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/classloader/MultiParentClassLoaderTest.groovy
 create 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/concurrent/CompositeStoppableTest.groovy
 delete mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/concurrent/DefaultExecutorFactorySpec.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/concurrent/ServiceLifecycleTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/hash/HashValueTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/reflect/JavaTestSubject.java
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/reflect/JavaTestSubjectSubclass.java
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/service/DefaultServiceRegistryConcurrencyTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/service/DefaultServiceRegistryTest.groovy
 delete mode 100755 subprojects/base-services/src/test/groovy/org/gradle/internal/service/DefaultServiceRegistryTest.java
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/service/GenericRunnable.java
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/service/ProviderWithGenericType.java
 delete mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/service/SynchronizedServiceRegistryTest.groovy
 rename subprojects/{core => base-services}/src/test/resources/org/gradle/util/ClassLoaderTest.txt (100%)
 create mode 100644 subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/outcome/internal/FileOutcomeIdentifier.java
 create mode 100644 subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/outcome/internal/tooling/DefaultGradleBuildOutcome.java
 create mode 100644 subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/outcome/internal/tooling/DefaultGradleFileBuildOutcome.java
 create mode 100644 subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/outcome/internal/tooling/DefaultProjectOutcomes.java
 create mode 100644 subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/outcome/internal/tooling/ProjectOutcomesModelBuilder.java
 create mode 100644 subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/outcome/internal/tooling/PublishArtifactToFileBuildOutcomeTransformer.java
 create mode 100644 subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/outcome/internal/tooling/ToolingRegistrationAction.java
 create mode 100644 subprojects/build-comparison/src/main/resources/META-INF/services/org.gradle.configuration.project.ProjectConfigureAction
 create mode 100644 subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/outcome/internal/tooling/PublishArtifactToFileBuildOutcomeTransformerTest.groovy
 create mode 100644 subprojects/build-init/build-init.gradle
 create mode 100644 subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/BuildInitPluginIntegrationTest.groovy
 create mode 100644 subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/GroovyLibraryInitIntegrationTest.groovy
 create mode 100644 subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/JavaLibraryInitIntegrationTest.groovy
 create mode 100644 subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/MavenConversionIntegrationTest.groovy
 create mode 100644 subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/ScalaLibraryInitIntegrationTest.groovy
 create mode 100644 subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/WrapperPluginIntegrationTest.groovy
 create mode 100644 subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/fixtures/WrapperTestFixture.groovy
 create mode 100644 subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/internal/WrapperPluginAutoApplyActionIntegTest.groovy
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/enforcerplugin/pom.xml (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/enforcerplugin/src/main/java/Foo.java (100%)
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/expandProperties/pom.xml
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/expandProperties/src/main/java/Foo.java
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/expandProperties/src/test/java/FooTest.java
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/flatmultimodule/webinar-api/pom.xml (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/flatmultimodule/webinar-api/src/main/java/webinar/Demoable.java (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/flatmultimodule/webinar-impl/pom.xml (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/flatmultimodule/webinar-impl/src/main/java/webinar/Webinar.java (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/flatmultimodule/webinar-impl/src/test/java/webinar/WebinarTest.java (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/flatmultimodule/webinar-parent/pom.xml (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/flatmultimodule/webinar-war/pom.xml (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/flatmultimodule/webinar-war/src/main/webapp/WEB-INF/web.xml (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/flatmultimodule/webinar-war/src/main/webapp/index.jsp (100%)
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/mavenExtensions/pom.xml
 create mode 100755 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/mavenExtensions/test-core/pom.xml
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/multiModule/pom.xml (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/multiModule/webinar-api/pom.xml (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/multiModule/webinar-api/src/main/java/webinar/Demoable.java (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/multiModule/webinar-impl/pom.xml (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/multiModule/webinar-impl/src/main/java/webinar/Webinar.java (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/multiModule/webinar-impl/src/test/java/webinar/WebinarTest.java (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/multiModule/webinar-war/pom.xml (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/multiModule/webinar-war/src/main/webapp/WEB-INF/web.xml (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/multiModule/webinar-war/src/main/webapp/index.jsp (100%)
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithNestedParent/nested-parent/pom.xml
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithNestedParent/pom.xml
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/multiModule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithNestedParent}/webinar-api/pom.xml (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/flatmultimodule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithNestedParent}/webinar-api/src/main/java/webinar/Demoable.java (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/multiModule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithNestedParent}/webinar-impl/pom.xml (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/flatmultimodule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithNestedParent}/webinar-impl/src/main/java/webinar/Webinar.java (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/flatmultimodule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithNestedParent}/webinar-impl/src/test/java/webinar/WebinarTest.java (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/multiModule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithNestedParent}/webinar-war/pom.xml (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/flatmultimodule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithNestedParent}/webinar-war/src/main/webapp/WEB-INF/web.xml (100%)
 copy subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/flatmultimodule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithNestedParent}/webinar-war/src/main/webapp/index.jsp (100%)
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithRemoteParent/pom.xml
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithRemoteParent/util-parent/pom.xml
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/multiModule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithRemoteParent}/webinar-api/pom.xml (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/flatmultimodule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithRemoteParent}/webinar-api/src/main/java/webinar/Demoable.java (100%)
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithRemoteParent/webinar-impl/pom.xml
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/flatmultimodule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithRemoteParent}/webinar-impl/src/main/java/webinar/Webinar.java (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/flatmultimodule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithRemoteParent}/webinar-impl/src/test/java/webinar/WebinarTest.java (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/multiModule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithRemoteParent}/webinar-war/pom.xml (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/flatmultimodule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithRemoteParent}/webinar-war/src/main/webapp/WEB-INF/web.xml (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven/MavenConversionIntegrationTest/flatmultimodule => build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/multiModuleWithRemoteParent}/webinar-war/src/main/webapp/index.jsp (100%)
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/providedNotWar/pom.xml
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/remoteparent/pom.xml
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/remoteparent/src/main/java/Bar.java
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/sharedResources/maven_home/m2_home/conf/settings.xml
 create mode 100644 subprojects/build-init/src/integTest/resources/org/gradle/buildinit/plugins/MavenConversionIntegrationTest/sharedResources/maven_repo/util/util/parent/util-parent/3/util-parent-3.pom
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/singleModule/pom.xml (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/singleModule/src/main/java/Foo.java (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/singleModule/src/test/java/FooTest.java (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/testjar/pom.xml (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/testjar/src/main/java/Foo.java (100%)
 rename subprojects/{maven/src/integTest/resources/org/gradle/api/plugins/maven => build-init/src/integTest/resources/org/gradle/buildinit/plugins}/MavenConversionIntegrationTest/testjar/src/test/java/FooTest.java (100%)
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/api/tasks/wrapper/Wrapper.java
 rename subprojects/{plugins => build-init}/src/main/groovy/org/gradle/api/tasks/wrapper/package-info.java (100%)
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/BuildInitPlugin.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/WrapperPlugin.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/BasicTemplateBasedProjectInitDescriptor.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/BuildInitAutoApplyAction.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/BuildInitException.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/BuildInitServices.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/BuildInitTypeIds.java
 create 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/DefaultTemplateLibraryVersionProvider.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/GroovyLibraryProjectInitDescriptor.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/JavaLibraryProjectInitDescriptor.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/LanguageLibraryProjectInitDescriptor.java
 create 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/ProjectInitDescriptor.groovy
 create 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/ProjectLayoutSetupRegistryFactory.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/ScalaLibraryProjectInitDescriptor.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/SimpleGlobalFilesBuildSettingsDescriptor.java
 create 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/TemplateBasedProjectInitDescriptor.java
 create 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/TemplateOperation.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/TemplateOperationFactory.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/TemplateValue.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/WrapperPluginAutoApplyAction.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/maven/Maven2Gradle.groovy
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/maven/MavenConversionException.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/maven/MavenProjectXmlWriter.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/maven/MavenProjectsCreator.java
 create mode 100644 subprojects/build-init/src/main/groovy/org/gradle/buildinit/tasks/InitBuild.groovy
 create mode 100644 subprojects/build-init/src/main/resources/META-INF/gradle-plugins/build-init.properties
 create mode 100644 subprojects/build-init/src/main/resources/META-INF/gradle-plugins/wrapper.properties
 create mode 100644 subprojects/build-init/src/main/resources/META-INF/services/org.gradle.configuration.project.ProjectConfigureAction
 create mode 100644 subprojects/build-init/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/build-init/src/main/resources/org/gradle/buildinit/tasks/templates/build.gradle.template
 create mode 100644 subprojects/build-init/src/main/resources/org/gradle/buildinit/tasks/templates/groovylibrary/Library.groovy.template
 create mode 100644 subprojects/build-init/src/main/resources/org/gradle/buildinit/tasks/templates/groovylibrary/LibraryTest.groovy.template
 create mode 100644 subprojects/build-init/src/main/resources/org/gradle/buildinit/tasks/templates/groovylibrary/build.gradle.template
 create mode 100644 subprojects/build-init/src/main/resources/org/gradle/buildinit/tasks/templates/javalibrary/Library.java.template
 create mode 100644 subprojects/build-init/src/main/resources/org/gradle/buildinit/tasks/templates/javalibrary/LibraryTest.java.template
 create mode 100644 subprojects/build-init/src/main/resources/org/gradle/buildinit/tasks/templates/javalibrary/build.gradle.template
 create mode 100644 subprojects/build-init/src/main/resources/org/gradle/buildinit/tasks/templates/scalalibrary/Library.scala.template
 create mode 100644 subprojects/build-init/src/main/resources/org/gradle/buildinit/tasks/templates/scalalibrary/LibrarySuite.scala.template
 create mode 100644 subprojects/build-init/src/main/resources/org/gradle/buildinit/tasks/templates/scalalibrary/build.gradle.template
 create mode 100644 subprojects/build-init/src/main/resources/org/gradle/buildinit/tasks/templates/settings.gradle.template
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/api/tasks/wrapper/WrapperTest.java
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/BuildInitPluginSpec.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/WrapperPluginSpec.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/internal/BuildInitAutoApplyActionSpec.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/internal/ConditionalTemplateOperationSpec.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/internal/LanguageLibraryProjectInitDescriptorSpec.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/internal/ProjectLayoutSetupRegistryFactoryTest.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/internal/ProjectLayoutSetupRegistrySpec.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/internal/SimpleTemplateOperationSpec.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/internal/TemplateBasedProjectInitDescriptorSpec.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/internal/TemplateOperationFactorySpec.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/internal/TemplateValueTest.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/internal/maven/MavenProjectXmlWriterTest.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/internal/maven/MavenProjectsCreatorSpec.groovy
 create mode 100644 subprojects/build-init/src/test/groovy/org/gradle/buildinit/tasks/InitBuildSpec.groovy
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugsXmlReport.java
 create mode 100644 subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsXmlReportImpl.java
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ArtifactDeclarationIntegrationTest.groovy
 delete mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ArtifactOnlyResolutionIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesChangingModulesIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesStatusIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/DetachedConfigurationsIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ExtendingConfigurationsIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/FlatDirJvmLibraryArtifactResolutionIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/JvmLibraryArtifactResolveTestFixture.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ResolutionResultApiIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ResolveTestFixture.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachingDependencyMetadataInMemoryIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyBrokenDescriptorIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesChangingModulesIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesStatusIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyCustomStatusLatestVersionIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorValidationIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyJvmLibraryArtifactResolutionIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyModuleResolveIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenBrokenRemoteResolveIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesChangingModulesIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesStatusIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenCustomPackagingResolveIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenJcenterDependencyResolveIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenJvmLibraryArtifactResolutionIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenLatestResolveIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomResolveIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenProfileResolveIntegrationTest.groovy
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ArtifactPublicationServices.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ArtifactPublisher.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultArtifactIdentifier.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyManagementBuildScopeServices.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyManagementGlobalScopeServices.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyServices.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ModuleMetadataProcessor.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ModuleVersionPublisher.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ModuleVersionSelectorSerializer.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ResolvedConfigurationIdentifierSerializer.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/component/ComponentIdentifierFactory.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/component/DefaultComponentIdentifierFactory.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/component/DefaultModuleComponentIdentifier.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/component/DefaultModuleComponentSelector.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/component/DefaultProjectComponentIdentifier.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/component/DefaultProjectComponentSelector.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandler.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolveContext.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactSetResolveResult.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactTypeResolveContext.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/BuildableArtifactSetResolveResult.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/BuildableComponentResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/BuildableModuleVersionResolveResult.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLayout.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ComponentResolveResult.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ConfigurationResolveContext.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ContextualArtifactResolver.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactSetResolveResult.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableComponentResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableModuleVersionResolveResult.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyContextManager.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultSettingsConverter.java
 delete mode 100755 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DependencyToModuleResolver.java
 create mode 100755 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DependencyToModuleVersionResolver.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyContextManager.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyFactory.java
 rename subprojects/{core => core-impl}/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyModuleDescriptorWriter.java (100%)
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyResolverBackedModuleVersionPublisher.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvySettingsFactory.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/LocalComponentFactory.java
 create mode 100755 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ModuleToModuleVersionResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ModuleVersionResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ResolvedArtifactFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ResolvedConfigurationBuilder.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/SettingsConverter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/DefaultCachedModuleResolution.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/DefaultCachedModuleVersionList.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/ModuleResolutionCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/ModuleResolutionCacheEntry.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/ModuleVersionsCache.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/ModuleVersionsCacheEntry.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/SingleFileBackedModuleResolutionCache.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/SingleFileBackedModuleVersionsCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/AbstractDependencyResolverAdapter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BuildableModuleVersionMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BuildableModuleVersionMetaDataResolveResult.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BuildableModuleVersionSelectionResolveResult.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ConfiguredModuleVersionRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaDataResolveResult.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionSelectionResolveResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultDependencyMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultIvyAdapter.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultModuleVersionListing.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DelegatingDependencyResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DependencyMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolver.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ExternalResourceResolverAdapter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyAdapter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDependencyResolverAdapter.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalArtifactsModuleVersionRepository.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleVersionListing.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleVersionMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChain.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainArtifactResolver.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolver.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainModuleResolution.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainModuleSource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RestrictedDependencyResolver.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/VersionInfo.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/Versioned.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedModuleVersionResult.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedRepository.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCache.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCacheStats.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryDependencyMetadataCache.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractModuleDescriptorParser.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DescriptorParseContext.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedDescriptorParseContext.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedParserSettings.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParseException.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParser.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/ModuleScopedParserSettings.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/ParserRegistry.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomParent.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReader.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/RootPomParent.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/UnresolvedDependencyVersionException.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/data/MavenDependencyKey.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/data/PomDependencyMgt.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/data/PomProfile.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ChainVersionMatcher.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ExactVersionMatcher.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/LatestStrategy.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/LatestVersionMatcher.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/LatestVersionStrategy.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ResolverStrategy.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/SubVersionMatcher.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/VersionMatcher.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/VersionRangeMatcher.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/CachedModuleDescriptorParseContext.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultCachedMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultCachedModuleDescriptor.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleArtifactsCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleDescriptorCache.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleMetaDataCache.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleArtifactsCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorCache.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleMetaDataCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ArtifactsExtraAttributesStrategy.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ArtifactsToModuleDescriptorConverter.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ConfigurationsToArtifactsConverter.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultArtifactsToModuleDescriptorConverter.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToArtifactsConverter.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/PublishLocalComponentFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/PublishModuleDescriptorConverter.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ResolveLocalComponentFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ResolveModuleDescriptorConverter.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleMetaDataFactory.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultClientModuleMetaDataFactory.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultModuleDescriptorFactoryForClientModule.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ModuleDescriptorFactoryForClientModule.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/DefaultProjectComponentRegistry.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/DefaultProjectModuleRegistry.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/DefaultProjectPublication.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/DefaultProjectPublicationRegistry.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectArtifactResolver.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectComponentRegistry.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectModuleRegistry.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectPublication.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectPublicationRegistry.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultExternalResourceCachePolicy.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/ExternalResourceCachePolicy.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DefaultDependencyToConfigurationResolver.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyToConfigurationResolver.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultResolvedConfigurationBuilder.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultTransientConfigurationResults.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/ResolvedConfigurationBuilder.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/ResolvedConfigurationResults.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/ResolvedContentsMapping.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResults.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResultsBuilder.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentIdentifierSerializer.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentSelectionReasonSerializer.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentSelectorSerializer.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultInternalDependencyResult.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultModuleVersionSelection.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultResolutionResultBuilder.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/InternalDependencyResultSerializer.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ModuleVersionSelectionSerializer.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ResolvedConfigurationListener.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/StreamingResolutionResultBuilder.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/CachedStoreFactory.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/DefaultBinaryStore.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/ResolutionResultsStoreFactory.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/StoreSet.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/AbstractModuleDescriptorBackedMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/BuildableModuleVersionPublishMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ComponentArtifactIdentifier.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ComponentArtifactMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ComponentMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ConfigurationMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultDependencyMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyArtifactName.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultLocalArtifactIdentifier.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultLocalComponentMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactIdentifier.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionPublishMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DependencyMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/IvyArtifactName.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/LocalArtifactMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/LocalComponentMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleDescriptorAdapter.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionArtifactIdentifier.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionArtifactIdentifierSerializer.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionArtifactMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionArtifactPublishMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionPublishMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/MutableLocalComponentMetaData.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/MutableModuleVersionMetaData.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/CustomResolverArtifactRepository.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalArtifactRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/FixedResolverArtifactRepository.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/PublicationAwareRepository.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/AbstractRepositoryCacheManager.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/DownloadingRepositoryArtifactCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/DownloadingRepositoryCacheManager.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/EnhancedArtifactDownloadReport.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/LocalFileRepositoryArtifactCache.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/LocalFileRepositoryCacheManager.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/RepositoryArtifactCache.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/AbstractRepositoryCacheManager.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/CustomIvyResolverRepositoryFactory.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/CustomResolverArtifactRepository.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManager.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/EnhancedArtifactDownloadReport.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/FixedResolverArtifactRepository.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/IvyDependencyResolverAdapter.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/LegacyDependencyResolverRepositoryFactory.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/LegacyResolverParserSettings.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/LocalFileRepositoryCacheManager.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ComponentMetadataDetailsAdapter.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolverDescriptorParseContext.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenLocalResolver.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/VerifyingExternalResourceDownloader.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/AbstractSoftwareArtifact.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/AbstractSoftwareComponent.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/ComponentMetaDataArtifact.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQuery.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQueryFactory.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQueryResult.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibrary.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibraryJavadocArtifact.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibrarySourcesArtifact.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultUnresolvedSoftwareComponent.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/IvyDescriptorArtifact.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/MavenPomArtifact.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentResult.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedModuleVersionResult.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/DefaultLocallyAvailableExternalResource.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/UrlExternalResource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/DefaultLocallyAvailableResource.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResource.java
 create mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/filestore/ivy/ArtifactIdentifierFileStore.java
 delete mode 100644 subprojects/core-impl/src/main/groovy/org/gradle/api/internal/filestore/ivy/ArtifactRevisionIdFileStore.java
 create mode 100644 subprojects/core-impl/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/artifacts/ArtifactsTestUtils.java
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DefaultArtifactIdentifierTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DependencyManagementBuildScopeServicesTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DependencyManagementGlobalScopeServicesTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ModuleVersionSelectorSerializerTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ResolvedConfigurationIdentifierSerializerTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/component/DefaultComponentIdentifierFactoryTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/component/DefaultModuleComponentIdentifierTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/component/DefaultModuleComponentSelectorTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/component/DefaultProjectComponentIdentifierTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/component/DefaultProjectComponentSelectorTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandlerTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLayoutTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactSetResolveResultTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableComponentResolveResultTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableModuleVersionResolveResultTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultCacheLockingManagerTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyContextManagerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultSettingsConverterTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyBackedArtifactPublisherTest.java
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/IvySettingsFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ResolvedArtifactFactoryTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaDataResolveResultTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaDataTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultDependencyMetaDataTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolverTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolverTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/UserResolverChainTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedModuleVersionResultTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedRepositoryTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCacheTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryDependencyMetadataCacheTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractGradlePomModuleDescriptorParserTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractPomReaderTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParserTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParserProfileTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReaderProfileTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReaderTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/data/MavenDependencyKeyTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ChainVersionMatcherTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/ExactVersionMatcherTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/LatestVersionMatcherTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/LatestVersionStrategyTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/SubVersionMatcherTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/strategy/VersionRangeMatcherTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultArtifactsToModuleDescriptorConverterTest.java
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToArtifactsConverterTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/PublishLocalComponentFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/PublishModuleDescriptorConverterTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ResolveLocalComponentFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ResolveModuleDescriptorConverterTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleDependencyDescriptorFactoryTest.java
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleIvyDependencyDescriptorFactoryTest.java
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultClientModuleMetaDataFactoryTest.java
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultModuleDescriptorFactoryForClientModuleTest.java
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ProjectDependencyDescriptorFactoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ProjectDependencyDescriptorFactoryTest.java
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentIdentifierSerializerTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentSelectionReasonSerializerTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ComponentSelectorSerializerTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DefaultResolutionResultBuilderSpec.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DummyBinaryStore.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/DummyStore.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/InternalDependencyResultSerializerTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ModuleVersionSelectionSerializerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ResolutionResultBuilderSpec.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/ResolutionResultPrinter.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/result/StreamingResolutionResultBuilderTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/CachedStoreFactoryTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/DefaultBinaryStoreTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/store/ResolutionResultsStoreFactoryTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultDependencyMetaDataTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyArtifactNameTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultLocalArtifactIdentifierTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultLocalComponentMetaDataTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactIdentifierTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactMetaDataTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionPublishMetaDataTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/ModuleDescriptorAdapterTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalRepositoryTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/DownloadingRepositoryCacheManagerTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManagerTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/resolutioncache/DefaultArtifactResolutionCacheTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/CachedExternalResourceAdapterTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResourceAdapterTest.groovy
 create mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/cached/DefaultArtifactResolutionCacheTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/local/DefaultLocallyAvailableResourceTest.groovy
 delete mode 100644 subprojects/core-impl/src/test/resources/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/test-bad-confs.xml
 delete mode 100644 subprojects/core-impl/src/test/resources/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/test-cyclic-confs1.xml
 delete mode 100644 subprojects/core-impl/src/test/resources/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/test-empty-dependencies.xml
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/DeprecationHandlingIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/ApplyPluginIntegSpec.groovy
 create mode 100755 subprojects/core/src/integTest/groovy/org/gradle/api/BuildEventsErrorIntegrationTest.groovy
 create mode 100755 subprojects/core/src/integTest/groovy/org/gradle/api/BuildScriptErrorIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/CrossProcessFileLockIntegrationTest.groovy
 create mode 100755 subprojects/core/src/integTest/groovy/org/gradle/api/DeferredConfigurableExtensionIntegrationTest.groovy
 create mode 100755 subprojects/core/src/integTest/groovy/org/gradle/api/ExternalScriptErrorIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/FinalizerTaskIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/GradlePluginIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/InitScriptErrorIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/ProfilingIntegrationTest.groovy
 create mode 100755 subprojects/core/src/integTest/groovy/org/gradle/api/ProjectConfigureEventsErrorIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/SettingsPluginIntegrationSpec.groovy
 create mode 100755 subprojects/core/src/integTest/groovy/org/gradle/api/SettingsScriptErrorIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/dsl/ConcurrentClassDecorationSpec.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/events/BuildExecutionEventsIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalTaskIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/TaskCommandLineConfigurationIntegrationSpec.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/TaskRemovalIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/api/tasks/bundling/ZipIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/plugin/PluginHandlerScriptIntegTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/plugin/ScriptPluginClassLoadingIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/plugin/bintray/BintrayPluginResolutionIntegTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/process/internal/PathLimitationIntegTest.groovy
 delete mode 100644 subprojects/core/src/integTest/resources/org/gradle/api/tasks/ArchiveIntegrationTest/tarTreeFailsGracefully/compressedTarWithWrongExtension.tar
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/NonExtensible.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/ProjectConfigurationException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/ComponentMetadataDetails.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/component/ComponentIdentifier.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/component/ComponentSelector.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/component/ModuleComponentIdentifier.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/component/ModuleComponentSelector.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/component/ProjectComponentIdentifier.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/component/ProjectComponentSelector.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/component/package-info.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/dsl/ComponentMetadataHandler.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/ArtifactResolutionQuery.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/ArtifactResolutionQueryResult.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibrary.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibraryArtifact.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibraryJavadocArtifact.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibrarySourcesArtifact.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/SoftwareArtifact.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/SoftwareComponent.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/UnresolvedSoftwareComponent.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/package-info.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ComponentSelectionReason.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ModuleVersionSelectionReason.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ResolvedComponentResult.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ResolvedModuleVersionResult.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/file/DuplicateFileCopyingException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/file/DuplicatesStrategy.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractMultiCauseException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/CachingDirectedGraphWalker.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/Contextual.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/DirectedGraph.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/DirectedGraphWithEdgeValues.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/GraphAggregator.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/LocationAwareException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/MultiCauseException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/ArtifactPublicationServices.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/ArtifactPublisher.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/DefaultArtifactIdentifier.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/ModuleInternal.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/ProjectDependencyInternal.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/ArtifactResolutionQueryFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/DefaultDependencyHandler.groovy
 create 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/ivyservice/ModuleDescriptorConverter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/PublicationAwareRepository.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/version/LatestVersionSemanticComparator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/cache/BinaryStore.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/cache/Store.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/CacheBackedFileSnapshotRepository.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/CacheBackedTaskHistoryRepository.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/CacheLockHandlingTaskExecuter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/CachingHasher.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/CompositeUpToDateRule.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/DefaultFileCacheListener.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/DefaultFileSnapshotter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/DefaultHasher.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/DefaultTaskArtifactStateCacheAccess.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/DefaultTaskArtifactStateRepository.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/FileCacheBroadcastTaskArtifactStateRepository.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/FileCacheListener.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/FileCollectionSnapshot.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/FileSnapshotRepository.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/FileSnapshotter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/Hasher.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/InMemoryIndexedCache.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/InputFilesChangedUpToDateRule.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/InputPropertiesChangedUpToDateRule.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/MapMergeChangeListener.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/OutputFilesChangedUpToDateRule.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/OutputFilesSnapshotter.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/ShortCircuitTaskArtifactStateRepository.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/TaskArtifactStateCacheAccess.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/TaskCacheLockHandlingBuildExecuter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/TaskExecution.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/TaskHistoryRepository.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/TaskTypeChangedUpToDateRule.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/UpToDateRule.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/ChangesOnlyIncrementalTaskInputs.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/DefaultTaskArtifactStateRepository.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/NoHistoryArtifactState.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/RebuildIncrementalTaskInputs.java
 create mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/ShortCircuitTaskArtifactStateRepository.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/changes/StatefulIncrementalTaskInputs.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/CachingTaskStateChanges.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/ChangeType.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/DescriptiveChange.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/FileChange.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/InputFileChange.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/InputFilesStateChangeRule.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/InputPropertiesStateChangeRule.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/NoHistoryStateChangeRule.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/OutputFileChange.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/OutputFilesStateChangeRule.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/SimpleTaskStateChanges.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/SummaryTaskStateChanges.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/TaskStateChange.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/TaskStateChanges.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/TaskTypeStateChangeRule.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/TaskUpToDateState.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/CacheBackedFileSnapshotRepository.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/CacheBackedTaskHistoryRepository.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/CachingFileSnapshotter.java
 create mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/DefaultFileCollectionSnapshotter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/DefaultFileSnapshotterSerializer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/DefaultTaskArtifactStateCacheAccess.java
 create mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/FileCollectionSnapshot.java
 create mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/FileCollectionSnapshotter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/FileSnapshotRepository.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/FileSnapshotter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/InMemoryTaskArtifactCache.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/MapMergeChangeListener.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/NoOpDecorator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/OutputFilesCollectionSnapshotter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/OutputFilesSnapshotSerializer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/TaskArtifactStateCacheAccess.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/TaskExecution.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/TaskHistoryRepository.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/coerce/MethodArgumentsTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/coerce/TypeCoercingMethodArgumentsTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/CopyActionProcessingStreamAction.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/DefaultCompositeFileTree.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/DefaultFileLookup.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/FileLookup.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/archive/TarCopyAction.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/archive/TarCopySpecVisitor.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/archive/ZipCopySpecVisitor.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/DelegatingFileCollection.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/LazilyInitializedFileCollection.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/AbstractZipCompressor.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/ArchiveCopyAction.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopyActionExecuter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopyActionProcessingStream.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopyFileVisitorImpl.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecActionImpl.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecBackedCopyActionProcessingStream.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecImpl.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecVisitor.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecWrapper.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DefaultCopySpec.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DefaultFileCopyDetails.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DefaultZipCompressor.java
 create 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/DelegatingCopySpecVisitor.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DestinationRootCopySpec.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionDecorator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/EmptyCopySpecVisitor.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/FileCopier.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/FileCopyDetailsInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/FileCopySpecVisitor.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/MappingCopySpecVisitor.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/MatchingCopyAction.java
 create 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/NormalizingCopySpecVisitor.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/RelativizedCopySpec.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/SyncCopyActionDecorator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/SyncCopySpecVisitor.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/ZipDeflatedCompressor.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/ZipStoredCompressor.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/pattern/AnyWildcardPatternStep.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/pattern/DefaultPatternMatcher.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/pattern/EndOfPathMatcher.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/pattern/FixedPatternStep.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/pattern/FixedStepsPathMatcher.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/pattern/GreedyPathMatcher.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/pattern/GreedyPatternStep.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/pattern/NameOnlyPatternMatcher.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/pattern/PathMatcher.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/pattern/WildcardPrefixPatternStep.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/AbstractFileStoreEntry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/FileStore.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/FileStoreEntry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/FileStoreSearcher.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/hash/DefaultHasher.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/hash/Hasher.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ClassLoaderCache.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ClassLoaderScope.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderCache.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderScope.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/NoClassLoaderUpdateScriptHandler.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/RootClassLoaderScope.java
 create 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/ScriptClassLoaderProvider.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ScriptHandlerClassLoaderFactory.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ScriptHandlerInternal.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/NotationParserBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/TypeInfo.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/api/NotationParser.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/api/UnsupportedNotationException.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/parsers/CharSequenceNotationParser.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/parsers/ClosureToSpecNotationParser.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/parsers/CompositeNotationParser.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/parsers/ErrorHandlingNotationParser.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/parsers/FlatteningNotationParser.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/parsers/JustReturningParser.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/parsers/MapKey.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/parsers/MapNotationParser.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/parsers/NormalizedTimeUnit.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/parsers/TimeUnitsParser.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/notations/parsers/TypedNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/ClassloaderBackedPluginDescriptorLocator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultPluginContainer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultProjectsPluginContainer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/ExtensionContainerInternal.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/PluginDescriptor.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/PluginDescriptorLocator.java
 create 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/DefaultAntBuilder.groovy
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/DefaultAntBuilder.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/api/internal/project/GlobalServicesRegistry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/GradleInternalServiceRegistry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/IProjectRegistry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectInternalServiceRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectRegistry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/ServiceRegistryFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/TaskExecutionServices.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/TaskInternalServiceRegistry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/TopLevelBuildServiceRegistry.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/CommandLineOption.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/ContextAwareTaskAction.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/SimpleWorkResult.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/TaskExecutionContext.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/execution/DefaultTaskExecutionContext.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/options/AbstractOptionElement.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/options/FieldOptionElement.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/options/InstanceOptionDescriptor.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/options/MethodOptionElement.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/options/Option.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/options/OptionDescriptor.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/options/OptionElement.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/options/OptionNotationParserFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/options/OptionReader.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/options/OptionValidationException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/options/OptionValues.groovy
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/plugins/PluginAware.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/Upload.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/bundling/internal/Zip64RequiredException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/incremental/IncrementalTaskInputs.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/incremental/InputFileDetails.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/incremental/package-info.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/DirectoryCacheBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/ObjectCacheBuilder.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/PersistentIndexedCacheParameters.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/PersistentStore.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/CacheCoordinator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/CacheDecorator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/CacheInitializationAction.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/CacheScopeMapping.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultCacheScopeMapping.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultMultiProcessSafePersistentIndexedCache.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/DelegateOnDemandPersistentDirectoryCache.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/FileLockCommunicator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/GracefullyStoppedException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/cacheops/CacheAccessOperationsStack.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/cacheops/CacheOperation.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/cacheops/CacheOperationStack.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/DefaultLockStateSerializer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/LockFileAccess.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/LockInfo.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/LockInfoAccess.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/LockInfoSerializer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/LockOptions.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/LockOptionsBuilder.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/LockState.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/LockStateAccess.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/LockStateSerializer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/filelock/Version1LockStateSerializer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/locklistener/DefaultFileLockContentionHandler.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/locklistener/FileLockContentionHandler.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/BuildScriptProcessor.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/LifecycleProjectEvaluator.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/ProjectDependencies2TaskResolver.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/ProjectEvaluator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/BuildScriptProcessor.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/ConfigureActionsProjectEvaluator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/DefaultProjectConfigurationActionContainer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/DelayedConfigurationActions.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/LifecycleProjectEvaluator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/PluginsProjectConfigureActions.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/ProjectConfigurationActionContainer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/ProjectConfigureAction.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/ProjectDependencies2TaskResolver.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/ProjectEvaluator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/configuration/project/TaskModelRealizingConfigurationAction.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/TaskSelectionResult.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/commandline/TaskConfigurationException.java
 create 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/ExecutionOptions.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/taskgraph/TaskDependencyGraph.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/execution/taskgraph/TaskDependencyGraphEdge.groovy
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/AstUtils.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/BuildScriptClasspathScriptTransformer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ClasspathScriptTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/FilteredTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/FilteringStatementTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/PluginsAndBuildscriptTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptBlock.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptBlockToServiceConfigurationTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/StatementExtractingScriptTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/StatementTransformer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/BuildAction.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/BuildController.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/BuildProgressLogger.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/BuildSourceBuilder.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/DefaultSettings.groovy
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/DefaultSettings.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/GradleLauncherAction.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/IProjectDescriptorRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/JdkToolsInitializer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/ProjectDescriptorRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/ProjectPathProjectSpec.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/ProjectSpecs.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/buildsrc/BuildSourceBuilder.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/buildsrc/BuildSrcBuildListenerFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/initialization/buildsrc/BuildSrcUpdateFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/environment/GradleBuildEnvironment.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/exceptions/AbstractMultiCauseException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/exceptions/Contextual.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/exceptions/FailureResolutionAware.java
 create mode 100755 subprojects/core/src/main/groovy/org/gradle/internal/exceptions/LocationAwareException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/exceptions/MultiCauseException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/featurelifecycle/DeprecatedFeatureHandler.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/featurelifecycle/DeprecatedFeatureUsage.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/featurelifecycle/LoggingDeprecatedFeatureHandler.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/featurelifecycle/ScriptUsageLocationReporter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/featurelifecycle/UsageLocationReporter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/graph/CachingDirectedGraphWalker.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/graph/DirectedGraph.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/graph/DirectedGraphRenderer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/graph/DirectedGraphWithEdgeValues.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/graph/GraphAggregator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/graph/GraphNodeRenderer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/graph/GraphRenderer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/BuildProgressFilter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/BuildProgressLogger.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/LoggerProvider.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/OperationIdentifier.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/OperationsHierarchy.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/OperationsHierarchyKeeper.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/PercentageProgressFormatter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/ProgressFormatter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/ProgressLoggerProvider.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/progress/SimpleProgressFormatter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/BuildScopeServiceRegistryFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/BuildScopeServices.java
 create mode 100755 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/GlobalScopeServices.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/GradleScopeServices.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/PluginServiceRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/ProjectScopeServices.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/ServiceRegistryFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/SettingsScopeServices.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/TaskExecutionServices.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/TaskScopeServices.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/text/TreeFormatter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/CharSequenceNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/ClosureToSpecNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/CompositeNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/EnumFromCharSequenceNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/ErrorHandlingNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/FlatteningNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/JustReturningParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/MapKey.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/MapNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/NormalizedTimeUnit.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/NotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/NotationParserBuilder.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/TimeUnitsParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/TypeConversionException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/TypeInfo.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/TypedNotationParser.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/UnsupportedNotationException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/ValueAwareNotationParser.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/StatusBarFormatter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/progress/ProgressOperation.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/progress/ProgressOperations.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/ModelFinalizer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/ModelPath.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/ModelRule.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/ModelRules.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/Path.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/dsl/ModelDsl.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/dsl/internal/GroovyModelDsl.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/DefaultInputs.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/DefaultModelRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/Inputs.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/ModelCreationListener.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/ModelCreator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/ModelMutation.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/ModelMutator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/ModelRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/ModelRegistryBackedModelRules.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/model/internal/rules/ReflectiveRule.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/PluginHandler.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/DefaultPluginHandler.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/NonPluggableTargetPluginHandler.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginRequestApplicator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolutionApplicator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolverFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolvers.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/ClassPathPluginResolution.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/CompositePluginResolver.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/DefaultPluginRequest.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/DependencyResolvingClasspathProvider.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/InvalidPluginRequestException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterPluginMapper.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterRepositoryConfigurer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/ModuleMappingPluginResolver.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/NotInPluginRegistryPluginResolverCheck.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRegistryPluginResolver.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRequest.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRequestSerializer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginResolution.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginResolver.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/SimplePluginResolution.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/ExecActionFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/process/internal/ProcessParentingInitializer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/profile/DependencyResolveProfile.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/profile/EvalutationOperation.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/testfixtures/internal/GlobalTestServices.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/testfixtures/internal/InMemoryIndexedCache.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/testfixtures/internal/TestBuildScopeServices.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/testfixtures/internal/TestGlobalScopeServices.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/testfixtures/internal/TestTopLevelBuildServiceRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/tooling/provider/model/ToolingModelBuilder.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/tooling/provider/model/ToolingModelBuilderRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/tooling/provider/model/UnknownModelException.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/tooling/provider/model/internal/DefaultToolingModelBuilderRegistry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/tooling/provider/model/internal/LegacyConsumerInterface.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/tooling/provider/model/package-info.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/ClassLoaderBackedClasspathSource.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/ClassLoaderFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/ClasspathSource.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/ClasspathUtil.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/DefaultClassLoaderFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/DeleteOnExit.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/FilteringClassLoader.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/JavaMethod.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/MultiParentClassLoader.java
 delete mode 100755 subprojects/core/src/main/groovy/org/gradle/util/MutableURLClassLoader.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/ReflectionUtil.groovy
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/StdoutSwapper.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/hash/HashUtil.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/util/hash/HashValue.java
 delete mode 100644 subprojects/core/src/main/resources/org/gradle/configuration/default-imports.txt
 create mode 100644 subprojects/core/src/main/resources/org/gradle/initialization/buildsrc/defaultBuildSourceScript.txt
 delete mode 100644 subprojects/core/src/main/resources/org/gradle/initialization/defaultBuildSourceScript.txt
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/file/ProjectCopySpecTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/AbstractMultiCauseExceptionTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/CachingDirectedGraphWalkerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/DefaultNamedDomainObjectCollectionTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/DefaultPolymorphicDomainObjectContainerBaseTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/GraphAggregatorTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/LocationAwareExceptionTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/version/LatestVersionSemanticComparatorSpec.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/CacheBackedFileSnapshotRepositoryTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/CachingHasherTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/CompositeUpToDateRuleTest.groovy
 delete mode 100755 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/DefaultFileSnapshotterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/DefaultTaskArtifactStateCacheAccessTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/DefaultTaskArtifactStateRepositoryTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/FileCacheBroadcastTaskArtifactStateRepositoryTest.groovy
 delete mode 100755 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/ShortCircuitTaskArtifactStateRepositoryTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/changes/DefaultTaskArtifactStateRepositoryTest.groovy
 create mode 100755 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/changes/ShortCircuitTaskArtifactStateRepositoryTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/rules/CachingTaskStateChangesTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/rules/InputFilesStateChangeRuleTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/rules/OutputFilesStateChangeRuleTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/rules/SimpleTaskStateChangesTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/rules/SummaryTaskStateChangesTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/CacheBackedFileSnapshotRepositoryTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/CachingFileSnapshotterTest.groovy
 create mode 100755 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/DefaultFileCollectionSnapshotterTest.groovy
 create 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/DefaultTaskArtifactStateCacheAccessTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/InMemoryTaskArtifactCacheTest.groovy
 create 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/coerce/TypeCoercingMethodArgumentsTransformerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/DefaultCompositeFileTreeTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/DelegatingFileCollectionTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/LazilyInitializedFileCollectionTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/archive/TarCopyActionTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/archive/TarCopySpecVisitorTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/archive/ZipCopyActionTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/archive/ZipCopySpecVisitorTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopyActionExecuterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopyActionImplTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopyFileVisitorImplTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopySpecActionImplTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopySpecBackedCopyActionProcessingStreamTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopySpecImplTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopySpecMatchingTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DefaultCopySpecTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionDecoratorTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/FileCopyActionImplTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/FileCopyActionTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/FileCopySpecVisitorTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/MappingCopySpecVisitorTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/NormalizingCopyActionDecoratorTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/NormalizingCopySpecVisitorTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/SyncCopyActionDecoratorTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/SyncCopySpecVisitorTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/pattern/DefaultPatternMatcherTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/pattern/FixedPatternStepTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/pattern/FixedStepsPathMatcherTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/pattern/GreedyPathMatcherTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/pattern/NameOnlyPatternMatcherTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/pattern/PatternStepFactoryTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/pattern/PatternStepFactoryTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/pattern/WildcardPrefixPatternStepTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderCacheTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderScopeTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/notations/parsers/CharSequenceNotationParserTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/notations/parsers/ClosureToSpecNotationParserTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/notations/parsers/ErrorHandlingNotationParserTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/notations/parsers/MapNotationParserTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/notations/parsers/TimeUnitsParserTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/notations/parsers/TypedNotationParserTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginContainerTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultProjectsPluginContainerTest.java
 delete mode 100755 subprojects/core/src/test/groovy/org/gradle/api/internal/project/GlobalServicesRegistryTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/GradleInternalServiceRegistryTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/ProjectFactoryTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/ProjectFactoryTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/ProjectInternalServiceRegistryTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/TaskExecutionServicesTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/TaskInternalServiceRegistryTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/TopLevelBuildServiceRegistryTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/execution/SkipUpToDateTaskExecuterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/execution/SkipUpToDateTaskExecuterTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/options/InstanceOptionDescriptorSpec.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/options/OptionNotationParserFactorySpec.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/options/OptionReaderTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/tasks/AbstractCopyTaskTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/tasks/AbstractCopyTaskTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/tasks/SyncTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/tasks/UploadTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/AbstractFileLockManagerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/DefaultCacheScopeMappingTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/DefaultFileLockManagerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/DefaultFileLockManagerWithCrossVersionProtocolTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/DefaultFileLockManagerWithNewProtocolTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/DelegateOnDemandPersistentDirectoryCacheSpec.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/FileLockCommunicatorTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/cacheops/CacheAccessOperationsStackTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/cacheops/CacheOperationStackTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/filelock/LockOptionsBuilderTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/cache/internal/locklistener/DefaultFileLockContentionHandlerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/BuildScriptProcessorTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/DefaultInitScriptProcessorTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/DefaultInitScriptProcessorTest.java
 create mode 100755 subprojects/core/src/test/groovy/org/gradle/configuration/DefaultScriptPluginFactoryTest.groovy
 delete mode 100755 subprojects/core/src/test/groovy/org/gradle/configuration/DefaultScriptPluginFactoryTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/ImplicitTasksConfigurerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/LifecycleProjectEvaluatorTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/ProjectDependencies2TaskResolverTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/project/BuildScriptProcessorTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/project/ConfigureActionsProjectEvaluatorTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/project/DefaultProjectConfigurationActionContainerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/project/DelayedConfigurationActionsTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/project/LifecycleProjectEvaluatorTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/project/PluginsProjectConfigureActionsTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/configuration/project/ProjectDependencies2TaskResolverTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/execution/taskgraph/DefaultTaskPlanExecutorTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/execution/taskgraph/ParallelTaskExecutionPlanTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/execution/taskgraph/TaskDependencyGraphTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/BuildLayoutParametersTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/BuildProgressLoggerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/BuildSourceBuilderTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/ProjectPathProjectSpecTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/ProjectSpecsTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/ScriptEvaluatingSettingsProcessorTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/SettingsFactoryTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/SettingsFactoryTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/SettingsHandlerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/SettingsHandlerTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/buildsrc/BuildSourceBuilderTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/buildsrc/BuildSrcBuildListenerFactoryTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/initialization/buildsrc/BuildSrcUpdateFactoryTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/exceptions/AbstractMultiCauseExceptionTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/exceptions/LocationAwareExceptionTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/featurelifecycle/DeprecatedFeatureUsageTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/featurelifecycle/LoggingDeprecatedFeatureHandlerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/featurelifecycle/ScriptUsageLocationReporterTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/graph/CachingDirectedGraphWalkerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/graph/DirectedGraphRendererTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/graph/GraphAggregatorTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/progress/BuildProgressFilterTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/progress/BuildProgressLoggerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/progress/OperationsHierarchyKeeperTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/progress/OperationsHierarchyTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/progress/PercentageProgressFormatterTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/progress/SimpleProgressFormatterTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/service/scopes/BuildScopeServicesTest.groovy
 create mode 100755 subprojects/core/src/test/groovy/org/gradle/internal/service/scopes/GlobalScopeServicesTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/service/scopes/GradleScopeServicesTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/service/scopes/ProjectScopeServicesTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/service/scopes/SettingsScopeServicesTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/service/scopes/TaskExecutionServicesTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/service/scopes/TaskScopeServicesTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/text/TreeFormatterTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/CharSequenceNotationParserTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/ClosureToSpecNotationParserTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/EnumFromCharSequenceNotationParserSpec.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/ErrorHandlingNotationParserTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/MapNotationParserTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/NotationParserBuilderSpec.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/TimeUnitsParserTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/TypedNotationParserTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/progress/ProgressOperationsTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/model/dsl/internal/GroovyModelDslTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/model/internal/ModelRegistryBackedModelRulesTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/plugin/bintray/JCenterPluginMapperSpec.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/plugin/internal/DefaultPluginHandlerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/profile/ProfileReportRendererTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/profile/ProjectProfileTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/profile/TaskExecutionTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/tooling/provider/model/internal/DefaultToolingModelBuilderRegistryTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/util/DefaultClassLoaderFactoryTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/util/DefaultClassLoaderFactoryTestHelper.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/util/FilteringClassLoaderTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/util/JavaMethodTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/util/MultiParentClassLoaderTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/util/StdoutSwapperTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/util/hash/HashValueTest.groovy
 delete mode 100644 subprojects/core/src/test/resources/org/gradle/api/internal/file/archive/permissions.tar
 create mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/api/RecordingAntBuildListener.groovy
 create mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/api/file/FileCollectionMatchers.java
 create mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/api/internal/file/copy/CopyActionExecuterUtil.java
 create mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/api/tasks/AbstractCopyTaskContractTest.groovy
 create mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/api/tasks/TaskDependencyMatchers.java
 create mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/cache/internal/locklistener/NoOpFileLockContentionHandler.java
 delete mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/util/HelperUtil.groovy
 delete mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/util/Matchers.java
 create mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/util/TestUtil.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/ide/visualstudio/VisualStudioFileCustomizationIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/ide/visualstudio/VisualStudioMultiProjectIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/ide/visualstudio/VisualStudioSingleProjectIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/ide/visualstudio/plugins/VisualStudioPluginIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/CppAutoTestedSamplesIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerPluginIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/c/plugins/CPluginIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIncrementalCompileIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AssemblyLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AssemblyLanguageIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/BinaryBuildTypesIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/BinaryFlavorsIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/BinaryPlatformIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CCallingMixedCAndCppLanguageIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CLanguageIncrementalCompileIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CLanguageIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppBinariesIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppCallingCLanguageIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppLanguageIncrementalCompileIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppLanguageIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppPluginGoodBehaviourTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/DuplicateBaseNamesIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GccToolChainCustomisationIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GccToolChainDiscoveryIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GeneratedSourcesIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryApiDependenciesIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryBinariesIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryDependenciesIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/MixedLanguageIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/MultipleToolChainIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeBinariesPluginIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeSamplesIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/PrebuiltLibrariesIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/SharedLibrarySoNameIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/SourceSetDependenciesIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/ToolChainDiscoveryIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesIncrementalBuildIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesUnsupportedIntegrationTest.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/fixtures/AbstractInstalledToolChainIntegrationSpec.groovy
 create mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/fixtures/SingleToolChainTestRunner.java
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppPluginIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/MixedObjectiveCIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/ObjectiveCLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/ObjectiveCLanguageIncrementalCompileIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/ObjectiveCLanguageIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/ObjectiveCUnsupportedIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCPluginIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivecpp/ObjectiveCppLanguageIncrementalBuildIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivecpp/ObjectiveCppLanguageIncrementalCompileIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivecpp/ObjectiveCppLanguageIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivecpp/ObjectiveCppUnsupportedIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppPluginIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesPluginIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPluginIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/test/cunit/plugins/CUnitPluginIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/plugins/cpp/AbstractBinariesIntegrationSpec.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/plugins/cpp/AvailableCompilers.java
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/plugins/cpp/CppExePluginGoodBehaviourTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/plugins/cpp/CppIntegrationTestRunner.java
 delete mode 100644 subprojects/cpp/src/integTest/groovy/org/gradle/plugins/cpp/CppLibPluginGoodBehaviourTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/plugins/cpp/CppPluginIntegrationTest.groovy
 delete mode 100755 subprojects/cpp/src/integTest/groovy/org/gradle/plugins/cpp/CppSamplesIntegrationTest.groovy
 create mode 100644 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/include/CUnit/Automated.h
 create mode 100644 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/include/CUnit/Basic.h
 create mode 100644 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/include/CUnit/CUError.h
 create mode 100644 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/include/CUnit/CUnit.h
 create mode 100644 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/include/CUnit/CUnit_intl.h
 create mode 100644 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/include/CUnit/Console.h
 create mode 100644 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/include/CUnit/MyMem.h
 create mode 100644 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/include/CUnit/TestDB.h
 create mode 100644 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/include/CUnit/TestRun.h
 create mode 100644 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/include/CUnit/Util.h
 create mode 100755 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/lib/cygwin/cunit.lib
 create mode 100644 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/lib/linux/libcunit.a
 create mode 100755 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/lib/mingw/cunit.lib
 create mode 100644 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/lib/osx/libcunit.a
 create mode 100644 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/lib/vs2010/cunit.lib
 create mode 100755 subprojects/cpp/src/integTest/resources/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest/shared/libs/cunit/2.1-2/lib/vs2013/cunit.lib
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/model/CprojectDescriptor.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/model/CprojectSettings.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/model/ProjectDescriptor.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/model/ProjectSettings.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/tasks/GenerateMetadataFileTask.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/ConfigFile.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/TextConfigFile.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/TextProvider.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioExtension.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioProject.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioSolution.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/XmlConfigFile.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioExtension.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioProject.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioSolution.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/ExecutableVisualStudioProjectConfiguration.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfiguration.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapper.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistry.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectResolver.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioSolutionRegistry.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/rules/CreateVisualStudioModel.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/rules/CreateVisualStudioTasks.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/plugins/VisualStudioPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/tasks/GenerateFiltersFileTask.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/tasks/GenerateProjectFileTask.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/tasks/GenerateSolutionFileTask.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/tasks/internal/AbsoluteFileNameTransformer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/tasks/internal/RelativeFileNameTransformer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioFiltersFile.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioProjectFile.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioSolutionFile.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/DependentSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/HeaderExportingSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/assembler/AssemblerSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/assembler/internal/DefaultAssemblerSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/assembler/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/assembler/plugins/AssemblerLangPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/c/CSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/c/internal/DefaultCSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/c/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/c/plugins/CLangPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/cpp/CppSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/cpp/internal/DefaultCppSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/cpp/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/cpp/plugins/CppLangPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/internal/AbstractHeaderExportingDependentSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/internal/AbstractHeaderExportingSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/internal/ConfigurationBasedNativeDependencySet.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivec/ObjectiveCSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivec/internal/DefaultObjectiveCSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivec/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivec/plugins/ObjectiveCLangPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivecpp/ObjectiveCppSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivecpp/internal/DefaultObjectiveCppSourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivecpp/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/objectivecpp/plugins/ObjectiveCppLangPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/rc/WindowsResourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/rc/internal/DefaultWindowsResourceSet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/rc/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/language/rc/plugins/WindowsResourceScriptPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/BuildType.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/BuildTypeContainer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Executable.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ExecutableBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ExecutableContainer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Flavor.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/FlavorContainer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Library.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/LibraryBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/LibraryContainer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeBinaryTasks.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeDependencySet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeLibraryRequirement.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/PrebuiltLibraries.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/PrebuiltLibrary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ProjectNativeBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ProjectNativeComponent.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Repositories.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/SharedLibraryBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/StaticLibraryBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/TargetedNativeComponent.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Tool.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractBinaryToolSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectLibraryBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeComponent.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractTargetedProjectNativeComponent.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/BinaryToolSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultBuildType.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultBuildTypeContainer.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultExecutable.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultExecutableContainer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultFlavor.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultFlavorContainer.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultLibrary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultLibraryContainer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultLinkerSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultNativeBinaryTasks.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultStaticLibraryArchiverSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultTool.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/LibraryBinaryInternal.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/LinkerSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeBinaryServices.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeProjectComponentIdentifier.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectExecutableBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeBinaryInternal.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeComponentInternal.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeLibraryRequirement.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectSharedLibraryBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectStaticLibraryBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/SharedLibraryLinkerSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/SourceSetNotationParser.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/StaticLibraryArchiverSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/StaticLibraryBinaryInternal.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/TargetedNativeComponentInternal.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ApplySourceSetConventions.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ConfigureGeneratedSourceSets.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/CreateDefaultBuildTypes.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/CreateDefaultFlavors.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/CreateDefaultPlatform.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/CreateNativeBinaries.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeBinariesFactory.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/NativeBinariesFactory.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeBinaryInitializer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeComponentInitializer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/RepositoriesFactory.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/AbstractPrebuiltLibraryBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/DefaultPrebuiltLibraries.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/DefaultPrebuiltLibrary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/DefaultPrebuiltSharedLibraryBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/DefaultPrebuiltStaticLibraryBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/PrebuiltLibraryBinaryLocator.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/PrebuiltLibraryInitializer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/PrebuiltLibraryResolveException.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/ApiRequirementNativeDependencyResolver.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/ChainedLibraryBinaryLocator.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultLibraryResolver.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultNativeDependencySet.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultProjectLocator.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/InputHandlingNativeDependencyResolver.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/LibraryBinaryLocator.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/LibraryNativeDependencyResolver.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/LibraryResolveException.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeBinaryRequirementResolveResult.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeBinaryResolveResult.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyNotationParser.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyResolver.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyResolverServices.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLibraryBinaryLocator.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLocator.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/RequirementParsingNativeDependencyResolver.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/SourceSetNativeDependencyResolver.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/PreprocessingTool.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/internal/AssembleSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/internal/DefaultAssembleSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerNativeBinariesPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/tasks/Assemble.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/CCompileSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/DefaultCCompileSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/AbstractIncrementalNativeCompiler.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CleanCompilingNativeCompiler.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CompilationFileState.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CompilationState.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CompilationStateSerializer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultIncrementalCompilation.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludes.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludesParser.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludesResolver.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompilation.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompileProcessor.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompilerBuilder.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalNativeCompiler.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/ResolvedInclude.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/SourceIncludes.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/SourceIncludesParser.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/SourceIncludesResolver.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/CSourceParser.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/PreprocessingReader.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/RegexBackedCSourceParser.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/plugins/CNativeBinariesPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/plugins/CPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/tasks/AbstractNativeCompileTask.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/tasks/CCompile.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/internal/CppCompileSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/internal/DefaultCppCompileSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppNativeBinariesPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/plugins/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/tasks/CppCompile.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/tasks/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/internal/AbstractNativeCompileSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/internal/DefaultPreprocessingTool.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/internal/DefaultObjectiveCCompileSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/internal/ObjectiveCCompileSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCNativeBinariesPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/plugins/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/tasks/ObjectiveCCompile.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/tasks/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/internal/DefaultObjectiveCppCompileSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/internal/ObjectiveCppCompileSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppNativeBinariesPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/tasks/ObjectiveCppCompile.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/tasks/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/internal/DefaultWindowsResourceCompileSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/internal/WindowsResourceCompileSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesNativeBinariesPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/tasks/WindowsResourceCompile.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/Architecture.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/OperatingSystem.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/Platform.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/PlatformContainer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/ArchitectureInternal.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/ArchitectureNotationParser.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/DefaultArchitecture.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/DefaultOperatingSystem.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/DefaultPlatform.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/DefaultPlatformContainer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/OperatingSystemNotationParser.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/internal/PlatformInternal.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/platform/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeBinariesModelPlugin.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/AbstractLinkTask.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/BuildBinaryTask.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/CreateStaticLibrary.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/InstallExecutable.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/LinkExecutable.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/LinkSharedLibrary.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/ProjectComponentTestSuite.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuite.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuiteContainer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuiteExecutableBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/CUnitTestSuite.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/ConfigureCUnitTestSources.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/CreateCUnitBinaries.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/DefaultCUnitTestSuite.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/plugins/CUnitPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/plugins/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/tasks/GenerateCUnitLauncher.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/tasks/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultTestSuiteContainer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultTestSuiteExecutableBinary.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/plugins/NativeBinariesTestPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/plugins/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/tasks/RunTestExecutable.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/tasks/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/Clang.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/Gcc.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/GccTool.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/PlatformConfigurableToolChain.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/TargetPlatformConfiguration.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/ToolChain.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/ToolChainRegistry.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/VisualCpp.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/AbstractToolChain.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ArgsTransformer.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/CommandLineTool.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/CompileSpecToArgsTransformerChain.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultToolChainRegistry.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/MacroArgsConverter.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/NativeCompileSpec.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/OptionsFileArgsTransformer.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/OutputCleaningCompiler.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/PlatformToolChain.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/SingleSourceCompileArgTransformer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolChainAvailability.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolChainInternal.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolChainRegistryInternal.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolSearchResult.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolType.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/UnavailablePlatformToolChain.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/clang/ClangToolChain.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AbstractGccCompatibleToolChain.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ArStaticLibraryArchiver.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/Assembler.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CCompiler.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CommandLineToolSearchResult.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CppCompiler.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccCompilerArgsTransformer.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccLinker.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccOptionsFileArgTransformer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccPlatformToolChain.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolChain.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolSearchPath.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/NativeCompiler.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ObjectiveCCompiler.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ObjectiveCppCompiler.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/PostTransformActionArgsTransformer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ShortCircuitArgsTransformer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/version/GccVersionDeterminer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/version/GccVersionResult.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/Assembler.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/CCompiler.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/CppCompiler.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/DefaultVisualStudioLocator.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/DefaultWindowsSdkLocator.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/EscapeUserArgs.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/InstallationSearchResult.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/LibExeStaticLibraryArchiver.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/LinkExeLinker.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/NativeCompiler.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppCompilerArgsTransformer.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppInstall.java
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppToolChain.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualStudioInstall.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualStudioLocator.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/WindowsResourceCompiler.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/WindowsSdk.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/WindowsSdkLocator.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/plugins/StandardToolChainsPlugin.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultTool.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultToolRegistry.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/GccToolInternal.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/PlatformGccTool.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/PlatformToolRegistry.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/ToolRegistry.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/ToolSearchPath.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/package-info.java
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/ClangCompilerPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/GccCompilerPlugin.groovy
 create mode 100755 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/MicrosoftVisualCppPlugin.groovy
 create mode 100644 subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/BinariesPlugin.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/Binary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/CompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/Compiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/CompilerRegistry.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/Executable.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/HeaderExportingSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/Library.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/LibraryCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/NativeDependencyCapableSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/NativeDependencySet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/SourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/internal/BinaryCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/internal/BinaryCompileSpecFactory.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/internal/CompileSpecFactory.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/internal/CompileTaskAware.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/internal/CompilerAdapter.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/internal/ConfigurationBasedNativeDependencySet.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/internal/DefaultBinary.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/internal/DefaultCompilerRegistry.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/internal/DefaultExecutable.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/internal/DefaultLibrary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/internal/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/model/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/binaries/tasks/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/CppCompile.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/CppExeConventionPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/CppExtension.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/CppLibConventionPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/CppPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/CppSourceSet.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/cdt/CdtIdePlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/cdt/model/CprojectDescriptor.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/cdt/model/CprojectSettings.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/cdt/model/ProjectDescriptor.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/cdt/model/ProjectSettings.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/cdt/tasks/GenerateMetadataFileTask.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/compiler/capability/AgainstLibrary.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/compiler/capability/CompilesCpp.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/compiler/capability/StandardCppCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/compiler/capability/package-info.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/compiler/internal/CommandLineCppCompiler.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/compiler/internal/CommandLineCppCompilerAdapter.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/compiler/internal/CommandLineCppCompilerArgumentsToOptionFile.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/compiler/internal/CppCompiler.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/gpp/GppCompileSpec.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/gpp/GppCompilerPlugin.groovy
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/gpp/GppLibraryCompileSpec.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/gpp/internal/GppCompileSpecFactory.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/gpp/internal/GppCompileSpecToArguments.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/gpp/internal/GppCompiler.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/gpp/internal/GppCompilerAdapter.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/gpp/internal/version/GppVersionDeterminer.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/gpp/package-info.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/internal/CppCompileSpec.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/internal/DefaultCppSourceSet.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/msvcpp/MicrosoftVisualCppPlugin.groovy
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/msvcpp/internal/VisualCppCompileSpecToArguments.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/msvcpp/internal/VisualCppCompiler.java
 delete mode 100755 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/msvcpp/internal/VisualCppCompilerAdapter.java
 delete mode 100644 subprojects/cpp/src/main/groovy/org/gradle/plugins/cpp/package-info.java
 create mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/assembler.properties
 delete mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/binaries.properties
 create mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/c.properties
 delete mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/cpp-exe.properties
 delete mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/cpp-lib.properties
 create mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/cunit.properties
 delete mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/gpp-compiler.properties
 create mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/native-binaries.properties
 create mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/objective-c.properties
 create mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/objective-cpp.properties
 create mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/visual-studio.properties
 create mode 100644 subprojects/cpp/src/main/resources/META-INF/gradle-plugins/windows-resources.properties
 create mode 100644 subprojects/cpp/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 rename subprojects/cpp/src/main/resources/org/gradle/{plugins/cpp => ide}/cdt/model/defaultCproject-linux.xml (100%)
 rename subprojects/cpp/src/main/resources/org/gradle/{plugins/cpp => ide}/cdt/model/defaultCproject-macos.xml (100%)
 rename subprojects/cpp/src/main/resources/org/gradle/{plugins/cpp => ide}/cdt/model/defaultProject.xml (100%)
 create mode 100644 subprojects/cpp/src/main/resources/org/gradle/ide/visualstudio/tasks/internal/default.sln
 create mode 100644 subprojects/cpp/src/main/resources/org/gradle/ide/visualstudio/tasks/internal/default.vcxproj
 create mode 100644 subprojects/cpp/src/main/resources/org/gradle/ide/visualstudio/tasks/internal/default.vcxproj.filters
 create mode 100644 subprojects/cpp/src/main/resources/org/gradle/nativebinaries/test/cunit/tasks/gradle_cunit_main.c
 create mode 100644 subprojects/cpp/src/main/resources/org/gradle/nativebinaries/test/cunit/tasks/gradle_cunit_register.h
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/cdt/model/CprojectSettingsSpec.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/cdt/model/ProjectDescriptorSpec.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioProjectTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfigurationTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapperTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistryTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/tasks/internal/RelativeFileNameTransformerTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioFiltersFileTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioProjectFileTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/tasks/internal/VisualStudioSolutionFileTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/language/assembler/plugins/AssemblerLangPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/language/c/plugins/CLangPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/language/cpp/plugins/CppLangPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultBuildTypeTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultExecutableBinaryTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultExecutableTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultFlavorTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultLibraryTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeBinaryTasksTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeComponentTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectNativeBinaryTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectSharedLibraryBinaryTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectStaticLibraryBinaryTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/SourceSetNotationParserTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/CreateDefaultBuildTypesTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/CreateDefaultFlavorsTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/CreateDefaultPlatformTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeBinariesFactoryTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeBinaryInitializerTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeComponentInitializerTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/prebuilt/DefaultPrebuiltSharedLibraryBinaryTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/prebuilt/DefaultPrebuiltStaticLibraryBinaryTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyNotationParserTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLibraryBinaryLocatorTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/AbstractNativeBinariesPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerNativeBinariesPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/tasks/AssemblerTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CleanCompilingNativeCompilerTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CompilationStateSerializerTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludesParserTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludesResolverTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompileProcessorTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalNativeCompilerTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/PreprocessingReaderTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/RegexBackedCSourceParserTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/plugins/CNativeBinariesPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/tasks/CCompileTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/fixtures/binaryinfo/ReadelfBinaryInfoTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/internal/DefaultCppSourceSetTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppNativeBinariesPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/tasks/CppCompileTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCNativeBinariesPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppNativeBinariesPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/platform/internal/ArchitectureNotationParserTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/platform/internal/DefaultArchitectureTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/platform/internal/DefaultOperatingSystemTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/platform/internal/DefaultPlatformTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/platform/internal/OperatingSystemNotationParserTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeBinariesModelPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultToolChainRegistryTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/OutputCleaningCompilerTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/ToolChainAvailabilityTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/UnavailablePlatformToolChainTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AbstractGccCompatibleToolChainTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AssemblerTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CCompilerTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ClangToolChainTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccLinkerTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolChainTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ShortCircuitArgsTransformerTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/version/GccVersionDeterminerTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/DefaultVisualStudioLocatorTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/DefaultWindowsSdkLocatorTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppToolChainTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/tools/ToolSearchPathTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/plugins/ClangCompilerPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/plugins/GccCompilerPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/plugins/MicrosoftVisualCppPluginTest.groovy
 create mode 100644 subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/plugins/ToolchainPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/plugins/binaries/model/internal/DefaultCompilerRegistryTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/plugins/cpp/CppExeConventionPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/plugins/cpp/CppLibConventionPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/plugins/cpp/CppPluginTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/plugins/cpp/cdt/model/CprojectSettingsSpec.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/plugins/cpp/cdt/model/ProjectDescriptorSpec.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/plugins/cpp/gpp/GppCompileSpecTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/plugins/cpp/gpp/GppLibraryCompileSpecTest.groovy
 delete mode 100644 subprojects/cpp/src/test/groovy/org/gradle/plugins/cpp/gpp/internal/version/GppVersionDeterminerTest.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/ide/visualstudio/fixtures/FiltersFile.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/ide/visualstudio/fixtures/ProjectFile.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/ide/visualstudio/fixtures/SolutionFile.groovy
 create mode 100755 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/AvailableToolChains.java
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/ExecutableFixture.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/NativeBinaryFixture.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/NativeInstallationFixture.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/RequiresInstalledToolChain.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/RequiresInstalledToolChainExtension.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/SharedLibraryFixture.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/StaticLibraryFixture.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/ToolChainRequirement.java
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CCallingMixedCAndCppHelloWorldApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CCompilerDetectingTestApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CHelloWorldApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CppCallingCHelloWorldApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CppCompilerDetectingTestApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CppHelloWorldApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateAssemblerBaseNamesTestApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateCBaseNamesTestApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateCppBaseNamesTestApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateMixedSameBaseNamesTestApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateObjectiveCBaseNamesTestApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateObjectiveCppBaseNamesTestApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateWindowsResourcesBaseNamesTestApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ExeWithDiamondDependencyHelloWorldApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ExeWithLibraryUsingLibraryHelloWorldApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/HelloWorldApp.java
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/IncrementalHelloWorldApp.java
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/MixedLanguageHelloWorldApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/MixedObjectiveCHelloWorldApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ObjectiveCHelloWorldApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ObjectiveCppHelloWorldApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/PlatformDetectingTestApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/SourceFile.java
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/TestApp.java
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/TestComponent.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/WindowsResourceHelloWorldApp.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/binaryinfo/BinaryInfo.java
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/binaryinfo/DumpbinBinaryInfo.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/binaryinfo/OtoolBinaryInfo.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/binaryinfo/ReadelfBinaryInfo.groovy
 create mode 100644 subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/test/cunit/CUnitTestResults.groovy
 create mode 100644 subprojects/diagnostics/src/integTest/groovy/org/gradle/api/reporting/dependencies/HtmlDependencyReportTaskIntegrationTest.groovy
 create mode 100644 subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/HelpTaskIntegrationTest.groovy
 delete mode 100644 subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/ResolutionResultApiIntegrationTest.groovy
 create mode 100644 subprojects/diagnostics/src/integTest/groovy/org/gradle/configuration/HelpTest.groovy
 create mode 100644 subprojects/diagnostics/src/integTest/resources/org/gradle/api/tasks/diagnostics/HelpTaskIntegrationTest/listsCommonDynamicAvailableValues/build.gradle
 create mode 100644 subprojects/diagnostics/src/integTest/resources/org/gradle/api/tasks/diagnostics/HelpTaskIntegrationTest/listsCommonDynamicAvailableValues/settings.gradle
 create mode 100644 subprojects/diagnostics/src/integTest/resources/org/gradle/api/tasks/diagnostics/HelpTaskIntegrationTest/listsEnumAndBooleanCmdOptionValues/build.gradle
 create mode 100644 subprojects/diagnostics/src/integTest/resources/org/gradle/api/tasks/diagnostics/HelpTaskIntegrationTest/listsEnumAndBooleanCmdOptionValues/settings.gradle
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/plugins/internal/HelpTasksAutoApplyAction.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/DependencyReportContainer.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/HtmlDependencyReportTask.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/internal/DefaultDependencyReportContainer.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/internal/HtmlDependencyReporter.groovy
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/internal/JsonDependencyReportIndexRenderer.groovy
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/internal/JsonProjectDependencyRenderer.groovy
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/internal/StrictDependencyResultSpec.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/package-info.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/GraphRenderer.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/graph/nodes/DependencyReportHeader.java
 delete mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/graph/nodes/SimpleDependency.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/configuration/TaskDetailPrinter.java
 create mode 100644 subprojects/diagnostics/src/main/resources/META-INF/services/org.gradle.configuration.project.ProjectConfigureAction
 create mode 100644 subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/d.gif
 create mode 100644 subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/d.png
 create mode 100644 subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/index.html
 create mode 100644 subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/jquery-1.10.1.min.js
 create mode 100644 subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/jquery.jstree.js
 create mode 100644 subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/script.js
 create mode 100644 subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/style.css
 create mode 100644 subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/template.html
 create mode 100644 subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/throbber.gif
 create mode 100644 subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/tree.css
 create mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/plugins/ProjectReportsPluginTest.groovy
 delete mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/plugins/ProjectReportsPluginTest.java
 delete mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/plugins/ReportingBasePluginConventionTest.groovy
 delete mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/plugins/ReportingBasePluginTest.groovy
 create mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/reporting/dependencies/internal/StrictDependencyResultSpecTest.groovy
 create mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/tasks/diagnostics/internal/graph/nodes/SimpleDependency.java
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.reporting.Report.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.reporting.ReportContainer.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.reporting.Reporting.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.reporting.ReportingExtension.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.reporting.dependencies.HtmlDependencyReportTask.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.tasks.GroovyRuntime.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.tasks.ScalaRuntime.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.tasks.incremental.IncrementalTaskInputs.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.tasks.incremental.InputFile.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.buildinit.tasks.InitBuild.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.ide.visualstudio.VisualStudioExtension.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.ide.visualstudio.VisualStudioProject.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.ide.visualstudio.VisualStudioSolution.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.language.DependentSourceSet.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.language.HeaderExportingSourceSet.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.language.assembler.AssemblerSourceSet.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.language.base.BinaryContainer.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.language.base.FunctionalSourceSet.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.language.base.LanguageSourceSet.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.language.base.ProjectSourceSet.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.language.c.CSourceSet.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.language.cpp.CppSourceSet.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.language.objectivec.ObjectiveCSourceSet.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.language.objectivecpp.ObjectiveCppSourceSet.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.language.rc.WindowsResourceSet.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.BuildType.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.BuildTypeContainer.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.Executable.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ExecutableBinary.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ExecutableContainer.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.Flavor.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.FlavorContainer.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.Library.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.LibraryBinary.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.LibraryContainer.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.NativeBinary.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ProjectNativeBinary.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ProjectNativeComponent.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.SharedLibraryBinary.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.StaticLibraryBinary.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.TargetedNativeComponent.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.Tool.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.language.PreprocessingTool.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.language.assembler.tasks.Assemble.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.language.c.tasks.AbstractNativeCompileTask.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.language.c.tasks.CCompile.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.language.cpp.plugins.CppExeConventionPlugin.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.language.cpp.plugins.CppLibConventionPlugin.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.language.cpp.plugins.CppPlugin.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.language.cpp.tasks.CppCompile.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.language.objectivec.tasks.ObjectiveCCompile.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.language.objectivecpp.tasks.ObjectiveCppCompile.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.language.rc.tasks.WindowsResourceCompile.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.platform.Platform.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.platform.PlatformContainer.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.tasks.AbstractLinkTask.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.tasks.CreateStaticLibrary.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.tasks.InstallExecutable.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.tasks.LinkExecutable.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.tasks.LinkSharedLibrary.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.ProjectComponentTestSuite.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.TestSuite.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.TestSuiteContainer.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.TestSuiteExecutableBinary.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.cunit.CUnitTestSuite.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.Clang.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.Gcc.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.PlatformConfigurableToolChain.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.ToolChain.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.ToolChainRegistry.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.VisualCpp.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.plugins.GppCompilerPlugin.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.plugins.MicrosoftVisualCppPlugin.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.testing.jacoco.plugins.JacocoPluginExtension.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.testing.jacoco.plugins.JacocoTaskExtension.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.testing.jacoco.tasks.JacocoBase.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.testing.jacoco.tasks.JacocoMerge.xml
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.testing.jacoco.tasks.JacocoReport.xml
 delete mode 100644 subprojects/docs/src/docs/userguide/bootstrapPlugin.xml
 create mode 100644 subprojects/docs/src/docs/userguide/buildInitPlugin.xml
 delete mode 100755 subprojects/docs/src/docs/userguide/cpp.xml
 create mode 100644 subprojects/docs/src/docs/userguide/img/jacocoHtmlReport.png
 create mode 100644 subprojects/docs/src/docs/userguide/jacocoPlugin.xml
 create mode 100755 subprojects/docs/src/docs/userguide/nativeBinaries.xml
 create mode 100644 subprojects/docs/src/docs/userguide/wrapperPlugin.xml
 copy subprojects/docs/src/samples/{codeQuality => buildDashboard}/src/main/java/org/gradle/sample/Person.java (100%)
 delete mode 100644 subprojects/docs/src/samples/cpp/dependencies/build.gradle
 delete mode 100644 subprojects/docs/src/samples/cpp/dependencies/lib/src/main/cpp/hello.cpp
 delete mode 100644 subprojects/docs/src/samples/cpp/dependencies/lib/src/main/headers/hello.h
 delete mode 100644 subprojects/docs/src/samples/cpp/exe/build.gradle
 delete mode 100644 subprojects/docs/src/samples/cpp/exewithlib/build.gradle
 delete mode 100644 subprojects/docs/src/samples/cpp/exewithlib/settings.gradle
 create mode 100644 subprojects/docs/src/samples/ivy-publish/multiple-publications/build.gradle
 create mode 100644 subprojects/docs/src/samples/ivy-publish/multiple-publications/output/project1.ivy.xml
 create mode 100644 subprojects/docs/src/samples/ivy-publish/multiple-publications/output/project2-api.ivy.xml
 create mode 100644 subprojects/docs/src/samples/ivy-publish/multiple-publications/output/project2-impl.ivy.xml
 create mode 100644 subprojects/docs/src/samples/ivy-publish/multiple-publications/settings.gradle
 create mode 100644 subprojects/docs/src/samples/maven-publish/multiple-publications/build.gradle
 create mode 100644 subprojects/docs/src/samples/maven-publish/multiple-publications/output/project1.pom.xml
 create mode 100644 subprojects/docs/src/samples/maven-publish/multiple-publications/output/project2-api.pom.xml
 create mode 100644 subprojects/docs/src/samples/maven-publish/multiple-publications/output/project2-impl.pom.xml
 create mode 100644 subprojects/docs/src/samples/maven-publish/multiple-publications/settings.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/assembler/build.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/assembler/src/main/asm_i386_gcc/sum.s
 create mode 100644 subprojects/docs/src/samples/native-binaries/assembler/src/main/asm_i386_masm/sum.s
 create mode 100644 subprojects/docs/src/samples/native-binaries/assembler/src/main/c/main.c
 create mode 100755 subprojects/docs/src/samples/native-binaries/assembler/src/main/headers/sum.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/c/build.gradle
 create mode 100755 subprojects/docs/src/samples/native-binaries/c/src/hello/c/hello.c
 create mode 100755 subprojects/docs/src/samples/native-binaries/c/src/hello/headers/hello.h
 copy subprojects/docs/src/samples/{cpp/dependencies/exe/src/main/cpp/main.cpp => native-binaries/c/src/main/c/main.c} (100%)
 create mode 100644 subprojects/docs/src/samples/native-binaries/cpp-exe/build.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/cpp-exe/settings.gradle
 rename subprojects/docs/src/samples/{cpp/exe => native-binaries/cpp-exe}/src/main/cpp/hello.cpp (100%)
 create mode 100644 subprojects/docs/src/samples/native-binaries/cpp-lib/build.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/cpp-lib/settings.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/cpp-lib/src/main/cpp/hello.cpp
 copy subprojects/docs/src/samples/{cpp/exewithlib/lib => native-binaries/cpp-lib}/src/main/headers/hello.h (100%)
 create mode 100644 subprojects/docs/src/samples/native-binaries/cpp/build.gradle
 create mode 100755 subprojects/docs/src/samples/native-binaries/cpp/src/hello/cpp/hello.cpp
 create mode 100755 subprojects/docs/src/samples/native-binaries/cpp/src/hello/headers/hello.h
 rename subprojects/docs/src/samples/{cpp/exewithlib/exe => native-binaries/cpp}/src/main/cpp/main.cpp (100%)
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/README.md
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/build.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/Automated.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/Basic.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/CUError.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/CUnit.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/CUnit_intl.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/Console.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/MyMem.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/TestDB.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/TestRun.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/include/CUnit/Util.h
 create mode 100755 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/lib/cygwin/cunit.lib
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/lib/linux/libcunit.a
 create mode 100755 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/lib/mingw/cunit.lib
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/lib/osx/libcunit.a
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/lib/vs2010/cunit.lib
 create mode 100755 subprojects/docs/src/samples/native-binaries/cunit/lib/cunit/2.1-2/lib/vs2013/cunit.lib
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/src/operators/c/minus.c
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/src/operators/c/plus.c
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/src/operators/headers/operators.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/src/operatorsTest/cunit/suite_operators.c
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/src/operatorsTest/cunit/test_minus.c
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/src/operatorsTest/cunit/test_plus.c
 create mode 100644 subprojects/docs/src/samples/native-binaries/cunit/src/operatorsTest/headers/test_operators.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/custom-layout/build.gradle
 create mode 100755 subprojects/docs/src/samples/native-binaries/custom-layout/src/include/hello.h
 create mode 100755 subprojects/docs/src/samples/native-binaries/custom-layout/src/source/hello.c
 create mode 100644 subprojects/docs/src/samples/native-binaries/custom-layout/src/source/main.cpp
 create mode 100644 subprojects/docs/src/samples/native-binaries/flavors/build.gradle
 copy subprojects/docs/src/samples/{cpp/dependencies/exe/src/main => native-binaries/flavors/src/exe}/cpp/main.cpp (100%)
 create mode 100755 subprojects/docs/src/samples/native-binaries/flavors/src/lib/cpp/hello.cpp
 create mode 100755 subprojects/docs/src/samples/native-binaries/flavors/src/lib/headers/hello.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/idl/build.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/idl/src/main/c/main.c
 create mode 100644 subprojects/docs/src/samples/native-binaries/idl/src/main/idl/hello.idl
 create mode 100644 subprojects/docs/src/samples/native-binaries/multi-project/build.gradle
 copy subprojects/docs/src/samples/{cpp/dependencies => native-binaries/multi-project}/exe/src/main/cpp/main.cpp (100%)
 rename subprojects/docs/src/samples/{cpp/exewithlib => native-binaries/multi-project}/lib/src/main/cpp/hello.cpp (100%)
 rename subprojects/docs/src/samples/{cpp/exewithlib => native-binaries/multi-project}/lib/src/main/headers/hello.h (100%)
 rename subprojects/docs/src/samples/{cpp/dependencies => native-binaries/multi-project}/settings.gradle (100%)
 create mode 100644 subprojects/docs/src/samples/native-binaries/objective-c/build.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/objective-c/src/main/objc/main.m
 create mode 100644 subprojects/docs/src/samples/native-binaries/objective-cpp/build.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/objective-cpp/src/main/objcpp/main.mm
 create mode 100644 subprojects/docs/src/samples/native-binaries/prebuilt/3rd-party-lib/boost_1_55_0/README.txt
 create mode 100644 subprojects/docs/src/samples/native-binaries/prebuilt/3rd-party-lib/boost_1_55_0/boost/version.hpp
 create mode 100644 subprojects/docs/src/samples/native-binaries/prebuilt/3rd-party-lib/util/README.txt
 create mode 100644 subprojects/docs/src/samples/native-binaries/prebuilt/3rd-party-lib/util/build.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/prebuilt/3rd-party-lib/util/settings.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/prebuilt/3rd-party-lib/util/src/util/cpp/util.cpp
 create mode 100755 subprojects/docs/src/samples/native-binaries/prebuilt/3rd-party-lib/util/src/util/headers/util.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/prebuilt/build.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/prebuilt/src/main/cpp/main.cpp
 create mode 100644 subprojects/docs/src/samples/native-binaries/tool-chains/build.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/tool-chains/src/main/cpp/main.cpp
 create mode 100644 subprojects/docs/src/samples/native-binaries/variants/build.gradle
 create mode 100755 subprojects/docs/src/samples/native-binaries/variants/src/hello/cpp/hello.cpp
 create mode 100755 subprojects/docs/src/samples/native-binaries/variants/src/hello/headers/hello.h
 copy subprojects/docs/src/samples/{cpp/dependencies/exe => native-binaries/variants}/src/main/cpp/main.cpp (100%)
 create mode 100644 subprojects/docs/src/samples/native-binaries/visual-studio/build.gradle
 create mode 100755 subprojects/docs/src/samples/native-binaries/visual-studio/src/hello/cpp/hello.cpp
 create mode 100755 subprojects/docs/src/samples/native-binaries/visual-studio/src/hello/headers/hello.h
 copy subprojects/docs/src/samples/{cpp/dependencies/exe => native-binaries/visual-studio}/src/main/cpp/main.cpp (100%)
 create mode 100644 subprojects/docs/src/samples/native-binaries/windows-resources/build-resource-only-dll.gradle
 create mode 100644 subprojects/docs/src/samples/native-binaries/windows-resources/build.gradle
 create mode 100755 subprojects/docs/src/samples/native-binaries/windows-resources/src/hello/cpp/hello.cpp
 create mode 100755 subprojects/docs/src/samples/native-binaries/windows-resources/src/hello/headers/hello.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/windows-resources/src/hello/headers/resources.h
 create mode 100644 subprojects/docs/src/samples/native-binaries/windows-resources/src/hello/rc/resources.rc
 create mode 100644 subprojects/docs/src/samples/native-binaries/windows-resources/src/main/cpp/main.cpp
 rename subprojects/docs/src/samples/{cpp/dependencies/exe/src/main => src/main/cpp/library}/cpp/main.cpp (100%)
 create mode 100644 subprojects/docs/src/samples/testing/filtering/build.gradle
 create mode 100644 subprojects/docs/src/samples/testing/filtering/src/test/java/SomeIntegTest.java
 create mode 100644 subprojects/docs/src/samples/testing/filtering/src/test/java/SomeOtherTest.java
 create mode 100644 subprojects/docs/src/samples/testing/jacoco/application/build.gradle
 create mode 100644 subprojects/docs/src/samples/testing/jacoco/application/src/main/java/org/gradle/MyMain.java
 create mode 100644 subprojects/docs/src/samples/testing/jacoco/quickstart/build.gradle
 create mode 100644 subprojects/docs/src/samples/testing/jacoco/quickstart/src/main/java/org/gradle/Person.java
 create mode 100644 subprojects/docs/src/samples/testing/jacoco/quickstart/src/test/java/org/gradle/PersonTest.java
 create mode 100644 subprojects/docs/src/samples/testing/junit/categories/build.gradle
 create mode 100644 subprojects/docs/src/samples/testing/junit/categories/src/test/java/org/gradle/junit/CategorizedJUnitTest.java
 create mode 100644 subprojects/docs/src/samples/testing/junit/categories/src/test/java/org/gradle/junit/CategoryA.java
 create mode 100644 subprojects/docs/src/samples/testing/junit/categories/src/test/java/org/gradle/junit/CategoryB.java
 create mode 100644 subprojects/docs/src/samples/testing/junit/categories/src/test/java/org/gradle/junit/SimpleJUnitTest.java
 create mode 100644 subprojects/docs/src/samples/testing/testng/groups/build.gradle
 create mode 100644 subprojects/docs/src/samples/testing/testng/groups/src/test/java/org/gradle/testng/SimpleIntegrationTest.java
 create mode 100644 subprojects/docs/src/samples/testing/testng/groups/src/test/java/org/gradle/testng/SimpleUnitTest.java
 create mode 100644 subprojects/docs/src/samples/toolingApi/customModel/plugin/build.gradle
 create mode 100644 subprojects/docs/src/samples/toolingApi/customModel/plugin/src/main/java/org/gradle/sample/plugin/CustomModel.java
 create mode 100644 subprojects/docs/src/samples/toolingApi/customModel/plugin/src/main/java/org/gradle/sample/plugin/CustomPlugin.java
 create mode 100644 subprojects/docs/src/samples/toolingApi/customModel/plugin/src/main/java/org/gradle/sample/plugin/DefaultModel.java
 create mode 100644 subprojects/docs/src/samples/toolingApi/customModel/plugin/src/main/resources/META-INF/gradle-plugins/custom-plugin.properties
 create mode 100644 subprojects/docs/src/samples/toolingApi/customModel/readme.xml
 create mode 100644 subprojects/docs/src/samples/toolingApi/customModel/sampleBuild/build.gradle
 create mode 100644 subprojects/docs/src/samples/toolingApi/customModel/sampleBuild/settings.gradle
 create mode 100644 subprojects/docs/src/samples/toolingApi/customModel/tooling/build.gradle
 create mode 100644 subprojects/docs/src/samples/toolingApi/customModel/tooling/src/main/java/org/gradle/sample/Main.java
 create mode 100644 subprojects/docs/src/samples/userguide/artifacts/componentMetadata/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/artifacts/componentMetadata/repo/air.birds/albatros/1.9/ivy-1.9.xml
 create mode 100644 subprojects/docs/src/samples/userguide/artifacts/componentMetadata/repo/air.birds/albatros/2.0/ivy-2.0.xml
 create mode 100644 subprojects/docs/src/samples/userguide/artifacts/componentMetadata/repo/sea.fish/tuna/1.3/ivy-1.3.xml
 create mode 100644 subprojects/docs/src/samples/userguide/artifacts/componentMetadata/repo/sea.fish/tuna/1.4/ivy-1.4.xml
 create mode 100644 subprojects/docs/src/samples/userguide/artifacts/componentMetadata/repo/sea.fish/tuna/1.5/ivy-1.5.xml
 create mode 100644 subprojects/docs/src/samples/userguide/initScripts/plugins/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/initScripts/plugins/init.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/multiproject/dependencies/firstMessages/messages/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/multiproject/dependencies/messagesConfigDependencies/messages/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/multiproject/dependencies/messagesConfigDependenciesAltSolution/messages/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/multiproject/dependencies/messagesConfigDependenciesBroken/messages/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/multiproject/dependencies/messagesHack/messages/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/multiproject/dependencies/messagesTaskDependencies/messages/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/multiproject/dependencies/messagesWithDependencies/messages/build.gradle
 delete mode 100644 subprojects/docs/src/samples/userguide/tasks/configureUsingConfigure/build.gradle
 delete mode 100644 subprojects/docs/src/samples/userguide/tasks/configureUsingLiterateStyle/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/finalizers/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/finalizersWithFailure/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/incrementalTask/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/mustRunAfter/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/shouldRunAfter/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/tasks/shouldRunAfterWithCycle/build.gradle
 delete mode 100644 subprojects/docs/src/samples/userguide/wrapper/customized/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguideOutput/customStatusScheme.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalTaskChangedProperty.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalTaskFirstRun.out
 copy subprojects/docs/src/samples/{webApplication/customised/src/additionalWebInf/additional.xml => userguideOutput/incrementalTaskNoChange.out} (100%)
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalTaskRemovedInput.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalTaskRemovedOutput.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/incrementalTaskUpdatedInputs.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/latestSelector.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/mustRunAfter.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/mustRunAfterSingleTask.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/shouldRunAfter.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/shouldRunAfterWithCycle.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/taskFinalizers.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/taskFinalizersWithFailure.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/taskHelp.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/usePluginsInInitScripts.out
 delete mode 100755 subprojects/docs/src/samples/webApplication/customised/readme.xml
 rename subprojects/docs/src/samples/webApplication/{customised => customized}/build.gradle (100%)
 create mode 100755 subprojects/docs/src/samples/webApplication/customized/readme.xml
 rename subprojects/docs/src/samples/webApplication/{customised => customized}/src/additionalWebInf/additional.xml (100%)
 rename subprojects/docs/src/samples/webApplication/{customised => customized}/src/main/java/org/gradle/HelloServlet.java (100%)
 rename subprojects/docs/src/samples/webApplication/{customised => customized}/src/main/java/org/gradle/MyClass.java (100%)
 rename subprojects/docs/src/samples/webApplication/{customised => customized}/src/main/webapp/WEB-INF/webapp.xml (100%)
 rename subprojects/docs/src/samples/webApplication/{customised => customized}/src/main/webapp/webapp.html (100%)
 rename subprojects/docs/src/samples/webApplication/{customised => customized}/src/rootContent/root.txt (100%)
 rename subprojects/docs/src/samples/webApplication/{customised => customized}/src/someWeb.xml (100%)
 rename subprojects/docs/src/samples/webApplication/{customised => customized}/src/test/java/org/gradle/MyClassTest.java (100%)
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractIdeIntegrationSpec.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractSourcesAndJavadocJarsIntegrationTest.groovy
 delete mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseClasspathRemoteResolutionIntegrationTest.groovy
 delete mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseClasspathResolveIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseSourcesAndJavadocJarsIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaSourcesAndJavadocJarsIntegrationTest.groovy
 delete mode 100644 subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/idea/IdeaIntegrationTest/addsScalaFacetAndCompilerLibraries/expectedFiles/project1/project1.iml.xml
 delete mode 100644 subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/idea/IdeaIntegrationTest/addsScalaFacetAndCompilerLibraries/expectedFiles/project2/project2.iml.xml
 delete mode 100644 subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/idea/IdeaIntegrationTest/addsScalaFacetAndCompilerLibraries/expectedFiles/project3/project3.iml.xml
 delete mode 100644 subprojects/ide/src/integTest/resources/org/gradle/plugins/ide/idea/IdeaIntegrationTest/addsScalaFacetAndCompilerLibraries/expectedFiles/root.ipr.xml
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/internal/GeneratedIdeaScope.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/internal/IdeaDependenciesProvider.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/internal/IdeaDependenciesProvider.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/internal/IdeaScopeMappingRule.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/internal/ModuleDependencyBuilder.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/internal/ModuleDependencyBuilder.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/JavadocAndSourcesDownloader.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/BasicIdeaModelBuilder.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/BuildInvocationsBuilder.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/EclipseModelBuilder.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/GradleBuildBuilder.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/GradleProjectBuilder.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/IdeaModelBuilder.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/PublicationsBuilder.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/TasksFactory.java
 create 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/DefaultEclipseExternalDependency.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseLinkedResource.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseProject.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseProjectDependency.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseSourceDirectory.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseTask.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaCompilerOutput.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaContentRoot.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaDependency.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaDependencyScope.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaLanguageLevel.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaModule.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaModuleDependency.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaProject.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaSingleEntryLibraryDependency.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaSourceDirectory.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/idea/DefaultIdeaModuleDependency.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/idea/DefaultIdeaSingleEntryLibraryDependency.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/provider/BasicIdeaModelBuilder.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/provider/BuildModelAction.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/provider/BuildsModel.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/provider/EclipseModelBuilder.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/provider/FileOutcomeIdentifier.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/provider/GradleProjectBuilder.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/provider/IdeaModelBuilder.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/provider/NullResultBuilder.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/provider/ProjectOutcomesModelBuilder.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/provider/PublishArtifactToFileBuildOutcomeTransformer.java
 delete mode 100644 subprojects/ide/src/main/groovy/org/gradle/tooling/internal/provider/TasksFactory.java
 create mode 100644 subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/DefaultIdeDependencyResolver.java
 create mode 100644 subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/IdeDependencyResolver.java
 create mode 100644 subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/model/IdeDependency.java
 create mode 100644 subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/model/IdeDependencyKey.java
 create mode 100644 subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/model/IdeExtendedRepoFileDependency.java
 create mode 100644 subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/model/IdeLocalFileDependency.java
 create mode 100644 subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/model/IdeProjectDependency.java
 create mode 100644 subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/model/IdeRepoFileDependency.java
 create mode 100644 subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/model/UnresolvedIdeRepoFileDependency.java
 create mode 100644 subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/translator/ExternalModuleDependencyTranslator.java
 create mode 100644 subprojects/ide/src/main/resources/META-INF/services/org.gradle.configuration.project.ProjectConfigureAction
 create mode 100644 subprojects/ide/src/test/groovy/org/gradle/plugins/ide/idea/model/internal/IdeaDependenciesProviderTest.groovy
 create mode 100644 subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/BuildInvocationsBuilderTest.groovy
 create mode 100644 subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/GradleBuildBuilderTest.groovy
 create mode 100644 subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/GradleProjectBuilderTest.groovy
 create mode 100644 subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/ProjectPublicationsBuilderTest.groovy
 create mode 100644 subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/TasksFactoryTest.groovy
 create mode 100644 subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseProjectTest.groovy
 delete mode 100644 subprojects/ide/src/test/groovy/org/gradle/tooling/internal/provider/PublishArtifactToFileBuildOutcomeTransformerTest.groovy
 delete mode 100644 subprojects/ide/src/test/groovy/org/gradle/tooling/internal/provider/TasksFactoryTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/api/tasks/TaskCommandLineConfigurationIntegrationSpec.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/BuildScriptErrorIntegrationTest.java
 delete mode 100755 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ExternalScriptErrorIntegrationTest.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/IncrementalTasksIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/IncrementalTestIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/InitScriptErrorIntegrationTest.java
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/MixedNativeAndJvmProjectIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/PluginCrossVersionIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ProfilingIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/SettingsScriptErrorIntegrationTest.java
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/TaskDefinitionIntegrationSpec.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/TaskExecutionIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/TaskExecutionIntegrationTest.java
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/TaskSubclassingBinaryCompatibilityCrossVersionSpec.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyHttpPublishIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyJavaProjectPublishIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyLocalPublishIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvySingleProjectPublishIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/ivy/SamplesIvyPublishIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/maven/SamplesMavenPomGenerationIntegrationTest.groovy
 delete mode 100755 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/maven/SamplesMavenQuickstartIntegrationTest.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/samples/JUnitSamplesIntegrationTest.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/samples/SamplesJUnitIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/samples/SamplesMixedJavaAndScalaIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/samples/SamplesScalaCustomizedLayoutIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/samples/SamplesScalaQuickstartIntegrationTest.groovy
 delete mode 100644 subprojects/integ-test/src/integTest/resources/org/gradle/integtests/logging/LoggingIntegrationTest/deprecated/build.gradle
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/TargetCoverage.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/AnyOrderOutputMatcher.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/ParallelOutputMatcher.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/versions/ClasspathVersionJsonSource.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/versions/ClasspathVersionSource.java
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/versions/IsTestableGradleVersionSpec.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/versions/ReleasedGradleVersion.java
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/versions/VersionWebServiceJsonParser.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/AbstractModule.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/HttpModule.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/HttpRepository.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/Module.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/Repository.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/bintray/BintrayApi.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/bintray/BintrayTestServer.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/AbstractIvyModule.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/AbstractMavenModule.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenLocalModule.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenLocalRepository.groovy
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/plugin/PluginBuilder.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/publish/Identifier.java
 create mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/ServletContainer.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/test/groovy/org/gradle/integtests/fixtures/versions/IsTestableGradleVersionSpecTest.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/test/groovy/org/gradle/integtests/fixtures/versions/VersionWebServiceJsonParserTest.groovy
 create mode 100644 subprojects/internal-integ-testing/src/test/groovy/org/gradle/test/fixtures/maven/MavenFileModuleTest.groovy
 create mode 100644 subprojects/internal-integ-testing/src/test/groovy/org/gradle/test/fixtures/maven/MavenLocalModuleTest.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/integtests/fixtures/JUnitTestClassExecutionResult.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/integtests/fixtures/TestResultOutputAssociation.java
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/archive/ArchiveTestFixture.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/archive/JarTestFixture.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/archive/TarTestFixture.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/archive/ZipTestFixture.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/concurrent/TestLogger.groovy
 delete mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/concurrent/TestThreadListener.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/encoding/Identifier.java
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/ExecOutput.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/WorkspaceTest.groovy
 delete mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/testing/internal/util/Network.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/util/Matchers.java
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/util/TestClassLoader.groovy
 delete mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishArtifactCustomisationIntegTest.groovy
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishArtifactCustomizationIntegTest.groovy
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishCoordinatesIntegTest.groovy
 delete mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishDescriptorCustomisationIntegTest.groovy
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishDescriptorCustomizationIntegTest.groovy
 rename subprojects/{integ-test => ivy}/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyEarProjectPublishIntegrationTest.groovy (100%)
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyHttpPublishIntegrationTest.groovy
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyJavaProjectPublishIntegrationTest.groovy
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyLocalPublishIntegrationTest.groovy
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvySingleProjectPublishIntegrationTest.groovy
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyUrlResolverPublishIntegrationTest.groovy
 rename subprojects/{integ-test => ivy}/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyWarProjectPublishIntegrationTest.groovy (100%)
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/SamplesIvyPublishIntegrationTest.groovy
 create mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/IvyPublicationTasksModelRule.java
 delete mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/plugins/IvyPublicationDynamicDescriptorGenerationTaskCreator.java
 delete mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/plugins/IvyPublishDynamicTaskCreator.java
 create mode 100644 subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/publisher/ContextualizingIvyPublisher.java
 delete mode 100644 subprojects/ivy/src/test/groovy/org/gradle/api/publish/ivy/internal/plugins/IvyPublicationDynamicDescriptorGenerationTaskCreatorTest.groovy
 delete mode 100644 subprojects/ivy/src/test/groovy/org/gradle/api/publish/ivy/internal/plugins/IvyPublishDynamicTaskCreatorTest.groovy
 create mode 100644 subprojects/jacoco/jacoco.gradle
 create mode 100644 subprojects/jacoco/src/integTest/groovy/org/gradle/testing/jacoco/plugins/JacocoPluginGoodBehaviourTest.groovy
 create mode 100644 subprojects/jacoco/src/integTest/groovy/org/gradle/testing/jacoco/plugins/JacocoPluginIntegrationTest.groovy
 create mode 100644 subprojects/jacoco/src/integTest/groovy/org/gradle/testing/jacoco/plugins/JacocoVersionIntegTest.groovy
 create mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/internal/jacoco/JacocoAgentJar.groovy
 create mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/internal/jacoco/JacocoReportsContainerImpl.java
 create mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/plugins/JacocoPlugin.groovy
 create mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/plugins/JacocoPluginExtension.groovy
 create mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/plugins/JacocoTaskExtension.groovy
 create mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoBase.groovy
 create mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoMerge.groovy
 create mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoReport.groovy
 create mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoReportsContainer.java
 create mode 100644 subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/package-info.java
 create mode 100644 subprojects/jacoco/src/main/resources/META-INF/gradle-plugins/jacoco.properties
 create mode 100644 subprojects/jacoco/src/test/groovy/org/gradle/testing/jacoco/plugins/JacocoPluginSpec.groovy
 create mode 100644 subprojects/jacoco/src/test/groovy/org/gradle/testing/jacoco/plugins/JacocoTaskExtensionSpec.groovy
 create mode 100644 subprojects/language-base/language-base.gradle
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/Binary.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/BinaryContainer.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/BuildableModelElement.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/FunctionalSourceSet.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/LanguageSourceSet.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/ProjectSourceSet.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/AbstractBuildableModelElement.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/AbstractLanguageSourceSet.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryInternal.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryNamingScheme.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryNamingSchemeBuilder.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryContainer.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryNamingScheme.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryNamingSchemeBuilder.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultFunctionalSourceSet.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultProjectSourceSet.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/LanguageSourceSetInternal.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/package-info.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/plugins/LanguageBasePlugin.java
 create mode 100644 subprojects/language-base/src/main/groovy/org/gradle/language/base/plugins/package-info.java
 create mode 100644 subprojects/language-base/src/main/resources/META-INF/gradle-plugins/language-base.properties
 create mode 100644 subprojects/language-base/src/test/groovy/org/gradle/language/base/internal/BuildableModelElementTest.groovy
 create mode 100644 subprojects/language-base/src/test/groovy/org/gradle/language/base/internal/DefaultBinaryNamingSchemeTest.groovy
 create mode 100644 subprojects/language-base/src/test/groovy/org/gradle/language/base/internal/DefaultFunctionalSourceSetTest.groovy
 create mode 100644 subprojects/language-jvm/language-jvm.gradle
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/java/JavaSourceSet.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/java/internal/DefaultJavaSourceSet.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/java/package-info.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/ClassDirectoryBinary.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/Classpath.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/ResourceSet.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/ClassDirectoryBinaryNamingScheme.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/DefaultClassDirectoryBinary.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/DefaultClasspath.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/DefaultResourceSet.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/SimpleStaleClassCleaner.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/StaleClassCleaner.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/package-info.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/plugins/JvmLanguagePlugin.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/plugins/package-info.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/tasks/ProcessResources.java
 create mode 100644 subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/tasks/package-info.java
 create mode 100644 subprojects/language-jvm/src/test/groovy/org/gradle/language/java/internal/DefaultJavaSourceSetTest.groovy
 create mode 100644 subprojects/language-jvm/src/test/groovy/org/gradle/language/jvm/internal/ClassDirectoryBinaryNamingSchemeTest.groovy
 create mode 100644 subprojects/language-jvm/src/test/groovy/org/gradle/language/jvm/internal/DefaultClassDirectoryBinaryTest.groovy
 create mode 100644 subprojects/language-jvm/src/test/groovy/org/gradle/language/jvm/internal/DefaultResourceSetTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/ExecuteBuildAction.java
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/daemon/configuration/DaemonParametersIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/cli/converter/DaemonCommandLineConverter.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/cli/converter/LayoutToPropertiesConverter.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/cli/converter/PropertiesToDaemonParametersConverter.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/cli/converter/PropertiesToStartParameterConverter.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DaemonConnectionException.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/StaleDaemonAddressException.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/configuration/GradlePropertiesConfigurer.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/DaemonHygieneAction.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/NoOpDaemonCommandAction.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/BuildActionExecuter.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/GradleLauncherActionExecuter.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/InProcessBuildActionExecuter.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/InProcessGradleLauncherActionExecuter.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/launcher/exec/InitializationAware.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableGradleProjectTask.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableGradleTask.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableGradleTaskSelector.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableImplementation.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/BuildActionResult.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/BuildModelAction.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ClassLoaderDetails.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ClasspathInferer.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ClientProvidedBuildAction.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ClientSidePayloadClassLoaderRegistry.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ConnectionScopeServices.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DaemonBuildActionExecuter.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DaemonGradleLauncherActionExecuter.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DefaultBuildController.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DefaultConnectionMetaData.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DefaultPayloadClassLoaderRegistry.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DelegatingBuildModelAction.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DeserializeMap.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/EmbeddedExecuterSupport.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ExecuteBuildAction.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/LoggingBridgingBuildActionExecuter.java
 delete mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/LoggingBridgingGradleLauncherActionExecuter.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ModelClassLoaderFactory.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/PayloadClassLoaderRegistry.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/PayloadSerializer.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ProviderConnection.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ReflectionClassLookup.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/SerializeMap.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/SerializedPayload.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ToolingGlobalScopeServices.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ToolingServices.java
 create mode 100644 subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/jdk6/Jdk6ClassLookup.java
 create mode 100644 subprojects/launcher/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/cli/converter/DaemonCommandLineConverterTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/cli/converter/LayoutToPropertiesConverterTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/cli/converter/PropertiesToDaemonParametersConverterTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/cli/converter/PropertiesToStartParameterConverterTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/configuration/GradlePropertiesConfigurerTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/configuration/GradlePropertiesTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/server/exec/DaemonHygieneActionTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/exec/InProcessBuildActionExecuterTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/launcher/exec/InProcessGradleLauncherActionExecuterTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/AbstractClassGraphSpec.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ClasspathInfererTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ConnectionScopeServicesTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/CustomAction.java
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/CustomModel.java
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/CustomPayload.java
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/DaemonBuildActionExecuterTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/DaemonGradleLauncherActionExecuterTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/DefaultBuildControllerTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ExecuteBuildActionTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/LoggingBridgingBuildActionExecuterTest.groovy
 delete mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/LoggingBridgingGradleLauncherActionExecuterTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ModelClassLoaderFactoryTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/PayloadInterface.java
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/PayloadSerializerTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ToolingGlobalScopeServicesTest.groovy
 create mode 100644 subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/WrapperPayload.java
 delete mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/api/plugins/maven/MavenConversionIntegrationTest.groovy
 delete mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishArtifactCustomisationIntegTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishArtifactCustomizationIntegTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishCoordinatesIntegTest.groovy
 delete mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishPomCustomisationIntegTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishPomCustomizationIntegTest.groovy
 rename subprojects/{integ-test => maven}/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenEarProjectPublishIntegrationTest.groovy (100%)
 rename subprojects/{integ-test => maven}/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenJavaProjectPublishIntegrationTest.groovy (100%)
 rename subprojects/{integ-test => maven}/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenMultiProjectPublishIntegrationTest.groovy (100%)
 rename subprojects/{integ-test => maven}/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPomGenerationIntegrationTest.groovy (100%)
 rename subprojects/{integ-test => maven}/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishIgnoresMavenSettingsTest.groovy (100%)
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishIntegrationTest.groovy
 rename subprojects/{integ-test => maven}/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishRespectsPomConfigurationTest.groovy (100%)
 rename subprojects/{integ-test => maven}/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenWarProjectPublishIntegrationTest.groovy (100%)
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/SamplesMavenPomGenerationIntegrationTest.groovy
 create mode 100755 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/SamplesMavenQuickstartIntegrationTest.groovy
 rename subprojects/{integ-test => maven}/src/integTest/resources/org/gradle/integtests/publish/maven/pomGeneration/expectedNewPom.txt (100%)
 rename subprojects/{integ-test => maven}/src/integTest/resources/org/gradle/integtests/publish/maven/pomGeneration/expectedPom.txt (100%)
 rename subprojects/{integ-test => maven}/src/integTest/resources/org/gradle/integtests/publish/maven/pomGeneration/expectedQuickstartPom.txt (100%)
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/plugins/maven/ConvertMaven2Gradle.groovy
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/plugins/maven/Maven2GradlePlugin.groovy
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/plugins/maven/internal/Maven2Gradle.groovy
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/plugins/maven/internal/MavenProjectXmlWriter.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/plugins/maven/internal/MavenProjectsCreator.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/CustomTaskFactoryDeployerFactory.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/DefaultDeployTaskFactory.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/DefaultInstallTaskFactory.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/NoInstallDeployTaskFactory.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/MavenDependency.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/MavenPublishTaskModelRule.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/dependencies/DefaultMavenDependency.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/dependencies/MavenDependencyInternal.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/plugins/GeneratePomTaskCreator.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/plugins/MavenPublishDynamicTaskCreator.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/plugins/MavenPublishLocalDynamicTaskCreator.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AbstractAntTaskBackedMavenPublisher.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AntTaskBackedMavenLocalPublisher.java
 delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/MavenDeployerConfigurer.java
 create mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/MavenRemoteRepositoryFactory.java
 delete mode 100644 subprojects/maven/src/main/resources/META-INF/gradle-plugins/maven2Gradle.properties
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/plugins/maven/Maven2GradlePluginSpec.groovy
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/plugins/maven/internal/MavenProjectXmlWriterTest.groovy
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/plugins/maven/internal/MavenProjectsCreatorSpec.groovy
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/ant/AbstractMavenResolverTest.java
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/ant/BaseMavenDeployerTest.java
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/ant/BaseMavenInstallerTest.java
 delete mode 100644 subprojects/maven/src/test/groovy/org/gradle/api/publication/maven/internal/ant/DefaultDeployTaskFactoryTest.java
 delete mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/Addressable.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/ConnectEvent.java
 create mode 100755 subprojects/messaging/src/main/java/org/gradle/messaging/remote/ObjectConnectionBuilder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/ConnectCompletion.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/SocketConnectCompletion.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/AbstractCollectionSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/AbstractDecoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/AbstractEncoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/BaseSerializerFactory.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/DataStreamBackedSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/Decoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/DefaultSerializerRegistry.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/Encoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/FlushableEncoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/InputStreamBackedDecoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/ListSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/LongSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/MapSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/NullSafeStringSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/OutputStreamBackedEncoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/SerializerRegistry.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/SetSerializer.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/kryo/KryoAwareSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/kryo/KryoBackedDecoder.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/kryo/KryoBackedEncoder.java
 delete mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/kryo/KryoSerializer.java
 create mode 100644 subprojects/messaging/src/main/java/org/gradle/messaging/serialize/kryo/StatefulSerializer.java
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/InetAddressFactoryTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/AbstractCodecTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/BaseSerializerFactoryTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/DefaultSerializerRegistryTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/ListSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/LongSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/MapSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/SetSerializerTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/StreamBackedCodecTest.groovy
 create mode 100644 subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/kryo/KryoBackedCodecTest.groovy
 create mode 100644 subprojects/messaging/src/testFixtures/groovy/org/gradle/messaging/serialize/SerializerSpec.groovy
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystems.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/MacFilePathEncoder.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedChmod.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedStat.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedSymlink.java
 delete mode 100755 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/Kernel32.java
 delete mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/WindowsHandlesManipulator.java
 delete mode 100755 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/WindowsProcessEnvironment.java
 create mode 100644 subprojects/native/src/main/java/org/gradle/internal/nativeplatform/services/FileSystems.java
 delete mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/FileSystemServicesOnLinuxTest.groovy
 delete mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/FileSystemServicesOnMacTest.groovy
 delete mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/FileSystemServicesOnUnknownOsTest.groovy
 delete mode 100644 subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/FileSystemServicesOnWindowsTest.groovy
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/foundation/BootstrapLoader.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/foundation/ParentLastClassLoader.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ExternalUtility.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/foundation/GradleInterfaceVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/foundation/GradleInterfaceVersion2.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/foundation/ProjectVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/foundation/RequestObserverVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/foundation/RequestVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/foundation/TaskVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/foundation/favorites/FavoriteTaskVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/foundation/favorites/FavoritesEditorVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/runner/GradleRunnerFactory.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/runner/GradleRunnerInteractionVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/runner/GradleRunnerVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ui/AlternateUIInteractionVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ui/BasicGradleUIVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ui/CommandLineArgumentAlteringListenerVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ui/DualPaneUIInteractionVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ui/DualPaneUIVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ui/GradleTabVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ui/GradleUIInteractionVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ui/OutputObserverVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ui/OutputUILordVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ui/SettingsNodeVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ui/SinglePaneUIInteractionVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ui/SinglePaneUIVersion1.java
 delete mode 100644 subprojects/open-api/src/main/groovy/org/gradle/openapi/external/ui/UIFactory.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/foundation/BootstrapLoader.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/foundation/ParentLastClassLoader.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ExternalUtility.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/foundation/GradleInterfaceVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/foundation/GradleInterfaceVersion2.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/foundation/ProjectVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/foundation/RequestObserverVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/foundation/RequestVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/foundation/TaskVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/foundation/favorites/FavoriteTaskVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/foundation/favorites/FavoritesEditorVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/runner/GradleRunnerFactory.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/runner/GradleRunnerInteractionVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/runner/GradleRunnerVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/AlternateUIInteractionVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/BasicGradleUIVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/CommandLineArgumentAlteringListenerVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/DualPaneUIInteractionVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/DualPaneUIVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/GradleTabVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/GradleUIInteractionVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/OutputObserverVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/OutputUILordVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/SettingsNodeVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/SinglePaneUIInteractionVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/SinglePaneUIVersion1.java
 create mode 100644 subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/UIFactory.java
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/ConfigurationPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/FirstBuildPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/ResultSpecification.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/AmountTest.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/DurationTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/GCLoggingCollectorTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/PerformanceTestRunnerTest.groovy
 delete mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/UnitsTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/measure/AmountTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/measure/DataSeriesTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/measure/DurationTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/measure/UnitsTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/results/ReportGeneratorTest.groovy
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/results/ResultsStoreTest.groovy
 create mode 100644 subprojects/performance/src/test/resources/org/gradle/performance/fixture/gc-1.txt
 create mode 100644 subprojects/performance/src/test/resources/org/gradle/performance/fixture/gc-2.txt
 create mode 100644 subprojects/performance/src/test/resources/org/gradle/performance/fixture/gc-3.txt
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/Amount.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/CompositeDataCollector.java
 create 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/DataAmount.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/Duration.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/GCLoggingCollector.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/Git.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/MeasuredOperation.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/OperationTimer.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/Units.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/VersionResults.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/measure/Amount.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/measure/DataAmount.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/measure/DataSeries.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/measure/Duration.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/measure/MeasuredOperation.groovy
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/measure/Units.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/FileRenderer.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/FormatSupport.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/HtmlPageGenerator.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/IndexPageGenerator.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/ReportGenerator.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/ResultsStore.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/TestDataGenerator.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/TestExecutionHistory.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/results/TestPageGenerator.java
 create mode 100644 subprojects/performance/src/testFixtures/resources/org/gradle/reporting/report.js
 create mode 100644 subprojects/performance/src/testFixtures/resources/org/gradle/reporting/style.css
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/groovy/GroovyPluginIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/IncrementalJavaCompilationIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/IncrementalTestIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/SuiteTimestampIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/TestTaskIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/cucumberjvm/CucumberJVMReportIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/fixture/AbstractTestFilteringIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/fixture/JUnitCoverage.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/fixture/TestNGCoverage.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitAssumptionsIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitCategoriesIntegrationSpec.groovy
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitCrossVersionIntegrationSpec.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitFilteringIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitFilteringSupportIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitIgnoreClassMultiVersionIntegrationSpec.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitMultiVersionIntegrationSpec.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitTestFilteringSamplesIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGFilteringIntegrationTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGIntegrationProject.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGSuiteInitialisationIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGSuiteIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/canJointCompileWithJavaCompilerExecutable/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/canJointCompileWithJavaCompilerExecutable/src/main/groovy/GroovyCode.groovy
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/canJointCompileWithJavaCompilerExecutable/src/main/groovy/JavaCode.java
 rename subprojects/{integ-test/src/integTest/resources/org/gradle/integtests => plugins/src/integTest/resources/org/gradle/testing}/IncrementalTestIntegrationTest/doesNotRunStaleTests/src/test/java/Broken.java (100%)
 rename subprojects/{integ-test/src/integTest/resources/org/gradle/integtests => plugins/src/integTest/resources/org/gradle/testing}/IncrementalTestIntegrationTest/executesTestsWhenSourceChanges/NewMainClass.java (100%)
 rename subprojects/{integ-test/src/integTest/resources/org/gradle/integtests => plugins/src/integTest/resources/org/gradle/testing}/IncrementalTestIntegrationTest/executesTestsWhenSourceChanges/NewOk.java (100%)
 rename subprojects/{integ-test/src/integTest/resources/org/gradle/integtests => plugins/src/integTest/resources/org/gradle/testing}/IncrementalTestIntegrationTest/executesTestsWhenSourceChanges/src/main/java/MainClass.java (100%)
 rename subprojects/{integ-test/src/integTest/resources/org/gradle/integtests/IncrementalTestIntegrationTest/executesTestsWhenSelectedTestsChange => plugins/src/integTest/resources/org/gradle/testing/IncrementalTestIntegrationTest/executesTestsWhenTestFrameworkChanges}/build.gradle (100%)
 rename subprojects/{integ-test/src/integTest/resources/org/gradle/integtests/IncrementalTestIntegrationTest/executesTestsWhenSelectedTestsChange => plugins/src/integTest/resources/org/gradle/testing/IncrementalTestIntegrationTest/executesTestsWhenTestFrameworkChanges}/src/test/java/JUnitExtra.java (100%)
 rename subprojects/{integ-test/src/integTest/resources/org/gradle/integtests/IncrementalTestIntegrationTest/executesTestsWhenSelectedTestsChange => plugins/src/integTest/resources/org/gradle/testing/IncrementalTestIntegrationTest/executesTestsWhenTestFrameworkChanges}/src/test/java/JUnitTest.java (100%)
 rename subprojects/{integ-test/src/integTest/resources/org/gradle/integtests/IncrementalTestIntegrationTest/executesTestsWhenSelectedTestsChange => plugins/src/integTest/resources/org/gradle/testing/IncrementalTestIntegrationTest/executesTestsWhenTestFrameworkChanges}/src/test/java/TestNGTest.java (100%)
 rename subprojects/{integ-test/src/integTest/resources/org/gradle/integtests => plugins/src/integTest/resources/org/gradle/testing}/IncrementalTestIntegrationTest/shared/build.gradle (100%)
 rename subprojects/{integ-test/src/integTest/resources/org/gradle/integtests => plugins/src/integTest/resources/org/gradle/testing}/IncrementalTestIntegrationTest/shared/src/test/java/Ok.java (100%)
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/cucumberjvm/CucumberJVMReportIntegrationTest/testReportingSupportsCucumberStepsWithSlashes/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/cucumberjvm/CucumberJVMReportIntegrationTest/testReportingSupportsCucumberStepsWithSlashes/src/test/java/HelloStepdefs.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/cucumberjvm/CucumberJVMReportIntegrationTest/testReportingSupportsCucumberStepsWithSlashes/src/test/java/RunCukesTest.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/cucumberjvm/CucumberJVMReportIntegrationTest/testReportingSupportsCucumberStepsWithSlashes/src/test/resources/helloworld.feature
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitAssumptionsIntegrationTest/supportsAssumptions/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitAssumptionsIntegrationTest/supportsAssumptions/src/test/java/org/gradle/TestWithAssumptions.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canCombineCategoriesWithCustomRunner/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canCombineCategoriesWithCustomRunner/src/test/java/org/gradle/CategoryA.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canCombineCategoriesWithCustomRunner/src/test/java/org/gradle/LocaleHolder.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canCombineCategoriesWithCustomRunner/src/test/java/org/gradle/Locales.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canCombineCategoriesWithCustomRunner/src/test/java/org/gradle/SomeLocaleTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canCombineCategoriesWithCustomRunner/src/test/java/org/gradle/SomeMoreLocalTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyExcludesOnly/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyExcludesOnly/src/test/java/org/gradle/CatATests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyExcludesOnly/src/test/java/org/gradle/CategoryA.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyExcludesOnly/src/test/java/org/gradle/NoCatTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyExcludesOnly/src/test/java/org/gradle/SomeOtherCat.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyExcludesOnly/src/test/java/org/gradle/SomeOtherCatTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyExcludesOnly/src/test/java/org/gradle/SomeTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/CatACTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/CatADTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/CatATests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/CatBTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/CatCBTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/CatCTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/CatDTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/CatZTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/CategoryA.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/CategoryB.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/CategoryC.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/CategoryD.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/CategoryZ.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/MixedTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesCoverageIntegrationSpec/canSpecifyIncludeAndExcludeCategories/src/test/java/org/gradle/NoCatTests.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesIntegrationSpec/reportsUnloadableCategories/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesIntegrationSpec/reportsUnloadableCategories/src/test/java/org/gradle/SomeTestClass.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesIntegrationSpec/testTaskFailsIfCategoriesNotSupported/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitCategoriesIntegrationSpec/testTaskFailsIfCategoriesNotSupported/src/test/java/org/gradle/SomeTest.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIgnoreClassMultiVersionIntegrationSpec/canHandleClassLevelIgnoredTests/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIgnoreClassMultiVersionIntegrationSpec/canHandleClassLevelIgnoredTests/src/test/java/org/gradle/CustomIgnoredTest.java
 rename subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/{JUnitIntegrationTest/junit4Tests => JUnitIgnoreClassMultiVersionIntegrationSpec/canHandleClassLevelIgnoredTests}/src/test/java/org/gradle/IgnoredTest.java (100%)
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/canRunTestsUsingJUnit3/build.gradle
 delete mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/junit3Tests/build.gradle
 delete mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/junit4Tests/build.gradle
 delete mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/junit4Tests/src/test/java/org/gradle/CustomIgnoredTest.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/supportsTestCategories/build.gradle
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/supportsTestCategories/src/test/java/org/gradle/CategoryA.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/supportsTestCategories/src/test/java/org/gradle/CategoryB.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/supportsTestCategories/src/test/java/org/gradle/CategoryC.java
 create mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitIntegrationTest/supportsTestCategories/src/test/java/org/gradle/SomeTest.java
 rename subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/{JUnitCrossVersionIntegrationSpec => JUnitMultiVersionIntegrationSpec}/canRunTestsUsingJUnit/build.gradle (100%)
 delete mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGLoggingIntegrationTest/shared/build.gradle
 delete mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGLoggingIntegrationTest/shared/src/test/groovy/org/gradle/TestNGTest.groovy
 delete mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGLoggingIntegrationTest/standardOutputLogging/build.gradle
 delete mode 100644 subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGLoggingIntegrationTest/standardOutputLogging/src/test/groovy/org/gradle/TestNGStandardOutputTest.groovy
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/CompileServices.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/DefaultBinariesContainer.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/DefaultClassDirectoryBinary.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/DefaultClasspath.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/DefaultFunctionalSourceSet.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/DefaultJavaSourceSet.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/DefaultJvmBinaryContainer.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/DefaultProjectSourceSet.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/DefaultResourceSet.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CleaningGroovyCompiler.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CleaningJavaCompiler.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CleaningJavaCompilerSupport.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/GroovyCompileTransformingClassLoader.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/IncrementalGroovyCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/IncrementalJavaCompiler.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/IncrementalJavaCompilerSupport.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/SimpleStaleClassCleaner.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/SimpleWorkResult.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/StaleClassCleaner.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/TransformingClassLoader.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/daemon/CompilerClientsManager.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonStarter.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/AllFromJarRebuildInfo.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassDependents.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassNameProvider.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/DefaultRebuildInfo.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/DummySerializer.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationSupport.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/InputOutputMapper.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarArchive.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarChangeProcessor.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarDelta.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshot.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotCache.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotFeeder.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotter.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JavaSourceClass.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/OutputClassMapper.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/RebuildInfo.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SelectiveCompilation.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SelectiveJavaCompiler.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SpecificClassesRebuildInfo.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassAnalysis.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesAnalyzer.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesVisitor.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassRelevancyFilter.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfo.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoExtractor.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoSerializer.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/DefaultJUnitXmlReport.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/DefaultTestTaskReports.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/NoMatchingTestsReporter.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/filter/DefaultTestFilter.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/filter/TestSelectionMatcher.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/CategoryFilter.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/JUnitSpec.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/TestFailure.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/result/CachingFileWriter.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/result/InMemoryTestResultsProvider.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/result/TestFailure.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/result/TestOutputAssociation.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/result/TestOutputSerializer.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/result/TestOutputStore.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/testng/UnrepresentableParameterException.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/worker/TestEventSerializer.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JvmLanguagePlugin.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/LanguageBasePlugin.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/BinariesContainer.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/ClassDirectoryBinary.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/Classpath.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/FunctionalSourceSet.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/GroovyRuntime.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/JavaSourceSet.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/JvmBinaryContainer.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/JvmLanguageSourceSet.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/LanguageSourceSet.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/ProjectSourceSet.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/ResourceSet.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/Upload.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/JUnitXmlReport.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/TestFilter.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/TestTaskReports.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/junit/JUnitOptions.groovy
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/junit/JUnitOptions.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/tasks/wrapper/Wrapper.java
 create mode 100644 subprojects/plugins/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 mode change 100644 => 100755 subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/CleaningJavaCompilerTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/GroovyCompileTransformingClassLoaderTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/IncrementalJavaCompilerTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/TransformingClassLoaderTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/daemon/CompilerClientsManagerTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/daemon/CompilerDaemonManagerTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/AllFromJarRebuildInfoTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassNameProviderTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationSupportTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/InputOutputMapperTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotCacheTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotFeederTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotterTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JavaSourceClassTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/OutputClassMapperTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/AccessedFromPrivateClass.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesAnalyzerTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasNonPrivateConstants.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasPrivateConstants.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasPublicConstants.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/SomeClass.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/SomeOtherClass.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/UsedByNonPrivateConstantsClass.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/YetAnotherClass.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/SomeClassAnnotation.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/SomeRuntimeAnnotation.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/SomeSourceAnnotation.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/UsesAnnotationInField.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/UsesClassAnnotation.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/UsesRuntimeAnnotation.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/annotations/UsesSourceAnnotation.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoExtractorTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoSerializerTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/AbstractTestFrameworkTest.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/filter/DefaultTestFilterTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/filter/TestSelectionMatcherTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/JUnitTestClassProcessorData.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/JUnitTestFrameworkTest.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/result/AggregateTestResultsProviderTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/result/CachingFileWriterSpec.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/result/TestOutputSerializerTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/result/TestOutputStoreSpec.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/logging/SimpleTestResult.groovy
 create mode 100755 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/worker/ForkingTestClassProcessorTest.groovy
 delete mode 100755 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/worker/ForkingTestClassProcessorTest.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/worker/TestEventSerializerTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/tasks/GroovyRuntimeTest.groovy
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/tasks/UploadTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/tasks/wrapper/WrapperTest.java
 create mode 100644 subprojects/plugins/src/testFixtures/groovy/org/gradle/api/internal/tasks/testing/BuildableTestMethodResult.groovy
 create mode 100644 subprojects/plugins/src/testFixtures/groovy/org/gradle/api/internal/tasks/testing/BuildableTestResultsProvider.groovy
 create mode 100644 subprojects/plugins/src/testFixtures/groovy/org/gradle/api/internal/tasks/testing/MethodTestOutputEvent.groovy
 create mode 100644 subprojects/plugins/src/testFixtures/groovy/org/gradle/api/internal/tasks/testing/SimpleTestResult.groovy
 create mode 100644 subprojects/plugins/src/testFixtures/groovy/org/gradle/api/internal/tasks/testing/junit/report/HtmlTestResultsFixture.groovy
 delete mode 100644 subprojects/publish/src/main/groovy/org/gradle/api/publish/internal/CompositePublicationFactory.java
 delete mode 100644 subprojects/publish/src/main/groovy/org/gradle/api/publish/internal/GroovyPublicationContainer.groovy
 create mode 100644 subprojects/publish/src/main/groovy/org/gradle/api/publish/internal/ProjectDependencyPublicationResolver.java
 delete mode 100644 subprojects/publish/src/main/groovy/org/gradle/api/publish/internal/PublicationContainerInternal.java
 delete mode 100644 subprojects/publish/src/main/groovy/org/gradle/api/publish/internal/PublicationFactory.java
 create mode 100644 subprojects/publish/src/main/groovy/org/gradle/api/publish/internal/PublicationInternal.java
 create mode 100644 subprojects/publish/src/main/groovy/org/gradle/api/publish/internal/PublishServices.java
 create mode 100644 subprojects/publish/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
 create mode 100644 subprojects/publish/src/test/groovy/org/gradle/api/publish/internal/ProjectDependencyPublicationResolverTest.groovy
 rename subprojects/{plugins => reporting}/src/integTest/groovy/org/gradle/api/reporting/internal/TaskReportContainerIntegTest.groovy (100%)
 create mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/ConfigurableReport.java
 create mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/DirectoryReport.java
 create mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/internal/TaskGeneratedSingleDirectoryReport.java
 delete mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/plugins/BuildDashboardPlugin.groovy
 create mode 100644 subprojects/reporting/src/main/groovy/org/gradle/api/reporting/plugins/BuildDashboardPlugin.java
 create mode 100644 subprojects/reporting/src/main/resources/org/gradle/api/reporting/internal/style.css
 create mode 100644 subprojects/reporting/src/test/groovy/org/gradle/api/plugins/ReportingBasePluginConventionTest.groovy
 create mode 100644 subprojects/reporting/src/test/groovy/org/gradle/api/plugins/ReportingBasePluginTest.groovy
 create mode 100644 subprojects/resources/resources.gradle
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/filestore/FileStore.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/filestore/FileStoreSearcher.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/AbstractLocallyAvailableResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/DefaultLocallyAvailableResource.java
 create mode 100644 subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableResource.java
 create mode 100644 subprojects/resources/src/test/groovy/org/gradle/internal/resource/local/DefaultLocallyAvailableResourceTest.groovy
 rename subprojects/{integ-test => scala}/src/integTest/groovy/org/gradle/integtests/ScalaPluginGoodBehaviourTest.groovy (100%)
 rename subprojects/{integ-test => scala}/src/integTest/groovy/org/gradle/integtests/ScalaProjectIntegrationTest.java (100%)
 create mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/integtests/samples/SamplesMixedJavaAndScalaIntegrationTest.groovy
 create mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/integtests/samples/SamplesScalaCustomizedLayoutIntegrationTest.groovy
 create mode 100644 subprojects/scala/src/integTest/groovy/org/gradle/integtests/samples/SamplesScalaQuickstartIntegrationTest.groovy
 rename subprojects/{integ-test => scala}/src/integTest/groovy/org/gradle/integtests/samples/SamplesScalaZincIntegrationTest.groovy (100%)
 create mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/CleaningScalaCompiler.java
 delete mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/IncrementalScalaCompiler.java
 create mode 100644 subprojects/scala/src/main/groovy/org/gradle/api/tasks/ScalaRuntime.groovy
 create mode 100644 subprojects/scala/src/test/groovy/org/gradle/api/tasks/ScalaRuntimeTest.groovy
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProject/build.gradle
 create mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/javaProjectWithJacoco/build.gradle
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production1.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production10.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production2.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production3.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production4.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production5.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production6.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production7.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production8.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production9.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/resources/org/gradle/test/javaProject/productionResource.xml (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test1.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test10.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test2.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test3.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test4.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test5.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test6.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test7.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test8.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test9.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/resources/org/gradle/test/javaProject/testResource.xml (100%)
 delete mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProject/build.gradle
 create mode 100644 subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/javaProjectWithJacoco/build.gradle
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production1.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production10.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production2.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production3.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production4.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production5.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production6.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production7.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production8.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/java/org/gradle/test/javaProject/Production9.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/main/resources/org/gradle/test/javaProject/productionResource.xml (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test1.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test10.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test2.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test3.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test4.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test5.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test6.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test7.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test8.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/java/org/gradle/test/javaProject/Test9.java (100%)
 rename subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/{javaProject => javaProjectWithJacoco}/src/test/resources/org/gradle/test/javaProject/testResource.xml (100%)
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/ToolingApiUnsupportedVersionIntegrationTest.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/IncludeAllPermutations.java
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/MaxTargetGradleVersion.java
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/MinTargetGradleVersion.java
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/MinToolingApiVersion.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/TargetGradleVersion.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/ToolingApiVersion.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m3/ToolingApiLoggingCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/UnsupportedModelFeedbackCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/GradlePropertiesToolingApiCrossVersionSpec.groovy
 delete mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/UnknownModelFeedbackCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m9/GradlePropertiesToolingApiCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/BuildInvocationsCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/FetchAllTaskSelectorsBuildAction.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/FetchTaskSelectorsBuildAction.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/FetchTasksBuildAction.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/PublicationsCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/TaskDisplayNameCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/TestFilteringCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/ToolingApiDeprecationsCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/UserHomeDirCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r16/CustomModel.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r16/CustomToolingModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r16/UnknownCustomModelFeedbackCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/BrokenAction.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/BuildActionCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/BuildScriptModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/CustomModel.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/FetchCustomModel.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/FetchIdeaModel.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/FetchUnknownModel.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/GradleBuildModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/NullAction.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/ProjectLevelModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/UseGradleBuildToFetchProjectModel.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/UseOtherTypesToFetchProjectModel.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/BuildAction.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/BuildActionExecuter.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/BuildActionFailureException.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/BuildController.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/adapter/CollectionMapper.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/adapter/CompatibleIntrospector.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/adapter/MethodInvocation.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/adapter/MethodInvoker.java
 create 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/ProtocolToModelAdapter.java
 create 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/TargetTypeProvider.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/AbstractLongRunningOperation.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/DefaultBuildActionExecuter.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/ModelProvider.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/async/AsyncConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/async/AsyncConsumerActionExecutor.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/async/DefaultAsyncConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/async/DefaultAsyncConsumerActionExecutor.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/AbstractModelProducer.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/AbstractPost12ConsumerConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/AbstractPre12ConsumerConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ActionAwareConsumerConnection.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/AdaptedConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/BuildControllerAdapter.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/BuildInvocationsAdapterProducer.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ConnectionVersion4BackedConsumerConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ConsumerAction.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ConsumerActionExecutor.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ConsumerConnectionMetadata.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/GradleBuildAdapterProducer.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/LazyConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/LazyConsumerActionExecutor.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/LoggingInitializerConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/LoggingInitializerConsumerActionExecutor.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ModelBuilderBackedConsumerConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ModelBuilderBackedModelProducer.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ModelProducer.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/NoToolingApiConnection.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ProgressLoggingConnection.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ProgressLoggingConsumerActionExecutor.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/BuildInvocationsConverter.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/ConsumerTargetTypeProvider.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/GradleBuildConverter.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/GradleProjectMixInHandler.java
 create 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/PropertyHandlerFactory.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/TaskNameComparator.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/TaskPropertyHandlerFactory.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/parameters/ConsumerConnectionParameters.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/protocoladapter/ConsumerPropertyHandler.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/protocoladapter/MethodInvocation.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/protocoladapter/MethodInvoker.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/protocoladapter/ProtocolToModelAdapter.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/protocoladapter/TargetTypeProvider.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/eclipse/DefaultEclipseExternalDependency.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/eclipse/DefaultEclipseLinkedResource.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/eclipse/DefaultEclipseProject.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/eclipse/DefaultEclipseProjectDependency.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/eclipse/DefaultEclipseSourceDirectory.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/eclipse/DefaultEclipseTask.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/BasicGradleProject.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/BasicGradleTaskSelector.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultBuildInvocations.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultConvertedGradleProject.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultGradleBuild.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultGradleProjectTask.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultGradlePublication.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultGradleScript.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultProjectPublications.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/GradleProjectIdentity.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/PartialBasicGradleProject.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/PartialGradleProject.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/TaskListingLaunchable.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/idea/DefaultIdeaCompilerOutput.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/idea/DefaultIdeaContentRoot.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/idea/DefaultIdeaDependencyScope.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/idea/DefaultIdeaLanguageLevel.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/idea/DefaultIdeaModule.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/idea/DefaultIdeaModuleDependency.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/idea/DefaultIdeaProject.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/idea/DefaultIdeaSingleEntryLibraryDependency.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/idea/DefaultIdeaSourceDirectory.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/outcomes/DefaultGradleBuildOutcome.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/outcomes/DefaultGradleFileBuildOutcome.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/outcomes/DefaultProjectOutcomes.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalBuildAction.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalBuildActionExecutor.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalBuildActionFailureException.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalBuildController.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalLaunchable.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalTestModel.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalUnsupportedModelException.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/ModelBuilder.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/ModelIdentifier.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/reflect/CompatibleIntrospector.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/Launchable.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/TaskSelector.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/gradle/BasicGradleProject.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/gradle/BuildInvocations.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/gradle/GradleBuild.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/gradle/GradlePublication.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/gradle/GradleScript.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/gradle/ProjectPublications.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/gradle/package-info.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/internal/ProjectSensitiveToolingModelBuilder.java
 delete mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/internal/TestModel.java
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/integtests/tooling/fixture/GradleVersionSpecTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/adapter/CollectionMapperTest.groovy
 create 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/ProtocolToModelAdapterTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/DefaultBuildActionExecuterTest.groovy
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/ProtocolToModelAdapterTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/async/DefaultAsyncConsumerActionExecutorTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/ActionAwareConsumerConnectionTest.groovy
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/AdaptedConnectionTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/BuildControllerAdapterTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/ConnectionVersion4BackedConsumerConnectionTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/GradleBuildAdapterProducerTest.groovy
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/LazyConnectionTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/LazyConsumerActionExecutorTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/ModelBuilderBackedConsumerConnectionTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/ModelBuilderBackedModelProducerTest.groovy
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/ProgressLoggingConnectionTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/ProgressLoggingConsumerActionExecutorTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/converters/BuildInvocationsConverterTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/converters/GradleBuildConverterTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/converters/TaskNameComparatorTest.groovy
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/protocoladapter/ProtocolToModelAdapterTest.groovy
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/versioning/ModelMappingTest.groovy
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/eclipse/DefaultEclipseProjectTest.groovy
 delete mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/reflect/CompatibleIntrospectorTest.groovy
 create mode 100644 subprojects/tooling-api/src/testFixtures/groovy/org/gradle/integtests/tooling/fixture/GradleVersionSpec.java
 create mode 100644 subprojects/wrapper/src/integTest/groovy/org/gradle/integtests/WrapperConcurrentDownloadTest.groovy
 create mode 100644 subprojects/wrapper/src/integTest/groovy/org/gradle/integtests/WrapperGenerationIntegrationTest.groovy
 create mode 100644 subprojects/wrapper/src/integTest/groovy/org/gradle/integtests/WrapperHttpIntegrationTest.groovy
 create mode 100644 subprojects/wrapper/src/integTest/groovy/org/gradle/integtests/WrapperSetup.groovy
 create mode 100644 subprojects/wrapper/src/integTest/groovy/org/gradle/integtests/WrapperUserHomeIntegrationTest.groovy
 create mode 100644 subprojects/wrapper/src/main/java/org/gradle/wrapper/ExclusiveFileAccessManager.java
 create mode 100644 subprojects/wrapper/src/main/java/org/gradle/wrapper/GradleUserHomeLookup.java

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



More information about the pkg-java-commits mailing list