aboutsummaryrefslogtreecommitdiff
path: root/java/core
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
* Bump version number to 3.0.2Jisi Liu2016-09-021-1/+1
* Bump version number for GAJisi Liu2016-07-251-1/+1
* Versioning Java GeneratedMessage.Feng Xiao2016-07-194-347/+2718
* Include javadoc/source in Java release packages.Feng Xiao2016-07-185-16/+16
* Remove Java deterministic API.Feng Xiao2016-07-181-1/+1
* Fix compatiblity issues.Feng Xiao2016-07-141-4/+4
* Update version number to 3.0.0-beta-4Feng Xiao2016-07-131-1/+1
* Integrate from internal code base.Feng Xiao2016-07-134-1/+98
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-033-21/+21
* Integrated internal changes from GoogleAdam Cozzette2016-06-2948-2035/+5516
* Update version numbers for other languagesJisi Liu2016-05-101-1/+1
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-281-0/+2
|\
| * Added serialVersionUID to ExtendableMessage.Jakub Kukul2016-04-221-0/+2
* | Down integrate from Google internal.Jisi Liu2016-04-2858-2081/+5886
|/
* Integrate google internal changes.Jisi Liu2016-03-3061-1778/+5280
* Remove redundant `the` in comments.Dongjoon Hyun2016-02-032-2/+2
* Restore the license for Internal.javaJisi Liu2016-01-291-1/+29
* Uncomment the test, which was commented out during integrationJisi Liu2016-01-291-185/+184
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 23:35:07 +0000