aboutsummaryrefslogtreecommitdiff
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* Update version number to 3.5.0Jisi Liu2017-11-023-3/+3
|
* Add missing filesJisi Liu2017-10-261-0/+38
|
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-251-0/+1
|\
| * Merge pull request #3578 from pherl/filedeprecationJisi Liu2017-10-182-0/+39
| |\ | | | | | | Add @Deprecated annotation support for proto file.
| | * Add TODOJisi Liu2017-08-311-0/+3
| | |
| | * Add @Deprecated annotation support for proto file.Jisi Liu2017-08-312-0/+36
| | |
* | | Merge from google internalJisi Liu2017-10-189-48/+91
| | |
* | | Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-113-3/+3
|\| |
| * | Bump version for minor releaseJisi Liu2017-09-143-3/+3
| |/
* | Integrated internal changes from GoogleAdam Cozzette2017-09-1417-510/+1454
| |
* | Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-1840-577/+1471
|\|
| * Remove dependency on guava 20Jisi Liu2017-07-252-14/+10
| |
| * Merge from masterJisi Liu2017-07-252-12/+1
| |
| * Update version number for 3.4.0Jisi Liu2017-07-243-3/+3
| |
| * Merge from Google internal for 3.4 releaseJisi Liu2017-07-1838-575/+1471
| |
* | PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLongalanbur2017-08-081-1/+1
| |
* | Merge 3.3.x into masterBo Yang2017-07-184-30/+17
|\ \ | |/ |/|
| * Update version number to 3.3.2Bo Yang2017-06-213-3/+3
| |
| * Revert guava depedency to version 19.Feng Xiao2017-05-123-27/+14
| |
| * Update version number to 3.3.1Feng Xiao2017-05-083-3/+3
| |
* | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-2744-290/+1044
|\|
| * Update Java version number and dependency.Feng Xiao2017-03-303-4/+10
| |
| * Fix Java build.Feng Xiao2017-03-294-4/+11
| |
| * Down-integrate from google3.Feng Xiao2017-03-2941-286/+1027
| |
* | Allow unknown values for Map put*Value methods just like every other enum ↵Anuraag Agrawal2017-04-072-19/+8
| | | | | | | | 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
|/
* Merge pull request #2860 from prehistoric-penguin/masterFeng Xiao2017-03-201-30/+0
|\ | | | | Remove duplicated copyright statement
| * Remove duplicated copyright statementprehistoric-penguin2017-03-161-30/+0
| |
* | Changed scope of Java deps to "test".Josh Haberman2017-03-151-0/+3
|/ | | | This is per: https://github.com/google/protobuf/issues/2019
* Merge pull request #2835 from pherl/javaepJisi Liu2017-03-131-0/+1
|\ | | | | Suppress the last unchecked warning.
| * Suppress the last unchecked warning.Jisi Liu2017-03-101-0/+1
| | | | | | | | | | | | Likely to be java language issue. Varargs are considered arrays, thus using generic with varargs will cause unchecked warning about generic array creation.
* | Merge pull request #2832 from pherl/javaepJisi Liu2017-03-101-0/+3
|\| | | | | Fix java code according to error prone.
| * Fix java code according to error prone.Jisi Liu2017-03-101-0/+3
| |
* | 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
| | |
* | | Merge pull request #2827 from xfxyjwf/i1251Feng Xiao2017-03-101-3/+3
|\ \ \ | |_|/ |/| | Update comments for setSizeLimit.
| * | Update comments for setSizeLimit.Feng Xiao2017-03-091-3/+3
| |/
* | Merge pull request #2825 from pherl/javawarningJisi Liu2017-03-095-0/+13
|\ \ | | | | | | Cherry-pick changes from javalite branch to also fix Java warnings in the master branch
| * | Fix GeneratedMessageV3 warnings.Jisi Liu2017-03-091-0/+4
| | |
| * | Fix lint warnings in the javalite branch.Jisi Liu2017-03-094-0/+9
| |/
* / Make JsonFormat locale independent.Feng Xiao2017-03-082-4/+11
|/
* Merge pull request #2602 from GreatFruitOmsk/issue-2428Feng Xiao2017-03-081-1/+4
|\ | | | | Method Builder#clone() has been changed to bypass Java 1.6 compiler issue.
| * Update AbstractMessage.javagoorov2017-01-131-1/+1
| | | | | | Apply review's comments.
| * Update AbstractMessage.javagoorov2017-01-121-1/+4
| | | | | | Method Builder#clone() has been changed to bypass Java 1.6 compiler issue.
* | Prefer the term "3-Clause BSD License" over "New BSD License"Sebastian Schuberth2017-02-281-1/+1
| | | | | | | | The first is the newer name, which is also more telling.
* | Fix links to the New BSD License in meta-dataSebastian Schuberth2017-02-281-1/+1
| | | | | | | | | | The "New BSD License" is the "3-Clause BSD License", but the links were pointing to the "2-Clause BSD License".
* | Merge 3.2.x branch into master (#2648)Paul Yang2017-01-3110-34/+68
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 08:56:45 +0000