aboutsummaryrefslogtreecommitdiffhomepage
path: root/java
Commit message (Collapse)AuthorAge
...
* added minified JSON formatting functionality with testGravatar chezRong2016-07-01
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
| | | | This includes all internal changes from around May 20 to now.
* Describe platform requirements for the compatibility tests.Gravatar Feng Xiao2016-05-20
|
* Add compatiblity tests against v2.5.0Gravatar Feng Xiao2016-05-17
|
* Merge pull request #1542 from google/beta-3Gravatar Jisi Liu2016-05-16
|\ | | | | Merge Beta 3 release branch into master
* | Add compatibility notice for Java.Gravatar Feng Xiao2016-05-11
| |
| * Update version numbers for other languagesGravatar Jisi Liu2016-05-10
| |
| * Update version numbers for beta3Gravatar Jisi Liu2016-05-10
|/
* Remove accidentally restored deleted files.Gravatar Jisi Liu2016-05-06
|
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-04-28
|\
* | Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
| |
| * Added serialVersionUID to ExtendableMessage.Gravatar Jakub Kukul2016-04-22
|/
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-03-30
|\
* | Integrate google internal changes.Gravatar Jisi Liu2016-03-30
| |
| * Allow custom URLs for Any in JsonFormatGravatar Pradeep Gollakota2016-03-18
|/ | | | | | - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128
* Remove redundant `the` in comments.Gravatar Dongjoon Hyun2016-02-03
|
* Restore the license for Internal.javaGravatar Jisi Liu2016-01-29
|
* Uncomment the test, which was commented out during integrationGravatar Jisi Liu2016-01-29
|
* Integrate from google internal.Gravatar Jisi Liu2016-01-29
| | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration.
* Undo the Java module change for integration.Gravatar Jisi Liu2016-01-28
| | | | | | | | | Moving the files to their original location, so that opensource changes can be picked during the internal merge. Those files will be moved into the correct location after merging with internal code. Note: do NOT merge this into master without the other internal down-integration commit.
* move test file (was in wrong place after rebasing on java module refactor)Gravatar Joshua Humphries2016-01-15
|
* throw IOException instead of InvalidProtocolBufferException when appropriateGravatar Joshua Humphries2016-01-15
|
* Restructuring protobuf to multiple modulesGravatar nmittler2016-01-13
| | | | | | | | | protobuf/java will become a parent pom that will contain two modules: core - contains all of the code for the protobuf-java artifact util - contains all of the code for the protobuf-java-util artifact Also cleaned up various Maven warnings.
* Update version number and fix javadoc errors.Gravatar Feng Xiao2016-01-06
|
* Fix Java travis tests.Gravatar Feng Xiao2015-12-21
|
* Make conformance tests build for C++ and Java.Gravatar Feng Xiao2015-12-16
| | | | Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433
* Remove internal options from proto files.Gravatar Feng Xiao2015-12-14
| | | | Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9
* Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
|
* Fix typo in LazyField javadocGravatar Dave Hughes2015-11-24
| | | "equals".equals("euqals") == false
* include plugin.proto and generated code in protobuf-javaGravatar Joshua Humphries2015-11-05
|
* Revert unwanted changes.Gravatar Jisi Liu2015-10-06
|
* Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
|
* Fix javadoc errors.Gravatar Feng Xiao2015-08-27
|
* Update version number.Gravatar Feng Xiao2015-08-26
| | | | | Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other languages are updated to v3.0.0-alpha-4.
* Delete incorrectly placed test file.Gravatar Feng Xiao2015-08-25
|
* Merge Java util package to github.Gravatar Feng Xiao2015-08-25
|
* Cherry-pick Java utf8 change.Gravatar Feng Xiao2015-08-24
|
* Down-integrate from internal code base.Gravatar Feng Xiao2015-08-23
|
* Down-integrate from google3.Gravatar Feng Xiao2015-08-22
|
* Down-integrate from internal branch.Gravatar Jisi Liu2015-08-21
| | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
* Add distributionManagement explicitly to prevent maven from usingGravatar Bo Yang2015-05-29
| | | | | default configuration. In default configuration, maven needs webdav for deployment, which cannot be found in central repository.
* Update version number to 3.0.0-alpha-4Gravatar Bo Yang2015-05-29
|
* Update version number to 3.0.0-alpha-3Gravatar teboring2015-05-23
|
* Merge pull request #413 from TeBoring/masterGravatar Paul Yang2015-05-21
|\ | | | | down-integrate internal changes
| * down-integrate internal changesGravatar Bo Yang2015-05-21
| |
* | Include well-known types in Java runtime.Gravatar Feng Xiao2015-05-21
|/ | | | Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc
* Clean up importsGravatar Tamir Duberstein2015-04-02
|
* Move `UTF_8` to `Internal`Gravatar Tamir Duberstein2015-04-02
|
* Skip 3-byte test in CIGravatar Tamir Duberstein2015-04-02
|
* DRY: Use `Charset` statics to eliminate exceptionsGravatar Tamir Duberstein2015-04-02
|