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

176 Commits

Author SHA1 Message Date
Adam Cozzette
1f66b1b032 Sync from Piper @402594188 
PROTOBUF_SYNC_PIPER
 2021-10-12 10:19:10 -07:00
Adam Cozzette
3afc828309 Sync from Piper @401883098 
PROTOBUF_SYNC_PIPER
 2021-10-08 16:45:26 -07:00
Adam Cozzette
0613ca8284
Merge pull request #9061 from acozzette/merge-3.18.x 
Merge 3.18.x into master
 2021-10-05 17:08:16 -07:00
Elliotte Rusty Harold
1e88936fce
Stop using EasyMock classextension (#9008) 
* get rid of classextension and update EasyMock
 2021-10-05 21:49:01 +00:00
Adam Cozzette
2a75e8ca58 Merge branch '3.18.x' into merge-3.18.x 2021-10-05 14:04:13 -07:00
Adam Cozzette
0dab03ba7b
Update protobuf version to 3.18.1 (#9051) 
* Update protobuf version

* Update PHP release notes in package.xml
 2021-10-04 17:43:33 -07:00
Josh Haberman
129b3e8a98 Merge branch 'master' into sync-stage 2021-09-28 15:28:48 +00:00
Joshua Haberman
567efd4c3e
Merge pull request #9026 from haberman/merge-release 
Merge 3.18.x release branch to master
 2021-09-27 17:55:39 -07:00
Joshua Haberman
2128ce074f Merge branch '3.18.x' into merge-release 2021-09-27 15:29:06 -07:00
Josh Haberman
624d29d833 Sync from Piper @399250367 
PROTOBUF_SYNC_PIPER
 2021-09-27 19:18:41 +00:00
Elliotte Rusty Harold
a93074e546
deps: add j2objc annotations (#9005) 
* deps: add j2objc annotations

@pzd this will be needed on the next sync with google3
 2021-09-22 12:41:03 +00:00
Paul Yang
12fb2b7450
Update protobuf version (#8973) 
* Update protobuf version

* Update php notes
 2021-09-13 12:34:03 -07:00
Joshua Haberman
e5c570bb57 Sync from Piper @395706834 
PROTOBUF_SYNC_PIPER
 2021-09-09 08:21:42 -07:00
Derek Perez
0bab8e808e Addresses duplicates identified in #8925 (#8939) 
* Addresses duplicates identified in #8925

java_export aliases the rule name to the full maven_project_jar which consolidates all deps into a merged jar. This is not what we want for Bazel users.

* Update :util to match
 2021-08-31 12:19:03 -07:00
Derek Perez
2937b2ca63
Addresses duplicates identified in #8925 (#8939) 
* Addresses duplicates identified in #8925

java_export aliases the rule name to the full maven_project_jar which consolidates all deps into a merged jar. This is not what we want for Bazel users.

* Update :util to match
 2021-08-31 12:14:11 -07:00
Bo Yang
d8f55782b0 Update protobuf version 2021-08-27 14:39:58 -07:00
Adam Cozzette
f78fefc1ff Sync from Piper @392954264 
PROTOBUF_SYNC_PIPER
 2021-08-25 12:32:02 -07:00
Paul Yang
7cbc08615f
Update protobuf version (#8887) 2021-08-18 17:20:20 -07:00
Adam Cozzette
562fc946c7 Sync from Piper @388508285 
PROTOBUF_SYNC_PIPER
 2021-08-03 11:58:05 -07:00
Deanna Garcia
380e352b0b Sync from Piper @373820256 
PROTOBUF_SYNC_PIPER
 2021-05-14 17:50:31 +00:00
Joshua Haberman
f5fd897c1d Sync from Piper @371422642 
PROTOBUF_SYNC_PIPER
 2021-04-30 16:12:50 -07:00
Derek Perez
bc45f92262
Bazel powered Java testing (#8506) 
* Protobuf Java/Core Tests running w/ Bazel.

Also integrates rules_jvm_external and migrates existing maven deps
in place.

* Add test_suite target that maps to rule name.

* Lite tests passing in Bazel

* util tests passing with Bazel.

* Add conformance and build testing to //java:core

* Cleanup bzl style and lock down access to failure lists.

* Adding Java Lite conformance tests.

* rm newline

* parameterize conformance_test

This makes usage of failure lists more explicit.

* restrict visibility more for newly added libs and fix formatting.

* fix formatting and visibility.

* move testing.bzl to an internal package.

* fix file formatting.

* moving conformance_test to internal.bzl
 2021-04-20 11:36:32 -07:00
Joshua Haberman
ce560630bf Sync from Piper @368734211 
PROTOBUF_SYNC_PIPER
 2021-04-15 15:53:17 -07:00
Adam Cozzette
5679811239 Merge branch '3.15.x' into merge-3-15-x 2021-04-08 10:54:02 -07:00
Adam Cozzette
436bd7880e
Updated version to 3.15.8 (#8463) 
* Update protobuf version

* Updated CHANGES.txt and package.xml for 3.15.8
 2021-04-07 15:38:38 -07:00
Adam Cozzette
87aa9adb86 Merge branch 'master' into 3.15.x 2021-04-02 14:55:02 -07:00
Adam Cozzette
878be3569e Update protobuf version 2021-04-02 11:06:56 -07:00
Joshua Haberman
4a6dc34d3a Sync from Piper @365872496 
PROTOBUF_SYNC_PIPER
 2021-03-30 12:37:31 -07:00
Joshua Haberman
96307d28f6 Sync from Piper @364389596 
PROTOBUF_SYNC_PIPER
 2021-03-22 13:05:55 -07:00
Adam Cozzette
6aa539bf01 Update protobuf version 2021-03-10 14:53:26 -08:00
Adam Cozzette
4fff47a418 Update protobuf version 2021-03-04 13:35:04 -08:00
Adam Cozzette
fd8aabf32d Update protobuf version 2021-03-03 11:37:48 -08:00
Joshua Haberman
9df42757f9 Sync from Piper @359788468 
PROTOBUF_SYNC_PIPER
 2021-02-26 10:37:37 -08:00
Adam Cozzette
983d115bd9 Update protobuf version 2021-02-25 09:20:20 -08:00
Adam Cozzette
d7e943b8d2 Update protobuf version 2021-02-23 13:21:42 -08:00
Adam Cozzette
052dc799d2 Update protobuf version 2021-02-19 15:12: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
Adam Cozzette
e9f2ef308c Update protobuf version 2021-02-05 15:37:10 -08:00
Deanna Garcia
a00125024e Sync from Piper @353127564 
PROTOBUF_SYNC_PIPER
 2021-01-22 00:24:30 +00:00
Joshua Haberman
5c028d6cf4 Sync from Piper @343521567 
PROTOBUF_SYNC_PIPER
 2020-11-20 10:44:58 -08:00
Joshua Haberman
de371235c9 Sync from Piper @338284531 
PROTOBUF_SYNC_PIPER
 2020-10-21 10:04:14 -07:00
Joshua Haberman
95e6c5b474 Sync from Piper @327110949 
PROTOBUF_SYNC_PIPER
 2020-08-17 15:26:13 -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
Joshua Haberman
beeb621f50
Update protobuf version (#7557) 2020-05-26 15:46:39 -07:00
Joshua Haberman
6ad138d85a
Update protobuf version (#7535) 2020-05-20 10:54:29 -07:00
Joshua Haberman
9952e36f92
Merge release branch into master. (#7517) 
* Added background information about proto3 presence. (#7501)

* Fixed bug in map key sorting for Java TextFormat. (#7508)

Fixes: https://github.com/protocolbuffers/protobuf/issues/7505

* Update protobuf version

* Added a changelog entry about the Java fix. (#7516)
 2020-05-16 16:42:02 -07:00
Joshua Haberman
e90b71cdee Update protobuf version 2020-05-15 13:28:07 -07:00
Joshua Haberman
6ed738305b Sync from Piper @311396324 
PROTOBUF_SYNC_PIPER
 2020-05-13 13:46:15 -07:00