geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From upthewatersp...@apache.org
Subject [1/2] incubator-geode git commit: GEODE-1811: Marking runtime dependencies as optional in the pom
Date Tue, 23 Aug 2016 16:38:35 GMT
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 <upthewaterspout@apache.org>
Authored: Mon Aug 22 17:10:12 2016 -0700
Committer: Dan Smith <upthewaterspout@apache.org>
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


Mime
View raw message