aboutsummaryrefslogtreecommitdiff
path: root/java/core
Commit message (Expand)AuthorAgeFilesLines
* Bump version number to 3.5.2v3.5.2Bo Yang2018-03-051-1/+1
* Update version number to 3.5.1Jisi Liu2017-12-191-1/+1
* Update version number to 3.5.0Jisi Liu2017-11-021-1/+1
* 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 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-187-46/+79
* | | 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-1416-509/+1452
* | Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-1833-555/+1424
|\|
| * Merge from masterJisi Liu2017-07-251-5/+0
| * Update version number for 3.4.0Jisi Liu2017-07-241-1/+1
| * Merge from Google internal for 3.4 releaseJisi Liu2017-07-1833-569/+1436
* | PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLongalanbur2017-08-081-1/+1
* | Merge 3.3.x into masterBo Yang2017-07-182-21/+14
|\ \ | |/ |/|
| * Update version number to 3.3.2Bo Yang2017-06-211-1/+1
| * Revert guava depedency to version 19.Feng Xiao2017-05-122-20/+13
| * Update version number to 3.3.1Feng Xiao2017-05-081-1/+1
* | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-2738-198/+808
|\|
| * Update Java version number and dependency.Feng Xiao2017-03-301-1/+1
| * Fix Java build.Feng Xiao2017-03-292-1/+7
| * Down-integrate from google3.Feng Xiao2017-03-2937-197/+801
* | Allow unknown values for Map put*Value methods just like every other enum mut...Anuraag Agrawal2017-04-071-16/+7
|/
* 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 #2827 from xfxyjwf/i1251Feng Xiao2017-03-101-3/+3
|\ \ | |/ |/|
| * Update comments for setSizeLimit.Feng Xiao2017-03-091-3/+3
* | Fix GeneratedMessageV3 warnings.Jisi Liu2017-03-091-0/+4
* | Fix lint warnings in the javalite branch.Jisi Liu2017-03-094-0/+9
|/
* 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
* | Merge 3.2.x branch into master (#2648)Paul Yang2017-01-318-32/+66
|/
* Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB toMichael Stack2016-12-012-5/+80
* Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-173-11/+74
|\
| * #2356 : fix ExceptionInInitializerError on IBM J9Time2016-11-111-1/+1
| * Use latest maven-compiler-plugin (2.6.0)Christopher Tubbs2016-11-041-5/+28
| * Hacking ByteBufferWriter to work with GAEnmittler2016-10-201-5/+45
* | Integrated internal changes from GoogleAdam Cozzette2016-11-1720-225/+433
|/
* Update version number.Feng Xiao2016-10-101-1/+1
* Fix java compatibilty tests.Feng Xiao2016-10-101-350/+1
* Bump version number to 3.1.0-alpha-1.Bo Yang2016-10-101-1/+1
* Integrate internal changesBo Yang2016-10-1060-1544/+4512
* Fix erroneous comment regarding String.substringPatrick Strawderman2016-09-161-3/+3
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-29 03:51:23 +0000