[incubator-openwhisk-cli] branch master updated: Switch to Maven based dependency (#234)

[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-cli.git


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

commit 56ecb4ee4b2edb3817630e1c5f3a5e1d90825fe6
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Thu Mar 1 01:12:29 2018 +0530

    Switch to Maven based dependency (#234)
    
    * Switch to Maven based dependency
    
    This is required for apache/incubator-openwhisk#3277
---
 .travis.yml        |  2 ++
 settings.gradle    | 23 ++++-------------------
 tests/build.gradle | 14 +++-----------
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 42934f0..c571387 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,8 @@ before_script:
   - ./incubator-openwhisk/tools/travis/setup.sh
 
 script:
+  - cd $TRAVIS_BUILD_DIR/../incubator-openwhisk
+  - ./gradlew install
   - cd $TRAVIS_BUILD_DIR
   - ./gradlew --console=plain release
   - ./tools/travis/test_openwhisk.sh
diff --git a/settings.gradle b/settings.gradle
index 4f5a4d8..fc465f7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,29 +6,14 @@ if (!owDirectory.exists()) {
         "Environment variable OPENWHISK_HOME must point to a valid OpenWhisk build", null)
 }
 
-include 'clitests'; project(':clitests').projectDir = new File(owDirectory, 'tests')
-
-[   'common:scala',
-    'core:controller',
-    'core:invoker',
-    'actionRuntimes:nodejs6Action',
-    'actionRuntimes:actionProxy',
-    'actionRuntimes:pythonAction',
-    'actionRuntimes:python2Action',
-    'actionRuntimes:javaAction',
-    'actionRuntimes:swift3.1.1Action',
-    'sdk:docker',
-    'tests:dat:blackbox:badaction',
-    'tests:dat:blackbox:badproxy'
-].each() { p ->
-    include p
-    project(':'+p).projectDir = new File(owDirectory, p.replaceAll(':','/'))
-}
-
 include 'tests'
 
 rootProject.name = 'openwhisk-cli'
 
+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 22a54ec..a46a165 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -2,14 +2,10 @@ apply plugin: 'scala'
 apply plugin: 'eclipse'
 compileTestScala.options.encoding = 'UTF-8'
 
-evaluationDependsOn(':clitests')
-evaluationDependsOn(':common:scala')
-
-project(':clitests').test.onlyIf = {false}
-compileTestScala.dependsOn(':clitests:compileTestScala')
 
 repositories {
     mavenCentral()
+    mavenLocal()
 }
 
 tasks.withType(Test) {
@@ -29,12 +25,8 @@ task testWithoutCredentials(type: Test) {
 
 dependencies {
     compile "org.scala-lang:scala-library:${gradle.scala.version}"
-    compile project(':clitests')
-    compile project(':clitests').sourceSets.test.output
-
-    compile project(':common:scala')
-    compile project(':core:controller')
-    compile project(':core:invoker')
+    compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests"
+    compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:test-sources"
 }
 
 tasks.withType(ScalaCompile) {

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