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
Bo Yang
e7bcfc4241
Update version number to 3.3.2
2017-06-21 10:20:34 -07:00
Feng Xiao
129a6e2aca
Revert guava depedency to version 19.
2017-05-12 15:29:08 -07:00
Feng Xiao
58538ea919
Update version number to 3.3.1
2017-05-08 16:02:08 -07:00
Adam Cozzette
9053033a50
Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master
2017-04-27 14:55:53 -07:00
Anuraag Agrawal
bf483dfb99
Allow unknown values for Map put*Value methods just like every other enum mutation method.
2017-04-07 14:50:52 +09:00
Adam Cozzette
efec757104
Merge pull request #2937 from anuraaga/dev_rag2
...
Fix duplicate fields test and Any test. The repeated version is passing because nu…
2017-04-06 16:27:54 -07:00
Anuraag Agrawal
09328db1ff
Fix test for unexpected type url when parsing Any. Currently, the test fails since TestAllTypes doesn't have field '@type', which is the same test as testUnknownFields.
2017-04-05 17:44:26 +09:00
Anuraag Agrawal
662f97841e
Fix duplicate fields test. The repeated version is passing because null values in a repeated field are rejected and not testing what it wanted to. Also adds a oneof version that verifies the case of oneof fields of different names (currently only same name check seems to be tested).
...
Also fix spelling of a test.
2017-04-04 17:27:53 +09:00
Anuraag Agrawal
58373fa160
Fix error message for int64 parse error.
2017-04-03 17:35:42 +09:00
Feng Xiao
c2b3b3e04e
Update Java version number and dependency.
2017-03-30 18:25:11 -07:00
Feng Xiao
84f6954ca9
Fix Java build.
2017-03-29 16:03:53 -07:00
Feng Xiao
d36c0c538a
Down-integrate from google3.
2017-03-29 14:33:05 -07:00
Feng Xiao
db3ef48ede
Merge pull request #2860 from prehistoric-penguin/master
...
Remove duplicated copyright statement
2017-03-20 10:49:48 -07:00
prehistoric-penguin
33cc25f36c
Remove duplicated copyright statement
2017-03-16 11:23:07 +08:00
Josh Haberman
496cd481fa
Changed scope of Java deps to "test".
...
This is per: https://github.com/google/protobuf/issues/2019
2017-03-15 18:27:05 -07:00
Jisi Liu
ddfc86b1f7
Merge pull request #2835 from pherl/javaep
...
Suppress the last unchecked warning.
2017-03-13 10:56:20 -07:00
Jisi Liu
f4f31e73f2
Suppress the last unchecked warning.
...
Likely to be java language issue. Varargs are considered arrays, thus
using generic with varargs will cause unchecked warning about generic
array creation.
2017-03-10 15:33:17 -08:00
Jisi Liu
f54fb9d729
Merge pull request #2832 from pherl/javaep
...
Fix java code according to error prone.
2017-03-10 15:19:04 -08:00
Feng Xiao
e11cd3ee6e
Merge pull request #2818 from xfxyjwf/i1470
...
Don't expose gson exceptions in JsonFormat.
2017-03-10 15:08:51 -08:00
Feng Xiao
81f4fe5aab
Merge pull request #2827 from xfxyjwf/i1251
...
Update comments for setSizeLimit.
2017-03-10 15:02:52 -08:00
Jisi Liu
81fe52fbd4
Fix java code according to error prone.
2017-03-10 14:53:15 -08:00
Feng Xiao
03c8c8be6d
Update comments for setSizeLimit.
2017-03-09 17:24:42 -08:00
