io-it-suite-local independent of io-it-suite, k8s properties -> root pom
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/2f9cbec8 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/2f9cbec8 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/2f9cbec8 Branch: refs/heads/master Commit: 2f9cbec803791fd4e17fb28ec5590649aabb9622 Parents: 4192ac6 Author: Stephen Sisk <[email protected]> Authored: Thu Jul 20 11:38:40 2017 -0700 Committer: Thomas Groh <[email protected]> Committed: Thu Jul 20 13:34:49 2017 -0700 ---------------------------------------------------------------------- pom.xml | 5 +++++ sdks/java/io/jdbc/pom.xml | 33 +++++++++++++++++++++++++++++++++ sdks/java/io/pom.xml | 4 ---- 3 files changed, 38 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/2f9cbec8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f2d0dde..e0ec136 100644 --- a/pom.xml +++ b/pom.xml @@ -168,6 +168,11 @@ <compiler.default.pkginfo.flag>-Xpkginfo:always</compiler.default.pkginfo.flag> <compiler.default.exclude>nothing</compiler.default.exclude> <gax-grpc.version>0.20.0</gax-grpc.version> + + <!-- standard binary for kubectl --> + <kubectl>kubectl</kubectl> + <!-- the standard location for kubernete's config file --> + <kubeconfig>${user.home}/.kube/config</kubeconfig> </properties> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/beam/blob/2f9cbec8/sdks/java/io/jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/jdbc/pom.xml b/sdks/java/io/jdbc/pom.xml index 3e8ba57..357ddc0 100644 --- a/sdks/java/io/jdbc/pom.xml +++ b/sdks/java/io/jdbc/pom.xml @@ -105,6 +105,7 @@ </execution> </executions> </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> @@ -162,9 +163,32 @@ <profile> <id>io-it-suite-local</id> <activation><property><name>io-it-suite-local</name></property></activation> + <properties> + <!-- This is based on the location of the current pom relative to the root + See discussion in BEAM-2460 --> + <beamRootProjectDir>${project.parent.parent.parent.parent.basedir}</beamRootProjectDir> + </properties> <build> <plugins> <plugin> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>groovy-maven-plugin</artifactId> + <version>${groovy-maven-plugin.version}</version> + <executions> + <execution> + <id>find-supported-python-for-compile</id> + <phase>initialize</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source>${beamRootProjectDir}/sdks/python/findSupportedPython.groovy</source> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <version>${maven-exec-plugin.version}</version> @@ -200,6 +224,15 @@ </arguments> </configuration> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire-plugin.version}</version> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/beam/blob/2f9cbec8/sdks/java/io/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/pom.xml b/sdks/java/io/pom.xml index e9aa65f..4e02aa8 100644 --- a/sdks/java/io/pom.xml +++ b/sdks/java/io/pom.xml @@ -33,10 +33,6 @@ (sources and sinks) to consume and produce data from systems.</description> <properties> - <!-- standard binary for kubectl --> - <kubectl>kubectl</kubectl> - <!-- the standard location for kubernete's config file --> - <kubeconfig>${user.home}/.kube/config</kubeconfig> <!-- Necessary to make sure that integration with perfkit in io-it-suite works --> <integrationTestPipelineOptions></integrationTestPipelineOptions> <pkbBeamRunnerProfile></pkbBeamRunnerProfile>
