AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
8,038 Commits 35 Branches 138 Tags 124 MiB
4c5465e5fe
Commit Graph

471 Commits

Author SHA1 Message Date
Adam Cozzette
4c5465e5fe
Merge pull request #8402 from acozzette/merge-3-15-x 
Merge 3.15.x into master branch
 2021-03-16 11:01:34 -07:00
Adam Cozzette
4f8fef0a86
Merge pull request #8319 from elharo/patch-4 
deps: update JUnit and Truth
 2021-03-15 13:13:28 -07:00
Adam Cozzette
9db84d08fb Merge branch '3.15.x' into merge-3-15-x 2021-03-12 15:05:10 -08:00
Adam Cozzette
6aa539bf01 Update protobuf version 2021-03-10 14:53:26 -08:00
Adam Cozzette
673971834c
Merge branch 'master' into 3.15.x 2021-03-04 17:53:03 -08:00
Adam Cozzette
4fff47a418 Update protobuf version 2021-03-04 13:35:04 -08:00
Elliotte Rusty Harold
b6facc69ea docs: update version 2021-03-04 09:30:23 -08:00
Adam Cozzette
541b1735a8
Merge branch 'master' into 3.15.x-202103031418 2021-03-03 15:01:11 -08:00
Adam Cozzette
13fa25013a Merge branch '3.15.x' into 3.15.x-202103031418 2021-03-03 14:29:11 -08:00
Joshua Haberman
33905ec87b Fixed the Java Lite build. 2021-03-03 12:36:13 -08:00
Adam Cozzette
fd8aabf32d Update protobuf version 2021-03-03 11:37:48 -08:00
Joshua Haberman
f645c7ed07 Fixed spelling errors surfaced by CodeSpell. 2021-02-26 10:54:13 -08:00
Joshua Haberman
9df42757f9 Sync from Piper @359788468 
PROTOBUF_SYNC_PIPER
 2021-02-26 10:37:37 -08:00
