[gradle] branch jessie-backports updated (f97c857 -> cdf2f22)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Apr 18 06:32:24 UTC 2016


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

ebourg-guest pushed a change to branch jessie-backports
in repository gradle.

     omits  f97c857   Rebuild for jessie-backports
      adds  9dc8c8f   d/rules: Remove mh_linkjars override
      adds  368027e   Add ivy-2.4.0.patch and fix FTBFS with ivy 2.4.0.
      adds  9576ff9   Remove empty lines in debian/rules
      adds  ea03d95   Update changelog
      adds  aa31efc   Update patch header
      adds  989107f   Drop use-bndlib-1.50.0.patch and transition to bnd 2.1.0.
      adds  83515f2   Release 2.7-3
      adds  4edc3ff   d/gradle.1.md: Remove Debian revision from version number
      adds  a279398   Fixed the compatibility with Maven 3.3.9
      adds  604eb48   Upload to unstable
      adds  2a25418   Imported Upstream version 2.8
      adds  e8cc85c   Merge tag 'upstream/2.8'
      adds  da61b51   Refreshed the patches
      adds  bf5536f   Updated the Lintian overrides libgradle-core-java
      adds  fcfcf00   Re-use the faster clean logic from gradle-debian-helper
      adds  a420c8a   Build depend on libspock-java >= 0.7 and drop disable_buildSrc_tests.diff
      adds  e4966c8   Upload to unstable
      adds  066535c   Imported Upstream version 2.9
      adds  8962b1c   Merge tag 'upstream/2.9'
      adds  66e8179   Refreshed the patches
      adds  81114a3   Apply the java plugin in debian/generate-classpath.gradle
      adds  77dfa49   Upload to unstable
      adds  b284d9f   Bump to 2.10-1
      adds  9e019b1   Imported Upstream version 2.10
      adds  cf34db5   Merge tag 'upstream/2.10'
      adds  f2554b4   Drop the use of javahelper since it never works well with maven-repo-helper
      adds  bca8cf0   Refresh patches
      adds  59b1a96   Fix maven-repo-helper usage
      adds  90f9bda   Update d/gradle.1.md
      adds  60d8f00   d/gradle.1.md: Fix typo
      adds  5a30416   d/generate_classpath.gradle: Sort classpaths for reproducibility
      adds  9a88358   Refresh disable_sonar.diff
      adds  b2058fb   drop d/patches/disable_distributions.diff: Unnecessary
      adds  5f6aec1   d/.gitignore: Add .mh/
      adds  81f5844   d/rules: Fix zero-byte-files deletion mistake
      adds  2b3e33d   Upload to unstable
      adds  6ca1569   Standards-Version updated to 3.9.7
      adds  c58b22d   Use a secure Vcs-Git URL
      adds  7eb6906   Removed disable_java9.diff
      adds  f48426d   Replaced disable_release_notes.diff with a task exclusion parameter
      adds  a663397   Removed 26_disable_commitid.diff (not required)
      adds  ed08b52   Moved aether dependencies changes to eclipse-aether.diff
      adds  65ecaca   Merged maven-aether-provider.diff into eclipse-aether.diff
      adds  75ad7e1   Merged maven_builder_support.diff into maven-3.3.9-compatibility.patch
      adds  ae8f384   Removed maven_testng.diff (no longer used)
      adds  4e18ef0   Fixed the CycleDetectedException when installing Maven artifacts (Closes: #810817)
      adds  60325b4   Removed unnecessary changes performed by use_local_artifacts.diff
      adds  a03dc40   Upload to unstable
      adds  cdf2f22   Rebuild for jessie-backports

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (f97c857)
            \
             N -- N -- N   refs/heads/jessie-backports (cdf2f22)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

No new revisions were added by this update.

Summary of changes:
 build.gradle                                       |  122 ++-
 buildSrc/build.gradle                              |    2 +-
 .../main/groovy/org/gradle/build/BuildTypes.groovy |   78 --
 .../main/groovy/org/gradle/build/JarJarJar.groovy  |    3 +-
 .../org/gradle/build/ReleasedVersions.groovy       |   31 +-
 .../gradle/build/docs/BuildableDOMCategory.groovy  |    3 +-
 .../build/docs/UserGuideTransformTask.groovy       |   64 +-
 .../docs/dsl/docbook/AssembleDslDocTask.groovy     |   37 +-
 .../generator/DependencyGenerator.groovy           |  120 +++
 .../performance/generator/DependencyGraph.groovy   |   27 +
 .../performance/generator/MavenJarCreator.groovy   |   76 ++
 .../performance/generator/MavenModule.groovy       |  162 +++
 .../gradle/performance/generator/MavenPom.groovy   |   35 +
 .../performance/generator/MavenRepository.groovy   |   51 +
 .../gradle/performance/generator/MavenScope.groovy |   25 +
 .../performance/generator/RepositoryBuilder.groovy |   80 ++
 .../performance/generator/TestProject.groovy       |   46 +
 .../generator/tasks/JvmProjectGeneratorTask.groovy |  123 +++
 .../MonolithicNativeProjectGeneratorTask.groovy    |   64 ++
 .../tasks/NativeProjectGeneratorTask.groovy        |   39 +
 .../generator/tasks/ProjectGeneratorTask.groovy    |  232 +++++
 .../org/gradle/plugins/buildtypes/BuildType.groovy |   48 +
 .../plugins/buildtypes/BuildTypesPlugin.groovy     |   65 ++
 .../org.gradle.build-types.properties              |    1 +
 .../org/gradle/build/docs/XmlSpecification.groovy  |   16 +-
 .../generator/DependencyGeneratorTest.groovy       |   48 +
 config/checkstyle/suppressions.xml                 |    6 +-
 config/codenarc.xml                                |    3 +-
 debian/.gitignore                                  |    9 +
 debian/changelog                                   |   82 +-
 debian/control                                     |   12 +-
 debian/gbp.conf                                    |    2 -
 debian/generate-classpath.gradle                   |   25 -
 debian/generate-pom.gradle                         |   10 -
 debian/generate_classpath.gradle                   |   24 +
 debian/generate_pom.gradle                         |   13 +
 debian/gradle.1.md                                 |  160 +--
 debian/gradle.jlibs                                |    2 -
 debian/gradle.poms                                 |    4 +-
 debian/libgradle-core-java.jlibs                   |   13 -
 debian/libgradle-core-java.lintian-overrides       |    2 +-
 debian/libgradle-core-java.poms                    |   26 +-
 debian/libgradle-plugins-java.jlibs                |   37 -
 debian/libgradle-plugins-java.poms                 |   74 +-
 debian/patches/26_disable_commitid.diff            |   36 -
 debian/patches/33_scala_zinc.diff                  |   15 +-
 debian/patches/disable_aws.diff                    |    2 +-
 debian/patches/disable_buildSrc_tests.diff         |   11 +-
 debian/patches/disable_distributions.diff          |   40 -
 debian/patches/disable_java9.diff                  |   13 -
 debian/patches/disable_release_notes.diff          |   64 --
 debian/patches/disable_sonar.diff                  |   45 +-
 debian/patches/disable_tests.diff                  |  147 ++-
 debian/patches/eclipse-aether.diff                 |   65 +-
 debian/patches/generate_classpath.diff             |   12 +-
 debian/patches/generate_pom.diff                   |   17 +-
 debian/patches/ivy-2.4.0.patch                     |   48 +
 debian/patches/jcommander.diff                     |   12 +-
 debian/patches/maven-3.3-compatibility.patch       |   60 ++
 debian/patches/maven-aether-provider.diff          |   23 -
 debian/patches/maven_builder_support.diff          |   13 -
 debian/patches/maven_testng.diff                   |   31 -
 debian/patches/nekohtml.diff                       |    2 +-
 debian/patches/series                              |    7 +-
 debian/patches/use-bndlib-1.50.0.patch             |   37 +-
 debian/patches/use_local_artifacts.diff            |  145 +--
 debian/rules                                       |   30 +-
 gradle/buildReceipt.gradle                         |    5 +
 gradle/buildReceiptInit.gradle                     |   20 +
 gradle/buildSplits.gradle                          |   91 ++
 gradle/classycle.gradle                            |   23 +-
 gradle/compile.gradle                              |    3 +
 gradle/dependencies.gradle                         |    7 +-
 gradle/groovyProject.gradle                        |   24 +-
 gradle/idea.gradle                                 |    3 +-
 gradle/integTest.gradle                            |   11 +-
 gradle/java9.gradle                                |   55 +-
 gradle/pullRequestBuild.gradle                     |    6 +-
 gradle/testGroupings.gradle                        |   29 +-
 gradle/versioning.gradle                           |    2 +-
 gradle/wrapper/gradle-wrapper.properties           |    5 +-
 gradlew                                            |   10 +-
 .../api/plugins/announce/internal/Twitter.groovy   |    3 +-
 .../antlr/Antlr2PluginIntegrationTest.groovy       |   11 +-
 .../api/plugins/antlr/internal/AntlrExecuter.java  |    2 +-
 .../ExpressionReplacingVisitorSupport.java         |   14 +-
 .../scripts/internal/ScriptSourceTransformer.java  |   50 -
 .../src/main/java/org/gradle/api/JavaVersion.java  |    7 +-
 .../gradle/internal/classloader/ClasspathUtil.java |    2 +-
 .../classloader/DefaultClassLoaderFactory.java     |    3 +-
 .../classloader/MultiParentClassLoader.java        |    5 +
 .../classloader/TransformingClassLoader.java       |    2 +-
 .../org/gradle/internal/classpath/ClassPath.java   |    5 +-
 .../internal/classpath/DefaultClassPath.java       |   12 +
 .../internal/io/ClassLoaderObjectInputStream.java  |    2 +-
 .../internal/service/DefaultServiceRegistry.java   |    2 +-
 .../typeconversion/TypeConversionException.java    |    0
 .../internal/typeconversion/TypeConverter.java     |   24 +
 .../UnsupportedNotationException.java              |    0
 .../src/main/java}/org/gradle/util/GUtil.java      |    0
 .../groovy/org/gradle/api/JavaVersionSpec.groovy   |   13 +
 .../io/ClassLoaderObjectInputStreamTest.groovy     |   45 +
 .../reflect/MethodSignatureEquivalenceTest.groovy  |   47 +
 .../groovy/org/gradle/util}/util/GUtilTest.groovy  |    0
 .../plugins/MavenConversionIntegrationTest.groovy  |   16 +-
 .../AbstractPmdPluginVersionIntegrationTest.groovy |   33 +
 ...ckstylePluginDependenciesIntegrationTest.groovy |    6 +
 .../CheckstylePluginVersionIntegrationTest.groovy  |   21 +-
 .../PmdPluginAuxclasspathIntegrationTest.groovy    |  153 +++
 .../PmdPluginDependenciesIntegrationTest.groovy    |   65 ++
 .../quality/PmdPluginIntegrationTest.groovy        |  205 +---
 .../quality/PmdPluginVersionIntegrationTest.groovy |  202 +++-
 .../gradle/api/plugins/quality/Checkstyle.groovy   |   21 +-
 .../api/plugins/quality/CheckstylePlugin.groovy    |    8 +-
 .../api/plugins/quality/CheckstyleReports.java     |   14 +
 .../api/plugins/quality/CodeNarcPlugin.groovy      |    2 +-
 .../org/gradle/api/plugins/quality/Pmd.groovy      |   49 +-
 .../gradle/api/plugins/quality/PmdExtension.groovy |   25 +-
 .../gradle/api/plugins/quality/PmdPlugin.groovy    |    4 +
 .../quality/internal/CheckstyleReportsImpl.java    |    7 +-
 .../main/resources/checkstyle-noframes-sorted.xsl  |  195 ++++
 .../plugins/quality/CheckstylePluginTest.groovy    |    4 +
 .../api/plugins/quality/CheckstyleTest.groovy      |    3 +
 .../api/plugins/quality/PmdPluginTest.groovy       |   15 +
 .../integtest/fixtures/CheckstyleCoverage.groovy   |    2 +-
 .../org/gradle/api/ApplyPluginIntegSpec.groovy     |    4 +-
 .../resource/TextResourceIntegrationTest.groovy    |   11 +-
 .../api/tasks/CopyErrorIntegrationTest.groovy      |    6 +-
 .../tasks/IncrementalTasksIntegrationTest.groovy   |  116 ++-
 .../api/tasks/bundling/ZipIntegrationTest.groovy   |   89 ++
 .../RuleBasedTaskActionsIntegrationTest.groovy     |   87 --
 .../RuleBasedTaskExecutionIntegrationTest.groovy   |  230 -----
 .../RuleBasedTaskReferenceIntegrationTest.groovy   |   90 --
 .../RuleTaskBridgingIntegrationTest.groovy         |  629 ++++++++++++
 .../RuleTaskCreationIntegrationTest.groovy         |  614 ++++++++++++
 .../RuleTaskExecutionIntegrationTest.groovy        |  225 +++++
 .../execution/taskgraph/WithRuleBasedTasks.groovy  |    8 +-
 .../groovy/org/gradle/BuildExceptionReporter.java  |    1 +
 .../src/main/groovy/org/gradle/BuildLogger.java    |    1 +
 .../main/groovy/org/gradle/BuildResultLogger.java  |    1 +
 .../src/main/groovy/org/gradle/StartParameter.java |   65 +-
 .../groovy/org/gradle/TaskExecutionLogger.java     |    1 +
 .../gradle/api/artifacts/ConflictResolution.java   |    1 +
 .../api/artifacts/ExternalModuleDependency.java    |    6 +-
 .../groovy/org/gradle/api/artifacts/Module.java    |    2 +-
 .../api/artifacts/dsl/DependencyHandler.java       |    4 +-
 .../groovy/org/gradle/api/file/RelativePath.java   |   64 +-
 .../org/gradle/api/file/SourceDirectorySet.java    |    2 +
 .../api/internal/AsmBackedClassGenerator.java      |  127 +--
 .../org/gradle/api/internal/BeanDynamicObject.java |    6 +-
 .../api/internal/DependencyClassPathProvider.java  |   10 +-
 .../internal/artifacts/DefaultDependencySet.java   |    3 +-
 .../artifacts/DefaultPublishArtifactSet.java       |    3 +-
 .../dependencies/DefaultProjectDependency.java     |    3 +-
 .../api/internal/cache/HeapProportionalSizer.java  |   55 ++
 .../gradle/api/internal/cache/StringInterner.java  |   36 +
 .../DefaultTaskArtifactStateRepository.java        |   10 +-
 .../changes/IncrementalTaskInputsInternal.java     |   15 +
 .../changes/StatefulIncrementalTaskInputs.java     |   16 +
 .../rules/DiscoveredInputFileChange.java           |   27 +
 .../rules/DiscoveredInputFilesStateChangeRule.java |   88 ++
 .../rules/DiscoveredTaskStateChanges.java          |   24 +
 .../changedetection/rules/TaskUpToDateState.java   |   14 +-
 .../state/CacheBackedTaskHistoryRepository.java    |   57 +-
 .../state/CachingFileSnapshotter.java              |   27 +-
 .../state/DefaultFileCollectionSnapshotter.java    |   99 +-
 .../state/DefaultFileSnapshotterSerializer.java    |   11 +-
 .../state/FileTreeElementSnapshotter.java          |   23 +
 .../state/InMemoryTaskArtifactCache.java           |   80 +-
 .../state/OutputFilesCollectionSnapshotter.java    |   16 +-
 .../state/OutputFilesSnapshotSerializer.java       |    7 +-
 .../changedetection/state/TaskExecution.java       |    4 +
 .../internal/classloading/GroovySystemLoader.java  |   29 +
 .../classloading/GroovySystemLoaderFactory.java    |   55 ++
 .../LeakyOnJava7GroovySystemLoader.java            |  114 +++
 .../classloading/NoOpGroovySystemLoader.java       |   30 +
 .../api/internal/file/AbstractFileCollection.java  |   21 +-
 .../api/internal/file/AbstractFileResource.java    |    7 +-
 .../gradle/api/internal/file/AbstractFileTree.java |   22 +-
 .../api/internal/file/CachingFileVisitDetails.java |   63 ++
 .../api/internal/file/CompositeFileCollection.java |   76 +-
 .../api/internal/file/CompositeFileTree.java       |   19 +-
 .../internal/file/DefaultCompositeFileTree.java    |    7 +-
 .../internal/file/DefaultSourceDirectorySet.java   |    2 +-
 .../api/internal/file/FileCollectionInternal.java  |    3 +-
 .../internal/file/FileTreeElementComparator.java   |   33 +
 .../api/internal/file/FileTreeElementHasher.java   |   53 +
 .../file/FileVisitDetailsWithAttributes.java       |   52 +
 .../api/internal/file/UnionFileCollection.java     |    8 +-
 .../gradle/api/internal/file/UnionFileTree.java    |    2 +-
 .../api/internal/file/archive/TarFileTree.java     |   28 +-
 .../api/internal/file/archive/ZipCopyAction.java   |   11 +-
 .../api/internal/file/archive/ZipFileTree.java     |    8 +-
 .../file/archive/compression/Bzip2Archiver.java    |    5 +
 .../compression/CompressedReadableResource.java    |    1 +
 .../file/archive/compression/GzipArchiver.java     |    5 +
 ...pendenciesOnlyFileCollectionResolveContext.java |   94 +-
 .../DefaultConfigurableFileCollection.java         |   12 +-
 .../collections/DefaultConfigurableFileTree.java   |   17 +-
 .../file/collections/DefaultDirectoryWalker.java   |   74 ++
 .../collections/DefaultDirectoryWalkerFactory.java |   73 ++
 .../DefaultFileCollectionResolveContext.java       |   10 +-
 .../file/collections/DelegatingFileCollection.java |  113 ---
 .../file/collections/DelegatingFileTree.java       |   54 -
 .../file/collections/DirectoryFileTree.java        |   59 +-
 .../internal/file/collections/DirectoryWalker.java |   30 +
 .../file/collections/FileCollectionAdapter.java    |    3 +-
 .../file/collections/FileCollectionContainer.java  |    4 +-
 .../collections/FileCollectionResolveContext.java  |    3 +-
 .../internal/file/collections/FileTreeAdapter.java |    3 +-
 .../file/collections/FileTreeWithBackingFile.java  |   23 +
 .../file/collections/FilteredFileTree.java         |   27 +
 .../LazilyInitializedFileCollection.java           |   17 +-
 .../collections/LazilyInitializedFileTree.java     |   35 -
 .../api/internal/file/collections/MapFileTree.java |   62 +-
 .../file/collections/SingletonFileTree.java        |    4 +-
 .../file/collections/jdk7/Jdk7DirectoryWalker.java |  117 +++
 .../internal/initialization/ClassLoaderScope.java  |   10 +
 .../initialization/DefaultClassLoaderScope.java    |   96 +-
 .../initialization/RootClassLoaderScope.java       |   13 +
 .../loadercache/DefaultClassLoaderCache.java       |   32 +-
 .../loadercache/HashClassPathSnapshotter.java      |   27 +-
 .../plugins/RuleBasedPluginApplicator.java         |   10 +-
 .../api/internal/project/AbstractProject.java      |  110 ++-
 .../project/DefaultIsolatedAntBuilder.groovy       |  183 ----
 .../api/internal/project/ProjectScript.groovy      |    5 +
 .../api/internal/project/ant/BasicAntBuilder.java  |    8 +-
 .../project/antbuilder/AntBuilderDelegate.groovy   |   86 ++
 .../internal/project/antbuilder/CacheEntry.java    |   34 +
 .../project/antbuilder/CachedClassLoader.java      |   38 +
 .../antbuilder/ClassPathToClassLoaderCache.java    |  149 +++
 .../api/internal/project/antbuilder/Cleanup.java   |   55 ++
 .../antbuilder/DefaultIsolatedAntBuilder.java      |  212 ++++
 .../project/antbuilder/FinalizerThread.java        |  102 ++
 .../AnnotationProcessingTaskFactory.java           |   50 +-
 .../FileCollectionBackedArchiveTextResource.java   |   22 +-
 ...yRuleAwarePolymorphicDomainObjectContainer.java |   77 --
 .../api/internal/rules/ModelMapCreators.java       |   74 --
 .../RuleAwarePolymorphicDomainObjectContainer.java |   36 -
 .../tasks/CachingTaskDependencyResolveContext.java |   12 +-
 .../api/internal/tasks/DefaultTaskContainer.java   |   52 +-
 .../tasks/DefaultTaskContainerFactory.java         |   16 +-
 .../api/internal/tasks/DefaultTaskDependency.java  |    7 +-
 .../internal/tasks/RealizableTaskCollection.java   |  244 +++++
 .../api/internal/tasks/TaskContainerInternal.java  |    5 +-
 .../internal/tasks/TaskDependencyContainer.java    |   27 +
 .../api/internal/tasks/TaskDependencyInternal.java |    3 +-
 .../tasks/TaskDependencyResolveContext.java        |   14 +-
 .../groovy/org/gradle/api/logging/Logging.java     |    1 +
 .../org/gradle/api/plugins/ExtensionContainer.java |    2 +-
 .../main/groovy/org/gradle/api/tasks/JavaExec.java |   15 +
 .../groovy/org/gradle/api/tasks/bundling/Zip.java  |   22 +-
 .../tasks/incremental/IncrementalTaskInputs.java   |    4 +-
 .../org/gradle/api/tasks/util/PatternSet.java      |   46 +-
 .../util/internal/CachingPatternSpecFactory.java   |  180 ++++
 .../tasks/util/internal/PatternSpecFactory.java    |   78 ++
 .../internal/DefaultPersistentDirectoryCache.java  |    8 +-
 .../cache/internal/MapBackedInMemoryStore.java     |   87 ++
 .../cache/internal/NonThreadsafeInMemoryStore.java |   74 --
 .../btree/BTreePersistentIndexedCache.java         |    1 -
 .../cache/internal/btree/FileBackedBlockStore.java |  102 +-
 .../configuration/DefaultScriptPluginFactory.java  |    4 -
 .../project/BuildScriptProcessor.java              |    2 +-
 .../DefaultTasksBuildExecutionAction.java          |    4 +-
 .../org/gradle/execution/TaskNameResolver.java     |    7 +-
 .../taskgraph/AbstractTaskPlanExecutor.java        |    8 +-
 .../taskgraph/DefaultTaskExecutionPlan.java        |   34 +-
 .../scripts/internal/BuildScriptTransformer.java   |    3 +-
 .../internal/DefaultScriptCompilationHandler.java  |   39 +
 .../initialization/DefaultGradleLauncher.java      |   18 +-
 .../DefaultGradleLauncherFactory.java              |   20 +-
 .../authentication/AbstractAuthentication.java     |   23 +-
 .../authentication/AllSchemesAuthentication.java   |   10 +-
 .../authentication/AuthenticationInternal.java     |    6 +-
 .../filewatch/DefaultFileSystemChangeWaiter.java   |  138 ---
 .../DefaultFileSystemChangeWaiterFactory.java      |  161 +++
 .../filewatch/DefaultFileWatcherFactory.java       |    5 +-
 .../internal/filewatch/FileSystemChangeWaiter.java |    4 +-
 .../filewatch/FileSystemChangeWaiterFactory.java   |   23 +
 .../org/gradle/internal/filewatch/FileWatcher.java |    5 +
 .../internal/filewatch/FileWatcherFactory.java     |    4 +-
 .../filewatch/jdk7/Jdk7FileWatcherFactory.java     |    5 +-
 .../jdk7/WatchServiceFileWatcherBacking.java       |   13 +-
 .../filewatch/jdk7/WatchServiceRegistrar.java      |   53 +-
 .../service/scopes/BuildScopeServices.java         |  212 ++--
 .../service/scopes/BuildSessionScopeServices.java  |   55 +-
 .../service/scopes/GlobalScopeServices.java        |   23 +-
 .../service/scopes/ProjectScopeServices.java       |    6 +
 .../service/scopes/TaskExecutionServices.java      |   14 +-
 .../typeconversion/DefaultTypeConverter.java       |  333 +++++++
 .../typeconversion/NotationParserBuilder.java      |    2 +-
 .../org/gradle/logging/LoggingManagerInternal.java |    5 +
 .../org/gradle/logging/LoggingServiceRegistry.java |   63 +-
 .../gradle/logging/StandardOutputRedirector.java   |   25 -
 .../logging/internal/DefaultLoggingManager.java    |   39 +-
 .../internal/DefaultLoggingManagerFactory.java     |   21 +-
 .../internal/DefaultProgressLoggerFactory.java     |   26 +-
 .../internal/DefaultStandardOutputRedirector.java  |   94 --
 .../internal/JavaUtilLoggingConfigurer.java        |   41 -
 .../logging/internal/JavaUtilLoggingSystem.java    |   88 ++
 .../logging/internal/LoggingOutputInternal.java    |    3 +
 .../org/gradle/logging/internal/LoggingSystem.java |   17 +-
 .../logging/internal/LoggingSystemAdapter.java     |   11 +-
 .../gradle/logging/internal/NoOpLoggingSystem.java |    3 +-
 .../logging/internal/PrintStreamLoggingSystem.java |   39 +-
 .../collection/internal/BridgedCollections.java    |   20 +-
 .../internal/PolymorphicModelMapProjection.java    |   50 -
 .../persist/ReusingModelRegistryStore.java         |   14 +-
 .../use/internal/InjectedPluginClasspath.java      |   33 +
 .../testfixtures/internal/NoOpLoggingManager.java  |   99 --
 .../testfixtures/internal/ProjectBuilderImpl.java  |    7 +-
 .../internal/TestGlobalScopeServices.java          |   36 -
 .../internal/TestOutputEventListener.java          |   36 -
 .../org/gradle/util/AvailablePortFinder.java       |    1 +
 .../src/main/groovy/org/gradle/util/Clock.java     |    2 +-
 .../core/src/main/groovy/org/gradle/util/Path.java |   17 +-
 .../groovy/org/gradle/StartParameterTest.groovy    |    2 +-
 .../gradle/api/file/RelativePathSpockTest.groovy   |   54 +
 .../AsmBackedClassGeneratorGroovyTest.groovy       |   30 +-
 .../org/gradle/api/internal/DefaultTaskTest.groovy |    4 +-
 .../DependencyClassPathProviderTest.groovy         |    1 +
 .../DefaultProjectDependencyTest.groovy            |    4 +-
 .../api/internal/cache/StringInternerTest.groovy   |   56 ++
 .../DefaultTaskArtifactStateRepositoryTest.groovy  |   30 +-
 .../DiscoveredInputFilesStateChangeRuleTest.groovy |   72 ++
 .../changedetection/state/CacheCapSizerTest.groovy |   43 +
 .../state/CachingFileSnapshotterTest.groovy        |   17 +-
 .../DefaultFileCollectionSnapshotterTest.groovy    |   66 +-
 .../DefaultFileSnapshotterSerializerTest.groovy    |    5 +-
 .../state/LoggingEvictionListenerTest.groovy       |   47 +
 .../state/OutputFilesSnapshotSerializerTest.groovy |    3 +-
 .../file/AbstractFileCollectionTest.groovy         |  450 +++++++++
 .../internal/file/AbstractFileCollectionTest.java  |  357 -------
 .../api/internal/file/AbstractFileTreeTest.groovy  |  229 +++--
 .../file/CompositeFileCollectionSpec.groovy        |  310 ++++++
 .../internal/file/CompositeFileCollectionTest.java |   85 +-
 .../api/internal/file/CompositeFileTreeSpec.groovy |   91 ++
 .../api/internal/file/CompositeFileTreeTest.java   |   14 +-
 .../file/DefaultCompositeFileTreeTest.groovy       |   20 +
 .../file/DelegatingFileCollectionTest.groovy       |   84 --
 .../LazilyInitializedFileCollectionTest.groovy     |   46 +
 .../internal/file/UnionFileCollectionTest.groovy   |   90 ++
 .../api/internal/file/UnionFileCollectionTest.java |   84 --
 .../internal/file/archive/ZipCopyActionTest.groovy |    7 +-
 ...ciesOnlyFileCollectionResolveContextTest.groovy |  187 ++--
 .../DefaultConfigurableFileCollectionTest.java     |   27 +-
 .../DefaultConfigurableFileTreeTest.groovy         |    4 +-
 .../collections/DefaultDirectoryWalkerTest.java    |  387 ++++++++
 .../DefaultFileCollectionResolveContextTest.groovy |   10 +-
 .../file/collections/DirectoryFileTreeTest.java    |  377 -------
 .../collections/FileCollectionAdapterTest.groovy   |    2 +-
 .../file/collections/FileTreeAdapterTest.groovy    |    2 +-
 .../jdk7/Jdk7DirectoryWalkerTest.groovy            |  290 ++++++
 .../DefaultClassLoaderScopeTest.groovy             |  120 ++-
 .../HashClassPathSnapshotterTest.groovy            |    8 +-
 .../plugins/RuleSourceApplicationTest.groovy       |    8 +-
 .../project/DefaultIsolatedAntBuilderTest.groovy   |   18 +-
 .../api/internal/project/DefaultProjectTest.groovy |    9 +-
 .../antbuilder/AntBuilderMemoryLeakTest.groovy     |  106 ++
 ...warePolymorphicDomainObjectContainerTest.groovy |   75 --
 ...wareNamedDomainObjectFactoryRegistryTest.groovy |   51 -
 ...rePolymorphicNamedEntityInstantiatorTest.groovy |   49 -
 ...warePolymorphicDomainObjectContainerTest.groovy |   66 --
 .../CachingTaskDependencyResolveContextTest.groovy |   70 +-
 .../tasks/RealizableTaskCollectionTest.groovy      |   99 ++
 .../internal/CachingPatternSpecFactoryTest.groovy  |   86 ++
 .../gradle/execution/TaskNameResolverTest.groovy   |   44 +-
 .../internal/BuildScriptTransformerSpec.groovy     |    4 +-
 .../DefaultGradleLauncherFactoryTest.groovy        |    8 +-
 .../initialization/DefaultGradleLauncherTest.java  |    4 +-
 .../DefaultFileSystemChangeWaiterTest.groovy       |   62 +-
 .../filewatch/DefaultFileWatcherFactoryTest.groovy |   27 +-
 .../jdk7/WatchServiceFileWatcherBackingTest.groovy |    3 +-
 .../service/scopes/BuildScopeServicesTest.groovy   |  107 +-
 .../scopes/BuildSessionScopeServicesTest.groovy    |   91 ++
 .../service/scopes/GlobalScopeServicesTest.java    |    1 +
 .../scopes/TaskExecutionServicesTest.groovy        |    2 +
 .../typeconversion/DefaultTypeConverterTest.groovy |  159 +++
 .../logging/LoggingServiceRegistryTest.groovy      |  151 ++-
 .../internal/DefaultLoggingManagerTest.java        |   63 +-
 .../DefaultProgressLoggerFactoryTest.groovy        |   28 +-
 .../DefaultStandardOutputRedirectorTest.groovy     |  116 ---
 .../internal/JavaUtilLoggingConfigurerTest.groovy  |   40 -
 .../internal/JavaUtilLoggingSystemTest.groovy      |   40 +
 .../internal/LoggingSystemAdapterTest.groovy       |   42 +-
 .../internal/PrintStreamLoggingSystemTest.groovy   |   82 +-
 .../test/groovy/org/gradle/util/PathTest.groovy    |    5 +-
 .../ports/FixedAvailablePortAllocatorTest.groovy   |  117 ++-
 .../util/ports/ReleasingPortAllocatorTest.groovy   |   45 +
 .../gradle/api/file/FileCollectionMatchers.java    |    2 +-
 .../ports/AbstractAvailablePortAllocator.groovy    |    3 -
 .../util/ports/FixedAvailablePortAllocator.groovy  |   32 +-
 .../util/ports/ReleasingPortAllocator.groovy       |   65 ++
 .../AddingConfigurationIntegrationTest.groovy      |   94 ++
 .../ArtifactDependenciesIntegrationTest.groovy     |    6 +-
 ...pendencyHandlerApiResolveIntegrationTest.groovy |   12 +-
 .../DependencyResolveRulesIntegrationTest.groovy   |   18 +-
 ...pendencySubstitutionRulesIntegrationTest.groovy |   28 +-
 .../ProjectDependencyResolveIntegrationTest.groovy |   24 +-
 .../ResolutionResultApiIntegrationTest.groovy      |    6 +-
 ...ResolutionStrategySamplesIntegrationTest.groovy |    4 +-
 .../ResolvedConfigurationIntegrationTest.groovy    |  126 +--
 ...VersionConflictResolutionIntegrationTest.groovy |    5 +-
 ...ationDependencyResolutionIntegrationTest.groovy |   85 +-
 .../ivy/IvyFileRepoResolveIntegrationTest.groovy   |    2 +-
 .../ivy/IvyHttpRepoResolveIntegrationTest.groovy   |    5 +-
 .../maven/BadPomFileResolveIntegrationTest.groovy  |   42 -
 .../MavenFileRepoResolveIntegrationTest.groovy     |    2 +-
 .../MavenParentPomResolveIntegrationTest.groovy    |   63 ++
 .../MavenPomPackagingResolveIntegrationTest.groovy |    3 +-
 .../maven/MavenPomResolveIntegrationTest.groovy    |   44 +
 .../MavenProfileResolveIntegrationTest.groovy      |   73 ++
 .../DefaultDependencyManagementServices.java       |   14 +-
 .../artifacts/DefaultResolvedArtifact.java         |   11 +-
 .../DependencyManagementBuildScopeServices.java    |    8 +-
 .../DependencyManagementGlobalScopeServices.java   |   15 +-
 .../api/internal/artifacts/ResolveContext.java     |    8 +-
 .../configurations/DefaultConfiguration.java       |   23 +-
 .../DefaultConfigurationContainer.java             |   16 +-
 .../configurations/DirectBuildDependencies.java    |    3 +-
 .../configurations/TasksFromDependentProjects.java |    3 +-
 .../TasksFromProjectDependencies.java              |    3 +-
 .../internal/artifacts/ivyservice/CacheLayout.java |    4 +-
 .../ivyservice/IvyBackedArtifactPublisher.java     |   20 +-
 .../ivyservice/LocalComponentConverter.java        |   24 -
 .../parser/GradlePomModuleDescriptorBuilder.java   |    6 +-
 .../parser/IvyXmlModuleDescriptorParser.java       |   32 +-
 .../ConfigurationBackedComponent.java              |   39 -
 .../ConfigurationComponentMetaDataBuilder.java     |   25 +
 .../ConfigurationLocalComponentConverter.java      |   75 --
 .../ConfigurationsToArtifactsConverter.java        |   23 -
 .../ConfigurationsToModuleDescriptorConverter.java |   23 -
 ...faultConfigurationComponentMetaDataBuilder.java |   59 ++
 .../DefaultConfigurationsToArtifactsConverter.java |   28 -
 ...tConfigurationsToModuleDescriptorConverter.java |   39 -
 .../DefaultExcludeRuleConverter.java               |   38 -
 .../moduleconverter/ExcludeRuleConverter.java      |   22 -
 .../AbstractIvyDependencyDescriptorFactory.java    |    1 -
 ...ultDependenciesToModuleDescriptorConverter.java |    1 -
 .../dependencies/DefaultExcludeRuleConverter.java  |   38 +
 .../dependencies/ExcludeRuleConverter.java         |   22 +
 ...ternalModuleIvyDependencyDescriptorFactory.java |    1 -
 .../ProjectIvyDependencyDescriptorFactory.java     |    1 -
 .../DefaultProjectComponentRegistry.java           |   26 +-
 .../DefaultArtifactDependencyResolver.java         |   47 +-
 .../store/ResolutionResultsStoreFactory.java       |   41 +-
 .../resolver/ResourceVersionLister.java            |    2 +-
 .../transport/RepositoryTransportFactory.java      |    9 +-
 .../model/DefaultLibraryBinaryIdentifier.java      |    2 +-
 .../artifacts/DefaultResolvedArtifactTest.groovy   |   12 +-
 .../DefaultConfigurationContainerSpec.groovy       |   13 +-
 .../DefaultConfigurationContainerTest.groovy       |    3 +-
 .../configurations/DefaultConfigurationSpec.groovy |    5 +-
 .../TasksFromDependentProjectsTest.groovy          |    3 +-
 .../artifacts/ivyservice/CacheLayoutTest.groovy    |    8 +-
 ...ConfigurationLocalComponentConverterTest.groovy |   56 --
 ...onfigurationComponentMetaDataBuilderTest.groovy |  120 +++
 ...ltConfigurationsToArtifactsConverterTest.groovy |   48 -
 ...figurationsToModuleDescriptorConverterTest.java |  110 ---
 .../DefaultExcludeRuleConverterTest.java           |   49 -
 .../moduleconverter/IvyConverterTestUtil.java      |   31 -
 ...actDependencyDescriptorFactoryInternalTest.java |    1 -
 ...endenciesToModuleDescriptorConverterTest.groovy |    1 -
 .../DefaultExcludeRuleConverterTest.java           |   49 +
 .../ComponentReportIntegrationTest.groovy          |  157 ---
 ...iagnosticsComponentReportIntegrationTest.groovy |  161 +++
 .../DetailedModelReportIntegrationTest.groovy      |   22 +-
 .../model/ModelReportIntegrationTest.groovy        |  385 ++++++--
 .../model/ModelReportTaskIntegrationTest.groovy    |    3 +-
 ...uildEnvironmentReportTaskIntegrationTest.groovy |   98 ++
 ...pendencyInsightReportTaskIntegrationTest.groovy |  150 ++-
 .../DependencyReportTaskIntegrationTest.groovy     |   84 +-
 .../diagnostics/HelpTaskIntegrationTest.groovy     |   48 +-
 .../TaskReportTaskIntegrationTest.groovy           |    6 +-
 .../org/gradle/api/plugins/HelpTasksPlugin.java    |   17 +-
 .../api/reporting/components/ComponentReport.java  |   22 +-
 .../internal/AbstractBinaryRenderer.java           |   46 +-
 .../components/internal/BinaryRenderer.java        |    8 +
 .../components/internal/ComponentRenderer.java     |    2 +-
 .../internal/ComponentReportRenderer.java          |   64 +-
 .../components/internal/DiagnosticsServices.java   |    5 +-
 .../components/internal/RendererUtils.java         |   60 ++
 .../components/internal/SourceSetRenderer.java     |   41 +-
 .../gradle/api/reporting/model/ModelReport.java    |   15 +-
 .../model/internal/ModelNodeRenderer.java          |   13 +-
 .../diagnostics/AbstractDependencyReportTask.java  |   97 ++
 .../api/tasks/diagnostics/AbstractReportTask.java  |   28 +-
 .../diagnostics/BuildEnvironmentReportTask.java    |   95 ++
 .../tasks/diagnostics/DependencyReportTask.java    |   75 +-
 .../internal/ProjectReportGenerator.java           |   25 +
 .../diagnostics/internal/ReportGenerator.java      |   87 ++
 .../internal/text/DefaultTextReportBuilder.java    |  130 ++-
 .../internal/text/TextReportBuilder.java           |    9 +-
 .../gradle/api/plugins/HelpTasksPluginSpec.groovy  |    1 +
 .../internal/ComponentRendererTest.groovy          |   16 +-
 .../components/internal/RendererUtilsTest.groovy   |   98 ++
 .../internal/SourceSetRendererTest.groovy          |   59 +-
 .../reporting/model/ModelReportParserTest.groovy   |  109 ++-
 .../BuildEnvironmentReportTaskTest.groovy          |   50 +
 .../internal/ReportGeneratorTest.groovy            |  133 +++
 .../text/DefaultTextReportBuilderTest.groovy       |  214 +++-
 .../AbstractComponentReportIntegrationTest.groovy  |    5 +-
 ...ractNativeComponentReportIntegrationTest.groovy |   23 +
 .../ComponentReportOutputFormatter.groovy          |    2 -
 .../JvmComponentReportOutputFormatter.groovy       |    2 +-
 .../NativeComponentReportIntegrationTest.groovy    |   23 -
 .../NativeComponentReportOutputFormatter.groovy    |    8 +-
 .../api/reporting/model/ModelReportParser.groovy   |   21 +-
 subprojects/distributions/distributions.gradle     |    6 +-
 subprojects/docs/docs.gradle                       |    6 +
 subprojects/docs/src/docs/css/base.css             |    2 +-
 subprojects/docs/src/docs/css/userguide.css        |   12 +
 subprojects/docs/src/docs/dsl/dsl.xml              |   42 +-
 ...e.api.plugins.ReportingBasePluginConvention.xml |   35 -
 .../dsl/org.gradle.api.plugins.quality.Pmd.xml     |   10 +-
 ...org.gradle.api.plugins.quality.PmdExtension.xml |   10 +-
 .../docs/dsl/org.gradle.api.tasks.bundling.Zip.xml |    4 +
 ...org.gradle.api.tasks.compile.CompileOptions.xml |    6 +-
 ...s.diagnostics.AbstractDependencyReportTask.xml} |    0
 ...asks.diagnostics.BuildEnvironmentReportTask.xml |   38 +
 ...api.tasks.incremental.IncrementalTaskInputs.xml |    2 +-
 .../dsl/org.gradle.api.tasks.javadoc.Groovydoc.xml |    6 +-
 .../dsl/org.gradle.api.tasks.javadoc.Javadoc.xml   |    4 +-
 .../dsl/org.gradle.api.tasks.scala.ScalaDoc.xml    |    4 +-
 .../org.gradle.language.base.LanguageSourceSet.xml |    3 -
 ...age.nativeplatform.HeaderExportingSourceSet.xml |    3 -
 .../org.gradle.nativeplatform.NativeBinarySpec.xml |   29 +-
 ...rg.gradle.nativeplatform.PreprocessingTool.xml} |    0
 ...adle.nativeplatform.StaticLibraryBinarySpec.xml |    5 +-
 ...adle.nativeplatform.platform.NativePlatform.xml |   44 +
 .../dsl/org.gradle.platform.base.BinarySpec.xml    |    3 -
 .../dsl/org.gradle.platform.base.ComponentSpec.xml |    3 -
 subprojects/docs/src/docs/dsl/plugins.xml          |   22 -
 .../docs/src/docs/release/content/script.js        |   46 -
 subprojects/docs/src/docs/release/notes.md         |  478 ++++++---
 .../src/docs/stylesheets/userGuideHtmlCommon.xsl   |    8 +-
 .../docs/src/docs/userguide/buildEnvironment.xml   |   11 +-
 .../src/docs/userguide/buildScriptsTutorial.xml    |    2 +-
 .../src/docs/userguide/buildingJavaLibraries.xml   |  447 +++++++++
 .../docs/src/docs/userguide/commandLine.xml        |    3 +-
 .../src/docs/userguide/commandLineTutorial.xml     |    9 +-
 subprojects/docs/src/docs/userguide/depMngmt.xml   |    2 +-
 .../docs/src/docs/userguide/distributionPlugin.xml |    2 +-
 .../docs/src/docs/userguide/gradleDaemon.xml       |  117 ++-
 .../docs/src/docs/userguide/gradleWrapper.xml      |  161 +--
 .../docs/src/docs/userguide/groovyPlugin.xml       |    7 +-
 subprojects/docs/src/docs/userguide/ideSupport.xml |   58 --
 .../src/docs/userguide/introMultiProjectBuilds.xml |  129 +++
 subprojects/docs/src/docs/userguide/javaPlugin.xml |   17 +-
 .../docs/src/docs/userguide/nativeBinaries.xml     |   54 +-
 .../docs/src/docs/userguide/newJavaPlugin.xml      |  313 ------
 subprojects/docs/src/docs/userguide/newModel.xml   |  508 ----------
 .../docs/src/docs/userguide/organizeBuildLogic.xml |   16 +-
 subprojects/docs/src/docs/userguide/osgi.xml       |    4 +-
 subprojects/docs/src/docs/userguide/playPlugin.xml |   19 +-
 subprojects/docs/src/docs/userguide/plugins.xml    |    2 +-
 .../docs/src/docs/userguide/projectReports.xml     |    4 +-
 .../docs/src/docs/userguide/scalaPlugin.xml        |    3 +-
 .../docs/src/docs/userguide/softwareModel.xml      |  773 +++++++++++++++
 .../src/docs/userguide/softwareModelConcepts.xml   |   52 +
 .../docs/src/docs/userguide/sonarPlugin.xml        |    6 +-
 .../docs/src/docs/userguide/sonarRunnerPlugin.xml  |    7 +-
 .../docs/src/docs/userguide/standardPlugins.xml    |   16 +-
 subprojects/docs/src/docs/userguide/tasks.xml      |    2 +-
 subprojects/docs/src/docs/userguide/testKit.xml    |   51 +-
 subprojects/docs/src/docs/userguide/userguide.xml  |  175 ++--
 .../docs/src/docs/userguide/workingWithFiles.xml   |    6 +-
 .../src/docs/userguide/writingBuildScripts.xml     |   23 +-
 .../samples/customModel/componentType/build.gradle |   38 +-
 .../DefaultDocumentationComponent.groovy           |   21 -
 .../documentation/DocumentationComponent.groovy    |    2 +
 .../documentation/DocumentationPlugin.groovy       |    8 +-
 .../documentation/DocumentationSourceSet.groovy    |    4 +-
 .../groovy/sample/markdown/MarkdownPlugin.groovy   |    4 +-
 .../samples/groovy/customizedLayout/build.gradle   |    2 +-
 .../samples/groovy/mixedJavaAndGroovy/build.gradle |    2 +-
 .../multiproject/groovycDetector/build.gradle      |    2 +-
 .../groovy/multiproject/testproject/build.gradle   |    2 +-
 .../src/test/groovy/org/gradle/VersionTest.groovy  |    7 +-
 .../src/samples/groovy/quickstart/build.gradle     |    2 +-
 .../src/test/groovy/org/gradle/PersonTest.groovy   |   10 +-
 .../javaLibraryPlugin/apispec-support/build.gradle |    5 +
 .../src/main/java/org/gradle/Person.java           |   17 +
 .../samples/javaLibraryPlugin/apispec/build.gradle |   47 +
 .../src/brokenclient/java/org/gradle/Client.java   |   10 +
 .../apispec/src/client/java/org/gradle/Client.java |    8 +
 .../apispec/src/main}/java/org/gradle/Person.java  |    0
 .../java/org/gradle/internal/PersonInternal.java   |    9 +
 .../main/java/org/gradle/utils/StringUtils.java    |    5 +
 .../src/main}/resources/org/gradle/resource.xml    |    0
 .../multiplecomponents/build.gradle                |   88 ++
 .../multiplecomponents/settings.gradle             |    0
 .../src/client/java/org/gradle/Client.java         |    0
 .../src/core/java/org/gradle/Person.java           |    0
 .../src/core}/resources/org/gradle/resource.xml    |    0
 .../src/server/java/org/gradle/PersonServer.java   |    0
 .../src/verifier/java/org/gradle/Verifier.java     |   16 +
 .../multiplecomponents/util/build.gradle           |    0
 .../util/src/main/java/org/gradle/Utils.java       |    0
 .../quickstart/build.gradle                        |    0
 .../src/main/java/org/gradle/Person.java           |    0
 .../src/main/resources/org/gradle/resource.xml     |    0
 .../targetplatforms/core/build.gradle              |   28 +
 .../core/src/main/java/org/gradle/Person.java      |    0
 .../core/src/main/java6/org/gradle/Person6.java    |    0
 .../src/main/resources/org/gradle/resource.xml     |    0
 .../targetplatforms/server/build.gradle            |    0
 .../server/src/main/java/org/gradle/Server.java    |    0
 .../targetplatforms/settings.gradle                |    0
 .../modelRules/basicRuleSourcePlugin/build.gradle  |   10 +-
 .../modelRules/language-support/build.gradle       |   36 +
 .../src/samples/modelRules/modelDsl/build.gradle   |  117 ++-
 .../modelRules/modelDslCoercion/build.gradle       |   57 ++
 .../samples/modelRules/modelDslCoercion/data.csv   |    1 +
 .../src/samples/native-binaries/c/build.gradle     |   34 +-
 .../samples/native-binaries/cpp-exe/build.gradle   |    2 +-
 .../src/samples/native-binaries/cpp/build.gradle   |   40 +-
 .../src/samples/native-binaries/cunit/build.gradle |   16 +-
 .../samples/native-binaries/flavors/build.gradle   |    8 +-
 .../native-binaries/google-test/build.gradle       |   20 +-
 .../native-binaries/multi-project/build.gradle     |   15 +-
 .../native-binaries/objective-c/build.gradle       |   20 +-
 .../native-binaries/objective-cpp/build.gradle     |   18 +-
 .../pre-compiled-headers/build.gradle              |   12 +-
 .../samples/native-binaries/prebuilt/build.gradle  |    4 +-
 .../native-binaries/sourceset-variant/build.gradle |    8 +-
 .../native-binaries/tool-chains/build.gradle       |    8 +-
 .../samples/native-binaries/variants/build.gradle  |   50 +-
 .../native-binaries/visual-studio/build.gradle     |   14 +-
 .../native-binaries/windows-resources/build.gradle |   20 +-
 .../newJavaPlugin/multiplecomponents/build.gradle  |   45 -
 .../targetplatforms/core/build.gradle              |   28 -
 subprojects/docs/src/samples/osgi/build.gradle     |    2 +-
 .../src/samples/play/custom-assets/build.gradle    |    4 +-
 .../gradle/sample/BuildLogicFunctionalTest.java    |    2 +-
 .../src/samples/testKit/testKitSpock/build.gradle  |    4 +-
 .../gradle/sample/BuildLogicFunctionalTest.groovy  |    2 +-
 .../testKitSpockClasspath/plugin/build.gradle      |    4 +-
 .../org.gradle.sample.helloworld.properties        |   17 +
 .../gradle/sample/BuildLogicFunctionalTest.groovy  |   53 +-
 .../testKit/testKitSpockGradleVersion/build.gradle |   16 +
 .../gradle/sample/BuildLogicFunctionalTest.groovy  |   61 ++
 .../artifacts/externalDependencies/build.gradle    |    6 +-
 .../userguide/groovy/groovyDependency/build.gradle |    4 +-
 .../modelRules/configureAsRequired/build.gradle    |   35 +
 .../modelRules/configureElementsOfMap/build.gradle |   49 +
 .../build.gradle                                   |   35 +
 .../tutorial/groovyWithFlatDir/build.gradle        |    2 +-
 .../userguide/tutorial/projectReports/build.gradle |    2 +-
 .../basicRuleSourcePlugin-model-task.out           |  220 +++--
 .../buildingJavaLibraries-compile-avoid.out        |    8 +
 .../buildingJavaLibraries-compile-brokenclient.out |    5 +
 .../buildingJavaLibraries-compile-first.out        |    8 +
 .../buildingJavaLibraries-updateSources.out        |    3 +
 .../userguideOutput/dependencyInsightReport.out    |    4 +-
 .../userguideOutput/dependencyListReport.out       |    6 +-
 .../src/samples/userguideOutput/listProjects.out   |   14 +
 .../userguideOutput/model-language-support-all.out |    1 +
 .../modelDslConfigureRuleNotRunWhenNotRequired.out |    6 +
 .../modelDslConfigureRuleRunWhenRequired.out       |    7 +
 ...itializationRuleRunsBeforeConfigurationRule.out |    9 +
 .../userguideOutput/modelDslModelMapNestedAll.out  |   11 +
 .../userguideOutput/nativeComponentReport.out      |   24 +-
 .../userguideOutput/newJavaComponentReport.out     |    9 +-
 .../newJavaMultiComponents-clientJar.out           |    4 +-
 .../newJavaMultiComponents-serverJar.out           |    7 +-
 .../newJavaMultiComponents-verifierJar.out         |    6 +
 .../samples/userguideOutput/newJavaQuickstart.out  |    1 +
 .../newJavaTargetPlatforms-java6MainJar.out        |   14 +-
 .../newJavaTargetPlatforms-server.out              |   34 +-
 .../userguideOutput/newJavaTargetPlatforms.out     |   20 +-
 .../userguideOutput/playComponentReport.out        |    4 +-
 .../samples/userguideOutput/taskListAllReport.out  |    3 +
 .../src/samples/userguideOutput/taskListReport.out |    1 +
 .../releasenotes/StaticReleaseNotesTest.groovy     |   14 -
 .../main/groovy/org/gradle/plugins/ear/Ear.groovy  |    2 +-
 ...alStudioFileCustomizationIntegrationTest.groovy |    6 +-
 .../VisualStudioMultiProjectIntegrationTest.groovy |    6 +-
 ...VisualStudioSingleProjectIntegrationTest.groovy |   20 +-
 .../VisualStudioProjectConfiguration.groovy        |    6 +-
 .../internal/VisualStudioProjectResolver.java      |    4 +-
 .../visualstudio/plugins/VisualStudioPlugin.java   |    6 +-
 .../VisualStudioProjectConfigurationTest.groovy    |   32 +-
 .../AbstractIdeDeduplicationIntegrationTest.groovy |  282 ++++++
 .../eclipse/AbstractEclipseIntegrationSpec.groovy  |   28 +-
 .../eclipse/AbstractEclipseIntegrationTest.groovy  |    8 +-
 .../ide/eclipse/EclipseClasspathFixture.groovy     |   32 +-
 ...pseDependencySubstitutionIntegrationTest.groovy |    2 +-
 .../ide/eclipse/EclipseIntegrationTest.groovy      |   44 +
 .../EclipseMultiModuleIntegrationTest.groovy       |    4 +-
 .../ide/eclipse/EclipseProjectFixture.groovy       |   62 +-
 .../eclipse/EclipseProjectIntegrationTest.groovy   |  106 +-
 ...eProjectNameDeduplicationIntegrationTest.groovy |   54 +
 ...ipseSourcesAndJavadocJarsIntegrationTest.groovy |    4 +-
 .../ide/eclipse/EclipseWtpComponentFixture.groovy  |   34 +-
 .../ide/eclipse/EclipseWtpFacetsFixture.groovy     |   26 +-
 .../ide/eclipse/EclipseWtpIntegrationTest.groovy   |    2 +-
 .../eclipse/EclipseWtpModelIntegrationTest.groovy  |  711 +++++++-------
 ...deaDependencySubstitutionIntegrationTest.groovy |    2 +-
 .../plugins/ide/idea/IdeaIntegrationTest.groovy    |    8 +-
 .../IdeaModuleDeduplicationIntegrationTest.groovy  |   34 +
 .../ide/idea/IdeaMultiModuleIntegrationTest.groovy |   22 +-
 .../ide/eclipse/internal/EclipseNameDeduper.groovy |    9 +-
 .../ide/eclipse/model/EclipseDomainModel.groovy    |    1 +
 .../plugins/ide/eclipse/model/EclipseJdt.groovy    |   12 +-
 .../ide/eclipse/model/EclipseProject.groovy        |   26 +-
 .../internal/configurer/DeduplicationTarget.groovy |   18 +-
 .../internal/configurer/ModuleNameDeduper.groovy   |   89 +-
 .../ide/internal/configurer/ProjectDeduper.groovy  |   13 +-
 .../ide/internal/tooling/EclipseModelBuilder.java  |   22 +
 .../eclipse/DefaultEclipseBuildCommand.java        |   46 +
 .../tooling/eclipse/DefaultEclipseProject.java     |   30 +
 .../eclipse/DefaultEclipseProjectNature.java       |   37 +
 .../tooling/java/DefaultJavaSourceSettings.java    |   33 +
 .../model/internal/SourceFoldersCreatorTest.groovy |   34 +-
 .../configurer/DeduplicationTargetTest.groovy      |   47 -
 .../configurer/ModuleNameDeduperTest.groovy        |  139 ++-
 .../eclipse/DefaultEclipseProjectTest.groovy       |   14 +
 .../tooling/eclipse/EclipseModelBuilderTest.groovy |  191 ++++
 .../integtests/CacheProjectIntegrationTest.groovy  |    2 +-
 ...latedAntBuilderMemoryLeakIntegrationTest.groovy |  135 +++
 ...gacyAndComponentJvmPluginIntegrationTest.groovy |   21 +-
 .../MixedNativeAndJvmProjectIntegrationTest.groovy |   46 +-
 .../OsgiProjectSampleIntegrationTest.groovy        |    2 +-
 .../integtests/ProjectLayoutIntegrationTest.groovy |    2 +-
 .../BuildEnvironmentIntegrationTest.groovy         |    4 +-
 .../logging/LoggingIntegrationTest.groovy          |   11 +-
 .../SamplesRepositoriesIntegrationTest.groovy      |    6 +-
 .../SamplesWebProjectIntegrationTest.groovy        |   26 +-
 .../SamplesWebQuickstartIntegrationTest.groovy     |    8 +-
 .../samples/UserGuideSamplesIntegrationTest.groovy |    2 +-
 .../samples/UserGuideSamplesRunner.groovy          |   45 +-
 .../fixtures/AbstractIntegrationSpec.groovy        |   16 +-
 .../fixtures/AbstractIntegrationTest.java          |    8 +-
 .../fixtures/CrossVersionIntegrationSpec.groovy    |    3 +-
 .../gradle/integtests/fixtures/EnableModelDsl.java |   32 -
 .../fixtures/executer/AbstractGradleExecuter.java  |   21 +-
 .../executer/DefaultGradleDistribution.java        |   24 +-
 .../fixtures/executer/ExecutionFailure.java        |   12 +-
 .../fixtures/executer/ExecutionResult.java         |    6 +
 .../fixtures/executer/ForkingGradleExecuter.java   |    2 +-
 .../executer/GradleBackedArtifactBuilder.java      |    4 +-
 .../fixtures/executer/GradleDistribution.java      |   10 +-
 .../fixtures/executer/GradleExecuter.java          |   20 +-
 .../fixtures/executer/InProcessGradleExecuter.java |   45 +-
 .../executer/OutputScrapingExecutionResult.java    |   12 +-
 .../test/fixtures/maven/AbstractMavenModule.groovy |   16 +-
 .../test/fixtures/maven/DelegatingMavenModule.java |   10 +-
 .../gradle/test/fixtures/maven/MavenModule.groovy  |    4 +-
 .../server/http/CyclicBarrierHttpServer.java       |   16 +-
 .../test/fixtures/server/http/HttpServer.groovy    |   14 +-
 .../fixtures/jvm/OsXJavaHomeParserTest.groovy      |   47 +-
 .../test/fixtures/maven/MavenFileModuleTest.groovy |    6 +-
 .../fixtures/maven/MavenLocalModuleTest.groovy     |    6 +-
 .../gradle/test/fixtures/ConcurrentTestUtil.groovy |    8 +-
 .../test/fixtures/archive/ZipTestFixture.groovy    |    8 +-
 .../test/fixtures/concurrent/ConcurrentSpec.groovy |    2 +-
 .../test/fixtures/concurrent/Instants.groovy       |   11 +-
 .../test/fixtures/concurrent/TestLogger.groovy     |    4 +-
 .../file/AbstractTestDirectoryProvider.java        |   54 +-
 .../test/fixtures/file/CleanupTestDirectory.groovy |   44 +
 .../file/CleanupTestDirectoryExtension.groovy      |   55 ++
 .../test/fixtures/file/TestDirectoryProvider.java  |    2 +
 .../org/gradle/test/fixtures/file/TestFile.java    |   41 +-
 .../test/fixtures/file/TestFileHelper.groovy       |   48 +-
 .../file/TestNameTestDirectoryProvider.java        |    5 +
 .../internal/NativeServicesTestFixture.java        |    7 +-
 .../api/publish/ivy/IvyPublishHttpIntegTest.groovy |    3 +-
 .../ivy/IvyPublishVersionRangeIntegTest.groovy     |  104 ++
 .../ivy/IvyHttpPublishIntegrationTest.groovy       |    2 -
 .../IvyVersionRangePublishIntegrationTest.groovy   |   95 ++
 .../internal/artifact/DefaultIvyArtifactSet.java   |    3 +-
 .../ivy/plugins/IvyPublishPluginTest.groovy        |    4 +-
 .../plugins/jetty/internal/Jetty6PluginServer.java |    4 +-
 subprojects/language-groovy/language-groovy.gradle |    2 +-
 .../gradle/groovy/GroovyDocIntegrationTest.groovy  |    2 +-
 .../GroovyCompilerContinuousIntegrationTest.groovy |   62 ++
 .../internal/tasks/compile/ApiGroovyCompiler.java  |   28 +-
 .../tasks/compile/daemon/DaemonGroovyCompiler.java |    7 +-
 .../org/gradle/api/tasks/javadoc/AntGroovydoc.java |    1 +
 subprojects/language-java/language-java.gradle     |    1 +
 ...ncrementalJavaCompilationIntegrationTest.groovy |   83 +-
 ...ustomComponentJarBinariesIntegrationTest.groovy |   18 +-
 .../gradle/language/java/DependencyScope.groovy    |   65 ++
 .../language/java/JarBinaryTypeVariantsTest.groovy |   14 +-
 ...aCompilationAgainstApiJarIntegrationTest.groovy | 1033 ++++++++++++++++++++
 ...lationAgainstDependenciesIntegrationTest.groovy |  151 +++
 .../JavaCompilerContinuousIntegrationTest.groovy   |   67 ++
 .../language/java/JavaIntegrationTesting.groovy    |   28 +
 ...braryDependencyResolutionIntegrationTest.groovy |  275 +++---
 ...guageDependencyResolutionIntegrationTest.groovy |  490 +++++-----
 ...ernalDependencyResolutionIntegrationTest.groovy |  265 +++++
 .../java/JavaLanguageIntegrationTest.groovy        |  118 ++-
 .../java/JavaSourceSetIntegrationTest.groovy       |  144 +--
 .../language/java/JvmApiSpecIntegrationTest.groovy |  491 ++++++++++
 .../MultipleBinaryTypesWithVariantsTest.groovy     |   22 +-
 .../java/SampleJavaLanguageIntegrationTest.groovy  |   70 +-
 .../java/SingleBinaryTypeWithVariantsTest.groovy   |  167 ++--
 .../VariantAwareDependencyResolutionSpec.groovy    |   28 +-
 .../internal/tasks/compile/DaemonJavaCompiler.java |    4 +-
 .../compile/incremental/CompilationSourceDirs.java |   67 +-
 .../incremental/IncrementalCompilerDecorator.java  |    2 +-
 .../compile/incremental/SourceToNameConverter.java |    2 +-
 .../internal/GroupsJavadocOptionFileOption.java    |   14 +-
 .../org/gradle/language/java/JavaSourceSet.java    |    3 +-
 .../internal/DefaultJavaLanguageSourceSet.java     |   10 +-
 .../internal/JavaToolChainServiceRegistry.java     |    4 +-
 .../language/java/plugins/JavaLanguagePlugin.java  |   16 +-
 .../incremental/SourceToNameConverterTest.groovy   |    2 +-
 .../DefaultJavaLanguageSourceSetTest.groovy        |   19 +-
 .../language/fixtures/TestJavaComponent.groovy     |    2 +-
 subprojects/language-jvm/language-jvm.gradle       |    1 +
 .../ResourceOnlyJvmLibraryIntegrationTest.groovy   |   17 +-
 .../daemon/InProcessCompilerDaemonFactory.java     |    6 +
 .../jvm/internal/JvmPluginServiceRegistry.java     |   11 +-
 ...bstractCompilerContinuousIntegrationTest.groovy |   73 ++
 .../fixtures/jvm/TestJvmComponent.groovy           |    4 +
 ...mLanguageIncrementalBuildIntegrationTest.groovy |   30 +-
 .../AbstractJvmLanguageIntegrationTest.groovy      |   41 +-
 ...AbstractJvmPluginLanguageIntegrationTest.groovy |   42 +-
 ...eLanguageIncrementalBuildIntegrationTest.groovy |   47 +-
 ...anguageIncrementalCompileIntegrationTest.groovy |  106 +-
 .../AbstractNativeLanguageIntegrationTest.groovy   |   86 +-
 ...ctNativePreCompiledHeaderIntegrationTest.groovy |    6 +-
 .../DuplicateBaseNamesIntegrationTest.groovy       |   10 +-
 ...yLanguageIncrementalBuildIntegrationTest.groovy |    6 +-
 .../AssemblyLanguageIntegrationTest.groovy         |    3 +-
 .../language/c/CLanguageIntegrationTest.groovy     |    8 +-
 .../language/c/MixedLanguageIntegrationTest.groovy |    6 +-
 .../language/cpp/CppLanguageIntegrationTest.groovy |    4 +-
 .../app/DuplicateObjectiveCBaseNamesTestApp.groovy |   14 +-
 .../DuplicateObjectiveCppBaseNamesTestApp.groovy   |   14 +-
 .../NativeLanguageSamplesIntegrationTest.groovy    |   20 +-
 .../ParallelNativePluginsIntegrationTest.groovy    |   18 +-
 ...anguageIncrementalCompileIntegrationTest.groovy |    6 +-
 ...ResourcesIncrementalBuildIntegrationTest.groovy |    6 +-
 .../rc/WindowsResourcesIntegrationTest.groovy      |    4 +-
 .../org/gradle/language/PreprocessingTool.java     |   45 -
 .../plugins/internal/AssembleTaskConfig.java       |    9 +-
 .../org/gradle/language/c/plugins/CLangPlugin.java |    2 +-
 .../gradle/language/cpp/plugins/CppLangPlugin.java |    2 +-
 .../internal/AbstractHeaderExportingSourceSet.java |    5 -
 .../internal/AbstractNativeCompileSpec.java        |   10 +
 .../nativeplatform/internal/CompileTaskConfig.java |    5 +-
 .../internal/DefaultPreprocessingTool.java         |   39 -
 .../internal/PCHCompileTaskConfig.java             |    2 +-
 .../internal/SourceCompileTaskConfig.java          |    4 +-
 .../incremental/IncrementalCompileProcessor.java   |    8 +-
 .../incremental/IncrementalNativeCompiler.java     |   50 +-
 .../internal/incremental/ResolvedInclude.java      |   20 +
 .../tasks/AbstractNativeCompileTask.java           |    6 +-
 .../objectivec/plugins/ObjectiveCLangPlugin.java   |    2 +-
 .../plugins/ObjectiveCppLangPlugin.java            |    2 +-
 .../rc/plugins/WindowsResourceScriptPlugin.java    |    2 +-
 .../WindowsResourcesCompileTaskConfig.java         |    9 +-
 .../language/rc/tasks/WindowsResourceCompile.java  |    1 +
 .../AbstractNativeComponentPluginTest.groovy       |   21 +-
 .../plugins/AssemblerLangPluginTest.groovy         |    4 +-
 .../assembler/plugins/AssemblerPluginTest.groovy   |   25 +-
 .../language/c/plugins/CLangPluginTest.groovy      |    4 +-
 .../cpp/internal/DefaultCppSourceSetTest.groovy    |    4 +-
 .../language/cpp/plugins/CppLangPluginTest.groovy  |    4 +-
 .../DefaultSourceIncludesResolverTest.groovy       |    1 +
 .../IncrementalCompileProcessorTest.groovy         |    5 +-
 .../plugins/ObjectiveCLangPluginTest.groovy        |    4 +-
 .../plugins/ObjectiveCppLangPluginTest.groovy      |    4 +-
 subprojects/language-scala/language-scala.gradle   |    1 +
 .../scala/JointScalaLangIntegrationTest.groovy     |    3 +-
 .../SampleScalaLanguageIntegrationTest.groovy      |    2 +-
 .../ScalaCompilerContinuousIntegrationTest.groovy  |   67 ++
 .../internal/tasks/scala/DaemonScalaCompiler.java  |    5 +-
 .../scala/plugins/ScalaLanguagePlugin.java         |    5 +-
 subprojects/launcher/launcher.gradle               |    5 +
 .../launcher/CommandLineIntegrationSpec.groovy     |   17 +
 .../ArchivesContinuousIntegrationTest.groovy       |   39 +-
 ...ionServiceReuseContinuousIntegrationTest.groovy |   73 ++
 ...ngesDuringBuildContinuousIntegrationTest.groovy |   57 ++
 .../SmokeContinuousIntegrationTest.groovy          |   48 +-
 .../daemon/DaemonFeedbackIntegrationSpec.groovy    |   14 +-
 .../DaemonUsageSuggestionIntegrationTest.groovy    |    4 +
 .../daemon/SingleUseDaemonIntegrationTest.groovy   |   14 +-
 .../daemon/StoppingDaemonIntegrationSpec.groovy    |    9 +-
 .../DaemonParametersIntegrationTest.groovy         |    2 +
 .../testing/DaemonEventSequenceBuilder.groovy      |    4 +-
 .../launcher/daemon/testing/DaemonsState.groovy    |    4 +-
 .../gradle/launcher/cli/BuildActionsFactory.java   |    3 +-
 .../launcher/daemon/client/DaemonClient.java       |    4 +-
 .../daemon/client/DefaultDaemonConnector.java      |    2 +-
 .../daemon/configuration/DaemonParameters.java     |    4 +-
 .../org/gradle/launcher/daemon/server/Daemon.java  |   10 +-
 .../daemon/server/DaemonStateCoordinator.java      |    2 +-
 .../server/DefaultIncomingConnectionHandler.java   |    4 +-
 .../daemon/server/DomainRegistryUpdater.java       |    8 +-
 .../server/exec/EstablishBuildEnvironment.java     |    3 +-
 .../launcher/daemon/server/exec/LogToClient.java   |    2 +-
 .../launcher/daemon/server/health/DaemonStats.java |    9 +-
 .../launcher/exec/BuildActionParameters.java       |    3 +
 .../exec/ContinuousBuildActionExecuter.java        |   17 +-
 .../DaemonUsageSuggestingBuildActionExecuter.java  |    6 +-
 .../exec/DefaultBuildActionParameters.java         |   27 +-
 .../internal/provider/ClasspathInferer.java        |    2 +-
 .../ClientSidePayloadClassLoaderFactory.java       |    4 +-
 .../provider/DaemonBuildActionExecuter.java        |   10 +-
 .../LoggingBridgingBuildActionExecuter.java        |   12 +-
 .../internal/provider/ProviderConnection.java      |   20 +-
 .../provider/ProviderStartParameterConverter.java  |    3 +-
 .../provider/connection/BuildLogLevelMixIn.java    |    6 +-
 .../connection/ProviderOperationParameters.java    |  107 +-
 .../configuration/DaemonParametersTest.groovy      |   13 +
 .../DaemonServerExceptionHandlingTest.groovy       |    3 +-
 .../daemon/server/health/DaemonStatsTest.groovy    |   31 +
 .../exec/ContinuousBuildActionExecuterTest.groovy  |   27 +-
 .../exec/DefaultBuildActionParametersTest.groovy   |    3 +-
 .../LoggingBridgingBuildActionExecuterTest.groovy  |    9 +-
 .../ProviderStartParameterConverterTest.groovy     |   10 +-
 .../connection/BuildLogLevelMixInTest.groovy       |   22 +-
 .../AbstractContinuousIntegrationTest.groovy       |   59 +-
 .../org/gradle/launcher/debug/JDWPUtil.groovy      |   78 ++
 .../MavenPublicationVersionRangeIntegTest.groovy   |   64 --
 .../publish/maven/MavenPublishHttpIntegTest.groovy |    2 -
 .../maven/MavenPublishIssuesIntegTest.groovy       |   43 +
 .../maven/MavenPublishMultiProjectIntegTest.groovy |   64 ++
 .../maven/MavenPublishVersionRangeIntegTest.groovy |  105 ++
 ...nNonUniqueSnapshotPublishIntegrationTest.groovy |   53 +
 ...enPomConfigurationPublishIntegrationTest.groovy |   82 ++
 .../maven/MavenPomGenerationIntegrationTest.groovy |  110 ---
 ...MavenPomGenerationPublishIntegrationTest.groovy |  110 +++
 .../MavenPublishIgnoresMavenSettingsTest.groovy    |   65 --
 ...MavenPublishNonUniqueSnapshotVersionTest.groovy |   53 -
 ...MavenPublishRespectsPomConfigurationTest.groovy |   82 --
 .../MavenPublishVersionRangeIntegrationTest.groovy |   97 --
 .../MavenSettingsPublishIntegrationTest.groovy     |   65 ++
 .../maven/MavenSftpPublishIntegrationTest.groovy   |   94 ++
 .../MavenVersionRangePublishIntegrationTest.groovy |  105 ++
 .../maven/MavenWagonPublishIntegrationTest.groovy  |   55 ++
 .../action/AbstractMavenPublishAction.java         |   21 +-
 .../maven/internal/action/MavenDeployAction.java   |    7 +-
 .../maven/internal/action/MavenInstallAction.java  |    9 +-
 .../internal/action/MavenWagonDeployAction.java    |   14 +-
 .../maven/internal/deployer/BaseMavenDeployer.java |    5 +-
 .../maven/internal/pom/CustomModelBuilder.java     |    2 +-
 .../gradle/api/publish/maven/MavenPublication.java |    5 +-
 .../internal/artifact/DefaultMavenArtifactSet.java |    3 +-
 .../publication/DefaultMavenPublication.java       |    4 +-
 .../internal/publisher/MavenRemotePublisher.java   |    2 +-
 .../publication/DefaultMavenPublicationTest.groovy |    1 +
 .../maven/plugins/MavenPublishPluginTest.groovy    |    3 +-
 .../remote/internal/inet/TcpOutgoingConnector.java |   19 +-
 .../internal/inet/MulticastConnectionTest.groovy   |    6 +-
 .../remote/internal/inet/TcpConnectorTest.groovy   |    8 +-
 .../model/ConfigurationCycleIntegrationTest.groovy |   14 +-
 .../gradle/model/ModelReuseIntegrationTest.groovy  |    6 +-
 .../ModelRuleBindingFailureIntegrationTest.groovy  |  162 ++-
 .../model/ModelRuleSamplesIntegrationTest.groovy   |   10 +
 ...ationRuleApplicationOrderIntegrationTest.groovy |    7 +-
 .../model/PluginRuleSourceIntegrationTest.groovy   |   31 +-
 .../model/TaskCreationIntegrationTest.groovy       |  707 --------------
 .../EnumsInManagedModelIntegrationTest.groovy      |    5 -
 ...validManagedModelMutationIntegrationTest.groovy |    9 +-
 .../InvalidManagedModelRuleIntegrationTest.groovy  |   27 +-
 ...GroovyScalarConfigurationIntegrationTest.groovy |  558 +++++++++++
 .../managed/ManagedModelMapIntegrationTest.groovy  |   15 +-
 ...odelPropertyTargetingRuleIntegrationTest.groovy |  347 +++++--
 .../ManagedScalarCollectionsIntegrationTest.groovy |  317 ++++++
 .../model/managed/ManagedSetIntegrationTest.groovy |   29 +-
 .../ManagedTypeReferencesIntegrationTest.groovy    |   44 +
 ...peWithUnmanagedPropertiesIntegrationTest.groovy |    5 -
 .../model/managed/ModelSetIntegrationTest.groovy   |   35 +-
 ...ScalarTypesInManagedModelIntegrationTest.groovy |  150 ++-
 ...managedCollectionPropertyIntegrationTest.groovy |   77 ++
 .../src/main/java/org/gradle/model/Managed.java    |    7 +-
 .../src/main/java/org/gradle/model/ModelMap.java   |    6 +
 .../src/main/java/org/gradle/model/RuleSource.java |    4 +-
 .../ChildNodeInitializerStrategyAccessor.java      |   24 +
 .../ChildNodeInitializerStrategyAccessors.java     |   42 +
 .../internal/ModelMapModelProjection.java          |   45 +-
 .../model/internal/asm/AsmClassGeneratorUtils.java |  144 +++
 .../model/internal/core/AbstractModelAction.java   |   53 +
 .../internal/core/AbstractModelActionWithView.java |   53 +
 .../model/internal/core/AddProjectionsAction.java  |   46 +
 .../model/internal/core/BaseInstanceFactory.java   |  335 ++++++-
 .../internal/core/ChainingModelProjection.java     |   25 +-
 .../internal/core/DefaultModelRegistration.java    |   89 ++
 .../core/DefaultNodeInitializerRegistry.java       |   97 ++
 .../model/internal/core/DeferredModelAction.java   |   28 +
 .../core/DependencyOnlyExtractedModelRule.java     |   20 +-
 .../core/DirectNodeInputUsingModelAction.java      |   52 +-
 .../core/DirectNodeNoInputsModelAction.java        |   36 +-
 .../model/internal/core/EmptyModelProjection.java  |    8 +-
 .../model/internal/core/ExtractedModelAction.java  |   26 +-
 .../model/internal/core/ExtractedModelCreator.java |   55 --
 .../internal/core/ExtractedModelRegistration.java  |   45 +
 .../model/internal/core/ExtractedModelRule.java    |   21 +-
 .../internal/core/FactoryBasedNodeInitializer.java |  171 +++-
 .../model/internal/core/InputUsingModelAction.java |   34 +-
 .../model/internal/core/InstanceFactory.java       |   49 +-
 .../gradle/model/internal/core/ModelAction.java    |    8 +-
 .../model/internal/core/ModelActionRole.java       |   27 +-
 .../gradle/model/internal/core/ModelAdapter.java   |    4 +-
 .../gradle/model/internal/core/ModelCreator.java   |   37 -
 .../gradle/model/internal/core/ModelCreators.java  |  194 ----
 .../internal/core/ModelMapGroovyDecorator.java     |  248 -----
 .../model/internal/core/ModelMapGroovyView.java    |   98 ++
 .../org/gradle/model/internal/core/ModelMaps.java  |   65 ++
 .../org/gradle/model/internal/core/ModelNode.java  |   15 +-
 .../gradle/model/internal/core/ModelPredicate.java |    6 +
 .../gradle/model/internal/core/ModelPromise.java   |    4 +-
 .../gradle/model/internal/core/ModelReference.java |    5 +-
 .../model/internal/core/ModelRegistration.java     |   47 +
 .../model/internal/core/ModelRegistrations.java    |  253 +++++
 .../org/gradle/model/internal/core/ModelRule.java  |   23 -
 .../core/ModelTypeInitializationException.java     |  135 +++
 .../org/gradle/model/internal/core/ModelViews.java |   13 +
 .../model/internal/core/MutableModelNode.java      |   27 +-
 .../model/internal/core/NoInputsModelAction.java   |   28 +-
 .../model/internal/core/NodeBackedModelMap.java    |  239 +++--
 .../model/internal/core/NodeBackedModelSet.java    |   11 +-
 .../model/internal/core/NodeInitializer.java       |   13 +-
 .../internal/core/NodeInitializerContext.java      |   65 ++
 .../internal/core/NodeInitializerRegistry.java     |   27 +
 .../core/ProjectionBackedModelCreator.java         |   83 --
 .../org/gradle/model/internal/core/Service.java    |   53 +
 .../core/SpecializedModelMapProjection.java        |   35 +-
 .../TypeCompatibilityModelProjectionSupport.java   |   44 +-
 .../internal/core/UnmanagedModelProjection.java    |    5 +-
 .../model/internal/core/UnmanagedStruct.java       |   29 +
 .../rule/describe/MethodModelRuleDescriptor.java   |    2 +-
 .../inspect/AbstractManagedModelInitializer.java   |  147 +++
 .../AbstractModelCreationRuleExtractor.java        |    9 +-
 ...bstractUnmanagedModelCreationRuleExtractor.java |   94 ++
 .../inspect/DefaultMethodRuleDefinition.java       |   11 +-
 .../internal/inspect/DefaultModelRuleInvoker.java  |    2 +-
 .../inspect/ManagedChildNodeCreatorStrategy.java   |   18 +-
 .../inspect/ManagedModelCreationRuleExtractor.java |   53 +-
 .../internal/inspect/ManagedModelInitializer.java  |  112 +--
 .../internal/inspect/MethodBackedModelAction.java  |   30 +-
 .../inspect/MethodModelRuleExtractors.java         |    1 +
 .../internal/inspect/MethodRuleDefinition.java     |    2 +
 .../model/internal/inspect/ModelRuleExtractor.java |   28 +-
 .../inspect/ProjectionOnlyNodeInitializer.java     |   22 +-
 .../ReadonlyImmutableManagedPropertyException.java |   37 +
 .../inspect/ServiceModelCreationRuleExtractor.java |   33 +
 .../UnmanagedModelCreationRuleExtractor.java       |   75 +-
 .../UnmanagedPropertyMissingSetterException.java   |   32 +
 .../internal/manage/instance/ManagedInstance.java  |    8 +-
 .../manage/instance/ManagedProxyFactory.java       |   76 +-
 .../manage/instance/ModelElementState.java         |    4 +
 .../manage/projection/ManagedModelProjection.java  |   78 +-
 .../manage/schema/AbstractModelStructSchema.java   |   77 --
 .../manage/schema/AbstractStructSchema.java        |   82 ++
 .../internal/manage/schema/CollectionSchema.java   |   49 +
 .../internal/manage/schema/CompositeSchema.java    |   23 +
 .../manage/schema/ManagedImplModelSchema.java      |   29 -
 .../internal/manage/schema/ManagedImplSchema.java  |   24 +
 .../manage/schema/ManagedImplStructSchema.java     |   31 +
 .../manage/schema/ModelCollectionSchema.java       |   47 -
 .../schema/ModelManagedImplStructSchema.java       |   57 --
 .../internal/manage/schema/ModelMapSchema.java     |   29 +-
 .../internal/manage/schema/ModelProperty.java      |   62 +-
 .../model/internal/manage/schema/ModelSchema.java  |    3 +
 .../internal/manage/schema/ModelSetSchema.java     |   28 +
 .../internal/manage/schema/ModelStructSchema.java  |   35 -
 .../schema/ModelUnmanagedImplStructSchema.java     |   31 -
 .../internal/manage/schema/ModelValueSchema.java   |   30 -
 .../manage/schema/ScalarCollectionSchema.java      |   41 +
 .../internal/manage/schema/ScalarValueSchema.java  |   33 +
 .../manage/schema/SpecializedMapSchema.java        |   39 +
 .../model/internal/manage/schema/StructSchema.java |   41 +
 .../manage/schema/UnmanagedImplStructSchema.java   |   38 +
 .../extract/AbstractProxyClassGenerator.java       |    5 +-
 .../manage/schema/extract/CandidateMethods.java    |  114 +++
 ...CollectionNodeInitializerExtractionSupport.java |   33 +
 .../manage/schema/extract/CollectionStrategy.java  |   36 +
 .../schema/extract/ConstructableTypesRegistry.java |   25 +
 .../extract/DefaultConstructableTypesRegistry.java |   44 +
 .../DefaultModelSchemaExtractionContext.java       |   99 ++
 .../schema/extract/DefaultModelSchemaStore.java    |    8 +-
 .../manage/schema/extract/EnumStrategy.java        |   10 +-
 ...toryBasedNodeInitializerExtractionStrategy.java |   52 +
 .../InvalidManagedModelElementTypeException.java   |    8 +-
 .../schema/extract/JdkValueTypeStrategy.java       |   41 +-
 .../ManagedCollectionProxyClassGenerator.java      |    2 +-
 ...mplStructNodeInitializerExtractionStrategy.java |   50 +
 ...dImplStructSchemaExtractionStrategySupport.java |  376 -------
 .../schema/extract/ManagedImplStructStrategy.java  |  351 ++++++-
 .../schema/extract/ManagedProxyClassGenerator.java |  738 +++++++++-----
 ...anagedSetNodeInitializerExtractionStrategy.java |  116 +++
 .../manage/schema/extract/ManagedSetStrategy.java  |   62 --
 .../internal/manage/schema/extract/MethodType.java |   87 ++
 .../ModelMapNodeInitializerExtractionStrategy.java |   78 ++
 .../manage/schema/extract/ModelMapStrategy.java    |   35 +-
 .../extract/ModelPropertyExtractionContext.java    |   76 ++
 .../extract/ModelSchemaAspectExtractionResult.java |   14 -
 .../schema/extract/ModelSchemaAspectExtractor.java |    5 -
 .../extract/ModelSchemaExtractionContext.java      |   72 +-
 .../extract/ModelSchemaExtractionResult.java       |   47 -
 .../extract/ModelSchemaExtractionStrategy.java     |    9 +-
 .../schema/extract/ModelSchemaExtractor.java       |   72 +-
 .../manage/schema/extract/ModelSchemaUtils.java    |   78 +-
 .../ModelSetNodeInitializerExtractionStrategy.java |  114 +++
 .../manage/schema/extract/ModelSetStrategy.java    |   62 --
 .../extract/NodeInitializerExtractionStrategy.java |   27 +
 .../manage/schema/extract/PrimitiveStrategy.java   |   11 +-
 .../extract/PropertyAccessorExtractionContext.java |   29 +-
 ...ollectionNodeInitializerExtractionStrategy.java |  406 ++++++++
 .../schema/extract/ScalarCollectionStrategy.java   |   60 ++
 .../manage/schema/extract/ScalarTypes.java         |   69 ++
 .../manage/schema/extract/SetStrategy.java         |   56 +-
 ...alizedMapNodeInitializerExtractionStrategy.java |   91 ++
 .../schema/extract/SpecializedMapStrategy.java     |   58 +-
 .../StructSchemaExtractionStrategySupport.java     |  265 +++--
 .../extract/UnmanagedCollectionStrategy.java       |   46 +
 .../extract/UnmanagedImplStructStrategy.java       |   39 +-
 .../method/WeaklyTypeReferencingMethod.java        |   55 +-
 .../registry/AnyStateBindingPredicate.java         |   33 -
 .../model/internal/registry/BindingPredicate.java  |    8 +-
 .../model/internal/registry/CreatorRuleBinder.java |   35 -
 .../internal/registry/DefaultModelRegistry.java    |  753 ++++++++------
 .../model/internal/registry/ModelBinding.java      |   31 +-
 .../internal/registry/ModelCreationListener.java   |   29 -
 .../gradle/model/internal/registry/ModelGraph.java |   82 +-
 .../model/internal/registry/ModelListener.java     |   30 +
 .../model/internal/registry/ModelNodeInternal.java |  124 ++-
 .../internal/registry/ModelReferenceNode.java      |   97 +-
 .../model/internal/registry/ModelRegistry.java     |   37 +-
 .../model/internal/registry/MutatorRuleBinder.java |   62 --
 .../registry/OneOfTypeBinderCreationListener.java  |   24 +-
 .../registry/PathBinderCreationListener.java       |   17 +-
 .../gradle/model/internal/registry/RuleBinder.java |   69 +-
 .../model/internal/registry/RuleBindings.java      |  118 ++-
 .../internal/registry/UnboundRulesProcessor.java   |   10 +-
 .../internal/report/AmbiguousBindingReporter.java  |    4 +-
 .../internal/report/unbound/UnboundRuleInput.java  |    2 +-
 .../model/internal/type/ClassTypeWrapper.java      |   27 +-
 .../internal/type/GenericArrayTypeWrapper.java     |   72 ++
 .../org/gradle/model/internal/type/ModelType.java  |   74 +-
 .../org/gradle/model/internal/type/ModelTypes.java |   18 +
 .../internal/type/ParameterizedTypeWrapper.java    |    9 +
 .../internal/type/TypeVariableTypeWrapper.java     |   10 +-
 .../gradle/model/internal/type/TypeWrapper.java    |    4 +
 .../model/internal/type/WildcardTypeWrapper.java   |   12 +
 .../gradle/model/ManagedModelMapTypesTest.groovy   |    1 -
 .../org/gradle/model/ManagedNamedTest.groovy       |   36 +-
 .../model/ManagedNodeBackedModelMapTest.groovy     |  237 ++++-
 .../model/UnmanagedNodeBackedModelMapTest.groovy   |   86 +-
 .../internal/core/BaseInstanceFactoryTest.groovy   |  287 ++++++
 .../core/InstanceBackedModelCreatorTest.groovy     |   56 --
 .../InstanceBackedModelRegistrationTest.groovy     |   57 ++
 .../core/ModelMapGroovyDecoratorTest.groovy        |   40 -
 .../model/internal/core/ModelTypeJavaTest.java     |    4 +-
 .../model/internal/core/ModelTypeTest.groovy       |   62 +-
 .../core/UnmanagedModelProjectionTest.groovy       |   42 +
 .../describe/MethodModelRuleDescriptorTest.groovy  |    2 +-
 .../inspect/ManagedModelInitializerTest.groovy     |  412 ++++++++
 .../internal/inspect/ModelRuleBindingTest.groovy   |   32 +-
 .../internal/inspect/ModelRuleExtractorTest.groovy |  160 +--
 .../inspect/MutationRuleExecutionOrderTest.groovy  |    5 +-
 .../manage/instance/ManagedProxyTest.groovy        |   10 +-
 .../AbstractCollectionModelProjectionTest.groovy   |  281 ++++++
 .../projection/ListModelProjectionTest.groovy      |  103 ++
 .../projection/ModelSetModelProjectionTest.groovy  |   16 +-
 .../projection/SetModelProjectionTest.groovy       |   36 +
 .../extract/DefaultModelSchemaStoreTest.groovy     |   14 +-
 ...ManagedCollectionProxyClassGeneratorTest.groovy |    4 +
 .../extract/ManagedImplStructStrategyTest.groovy   |   70 ++
 .../extract/ManagedProxyClassGeneratorTest.groovy  |  608 ++++++++++--
 .../schema/extract/ModelMapStrategyTest.groovy     |   42 +
 .../schema/extract/ModelSchemaExtractorTest.groovy |  612 ++++++++----
 .../schema/extract/ModelSchemaUtilsTest.groovy     |   70 +-
 .../schema/extract/ModelSetStrategyTest.groovy     |   42 +
 .../schema/extract/ModelStoreTestUtils.groovy      |   47 +
 .../extract/ScalarCollectionStrategyTest.groovy    |   53 +
 .../extract/ScalarTypesInManagedModelTest.groovy   |   65 +-
 .../extract/SpecializedModelMapStrategyTest.groovy |   40 +
 ...TypeWithManagedSuperTypeExtractionStrategy.java |   12 +-
 .../extract/UnmanagedCollectionStrategyTest.groovy |   42 +
 .../extract/UnmanagedImplStructStrategyTest.groovy |   82 ++
 .../registry/DefaultModelRegistryTest.groovy       |  848 ++++++++++------
 .../model/internal/registry/ModelGraphTest.groovy  |  218 +++--
 .../internal/registry/ModelNodeInternalTest.groovy |   15 +-
 .../registry/ModelNodeReplacementTest.groovy       |   16 +-
 .../registry/ModelRegistryEphemeralNodeTest.groovy |   60 +-
 .../model/internal/registry/RegistrySpec.groovy    |   60 +-
 .../internal/registry/RuleBindingsTest.groovy      |   70 +-
 .../model/internal/registry/ScopedRuleTest.groovy  |   36 +-
 .../registry/UnboundRulesProcessorTest.groovy      |    3 +
 ...tRuleAwareNamedDomainObjectFactoryRegistry.java |    0
 ...uleAwarePolymorphicNamedEntityInstantiator.java |    0
 .../RuleAwareNamedDomainObjectFactoryRegistry.java |    0
 ...uleAwarePolymorphicNamedEntityInstantiator.java |    0
 .../model/internal/fixture/ModelActionBuilder.java |  140 +++
 .../internal/fixture/ModelRegistrationBuilder.java |  182 ++++
 .../internal/fixture/ModelRegistryHelper.java      |  580 +----------
 .../fixture/ModelRegistryHelperExtension.java      |  238 +++++
 .../internal/fixture/ProjectRegistrySpec.groovy    |   41 +
 .../fixture/TestManagedProxyFactory.groovy         |   23 +
 .../fixture/TestNodeInitializerRegistry.java       |   39 +
 .../org.codehaus.groovy.runtime.ExtensionModule    |   19 +
 .../model/dsl/ManagedTypeDslIntegrationTest.groovy |  204 ++++
 .../dsl/ModelDslCreationIntegrationTest.groovy     |   98 +-
 .../model/dsl/ModelDslIntegrationTest.groovy       |  128 +--
 .../model/dsl/ModelMapDslIntegrationTest.groovy    |  466 +++++++++
 .../ModelDslRuleDetectionIntegrationSpec.groovy    |   30 +-
 ...odelDslRuleInputDetectionIntegrationSpec.groovy |  258 ++++-
 .../NestedModelDslUsageIntegrationSpec.groovy      |   53 +-
 ...stedModelRuleDslDetectionIntegrationTest.groovy |  106 ++
 .../internal/NonTransformedModelDslBacking.java    |   44 +-
 .../dsl/internal/TransformedModelDslBacking.java   |  154 +--
 .../model/dsl/internal/inputs/PotentialInput.java  |   33 +
 .../model/dsl/internal/inputs/PotentialInputs.java |   42 +
 .../model/dsl/internal/inputs/RuleInputAccess.java |   25 -
 .../internal/inputs/RuleInputAccessBacking.java    |   64 --
 .../transform/ClosureBackedRuleFactory.java        |  120 +++
 .../dsl/internal/transform/InputReference.java     |   35 +
 .../dsl/internal/transform/InputReferences.java    |   60 +-
 .../internal/transform/ModelBlockTransformer.java  |   23 +-
 .../model/dsl/internal/transform/RuleMetadata.java |   48 -
 .../model/dsl/internal/transform/RuleVisitor.java  |  350 ++++---
 .../model/dsl/internal/transform/RulesVisitor.java |   43 +-
 .../dsl/internal/transform/SourceLocation.java     |   35 +-
 .../dsl/internal/transform/TransformedClosure.java |   42 +
 .../NonTransformedModelDslBackingTest.groovy       |   34 +-
 .../internal/TransformedModelDslBackingTest.groovy |  125 ---
 .../nativeintegration/services/NativeServices.java |   48 +-
 subprojects/osgi/osgi.gradle                       |    4 +-
 subprojects/performance/performance.gradle         |  313 ++++--
 .../performance/src/configPlugin/ConfigPlugin.java |    2 +-
 subprojects/performance/src/generator.groovy       |  545 -----------
 .../performance/CleanBuildPerformanceTest.groovy   |    5 +-
 .../ConfigurationPerformanceTest.groovy            |    7 +-
 .../performance/DaemonPerformanceTest.groovy       |    8 +-
 .../DependencyReportPerformanceTest.groovy         |    7 +-
 .../DependencyResolutionStressTest.groovy          |    6 +-
 .../performance/FirstBuildPerformanceTest.groovy   |    7 +-
 .../IdeIntegrationPerformanceTest.groovy           |   11 +-
 .../JavaSoftwareModelBuildPerformanceTest.groovy   |  105 ++
 ...wareModelCompileAvoidancePerformanceTest.groovy |   70 ++
 ...oftwareModelConfigurationPerformanceTest.groovy |   54 +
 .../JavaSoftwareModelSourceFileUpdater.groovy      |  210 ++++
 .../ManyEmptyProjectsHelpPerformanceTest.groovy    |   16 +-
 .../MonolithicNativePluginPerformanceTest.groovy   |  158 +++
 .../performance/NativeBuildPerformanceTest.groovy  |   65 ++
 .../NativeParallelPerformanceTest.groovy           |    3 +
 .../performance/NativePerformanceTest.groovy       |   62 --
 .../NativePreCompiledHeaderPerformanceTest.groovy  |    4 +-
 .../NativeScenarioPerformanceTest.groovy           |   11 +-
 .../OldJavaPluginBigProjectPerformanceTest.groovy  |   12 +-
 .../OldVsNewJavaPluginPerformanceTest.groovy       |   27 +-
 .../ParallelBuildPerformanceTest.groovy            |    4 +
 .../ProjectDependenciesPerformanceTest.groovy      |   11 +-
 .../TestExecutionPerformanceTest.groovy            |    6 +-
 .../UpToDateBuildPerformanceTest.groovy            |    7 +-
 .../performance/VariantsPerformanceTest.groovy     |   27 +-
 .../templates/build-event-timestamps/build.gradle  |   15 +-
 .../src/templates/config-inject/build.gradle       |    6 +-
 .../src/templates/heap-capture/build.gradle        |   29 +
 subprojects/performance/src/templates/init.gradle  |    4 +-
 .../src/templates/java-source/Production.java      |   30 +-
 .../templates/java-sw-model-project/build.gradle   |  168 ++++
 .../src/templates/native-monolithic/build.gradle   |    7 +
 .../src/templates/native-monolithic/common.gradle  |   65 ++
 .../templates/native-monolithic/components.gradle  |   51 +
 .../templates/native-monolithic/prebuilt.gradle    |   27 +
 .../src/templates/native-monolithic/src/common.h   |    7 +
 .../src/templates/native-monolithic/src/prebuilt.h |    7 +
 .../src/templates/native-monolithic/src/src.c      |   19 +
 .../src/templates/native-monolithic/src/src.cpp    |   20 +
 .../src/templates/native-monolithic/src/src.h      |   14 +
 .../src/templates/native-monolithic/src/unused.c   |    2 +
 .../src/templates/new-java-plugin/build.gradle     |    7 +
 .../src/templates/old-java-plugin/build.gradle     |    5 +
 .../src/templates/project-with-source/build.gradle |    6 +-
 .../src/templates/root-project/checkstyle.xml      |   22 +
 .../performance/src/templates/with-junit/Test.java |    2 +-
 .../BuildEventTimestampCollectorTest.groovy        |   18 +-
 .../performance/fixture/GCEventParserTest.groovy   |   11 +
 .../performance/fixture/YourKitProfilerTest.groovy |   76 ++
 .../AbstractCrossBuildPerformanceTest.groovy       |    1 +
 .../AbstractCrossVersionPerformanceTest.groovy     |    1 +
 .../groovy/org/gradle/performance/Experiment.java  |   20 -
 .../org/gradle/performance/PerformanceTest.java    |   20 -
 .../categories/BasicPerformanceTest.java           |   23 +
 .../gradle/performance/categories/Experiment.java  |   25 +
 .../categories/JavaPerformanceTest.java            |   23 +
 .../categories/NativePerformanceTest.java          |   23 +
 .../performance/categories/PerformanceTest.java    |   23 +
 .../fixture/BuildEventTimestampCollector.java      |   12 +-
 .../fixture/BuildExperimentInvocationInfo.java     |   31 +
 .../fixture/BuildExperimentListener.java           |   31 +
 .../fixture/BuildExperimentListenerAdapter.java    |   36 +
 .../performance/fixture/BuildExperimentRunner.java |  111 ++-
 .../performance/fixture/BuildExperimentSpec.groovy |   28 +-
 .../fixture/CompilationLoggingCollector.java       |   60 ++
 .../fixture/CompositeDataCollector.java            |    4 +-
 .../fixture/CrossBuildPerformanceTestRunner.groovy |    6 +
 .../CrossVersionPerformanceTestRunner.groovy       |   14 +-
 .../gradle/performance/fixture/DataCollector.java  |    2 +-
 .../gradle/performance/fixture/GCEventParser.java  |    2 +-
 .../performance/fixture/GCLoggingCollector.java    |    5 +-
 .../fixture/GradleExecuterBackedSession.groovy     |   11 +-
 .../fixture/GradleInvocationCustomizer.java        |   21 +
 .../fixture/GradleInvocationSpec.groovy            |   64 +-
 .../gradle/performance/fixture/GradleSession.java  |    8 +-
 .../org/gradle/performance/fixture/LogFiles.java   |   41 +
 .../fixture/MeasuredOperationList.groovy           |    2 +-
 .../performance/fixture/MemoryInfoCollector.groovy |    4 +-
 .../gradle/performance/fixture/OperationTimer.java |    4 +-
 .../org/gradle/performance/fixture/Profiler.java   |   26 +
 .../fixture/ToolingApiBackedGradleSession.groovy   |   19 +-
 .../performance/fixture/YourKitProfiler.groovy     |  206 ++++
 .../results/CrossVersionResultsStore.java          |    4 +
 .../performance/results/TestPageGenerator.java     |   13 +-
 subprojects/platform-base/platform-base.gradle     |    2 +-
 .../AbstractComponentModelIntegrationTest.groovy   |  149 +++
 .../base/AssembleTaskIntegrationTest.groovy        |    4 +-
 .../language/base/BaseModelIntegrationTest.groovy  |   46 +
 .../base/ComponentBinariesIntegrationTest.groovy   |  164 ++++
 .../ComponentBinarySourcesIntegrationTest.groovy   |  331 +++++++
 .../base/ComponentModelIntegrationTest.groovy      |  457 ++++-----
 .../base/ComponentSourcesIntegrationTest.groovy    |  210 ++++
 .../base/ComponentTypeSampleIntegTest.groovy       |   20 +-
 .../base/CustomBinaryIntegrationTest.groovy        |  120 ++-
 ...CustomBinaryInternalViewsIntegrationTest.groovy |  307 ++++++
 .../base/CustomBinaryTasksIntegrationTest.groovy   |   51 +-
 .../CustomComponentBinariesIntegrationTest.groovy  |  200 ++--
 .../base/CustomComponentIntegrationTest.groovy     |  538 ++++++++++
 ...tomComponentInternalViewsIntegrationTest.groovy |  205 ++++
 .../CustomComponentPluginIntegrationTest.groovy    |   69 +-
 .../CustomComponentSourceSetIntegrationTest.groovy |   40 +-
 .../base/CustomManagedBinaryIntegrationTest.groovy |  143 +++
 .../base/FunctionalSourceSetIntegrationTest.groovy |  263 +++++
 .../base/LanguageSourceSetIntegrationTest.groovy   |  213 ++++
 .../base/LanguageTypeIntegrationTest.groovy        |   26 +-
 .../base/LanguageTypeSampleIntegrationTest.groovy  |   24 +-
 .../VariantAspectExtractionIntegrationTest.groovy  |   15 +-
 .../ComponentModelBasePluginIntegrationTest.groovy |  131 ---
 .../LifecycleBasePluginIntegrationTest.groovy      |    1 +
 .../org/gradle/api/BuildableModelElement.java      |    0
 .../internal/AbstractBuildableModelElement.java    |    0
 .../AbstractLocalLibraryDependencyResolver.java    |  178 ----
 ...efaultLibraryResolutionErrorMessageBuilder.java |  105 ++
 .../LibraryResolutionErrorMessageBuilder.java      |    5 +-
 .../resolve/LocalLibraryDependencyResolver.java    |  171 ++++
 .../resolve/LocalLibraryMetaDataAdapter.java       |   24 +
 .../api/internal/resolve/VariantsMatcher.java      |   22 +-
 .../gradle/language/base/DependentSourceSet.java   |   26 +
 .../gradle/language/base/FunctionalSourceSet.java  |    5 +-
 .../gradle/language/base/LanguageSourceSet.java    |    8 +-
 .../base/internal/DefaultFunctionalSourceSet.java  |   46 -
 .../base/internal/DependentSourceSetInternal.java  |   25 -
 .../base/internal/LanguageSourceSetFactory.java    |   68 ++
 .../base/internal/LanguageSourceSetInternal.java   |    5 +-
 .../language/base/internal/ProjectLayout.java      |   39 +
 .../internal/model/BinarySpecFactoryRegistry.java  |   64 --
 .../base/internal/model/ComponentBinaryRules.java  |   17 +-
 .../base/internal/model/ComponentRules.java        |   63 +-
 .../internal/model/ComponentSpecInitializer.java   |    8 +-
 .../DefaultLibraryLocalComponentMetaData.java      |   95 +-
 .../model/DefaultVariantAxisCompatibility.java     |   35 +
 .../DefaultVariantAxisCompatibilityFactory.java    |   41 +
 .../model/DefaultVariantDimensionSelector.java     |   35 -
 .../DefaultVariantDimensionSelectorFactory.java    |   41 -
 .../internal/model/DefaultVariantsMetaData.java    |   52 +-
 .../internal/model/VariantAxisCompatibility.java   |   39 +
 .../model/VariantAxisCompatibilityFactory.java     |   20 +
 .../internal/model/VariantDimensionSelector.java   |   39 -
 .../model/VariantDimensionSelectorFactory.java     |   20 -
 .../base/internal/model/VariantsMetaData.java      |   10 +-
 .../internal/model/VariantsMetaDataHelper.java     |    6 +-
 .../internal/registry/DefaultLanguageRegistry.java |   18 +-
 .../internal/registry/LanguageRegistration.java    |   15 +-
 .../base/internal/registry/LanguageRegistry.java   |    1 +
 .../registry/NamedLanguageRegistration.java        |   57 ++
 .../registry/RuleBasedLanguageRegistration.java    |   59 --
 .../DependentSourceSetLocalComponentConverter.java |   85 --
 .../resolve/DependentSourceSetResolveContext.java  |   39 +-
 .../base/plugins/ComponentModelBasePlugin.java     |  144 ++-
 .../language/base/plugins/LanguageBasePlugin.java  |  125 +--
 .../language/base/plugins/LifecycleBasePlugin.java |   29 +-
 .../base/sources/BaseLanguageSourceSet.java        |   48 +-
 .../core/DomainObjectCollectionBackedModelMap.java |    7 +-
 .../org/gradle/platform/base/BinaryContainer.java  |    5 +-
 .../java/org/gradle/platform/base/BinarySpec.java  |   16 +-
 .../platform/base/BinaryTasksCollection.java       |   12 +
 .../org/gradle/platform/base/ComponentSpec.java    |   13 +-
 .../org/gradle/platform/base/ComponentType.java    |    2 +-
 .../org/gradle/platform/base/DependencySpec.java   |   17 +-
 .../platform/base/DependencySpecBuilder.java       |   26 +-
 .../platform/base/DependencySpecContainer.java     |   27 +-
 .../gradle/platform/base/LibraryBinarySpec.java    |    2 +-
 .../gradle/platform/base/ModuleDependencySpec.java |   49 +
 .../platform/base/ModuleDependencySpecBuilder.java |   53 +
 .../platform/base/ProjectDependencySpec.java       |   44 +
 .../base/ProjectDependencySpecBuilder.java         |   43 +
 .../java/org/gradle/platform/base/TypeBuilder.java |    2 +
 .../platform/base/binary/BaseBinarySpec.java       |  129 ++-
 .../base/binary/internal/BinarySpecFactory.java    |   64 ++
 .../platform/base/component/BaseComponentSpec.java |  145 +--
 .../component/internal/ComponentSpecFactory.java   |   57 ++
 .../platform/base/internal/BinaryNamingScheme.java |   47 +-
 .../base/internal/BinaryNamingSchemeBuilder.java   |   26 -
 .../platform/base/internal/BinarySpecFactory.java  |   26 -
 .../platform/base/internal/BinarySpecInternal.java |   14 +-
 .../internal/BinaryTasksCollectionWrapper.java     |   10 +
 .../platform/base/internal/ComponentSpecAware.java |   25 -
 .../base/internal/ComponentSpecFactory.java        |   26 -
 .../base/internal/ComponentSpecInternal.java       |    3 -
 .../base/internal/DefaultBinaryContainer.java      |   28 -
 .../base/internal/DefaultBinaryNamingScheme.java   |  169 +++-
 .../internal/DefaultBinaryNamingSchemeBuilder.java |   64 --
 .../internal/DefaultBinaryTasksCollection.java     |   16 +-
 .../base/internal/DefaultDependencySpec.java       |  103 --
 .../internal/DefaultDependencySpecContainer.java   |   79 +-
 .../base/internal/DefaultModuleDependencySpec.java |  152 +++
 .../base/internal/DefaultPlatformRequirement.java  |    5 +
 .../internal/DefaultProjectDependencySpec.java     |  123 +++
 .../PlatformAwareComponentSpecInternal.java        |    2 +-
 .../base/internal/builder/TypeBuilderInternal.java |    4 +
 ...nnotationDrivenComponentModelRuleExtractor.java |    5 +-
 .../internal/registry/AbstractTypeBuilder.java     |   23 +-
 .../registry/BinaryTasksModelRuleExtractor.java    |   10 +-
 .../registry/BinaryTypeModelRuleExtractor.java     |   75 +-
 .../ComponentBinariesModelRuleExtractor.java       |    4 +-
 .../ComponentModelBaseServiceRegistry.java         |    8 +-
 .../registry/ComponentTypeModelRuleExtractor.java  |   75 +-
 .../registry/LanguageTypeModelRuleExtractor.java   |   69 +-
 .../base/internal/registry/ModelMapBasedRule.java  |   55 +-
 .../internal/registry/TypeModelRuleExtractor.java  |   21 +-
 .../internal/util/ImplementationTypeDetermer.java  |   61 --
 .../internal/resolve/VariantsMatcherTest.groovy    |   29 +-
 .../ComponentTypeModelRuleExtractorTest.groovy     |   93 +-
 .../internal/DefaultFunctionalSourceSetTest.groovy |   30 -
 .../model/DefaultVariantsMetaDataTest.groovy       |   18 +-
 .../internal/model/ParametrizedBinaryString.java   |    6 +-
 .../model/ParametrizedBinaryVariantDimension1.java |    6 +-
 .../base/internal/model/ParametrizedVariant.java   |    2 +-
 .../base/internal/model/VariantDimension1.java     |    2 +-
 .../base/internal/model/VariantDimension2.java     |    2 +-
 .../base/internal/model/VariantDimension3.java     |    2 +-
 .../model/VariantsMetaDataHelperTest.groovy        |   22 +-
 .../LanguageTypeModelRuleExtractorTest.groovy      |   34 +-
 ...dentSourceSetLocalComponentConverterTest.groovy |  136 ---
 .../DependentSourceSetResolveContextTest.groovy    |   29 +-
 .../testinterfaces/CustomLanguageSourceSet.groovy  |   21 -
 .../internal/testinterfaces/NotBinarySpec.groovy   |   19 -
 .../testinterfaces/NotComponentSpec.groovy         |   19 -
 .../base/internal/testinterfaces/RawLibrary.groovy |   21 -
 .../internal/testinterfaces/SomeBinarySpec.groovy  |   21 -
 .../testinterfaces/SomeBinarySubType.groovy        |   19 -
 .../testinterfaces/SomeComponentSpec.groovy        |   21 -
 .../internal/testinterfaces/SomeLibrary.groovy     |   21 -
 .../base/plugins/LanguageBasePluginTest.groovy     |   19 +-
 .../base/sources/BaseLanguageSourceSetTest.groovy  |   36 +
 ...DomainObjectCollectionBackedModelMapTest.groovy |   29 +-
 .../platform/base/binary/BaseBinarySpecTest.groovy |   66 +-
 .../base/component/BaseComponentSpecTest.groovy    |   50 +-
 .../internal/DefaultBinaryNamingSchemeTest.groovy  |  159 ++-
 .../DefaultBinaryTasksCollectionTest.groovy        |    9 +-
 .../DefaultDependencySpecContainerTest.groovy      |  195 ++++
 ...SpecSpecializationSchemaExtractionStrategy.java |   38 -
 .../BinaryTasksModelRuleExtractorTest.groovy       |   25 +-
 .../BinaryTypeModelRuleExtractorTest.groovy        |   96 +-
 .../ComponentBinariesModelRuleExtractorTest.groovy |   35 +-
 .../sources/BaseLanguageSourceSetFixtures.groovy   |   50 +
 .../platform/base/binary/BaseBinaryFixtures.groovy |   47 +
 .../base/component/BaseComponentFixtures.groovy    |   38 +-
 .../plugin/AbstractLanguagePluginSpec.groovy       |    9 +-
 .../jvm/ComponentReportIntegrationTest.groovy      |  264 -----
 ...ustomJarBinarySpecSubtypeIntegrationTest.groovy |   27 +-
 .../gradle/jvm/JarBinariesIntegrationTest.groovy   |   60 +-
 .../gradle/jvm/ModelReuseIntegrationTest.groovy    |    5 +-
 ...latformJvmComponentReportIntegrationTest.groovy |  385 ++++++++
 .../JvmComponentPluginIntegrationTest.groovy       |  287 +++---
 .../JvmLibraryResolutionErrorMessageBuilder.java   |  151 ---
 .../resolve/JvmLocalLibraryDependencyResolver.java |   44 -
 .../resolve/JvmLocalLibraryMetaDataAdapter.java    |   42 +
 .../main/java/org/gradle/jvm/JarBinarySpec.java    |   15 +
 .../src/main/java/org/gradle/jvm/JvmApiSpec.java   |   58 ++
 .../main/java/org/gradle/jvm/JvmLibrarySpec.java   |   13 +-
 .../jvm/internal/AbstractJvmBinaryRenderer.java    |   12 +-
 .../org/gradle/jvm/internal/BuildDirHolder.java    |   31 -
 .../gradle/jvm/internal/DefaultJarBinarySpec.java  |   71 +-
 .../org/gradle/jvm/internal/DefaultJarFile.java    |   34 +
 ...efaultJavaPlatformVariantAxisCompatibility.java |   31 +
 ...efaultJavaPlatformVariantDimensionSelector.java |   31 -
 .../org/gradle/jvm/internal/DefaultJvmApiSpec.java |   68 ++
 .../gradle/jvm/internal/DefaultJvmLibrarySpec.java |   23 +-
 .../jvm/internal/DependencyResolvingClasspath.java |   68 +-
 .../org/gradle/jvm/internal/JarBinaryRenderer.java |   11 +
 .../org/gradle/jvm/internal/JarBinaryRules.java    |   21 +-
 .../gradle/jvm/internal/JarBinarySpecInternal.java |   22 +-
 .../main/java/org/gradle/jvm/internal/JarFile.java |   33 +
 .../jvm/internal/JvmLibrarySpecInternal.java       |    3 -
 .../org/gradle/jvm/internal/JvmPackageName.java    |  145 +++
 ...arBinarySpecSpecializationModelInitializer.java |   60 --
 ...SpecSpecializationSchemaExtractionStrategy.java |   40 -
 .../jvm/internal/services/PlatformJvmServices.java |   33 +-
 .../org/gradle/jvm/plugins/JvmComponentPlugin.java |  145 ++-
 .../src/main/java/org/gradle/jvm/tasks/Jar.java    |    2 +-
 .../main/java/org/gradle/jvm/tasks/api/ApiJar.java |  235 +++++
 .../jvm/tasks/api/internal/AccessibleMember.java   |   37 +
 .../jvm/tasks/api/internal/AnnotatableMember.java  |   51 +
 .../api/internal/AnnotationAnnotationValue.java    |   24 +
 .../jvm/tasks/api/internal/AnnotationMember.java   |   61 ++
 .../jvm/tasks/api/internal/AnnotationValue.java    |   36 +
 .../jvm/tasks/api/internal/ApiClassExtractor.java  |  140 +++
 .../jvm/tasks/api/internal/ApiMemberSelector.java  |  231 +++++
 .../tasks/api/internal/ArrayAnnotationValue.java   |   24 +
 .../gradle/jvm/tasks/api/internal/ClassMember.java |   45 +
 .../tasks/api/internal/EnumAnnotationValue.java    |   31 +
 .../gradle/jvm/tasks/api/internal/FieldMember.java |   39 +
 .../jvm/tasks/api/internal/InnerClassMember.java   |   45 +
 .../org/gradle/jvm/tasks/api/internal/Member.java  |   49 +
 .../jvm/tasks/api/internal/MethodMember.java       |   77 ++
 .../internal/MethodStubbingApiMemberAdapter.java   |   85 ++
 .../api/internal/ParameterAnnotationMember.java    |   38 +
 .../tasks/api/internal/SimpleAnnotationValue.java  |   24 +
 .../api/internal/SortingAnnotationVisitor.java     |   85 ++
 .../gradle/jvm/tasks/api/internal/TypedMember.java |   38 +
 .../org/gradle/jvm/tasks/api/package-info.java     |   24 +
 .../JvmLocalLibraryDependencyResolverTest.groovy   |   34 +-
 .../jvm/internal/DefaultJarBinarySpecTest.groovy   |    7 +-
 ...JavaPlatformVariantAxisCompatibilityTest.groovy |   74 ++
 ...JavaPlatformVariantDimensionSelectorTest.groovy |   74 --
 .../jvm/internal/DefaultJvmBinaryTasksTest.groovy  |    6 +-
 .../jvm/internal/DefaultJvmLibrarySpecTest.groovy  |   36 +-
 .../gradle/jvm/internal/JvmPackageNameTest.groovy  |   79 ++
 .../internal/plugins/CreateJvmBinariesTest.groovy  |   35 +-
 .../ApiClassExtractorAnnotationsTest.groovy        |  291 ++++++
 .../ApiClassExtractorInnerClassTest.groovy         |  150 +++
 .../api/internal/ApiClassExtractorTest.groovy      |  493 ++++++++++
 .../internal/ApiClassExtractorTestSupport.groovy   |  200 ++++
 .../ApiClassExtractorTestSupportTest.groovy        |   78 ++
 .../BinaryBuildTypesIntegrationTest.groovy         |   31 +-
 .../BinaryConfigurationIntegrationTest.groovy      |   30 +-
 .../BinaryFlavorsIntegrationTest.groovy            |   30 +-
 .../ComponentReportIntegrationTest.groovy          |  269 -----
 .../LibraryApiDependenciesIntegrationTest.groovy   |   26 +-
 .../LibraryBinariesIntegrationTest.groovy          |   18 +-
 .../LibraryDependenciesIntegrationTest.groovy      |  100 +-
 .../ModelReuseIntegrationTest.groovy               |    2 +
 .../NativeBinariesIntegrationTest.groovy           |  125 ++-
 .../NativePlatformSamplesIntegrationTest.groovy    |   79 +-
 ...formNativeComponentReportIntegrationTest.groovy |  272 ++++++
 .../PrebuiltLibrariesIntegrationTest.groovy        |   20 +-
 .../SharedLibrarySoNameIntegrationTest.groovy      |    6 +-
 .../TestSuiteDefinitionIntegrationSpec.groovy      |   73 +-
 .../TestSuiteModelIntegrationSpec.groovy           |   49 +-
 .../BinaryNativePlatformIntegrationTest.groovy     |   71 +-
 .../GeneratedSourcesIntegrationTest.groovy         |    2 +-
 ...rceSetCompileDependenciesIntegrationTest.groovy |    6 +-
 .../SourceSetDependenciesIntegrationTest.groovy    |    6 +-
 ...SourceSetLinkDependenciesIntegrationTest.groovy |    6 +-
 .../CommonToolchainCustomizationIntegTest.groovy   |    2 +-
 ...ToolChainCrossCompilationIntegrationTest.groovy |    6 +-
 ...GccToolChainCustomisationIntegrationTest.groovy |   22 +-
 .../GccToolChainDiscoveryIntegrationTest.groovy    |    2 +-
 .../MultipleNativeToolChainIntegrationTest.groovy  |    6 +-
 .../NativeToolChainDiscoveryIntegrationTest.groovy |    4 +-
 .../nativeplatform/HeaderExportingSourceSet.java   |    7 -
 .../org/gradle/nativeplatform/NativeBinary.java    |    4 +-
 .../gradle/nativeplatform/NativeBinarySpec.java    |   65 +-
 .../nativeplatform/NativeExecutableBinarySpec.java |   13 +-
 .../nativeplatform/NativeExecutableFileSpec.java   |   51 +
 .../nativeplatform/NativeInstallationSpec.java     |   38 +
 .../nativeplatform/NativeLibraryBinarySpec.java    |    6 +-
 .../gradle/nativeplatform/PreprocessingTool.java   |   45 +
 .../nativeplatform/SharedLibraryBinarySpec.java    |    2 +-
 .../nativeplatform/StaticLibraryBinarySpec.java    |    2 +-
 .../nativeplatform/TargetedNativeComponent.java    |    2 +-
 .../internal/AbstractNativeBinaryRenderer.java     |    8 +-
 .../internal/AbstractNativeBinarySpec.java         |   64 +-
 .../internal/AbstractNativeLibraryBinarySpec.java  |    5 +-
 .../DefaultNativeExecutableBinarySpec.java         |   25 +-
 .../internal/DefaultPreprocessingTool.java         |   38 +
 .../internal/NativeBinarySpecInternal.java         |    9 +-
 .../internal/NativeExecutableBinaryRenderer.java   |   10 +-
 .../internal/SharedLibraryBinaryRenderer.java      |    8 +
 .../internal/StaticLibraryBinaryRenderer.java      |    8 +
 .../internal/configure/NativeBinaries.java         |   30 +-
 .../internal/configure/NativeBinaryRules.java      |  118 ++-
 .../internal/configure/NativeComponentRules.java   |   31 +-
 .../ToolSettingNativeBinaryInitializer.java        |   43 -
 .../prebuilt/PrebuiltLibraryBinaryLocator.java     |   16 +-
 .../prebuilt/PrebuiltLibraryInitializer.java       |   11 +-
 .../resolve/ChainedLibraryBinaryLocator.java       |   16 +-
 .../internal/resolve/DefaultLibraryResolver.java   |   18 +-
 .../resolve/ProjectLibraryBinaryLocator.java       |   10 +-
 .../plugins/NativeComponentModelPlugin.java        |   33 +-
 .../nativeplatform/tasks/InstallExecutable.groovy  |   12 +-
 .../test/NativeTestSuiteBinarySpec.java            |   17 +-
 .../internal/DefaultNativeTestSuiteBinarySpec.java |   21 +-
 .../internal/NativeTestSuiteBinaryRenderer.java    |    9 +
 .../test/plugins/NativeBinariesTestPlugin.java     |   81 +-
 .../toolchain/internal/NativeCompileSpec.java      |    4 +
 .../internal/DefaultNativeComponentTest.groovy     |   13 +-
 .../DefaultNativeExecutableBinarySpecTest.groovy   |   13 +-
 .../DefaultNativeExecutableSpecTest.groovy         |    8 +-
 .../internal/DefaultNativeLibrarySpecTest.groovy   |    8 +-
 .../DefaultSharedLibraryBinarySpecTest.groovy      |   16 +-
 .../DefaultStaticLibraryBinarySpecTest.groovy      |   12 +-
 .../internal/NativeBinarySpecTest.groovy           |   17 +-
 .../internal/TestNativeBinariesFactory.java        |   43 +
 .../configure/NativeBinaryRulesTest.groovy         |   24 +-
 .../configure/NativeComponentRulesTest.groovy      |  125 ++-
 .../ToolSettingNativeBinaryInitializerTest.groovy  |   71 --
 .../resolve/ProjectLibraryBinaryLocatorTest.groovy |   23 +-
 .../plugins/NativeComponentModelPluginTest.groovy  |  103 +-
 .../plugins/NativeComponentPluginTest.groovy       |   18 +-
 .../plugins/NativeBinariesTestPluginTest.groovy    |   70 --
 .../gcc/version/GccVersionDeterminerTest.groovy    |    8 +-
 .../plugins/NativeToolChainPluginTest.groovy       |    9 +-
 .../ide/visualstudio/fixtures/ProjectFile.groovy   |    4 +
 ...bstractInstalledToolChainIntegrationSpec.groovy |    2 +-
 .../app/MixedObjectiveCHelloWorldApp.groovy        |   18 +-
 .../fixtures/app/ObjectiveCHelloWorldApp.groovy    |   16 +-
 .../fixtures/app/ObjectiveCppHelloWorldApp.groovy  |   16 +-
 .../app/WindowsResourceHelloWorldApp.groovy        |   14 +-
 .../fixtures/binaryinfo/DumpbinBinaryInfo.groovy   |    2 +
 .../configure/TestNativeBinariesFactory.java       |   42 -
 subprojects/platform-play/platform-play.gradle     |    3 +
 ...dPlayAndJvmLibraryProjectIntegrationTest.groovy |   41 +-
 .../PlayAppWithFailingTestsIntegrationTest.groovy  |   11 +-
 .../PlayApplicationBinariesIntegrationTest.groovy  |    2 +-
 .../PlayBinaryApplicationIntegrationTest.groovy    |    3 +-
 ...ayMultiProjectApplicationIntegrationTest.groovy |    2 +-
 ...ayPlatformComponentReportIntegrationTest.groovy |   76 ++
 .../integtest/PlayPlatformIntegrationTest.groovy   |    2 +-
 .../PlayBinaryAdvancedAppIntegrationTest.groovy    |    5 +-
 ...ayDistributionAdvancedAppIntegrationTest.groovy |    2 +-
 .../basic/PlayBinaryBasicAppIntegrationTest.groovy |    2 +-
 .../PlayDistributionBasicAppIntegrationTest.groovy |    2 +-
 .../basic/PlayTestBasicAppIntegrationTest.groovy   |    2 +-
 .../PlayContinuousBuildIntegrationTest.groovy      |    2 +-
 ...aScriptCompilerContinuousIntegrationTest.groovy |   54 +
 ...ltiProjectContinuousBuildIntegrationTest.groovy |    2 +-
 .../PlayMultiProjectReloadIntegrationTest.groovy   |    2 +-
 .../continuous/PlayReloadIntegrationTest.groovy    |    5 +-
 ...yRoutesCompilerContinuousIntegrationTest.groovy |   46 +
 ...ayTwirlCompilerContinuousIntegrationTest.groovy |   60 ++
 ...BinaryAppWithDependenciesIntegrationTest.groovy |    2 +-
 ...butionAppWithDependenciesIntegrationTest.groovy |    2 +-
 ...ayTestAppWithDependenciesIntegrationTest.groovy |    2 +-
 .../PlayApplicationPluginIntegrationTest.groovy    |   63 +-
 .../PlayCoffeeScriptPluginIntegrationTest.groovy   |    2 +-
 .../PlayDistributionPluginIntegrationTest.groovy   |   14 +-
 .../PlayJavaScriptPluginIntegrationTest.groovy     |    2 +-
 .../AbstractRoutesCompileIntegrationTest.groovy    |   20 +-
 .../CoffeeScriptCompileIntegrationTest.groovy      |   21 +-
 .../tasks/DistributionZipIntegrationTest.groovy    |   14 +-
 .../tasks/JavaScriptMinifyIntegrationTest.groovy   |   14 +-
 .../play/tasks/PlayRunIntegrationTest.groovy       |    2 +-
 .../play/tasks/TwirlCompileIntegrationTest.groovy  |   20 +-
 .../play/tasks/TwirlVersionIntegrationTest.groovy  |   14 +-
 .../org/gradle/play/PlayApplicationBinarySpec.java |    2 +
 .../java/org/gradle/play/PlayApplicationSpec.java  |    9 +-
 .../play/PlayPlatformAwareComponentSpec.java       |   32 +
 .../internal/DefaultPlayApplicationBinarySpec.java |    8 +-
 .../play/internal/DefaultPlayApplicationSpec.java  |   58 --
 .../gradle/play/internal/DefaultPlayPlatform.java  |    5 +
 .../DefaultPlayPlatformAwareComponentSpec.java     |   52 +
 .../PlayApplicationBinarySpecInternal.java         |    3 -
 .../play/internal/PlayApplicationSpecInternal.java |    5 +-
 .../PlayPlatformAwareComponentSpecInternal.java    |   24 +
 .../DefaultPlayDistributionContainer.java          |    4 +-
 .../internal/javascript/GoogleClosureCompiler.java |    5 +-
 .../DefaultVersionedRoutesCompilerAdapter.java     |    6 +-
 .../play/internal/routes/RoutesCompiler.java       |    3 +-
 .../routes/VersionedRoutesCompilerAdapter.java     |    3 +-
 .../run/PlayApplicationDeploymentHandle.java       |    2 +-
 .../spec/PlayApplicationBinaryRenderer.java        |   14 +-
 .../internal/toolchain/DaemonPlayCompiler.java     |    5 +-
 .../gradle/play/internal/twirl/TwirlCompiler.java  |    3 +-
 .../internal/twirl/TwirlCompilerAdapterV10X.java   |    6 +-
 .../internal/twirl/TwirlCompilerAdapterV22X.java   |    6 +-
 .../twirl/VersionedTwirlCompilerAdapter.java       |    3 +-
 .../gradle/play/plugins/PlayApplicationPlugin.java |   76 +-
 .../play/plugins/PlayCoffeeScriptPlugin.java       |   17 +-
 .../play/plugins/PlayDistributionPlugin.java       |   18 +-
 .../gradle/play/plugins/PlayJavaScriptPlugin.java  |   16 +-
 .../play/plugins/PlayPluginConfigurations.java     |   11 +
 .../org/gradle/play/plugins/PlayTestPlugin.java    |   22 +-
 .../DefaultCoffeeScriptSourceSetTest.groovy        |    4 +-
 .../internal/DefaultJavaScriptSourceSetTest.groovy |    4 +-
 .../DefaultPlayApplicationBinarySpecTest.groovy    |    7 +-
 .../play/plugins/PlayCoffeeScriptPluginTest.groovy |    2 +-
 .../play/plugins/PlayDistributionPluginTest.groovy |   13 +-
 .../play/plugins/PlayJavaScriptPluginTest.groovy   |    2 +-
 .../gradle/play/plugins/PlayTestPluginTest.groovy  |   11 +-
 ...actPlayCompilerContinuousIntegrationTest.groovy |   37 +
 ...stractPlayContinuousBuildIntegrationTest.groovy |    1 -
 .../DistributionTestExecHandleBuilder.groovy       |    1 +
 .../gradle/play/integtest/fixtures/PlayApp.groovy  |  101 ++
 ...ayMultiVersionApplicationIntegrationTest.groovy |    1 -
 .../play/integtest/fixtures/Repositories.groovy    |   44 +
 .../integtest/fixtures/app/AdvancedPlayApp.groovy  |   15 +
 .../integtest/fixtures/app/BasicPlayApp.groovy     |    2 +
 .../play/integtest/fixtures/app/PlayApp.groovy     |   94 --
 .../fixtures/app/PlayAppWithDependencies.groovy    |    2 +
 .../integtest/fixtures/app/PlayMultiProject.groovy |    1 +
 .../fixtures/app/WithFailingTestsApp.groovy        |   11 +-
 .../fixtures/app/advancedplayapp/build.gradle      |   17 +-
 .../advancedplayapp/conf/evolutions/default/1.sql  |    5 +
 .../fixtures/app/basicplayapp/build.gradle         |   13 +-
 .../app/playappwithdependencies/build.gradle       |   13 +-
 .../fixtures/app/playmultiproject/build.gradle     |   15 +-
 .../plugin/use/PluginUseDslIntegrationSpec.groovy  |    2 +-
 .../internal/DefaultPluginRequestApplicator.java   |   38 +-
 .../plugin/use/internal/PluginResolverFactory.java |   11 +-
 .../internal/PluginUsePluginServiceRegistry.java   |   23 +-
 .../use/resolve/internal/PluginResolveContext.java |    2 +
 .../internal/InjectedClasspathPluginResolver.java  |   91 ++
 .../api/tasks/bundling/JarIntegrationTest.groovy   |   53 +
 .../groovy/GroovyBasePluginIntegrationTest.groovy  |    8 +-
 .../BasicGroovyCompilerIntegrationSpec.groovy      |    2 +-
 .../java/ComponentReportIntegrationTest.groovy     |   67 --
 .../JavaProjectModelBridgingIntegrationTest.groovy |   94 ++
 .../PluginsComponentReportIntegrationTest.groovy   |  194 ++++
 .../BasicJavaCompilerIntegrationSpec.groovy        |    2 +-
 ...JUnitLoggingOutputCaptureIntegrationTest.groovy |    5 +-
 .../TestNGConsoleLoggingIntegrationTest.groovy     |    4 +-
 ...estNGLoggingOutputCaptureIntegrationTest.groovy |    9 +-
 .../shared/build.gradle                            |    2 +-
 .../standardOutputLogging/build.gradle             |    2 +-
 .../groovyJdk15Failing/build.gradle                |    4 +-
 .../groovyJdk15Passing/build.gradle                |    4 +-
 .../internal/java/AbstractLanguageSourceSet.java   |   11 +-
 .../api/internal/java/DefaultJavaSourceSet.java    |    7 +
 .../jvm/ClassDirectoryBinaryNamingScheme.java      |   14 +-
 .../internal/jvm/ClassDirectoryBinaryRenderer.java |   17 +-
 .../jvm/ClassDirectoryBinarySpecInternal.java      |    3 -
 .../jvm/DefaultClassDirectoryBinarySpec.java       |   59 +-
 .../api/internal/tasks/DefaultSourceSet.java       |   12 +-
 .../api/internal/tasks/DefaultSourceSetOutput.java |   10 +-
 .../tasks/testing/junit/JULRedirector.java         |    2 +-
 .../CaptureTestOutputTestResultProcessor.java      |    1 -
 .../DefaultStandardOutputRedirector.java           |   93 ++
 .../processors/StandardOutputRedirector.java       |   26 +
 .../testing/processors/TestOutputRedirector.java   |    1 -
 .../groovy/org/gradle/api/plugins/BasePlugin.java  |   13 +-
 .../org/gradle/api/plugins/JavaBasePlugin.java     |  215 ++--
 .../api/plugins/LegacyJavaComponentPlugin.java     |  156 ---
 .../groovy/org/gradle/api/tasks/GroovyRuntime.java |   26 +-
 .../groovy/org/gradle/api/tasks/testing/Test.java  |   36 +-
 .../api/internal/plugins/unixStartScript.txt       |    4 +-
 .../ClassDirectoryBinaryNamingSchemeTest.groovy    |   24 +-
 .../jvm/DefaultClassDirectoryBinarySpecTest.groovy |   51 +-
 .../plugins/UnixStartScriptGeneratorTest.groovy    |    2 +-
 .../api/internal/tasks/DefaultSourceSetTest.groovy |   41 +-
 .../DefaultStandardOutputRedirectorTest.groovy     |  116 +++
 .../processors/TestOutputRedirectorTest.groovy     |    1 -
 .../gradle/api/plugins/JavaBasePluginTest.groovy   |   90 +-
 .../plugins/LegacyJavaComponentPluginTest.groovy   |   55 --
 .../org/gradle/api/tasks/GroovyRuntimeTest.groovy  |    3 +-
 .../org/gradle/api/tasks/testing/TestTest.java     |    2 +-
 .../BuildDashboardPluginIntegrationTest.groovy     |    1 -
 .../transport/http/HttpResourceAccessor.java       |    2 +-
 .../http/RepeatableInputStreamEntity.java          |    2 +-
 .../s3/ivy/IvyS3RepoResolveIntegrationTest.groovy  |    4 +-
 .../maven/MavenS3RepoErrorsIntegrationTest.groovy  |    7 +-
 .../ivy/IvyPublishSftpIntegrationTest.groovy       |   10 +-
 .../ivy/IvySftpLegacyPublishIntegrationTest.groovy |    2 +-
 .../maven/MavenPublishSftpIntegrationTest.groovy   |    2 +-
 .../AbstractSftpDependencyResolutionTest.groovy    |    2 +-
 .../ivy/IvySftpRepoErrorsIntegrationTest.groovy    |    2 +-
 .../ivy/IvySftpRepoResolveIntegrationTest.groovy   |    2 +-
 .../MavenSftpRepoResolveIntegrationTest.groovy     |    2 +-
 .../transport/sftp/SftpResourceUploader.java       |    2 +-
 .../groovy/org/gradle/api/tasks/ScalaRuntime.java  |   24 +-
 .../org/gradle/api/tasks/scala/AntScalaDoc.groovy  |    1 +
 .../org/gradle/api/tasks/ScalaRuntimeTest.groovy   |    3 +-
 .../gradle/api/tasks/scala/ScalaCompileTest.java   |    7 +-
 .../plugins/sonar/SonarSmokeIntegrationTest.groovy |   14 +-
 .../org/gradle/sonar/runner/SonarTestServer.groovy |    9 +-
 .../shared/groovyProject/build.gradle              |    2 +-
 .../gradle/api/plugins/sonar/SonarAnalyze.groovy   |    5 +-
 .../gradle/api/plugins/sonar/SonarPlugin.groovy    |    6 +
 .../plugins/sonar/model/IncludeProperties.groovy   |    9 +-
 .../sonar/model/ModelToPropertiesConverter.groovy  |    3 +
 .../api/plugins/sonar/model/SonarProperty.groovy   |    4 +-
 .../api/plugins/sonar/model/SonarRootModel.groovy  |   21 +
 .../org/gradle/sonar/runner/SonarProperties.java   |    6 +-
 .../gradle/sonar/runner/SonarRunnerExtension.java  |    5 +-
 .../sonar/runner/SonarRunnerRootExtension.java     |    3 +
 .../org/gradle/sonar/runner/package-info.java      |    4 +-
 .../sonar/runner/plugins/SonarRunnerPlugin.java    |    8 +-
 .../org/gradle/sonar/runner/tasks/SonarRunner.java |    9 +-
 .../runner/plugins/SonarRunnerPluginTest.groovy    |    4 +
 .../testkit/TestKitEndUserIntegrationTest.groovy   |  618 ++++++++++--
 .../testkit/TestKitSamplesIntegrationTest.groovy   |   13 +-
 .../AbstractGradleRunnerIntegrationTest.groovy     |   47 +-
 .../GradleRunnerArgumentsIntegrationTest.groovy    |   44 +-
 .../GradleRunnerBuildFailureIntegrationTest.groovy |   53 +-
 ...GradleRunnerCaptureOutputIntegrationTest.groovy |  127 +++
 ...GradleRunnerGradleVersionIntegrationTest.groovy |  142 +++
 ...radleRunnerIsolatedDaemonIntegrationTest.groovy |   20 +-
 ...leRunnerMechanicalFailureIntegrationTest.groovy |   88 +-
 ...adleRunnerPluginInjectionIntegrationTest.groovy |  532 ++++++++++
 .../GradleRunnerResultIntegrationTest.groovy       |   37 +-
 .../runner/GradleRunnerSmokeIntegrationTest.groovy |   43 +-
 .../fixtures/GradleRunnerIntegTestRunner.groovy    |   74 ++
 .../gradle/testkit/runner/fixtures/NoDebug.java    |   28 +
 .../org/gradle/testkit/runner/BuildResult.java     |   23 +-
 .../java/org/gradle/testkit/runner/BuildTask.java  |    3 +
 .../org/gradle/testkit/runner/GradleRunner.java    |  205 +++-
 .../InvalidRunnerConfigurationException.java       |    5 +-
 .../org/gradle/testkit/runner/TaskOutcome.java     |    3 +
 .../testkit/runner/UnexpectedBuildFailure.java     |    6 +-
 .../runner/UnexpectedBuildResultException.java     |   45 +
 .../testkit/runner/UnexpectedBuildSuccess.java     |    6 +-
 .../runner/internal/DefaultBuildResult.java        |   22 +-
 .../testkit/runner/internal/DefaultBuildTask.java  |    5 +
 .../runner/internal/DefaultGradleRunner.java       |  212 +++-
 .../runner/internal/GradleExecutionParameters.java |   96 ++
 .../runner/internal/GradleExecutionResult.java     |   22 +-
 .../testkit/runner/internal/GradleExecutor.java    |    5 +-
 .../runner/internal/TempTestKitDirProvider.java    |    6 +-
 .../runner/internal/TestKitGradleExecutor.java     |  151 ---
 .../runner/internal/ToolingApiGradleExecutor.java  |  220 +++++
 .../runner/internal/dist/GradleDistribution.java   |   20 +
 .../internal/dist/InstalledGradleDistribution.java |   32 +
 .../dist/URILocatedGradleDistribution.java         |   32 +
 .../dist/VersionBasedGradleDistribution.java       |   30 +
 .../runner/internal/io/NoCloseOutputStream.java    |   49 +
 .../internal/io/SynchronizedOutputStream.java      |   54 +
 .../runner/internal/DefaultBuildResultTest.groovy  |    6 +-
 .../runner/internal/DefaultBuildTaskTest.groovy    |   30 +
 .../runner/internal/DefaultGradleRunnerTest.groovy |  214 ++--
 subprojects/test-kit/test-kit.gradle               |   42 +
 .../CUnitComponentReportIntegrationTest.groovy     |   86 ++
 .../test/cunit/CUnitIntegrationTest.groovy         |   68 +-
 .../test/cunit/CUnitSamplesIntegrationTest.groovy  |   32 +-
 .../cunit/ComponentReportIntegrationTest.groovy    |   85 --
 .../ComponentReportIntegrationTest.groovy          |   83 --
 .../googletest/GoogleTestIntegrationTest.groovy    |   41 +-
 .../GoogleTestSamplesIntegrationTest.groovy        |   20 +-
 ...tingNativeComponentReportIntegrationTest.groovy |   84 ++
 .../test/cunit/CUnitTestSuiteBinarySpec.java       |    5 +-
 .../internal/DefaultCUnitTestSuiteBinary.java      |   10 +-
 .../test/cunit/plugins/CUnitPlugin.java            |   86 +-
 .../googletest/GoogleTestTestSuiteBinarySpec.java  |    4 +-
 .../internal/DefaultGoogleTestTestSuiteBinary.java |    8 +-
 .../test/googletest/plugins/GoogleTestPlugin.java  |   58 +-
 .../test/internal/NativeTestSuites.java            |  103 ++
 .../nativeplatform/test/cunit/CUnitTest.groovy     |    6 +-
 .../test/googletest/GoogleTestTest.groovy          |    6 +-
 .../runner/TestExecutionResultEvaluator.java       |    2 +-
 ...GlobalLoggingManipulationIntegrationTest.groovy |   13 +-
 .../tooling/ToolingApiIntegrationTest.groovy       |    7 +-
 .../tooling/ToolingApiRemoteIntegrationTest.groovy |    5 +-
 .../ContinuousBuildToolingApiSpecification.groovy  |   75 +-
 .../tooling/fixture/ProgressEvents.groovy          |   10 +-
 .../ToolingApiCompatibilitySuiteRunner.groovy      |    3 -
 .../fixture/ToolingApiDistributionResolver.groovy  |    2 +-
 .../fixture/ToolingApiLoggingSpecification.groovy  |   27 +
 .../tooling/fixture/ToolingApiSpecification.groovy |    5 +-
 .../m3/ToolingApiLoggingCrossVersionSpec.groovy    |    8 +-
 .../m5/ToolingApiIdeaModelCrossVersionSpec.groovy  |   25 +-
 ...ReceivingStandardStreamsCrossVersionSpec.groovy |   80 +-
 .../m8/JavaConfigurabilityCrossVersionSpec.groovy  |    4 +-
 .../m8/ToolingApiLoggingCrossVersionSpec.groovy    |   11 +-
 ...adlePropertiesToolingApiCrossVersionSpec.groovy |    6 +-
 .../r112/BuildInvocationsCrossVersionSpec.groovy   |    1 -
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |  127 +++
 .../tooling/r22/BuildActionCrossVersionSpec.groovy |   19 +-
 .../r23/StandardStreamsCrossVersionSpec.groovy     |    8 +-
 .../r25/ContinuousBuildCrossVersionSpec.groovy     |    3 +
 ...nuousBuildProgressEventsCrossVersionSpec.groovy |    1 +
 ...entHandleContinuousBuildCrossVersionSpec.groovy |    6 +-
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |   64 ++
 .../r28/ToolingApiIdeaModelCrossVersionSpec.groovy |   64 ++
 .../ToolingApiEclipseModelCrossVersionSpec.groovy  |  246 +++++
 .../internal/adapter/ProtocolToModelAdapter.java   |   23 +
 .../consumer/AbstractLongRunningOperation.java     |   13 +
 .../internal/consumer/DefaultBuildLauncher.java    |    2 +-
 .../internal/consumer/DefaultGradleConnector.java  |    5 +
 .../internal/consumer/DistributionFactory.java     |   23 +-
 .../connection/CancellableConsumerConnection.java  |   11 +-
 ...sspathInjectionSupportedCheckModelProducer.java |   48 +
 .../parameters/ConsumerOperationParameters.java    |   66 +-
 .../org/gradle/tooling/model/GradleProject.java    |   11 +-
 .../tooling/model/eclipse/EclipseBuildCommand.java |   51 +
 .../model/eclipse/EclipseJavaSourceSettings.java   |   30 +
 .../tooling/model/eclipse/EclipseProject.java      |   51 +-
 .../model/eclipse/EclipseProjectNature.java        |   36 +
 .../model/eclipse/HierarchicalEclipseProject.java  |    4 +-
 .../gradle/tooling/model/java/JavaSourceAware.java |   39 +
 .../tooling/model/java/JavaSourceSettings.java     |   35 +
 .../gradle/tooling/model/java/package-info.java    |   20 +
 .../adapter/ProtocolToModelAdapterTest.groovy      |   39 +
 ...InjectionSupportedCheckModelProducerTest.groovy |   72 ++
 .../ConsumerOperationParametersTest.groovy         |   18 +-
 .../gradle/wrapper/GradleUserHomeLookupTest.groovy |   75 ++
 .../groovy/org/gradle/wrapper/InstallTest.groovy   |    4 +-
 version.txt                                        |    2 +-
 1895 files changed, 63863 insertions(+), 27881 deletions(-)
 delete mode 100644 buildSrc/src/main/groovy/org/gradle/build/BuildTypes.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/DependencyGenerator.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/DependencyGraph.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/MavenJarCreator.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/MavenModule.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/MavenPom.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/MavenRepository.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/MavenScope.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/RepositoryBuilder.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/TestProject.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/tasks/JvmProjectGeneratorTask.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/tasks/MonolithicNativeProjectGeneratorTask.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/tasks/NativeProjectGeneratorTask.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/performance/generator/tasks/ProjectGeneratorTask.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/plugins/buildtypes/BuildType.groovy
 create mode 100644 buildSrc/src/main/groovy/org/gradle/plugins/buildtypes/BuildTypesPlugin.groovy
 create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/org.gradle.build-types.properties
 create mode 100644 buildSrc/src/test/groovy/org/gradle/performance/generator/DependencyGeneratorTest.groovy
 create mode 100644 debian/.gitignore
 delete mode 100644 debian/gbp.conf
 delete mode 100644 debian/generate-classpath.gradle
 delete mode 100644 debian/generate-pom.gradle
 create mode 100644 debian/generate_classpath.gradle
 create mode 100644 debian/generate_pom.gradle
 delete mode 100644 debian/gradle.jlibs
 delete mode 100644 debian/libgradle-core-java.jlibs
 delete mode 100644 debian/libgradle-plugins-java.jlibs
 delete mode 100644 debian/patches/26_disable_commitid.diff
 delete mode 100644 debian/patches/disable_distributions.diff
 delete mode 100644 debian/patches/disable_java9.diff
 delete mode 100644 debian/patches/disable_release_notes.diff
 create mode 100644 debian/patches/ivy-2.4.0.patch
 create mode 100644 debian/patches/maven-3.3-compatibility.patch
 delete mode 100644 debian/patches/maven-aether-provider.diff
 delete mode 100644 debian/patches/maven_builder_support.diff
 delete mode 100644 debian/patches/maven_testng.diff
 create mode 100644 gradle/buildReceiptInit.gradle
 create mode 100644 gradle/buildSplits.gradle
 delete mode 100644 subprojects/base-services-groovy/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptSourceTransformer.java
 rename subprojects/{core/src/main/groovy => base-services/src/main/java}/org/gradle/internal/typeconversion/TypeConversionException.java (100%)
 create mode 100644 subprojects/base-services/src/main/java/org/gradle/internal/typeconversion/TypeConverter.java
 rename subprojects/{core/src/main/groovy => base-services/src/main/java}/org/gradle/internal/typeconversion/UnsupportedNotationException.java (100%)
 rename subprojects/{core/src/main/groovy => base-services/src/main/java}/org/gradle/util/GUtil.java (100%)
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/io/ClassLoaderObjectInputStreamTest.groovy
 create mode 100644 subprojects/base-services/src/test/groovy/org/gradle/internal/reflect/MethodSignatureEquivalenceTest.groovy
 rename subprojects/{core/src/test/groovy/org/gradle => base-services/src/test/groovy/org/gradle/util}/util/GUtilTest.groovy (100%)
 create mode 100644 subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/AbstractPmdPluginVersionIntegrationTest.groovy
 create mode 100644 subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/PmdPluginAuxclasspathIntegrationTest.groovy
 create mode 100644 subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/PmdPluginDependenciesIntegrationTest.groovy
 create mode 100644 subprojects/code-quality/src/main/resources/checkstyle-noframes-sorted.xsl
 delete mode 100644 subprojects/core/src/integTest/groovy/org/gradle/execution/taskgraph/RuleBasedTaskActionsIntegrationTest.groovy
 delete mode 100644 subprojects/core/src/integTest/groovy/org/gradle/execution/taskgraph/RuleBasedTaskExecutionIntegrationTest.groovy
 delete mode 100644 subprojects/core/src/integTest/groovy/org/gradle/execution/taskgraph/RuleBasedTaskReferenceIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/execution/taskgraph/RuleTaskBridgingIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/execution/taskgraph/RuleTaskCreationIntegrationTest.groovy
 create mode 100644 subprojects/core/src/integTest/groovy/org/gradle/execution/taskgraph/RuleTaskExecutionIntegrationTest.groovy
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/cache/HeapProportionalSizer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/cache/StringInterner.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/DiscoveredInputFileChange.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/DiscoveredInputFilesStateChangeRule.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/rules/DiscoveredTaskStateChanges.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/FileTreeElementSnapshotter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/classloading/GroovySystemLoader.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/classloading/GroovySystemLoaderFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/classloading/LeakyOnJava7GroovySystemLoader.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/classloading/NoOpGroovySystemLoader.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/CachingFileVisitDetails.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/FileTreeElementComparator.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/FileTreeElementHasher.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/FileVisitDetailsWithAttributes.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/DefaultDirectoryWalker.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/DefaultDirectoryWalkerFactory.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/DelegatingFileCollection.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/DelegatingFileTree.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/DirectoryWalker.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/FileTreeWithBackingFile.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/FilteredFileTree.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/LazilyInitializedFileTree.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/file/collections/jdk7/Jdk7DirectoryWalker.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/DefaultIsolatedAntBuilder.groovy
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/antbuilder/AntBuilderDelegate.groovy
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/antbuilder/CacheEntry.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/antbuilder/CachedClassLoader.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/antbuilder/ClassPathToClassLoaderCache.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/antbuilder/Cleanup.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/antbuilder/DefaultIsolatedAntBuilder.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/project/antbuilder/FinalizerThread.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/rules/AddOnlyRuleAwarePolymorphicDomainObjectContainer.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/rules/ModelMapCreators.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/rules/RuleAwarePolymorphicDomainObjectContainer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/RealizableTaskCollection.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/TaskDependencyContainer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/util/internal/CachingPatternSpecFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/api/tasks/util/internal/PatternSpecFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/MapBackedInMemoryStore.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/cache/internal/NonThreadsafeInMemoryStore.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/filewatch/DefaultFileSystemChangeWaiter.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/filewatch/DefaultFileSystemChangeWaiterFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/filewatch/FileSystemChangeWaiterFactory.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/DefaultTypeConverter.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/StandardOutputRedirector.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/DefaultStandardOutputRedirector.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/JavaUtilLoggingConfigurer.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/logging/internal/JavaUtilLoggingSystem.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/model/collection/internal/PolymorphicModelMapProjection.java
 create mode 100644 subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/InjectedPluginClasspath.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/testfixtures/internal/NoOpLoggingManager.java
 delete mode 100644 subprojects/core/src/main/groovy/org/gradle/testfixtures/internal/TestOutputEventListener.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/file/RelativePathSpockTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/cache/StringInternerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/rules/DiscoveredInputFilesStateChangeRuleTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/CacheCapSizerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/LoggingEvictionListenerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/AbstractFileCollectionTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/AbstractFileCollectionTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/CompositeFileCollectionSpec.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/CompositeFileTreeSpec.groovy
 delete 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/UnionFileCollectionTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/UnionFileCollectionTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/collections/DefaultDirectoryWalkerTest.java
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/collections/DirectoryFileTreeTest.java
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/file/collections/jdk7/Jdk7DirectoryWalkerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/project/antbuilder/AntBuilderMemoryLeakTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/rules/AddOnlyRuleAwarePolymorphicDomainObjectContainerTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/rules/DefaultRuleAwareNamedDomainObjectFactoryRegistryTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/rules/DefaultRuleAwarePolymorphicNamedEntityInstantiatorTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/rules/RuleAwarePolymorphicDomainObjectContainerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/RealizableTaskCollectionTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/api/tasks/util/internal/CachingPatternSpecFactoryTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/service/scopes/BuildSessionScopeServicesTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/DefaultTypeConverterTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/DefaultStandardOutputRedirectorTest.groovy
 delete mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/JavaUtilLoggingConfigurerTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/logging/internal/JavaUtilLoggingSystemTest.groovy
 create mode 100644 subprojects/core/src/test/groovy/org/gradle/util/ports/ReleasingPortAllocatorTest.groovy
 create mode 100644 subprojects/core/src/testFixtures/groovy/org/gradle/util/ports/ReleasingPortAllocator.groovy
 create mode 100644 subprojects/dependency-management/src/integTest/groovy/org/gradle/integtests/resolve/AddingConfigurationIntegrationTest.groovy
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/LocalComponentConverter.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ConfigurationBackedComponent.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ConfigurationComponentMetaDataBuilder.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ConfigurationLocalComponentConverter.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ConfigurationsToArtifactsConverter.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ConfigurationsToModuleDescriptorConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationComponentMetaDataBuilder.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToArtifactsConverter.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToModuleDescriptorConverter.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultExcludeRuleConverter.java
 delete mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ExcludeRuleConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultExcludeRuleConverter.java
 create mode 100644 subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ExcludeRuleConverter.java
 delete mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/ConfigurationLocalComponentConverterTest.groovy
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationComponentMetaDataBuilderTest.groovy
 delete mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToArtifactsConverterTest.groovy
 delete mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultConfigurationsToModuleDescriptorConverterTest.java
 delete mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/DefaultExcludeRuleConverterTest.java
 delete mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/IvyConverterTestUtil.java
 create mode 100644 subprojects/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultExcludeRuleConverterTest.java
 delete mode 100644 subprojects/diagnostics/src/integTest/groovy/org/gradle/api/reporting/components/ComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/diagnostics/src/integTest/groovy/org/gradle/api/reporting/components/DiagnosticsComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/BuildEnvironmentReportTaskIntegrationTest.groovy
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/components/internal/RendererUtils.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/AbstractDependencyReportTask.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/BuildEnvironmentReportTask.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/ProjectReportGenerator.java
 create mode 100644 subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/ReportGenerator.java
 create mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/reporting/components/internal/RendererUtilsTest.groovy
 create mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/tasks/diagnostics/BuildEnvironmentReportTaskTest.groovy
 create mode 100644 subprojects/diagnostics/src/test/groovy/org/gradle/api/tasks/diagnostics/internal/ReportGeneratorTest.groovy
 create mode 100644 subprojects/diagnostics/src/testFixtures/groovy/org/gradle/api/reporting/components/AbstractNativeComponentReportIntegrationTest.groovy
 delete mode 100644 subprojects/diagnostics/src/testFixtures/groovy/org/gradle/api/reporting/components/NativeComponentReportIntegrationTest.groovy
 delete mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.plugins.ReportingBasePluginConvention.xml
 copy subprojects/docs/src/docs/dsl/{org.gradle.api.tasks.diagnostics.AbstractReportTask.xml => org.gradle.api.tasks.diagnostics.AbstractDependencyReportTask.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.api.tasks.diagnostics.BuildEnvironmentReportTask.xml
 rename subprojects/docs/src/docs/dsl/{org.gradle.language.PreprocessingTool.xml => org.gradle.nativeplatform.PreprocessingTool.xml} (100%)
 create mode 100644 subprojects/docs/src/docs/dsl/org.gradle.nativeplatform.platform.NativePlatform.xml
 create mode 100644 subprojects/docs/src/docs/userguide/buildingJavaLibraries.xml
 delete mode 100644 subprojects/docs/src/docs/userguide/ideSupport.xml
 create mode 100644 subprojects/docs/src/docs/userguide/introMultiProjectBuilds.xml
 delete mode 100644 subprojects/docs/src/docs/userguide/newJavaPlugin.xml
 delete mode 100644 subprojects/docs/src/docs/userguide/newModel.xml
 create mode 100644 subprojects/docs/src/docs/userguide/softwareModel.xml
 create mode 100644 subprojects/docs/src/docs/userguide/softwareModelConcepts.xml
 delete mode 100644 subprojects/docs/src/samples/customModel/languageType/buildSrc/src/main/groovy/sample/documentation/DefaultDocumentationComponent.groovy
 create mode 100644 subprojects/docs/src/samples/javaLibraryPlugin/apispec-support/build.gradle
 create mode 100644 subprojects/docs/src/samples/javaLibraryPlugin/apispec-support/src/main/java/org/gradle/Person.java
 create mode 100644 subprojects/docs/src/samples/javaLibraryPlugin/apispec/build.gradle
 create mode 100644 subprojects/docs/src/samples/javaLibraryPlugin/apispec/src/brokenclient/java/org/gradle/Client.java
 create mode 100644 subprojects/docs/src/samples/javaLibraryPlugin/apispec/src/client/java/org/gradle/Client.java
 copy subprojects/docs/src/samples/{java/customizedLayout/src => javaLibraryPlugin/apispec/src/main}/java/org/gradle/Person.java (100%)
 create mode 100644 subprojects/docs/src/samples/javaLibraryPlugin/apispec/src/main/java/org/gradle/internal/PersonInternal.java
 create mode 100644 subprojects/docs/src/samples/javaLibraryPlugin/apispec/src/main/java/org/gradle/utils/StringUtils.java
 rename subprojects/docs/src/samples/{newJavaPlugin/multiplecomponents/src/core => javaLibraryPlugin/apispec/src/main}/resources/org/gradle/resource.xml (100%)
 create mode 100644 subprojects/docs/src/samples/javaLibraryPlugin/multiplecomponents/build.gradle
 rename subprojects/docs/src/samples/{newJavaPlugin => javaLibraryPlugin}/multiplecomponents/settings.gradle (100%)
 rename subprojects/docs/src/samples/{newJavaPlugin => javaLibraryPlugin}/multiplecomponents/src/client/java/org/gradle/Client.java (100%)
 rename subprojects/docs/src/samples/{newJavaPlugin => javaLibraryPlugin}/multiplecomponents/src/core/java/org/gradle/Person.java (100%)
 rename subprojects/docs/src/samples/{newJavaPlugin/quickstart/src/main => javaLibraryPlugin/multiplecomponents/src/core}/resources/org/gradle/resource.xml (100%)
 rename subprojects/docs/src/samples/{newJavaPlugin => javaLibraryPlugin}/multiplecomponents/src/server/java/org/gradle/PersonServer.java (100%)
 create mode 100644 subprojects/docs/src/samples/javaLibraryPlugin/multiplecomponents/src/verifier/java/org/gradle/Verifier.java
 rename subprojects/docs/src/samples/{newJavaPlugin => javaLibraryPlugin}/multiplecomponents/util/build.gradle (100%)
 rename subprojects/docs/src/samples/{newJavaPlugin => javaLibraryPlugin}/multiplecomponents/util/src/main/java/org/gradle/Utils.java (100%)
 rename subprojects/docs/src/samples/{newJavaPlugin => javaLibraryPlugin}/quickstart/build.gradle (100%)
 rename subprojects/docs/src/samples/{newJavaPlugin => javaLibraryPlugin}/quickstart/src/main/java/org/gradle/Person.java (100%)
 rename subprojects/docs/src/samples/{newJavaPlugin/targetplatforms/core => javaLibraryPlugin/quickstart}/src/main/resources/org/gradle/resource.xml (100%)
 create mode 100644 subprojects/docs/src/samples/javaLibraryPlugin/targetplatforms/core/build.gradle
 rename subprojects/docs/src/samples/{newJavaPlugin => javaLibraryPlugin}/targetplatforms/core/src/main/java/org/gradle/Person.java (100%)
 rename subprojects/docs/src/samples/{newJavaPlugin => javaLibraryPlugin}/targetplatforms/core/src/main/java6/org/gradle/Person6.java (100%)
 copy subprojects/docs/src/samples/{java/quickstart => javaLibraryPlugin/targetplatforms/core}/src/main/resources/org/gradle/resource.xml (100%)
 rename subprojects/docs/src/samples/{newJavaPlugin => javaLibraryPlugin}/targetplatforms/server/build.gradle (100%)
 rename subprojects/docs/src/samples/{newJavaPlugin => javaLibraryPlugin}/targetplatforms/server/src/main/java/org/gradle/Server.java (100%)
 rename subprojects/docs/src/samples/{newJavaPlugin => javaLibraryPlugin}/targetplatforms/settings.gradle (100%)
 create mode 100644 subprojects/docs/src/samples/modelRules/language-support/build.gradle
 create mode 100644 subprojects/docs/src/samples/modelRules/modelDslCoercion/build.gradle
 create mode 100644 subprojects/docs/src/samples/modelRules/modelDslCoercion/data.csv
 delete mode 100644 subprojects/docs/src/samples/newJavaPlugin/multiplecomponents/build.gradle
 delete mode 100644 subprojects/docs/src/samples/newJavaPlugin/targetplatforms/core/build.gradle
 create mode 100644 subprojects/docs/src/samples/testKit/testKitSpockClasspath/plugin/src/main/resources/META-INF/gradle-plugins/org.gradle.sample.helloworld.properties
 create mode 100644 subprojects/docs/src/samples/testKit/testKitSpockGradleVersion/build.gradle
 create mode 100644 subprojects/docs/src/samples/testKit/testKitSpockGradleVersion/src/test/groovy/org/gradle/sample/BuildLogicFunctionalTest.groovy
 create mode 100644 subprojects/docs/src/samples/userguide/modelRules/configureAsRequired/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/modelRules/configureElementsOfMap/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguide/modelRules/initializationRuleRunsBeforeConfigurationRules/build.gradle
 create mode 100644 subprojects/docs/src/samples/userguideOutput/buildingJavaLibraries-compile-avoid.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/buildingJavaLibraries-compile-brokenclient.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/buildingJavaLibraries-compile-first.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/buildingJavaLibraries-updateSources.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/listProjects.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/model-language-support-all.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/modelDslConfigureRuleNotRunWhenNotRequired.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/modelDslConfigureRuleRunWhenRequired.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/modelDslInitializationRuleRunsBeforeConfigurationRule.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/modelDslModelMapNestedAll.out
 create mode 100644 subprojects/docs/src/samples/userguideOutput/newJavaMultiComponents-verifierJar.out
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractIdeDeduplicationIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseProjectNameDeduplicationIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaModuleDeduplicationIntegrationTest.groovy
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseBuildCommand.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseProjectNature.java
 create mode 100644 subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/java/DefaultJavaSourceSettings.java
 delete mode 100644 subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/configurer/DeduplicationTargetTest.groovy
 create mode 100644 subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/EclipseModelBuilderTest.groovy
 create mode 100644 subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/IsolatedAntBuilderMemoryLeakIntegrationTest.groovy
 delete mode 100644 subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/EnableModelDsl.java
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/CleanupTestDirectory.groovy
 create mode 100644 subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/CleanupTestDirectoryExtension.groovy
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishVersionRangeIntegTest.groovy
 create mode 100644 subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyVersionRangePublishIntegrationTest.groovy
 create mode 100644 subprojects/language-groovy/src/integTest/groovy/org/gradle/language/groovy/GroovyCompilerContinuousIntegrationTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/language/java/DependencyScope.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/language/java/JavaCompilationAgainstApiJarIntegrationTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/language/java/JavaCompilationAgainstDependenciesIntegrationTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/language/java/JavaCompilerContinuousIntegrationTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/language/java/JavaIntegrationTesting.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/language/java/JavaLanguageExternalDependencyResolutionIntegrationTest.groovy
 create mode 100644 subprojects/language-java/src/integTest/groovy/org/gradle/language/java/JvmApiSpecIntegrationTest.groovy
 create mode 100644 subprojects/language-jvm/src/testFixtures/groovy/org/gradle/api/tasks/compile/AbstractCompilerContinuousIntegrationTest.groovy
 delete mode 100644 subprojects/language-native/src/main/java/org/gradle/language/PreprocessingTool.java
 delete mode 100644 subprojects/language-native/src/main/java/org/gradle/language/nativeplatform/internal/DefaultPreprocessingTool.java
 create mode 100644 subprojects/language-scala/src/integTest/groovy/org/gradle/language/scala/ScalaCompilerContinuousIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/continuous/BuildSessionServiceReuseContinuousIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/integTest/groovy/org/gradle/launcher/continuous/ChangesDuringBuildContinuousIntegrationTest.groovy
 create mode 100644 subprojects/launcher/src/testFixtures/groovy/org/gradle/launcher/debug/JDWPUtil.groovy
 delete mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublicationVersionRangeIntegTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishVersionRangeIntegTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenNonUniqueSnapshotPublishIntegrationTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPomConfigurationPublishIntegrationTest.groovy
 delete mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPomGenerationIntegrationTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPomGenerationPublishIntegrationTest.groovy
 delete mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishIgnoresMavenSettingsTest.groovy
 delete mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishNonUniqueSnapshotVersionTest.groovy
 delete mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishRespectsPomConfigurationTest.groovy
 delete mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishVersionRangeIntegrationTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenSettingsPublishIntegrationTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenSftpPublishIntegrationTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenVersionRangePublishIntegrationTest.groovy
 create mode 100644 subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenWagonPublishIntegrationTest.groovy
 delete mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/TaskCreationIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/ManagedModelGroovyScalarConfigurationIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/ManagedScalarCollectionsIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/integTest/groovy/org/gradle/model/managed/UnmanagedCollectionPropertyIntegrationTest.groovy
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/collection/internal/ChildNodeInitializerStrategyAccessor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/collection/internal/ChildNodeInitializerStrategyAccessors.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/asm/AsmClassGeneratorUtils.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/AbstractModelAction.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/AbstractModelActionWithView.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/AddProjectionsAction.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/DefaultModelRegistration.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/DefaultNodeInitializerRegistry.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/DeferredModelAction.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ExtractedModelCreator.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ExtractedModelRegistration.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelCreator.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelCreators.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelMapGroovyDecorator.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelMapGroovyView.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelMaps.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelRegistration.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelRegistrations.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelRule.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ModelTypeInitializationException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/NodeInitializerContext.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/NodeInitializerRegistry.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/ProjectionBackedModelCreator.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/Service.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/core/UnmanagedStruct.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/AbstractManagedModelInitializer.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/AbstractUnmanagedModelCreationRuleExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/ReadonlyImmutableManagedPropertyException.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/ServiceModelCreationRuleExtractor.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/inspect/UnmanagedPropertyMissingSetterException.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/AbstractModelStructSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/AbstractStructSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/CollectionSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/CompositeSchema.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ManagedImplModelSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ManagedImplSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ManagedImplStructSchema.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ModelCollectionSchema.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ModelManagedImplStructSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ModelSetSchema.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ModelStructSchema.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ModelUnmanagedImplStructSchema.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ModelValueSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ScalarCollectionSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/ScalarValueSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/SpecializedMapSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/StructSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/UnmanagedImplStructSchema.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/CandidateMethods.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/CollectionNodeInitializerExtractionSupport.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/CollectionStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ConstructableTypesRegistry.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/DefaultConstructableTypesRegistry.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/DefaultModelSchemaExtractionContext.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/FactoryBasedNodeInitializerExtractionStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ManagedImplStructNodeInitializerExtractionStrategy.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ManagedImplStructSchemaExtractionStrategySupport.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ManagedSetNodeInitializerExtractionStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/MethodType.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ModelMapNodeInitializerExtractionStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ModelPropertyExtractionContext.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ModelSchemaExtractionResult.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ModelSetNodeInitializerExtractionStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/NodeInitializerExtractionStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ScalarCollectionNodeInitializerExtractionStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ScalarCollectionStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/ScalarTypes.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/SpecializedMapNodeInitializerExtractionStrategy.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/manage/schema/extract/UnmanagedCollectionStrategy.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/AnyStateBindingPredicate.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/CreatorRuleBinder.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/ModelCreationListener.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/ModelListener.java
 delete mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/registry/MutatorRuleBinder.java
 create mode 100644 subprojects/model-core/src/main/java/org/gradle/model/internal/type/GenericArrayTypeWrapper.java
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/core/BaseInstanceFactoryTest.groovy
 delete mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/core/InstanceBackedModelCreatorTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/core/InstanceBackedModelRegistrationTest.groovy
 delete mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/core/ModelMapGroovyDecoratorTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/core/UnmanagedModelProjectionTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/inspect/ManagedModelInitializerTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/projection/AbstractCollectionModelProjectionTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/projection/ListModelProjectionTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/projection/SetModelProjectionTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/ManagedImplStructStrategyTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/ModelMapStrategyTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/ModelSetStrategyTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/ModelStoreTestUtils.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/ScalarCollectionStrategyTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/SpecializedModelMapStrategyTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/UnmanagedCollectionStrategyTest.groovy
 create mode 100644 subprojects/model-core/src/test/groovy/org/gradle/model/internal/manage/schema/extract/UnmanagedImplStructStrategyTest.groovy
 rename subprojects/{core/src/main => model-core/src/testFixtures}/groovy/org/gradle/api/internal/rules/DefaultRuleAwareNamedDomainObjectFactoryRegistry.java (100%)
 rename subprojects/{core/src/main => model-core/src/testFixtures}/groovy/org/gradle/api/internal/rules/DefaultRuleAwarePolymorphicNamedEntityInstantiator.java (100%)
 rename subprojects/{core/src/main => model-core/src/testFixtures}/groovy/org/gradle/api/internal/rules/RuleAwareNamedDomainObjectFactoryRegistry.java (100%)
 rename subprojects/{core/src/main => model-core/src/testFixtures}/groovy/org/gradle/api/internal/rules/RuleAwarePolymorphicNamedEntityInstantiator.java (100%)
 create mode 100644 subprojects/model-core/src/testFixtures/groovy/org/gradle/model/internal/fixture/ModelActionBuilder.java
 create mode 100644 subprojects/model-core/src/testFixtures/groovy/org/gradle/model/internal/fixture/ModelRegistrationBuilder.java
 create mode 100644 subprojects/model-core/src/testFixtures/groovy/org/gradle/model/internal/fixture/ModelRegistryHelperExtension.java
 create mode 100644 subprojects/model-core/src/testFixtures/groovy/org/gradle/model/internal/fixture/ProjectRegistrySpec.groovy
 create mode 100644 subprojects/model-core/src/testFixtures/groovy/org/gradle/model/internal/fixture/TestManagedProxyFactory.groovy
 create mode 100644 subprojects/model-core/src/testFixtures/groovy/org/gradle/model/internal/fixture/TestNodeInitializerRegistry.java
 create mode 100644 subprojects/model-core/src/testFixtures/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
 create mode 100644 subprojects/model-groovy/src/integTest/groovy/org/gradle/model/dsl/ManagedTypeDslIntegrationTest.groovy
 create mode 100644 subprojects/model-groovy/src/integTest/groovy/org/gradle/model/dsl/ModelMapDslIntegrationTest.groovy
 create mode 100644 subprojects/model-groovy/src/integTest/groovy/org/gradle/model/dsl/internal/transform/NestedModelRuleDslDetectionIntegrationTest.groovy
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/inputs/PotentialInput.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/inputs/PotentialInputs.java
 delete mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/inputs/RuleInputAccess.java
 delete mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/inputs/RuleInputAccessBacking.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/transform/ClosureBackedRuleFactory.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/transform/InputReference.java
 delete mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/transform/RuleMetadata.java
 create mode 100644 subprojects/model-groovy/src/main/java/org/gradle/model/dsl/internal/transform/TransformedClosure.java
 delete mode 100644 subprojects/model-groovy/src/test/groovy/org/gradle/model/dsl/internal/TransformedModelDslBackingTest.groovy
 delete mode 100644 subprojects/performance/src/generator.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaSoftwareModelBuildPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaSoftwareModelCompileAvoidancePerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaSoftwareModelConfigurationPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/JavaSoftwareModelSourceFileUpdater.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/MonolithicNativePluginPerformanceTest.groovy
 create mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/NativeBuildPerformanceTest.groovy
 delete mode 100644 subprojects/performance/src/integTest/groovy/org/gradle/performance/NativePerformanceTest.groovy
 create mode 100644 subprojects/performance/src/templates/java-sw-model-project/build.gradle
 create mode 100644 subprojects/performance/src/templates/native-monolithic/build.gradle
 create mode 100644 subprojects/performance/src/templates/native-monolithic/common.gradle
 create mode 100644 subprojects/performance/src/templates/native-monolithic/components.gradle
 create mode 100644 subprojects/performance/src/templates/native-monolithic/prebuilt.gradle
 create mode 100644 subprojects/performance/src/templates/native-monolithic/src/common.h
 create mode 100644 subprojects/performance/src/templates/native-monolithic/src/prebuilt.h
 create mode 100644 subprojects/performance/src/templates/native-monolithic/src/src.c
 create mode 100644 subprojects/performance/src/templates/native-monolithic/src/src.cpp
 create mode 100644 subprojects/performance/src/templates/native-monolithic/src/src.h
 create mode 100644 subprojects/performance/src/templates/native-monolithic/src/unused.c
 create mode 100755 subprojects/performance/src/templates/root-project/checkstyle.xml
 create mode 100644 subprojects/performance/src/test/groovy/org/gradle/performance/fixture/YourKitProfilerTest.groovy
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/Experiment.java
 delete mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/PerformanceTest.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/categories/BasicPerformanceTest.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/categories/Experiment.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/categories/JavaPerformanceTest.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/categories/NativePerformanceTest.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/categories/PerformanceTest.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/BuildExperimentInvocationInfo.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/BuildExperimentListener.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/BuildExperimentListenerAdapter.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/CompilationLoggingCollector.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/GradleInvocationCustomizer.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/LogFiles.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/Profiler.java
 create mode 100644 subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/YourKitProfiler.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/AbstractComponentModelIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/BaseModelIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/ComponentBinariesIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/ComponentBinarySourcesIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/ComponentSourcesIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/CustomBinaryInternalViewsIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/CustomComponentIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/CustomComponentInternalViewsIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/CustomManagedBinaryIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/FunctionalSourceSetIntegrationTest.groovy
 create mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/LanguageSourceSetIntegrationTest.groovy
 delete mode 100644 subprojects/platform-base/src/integTest/groovy/org/gradle/language/base/plugins/ComponentModelBasePluginIntegrationTest.groovy
 rename subprojects/{core/src/main/groovy => platform-base/src/main/java}/org/gradle/api/BuildableModelElement.java (100%)
 rename subprojects/{core/src/main/groovy => platform-base/src/main/java}/org/gradle/api/internal/AbstractBuildableModelElement.java (100%)
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/AbstractLocalLibraryDependencyResolver.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/DefaultLibraryResolutionErrorMessageBuilder.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/LocalLibraryDependencyResolver.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/api/internal/resolve/LocalLibraryMetaDataAdapter.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/DependentSourceSet.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/DefaultFunctionalSourceSet.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/DependentSourceSetInternal.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/LanguageSourceSetFactory.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/ProjectLayout.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/BinarySpecFactoryRegistry.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/DefaultVariantAxisCompatibility.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/DefaultVariantAxisCompatibilityFactory.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/DefaultVariantDimensionSelector.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/DefaultVariantDimensionSelectorFactory.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/VariantAxisCompatibility.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/VariantAxisCompatibilityFactory.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/VariantDimensionSelector.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/model/VariantDimensionSelectorFactory.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/registry/NamedLanguageRegistration.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/registry/RuleBasedLanguageRegistration.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/language/base/internal/resolve/DependentSourceSetLocalComponentConverter.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ModuleDependencySpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ModuleDependencySpecBuilder.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ProjectDependencySpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/ProjectDependencySpecBuilder.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/binary/internal/BinarySpecFactory.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/component/internal/ComponentSpecFactory.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/BinaryNamingSchemeBuilder.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/BinarySpecFactory.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/ComponentSpecAware.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/ComponentSpecFactory.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultBinaryContainer.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultBinaryNamingSchemeBuilder.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultDependencySpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultModuleDependencySpec.java
 create mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/DefaultProjectDependencySpec.java
 delete mode 100644 subprojects/platform-base/src/main/java/org/gradle/platform/base/internal/util/ImplementationTypeDetermer.java
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/DefaultFunctionalSourceSetTest.groovy
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/resolve/DependentSourceSetLocalComponentConverterTest.groovy
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/testinterfaces/CustomLanguageSourceSet.groovy
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/testinterfaces/NotBinarySpec.groovy
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/testinterfaces/NotComponentSpec.groovy
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/testinterfaces/RawLibrary.groovy
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/testinterfaces/SomeBinarySpec.groovy
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/testinterfaces/SomeBinarySubType.groovy
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/testinterfaces/SomeComponentSpec.groovy
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/internal/testinterfaces/SomeLibrary.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/language/base/sources/BaseLanguageSourceSetTest.groovy
 create mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/DefaultDependencySpecContainerTest.groovy
 delete mode 100644 subprojects/platform-base/src/test/groovy/org/gradle/platform/base/internal/registry/BinarySpecSpecializationSchemaExtractionStrategy.java
 create mode 100644 subprojects/platform-base/src/testFixtures/groovy/org/gradle/language/base/sources/BaseLanguageSourceSetFixtures.groovy
 create mode 100644 subprojects/platform-base/src/testFixtures/groovy/org/gradle/platform/base/binary/BaseBinaryFixtures.groovy
 delete mode 100644 subprojects/platform-jvm/src/integTest/groovy/org/gradle/jvm/ComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/platform-jvm/src/integTest/groovy/org/gradle/jvm/PlatformJvmComponentReportIntegrationTest.groovy
 delete mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/api/internal/resolve/JvmLibraryResolutionErrorMessageBuilder.java
 delete mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/api/internal/resolve/JvmLocalLibraryDependencyResolver.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/api/internal/resolve/JvmLocalLibraryMetaDataAdapter.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/JvmApiSpec.java
 delete mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/BuildDirHolder.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/DefaultJarFile.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/DefaultJavaPlatformVariantAxisCompatibility.java
 delete mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/DefaultJavaPlatformVariantDimensionSelector.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/DefaultJvmApiSpec.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/JarFile.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/JvmPackageName.java
 delete mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/model/JarBinarySpecSpecializationModelInitializer.java
 delete mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/internal/model/JarBinarySpecSpecializationSchemaExtractionStrategy.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/ApiJar.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/AccessibleMember.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/AnnotatableMember.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/AnnotationAnnotationValue.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/AnnotationMember.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/AnnotationValue.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/ApiClassExtractor.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/ApiMemberSelector.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/ArrayAnnotationValue.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/ClassMember.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/EnumAnnotationValue.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/FieldMember.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/InnerClassMember.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/Member.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/MethodMember.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/MethodStubbingApiMemberAdapter.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/ParameterAnnotationMember.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/SimpleAnnotationValue.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/SortingAnnotationVisitor.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/internal/TypedMember.java
 create mode 100644 subprojects/platform-jvm/src/main/java/org/gradle/jvm/tasks/api/package-info.java
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/DefaultJavaPlatformVariantAxisCompatibilityTest.groovy
 delete mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/DefaultJavaPlatformVariantDimensionSelectorTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/internal/JvmPackageNameTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/tasks/api/internal/ApiClassExtractorAnnotationsTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/tasks/api/internal/ApiClassExtractorInnerClassTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/tasks/api/internal/ApiClassExtractorTest.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/tasks/api/internal/ApiClassExtractorTestSupport.groovy
 create mode 100644 subprojects/platform-jvm/src/test/groovy/org/gradle/jvm/tasks/api/internal/ApiClassExtractorTestSupportTest.groovy
 delete mode 100644 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/ComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/platform-native/src/integTest/groovy/org/gradle/nativeplatform/PlatformNativeComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeExecutableFileSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/NativeInstallationSpec.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/PreprocessingTool.java
 create mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/DefaultPreprocessingTool.java
 delete mode 100644 subprojects/platform-native/src/main/groovy/org/gradle/nativeplatform/internal/configure/ToolSettingNativeBinaryInitializer.java
 create mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/TestNativeBinariesFactory.java
 delete mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/internal/configure/ToolSettingNativeBinaryInitializerTest.groovy
 delete mode 100644 subprojects/platform-native/src/test/groovy/org/gradle/nativeplatform/test/plugins/NativeBinariesTestPluginTest.groovy
 delete mode 100644 subprojects/platform-native/src/testFixtures/groovy/org/gradle/nativeplatform/internal/configure/TestNativeBinariesFactory.java
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/PlayPlatformComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/continuous/PlayJavaScriptCompilerContinuousIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/continuous/PlayRoutesCompilerContinuousIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/integTest/groovy/org/gradle/play/integtest/continuous/PlayTwirlCompilerContinuousIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/PlayPlatformAwareComponentSpec.java
 delete mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/DefaultPlayApplicationSpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/DefaultPlayPlatformAwareComponentSpec.java
 create mode 100644 subprojects/platform-play/src/main/java/org/gradle/play/internal/PlayPlatformAwareComponentSpecInternal.java
 create mode 100644 subprojects/platform-play/src/testFixtures/groovy/org/gradle/play/integtest/fixtures/AbstractPlayCompilerContinuousIntegrationTest.groovy
 create mode 100644 subprojects/platform-play/src/testFixtures/groovy/org/gradle/play/integtest/fixtures/PlayApp.groovy
 create mode 100644 subprojects/platform-play/src/testFixtures/groovy/org/gradle/play/integtest/fixtures/Repositories.groovy
 delete mode 100644 subprojects/platform-play/src/testFixtures/groovy/org/gradle/play/integtest/fixtures/app/PlayApp.groovy
 create mode 100644 subprojects/platform-play/src/testFixtures/resources/org/gradle/play/integtest/fixtures/app/advancedplayapp/conf/evolutions/default/1.sql
 create mode 100644 subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/service/internal/InjectedClasspathPluginResolver.java
 delete mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/java/ComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/java/JavaProjectModelBridgingIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/integTest/groovy/org/gradle/java/PluginsComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/processors/DefaultStandardOutputRedirector.java
 create mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/processors/StandardOutputRedirector.java
 delete mode 100644 subprojects/plugins/src/main/groovy/org/gradle/api/plugins/LegacyJavaComponentPlugin.java
 create mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/processors/DefaultStandardOutputRedirectorTest.groovy
 delete mode 100644 subprojects/plugins/src/test/groovy/org/gradle/api/plugins/LegacyJavaComponentPluginTest.groovy
 create mode 100644 subprojects/test-kit/src/integTest/groovy/org/gradle/testkit/runner/GradleRunnerCaptureOutputIntegrationTest.groovy
 create mode 100644 subprojects/test-kit/src/integTest/groovy/org/gradle/testkit/runner/GradleRunnerGradleVersionIntegrationTest.groovy
 create mode 100644 subprojects/test-kit/src/integTest/groovy/org/gradle/testkit/runner/GradleRunnerPluginInjectionIntegrationTest.groovy
 create mode 100644 subprojects/test-kit/src/integTest/groovy/org/gradle/testkit/runner/fixtures/GradleRunnerIntegTestRunner.groovy
 create mode 100644 subprojects/test-kit/src/integTest/groovy/org/gradle/testkit/runner/fixtures/NoDebug.java
 create mode 100644 subprojects/test-kit/src/main/java/org/gradle/testkit/runner/UnexpectedBuildResultException.java
 create mode 100644 subprojects/test-kit/src/main/java/org/gradle/testkit/runner/internal/GradleExecutionParameters.java
 delete mode 100644 subprojects/test-kit/src/main/java/org/gradle/testkit/runner/internal/TestKitGradleExecutor.java
 create mode 100644 subprojects/test-kit/src/main/java/org/gradle/testkit/runner/internal/ToolingApiGradleExecutor.java
 create mode 100644 subprojects/test-kit/src/main/java/org/gradle/testkit/runner/internal/dist/GradleDistribution.java
 create mode 100644 subprojects/test-kit/src/main/java/org/gradle/testkit/runner/internal/dist/InstalledGradleDistribution.java
 create mode 100644 subprojects/test-kit/src/main/java/org/gradle/testkit/runner/internal/dist/URILocatedGradleDistribution.java
 create mode 100644 subprojects/test-kit/src/main/java/org/gradle/testkit/runner/internal/dist/VersionBasedGradleDistribution.java
 create mode 100644 subprojects/test-kit/src/main/java/org/gradle/testkit/runner/internal/io/NoCloseOutputStream.java
 create mode 100644 subprojects/test-kit/src/main/java/org/gradle/testkit/runner/internal/io/SynchronizedOutputStream.java
 create mode 100644 subprojects/test-kit/src/test/groovy/org/gradle/testkit/runner/internal/DefaultBuildTaskTest.groovy
 create mode 100644 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/cunit/CUnitComponentReportIntegrationTest.groovy
 delete mode 100644 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/cunit/ComponentReportIntegrationTest.groovy
 delete mode 100644 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/googletest/ComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/testing-native/src/integTest/groovy/org/gradle/nativeplatform/test/googletest/TestingNativeComponentReportIntegrationTest.groovy
 create mode 100644 subprojects/testing-native/src/main/java/org/gradle/nativeplatform/test/internal/NativeTestSuites.java
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/ToolingApiLoggingSpecification.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r210/ToolingApiEclipseModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r28/ToolingApiEclipseModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r28/ToolingApiIdeaModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r29/ToolingApiEclipseModelCrossVersionSpec.groovy
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/PluginClasspathInjectionSupportedCheckModelProducer.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/eclipse/EclipseBuildCommand.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/eclipse/EclipseJavaSourceSettings.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/eclipse/EclipseProjectNature.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/java/JavaSourceAware.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/java/JavaSourceSettings.java
 create mode 100644 subprojects/tooling-api/src/main/java/org/gradle/tooling/model/java/package-info.java
 create mode 100644 subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/PluginClasspathInjectionSupportedCheckModelProducerTest.groovy
 create mode 100644 subprojects/wrapper/src/test/groovy/org/gradle/wrapper/GradleUserHomeLookupTest.groovy

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



More information about the pkg-java-commits mailing list