[
https://issues.apache.org/jira/browse/BEAM-5399?focusedWorklogId=158968&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-158968
]
ASF GitHub Bot logged work on BEAM-5399:
----------------------------------------
Author: ASF GitHub Bot
Created on: 26/Oct/18 03:10
Start Date: 26/Oct/18 03:10
Worklog Time Spent: 10m
Work Description: swegner closed pull request #6437: [BEAM-5399] Upgrade
gradle-avro-plugin to latest version
URL: https://github.com/apache/beam/pull/6437
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/build.gradle b/build.gradle
index 488ac0ddf62..35f6967dfd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,7 +53,7 @@ buildscript {
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.5"
// Enable proto code generation
classpath "io.spring.gradle:propdeps-plugin:0.0.9.RELEASE"
// Enable provided and optional configurations
classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.3.1"
// Enable Apache license enforcement
- classpath "com.commercehub.gradle.plugin:gradle-avro-plugin:0.11.0"
// Enable Avro code generation
+ classpath "com.commercehub.gradle.plugin:gradle-avro-plugin:0.15.1"
// Enable Avro code generation
classpath "com.diffplug.spotless:spotless-plugin-gradle:3.6.0"
// Enable a code formatting plugin
classpath "gradle.plugin.com.github.blindpirate:gogradle:0.10"
// Enable Go code compilation
classpath "gradle.plugin.com.palantir.gradle.docker:gradle-docker:0.13.0"
// Enable building Docker containers
diff --git
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 28548c09ddd..d568c82c1c2 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -670,7 +670,15 @@ class BeamModulePlugin implements Plugin<Project> {
// Enables a plugin which can apply code formatting to source.
// TODO(https://issues.apache.org/jira/browse/BEAM-4394): Should this
plugin be enabled for all projects?
project.apply plugin: "com.diffplug.gradle.spotless"
- project.spotless { java { googleJavaFormat() } }
+ project.spotless {
+ java {
+ googleJavaFormat()
+ target project.fileTree(project.rootDir) {
+ include '**/*.java'
+ exclude '**/generated-test-avro-java/**'
+ }
+ }
+ }
// Enables a plugin which performs code analysis for common bugs.
// This plugin is configured to only analyze the "main" source set.
diff --git a/sdks/java/build-tools/src/main/resources/beam/suppressions.xml
b/sdks/java/build-tools/src/main/resources/beam/suppressions.xml
index 575d3f2eaf3..b1f37dafeef 100644
--- a/sdks/java/build-tools/src/main/resources/beam/suppressions.xml
+++ b/sdks/java/build-tools/src/main/resources/beam/suppressions.xml
@@ -25,5 +25,6 @@
<suppress checks=".*" files=".+[\\\/]generated[\\\/].+\.java" />
<suppress checks=".*" files=".+[\\\/]generated-sources[\\\/].+\.java" />
<suppress checks=".*" files=".+[\\\/]generated-test-sources[\\\/].+\.java" />
+ <suppress checks=".*" files=".+[\\\/]generated-test-avro-java[\\\/].+\.java"
/>
</suppressions>
diff --git a/sdks/java/maven-archetypes/starter/build.gradle
b/sdks/java/maven-archetypes/starter/build.gradle
index da533b15649..60374875b38 100644
--- a/sdks/java/maven-archetypes/starter/build.gradle
+++ b/sdks/java/maven-archetypes/starter/build.gradle
@@ -18,6 +18,9 @@
apply plugin: org.apache.beam.gradle.BeamModulePlugin
applyJavaNature()
+spotless {
+ removeFormat 'java' // Source files are tokenized and break spotless parsing
+}
description = "Apache Beam :: SDKs :: Java :: Maven Archetypes :: Starter"
ext.summary = """A Maven archetype to create a simple starter pipeline to
----------------------------------------------------------------
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: 158968)
Time Spent: 40m (was: 0.5h)
> Beam Dependency Update Request:
> com.commercehub.gradle.plugin:gradle-avro-plugin 0.15.1
> ---------------------------------------------------------------------------------------
>
> Key: BEAM-5399
> URL: https://issues.apache.org/jira/browse/BEAM-5399
> Project: Beam
> Issue Type: Sub-task
> Components: dependencies
> Reporter: Beam JIRA Bot
> Assignee: Scott Wegner
> Priority: Major
> Time Spent: 40m
> Remaining Estimate: 0h
>
> 2018-09-17 12:19:04.601511
> Please review and upgrade the
> com.commercehub.gradle.plugin:gradle-avro-plugin to the latest version 0.15.1
>
> cc:
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
