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 from
May 9, 2016
Merged

Backport AutoValue integration #239

lukecwik merged 3 commits into from
May 9, 2016

Conversation

@swegner
Copy link
Contributor

@swegner swegner commented May 4, 2016

No description provided.

@swegner
Copy link
Contributor Author

swegner commented May 4, 2016

R: @lukecwik
CC: @tgroh

@swegner
Copy link
Contributor Author

swegner commented May 4, 2016

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
Contributor

davorbonaci commented May 4, 2016

Do we need this backport?

@swegner
Copy link
Contributor Author

swegner commented May 4, 2016

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
Contributor

davorbonaci commented May 7, 2016

Sure; ok to proceed with caution.

@swegner
Copy link
Contributor Author

swegner commented May 9, 2016

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

lukecwik
lukecwik reviewed May 9, 2016
View reviewed changes
pom.xml Outdated
</goals>
</execution>
</executions>
<configuration>
Copy link
Contributor

@lukecwik lukecwik May 9, 2016

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
Contributor Author

@swegner swegner May 9, 2016

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 swegner force-pushed the backport-autovalue branch from 0186d0b to c5be5fe Compare May 9, 2016 19:02
@swegner
Copy link
Contributor Author

swegner commented May 9, 2016

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

1 similar comment
@swegner
Copy link
Contributor Author

swegner commented May 9, 2016

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

@lukecwik
Copy link
Contributor

lukecwik commented May 9, 2016

LGTM

@lukecwik
Copy link
Contributor

lukecwik commented May 9, 2016

Waiting on travis and then will merge.

@lukecwik
Copy link
Contributor

lukecwik commented May 9, 2016

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

@swegner swegner force-pushed the backport-autovalue branch from 6dbf2bd to c6ea95b Compare May 9, 2016 23:20
@swegner
Copy link
Contributor Author

swegner commented May 9, 2016

done. @lukecwik

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

Reviewers

No reviews

Assignees

No one assigned

Labels

cla: yes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@swegner @davorbonaci @lukecwik @googlebot