From 330d362949d27bf330055634956bed27cf361653 Mon Sep 17 00:00:00 2001 From: Dan Rollo Date: Sat, 9 Jan 2016 17:07:50 -0500 Subject: [PATCH] test with river 3.0.0 rc1. Must copy contents of: apache-river-3.0.0-bin.tar.gz to: ${rootProject.projectDir.path}/apache-river-dist/apache-river-3.0.0. test failure: GreeterServiceTest.java:68 --- build.gradle | 16 +++++++++++----- hello-service/build.gradle | 12 ++++++++++-- hello-webapp-client/build.gradle | 9 +++++++-- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 2fa43aa..ec76c98 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ allprojects { ext { - riverVersion = "3.0" + riverVersion = "3.0.0" riverHome = "${rootProject.projectDir.path}/apache-river-dist/apache-river-${riverVersion}" } } @@ -36,9 +36,15 @@ subprojects { } dependencies { - river_platform "org.apache.river:start:${riverVersion}" - river_platform "net.jini:jsk-platform:${riverVersion}" - river_platform "net.jini:groovy-config:${riverVersion}" + //river_platform "org.apache.river:start:${riverVersion}" + river_platform files("${riverHome}/lib/start.jar") + + //river_platform "net.jini:jsk-platform:${riverVersion}" + river_platform files("${riverHome}/lib/jsk-platform.jar") + river_platform files("${riverHome}/lib/jsk-resources.jar") + + //river_platform "net.jini:groovy-config:${riverVersion}" + river_platform files("${riverHome}/lib/groovy-config.jar") } compileJava.options.encoding = 'UTF-8' @@ -76,4 +82,4 @@ task getRiverDist() { task wrapper(type: Wrapper) { gradleVersion = '2.6' -} \ No newline at end of file +} diff --git a/hello-service/build.gradle b/hello-service/build.gradle index f7872fc..d1d7d09 100644 --- a/hello-service/build.gradle +++ b/hello-service/build.gradle @@ -24,8 +24,16 @@ configurations { } dependencies { - compile project(":hello-api") - compile "net.jini:jsk-lib:${riverVersion}" + compile project(":hello-api") + + //compile "net.jini:jsk-lib:${riverVersion}" + compile files("${riverHome}/lib/jsk-lib.jar") + compile files("${riverHome}/lib/jsk-platform.jar") + compile files("${riverHome}/lib/jsk-resources.jar") + + compile files("${riverHome}/lib/groovy-config.jar") + compile "org.codehaus.groovy:groovy:2.4.5" + testCompile "junit:junit:4.12" } diff --git a/hello-webapp-client/build.gradle b/hello-webapp-client/build.gradle index 1555594..f0b0fc3 100644 --- a/hello-webapp-client/build.gradle +++ b/hello-webapp-client/build.gradle @@ -20,8 +20,13 @@ apply plugin: 'java' apply plugin: 'war' dependencies { - compile project(":hello-api") - compile "net.jini:jsk-lib:${riverVersion}" + compile project(":hello-api") + + //compile "net.jini:jsk-lib:${riverVersion}" + compile files("${riverHome}/lib/jsk-lib.jar") + compile files("${riverHome}/lib/jsk-platform.jar") + compile files("${riverHome}/lib/jsk-resources.jar") + compile "javax:javaee-web-api:6.0" }