beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lc...@apache.org
Subject [10/50] [abbrv] beam git commit: Fix sdks/java/core testCompile dependency to bring in standard_coders.yaml
Date Fri, 17 Nov 2017 22:29:41 GMT
Fix sdks/java/core testCompile dependency to bring in standard_coders.yaml


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/3f45dafc
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/3f45dafc
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/3f45dafc

Branch: refs/heads/master
Commit: 3f45dafc5aa5addb86e610a937231f4278ba256f
Parents: 61fddaf
Author: Lukasz Cwik <lcwik@google.com>
Authored: Fri Nov 3 22:43:35 2017 -0700
Committer: Luke Cwik <lcwik@google.com>
Committed: Fri Nov 17 14:27:15 2017 -0800

----------------------------------------------------------------------
 sdks/java/core/build.gradle | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/3f45dafc/sdks/java/core/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/core/build.gradle b/sdks/java/core/build.gradle
index 0bcee08..3764f18 100644
--- a/sdks/java/core/build.gradle
+++ b/sdks/java/core/build.gradle
@@ -22,6 +22,15 @@ applyAvroNature()
 
 description = "Apache Beam :: SDKs :: Java :: Core"
 
+/*
+ * We need to rely on manually specifying these evaluationDependsOn to ensure that
+ * the following projects are evaluated before we evaluate this project. This is because
+ * we are attempting to reference the "sourceSets.test.output" directly.
+ * TODO: Swap to generating test artifacts which we can then rely on instead of
+ * the test outputs directly.
+ */
+evaluationDependsOn(":beam-model-parent:beam-model-fn-execution")
+
 processResources {
   filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
     'pom.version': version,
@@ -56,7 +65,7 @@ dependencies {
   compile library.java.hamcrest_library
   compile library.java.junit
   runtime "org.tukaani:xz:1.5"
-  testCompile project(":beam-model-parent:beam-model-fn-execution")
+  testCompile project(":beam-model-parent:beam-model-fn-execution").sourceSets.test.output
   testCompile library.java.guava_testlib
   testCompile library.java.jackson_dataformat_yaml
   testCompile library.java.slf4j_jdk14


Mime
View raw message