aboutsummaryrefslogtreecommitdiff
path: root/java/core
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | This includes all internal changes from around May 20 to now.
* 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
|
* Integrate from google internal.Jisi Liu2016-01-29139-0/+55893
| | | | | 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.Jisi Liu2016-01-28140-55972/+0
| | | | | | | | | 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)Joshua Humphries2016-01-151-0/+211
|
* throw IOException instead of InvalidProtocolBufferException when appropriateJoshua Humphries2016-01-153-4/+80
|
* Restructuring protobuf to multiple modulesnmittler2016-01-13142-0/+55866
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.