aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/compiler/java
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4504 from xfxyjwf/liteFeng Xiao2018-04-181-0/+10
|\
| * Cleanup + documentation for Java Lite runtime.Feng Xiao2018-04-121-0/+10
* | Fixed a Visual Studio 2017 build error. (#4488)Ronny Krüger2018-04-164-11/+7
|/
* Integrated internal changes from GoogleAdam Cozzette2018-03-1327-117/+254
* Java: Generate warning free codeDavid Ostrovsky2018-01-272-0/+30
* Merge pull request #4046 from acozzette/deprecated-valueof-issue-2054Adam Cozzette2017-12-141-1/+9
|\
| * Generate an annotation to suppress deprecation warningsAdam Cozzette2017-12-131-1/+9
* | Add deprecation annotation for oneof case.Jisi Liu2017-12-131-5/+4
|/
* Integrated internal changes from GoogleAdam Cozzette2017-12-012-44/+46
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-251-2/+5
|\
| * Add @Deprecated annotation support for proto file.Jisi Liu2017-08-311-2/+5
* | Fix Java 1.6 compileJisi Liu2017-10-181-2/+2
* | Merge from google internalJisi Liu2017-10-184-11/+186
* | Integrated internal changes from GoogleAdam Cozzette2017-09-144-212/+281
|/
* Merge master into 3.4.xJisi Liu2017-07-183-9/+15
|\
| * Merge pull request #3134 from lundefugl/javabug1Feng Xiao2017-07-172-5/+5
| |\
| | * Issue 3112: Object class with fully qualified namelundefugl2017-05-242-5/+5
| * | Qualify string in java_options.hCalder Coalson2017-06-161-2/+2
| * | Ensure that for Java, imports of .proto files with empty packages worksAdam Cozzette2017-06-021-4/+10
| |/
* / Merge from Google internal for 3.4 releaseJisi Liu2017-07-1824-715/+1030
|/
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-2719-55/+79
|\
| * Down-integrate from google3.Feng Xiao2017-03-2919-55/+79
* | Allow unknown values for Map put*Value methods just like every other enum mut...Anuraag Agrawal2017-04-072-6/+0
|/
* Fix java code according to error prone.Jisi Liu2017-03-101-1/+1
* Fix lint warnings in the javalite branch.Jisi Liu2017-03-092-0/+2
* Merge pull request #2810 from xfxyjwf/i1994Feng Xiao2017-03-091-4/+22
|\
| * Avoid redundant type casts for oneof bytes fields.Feng Xiao2017-03-081-4/+22
* | Merge pull request #2814 from pherl/javadeprecateJisi Liu2017-03-092-10/+24
|\ \ | |/ |/|
| * Add annotations for deprecated messages in JavaJisi Liu2017-03-092-10/+24
* | const FieldDescriptorCompareRoss Wang2017-02-171-1/+1
|/
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-317-19/+11
* Integrated internal changes from GoogleAdam Cozzette2016-11-1745-257/+251
* Integrate internal changesBo Yang2016-10-1010-39/+52
* Versioning Java GeneratedMessage.Feng Xiao2016-07-194-38/+57
* Fix compatiblity issues.Feng Xiao2016-07-141-0/+68
* Integrate from internal code base.Feng Xiao2016-07-132-5/+15
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-032-2/+2
* Integrated internal changes from GoogleAdam Cozzette2016-06-2931-401/+1252
* Down integrate from Google internal.Jisi Liu2016-04-2820-479/+331
* Integrate google internal changes.Jisi Liu2016-03-3034-355/+667
* Integrate from google internal.Jisi Liu2016-01-292-0/+0
* fully qualify invocations of static methods on GeneratedMessageJoshua Humphries2016-01-151-6/+6
* throw IOException instead of InvalidProtocolBufferException when appropriateJoshua Humphries2016-01-152-10/+9
* Down-integrate from internal code base.Feng Xiao2015-12-119-206/+102
* Correct spellingBenjamin Barenblat2015-10-301-1/+1
* Down-integrate from google internal.Jisi Liu2015-10-053-27/+9
* Make the PARSER @Deprecated public.Feng Xiao2015-08-252-2/+11
* Cherry-pick Java utf8 change.Feng Xiao2015-08-243-8/+5
* Down-integrate from google3.Feng Xiao2015-08-2220-201/+650
* Merge branch 'master' of github.com:google/protobufJisi Liu2015-08-214-12/+2
|\
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-29 09:13:24 +0000