Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 703FD200B6D for ; Tue, 23 Aug 2016 18:38:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6EBED160AAD; Tue, 23 Aug 2016 16:38:39 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B5892160A81 for ; Tue, 23 Aug 2016 18:38:38 +0200 (CEST) Received: (qmail 64562 invoked by uid 500); 23 Aug 2016 16:38:37 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 64553 invoked by uid 99); 23 Aug 2016 16:38:37 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Aug 2016 16:38:37 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 8AAE31A600C for ; Tue, 23 Aug 2016 16:38:37 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id y4QGzXNGBOrm for ; Tue, 23 Aug 2016 16:38:37 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 345F15F5D3 for ; Tue, 23 Aug 2016 16:38:36 +0000 (UTC) Received: (qmail 64533 invoked by uid 99); 23 Aug 2016 16:38:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Aug 2016 16:38:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8C75E0556; Tue, 23 Aug 2016 16:38:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: upthewaterspout@apache.org To: commits@geode.incubator.apache.org Date: Tue, 23 Aug 2016 16:38:35 -0000 Message-Id: <510b4bdbb16b439bb4eeee54cf10ae31@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-geode git commit: GEODE-1811: Marking runtime dependencies as optional in the pom archived-at: Tue, 23 Aug 2016 16:38:39 -0000 Repository: incubator-geode Updated Branches: refs/heads/develop d5018b2d1 -> 91cca477f GEODE-1811: Marking runtime dependencies as optional in the pom We had certain runtime dependencies marked as optional in geode-core/build.gradle. However, we were only looking for the optional flag on compile dependencies, so the runtime dependencies were not marked as optional in the generated pom file. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/91cca477 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/91cca477 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/91cca477 Branch: refs/heads/develop Commit: 91cca477fd4edf6eea72bbc64ddfea40bb34e89a Parents: 48589a0 Author: Dan Smith Authored: Mon Aug 22 17:10:12 2016 -0700 Committer: Dan Smith Committed: Tue Aug 23 09:28:38 2016 -0700 ---------------------------------------------------------------------- gradle/publish.gradle | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/91cca477/gradle/publish.gradle ---------------------------------------------------------------------- diff --git a/gradle/publish.gradle b/gradle/publish.gradle index 768fce4..2258da6 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -57,6 +57,8 @@ subprojects { //This black magic checks to see if a dependency has the flag ext.optional=true //set on it, and if so marks the dependency as optional in the maven pom def depMap = project.configurations.compile.dependencies.collectEntries { [it.name, it] } + def runtimeDeps = project.configurations.runtime.dependencies.collectEntries { [it.name, it] } + depMap.putAll(runtimeDeps) asNode().dependencies.dependency.findAll { def dep = depMap.get(it.artifactId.text()) return dep?.hasProperty('optional') && dep.optional