From 10f2dee150ec3aa15a660a8de1ce80ca722cddca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Fl=C3=BCgge?= Date: Mon, 13 Aug 2018 17:57:48 +0200 Subject: [PATCH 1/2] Fix bug parsing dependencies from feature.xml Return a list of string representations of XML attributes instead of the attributes itself (which caused a type mismatch) from parsing method. --- .../buildmonkey/dependency/ManifestDependencyPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compilation/gradle.dependency/src/main/groovy/de/monkeyworks/buildmonkey/dependency/ManifestDependencyPlugin.groovy b/compilation/gradle.dependency/src/main/groovy/de/monkeyworks/buildmonkey/dependency/ManifestDependencyPlugin.groovy index 3bc8c68..97415f5 100644 --- a/compilation/gradle.dependency/src/main/groovy/de/monkeyworks/buildmonkey/dependency/ManifestDependencyPlugin.groovy +++ b/compilation/gradle.dependency/src/main/groovy/de/monkeyworks/buildmonkey/dependency/ManifestDependencyPlugin.groovy @@ -178,7 +178,7 @@ class ManifestDependencyPlugin implements Plugin { def evaluationStrategy = { def parsedXML = new XmlSlurper().parse(it) def extractFromXML = { String nodeName, String attribute -> - return parsedXML.'**'.findAll { node -> node.name() == nodeName }.collect { it["@$attribute"] } + return parsedXML.'**'.findAll { node -> node.name() == nodeName }.collect { it["@$attribute"].text() } } return extractFromXML("plugin", "id") + extractFromXML("import", "plugin") + extractFromXML("include", "id") } From 118d0ecaff33f631f1be65b85c95c0dbcb99b6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Fl=C3=BCgge?= Date: Tue, 14 Aug 2018 17:01:12 +0200 Subject: [PATCH 2/2] Fix Eclipse SDK Download in Examples With Existing URL --- examples/example1/build.gradle | 6 ++++++ examples/exampleApp/build.gradle | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/examples/example1/build.gradle b/examples/example1/build.gradle index 9538b90..55a7dee 100644 --- a/examples/example1/build.gradle +++ b/examples/example1/build.gradle @@ -37,6 +37,12 @@ apply plugin: 'de.monkeyworks.buildmonkey.p2.P2MirrorPlugin' def buildUri = buildDir.toURI() def buildUrl = buildUri.toURL() +// Configure Eclipse SDK Download +eclipseConfiguration { + eclipseSdkURL = 'http://ftp.halifax.rwth-aachen.de/eclipse//eclipse/downloads/drops4/R-4.7.3-201803010715/' + eclipseVersion = '4.7.3' +} + // Configure mirroring plugin eclipseMirror { // Both parameters on false means a lazy dependency resolving but matching the exact versions of the defined features diff --git a/examples/exampleApp/build.gradle b/examples/exampleApp/build.gradle index b1b5967..542506c 100644 --- a/examples/exampleApp/build.gradle +++ b/examples/exampleApp/build.gradle @@ -25,6 +25,12 @@ apply plugin: 'de.monkeyworks.buildmonkey.mavenizer.MavenizerPlugin' def buildUri = buildDir.toURI() def buildUrl = buildUri.toURL() +// Configure Eclipse SDK Download +eclipseConfiguration { + eclipseSdkURL = 'http://ftp.halifax.rwth-aachen.de/eclipse//eclipse/downloads/drops4/R-4.7.3-201803010715/' + eclipseVersion = '4.7.3' +} + eclipseMirror { sliceStrict false latestVersionOnly false