[
https://issues.apache.org/jira/browse/BEAM-6235?focusedWorklogId=176052&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-176052
]
ASF GitHub Bot logged work on BEAM-6235:
----------------------------------------
Author: ASF GitHub Bot
Created on: 17/Dec/18 14:48
Start Date: 17/Dec/18 14:48
Worklog Time Spent: 10m
Work Description: iemejia closed pull request #7285: [BEAM-6235] Upgrade
AutoValue to version 1.6.3
URL: https://github.com/apache/beam/pull/7285
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/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index d37de14cb7e2..5fb1badcb1b7 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -648,17 +648,18 @@ class BeamModulePlugin implements Plugin<Project> {
// Note that these plugins specifically use the compileOnly and
testCompileOnly
// configurations because they are never required to be shaded or
become a
// dependency of the output.
- def auto_value = "com.google.auto.value:auto-value:1.5.3"
+ def auto_value = "com.google.auto.value:auto-value:1.6.3"
+ def auto_value_annotations =
"com.google.auto.value:auto-value-annotations:1.6.3"
def auto_service = "com.google.auto.service:auto-service:1.0-rc2"
- compileOnly auto_value
+ compileOnly auto_value_annotations
+ testCompileOnly auto_value_annotations
apt auto_value
- testCompileOnly auto_value
testApt auto_value
compileOnly auto_service
- apt auto_service
testCompileOnly auto_service
+ apt auto_service
testApt auto_service
// These dependencies are needed to avoid error-prone warnings on
package-info.java files,
@@ -669,8 +670,8 @@ class BeamModulePlugin implements Plugin<Project> {
// See: https://www.apache.org/legal/resolved.html#prohibited
def findbugs_annotations = "com.google.code.findbugs:annotations:3.0.1"
compileOnly findbugs_annotations
- apt findbugs_annotations
testCompileOnly findbugs_annotations
+ apt findbugs_annotations
testApt findbugs_annotations
}
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroIO.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroIO.java
index 6f6b6b791bfd..a22345c060fe 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroIO.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroIO.java
@@ -934,7 +934,8 @@ public
CreateParseSourceFn(SerializableFunction<GenericRecord, T> parseFn, Coder
abstract Builder<UserT, DestinationT, OutputT> setFilenamePrefix(
ValueProvider<ResourceId> filenamePrefix);
- abstract Builder<UserT, DestinationT, OutputT> setFilenameSuffix(String
filenameSuffix);
+ abstract Builder<UserT, DestinationT, OutputT> setFilenameSuffix(
+ @Nullable String filenameSuffix);
abstract Builder<UserT, DestinationT, OutputT> setTempDirectory(
ValueProvider<ResourceId> tempDirectory);
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TFRecordIO.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TFRecordIO.java
index 274df369d729..21d2119f4335 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TFRecordIO.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TFRecordIO.java
@@ -237,7 +237,7 @@ public void populateDisplayData(DisplayData.Builder
builder) {
abstract static class Builder {
abstract Builder setOutputPrefix(ValueProvider<ResourceId> outputPrefix);
- abstract Builder setShardTemplate(String shardTemplate);
+ abstract Builder setShardTemplate(@Nullable String shardTemplate);
abstract Builder setFilenameSuffix(@Nullable String filenameSuffix);
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java
index 32578ec130dc..3ff113cc2573 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java
@@ -640,7 +640,7 @@ private CreateTextSourceFn(byte[] delimiter) {
@AutoValue.Builder
abstract static class Builder<UserT, DestinationT> {
abstract Builder<UserT, DestinationT> setFilenamePrefix(
- ValueProvider<ResourceId> filenamePrefix);
+ @Nullable ValueProvider<ResourceId> filenamePrefix);
abstract Builder<UserT, DestinationT> setTempDirectory(
@Nullable ValueProvider<ResourceId> tempDirectory);
----------------------------------------------------------------
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: 176052)
Time Spent: 0.5h (was: 20m)
> Upgrade AutoValue to version 1.6.3
> ----------------------------------
>
> Key: BEAM-6235
> URL: https://issues.apache.org/jira/browse/BEAM-6235
> Project: Beam
> Issue Type: Improvement
> Components: build-system
> Reporter: Ismaël Mejía
> Assignee: Ismaël Mejía
> Priority: Minor
> Time Spent: 0.5h
> Remaining Estimate: 0h
>
> AutoValue 1.6 has now the annotations in a separate artifact:
> auto-value-annotations. This allows users to specify the annotations in
> compile scope and the processor in an annotation processing scope, without
> leaking the processor to a release binary.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
