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

[cs...@apache.org]

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

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


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

commit 79dfde6ee7a5a6edec11f3375a50b1e6dc808bab
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Thu Mar 1 20:49:45 2018 +0530

    Switch to Maven based dependency (#22)
---
 settings.gradle       | 12 ++++--------
 tests/build.gradle    |  7 +++----
 tools/travis/build.sh |  7 ++++++-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 5f35251..59c7a86 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-deploy'
 
+gradle.ext.openwhisk = [
+        version: '1.0.0-SNAPSHOT'
+]
+
 gradle.ext.scala = [
     version: '2.11.8',
     compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
diff --git a/tests/build.gradle b/tests/build.gradle
index 124229c..3b60d6c 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -2,10 +2,9 @@ apply plugin: 'scala'
 apply plugin: 'eclipse'
 compileTestScala.options.encoding = 'UTF-8'
 
-evaluationDependsOn(':whisktests')
-
 repositories {
     mavenCentral()
+    mavenLocal()
 }
 
 tasks.withType(Test) {
@@ -19,8 +18,8 @@ tasks.withType(Test) {
 
 dependencies {
     compile "org.scala-lang:scala-library:${gradle.scala.version}"
-    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/build.sh b/tools/travis/build.sh
index c980eee..7626625 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -28,7 +28,12 @@ $ANSIBLE_CMD initdb.yml
 
 cd $WHISKDIR
 
-TERM=dumb ./gradlew distDocker
+TERM=dumb ./gradlew \
+:common:scala:install \
+:core:controller:install \
+:core:invoker:install \
+:tests:install \
+distDocker
 
 cd $WHISKDIR/ansible
 

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