[gradle] 01/03: Merge tag 'upstream/2.13'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed May 18 21:04:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository gradle.
commit 0b46d7c91292e7d54682cf717f8000f48d32864e
Merge: 30e7d71 2ae513d
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed May 18 00:15:32 2016 +0200
Merge tag 'upstream/2.13'
Upstream version 2.13
build.gradle | 5 +-
.../build/docs/dsl/links/ClassLinkMetaData.java | 5 +-
.../generator/tasks/ProjectGeneratorTask.groovy | 3 +
.../docs/dsl/links/ClassLinkMetaDataTest.groovy | 66 ++
config/checkstyle/suppressions.xml | 2 +
gradle/buildSplits.gradle | 8 +-
gradle/dependencies.gradle | 6 +-
gradle/idea.gradle | 29 +-
gradle/integTest.gradle | 7 +-
gradle/wrapper/gradle-wrapper.properties | 4 +-
settings.gradle | 1 +
.../announce/AnnouncePluginExtension.groovy | 4 +-
.../announce/internal/DefaultIconProvider.groovy | 13 +-
.../internal/DefaultIconProviderTest.groovy | 27 +-
.../antlr/Antlr2PluginIntegrationTest.groovy | 2 +-
.../antlr/Antlr3PluginIntegrationTest.groovy | 1 +
.../antlr/Antlr4PluginIntegrationTest.groovy | 1 +
.../org/gradle/api/plugins/antlr/AntlrTask.java | 9 +-
.../api/plugins/antlr/internal/AntlrExecuter.java | 26 +-
.../api/plugins/antlr/internal/AntlrWorker.java | 21 +
.../plugins/antlr/internal/AntlrWorkerClient.java | 30 -
.../antlr/internal/AntlrWorkerClientProtocol.java | 21 -
.../plugins/antlr/internal/AntlrWorkerManager.java | 25 +-
.../plugins/antlr/internal/AntlrWorkerServer.java | 53 --
.../BuildOperationProcessorIntegrationTest.groovy | 70 ++
.../gradle/api/internal/cache/StringInterner.java | 36 +
.../src/main/java/org/gradle/internal/Actions.java | 5 +-
.../internal/io/LineBufferingOutputStream.java | 112 +++
.../gradle/internal/io/SkipFirstTextStream.java | 44 ++
.../org/gradle/internal/io/WriterTextStream.java | 54 ++
.../java/org/gradle/internal/jvm/JdkTools.java | 4 +-
.../operations/BuildOperationProcessor.java | 19 +-
.../internal/operations/BuildOperationQueue.java | 10 +
.../operations/BuildOperationQueueFactory.java | 23 +
.../operations/BuildOperationQueueFailure.java | 29 +
.../operations/DefaultBuildOperationProcessor.java | 66 +-
.../operations/DefaultBuildOperationQueue.java | 77 ++-
.../DefaultBuildOperationQueueFactory.java | 26 +
.../operations/RunnableBuildOperation.java | 23 +
.../internal/reflect/JavaReflectionUtil.java | 15 +-
.../src/main/java/org/gradle/util/GUtil.java | 32 +-
.../api/internal/cache/StringInternerTest.groovy | 56 ++
.../internal/io/SkipFirstTextStreamTest.groovy | 67 ++
.../org/gradle/internal/jvm/JdkToolsTest.groovy | 1 +
.../DefaultBuildOperationProcessorTest.groovy | 189 ++++--
.../DefaultBuildOperationQueueTest.groovy | 79 ++-
.../groovy/org/gradle/util/util/GUtilTest.groovy | 69 +-
.../AbstractFindBugsPluginIntegrationTest.groovy | 36 +-
.../CheckstylePluginVersionIntegrationTest.groovy | 28 +
.../internal/FindBugsSpecBuilderTest.groovy | 32 +
.../resources/checkstyle-custom-stylesheet.xsl | 13 +
.../resources/findbugs-custom-stylesheet.xsl | 13 +
.../gradle/api/plugins/quality/Checkstyle.groovy | 5 +-
.../org/gradle/api/plugins/quality/FindBugs.groovy | 5 +-
.../api/plugins/quality/FindBugsReports.java | 4 +-
.../api/plugins/quality/JDependPlugin.groovy | 2 +-
.../quality/internal/CheckstyleReportsImpl.java | 3 +-
.../quality/internal/FindBugsReportsImpl.java | 7 +-
.../internal/findbugs/FindBugsExecuter.java | 10 +-
.../internal/findbugs/FindBugsSpecBuilder.java | 8 +-
.../quality/internal/findbugs/FindBugsWorker.java | 23 +
.../internal/findbugs/FindBugsWorkerClient.java | 43 --
.../findbugs/FindBugsWorkerClientProtocol.java | 21 -
.../internal/findbugs/FindBugsWorkerManager.groovy | 27 +-
.../internal/findbugs/FindBugsWorkerServer.java | 50 --
.../internal/findbugs/FindBugsXmlReportImpl.java | 2 +
.../findbugs/FindBugsWorkerServerTest.groovy | 40 --
.../org/gradle/api/ApplyPluginIntegSpec.groovy | 29 +-
.../CrossBuildScriptCachingIntegrationSpec.groovy | 753 +++++++++++++++++++++
.../api/dsl/DynamicObjectIntegrationTest.groovy | 52 +-
.../state/DirectoryScanningIntegTest.groovy | 253 +++++++
.../InMemoryTaskArtifactsIntegrationTest.groovy | 71 ++
.../changedetection/state/UpToDateIntegTest.groovy | 57 ++
.../ClassLoadersCachingIntegrationTest.groovy | 12 +-
.../BrokenCompressedResourceIntegrationTest.groovy | 93 +++
.../BrokenTextResourceIntegrationTest.groovy | 75 ++
.../CompressedResourceIntegrationTest.groovy | 65 ++
.../gradle/api/tasks/ArchiveIntegrationTest.groovy | 3 -
.../api/tasks/CopyTaskIntegrationSpec.groovy | 28 +
.../gradle/api/tasks/DeleteIntegrationTest.groovy | 127 ++++
.../tasks/IncrementalBuildIntegrationTest.groovy | 136 +++-
.../PropertiesLoaderIntegrationTest.groovy | 19 +
.../AbstractWorkerProcessIntegrationSpec.groovy | 89 +++
.../process/internal/BrokenRemoteProcess.java | 27 +
.../gradle/process/internal/BrokenTestWorker.java | 29 +
.../process/internal/CrashingRemoteProcess.java | 32 +
.../gradle/process/internal/LoggingProcess.java | 29 +
.../process/internal/NoCleanUpRemoteProcess.java | 40 ++
.../gradle/process/internal/NotDeserializable.java | 33 +
.../process/internal/OtherRemoteProcess.java | 30 +
.../internal/PathLimitationIntegTest.groovy | 255 -------
.../internal/PathLimitationIntegrationTest.groovy | 155 +++++
.../gradle/process/internal/PingRemoteProcess.java | 49 ++
.../org/gradle/process/internal/RemoteProcess.java | 53 ++
.../SingleUseWorkerProcessIntegrationTest.groovy | 157 +++++
.../process/internal/TestListenerInterface.java | 21 +
.../gradle/process/internal/TestWorkInterface.java | 23 +
.../org/gradle/process/internal/TestWorker.java | 32 +
.../internal/WorkerProcessIntegrationTest.groovy | 223 ++++++
.../internal/WorkerProcessIntegrationTest.java | 390 -----------
.../buildSrc/src/main/java/DirTransformerTask.java | 58 --
.../buildSrc/src/main/java/GeneratorTask.java | 53 --
.../buildSrc/src/main/java/TransformerTask.java | 66 --
.../src/main/groovy/org/gradle/StartParameter.java | 11 +-
.../src/main/groovy/org/gradle/api/Project.java | 55 +-
.../component/LibraryBinaryIdentifier.java | 1 -
.../groovy/org/gradle/api/file/DeleteAction.java | 3 +
.../groovy/org/gradle/api/file/DeleteSpec.java | 40 ++
.../org/gradle/api/file/FileCopyDetails.java | 4 +
.../api/internal/AsmBackedClassGenerator.java | 30 +-
.../api/internal/CompositeDynamicObject.java | 2 +-
.../api/internal/DefaultClassPathProvider.java | 3 +
.../api/internal/DependencyClassPathProvider.java | 6 +-
.../api/internal/ExtensibleDynamicObject.java | 35 +-
.../api/internal/GradleDistributionLocator.java | 36 -
.../dsl/dependencies/DefaultDependencyHandler.java | 8 +
.../dsl/dependencies/DependencyFactory.java | 2 +-
.../gradle/api/internal/cache/StringInterner.java | 36 -
.../DefaultTaskArtifactStateRepository.java | 27 +-
.../changes/NoHistoryArtifactState.java | 4 +-
.../ShortCircuitTaskArtifactStateRepository.java | 4 +-
.../AbstractFileSnapshotTaskStateChanges.java | 12 +-
.../internal/changedetection/rules/FileChange.java | 2 +-
.../rules/OutputFilesTaskStateChanges.java | 31 +-
.../state/AbstractFileCollectionSnapshotter.java | 95 +++
.../state/CachingFileSnapshotter.java | 41 +-
.../changedetection/state/CachingTreeVisitor.java | 80 +++
.../state/DefaultFileCollectionSnapshotter.java | 243 +------
.../state/DefaultFileSnapshotterSerializer.java | 33 +-
.../changedetection/state/DirSnapshot.java | 37 +
.../state/FileCollectionSnapshot.java | 53 +-
.../state/FileCollectionSnapshotImpl.java | 147 ++++
.../state/FileCollectionSnapshotter.java | 5 +-
.../changedetection/state/FileHashSnapshot.java | 60 ++
.../changedetection/state/FileSnapshot.java | 4 +-
.../changedetection/state/FileSnapshotter.java | 14 +-
.../state/InMemoryTaskArtifactCache.java | 1 -
.../state/IncrementalFileSnapshot.java | 23 +
.../state/MapMergeChangeListener.java | 34 +-
.../state/MinimalFileSetSnapshotter.java | 8 +-
.../changedetection/state/MissingFileSnapshot.java | 37 +
.../state/OutputFilesCollectionSnapshotter.java | 166 ++---
.../state/OutputFilesSnapshotSerializer.java | 24 +-
.../DefaultGradleDistributionLocator.java | 117 ----
.../internal/classpath/DefaultModuleRegistry.java | 45 +-
.../api/internal/file/DefaultFileOperations.java | 16 +-
.../gradle/api/internal/file/FileOperations.java | 7 +-
.../org/gradle/api/internal/file/FileResource.java | 7 +-
.../file/archive/compression/AbstractArchiver.java | 6 -
.../compression/ArchiveOutputStreamFactory.java | 3 +-
.../file/archive/compression/Bzip2Archiver.java | 17 +-
.../compression/CompressedReadableResource.java | 2 -
.../file/archive/compression/GzipArchiver.java | 18 +-
.../collections/DefaultDirectoryWalkerFactory.java | 4 +-
.../internal/file/collections/EmptyFileTree.java | 58 --
.../api/internal/file/collections/MapFileTree.java | 30 +-
.../internal/file/copy/DefaultZipCompressor.java | 7 +-
.../api/internal/file/copy/DeleteActionImpl.java | 94 ---
.../api/internal/file/copy/ZipCompressor.java | 3 +-
.../internal/file/delete/DefaultDeleteSpec.java | 51 ++
.../internal/file/delete/DeleteSpecInternal.java | 37 +
.../gradle/api/internal/file/delete/Deleter.java | 112 +++
.../pattern/HasPrefixAndSuffixPatternStep.java | 2 +-
.../file/pattern/HasSuffixPatternStep.java | 9 +-
.../gradle/api/internal/hash/DefaultHasher.java | 5 +-
.../org/gradle/api/internal/hash/Hasher.java | 4 +-
.../initialization/AbstractScriptHandler.java | 78 ---
.../initialization/DefaultScriptHandler.java | 11 +-
.../loadercache/DefaultClassLoaderCache.java | 41 +-
.../loadercache/HashClassPathSnapshotter.java | 34 +-
.../plugins/DefaultExtraPropertiesExtension.java | 10 +-
.../plugins/DefaultObjectConfigurationAction.java | 277 ++++----
.../api/internal/project/AbstractProject.java | 13 +-
.../AnnotationProcessingTaskFactory.java | 35 +-
.../resources/CharSourceBackedTextResource.java | 24 +-
.../FileCollectionBackedTextResource.java | 57 +-
.../resources/ResourceIsAFolderException.java | 28 -
.../resources/StringBackedTextResource.java | 18 +-
.../tasks/execution/SkipUpToDateTaskExecuter.java | 8 +-
.../tasks/options/AbstractOptionElement.java | 4 +-
.../internal/tasks/options/FieldOptionElement.java | 8 +-
.../tasks/options/MethodOptionElement.java | 8 +-
.../tasks/options/OptionNotationParserFactory.java | 67 --
.../api/internal/tasks/options/OptionReader.java | 7 +-
.../options/OptionValueNotationParserFactory.java | 64 ++
.../api/resources/MissingResourceException.java | 26 -
.../org/gradle/api/resources/ReadableResource.java | 5 +-
.../gradle/api/resources/ResourceException.java | 35 -
.../org/gradle/api/resources/TextResource.java | 6 +-
.../internal/ReadableResourceInternal.java | 3 +-
.../resources/internal/TextResourceInternal.java | 23 +
.../main/groovy/org/gradle/api/tasks/Delete.java | 58 +-
.../org/gradle/api/tasks/util/PatternSet.java | 23 +-
.../internal/DefaultPersistentDirectoryCache.java | 6 +-
.../configuration/DefaultInitScriptProcessor.java | 2 +-
.../configuration/DefaultScriptPluginFactory.java | 8 +-
.../project/BuildScriptProcessor.java | 2 +-
.../groovy/scripts/AbstractUriScriptSource.java | 2 +-
.../gradle/groovy/scripts/CachingScriptSource.java | 98 ++-
.../org/gradle/groovy/scripts/DefaultScript.java | 19 +-
.../scripts/DefaultScriptCompilerFactory.java | 2 +-
.../groovy/scripts/DelegatingScriptSource.java | 4 +-
.../scripts/NonExistentFileScriptSource.java | 44 +-
.../org/gradle/groovy/scripts/ScriptSource.java | 4 +-
.../gradle/groovy/scripts/StringScriptSource.java | 10 +-
.../org/gradle/groovy/scripts/UriScriptSource.java | 18 +-
...ildScopeInMemoryCachingScriptClassCompiler.java | 54 ++
.../scripts/internal/BuildScriptTransformer.java | 2 +-
.../internal/CachingScriptClassCompiler.java | 83 ---
.../CrossBuildInMemoryCachingScriptClassCache.java | 61 ++
.../internal/DefaultScriptCompilationHandler.java | 43 +-
.../scripts/internal/EmptyScriptGenerator.java | 20 -
.../FileCacheBackedScriptClassCompiler.java | 375 +++++++++-
.../scripts/internal/GradleResolveVisitor.java | 10 +-
.../scripts/internal/RemappingScriptSource.java | 40 ++
.../groovy/scripts/internal/ScriptCacheKey.java | 52 ++
.../internal/ShortCircuitEmptyScriptCompiler.java | 63 --
.../initialization/DefaultClassLoaderRegistry.java | 21 +-
.../DefaultClassLoaderScopeRegistry.java | 2 +-
.../initialization/DefaultJdkToolsInitializer.java | 43 ++
.../initialization/FlatClassLoaderRegistry.java | 46 ++
.../ProjectPropertySettingBuildLoader.java | 63 +-
.../initialization/layout/BuildLayoutFactory.java | 4 +-
.../composite/CompositeBuildActionParameters.java | 21 +
.../composite/CompositeBuildActionRunner.java | 24 +
.../composite/CompositeBuildController.java | 40 ++
.../internal/composite/CompositeParameters.java | 59 ++
.../composite/DefaultGradleParticipantBuild.java | 60 ++
.../internal/composite/GradleParticipantBuild.java | 30 +
.../filewatch/jdk7/WatchPointsRegistry.java | 113 ++--
.../jdk7/WatchServiceFileWatcherBacking.java | 6 +-
.../filewatch/jdk7/WatchServiceRegistrar.java | 65 +-
.../installation/CurrentGradleInstallation.java | 51 ++
.../CurrentGradleInstallationLocator.java | 92 +++
.../gradle/internal/installation/GradleFatJar.java | 88 +++
.../internal/installation/GradleInstallation.java | 65 ++
.../progress/PercentageProgressFormatter.java | 2 +-
.../internal/resource/local/PathKeyFileStore.java | 18 +-
.../service/scopes/BuildScopeServices.java | 20 +-
.../service/scopes/BuildSessionScopeServices.java | 7 +-
.../service/scopes/GlobalScopeServices.java | 57 +-
.../service/scopes/TaskExecutionServices.java | 25 +-
.../typeconversion/NotationParserBuilder.java | 4 +-
.../gradle/internal/xml/SimpleMarkupWriter.java | 8 +-
.../org/gradle/internal/xml/SimpleXmlWriter.java | 27 +-
.../org/gradle/invocation/DefaultGradle.java | 12 +-
.../AbstractLineChoppingStyledTextOutput.java | 41 +-
.../org/gradle/logging/internal/AnsiConsole.java | 276 ++++----
.../org/gradle/logging/internal/Console.java | 6 +
.../internal/ConsoleBackedProgressRenderer.java | 110 ++-
.../logging/internal/DefaultLoggingManager.java | 15 +-
.../logging/internal/FlushToOutputsEvent.java | 31 +
.../groovy/org/gradle/logging/internal/Label.java | 2 -
.../internal/LinePrefixingStyledTextOutput.java | 7 +-
.../logging/internal/LogLevelChangeEvent.java | 3 +
.../internal/LoggingBackedStyledTextOutput.java | 17 +-
.../logging/internal/LoggingOutputInternal.java | 4 +-
.../logging/internal/OutputEventRenderer.java | 14 +-
.../internal/StyledTextOutputBackedRenderer.java | 10 +-
.../use/internal/PluginRequestsSerializer.java | 8 +-
.../gradle/process/internal/CurrentProcess.java | 53 ++
.../gradle/process/internal/DefaultExecHandle.java | 2 +-
.../process/internal/DefaultJavaForkOptions.java | 2 +-
.../DefaultSingleUseWorkerProcessBuilder.java | 216 ++++++
.../process/internal/DefaultWorkerProcess.java | 4 +-
.../internal/DefaultWorkerProcessBuilder.java | 167 +++++
.../internal/DefaultWorkerProcessFactory.java | 92 +--
.../org/gradle/process/internal/ExecHandle.java | 4 +-
.../org/gradle/process/internal/JvmOptions.java | 43 +-
.../internal/SingleUseWorkerProcessBuilder.java | 24 +
.../org/gradle/process/internal/WorkerProcess.java | 2 +-
.../process/internal/WorkerProcessBuilder.java | 110 +--
.../process/internal/WorkerProcessException.java | 27 +
.../process/internal/WorkerProcessFactory.java | 33 +
.../process/internal/WorkerProcessSettings.java | 52 ++
.../internal/child/ActionExecutionWorker.java | 70 +-
...nClassesInIsolatedClassLoaderWorkerFactory.java | 94 ---
...ionClassesInSystemClassLoaderWorkerFactory.java | 66 +-
.../child/ImplementationClassLoaderWorker.java | 97 ---
.../IsolatedApplicationClassLoaderWorker.java | 56 --
.../child/SystemApplicationClassLoaderWorker.java | 93 ++-
.../process/internal/child/WorkerContext.java | 3 +
.../process/internal/child/WorkerFactory.java | 4 +-
.../child/WorkerProcessClassPathProvider.java | 44 +-
.../internal/launcher/GradleWorkerMain.java | 34 +-
.../launcher/IsolatedGradleWorkerMain.java | 59 --
.../process/internal/streams/SafeStreams.java | 20 +-
.../org/gradle/reporting/HtmlReportRenderer.java | 17 +-
.../internal/TestBuildScopeServices.java | 8 +-
.../org/gradle/util/LineBufferingOutputStream.java | 113 ----
.../util/LinePerThreadBufferingOutputStream.java | 1 +
.../groovy/org/gradle/StartParameterTest.groovy | 2 +
.../api/internal/cache/StringInternerTest.groovy | 56 --
.../DefaultTaskArtifactStateRepositoryTest.groovy | 27 +-
.../rules/FileSnapshotTaskStateChangesTest.groovy | 2 +-
.../rules/TaskUpToDateStateTest.groovy | 8 +-
.../changedetection/state/CacheCapSizerTest.groovy | 12 +-
.../state/CachingFileSnapshotterTest.groovy | 34 +-
.../state/CachingTreeVisitorTest.groovy | 140 ++++
.../DefaultFileCollectionSnapshotterTest.groovy | 343 ++++++----
.../DefaultFileSnapshotterSerializerTest.groovy | 16 +-
.../state/MinimalFileSetSnapshotterTest.groovy | 10 +-
.../state/OutputFilesSnapshotSerializerTest.groovy | 4 +-
.../DefaultGradleDistributionLocatorTest.groovy | 124 ----
.../classpath/DefaultModuleRegistryTest.groovy | 43 +-
.../internal/file/collections/MapFileTreeTest.java | 2 +-
.../jdk7/Jdk7DirectoryWalkerTest.groovy | 4 +-
.../internal/file/copy/DeleteActionImplTest.groovy | 91 ---
.../api/internal/file/delete/DeleterTest.groovy | 160 +++++
.../HasPrefixAndSuffixPatternStepTest.groovy | 20 +-
.../file/pattern/PatternStepFactoryTest.groovy | 10 +-
.../HashClassPathSnapshotterTest.groovy | 11 +-
.../project/DefaultIsolatedAntBuilderTest.groovy | 3 +-
.../api/internal/project/DefaultProjectTest.groovy | 11 +-
.../antbuilder/AntBuilderMemoryLeakTest.groovy | 15 +-
.../AnnotationProcessingTaskFactoryTest.java | 113 +++-
.../CharSourceBackedTextResourceTest.groovy | 2 +-
.../execution/SkipUpToDateTaskExecuterTest.groovy | 14 +-
.../options/OptionNotationParserFactorySpec.groovy | 55 --
.../internal/tasks/options/OptionReaderTest.groovy | 28 +-
.../OptionValueNotationParserFactorySpec.groovy | 55 ++
.../groovy/org/gradle/api/tasks/DeleteTest.groovy | 110 +++
.../groovy/org/gradle/api/tasks/DeleteTest.java | 77 ---
.../gradle/api/tasks/util/PatternSetTest.groovy | 26 +
.../DefaultInitScriptProcessorTest.groovy | 11 +-
.../DefaultScriptPluginFactoryTest.groovy | 16 +-
.../groovy/scripts/CachingScriptSourceTest.groovy | 47 ++
.../groovy/scripts/CachingScriptSourceTest.java | 45 --
.../DefaultScriptCompilerFactoryTest.groovy | 8 +-
.../groovy/scripts/StringScriptSourceTest.java | 4 +-
.../gradle/groovy/scripts/UriScriptSourceTest.java | 57 +-
...peInMemoryCachingScriptClassCompilerTest.groovy | 131 ++++
.../internal/CachingScriptClassCompilerTest.groovy | 125 ----
.../DefaultScriptCompilationHandlerTest.groovy | 43 +-
.../FileCacheBackedScriptClassCompilerTest.groovy | 131 ++--
.../ShortCircuitEmptyScriptCompilerTest.groovy | 74 --
.../ProjectPropertySettingBuildLoaderTest.groovy | 27 +-
.../filewatch/AbstractFileWatcherTest.groovy | 77 +++
.../filewatch/DefaultFileWatcherFactoryTest.groovy | 150 ++--
.../filewatch/jdk7/WatchPointsRegistryTest.groovy | 120 ++--
.../jdk7/WatchServiceFileWatcherBackingTest.groovy | 122 +++-
.../CurrentGradleInstallationLocatorTest.groovy | 123 ++++
.../internal/installation/GradleFatJarTest.groovy | 122 ++++
.../service/scopes/BuildScopeServicesTest.groovy | 18 +-
.../scopes/BuildSessionScopeServicesTest.groovy | 9 +-
.../service/scopes/GlobalScopeServicesTest.java | 12 +-
.../org/gradle/invocation/DefaultGradleTest.java | 33 +-
.../logging/LoggingServiceRegistryTest.groovy | 92 ++-
...AbstractLineChoppingStyledTextOutputTest.groovy | 53 +-
.../gradle/logging/internal/AnsiConsoleTest.groovy | 652 ++++++++++--------
.../ConsoleBackedProgressRendererTest.groovy | 182 ++++-
.../org/gradle/logging/internal/ConsoleStub.java | 4 +
.../internal/OutputEventRendererTest.groovy | 7 +
.../gradle/logging/internal/TestColorMap.groovy | 60 ++
.../process/internal/DefaultExecHandleSpec.groovy | 48 +-
.../internal/DefaultWorkerProcessTest.groovy | 4 +
.../internal/JavaExecHandleBuilderTest.groovy | 4 +-
.../gradle/process/internal/JvmOptionsTest.groovy | 80 ++-
.../internal/child/ActionExecutionWorkerTest.java | 118 ----
.../child/ImplementationClassLoaderWorkerTest.java | 84 ---
.../streams/ExecOutputHandleRunnerTest.groovy | 2 +-
.../gradle/util/LineBufferingOutputStreamTest.java | 1 +
.../groovy/org/gradle/util/MockExecutor.java | 96 ++-
.../groovy/org/gradle/util/MockTimeProvider.java | 33 +
...pendencyHandlerApiResolveIntegrationTest.groovy | 5 +-
.../AbstractProxyResolveIntegrationTest.groovy | 108 ++-
.../http/HttpProxyResolveIntegrationTest.groovy | 9 +-
.../http/HttpsProxyResolveIntegrationTest.groovy | 8 +-
.../ivy/IvyBrokenDescriptorIntegrationTest.groovy | 29 +
.../maven/BadPomFileResolveIntegrationTest.groovy | 28 +
.../DependencyManagementBuildScopeServices.java | 24 +-
.../ivyservice/IvyXmlModuleDescriptorWriter.java | 7 +-
.../parser/IvyXmlModuleDescriptorParser.java | 12 +-
.../ivyresolve/parser/MetaDataParseException.java | 2 +-
.../resolver/ChainedVersionLister.java | 10 +-
.../DefaultExternalResourceArtifactResolver.java | 12 +-
.../repositories/resolver/MavenMetadataLoader.java | 8 +-
.../repositories/resolver/MavenResolver.java | 6 +-
.../repositories/resolver/MavenVersionLister.java | 2 +-
.../resolver/ResourceVersionLister.java | 5 +-
.../resolver/VersionPatternVisitor.java | 2 +-
.../internal/impldeps/GradleImplDepsJarType.java | 31 +
.../internal/impldeps/GradleImplDepsProvider.java | 78 +++
.../impldeps/GradleImplDepsRelocatedJar.java | 44 ++
.../GradleImplDepsRelocatedJarCreator.java | 269 ++++++++
.../internal/impldeps/GradleImplDepsRelocator.java | 63 ++
.../api/internal/impldeps/RelocatedJarCreator.java | 23 +
.../DependencyClassPathNotationConverter.java | 55 +-
.../notations/DependencyNotationParser.java | 20 +-
.../DefaultCacheAwareExternalResourceAccessor.java | 7 +-
.../transport/ExternalResourceRepository.java | 2 +-
.../GradlePomModuleDescriptorParserTest.groovy | 2 +-
.../parser/IvyXmlModuleDescriptorParserTest.groovy | 12 +-
.../resolver/ChainedVersionListerTest.groovy | 20 +-
.../resolver/MavenVersionListerTest.groovy | 12 +-
.../resolver/ResourceVersionListerTest.groovy | 2 +-
.../impldeps/GradleImplDepsProviderTest.groovy | 130 ++++
.../GradleImplDepsRelocatedJarCreatorTest.groovy | 219 ++++++
...DependencyClassPathNotationConverterTest.groovy | 74 +-
.../gradle/AllDistributionIntegrationSpec.groovy | 2 +-
.../gradle/BinDistributionIntegrationSpec.groovy | 2 +-
.../org/gradle/DistributionIntegrationSpec.groovy | 5 +-
subprojects/docs/docs.gradle | 1 +
subprojects/docs/src/docs/css/userguide.css | 19 +
subprojects/docs/src/docs/dsl/dsl.xml | 44 +-
.../docs/src/docs/dsl/org.gradle.api.Project.xml | 5 +-
...radle.api.plugins.quality.FindBugsXmlReport.xml | 25 +
...gradle.api.reporting.CustomizableHtmlReport.xml | 25 +
.../org.gradle.api.reporting.DirectoryReport.xml | 25 +
.../org.gradle.api.reporting.SingleFileReport.xml | 22 +
.../src/docs/dsl/org.gradle.api.tasks.Delete.xml | 3 +-
.../dsl/org.gradle.api.tasks.javadoc.Groovydoc.xml | 8 +
.../docs/dsl/org.gradle.api.tasks.testing.Test.xml | 5 +-
...rg.gradle.plugins.ide.idea.model.IdeaModule.xml | 12 +-
...g.gradle.plugins.ide.idea.model.IdeaProject.xml | 9 +-
...esting.jacoco.plugins.JacocoPluginExtension.xml | 2 +-
subprojects/docs/src/docs/release/notes.md | 268 +++++---
.../src/docs/stylesheets/userGuideHtmlCommon.xsl | 32 +
.../docs/src/docs/userguide/applicationPlugin.xml | 2 +-
.../userguide/artifactDependenciesTutorial.xml | 6 +-
.../docs/src/docs/userguide/checkstylePlugin.xml | 16 +-
subprojects/docs/src/docs/userguide/embedding.xml | 76 ++-
.../docs/src/docs/userguide/findBugsPlugin.xml | 17 +-
.../docs/src/docs/userguide/gradleDaemon.xml | 7 +
.../docs/src/docs/userguide/groovyPlugin.xml | 6 +-
.../docs/src/docs/userguide/jacocoPlugin.xml | 4 +
.../docs/src/docs/userguide/javaGradlePlugin.xml | 6 +
subprojects/docs/src/docs/userguide/javaPlugin.xml | 2 +
.../docs/src/docs/userguide/scalaPlugin.xml | 4 +
.../docs/src/docs/userguide/signingPlugin.xml | 19 +-
.../docs/src/docs/userguide/softwareModel.xml | 262 ++++---
subprojects/docs/src/docs/userguide/testKit.xml | 90 ++-
.../docs/src/samples/application/build.gradle | 86 +--
.../docs/src/samples/codeQuality/build.gradle | 20 +-
.../codeQuality/config/xsl/checkstyle-custom.xsl | 13 +
.../codeQuality/config/xsl/findbugs-custom.xsl | 13 +
.../docs/src/samples/compositeBuild/build.gradle | 21 +
.../compositeBuild/projects/project1/build.gradle | 4 +
.../projects/project1/settings.gradle | 18 +
.../compositeBuild/projects/project2/build.gradle | 20 +
.../projects/project2/settings.gradle | 17 +
.../compositeBuild/projects/project3/build.gradle | 20 +
.../projects/project3/settings.gradle | 18 +
.../docs/src/samples/compositeBuild/readme.xml | 19 +
.../src/samples/compositeBuild/settings.gradle | 1 +
.../ivy-publish/java-multi-project/build.gradle | 2 +-
.../ivy-publish/multiple-publications/build.gradle | 2 +-
.../output/project2-impl.ivy.xml | 2 +-
.../docs/src/samples/java/base/prod/build.gradle | 2 +-
.../multiproject/services/webservice/build.gradle | 4 +-
.../docs/src/samples/java/quickstart/build.gradle | 2 +-
.../samples/java/withIntegrationTests/build.gradle | 2 +-
.../samples/maven-publish/javaProject/build.gradle | 2 +-
.../multiple-publications/build.gradle | 2 +-
.../output/project2-impl.pom.xml | 2 +-
.../modelRules/basicRuleSourcePlugin/build.gradle | 2 +
.../docs/src/samples/scala/force/build.gradle | 2 +-
.../docs/src/samples/scala/quickstart/build.gradle | 2 +-
.../docs/src/samples/scala/zinc/build.gradle | 2 +-
.../docs/src/samples/sonar/quickstart/build.gradle | 2 +-
.../samples/sonarRunner/quickstart/build.gradle | 2 +-
.../build.gradle | 38 ++
.../gradle/sample/BuildLogicFunctionalTest.groovy | 54 ++
.../org/gradle/sample/HelloWorldPlugin.groovy | 30 +
.../org.gradle.sample.helloworld.properties | 0
.../build.gradle | 14 +
.../org/gradle/sample/HelloWorldPlugin.groovy | 30 +
.../org.gradle.sample.helloworld.properties | 0
.../gradle/sample/BuildLogicFunctionalTest.groovy | 56 ++
.../gradleVersion}/build.gradle | 0
.../gradle/sample/BuildLogicFunctionalTest.groovy | 0
.../junitQuickstart}/build.gradle | 0
.../gradle/sample/BuildLogicFunctionalTest.java | 0
.../manualClasspathInjection/build.gradle | 34 +
.../groovy/org/gradle/sample/HelloWorld.groovy | 27 +
.../org/gradle/sample/HelloWorldPlugin.groovy | 0
.../org.gradle.sample.helloworld.properties | 0
.../gradle/sample/BuildLogicFunctionalTest.groovy | 0
.../spockQuickstart}/build.gradle | 0
.../gradle/sample/BuildLogicFunctionalTest.groovy | 0
.../testKit/testKitSpockClasspath/lib/build.gradle | 5 -
.../groovy/org/gradle/sample/lib/Messages.groovy | 5 -
.../testKitSpockClasspath/plugin/build.gradle | 38 --
.../groovy/org/gradle/sample/HelloWorld.groovy | 28 -
.../testKit/testKitSpockClasspath/settings.gradle | 1 -
.../samples/testing/jacoco/quickstart/build.gradle | 2 +-
.../toolingApi/composite-models/build.gradle | 25 +
.../projects/project1/build.gradle | 4 +
.../projects/project1/settings.gradle | 2 +
.../projects/project2/build.gradle | 4 +
.../projects/project2/settings.gradle | 1 +
.../projects/project3/build.gradle | 4 +
.../projects/project3/settings.gradle | 2 +
.../samples/toolingApi/composite-models/readme.xml | 3 +
.../src/main/java/org/gradle/sample/Main.java | 91 +++
.../toolingApi/composite-tasks/build.gradle | 25 +
.../composite-tasks/projects/project1/build.gradle | 4 +
.../projects/project1/settings.gradle | 2 +
.../composite-tasks/projects/project2/build.gradle | 4 +
.../projects/project2/settings.gradle | 1 +
.../composite-tasks/projects/project3/build.gradle | 4 +
.../projects/project3/settings.gradle | 2 +
.../samples/toolingApi/composite-tasks/readme.xml | 3 +
.../src/main/java/org/gradle/sample/Main.java | 108 +++
.../artifacts/externalDependencies/build.gradle | 8 +-
.../userguide/javaLibraryDistribution/build.gradle | 2 +-
.../userguide/organizeBuildLogic/build.gradle | 4 +-
.../tutorial/groovyWithFlatDir/build.gradle | 6 +-
.../basicRuleSourcePlugin-model-task.out | 2 +-
.../userguideOutput/externalDependencies.out | 16 +-
.../eclipse/EclipseClasspathIntegrationTest.groovy | 163 +++++
.../IdeaJavaLanguageSettingsIntegrationTest.groovy | 27 +
.../ide/idea/IdeaModuleIntegrationTest.groovy | 114 ++++
.../canCreateAndDeleteMetaData/api/build.gradle | 2 +-
.../expectedFiles/apiClasspath.xml | 3 +-
.../expectedFiles/commonClasspath.xml | 3 +-
.../expectedFiles/groovyprojectClasspath.xml | 6 +-
.../expectedFiles/webAppJava6Classpath.xml | 6 +-
.../expectedFiles/webAppJava6WtpComponent.xml | 2 +-
.../expectedFiles/webserviceClasspath.xml | 6 +-
.../expectedFiles/webserviceWtpComponent.xml | 2 +-
.../groovyproject/build.gradle | 2 +-
.../canCreateAndDeleteMetaData/api/build.gradle | 2 +-
.../expectedFiles/api/api.iml.xml | 8 +-
.../expectedFiles/webservice/webservice.iml.xml | 8 +-
.../overwritesExistingDependencies/build.gradle | 4 +-
.../expectedFiles/root.iml.xml | 4 +-
.../plugins/ide/eclipse/EclipsePlugin.groovy | 124 ++--
.../org/gradle/plugins/ide/idea/IdeaPlugin.groovy | 100 +--
.../gradle/plugins/ide/idea/model/Project.groovy | 16 +-
.../idea/model/internal/GeneratedIdeaScope.java | 2 +
.../model/internal/IdeaDependenciesProvider.java | 4 +
.../gradle/plugins/ide/internal/IdePlugin.groovy | 14 +-
.../internal/tooling/BuildEnvironmentBuilder.java | 46 ++
.../tooling/ToolingRegistrationAction.java | 1 +
.../model/LaunchableGradleTaskSelector.java | 3 +-
.../internal/IdeaDependenciesProviderTest.groovy | 23 +
.../installation-beacon/installation-beacon.gradle | 17 +
.../installation/beacon/InstallationBeacon.java | 25 +
.../integtests/ApplicationIntegrationSpec.groovy | 14 +-
.../integtests/CacheProjectIntegrationTest.groovy | 19 +-
...JavaCompileOnlyDependencyIntegrationTest.groovy | 67 ++
.../BuildEnvironmentIntegrationTest.groovy | 2 +-
.../SamplesApplicationIntegrationTest.groovy | 4 +-
.../SamplesCodeQualityIntegrationTest.groovy | 8 +-
.../SamplesJavaMultiProjectIntegrationTest.groovy | 2 +-
.../java/expectedApiClasspathFile.txt | 2 +-
.../eclipseproject/scala/expectedClasspathFile.txt | 2 +-
.../fixtures/daemon/DaemonIntegrationSpec.groovy | 3 +
.../fixtures/daemon/DaemonLogsAnalyzer.groovy | 18 +-
.../fixtures/executer/AbstractGradleExecuter.java | 42 +-
.../fixtures/executer/ForkingGradleExecuter.java | 23 +-
.../fixtures/executer/GradleExecuter.java | 15 +-
.../fixtures/executer/GradleVersions.java | 1 +
.../executer/IntegrationTestBuildContext.java | 18 +-
.../executer/ProgressLoggingFixture.groovy | 8 +
.../versions/ReleasedVersionDistributions.java | 8 +
.../test/fixtures/keystore/TestKeyStore.groovy | 30 +-
.../org/gradle/test/fixtures/file/TestFile.java | 19 +
.../test/fixtures/file/TestFileHelper.groovy | 22 +
.../org/gradle/util/RedirectStdOutAndErr.java | 9 +-
.../api/publish/ivy/IvyPublishEarIntegTest.groovy | 2 +-
.../api/publish/ivy/IvyPublishJavaIntegTest.groovy | 10 +-
.../api/publish/ivy/IvyPublishWarIntegTest.groovy | 2 +-
.../ivy/SamplesIvyPublishIntegrationTest.groovy | 2 +-
.../ivy/IvyEarProjectPublishIntegrationTest.groovy | 2 +-
.../IvyJavaProjectPublishIntegrationTest.groovy | 4 +-
.../ivy/IvyWarProjectPublishIntegrationTest.groovy | 2 +-
.../publisher/IvyDescriptorFileGenerator.java | 5 -
.../publisher/ValidatingIvyPublisherTest.groovy | 2 +-
...actIvyRemoteLegacyPublishIntegrationTest.groovy | 4 +-
.../jacoco/plugins/JacocoVersionIntegTest.groovy | 2 +-
.../gradle/internal/jacoco/JacocoAgentJar.groovy | 17 +-
.../jacoco/plugins/JacocoPluginExtension.groovy | 2 +-
.../jacoco/plugins/JacocoTaskExtension.groovy | 14 +-
.../internal/jacoco/JacocoAgentJarTest.groovy | 63 ++
.../jacoco/plugins/JacocoTaskExtensionSpec.groovy | 25 +-
.../coffeescript/CoffeeScriptCompile.java | 5 +-
.../internal/CoffeeScriptCompileResult.java | 32 -
.../rhino/CoffeeScriptCompilerProtocol.java | 23 +
.../internal/rhino/CoffeeScriptCompilerWorker.java | 13 +-
.../internal/rhino/RhinoCoffeeScriptCompiler.java | 15 +-
.../plugins/javascript/envjs/EnvJsPlugin.groovy | 6 +-
.../envjs/internal/EnvJsBrowserEvaluator.java | 12 +-
.../envjs/internal/EnvJsEvaluateWorker.java | 15 +-
.../envjs/internal/EnvJvEvaluateProtocol.java | 21 +
.../gradle/plugins/javascript/jshint/JsHint.java | 17 +-
.../javascript/jshint/internal/JsHintProtocol.java | 21 +
.../javascript/jshint/internal/JsHintWorker.java | 10 +-
.../javascript/rhino/worker/RhinoWorker.java | 6 -
.../javascript/rhino/worker/RhinoWorkerHandle.java | 25 -
.../rhino/worker/RhinoWorkerHandleFactory.java | 6 +-
.../javascript/rhino/worker/RhinoWorkerSpec.java | 45 --
.../javascript/rhino/worker/RhinoWorkerUtils.java | 2 +-
.../worker/internal/DefaultRhinoWorkerHandle.java | 100 ---
.../internal/DefaultRhinoWorkerHandleFactory.java | 21 +-
.../worker/internal/RhinoClientWorkerProtocol.java | 25 -
.../rhino/worker/internal/RhinoServer.java | 61 --
.../worker/internal/RhinoWorkerClientProtocol.java | 29 -
.../rhino/worker/internal/RhinoWorkerReceiver.java | 68 --
.../gradle/groovy/GroovyDocIntegrationTest.groovy | 56 +-
.../groovy/GroovyDocStampsIntegrationTest.groovy | 61 ++
.../api/tasks/compile/GroovyCompileOptions.java | 2 +-
.../org/gradle/api/tasks/javadoc/AntGroovydoc.java | 63 +-
.../org/gradle/api/tasks/javadoc/Groovydoc.java | 43 +-
.../testing/fixture/GroovydocCoverage.groovy | 23 +
.../analyzer/CachingClassDependenciesAnalyzer.java | 4 +-
.../incremental/analyzer/ClassAnalysisCache.java | 3 +-
.../analyzer/DefaultClassAnalysisCache.java | 9 +-
.../incremental/jar/CachingJarSnapshotter.java | 5 +-
.../incremental/jar/DefaultJarSnapshotCache.java | 13 +-
.../incremental/jar/DefaultJarSnapshotter.java | 9 +-
.../incremental/jar/JarClasspathSnapshotData.java | 8 +-
.../jar/JarClasspathSnapshotDataSerializer.java | 9 +-
.../jar/JarClasspathSnapshotFactory.java | 4 +-
.../tasks/compile/incremental/jar/JarSnapshot.java | 16 +-
.../compile/incremental/jar/JarSnapshotCache.java | 5 +-
.../compile/incremental/jar/JarSnapshotData.java | 7 +-
.../incremental/jar/JarSnapshotDataSerializer.java | 19 +-
.../internal/JavaToolChainServiceRegistry.java | 4 +-
.../jar/DefaultJarSnapshotterTest.groovy | 5 +-
.../jar/JarClasspathSnapshotFactoryTest.groovy | 9 +-
.../compile/incremental/jar/JarSnapshotTest.groovy | 33 +-
.../compile/daemon/CompilerDaemonStarter.java | 12 +-
...eLanguageIncrementalBuildIntegrationTest.groovy | 7 +-
.../internal/incremental/CompilationFileState.java | 10 +-
.../internal/incremental/CompilationState.java | 8 +-
.../incremental/CompilationStateSerializer.java | 21 +-
.../incremental/IncrementalCompileProcessor.java | 2 +-
.../CompilationStateSerializerTest.groovy | 9 +-
.../IncrementalCompileProcessorTest.groovy | 2 +-
.../ScalaCompileParallelIntegrationTest.groovy | 32 +-
.../internal/tasks/scala/ZincScalaCompiler.java | 5 +-
...ionServiceReuseContinuousIntegrationTest.groovy | 12 +-
.../JdkVersionsContinuousIntegrationTest.groovy | 14 +-
.../SmokeContinuousIntegrationTest.groovy | 40 ++
.../daemon/DaemonFeedbackIntegrationSpec.groovy | 2 +-
.../DaemonSystemPropertiesIntegrationTest.groovy | 159 +++++
.../daemon/SingleUseDaemonIntegrationTest.groovy | 1 +
.../launcher/bootstrap/ProcessBootstrap.java | 5 +-
.../gradle/launcher/cli/BuildActionsFactory.java | 8 +-
.../launcher/cli/CommandLineActionFactory.java | 10 +-
.../launcher/daemon/bootstrap/DaemonGreeter.java | 7 +-
.../bootstrap/DaemonStartupCommunication.java | 32 +-
.../daemon/client/DaemonClientConnection.java | 6 +-
.../daemon/client/DefaultDaemonConnector.java | 7 +-
.../daemon/client/DefaultDaemonStarter.java | 27 +-
.../launcher/daemon/client/InputForwarder.java | 8 +-
.../daemon/configuration/BuildProcess.java | 60 ++
.../daemon/configuration/CurrentProcess.java | 74 --
.../daemon/configuration/DaemonJvmOptions.java | 83 +++
.../daemon/configuration/DaemonParameters.java | 29 +-
.../ForegroundDaemonConfiguration.java | 2 +
.../daemon/configuration/GradleProperties.java | 4 +-
.../daemon/protocol/DaemonMessageSerializer.java | 19 +-
.../daemon/server/DaemonTcpServerConnector.java | 7 +-
.../daemon/server/DefaultDaemonConnection.java | 11 +-
.../server/DefaultIncomingConnectionHandler.java | 7 +-
.../daemon/server/IncomingConnectionHandler.java | 4 +-
.../server/SynchronizedDispatchConnection.java | 21 +-
.../launcher/daemon/server/exec/LogToClient.java | 103 ++-
.../exec/ChainingCompositeBuildActionRunner.java | 44 ++
.../exec/CompositeBuildActionExecuter.java | 39 ++
.../exec/ContinuousBuildActionExecuter.java | 19 +-
.../DefaultCompositeBuildActionParameters.java | 47 ++
.../exec/DefaultCompositeBuildController.java | 54 ++
.../internal/provider/BuildActionResult.java | 4 +-
.../internal/provider/LauncherServices.java | 17 +-
.../launcher/cli/BuildActionsFactoryTest.groovy | 1 +
.../cli/CommandLineActionFactoryTest.groovy | 9 +-
...ropertiesToDaemonParametersConverterTest.groovy | 7 +
.../ContinuousIntegrationTestFixtureTest.groovy | 134 ++++
.../daemon/bootstrap/DaemonGreeterTest.groovy | 6 +-
.../client/DaemonClientConnectionTest.groovy | 7 -
.../daemon/configuration/BuildProcessTest.groovy | 109 +++
.../daemon/configuration/CurrentProcessTest.groovy | 108 ---
.../configuration/DaemonJvmOptionsTest.groovy | 67 ++
.../configuration/DaemonParametersTest.groovy | 16 +-
.../server/DefaultDaemonConnectionTest.groovy | 12 +-
.../ChainingCompositeBuildActionRunnerTest.groovy | 50 ++
.../exec/ContinuousBuildActionExecuterTest.groovy | 2 +-
.../AbstractContinuousIntegrationTest.groovy | 17 +-
.../publish/maven/MavenPublishEarIntegTest.groovy | 2 +-
.../publish/maven/MavenPublishJavaIntegTest.groovy | 10 +-
.../maven/MavenPublishMultiProjectIntegTest.groovy | 2 +-
.../maven/MavenPublishWarProjectIntegTest.groovy | 2 +-
.../SamplesMavenPublishIntegrationTest.groovy | 2 +-
.../MavenEarProjectPublishIntegrationTest.groovy | 2 +-
.../MavenJavaProjectPublishIntegrationTest.groovy | 4 +-
.../maven/MavenPublishIntegrationTest.groovy | 4 +-
.../MavenWarProjectPublishIntegrationTest.groovy | 2 +-
.../gradle/api/artifacts/maven/MavenDeployer.java | 4 +-
.../wagon/RepositoryTransportWagonAdapter.java | 5 +-
.../BroadcastMessagingIntegrationTest.groovy | 340 ----------
.../remote/UnicastMessagingIntegrationTest.groovy | 4 -
.../internal/hub/MessageHubIntegrationTest.groovy | 34 +-
.../org/gradle/internal/serialize/Decoder.java | 3 +-
.../serialize/DefaultSerializerRegistry.java | 58 +-
.../org/gradle/internal/serialize/Encoder.java | 4 +
.../internal/serialize/FlushableEncoder.java | 6 +
.../internal/serialize/HashValueSerializer.java | 36 +
.../gradle/internal/serialize/LongSerializer.java | 29 -
.../internal/serialize/ObjectArraySerializer.java | 43 --
.../serialize/OutputStreamBackedEncoder.java | 1 -
.../internal/serialize/SerializerRegistry.java | 10 +-
.../internal/serialize/StatefulSerializer.java | 4 +
.../internal/serialize/kryo/JavaSerializer.java | 62 --
.../gradle/messaging/dispatch/AsyncReceive.java | 204 ------
.../gradle/messaging/dispatch/DelayedReceive.java | 161 -----
.../gradle/messaging/dispatch/QueuingDispatch.java | 80 ---
.../gradle/messaging/remote/ObjectConnection.java | 4 +-
.../messaging/remote/ObjectConnectionBuilder.java | 16 +-
.../messaging/remote/internal/AsyncConnection.java | 39 --
.../remote/internal/AsyncConnectionAdapter.java | 84 ---
.../remote/internal/BroadcastSendProtocol.java | 96 ---
.../remote/internal/BufferingProtocol.java | 90 ---
.../remote/internal/ChannelLookupProtocol.java | 105 ---
.../internal/ChannelRegistrationProtocol.java | 90 ---
.../remote/internal/ConnectCompletion.java | 11 +-
.../messaging/remote/internal/Connection.java | 4 +-
.../remote/internal/DefaultIncomingBroadcast.java | 92 ---
.../remote/internal/DefaultMessageSerializer.java | 65 --
.../remote/internal/DefaultOutgoingBroadcast.java | 117 ----
.../remote/internal/DelegatingConnection.java | 45 --
.../remote/internal/EagerReceiveBuffer.java | 244 -------
.../remote/internal/GroupMessageFilter.java | 48 --
.../remote/internal/IncomingBroadcast.java | 20 -
.../internal/KryoBackedMessageSerializer.java | 33 +-
.../gradle/messaging/remote/internal/Message.java | 2 +-
.../messaging/remote/internal/MessageHub.java | 199 ------
.../remote/internal/MessageOriginator.java | 57 --
.../remote/internal/MessageSerializer.java | 16 +-
.../remote/internal/MessagingServices.java | 76 +--
.../MethodInvocationMarshallingDispatch.java | 60 --
.../MethodInvocationUnmarshallingDispatch.java | 62 --
.../remote/internal/OutgoingBroadcast.java | 20 -
.../remote/internal/OutgoingMultiplex.java | 33 -
.../gradle/messaging/remote/internal/Protocol.java | 53 --
.../messaging/remote/internal/ProtocolContext.java | 39 --
.../messaging/remote/internal/ProtocolStack.java | 323 ---------
.../messaging/remote/internal/ReceiveProtocol.java | 113 ----
.../remote/internal/RemoteConnection.java | 2 +
.../remote/internal/RemoteDisconnectProtocol.java | 66 --
.../gradle/messaging/remote/internal/Router.java | 238 -------
.../messaging/remote/internal/SendProtocol.java | 113 ----
.../remote/internal/TypeCastDispatch.java | 32 -
.../remote/internal/UnicastSendProtocol.java | 86 ---
.../messaging/remote/internal/WorkerProtocol.java | 70 --
.../remote/internal/hub/ConnectionSet.java | 4 +-
.../remote/internal/hub/ConnectionState.java | 8 +-
.../internal/hub/DefaultMethodArgsSerializer.java | 79 +++
...avaSerializationBackedMethodArgsSerializer.java | 62 ++
.../messaging/remote/internal/hub/MessageHub.java | 16 +-
.../hub/MessageHubBackedObjectConnection.java | 44 +-
.../remote/internal/hub/MethodArgsSerializer.java | 23 +
.../internal/hub/MethodInvocationSerializer.java | 94 +--
.../remote/internal/hub/queue/EndPointQueue.java | 12 +-
.../remote/internal/inet/MultiChoiceAddress.java | 9 +-
.../inet/MultiChoiceAddressSerializer.java | 54 ++
.../remote/internal/inet/MulticastConnection.java | 105 ---
.../internal/inet/SocketConnectCompletion.java | 13 +-
.../remote/internal/inet/SocketConnection.java | 33 +-
.../remote/internal/inet/TcpIncomingConnector.java | 7 +-
.../remote/internal/inet/TcpOutgoingConnector.java | 1 -
.../internal/protocol/AbstractPayloadMessage.java | 42 --
.../remote/internal/protocol/ChannelAvailable.java | 57 --
.../internal/protocol/ChannelUnavailable.java | 58 --
.../internal/protocol/ConsumerAvailable.java | 36 -
.../remote/internal/protocol/ConsumerMessage.java | 64 --
.../remote/internal/protocol/ConsumerReady.java | 24 -
.../remote/internal/protocol/ConsumerStopped.java | 24 -
.../remote/internal/protocol/ConsumerStopping.java | 24 -
.../internal/protocol/ConsumerUnavailable.java | 24 -
.../remote/internal/protocol/DiscoveryMessage.java | 54 --
.../protocol/DiscoveryProtocolSerializer.java | 191 ------
.../remote/internal/protocol/EndOfStreamEvent.java | 20 -
.../remote/internal/protocol/LookupRequest.java | 51 --
.../remote/internal/protocol/MessageCredits.java | 53 --
.../remote/internal/protocol/MethodMetaInfo.java | 131 ----
.../internal/protocol/ParticipantAvailable.java | 70 --
.../internal/protocol/ParticipantUnavailable.java | 58 --
.../remote/internal/protocol/PayloadMessage.java | 24 -
.../internal/protocol/ProducerAvailable.java | 36 -
.../remote/internal/protocol/ProducerMessage.java | 64 --
.../remote/internal/protocol/ProducerReady.java | 24 -
.../remote/internal/protocol/ProducerStopped.java | 24 -
.../internal/protocol/ProducerUnavailable.java | 24 -
.../internal/protocol/RemoteMethodInvocation.java | 65 --
.../remote/internal/protocol/Request.java | 63 --
.../remote/internal/protocol/RoutableMessage.java | 23 -
.../internal/protocol/RouteAvailableMessage.java | 33 -
.../internal/protocol/RouteUnavailableMessage.java | 20 -
.../remote/internal/protocol/StatelessMessage.java | 42 --
.../remote/internal/protocol/UnknownMessage.java | 30 -
.../remote/internal/protocol/WorkerStopped.java | 42 --
.../remote/internal/protocol/WorkerStopping.java | 19 -
.../serialize/DefaultSerializerRegistryTest.groovy | 49 +-
.../internal/serialize/LongSerializerTest.groovy | 34 -
.../serialize/ObjectArraySerializerTest.groovy | 31 -
.../messaging/dispatch/AsyncReceiveTest.groovy | 142 ----
.../messaging/dispatch/QueuingDispatchTest.groovy | 78 ---
.../internal/AsyncConnectionAdapterTest.groovy | 103 ---
.../internal/BroadcastSendProtocolTest.groovy | 139 ----
.../remote/internal/BufferingProtocolTest.groovy | 190 ------
.../internal/ChannelLookupProtocolTest.groovy | 140 ----
.../ChannelRegistrationProtocolTest.groovy | 97 ---
.../remote/internal/EagerReceiveBufferTest.groovy | 135 ----
.../remote/internal/GroupMessageFilterTest.groovy | 57 --
.../KryoBackedMessageSerializerTest.groovy | 43 --
.../messaging/remote/internal/MessageTest.groovy | 2 +-
.../remote/internal/MessagingServicesTest.groovy | 12 +-
.../MethodInvocationMarshallingDispatchTest.groovy | 85 ---
...ethodInvocationUnmarshallingDispatchTest.groovy | 97 ---
.../remote/internal/ProtocolStackTest.groovy | 385 -----------
.../remote/internal/ReceiveProtocolTest.groovy | 148 ----
.../internal/RemoteDisconnectProtocolTest.groovy | 131 ----
.../messaging/remote/internal/RouterTest.groovy | 303 ---------
.../remote/internal/SendProtocolTest.groovy | 196 ------
.../remote/internal/UnicastSendProtocolTest.groovy | 134 ----
.../remote/internal/WorkerProtocolTest.groovy | 96 ---
.../remote/internal/hub/ConnectionSetTest.groovy | 11 +-
.../hub/DefaultMethodArgsSerializerTest.groovy | 43 ++
...ializationBackedMethodArgsSerializerTest.groovy | 43 ++
.../remote/internal/hub/MessageHubTest.groovy | 53 +-
.../hub/MethodInvocationSerializerTest.groovy | 21 +-
.../inet/MultiChoiceAddressSerializerTest.groovy | 28 +
.../internal/inet/MultiChoiceAddressTest.groovy | 25 +-
.../internal/inet/MulticastConnectionTest.groovy | 90 ---
.../remote/internal/inet/TcpConnectorTest.groovy | 31 +-
.../protocol/AbstractPayloadMessageTest.groovy | 69 --
.../DiscoveryProcotolSerializerTest.groovy | 94 ---
.../protocol/RemoteMethodInvocationTest.java | 37 -
.../org/gradle/model/internal/core/ModelPath.java | 14 +-
.../gradle/model/internal/core/ModelReference.java | 29 +-
.../rule/describe/AbstractModelRuleDescriptor.java | 3 +
.../rule/describe/MethodModelRuleDescriptor.java | 21 +-
.../rule/describe/SimpleModelRuleDescriptor.java | 2 +-
.../inspect/DefaultMethodRuleDefinition.java | 2 +-
.../manage/schema/extract/PrimitiveTypes.java | 2 +-
.../model/dsl/internal/transform/RuleVisitor.java | 6 +-
.../nativeintegration/filesystem/FileSystem.java | 8 +
.../nativeintegration/filesystem/Symlink.java | 2 +
.../filesystem/jdk7/Jdk7Symlink.java | 92 +++
.../filesystem/jdk7/WindowsJdk7Symlink.java | 39 ++
.../filesystem/services/FileSystemServices.java | 7 +-
.../filesystem/services/GenericFileSystem.java | 5 +
.../services/NativePlatformBackedSymlink.java | 6 +
.../filesystem/services/UnsupportedSymlink.java | 5 +
.../filesystem/services/WindowsSymlink.java | 5 +
.../filesystem/jdk7/Jdk7SymlinkTest.groovy | 59 ++
subprojects/performance/performance.gradle | 86 ++-
.../performance/BaseJavalSourceFileUpdater.groovy | 148 ++++
.../BuildReceiptPluginPerformanceTest.groovy | 21 +-
.../DependencyReportPerformanceTest.groovy | 10 +-
.../performance/FirstBuildPerformanceTest.groovy | 2 +-
.../IdeIntegrationPerformanceTest.groovy | 20 +-
.../JavaCleanDaemonPerformanceTest.groovy | 22 +-
.../JavaConfigurationDaemonPerformanceTest.groovy | 12 +-
.../JavaConfigurationPerformanceTest.groovy | 32 +-
.../JavaFullAssembleDaemonPerformanceTest.groovy | 20 +-
.../JavaFullBuildDaemonPerformanceTest.groovy | 2 +-
.../JavaFullBuildPerformanceTest.groovy | 10 +-
.../JavaOldModelSourceFileUpdater.groovy | 44 ++
...JavaPartialAssembleDaemonPerformanceTest.groovy | 10 +-
.../JavaSoftwareModelSourceFileUpdater.groovy | 192 ++----
.../JavaTestExecutionPerformanceTest.groovy | 70 ++
.../JavaTestGradleVsMavenPerformanceTest.groovy | 100 +++
...pToDateFullAssembleDaemonPerformanceTest.groovy | 2 +-
.../JavaUpToDateFullBuildPerformanceTest.groovy | 27 +-
.../ManyEmptyProjectsHelpPerformanceTest.groovy | 24 +-
.../performance/NativeBuildPerformanceTest.groovy | 8 +-
.../ProjectDependenciesPerformanceTest.groovy | 2 +-
.../RealWorldNativePluginPerformanceTest.groovy | 4 +-
.../performance/SourceUpdateCardinality.java | 20 +-
.../TestExecutionPerformanceTest.groovy | 2 +-
...ngApiIdeModelCrossVersionPerformanceTest.groovy | 195 ++++++
.../templates/build-event-timestamps/build.gradle | 3 +-
.../src/templates/project-with-source/build.gradle | 5 +
.../performance/src/templates/root-project/pom.xml | 48 ++
.../gradle/performance/ResultSpecification.groovy | 16 +
.../CrossVersionPerformanceTestRunnerTest.groovy | 2 +-
.../performance/fixture/MavenDownloaderTest.groovy | 52 ++
.../AbstractCrossBuildPerformanceTest.groovy | 15 +-
.../AbstractCrossVersionPerformanceTest.groovy | 7 +-
.../AbstractGradleVsMavenPerformanceTest.groovy | 67 ++
...actToolingApiCrossVersionPerformanceTest.groovy | 213 ++++++
.../categories/ToolingApiPerformanceTest.java | 23 +
...AbstractGradleBuildPerformanceTestRunner.groovy | 95 +++
.../performance/fixture/BuildExperimentRunner.java | 178 ++---
.../performance/fixture/BuildExperimentSpec.groovy | 76 +--
.../BuildReceiptPerformanceTestRunner.groovy | 14 +-
.../fixture/CrossBuildPerformanceResults.groovy | 4 +
.../fixture/CrossBuildPerformanceTestRunner.groovy | 90 +--
.../CrossVersionPerformanceTestRunner.groovy | 54 +-
.../DefaultBuildExperimentInvocationInfo.java | 59 ++
.../fixture/GradleBuildExperimentSpec.groovy | 94 +++
.../fixture/GradleExecuterBackedSession.groovy | 2 +-
.../fixture/GradleInvocationCustomizer.java | 3 +-
.../fixture/GradleInvocationSpec.groovy | 49 +-
.../gradle/performance/fixture/GradleSession.java | 4 +-
.../GradleVsMavenBuildExperimentRunner.java | 87 +++
.../GradleVsMavenBuildPerformanceResults.groovy | 49 ++
.../GradleVsMavenPerformanceTestRunner.groovy | 99 +++
.../performance/fixture/InvocationCustomizer.java | 21 +
.../fixture/InvocationExecutorProvider.java | 20 +
.../performance/fixture/InvocationSpec.groovy | 30 +
.../fixture/MavenBuildExperimentSpec.groovy | 102 +++
.../performance/fixture/MavenInstallation.groovy | 61 ++
.../fixture/MavenInstallationDownloader.groovy | 89 +++
.../performance/fixture/MavenInvocationSpec.groovy | 158 +++++
.../performance/fixture/PerformanceTestResult.java | 5 +-
.../org/gradle/performance/fixture/Profiler.java | 2 +-
.../fixture/ToolingApiBackedGradleSession.groovy | 2 +-
.../performance/fixture/YourKitProfiler.groovy | 2 +-
.../performance/results/AllResultsStore.java | 5 +-
.../results/BaseCrossBuildResultsStore.java | 6 +-
.../results/BuildReceiptsResultsStore.java | 4 +-
.../results/CrossBuildResultsStore.java | 2 +-
.../results/CrossVersionResultsStore.java | 35 +-
.../results/GradleVsMavenBuildResultsStore.java | 29 +
.../performance/results/NoResultsStore.groovy | 47 ++
.../performance/results/ResultsStoreHelper.java | 63 ++
...iesWithComponentReferenceIntegrationTest.groovy | 60 ++
.../ComponentBinariesModelRuleExtractor.java | 10 +-
...AbstractAnnotationModelRuleExtractorTest.groovy | 7 -
.../ComponentBinariesModelRuleExtractorTest.groovy | 10 +-
.../toolchain/internal/NativeCompiler.java | 24 +-
.../internal/gcc/ArStaticLibraryArchiver.java | 16 +-
.../toolchain/internal/gcc/GccLinker.java | 18 +-
.../msvcpp/LibExeStaticLibraryArchiver.java | 21 +-
.../toolchain/internal/msvcpp/LinkExeLinker.java | 17 +-
.../toolchain/internal/NativeCompilerTest.groovy | 3 +-
.../toolchain/internal/gcc/GccLinkerTest.groovy | 16 +-
.../play/internal/run/PlayApplicationRunner.java | 12 +-
.../internal/run/PlayApplicationRunnerFactory.java | 5 +-
.../internal/toolchain/DefaultPlayToolChain.java | 9 +-
.../toolchain/DefaultPlayToolProvider.java | 10 +-
.../toolchain/PlayToolChainServiceRegistry.java | 6 +-
.../play/internal/DefaultPlayToolChainTest.groovy | 4 +-
.../toolchain/DefaultPlayToolProviderTest.groovy | 12 +-
.../plugin-development/plugin-development.gradle | 2 +
.../BaseGradleImplDepsIntegrationTest.groovy | 124 ++++
...adleImplDepsCompatibilityIntegrationTest.groovy | 207 ++++++
...GradleImplDepsConcurrencyIntegrationTest.groovy | 162 +++++
.../GradleImplDepsGenerationIntegrationTest.groovy | 73 ++
...GradleImplDepsPerformanceIntegrationTest.groovy | 68 ++
.../GradleImplDepsPublishingIntegrationTest.groovy | 131 ++++
.../GradleImplDepsVisibilityIntegrationTest.groovy | 125 ++++
...ePluginPluginTestKitSetupIntegrationTest.groovy | 124 ++++
.../PluginClasspathManifestIntegrationTest.groovy | 132 ----
.../PluginUnderTestMetadataIntegrationTest.groovy | 122 ++++
.../devel/GradlePluginDevelopmentExtension.java | 97 +++
.../java/org/gradle/plugin/devel/package-info.java | 20 +
.../devel/plugins/JavaGradlePluginPlugin.java | 82 ++-
.../internal/tasks/PluginClasspathManifest.java | 87 ---
.../gradle/plugin/devel/plugins/package-info.java | 4 +-
.../devel/tasks/PluginUnderTestMetadata.java | 108 +++
.../gradle/plugin/devel/tasks/package-info.java | 20 +
.../JavaGradlePluginPluginTestKitSetupTest.groovy | 166 +++++
...esolutionDeprecatedClientIntegrationTest.groovy | 7 +-
.../HttpPluginResolutionServiceClient.java | 4 +-
.../internal/PluginResolutionServiceClient.java | 4 +-
.../ApplicationPluginIntegrationTest.groovy | 61 +-
.../JavaLibraryDistributionIntegrationTest.groovy | 4 +-
.../DefaultTemplateBasedStartScriptGenerator.java | 6 +-
.../api/internal/plugins/unixStartScript.txt | 46 +-
.../api/internal/plugins/windowsStartScript.txt | 6 +-
.../plugins/UnixStartScriptGeneratorTest.groovy | 2 +-
.../api/reporting/CustomizableHtmlReport.java | 42 ++
.../org/gradle/api/reporting/DirectoryReport.java | 2 +-
.../internal/CustomizableHtmlReportImpl.java | 41 ++
.../reporting/internal/TaskReportContainer.java | 26 +-
.../http/ApacheDirectoryListingParser.java | 6 +-
.../transport/http/HttpClientConfigurer.java | 14 +-
.../transport/http/HttpResourceLister.java | 5 +-
.../http/ApacheDirectoryListingParserTest.groovy | 2 +-
.../transport/http/HttpClientConfigurerTest.groovy | 6 +-
.../resource/transport/aws/s3/S3Client.java | 6 +-
.../resource/transport/aws/s3/S3ClientTest.groovy | 2 +-
.../resource/transport/sftp/SftpClientFactory.java | 2 +-
.../resource/transport/sftp/SftpResource.java | 4 +-
.../transport/sftp/SftpResourceAccessor.java | 4 +-
.../transport/sftp/SftpResourceLister.java | 2 +-
.../transport/sftp/SftpResourceUploader.java | 5 +-
.../api/resources/MissingResourceException.java | 40 ++
.../gradle/api/resources/ResourceException.java | 65 ++
.../resource/AbstractExternalResource.java | 20 +-
.../gradle/internal/resource/CachingResource.java | 45 --
.../internal/resource/CachingTextResource.java | 92 +++
.../org/gradle/internal/resource/CharsetUtil.java | 25 -
.../internal/resource/DelegatingResource.java | 52 --
.../gradle/internal/resource/ExternalResource.java | 18 +-
.../resource/LocalFileStandInExternalResource.java | 8 +
.../org/gradle/internal/resource/Resource.java | 44 +-
.../internal/resource/ResourceException.java | 67 --
.../internal/resource/ResourceExceptions.java | 71 ++
.../resource/ResourceIsAFolderException.java | 30 +
.../gradle/internal/resource/ResourceLocation.java | 54 ++
.../resource/ResourceNotFoundException.java | 32 -
.../gradle/internal/resource/StringResource.java | 50 --
.../internal/resource/StringTextResource.java | 105 +++
.../org/gradle/internal/resource/TextResource.java | 100 +++
.../org/gradle/internal/resource/UriResource.java | 204 ------
.../gradle/internal/resource/UriTextResource.java | 266 ++++++++
.../local/AbstractLocallyAvailableResource.java | 10 +
.../DefaultLocallyAvailableExternalResource.java | 5 -
.../local/DefaultLocallyAvailableResource.java | 5 -
.../internal/resource/local/FileLocalResource.java | 4 +-
.../internal/resource/local/LocalResource.java | 2 +-
.../resource/local/LocallyAvailableResource.java | 3 +-
.../resource/transfer/DefaultExternalResource.java | 2 +-
.../transfer/ExternalResourceAccessor.java | 2 +-
.../resource/transfer/ExternalResourceLister.java | 2 +-
.../resource/AbstractExternalResourceTest.groovy | 17 +-
.../internal/resource/CachingResourceTest.groovy | 67 --
.../resource/CachingTextResourceTest.groovy | 88 +++
.../internal/resource/ResourceExceptionTest.groovy | 54 --
.../resource/ResourceExceptionsTest.groovy | 55 ++
.../internal/resource/StringResourceTest.groovy | 49 --
.../resource/StringTextResourceTest.groovy | 54 ++
.../internal/resource/UriResourceTest.groovy | 210 ------
.../internal/resource/UriTextResourceTest.groovy | 266 ++++++++
.../internal/tasks/scala/AntScalaCompiler.groovy | 7 +-
.../tasks/scala/ScalaCompileOptionsInternal.java | 42 ++
.../internal/tasks/scala/ScalaCompilerFactory.java | 7 +-
.../api/plugins/scala/ScalaBasePlugin.groovy | 4 +-
.../org/gradle/api/tasks/scala/ScalaCompile.java | 11 +-
.../api/tasks/scala/ScalaCompileOptions.java | 8 +-
.../signing/SigningTasksIntegrationSpec.groovy | 66 +-
.../gradle/plugins/signing/keys/subkey/keyId.txt | 1 +
.../plugins/signing/keys/subkey/password.txt | 1 +
.../gradle/plugins/signing/keys/subkey/secring.gpg | Bin 0 -> 2291 bytes
.../signatory/pgp/PgpSignatoryFactory.groovy | 34 +-
.../shared/javaProjectWithJacoco/build.gradle | 4 +
.../shared/javaProjectWithJacoco/build.gradle | 4 +
...DependencyClassVisibilityIntegrationTest.groovy | 82 +++
.../testkit/TestKitEndUserIntegrationTest.groovy | 674 ------------------
.../testkit/TestKitSamplesIntegrationTest.groovy | 67 --
.../runner/BaseGradleRunnerIntegrationTest.groovy | 311 +++++++++
.../GradleRunnerArgumentsIntegrationTest.groovy | 67 +-
.../GradleRunnerBuildFailureIntegrationTest.groovy | 157 +++--
...GradleRunnerCaptureOutputIntegrationTest.groovy | 62 +-
...GradleRunnerConfigurationIntegrationTest.groovy | 45 ++
...lPluginClasspathInjectionIntegrationTest.groovy | 123 ++++
.../GradleRunnerDaemonIntegrationTest.groovy | 120 ++++
...GradleRunnerGradleVersionIntegrationTest.groovy | 17 +-
.../runner/GradleRunnerIntegrationTest.groovy | 310 ---------
...radleRunnerIsolatedDaemonIntegrationTest.groovy | 188 -----
.../GradleRunnerIsolationIntegrationTest.groovy | 61 ++
...unnerManualClassInjectionIntegrationTest.groovy | 95 ---
...lPluginClasspathInjectionIntegrationTest.groovy | 49 ++
...leRunnerMechanicalFailureIntegrationTest.groovy | 83 ++-
...rPluginClasspathInjectionIntegrationTest.groovy | 370 ++++++++++
...adleRunnerPluginInjectionIntegrationTest.groovy | 496 --------------
.../GradleRunnerResultIntegrationTest.groovy | 27 +-
.../runner/GradleRunnerSmokeIntegrationTest.groovy | 106 ---
...UnsupportedFeatureFailureIntegrationTest.groovy | 52 +-
.../BaseTestKitEndUserIntegrationTest.groovy | 49 ++
...ClasspathInjectionEndUserIntegrationTest.groovy | 137 ++++
.../GradleRunnerMiscEndUserIntegationTest.groovy | 195 ++++++
...ClasspathInjectionEndUserIntegrationTest.groovy | 151 +++++
...radleRunnerSamplesEndUserIntegrationTest.groovy | 77 +++
.../runner/fixtures/CustomDaemonDirectory.java | 28 +
.../org/gradle/testkit/runner/fixtures/Debug.java | 28 +
.../runner/fixtures/InjectsPluginClasspath.java | 25 +
.../runner/fixtures/InspectsBuildOutput.java | 25 +
.../runner/fixtures/InspectsExecutedTasks.java | 25 +
.../gradle/testkit/runner/fixtures/NoDebug.java | 28 +
.../testkit/runner/fixtures/NonCrossVersion.java | 28 +
.../testkit/runner/fixtures/PluginUnderTest.groovy | 205 ++++++
.../testkit/runner/fixtures/annotations/Debug.java | 28 -
.../annotations/InjectsPluginClasspath.java | 25 -
.../fixtures/annotations/InspectsBuildOutput.java | 25 -
.../annotations/InspectsExecutedTasks.java | 25 -
.../runner/fixtures/annotations/NoDebug.java | 28 -
.../fixtures/annotations/NonCrossVersion.java | 28 -
.../org/gradle/testkit/runner/GradleRunner.java | 27 +
.../runner/InvalidPluginMetadataException.java | 33 +
.../runner/internal/DefaultGradleRunner.java | 53 +-
.../runner/internal/GradleExecutionParameters.java | 11 +-
.../testkit/runner/internal/GradleProvider.java | 99 +++
.../internal/PluginUnderTestMetadataReading.java | 76 +++
.../runner/internal/TempTestKitDirProvider.java | 10 +-
.../runner/internal/ToolingApiGradleExecutor.java | 23 +-
.../runner/internal/dist/GradleDistribution.java | 20 -
.../internal/dist/InstalledGradleDistribution.java | 32 -
.../dist/URILocatedGradleDistribution.java | 32 -
.../dist/VersionBasedGradleDistribution.java | 30 -
.../internal/TempTestKitDirProviderTest.groovy | 19 +-
subprojects/test-kit/test-kit.gradle | 4 +-
.../tasks/testing/logging/TestCountLogger.java | 4 +-
.../testing/worker/ForkingTestClassProcessor.java | 38 +-
.../tasks/testing/worker/TestEventSerializer.java | 6 +-
.../internal/tasks/testing/worker/TestWorker.java | 2 +-
.../testing/logging/TestCountLoggerTest.groovy | 16 +-
.../worker/ForkingTestClassProcessorTest.groovy | 39 +-
.../testing/worker/TestEventSerializerTest.groovy | 103 ++-
.../tasks/testing/worker/TestWorkerTest.groovy | 2 +-
.../TestProgressLoggingIntegrationTest.groovy | 141 ++++
.../AbstractTestFilteringIntegrationTest.groovy | 61 +-
.../testing/detection/DefaultTestExecuter.java | 11 +-
.../testing/junit/report/ClassTestResults.java | 4 +-
.../testing/junit/report/DefaultTestReport.java | 58 +-
.../result/Binary2JUnitXmlReportGenerator.java | 72 +-
.../BinaryResultBackedTestResultsProvider.java | 44 +-
.../junit/result/InMemoryTestResultsProvider.java | 46 +-
.../testing/junit/result/JUnitXmlResultWriter.java | 3 +
.../TestOutputStoreBackedResultsProvider.java | 43 ++
.../java/org/gradle/api/tasks/testing/Test.java | 30 +-
.../org/gradle/api/tasks/testing/TestReport.java | 9 +-
.../detection/DefaultTestExecuterTest.groovy | 7 +-
.../junit/report/DefaultTestReportTest.groovy | 59 +-
.../Binary2JUnitXmlReportGeneratorSpec.groovy | 42 +-
.../runner/CompositeBuildModelActionRunner.java | 213 ++++++
.../provider/runner/ToolingBuilderServices.java | 6 +
.../tooling/AutoTestedSamplesToolingApiTest.groovy | 4 +-
.../SamplesCompositeBuildIntegrationTest.groovy | 72 ++
.../SamplesToolingApiIntegrationTest.groovy | 30 +
.../fixture/AbstractToolingApiSpecification.groovy | 94 ---
.../tooling/fixture/ProgressEvents.groovy | 240 -------
.../integtests/tooling/fixture/ToolingApi.groovy | 199 ------
.../ToolingApiCompatibilitySuiteRunner.groovy | 171 -----
.../tooling/fixture/ToolingApiSpecification.groovy | 150 ----
.../tooling/fixture/ToolingApiVersions.java | 31 -
.../r112/PublicationsCrossVersionSpec.groovy | 2 +-
.../tooling/r18/BuildActionCrossVersionSpec.groovy | 16 +-
.../tooling/r18/FetchBuildEnvironment.java | 27 +
...oolingModelSerializationCrossVersionSpec.groovy | 3 +-
...raryModelsCompositeBuildCrossVersionSpec.groovy | 247 +++++++
...entPassingCompositeBuildCrossVersionSpec.groovy | 222 ++++++
...ncellationCompositeBuildCrossVersionSpec.groovy | 185 +++++
...oordinatorCompositeBuildCrossVersionSpec.groovy | 53 ++
...ecuteBuildCompositeBuildCrossVersionSpec.groovy | 377 +++++++++++
...delBuilderCompositeBuildCrossVersionSpec.groovy | 51 ++
...erogeneousCompositeBuildCrossVersionSpec.groovy | 165 +++++
...odelResultCompositeBuildCrossVersionSpec.groovy | 232 +++++++
...ithGradleBuildIdentifierCrossVersionSpec.groovy | 96 +++
.../ModelsWithGradleProjectCrossVersionSpec.groovy | 276 ++++++++
...hGradleProjectIdentifierCrossVersionSpec.groovy | 141 ++++
...ltiProjectCompositeBuildCrossVersionSpec.groovy | 170 +++++
...ssListenerCompositeBuildCrossVersionSpec.groovy | 203 ++++++
...gleProjectCompositeBuildCrossVersionSpec.groovy | 138 ++++
.../SmokeCompositeBuildCrossVersionSpec.groovy | 118 ++++
...dardStreamCompositeBuildCrossVersionSpec.groovy | 194 ++++++
.../r22/ClientShutdownCrossVersionSpec.groovy | 3 +-
.../r26/TestLauncherCrossVersionSpec.groovy | 1 +
.../java/org/gradle/tooling/GradleConnector.java | 13 +
.../tooling/connection/FailedModelResult.java | 46 ++
.../tooling/connection/GradleConnection.java | 133 ++++
.../connection/GradleConnectionBuilder.java | 108 +++
.../org/gradle/tooling/connection/ModelResult.java | 47 ++
.../gradle/tooling/connection/ModelResults.java | 27 +
.../gradle/tooling/connection/package-info.java | 20 +
.../tooling/internal/adapter/MethodInvocation.java | 9 +
.../internal/adapter/ProtocolToModelAdapter.java | 372 +++++++---
.../connection/CompositeBuildLauncher.java | 25 +
.../connection/DefaultBuildIdentifier.java | 59 ++
.../connection/DefaultCompositeModelBuilder.java | 116 ++++
.../connection/DefaultFailedModelResult.java | 65 ++
.../connection/DefaultGradleConnection.java | 68 ++
.../connection/DefaultGradleConnectionBuilder.java | 156 +++++
.../internal/connection/DefaultModelResult.java | 43 ++
.../connection/DefaultProjectIdentifier.java | 71 ++
.../connection/GradleConnectionBuildLauncher.java | 84 +++
.../GradleConnectionBuilderInternal.java | 28 +
.../connection/GradleConnectionFactory.java | 62 ++
.../internal/connection/ParticipantConnector.java | 98 +++
.../ToolingClientCompositeBuildLauncher.java | 61 ++
.../ToolingClientCompositeModelBuilder.java | 263 +++++++
.../connection/ToolingClientCompositeUtil.java | 38 ++
.../ToolingClientConsumerConnection.java | 65 ++
.../consumer/AbstractConnectionParameters.java | 110 +++
.../consumer/AbstractLongRunningOperation.java | 4 +
.../internal/consumer/BlockingResultHandler.java | 2 +-
.../consumer/CompositeConnectionParameters.java | 24 +
.../internal/consumer/ConnectionFactory.java | 10 +-
.../internal/consumer/ConnectionParameters.java | 7 -
.../internal/consumer/ConnectorServices.java | 20 +
.../consumer/DefaultBuildActionExecuter.java | 28 +-
.../internal/consumer/DefaultBuildLauncher.java | 19 +-
.../DefaultCompositeConnectionParameters.java | 71 ++
.../consumer/DefaultConnectionParameters.java | 99 +--
.../internal/consumer/DefaultGradleConnector.java | 2 +-
.../internal/consumer/DefaultModelBuilder.java | 24 +-
.../consumer/DefaultProjectConnection.java | 6 +-
.../internal/consumer/DefaultTestLauncher.java | 12 +-
.../internal/consumer/ExceptionTransformer.java | 62 ++
.../consumer/ProjectConnectionBuildLauncher.java | 27 +
.../consumer/ProjectConnectionParameters.java | 27 +
.../internal/consumer/ResultHandlerAdapter.java | 36 +-
.../connection/AbstractConsumerConnection.java | 8 +-
.../connection/ActionAwareConsumerConnection.java | 3 +-
.../BuildActionRunnerBackedConsumerConnection.java | 15 +-
.../CancellableConsumerActionExecutor.java | 47 ++
.../connection/CancellableConsumerConnection.java | 8 +-
...CancellableModelBuilderBackedModelProducer.java | 10 +-
.../consumer/connection/ConsumerConnection.java | 4 +
.../connection/GradleBuildAdapterProducer.java | 6 +-
.../connection/HasCompatibilityMapperAction.java | 37 +-
.../connection/InternalBuildActionAdapter.java | 4 +-
...InternalConnectionBackedConsumerConnection.java | 14 +-
.../connection/LazyConsumerActionExecutor.java | 4 -
.../ModelBuilderBackedConsumerConnection.java | 4 +-
.../ModelBuilderBackedModelProducer.java | 2 +-
.../consumer/connection/MultiModelProducer.java | 24 +
.../connection/NoToolingApiConnection.java | 8 +-
.../NonCancellableConsumerConnectionAdapter.java | 6 +
.../UnsupportedOlderVersionConnection.java | 6 +
.../BasicGradleProjectIdentifierMixin.java | 33 +
.../converters/BuildInvocationsConverter.java | 4 +
.../converters/FixedBuildIdentifierProvider.java | 50 ++
.../converters/GradleProjectIdentifierMapping.java | 37 +
.../converters/GradleProjectIdentifierMixin.java | 33 +
.../parameters/ConsumerOperationParameters.java | 80 ++-
.../internal/consumer/versioning/ModelMapping.java | 2 +
.../org/gradle/tooling/model/BuildIdentifier.java | 31 +
.../org/gradle/tooling/model/GradleProject.java | 7 +
.../java/org/gradle/tooling/model/Launchable.java | 8 +
.../gradle/tooling/model/ProjectIdentifier.java | 37 +
.../tooling/model/build/BuildEnvironment.java | 9 +
.../tooling/model/eclipse/EclipseProject.java | 2 +-
.../model/eclipse/HierarchicalEclipseProject.java | 4 +-
.../tooling/model/gradle/BasicGradleProject.java | 9 +
.../tooling/model/gradle/BuildInvocations.java | 15 +-
.../gradle/tooling/model/gradle/GradleBuild.java | 9 +
.../tooling/model/gradle/ProjectPublications.java | 9 +
.../DefaultCompositeModelBuilderTest.groovy | 41 ++
.../DefaultGradleConnectionBuilderTest.groovy | 119 ++++
.../connection/DefaultGradleConnectionTest.groovy | 50 ++
.../GradleConnectionBuildLauncherTest.groovy | 37 +
.../internal/consumer/ConnectorServicesTest.groovy | 7 +-
.../consumer/DefaultBuildLauncherTest.groovy | 12 +-
.../consumer/DefaultModelBuilderTest.groovy | 4 +-
.../consumer/DefaultProjectConnectionTest.groovy | 4 +-
...ActionRunnerBackedConsumerConnectionTest.groovy | 2 +-
.../CancellableConsumerActionExecutorTest.groovy | 56 ++
.../GradleBuildAdapterProducerTest.groovy | 20 +-
...alConnectionBackedConsumerConnectionTest.groovy | 2 +-
.../LazyConsumerActionExecutorTest.groovy | 19 -
...ModelBuilderBackedConsumerConnectionTest.groovy | 2 +-
.../ConsumerOperationParametersTest.groovy | 11 +-
.../fixture/AbstractToolingApiSpecification.groovy | 99 +++
.../CompositeToolingApiSpecification.groovy | 182 +++++
.../tooling/fixture/ConfigurableOperation.groovy | 0
.../ContinuousBuildToolingApiSpecification.groovy | 0
.../fixture/ExternalToolingApiDistribution.groovy | 0
.../tooling/fixture/GradleBuildCancellation.groovy | 0
.../tooling/fixture/ProgressEvents.groovy | 241 +++++++
.../tooling/fixture/TargetGradleVersion.java | 0
.../TestClasspathToolingApiDistribution.groovy | 0
.../integtests/tooling/fixture/TextUtil.java | 0
.../integtests/tooling/fixture/ToolingApi.groovy | 212 ++++++
.../fixture/ToolingApiClasspathProvider.groovy | 80 +++
.../ToolingApiCompatibilitySuiteRunner.groovy | 136 ++++
.../tooling/fixture/ToolingApiDistribution.groovy | 0
.../fixture/ToolingApiDistributionResolver.groovy | 0
.../fixture/ToolingApiLoggingSpecification.groovy | 0
.../tooling/fixture/ToolingApiSpecification.groovy | 145 ++++
.../tooling/fixture/ToolingApiVersion.java | 0
.../tooling/fixture/ToolingApiVersions.java | 32 +
subprojects/tooling-api/tooling-api.gradle | 8 +-
.../gradleplugin/foundation/GradlePluginLord.java | 6 +-
.../gradle/wrapper/SystemPropertiesHandler.java | 9 +-
version.txt | 2 +-
1264 files changed, 35069 insertions(+), 22365 deletions(-)
--
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