aboutsummaryrefslogtreecommitdiffstats
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* Update stubsColin Cross2019-09-061-1/+23
| | | | | | | | | | The java proto runtime requires more methods in sun.misc.Unsafe to compile. Bug: 117607748 Test: m checkbuild Change-Id: I8e1c6265dd29d9b38ec87988fb9ed213e26706d6 Merged-In: I8e1c6265dd29d9b38ec87988fb9ed213e26706d6
* Merge tag 'v3.9.1' into masterColin Cross2019-09-06280-14982/+50621
|\ | | | | | | | | | | | | Bug: 117607748 Test: m checkbuild Change-Id: Ia6553278cfea2a8328937c3eebcd0f4fa2018eac Merged-In: Ia6553278cfea2a8328937c3eebcd0f4fa2018eac
| * Update protobuf version (#6472)Paul Yang2019-08-055-5/+5
| |
| * Disable javadoc error (#6371)Paul Yang2019-07-231-1/+7
| | | | | | | | | | | | | | | | | | | | * Disable javadoc error Actual fixes of the javadoc will be followed up * Remove duplicated configuration * Update javadoc plugin version
| * Update protobuf version (#6366)Paul Yang2019-07-115-5/+5
| |
| * Merge branch 'master' into 3.9.xBo Yang2019-06-212-5/+6
| |\ | | | | | | | | | | | | | | | Conflicts: java/lite/pom.xml java/util/pom.xml
| | * Merge remote-tracking branch 'origin/3.8.x'Bo Yang2019-06-211-1/+1
| | |\
| | | * Fix JavaLite versionHao Nguyen2019-06-091-1/+1
| | | |
| | * | Merge pull request #6246 from JLLeitschuh/patch-1Hao Nguyen2019-06-201-5/+5
| | |\ \ | | | | | | | | | | Compatibility tests pull artifacts over HTTPS
| | | * | Compatibility tests pull artifacts over HTTPSJonathan Leitschuh2019-06-111-5/+5
| | | | |
| | * | | Merge pull request #6177 from cgrushko/masterHao Nguyen2019-06-201-0/+1
| | |\ \ \ | | | | | | | | | | | | Add `protobuf_java_lite` Bazel target
| | | * | | Add `protobuf_java_lite` Bazel targetCarmi Grushko2019-06-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that builds the JavaLite runtime. Contents based on java/lite/pom.xml.
| | * | | | Update GSON versionHao Nguyen2019-06-171-134/+134
| | | | | |
| * | | | | Update version to 3.9.0Hao Nguyen2019-06-175-13/+11
| |/ / / /
| * | / / Down integrate to GitHubHao Nguyen2019-06-119-171/+370
| | |/ / | |/| |
| * | | Merge branch '3.8.x' into 3.8.x-201905311515Hao Nguyen2019-05-315-5/+5
| |\ \ \ | | |/ / | |/| / | | |/
| | * Update protobuf versionHao Nguyen2019-05-214-4/+4
| | |
| | * Revert "Update protobuf version"Hao Nguyen2019-05-214-4/+4
| | | | | | | | | | | | This reverts commit 6d96493b3147a0f253f7eef2447785e19361afe3.
| | * Update protobuf versionHao Nguyen2019-05-214-4/+4
| | |
| | * Remove unused files from lite's pom.xmlHao Nguyen2019-04-291-7/+0
| | |
| | * Update java lite versionHao Nguyen2019-04-231-1/+1
| | |
| | * Update version to 3.8.0Hao Nguyen2019-04-234-4/+4
| | |
| * | Add dependency to truth in testHao Nguyen2019-05-312-0/+11
| | |
| * | Down integrate to GitHubHao Nguyen2019-05-304-0/+311
| | |
| * | Down integrate to GitHubHao Nguyen2019-05-214-69/+46
| | |
| * | Merge pull request #6151 from haon4/201905171200Hao Nguyen2019-05-202-2/+2
| |\ \ | | | | | | | | Down Integrate to GitHub
| | * | Down integrate to GitHubHao Nguyen2019-05-172-2/+2
| | | |
| * | | Merge pull request #6115 from haon4/javalite_docYilun Chong2019-05-141-2/+10
| |\ \ \ | | |/ / | |/| | Update instruction on how to use JavaLite runtime
| | * | Update instruction on how to use JavaLite runtimeHao Nguyen2019-05-081-2/+10
| | |/
| * | Merge pull request #6127 from haon4/201905131051Hao Nguyen2019-05-131-4/+13
| |\ \ | | | | | | | | Down integrate to GitHub
| | * | Down integrate to GitHubHao Nguyen2019-05-131-4/+13
| | | |
| * | | Fix typoPer Lundberg2019-05-101-1/+1
| |/ /
| * | Down integrate to GitHubHao Nguyen2019-05-031-2/+1
| | |
| * | Merge pull request #6088 from haon4/201904301530Hao Nguyen2019-05-016-55/+80
| |\ \ | | | | | | | | Down integrate to GitHub
| | * | Down integrate to GitHubHao Nguyen2019-04-306-55/+80
| | |/
| * / Remove unused files from lite's pom.xmlHao Nguyen2019-04-261-7/+0
| |/
| * Down integrate to GitHubHao Nguyen2019-04-2213-44/+44
| |
| * Down integrate to GitHubHao Nguyen2019-04-171-0/+1
| |
| * Add a link to the older version of JavaLiteHao Nguyen2019-04-091-0/+4
| |
| * Update documentation for JavaLiteHao Nguyen2019-04-091-35/+10
| |
| * Add module for JavaLite and fix buildsHao Nguyen2019-04-097-19/+478
| |
| * Merge branch 'master' of https://github.com/protocolbuffers/protobuf into ↵Hao Nguyen2019-04-094-4/+4
| |\ | | | | | | | | | sync201904090622
| | * Revert accidentally commitHao Nguyen2019-04-05119-35133/+1603
| | |
| | * Add module for JavaLite and fix buildsHao Nguyen2019-04-057-19/+479
| | |
| | * Merge branch 'master' of https://github.com/protocolbuffers/protobufHao Nguyen2019-04-054-4/+4
| | |\
| | | * Merge branch '3.7.x' into merge-3-7-xAdam Cozzette2019-03-264-4/+4
| | | |\
| | | | * Update version number to 3.7.1 (#5947)Paul Yang2019-03-264-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update version number to 3.7.1 * Update version number in port_def.inc
| | * | | Down integrate to GithubHao Nguyen2019-04-05112-1584/+34654
| | |/ /
| * / / Down integrate to GithubHao Nguyen2019-04-09113-1588/+34647
| |/ /
| * | Merge branch 'contributing' of https://github.com/haon4/protobuf into ↵Hao Nguyen2019-03-205-0/+42
| |\ \ | | | | | | | | | | | | contributing
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-14 10:38:47 +0000