Adam Cozzette
e54403190b Merge branch '3.15.x' into 3.15.x-202102251545 2021-02-25 15:54:09 -08:00
Adam Cozzette
983d115bd9 Update protobuf version 2021-02-25 09:20:20 -08:00
Adam Cozzette
d8254a67ce Merge branch '3.15.x' into 3.15.x-202102231541 2021-02-23 15:51:34 -08:00
Adam Cozzette
d7e943b8d2 Update protobuf version 2021-02-23 13:21:42 -08:00
Adam Cozzette
6e84adc9ff Merge branch '3.15.x' into merge-3-15-x 2021-02-22 11:03:32 -08:00
Adam Cozzette
052dc799d2 Update protobuf version 2021-02-19 15:12:24 -08:00
Elliotte Rusty Harold
947e2e189a
deps: update JUnit and Truth 2021-02-19 21:36:09 +00:00
Adam Cozzette
133e5e7526 Update protobuf version 2021-02-18 16:53:24 -08:00
Adam Cozzette
de701c660b Update protobuf version 2021-02-18 16:53:24 -08:00
Adam Cozzette
ac9218c5d9 Update protobuf version 2021-02-18 16:53:24 -08:00
Adam Cozzette
ae50d9b990 Update protobuf version 2021-02-18 11:50:15 -08:00
Adam Cozzette
8260126500 Update protobuf version 2021-02-17 10:51:33 -08:00
Elliotte Rusty Harold
e1b26fe4a1
deps: update to Guava 30.1 (#8209) 
This release includes a minor security fix.
 2021-02-11 16:28:10 -08:00
Adam Cozzette
e9f2ef308c Update protobuf version 2021-02-05 15:37:10 -08:00
Joshua Haberman
51daaba638 Sync from Piper @355707933 
PROTOBUF_SYNC_PIPER
 2021-02-04 14:09:49 -08:00
Deanna Garcia
a00125024e Sync from Piper @353127564 
PROTOBUF_SYNC_PIPER
 2021-01-22 00:24:30 +00:00
Elliotte Rusty Harold
c17e3c134c
Guava 30 (#7991) 2020-12-04 13:51:39 -08:00
Joshua Haberman
5c028d6cf4 Sync from Piper @343521567 
PROTOBUF_SYNC_PIPER
 2020-11-20 10:44:58 -08:00
Joshua Haberman
b70695dd68 Sync from Piper @338707351 
PROTOBUF_SYNC_PIPER
 2020-10-23 11:07:04 -07:00
Joshua Haberman
de371235c9 Sync from Piper @338284531 
PROTOBUF_SYNC_PIPER
 2020-10-21 10:04:14 -07:00
Joshua Haberman
38d6de1eef Sync from Piper @334206209 
PROTOBUF_SYNC_PIPER
 2020-09-28 11:54:54 -07:00
Joshua Haberman
f3cf99c0fb Sync from Piper @328224070 
PROTOBUF_SYNC_PIPER
 2020-08-24 15:48:43 -07:00
Joshua Haberman
32a94ce353 Merge tag 'refs/tags/sync-piper' into sync-stage 
# Conflicts:
#	csharp/src/Google.Protobuf.Test/testprotos.pb
 2020-08-17 15:26:33 -07:00
Joshua Haberman
95e6c5b474 Sync from Piper @327110949 
PROTOBUF_SYNC_PIPER
 2020-08-17 15:26:13 -07:00
Adam Cozzette
58f4260e8e Merged 3.13.x into master 2020-08-17 11:06:11 -07:00
Adam Cozzette
fde7cf7358 Update protobuf version 2020-08-14 15:20:53 -07:00
Adam Cozzette
98c2e69f8c Update protobuf version 2020-08-12 14:49:20 -07:00
Brendan Linn
389bd06d0a //:protobuf_java_util: discontinue JDK 7 compatibility support. 
6bbd56dfd9 removed the -source 7 -target
7 javacopts from the //java:{core,lite} targets in order to improve
compatibility with more recent versions of javac. (see that commit for
more discussion of motivation.) but the commit left -source 7 -target
7 javacopts on the related //java/util target. i've confirmed with the
commit author that this was just an oversight, so remove these flags
as well.
 2020-08-11 16:25:41 -07:00
Peter Newman
e2cc2de304
Fix lots of spelling errors (#7751) 
* Fix a typo

* Fix lots of spelling errors

* Fix a few more spelling mistakes

* s/parsable/parseable/

* Don't touch the third party files

* Cloneable is the preferred C# term

* Copyable is the preferred C++ term

* Revert "s/parsable/parseable/"

This reverts commit 534ecf7675.

* Revert unparseable->unparsable corrections
 2020-08-10 11:08:25 -07:00
Roberto Cosenza
02ade8bc32 Adding forgotten duration.proto to the lite library 2020-08-07 14:44:49 -07:00
Adam Cozzette
1c587a8059 Updated version to 3.13.0-rc2 2020-08-07 14:44:49 -07:00
Adam Cozzette
6b3a834f33 Temporarily disabled ExtensionRegistryFactoryTest 
This test has started failing, and I believe the cause is a change in
class loading behavior in Java 11. As far as I know, that breaks the
test logic but there is nothing wrong with the non-test code. This
change temporarily disables the test so that we can unblock the 4.0
release while I work on a more permanent fix.
 2020-08-07 14:44:49 -07:00
Adam Cozzette
8940150706 Updated version to 3.13.0-rc1. 2020-08-07 14:44:49 -07:00
Roberto Cosenza
8c91d71f69 Adding forgotten duration.proto to the lite library 2020-07-20 10:09:31 -07:00
Peter Newman
fc8e2e871d Fix a typo 2020-07-20 09:02:36 -07:00
Joshua Haberman
f77065d4eb Sync from Piper @316511779 
PROTOBUF_SYNC_PIPER
 2020-06-15 11:48:47 -07:00
Joshua Haberman
c077d949d8 Merge branch '3.12.x' into merge-312 2020-05-26 16:45:43 -07:00