This is an automated email from the ASF dual-hosted git repository.
lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new b8e0724 BEAM-3256 Add archetype testing/generation to existing
GradleBuild PreCommit
b8e0724 is described below
commit b8e0724650cec19023b5493d1c007e497652c08c
Author: yifanzou <yifan...@yifanzou-macbookpro.roam.corp.google.com>
AuthorDate: Tue Apr 3 16:49:33 2018 -0700
BEAM-3256 Add archetype testing/generation to existing GradleBuild PreCommit
---
.../jenkins/job_beam_PreCommit_Java_GradleBuild.groovy | 2 ++
build.gradle | 2 ++
sdks/java/maven-archetypes/examples/build.gradle | 11 +++++++++++
sdks/java/maven-archetypes/starter/build.gradle | 11 +++++++++++
4 files changed, 26 insertions(+)
diff --git a/.test-infra/jenkins/job_beam_PreCommit_Java_GradleBuild.groovy
b/.test-infra/jenkins/job_beam_PreCommit_Java_GradleBuild.groovy
index df41635..c5edbf1 100644
--- a/.test-infra/jenkins/job_beam_PreCommit_Java_GradleBuild.groovy
+++ b/.test-infra/jenkins/job_beam_PreCommit_Java_GradleBuild.groovy
@@ -44,6 +44,8 @@ job('beam_PreCommit_Java_GradleBuild') {
'--continue',
// Until we verify the build cache is working appropriately, force
rerunning all tasks
'--rerun-tasks',
+ // Specify maven home on Jenkins
+ '-Pmaven_home=/home/jenkins/tools/maven/apache-maven-3.5.2'
]
def gradle_command_line = './gradlew ' + gradle_switches.join(' ') + '
:javaPreCommit'
diff --git a/build.gradle b/build.gradle
index e924202..602f8e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -117,6 +117,8 @@ task javaPreCommit() {
dependsOn ":rat"
dependsOn ":sdks:java:core:buildNeeded"
dependsOn ":sdks:java:core:buildDependents"
+ dependsOn
":sdks:java:maven-archetypes:examples:generateAndBuildArchetypeTest"
+ dependsOn ":sdks:java:maven-archetypes:starter:generateAndBuildArchetypeTest"
dependsOn ":examples:java:preCommit"
}
diff --git a/sdks/java/maven-archetypes/examples/build.gradle
b/sdks/java/maven-archetypes/examples/build.gradle
index c701303..a786939 100644
--- a/sdks/java/maven-archetypes/examples/build.gradle
+++ b/sdks/java/maven-archetypes/examples/build.gradle
@@ -55,6 +55,17 @@ task generateSources(type: Exec) {
commandLine './generate-sources.sh'
}
+// Add archetype testing/generation to existing GradleBuild PreCommit
+// https://issues.apache.org/jira/browse/BEAM-3256
+task generateAndBuildArchetypeTest(type: Exec) {
+ if (project.hasProperty("maven_home")) {
+ commandLine "${maven_home}/bin/mvn", 'clean', 'install'
+ environment "MAVEN_HOME", "${maven_home}"
+ } else {
+ commandLine 'mvn', 'clean', 'install'
+ }
+}
+
sourceSets {
main {
output.dir('src', builtBy: 'generateSources')
diff --git a/sdks/java/maven-archetypes/starter/build.gradle
b/sdks/java/maven-archetypes/starter/build.gradle
index a7a5bd5..3a4332a 100644
--- a/sdks/java/maven-archetypes/starter/build.gradle
+++ b/sdks/java/maven-archetypes/starter/build.gradle
@@ -21,6 +21,17 @@ applyJavaNature(artifactId:
"beam-sdks-java-maven-archetypes-starter")
description = "Apache Beam :: SDKs :: Java :: Maven Archetypes :: Starter"
+// Add archetype testing/generation to existing GradleBuild PreCommit
+// https://issues.apache.org/jira/browse/BEAM-3256
+task generateAndBuildArchetypeTest(type: Exec) {
+ if (project.hasProperty("maven_home")) {
+ commandLine "${maven_home}/bin/mvn", 'clean', 'install'
+ environment "MAVEN_HOME", "${maven_home}"
+ } else {
+ commandLine 'mvn', 'clean', 'install'
+ }
+}
+
dependencies {
shadow project(path: ":runners:direct-java", configuration: "shadow")
shadow project(path: ":sdks:java:core", configuration: "shadow")
--
To stop receiving notification emails like this one, please contact
lc...@apache.org.
