aboutsummaryrefslogtreecommitdiffhomepage
path: root/java
Commit message (Expand)AuthorAge
* Revert guava depedency to version 19.Gravatar Feng Xiao2017-05-12
* Update version number to 3.3.1Gravatar Feng Xiao2017-05-08
* Update Java version number and dependency.Gravatar Feng Xiao2017-03-30
* Fix Java build.Gravatar Feng Xiao2017-03-29
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
* Merge pull request #2860 from prehistoric-penguin/masterGravatar Feng Xiao2017-03-20
|\
| * Remove duplicated copyright statementGravatar prehistoric-penguin2017-03-16
* | Changed scope of Java deps to "test".Gravatar Josh Haberman2017-03-15
|/
* Merge pull request #2835 from pherl/javaepGravatar Jisi Liu2017-03-13
|\
| * Suppress the last unchecked warning.Gravatar Jisi Liu2017-03-10
* | Merge pull request #2832 from pherl/javaepGravatar Jisi Liu2017-03-10
|\|
* | Merge pull request #2818 from xfxyjwf/i1470Gravatar Feng Xiao2017-03-10
|\ \
* \ \ Merge pull request #2827 from xfxyjwf/i1251Gravatar Feng Xiao2017-03-10
|\ \ \
| | | * Fix java code according to error prone.Gravatar Jisi Liu2017-03-10
| |_|/ |/| |
| * | Update comments for setSizeLimit.Gravatar Feng Xiao2017-03-09
* | | Merge pull request #2825 from pherl/javawarningGravatar Jisi Liu2017-03-09
|\ \ \
| * | | Fix GeneratedMessageV3 warnings.Gravatar Jisi Liu2017-03-09
| * | | Fix lint warnings in the javalite branch.Gravatar Jisi Liu2017-03-09
| |/ /
| | * Don't expose gson exceptions in JsonFormat.Gravatar Feng Xiao2017-03-09
| |/
* / Make JsonFormat locale independent.Gravatar Feng Xiao2017-03-08
|/
* Merge pull request #2602 from GreatFruitOmsk/issue-2428Gravatar Feng Xiao2017-03-08
|\
* | Prefer the term "3-Clause BSD License" over "New BSD License"Gravatar Sebastian Schuberth2017-02-28
* | Fix links to the New BSD License in meta-dataGravatar Sebastian Schuberth2017-02-28
* | Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
| * Update AbstractMessage.javaGravatar goorov2017-01-13
| * Update AbstractMessage.javaGravatar goorov2017-01-12
|/
* Merge pull request #2394 from cwelton/formattingGravatar Feng Xiao2016-12-08
|\
| * oneOf fix for JsonFormat includingDefaultValueFieldsGravatar Caleb Welton2016-12-05
* | Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB toGravatar Michael Stack2016-12-01
* | Merge branch 'master' into down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-17
|\|
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| * #2356 : fix ExceptionInInitializerError on IBM J9Gravatar Time2016-11-11
| * Use latest maven-compiler-plugin (2.6.0)Gravatar Christopher Tubbs2016-11-04
| * Hacking ByteBufferWriter to work with GAEGravatar nmittler2016-10-20
|/
* Update version number.Gravatar Bo Yang2016-10-10
* Update version number.Gravatar Feng Xiao2016-10-10
* Fix java compatibilty tests.Gravatar Feng Xiao2016-10-10
* Fix bugs for internal integration.Gravatar Bo Yang2016-10-10
* Bump version number to 3.1.0-alpha-1.Gravatar Bo Yang2016-10-10
* Integrate internal changesGravatar Bo Yang2016-10-10
* Fix gson dependency.Gravatar Bo Yang2016-09-21
* Fix erroneous comment regarding String.substringGravatar Patrick Strawderman2016-09-16
* Merge remote-tracking branch 'origin/3.0.x' into mergeGravatar Jisi Liu2016-09-14
|\
* | Allow the JsonFormat.Parser to ignore unknown fieldsGravatar Dave Protasowski2016-09-08
| * Bump version number to 3.0.2Gravatar Jisi Liu2016-09-02
| * Use 64-bit protoc binaries in compatibility tests.Gravatar Feng Xiao2016-08-31
* | Use 64-bit protoc binaries in compatibility tests.Gravatar Feng Xiao2016-08-01
|/
* Bump version number for GAGravatar Jisi Liu2016-07-25
* Update compatibility tests as well.Gravatar Feng Xiao2016-07-19
* Versioning Java GeneratedMessage.Gravatar Feng Xiao2016-07-19