Feng Xiao
3bf0245fd2
Merge pull request #5122 from elharo/guava20
...
update to Guava 20
2018-09-10 13:46:38 -07:00
Joshua Haberman
f9d8138376
Merge pull request #5109 from haberman/integrate
...
Down-integrate from google3.
2018-09-07 16:15:38 -07:00
Josh Haberman
4049a24f2b
Reverted changes to map_lite_test.proto.
2018-09-07 09:43:14 -07:00
Elliotte Rusty Harold
bb3bff0cd4
update to Guava 20
2018-09-07 08:33:14 -04:00
Kyle Krueger
21ebeed20a
Update README.md with gradle instructions for java
2018-09-06 09:43:26 +02:00
Josh Haberman
d61aede89c
Down-integrate from google3.
2018-09-04 10:58:54 -07:00
Elliotte Harold
259331566b
update version
2018-08-27 21:54:07 -04:00
Feng Xiao
afe98de32a
Replace repo links.
2018-08-22 11:55:30 -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
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
Aleksej Kazmin
5ddc6874e4
Fix typo in FieldMaskTree.java warning
2018-08-07 17:46:34 +03:00
Adam Cozzette
94d55e5292
Merge branch '3.6.x' into merge-3-6-x
2018-08-01 13:44:55 -07:00
vijay-bhatt
0f56f27ffc
Ignore unknown enum received in json when ignoreUnknownFields flag is set ( #4825 )
...
* Ignore unknown enum received in json when ignoreUnknownFields flag is set.
2018-07-30 13:36:46 -07:00
Adam Cozzette
9e1286b949
Updated version numbers to 3.6.1
2018-07-27 13:30:28 -07:00
Jonathan Haber
964201af37
Store the class object itself ( #4927 )
...
* Store the class object itself
* Add test for backwards compatibility
* Rename and add test
* Add comments
2018-07-23 13:45:22 -07:00
Adam Cozzette
82d3d7d250
Merge branch '3.6.x' into merge-3-6-x
2018-06-25 13:22:10 -07:00
Feng Xiao
4fda0f783b
Merge pull request #2811 from Dunemaster/master
...
Java: Mark sun.misc dependency as optional
2018-06-11 15:36:05 -07:00
Jisi Liu
45eb28b588
Update version number to 3.6.0
2018-05-14 16:06:22 -07:00
Anuraag Agrawal
92ac1ed6a5
Remove unsafe no-copy String allocation since it's not useful in recent Java versions.
2018-05-11 14:27:31 +09:00
Feng Xiao
7d55040eeb
Cleanup + documentation for Java Lite runtime.
2018-04-12 17:58:55 -07:00
Paul Yang
c931743461
Merge branch ( #4466 )
...
* Fix setup.py for windows build.
* Bump version number to 3.5.2
* Cat the test-suite.log on errors for presubits
2018-04-02 15:55:28 -07:00
Adam Cozzette
ec57f511c1
Added map_lite_test.proto to fix LiteTest
2018-03-20 14:44:30 -07:00
Adam Cozzette
0400cca323
Integrated internal changes from Google
2018-03-13 16:37:29 -07:00
David Ostrovsky
019ceea4b3
Drop java 6 support
...
Fixes #4220 .
2018-01-25 06:54:38 +01:00
kenji yoshida
1c3b20b122
fix typo in FieldMaskTree.java comment
2018-01-22 00:09:36 +09:00
Jisi Liu
383a4941d5
Merge remote-tracking branch 'origin/3.5.x' into master
2018-01-03 09:28:40 -08:00
Jisi Liu
050fc9a437
Update version number to 3.5.1
2017-12-19 11:00:33 -08:00
Jisi Liu
22e1cfd84a
Add deprecation annotation for oneof case.
2017-12-13 14:09:50 -08:00
Adam Cozzette
0ba8eea655
Merge branch 'master' into down-integrate
2017-12-01 10:05:19 -08:00
Adam Cozzette
92a7e778e7
Integrated internal changes from Google
2017-12-01 10:05:10 -08:00
Adam Cozzette
a27da09339
Merge branch '3.5.x' into 3.5.x-merge
2017-11-30 13:34:51 -08:00
Anuraag Agrawal
3e944aec9e
Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.
2017-11-29 15:44:58 +09:00
Jisi Liu
97dd175a91
Update version number to 3.5.0
2017-11-02 14:16:22 -07:00
Jisi Liu
a08b03d4c0
Add missing files
2017-10-26 13:48:53 -07:00
Jisi Liu
cdc0d9536a
Merge remote-tracking branch 'origin/3.4.x' into master
2017-10-25 14:43:07 -07:00
Jisi Liu
ca6187d5e7
Merge pull request #3578 from pherl/filedeprecation
...
Add @Deprecated annotation support for proto file.
2017-10-18 15:33:31 -07:00
Jisi Liu
1a7a7fca80
Merge from google internal
2017-10-18 12:22:18 -07:00
Jisi Liu
de15e73d58
Merge remote-tracking branch 'origin/3.4.x' into master
2017-10-11 14:44:03 -07:00
Jisi Liu
dba647a6b2
Bump version for minor release
2017-09-14 11:12:55 -07:00
Adam Cozzette
13fd045dbb
Integrated internal changes from Google
2017-09-14 10:03:57 -07:00
Jisi Liu
f9b81690f5
Add TODO
2017-08-31 11:24:05 -07:00
Jisi Liu
baae7ea12b
Add @Deprecated annotation support for proto file.
2017-08-31 10:49:58 -07:00
Jisi Liu
139775ccc0
Merge remote-tracking branch 'origin/3.4.x' into mergemaster
2017-08-18 16:25:35 -07:00
alanbur
a68a8004b5
PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLong
2017-08-08 11:56:36 +01:00
Jisi Liu
9b8f6589f2
Remove dependency on guava 20
2017-07-25 13:46:17 -07:00
Jisi Liu
759245a49a
Merge from master
2017-07-25 11:52:33 -07:00
Jisi Liu
7bb39bef1a
Update version number for 3.4.0
2017-07-24 16:03:49 -07:00
Jisi Liu
09354db143
Merge from Google internal for 3.4 release
2017-07-18 15:38:30 -07:00
Bo Yang
6ec0b7e4d1
Merge 3.3.x into master
2017-07-18 11:06:16 -07:00