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

571 Commits

Author SHA1 Message Date
Joshua Haberman
beeb621f50
Update protobuf version (#7557) 2020-05-26 15:46:39 -07:00
Joshua Haberman
0a737d8eb0 Sync from Piper @313142438 
PROTOBUF_SYNC_PIPER
 2020-05-26 00:26:15 -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
7276738e79
Fixed bug in map key sorting for Java TextFormat. (#7508) 
Fixes: https://github.com/protocolbuffers/protobuf/issues/7505
 2020-05-14 17:04:20 -07:00
Joshua Haberman
6ed738305b Sync from Piper @311396324 
PROTOBUF_SYNC_PIPER
 2020-05-13 13:46:15 -07:00
Joshua Haberman
f597a24627 Update protobuf version 2020-05-12 12:49:46 -07:00
Joshua Haberman
01e8c0fa34 Cherry-pick the fix to #7480 from #7485. 2020-05-12 11:34:02 -07:00
Joshua Haberman
6b5fb807c0 Sync from Piper @310858019 
PROTOBUF_SYNC_PIPER
 2020-05-11 00:12:20 -07:00
Joshua Haberman
a9f11d7d64
Updated version to 3.12.0-rc1. (#7449) 2020-04-30 15:34:10 -07:00
Joshua Haberman
32e5deb1ac Sync from Piper @308829107 
PROTOBUF_SYNC_PIPER
 2020-04-28 08:40:38 -07:00
Joshua Haberman
bb30225f06 Sync from Piper @307316823 
PROTOBUF_SYNC_PIPER
 2020-04-19 18:01:44 -07:00
Joshua Haberman
c649397029
Set execute bit on files if and only if they begin with (#!). (#7347) 
* Set execute bit on files if and only if they begin with (#!).

Git only tracks the 'x' (executable) bit on each file. Prior to this
CL, our files were a random mix of executable and non-executable.
This change imposes some order by making files executable if and only
if they have shebang (#!) lines at the beginning.

We don't have any executable binaries checked into the repo, so
we shouldn't need to worry about that case.

* Added fix_permissions.sh script to set +x iff a file begins with (#!).
 2020-04-01 15:28:25 -07:00
Joshua Haberman
b99994d994 Sync from Piper @304070343 
PROTOBUF_SYNC_PIPER
 2020-03-31 16:25:37 -07:00
Rafi Kamal
0eb476b696 Merge branch 3.11.x to master 2020-02-18 16:42:47 -08:00
Yannic
f0cb9cdb95
[bazel] Move Java runtime/toolchains into //java (#7190) 
* [bazel] Move Java runtime/toolchains into //java

This change moves `java_library` targets from the top-level BUILD file
into `//java/{core,lite,util}` and declares `alias` targets to point to
their new locations (hence, this is not a breaking change).

This will allow users that don't use Java to stop depending on
`@rules_java` (e.g. as requested in
https://github.com/bazelbuild/rules_scala/pull/989#issuecomment-583405161).

Note that there is no intention to deprecate + remove the top-level
targets in the foreseeable future.

* Add BUILD files in //java to java_EXTRA_DIST
 2020-02-13 13:04:14 -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
47434eb43d
deps: update errorprone to 2.3.4 (#7125) (#7157) 2020-01-31 09:43:24 -08:00
Elliotte Rusty Harold
5e014c2ddf
Update JUnit and Truth (#7149) 2020-01-29 12:51:46 -08:00
Elliotte Rusty Harold
a62ee83401 deps: update errorprone to 2.3.4 (#7125) 
deps: update errorprone to 2.3.4
 2020-01-28 12:16:17 -08:00
Elliotte Rusty Harold
5a578d2a5c deps: update guava to 28.2-android 2020-01-10 10:52:48 -08:00
Rafi Kamal
ed8688de72
Merge pull request #7064 from rafi-kamal/3.11.x-202001071136 
Merge branch 3.11.x to master
 2020-01-08 12:24:20 -08:00
Brian Wignall
a104dffcb6 Fix typos (#7050) 
Uses https://en.wikipedia.org/wiki/Wikipedia:Lists_of_common_misspellings/For_machines to find likely typos, with https://github.com/bwignall/typochecker to help automate the checking.
 2020-01-08 10:18:20 -08:00
Rafi Kamal
4500f31a6a Merge branch 3.11.x to master 2020-01-07 11:52:29 -08:00
Rafi Kamal
39492b68d8
Update protobuf version to 3.11.2 (#7004) 2019-12-10 17:50:28 -08:00
Elliotte Rusty Harold
4457b1f290 Update to 3.11.0 in docs 
@haberman
 2019-12-05 10:36:57 -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
3cc55d6167
Update protobuf version (#6898) 2019-11-15 17:44:10 -08:00
Rafi Kamal
58d4420e2d Down Integrate Internal Changes 2019-11-12 13:38:58 -08:00
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
Hao Nguyen
88339fa7f8 Down integrate to GitHub 2019-05-21 16:02:13 -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
fcfc47d405
Merge pull request #6151 from haon4/201905171200 
Down Integrate to GitHub
 2019-05-20 10:26:25 -07:00
Hao Nguyen
66540237ca Down integrate to GitHub 2019-05-17 12:01:17 -07:00
Yilun Chong
b4f193788c
Merge pull request #6115 from haon4/javalite_doc 
Update instruction on how to use JavaLite runtime
 2019-05-14 18:04:33 -07:00
Hao Nguyen
166652fc6f
Merge pull request #6127 from haon4/201905131051 
Down integrate to GitHub
 2019-05-13 17:00:12 -07:00
Hao Nguyen
a1c8868344 Down integrate to GitHub 2019-05-13 10:52:29 -07:00
Per Lundberg
2bb7c278c2 Fix typo 2019-05-10 11:10:27 -07:00
Hao Nguyen
cf9fe7259b Update instruction on how to use JavaLite runtime 2019-05-08 17:05:58 -07:00
Hao Nguyen
1d4e959374 Down integrate to GitHub 2019-05-03 14:33:43 -07:00
Hao Nguyen
c3721151ed
Merge pull request #6088 from haon4/201904301530 
Down integrate to GitHub
 2019-05-01 14:31:56 -07:00
Hao Nguyen
76b4b4b331 Down integrate to GitHub 2019-04-30 15:30:49 -07:00
Hao Nguyen
a80431a0a0 Remove unused files from lite's pom.xml 2019-04-29 10:43:39 -07:00
Hao Nguyen
598a6da287 Remove unused files from lite's pom.xml 2019-04-26 16:12:22 -07:00
Hao Nguyen
1b3c0e418e Update java lite version 2019-04-23 17:04:16 -07:00
Hao Nguyen
37a89f8e1a Update version to 3.8.0 2019-04-23 16:14:52 -07:00
Hao Nguyen
711e4b4d6c Down integrate to GitHub 2019-04-22 17:12:12 -07:00
Hao Nguyen
9e3f053fcc Down integrate to GitHub 2019-04-17 12:57:37 -07:00
Hao Nguyen
92e824e505 Add a link to the older version of JavaLite 2019-04-09 15:07:44 -07:00
Hao Nguyen
1da2a67429 Update documentation for JavaLite 2019-04-09 13:07:25 -07:00
Hao Nguyen
ef1e8e7172 Add module for JavaLite and fix builds 2019-04-09 06:48:01 -07:00
Hao Nguyen
6dc9832aab Merge branch 'master' of https://github.com/protocolbuffers/protobuf into sync201904090622 2019-04-09 06:25:48 -07:00
Hao Nguyen
176f7db11d Down integrate to Github 2019-04-09 06:23:32 -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
Hao Nguyen
86bc27d220 Merge branch 'master' of https://github.com/protocolbuffers/protobuf 2019-04-05 16:41:24 -07:00
Hao Nguyen
a48a574f7e Down integrate to Github 2019-04-05 16:39:18 -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
Hao Nguyen
81567d89a9 Merge branch 'contributing' of https://github.com/haon4/protobuf into contributing 2019-03-20 11:46:11 -07:00
Hao Nguyen
2f864fdfdf Down integrate to Github 2019-03-20 11:45:01 -07:00
Joe Bolinger
5e0812d4b1 Allow Java reserved keywords to be used in extensions (#5709) 
* add check for reserved keywords in extensions

* add all reserved keywords

* use string without std::

* add test and update name in lite version

* test updates
 2019-03-20 09:50:04 -07:00
Hao Nguyen
d0f91c863a
Down integrate to Github (#5839) 
* Down integrate to github
 2019-03-06 12:39:12 -08: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
Yilun Chong
429d2ae19f
Merge branch 'master' into integration 2019-02-24 17:17:17 -08:00
Bo Yang
b52754b719 Update version to 3.7.0rc3 2019-02-22 11:31:48 -08:00
Yilun Chong
d8c2501b43 down integration from internal 2019-02-22 18:13:33 +08:00
Xiang Dai
e479410564 delete all duplicate empty blanks (#5758) 
Signed-off-by: Xiang Dai <764524258@qq.com>
 2019-02-20 19:28:50 -08:00
Dalvin
c691c4cbfa Enhance java-lite documentation (#5743) 2019-02-20 19:24:37 -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
776b3a8b11 Fixed infinite recursion problem with Java GeneratedMessageV3 (#5657) 
GeneratedMessageV3#setUnknownFieldsProto3 was trying to delegate to
setUnknownFields but was inadvertently resulting in infinite recursion.
This commit makes setUnknownFields and setUnknownFieldsProto3 delegate
to a common private method to fix the problem and avoid confusion.
 2019-02-01 11:27:19 -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
Adam Cozzette
0e3f1f4ad7 Fixed Javadoc errors 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
7187cfd275 Update version number in java/bom/pom.xml 2019-01-24 11:20:14 -08:00
Hao Nguyen
d5be2baa46 Update version to 3.7.0 2019-01-24 10:23:02 -08:00
Yilun Chong
0adb74c2d3 Down-integrate internal changes to github. (#5555) 
* Down-integrate internal changes to github.

* fix python conformance test

* fix csharp conformance test

* add back java map_lite_test.proto's optimize for option

* fix php conformance test
 2019-01-08 15:06:30 -08:00
Bo Yang
f8fc10df1c Revert change to map_lite_test.proto 2018-12-20 15:59:06 -08:00
Bo Yang
624a40a387 Down-integrate internal changes to github. 2018-12-20 14:21:20 -08:00
Paul Yang
cecba296b8
Down-integrate internal changes (#5467) 
* Down-integrate internal changes

* Update generated code for php, objc and csharp.

* Add missing dependency in conformance_php
 2018-12-14 16:05:03 -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
Hao Nguyen
6cb87bd157 Use docker for csharp, java_compatibility, and python_compatibility. Remove prepare_build_linux_rc that is no longer needed. 2018-12-13 15:20:25 -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
c81b4202d1 Fixed Java tests 2018-11-09 11:40:27 -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
Adrián Nieto Rodríguez
31d6b4e30e Fix Javadoc typo (#5280) 2018-10-22 14:05:32 -07:00
Elliotte Harold
feea49b5b5 remove obsolete parent 2018-10-02 07:11:47 -04:00
Feng Xiao
3bf0245fd2
Merge pull request #5122 from elharo/guava20 
update to Guava 20
 2018-09-10 13:46:38 -07:00
Joshua Haberman
f9d8138376
Merge pull request #5109 from haberman/integrate 
Down-integrate from google3.
 2018-09-07 16:15:38 -07:00
Josh Haberman
4049a24f2b Reverted changes to map_lite_test.proto. 2018-09-07 09:43:14 -07:00
Elliotte Rusty Harold
bb3bff0cd4 update to Guava 20 2018-09-07 08:33:14 -04:00
Kyle Krueger
21ebeed20a
Update README.md with gradle instructions for java 2018-09-06 09:43:26 +02:00
Josh Haberman
d61aede89c Down-integrate from google3. 2018-09-04 10:58:54 -07:00
Elliotte Harold
259331566b update version 2018-08-27 21:54:07 -04:00
Feng Xiao
afe98de32a Replace repo links. 2018-08-22 11:55:30 -07:00
Feng Xiao
acd5b05e9f Fix failing tests. 
1. Fix C++ tests.
  * Add missing files to Makefile.am and fix distcheck in tests.sh
  * Remove BUILT_SOURCES from conformance/Makefile.am.
  * Add some missing override keyword.
  * Add a type cast to int64 because our StrCat() in stubs can't handle size_t.
2. Fix Java tests.
  * Add missing test dependency on guava in pom.xml.
  * Include newly referenced test data in test resources.
  * Manually fix map_lite_test.proto which is overwritten because it's mapped
    from map_test.proto in google3.
  * Add back "optimize_for = LITE_RUNTIME" which is still needed to keep the
    opensource test passing as it's still running lite tests.
  * Add a type cast in newBuilder() because without it the code doesn't compile
    with openjdk javac 1.8 (the compiler can't figure if it's the right type
    due to complex generic typing).
3. Fix Python tests.
  * Remove/replace references to <hash_map>.
  * Suppress more warnings in setup.py.
  * Replace incorrect header inclusion for google/protobuf/proto_api.h.
  * Add strings::EndsWith to google/protobuf/stubs/strutil.h because it's
    referenced in the updated python C extension code.
  * Replace proto2 with google::protobuf. The proto2 name is leaked to
    opensource because we removed the subsitition rule for proto2 namespace
    but only fixed C++ source code and forgot to update python C extension code.
 2018-08-09 21:21:01 -07:00
Feng Xiao
a8465b738e Merge master branch. 2018-08-08 17:14:42 -07:00
Feng Xiao
6bbe197e9c Down-integrate from google3. 2018-08-08 17:00:41 -07:00
Aleksej Kazmin
5ddc6874e4
Fix typo in FieldMaskTree.java warning 2018-08-07 17:46:34 +03:00
Adam Cozzette
94d55e5292 Merge branch '3.6.x' into merge-3-6-x 2018-08-01 13:44:55 -07:00
vijay-bhatt
0f56f27ffc Ignore unknown enum received in json when ignoreUnknownFields flag is set (#4825) 
* Ignore unknown enum received in json when ignoreUnknownFields flag is set.
 2018-07-30 13:36:46 -07:00
Adam Cozzette
9e1286b949 Updated version numbers to 3.6.1 2018-07-27 13:30:28 -07:00
Jonathan Haber
964201af37 Store the class object itself (#4927) 
* Store the class object itself

* Add test for backwards compatibility

* Rename and add test

* Add comments
 2018-07-23 13:45:22 -07:00
Adam Cozzette
82d3d7d250 Merge branch '3.6.x' into merge-3-6-x 2018-06-25 13:22:10 -07:00
Feng Xiao
4fda0f783b
Merge pull request #2811 from Dunemaster/master 
Java: Mark sun.misc dependency as optional
 2018-06-11 15:36:05 -07:00
Jisi Liu
45eb28b588 Update version number to 3.6.0 2018-05-14 16:06:22 -07:00
Anuraag Agrawal
92ac1ed6a5 Remove unsafe no-copy String allocation since it's not useful in recent Java versions. 2018-05-11 14:27:31 +09: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
Adam Cozzette
ec57f511c1 Added map_lite_test.proto to fix LiteTest 2018-03-20 14:44:30 -07:00
Adam Cozzette
0400cca323 Integrated internal changes from Google 2018-03-13 16:37:29 -07:00
David Ostrovsky
019ceea4b3 Drop java 6 support 
Fixes #4220.
 2018-01-25 06:54:38 +01:00
kenji yoshida
1c3b20b122
fix typo in FieldMaskTree.java comment 2018-01-22 00:09:36 +09:00
Jisi Liu
383a4941d5 Merge remote-tracking branch 'origin/3.5.x' into master 2018-01-03 09:28:40 -08:00
Jisi Liu
050fc9a437 Update version number to 3.5.1 2017-12-19 11:00:33 -08:00
Jisi Liu
22e1cfd84a Add deprecation annotation for oneof case. 2017-12-13 14:09:50 -08:00
Adam Cozzette
0ba8eea655 Merge branch 'master' into down-integrate 2017-12-01 10:05:19 -08:00
Adam Cozzette
92a7e778e7 Integrated internal changes from Google 2017-12-01 10:05:10 -08:00
Adam Cozzette
a27da09339 Merge branch '3.5.x' into 3.5.x-merge 2017-11-30 13:34:51 -08:00
Anuraag Agrawal
3e944aec9e Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer. 2017-11-29 15:44:58 +09:00
Jisi Liu
97dd175a91 Update version number to 3.5.0 2017-11-02 14:16:22 -07:00
Jisi Liu
a08b03d4c0 Add missing files 2017-10-26 13:48:53 -07:00
Jisi Liu
cdc0d9536a Merge remote-tracking branch 'origin/3.4.x' into master 2017-10-25 14:43:07 -07:00
Jisi Liu
ca6187d5e7 Merge pull request #3578 from pherl/filedeprecation 
Add @Deprecated annotation support for proto file.
 2017-10-18 15:33:31 -07:00
Jisi Liu
1a7a7fca80 Merge from google internal 2017-10-18 12:22:18 -07:00
Jisi Liu
de15e73d58 Merge remote-tracking branch 'origin/3.4.x' into master 2017-10-11 14:44:03 -07:00
Jisi Liu
dba647a6b2 Bump version for minor release 2017-09-14 11:12:55 -07:00
Adam Cozzette
13fd045dbb Integrated internal changes from Google 2017-09-14 10:03:57 -07:00
Jisi Liu
f9b81690f5 Add TODO 2017-08-31 11:24:05 -07:00
Jisi Liu
baae7ea12b Add @Deprecated annotation support for proto file. 2017-08-31 10:49:58 -07:00
Jisi Liu
139775ccc0 Merge remote-tracking branch 'origin/3.4.x' into mergemaster 2017-08-18 16:25:35 -07:00
alanbur
a68a8004b5 PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLong 2017-08-08 11:56:36 +01:00
Jisi Liu
9b8f6589f2 Remove dependency on guava 20 2017-07-25 13:46:17 -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
Jisi Liu
09354db143 Merge from Google internal for 3.4 release 2017-07-18 15:38:30 -07:00
Bo Yang
6ec0b7e4d1 Merge 3.3.x into master 2017-07-18 11:06:16 -07:00
Bo Yang
e7bcfc4241 Update version number to 3.3.2 2017-06-21 10:20:34 -07:00
Feng Xiao
129a6e2aca Revert guava depedency to version 19. 2017-05-12 15:29:08 -07:00