polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From paulmer...@apache.org
Subject zest-java git commit: Build, minor: fix Jackson dependency resolution rule
Date Fri, 31 Jul 2015 12:31:04 GMT
Repository: zest-java
Updated Branches:
  refs/heads/develop 4c8906be6 -> fe0a45051


Build, minor: fix Jackson dependency resolution rule

Old rule didn’t take into account that jackson-parent release cycle is
not the same as other modules.
This was causing honkerCheck task to log a load of exceptions.
This commit fixes that.


Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/fe0a4505
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/fe0a4505
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/fe0a4505

Branch: refs/heads/develop
Commit: fe0a450514a1bb4f11bd8c6332d908715fd029c9
Parents: 4c8906b
Author: Paul Merlin <paul@nosphere.org>
Authored: Fri Jul 31 14:30:44 2015 +0200
Committer: Paul Merlin <paul@nosphere.org>
Committed: Fri Jul 31 14:30:44 2015 +0200

----------------------------------------------------------------------
 libraries.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/fe0a4505/libraries.gradle
----------------------------------------------------------------------
diff --git a/libraries.gradle b/libraries.gradle
index 1507bc8..862295a 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -270,7 +270,7 @@ allprojects {
           dep.useTarget group: dep.requested.group, name: dep.requested.module, version:
osgiVersion
         }
         // Always resolve Jackson to the same version
-        if( dep.requested.group.startsWith( 'com.fasterxml.jackson' ) ) {
+        if( dep.requested.group.startsWith( 'com.fasterxml.jackson' ) && dep.requested.module
!= 'jackson-parent' ) {
           dep.useTarget group: dep.requested.group, name: dep.requested.module, version:
jacksonVersion
         }
         // woodstox:wstx-asl is broken (no pom), use org.codehaus.woodstox:wstx-asl instead


Mime
View raw message