[go: nahoru, domu]
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.

Sign up for GitHub

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

Jump to bottom

move apache classes back into google-http-client #614

Merged
merged 6 commits into from
Mar 15, 2019
Merged

move apache classes back into google-http-client #614

merged 6 commits into from
Mar 15, 2019

Conversation

elharo
Copy link
Contributor
@elharo elharo commented Mar 14, 2019 •
edited
Loading

Fixes #606

  • Tests pass
  • Appropriate docs were updated (if necessary)

I think this reverts the bare minimum files to keep the API compatible with 1.27.0. I left the tests and other files moved or created in #543 behind in google-http-client-apache.

@elharo elharo requested a review from a team as a code owner March 14, 2019 20:49
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Mar 14, 2019
@sduskis
Copy link
Contributor
sduskis commented Mar 14, 2019

Its weird that we have eclipse files checked in, IMHO.

@elharo
Copy link
Contributor Author
elharo commented Mar 14, 2019

[WARNING] 6003: com.google.api.client.http.HttpRequest: Value of compile-time constant USER_AGENT_SUFFIX has been changed
[WARNING] 6003: com.google.api.client.http.HttpRequest: Value of compile-time constant VERSION has been changed
[ERROR] 7006: com.google.api.client.http.apache.ApacheHttpTransport: Return type of method 'public org.apache.http.impl.client.DefaultHttpClient newDefaultHttpClient()' has been changed to org.apache.http.client.HttpClient

@elharo
Copy link
Contributor Author
elharo commented Mar 14, 2019

We can probably delete and .gitignore those Eclipse files in another PR.

@elharo
Copy link
Contributor Author
elharo commented Mar 14, 2019 •
edited
Loading

The return type change here is weird. Funny it didn't show up before. Here's the original from 1.19.0:

https://developers.google.com/api-client-library/java/google-http-java-client/reference/1.19.0/com/google/api/client/http/apache/ApacheHttpTransport#newDefaultHttpClient()

@elharo
Copy link
Contributor Author
elharo commented Mar 14, 2019

Looks like the return type of newDefaultHttpClient changed in #558 after the artifacts were split so that change needs to be rolled back too.

3d7f17c

@sduskis
Copy link
Contributor
sduskis commented Mar 14, 2019

Is it possible to do the two different reverts in two steps? I'm having cognitive overload with the combination of the two changes.

@elharo
Copy link
Contributor Author
elharo commented Mar 15, 2019

OK, I've reverted back to the state where it just moved the classes back into the main artifact. This will need a second PR to undo the return type change from #558.

@sduskis
Copy link
Contributor
sduskis commented Mar 15, 2019

retesting java 7

@elharo elharo merged commit 2e2b70b into master Mar 15, 2019
@elharo elharo deleted the work branch March 15, 2019 21:10
@kolea2 kolea2 mentioned this pull request Mar 25, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sduskis sduskis sduskis approved these changes

Assignees
No one assigned
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@elharo @sduskis @googlebot