Adam Cozzette
878be3569e
Update protobuf version
2021-04-02 11:06:56 -07:00
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
Adam Cozzette
13fa25013a
Merge branch '3.15.x' into 3.15.x-202103031418
2021-03-03 14:29:11 -08:00
Adam Cozzette
fd8aabf32d
Update protobuf version
2021-03-03 11:37:48 -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
Elliotte Rusty Harold
c17e3c134c
Guava 30 ( #7991 )
2020-12-04 13:51:39 -08:00
Adam Cozzette
f3192d6128
Update protobuf version
2020-11-13 11:27:32 -08:00
Adam Cozzette
1b851b3fe6
Update protobuf version
2020-11-12 12:44:26 -08:00
Adam Cozzette
a8ab1fade9
Update protobuf version
2020-11-10 17:15:32 -08:00
Adam Cozzette
27100b40fd
Update protobuf version
2020-11-05 14:30:53 -08:00
dependabot[bot]
74de188815
Bump junit from 4.13 to 4.13.1 in /java
...
Bumps [junit](https://github.com/junit-team/junit4 ) from 4.13 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases )
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md )
- [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-10-22 14:43:37 -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
Adam Cozzette
1c587a8059
Updated version to 3.13.0-rc2
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
Joshua Haberman
9ce8c330e7
Updated version to 3.12.3 and updated CHANGES.txt. ( #7580 )
...
* Updated version to 3.12.3 and updated CHANGES.txt.
* Re-ran generate_descriptor_protos.sh and made it more parallel.
2020-06-01 13:36:50 -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
e90b71cdee
Update protobuf version
2020-05-15 13:28:07 -07:00
Joshua Haberman
f597a24627
Update protobuf version
2020-05-12 12:49:46 -07:00
Joshua Haberman
a9f11d7d64
Updated version to 3.12.0-rc1. ( #7449 )
2020-04-30 15:34:10 -07:00
Elliotte Rusty Harold
62832897c3
deps: update Guava to 29.0
...
@rafi-kamal
2020-04-14 15:19:40 -07:00
Rafi Kamal
0eb476b696
Merge branch 3.11.x to master
2020-02-18 16:42:47 -08:00
Rafi Kamal
c74057267d
Update protobuf version ( #7206 )
2020-02-12 14:41:16 -08:00
Rafi Kamal
345df38dd3
Update protobuf version ( #7143 )
2020-01-31 13:47:09 -08:00
Elliotte Rusty Harold
5e014c2ddf
Update JUnit and Truth ( #7149 )
2020-01-29 12:51:46 -08:00
Elliotte Rusty Harold
5a578d2a5c
deps: update guava to 28.2-android
2020-01-10 10:52:48 -08:00
Rafi Kamal
39492b68d8
Update protobuf version to 3.11.2 ( #7004 )
2019-12-10 17:50:28 -08:00
Rafi Kamal
b78c53f935
Update protobuf version to 3.11.1 ( #6972 )
2019-12-02 11:57:21 -08:00
Rafi Kamal
1d5375c621
Update protobuf version to 3.11.0 ( #6943 )
2019-11-25 15:12:00 -08:00
Rafi Kamal
6220db4ec4
Update protobuf version ( #6927 )
2019-11-21 19:10:04 -08:00
Rafi Kamal
cd7b27be38
Update protobuf version ( #6898 )
2019-11-19 15:32:13 -08:00
Rafi Kamal
3a505c2ded
Merge pull request #6744 from elharo/patch-5
...
Java: Update to Guava 28.1-android
2019-10-15 09:00:06 -07:00
Elliotte Rusty Harold
e7db3d35e4
Update to Guava 28.1-android
2019-10-08 15:44:46 -04:00
Rafi Kamal
2ed41359fe
Update version to 3.11.0-RC0
2019-10-03 14:24:27 -07:00
Jie Luo
2a4657971d
Update to 3.10.0-rc0 ( #6660 )
...
* Cherry pick changes on update_version.py #6643
* Update version to 3.10.0-rc-0
* Do not add rc0 to php packages.xml
2019-09-18 13:30:03 -07:00
Rafi Kamal
5021cd3419
Update protobuf version
2019-09-12 13:50:24 -07:00
Rafi Kamal
56bf637221
Update protobuf version
2019-09-05 09:47:52 -07:00
Elliotte Rusty Harold
e971944bfc
Update to Truth 1.0
2019-08-20 19:49:31 -04:00
Jie Luo
43156775be
Merge 3.9.x 201908071359 to master ( #6484 )
...
* Add changelog for 3.9.x
* Revert "Make php message class final to avoid mocking (#6277 )" (#6324 )
This reverts commit 7f84a94366
.
This is just temporary. Eventually, we still want to roll forward this
change. Some users are complaining they need more time to clean up their
code.
* Update extract_includes.bat.in
File io_win32.h is not in directory google\protobuf\stubs under directory google\protobuf\io
* Set oneof case in array constructor (#6351 )
Forgot to set it previously.
* Update protobuf version (#6366 )
* Drop building wheel for python 3.4 (#6406 )
https://github.com/matthew-brett/multibuild/pull/240
* Fix binary compatibility in FieldCodec factory methods (#6380 ) (#6424 )
* Fix binary compatibility in FieldCodec factory messages
* Make default value parameter for current factories required
* Route old methods through default value overloads
* Remove ExtensionRegistry.Add(params) overload
* Rename ExtensionRegistry.Add(IEnumerable<Extension>) overload to AddRange
* Edit naming of parameters in Extension classes
* * Fix add API warnings to docs for extension APIs
* Rename internal ExtensionSet.GetValue to TryGetValue
* Disable javadoc error (#6371 )
* Disable javadoc error
Actual fixes of the javadoc will be followed up
* Remove duplicated configuration
* Update javadoc plugin version
* Updated Bazel test script to use most recent Bazel version (#6413 ) (#6433 )
I'm not exactly sure why, but this fixes the failing Bazel presubmit
test. Using the most recent version seems like a good idea anyway so
that we can make sure we're compatible with any new Bazel changes.
* [bazel] Add fixes for --incompatible_load_{cc,java,proto}_rules_from_bzl
* No need to update version in generated code (#6471 )
generate_descriptor will handle that
* Update protobuf version (#6472 )
2019-08-09 13:21:18 -07:00
Elliotte Rusty Harold
17eca42734
Update guava
2019-07-02 12:03:34 -04:00
Hao Nguyen
638720274b
Update version to 3.9.0
2019-06-17 09:34:50 -07:00
Hao Nguyen
634d704d23
Merge branch '3.8.x' into 3.8.x-201905311515
2019-05-31 15:18:39 -07:00
Hao Nguyen
010320f780
Add dependency to truth in test
2019-05-31 07:54:53 -07:00
Hao Nguyen
b0d648664d
Update protobuf version
2019-05-21 14:07:13 -07:00
Hao Nguyen
2352a30e66
Revert "Update protobuf version"
...
This reverts commit 6d96493b31
.
2019-05-21 13:49:06 -07:00
Hao Nguyen
6d96493b31
Update protobuf version
2019-05-21 13:31:01 -07:00
Hao Nguyen
37a89f8e1a
Update version to 3.8.0
2019-04-23 16:14:52 -07:00
Hao Nguyen
ef1e8e7172
Add module for JavaLite and fix builds
2019-04-09 06:48:01 -07:00
Hao Nguyen
c163a2d1a4
Revert accidentally commit
2019-04-05 17:09:42 -07:00
Hao Nguyen
1eb049141e
Add module for JavaLite and fix builds
2019-04-05 16:55:34 -07:00
Adam Cozzette
8645d893ab
Merge branch '3.7.x' into merge-3-7-x
2019-03-26 14:32:20 -07:00
Paul Yang
6973c3a504
Update version number to 3.7.1 ( #5947 )
...
* Update version number to 3.7.1
* Update version number in port_def.inc
2019-03-26 09:30:12 -07:00
Bo Yang
cb6fa92ee8
Merge branch '3.7.x'
2019-03-04 10:18:18 -08:00
Paul Yang
582743bf40
Update version number to 3.7.0 ( #5793 )
...
* Update version number to 3.7.0
* Add php/releash.sh to Makefile.am
* Make cpp_distcheck exit on fail
2019-02-28 12:55:14 -08:00
Bo Yang
b52754b719
Update version to 3.7.0rc3
2019-02-22 11:31:48 -08:00
Paul Yang
c7b3392201
Update version to 3.7.0 ( #5749 )
...
* Update version to 3.7.0
* Update version number for java bom
2019-02-19 15:54:45 -08:00
Adam Cozzette
1ee15baefc
Updated version to 3.7.0rc2
2019-01-30 21:08:04 -08:00
Adam Cozzette
650915742d
Updated pom.xml files
...
The Nexus repository now seems to require SCM and developer information
to be present in the POM file.
2019-01-30 13:25:58 -08:00
Hao Nguyen
bc5154e27f
Update guava version
2019-01-24 13:46:19 -08:00
Hao Nguyen
329adbed0d
Update gauva version to 26
2019-01-24 13:40:43 -08:00
Hao Nguyen
d5be2baa46
Update version to 3.7.0
2019-01-24 10:23:02 -08:00
Hao Nguyen
4b02f652e0
Make sure to add a new line at the end of XML files
2018-12-14 15:10:11 -08:00
Hao Nguyen
9349e23827
Replace update_version shell script with a python script, which is much better at handling XML rewrite. Update the PHP version too. As part of rewrite, some XML file format will change a little, but the semantics is still the same so it should be okay.
2018-12-14 15:05:48 -08:00
Adam Cozzette
46a48e49aa
Merge pull request #5332 from acozzette/integrate
...
Integrated internal changes from Google
2018-11-12 13:55:00 -08:00
Elliotte Rusty Harold
398a47b90b
java: add BOM ( #5117 )
2018-11-12 11:31:42 -08:00
Adam Cozzette
dbc644fcf0
Updated guava-testlib version in pom.xml
2018-11-09 11:40:27 -08:00
Adam Cozzette
0894e07536
Integrated internal changes from Google
2018-11-09 11:28:22 -08:00
Elliotte Harold
feea49b5b5
remove obsolete parent
2018-10-02 07:11:47 -04:00
Elliotte Rusty Harold
bb3bff0cd4
update to Guava 20
2018-09-07 08:33:14 -04:00
Feng Xiao
afe98de32a
Replace repo links.
2018-08-22 11:55:30 -07:00
Adam Cozzette
9e1286b949
Updated version numbers to 3.6.1
2018-07-27 13:30:28 -07:00
Jisi Liu
45eb28b588
Update version number to 3.6.0
2018-05-14 16:06:22 -07: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
David Ostrovsky
019ceea4b3
Drop java 6 support
...
Fixes #4220 .
2018-01-25 06:54:38 +01:00
Jisi Liu
050fc9a437
Update version number to 3.5.1
2017-12-19 11:00:33 -08:00
Jisi Liu
97dd175a91
Update version number to 3.5.0
2017-11-02 14:16:22 -07:00
Jisi Liu
dba647a6b2
Bump version for minor release
2017-09-14 11:12:55 -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
Feng Xiao
c2b3b3e04e
Update Java version number and dependency.
2017-03-30 18:25:11 -07:00