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

388 Commits

Author SHA1 Message Date
Rafi Kamal
3fa17ca0bd
Merge pull request #6811 from elharo/guava 
Update GSON and errorprone
 2019-10-29 11:49:09 -07:00
Elliotte Rusty Harold
ed69e88695 update error_prone and gson 2019-10-28 07:09:46 -04:00
Elliotte Rusty Harold
82db4520a1
Update to 3.10.0 in docs 2019-10-28 06:57:39 -04:00
Rafi Kamal
342a2d627c
Merge pull request #6752 from rafi-kamal/201910111201 
Down integrate Google3 changes to Github
 2019-10-24 12:03:05 -07:00
Donald Chai
175ddfc175 Add com.google.truth as test dependencies 
This goes hand-in-hand with other dependencies like junit, but seems to
only have been used from util/pom.xml.
 2019-10-22 20:03:51 -07: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
Rafi Kamal
27c1defe35
Merge branch 'master' into 201910111201 2019-10-11 12:07:38 -07:00
Rafi Kamal
6c92f9dff1 Down integrate to GitHub 2019-10-11 12:05:46 -07:00
Rafi Kamal
d8e678aae4
Merge pull request #6728 from protocolbuffers/3.10.x-merge 
Merge 3.10.x with master and increment the version number
 2019-10-10 16:56:19 -07:00
Elliotte Rusty Harold
e7db3d35e4
Update to Guava 28.1-android 2019-10-08 15:44:46 -04:00
Rafi Kamal
7efcc0466c
Change Protobuf BOM license from Apache to BSD 2019-10-07 15:11:37 -07:00
Rafi Kamal
000a8d0902 Removed unnecessary conflict files 2019-10-03 14:38:13 -07:00
Rafi Kamal
2ed41359fe Update version to 3.11.0-RC0 2019-10-03 14:24:27 -07:00
Rafi Kamal
97c7c3fc97 Merge 3.10.x to master 2019-10-03 14:03:38 -07:00
Elliotte Rusty Harold
e157c5b9be
Update to 3.9.2 
3.9.2 is on the Githib releases page.
 2019-09-26 13:14:38 -04: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
Paul Yang
763c358874
Down Integrate Internal Changes (#6634) 
* Down integrate to GitHub

* Remove unintentional double assign

* Change ByteCountInt64 to int64_t

* Revert changes in binary_conformance_test.cc

* Revert unnecessary changes
 2019-09-12 11:03:27 -07:00
Rafi Kamal
63fc281046 Update protobuf version 2019-09-05 10:15:17 -07:00
Rafi Kamal
56bf637221 Update protobuf version 2019-09-05 09:47:52 -07:00
Rafi Kamal
bc1773c42c
Merge pull request #6568 from ennerf/add-jigsaw-module-name 
Java: Add Automatic-Module-Name entries to the Manifest
 2019-08-30 13:56:17 -07:00
Elliotte Rusty Harold
22f054ac00
Update version number 2019-08-30 09:42:28 -04:00
Florian Enner
405b618a2c
added manifest entries to set jigsaw module names 2019-08-26 16:10:45 +02:00
Rafi Kamal
1be79eefd5
Merge pull request #6557 from elharo/patch-3 
Update versions to 3.9.1
 2019-08-23 15:12:38 -07:00
Rafi Kamal
2228af689f
Merge pull request #6556 from rafi-kamal/201908221610 
Down integrate internal changes to GitHub
 2019-08-22 22:04:52 -07:00
Elliotte Rusty Harold
2048a6f442
Update versions to 3.9.1 2019-08-22 20:36:31 -04:00
Rafi Kamal
4f02f056b5 Down integrate to GitHub 2019-08-22 17:33:01 -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
Jie Luo
d1eeb852fc
compatibility test between last released and current for java python php (#6441) 
* compatibility tests between last released and the current version
 2019-07-31 17:49:26 -07:00
Paul Yang
7bff8393ca
Down Integrate to GitHub (#6414) 
* Down integrate to GitHub

* Fix broken tests
 2019-07-19 14:49:01 -07:00
Hao Nguyen
fc9fd4d437
Merge pull request #6331 from elharo/patch-2 
Update guava
 2019-07-10 13:55:11 -06:00
Hao Nguyen
a387c1025e
Merge pull request #6330 from elharo/patch-1 
Update gson
 2019-07-10 13:48:14 -06:00
Elliotte Rusty Harold
4b21abdef3
Update version in README 
to 3.8.0
 2019-07-08 10:12:19 -04:00
Elliotte Rusty Harold
17eca42734
Update guava 2019-07-02 12:03:34 -04:00
Elliotte Rusty Harold
6ae7391b1f
Update gson 2019-07-02 12:02:35 -04:00
Hao Nguyen
51026d9229 Down integrate to GitHub 2019-06-26 11:01:34 -07:00
Bo Yang
d581c76063 Merge branch 'master' into 3.9.x 
Conflicts:
	java/lite/pom.xml
	java/util/pom.xml
 2019-06-21 20:31:00 +00:00
Bo Yang
bc742640ef Merge remote-tracking branch 'origin/3.8.x' 2019-06-21 04:01:45 +00:00
Hao Nguyen
0eb0aa5dc9
Merge pull request #6246 from JLLeitschuh/patch-1 
Compatibility tests pull artifacts over HTTPS
 2019-06-20 11:17:22 -07:00
Hao Nguyen
e992abd1f8
Merge pull request #6177 from cgrushko/master 
Add `protobuf_java_lite` Bazel target
 2019-06-20 11:15:08 -07:00
Hao Nguyen
8ccdc44dde Update GSON version 2019-06-17 13:20:44 -07:00
Hao Nguyen
638720274b Update version to 3.9.0 2019-06-17 09:34:50 -07:00
Jonathan Leitschuh
8147e7db8a
Compatibility tests pull artifacts over HTTPS 2019-06-11 22:23:37 -04:00
Hao Nguyen
09cab821a9 Down integrate to GitHub 2019-06-11 16:00:16 -07:00
Hao Nguyen
005a5e3731 Fix JavaLite version 2019-06-09 05:48:34 -07:00
Carmi Grushko
5c25f41423 Add protobuf_java_lite Bazel target 
that builds the JavaLite runtime.

Contents based on java/lite/pom.xml.
 2019-06-01 12:08:53 +03: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
044c766fd4 Down integrate to GitHub 2019-05-30 13:31:15 -07:00