Repository: zest-qi4j Updated Branches: refs/heads/develop d641afdb9 -> 44f6157f0
Build now use Gradle 2.5 Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/44f6157f Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/44f6157f Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/44f6157f Branch: refs/heads/develop Commit: 44f6157f031baaa4432fb12b66bd89a177642c1e Parents: d641afd Author: Paul Merlin <[email protected]> Authored: Wed Jul 15 14:39:04 2015 +0200 Committer: Paul Merlin <[email protected]> Committed: Wed Jul 15 14:39:04 2015 +0200 ---------------------------------------------------------------------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- libraries.gradle | 44 +++++++++++++-------------- 3 files changed, 23 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/44f6157f/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index b0f4791..11c9d14 100644 --- a/build.gradle +++ b/build.gradle @@ -861,5 +861,5 @@ task release { // 2) /gradlew.bat which is the windows bat script for for executing builds // 3) /wrapper which is a directory named by the "jarPath" config which contains other needed files. task wrapper( type: Wrapper ) { - gradleVersion = '2.4' + gradleVersion = '2.5' } http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/44f6157f/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 498c744..48f202a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/44f6157f/libraries.gradle ---------------------------------------------------------------------- diff --git a/libraries.gradle b/libraries.gradle index ccb5b14..86ad6e4 100644 --- a/libraries.gradle +++ b/libraries.gradle @@ -264,31 +264,29 @@ rootProject.ext { ] } -// Global transitive dependencies resolution rules -// See https://docs.gradle.org/current/userguide/dependency_management.html#sec:dependency_resolve_rules -// See https://docs.gradle.org/current/dsl/org.gradle.api.artifacts.ResolutionStrategy.html +// Global transitive dependencies substitution rules +// See https://docs.gradle.org/current/userguide/dependency_management.html#dependency_substitution_rules +// See https://docs.gradle.org/current/dsl/org.gradle.api.artifacts.DependencySubstitutions.html allprojects { configurations.all { - resolutionStrategy { - dependencySubstitution { - eachModule { ModuleDependencySubstitution details -> - // Always resolve SLF4J to the same version - if( details.requested.group == 'org.slf4j' ) { - details.useTarget group: details.requested.group, name: details.requested.module, version: slf4jVersion - } - // woodstox:wstx-asl is broken (no pom), use org.codehaus.woodstox:wstx-asl instead - if( details.requested.group == 'woodstox' && details.requested.module == 'wstx-asl' ) { - details.useTarget group: 'org.codehaus.woodstox', name: 'wstx-asl', version: details.requested.version - } - // some bad citizens have SNAPSHOT parents ... - if( details.requested.module == 'commons-sandbox-parent' && details.requested.version == '3-SNAPSHOT') { - details.useTarget group: details.requested.group, name: details.requested.module, version: '3' - } - // Findbugs Annotation is LGPL, use https://github.com/stephenc/findbugs-annotations which is - // Apache 2 licensed instead - if( details.requested.group == 'net.sourceforge.findbugs' && details.requested.module == 'annotations' ) { - details.useTarget group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1' - } + resolutionStrategy.dependencySubstitution.all { DependencySubstitution dep -> + if( dep.requested instanceof ModuleComponentSelector ) { + // Always resolve SLF4J to the same version + if( dep.requested.group == 'org.slf4j' ) { + dep.useTarget group: dep.requested.group, name: dep.requested.module, version: slf4jVersion + } + // woodstox:wstx-asl is broken (no pom), use org.codehaus.woodstox:wstx-asl instead + if( dep.requested.group == 'woodstox' && dep.requested.module == 'wstx-asl' ) { + dep.useTarget group: 'org.codehaus.woodstox', name: 'wstx-asl', version: dep.requested.version + } + // some bad citizens have SNAPSHOT parents ... + if( dep.requested.module == 'commons-sandbox-parent' && dep.requested.version == '3-SNAPSHOT') { + dep.useTarget group: dep.requested.group, name: dep.requested.module, version: '3' + } + // Findbugs Annotation is LGPL, use https://github.com/stephenc/findbugs-annotations which is + // Apache 2 licensed instead + if( dep.requested.group == 'net.sourceforge.findbugs' && dep.requested.module == 'annotations' ) { + dep.useTarget group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1' } } }
