aboutsummaryrefslogtreecommitdiff
path: root/java
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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 mut...Anuraag Agrawal2017-04-072-19/+8
* | | Merge pull request #2937 from anuraaga/dev_rag2Adam Cozzette2017-04-061-5/+15
|\ \ \
| * | | Fix test for unexpected type url when parsing Any. Currently, the test fails ...Anuraag Agrawal2017-04-051-1/+1
| * | | Fix duplicate fields test. The repeated version is passing because null value...Anuraag Agrawal2017-04-041-4/+14
| |/ /
* / / 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 statementprehistoric-penguin2017-03-161-30/+0
* | | Changed scope of Java deps to "test".Josh Haberman2017-03-151-0/+3
|/ /
* | Merge pull request #2835 from pherl/javaepJisi Liu2017-03-131-0/+1
|\ \
| * | Suppress the last unchecked warning.Jisi Liu2017-03-101-0/+1
* | | Merge pull request #2832 from pherl/javaepJisi Liu2017-03-101-0/+3
|\| |
| * | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-08 10:11:06 +0000