Abacn commented on code in PR #37133:
URL: https://github.com/apache/beam/pull/37133#discussion_r2666414386
##########
runners/flink/flink_runner.gradle:
##########
@@ -92,45 +106,69 @@ def copyTestResourcesOverrides =
tasks.register('copyTestResourcesOverrides', Co
it.duplicatesStrategy DuplicatesStrategy.INCLUDE
}
-// add dependency to gradle Java plugin defined tasks
-compileJava.dependsOn copySourceOverrides
-processResources.dependsOn copyResourcesOverrides
-compileTestJava.dependsOn copyTestSourceOverrides
-processTestResources.dependsOn copyTestResourcesOverrides
-
-// add dependency BeamModulePlugin defined custom tasks
-// they are defined only when certain flags are provided (e.g. -Prelease;
-Ppublishing, etc)
-def sourcesJar = project.tasks.findByName('sourcesJar')
-if (sourcesJar != null) {
- sourcesJar.dependsOn copySourceOverrides
- sourcesJar.dependsOn copyResourcesOverrides
-}
-def testSourcesJar = project.tasks.findByName('testSourcesJar')
-if (testSourcesJar != null) {
- testSourcesJar.dependsOn copyTestSourceOverrides
- testSourcesJar.dependsOn copyTestResourcesOverrides
-}
+def use_override = (flink_major != all_versions.first())
+def sourceBase = "${project.projectDir}/../src"
-/*
+if (use_override) {
+ // Copy original+version specific sources to a tmp dir and use it as
sourceSet
+ // add dependency to gradle Java plugin defined tasks
+ compileJava.dependsOn copySourceOverrides
+ processResources.dependsOn copyResourcesOverrides
+ compileTestJava.dependsOn copyTestSourceOverrides
+ processTestResources.dependsOn copyTestResourcesOverrides
+
+ // add dependency BeamModulePlugin defined custom tasks
+ // they are defined only when certain flags are provided (e.g. -Prelease;
-Ppublishing, etc)
+ def sourcesJar = project.tasks.findByName('sourcesJar')
+ if (sourcesJar != null) {
+ sourcesJar.dependsOn copySourceOverrides
+ sourcesJar.dependsOn copyResourcesOverrides
+ }
+ def testSourcesJar = project.tasks.findByName('testSourcesJar')
+ if (testSourcesJar != null) {
+ testSourcesJar.dependsOn copyTestSourceOverrides
+ testSourcesJar.dependsOn copyTestResourcesOverrides
+ }
+ /*
* We have to explicitly set all directories here to make sure each
* version of Flink has the correct overrides set.
*/
-def sourceBase = "${project.projectDir}/../src"
-sourceSets {
- main {
- java {
- srcDirs = ["${sourceBase}/main/java", "${sourceOverridesBase}/main/java"]
+ sourceSets {
+ main {
+ java {
+ srcDirs = ["${sourceOverridesBase}/main/java"]
+ }
+ resources {
+ srcDirs = ["${sourceBase}/main/resources",
"${sourceOverridesBase}/main/resources"]
+ }
}
- resources {
- srcDirs = ["${sourceBase}/main/resources",
"${sourceOverridesBase}/main/resources"]
+ test {
+ java {
+ srcDirs = ["${sourceOverridesBase}/test/java"]
+ }
+ resources {
+ srcDirs = ["${sourceBase}/test/resources",
"${sourceOverridesBase}/test/resources"]
+ }
}
}
- test {
- java {
- srcDirs = ["${sourceBase}/test/java", "${sourceOverridesBase}/test/java"]
+} else {
+ // Use the original sources directly for the lowest supported Flink version.
Review Comment:
This is an arrangement to IDE, make "find all references" functionality
points to original source files instead of the copy-pasted files in `build/`
directory.
##########
runners/flink/flink_runner.gradle:
##########
@@ -92,45 +106,69 @@ def copyTestResourcesOverrides =
tasks.register('copyTestResourcesOverrides', Co
it.duplicatesStrategy DuplicatesStrategy.INCLUDE
}
-// add dependency to gradle Java plugin defined tasks
-compileJava.dependsOn copySourceOverrides
-processResources.dependsOn copyResourcesOverrides
-compileTestJava.dependsOn copyTestSourceOverrides
-processTestResources.dependsOn copyTestResourcesOverrides
-
-// add dependency BeamModulePlugin defined custom tasks
-// they are defined only when certain flags are provided (e.g. -Prelease;
-Ppublishing, etc)
-def sourcesJar = project.tasks.findByName('sourcesJar')
-if (sourcesJar != null) {
- sourcesJar.dependsOn copySourceOverrides
- sourcesJar.dependsOn copyResourcesOverrides
-}
-def testSourcesJar = project.tasks.findByName('testSourcesJar')
-if (testSourcesJar != null) {
- testSourcesJar.dependsOn copyTestSourceOverrides
- testSourcesJar.dependsOn copyTestResourcesOverrides
-}
+def use_override = (flink_major != all_versions.first())
+def sourceBase = "${project.projectDir}/../src"
-/*
+if (use_override) {
+ // Copy original+version specific sources to a tmp dir and use it as
sourceSet
+ // add dependency to gradle Java plugin defined tasks
+ compileJava.dependsOn copySourceOverrides
+ processResources.dependsOn copyResourcesOverrides
+ compileTestJava.dependsOn copyTestSourceOverrides
+ processTestResources.dependsOn copyTestResourcesOverrides
+
+ // add dependency BeamModulePlugin defined custom tasks
+ // they are defined only when certain flags are provided (e.g. -Prelease;
-Ppublishing, etc)
+ def sourcesJar = project.tasks.findByName('sourcesJar')
+ if (sourcesJar != null) {
+ sourcesJar.dependsOn copySourceOverrides
+ sourcesJar.dependsOn copyResourcesOverrides
+ }
+ def testSourcesJar = project.tasks.findByName('testSourcesJar')
+ if (testSourcesJar != null) {
+ testSourcesJar.dependsOn copyTestSourceOverrides
+ testSourcesJar.dependsOn copyTestResourcesOverrides
+ }
+ /*
* We have to explicitly set all directories here to make sure each
* version of Flink has the correct overrides set.
*/
-def sourceBase = "${project.projectDir}/../src"
-sourceSets {
- main {
- java {
- srcDirs = ["${sourceBase}/main/java", "${sourceOverridesBase}/main/java"]
+ sourceSets {
+ main {
+ java {
+ srcDirs = ["${sourceOverridesBase}/main/java"]
+ }
+ resources {
+ srcDirs = ["${sourceBase}/main/resources",
"${sourceOverridesBase}/main/resources"]
+ }
}
- resources {
- srcDirs = ["${sourceBase}/main/resources",
"${sourceOverridesBase}/main/resources"]
+ test {
+ java {
+ srcDirs = ["${sourceOverridesBase}/test/java"]
+ }
+ resources {
+ srcDirs = ["${sourceBase}/test/resources",
"${sourceOverridesBase}/test/resources"]
+ }
}
}
- test {
- java {
- srcDirs = ["${sourceBase}/test/java", "${sourceOverridesBase}/test/java"]
+} else {
+ // Use the original sources directly for the lowest supported Flink version.
Review Comment:
This is an arrangement to IDE, making "find all references" functionality
points to original source files instead of the copy-pasted files in `build/`
directory.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
