Commit Graph

6001 Commits

Author SHA1 Message Date
Paul Yang
98e26a4195
Add missing reference to conformanc_test_impl.cc in Makefile (#5100)
* Add missing reference to conformanc_test_impl.cc in Makefile

* Update conformance failure list
2018-08-31 10:47:58 -07:00
Feng Xiao
9a8d9b1014
Merge pull request #5082 from elharo/guava
update version
2018-08-29 14:20:31 -07:00
Feng Xiao
0bfe1ca277
Merge pull request #5079 from GobySoft/request-new-extension
Request new option extension (and update URLs for existing projects)
2018-08-29 14:15:33 -07:00
Feng Xiao
86c7786be8
Merge pull request #5077 from EmersonGaziz/patch-1
Update options.md | fix website url for C# port
2018-08-29 14:13:05 -07:00
Elliotte Harold
259331566b update version 2018-08-27 21:54:07 -04:00
Toby Schneider
4fd7bdee48
Update options.md
Update my projects' (DCCL / Goby) URLs.
Propose new extension for CGSN Mooring project.
2018-08-24 17:10:24 -04:00
Gohar Aziz
f3a74befcd
Update options.md | fix website url for C# port
Update options.md | fix website url for C# port of protocol buffers.. From `http://github.com/jskeet/dotnet-protobufs` to `https://github.com/jskeet/protobuf-csharp-port`
2018-08-24 10:19:22 -04:00
Feng Xiao
45d03a9771
Merge pull request #5074 from xfxyjwf/links
Revert changed links in Dockerfiles.
2018-08-23 16:17:25 -07:00
Feng Xiao
a0a17e24d7 Fix go tests. 2018-08-23 15:35:52 -07:00
Feng Xiao
409f954673 Revert changed links in Dockerfiles.
These changes require building new docker images and without new images
our kokoro tests are all failing.
2018-08-23 12:43:35 -07:00
Feng Xiao
fd4baa91e7
Merge pull request #5068 from xfxyjwf/links
Replace repo links.
2018-08-22 18:32:11 -07:00
Feng Xiao
afe98de32a Replace repo links. 2018-08-22 11:55:30 -07:00
Jon Skeet
228530e2da Support creating FileDescriptors dynamically from binary data.
Related to #658 and #5007.
2018-08-20 22:00:02 +01:00
Feng Xiao
fa252ec2a5
Merge pull request #5024 from greenhouse-org/fix-windows-path
Fix TryCreateParentDirectory on Windows
2018-08-20 13:50:16 -07:00
Feng Xiao
9590dd2c4f
Merge pull request #5050 from lucidsoftware/lucid
Change deprecated Bazel single file attr param
2018-08-20 13:40:02 -07:00
James Judd
d5f0dac497 Change deprecated Bazel single file attr param
This removes the need for --incompatible_disable_deprecated_attr_params
when using Protobuf
2018-08-14 21:55:35 -06:00
Jie Luo
ab09b2a2e2
Disable surrogate check for ucs2 (#5039)
* _SURROGATE_PATTERN check for ucs4
Skip some test for ucs2 by sys.maxunicode
2018-08-14 11:17:16 -07:00
Feng Xiao
fe2eef4bf4
Merge pull request #5042 from dsnet/master
Document wrapper non-uses
2018-08-13 17:49:03 -07:00
Joe Tsai
6b6e155ff9 Document wrapper non-uses
Document the cases where the wrapper well-known types are not useful.
2018-08-13 16:44:47 -07:00
Feng Xiao
d39c7ef6eb
Merge pull request #5033 from xfxyjwf/up
Fix issues discovered in up-integration.
2018-08-13 15:20:48 -07:00
Feng Xiao
fa11dea05b Fix issues discovered in up-integration. 2018-08-13 15:20:04 -07:00
Feng Xiao
f2a326d36e
Merge pull request #5041 from xfxyjwf/bazel
Add status badge for bazel build.
2018-08-13 15:13:41 -07:00
Feng Xiao
b4646ecfff Add status badge for bazel build. 2018-08-13 14:55:52 -07:00
Feng Xiao
2932594145
Merge pull request #5040 from xfxyjwf/bazel
Fix bazel test.
2018-08-13 14:55:11 -07:00
Feng Xiao
bde4eaf137 Update build files.
* Fixes https://github.com/google/protobuf/issues/5031
* Fixes https://github.com/google/protobuf/issues/5037
2018-08-13 14:41:27 -07:00
Feng Xiao
4c70c9cb17
Merge pull request #5038 from xfxyjwf/proto2
Down-integrate proto2 namespace fix.
2018-08-13 14:41:05 -07:00
Sam Smith
bf784289d2 Always spilt on '\' and '/' 2018-08-13 17:17:33 -04:00
Joshua Haberman
585b24e9a6
Merge pull request #5032 from TeBoring/json-wrapper
Fix json parsing of wrapper values
2018-08-13 13:36:08 -07:00
Feng Xiao
14be563f00 Down-integrate proto2 namespace fix. 2018-08-13 12:32:21 -07:00
Bo Yang
e3ee7167f1 Fix json parsing of wrapper values 2018-08-10 18:09:02 +00:00
Yilun Chong
ba8692fbad
Merge pull request #4951 from BSBandme/add_js_benchmark
Add JS and Protobuf.js benchmark, fix js's reader.skipGroup
2018-08-10 11:07:04 -07:00
Feng Xiao
acd5b05e9f Fix failing tests.
1. Fix C++ tests.
  * Add missing files to Makefile.am and fix distcheck in tests.sh
  * Remove BUILT_SOURCES from conformance/Makefile.am.
  * Add some missing override keyword.
  * Add a type cast to int64 because our StrCat() in stubs can't handle size_t.
2. Fix Java tests.
  * Add missing test dependency on guava in pom.xml.
  * Include newly referenced test data in test resources.
  * Manually fix map_lite_test.proto which is overwritten because it's mapped
    from map_test.proto in google3.
  * Add back "optimize_for = LITE_RUNTIME" which is still needed to keep the
    opensource test passing as it's still running lite tests.
  * Add a type cast in newBuilder() because without it the code doesn't compile
    with openjdk javac 1.8 (the compiler can't figure if it's the right type
    due to complex generic typing).
3. Fix Python tests.
  * Remove/replace references to <hash_map>.
  * Suppress more warnings in setup.py.
  * Replace incorrect header inclusion for google/protobuf/proto_api.h.
  * Add strings::EndsWith to google/protobuf/stubs/strutil.h because it's
    referenced in the updated python C extension code.
  * Replace proto2 with google::protobuf. The proto2 name is leaked to
    opensource because we removed the subsitition rule for proto2 namespace
    but only fixed C++ source code and forgot to update python C extension code.
2018-08-09 21:21:01 -07:00
Feng Xiao
8e4fd1b4e8 Merge remote-tracking branch 'google/master' into integration_base 2018-08-09 16:55:29 -07:00
Feng Xiao
fe80059c8d
Merge pull request #5027 from xfxyjwf/jenkins
Cleanup kokoro scripts.
2018-08-09 16:06:38 -07:00
Feng Xiao
f0b8a57fe6 Cleanup kokoro scripts.
Changes:
1. Remove stuff no longer needed. Lots of the heavy lifting were there
because we were running our own jenkins cluster and had to manage all
the test logs ourselves. Now they are useless.
2. Change "-j2" to "-j4" to speed up the test a little bit. Kokoro
machines have 4 logic CPUs according to their spec.
2018-08-09 15:22:22 -07:00
Sam Smith
84963a5511 Fix TryCreateParentDirectory on Windows
On Windows, both '/' and '\' are valid path separators. So when creating
the parent directories, split the filename on both

Signed-off-by: Akshat Gokhale <agokhale@pivotal.io>
2018-08-09 10:46:22 -04:00
Feng Xiao
c9a30c2c27
Merge pull request #5020 from brian-peloton/master
Fix broken test of const repeated field iterators
2018-08-08 20:40:42 -07:00
Feng Xiao
a4862e790e Update generated descriptors. 2018-08-08 17:21:04 -07:00
Feng Xiao
a8465b738e Merge master branch. 2018-08-08 17:14:42 -07:00
Feng Xiao
6bbe197e9c Down-integrate from google3. 2018-08-08 17:00:41 -07:00
Brian Silverman
2f656087f0 Fix broken test of const repeated field iterators
The old version had a NOP for loop, which doesn't make sense. I'm pretty
sure this was the original intention. Newer GCC's
-Wunused-but-set-variable flags the old version.
2018-08-08 15:27:00 -07:00
Yilun Chong
5a95666f6e fix filename and newline 2018-08-08 11:24:09 -07:00
Yilun Chong
9bbc4b1fab
Merge pull request #4981 from BSBandme/fix_js_skipgroup
Fix js reader.js's skipGroup
2018-08-08 11:01:53 -07:00
Feng Xiao
0483feb6e0
Merge pull request #5013 from prSquirrel/fix-typo-field-mask-tree
Fix typo in FieldMaskTree.java warning
2018-08-07 17:47:57 -07:00
Adam Cozzette
f504d95d46
Merge pull request #5010 from batradhruv/4593
#4593 Replace all occurrences of "NULL" to nullptr in src/google/proto…
2018-08-07 12:05:29 -07:00
Aleksej Kazmin
5ddc6874e4
Fix typo in FieldMaskTree.java warning 2018-08-07 17:46:34 +03:00
Dhruv
526b350199 4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubs 2018-08-07 08:03:57 +08:00
dmaclach
3389bd965b Add header need for module maps.
If you make up a module map for Objective C protocol buffers, the compiler will complain about missing a declaration for GPBUnknownFieldSet which is used in this file.
2018-08-06 18:41:22 -04:00
Feng Xiao
62fc66ada3
Merge pull request #5005 from finaldie/python.gitignore
Ignore python .egg file to make git status clean #5004
2018-08-06 13:34:13 -07:00
Yuzhang Hu
9c7655c9fc Ignore python .egg file to make git status clean #5004 2018-08-05 02:58:30 -07:00