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-catalog.git
The following commit(s) were added to refs/heads/master by this push:
new 413d5e0 Switch to Maven based dependency (#261)
413d5e0 is described below
commit 413d5e0e31ffb339c75b7bde6bc28ab320cfed23
Author: Chetan Mehrotra <[email protected]>
AuthorDate: Thu Mar 1 20:49:10 2018 +0530
Switch to Maven based dependency (#261)
---
settings.gradle | 12 ++++--------
tests/build.gradle | 7 +++----
tools/travis/build.sh | 2 +-
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/settings.gradle b/settings.gradle
index 093728f..17488fc 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-catalog'
+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 6792a90..a11f24a 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) {
@@ -25,8 +24,8 @@ task testWithoutCredentials(type: 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 8331ea1..fc3d55c 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -28,7 +28,7 @@ $ANSIBLE_CMD initdb.yml
cd $WHISKDIR
-TERM=dumb ./gradlew distDocker
+TERM=dumb ./gradlew install distDocker
cd $WHISKDIR/ansible
--
To stop receiving notification emails like this one, please contact
[email protected].
