From cc9ce029328cc50065596b5a2191cc5475c8b44a Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Tue, 5 Jul 2011 21:59:12 +0300
Subject: [PATCH] + update pom generation

---
 maven.gradle | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/maven.gradle b/maven.gradle
index a791a987d..801daef43 100644
--- a/maven.gradle
+++ b/maven.gradle
@@ -89,10 +89,16 @@ def customizePom(pom) {
         p.dependencies = p.dependencies.findAll {it.scope != 'test'}
 
         // Flag optional deps
-        
+        def opDeps = configurations.testRuntime.allDependencies.findAll { gradleDep ->
+            gradleDep.asDynamicObject.hasProperty('optional') && gradleDep.optional
+        }
+
         p.dependencies.findAll { dep ->
             optionalDeps.contains(dep.artifactId) ||
-            dep.groupId.startsWith('org.slf4j')
+            dep.groupId.startsWith('org.slf4j') ||
+            opDeps.any { op ->
+                (dep.groupId == op.group && dep.artifactId == op.name)
+            }
         }*.optional = true
         
     }