Joshua Haberman
f80137c46d
Merge branch 'main' into merge-to-main
2022-04-22 02:44:36 +00:00
Joshua Haberman
296c1fdaff
Update protobuf version ( #9820 )
...
* Update protobuf version
* Updated Makefile.am for composer.json move.
2022-04-20 16:00:42 -07:00
David L. Jones
9e09343a49
Sync from Piper @441896533
...
PROTOBUF_SYNC_PIPER
2022-04-14 17:36:14 -07:00
mkruskal-google
85aa87cbc9
Merge 3.20.1-rc1 into main ( #9760 )
...
* Fix NPE during encoding and add regression test for issue 9507.
(cherry picked from commit 58e320a732#9677 )
All synthetic methods implemented by `method_missing` are now supported by `respond_to?`.
Fixes issue #9202 .
* Fix null pointer exceptions exposed by new regression tests.
* Fix clear_ on oneofs so that it is safe to call repeatedly and so that respond_to? does not depend on whether the oneof is currently cleared.
* Code cleanup: reenable more tests on JRuby.
* Align JRuby behavior with CRuby by throwing a RuntimeError when attempting to assign to a oneof.
(cherry picked from commit 8e7f936696#9727 from mlocati/build-packaged-php-extension
Fix building packaged PHP extension
(cherry picked from commit 7f9901c5f6
2022-04-07 18:33:58 -04:00
Mike Kruskal
a29e0e3f44
Sync from Piper @439400376
...
PROTOBUF_SYNC_PIPER
2022-04-04 13:42:37 -07:00
Mike Kruskal
d24edbca53
Update protobuf version
2022-04-04 11:13:56 -07:00
Darly Paredes
25045e3f69
Update protobuf version
2022-03-25 19:20:51 +00:00
theodorerose
ebfa0d345e
Update protobuf version
2022-03-15 21:12:45 +00:00
Adam Cozzette
b20209f321
Sync from Piper @acozzette/proto_github_202203101748
...
PROTOBUF_SYNC_PIPER
2022-03-10 18:36:42 +00:00
Adam Cozzette
88a18db91e
Update protobuf version
2022-03-04 09:52:19 -08:00
Adam Cozzette
f7232f2aa3
Replace EasyMock dependency with Mockito and re-pin Bazel deps
2022-03-02 19:27:59 +00:00
Adam Cozzette
76398dab31
Sync from Piper @431959314
...
PROTOBUF_SYNC_PIPER
2022-03-02 17:37:55 +00:00
David L. Jones
1ba1d73e0d
Sync from Piper @429333699
...
PROTOBUF_SYNC_PIPER
2022-02-17 09:53:51 -08:00
Joshua Haberman
06196e9b4c
Merge tag 'refs/tags/sync-piper' into sync-stage
2022-02-08 20:53:32 -08:00
Joshua Haberman
dce403a8b3
Sync from Piper @427369078
...
PROTOBUF_SYNC_PIPER
2022-02-08 20:53:31 -08:00
Deanna Garcia
ab4585a695
Sync from Piper @425656941
...
PROTOBUF_SYNC_PIPER
2022-02-01 18:24:53 +00:00
Adam Cozzette
18521f6055
Merge branch '3.19.x' into merge-3.19.x
2022-01-28 17:42:21 +00:00
Adam Cozzette
22d0e265de
Update protobuf version for 3.19.4 ( #9449 )
...
I also updated the PHP release notes in
php/ext/google/protobuf/package.xml.
2022-01-27 19:35:56 -08:00
Deanna Garcia
6e8b0dfcbf
Switch to java_test
2022-01-20 22:24:59 +00:00
Deanna Garcia
01f09b3425
Fixing bazel build failure
2022-01-13 00:29:28 +00:00
Deanna Garcia
7924cd6726
Addressing comments
2022-01-13 00:10:23 +00:00
Deanna Garcia
ab7cf573ab
Remove unfinished release work and make names consistent
2022-01-12 21:58:46 +00:00
Deanna Garcia
dfd99e7ec0
Adding kotlin bazel tests
2022-01-12 21:54:30 +00:00
Adam Cozzette
cc7b1b5323
Update protobuf version
2022-01-10 18:08:15 -08:00
Adam Cozzette
eb94f17a8b
Update protobuf version
2022-01-05 10:05:11 -08:00
Adam Cozzette
7c40b2df1f
Update protobuf version ( #9167 )
2021-10-28 14:07:53 -07:00
Adam Cozzette
17b30e9647
Update protobuf version ( #9119 )
2021-10-20 10:14:02 -07:00
Adam Cozzette
3f3e6f47c6
Update version to 3.19.0-rc2 and fix changelog about Java 7 ( #9116 )
...
* Update protobuf version
* Update CHANGES.txt to reflect that we're not yet dropping Java 7
2021-10-19 09:01:57 -07:00
Adam Cozzette
519340d662
Update protobuf version ( #9106 )
2021-10-15 14:33:06 -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
Joshua Haberman
2128ce074f
Merge branch '3.18.x' into merge-release
2021-09-27 15:29:06 -07:00
Paul Yang
12fb2b7450
Update protobuf version ( #8973 )
...
* Update protobuf version
* Update php notes
2021-09-13 12:34:03 -07:00
Bo Yang
d8f55782b0
Update protobuf version
2021-08-27 14:39:58 -07:00
Adam Cozzette
4eed0dab5a
Sync from Piper @392076391
...
PROTOBUF_SYNC_PIPER
2021-08-20 15:05:53 -07:00
Paul Yang
7cbc08615f
Update protobuf version ( #8887 )
2021-08-18 17:20:20 -07:00
Adam Cozzette
5d03f8c8a5
Merge tag 'refs/tags/sync-piper' into sync-stage
2021-08-03 12:25:42 -07:00
Adam Cozzette
562fc946c7
Sync from Piper @388508285
...
PROTOBUF_SYNC_PIPER
2021-08-03 11:58:05 -07:00
Damon Cai
a420f23d4c
Remove JvmField annotations from Kotlin private properties ( #8804 ) ( #8811 )
2021-07-13 15:25:00 -07:00
Deanna Garcia
367851d124
Update protobuf version
2021-06-04 21:21:39 +00:00
Deanna Garcia
0717715ae9
Removing more from the pom
2021-06-04 21:14:15 +00:00
Deanna Garcia
5330d0d5da
Updating pom files
2021-06-04 20:47:49 +00:00
Deanna Garcia
50a317556a
Fixing merge conflict
2021-06-02 22:31:51 +00:00
Deanna Garcia
506f2273d1
Merging 3.17.x branch into master
2021-06-02 22:29:40 +00:00
Adam Cozzette
d2f6d9b721
Merge pull request #8650 from acozzette/merge-3.17.x
...
Merge 3.17.x into master
2021-05-27 08:05:54 -07:00
Deanna Garcia
5b8208ecea
Update protobuf version
2021-05-25 19:36:05 +00:00
Deanna Garcia
021329b7e7
resolving conflicts
2021-05-25 17:27:07 +00:00
Joshua Haberman
9521803d40
Sync from Piper @375548932
...
PROTOBUF_SYNC_PIPER
2021-05-24 13:49:39 -07:00
