From ba0c2a38f93e529c420ba71cff2eb9bf80c6459f Mon Sep 17 00:00:00 2001 From: YamStranger Date: Thu, 4 Feb 2016 15:35:58 +0200 Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch 'upstream/master' From 9e66e4bd6f5965972f4cbaf4f614b2de5b55f767 Mon Sep 17 00:00:00 2001 From: YamStranger Date: Thu, 4 Feb 2016 23:36:22 +0200 Subject: [PATCH 2/2] fix: updated commons-collection for jira/jbehave/cucumber modules --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 3ac0ddaa7f..024f3d7607 100644 --- a/build.gradle +++ b/build.gradle @@ -64,9 +64,9 @@ allprojects { // TODO make work for generated Maven POM... // it's working for gradle build, but also had to exclude old transitives for geio.appiumnerated POM force 'com.thoughtworks.xstream:xstream:1.4.5', - 'commons-collections:commons-collections:3.2.1', + 'commons-collections:commons-collections:3.2.2', 'commons-logging:commons-logging:1.2', - 'xml-apis:xml-apis:1.4.01' + 'xml-apis:xml-apis:1.4.01' } } } @@ -403,7 +403,7 @@ subprojects { } task copyDeps(type: Copy) { - from configurations.runtime + from configurations.runtime + configurations.testCompile into project.projectDir.path + "/lib" } }