This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle-1.12.
commit 674958d1738534418e60aeb0da4ed1758cd09a28 Merge: 8ee6d1d 586da5d Author: Damien Raude-Morvan <[email protected]> Date: Sun Nov 25 19:35:20 2012 +0100 Merge tag 'upstream/1.3' Upstream version 1.3 build.gradle | 510 +++------------ buildSrc/build.gradle | 7 +- .../main/groovy/org/gradle/build/BuildTypes.groovy | 77 +++ .../src/main/groovy/org/gradle/build/JarJar.groovy | 31 +- .../gradle/build/docs/BuildableDOMCategory.groovy | 3 +- .../build/docs/UserGuideTransformTask.groovy | 4 +- .../gradle/build/docs/dsl/ClassLinkMetaData.java | 164 ----- .../build/docs/dsl/ExtractDslMetaDataTask.groovy | 144 ----- .../org/gradle/build/docs/dsl/LinkMetaData.java | 44 -- .../build/docs/dsl/SourceMetaDataVisitor.java | 496 -------------- .../gradle/build/docs/dsl/TypeNameResolver.java | 167 ----- .../docs/dsl/docbook/AssembleDslDocTask.groovy | 47 +- .../build/docs/dsl/docbook/BasicJavadocLexer.java | 1 + .../docs/dsl/docbook/BlockDetailRenderer.java | 87 +++ .../gradle/build/docs/dsl/docbook/BlockDoc.groovy | 69 -- .../build/docs/dsl/docbook/BlockTableRenderer.java | 76 +++ .../build/docs/dsl/docbook/BlocksRenderer.java | 91 +++ .../docs/dsl/docbook/ClassDescriptionRenderer.java | 62 ++ .../gradle/build/docs/dsl/docbook/ClassDoc.groovy | 343 ---------- .../build/docs/dsl/docbook/ClassDocBuilder.java | 50 ++ .../docs/dsl/docbook/ClassDocCommentBuilder.java | 36 ++ .../dsl/docbook/ClassDocExtensionsBuilder.java | 106 +++ .../docs/dsl/docbook/ClassDocMethodsBuilder.java | 92 +++ .../dsl/docbook/ClassDocPropertiesBuilder.java | 130 ++++ .../build/docs/dsl/docbook/ClassDocRenderer.groovy | 443 ------------- .../build/docs/dsl/docbook/ClassDocRenderer.java | 61 ++ .../docs/dsl/docbook/ClassDocSuperTypeBuilder.java | 69 ++ .../docs/dsl/docbook/ClassExtensionDoc.groovy | 95 --- .../build/docs/dsl/docbook/DocBookBuilder.java | 93 +++ .../gradle/build/docs/dsl/docbook/DocComment.java | 6 +- .../build/docs/dsl/docbook/DslDocModel.groovy | 76 ++- .../build/docs/dsl/docbook/DslElementDoc.java | 33 - .../docs/dsl/docbook/ElementWarningsRenderer.java | 52 ++ .../docbook/ExtensionBlocksSummaryRenderer.java | 68 ++ .../docbook/ExtensionMethodsSummaryRenderer.java | 68 ++ .../ExtensionPropertiesSummaryRenderer.java | 68 ++ .../docs/dsl/docbook/ExtraAttributeDoc.groovy | 45 -- .../docs/dsl/docbook/HtmlToXmlJavadocLexer.java | 110 +++- .../build/docs/dsl/docbook/JavadocConverter.java | 287 ++++----- .../build/docs/dsl/docbook/JavadocLexer.java | 3 + .../docs/dsl/docbook/JavadocLinkConverter.java | 8 +- .../build/docs/dsl/docbook/LinkRenderer.java | 4 +- .../docs/dsl/docbook/MethodDetailRenderer.java | 69 ++ .../gradle/build/docs/dsl/docbook/MethodDoc.groovy | 68 -- .../docs/dsl/docbook/MethodTableRenderer.java | 86 +++ .../build/docs/dsl/docbook/MethodsRenderer.java | 91 +++ .../docs/dsl/docbook/ModelBuilderSupport.java | 63 ++ .../build/docs/dsl/docbook/PropertiesRenderer.java | 91 +++ .../docs/dsl/docbook/PropertyDetailRenderer.java | 81 +++ .../build/docs/dsl/docbook/PropertyDoc.groovy | 81 --- .../docs/dsl/docbook/PropertyTableRenderer.java | 76 +++ .../docs/dsl/docbook/ReferencedTypeBuilder.java | 40 ++ .../build/docs/dsl/docbook/model/BlockDoc.groovy | 73 +++ .../build/docs/dsl/docbook/model/ClassDoc.groovy | 176 +++++ .../dsl/docbook/model/ClassExtensionDoc.groovy | 82 +++ .../docbook/model/ClassExtensionMetaData.groovy | 34 + .../docs/dsl/docbook/model/DslElementDoc.java | 33 + .../dsl/docbook/model/ExtensionMetaData.groovy | 28 + .../dsl/docbook/model/ExtraAttributeDoc.groovy | 46 ++ .../build/docs/dsl/docbook/model/MethodDoc.groovy | 74 +++ .../docs/dsl/docbook/model/MixinMetaData.groovy | 26 + .../docs/dsl/docbook/model/PropertyDoc.groovy | 91 +++ .../build/docs/dsl/links/ClassLinkMetaData.java | 164 +++++ .../gradle/build/docs/dsl/links/LinkMetaData.java | 44 ++ .../docs/dsl/model/AbstractLanguageElement.java | 65 -- .../docs/dsl/model/ClassExtensionMetaData.groovy | 34 - .../gradle/build/docs/dsl/model/ClassMetaData.java | 262 -------- .../build/docs/dsl/model/ExtensionMetaData.groovy | 28 - .../build/docs/dsl/model/LanguageElement.java | 28 - .../build/docs/dsl/model/MethodMetaData.java | 142 ---- .../build/docs/dsl/model/MixinMetaData.groovy | 26 - .../build/docs/dsl/model/ParameterMetaData.java | 55 -- .../build/docs/dsl/model/PropertyMetaData.java | 111 ---- .../gradle/build/docs/dsl/model/TypeContainer.java | 22 - .../gradle/build/docs/dsl/model/TypeMetaData.java | 186 ------ .../docs/dsl/source/ExtractDslMetaDataTask.groovy | 144 +++++ .../docs/dsl/source/SourceMetaDataVisitor.java | 496 ++++++++++++++ .../build/docs/dsl/source/TypeNameResolver.java | 167 +++++ .../dsl/source/model/AbstractLanguageElement.java | 65 ++ .../build/docs/dsl/source/model/ClassMetaData.java | 283 ++++++++ .../docs/dsl/source/model/LanguageElement.java | 28 + .../docs/dsl/source/model/MethodMetaData.java | 135 ++++ .../docs/dsl/source/model/ParameterMetaData.java | 56 ++ .../docs/dsl/source/model/PropertyMetaData.java | 104 +++ .../build/docs/dsl/source/model/TypeContainer.java | 22 + .../build/docs/dsl/source/model/TypeMetaData.java | 193 ++++++ .../docs/model/SimpleClassMetaDataRepository.java | 1 + .../build/integtest/IntegTestConvention.groovy | 49 -- .../gradle/build/integtest/IntegTestPlugin.groovy | 26 - .../gradle/plugins/jsoup/JsoupFilterReader.groovy | 58 -- .../org/gradle/build/docs/XmlSpecification.groovy | 9 +- .../docs/dsl/ExtractDslMetaDataTaskTest.groovy | 717 --------------------- .../build/docs/dsl/TypeNameResolverTest.groovy | 178 ----- .../docs/dsl/docbook/BasicJavadocLexerTest.groovy | 12 + .../docbook/ClassDocExtensionsBuilderTest.groovy | 180 ++++++ .../dsl/docbook/ClassDocMethodsBuilderTest.groovy | 193 ++++++ .../docbook/ClassDocPropertiesBuilderTest.groovy | 170 +++++ .../docs/dsl/docbook/ClassDocRendererTest.groovy | 421 ++++++++---- .../build/docs/dsl/docbook/ClassDocTest.groovy | 367 ----------- .../dsl/docbook/HtmlToXmlJavadocLexerTest.groovy | 171 +++++ .../docs/dsl/docbook/JavadocConverterTest.groovy | 35 +- .../dsl/docbook/JavadocLinkConverterTest.groovy | 6 +- .../build/docs/dsl/docbook/LinkRendererTest.groovy | 6 +- .../build/docs/dsl/model/ClassMetaDataTest.groovy | 41 -- .../build/docs/dsl/model/MethodMetaDataTest.groovy | 163 ----- .../docs/dsl/model/ParameterMetaDataTest.groovy | 30 - .../docs/dsl/model/PropertyMetaDataTest.groovy | 134 ---- .../build/docs/dsl/model/TypeMetaDataTest.groovy | 183 ------ .../dsl/source/ExtractDslMetaDataTaskTest.groovy | 717 +++++++++++++++++++++ .../docs/dsl/source/TypeNameResolverTest.groovy | 178 +++++ .../docs/dsl/source/model/ClassMetaDataTest.groovy | 41 ++ .../dsl/source/model/MethodMetaDataTest.groovy | 151 +++++ .../dsl/source/model/ParameterMetaDataTest.groovy | 30 + .../dsl/source/model/PropertyMetaDataTest.groovy | 122 ++++ .../docs/dsl/source/model/TypeMetaDataTest.groovy | 183 ++++++ config/checkstyle/checkstyle-groovy.xml | 6 + config/checkstyle/checkstyle.xml | 5 +- config/checkstyle/suppressions.xml | 4 + gradle/buildReceipt.gradle | 127 ++++ gradle/classycle.gradle | 61 +- gradle/compile.gradle | 2 + gradle/conventions-dsl.gradle | 18 - gradle/dependencies.gradle | 145 +++++ gradle/eclipse.gradle | 24 +- gradle/groovyProject.gradle | 70 +- gradle/idea.gradle | 29 +- gradle/incomingDistributions.gradle | 37 ++ gradle/intTestImage.gradle | 47 ++ gradle/integTest.gradle | 104 ++- ...oDependencyResolutionDuringConfiguration.gradle | 14 + gradle/publish.gradle | 10 +- gradle/testWithUnknownOS.gradle | 1 + gradle/versioning.gradle | 15 +- gradle/wrapper.gradle | 40 ++ gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 4 +- settings.gradle | 8 +- subprojects/announce/announce.gradle | 4 +- .../internal/AnnouncerUnavailableException.groovy | 29 - .../internal/AnnouncerUnavailableException.java | 29 + .../base-services-groovy.gradle | 24 + .../gradle/api/InvalidActionClosureException.java | 67 ++ .../main/groovy/org/gradle/api/package-info.java | 26 + .../main/groovy/org/gradle/api/specs/AndSpec.java | 62 ++ .../org/gradle/api/specs/internal/ClosureSpec.java | 0 .../groovy/org/gradle/api/specs/package-info.java | 20 + .../api/internal/ClosureBackedActionTest.groovy | 91 +++ .../api/specs/AbstractCompositeSpecTest.java | 71 ++ .../groovy/org/gradle/api/specs/AndSpecTest.java | 57 ++ .../groovy/org/gradle/api/specs/NotSpecTest.java | 37 ++ .../groovy/org/gradle/api/specs/OrSpecTest.java | 46 ++ subprojects/base-services/base-services.gradle | 3 +- .../src/main/java/org/gradle/api/Experimental.java | 30 - .../main/java}/org/gradle/api/GradleException.java | 0 .../src/main/java/org/gradle/api/Incubating.java | 30 + .../src/main/java/org/gradle/api/JavaVersion.java | 5 +- .../src/main/java}/org/gradle/api/Named.java | 0 .../src/main/java}/org/gradle/api/Namer.java | 0 .../src/main/java}/org/gradle/api/Transformer.java | 0 .../java/org/gradle/api/UncheckedIOException.java | 36 ++ .../main/java/org/gradle/api/internal/Actions.java | 174 +++++ .../main/java/org/gradle/api/internal/Cast.java | 46 ++ .../org/gradle/api/internal/ErroringAction.java | 44 ++ .../gradle/api/internal/HasInternalProtocol.java | 35 + .../java/org/gradle/api/internal/IoActions.java | 93 +++ .../java/org/gradle/api/internal/Transformers.java | 95 +++ .../java/org/gradle/api/specs/CompositeSpec.java | 69 ++ .../main/java/org/gradle/api/specs/NotSpec.java | 34 + .../src/main/java/org/gradle/api/specs/OrSpec.java | 49 ++ .../src/main/java}/org/gradle/api/specs/Spec.java | 0 .../org/gradle/internal/CompositeStoppable.java | 11 +- .../main/java/org/gradle/internal/Factories.java | 27 + .../java/org/gradle/internal/SystemProperties.java | 40 +- .../internal/classpath/DefaultClassPath.java | 5 + .../concurrent/DefaultExecutorFactory.java | 2 +- .../src/main/java/org/gradle/internal/jvm/Jvm.java | 8 - .../internal/reflect/DirectInstantiator.java | 6 +- .../org/gradle/internal/reflect/Instantiator.java | 4 +- .../reflect/ObjectInstantiationException.java | 23 + .../internal/service/AbstractServiceRegistry.java | 74 +++ .../internal/service/DefaultServiceRegistry.java | 14 +- .../gradle/internal/service/ServiceLocator.java | 11 +- .../gradle/internal/service/ServiceRegistry.java | 14 +- .../service/SynchronizedServiceRegistry.java | 10 + .../main/java/org/gradle/util/CollectionUtils.java | 418 ++++++++++++ .../groovy/org/gradle/api/JavaVersionSpec.groovy | 2 + .../org/gradle/api/internal/ActionsTest.groovy | 133 ++++ .../groovy/org/gradle/api/internal/CastTest.groovy | 44 ++ .../gradle/api/internal/ErroringActionTest.groovy | 52 ++ .../org/gradle/api/internal/IoActionsTest.groovy | 94 +++ .../gradle/api/internal/TransformersTest.groovy | 74 +++ .../org/gradle/internal/FactoriesTest.groovy | 35 + .../gradle/internal/SystemPropertiesTest.groovy | 27 + .../internal/reflect/DirectInstantiatorTest.groovy | 38 +- .../service/DefaultServiceRegistryTest.java | 103 ++- .../org/gradle/util/CollectionUtilsTest.groovy | 273 ++++++++ .../build-comparison/build-comparison.gradle | 37 ++ .../gradle/BuildComparisonIntegrationSpec.groovy | 307 +++++++++ ...Pre12CompareGradleBuildsCrossVersionSpec.groovy | 178 +++++ .../compareArchives/source/build.gradle | 1 + .../compareArchives/source/settings.gradle | 2 + .../source/src/main/java/org/gradle/Changed.java | 8 + .../src/main/java/org/gradle/DifferentCrc.java | 8 + .../src/main/java/org/gradle/SourceBuildOnly.java | 3 + .../source/src/main/java/org/gradle/Unchanged.java | 8 + .../compareArchives/target/build.gradle | 2 + .../compareArchives/target/settings.gradle | 2 + .../target/src/main/java/org/gradle/Changed.java | 10 + .../src/main/java/org/gradle/DifferentCrc.java | 8 + .../src/main/java/org/gradle/TargetBuildOnly.java | 3 + .../target/src/main/java/org/gradle/Unchanged.java | 8 + .../compare/internal/BuildComparator.java | 32 + .../compare/internal/BuildComparisonResult.java | 66 ++ .../compare/internal/BuildComparisonSpec.java | 60 ++ .../internal/BuildComparisonSpecBuilder.java | 35 + .../internal/BuildComparisonSpecFactory.java | 65 ++ .../compare/internal/BuildOutcomeComparator.java | 45 ++ .../internal/BuildOutcomeComparatorFactory.java | 24 + .../internal/BuildOutcomeComparisonResult.java | 44 ++ .../BuildOutcomeComparisonResultSupport.java | 38 ++ .../compare/internal/ComparisonResultType.java | 29 + .../compare/internal/DefaultBuildComparator.java | 77 +++ .../internal/DefaultBuildComparisonSpec.java | 47 ++ .../DefaultBuildComparisonSpecBuilder.java | 55 ++ .../DefaultBuildOutcomeComparatorFactory.java | 41 ++ .../gradle/CompareGradleBuilds.java | 263 ++++++++ .../gradle/CompareGradleBuildsPlugin.groovy | 42 ++ .../gradle/GradleBuildInvocationSpec.java | 104 +++ .../internal/ComparableGradleBuildExecuter.java | 102 +++ .../internal/DefaultGradleBuildInvocationSpec.java | 129 ++++ .../gradle/internal/GradleBuildComparison.java | 275 ++++++++ .../internal/GradleBuildOutcomeSetInferrer.java | 73 +++ .../internal/GradleBuildOutcomeSetTransformer.java | 95 +++ .../buildcomparison/gradle/package-info.java | 20 + .../outcome/internal/BuildOutcome.java | 33 + .../outcome/internal/BuildOutcomeAssociation.java | 50 ++ .../outcome/internal/BuildOutcomeAssociator.java | 30 + .../outcome/internal/BuildOutcomeSupport.java | 36 ++ ...ypeAndCharacteristicBuildOutcomeAssociator.java | 49 ++ .../ByTypeAndNameBuildOutcomeAssociator.java | 29 + .../internal/CompositeBuildOutcomeAssociator.java | 41 ++ .../internal/DefaultBuildOutcomeAssociation.java | 42 ++ .../archive/GeneratedArchiveBuildOutcome.java | 54 ++ .../GeneratedArchiveBuildOutcomeComparator.java | 91 +++ ...neratedArchiveBuildOutcomeComparisonResult.java | 67 ++ ...BuildOutcomeComparisonResultHtmlRenderer.groovy | 150 +++++ ...GeneratedArchiveBuildOutcomeHtmlRenderer.groovy | 46 ++ .../internal/archive/entry/ArchiveEntry.java | 94 +++ .../archive/entry/ArchiveEntryComparison.java | 59 ++ .../entry/FileToArchiveEntrySetTransformer.java | 68 ++ .../entry/ZipEntryToArchiveEntryTransformer.java | 33 + .../internal/unknown/UnknownBuildOutcome.java | 30 + .../unknown/UnknownBuildOutcomeComparator.java | 32 + .../UnknownBuildOutcomeComparisonResult.java | 31 + ...BuildOutcomeComparisonResultHtmlRenderer.groovy | 38 ++ .../unknown/UnknownBuildOutcomeHtmlRenderer.groovy | 34 + .../internal/BuildComparisonResultRenderer.java | 30 + .../BuildOutcomeComparisonResultRenderer.java | 35 + ...uildOutcomeComparisonResultRendererFactory.java | 25 + .../render/internal/BuildOutcomeRenderer.java | 35 + .../internal/BuildOutcomeRendererFactory.java | 25 + ...uildOutcomeComparisonResultRendererFactory.java | 49 ++ .../DefaultBuildOutcomeRendererFactory.java | 50 ++ ...BuildOutcomeComparisonResultHtmlRenderer.groovy | 34 + .../internal/html/BuildOutcomeHtmlRenderer.groovy | 30 + .../GradleBuildComparisonResultHtmlRenderer.groovy | 303 +++++++++ .../render/internal/html/HtmlRenderContext.java | 73 +++ .../compare-gradle-builds.properties | 1 + .../internal/BuildComparisonSpecFactoryTest.groovy | 56 ++ .../internal/DefaultBuildComparatorTest.groovy | 86 +++ ...DefaultBuildOutcomeComparatorFactoryTest.groovy | 94 +++ .../DefaultGradleBuildInvocationSpecTest.groovy | 61 ++ .../GradleBuildOutcomeSetInferrerTest.groovy | 95 +++ .../GradleBuildOutcomeSetTransformerTest.groovy | 114 ++++ .../ByTypeAndNameBuildOutcomeAssociatorTest.groovy | 47 ++ ...neratedArchiveBuildOutcomeComparatorTest.groovy | 129 ++++ .../entry/ArchiveEntryComparisonTest.groovy | 72 +++ .../internal/archive/entry/ArchiveEntryTest.groovy | 51 ++ .../FileToArchiveEntrySetTransformerTest.groovy | 66 ++ .../ZipEntryToArchiveEntryTransformerTest.groovy | 63 ++ ...tcomeComparisonResultRendererFactoryTest.groovy | 58 ++ ...dleBuildComparisonResultHtmlRendererTest.groovy | 127 ++++ .../fixtures/MutableDomainObjectSet.groovy | 29 + .../fixtures/MutableProjectOutcomes.groovy | 72 +++ .../fixtures/ProjectOutcomesBuilder.groovy | 32 + .../outcome/string/StringBuildOutcome.groovy | 69 ++ .../string/StringBuildOutcomeComparator.groovy | 32 + .../StringBuildOutcomeComparisonResult.groovy | 37 ++ ...BuildOutcomeComparisonResultHtmlRenderer.groovy | 44 ++ ...gBuildOutcomeComparisonResultMapRenderer.groovy | 36 ++ .../string/StringBuildOutcomeHtmlRenderer.groovy | 31 + subprojects/cli/cli.gradle | 6 +- .../java/org/gradle/cli/CommandLineOption.java | 10 +- .../org/gradle/cli/ParsedCommandLineOption.java | 6 +- .../org/gradle/cli/CommandLineParserTest.groovy | 38 +- .../gradle/cli/ParsedCommandLineOptionSpec.groovy | 62 ++ subprojects/code-quality/code-quality.gradle | 5 +- ...toTestedSampleCodeQualityIntegrationTest.groovy | 28 + .../quality/FindBugsPluginIntegrationTest.groovy | 68 +- .../internal/FindBugsSpecBuilderTest.groovy | 101 ++- .../gradle/api/plugins/quality/Checkstyle.groovy | 15 +- .../org/gradle/api/plugins/quality/CodeNarc.groovy | 13 +- .../org/gradle/api/plugins/quality/FindBugs.groovy | 117 +++- .../api/plugins/quality/FindBugsExtension.groovy | 59 +- .../api/plugins/quality/FindBugsPlugin.groovy | 9 +- .../org/gradle/api/plugins/quality/JDepend.groovy | 13 +- .../org/gradle/api/plugins/quality/Pmd.groovy | 11 +- .../quality/internal/findbugs/FindBugsSpec.java | 18 +- .../internal/findbugs/FindBugsSpecBuilder.java | 117 +++- .../internal/findbugs/FindBugsWorkerManager.groovy | 15 +- .../internal/findbugs/FindBugsWorkerServer.java | 2 +- .../api/plugins/quality/FindBugsPluginTest.groovy | 62 +- .../gradle/api/plugins/quality/FindBugsTest.groovy | 78 +-- subprojects/core-impl/core-impl.gradle | 60 +- .../DefaultDependencyManagementServices.java | 83 ++- .../artifacts/DefaultResolvedArtifact.java | 31 +- .../ivyservice/ArtifactResolveResult.java | 7 + .../artifacts/ivyservice/ArtifactResolver.java | 2 +- .../ivyservice/BrokenArtifactResolveResult.java | 36 -- .../BrokenModuleVersionResolveResult.java | 43 -- .../ivyservice/BuildableArtifactResolveResult.java | 41 ++ .../BuildableModuleVersionResolveResult.java | 47 ++ .../CacheLockingArtifactDependencyResolver.java | 12 +- .../DefaultBuildableArtifactResolveResult.java | 72 +++ ...DefaultBuildableModuleVersionResolveResult.java | 86 +++ .../ivyservice/DefaultCacheLockingManager.java | 2 +- .../ivyservice/DefaultIvyDependencyPublisher.java | 5 +- .../ivyservice/DefaultUnresolvedDependency.java | 4 +- .../ivyservice/DependencyToModuleResolver.java | 4 +- .../ErrorHandlingArtifactDependencyResolver.java | 12 +- .../ivyservice/ErrorHandlingArtifactPublisher.java | 21 +- .../FileBackedArtifactResolveResult.java | 36 -- .../ForcedModuleVersionIdResolveResult.java | 47 ++ .../ivyservice/IvyBackedArtifactPublisher.java | 182 +++--- .../ivyservice/IvyModuleDescriptorWriter.java | 30 + .../ivyservice/IvyXmlModuleDescriptorWriter.java | 576 +++++++++++++++++ .../ivyservice/ModuleVersionIdResolveResult.java | 10 + .../ivyservice/ResolvedArtifactFactory.java | 4 +- .../SelfResolvingDependencyResolver.java | 94 +-- ...cuitEmptyConfigsArtifactDependencyResolver.java | 34 +- .../VersionForcingDependencyToModuleResolver.java | 3 +- .../clientmodule/ClientModuleResolver.java | 41 +- .../AbstractDependencyResolverAdapter.java | 83 +++ .../BuildableModuleVersionDescriptor.java | 59 ++ .../CacheLockingModuleVersionRepository.java | 19 +- .../ivyresolve/CachingModuleVersionRepository.java | 119 ++-- .../DefaultBuildableModuleVersionDescriptor.java | 92 +++ .../ivyservice/ivyresolve/DefaultIvyAdapter.java | 4 +- .../ivyresolve/DefaultModuleVersionDescriptor.java | 41 -- .../ivyresolve/DependencyResolverAdapter.java | 117 ---- .../ivyresolve/DependencyResolverIdentifier.java | 8 +- .../ivyservice/ivyresolve/DownloadedArtifact.java | 43 -- .../ExternalResourceResolverAdapter.java | 54 ++ .../ivyresolve/IvyDependencyResolverAdapter.java | 64 ++ .../ivyresolve/LazyDependencyToModuleResolver.java | 52 +- .../LocalAwareModuleVersionRepository.java | 31 + .../ivyresolve/LocalModuleVersionRepository.java | 53 ++ .../ivyresolve/LoopbackDependencyResolver.java | 13 +- .../ivyresolve/ModuleVersionDescriptor.java | 3 +- .../ivyresolve/ModuleVersionRepository.java | 19 +- .../ivyservice/ivyresolve/ResolveIvyFactory.java | 32 +- .../StartParameterResolutionOverride.java | 9 +- .../ivyservice/ivyresolve/UserResolverChain.java | 147 +++-- .../DownloadedIvyModuleDescriptorParser.java | 2 +- .../parser/GradlePomModuleDescriptorBuilder.java | 26 +- .../parser/GradlePomModuleDescriptorParser.java | 9 +- .../modulecache/DefaultModuleDescriptorCache.java | 5 +- .../modulecache/ModuleDescriptorFileStore.java | 48 -- .../modulecache/ModuleDescriptorStore.java | 57 +- .../projectmodule/ProjectDependencyResolver.java | 43 +- .../resolveengine/DefaultDependencyResolver.java | 10 +- .../resolveengine/DependencyGraphBuilder.java | 104 ++- .../LatestModuleConflictResolver.java | 29 +- .../result/CachingDependencyResultFactory.java | 54 ++ .../result/InternalDependencyResult.java | 32 + .../result/ModuleVersionSelection.java | 30 + .../result/ResolutionResultBuilder.java | 75 +++ .../result/ResolvedConfigurationListener.java | 30 + .../result/VersionSelectionReasons.java | 51 ++ .../DefaultLocalMavenRepositoryLocator.java | 39 +- .../mvnsettings/DefaultMavenFileLocations.java | 2 +- .../mvnsettings/DefaultMavenSettingsProvider.java | 43 ++ .../mvnsettings/MavenSettingsProvider.java | 23 + .../AbstractAuthenticationSupportedRepository.java | 2 +- .../CustomResolverArtifactRepository.java | 26 +- .../repositories/DefaultBaseRepositoryFactory.java | 138 ++++ .../DefaultExternalResourceRepository.java | 138 ---- .../DefaultFlatDirArtifactRepository.java | 25 +- .../repositories/DefaultIvyArtifactRepository.java | 32 +- .../DefaultMavenArtifactRepository.java | 22 +- .../repositories/DefaultResolverFactory.java | 117 ---- .../EnhancedArtifactDownloadReport.java | 38 -- .../repositories/ExternalResourceRepository.java | 46 -- .../repositories/ExternalResourceResolver.java | 471 -------------- .../IvyArtifactRepositoryInternal.java | 26 + .../artifacts/repositories/IvyResolver.java | 47 -- .../artifacts/repositories/MavenResolver.java | 316 --------- .../repositories/PatternBasedResolver.java | 33 - .../ProgressLoggingTransferListener.java | 81 --- .../DownloadingRepositoryCacheManager.java | 49 +- .../EnhancedArtifactDownloadReport.java | 56 ++ .../LocalFileRepositoryCacheManager.java | 8 +- .../layout/GradleRepositoryLayout.java | 2 +- .../repositories/layout/MavenRepositoryLayout.java | 2 +- .../layout/PatternRepositoryLayout.java | 2 +- .../repositories/layout/RepositoryLayout.java | 2 +- .../repositories/resolver/AbstractVersionList.java | 63 ++ .../resolver/ChainedVersionLister.java | 79 +++ .../repositories/resolver/DefaultVersionList.java | 49 ++ .../resolver/ExternalResourceResolver.java | 637 ++++++++++++++++++ .../repositories/resolver/IvyResolver.java | 45 ++ .../repositories/resolver/IvyResourcePattern.java | 63 ++ .../repositories/resolver/M2ResourcePattern.java | 63 ++ .../repositories/resolver/MavenMetadata.java | 26 + .../repositories/resolver/MavenMetadataLoader.java | 86 +++ .../repositories/resolver/MavenPattern.java | 23 + .../repositories/resolver/MavenResolver.java | 257 ++++++++ .../repositories/resolver/MavenVersionLister.java | 49 ++ .../resolver/PatternBasedResolver.java | 33 + .../repositories/resolver/ResourcePattern.java | 41 ++ .../resolver/ResourceVersionLister.java | 164 +++++ .../repositories/resolver/VersionList.java | 41 ++ .../repositories/resolver/VersionLister.java | 26 + .../transport/ProgressLoggingTransferListener.java | 58 ++ .../transport/RepositoryTransport.java | 2 +- .../transport/RepositoryTransportFactory.java | 77 +-- .../artifacts/result/DefaultResolutionResult.java | 95 +++ .../result/DefaultResolvedDependencyResult.java | 58 ++ .../result/DefaultResolvedModuleVersionResult.java | 81 +++ .../result/DefaultUnresolvedDependencyResult.java | 54 ++ .../externalresource/AbstractExternalResource.java | 18 +- .../externalresource/ExternalResource.java | 8 +- .../MetaDataOnlyExternalResource.java | 6 - .../cached/CachedExternalResourceAdapter.java | 13 +- .../cached/DefaultCachedExternalResourceIndex.java | 8 +- .../LocalMavenLocallyAvailableResourceFinder.java | 84 --- .../ivy/LocallyAvailableResourceFinderFactory.java | 47 +- ...PatternBasedLocallyAvailableResourceFinder.java | 55 +- .../local/ivy/PatternTransformer.java | 78 --- .../transfer/AbstractProgressLoggingHandler.java | 41 ++ .../CacheAwareExternalResourceAccessor.java | 3 +- .../DefaultCacheAwareExternalResourceAccessor.java | 8 +- .../transfer/ExternalResourceUploader.java | 8 +- .../ProgressLoggingExternalResourceAccessor.java | 156 +++++ .../ProgressLoggingExternalResourceUploader.java | 81 +++ .../transfer/ResourceOperation.java | 70 ++ .../DefaultExternalResourceRepository.java | 125 ++++ .../transport/ExternalResourceRepository.java | 70 ++ .../transport/file/FileResourceConnector.java | 33 +- .../transport/file/FileTransport.java | 28 +- .../http/CopyProgressListenerAdapter.java | 31 - .../transport/http/HttpClientConfigurer.java | 15 +- .../transport/http/HttpClientHelper.java | 18 +- .../transport/http/HttpRequestException.java | 31 + .../transport/http/HttpResourceAccessor.java | 10 +- .../transport/http/HttpResourceLister.java | 45 +- .../transport/http/HttpResourceUploader.java | 10 +- .../transport/http/HttpTransport.java | 31 +- .../http/RepeatableInputStreamEntity.java | 60 ++ .../internal/filestore/DefaultFileStoreEntry.java | 39 -- .../gradle/api/internal/filestore/FileStore.java | 24 - .../filestore/GroupedAndNamedUniqueFileStore.java | 58 -- .../internal/filestore/UniquePathFileStore.java | 98 --- .../filestore/ivy/ArtifactRevisionIdFileStore.java | 7 +- .../gradle/api/artifacts/ArtifactsTestUtils.java | 2 + .../DefaultDependencyManagementServicesTest.groovy | 2 + .../artifacts/DefaultResolvedArtifactTest.groovy | 7 +- ...cheLockingArtifactDependencyResolverTest.groovy | 12 +- ...efaultBuildableArtifactResolveResultTest.groovy | 86 +++ ...tBuildableModuleVersionResolveResultTest.groovy | 113 ++++ ...orHandlingArtifactDependencyResolverTest.groovy | 165 +++-- .../ErrorHandlingArtifactPublisherTest.groovy | 19 +- .../ivyservice/IvyBackedArtifactPublisherTest.java | 328 +++++----- .../IvyXmlModuleDescriptorWriterTest.groovy | 152 +++++ .../ivyservice/ResolvedArtifactFactoryTest.groovy | 7 +- .../SelfResolvingDependencyResolverTest.groovy | 131 ++++ .../SelfResolvingDependencyResolverTest.java | 177 ----- ...ptyConfigsArtifactDependencyResolverSpec.groovy | 70 ++ ...EmptyConfigsArtifactDependencyResolverTest.java | 79 --- ...ionForcingDependencyToModuleResolverTest.groovy | 5 +- .../clientmodule/ClientModuleResolverTest.groovy | 49 +- .../CachingModuleVersionRepositoryTest.groovy | 28 +- ...aultBuildableModuleVersionDescriptorTest.groovy | 121 ++++ .../DependencyResolverIdentifierTest.groovy | 2 +- .../LazyDependencyToModuleResolverTest.groovy | 73 +-- .../ivyresolve/UserResolverChainTest.groovy | 513 +++++++++++++++ .../modulecache/ModuleDescriptorStoreTest.groovy | 76 +++ .../ProjectDependencyResolverTest.groovy | 23 +- .../DependencyGraphBuilderTest.groovy | 97 ++- .../CachingDependencyResultFactoryTest.groovy | 71 ++ .../result/ResolutionResultBuilderSpec.groovy | 264 ++++++++ .../DefaultLocalMavenRepositoryLocatorTest.groovy | 6 +- .../DefaultBaseRepositoryFactoryTest.groovy | 155 +++++ .../DefaultFlatDirArtifactRepositoryTest.groovy | 6 +- .../DefaultIvyArtifactRepositoryTest.groovy | 15 +- .../DefaultMavenArtifactRepositoryTest.groovy | 11 +- .../repositories/DefaultResolverFactoryTest.groovy | 152 ----- .../DownloadingRepositoryCacheManagerTest.groovy | 71 ++ .../resolver/ChainedVersionListerTest.groovy | 125 ++++ .../resolver/IvyResourcePatternTest.groovy | 45 ++ .../resolver/M2ResourcePatternTest.groovy | 79 +++ .../repositories/resolver/MavenResolverTest.groovy | 48 ++ .../resolver/MavenVersionListerTest.groovy | 174 +++++ .../resolver/ResourceVersionListerTest.groovy | 184 ++++++ .../ProgressLoggingTransferListenerTest.groovy | 78 +++ .../result/DefaultResolutionResultTest.groovy | 115 ++++ .../DefaultResolvedModuleVersionResultSpec.groovy | 67 ++ .../CachedExternalResourceAdapterTest.groovy | 8 +- ...ltCacheAwareExternalResourceAccessorTest.groovy | 18 +- ...gressLoggingExternalResourceAccessorTest.groovy | 124 ++++ ...gressLoggingExternalResourceUploaderTest.groovy | 67 ++ .../transfer/ResourceOperationTest.groovy | 95 +++ .../http/ApacheDirectoryListingParserTest.groovy | 67 +- .../transport/http/HttpClientConfigurerTest.groovy | 15 +- .../transport/http/HttpClientHelperTest.groovy | 46 ++ .../transport/http/HttpResourceListerTest.groovy | 10 +- .../result/ResolutionResultDataBuilder.groovy | 42 ++ subprojects/core/core.gradle | 11 +- .../api/dsl/DynamicObjectIntegrationTest.groovy | 43 +- .../scripts/StatementLabelsIntegrationTest.groovy | 7 +- .../groovy/org/gradle/BuildExceptionReporter.java | 153 +++-- .../src/main/groovy/org/gradle/StartParameter.java | 23 + .../groovy/org/gradle/TaskExecutionLogger.java | 17 +- .../src/main/groovy/org/gradle/api/Project.java | 2 + .../org/gradle/api/UncheckedIOException.java | 39 -- .../org/gradle/api/artifacts/Configuration.java | 2 + .../api/artifacts/ConfigurationContainer.java | 2 + .../gradle/api/artifacts/LenientConfiguration.java | 2 - .../api/artifacts/ModuleVersionSelector.java | 13 + .../api/artifacts/ResolvableDependencies.java | 11 + .../artifacts/cache/ArtifactResolutionControl.java | 4 +- .../cache/DependencyResolutionControl.java | 4 +- .../artifacts/cache/ModuleResolutionControl.java | 4 +- .../api/artifacts/cache/ResolutionControl.java | 4 +- .../api/artifacts/cache/ResolutionRules.java | 4 +- .../artifacts/repositories/ArtifactRepository.java | 8 + .../repositories/IvyArtifactRepository.java | 26 +- .../api/artifacts/result/DependencyResult.java | 42 ++ .../result/ModuleVersionSelectionReason.java | 41 ++ .../api/artifacts/result/ResolutionResult.java | 93 +++ .../artifacts/result/ResolvedDependencyResult.java | 37 ++ .../result/ResolvedModuleVersionResult.java | 63 ++ .../result/UnresolvedDependencyResult.java | 25 + .../gradle/api/artifacts/result/package-info.java | 20 + .../groovy/org/gradle/api/file/RelativePath.java | 4 +- .../api/internal/AbstractClassGenerator.java | 30 +- .../gradle/api/internal/AbstractDynamicObject.java | 10 +- .../api/internal/AsmBackedClassGenerator.java | 166 ++++- .../org/gradle/api/internal/BeanDynamicObject.java | 28 + .../gradle/api/internal/ClosureBackedAction.java | 68 ++ .../api/internal/CompositeDomainObjectSet.java | 16 +- .../api/internal/CompositeDynamicObject.java | 60 ++ .../org/gradle/api/internal/ConfigureDelegate.java | 11 +- .../internal/DefaultDomainObjectCollection.java | 7 +- .../internal/DependencyInjectingInstantiator.java | 185 ++++++ .../gradle/api/internal/DocumentationRegistry.java | 14 +- .../org/gradle/api/internal/DynamicObject.java | 8 + .../gradle/api/internal/DynamicObjectHelper.java | 8 + .../api/internal/DynamicPropertyNamer.groovy | 13 - .../api/internal/ExtensibleDynamicObject.java | 8 + .../org/gradle/api/internal/FilteredAction.java | 38 -- .../api/internal/NoNamingPropertyException.java | 23 + .../api/internal/NullNamingPropertyException.java | 23 + .../org/gradle/api/internal/XmlTransformer.java | 39 +- .../artifacts/ArtifactDependencyResolver.java | 3 +- .../api/internal/artifacts/ArtifactPublisher.java | 8 +- .../artifacts/ArtifactPublisherFactory.java | 25 + .../internal/artifacts/BaseRepositoryFactory.java | 49 ++ .../artifacts/DefaultArtifactPublisherFactory.java | 46 ++ .../DefaultArtifactRepositoryContainer.java | 57 +- .../api/internal/artifacts/DefaultExcludeRule.java | 2 +- .../artifacts/DefaultModuleVersionIdentifier.java | 12 +- .../artifacts/DefaultModuleVersionSelector.java | 11 +- .../artifacts/DependencyResolutionServices.java | 2 +- .../artifacts/ModuleVersionSelectorStrictSpec.java | 40 ++ .../artifacts/ResolvedConfigurationIdentifier.java | 32 +- .../api/internal/artifacts/ResolverFactory.java | 38 -- .../api/internal/artifacts/ResolverResults.java | 62 ++ .../configurations/ConfigurationInternal.java | 2 +- .../artifacts/configurations/Configurations.java | 4 +- .../configurations/DefaultConfiguration.java | 26 +- .../configurations/dynamicversion/CachePolicy.java | 3 +- .../dynamicversion/DefaultCachePolicy.java | 23 +- .../dependencies/AbstractExternalDependency.java | 6 + .../artifacts/dsl/DefaultRepositoryFactory.java | 98 +++ .../artifacts/dsl/DefaultRepositoryHandler.java | 77 ++- .../internal/artifacts/dsl/RepositoryFactory.java | 111 ++++ .../artifacts/dsl/RepositoryFactoryInternal.java | 25 + .../dependencies/ModuleDescriptorDelegate.groovy | 1 - .../repositories/AbstractArtifactRepository.java | 42 ++ .../repositories/ArtifactRepositoryInternal.java | 5 + .../FixedResolverArtifactRepository.java | 7 +- .../result/ResolvedDependencyResultPrinter.java | 39 ++ .../version/LatestVersionSemanticComparator.java | 49 ++ .../api/internal/classpath/ManifestUtil.java | 4 +- .../collections/CollectionEventRegister.java | 13 +- .../api/internal/file/AbstractFileCollection.java | 2 +- .../api/internal/file/AbstractFileResolver.java | 6 +- .../api/internal/file/AbstractFileTreeElement.java | 9 +- .../api/internal/file/BaseDirFileResolver.java | 3 +- .../file/DefaultTemporaryFileProvider.java | 12 +- .../api/internal/file/FileOrUriNotationParser.java | 6 +- .../internal/file/TmpDirTemporaryFileProvider.java | 24 - .../api/internal/file/archive/TarFileTree.java | 5 +- .../api/internal/file/archive/ZipFileTree.java | 5 +- .../api/internal/file/copy/PathNotationParser.java | 8 +- .../internal/filestore/AbstractFileStoreEntry.java | 28 + .../gradle/api/internal/filestore/FileStore.java | 31 + .../api/internal/filestore/FileStoreEntry.java | 0 .../api/internal/filestore/FileStoreSearcher.java | 0 .../filestore/GroupedAndNamedUniqueFileStore.java | 80 +++ .../api/internal/filestore/PathKeyFileStore.java | 201 ++++++ .../filestore/PathNormalisingKeyFileStore.java | 63 ++ .../internal/filestore/UniquePathKeyFileStore.java | 51 ++ .../internal/notations/NotationParserBuilder.java | 10 +- .../gradle/api/internal/notations/TypeInfo.java | 35 + .../api/internal/notations/api/NotationParser.java | 4 +- .../parsers/ClosureToSpecNotationParser.java | 41 ++ .../api/internal/plugins/DefaultConvention.java | 8 + .../plugins/DefaultExtraPropertiesExtension.java | 2 +- .../internal/plugins/DefaultPluginRegistry.java | 25 +- .../api/internal/plugins/PluginRegistry.java | 3 +- .../api/internal/project/AbstractProject.java | 4 +- .../internal/project/GlobalServicesRegistry.java | 8 +- .../project/GradleInternalServiceRegistry.java | 9 +- .../project/ProjectInternalServiceRegistry.java | 12 +- .../internal/project/TaskExecutionServices.java | 13 +- .../project/TopLevelBuildServiceRegistry.java | 26 +- .../AnnotationProcessingTaskFactory.java | 17 +- .../taskfactory/DependencyAutoWireTaskFactory.java | 21 +- .../internal/project/taskfactory/ITaskFactory.java | 5 +- .../internal/project/taskfactory/TaskFactory.java | 43 +- .../resource/ResourceNotFoundException.java | 4 + .../gradle/api/internal/resource/UriResource.java | 34 +- .../api/internal/tasks/DefaultTaskContainer.java | 11 +- .../groovy/org/gradle/api/invocation/Gradle.java | 2 + .../org/gradle/api/plugins/ExtensionAware.java | 2 +- .../ivy/internal/IvyNormalizedPublication.java | 55 ++ .../api/publish/ivy/internal/IvyPublisher.java | 33 + .../main/groovy/org/gradle/api/specs/AndSpec.java | 55 -- .../groovy/org/gradle/api/specs/CompositeSpec.java | 66 -- .../main/groovy/org/gradle/api/specs/NotSpec.java | 34 - .../main/groovy/org/gradle/api/specs/OrSpec.java | 45 -- .../main/groovy/org/gradle/api/specs/Specs.java | 10 +- .../groovy/org/gradle/api/specs/package-info.java | 2 +- .../groovy/org/gradle/api/tasks/Directory.groovy | 2 +- .../src/main/groovy/org/gradle/api/tasks/Exec.java | 10 +- .../groovy/org/gradle/api/tasks/TaskContainer.java | 2 +- .../main/groovy/org/gradle/api/tasks/Upload.java | 8 +- .../tasks/diagnostics/DependencyReportTask.java | 90 --- .../api/tasks/diagnostics/PropertyReportTask.java | 50 -- .../AggregateMultiProjectTaskReportModel.java | 87 --- .../diagnostics/internal/AsciiReportRenderer.java | 172 ----- .../internal/DefaultGroupTaskReportModel.java | 82 --- .../internal/DependencyReportRenderer.java | 47 -- .../tasks/diagnostics/internal/GraphRenderer.java | 65 -- .../internal/GraphvizReportRenderer.java | 75 --- .../diagnostics/internal/TaskReportRenderer.java | 156 ----- .../gradle/api/tasks/diagnostics/package-info.java | 20 - .../org/gradle/api/tasks/util/PatternSet.groovy | 248 ------- .../org/gradle/api/tasks/util/PatternSet.java | 250 +++++++ .../internal/PatternSetAntBuilderDelegate.java | 102 +++ .../gradle/cache/internal/DefaultCacheAccess.java | 186 ++++-- .../cache/internal/DefaultFileLockManager.java | 10 +- .../internal/DefaultPersistentDirectoryStore.java | 3 +- .../DelegateOnDemandPersistentDirectoryCache.java | 4 +- .../cache/internal/UnitOfWorkParticipant.java | 9 + .../configuration/DefaultBuildConfigurer.java | 17 +- .../main/groovy/org/gradle/configuration/Help.java | 48 -- .../configuration/ImplicitTasksConfigurer.java | 33 +- .../gradle/execution/DefaultTaskGraphExecuter.java | 241 ------- ...ludedTaskFilteringBuildConfigurationAction.java | 17 +- .../gradle/execution/MultipleBuildFailures.java | 31 + .../execution/SelectedTaskExecutionAction.java | 31 +- .../TaskNameResolvingBuildConfigurationAction.java | 49 +- .../groovy/org/gradle/execution/TaskSelector.java | 46 +- .../commandline/CommandLineTaskConfigurer.java | 108 ++++ .../commandline/CommandLineTaskParser.java | 63 ++ .../taskgraph/DefaultTaskExecutionPlan.java | 248 +++++++ .../taskgraph/DefaultTaskGraphExecuter.java | 145 +++++ .../taskgraph/DefaultTaskPlanExecutor.java | 57 ++ .../execution/taskgraph/ExecutionOptions.java | 36 ++ .../taskgraph/ParallelTaskPlanExecutor.java | 131 ++++ .../execution/taskgraph/TaskExecutionPlan.java | 52 ++ .../org/gradle/execution/taskgraph/TaskInfo.java | 109 ++++ .../execution/taskgraph/TaskPlanExecutor.java | 23 + .../taskgraph/TaskPlanExecutorFactory.java | 52 ++ .../org/gradle/groovy/scripts/DefaultScript.java | 2 +- .../internal/StatementLabelsDeprecationLogger.java | 11 +- .../org/gradle/initialization/BaseSettings.java | 14 - .../initialization/DefaultClassLoaderRegistry.java | 1 + .../DefaultCommandLineConverter.java | 20 +- .../initialization/DefaultGradleLauncher.java | 6 +- .../DefaultGradleLauncherFactory.java | 2 +- .../gradle/initialization/DefaultSettings.groovy | 7 - .../initialization/DependencyResolutionLogger.java | 22 +- .../initialization/ModelConfigurationListener.java | 2 +- .../MultipleBuildFailuresExceptionAnalyser.java | 49 ++ .../org/gradle/initialization/SettingsFactory.java | 18 +- .../initialization/TasksCompletionListener.java | 26 + .../org/gradle/logging/LoggingServiceRegistry.java | 169 +++-- .../org/gradle/logging/internal/AnsiConsole.java | 3 - .../internal/ConsoleBackedProgressRenderer.java | 20 +- .../logging/internal/ConsoleConfigureAction.java | 49 ++ .../logging/internal/DefaultLoggingConfigurer.java | 4 - .../logging/internal/DefaultLoggingManager.java | 10 +- .../internal/DefaultProgressLoggerFactory.java | 2 +- .../internal/DefaultStandardOutputRedirector.java | 4 +- .../internal/DefaultStatusBarFormatter.java | 54 ++ .../internal/EmbeddedLoggingManagerFactory.java | 36 -- .../internal/LoggingBackedStyledTextOutput.java | 2 +- .../logging/internal/LoggingOutputInternal.java | 10 +- .../logging/internal/OutputEventRenderer.java | 83 +-- .../logging/internal/PrintStreamLoggingSystem.java | 2 +- .../logging/internal/ProgressCompleteEvent.java | 8 +- .../logging/internal/StatusBarFormatter.java | 23 + .../logging/internal/TerminalDetectorFactory.java | 44 -- .../logback/SimpleLogbackLoggingConfigurer.java | 42 -- .../process/internal/DefaultWorkerProcess.java | 11 +- .../process/internal/JavaExecHandleBuilder.java | 5 +- .../org/gradle/process/internal/JvmOptions.java | 75 +-- .../internal/ProcessParentingInitializer.java | 3 +- .../process/internal/WorkerProcessBuilder.java | 14 +- .../internal/child/ActionExecutionWorker.java | 4 +- .../child/ImplementationClassLoaderWorker.java | 2 +- .../internal/streams/ExecOutputHandleRunner.java | 2 +- .../org/gradle/reporting/TextReportRenderer.java | 21 +- .../testfixtures/internal/GlobalTestServices.java | 2 +- .../testfixtures/internal/NoOpLoggingManager.java | 5 +- .../internal/TestTopLevelBuildServiceRegistry.java | 2 +- .../org/gradle/util/AvailablePortFinder.java | 5 +- .../src/main/groovy/org/gradle/util/Clock.java | 22 +- .../groovy/org/gradle/util/CollectionUtils.java | 107 --- .../main/groovy/org/gradle/util/ConfigureUtil.java | 20 +- .../groovy/org/gradle/util/DeprecationLogger.java | 92 ++- .../org/gradle/util/DisconnectableInputStream.java | 68 +- .../main/groovy/org/gradle/util/GFileUtils.java | 109 +++- .../src/main/groovy/org/gradle/util/GUtil.java | 23 +- .../main/groovy/org/gradle/util/GradleVersion.java | 25 + .../core/src/main/groovy/org/gradle/util/Jvm.java | 2 +- .../org/gradle/util/LineBufferingOutputStream.java | 44 +- .../util/LinePerThreadBufferingOutputStream.java | 8 +- .../src/main/groovy/org/gradle/util/TextUtil.java | 8 + .../org/gradle/util/ToStringTransformer.java | 27 - .../main/groovy/org/gradle/util/VersionNumber.java | 102 +++ .../org/gradle/configuration/default-imports.txt | 6 + .../org/gradle/BuildExceptionReporterTest.groovy | 49 ++ .../org/gradle/TaskExecutionLoggerTest.groovy | 108 ++++ .../groovy/org/gradle/TaskExecutionLoggerTest.java | 128 ---- .../AsmBackedClassGeneratorGroovyTest.groovy | 215 ++++++ .../api/internal/AsmBackedClassGeneratorTest.java | 196 +++++- .../org/gradle/api/internal/DefaultTaskTest.groovy | 13 +- .../DependencyInjectingInstantiatorTest.groovy | 304 +++++++++ .../api/internal/DocumentationRegistryTest.groovy | 9 +- .../api/internal/ExtensibleDynamicObjectTest.java | 124 ++-- .../ExtensibleDynamicObjectTestHelper.groovy | 29 +- .../FactoryNamedDomainObjectContainerSpec.groovy | 3 +- .../gradle/api/internal/FilteredActionSpec.groovy | 69 -- ...AutoCreateNamedDomainObjectContainerSpec.groovy | 2 +- .../gradle/api/internal/XmlTransformerTest.groovy | 29 + .../DefaultArtifactRepositoryContainerTest.groovy | 378 ++++++----- .../ModuleVersionSelectorStrictSpecTest.groovy | 44 ++ .../internal/artifacts/ResolverResultsSpec.groovy | 55 ++ .../configurations/DefaultConfigurationSpec.groovy | 4 +- .../configurations/DefaultConfigurationTest.java | 8 +- .../dynamicversion/DefaultCachePolicySpec.groovy | 20 +- .../dsl/DefaultRepositoryFactoryTest.groovy | 137 ++++ .../dsl/DefaultRepositoryHandlerTest.groovy | 427 ++++-------- .../dsl/TestFlatDirectoryArtifactRepository.java | 23 + .../artifacts/dsl/TestIvyArtifactRepository.java | 23 + .../artifacts/dsl/TestMavenArtifactRepository.java | 23 + ...meAfterContainerInclusionDeprecationTest.groovy | 70 ++ .../LatestVersionSemanticComparatorSpec.groovy | 76 +++ .../internal/file/AbstractFileTreeElementTest.java | 47 +- .../internal/file/DefaultFileOperationsTest.groovy | 3 +- .../internal/file/copy/DeleteActionImplTest.groovy | 12 +- .../internal/filestore/PathKeyFileStoreTest.groovy | 198 ++++++ .../PathNormalisingKeyFileStoreTest.groovy | 94 +++ .../filestore/UniquePathKeyFileStoreTest.groovy | 112 ++++ .../parsers/ClosureToSpecNotationParserSpec.groovy | 40 ++ .../plugins/DefaultPluginRegistryTest.groovy | 218 +++++++ .../plugins/DefaultPluginRegistryTest.java | 256 -------- .../project/DefaultIsolatedAntBuilderTest.groovy | 38 +- .../project/GlobalServicesRegistryTest.java | 5 + .../GradleInternalServiceRegistryTest.groovy | 101 +++ .../project/GradleInternalServiceRegistryTest.java | 108 ---- .../ProjectInternalServiceRegistryTest.java | 20 +- .../TopLevelBuildServiceRegistryTest.groovy | 18 +- .../AnnotationProcessingTaskFactoryTest.java | 6 +- .../DependencyAutoWireTaskFactoryTest.java | 13 +- .../project/taskfactory/TaskFactoryTest.groovy | 167 +++++ .../project/taskfactory/TaskFactoryTest.java | 233 ------- .../internal/tasks/DefaultTaskContainerTest.java | 20 +- .../tasks/util/DefaultJavaForkOptionsTest.groovy | 4 +- .../groovy/org/gradle/api/logging/LoggingTest.java | 10 +- .../api/specs/AbstractCompositeSpecTest.java | 74 --- .../groovy/org/gradle/api/specs/AndSpecTest.java | 60 -- .../groovy/org/gradle/api/specs/NotSpecTest.java | 39 -- .../groovy/org/gradle/api/specs/OrSpecTest.java | 48 -- .../groovy/org/gradle/api/specs/SpecsTest.groovy | 2 +- .../org/gradle/api/tasks/AbstractCopyTaskTest.java | 1 - .../groovy/org/gradle/api/tasks/CopyTest.groovy | 1 - .../groovy/org/gradle/api/tasks/DeleteTest.java | 1 - .../org/gradle/api/tasks/DirectoryTest.groovy | 1 - .../groovy/org/gradle/api/tasks/ExecTest.groovy | 1 - .../org/gradle/api/tasks/GradleBuildTest.groovy | 1 - .../org/gradle/api/tasks/SourceTaskTest.groovy | 1 - .../groovy/org/gradle/api/tasks/UploadTest.java | 15 +- .../org/gradle/api/tasks/bundling/TarTest.groovy | 1 - .../org/gradle/api/tasks/bundling/ZipTest.groovy | 1 - .../diagnostics/DependencyReportTaskTest.java | 140 ---- ...AggregateMultiProjectTaskReportModelTest.groovy | 115 ---- .../internal/AsciiReportRendererTest.groovy | 116 ---- .../DefaultGroupTaskReportModelTest.groovy | 110 ---- .../SingleProjectTaskReportModelTest.groovy | 179 ----- .../internal/TaskDetailsFactoryTest.groovy | 74 --- .../internal/TaskModelSpecification.groovy | 49 -- .../internal/TaskReportRendererTest.groovy | 184 ------ .../internal/TextReportRendererTest.groovy | 115 ---- .../gradle/api/tasks/util/PatternSetTest.groovy | 20 +- .../cache/internal/DefaultCacheAccessTest.groovy | 213 ++++-- .../cache/internal/DefaultCacheFactoryTest.groovy | 2 +- .../cache/internal/OnDemandFileAccessTest.groovy | 4 +- .../ImplicitTasksConfigurerTest.groovy | 13 +- .../execution/DefaultTaskGraphExecuterTest.java | 579 ----------------- ...askFilteringBuildConfigurationActionTest.groovy | 8 +- .../SelectedTaskExecutionActionTest.groovy | 34 +- .../CommandLineTaskConfigurerSpec.groovy | 177 +++++ .../commandline/CommandLineTaskParserSpec.groovy | 119 ++++ .../taskgraph/DefaultTaskExecutionPlanTest.groovy | 442 +++++++++++++ .../taskgraph/DefaultTaskGraphExecuterTest.java | 578 +++++++++++++++++ .../taskgraph/TaskPlanExecutorFactoryTest.groovy | 46 ++ .../DefaultCommandLineConverterTest.java | 21 + .../DefaultExceptionAnalyserTest.java | 9 +- .../initialization/DefaultGradleLauncherTest.java | 6 +- .../initialization/DefaultSettingsTest.groovy | 5 +- .../gradle/initialization/SettingsFactoryTest.java | 6 +- .../org/gradle/logging/ConfigureLogging.groovy | 64 ++ .../logging/LoggingServiceRegistryTest.groovy | 211 +++++- .../org/gradle/logging/LoggingTestHelper.groovy | 53 -- .../groovy/org/gradle/logging/TestAppender.groovy | 40 ++ .../ConsoleBackedProgressRendererTest.groovy | 5 +- .../internal/DefaultStatusBarFormatterTest.groovy | 44 ++ .../internal/JavaUtilLoggingConfigurerTest.groovy | 27 +- .../internal/OutputEventRendererTest.groovy | 96 ++- .../logging/internal/OutputSpecification.groovy | 2 +- .../internal/TerminalDetectorFactoryTest.groovy | 63 -- .../process/internal/DefaultExecHandleSpec.groovy | 33 +- .../internal/DefaultWorkerProcessFactoryTest.java | 2 +- .../internal/DefaultWorkerProcessTest.groovy | 4 +- .../gradle/process/internal/JvmOptionsTest.groovy | 87 ++- .../org/gradle/util/CollectionUtilsTest.groovy | 91 --- .../org/gradle/util/DeprecationLoggerTest.groovy | 83 +++ .../util/DisconnectableInputStreamTest.groovy | 64 +- .../groovy/org/gradle/util/GFileUtilsTest.groovy | 70 +- .../test/groovy/org/gradle/util/GUtilTest.groovy | 6 + .../org/gradle/util/GradleVersionTest.groovy | 33 + .../gradle/util/LineBufferingOutputStreamTest.java | 41 +- .../LinePerThreadBufferingOutputStreamTest.groovy | 4 +- .../org/gradle/util/VersionNumberTest.groovy | 96 +++ .../org/gradle/api/internal/file/TestFiles.java | 36 ++ .../gradle/api/tasks/AbstractSpockTaskTest.groovy | 24 +- .../org/gradle/api/tasks/AbstractTaskTest.java | 63 +- .../DefaultFileLockManagerTestHelper.groovy | 13 +- .../groovy/org/gradle/util/HelperUtil.groovy | 12 +- .../groovy/org/gradle/util/Matchers.java | 13 + .../groovy/org/gradle/util/MockExecutor.java | 35 + .../org/gradle/util/MultithreadedTestCase.java | 4 +- subprojects/cpp/cpp.gradle | 7 + .../plugins/cpp/CppIntegrationTestRunner.java | 2 +- .../plugins/cpp/CppSamplesIntegrationTest.groovy | 18 +- .../gradle/plugins/binaries/BinariesPlugin.java | 12 +- .../binaries/model/internal/CompileTaskAware.java | 4 +- .../gradle/plugins/binaries/tasks/Compile.groovy | 32 - .../org/gradle/plugins/cpp/CppCompile.groovy | 33 + .../groovy/org/gradle/plugins/cpp/CppPlugin.groovy | 3 +- .../gradle/plugins/cpp/gpp/GppCompileSpec.groovy | 26 +- .../plugins/cpp/internal/DefaultCppSourceSet.java | 2 - .../cpp/msvcpp/MicrosoftVisualCppPlugin.groovy | 5 + .../org/gradle/plugins/cpp/CppPluginTest.groovy | 18 +- .../plugins/cpp/gpp/GppCompileSpecTest.groovy | 4 +- subprojects/diagnostics/diagnostics.gradle | 25 + .../ProjectReportsPluginIntegrationTest.java | 33 + ...pendencyInsightReportTaskIntegrationTest.groovy | 488 ++++++++++++++ .../DependencyReportTaskIntegrationTest.groovy | 420 ++++++++++++ .../org/gradle/api/plugins/HelpTasksPlugin.groovy | 67 ++ .../gradle/api/plugins/ProjectReportsPlugin.java | 0 .../plugins/ProjectReportsPluginConvention.groovy | 43 ++ .../api/tasks/diagnostics/AbstractReportTask.java | 0 .../diagnostics/DependencyInsightReportTask.groovy | 201 ++++++ .../tasks/diagnostics/DependencyReportTask.java | 90 +++ .../api/tasks/diagnostics/ProjectReportTask.java | 0 .../api/tasks/diagnostics/PropertyReportTask.java | 50 ++ .../api/tasks/diagnostics/ReportException.java | 29 + .../api/tasks/diagnostics/TaskReportTask.java | 0 .../AggregateMultiProjectTaskReportModel.java | 90 +++ .../internal/DefaultGroupTaskReportModel.java | 82 +++ .../internal/DependencyReportRenderer.java | 46 ++ .../tasks/diagnostics/internal/GraphRenderer.java | 69 ++ .../internal/PropertyReportRenderer.java | 0 .../tasks/diagnostics/internal/ReportRenderer.java | 0 .../internal/SingleProjectTaskReportModel.java | 0 .../tasks/diagnostics/internal/TaskDetails.java | 0 .../diagnostics/internal/TaskDetailsFactory.java | 0 .../diagnostics/internal/TaskReportModel.java | 0 .../diagnostics/internal/TaskReportRenderer.java | 157 +++++ .../diagnostics/internal/TextReportRenderer.java | 0 .../AsciiDependencyReportRenderer.java | 112 ++++ .../internal/dsl/DependencyResultSpec.java | 54 ++ .../dsl/DependencyResultSpecNotationParser.java | 57 ++ .../internal/graph/DependencyGraphRenderer.groovy | 81 +++ .../diagnostics/internal/graph/NodeRenderer.groovy | 28 + .../internal/graph/SimpleNodeRenderer.java | 36 ++ .../nodes/AbstractRenderableDependencyResult.java | 82 +++ .../nodes/AbstractRenderableModuleResult.java | 53 ++ .../nodes/InvertedRenderableDependencyResult.java | 46 ++ .../nodes/InvertedRenderableModuleResult.java | 45 ++ .../internal/graph/nodes/RenderableDependency.java | 31 + .../graph/nodes/RenderableDependencyResult.java | 48 ++ .../graph/nodes/RenderableModuleResult.java | 45 ++ .../internal/graph/nodes/SimpleDependency.java | 58 ++ .../insight/DependencyInsightReporter.groovy | 69 ++ .../insight/ResolvedDependencyResultSorter.java | 76 +++ .../gradle/api/tasks/diagnostics/package-info.java | 22 + .../main/groovy/org/gradle/configuration/Help.java | 48 ++ .../META-INF/gradle-plugins/help-tasks.properties | 1 + .../gradle-plugins/project-report.properties | 0 .../gradle-plugins/project-reports.properties | 0 .../gradle/api/plugins/HelpTasksPluginSpec.groovy | 68 ++ .../api/plugins/ProjectReportsPluginTest.java | 0 .../ReportingBasePluginConventionTest.groovy | 0 .../api/plugins/ReportingBasePluginTest.groovy | 46 ++ .../tasks/diagnostics/AbstractReportTaskTest.java | 0 .../DependencyInsightReportTaskSpec.groovy | 78 +++ .../diagnostics/DependencyReportTaskTest.groovy | 79 +++ .../tasks/diagnostics/ProjectReportTaskTest.groovy | 0 .../tasks/diagnostics/PropertyReportTaskTest.java | 0 .../api/tasks/diagnostics/TaskReportTaskTest.java | 0 .../internal/AbstractTaskModelSpec.groovy | 49 ++ ...AggregateMultiProjectTaskReportModelTest.groovy | 115 ++++ .../DefaultGroupTaskReportModelTest.groovy | 110 ++++ .../internal/PropertyReportRendererTest.java | 0 .../SingleProjectTaskReportModelTest.groovy | 179 +++++ .../internal/TaskDetailsFactoryTest.groovy | 74 +++ .../internal/TaskReportRendererTest.groovy | 184 ++++++ .../internal/TextReportRendererTest.groovy | 116 ++++ .../AsciiDependencyReportRendererTest.groovy | 105 +++ .../DependencyResultSpecNotationParserSpec.groovy | 97 +++ .../internal/dsl/DependencyResultSpecTest.groovy | 69 ++ .../graph/DependencyGraphRendererSpec.groovy | 85 +++ .../AbstractRenderableDependencyResultSpec.groovy | 46 ++ .../InvertedRenderableDependencyResultTest.groovy | 72 +++ .../insight/DependencyInsightReporterSpec.groovy | 108 ++++ .../ResolvedDependencyResultSorterSpec.groovy | 79 +++ subprojects/distributions/distributions.gradle | 134 ++++ .../gradle/AllDistributionIntegrationSpec.groovy | 72 +++ .../gradle/BinDistributionIntegrationSpec.groovy | 34 + .../org/gradle/DistributionIntegrationSpec.groovy | 93 +++ .../gradle/SrcDistributionIntegrationSpec.groovy | 58 ++ .../distributions/src}/toplevel/LICENSE | 0 .../distributions/src}/toplevel/NOTICE | 0 .../distributions/src}/toplevel/changelog.txt | 0 .../distributions/src}/toplevel/init.d/readme.txt | 0 .../src}/toplevel/media/gradle-icon-128x128.png | Bin .../src}/toplevel/media/gradle-icon-16x16.png | Bin .../src}/toplevel/media/gradle-icon-24x24.png | Bin .../src}/toplevel/media/gradle-icon-256x256.png | Bin .../src}/toplevel/media/gradle-icon-32x32.png | Bin .../src}/toplevel/media/gradle-icon-48x48.png | Bin .../src}/toplevel/media/gradle-icon-512x512.png | Bin .../src}/toplevel/media/gradle-icon-64x64.png | Bin .../distributions/src}/toplevel/media/gradle.icns | Bin subprojects/docs/docs.gradle | 146 +++-- subprojects/docs/release-notes-transform.gradle | 59 +- subprojects/docs/src/docs/css/base.css | 369 ++++++----- subprojects/docs/src/docs/css/docs.css | 134 ++++ subprojects/docs/src/docs/css/dsl.css | 53 +- .../docs/src/docs/css/images/gradle-logo_25o.gif | Bin 0 -> 2241 bytes subprojects/docs/src/docs/css/release-notes.css | 72 +++ subprojects/docs/src/docs/css/style.css | 58 -- subprojects/docs/src/docs/css/userguide.css | 69 +- subprojects/docs/src/docs/dsl/dsl.xml | 89 ++- .../dsl/org.gradle.api.artifacts.Configuration.xml | 6 + ....buildcomparison.gradle.CompareGradleBuilds.xml | 45 ++ ...comparison.gradle.GradleBuildInvocationSpec.xml | 39 ++ .../org.gradle.api.plugins.quality.FindBugs.xml | 24 + ...radle.api.plugins.quality.FindBugsExtension.xml | 26 +- ...org.gradle.api.publish.PublicationContainer.xml | 22 + .../org.gradle.api.publish.PublishingExtension.xml | 34 + ....gradle.api.publish.ivy.IvyModuleDescriptor.xml | 30 + .../org.gradle.api.publish.ivy.IvyPublication.xml | 28 + ...rg.gradle.api.tasks.compile.AbstractOptions.xml | 22 + ...org.gradle.api.tasks.compile.CompileOptions.xml | 108 ++++ ...adle.api.tasks.compile.GroovyCompileOptions.xml | 78 +++ .../org.gradle.api.tasks.compile.JavaCompile.xml | 31 + ...sks.diagnostics.DependencyInsightReportTask.xml | 47 ++ .../org.gradle.api.tasks.scala.ScalaCompile.xml | 4 + ....gradle.api.tasks.scala.ScalaCompileOptions.xml | 95 +++ .../docs/dsl/org.gradle.api.tasks.testing.Test.xml | 5 +- ...radle.api.tasks.testing.logging.TestLogging.xml | 68 ++ ....tasks.testing.logging.TestLoggingContainer.xml | 33 +- subprojects/docs/src/docs/dsl/plugins.xml | 5 +- .../docs/src/docs/release/content/Lato-bold.woff | Bin 37284 -> 0 bytes .../src/docs/release/content/Lato-regular.woff | Bin 35884 -> 0 bytes .../src/docs/release/content/jquery-1.7.2-min.js | 4 - subprojects/docs/src/docs/release/content/logo.gif | Bin 7488 -> 0 bytes .../docs/src/docs/release/content/style.css | 177 ----- subprojects/docs/src/docs/release/notes.md | 424 ++++++++---- subprojects/docs/src/docs/stylesheets/dslHtml.xsl | 2 +- .../docs/src/docs/stylesheets/standaloneHtml.xsl | 2 +- .../src/docs/stylesheets/userGuideHtmlCommon.xsl | 2 +- .../docs/src/docs/stylesheets/userGuidePdf.xsl | 2 +- .../docs/src/docs/userguide/artifactMngmt.xml | 8 +- .../docs/src/docs/userguide/bootstrapPlugin.xml | 88 +++ .../docs/userguide/buildAnnouncementsPlugin.xml | 2 +- .../docs/src/docs/userguide/buildEnvironment.xml | 2 +- .../docs/src/docs/userguide/commandLine.xml | 22 + .../src/docs/userguide/commandLineTutorial.xml | 37 ++ .../docs/src/docs/userguide/comparingBuilds.xml | 233 +++++++ subprojects/docs/src/docs/userguide/depMngmt.xml | 185 +++--- .../docs/src/docs/userguide/eclipsePlugin.xml | 2 +- subprojects/docs/src/docs/userguide/embedding.xml | 6 +- .../docs/src/docs/userguide/featureLifecycle.xml | 132 ++++ .../docs/src/docs/userguide/gradleDaemon.xml | 14 +- subprojects/docs/src/docs/userguide/javaPlugin.xml | 8 +- subprojects/docs/src/docs/userguide/logging.xml | 13 +- .../docs/src/docs/userguide/multiproject.xml | 23 + subprojects/docs/src/docs/userguide/plugins.xml | 2 +- .../docs/src/docs/userguide/projectReports.xml | 9 +- .../docs/src/docs/userguide/publishingIvy.xml | 228 +++++++ .../docs/src/docs/userguide/scalaPlugin.xml | 77 ++- .../docs/src/docs/userguide/standardPlugins.xml | 15 +- .../docs/src/docs/userguide/troubleshooting.xml | 1 - subprojects/docs/src/docs/userguide/userguide.xml | 13 +- .../docs/src/docs/userguide/workingWithFiles.xml | 2 +- .../multiproject/groovycDetector/build.gradle | 2 +- .../groovy/multiproject/testproject/build.gradle | 2 +- .../src/test/groovy/org/gradle/VersionTest.groovy | 4 +- .../docs/src/samples/ivypublish-new/build.gradle | 60 ++ .../docs/src/samples/ivypublish-new/output-ivy.xml | 23 + .../src/samples/ivypublish-new/settings.gradle | 18 + .../src/main/java/org/gradle/SomeClass.java | 4 + .../samples/ivypublish-new/subproject/build.gradle | 17 + .../src/main/java/org/gradle/shared/Person.java | 5 + .../samples/scala/customizedLayout/build.gradle | 8 +- .../docs/src/samples/scala/fsc/build.gradle | 13 +- .../samples/scala/mixedJavaAndScala/build.gradle | 8 +- .../docs/src/samples/scala/quickstart/build.gradle | 13 +- .../docs/src/samples/scala/zinc/build.gradle | 33 + subprojects/docs/src/samples/scala/zinc/readme.xml | 3 + .../main/scala/org/gradle/sample/api/Person.scala | 9 + .../scala/org/gradle/sample/impl/PersonImpl.scala | 12 + .../src/main/java/org/gradle/sample/Main.java | 35 - .../src/samples/toolingApi/eclipse/build.gradle | 2 +- .../src/main/java/org/gradle/sample/Main.java | 10 + .../idea/src/main/java/org/gradle/sample/Main.java | 4 + .../src/main/java/org/gradle/sample/Main.java | 8 + .../toolingApi/{build => runBuild}/build.gradle | 0 .../toolingApi/{build => runBuild}/readme.xml | 0 .../src/main/java/org/gradle/sample/Main.java | 43 ++ .../artifacts/externalDependencies/build.gradle | 8 +- .../samples/userguide/artifacts/maven/build.gradle | 1 - .../src/samples/userguide/files/copy/build.gradle | 5 +- .../userguide/files/inputFiles/build.gradle | 2 +- .../samples/userguide/java/sourceSets/build.gradle | 2 +- .../userguide/tutorial/projectReports/build.gradle | 2 +- .../tutorial/properties/gradle.properties | 2 +- .../userguideOutput/dependencyInsightReport.out | 3 + .../userguideOutput/dependencyListReport.out | 8 +- .../samples/userguideOutput/taskListAllReport.out | 3 +- .../src/samples/userguideOutput/taskListReport.out | 3 +- .../customised/src/test/java/org/MyClassTest.java | 7 - .../src/test/java/org/gradle/MyClassTest.java | 7 + subprojects/ear/ear.gradle | 1 + .../groovy/org/gradle/plugins/ear/EarPlugin.java | 9 +- .../internal/DefaultDeploymentDescriptor.groovy | 28 +- .../org/gradle/plugins/ear/EarPluginTest.groovy | 3 +- .../groovy/org/gradle/plugins/ear/EarTest.groovy | 3 - subprojects/ide/ide.gradle | 3 +- .../plugins/ide/AbstractIdeIntegrationTest.groovy | 7 +- .../eclipse/EclipseClasspathIntegrationTest.groovy | 34 +- ...ClasspathRemoteResolutionIntegrationTest.groovy | 4 +- .../ide/eclipse/EclipseIntegrationTest.groovy | 26 +- .../plugins/ide/eclipse/EclipsePlugin.groovy | 24 +- .../plugins/ide/eclipse/EclipseWtpPlugin.groovy | 24 +- .../ide/eclipse/model/EclipseClasspath.groovy | 74 ++- .../plugins/ide/eclipse/model/EclipseModel.groovy | 2 +- .../org/gradle/plugins/ide/idea/IdeaPlugin.groovy | 24 +- .../internal/provider/BuildModelAction.java | 41 +- .../internal/provider/EclipseModelBuilder.java | 3 +- .../internal/provider/FileOutcomeIdentifier.java | 41 ++ .../internal/provider/IdeaModelBuilder.java | 2 +- .../internal/provider/MigrationModelBuilder.java | 74 --- .../internal/provider/ModelBuildingAdapter.java | 42 -- .../internal/provider/NullResultBuilder.java | 30 + .../provider/ProjectOutcomesModelBuilder.java | 71 ++ ...blishArtifactToFileBuildOutcomeTransformer.java | 98 +++ .../plugins/ide/eclipse/EclipsePluginTest.groovy | 20 +- .../ide/eclipse/EclipseWtpPluginTest.groovy | 3 +- .../ide/idea/ GenerateIdeaModuleTest.groovy | 7 +- .../gradle/plugins/ide/idea/IdeaPluginTest.groovy | 4 +- ...rtifactToFileBuildOutcomeTransformerTest.groovy | 86 +++ subprojects/integ-test/integ-test.gradle | 18 +- ...kCommandLineConfigurationIntegrationSpec.groovy | 252 ++++++++ .../DependencyReportTaskIntegrationTest.groovy | 60 -- .../org/gradle/debug/GradleRunConfiguration.groovy | 4 +- .../integtests/CacheProjectIntegrationTest.groovy | 4 +- .../integtests/CommandLineIntegrationTest.groovy | 8 +- .../integtests/DistributionIntegrationTest.groovy | 160 ----- .../DistributionLocatorIntegrationTest.groovy | 2 +- .../ExternalScriptExecutionIntegrationTest.groovy | 7 +- .../InitScriptExecutionIntegrationTest.groovy | 2 +- .../MultiProjectDependencyIntegrationTest.groovy | 283 ++++++++ .../ParallelProjectExecutionIntegrationTest.groovy | 109 ++++ .../integtests/ProjectLayoutIntegrationTest.groovy | 9 +- .../ProjectReportsPluginIntegrationTest.java | 33 - .../integtests/WorkerProcessIntegrationTest.java | 38 +- .../WrapperProjectIntegrationTest.groovy | 172 ----- .../BuildEnvironmentIntegrationTest.groovy | 10 +- .../integtests/fixture/M2Installation.groovy | 33 +- .../ivy/IvyEarProjectPublishIntegrationTest.groovy | 5 +- .../ivy/IvyHttpPublishIntegrationTest.groovy | 36 +- .../IvyJavaProjectPublishIntegrationTest.groovy | 9 +- .../ivy/IvyLocalPublishIntegrationTest.groovy | 41 +- .../ivy/IvySFtpPublishIntegrationTest.groovy | 12 +- .../IvySingleProjectPublishIntegrationTest.groovy | 9 +- .../ivy/IvyWarProjectPublishIntegrationTest.groovy | 5 +- .../MavenEarProjectPublishIntegrationTest.groovy | 5 +- .../MavenJavaProjectPublishIntegrationTest.groovy | 5 +- .../MavenMultiProjectPublishIntegrationTest.groovy | 2 - .../MavenNewPublicationIntegrationTest.groovy | 158 ----- .../maven/MavenPomGenerationIntegrationTest.groovy | 8 +- .../maven/MavenPublishIntegrationTest.groovy | 73 ++- ...MavenPublishRespectsPomConfigurationTest.groovy | 8 +- .../MavenWarProjectPublishIntegrationTest.groovy | 5 +- ...SamplesMavenPomGenerationIntegrationTest.groovy | 13 +- .../SamplesMavenQuickstartIntegrationTest.groovy | 12 +- .../AbstractDependencyResolutionTest.groovy | 42 +- .../ArtifactDependenciesIntegrationTest.groovy | 12 +- .../ArtifactOnlyResolutionIntegrationTest.groovy | 11 +- .../resolve/CacheResolveIntegrationTest.groovy | 58 +- .../ProjectDependencyResolveIntegrationTest.groovy | 21 +- .../ResolvedConfigurationIntegrationTest.groovy | 19 +- .../VersionConflictResolutionIntegTest.groovy | 126 +++- ...AliasedArtifactResolutionIntegrationTest.groovy | 171 +++-- .../CacheReuseCrossVersionIntegrationTest.groovy | 90 ++- .../M3CacheReuseCrossVersionIntegrationTest.groovy | 23 +- .../MavenM2CacheReuseIntegrationTest.groovy | 33 +- .../ResolutionOverrideIntegrationTest.groovy | 45 +- ...achedDependencyResolutionIntegrationTest.groovy | 63 +- .../CachedMissingModulesIntegrationTest.groovy | 260 ++++++++ .../FileSystemResolverIntegrationTest.groovy | 72 +++ .../FilerSystemResolverIntegrationTest.groovy | 76 --- .../custom/IvySFtpResolverIntegrationTest.groovy | 18 +- .../custom/IvyUrlResolverIntegrationTest.groovy | 55 +- .../AbstractHttpsRepoResolveIntegrationTest.groovy | 129 ++++ ...ationDependencyResolutionIntegrationTest.groovy | 12 +- .../http/HttpProxyResolveIntegrationTest.groovy | 6 +- .../http/HttpRedirectResolveIntegrationTest.groovy | 4 +- .../IvyBrokenRemoteResolveIntegrationTest.groovy | 38 +- ...angingModuleRemoteResolveIntegrationTest.groovy | 144 +++-- ...amicRevisionRemoteResolveIntegrationTest.groovy | 464 ++++++++++--- ...IvyDynamicRevisionResolveIntegrationTest.groovy | 334 ++++++++++ .../ivy/IvyHttpRepoResolveIntegrationTest.groovy | 14 +- .../ivy/IvyHttpsRepoResolveIntegrationTest.groovy | 28 + .../MavenDynamicResolveIntegrationTest.groovy | 123 +++- .../MavenFileRepoResolveIntegrationTest.groovy | 3 +- .../MavenHttpRepoResolveIntegrationTest.groovy | 80 ++- .../MavenHttpsRepoResolveIntegrationTest.groovy | 28 + .../MavenLocalRepoResolveIntegrationTest.groovy | 108 ++-- .../MavenPomPackagingResolveIntegrationTest.groovy | 8 +- .../MavenSnapshotResolveIntegrationTest.groovy | 269 ++++---- .../SamplesJavaApiAndImplIntegrationTest.groovy | 5 +- ...mplesMultiProjectBuildSrcIntegrationTest.groovy | 7 +- .../samples/SamplesScalaZincIntegrationTest.groovy | 52 ++ .../SamplesWebQuickstartIntegrationTest.groovy | 2 +- .../eclipseproject/scala/expectedClasspathFile.txt | 2 +- .../shared/clientStore | Bin 0 -> 2249 bytes .../shared/serverStore | Bin 0 -> 2249 bytes .../build.gradle | 80 --- .../shared/producer.gradle | 22 - .../shared/projectWithMavenSnapshots.gradle | 20 - .../shared/src/main/java/org/gradle/Test.java | 4 - .../internal-integ-testing.gradle | 3 +- .../fixtures/AbstractDelegatingGradleExecuter.java | 4 + .../fixtures/AbstractGradleExecuter.java | 118 +++- .../fixtures/AbstractIntegrationSpec.groovy | 49 +- .../fixtures/AbstractIntegrationTest.java | 37 +- .../fixtures/AbstractMultiTestRunner.java | 59 +- .../integtests/fixtures/AvailableJavaHomes.java | 106 ++- .../fixtures/BasicGradleDistribution.java | 5 + .../gradle/integtests/fixtures/ClassFile.groovy | 69 ++ .../fixtures/CrossVersionIntegrationSpec.groovy | 13 + .../integtests/fixtures/DaemonGradleExecuter.java | 60 +- .../fixtures/EmbeddedDaemonGradleExecuter.java | 5 +- .../integtests/fixtures/ExecutionResult.java | 2 + .../integtests/fixtures/ForkingGradleExecuter.java | 49 +- .../integtests/fixtures/ForkingGradleHandle.java | 4 +- .../integtests/fixtures/GradleDistribution.java | 32 +- .../fixtures/GradleDistributionExecuter.java | 130 ++-- .../gradle/integtests/fixtures/GradleExecuter.java | 61 +- .../gradle/integtests/fixtures/GradleHandle.java | 4 - .../gradle/integtests/fixtures/HttpServer.groovy | 639 ------------------ .../fixtures/InProcessGradleExecuter.java | 57 +- .../integtests/fixtures/IvyRepository.groovy | 293 --------- .../fixtures/JUnitTestExecutionResult.groovy | 18 +- .../fixtures/KillProcessAvailability.groovy | 47 ++ .../integtests/fixtures/MavenFileModule.groovy | 294 +++++++++ .../integtests/fixtures/MavenFileRepository.groovy | 41 ++ .../integtests/fixtures/MavenHttpModule.groovy | 152 +++++ .../integtests/fixtures/MavenHttpRepository.groovy | 70 ++ .../gradle/integtests/fixtures/MavenModule.groovy | 42 ++ .../org/gradle/integtests/fixtures/MavenPom.groovy | 46 ++ .../integtests/fixtures/MavenRepository.groovy | 408 +----------- .../gradle/integtests/fixtures/MavenScope.groovy | 36 ++ .../fixtures/MultiVersionIntegrationSpec.groovy | 5 + .../fixtures/OutputScrapingExecutionResult.java | 9 +- .../fixtures/OutputScrapingGradleHandle.java | 13 +- .../fixtures/ParallelForkingGradleExecuter.java | 43 ++ .../fixtures/ParallelForkingGradleHandle.java | 76 +++ .../fixtures/ParallelOutputMatcher.groovy | 51 ++ .../fixtures/PreviousGradleVersionExecuter.groovy | 24 +- .../fixtures/ProgressLoggingFixture.groovy | 83 +++ .../fixtures/RedirectMavenCentral.groovy | 46 ++ .../integtests/fixtures/ReleasedVersions.java | 14 - .../gradle/integtests/fixtures/SFTPServer.groovy | 153 ----- .../fixtures/SequentialOutputMatcher.groovy | 92 +++ .../fixtures/TestClassExecutionResult.java | 2 + .../fixtures/TestNGExecutionResult.groovy | 37 +- .../fixtures/TestNativeFileSystem.groovy | 111 ---- .../integtests/fixtures/TestProxyServer.groovy | 70 -- .../fixtures/UserGuideSamplesRunner.groovy | 88 +-- .../fixtures/WellBehavedPluginTest.groovy | 2 +- .../test/fixtures/ivy/AbstractIvyModule.groovy | 25 + .../gradle/test/fixtures/ivy/IvyDescriptor.groovy | 70 ++ .../test/fixtures/ivy/IvyDescriptorArtifact.groovy | 25 + .../fixtures/ivy/IvyDescriptorConfiguration.groovy | 26 + .../IvyDescriptorDependencyConfiguration.groovy | 32 + .../gradle/test/fixtures/ivy/IvyFileModule.groovy | 203 ++++++ .../test/fixtures/ivy/IvyFileRepository.groovy | 71 ++ .../gradle/test/fixtures/ivy/IvyHttpModule.groovy | 132 ++++ .../test/fixtures/ivy/IvyHttpRepository.groovy | 54 ++ .../org/gradle/test/fixtures/ivy/IvyModule.java | 50 ++ .../gradle/test/fixtures/ivy/IvyRepository.groovy | 32 + .../fixtures/server/http/BlockingHttpServer.groovy | 133 ++++ .../test/fixtures/server/http/HttpServer.groovy | 684 ++++++++++++++++++++ .../fixtures/server/http/TestProxyServer.groovy | 72 +++ .../test/fixtures/server/sftp/SFTPServer.groovy | 242 +++++++ .../org/gradle/test/matchers/UserAgentMatcher.java | 54 ++ .../src/main/resources/logback.xml | 14 + .../internal-testing/internal-testing.gradle | 6 +- .../src/main/groovy/org/gradle/util/TestFile.java | 4 +- .../groovy/org/gradle/util/TestFileHelper.groovy | 3 + .../groovy/org/gradle/util/TestPrecondition.groovy | 3 + subprojects/ivy/ivy.gradle | 29 + .../ivy/AutoTestedSamplesIvyIntegrationTest.groovy | 29 + .../ivy/IvyCustomPublishIntegrationTest.groovy | 67 ++ .../ivy/IvyEarProjectPublishIntegrationTest.groovy | 64 ++ .../ivy/IvyHttpPublishIntegrationTest.groovy | 349 ++++++++++ .../IvyJavaProjectPublishIntegrationTest.groovy | 62 ++ .../ivy/IvyLocalPublishIntegrationTest.groovy | 128 ++++ ...vyPublishDescriptorModificationIntegTest.groovy | 85 +++ .../IvyPublishMultipleReposIntegrationTest.groovy | 96 +++ .../publish/ivy/IvyPublishPluginIntegTest.groovy | 32 + .../ivy/IvySFtpPublishIntegrationTest.groovy | 97 +++ .../IvySingleProjectPublishIntegrationTest.groovy | 137 ++++ .../ivy/IvyWarProjectPublishIntegrationTest.groovy | 60 ++ .../ivy/SamplesIvyPublishIntegrationTest.groovy | 73 +++ .../api/publish/ivy/IvyModuleDescriptor.java | 89 +++ .../org/gradle/api/publish/ivy/IvyPublication.java | 103 +++ .../ivy/internal/DefaultIvyModuleDescriptor.java | 45 ++ .../ivy/internal/DefaultIvyPublication.java | 100 +++ .../ivy/internal/IvyModuleDescriptorInternal.java | 26 + .../ivy/internal/IvyPublicationInternal.java | 31 + .../org/gradle/api/publish/ivy/package-info.java | 25 + .../api/publish/ivy/plugins/IvyPublishPlugin.java | 101 +++ .../api/publish/ivy/plugins/package-info.java | 25 + .../publish/ivy/tasks/PublishToIvyRepository.java | 167 +++++ .../internal/IvyPublishDynamicTaskCreator.java | 95 +++ .../gradle/api/publish/ivy/tasks/package-info.java | 25 + .../META-INF/gradle-plugins/ivy-publish.properties | 1 + .../ivy/internal/DefaultIvyPublicationTest.groovy | 81 +++ .../ivy/plugins/IvyPublishPluginTest.groovy | 85 +++ .../ivy/tasks/PublishToIvyRepositoryTest.groovy | 143 ++++ .../IvyPublishDynamicTaskCreatorTest.groovy | 105 +++ subprojects/javascript/javascript.gradle | 3 +- .../javascript/base/JavaScriptBasePlugin.groovy | 15 +- .../javascript/base/JavaScriptExtension.java | 12 +- .../coffeescript/CoffeeScriptCompile.java | 10 +- .../plugins/javascript/envjs/EnvJsPlugin.groovy | 11 +- .../gradle/plugins/javascript/jshint/JsHint.java | 10 +- .../base/JavaScriptBasePluginTest.groovy | 35 +- subprojects/launcher/launcher.gradle | 6 +- .../GradleConfigurabilityIntegrationSpec.groovy | 109 ++++ .../DaemonConfigurabilityIntegrationSpec.groovy | 100 --- .../daemon/DaemonFeedbackIntegrationSpec.groovy | 42 +- ...itialCommunicationFailureIntegrationSpec.groovy | 128 ++++ .../launcher/daemon/DaemonIntegrationSpec.groovy | 10 +- .../launcher/daemon/DaemonLifecycleSpec.groovy | 21 +- .../DaemonSystemPropertiesIntegrationTest.groovy | 49 ++ .../daemon/StoppingDaemonIntegrationSpec.groovy | 70 ++ .../StoppingDaemonSmokeIntegrationSpec.groovy | 89 --- .../daemon/testing/DaemonContextParser.java | 3 +- .../testing/DaemonEventSequenceBuilder.groovy | 2 +- .../daemon/testing/DaemonLogsAnalyzer.groovy | 52 ++ .../launcher/daemon/testing/TestableDaemon.groovy | 116 ++++ .../org/gradle/launcher/cli/ActionAdapter.java | 36 -- .../gradle/launcher/cli/BuildActionsFactory.java | 23 +- .../org/gradle/launcher/cli/CommandLineAction.java | 2 +- .../launcher/cli/CommandLineActionFactory.java | 15 +- .../org/gradle/launcher/cli/GuiActionsFactory.java | 5 +- .../launcher/daemon/bootstrap/DaemonMain.java | 43 +- .../daemon/bootstrap/ForegroundDaemonMain.java | 3 +- .../launcher/daemon/client/DaemonClient.java | 136 ++-- .../daemon/client/DaemonClientConnection.java | 74 +++ .../daemon/client/DaemonClientServicesSupport.java | 2 +- .../launcher/daemon/client/DaemonConnection.java | 56 -- .../launcher/daemon/client/DaemonConnector.java | 6 +- .../client/DaemonInitialConnectException.java | 4 - .../daemon/client/DefaultDaemonConnector.java | 58 +- .../daemon/client/DefaultDaemonStarter.java | 4 +- .../client/EmbeddedDaemonClientServices.java | 4 +- .../daemon/client/EmbeddedDaemonStarter.java | 2 +- .../launcher/daemon/client/InputForwarder.java | 2 +- .../daemon/client/SingleUseDaemonClient.java | 6 +- .../launcher/daemon/client/StopDispatcher.java | 33 +- .../daemon/diagnostics/DaemonDiagnostics.java | 2 +- .../launcher/daemon/logging/DaemonMessages.java | 10 +- .../launcher/daemon/protocol/DaemonBusy.java | 28 - .../daemon/protocol/DaemonUnavailable.java | 34 + .../gradle/launcher/daemon/protocol/Finished.java | 22 + .../launcher/daemon/registry/DaemonInfo.java | 5 +- .../launcher/daemon/registry/DaemonRegistry.java | 2 +- .../daemon/registry/DaemonRegistryServices.java | 2 +- .../daemon/registry/EmbeddedDaemonRegistry.java | 4 +- .../daemon/registry/PersistentDaemonRegistry.java | 8 +- .../org/gradle/launcher/daemon/server/Daemon.java | 157 ++--- .../daemon/server/DaemonServerConnector.java | 2 +- .../launcher/daemon/server/DaemonServices.java | 3 +- .../daemon/server/DaemonStateCoordinator.java | 343 ++++------ .../daemon/server/DaemonStoppedException.java | 18 +- .../daemon/server/DefaultDaemonConnection.java | 369 +++++++++++ .../server/DefaultIncomingConnectionHandler.java | 172 +++++ .../daemon/server/DomainRegistryUpdater.java | 19 +- .../server/SynchronizedDispatchConnection.java | 13 +- .../server/exec/CatchAndForwardDaemonFailure.java | 2 +- .../daemon/server/exec/DaemonCommandExecuter.java | 3 +- .../daemon/server/exec/DaemonCommandExecution.java | 13 +- .../daemon/server/exec/DaemonConnection.java | 90 +++ .../daemon/server/exec/DaemonStateControl.java | 42 +- .../server/exec/DaemonUnavailableException.java | 27 + .../server/exec/DefaultDaemonCommandExecuter.java | 25 +- .../server/exec/EstablishBuildEnvironment.java | 25 +- .../daemon/server/exec/ForwardClientInput.java | 95 +-- ...HandleClientDisconnectBeforeSendingCommand.java | 24 - .../launcher/daemon/server/exec/HandleStop.java | 6 +- .../launcher/daemon/server/exec/LogToClient.java | 14 +- .../launcher/daemon/server/exec/ReturnResult.java | 2 +- .../server/exec/StartBuildOrRespondWithBusy.java | 34 +- .../server/exec/StartStopIfBuildAndStop.java | 11 +- .../launcher/daemon/server/exec/StdinHandler.java | 25 + .../server/exec/StopConnectionAfterExecution.java | 40 -- .../daemon/server/exec/WatchForDisconnection.java | 14 +- .../internal/provider/ConfiguringBuildAction.java | 5 +- .../DaemonGradleLauncherActionExecuter.java | 2 +- .../internal/provider/DefaultConnection.java | 80 ++- .../provider/DelegatingBuildModelAction.java | 6 +- ...oggingBridgingGradleLauncherActionExecuter.java | 2 +- .../connection/AdaptedOperationParameters.java | 126 ++++ .../provider/connection/BuildLogLevelMixIn.java | 48 ++ .../provider/connection/ProviderBuildResult.java | 31 + .../connection/ProviderConnectionParameters.java | 23 + .../connection/ProviderOperationParameters.java | 67 ++ .../provider/input/AdaptedOperationParameters.java | 150 ----- .../input/ProviderOperationParameters.java | 66 -- .../launcher/cli/BuildActionsFactoryTest.groovy | 34 +- .../launcher/cli/GuiActionsFactoryTest.groovy | 6 +- .../launcher/daemon/EmbeddedDaemonSmokeTest.groovy | 4 +- .../client/DaemonClientConnectionTest.groovy | 94 +++ .../client/DaemonClientInputForwarderTest.groovy | 28 +- .../launcher/daemon/client/DaemonClientTest.groovy | 110 +++- .../client/DefaultDaemonConnectorTest.groovy | 16 +- .../registry/DaemonRegistryServicesTest.groovy | 2 +- .../registry/DomainRegistryUpdaterTest.groovy | 21 +- .../registry/EmbeddedDaemonRegistrySpec.groovy | 4 +- .../registry/PersistentDaemonRegistryTest.groovy | 45 +- .../DaemonServerExceptionHandlingTest.groovy | 3 +- .../server/DaemonStateCoordinatorTest.groovy | 427 ++++++++++-- .../server/DefaultDaemonConnectionTest.groovy | 394 +++++++++++ .../DaemonGradleLauncherActionExecuterTest.groovy | 2 +- ...BridgingGradleLauncherActionExecuterTest.groovy | 2 +- .../AdaptedOperationParametersTest.groovy | 71 ++ .../input/AdaptedOperationParametersTest.groovy | 71 -- .../maven/MavenConversionIntegrationTest.groovy | 139 ++++ .../flatmultimodule/webinar-api/pom.xml | 20 + .../src/main/java/webinar/Demoable.java | 5 + .../flatmultimodule/webinar-impl/pom.xml | 39 ++ .../src/main/java/webinar/Webinar.java | 20 + .../src/test/java/webinar/WebinarTest.java | 15 + .../flatmultimodule/webinar-parent/pom.xml | 30 + .../flatmultimodule/webinar-war/pom.xml | 37 ++ .../webinar-war/src/main/webapp/WEB-INF/web.xml | 7 + .../webinar-war/src/main/webapp/index.jsp | 6 + .../multiModule/pom.xml | 30 + .../multiModule/webinar-api/pom.xml | 19 + .../src/main/java/webinar/Demoable.java | 5 + .../multiModule/webinar-impl/pom.xml | 38 ++ .../src/main/java/webinar/Webinar.java | 20 + .../src/test/java/webinar/WebinarTest.java | 15 + .../multiModule/webinar-war/pom.xml | 36 ++ .../webinar-war/src/main/webapp/WEB-INF/web.xml | 7 + .../webinar-war/src/main/webapp/index.jsp | 6 + .../singleModule/pom.xml | 23 + .../singleModule/src/main/java/Foo.java | 7 + .../singleModule/src/test/java/FooTest.java | 7 + .../MavenConversionIntegrationTest/testjar/pom.xml | 38 ++ .../testjar/src/main/java/Foo.java | 7 + .../testjar/src/test/java/FooTest.java | 8 + .../groovy/org/gradle/api/plugins/MavenPlugin.java | 12 +- .../api/plugins/maven/ConvertMaven2Gradle.groovy | 67 ++ .../api/plugins/maven/Maven2GradlePlugin.groovy | 36 ++ .../api/plugins/maven/internal/Maven2Gradle.groovy | 552 ++++++++++++++++ .../maven/internal/MavenProjectXmlWriter.java | 58 ++ .../maven/internal/MavenProjectsCreator.java | 98 +++ .../api/publication/InstallPublications.groovy | 36 -- .../api/publication/PublicationPlugin.groovy | 44 -- .../org/gradle/api/publication/Publications.groovy | 31 - .../api/publication/PublishPublications.groovy | 36 -- .../api/publication/maven/MavenArtifact.groovy | 22 - .../api/publication/maven/MavenDependency.groovy | 25 - .../publication/maven/MavenPomCustomizer.groovy | 22 - .../api/publication/maven/MavenPublication.groovy | 32 - .../api/publication/maven/MavenPublisher.groovy | 23 - .../gradle/api/publication/maven/MavenScope.groovy | 24 - .../maven/internal/DefaultMavenPom.java | 50 +- .../internal/MavenPublicationPomGenerator.groovy | 58 -- .../maven/internal/ant/AbstractMavenResolver.java | 18 +- .../internal/ant/DefaultMavenPublisher.groovy | 93 --- .../internal/model/DefaultMavenArtifact.groovy | 24 - .../internal/model/DefaultMavenDependency.groovy | 52 -- .../internal/model/DefaultMavenPublication.groovy | 44 -- .../modelbuilder/DependenciesConverter.groovy | 59 -- .../modelbuilder/MavenPublicationBuilder.groovy | 80 --- .../internal/pombuilder/CustomModelBuilder.java | 82 --- .../maven/internal/pombuilder/ModelFactory.java | 44 -- .../internal/pombuilder/PlexusLoggerAdapter.java | 105 --- .../gradle-plugins/maven2Gradle.properties | 1 + .../org/gradle/api/plugins/MavenPluginTest.java | 21 +- .../plugins/maven/Maven2GradlePluginSpec.groovy | 36 ++ .../maven/internal/MavenProjectsCreatorSpec.groovy | 118 ++++ .../internal/ant/DefaultMavenPublisherTest.groovy | 150 ----- .../MavenPublicationBuilderTest.groovy | 209 ------ .../actor/internal/DefaultActorFactory.java | 4 +- .../remote/internal/AsyncConnectionAdapter.java | 2 +- .../remote/internal/DefaultIncomingBroadcast.java | 2 +- .../remote/internal/DefaultMessagingClient.java | 2 +- .../remote/internal/DefaultMessagingServer.java | 2 +- .../remote/internal/DefaultOutgoingBroadcast.java | 4 +- .../remote/internal/DisconnectAwareConnection.java | 46 -- .../DisconnectAwareConnectionDecorator.java | 123 ---- .../remote/internal/EagerReceiveBuffer.java | 25 +- .../messaging/remote/internal/MessageHub.java | 4 +- .../messaging/remote/internal/ProtocolStack.java | 2 +- .../remote/internal/inet/SocketConnection.java | 4 +- .../remote/internal/inet/TcpIncomingConnector.java | 4 +- .../remote/internal/protocol/MethodMetaInfo.java | 16 + .../internal/protocol/RemoteMethodInvocation.java | 9 + .../DisconnectAwareConnectionDecoratorTest.groovy | 168 ----- .../remote/internal/inet/TcpConnectorTest.groovy | 38 +- subprojects/migration/migration.gradle | 26 - subprojects/native/native.gradle | 7 +- .../nativeplatform/NoOpTerminalDetector.java | 25 - .../internal/nativeplatform/TerminalDetector.java | 23 - .../nativeplatform/WindowsTerminalDetector.java | 36 -- .../nativeplatform/console/ConsoleDetector.java | 29 + .../nativeplatform/console/ConsoleMetaData.java | 36 ++ .../console/FallbackConsoleMetaData.java | 31 + .../console/NativePlatformConsoleDetector.java | 48 ++ .../console/NativePlatformConsoleMetaData.java | 43 ++ .../console/NoOpConsoleDetector.java | 23 + .../console/UnixConsoleMetaData.java | 51 ++ .../console/WindowsConsoleDetector.java | 35 + .../internal/nativeplatform/filesystem/Chmod.java | 11 +- .../nativeplatform/filesystem/FileSystem.java | 14 +- .../filesystem/FileSystemServices.java | 6 +- .../nativeplatform/jna/JnaBootPathConfigurer.java | 16 +- .../jna/LibCBackedConsoleDetector.java | 64 ++ .../jna/LibCBackedTerminalDetector.java | 56 -- .../jna/WindowsProcessEnvironment.java | 2 +- .../nativeplatform/services/NativeServices.java | 92 ++- .../NativePlatformConsoleDetectorTest.groovy | 67 ++ .../jna/LibCBackedProcessEnvironmentTest.groovy | 2 +- .../jna/ProcessEnvironmentTest.groovy | 2 +- .../services/NativeServicesTest.groovy | 10 +- subprojects/open-api/open-api.gradle | 3 + .../plugins/osgi/OsgiPluginIntegrationSpec.groovy | 8 +- .../internal/plugins/osgi/DefaultOsgiManifest.java | 236 ++++++- .../plugins/osgi/OsgiPluginConventionTest.groovy | 16 +- subprojects/performance/performance.gradle | 64 +- subprojects/performance/src/generator.groovy | 24 +- .../DependencyResolutionStressTest.groovy | 280 ++++++++ .../org/gradle/peformance/PerformanceTest.groovy | 124 +++- .../peformance/fixture/MeasuredOperation.groovy | 47 -- .../peformance/fixture/PerformanceResults.groovy | 69 -- .../fixture/PerformanceTestRunner.groovy | 79 --- .../peformance/fixture/TestProjectLocator.groovy | 38 -- .../performance/src/templates/Production.scala | 7 + subprojects/performance/src/templates/Test.scala | 12 + .../performance/src/templates/TestNGTest.java | 42 ++ .../src/templates/VerboseJUnitTest.java | 26 + subprojects/performance/src/templates/build.gradle | 126 +++- .../gradle/peformance/fixture/AmountTest.groovy | 231 +++++++ .../gradle/peformance/fixture/DurationTest.groovy | 59 ++ .../fixture/PerformanceResultsTest.groovy | 202 ++++++ .../peformance/fixture/PrettyCalculatorSpec.groovy | 45 ++ .../org/gradle/peformance/fixture/UnitsTest.groovy | 34 + .../org/gradle/peformance/fixture/Amount.java | 160 +++++ .../org/gradle/peformance/fixture/DataAmount.java | 37 ++ .../gradle/peformance/fixture/DataCollector.java | 27 + .../org/gradle/peformance/fixture/Duration.java | 45 ++ .../peformance/fixture/MeasuredOperation.groovy | 41 ++ .../fixture/MeasuredOperationList.groovy | 50 ++ .../peformance/fixture/MemoryInfoCollector.groovy | 34 + .../peformance/fixture/PerformanceResults.groovy | 136 ++++ .../fixture/PerformanceTestRunner.groovy | 89 +++ .../peformance/fixture/PrettyCalculator.groovy | 49 ++ .../peformance/fixture/TestProjectLocator.groovy | 38 ++ .../org/gradle/peformance/fixture/Units.java | 193 ++++++ subprojects/plugins/plugins.gradle | 10 +- .../api/plugins/BasePluginIntegrationTest.groovy | 2 +- .../gradle/api/plugins/BuildSrcPluginTest.groovy | 5 +- .../GitHubDependenciesPluginIntegrationTest.groovy | 55 ++ .../ParallelCompilerDaemonIntegrationTest.groovy | 61 ++ .../AntForkingGroovyCompilerIntegrationTest.groovy | 5 +- ...ntInProcessGroovyCompilerIntegrationTest.groovy | 4 +- .../BasicGroovyCompilerIntegrationSpec.groovy | 33 +- .../DaemonGroovyCompilerIntegrationTest.groovy | 9 +- .../compile/InvokeDynamicGroovyCompilerSpec.groovy | 2 +- .../JreJavaHomeGroovyIntegrationTest.groovy | 14 +- .../BasicJavaCompilerIntegrationSpec.groovy | 9 +- .../org/gradle/java/compile/ClassFile.groovy | 68 -- .../compile/JavaCompilerIntegrationSpec.groovy | 2 +- .../DaemonJavaCompilerIntegrationTest.groovy | 7 +- .../JreJavaHomeJavaIntegrationTest.groovy | 9 +- .../gradle/testing/TestingIntegrationTest.groovy | 56 +- .../testing/junit/JUnitIntegrationTest.groovy | 43 +- ...NGProducesJUnitXmlResultsIntegrationTest.groovy | 164 +++++ .../TestNGProducesOldReportsIntegrationTest.groovy | 131 ++++ .../shared/GroovyClass.groovy | 96 +++ .../shared/JavaClass.java | 106 +++ .../shared/build.gradle | 14 + .../build.gradle | 9 + .../test/groovy/org/gradle/SystemErrTest.groovy | 32 + .../build.gradle | 9 + .../test/groovy/org/gradle/SystemOutTest.groovy | 32 + .../shared/build.gradle | 2 +- .../standardOutputLogging/build.gradle | 2 +- .../groovyJdk15Failing/build.gradle | 2 +- .../groovyJdk15Passing/build.gradle | 2 +- .../supportsTestGroups/build.gradle | 8 +- .../shared/build.gradle | 2 +- .../standardOutputLogging/build.gradle | 2 +- .../plugins/DefaultArtifactPublicationSet.java | 2 +- .../api/internal/tasks/DefaultSourceSet.java | 4 + .../tasks/compile/AntGroovyCompiler.groovy | 28 +- .../CommandLineJavaCompilerArgumentsGenerator.java | 5 +- .../tasks/compile/CompilationFailedException.java | 4 + .../compile/DefaultGroovyJavaJointCompileSpec.java | 6 +- .../tasks/compile/DefaultJavaCompileSpec.java | 15 +- .../tasks/compile/DefaultJavaCompilerFactory.java | 14 +- .../compile/DefaultJvmLanguageCompileSpec.java | 8 + .../tasks/compile/GroovyCompilerFactory.java | 52 +- .../compile/JavaCompilerArgumentsBuilder.java | 18 +- .../tasks/compile/JvmLanguageCompileSpec.java | 4 + .../tasks/compile/NoOpStaleClassCleaner.java | 24 + .../tasks/compile/TransformingClassLoader.java | 60 +- .../tasks/compile/daemon/CompilerDaemonClient.java | 26 +- .../compile/daemon/CompilerDaemonManager.java | 80 +-- .../detection/AbstractTestFrameworkDetector.java | 27 +- .../testing/detection/DefaultTestExecuter.java | 4 +- .../tasks/testing/detection/TestClassVisitor.java | 6 +- .../testing/detection/TestFrameworkDetector.java | 5 + .../tasks/testing/junit/JUnitDetector.java | 7 +- .../testing/junit/JUnitTestClassDetecter.java | 44 +- .../tasks/testing/junit/JUnitTestFramework.java | 6 +- .../testing/junit/JUnitTestMethodDetecter.java | 16 +- .../testing/junit/JUnitXmlReportGenerator.java | 122 +--- .../junit/TestNGJUnitXmlReportGenerator.java | 99 +++ .../testing/junit/report/ClassPageRenderer.java | 4 +- .../testing/junit/report/OverviewPageRenderer.java | 16 +- .../testing/junit/report/PackagePageRenderer.java | 8 +- .../tasks/testing/junit/result/XmlTestSuite.java | 150 +++++ .../testing/junit/result/XmlTestSuiteFactory.java | 51 ++ .../tasks/testing/logging/AbstractTestLogger.java | 10 +- .../processors/MaxNParallelTestClassProcessor.java | 2 +- .../tasks/testing/testng/TestNGDetector.java | 19 +- .../testing/testng/TestNGTestClassDetecter.java | 44 +- .../testing/testng/TestNGTestClassProcessor.java | 41 +- .../tasks/testing/testng/TestNGTestFramework.java | 39 +- .../testing/testng/TestNGTestMethodDetecter.java | 16 +- .../java/archives/internal/DefaultManifest.java | 21 +- .../groovy/org/gradle/api/plugins/BasePlugin.java | 2 +- .../org/gradle/api/plugins/JavaBasePlugin.java | 29 +- .../groovy/org/gradle/api/plugins/JavaPlugin.java | 4 +- .../gradle/api/plugins/JavaPluginConvention.groovy | 6 +- .../plugins/ProjectReportsPluginConvention.groovy | 43 -- .../gradle/api/plugins/ReportingBasePlugin.java | 43 -- .../plugins/github/GitHubDependenciesPlugin.groovy | 63 ++ .../plugins/github/GitHubDownloadsRepository.java | 85 +++ .../github/GitHubRepositoryHandlerExtension.java | 53 ++ .../internal/DefaultGitHubDownloadsRepository.java | 119 ++++ .../org/gradle/api/reporting/package-info.java | 20 - .../groovy/org/gradle/api/tasks/SourceSet.java | 7 + .../gradle/api/tasks/compile/AbstractOptions.java | 75 +-- .../gradle/api/tasks/compile/BaseForkOptions.java | 94 +++ .../org/gradle/api/tasks/compile/Compile.java | 12 +- .../gradle/api/tasks/compile/CompileOptions.java | 87 ++- .../org/gradle/api/tasks/compile/DebugOptions.java | 10 - .../gradle/api/tasks/compile/DependOptions.java | 14 +- .../org/gradle/api/tasks/compile/ForkOptions.java | 80 +-- .../gradle/api/tasks/compile/GroovyCompile.java | 11 +- .../api/tasks/compile/GroovyCompileOptions.java | 56 +- .../api/tasks/compile/GroovyForkOptions.java | 72 +-- .../org/gradle/api/tasks/compile/JavaCompile.java | 23 + .../groovy/org/gradle/api/tasks/testing/Test.java | 28 +- .../tasks/testing/logging/TestExceptionFormat.java | 3 - .../api/tasks/testing/logging/TestLogEvent.java | 3 - .../api/tasks/testing/logging/TestLogging.java | 94 +-- .../testing/logging/TestLoggingContainer.java | 2 - .../testing/logging/TestStackTraceFilter.java | 3 - .../api/tasks/testing/logging/package-info.java | 2 - .../api/tasks/testing/testng/TestNGOptions.groovy | 14 +- .../internal/GroupsJavadocOptionFileOption.java | 4 +- .../javadoc/internal/JavadocOptionFileWriter.java | 37 +- .../gradle-plugins/github-dependencies.properties | 1 + .../api/internal/plugins/unixStartScript.txt | 6 +- .../api/internal/tasks/DefaultSourceSetTest.groovy | 3 +- ...ndLineJavaCompilerArgumentsGeneratorTest.groovy | 2 + .../JavaCompilerArgumentsBuilderTest.groovy | 32 + .../compile/NormalizingGroovyCompilerTest.groovy | 7 +- .../compile/NormalizingJavaCompilerTest.groovy | 5 +- .../detection/DefaultTestExecuterTest.groovy | 68 ++ .../testng/TestNGTestClassProcessorTest.groovy | 30 +- .../testing/testng/TestNGTestFrameworkTest.java | 6 +- .../gradle/api/plugins/JavaBasePluginTest.groovy | 9 +- .../api/plugins/JavaPluginConventionTest.groovy | 5 +- .../org/gradle/api/plugins/JavaPluginTest.groovy | 47 +- .../api/plugins/ReportingBasePluginTest.groovy | 47 -- .../github/GitHubDependenciesPluginTest.groovy | 51 ++ .../internal/DefaultReportContainerTest.groovy | 132 ---- .../org/gradle/api/tasks/bundling/JarTest.groovy | 1 - .../org/gradle/api/tasks/bundling/WarTest.groovy | 3 - .../api/tasks/compile/AbstractOptionsTest.groovy | 40 +- .../api/tasks/compile/CompileOptionsTest.groovy | 6 +- .../org/gradle/api/tasks/compile/CompileTest.java | 90 --- .../api/tasks/compile/DebugOptionsTest.groovy | 28 +- .../api/tasks/compile/ForkOptionsTest.groovy | 15 +- .../tasks/compile/GroovyCompileOptionsTest.groovy | 4 +- .../api/tasks/compile/GroovyCompileTest.java | 1 - .../gradle/api/tasks/compile/JavaCompileTest.java | 89 +++ .../gradle/api/tasks/javadoc/GroovydocTest.java | 1 - .../org/gradle/api/tasks/javadoc/JavadocTest.java | 1 - .../org/gradle/api/tasks/testing/TestTest.java | 2 - .../org/gradle/api/tasks/wrapper/WrapperTest.java | 1 - .../internal/JavadocOptionFileWriterTest.groovy | 65 ++ .../api/tasks/compile/AbstractCompileTest.java | 6 +- subprojects/publish/publish.gradle | 23 + .../PublishAutoTestedSamplesIntegrationTest.groovy | 31 + .../plugins/PublishingPluginIntegTest.groovy | 28 + .../java/org/gradle/api/publish/Publication.java | 30 + .../gradle/api/publish/PublicationContainer.java | 46 ++ .../gradle/api/publish/PublishingExtension.java | 101 +++ .../api/publish/UnknownPublicationException.java | 32 + .../internal/DefaultPublicationContainer.java | 36 ++ .../internal/DefaultPublishingExtension.java | 49 ++ .../java/org/gradle/api/publish/package-info.java | 25 + .../api/publish/plugins/PublishingPlugin.java | 59 ++ .../gradle/api/publish/plugins/package-info.java | 25 + .../META-INF/gradle-plugins/publishing.properties | 1 + .../DefaultPublicationContainerTest.groovy | 71 ++ .../publish/plugins/PublishingPluginTest.groovy | 75 +++ subprojects/reporting/reporting.gradle | 6 + .../gradle/api/plugins/ReportingBasePlugin.java | 41 ++ .../api/plugins/ReportingBasePluginConvention.java | 0 .../groovy/org/gradle/api/reporting/Report.java | 0 .../org/gradle/api/reporting/ReportContainer.java | 0 .../groovy/org/gradle/api/reporting/Reporting.java | 0 .../gradle/api/reporting/ReportingExtension.java | 0 .../org/gradle/api/reporting/SingleFileReport.java | 0 .../reporting/internal/DefaultReportContainer.java | 0 .../api/reporting/internal/SimpleReport.java | 0 .../reporting/internal/TaskGeneratedReport.java | 0 .../internal/TaskGeneratedSingleFileReport.java | 0 .../reporting/internal/TaskReportContainer.java | 0 .../org/gradle/api/reporting/package-info.java | 20 + .../api/reporting/ReportingExtensionTest.groovy | 0 .../internal/DefaultReportContainerTest.groovy | 137 ++++ .../internal/TaskGeneratedReportTest.groovy | 0 .../internal/TaskReportContainerTest.groovy | 0 subprojects/scala/scala.gradle | 20 +- .../AntForkingScalaCompilerIntegrationTest.groovy | 43 ++ ...AntInProcessScalaCompilerIntegrationTest.groovy | 42 ++ .../BasicScalaCompilerIntegrationTest.groovy | 225 +++++++ .../ZincScalaCompilerIntegrationTest.groovy | 50 ++ ...tForkingScalaCompilerJdk6IntegrationTest.groovy | 44 ++ ...nProcessScalaCompilerJdk6IntegrationTest.groovy | 43 ++ .../ZincScalaCompilerJdk6IntegrationTest.groovy | 96 +++ .../JreJavaHomeScalaIntegrationTest.groovy | 16 +- .../recompilesDependentClasses/build.gradle | 5 +- .../build.gradle | 6 +- .../build.gradle | 26 + .../prj1/src/main/scala/Person.scala | 1 + .../prj2/src/main/scala/House.scala | 1 + .../prj2/src/main/scala/Other.scala | 2 + .../settings.gradle | 2 + .../compilesJavaCodeIncrementally/build.gradle | 18 + .../src/main/scala/House.java | 13 + .../src/main/scala/Other.java | 1 + .../src/main/scala/Person.java | 17 + .../compilesScalaCodeIncrementally/build.gradle | 18 + .../src/main/scala/House.scala | 1 + .../src/main/scala/Other.scala | 2 + .../src/main/scala/Person.scala | 1 + .../internal/tasks/scala/AntScalaCompiler.groovy | 50 +- .../internal/tasks/scala/DaemonScalaCompiler.java | 86 +++ .../tasks/scala/DefaultScalaCompileSpec.java | 19 + .../scala/DefaultScalaJavaJointCompileSpec.java | 25 +- .../tasks/scala/DelegatingScalaCompiler.java | 33 + .../tasks/scala/IncrementalScalaCompiler.java | 9 +- .../tasks/scala/NormalizingScalaCompiler.java | 105 +++ .../api/internal/tasks/scala/ScalaCompileSpec.java | 9 + .../scala/ScalaCompilerArgumentsGenerator.java | 66 ++ .../internal/tasks/scala/ScalaCompilerFactory.java | 68 ++ .../tasks/scala/jdk6/ZincScalaCompiler.java | 112 ++++ .../api/plugins/scala/ScalaBasePlugin.groovy | 78 ++- .../api/tasks/scala/IncrementalCompileOptions.java | 72 +++ .../org/gradle/api/tasks/scala/ScalaCompile.java | 116 +++- .../api/tasks/scala/ScalaCompileOptions.groovy | 146 ----- .../api/tasks/scala/ScalaCompileOptions.java | 354 ++++++++++ .../gradle/api/tasks/scala/ScalaDocOptions.groovy | 29 +- .../gradle/api/tasks/scala/ScalaForkOptions.java | 43 ++ .../scala/NormalizingScalaCompilerTest.groovy | 127 ++++ .../ScalaCompilerArgumentsGeneratorTest.groovy | 105 +++ .../api/plugins/scala/ScalaBasePluginTest.groovy | 70 +- .../api/tasks/scala/ScalaCompileOptionsTest.groovy | 63 +- .../gradle/api/tasks/scala/ScalaCompileTest.java | 2 - .../api/tasks/scala/ScalaDocOptionsTest.groovy | 5 +- .../org/gradle/api/tasks/scala/ScalaDocTest.java | 2 - .../plugins/signing/SigningSamplesSpec.groovy | 10 +- subprojects/sonar/sonar.gradle | 5 + .../plugins/sonar/SonarSmokeIntegrationTest.groovy | 89 +++ .../SonarSmokeIntegrationTest/shared/build.gradle | 14 + .../shared/src/main/java/Person.java | 5 + .../gradle/api/plugins/sonar/SonarAnalyze.groovy | 4 +- .../gradle/api/plugins/sonar/SonarPlugin.groovy | 10 +- .../SamplesToolingApiIntegrationTest.groovy | 14 +- .../tooling/ToolingApiIntegrationTest.groovy | 147 ++++- .../tooling/ToolingApiRemoteIntegrationTest.groovy | 64 ++ .../integtests/tooling/fixture/ToolingApi.groovy | 11 +- .../ToolingApiCompatibilitySuiteRunner.groovy | 13 +- .../tooling/fixture/ToolingApiSpecification.groovy | 16 +- .../ToolingApiEclipseModelCrossVersionSpec.groovy | 13 + ...ildableEclipseModelFixesCrossVersionSpec.groovy | 7 +- .../m5/ToolingApiIdeaModelCrossVersionSpec.groovy | 4 +- ...rictLongRunningOperationCrossVersionSpec.groovy | 17 +- .../m8/UnknownModelFeedbackCrossVersionSpec.groovy | 7 +- .../m9/DaemonErrorFeedbackCrossVersionSpec.groovy | 4 +- .../M9JavaConfigurabilityCrossVersionSpec.groovy | 4 +- ...singCommandLineArgumentsCrossVersionSpec.groovy | 4 +- .../DependencyMetaDataCrossVersionSpec.groovy | 8 +- .../r11rc1/MigrationModelCrossVersionSpec.groovy | 69 -- .../r12rc1/BuildModelCrossVersionSpec.groovy | 47 ++ .../ProjectOutcomesModuleCrossVersionSpec.groovy | 89 +++ ...pportedOperationFeedbackCrossVersionSpec.groovy | 39 ++ .../build.gradle | 9 - .../file.txt | 1 - .../src/main/java/Person.java | 3 - .../modelContainsAllProjects/build.gradle | 18 - .../modelContainsAllProjects/settings.gradle | 17 - .../modelContainsAllTestResults/build.gradle | 21 - .../java/org/gradle/tooling/BuildLauncher.java | 23 +- .../java/org/gradle/tooling/GradleConnector.java | 10 +- .../org/gradle/tooling/LongRunningOperation.java | 14 +- .../main/java/org/gradle/tooling/ModelBuilder.java | 22 + .../java/org/gradle/tooling/ProgressEvent.java | 2 + .../java/org/gradle/tooling/ProgressListener.java | 2 + .../java/org/gradle/tooling/ProjectConnection.java | 6 + .../java/org/gradle/tooling/ResultHandler.java | 3 + .../internal/consumer/DefaultBuildLauncher.java | 20 +- .../internal/consumer/DefaultModelBuilder.java | 18 +- .../internal/consumer/DistributionFactory.java | 2 +- .../tooling/internal/consumer/ModelProvider.java | 35 +- .../internal/consumer/async/AsyncConnection.java | 5 +- .../consumer/async/DefaultAsyncConnection.java | 14 +- .../connection/AbstractConsumerConnection.java | 47 ++ .../consumer/connection/AdaptedConnection.java | 43 +- .../BuildActionRunnerBackedConsumerConnection.java | 40 ++ .../consumer/connection/ConsumerConnection.java | 5 +- ...InternalConnectionBackedConsumerConnection.java | 35 + .../consumer/connection/LazyConnection.java | 23 +- .../connection/LoggingInitializerConnection.java | 10 +- .../connection/ProgressLoggingConnection.java | 16 +- .../loader/CachingToolingImplementationLoader.java | 5 +- .../loader/DefaultToolingImplementationLoader.java | 23 +- .../SynchronizedToolingImplementationLoader.java | 7 +- .../loader/ToolingImplementationLoader.java | 3 +- .../parameters/ConsumerConnectionParameters.java | 36 ++ .../parameters/ConsumerOperationParameters.java | 13 +- .../protocoladapter/ConsumerPropertyHandler.java | 41 ++ .../consumer/protocoladapter/MethodInvocation.java | 76 +++ .../consumer/protocoladapter/MethodInvoker.java | 21 + .../protocoladapter/ModelPropertyHandler.java | 51 -- .../protocoladapter/ProtocolToModelAdapter.java | 246 +++++-- .../protocoladapter/TargetTypeProvider.java | 2 + .../consumer/versioning/FeatureValidator.java | 46 -- .../internal/consumer/versioning/ModelMapping.java | 4 +- .../consumer/versioning/VersionDetails.java | 13 +- .../DefaultIdeaSingleEntryLibraryDependency.java | 2 +- .../tooling/internal/migration/DefaultArchive.java | 34 - .../internal/migration/DefaultProjectOutput.java | 81 --- .../internal/migration/DefaultTestResult.java | 34 - .../outcomes/DefaultGradleBuildOutcome.java | 46 ++ .../outcomes/DefaultGradleFileBuildOutcome.java | 42 ++ .../internal/outcomes/DefaultProjectOutcomes.java | 80 +++ .../internal/protocol/BuildActionRunner.java | 33 + .../tooling/internal/protocol/BuildParameters.java | 28 + .../tooling/internal/protocol/BuildResult.java | 29 + .../internal/protocol/ConfigurableConnection.java | 26 + .../internal/protocol/ConnectionParameters.java | 29 + .../internal/protocol/ConnectionVersion4.java | 14 +- .../internal/protocol/InternalConnection.java | 6 +- .../internal/protocol/InternalProjectOutcomes.java | 20 + .../internal/protocol/InternalProjectOutput.java | 20 - .../gradle/tooling/model/ExternalDependency.java | 4 +- .../gradle/tooling/model/GradleModuleVersion.java | 4 +- .../main/java/org/gradle/tooling/model/Task.java | 1 - .../gradle/tooling/model/internal/Exceptions.java | 4 - .../tooling/model/internal/migration/Archive.java | 26 - .../model/internal/migration/ProjectOutput.java | 34 - .../model/internal/migration/TaskOutput.java | 24 - .../model/internal/migration/TestResult.java | 26 - .../internal/outcomes/GradleBuildOutcome.java | 55 ++ .../internal/outcomes/GradleFileBuildOutcome.java | 53 ++ .../model/internal/outcomes/ProjectOutcomes.java | 33 + .../consumer/DefaultBuildLauncherTest.groovy | 34 +- .../consumer/DefaultModelBuilderTest.groovy | 47 +- .../consumer/ProtocolToModelAdapterTest.groovy | 22 + .../connection/AdaptedConnectionTest.groovy | 50 ++ ...ActionRunnerBackedConsumerConnectionTest.groovy | 61 ++ ...alConnectionBackedConsumerConnectionTest.groovy | 47 ++ .../consumer/connection/LazyConnectionTest.groovy | 54 +- .../ProgressLoggingConnectionTest.groovy | 27 +- .../CachingToolingImplementationLoaderTest.groovy | 20 +- .../DefaultToolingImplementationLoaderTest.groovy | 116 +++- ...chronizedToolingImplementationLoaderTest.groovy | 14 +- .../internal/consumer/loader/TestConnection.java | 36 -- .../ProtocolToModelAdapterTest.groovy | 149 ++++- subprojects/tooling-api/tooling-api.gradle | 12 +- subprojects/ui/ui.gradle | 4 - .../WrapperCrossVersionIntegrationTest.groovy | 0 .../WrapperProjectIntegrationTest.groovy | 180 ++++++ .../src/main/java/org/gradle/wrapper/Download.java | 40 +- .../java/org/gradle/wrapper/GradleWrapperMain.java | 31 +- .../groovy/org/gradle/wrapper/DownloadTest.groovy | 7 +- .../gradle/wrapper/GradleWrapperMainTest.groovy | 27 + subprojects/wrapper/wrapper.gradle | 17 +- 1866 files changed, 71441 insertions(+), 28711 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
