Jisi Liu
09b707a2a1
Fix lint warnings in the javalite branch.
2017-03-09 15:56:29 -08:00
Feng Xiao
635bd681d8
Include javadoc/source in Java release packages.
...
Also fixed javadoc errors.
[ci skip]
2016-07-28 14:53:09 -07:00
Otto Kekäläinen
3808d091f8
Fix spelling in strings and comments
2016-07-03 15:26:04 +03:00
Adam Cozzette
d64a2d9941
Integrated internal changes from Google
...
This includes all internal changes from around May 20 to now.
2016-06-29 15:38:03 -07:00
Jisi Liu
5dea2017db
Update version numbers for other languages
2016-05-10 15:43:39 -07:00
Jisi Liu
12fdeb9b41
Merge branch 'master' of github.com:google/protobuf
2016-04-28 14:43:08 -07:00
Jisi Liu
cf14183bcd
Down integrate from Google internal.
2016-04-28 14:34:59 -07:00
Jakub Kukul
db93833bc6
Added serialVersionUID to ExtendableMessage.
2016-04-22 16:04:27 +02:00
Jisi Liu
3b3c8abb96
Integrate google internal changes.
2016-03-30 11:39:59 -07:00
Dongjoon Hyun
7a9040fe7f
Remove redundant the in comments.
2016-02-03 15:27:27 -08:00
Jisi Liu
defa25b38b
Restore the license for Internal.java
2016-01-29 14:04:15 -08:00
Jisi Liu
1b8bab3a78
Uncomment the test, which was commented out during integration
2016-01-29 14:01:01 -08:00
Jisi Liu
5221dcbe47
Integrate from google internal.
...
Java files are moved to un-do the hack in the prevous commit, which
moved the java files to the original position for integration.
2016-01-29 13:51:05 -08:00
Jisi Liu
cb3f428810
Undo the Java module change for integration.
...
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.
2016-01-28 13:59:14 -08:00
Joshua Humphries
248557e73a
move test file (was in wrong place after rebasing on java module refactor)
2016-01-15 21:51:20 -05:00
Joshua Humphries
f3c75580e4
throw IOException instead of InvalidProtocolBufferException when appropriate
2016-01-15 21:51:19 -05:00
nmittler
49efe9d7db
Restructuring protobuf to multiple modules
...
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.
2016-01-13 08:15:15 -08:00
