Commit Graph

6482 Commits

Author SHA1 Message Date
Xiang Dai
8df872a500 Remove whitespace following trailing backslash
Fix below issue:
src/Makefile.am:210: warning: whitespace following trailing backslash

Signed-off-by: Xiang Dai <764524258@qq.com>
2019-01-31 14:39:06 -08:00
Michael Matthew Mitchell
dface63d71 Swapped libprotoc and libprotobuf
libprotobuf being targed before libprotoc was causing Visual Studio to fail in linking protoc.
2019-01-31 14:35:57 -08:00
Peter Sobot
50342e4812 Allowed json_format.ParseDict to parse extensions with scalar types. (#5609) 2019-01-31 13:00:23 -08:00
Bhargava Shastry
8532804bad Fixes warnings in https://github.com/google/oss-fuzz/issues/864#issuecomment-458596374 2019-01-31 11:06:47 -08:00
Adam Cozzette
1ee15baefc Updated version to 3.7.0rc2 2019-01-30 21:08:04 -08:00
Adam Cozzette
650915742d Updated pom.xml files
The Nexus repository now seems to require SCM and developer information
to be present in the POM file.
2019-01-30 13:25:58 -08:00
Adam Cozzette
02557977bb Include Linux ppcle_64 builds and Windows 64-bit builds of protoc 2019-01-30 13:25:58 -08:00
Adam Cozzette
0e3f1f4ad7 Fixed Javadoc errors 2019-01-30 13:25:58 -08:00
Ivan Pizhenko
41f94bf372 Fix GetErrno() to be const (#5595)
* Fix GetErrno() to be const noexcept

* Removed noexcept
2019-01-28 17:20:28 -08:00
Paul Yang
74f667ddc2
Merge pull request #5644 from TeBoring/fix-4765
Convert integer to string if field is string field in json
2019-01-28 15:15:59 -08:00
Bo Yang
8400e29044 Divide commands into separate lines 2019-01-28 20:58:58 +00:00
Bo Yang
71e5de01d3 phpunit-5.6.10 link is broken
Use 5.6.8 instead
2019-01-28 20:57:51 +00:00
Bo Yang
96029f3c4a Convert integer to string if field is string field in json
json_decode automatically convert numeric string to integer, so that
we need to convert it back. However, this will suceed to parse invalid
json data with string field set as integer even though it should have failed.
Because, the failure case is less often than the succeeding case, we decided
to make this change. Users should make sure their data don't use integer for
string fields by themselves.
2019-01-28 20:57:51 +00:00
Paul Yang
32339be92a
Merge pull request #5646 from TeBoring/3.7.x-cherrypick
Default values should also be serialized for json map key/value (#5643)
2019-01-28 12:48:54 -08:00
Paul Yang
3cae8e4467 Default values should also be serialized for json map key/value (#5643) 2019-01-28 19:30:10 +00:00
Paul Yang
a73b43593d
Merge pull request #5640 from TeBoring/3.7.x-cherrypick
cherrypick changes from master
2019-01-28 11:29:47 -08:00
Paul Yang
a21caa237a
Default values should also be serialized for json map key/value (#5643) 2019-01-28 11:25:52 -08:00
Hao Nguyen
c143164986 Fix MacOS protoc release (#5638)
* Use set -ex
* Use -std=c++14 so -latomic can be found
2019-01-27 19:53:31 +00:00
Hao Nguyen
532c42586f Fix python release build. (#5636)
* Fix python release build.
* Separate config.sh by platform
* Use KOKORO_JOR_NAME to determine the BUILD_COMMIT.
* Use -std=c++14 on MacOS so -latomic can be used.
2019-01-27 19:53:14 +00:00
Hao Nguyen
45a723b40d
Fix MacOS protoc release (#5638)
* Use set -ex
* Use -std=c++14 so -latomic can be found
2019-01-25 21:05:22 -08:00
Hao Nguyen
fac8e343e8
Fix python release build. (#5636)
* Fix python release build.
* Separate config.sh by platform
* Use KOKORO_JOR_NAME to determine the BUILD_COMMIT.
* Use -std=c++14 on MacOS so -latomic can be used.
2019-01-25 16:19:07 -08:00
Adam Cozzette
d135f07bba
Do "strict" heapcheck instead of "draconian" (#5635)
The draconian heapcheck turns up memory leaks outside our control, such
as ones in libc and in the heapchecker itself. I think for an automated
test it makes more sense for us to use the "strict" heapcheck, since
that already passes and should only report leaks that are within our
control.
2019-01-25 10:28:52 -08:00
Adam Cozzette
0f4ec5ecdc
Merge pull request #5628 from acozzette/update-gtest
Updated googletest submodule to the most recent upstream commit
2019-01-25 10:15:36 -08:00
Adam Cozzette
e2bfec9af2 Updated Linux cpp_distcheck test to exit immediately on error 2019-01-25 09:12:53 -08:00
Adam Cozzette
46f87f9740 Updated googletest submodule to the most recent upstream commit 2019-01-25 09:12:53 -08:00
Hao Nguyen
9273f3c1b5
Merge pull request #5630 from haon4/gauva
Update guava version to 26
2019-01-25 07:07:07 -08:00
Paul Yang
53a1d49633
Allow internalAddGeneratedFile to depend on new nested message name (#5629)
Previously, internalAddGeneratedFile has to depend on old non-nested name for sub-messages.
This creates a hard dependency on old generated code for compatibility usage.
If user's code has custome error handler, the deprecation warning in the old generated code
will also be thrown (even though users haven't explicitly depended on the old message name).

To fix this problem, this change added an additional flag in the generated code to tell run
time that it's safe to use new message name. In this way, internalAddGeneratedFile can safely
depend on new name and don't trigger unnecessary deprecation warning.
2019-01-24 19:10:00 -08:00
Hao Nguyen
dab6a7ea98
Merge pull request #5631 from haon4/update-changes
Update CHANGES.txt
2019-01-24 14:46:25 -08:00
Hao Nguyen
6b434dc6e2 Update CHANGES.txt 2019-01-24 14:35:47 -08:00
Hao Nguyen
bc5154e27f Update guava version 2019-01-24 13:46:19 -08:00
Hao Nguyen
329adbed0d Update gauva version to 26 2019-01-24 13:40:43 -08:00
Hao Nguyen
18f1f8142e
Merge pull request #5627 from haon4/master
Update more files in update_version.py
2019-01-24 12:35:46 -08:00
Hao Nguyen
cc83bf7aac
Merge pull request #5626 from haon4/3.7.x
Update version to 3.7.0
2019-01-24 12:11:57 -08:00
Hao Nguyen
c70643ed4b Update more files in update_version.py 2019-01-24 11:42:45 -08:00
Hao Nguyen
9e60cd785b Update generated codes 2019-01-24 11:32:07 -08:00
Hao Nguyen
7187cfd275 Update version number in java/bom/pom.xml 2019-01-24 11:20:14 -08:00
Hao Nguyen
15605fcd20 Include version change for src/google/protobuf/port_def.inc 2019-01-24 11:08:58 -08:00
Hao Nguyen
d5be2baa46 Update version to 3.7.0 2019-01-24 10:23:02 -08:00
Paul Yang
38d9ca47db
Merge pull request #5618 from TeBoring/3.7.x-merge
Merge new changes into 3.7.x
2019-01-23 17:31:17 -08:00
Bo Yang
dbfb9a8a07 Merge branch 'master' into 3.7.x 2019-01-23 12:49:53 -08:00
Paul Yang
d750fbf648
Fix more issues for reference values (#5613)
* Fix more issues for reference values

* Revert change in gdb test

* Add more tests
2019-01-23 12:44:20 -08:00
Hao Nguyen
30851ca266
Fix protoc release (#5615)
* Fix protoc release

* Update Dockerfile to include libatomic
2019-01-23 10:55:36 -08:00
Hao Nguyen
4f8a635679
Create test for protoc with tcmalloc (#5612)
* Add TC malloc kokoro test

* Update tcmalloc test
2019-01-23 10:02:51 -08:00
Paul Yang
7f42d6d0bc
Fix empty FieldMask json encoding/decoding (#5605)
* Fix empty FieldMask json encoding/decoding

* Add failed test to python's conformance failure list
2019-01-22 15:35:12 -08:00
Paul Yang
1069565a68
Fix c extension doesn' allow message reference in array (#5599)
* Fix c extension doesn' allow message reference in array

* Fix array constructor handling reference of array.

* Change test name
2019-01-22 14:02:44 -08:00
Adam Cozzette
a4c09f3eba
Merge pull request #5590 from i9/patch-1
Add proto3 to solidity link in third_party.md
2019-01-18 15:57:42 -08:00
Joshua Haberman
dd7127d23d Fixed compile warnings for PHP extension. (#5589)
* Fixed compile warnings for PHP extension.

* Fixed some compile errors on PHP <7 and with TSR enabled.

* One more fix for TSRM builds.
2019-01-18 15:05:57 -08:00
Joshua Haberman
6bbd2fc5aa
Merge pull request #5603 from protocolbuffers/revert-5597-patch-1
Revert "doc: apply consistent indentation to Any examples"
2019-01-18 13:51:57 -08:00
Paul Yang
4e929031b0 Revert "doc: apply consistent indentation to Any examples (#5597)"
This reverts commit b3367aee14.
2019-01-18 12:54:23 -08:00
bitspill
b3367aee14 doc: apply consistent indentation to Any examples (#5597) 2019-01-17 17:13:31 -08:00