Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update org.json to latest version #1904

Merged
merged 1 commit into from
Apr 12, 2017
Merged

Conversation

shinfan
Copy link
Contributor

@shinfan shinfan commented Apr 12, 2017

#1502 is caused by a dependency conflict of an older version of org.json package (which is used by a external dependency). The solution is to override the org.json version or exclude the older version from the external dependency.

I don't think there is much we can do in our client to prevent such dependency issues. But since our org.json package is very old I think we can upgrade to the latest anyway.

The only place we use org.json is in ServiceOptions class so this should not cause any issue.

@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Apr 12, 2017
@garrettjonesgoogle
Copy link
Member

LGTM after tests pass

@shinfan
Copy link
Contributor Author

shinfan commented Apr 12, 2017

3 tests passed on Travis. Going to merge.

@shinfan shinfan merged commit f9e7ecc into googleapis:master Apr 12, 2017
@coveralls
Copy link

Coverage Status

Coverage remained the same at 80.973% when pulling c18f6f2 on shinfan:master into 3f0f645 on GoogleCloudPlatform:master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants