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

Merge master into 3.9.x #6298

Merged
merged 28 commits into from
Jun 24, 2019
Merged

Merge master into 3.9.x #6298

merged 28 commits into from
Jun 24, 2019

Conversation

TeBoring
Copy link
Contributor

No description provided.

akonradi and others added 28 commits May 24, 2019 07:44
This project is used by the [Envoy proxy](https://www.envoyproxy.io/) and several others.

The existing code is using the extension value [919191](https://github.com/envoyproxy/protoc-gen-validate/blob/54b08a686ff6548d8a248218664254c422fc4599/validate/validate.proto#L29) but since maintaining binary compatibility is not important, it shouldn't be a problem to change once this allocation is approved.
that builds the JavaLite runtime.

Contents based on java/lite/pom.xml.
This fixes compatibility with bazel when passing `--incompatible_no_support_tools_in_action_inputs` which will be flipped in an upcoming release.
As a followup to ca3ead7, treat plugin executables as well as protoc as host tools.
New bundler doesn't work with old gem: rbenv/rbenv#1138
…fers#6251)

* Change int64 json encoding to be string for php and ruby

* Fix ruby test

* Sync upb change
Other languages will have this removed inside Google first.
These functions are subject to ADL and cause problems.
* php: Fixed php notices for unknown enum indices

* php: Fixed formatting of Duration

This fixes:
* Missing nanoseconds. The nanoseconds where divided as a float and
  implicitly converted to a string before being passed to bcadd.
  This can result in a float formatted in scientific/exponential notation,
  which bcmath doesn't understand.
* Durations are supposed to be formatted without trailing zeroes.
Include protobuf_deps.bzl in generated release archives
Removed all use of STLDelete*() in ObjC and C# Generators.
* Make php message class final

Because proto messages are just data object, they should not be mocked.
Explicitly make them final to avoid accidental usage.

* Update generated descriptors
Otherwise, sandbox and remote execution will complain `google/protobuf/port_def.inc` doesn't exist.
Add `protobuf_java_lite` Bazel target
Compatibility tests pull artifacts over HTTPS
Add extension number for protoc-gen-validate
Conflicts:
	java/lite/pom.xml
	java/util/pom.xml
@TeBoring TeBoring requested a review from acozzette June 21, 2019 20:32
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

ℹ️ Googlers: Go here for more info.

@googlebot
Copy link

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

ℹ️ Googlers: Go here for more info.

@TeBoring TeBoring merged commit 3f33753 into protocolbuffers:3.9.x Jun 24, 2019
bithium pushed a commit to bithium/protobuf that referenced this pull request Sep 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.