aboutsummaryrefslogtreecommitdiff
path: root/java/util
Commit message (Collapse)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-042-30/+24
|
* Merge master branch.Feng Xiao2018-08-084-7/+65
|\
| * Fix typo in FieldMaskTree.java warningAleksej Kazmin2018-08-071-1/+1
| |
| * Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-011-1/+1
| |\
| | * Updated version numbers to 3.6.1Adam Cozzette2018-07-271-1/+1
| | |
| * | Ignore unknown enum received in json when ignoreUnknownFields flag is set ↵vijay-bhatt2018-07-302-6/+63
| |/ | | | | | | | | (#4825) * Ignore unknown enum received in json when ignoreUnknownFields flag is set.
* / Down-integrate from google3.Feng Xiao2018-08-086-54/+132
|/
* Update version number to 3.6.0Jisi Liu2018-05-141-1/+1
|
* Merge branch (#4466)Paul Yang2018-04-021-1/+1
| | | | | | | | * Fix setup.py for windows build. * Bump version number to 3.5.2 * Cat the test-suite.log on errors for presubits
* fix typo in FieldMaskTree.java commentkenji yoshida2018-01-221-1/+1
|
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-1/+1
|\
| * Update version number to 3.5.1Jisi Liu2017-12-191-1/+1
| |
* | Merge branch 'master' into down-integrateAdam Cozzette2017-12-011-1/+1
|\|
| * Update version number to 3.5.0Jisi Liu2017-11-021-1/+1
| |
* | Integrated internal changes from GoogleAdam Cozzette2017-12-013-13/+70
|/
* Merge from google internalJisi Liu2017-10-182-2/+12
|
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-111-1/+1
|\
| * Bump version for minor releaseJisi Liu2017-09-141-1/+1
| |
* | Integrated internal changes from GoogleAdam Cozzette2017-09-141-1/+2
|/
* Remove dependency on guava 20Jisi Liu2017-07-252-14/+10
|
* Update version number for 3.4.0Jisi Liu2017-07-241-1/+1
|
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-185-6/+35
|
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-274-90/+227
|\
| * Update Java version number and dependency.Feng Xiao2017-03-301-1/+1
| |
| * Fix Java build.Feng Xiao2017-03-292-3/+4
| |
| * Down-integrate from google3.Feng Xiao2017-03-293-89/+225
| |
* | Allow unknown values for Map put*Value methods just like every other enum ↵Anuraag Agrawal2017-04-071-3/+1
| | | | | | | | mutation method.
* | Merge pull request #2937 from anuraaga/dev_rag2Adam Cozzette2017-04-061-5/+15
|\ \ | | | | | | Fix duplicate fields test and Any test. The repeated version is passing because nu…
| * | Fix test for unexpected type url when parsing Any. Currently, the test fails ↵Anuraag Agrawal2017-04-051-1/+1
| | | | | | | | | | | | since TestAllTypes doesn't have field '@type', which is the same test as testUnknownFields.
| * | Fix duplicate fields test. The repeated version is passing because null ↵Anuraag Agrawal2017-04-041-4/+14
| |/ | | | | | | | | | | values in a repeated field are rejected and not testing what it wanted to. Also adds a oneof version that verifies the case of oneof fields of different names (currently only same name check seems to be tested). Also fix spelling of a test.
* / Fix error message for int64 parse error.Anuraag Agrawal2017-04-031-1/+1
|/
* Remove duplicated copyright statementprehistoric-penguin2017-03-161-30/+0
|
* Merge pull request #2818 from xfxyjwf/i1470Feng Xiao2017-03-102-3/+52
|\ | | | | Don't expose gson exceptions in JsonFormat.
| * Don't expose gson exceptions in JsonFormat.Feng Xiao2017-03-092-3/+52
| |
* | Make JsonFormat locale independent.Feng Xiao2017-03-082-4/+11
|/
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Down-integrate internal changes to github. * Update conformance test failure list. * Explicitly import used class in nano test to avoid random test fail. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * maps_test.js: check whether Symbol is defined before using it (#2524) Symbol is not yet available on older versions of Node.js and so this test fails with them. This change just directly checks whether Symbol is available before we try to use it. * Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up * Updated Makefile.am to fix out-of-tree builds * Added Bazel genrule for generating well_known_types_embed.cc In pull request #2517 I made this change for the CMake and autotools builds but forgot to do it for the Bazel build. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * Add new js file in extra dist. * Bump version number to 3.2.0 * Fixed issue with autoloading - Invalid paths (#2538) * PHP fix int64 decoding (#2516) * fix int64 decoding * fix int64 decoding + tests * Fix int64 decoding on 32-bit machines. * Fix warning in compiler/js/embed.cc embed.cc: In function ‘std::string CEscape(const string&)’: embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < str.size(); ++i) { ^ * Fix include in auto-generated well_known_types_embed.cc Restore include style fix (e3da722) that has been trampled by auto-generation of well_known_types_embed.cc * Fixed cross compilations with the Autotools build Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed. * Minor fix for autocreated object repeated fields and maps. - If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list. * Fix generation of extending nested messages in JavaScript (#2439) * Fix generation of extending nested messages in JavaScript * Added missing test8.proto to build * Fix generated code when there is no namespace but there is enum definition. * Decoding unknown field should succeed. * Add embed.cc in src/Makefile.am to fix dist check. * Fixed "make distcheck" for the Autotools build To make the test pass I needed to fix out-of-tree builds and update EXTRA_DIST and CLEANFILES. * Remove redundent embed.cc from src/Makefile.am * Update version number to 3.2.0-rc.1 (#2578) * Change protoc-artifacts version to 3.2.0-rc.1 * Update version number to 3.2.0rc2 * Update change logs for 3.2.0 release. * Update php README * Update upb, fixes some bugs (including a hash table problem). (#2611) * Update upb, fixes some bugs (including a hash table problem). * Ruby: added a test for the previous hash table corruption. Verified that this triggers the bug in the currently released version. * Ruby: bugfix for SEGV. * Ruby: removed old code for dup'ing defs. * Reverting deployment target to 7.0 (#2618) The Protobuf library doesn’t require the 7.1 deployment target so reverting it back to 7.0 * Fix typo that breaks builds on big-endian (#2632) * Bump version number to 3.2.0
* Merge pull request #2394 from cwelton/formattingFeng Xiao2016-12-082-6/+30
|\ | | | | oneOf fix for JsonFormat includingDefaultValueFields
| * oneOf fix for JsonFormat includingDefaultValueFieldsCaleb Welton2016-12-052-6/+30
| |
* | Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-171-5/+17
|\|
| * Use latest maven-compiler-plugin (2.6.0)Christopher Tubbs2016-11-041-5/+17
| | | | | | | | | | | | * Uses build-helper-maven-plugin to add generated sources to the classpath * Fixes an issue building with newer versions of the maven-compiler-plugin (See https://issues.apache.org/jira/browse/MCOMPILER-240)
* | Integrated internal changes from GoogleAdam Cozzette2016-11-176-25/+80
|/
* Update version number.Bo Yang2016-10-101-1/+1
|
* Bump version number to 3.1.0-alpha-1.Bo Yang2016-10-101-1/+1
|
* Integrate internal changesBo Yang2016-10-106-159/+363
|
* Fix gson dependency.Bo Yang2016-09-211-1/+1
| | | | gson 2.3 has internal bug that it doesn't work with some versions of maven.
* Merge remote-tracking branch 'origin/3.0.x' into mergeJisi Liu2016-09-141-1/+1
|\
| * Bump version number to 3.0.2Jisi Liu2016-09-021-1/+1
| |
* | Allow the JsonFormat.Parser to ignore unknown fieldsDave Protasowski2016-09-082-6/+38
|/ | | | The default behaviour of throwing an exception remains
* Bump version number for GAJisi Liu2016-07-251-1/+1
|
* Update version number to 3.0.0-beta-4Feng Xiao2016-07-131-1/+1
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-14 03:01:46 +0000