dubee closed pull request #257: Switch to use Maven dependency
URL: https://github.com/apache/incubator-openwhisk-cli/pull/257
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/settings.gradle b/settings.gradle
index fc465f7c..38de3080 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,11 +1,3 @@
-def owPath = System.getenv("OPENWHISK_HOME") ?: '../incubator-openwhisk'
-def owDirectory = new File(owPath)
-
-if (!owDirectory.exists()) {
- throw new GradleScriptException(
- "Environment variable OPENWHISK_HOME must point to a valid OpenWhisk
build", null)
-}
-
include 'tests'
rootProject.name = 'openwhisk-cli'
@@ -18,5 +10,3 @@ gradle.ext.scala = [
version: '2.11.8',
compileFlags: ['-feature', '-unchecked', '-deprecation',
'-Xfatal-warnings', '-Ywarn-unused-import']
]
-
-gradle.ext.owPath = owPath
diff --git a/tests/build.gradle b/tests/build.gradle
index a46a1659..1dc5ef7b 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -42,7 +42,8 @@ task deleteKeystore(type: Delete) {
task createKeystore(dependsOn: deleteKeystore) {
doLast {
Properties props = new Properties()
- props.load(new FileInputStream(file(gradle.owPath +
'/whisk.properties')))
+ def owPath = System.getenv("OPENWHISK_HOME") ?:
'../incubator-openwhisk'
+ props.load(new FileInputStream(file(owPath + '/whisk.properties')))
keystorePath.parentFile.mkdirs()
def cmd = ['keytool', '-import', '-alias', 'Whisk', '-noprompt',
'-trustcacerts', '-file', file(props['whisk.ssl.cert']), '-keystore',
keystorePath, '-storepass', 'openwhisk']
cmd.execute().waitForProcessOutput(System.out, System.err)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
