Skip to content
This repository was archived by the owner on Nov 11, 2022. It is now read-only.

Backport AutoValue integration - #239

Merged
lukecwik merged 3 commits into
GoogleCloudPlatform:masterfrom
swegner:backport-autovalue
May 9, 2016
Merged

Backport AutoValue integration#239
lukecwik merged 3 commits into
GoogleCloudPlatform:masterfrom
swegner:backport-autovalue

Conversation

@swegner

Copy link
Copy Markdown
Contributor

No description provided.

@swegner

Copy link
Copy Markdown
ContributorAuthor

R: @lukecwik
CC: @tgroh

@swegner

Copy link
Copy Markdown
ContributorAuthor

Travis failure seems to be a flake:

Downloaded: https://repo.maven.apache.org/maven2/com/google/collections/google-collections/1.0/google-collections-1.0.jar (625 KB at 960.9 KB/sec)

[INFO] Changes detected - recompiling the module!

[INFO] Compiling 472 source files to /Users/travis/build/GoogleCloudPlatform/DataflowJavaSDK/sdk/target/classes

No output has been received in the last 10m0s, this potentially indicates a stalled build or something wrong with the build itself.

The build has been terminated

PTAL @lukecwik

@davorbonaci

Copy link
Copy Markdown
Contributor

Do we need this backport?

@swegner

Copy link
Copy Markdown
ContributorAuthor

re: @davorbonaci

Do we need this backport?

There have been a number of backported changes that needed manual merge work to un-AutoValue them, and @tgroh mentioned he has more in the pipeline. This isn't strictly required but should be relatively low-risk and make other backports easier.

@davorbonaci

Copy link
Copy Markdown
Contributor

Sure; ok to proceed with caution.

@swegner

Copy link
Copy Markdown
ContributorAuthor

I've addressed all feedback so far. Please take another look. @lukecwik

Comment threadpom.xml Outdated
</goals>
</execution>
</executions>
<configuration>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix indentation

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: this has already been addressed in BEAM via apache/beam@119812a

@swegner
swegnerforce-pushed the backport-autovalue branch from 0186d0b to c5be5feCompareMay 9, 2016 19:02
@swegner

Copy link
Copy Markdown
ContributorAuthor

I've addressed all feedback so far. Please take another look. @lukecwik

1 similar comment
@swegner

Copy link
Copy Markdown
ContributorAuthor

I've addressed all feedback so far. Please take another look. @lukecwik

@lukecwik

Copy link
Copy Markdown
Contributor

LGTM

@lukecwik

Copy link
Copy Markdown
Contributor

Waiting on travis and then will merge.

@lukecwik

Copy link
Copy Markdown
Contributor

Can you sync your PR since there is a merge conflict now?

@swegner
swegnerforce-pushed the backport-autovalue branch from 6dbf2bd to c6ea95bCompareMay 9, 2016 23:20
@swegner

Copy link
Copy Markdown
ContributorAuthor

done. @lukecwik

@lukecwik
lukecwik merged commit 6c61bfb into GoogleCloudPlatform:masterMay 9, 2016
@swegner
swegner deleted the backport-autovalue branch May 16, 2016 18:58
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@swegner@davorbonaci@lukecwik@googlebot