[
https://issues.apache.org/jira/browse/BEAM-3256?focusedWorklogId=104676&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-104676
]
ASF GitHub Bot logged work on BEAM-3256:
----------------------------------------
Author: ASF GitHub Bot
Created on: 22/May/18 16:45
Start Date: 22/May/18 16:45
Worklog Time Spent: 10m
Work Description: tgroh closed pull request #5444: Revert BEAM-3256 add
archetype testing to gradle build PreCommits
URL: https://github.com/apache/beam/pull/5444
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.test-infra/jenkins/job_PreCommit_Java_GradleBuild.groovy
b/.test-infra/jenkins/job_PreCommit_Java_GradleBuild.groovy
index 56af6da64a4..ce67d399ea6 100644
--- a/.test-infra/jenkins/job_PreCommit_Java_GradleBuild.groovy
+++ b/.test-infra/jenkins/job_PreCommit_Java_GradleBuild.groovy
@@ -44,8 +44,6 @@ job('beam_PreCommit_Java_GradleBuild') {
rootBuildScriptDir(common_job_properties.checkoutDir)
tasks(':javaPreCommit')
common_job_properties.setGradleSwitches(delegate)
- // Specify maven home on Jenkins, needed by Maven archetype integration
tests.
- switches('-Pmaven_home=/home/jenkins/tools/maven/apache-maven-3.5.2')
}
}
}
diff --git a/build.gradle b/build.gradle
index 88a757dfff7..905fe551650 100644
--- a/build.gradle
+++ b/build.gradle
@@ -140,8 +140,6 @@ task javaPreCommit() {
dependsOn ":rat"
dependsOn ":beam-sdks-java-core:buildNeeded"
dependsOn ":beam-sdks-java-core:buildDependents"
- dependsOn
":beam-sdks-java-maven-archetypes-examples:generateAndBuildArchetypeTest"
- dependsOn
":beam-sdks-java-maven-archetypes-starter:generateAndBuildArchetypeTest"
dependsOn ":beam-examples-java:preCommit"
}
diff --git a/sdks/java/maven-archetypes/examples/build.gradle
b/sdks/java/maven-archetypes/examples/build.gradle
index b0f2d2b5da6..b9844cd207a 100644
--- a/sdks/java/maven-archetypes/examples/build.gradle
+++ b/sdks/java/maven-archetypes/examples/build.gradle
@@ -61,15 +61,6 @@ task generateSources(type: Exec) {
commandLine './generate-sources.sh'
}
-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 9c5e6aa0b20..7f908494d79 100644
--- a/sdks/java/maven-archetypes/starter/build.gradle
+++ b/sdks/java/maven-archetypes/starter/build.gradle
@@ -23,15 +23,6 @@ description = "Apache Beam :: SDKs :: Java :: Maven
Archetypes :: Starter"
ext.summary = """A Maven archetype to create a simple starter pipeline to
get started using the Apache Beam Java SDK."""
-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: ":beam-runners-direct-java", configuration: "shadow")
shadow project(path: ":beam-sdks-java-core", configuration: "shadow")
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 104676)
Time Spent: 3.5h (was: 3h 20m)
> Add archetype testing/generation to existing GradleBuild PreCommit
> ------------------------------------------------------------------
>
> Key: BEAM-3256
> URL: https://issues.apache.org/jira/browse/BEAM-3256
> Project: Beam
> Issue Type: Sub-task
> Components: build-system
> Reporter: Luke Cwik
> Assignee: yifan zou
> Priority: Major
> Fix For: 2.5.0
>
> Time Spent: 3.5h
> Remaining Estimate: 0h
>
> This build currently is not exercising the archetype build and tests
> https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_PreCommit_Java_GradleBuild.groovy
> found here:
> https://github.com/apache/beam/tree/master/sdks/java/maven-archetypes
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
