aboutsummaryrefslogtreecommitdiff
path: root/java
Commit message (Expand)AuthorAgeFilesLines
...
| * 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.Feng Xiao2017-03-092-3/+52
* | | Merge pull request #2827 from xfxyjwf/i1251Feng Xiao2017-03-101-3/+3
|\ \ \ | |_|/ |/| |
| * | Update comments for setSizeLimit.Feng Xiao2017-03-091-3/+3
| |/
* | Merge pull request #2825 from pherl/javawarningJisi Liu2017-03-095-0/+13
|\ \
| * | 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
|\
| * Update AbstractMessage.javagoorov2017-01-131-1/+1
| * Update AbstractMessage.javagoorov2017-01-121-1/+4
* | Prefer the term "3-Clause BSD License" over "New BSD License"Sebastian Schuberth2017-02-281-1/+1
* | Fix links to the New BSD License in meta-dataSebastian Schuberth2017-02-281-1/+1
* | Merge 3.2.x branch into master (#2648)Paul Yang2017-01-3110-34/+68
|/
* Merge pull request #2394 from cwelton/formattingFeng Xiao2016-12-082-6/+30
|\
| * oneOf fix for JsonFormat includingDefaultValueFieldsCaleb Welton2016-12-052-6/+30
* | Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB toMichael Stack2016-12-012-5/+80
* | Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-177-20/+123
|\|
| * #2356 : fix ExceptionInInitializerError on IBM J9Time2016-11-111-1/+1
| * Use latest maven-compiler-plugin (2.6.0)Christopher Tubbs2016-11-045-14/+77
| * Hacking ByteBufferWriter to work with GAEnmittler2016-10-201-5/+45
* | Integrated internal changes from GoogleAdam Cozzette2016-11-1726-250/+513
|/
* Update version number.Bo Yang2016-10-101-1/+1
* Update version number.Feng Xiao2016-10-103-3/+3
* Fix java compatibilty tests.Feng Xiao2016-10-101-350/+1
* Fix bugs for internal integration.Bo Yang2016-10-106-1583/+0
* Bump version number to 3.1.0-alpha-1.Bo Yang2016-10-104-4/+4
* Integrate internal changesBo Yang2016-10-1072-1703/+6458
* Fix gson dependency.Bo Yang2016-09-211-1/+1
* Fix erroneous comment regarding String.substringPatrick Strawderman2016-09-161-3/+3
* Merge remote-tracking branch 'origin/3.0.x' into mergeJisi Liu2016-09-143-3/+3
|\
| * Bump version number to 3.0.2Jisi Liu2016-09-023-3/+3
| * Use 64-bit protoc binaries in compatibility tests.Feng Xiao2016-08-311-5/+5
* | Allow the JsonFormat.Parser to ignore unknown fieldsDave Protasowski2016-09-082-6/+38
* | Use 64-bit protoc binaries in compatibility tests.Feng Xiao2016-08-011-5/+5
|/
* Bump version number for GAJisi Liu2016-07-254-4/+4
* Update compatibility tests as well.Feng Xiao2016-07-193-347/+8
* Versioning Java GeneratedMessage.Feng Xiao2016-07-194-347/+2718
* Include javadoc/source in Java release packages.Feng Xiao2016-07-186-16/+42
* Remove Java deterministic API.Feng Xiao2016-07-181-1/+1
* Fix compatiblity issues.Feng Xiao2016-07-141-4/+4
* Merge pull request #1781 from xfxyjwf/update_versionFeng Xiao2016-07-144-4/+4
|\
| * Update version number to 3.0.0-beta-4Feng Xiao2016-07-134-4/+4
* | Exclude Java lite module from parent pom.xmlFeng Xiao2016-07-131-1/+1
|/
* Integrate from internal code base.Feng Xiao2016-07-136-18/+143
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-036-29/+29
* added minified JSON formatting functionality with testchezRong2016-07-012-26/+159
* Integrated internal changes from GoogleAdam Cozzette2016-06-2958-3184/+7118
* Describe platform requirements for the compatibility tests.Feng Xiao2016-05-201-0/+4
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 07:40:04 +0000