[Pkg-protobuf-devel] [pkg-protobuf] branch upstream updated (3a155dc -> 5ff3b49)
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Sun Aug 21 08:54:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
onlyjob pushed a change to branch upstream
in repository pkg-protobuf.
from 3a155dc Merge tag 'v3.0.0-beta-3.3' into upstream
new 2b22b61 Merge remote-tracking branch 'refs/remotes/google/master'
new 835fb94 Fixed parsing of BoolValue.
new cca2d44 Merge pull request #1517 from jhickson/boolvalue
new f4bc9e0 Remove confounding and unused #define - breaks boost/predef/other/endian.h
new 920ee73 Merge pull request #1483 from wal-rus/fix-boost-incompatibility
new 7cc9cb4 Move test for standalone BoolValue to JsonParserTest
new 371d341 Merge pull request #1518 from jskeet/move_test
new 09732c9 Add compatibility notice for Java.
new 325cc42 Merge pull request #1522 from xfxyjwf/compatibility_notice
new 28cb77f Fine-tune build scripts and better documentation.
new 04757db Fix the server id in example
new 7b87f77 Merge pull request #1521 from zhangkun83/master
new ce7e502 Remove the instructions for pbconfig.h
new 5c29835 Merge pull request #1528 from pherl/master
new 5d54a85 Test redundant varint fields decoding in JS.
new dc49706 Merge pull request #1529 from gkraynov/test-redundant-varint
new c8be6ee Merge pull request #1542 from google/beta-3
new b01b1a8 JSON format for Any message must print @type first, use OrderedDict instead of {}
new 718eb75 Merge pull request #1548 from anandolee/master
new 6673283 Integrate interanl changes
new 32e3d7a Merge pull request #1412 from google/internal
new b3bb46c Added download_url to be able to upload to pypi.
new 67d2d45 Merge pull request #1546 from pherl/beta-3
new fe06eb6 Fix protoc artifact pom version
new 97aa8a0 Merge pull request #1551 from pherl/beta-3
new cbb9183 Merge pull request #1559 from google/beta-3
new f2885f6 Fix #include in js_generator.cc
new ba696e7 Merge pull request #1547 from xyzzyz/js_generator
new 810ba9b Export class Arena to shared library.
new 431ba4b Merge pull request #1549 from xyzzyz/arena_export
new 545527e Ruby oneofs: return default instead of nil for unset fields.
new 2d514ce Fixed oneof behavior for enums and fixed JRuby.
new cc5296b Merge pull request #1558 from haberman/rubyoneof
new daec44f Expand the OS X/Xcode gitignores
new 16dd477 CocoaPod Integration Tests
new 12dffd9 Merge pull request #1572 from thomasvl/podspec_tests_2
new 20b5bf6 Add shared schemes for the CocoaPods integration tests
new c034ba7 Merge pull request #1574 from thomasvl/test_schemes
new 7d79458 Fix the cmake configuration file install path to be more standards compliant (See the description of cmake's config search behavior on https://cmake.org/cmake/help/v3.4/command/find_package.html)
new beca1f5 Merge pull request #1575 from wal-rus/cmake-install-msvc
new 02a28a8 Update protobuf-config-version.cmake.in to correctly set the required variables (PACKAGE_VERSION_EXACT, PACKAGE_VERSION_COMPATIBLE, PACKAGE_VERSION_UNSUITABLE)
new 2338e03 Merge pull request #1576 from wal-rus/cmake-versionfile
new 6c47faa Make the CocoaPods integration tests more robust
new 5c6518f Merge pull request #1583 from thomasvl/pods_integration_followup
new 4f630a6 Add compatiblity tests against v2.5.0
new a31d14b Describe platform requirements for the compatibility tests.
new 38e4713 Merge pull request #1523 from xfxyjwf/compatibility_tests
new 28f35b4 add protobuf:: namespace to installed targets
new 594ce56 Merge pull request #1578 from wal-rus/cmake-install-namespace
new 733ef98 added missing closing bracket for _cmakedir_desc in cmake/install.cmake line 88
new 2131b2d Merge pull request #1588 from jeffmvr/master
new 7336092 Add js/binary/encoder.js to js_EXTRA_DIST.
new 173daf1 Merge pull request #1589 from hochhaus/master
new 7da023b Better support for using the proto library from a framework.
new 5d0c2ee Merge pull request #1593 from thomasvl/framework_includes
new 368a2f4 Automated testing tweaks for ObjC
new d089f04 Merge pull request #1595 from thomasvl/objc_travis_tweaks
new 02cd45c Bazel build: Keep generated sources and Python runtime in the same directory.
new ed87c1f Merge pull request #1586 from davidzchen/python
new c8a440d Add more warnings to for the ObjC runtime build
new 0f27cab Merge pull request #1600 from thomasvl/objc_tighter_warnings
new e72805e fix expected class checking in GPBSetMessageRepeatedField
new 86e8f1f Merge pull request #1604 from jonwallg/repeated_types
new 38b9e74 Add -Woverriding-method-mismatch.
new 40ff94e Merge pull request #1617 from thomasvl/more_warnings
new a714c40 Removing unused GPBExceptionMessageKey
new e845187 Merge pull request #1620 from sergiocampama/cleanup1
new d550528 Bump objc podspec version number
new b8ded18 Merge pull request #1561 from pherl/beta-3
new e215828 Merge pull request #1630 from google/beta-3
new 04265e4 Remove if(TRUE)
new d13b3d0 remove useless cleanup - config.cmake files are executed in their own context.
new 457a297 Remove __PROTOBUF_PACKAGE_PREFIX
new a315bb8 Merge pull request #1614 from yeswalrus/cmake-cleanup
new 4629659 add protobuf as3 lib and code generator for as3
new c461193 Merge pull request #1629 from zhongfq/patch-1
new c57c6ea Bump to the *real* minimum required version. Setting CMP0022 breaks CMake versions < 2.8.12
new cc30be1 Merge pull request #1613 from yeswalrus/cmake-min-version
new 61c9696 Update the list of places where the version is stored.
new 18a9140 Merge pull request #1625 from yeswalrus/note-versions
new f6be0d1 Add https://github.com/os72/protobuf-dynamic
new 0ab7a7f Merge pull request #1640 from os72/master
new e34c091 Improving the granularity parsing errors (#1623)
new 20b5325 Integrate interanl changes
new ef7894e Make conformance tests more strict about the failure list.
new bd98eae Fixed Python by updating failure lists and fixed a few broken tests.
new 4833b4c Surrogate checking is unpredictable, so always manually check.
new 84a1b60 Added update_failure_list.py.
new 6a61894 Added test for surrogates (valid and invalid).
new 923d2c7 JSON surrogates Python: adjust regex for OSX error message.
new 350453f Make surrogate regex even more lenient.
new ed1d560 Merge pull request #1541 from haberman/conformancestrict
new 7155629 CMake project updates
new 09f6a5c Use ExternalProject_Add to build the examples in a stand-alone fashion.
new 23fef56 Replace handwritten protobuf-targets with exported version.
new dfe0c9a Merge pull request #1643 from yeswalrus/cmake-examples
new f1091ab Include the prerelease version in the protobuf_VERSION
new 0420eab For prerelease versions, require protobuf_FIND_VERSION to be set.
new 6aa981f Merge pull request #1624 from yeswalrus/cmake-prerelease-versioning
new b60e615 Fix the undefined behavior for opensource users.
new 401e07d Add GOOGLE_ prefix before PROTOBUF_DEPRECATED_ATTR
new 462e7fa protoc: support '=' in --proto_path arguments
new fba7976 Merge pull request #879 from mathstuf/support-equals-in-proto-path
new f8a969d proper codeblock in README
new 088c5c4 Merge pull request #1664 from bshaffer/patch-1
new 71f4a9c Fixes Xcode 8 analyzer warning saying that it was missing a release in dealloc (#1678)
new f0c1492 Add the CocoaPods integration tests to Travis.
new a2a3399 Add support for generation sources into a framework.
new f180ef6 Merge pull request #1683 from thomasvl/third_party_framework
new 78b3498 Save the relevant options used to create a package, allow users to reject packages based on them.
new 4150a91 make protobuf_MSVC_STATIC_RUNTIME a dependent option to reflect it's use.
new a5e116a Merge pull request #1665 from yeswalrus/cmake-package-requirements
new cadfbc8 Removed handling for ALIASED targets since they are unused.
new 52598c6 Merge pull request #1658 from yeswalrus/cmake-fixup-module
new 37eaae2 Remove a friend-class template that is only used for the constructor, and instead create an _internal_only getter that gets the needed information. This is a workaround for a deficiency in gcc-4.4 that does not properly support templated friend classes.
new 6daf3d2 Address review comments on function name
new 98bd6d7 Merge pull request #1692 from vjpai/friendless
new 8c20e55 Add new generation option for using proto sources from other frameworks.
new 1337486 JS: import well-known types from google-protobuf package.
new 0e27112 Bugfix: base the require logic on the file being required.
new 4308cc4 Added plugin.proto to well-known types for JS.
new 104723f Fix tests for CommonJS.
new b7560df Merge pull request #1696 from haberman/jswkt
new 5ebcfc1 Fix prerelease version matching to be more consistent with the find_package arguments.
new 4f93098 Merge pull request #1666 from yeswalrus/cmake-prerelease-examples
new 1a5333b Adds destination flag to xcodebuild to avoid possible flake errors (#1697)
new a230b5d Rename methods to avoid ObjC KVC collisions. (#1699)
new e3f6e2b Remove ordering guarantees in the MapField documentation
new a897ebb Merge pull request #1700 from jskeet/ordering
new 0421238 Expose JsonFormatter.WriteValue.
new 6f67be6 Merge pull request #1707 from jskeet/format-value
new c4b40a3 Create patch release for JS to include WKT.
new 48735cb Add "google" to package.json "files" for WKT.
new 1dc6280 Moved all dependencies to devDependencies.
new 6a6f95d JS package.json: Added author and updated Closure Library version.
new 0ab78e1 Merge pull request #1705 from haberman/revjsver
new 37ca94f Get value from text format name in GPBEnumDescriptor
new 2bcd43a Merge pull request #1714 from dnkoutso/master
new 3be6110 Fix Objective-C generator option typo
new 7b5648c Merge pull request #1719 from esteluk/patch-1
new dc0aeaa Adding conditional compiler symbol to support .NET 3.5 (#1713)
new fc4c617 Fix GPBGetMessage{Repeated,Map}Field()
new e0016c5 Merge pull request #1720 from thomasvl/issue_1716
new c18aa77 Validate the tag numbers when parsing. (#1725)
new d64a2d9 Integrated internal changes from Google
new b83af52 Fixed string formatting in text_format.py to be Python2.6-compatible
new 69cc213 Updated failure_list_java.txt to remove tests that now pass
new 2fe0556 Fix windows build.
new 6cfc19e Xcode project cleanup/setup.
new 7e8c893 Merge pull request #1723 from thomasvl/objc_test_coverage
new 454dbf1 added minified JSON formatting functionality with test
new aeff638 Merge pull request #1710 from chezRong/master
new e102db1 Fix some failing travis tests.
new 02b55d2 Merge pull request #1738 from xfxyjwf/fixbuild
new 31999a3 Add JsonParseOptions to ignore unknown fields
new cae3b0c Merge pull request #1704 from lizan/json_parse_options
new 523bfd4 add nullable qualifier to nil return types
new ec45897 Merge pull request #1712 from dkharrat/swift-error-handling
new c64d86e Fixed failing JS tests
new c10938a Merge pull request #1752 from acozzette/fix-js-tests
new 3808d09 Fix spelling in strings and comments
new d2ae496 Fix spelling error in function ParseTime parameter
new 0d5091e Merge pull request #1742 from ottok/fix-spelling
new a29a9c5 Don't support global ::string in stringpiece.h
new d84d0ca Fix data member declaration order.
new eaf3451 Merge pull request #1753 from xfxyjwf/fixup
new 57638d5 Make sure also Solaris x86 gets PATH_MAX
new c850ebc Merge pull request #1758 from dago/pathmax2
new ada0a81 Move DebuggerNonUserCodeAttribute to function members
new c534845 Changes to generated code from previous commit
new e9a7fc8 Remove WriteGeneratedTypeAttributes which is a no-op
new 03d9e09 Merge pull request #1735 from jskeet/attribute-placement
new be0d7f6 Don't #import the .m files.
new 8b00675 Merge pull request #1757 from thomasvl/avoid_importing_src
new 8c23655 Drop the performace baselines.
new c404c2a Merge pull request #1762 from thomasvl/drop_perf_profiles
new 3df146e Remove unnecessary reflection call
new 8779cba Merge pull request #1764 from jskeet/remove-is-value-type
new 8069466 Modify csharp README since there are now two NuGet packages
new 3560cc9 Merge pull request #1702 from lukebakken/csharp-nuget-doc-update
new 790e6af Fixed out-of-date documentation for CodedInputStream.ReadEnum. (#1581)
new 0d079bc Remove the baseline files from the make dist file list.
new 70c1ac7 Merge pull request #1776 from thomasvl/fix_dist
new 5520447 Fix a bad variable dereference causing <package>_FIND_VERSION_PRERELEASE to be ignored.
new 8eb90e3 Merge pull request #1778 from yeswalrus/fix-prerelease-version
new 042993b Implement RepeatedField.AddRange (#1733)
new 10a8fb4 Move to dotnet cli for building, and .NET Core (netstandard1.0) as target platform (#1727)
new f6d1d1a Uses head version of rvm to avoid shell_update_session not found error (#1791)
new b99577c Exposes the currently registered extensions for a message and removes the internal sortedExtensionsInUse
new 2e98ed5 Use public methods to fetch oneofs in generated code.
new b6a620d Merge pull request #1801 from thomasvl/oneof_framework_build_issues
new 9086d96 Integrate from internal code base.
new 443eb27 Update generated files.
new 7a7913e Add missing LIBPROTOBUF_EXPORT.
new 06a0248 Add missing LIBPROTOBUF_EXPORT
new dd37b99 Comment out lite conformance test.
new 047a3b4 Exclude Java lite module from parent pom.xml
new 8b659b2 Merge pull request #1783 from xfxyjwf/fixlite
new 932f94e Update version number to 3.0.0-beta-4
new c2ebdec Update version number in AssemblyInfo.cs.
new 4e0d051 Merge pull request #1781 from xfxyjwf/update_version
new d9334ea Improve exception throwing implementation in collections
new b053b92 Implement RepeatedField.AddRange.
new 2ee1e52 Optimize AddRange for sequences implementing ICollection
new 5e0de1e Remove the overload for Add(RepeatedField<T>)
new b5ce525 Move to dotnet cli for building, and .NET Core (netstandard1.0) as target platform (#1727)
new e1f146b Merge pull request #1785 from jskeet/merge-csharp
new 0b68255 Add missing golden test file.
new 1bce70d Fix compatiblity issues.
new 3a8d8ea Merge pull request #1787 from xfxyjwf/steppingstone
new 1349fb8 Added 3.0.0-beta-4 changelog.
new 3d9726f Mention Java lite in the changelog.
new 82b43d1 Remove Java deterministic API.
new 56855f6 Merge pull request #1792 from xfxyjwf/changelog
new 2078f61 Merge remote-tracking branch 'origin/3.0.0-beta-4'
new fa52702 Include javadoc/source in Java release packages.
new 24ac9c0 Merge pull request #1803 from xfxyjwf/javadoc
new 923eae8 JavaScript maps: move binary callbacks out of constructor.
new 7429b91 JavaScript: move extension binary info to separate struct.
new e0e7377 Fix goog.require()/goog.provide() ordering.
new 77b08af Merge pull request #1802 from haberman/jsmapbin
new 970a4fd Make implicit defaults consistent with explicit defaults
new db1b2a0 nits
new e4b129f restore old behavior for toObject
new 73e0b49 fix debug.dump
new dd3d9d6 Merge pull request #1447 from seishun/defaults
new deaea21 Use the dotnet-release package feed for Travis.
new e465f26 Merge pull request #1812 from jskeet/fix-travis
new 2e30301 Versioning Java GeneratedMessage.
new 36adb40 Update compatibility tests as well.
new 60cb094 Add files missing from "make dist".
new af8732e Merge pull request #1810 from xfxyjwf/versioning
new a4f68b1 Add missing files in EXTRA_DIST and add a test.
new 30d8416 Merge pull request #1811 from xfxyjwf/fixdist
new ad49ed7 Update travis tests for Java.
new 2ba058c Merge pull request #1822 from xfxyjwf/java6
new 2ff9349 Fixes the parsing of the proto-framework map file.
new de5236d Merge pull request #1828 from sergiocampama/framework
new 20fbb35 Add more tests to jenkins.
new 4ddaad4 Merge pull request #1825 from xfxyjwf/jenkins2
new 16adea3 Add a test to catch sign-comparison warnings.
new 9009662 Fix sign-comparison warnings in public header files.
new 1b3796c Merge pull request #1829 from xfxyjwf/fixcpp
new c2ced9a Remove linux tests from travis.
new 9702b9f Keep cpp_distcheck on travis for now.
new 0622030 Merge pull request #1830 from xfxyjwf/travis
new ff7f68a Ruby: encode and freeze strings when the are assigned or decoded.
new d07a996 Ruby: fixed string freezing for JRuby.
new 44bd6bd Merge pull request #1821 from haberman/rubyfreezestr
new 3a1259c Correctly sets the generate_for_named_framework option after parsing.
new b6cd9dd Merge pull request #1834 from sergiocampama/framework
new fdd970e Fix maven links.
new 9e3c98f Fix maven path.
new 868ea59 Merge pull request #1831 from xfxyjwf/protoc
new fb7a7c5 Bump version number for GA
new 5a6c921 Make jruby still depend on beta-4
new 0973822 remove extra zeros.
new 4f19797 Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb.
new b1cecb6 Merge pull request #1837 from haberman/rubygencodename
new b553b87 Add a script to build protoc zip packages.
new c43f718 Merge pull request #1846 from xfxyjwf/zip
new 6cab568 Ruby: translate package names from snake_case -> PascalCase.
new 6d92233 Added unit test for PascalCasing package names in Ruby.
new 97e2026 Added new file to ruby_EXTRA_DIST.
new ba52f2b Merge pull request #1788 from google/rubypackagecap
new 032fb91 Merge branch 'master' of github.com:google/protobuf into 3.0.0-GA
new b1aac0b Make protoc-artifacts able to build plugin.
new 54feb9a Fix the script comments.
new a17367f Define intX as standard exact-width integer types.
new f11a4f1 Merge pull request #1841 from pherl/3.0.0-GA
new b3b07cd Merge branch 'master' into 3.0.0-GA
new 43b36dd Fixed Makefile.am for Ruby file rename.
new 234ec01 Merge pull request #1847 from haberman/GAfixes
new 12581b4 Fixes traivs cpp build.
new b6b521b Merge pull request #1851 from xfxyjwf/cint
new 0750797 Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GA
new 7c9c314 fix comments.
new 7ba044a Merge pull request #1853 from pherl/3.0.0-GA
new e0d817e Change log for 3.0 GA release.
new e8ae137 Merge pull request #1864 from pherl/galogs
new 5ff3b49 Merge tag 'v3.0.0' into upstream
The 281 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 30 +-
BUILD | 45 +-
CHANGES.txt | 132 ++
Makefile.am | 159 +-
Protobuf.podspec | 10 +-
appveyor.bat | 9 +-
appveyor.yml | 6 +
cmake/CMakeLists.txt | 36 +-
cmake/examples.cmake | 57 +
cmake/extract_includes.bat.in | 1 +
cmake/install.cmake | 102 +-
cmake/protobuf-config-version.cmake.in | 59 +-
cmake/protobuf-config.cmake.in | 27 +-
cmake/protobuf-module.cmake.in | 185 +-
cmake/protobuf-options.cmake | 7 +
cmake/tests.cmake | 1 +
configure.ac | 11 +-
conformance/ConformanceJavaLite.java | 4 +-
conformance/Makefile.am | 94 +-
conformance/conformance_ruby.rb | 2 +-
conformance/conformance_test.cc | 55 +-
conformance/conformance_test.h | 10 +-
conformance/conformance_test_runner.cc | 4 +-
conformance/failure_list_cpp.txt | 58 -
conformance/failure_list_csharp.txt | 5 -
conformance/failure_list_java.txt | 6 -
conformance/failure_list_python.txt | 38 -
conformance/failure_list_python_cpp.txt | 38 -
.../update_failure_list.py | 56 +-
csharp/.gitignore | 21 +-
csharp/Google.Protobuf.Tools.nuspec | 2 +-
csharp/README.md | 4 +-
csharp/build_packages.bat | 7 +-
csharp/buildall.sh | 15 +-
csharp/src/AddressBook/AddressBook.csproj | 75 -
csharp/src/AddressBook/AddressBook.xproj | 19 +
csharp/src/AddressBook/Addressbook.cs | 55 +-
csharp/src/AddressBook/Properties/AssemblyInfo.cs | 18 -
csharp/src/AddressBook/SampleUsage.cs | 2 +-
csharp/src/AddressBook/app.config | 3 -
csharp/src/AddressBook/project.json | 20 +
csharp/src/Google.Protobuf.Conformance/App.config | 6 -
.../src/Google.Protobuf.Conformance/Conformance.cs | 204 +-
.../Google.Protobuf.Conformance.csproj | 61 -
.../Google.Protobuf.Conformance.xproj | 19 +
.../Properties/AssemblyInfo.cs | 48 -
.../src/Google.Protobuf.Conformance/project.json | 19 +
.../Google.Protobuf.JsonDump.csproj | 68 -
.../Google.Protobuf.JsonDump.xproj | 19 +
csharp/src/Google.Protobuf.JsonDump/Program.cs | 3 +-
.../Properties/AssemblyInfo.cs | 19 -
csharp/src/Google.Protobuf.JsonDump/app.config | 3 -
csharp/src/Google.Protobuf.JsonDump/project.json | 19 +
.../Collections/RepeatedFieldTest.cs | 90 +-
.../Compatibility/TypeExtensionsTest.cs | 20 +-
csharp/src/Google.Protobuf.Test/FieldCodecTest.cs | 3 +-
.../Google.Protobuf.Test.csproj | 143 --
.../Google.Protobuf.Test.xproj | 19 +
.../src/Google.Protobuf.Test/JsonFormatterTest.cs | 63 +
csharp/src/Google.Protobuf.Test/JsonParserTest.cs | 3 +
.../Properties/AppManifest.xml | 6 -
.../Properties/AssemblyInfo.cs | 20 -
.../TestProtos/MapUnittestProto3.cs | 146 +-
.../TestProtos/UnittestImportProto3.cs | 17 +-
.../TestProtos/UnittestImportPublicProto3.cs | 17 +-
.../TestProtos/UnittestIssues.cs | 209 +-
.../TestProtos/UnittestProto3.cs | 660 +++++-
.../TestProtos/UnittestWellKnownTypes.cs | 136 +-
.../Google.Protobuf.Test/WellKnownTypes/AnyTest.cs | 2 +-
.../WellKnownTypes/FieldMaskTest.cs | 4 +-
csharp/src/Google.Protobuf.Test/packages.config | 5 -
csharp/src/Google.Protobuf.Test/project.json | 44 +
csharp/src/Google.Protobuf.sln | 65 +-
csharp/src/Google.Protobuf/CodedInputStream.cs | 4 +-
csharp/src/Google.Protobuf/Collections/MapField.cs | 38 +-
.../Google.Protobuf/Collections/RepeatedField.cs | 113 +-
.../Compatibility/PropertyInfoExtensions.cs | 8 +
.../Compatibility/TypeExtensions.cs | 11 +-
csharp/src/Google.Protobuf/FieldCodec.cs | 3 +-
csharp/src/Google.Protobuf/Google.Protobuf.csproj | 168 --
csharp/src/Google.Protobuf/Google.Protobuf.nuspec | 54 -
csharp/src/Google.Protobuf/Google.Protobuf.xproj | 19 +
csharp/src/Google.Protobuf/JsonFormatter.cs | 47 +-
csharp/src/Google.Protobuf/JsonParser.cs | 3 +-
.../src/Google.Protobuf/Properties/AssemblyInfo.cs | 18 -
.../src/Google.Protobuf/Reflection/Descriptor.cs | 794 ++++++-
.../Reflection/MessageDescriptor.cs | 4 +
csharp/src/Google.Protobuf/WellKnownTypes/Any.cs | 34 +-
csharp/src/Google.Protobuf/WellKnownTypes/Api.cs | 62 +-
.../src/Google.Protobuf/WellKnownTypes/Duration.cs | 18 +-
csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs | 16 +-
.../Google.Protobuf/WellKnownTypes/FieldMask.cs | 69 +-
.../WellKnownTypes/FieldMaskPartial.cs | 5 +
.../WellKnownTypes/SourceContext.cs | 19 +-
.../src/Google.Protobuf/WellKnownTypes/Struct.cs | 56 +-
.../WellKnownTypes/TimeExtensions.cs | 4 -
.../Google.Protobuf/WellKnownTypes/Timestamp.cs | 18 +-
csharp/src/Google.Protobuf/WellKnownTypes/Type.cs | 104 +-
.../src/Google.Protobuf/WellKnownTypes/Wrappers.cs | 145 +-
csharp/src/Google.Protobuf/packages.config | 4 -
csharp/src/Google.Protobuf/project.json | 65 +
docs/third_party.md | 2 +
examples/CMakeLists.txt | 63 +
java/README.md | 85 +-
java/compatibility_tests/README.md | 50 +
java/compatibility_tests/v2.5.0/deps/pom.xml | 43 +
.../compatibility_tests/v2.5.0/more_protos/pom.xml | 69 +
.../com/google/protobuf/multiple_files_test.proto | 11 +-
.../com/google/protobuf/nested_builders_test.proto | 3 +-
.../com/google/protobuf/nested_extension.proto | 4 +-
.../google/protobuf/nested_extension_lite.proto | 3 +-
.../com/google/protobuf/non_nested_extension.proto | 4 +-
.../protobuf/non_nested_extension_lite.proto | 3 +-
.../com/google/protobuf/test_bad_identifiers.proto | 63 +-
.../src/proto}/google/protobuf/descriptor.proto | 245 +--
.../src/proto}/google/protobuf/unittest.proto | 164 +-
.../google/protobuf/unittest_custom_options.proto | 38 +-
.../protobuf/unittest_embed_optimize_for.proto | 3 +-
.../proto}/google/protobuf/unittest_empty.proto | 3 +-
.../protobuf/unittest_enormous_descriptor.proto | 6 +-
.../proto}/google/protobuf/unittest_import.proto | 13 +-
.../google/protobuf/unittest_import_lite.proto | 3 +-
.../google/protobuf/unittest_import_public.proto | 3 +-
.../protobuf/unittest_import_public_lite.proto | 3 +-
.../src/proto}/google/protobuf/unittest_lite.proto | 49 +-
.../protobuf/unittest_lite_imports_nonlite.proto | 3 +-
.../src/proto/google/protobuf/unittest_mset.proto | 32 +-
.../protobuf/unittest_no_generic_services.proto | 4 +-
.../google/protobuf/unittest_optimize_for.proto | 10 +-
java/compatibility_tests/v2.5.0/pom.xml | 30 +
java/compatibility_tests/v2.5.0/protos/pom.xml | 71 +
.../com/google/protobuf/multiple_files_test.proto | 11 +-
.../com/google/protobuf/nested_builders_test.proto | 3 +-
.../com/google/protobuf/nested_extension.proto | 4 +-
.../google/protobuf/nested_extension_lite.proto | 3 +-
.../com/google/protobuf/non_nested_extension.proto | 4 +-
.../protobuf/non_nested_extension_lite.proto | 3 +-
.../com/google/protobuf/test_bad_identifiers.proto | 63 +-
.../src/proto}/google/protobuf/descriptor.proto | 245 +--
.../src/proto}/google/protobuf/unittest.proto | 164 +-
.../google/protobuf/unittest_custom_options.proto | 38 +-
.../protobuf/unittest_embed_optimize_for.proto | 3 +-
.../proto}/google/protobuf/unittest_empty.proto | 3 +-
.../protobuf/unittest_enormous_descriptor.proto | 6 +-
.../proto}/google/protobuf/unittest_import.proto | 13 +-
.../google/protobuf/unittest_import_lite.proto | 3 +-
.../google/protobuf/unittest_import_public.proto | 3 +-
.../protobuf/unittest_import_public_lite.proto | 3 +-
.../src/proto}/google/protobuf/unittest_lite.proto | 49 +-
.../protobuf/unittest_lite_imports_nonlite.proto | 3 +-
.../src/proto/google/protobuf/unittest_mset.proto | 32 +-
.../protobuf/unittest_no_generic_services.proto | 4 +-
.../google/protobuf/unittest_optimize_for.proto | 10 +-
java/compatibility_tests/v2.5.0/test.sh | 140 ++
java/compatibility_tests/v2.5.0/tests/pom.xml | 73 +
.../google/protobuf/test}/AbstractMessageTest.java | 65 +-
.../protobuf/test/BoundedByteStringTest.java} | 30 +-
.../com/google/protobuf/test}/ByteStringTest.java | 218 +-
.../protobuf/test}/CodedInputStreamTest.java | 394 +---
.../protobuf/test/CodedOutputStreamTest.java | 318 +++
.../google/protobuf/test}/DeprecatedFieldTest.java | 6 +-
.../com/google/protobuf/test}/DescriptorsTest.java | 195 +-
.../google/protobuf/test}/DynamicMessageTest.java | 67 +-
.../protobuf/test}/ForceFieldBuildersPreRun.java | 9 +-
.../protobuf/test}/GeneratedMessageTest.java | 727 +------
.../protobuf/test}/LazyStringArrayListTest.java | 205 +-
.../protobuf/test}/LazyStringEndToEndTest.java | 30 +-
.../protobuf/test}/LiteralByteStringTest.java | 237 +--
.../com/google/protobuf/test}/MessageTest.java | 9 +-
.../google/protobuf/test}/NestedBuildersTest.java | 7 +-
.../java/com/google/protobuf/test}/ParserTest.java | 137 +-
.../protobuf/test/RopeByteStringSubstringTest.java | 72 +-
.../google/protobuf/test/RopeByteStringTest.java | 84 +
.../com/google/protobuf/test}/ServiceTest.java | 39 +-
.../google/protobuf/test}/TestBadIdentifiers.java | 38 +-
.../java/com/google/protobuf/test}/TestUtil.java | 979 +--------
.../com/google/protobuf/test/TextFormatTest.java | 536 +++++
.../google/protobuf/test}/UnknownFieldSetTest.java | 222 +-
.../test}/UnmodifiableLazyStringListTest.java | 80 +-
.../com/google/protobuf/test}/WireFormatTest.java | 171 +-
java/core/pom.xml | 2 +-
.../java/com/google/protobuf/AbstractMessage.java | 95 +-
.../com/google/protobuf/AbstractMessageLite.java | 46 +-
.../java/com/google/protobuf/BooleanArrayList.java | 46 +-
.../main/java/com/google/protobuf/ByteOutput.java | 4 +-
.../main/java/com/google/protobuf/ByteString.java | 28 +-
.../com/google/protobuf/CodedOutputStream.java | 151 +-
.../main/java/com/google/protobuf/Descriptors.java | 12 +
.../java/com/google/protobuf/DoubleArrayList.java | 50 +-
.../java/com/google/protobuf/DynamicMessage.java | 8 +
.../com/google/protobuf/ExtensionRegistry.java | 11 +-
.../google/protobuf/ExtensionRegistryFactory.java | 95 +
.../com/google/protobuf/ExtensionRegistryLite.java | 57 +-
.../main/java/com/google/protobuf/FieldSet.java | 26 +-
.../java/com/google/protobuf/FloatArrayList.java | 51 +-
.../java/com/google/protobuf/GeneratedMessage.java | 202 +-
.../com/google/protobuf/GeneratedMessageLite.java | 238 ++-
...neratedMessage.java => GeneratedMessageV3.java} | 709 +++----
.../java/com/google/protobuf/IntArrayList.java | 51 +-
.../main/java/com/google/protobuf/Internal.java | 20 +-
.../java/com/google/protobuf/LongArrayList.java | 53 +-
.../main/java/com/google/protobuf/MapEntry.java | 219 +-
.../java/com/google/protobuf/MapEntryLite.java | 319 +--
.../main/java/com/google/protobuf/MapField.java | 413 +++-
.../java/com/google/protobuf/MapFieldLite.java | 445 +---
.../com/google/protobuf/MessageReflection.java | 3 -
.../src/main/java/com/google/protobuf/Parser.java | 2 +-
...eldBuilder.java => RepeatedFieldBuilderV3.java} | 82 +-
...FieldBuilder.java => SingleFieldBuilderV3.java} | 26 +-
.../main/java/com/google/protobuf/TextFormat.java | 91 +-
.../google/protobuf/TextFormatParseInfoTree.java | 4 +-
.../java/com/google/protobuf/UnknownFieldSet.java | 4 +-
.../com/google/protobuf/UnsafeByteOperations.java | 17 +
.../main/java/com/google/protobuf/UnsafeUtil.java | 210 ++
.../src/main/java/com/google/protobuf/Utf8.java | 248 +--
.../com/google/protobuf/BooleanArrayListTest.java | 190 +-
.../java/com/google/protobuf/DescriptorsTest.java | 8 +
.../com/google/protobuf/DoubleArrayListTest.java | 149 +-
.../protobuf/ExtensionRegistryFactoryTest.java | 245 +++
.../com/google/protobuf/FieldPresenceTest.java | 70 +
.../com/google/protobuf/FloatArrayListTest.java | 149 +-
.../com/google/protobuf/GeneratedMessageTest.java | 4 +-
.../java/com/google/protobuf/IntArrayListTest.java | 143 +-
.../com/google/protobuf/LazyMessageLiteTest.java | 17 +
.../google/protobuf/LazyStringArrayListTest.java | 3 +-
.../com/google/protobuf/LiteEqualsAndHashTest.java | 2 +-
.../test/java/com/google/protobuf/LiteTest.java | 31 +-
.../com/google/protobuf/LongArrayListTest.java | 183 +-
.../com/google/protobuf/MapForProto2LiteTest.java | 717 +++++--
.../java/com/google/protobuf/MapForProto2Test.java | 654 +++++-
.../src/test/java/com/google/protobuf/MapTest.java | 588 +++++-
...erTest.java => RepeatedFieldBuilderV3Test.java} | 26 +-
...lderTest.java => SingleFieldBuilderV3Test.java} | 20 +-
.../test/java/com/google/protobuf/TestUtil.java | 5 +-
.../java/com/google/protobuf/TextFormatTest.java | 7 +-
.../com/google/protobuf/field_presence_test.proto | 2 +
.../google/protobuf/map_for_proto2_lite_test.proto | 11 +
.../com/google/protobuf/map_for_proto2_test.proto | 11 +
.../test/proto/com/google/protobuf/map_test.proto | 12 +-
java/lite/pom.xml | 2 +-
java/pom.xml | 30 +-
java/util/pom.xml | 2 +-
.../java/com/google/protobuf/util/Durations.java | 256 +++
.../com/google/protobuf/util/FieldMaskTree.java | 48 +-
.../com/google/protobuf/util/FieldMaskUtil.java | 78 +-
.../java/com/google/protobuf/util/JsonFormat.java | 850 ++++----
.../java/com/google/protobuf/util/TimeUtil.java | 381 +---
.../java/com/google/protobuf/util/Timestamps.java | 349 +++
.../google/protobuf/util/FieldMaskUtilTest.java | 113 +-
.../com/google/protobuf/util/JsonFormatTest.java | 809 +++----
.../com/google/protobuf/util/TimeUtilTest.java | 77 +-
.../proto/com/google/protobuf/util/json_test.proto | 1 +
javanano/pom.xml | 4 +-
.../google/protobuf/nano/MessageNanoPrinter.java | 2 +-
jenkins/docker/Dockerfile | 33 +-
jenkins/pull_request_in_docker.sh | 4 +-
js/binary/constants.js | 4 +-
js/binary/decoder_test.js | 3 +-
js/binary/reader_test.js | 73 +-
js/binary/writer.js | 36 +-
js/commonjs/export.js | 2 +
js/debug.js | 6 +-
js/map.js | 463 ++++
js/message.js | 152 +-
js/message_test.js | 140 +-
js/package.json | 16 +-
js/proto3_test.js | 39 +-
js/test.proto | 6 +
js/testbinary.proto | 27 +
objectivec/GPBArray.m | 71 +-
objectivec/GPBBootstrap.h | 2 +-
objectivec/GPBCodedInputStream.h | 35 +-
objectivec/GPBCodedInputStream.m | 80 +-
objectivec/GPBCodedOutputStream.m | 10 +-
objectivec/GPBDescriptor.h | 3 +-
objectivec/GPBDescriptor.m | 31 +-
objectivec/GPBDescriptor_PackagePrivate.h | 30 +-
objectivec/GPBDictionary.h | 1055 ++++++----
objectivec/GPBDictionary.m | 2222 ++++++++++----------
objectivec/GPBExtensionInternals.m | 11 +
objectivec/GPBExtensionRegistry.m | 8 +
objectivec/GPBMessage.h | 76 +-
objectivec/GPBMessage.m | 114 +-
objectivec/GPBMessage_PackagePrivate.h | 7 +-
objectivec/GPBProtocolBuffers.m | 14 +-
objectivec/GPBUnknownField.m | 8 +
objectivec/GPBUnknownFieldSet.m | 11 +-
objectivec/GPBUtilities.m | 51 +-
objectivec/GPBUtilities_PackagePrivate.h | 8 +-
objectivec/GPBWellKnownTypes.m | 2 -
objectivec/GPBWireFormat.h | 1 +
objectivec/GPBWireFormat.m | 7 +
.../ProtocolBuffers_OSX.xcodeproj/project.pbxproj | 64 +-
.../xcschemes/ProtocolBuffers.xcscheme | 3 +-
.../ProtocolBuffers_iOS.xcodeproj/project.pbxproj | 64 +-
.../FFE465CA-0E74-40E8-9F09-500B66B7DCB2.plist | 62 -
.../8BBEA4A5147C727100C4ADB7.xcbaseline/Info.plist | 21 -
.../xcschemes/ProtocolBuffers.xcscheme | 3 +-
objectivec/README.md | 40 +-
objectivec/Tests/CocoaPods/run_tests.sh | 16 +-
objectivec/Tests/GPBDescriptorTests.m | 8 +
objectivec/Tests/GPBDictionaryTests+Bool.m | 1020 ++++-----
objectivec/Tests/GPBDictionaryTests+Int32.m | 2044 +++++++++---------
objectivec/Tests/GPBDictionaryTests+Int64.m | 2044 +++++++++---------
objectivec/Tests/GPBDictionaryTests+String.m | 2036 +++++++++---------
objectivec/Tests/GPBDictionaryTests+UInt32.m | 2044 +++++++++---------
objectivec/Tests/GPBDictionaryTests+UInt64.m | 2044 +++++++++---------
objectivec/Tests/GPBDictionaryTests.pddm | 428 ++--
objectivec/Tests/GPBMessageTests+Runtime.m | 40 +
objectivec/Tests/GPBMessageTests+Serialization.m | 189 +-
objectivec/Tests/GPBMessageTests.m | 8 +-
objectivec/Tests/GPBSwiftTests.swift | 42 +-
objectivec/Tests/GPBTestUtilities.m | 30 +-
objectivec/Tests/GPBUnknownFieldSetTest.m | 4 -
objectivec/Tests/GPBUtilitiesTests.m | 27 +
objectivec/Tests/GPBWireFormatTests.m | 8 +-
objectivec/google/protobuf/Any.pbobjc.h | 16 +-
objectivec/google/protobuf/FieldMask.pbobjc.h | 52 +
objectivec/google/protobuf/SourceContext.pbobjc.h | 2 +-
objectivec/google/protobuf/Struct.pbobjc.m | 3 +-
php/ext/google/protobuf/upb.h | 2 +-
protobuf.bzl | 45 +-
protoc-artifacts/Dockerfile | 4 +-
protoc-artifacts/README.md | 42 +-
protoc-artifacts/build-protoc.sh | 29 +-
protoc-artifacts/build-zip.sh | 94 +
protoc-artifacts/pom.xml | 3 +-
python/google/protobuf/__init__.py | 2 +-
python/google/protobuf/descriptor.py | 48 +-
python/google/protobuf/descriptor_pool.py | 65 +-
python/google/protobuf/internal/_parameterized.py | 2 +-
python/google/protobuf/internal/containers.py | 6 +-
.../protobuf/internal/descriptor_pool_test.py | 18 +
python/google/protobuf/internal/descriptor_test.py | 41 +-
.../file_options_test.proto} | 11 +-
.../google/protobuf/internal/json_format_test.py | 46 +
python/google/protobuf/internal/message_test.py | 4 +
python/google/protobuf/internal/python_message.py | 26 +-
python/google/protobuf/internal/reflection_test.py | 1 +
.../protobuf/internal/symbol_database_test.py | 26 +-
.../google/protobuf/internal/text_format_test.py | 624 ++++--
python/google/protobuf/json_format.py | 773 +++----
python/google/protobuf/pyext/cpp_message.py | 6 +-
python/google/protobuf/pyext/descriptor.cc | 277 ++-
python/google/protobuf/pyext/descriptor.h | 6 +
.../google/protobuf/pyext/descriptor_containers.cc | 158 +-
.../google/protobuf/pyext/descriptor_containers.h | 8 +
python/google/protobuf/pyext/descriptor_pool.cc | 38 +
python/google/protobuf/pyext/map_container.cc | 4 +-
python/google/protobuf/pyext/message.cc | 82 +-
python/google/protobuf/pyext/message.h | 10 +-
.../message_module.cc} | 83 +-
.../protobuf/pyext/repeated_composite_container.cc | 4 +-
python/google/protobuf/reflection.py | 8 +-
python/google/protobuf/symbol_database.py | 82 +-
python/google/protobuf/text_format.py | 613 ++++--
python/setup.py | 3 +
ruby/Rakefile | 7 +-
ruby/ext/google/protobuf_c/encode_decode.c | 53 +-
ruby/ext/google/protobuf_c/map.c | 20 +-
ruby/ext/google/protobuf_c/protobuf.h | 3 +-
ruby/ext/google/protobuf_c/repeated_field.c | 5 +
ruby/ext/google/protobuf_c/storage.c | 72 +-
ruby/ext/google/protobuf_c/upb.c | 2 +-
ruby/ext/google/protobuf_c/upb.h | 2 +-
ruby/google-protobuf.gemspec | 2 +-
ruby/lib/google/protobuf/repeated_field.rb | 2 +-
ruby/pom.xml | 2 +-
.../java/com/google/protobuf/jruby/RubyMap.java | 4 +-
.../com/google/protobuf/jruby/RubyMessage.java | 16 +-
.../google/protobuf/jruby/RubyRepeatedField.java | 4 +-
.../main/java/com/google/protobuf/jruby/Utils.java | 37 +-
ruby/tests/basic.rb | 82 +-
ruby/tests/generated_code.proto | 2 +-
ruby/tests/generated_code_test.rb | 4 +-
ruby/tests/test_import.proto | 5 +
ruby/travis-test.sh | 2 +-
src/Makefile.am | 42 +-
src/README.md | 2 +-
src/google/protobuf/any.pb.cc | 25 +-
src/google/protobuf/any.pb.h | 8 +-
src/google/protobuf/any.proto | 16 +-
src/google/protobuf/api.pb.cc | 69 +-
src/google/protobuf/api.pb.h | 24 +-
src/google/protobuf/arena.cc | 11 +-
src/google/protobuf/arena.h | 4 +-
src/google/protobuf/arena_unittest.cc | 1 -
.../protobuf/compiler/command_line_interface.cc | 40 +-
.../compiler/command_line_interface_unittest.cc | 15 +
src/google/protobuf/compiler/cpp/cpp_enum.cc | 2 +-
src/google/protobuf/compiler/cpp/cpp_enum_field.cc | 2 +-
src/google/protobuf/compiler/cpp/cpp_field.cc | 2 +-
src/google/protobuf/compiler/cpp/cpp_file.cc | 26 +-
src/google/protobuf/compiler/cpp/cpp_map_field.cc | 258 ++-
src/google/protobuf/compiler/cpp/cpp_map_field.h | 4 +
src/google/protobuf/compiler/cpp/cpp_message.cc | 47 +-
src/google/protobuf/compiler/cpp/cpp_message.h | 2 +-
.../protobuf/compiler/cpp/cpp_message_field.cc | 8 +-
src/google/protobuf/compiler/cpp/cpp_options.h | 2 +
src/google/protobuf/compiler/cpp/cpp_service.cc | 8 +-
src/google/protobuf/compiler/csharp/csharp_enum.cc | 1 -
.../protobuf/compiler/csharp/csharp_field_base.cc | 3 +-
.../protobuf/compiler/csharp/csharp_map_field.cc | 2 +-
.../protobuf/compiler/csharp/csharp_message.cc | 72 +-
.../compiler/csharp/csharp_message_field.cc | 4 +-
.../compiler/csharp/csharp_primitive_field.cc | 4 +-
.../compiler/csharp/csharp_reflection_class.cc | 5 +-
.../compiler/csharp/csharp_repeated_enum_field.cc | 2 +-
.../csharp/csharp_repeated_message_field.cc | 2 +-
.../csharp/csharp_repeated_primitive_field.cc | 2 +-
.../csharp/csharp_source_generator_base.cc | 2 +-
.../compiler/csharp/csharp_source_generator_base.h | 2 +
.../compiler/csharp/csharp_wrapper_field.cc | 4 +-
src/google/protobuf/compiler/java/java_context.cc | 8 +-
src/google/protobuf/compiler/java/java_context.h | 14 +-
src/google/protobuf/compiler/java/java_enum.cc | 8 +-
src/google/protobuf/compiler/java/java_enum.h | 5 +-
.../protobuf/compiler/java/java_enum_field.cc | 29 +-
.../protobuf/compiler/java/java_enum_field_lite.cc | 10 +-
.../protobuf/compiler/java/java_enum_lite.cc | 17 +-
src/google/protobuf/compiler/java/java_enum_lite.h | 5 +-
src/google/protobuf/compiler/java/java_file.cc | 105 +-
src/google/protobuf/compiler/java/java_file.h | 11 +-
.../protobuf/compiler/java/java_generator.cc | 87 +-
src/google/protobuf/compiler/java/java_helpers.cc | 23 +-
src/google/protobuf/compiler/java/java_helpers.h | 56 +-
.../compiler/java/java_lazy_message_field.cc | 12 +-
.../compiler/java/java_lazy_message_field_lite.cc | 57 +-
.../protobuf/compiler/java/java_map_field.cc | 396 +++-
src/google/protobuf/compiler/java/java_map_field.h | 1 +
.../protobuf/compiler/java/java_map_field_lite.cc | 502 ++++-
src/google/protobuf/compiler/java/java_message.cc | 112 +-
src/google/protobuf/compiler/java/java_message.h | 3 +-
.../protobuf/compiler/java/java_message_builder.cc | 93 +-
.../protobuf/compiler/java/java_message_field.cc | 37 +-
.../protobuf/compiler/java/java_message_lite.cc | 35 +-
.../protobuf/compiler/java/java_message_lite.h | 3 +-
.../{cpp/cpp_options.h => java/java_options.h} | 46 +-
.../protobuf/compiler/java/java_primitive_field.cc | 4 +-
.../compiler/java/java_primitive_field_lite.cc | 38 +-
src/google/protobuf/compiler/java/java_service.cc | 5 +-
src/google/protobuf/compiler/java/java_service.h | 4 +-
.../compiler/java/java_shared_code_generator.cc | 50 +-
.../compiler/java/java_shared_code_generator.h | 13 +-
.../protobuf/compiler/java/java_string_field.cc | 14 +-
src/google/protobuf/compiler/js/js_generator.cc | 512 +++--
src/google/protobuf/compiler/main.cc | 8 +
.../compiler/objectivec/objectivec_field.cc | 2 +-
.../compiler/objectivec/objectivec_file.cc | 180 +-
.../protobuf/compiler/objectivec/objectivec_file.h | 2 +-
.../compiler/objectivec/objectivec_generator.cc | 52 +-
.../compiler/objectivec/objectivec_helpers.cc | 280 +--
.../compiler/objectivec/objectivec_helpers.h | 19 +-
.../compiler/objectivec/objectivec_message.cc | 16 +
.../compiler/objectivec/objectivec_message.h | 3 +
.../compiler/objectivec/objectivec_oneof.cc | 2 +-
src/google/protobuf/compiler/parser.cc | 10 +
src/google/protobuf/compiler/parser.h | 2 +-
src/google/protobuf/compiler/plugin.pb.cc | 57 +-
src/google/protobuf/compiler/plugin.pb.h | 24 +-
.../protobuf/compiler/python/python_generator.cc | 85 +-
.../protobuf/compiler/python/python_generator.h | 2 +
.../compiler/python/python_plugin_unittest.cc | 48 +
...generated_code.rb => ruby_generated_code_pb.rb} | 0
.../protobuf/compiler/ruby/ruby_generator.cc | 60 +-
.../compiler/ruby/ruby_generator_unittest.cc | 24 +-
src/google/protobuf/descriptor.cc | 21 +-
src/google/protobuf/descriptor.h | 9 +-
src/google/protobuf/descriptor.pb.cc | 1070 +++++++---
src/google/protobuf/descriptor.pb.h | 384 +++-
src/google/protobuf/descriptor.proto | 10 +
.../protobuf/descriptor_database_unittest.cc | 1 -
src/google/protobuf/descriptor_unittest.cc | 10 +-
src/google/protobuf/duration.pb.cc | 25 +-
src/google/protobuf/duration.pb.h | 8 +-
src/google/protobuf/dynamic_message.cc | 1 -
src/google/protobuf/dynamic_message_unittest.cc | 3 +-
src/google/protobuf/empty.pb.cc | 25 +-
src/google/protobuf/empty.pb.h | 8 +-
src/google/protobuf/extension_set.cc | 71 +-
src/google/protobuf/extension_set.h | 64 +-
src/google/protobuf/extension_set_heavy.cc | 99 +-
src/google/protobuf/extension_set_unittest.cc | 68 +
src/google/protobuf/field_mask.pb.cc | 25 +-
src/google/protobuf/field_mask.pb.h | 8 +-
src/google/protobuf/field_mask.proto | 52 +
.../protobuf/generated_message_reflection.cc | 5 +-
.../generated_message_reflection_unittest.cc | 67 +
src/google/protobuf/generated_message_util.cc | 6 +
src/google/protobuf/generated_message_util.h | 13 +-
src/google/protobuf/io/coded_stream.cc | 125 +-
src/google/protobuf/io/coded_stream.h | 73 +
src/google/protobuf/io/printer.h | 20 +
src/google/protobuf/io/tokenizer.h | 2 +-
.../protobuf/io/zero_copy_stream_impl_lite.h | 1 -
src/google/protobuf/map.h | 22 +-
src/google/protobuf/map_entry.h | 8 +-
src/google/protobuf/map_entry_lite.h | 173 +-
src/google/protobuf/map_field.h | 4 +-
src/google/protobuf/map_field_lite.h | 2 +-
src/google/protobuf/map_field_test.cc | 2 +-
src/google/protobuf/map_lite_unittest.proto | 2 +-
src/google/protobuf/map_proto2_unittest.proto | 20 +
src/google/protobuf/map_test.cc | 283 ++-
src/google/protobuf/map_type_handler.h | 46 +-
src/google/protobuf/map_unittest.proto | 2 +-
src/google/protobuf/message.cc | 2 -
src/google/protobuf/message.h | 6 +-
src/google/protobuf/message_lite.cc | 5 +-
src/google/protobuf/message_lite.h | 29 +-
src/google/protobuf/reflection.h | 2 +-
src/google/protobuf/repeated_field.h | 32 +-
src/google/protobuf/repeated_field_reflection.h | 337 ---
src/google/protobuf/source_context.pb.cc | 25 +-
src/google/protobuf/source_context.pb.h | 8 +-
src/google/protobuf/source_context.proto | 2 +-
src/google/protobuf/struct.pb.cc | 193 +-
src/google/protobuf/struct.pb.h | 24 +-
src/google/protobuf/stubs/bytestream.h | 2 +-
src/google/protobuf/stubs/int128.cc | 6 +-
src/google/protobuf/stubs/mathlimits.h | 6 +-
src/google/protobuf/stubs/port.h | 33 +-
src/google/protobuf/stubs/stringpiece.h | 8 -
src/google/protobuf/stubs/time.h | 2 +-
src/google/protobuf/test_util.cc | 6 +-
src/google/protobuf/testdata/golden_message_maps | Bin 0 -> 13619 bytes
src/google/protobuf/testing/googletest.cc | 4 +
src/google/protobuf/text_format.cc | 68 +-
src/google/protobuf/text_format_unittest.cc | 77 +-
src/google/protobuf/timestamp.pb.cc | 25 +-
src/google/protobuf/timestamp.pb.h | 8 +-
src/google/protobuf/type.pb.cc | 109 +-
src/google/protobuf/type.pb.h | 40 +-
src/google/protobuf/unittest.proto | 1 +
src/google/protobuf/unittest_custom_options.proto | 9 +
src/google/protobuf/unknown_field_set.cc | 28 +-
src/google/protobuf/unknown_field_set.h | 8 +-
src/google/protobuf/util/field_comparator.cc | 2 +-
src/google/protobuf/util/field_mask_util.cc | 54 +-
src/google/protobuf/util/field_mask_util.h | 12 +-
src/google/protobuf/util/field_mask_util_test.cc | 115 +
src/google/protobuf/util/internal/datapiece.cc | 30 +-
src/google/protobuf/util/internal/datapiece.h | 10 +-
.../util/internal/default_value_objectwriter.cc | 29 +-
.../util/internal/default_value_objectwriter.h | 12 +-
.../internal/default_value_objectwriter_test.cc | 33 +
src/google/protobuf/util/internal/json_escaping.cc | 2 +-
src/google/protobuf/util/internal/object_writer.h | 1 +
src/google/protobuf/util/internal/proto_writer.cc | 66 +-
src/google/protobuf/util/internal/proto_writer.h | 23 +-
.../util/internal/protostream_objectsource.cc | 12 +-
.../util/internal/protostream_objectsource.h | 4 +
.../util/internal/protostream_objectwriter.cc | 13 +-
.../util/internal/protostream_objectwriter.h | 19 +-
.../util/internal/protostream_objectwriter_test.cc | 117 ++
src/google/protobuf/util/internal/utility.cc | 10 +-
src/google/protobuf/util/internal/utility.h | 4 +
src/google/protobuf/util/json_format_proto3.proto | 5 +
src/google/protobuf/util/json_util.cc | 78 +-
src/google/protobuf/util/json_util.h | 78 +-
src/google/protobuf/util/json_util_test.cc | 89 +-
src/google/protobuf/util/message_differencer.cc | 5 +-
src/google/protobuf/util/message_differencer.h | 8 +-
.../protobuf/util/message_differencer_unittest.cc | 2 +-
src/google/protobuf/util/time_util.cc | 9 +-
src/google/protobuf/wire_format.h | 2 +-
src/google/protobuf/wire_format_lite.cc | 6 +-
src/google/protobuf/wire_format_lite.h | 40 +-
src/google/protobuf/wire_format_lite_inl.h | 56 +-
src/google/protobuf/wrappers.pb.cc | 121 +-
src/google/protobuf/wrappers.pb.h | 72 +-
tests.sh | 106 +-
572 files changed, 30902 insertions(+), 21722 deletions(-)
create mode 100644 cmake/examples.cmake
create mode 100644 cmake/protobuf-options.cmake
copy python/google/protobuf/pyext/cpp_message.py => conformance/update_failure_list.py (57%)
mode change 100644 => 100755
delete mode 100644 csharp/src/AddressBook/AddressBook.csproj
create mode 100644 csharp/src/AddressBook/AddressBook.xproj
delete mode 100644 csharp/src/AddressBook/Properties/AssemblyInfo.cs
delete mode 100644 csharp/src/AddressBook/app.config
create mode 100644 csharp/src/AddressBook/project.json
delete mode 100644 csharp/src/Google.Protobuf.Conformance/App.config
delete mode 100644 csharp/src/Google.Protobuf.Conformance/Google.Protobuf.Conformance.csproj
create mode 100644 csharp/src/Google.Protobuf.Conformance/Google.Protobuf.Conformance.xproj
delete mode 100644 csharp/src/Google.Protobuf.Conformance/Properties/AssemblyInfo.cs
create mode 100644 csharp/src/Google.Protobuf.Conformance/project.json
delete mode 100644 csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.csproj
create mode 100644 csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.xproj
delete mode 100644 csharp/src/Google.Protobuf.JsonDump/Properties/AssemblyInfo.cs
delete mode 100644 csharp/src/Google.Protobuf.JsonDump/app.config
create mode 100644 csharp/src/Google.Protobuf.JsonDump/project.json
delete mode 100644 csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
create mode 100644 csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.xproj
delete mode 100644 csharp/src/Google.Protobuf.Test/Properties/AppManifest.xml
delete mode 100644 csharp/src/Google.Protobuf.Test/Properties/AssemblyInfo.cs
delete mode 100644 csharp/src/Google.Protobuf.Test/packages.config
create mode 100644 csharp/src/Google.Protobuf.Test/project.json
delete mode 100644 csharp/src/Google.Protobuf/Google.Protobuf.csproj
delete mode 100644 csharp/src/Google.Protobuf/Google.Protobuf.nuspec
create mode 100644 csharp/src/Google.Protobuf/Google.Protobuf.xproj
delete mode 100644 csharp/src/Google.Protobuf/packages.config
create mode 100644 csharp/src/Google.Protobuf/project.json
create mode 100644 examples/CMakeLists.txt
create mode 100644 java/compatibility_tests/README.md
create mode 100644 java/compatibility_tests/v2.5.0/deps/pom.xml
create mode 100644 java/compatibility_tests/v2.5.0/more_protos/pom.xml
copy java/{core/src/test => compatibility_tests/v2.5.0/more_protos/src}/proto/com/google/protobuf/multiple_files_test.proto (91%)
copy java/{core/src/test => compatibility_tests/v2.5.0/more_protos/src}/proto/com/google/protobuf/nested_builders_test.proto (96%)
copy java/{core/src/test => compatibility_tests/v2.5.0/more_protos/src}/proto/com/google/protobuf/nested_extension.proto (96%)
copy java/{core/src/test => compatibility_tests/v2.5.0/more_protos/src}/proto/com/google/protobuf/nested_extension_lite.proto (96%)
copy java/{core/src/test => compatibility_tests/v2.5.0/more_protos/src}/proto/com/google/protobuf/non_nested_extension.proto (96%)
copy java/{core/src/test => compatibility_tests/v2.5.0/more_protos/src}/proto/com/google/protobuf/non_nested_extension_lite.proto (96%)
copy java/{core/src/test => compatibility_tests/v2.5.0/more_protos/src}/proto/com/google/protobuf/test_bad_identifiers.proto (62%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/descriptor.proto (71%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/unittest.proto (85%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/unittest_custom_options.proto (91%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/unittest_embed_optimize_for.proto (97%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/unittest_empty.proto (96%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/unittest_enormous_descriptor.proto (99%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/unittest_import.proto (90%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/unittest_import_lite.proto (96%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/unittest_import_public.proto (96%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/unittest_import_public_lite.proto (96%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/unittest_lite.proto (92%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/unittest_lite_imports_nonlite.proto (96%)
copy src/google/protobuf/unittest_mset_wire_format.proto => java/compatibility_tests/v2.5.0/more_protos/src/proto/google/protobuf/unittest_mset.proto (77%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/unittest_no_generic_services.proto (96%)
copy {src => java/compatibility_tests/v2.5.0/more_protos/src/proto}/google/protobuf/unittest_optimize_for.proto (94%)
create mode 100644 java/compatibility_tests/v2.5.0/pom.xml
create mode 100644 java/compatibility_tests/v2.5.0/protos/pom.xml
copy java/{core/src/test => compatibility_tests/v2.5.0/protos/src}/proto/com/google/protobuf/multiple_files_test.proto (91%)
copy java/{core/src/test => compatibility_tests/v2.5.0/protos/src}/proto/com/google/protobuf/nested_builders_test.proto (96%)
copy java/{core/src/test => compatibility_tests/v2.5.0/protos/src}/proto/com/google/protobuf/nested_extension.proto (96%)
copy java/{core/src/test => compatibility_tests/v2.5.0/protos/src}/proto/com/google/protobuf/nested_extension_lite.proto (96%)
copy java/{core/src/test => compatibility_tests/v2.5.0/protos/src}/proto/com/google/protobuf/non_nested_extension.proto (96%)
copy java/{core/src/test => compatibility_tests/v2.5.0/protos/src}/proto/com/google/protobuf/non_nested_extension_lite.proto (96%)
copy java/{core/src/test => compatibility_tests/v2.5.0/protos/src}/proto/com/google/protobuf/test_bad_identifiers.proto (62%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/descriptor.proto (71%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/unittest.proto (85%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/unittest_custom_options.proto (91%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/unittest_embed_optimize_for.proto (97%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/unittest_empty.proto (96%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/unittest_enormous_descriptor.proto (99%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/unittest_import.proto (90%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/unittest_import_lite.proto (96%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/unittest_import_public.proto (96%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/unittest_import_public_lite.proto (96%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/unittest_lite.proto (92%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/unittest_lite_imports_nonlite.proto (96%)
copy src/google/protobuf/unittest_mset_wire_format.proto => java/compatibility_tests/v2.5.0/protos/src/proto/google/protobuf/unittest_mset.proto (77%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/unittest_no_generic_services.proto (96%)
copy {src => java/compatibility_tests/v2.5.0/protos/src/proto}/google/protobuf/unittest_optimize_for.proto (94%)
create mode 100755 java/compatibility_tests/v2.5.0/test.sh
create mode 100644 java/compatibility_tests/v2.5.0/tests/pom.xml
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/AbstractMessageTest.java (92%)
copy java/{core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/BoundedByteStringTest.java} (63%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/ByteStringTest.java (72%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/CodedInputStreamTest.java (54%)
create mode 100644 java/compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/CodedOutputStreamTest.java
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/DeprecatedFieldTest.java (96%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/DescriptorsTest.java (79%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/DynamicMessageTest.java (80%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/ForceFieldBuildersPreRun.java (89%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/GeneratedMessageTest.java (57%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/LazyStringArrayListTest.java (54%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/LazyStringEndToEndTest.java (84%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/LiteralByteStringTest.java (60%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/MessageTest.java (99%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/NestedBuildersTest.java (98%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/ParserTest.java (66%)
copy src/google/protobuf/compiler/javanano/javanano_extension.h => java/compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/RopeByteStringSubstringTest.java (60%)
create mode 100644 java/compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/RopeByteStringTest.java
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/ServiceTest.java (96%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/TestBadIdentifiers.java (63%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/TestUtil.java (75%)
create mode 100644 java/compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/TextFormatTest.java
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/UnknownFieldSetTest.java (63%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/UnmodifiableLazyStringListTest.java (68%)
copy java/{core/src/test/java/com/google/protobuf => compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test}/WireFormatTest.java (75%)
create mode 100644 java/core/src/main/java/com/google/protobuf/ExtensionRegistryFactory.java
copy java/core/src/main/java/com/google/protobuf/{GeneratedMessage.java => GeneratedMessageV3.java} (82%)
copy java/core/src/main/java/com/google/protobuf/{RepeatedFieldBuilder.java => RepeatedFieldBuilderV3.java} (89%)
copy java/core/src/main/java/com/google/protobuf/{SingleFieldBuilder.java => SingleFieldBuilderV3.java} (91%)
create mode 100644 java/core/src/main/java/com/google/protobuf/UnsafeUtil.java
create mode 100644 java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java
rename java/core/src/test/java/com/google/protobuf/{RepeatedFieldBuilderTest.java => RepeatedFieldBuilderV3Test.java} (91%)
rename java/core/src/test/java/com/google/protobuf/{SingleFieldBuilderTest.java => SingleFieldBuilderV3Test.java} (90%)
create mode 100644 java/util/src/main/java/com/google/protobuf/util/Durations.java
create mode 100644 java/util/src/main/java/com/google/protobuf/util/Timestamps.java
create mode 100644 js/map.js
delete mode 100644 objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcbaselines/8BBEA4A5147C727100C4ADB7.xcbaseline/FFE465CA-0E74-40E8-9F09-500B66B7DCB2.plist
delete mode 100644 objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcbaselines/8BBEA4A5147C727100C4ADB7.xcbaseline/Info.plist
create mode 100755 protoc-artifacts/build-zip.sh
copy python/google/protobuf/{pyext/proto2_api_test.proto => internal/file_options_test.proto} (90%)
copy python/google/protobuf/{internal/descriptor_pool_test2.proto => pyext/message_module.cc} (56%)
create mode 100644 ruby/tests/test_import.proto
copy src/google/protobuf/compiler/{cpp/cpp_options.h => java/java_options.h} (65%)
rename src/google/protobuf/compiler/ruby/{ruby_generated_code.rb => ruby_generated_code_pb.rb} (100%)
delete mode 100644 src/google/protobuf/repeated_field_reflection.h
create mode 100644 src/google/protobuf/testdata/golden_message_maps
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-protobuf/pkg-protobuf.git
More information about the Pkg-protobuf-devel
mailing list