[incubator-openwhisk-package-cloudant] branch master updated: Switch to Maven based dependency (#159)

[du...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dubeejw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-cloudant.git


The following commit(s) were added to refs/heads/master by this push:
     new ed57624  Switch to Maven based dependency (#159)
ed57624 is described below

commit ed57624a3ad34c51bcd45811b7473e8517a70d3b
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Thu Mar 1 01:11:15 2018 +0530

    Switch to Maven based dependency (#159)
    
    This is required for apache/incubator-openwhisk#3277
---
 settings.gradle       | 12 ++++--------
 tests/build.gradle    |  7 ++++---
 tools/travis/setup.sh | 10 +++++++++-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 2198275..d4bf13e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,15 +1,11 @@
-def owPath = System.getenv("OPENWHISK_HOME") ?: '../open'
-def owDirectory = new File(owPath)
-
-include 'common:scala'; project(':common:scala').projectDir = new File(owDirectory, 'common/scala')
-include 'core:controller'; project(':core:controller').projectDir = new File(owDirectory, 'core/controller')
-include 'core:invoker'; project(':core:invoker').projectDir = new File(owDirectory, 'core/invoker')
-include 'whisktests'; project(':whisktests').projectDir = new File(owDirectory, 'tests')
-
 include 'tests'
 
 rootProject.name = 'openwhisk-package-cloudant'
 
+gradle.ext.openwhisk = [
+        version: '1.0.0-SNAPSHOT'
+]
+
 gradle.ext.scala = [
     version: '2.11.11',
     compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
diff --git a/tests/build.gradle b/tests/build.gradle
index 698277b..0589ef3 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'scala'
 apply plugin: 'eclipse'
 compileTestScala.options.encoding = 'UTF-8'
 
-evaluationDependsOn(':whisktests')
 
 repositories {
     mavenCentral()
     maven {
         url 'https://oss.sonatype.org/content/repositories/snapshots/'
     }
+    mavenLocal()
 
 }
 
@@ -29,8 +29,9 @@ task testHealth(type: Test) {
 dependencies {
     compile "org.scala-lang:scala-library:${gradle.scala.version}"
     compile 'com.cloudant:cloudant-client:1.0.1'
-    compile project(':whisktests')
-    compile project(':whisktests').sourceSets.test.output
+    compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests"
+    compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:test-sources"
+
 }
 
 tasks.withType(ScalaCompile) {
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index fcb973d..b0bab04 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -2,6 +2,7 @@
 
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 HOMEDIR="$SCRIPTDIR/../../../"
+WHISKDIR="$HOMEDIR/openwhisk"
 
 sudo gpasswd -a travis docker
 sudo -E bash -c 'echo '\''DOCKER_OPTS="-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock --api-enable-cors --storage-driver=aufs"'\'' > /etc/default/docker'
@@ -32,4 +33,11 @@ git clone https://github.com/apache/incubator-openwhisk-utilities.git
 
 # OpenWhisk stuff
 cd $HOMEDIR
-git clone https://github.com/openwhisk/openwhisk.git
+git clone https://github.com/apache/incubator-openwhisk.git openwhisk
+cd $WHISKDIR
+
+TERM=dumb ./gradlew \
+:common:scala:install \
+:core:controller:install \
+:core:invoker:install \
+:tests:install

-- 
To stop receiving notification emails like this one, please contact
dubeejw@apache.org.