Merge 3.10.x to master
This commit is contained in:
Rafi Kamal
commit
97c7c3fc97
71
CHANGES.txt
71
CHANGES.txt
@ -1,3 +1,74 @@
|
||||
2019-09-03 version 3.10.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
|
||||
|
||||
C++
|
||||
* Switch the proto parser to the faster MOMI parser.
|
||||
* Properly escape Struct keys in the proto3 JSON serializer.
|
||||
* Fix crash on uninitialized map entries.
|
||||
* Informed the compiler of has-bit invariant to produce better code
|
||||
* Unused imports of files defining descriptor extensions will now be reported
|
||||
* Add proto2::util::RemoveSubranges to remove multiple subranges in linear time.
|
||||
* Added BaseTextGenerator::GetCurrentIndentationSize()
|
||||
* Made implicit weak fields compatible with the Apple linker
|
||||
* Support 32 bit values for ProtoStreamObjectWriter to Struct.
|
||||
* Removed the internal-only header coded_stream_inl.h and the internal-only methods defined there.
|
||||
* Enforced no SWIG wrapping of descriptor_database.h (other headers already had this restriction).
|
||||
* Implementation of the equivalent of the MOMI parser for serialization. This removes one of the two serialization routines, by making the fast array serialization routine completely general. SerializeToCodedStream can now be implemented in terms of the much much faster array serialization. The array serialization regresses slightly, but when array serialization is not possible this wins big.
|
||||
* Do not convert unknown field name to snake case to accurately report error.
|
||||
* Fix a UBSAN warnings. (#6333)
|
||||
* Add podspec for C++ (#6404)
|
||||
* protoc: fix source code info location for missing label (#6436)
|
||||
* C++ Add move constructor for Reflection's SetString (#6477)
|
||||
|
||||
Java
|
||||
* Call loadDescriptor outside of synchronized block to remove one possible source of deadlock.
|
||||
* Have oneof enums implement a separate interface (other than EnumLite) for clarity.
|
||||
* Opensource Android Memory Accessors
|
||||
* Update TextFormat to make use of the new TypeRegistry.
|
||||
* Support getFieldBuilder and getRepeatedFieldBuilder in ExtendableBuilder
|
||||
* Update JsonFormat to make use of the new TypeRegistry.
|
||||
* Add proguard config generator for GmmBenchmarkSuiteLite.
|
||||
* Change ProtobufArrayList to use Object[] instead of ArrayList for 5-10% faster parsing
|
||||
* Implement ProtobufArrayList.add(E) for 20% (5%-40%) faster overall protolite2 parsing
|
||||
* Make a copy of JsonFormat.TypeRegistry at the protobuf top level package. This will eventually replace JsonFormat.TypeRegistry.
|
||||
* Fix javadoc warnings in generated files (#6231)
|
||||
* Java: Add Automatic-Module-Name entries to the Manifest (#6568)
|
||||
|
||||
Python
|
||||
* Add descriptor methods in descriptor_pool are deprecated.
|
||||
* Uses explicit imports to prevent multithread test failures in py3.
|
||||
* Added __delitem__ for Python extension dict
|
||||
* Update six version to 1.12.0 and fix legacy_create_init issue (#6391)
|
||||
|
||||
JavaScript
|
||||
* Remove deprecated boolean option to getResultBase64String().
|
||||
* Fix sint64 zig-zag encoding.
|
||||
* Simplify hash64 string conversion to avoid DIGIT array. Should reduce overhead if these functions aren't used, and be more efficient by avoiding linear array searches.
|
||||
* Change the parameter types of binaryReaderFn in ExtensionFieldBinaryInfo to (number, ?, ?).
|
||||
* Create dates.ts and time_of_days.ts to mirror Java versions. This is a near-identical conversion of c.g.type.util.{Dates,TimeOfDays} respectively.
|
||||
* Migrate moneys to TypeScript.
|
||||
|
||||
PHP
|
||||
* Fix incorrect leap day for Timestamp (#6696)
|
||||
* Initialize well known type values (#6713)
|
||||
|
||||
Ruby
|
||||
* Fix scope resolution for Google namespace (#5878)
|
||||
* Support hashes for struct initializers (#5716)
|
||||
* Optimized away the creation of empty string objects. (#6502)
|
||||
* Roll forward Ruby upb changes now that protobuf Ruby build is fixed (#5866)
|
||||
* Optimized layout_mark() for Ruby (#6521)
|
||||
* Optimization for layout_init() (#6547)
|
||||
* Fix for GC of Ruby map frames. (#6533)
|
||||
* Fixed leap year handling by reworking upb_mktime() -> upb_timegm(). (#6695)
|
||||
|
||||
Objective C
|
||||
* Remove OSReadLittle* due to alignment requirements (#6678)
|
||||
* Don't use unions and instead use memcpy for the type swaps. (#6672)
|
||||
|
||||
Other
|
||||
* Override CocoaPods module to lowercase (#6464)
|
||||
|
||||
|
||||
2019-06-28 version 3.9.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
|
||||
|
||||
C++
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'Protobuf-C++'
|
||||
s.version = '3.10.0-rc0'
|
||||
s.version = '3.10.0'
|
||||
s.summary = 'Protocol Buffers v3 runtime library for C++.'
|
||||
s.homepage = 'https://github.com/google/protobuf'
|
||||
s.license = '3-Clause BSD License'
|
||||
|
||||
46
Protobuf-C++.podspec.orig
Normal file
46
Protobuf-C++.podspec.orig
Normal file
@ -0,0 +1,46 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'Protobuf-C++'
|
||||
<<<<<<< HEAD
|
||||
s.version = '3.10.0-rc0'
|
||||
=======
|
||||
s.version = '3.10.0'
|
||||
>>>>>>> 3.10.x
|
||||
s.summary = 'Protocol Buffers v3 runtime library for C++.'
|
||||
s.homepage = 'https://github.com/google/protobuf'
|
||||
s.license = '3-Clause BSD License'
|
||||
s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' }
|
||||
s.cocoapods_version = '>= 1.0'
|
||||
|
||||
s.source = { :git => 'https://github.com/google/protobuf.git',
|
||||
:tag => "v#{s.version}" }
|
||||
|
||||
s.source_files = 'src/google/protobuf/*.{h,cc,inc}',
|
||||
'src/google/protobuf/stubs/*.{h,cc}',
|
||||
'src/google/protobuf/io/*.{h,cc}',
|
||||
'src/google/protobuf/util/*.{h,cc}',
|
||||
'src/google/protobuf/util/internal/*.{h,cc}'
|
||||
|
||||
# Excluding all the tests in the directories above
|
||||
s.exclude_files = 'src/google/**/*_test.{h,cc,inc}',
|
||||
'src/google/**/*_unittest.{h,cc}',
|
||||
'src/google/protobuf/test_util*.{h,cc}',
|
||||
'src/google/protobuf/map_lite_test_util.{h,cc}',
|
||||
'src/google/protobuf/map_test_util*.{h,cc,inc}'
|
||||
|
||||
s.header_mappings_dir = 'src'
|
||||
|
||||
s.ios.deployment_target = '7.0'
|
||||
s.osx.deployment_target = '10.9'
|
||||
s.tvos.deployment_target = '9.0'
|
||||
s.watchos.deployment_target = '2.0'
|
||||
|
||||
s.pod_target_xcconfig = {
|
||||
# Do not let src/google/protobuf/stubs/time.h override system API
|
||||
'USE_HEADERMAP' => 'NO',
|
||||
'ALWAYS_SEARCH_USER_PATHS' => 'NO',
|
||||
|
||||
# Configure tool is not being used for Xcode. When building, assume pthread is supported.
|
||||
'GCC_PREPROCESSOR_DEFINITIONS' => '"$(inherited)" "HAVE_PTHREAD=1"',
|
||||
}
|
||||
|
||||
end
|
||||
@ -5,7 +5,7 @@
|
||||
# dependent projects use the :git notation to refer to the library.
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'Protobuf'
|
||||
s.version = '3.10.0-rc0'
|
||||
s.version = '3.10.0'
|
||||
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
|
||||
s.homepage = 'https://github.com/protocolbuffers/protobuf'
|
||||
s.license = '3-Clause BSD License'
|
||||
|
||||
47
Protobuf.podspec.orig
Normal file
47
Protobuf.podspec.orig
Normal file
@ -0,0 +1,47 @@
|
||||
# This file describes to Cocoapods how to integrate the Objective-C runtime into a dependent
|
||||
# project.
|
||||
# Despite this file being specific to Objective-C, it needs to be on the root of the repository.
|
||||
# Otherwise, Cocoapods gives trouble like not picking up the license file correctly, or not letting
|
||||
# dependent projects use the :git notation to refer to the library.
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'Protobuf'
|
||||
<<<<<<< HEAD
|
||||
s.version = '3.10.0-rc0'
|
||||
=======
|
||||
s.version = '3.10.0'
|
||||
>>>>>>> 3.10.x
|
||||
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
|
||||
s.homepage = 'https://github.com/protocolbuffers/protobuf'
|
||||
s.license = '3-Clause BSD License'
|
||||
s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' }
|
||||
s.cocoapods_version = '>= 1.0'
|
||||
|
||||
s.module_name = 'protobuf'
|
||||
s.source = { :git => 'https://github.com/protocolbuffers/protobuf.git',
|
||||
:tag => "v#{s.version}" }
|
||||
|
||||
s.source_files = 'objectivec/*.{h,m}',
|
||||
'objectivec/google/protobuf/Any.pbobjc.{h,m}',
|
||||
'objectivec/google/protobuf/Api.pbobjc.{h,m}',
|
||||
'objectivec/google/protobuf/Duration.pbobjc.{h,m}',
|
||||
'objectivec/google/protobuf/Empty.pbobjc.{h,m}',
|
||||
'objectivec/google/protobuf/FieldMask.pbobjc.{h,m}',
|
||||
'objectivec/google/protobuf/SourceContext.pbobjc.{h,m}',
|
||||
'objectivec/google/protobuf/Struct.pbobjc.{h,m}',
|
||||
'objectivec/google/protobuf/Timestamp.pbobjc.{h,m}',
|
||||
'objectivec/google/protobuf/Type.pbobjc.{h,m}',
|
||||
'objectivec/google/protobuf/Wrappers.pbobjc.{h,m}'
|
||||
# The following would cause duplicate symbol definitions. GPBProtocolBuffers is expected to be
|
||||
# left out, as it's an umbrella implementation file.
|
||||
s.exclude_files = 'objectivec/GPBProtocolBuffers.m'
|
||||
|
||||
# Set a CPP symbol so the code knows to use framework imports.
|
||||
s.user_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' }
|
||||
s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' }
|
||||
|
||||
s.ios.deployment_target = '7.0'
|
||||
s.osx.deployment_target = '10.9'
|
||||
s.tvos.deployment_target = '9.0'
|
||||
s.watchos.deployment_target = '2.0'
|
||||
s.requires_arc = false
|
||||
end
|
||||
@ -17,7 +17,7 @@ AC_PREREQ(2.59)
|
||||
# In the SVN trunk, the version should always be the next anticipated release
|
||||
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
|
||||
# the size of one file name in the dist tarfile over the 99-char limit.)
|
||||
AC_INIT([Protocol Buffers],[3.10.0-rc-0],[protobuf@googlegroups.com],[protobuf])
|
||||
AC_INIT([Protocol Buffers],[3.10.0],[protobuf@googlegroups.com],[protobuf])
|
||||
|
||||
AM_MAINTAINER_MODE([enable])
|
||||
|
||||
|
||||
238
configure.ac.orig
Normal file
238
configure.ac.orig
Normal file
@ -0,0 +1,238 @@
|
||||
## Process this file with autoconf to produce configure.
|
||||
## In general, the safest way to proceed is to run ./autogen.sh
|
||||
|
||||
AC_PREREQ(2.59)
|
||||
|
||||
# Note: If you change the version, you must also update it in:
|
||||
# * Protobuf.podspec
|
||||
# * csharp/Google.Protobuf.Tools.nuspec
|
||||
# * csharp/src/*/AssemblyInfo.cs
|
||||
# * csharp/src/Google.Protobuf/Google.Protobuf.nuspec
|
||||
# * java/*/pom.xml
|
||||
# * python/google/protobuf/__init__.py
|
||||
# * protoc-artifacts/pom.xml
|
||||
# * src/google/protobuf/stubs/common.h
|
||||
# * src/Makefile.am (Update -version-info for LDFLAGS if needed)
|
||||
#
|
||||
# In the SVN trunk, the version should always be the next anticipated release
|
||||
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
|
||||
# the size of one file name in the dist tarfile over the 99-char limit.)
|
||||
<<<<<<< HEAD
|
||||
AC_INIT([Protocol Buffers],[3.10.0-rc-0],[protobuf@googlegroups.com],[protobuf])
|
||||
=======
|
||||
AC_INIT([Protocol Buffers],[3.10.0],[protobuf@googlegroups.com],[protobuf])
|
||||
>>>>>>> 3.10.x
|
||||
|
||||
AM_MAINTAINER_MODE([enable])
|
||||
|
||||
AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)
|
||||
# The config file is generated but not used by the source code, since we only
|
||||
# need very few of them, e.g. HAVE_PTHREAD and HAVE_ZLIB. Those macros are
|
||||
# passed down in CXXFLAGS manually in src/Makefile.am
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
AC_ARG_VAR(DIST_LANG, [language to include in the distribution package (i.e., make dist)])
|
||||
case "$DIST_LANG" in
|
||||
"") DIST_LANG=all ;;
|
||||
all | cpp | csharp | java | python | javanano | objectivec | ruby | js | php) ;;
|
||||
*) AC_MSG_FAILURE([unknown language: $DIST_LANG]) ;;
|
||||
esac
|
||||
AC_SUBST(DIST_LANG)
|
||||
|
||||
# autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily
|
||||
# the best choice for libprotobuf.
|
||||
AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"],
|
||||
[CFLAGS=""])
|
||||
AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],
|
||||
[CXXFLAGS=""])
|
||||
|
||||
AC_CANONICAL_TARGET
|
||||
|
||||
AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
|
||||
|
||||
# Silent rules enabled: the output is minimal but informative.
|
||||
# In particular, the warnings from the compiler stick out very clearly.
|
||||
# To see all logs, use the --disable-silent-rules on configure or via make V=1
|
||||
AM_SILENT_RULES([yes])
|
||||
|
||||
AC_ARG_WITH([zlib],
|
||||
[AS_HELP_STRING([--with-zlib],
|
||||
[include classes for streaming compressed data in and out @<:@default=check@:>@])],
|
||||
[],[with_zlib=check])
|
||||
|
||||
AC_ARG_WITH([zlib-include],
|
||||
[AS_HELP_STRING([--with-zlib-include=PATH],
|
||||
[zlib include directory])],
|
||||
[CPPFLAGS="-I$withval $CPPFLAGS"])
|
||||
|
||||
AC_ARG_WITH([zlib-lib],
|
||||
[AS_HELP_STRING([--with-zlib-lib=PATH],
|
||||
[zlib lib directory])],
|
||||
[LDFLAGS="-L$withval $LDFLAGS"])
|
||||
|
||||
AC_ARG_WITH([protoc],
|
||||
[AS_HELP_STRING([--with-protoc=COMMAND],
|
||||
[use the given protoc command instead of building a new one when building tests (useful for cross-compiling)])],
|
||||
[],[with_protoc=no])
|
||||
|
||||
# Checks for programs.
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
AC_PROG_CXX_FOR_BUILD
|
||||
AC_LANG([C++])
|
||||
ACX_USE_SYSTEM_EXTENSIONS
|
||||
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
|
||||
AM_CONDITIONAL(GCC, test "$GCC" = yes) # let the Makefile know if we're gcc
|
||||
AC_PROG_OBJC
|
||||
|
||||
# test_util.cc takes forever to compile with GCC and optimization turned on.
|
||||
AC_MSG_CHECKING([C++ compiler flags...])
|
||||
AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],[
|
||||
AS_IF([test "$GCC" = "yes"],[
|
||||
PROTOBUF_OPT_FLAG="-O2"
|
||||
CXXFLAGS="${CXXFLAGS} -g"
|
||||
])
|
||||
|
||||
# Protocol Buffers contains several checks that are intended to be used only
|
||||
# for debugging and which might hurt performance. Most users are probably
|
||||
# end users who don't want these checks, so add -DNDEBUG by default.
|
||||
CXXFLAGS="$CXXFLAGS -std=c++11 -DNDEBUG"
|
||||
|
||||
AC_MSG_RESULT([use default: $PROTOBUF_OPT_FLAG $CXXFLAGS])
|
||||
],[
|
||||
AC_MSG_RESULT([use user-supplied: $CXXFLAGS])
|
||||
])
|
||||
|
||||
AC_SUBST(PROTOBUF_OPT_FLAG)
|
||||
|
||||
ACX_CHECK_SUNCC
|
||||
|
||||
# Have to do libtool after SUNCC, other wise it "helpfully" adds Crun Cstd
|
||||
# to the link
|
||||
AC_PROG_LIBTOOL
|
||||
|
||||
# Check whether the linker supports version scripts
|
||||
AC_MSG_CHECKING([whether the linker supports version scripts])
|
||||
save_LDFLAGS=$LDFLAGS
|
||||
LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
|
||||
cat > conftest.map <<EOF
|
||||
{
|
||||
global:
|
||||
main;
|
||||
local:
|
||||
*;
|
||||
};
|
||||
EOF
|
||||
AC_LINK_IFELSE(
|
||||
[AC_LANG_SOURCE([int main() { return 0; }])],
|
||||
[have_ld_version_script=yes; AC_MSG_RESULT(yes)],
|
||||
[have_ld_version_script=no; AC_MSG_RESULT(no)])
|
||||
LDFLAGS=$save_LDFLAGS
|
||||
AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], [test "$have_ld_version_script" == "yes"])
|
||||
|
||||
# Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h stdlib.h unistd.h])
|
||||
|
||||
# Checks for library functions.
|
||||
AC_FUNC_MEMCMP
|
||||
AC_FUNC_STRTOD
|
||||
AC_CHECK_FUNCS([ftruncate memset mkdir strchr strerror strtol])
|
||||
|
||||
# Check for zlib.
|
||||
HAVE_ZLIB=0
|
||||
AS_IF([test "$with_zlib" != no], [
|
||||
AC_MSG_CHECKING([zlib version])
|
||||
|
||||
# First check the zlib header version.
|
||||
AC_COMPILE_IFELSE(
|
||||
[AC_LANG_PROGRAM([[
|
||||
#include <zlib.h>
|
||||
#if !defined(ZLIB_VERNUM) || (ZLIB_VERNUM < 0x1204)
|
||||
# error zlib version too old
|
||||
#endif
|
||||
]], [])], [
|
||||
AC_MSG_RESULT([ok (1.2.0.4 or later)])
|
||||
|
||||
# Also need to add -lz to the linker flags and make sure this succeeds.
|
||||
AC_SEARCH_LIBS([zlibVersion], [z], [
|
||||
AC_DEFINE([HAVE_ZLIB], [1], [Enable classes using zlib compression.])
|
||||
HAVE_ZLIB=1
|
||||
], [
|
||||
AS_IF([test "$with_zlib" != check], [
|
||||
AC_MSG_FAILURE([--with-zlib was given, but no working zlib library was found])
|
||||
])
|
||||
])
|
||||
], [
|
||||
AS_IF([test "$with_zlib" = check], [
|
||||
AC_MSG_RESULT([headers missing or too old (requires 1.2.0.4)])
|
||||
], [
|
||||
AC_MSG_FAILURE([--with-zlib was given, but zlib headers were not present or were too old (requires 1.2.0.4)])
|
||||
])
|
||||
])
|
||||
])
|
||||
AM_CONDITIONAL([HAVE_ZLIB], [test $HAVE_ZLIB = 1])
|
||||
|
||||
# Add -std=c++11 if necesssary. It is important for us to do this before the
|
||||
# libatomic check below, since that also depends on C++11.
|
||||
AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
|
||||
|
||||
dnl On some platforms, std::atomic needs a helper library
|
||||
AC_MSG_CHECKING(whether -latomic is needed)
|
||||
AC_LINK_IFELSE([AC_LANG_SOURCE([[
|
||||
#include <atomic>
|
||||
#include <cstdint>
|
||||
std::atomic<std::int64_t> v;
|
||||
int main() {
|
||||
return v;
|
||||
}
|
||||
]])], STD_ATOMIC_NEED_LIBATOMIC=no, STD_ATOMIC_NEED_LIBATOMIC=yes)
|
||||
AC_MSG_RESULT($STD_ATOMIC_NEED_LIBATOMIC)
|
||||
if test "x$STD_ATOMIC_NEED_LIBATOMIC" = xyes; then
|
||||
LIBATOMIC_LIBS="-latomic"
|
||||
fi
|
||||
AC_SUBST([LIBATOMIC_LIBS])
|
||||
|
||||
AS_IF([test "$with_protoc" != "no"], [
|
||||
PROTOC=$with_protoc
|
||||
AS_IF([test "$with_protoc" = "yes"], [
|
||||
# No argument given. Use system protoc.
|
||||
PROTOC=protoc
|
||||
])
|
||||
AS_IF([echo "$PROTOC" | grep -q '^@<:@^/@:>@.*/'], [
|
||||
# Does not start with a slash, but contains a slash. So, it's a relative
|
||||
# path (as opposed to an absolute path or an executable in $PATH).
|
||||
# Since it will actually be executed from the src directory, prefix with
|
||||
# the current directory. We also insert $ac_top_build_prefix in case this
|
||||
# is a nested package and --with-protoc was actually given on the outer
|
||||
# package's configure script.
|
||||
PROTOC=`pwd`/${ac_top_build_prefix}$PROTOC
|
||||
])
|
||||
AC_SUBST([PROTOC])
|
||||
])
|
||||
AM_CONDITIONAL([USE_EXTERNAL_PROTOC], [test "$with_protoc" != "no"])
|
||||
|
||||
AX_PTHREAD
|
||||
AM_CONDITIONAL([HAVE_PTHREAD], [test "x$ax_pthread_ok" = "xyes"])
|
||||
# We still keep this for improving pbconfig.h for unsupported platforms.
|
||||
AC_CXX_STL_HASH
|
||||
|
||||
# Enable ObjC support for conformance directory on OS X.
|
||||
OBJC_CONFORMANCE_TEST=0
|
||||
case "$target_os" in
|
||||
darwin*)
|
||||
OBJC_CONFORMANCE_TEST=1
|
||||
;;
|
||||
esac
|
||||
AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
|
||||
|
||||
# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
|
||||
# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
|
||||
# too.
|
||||
export CFLAGS
|
||||
export CXXFLAGS
|
||||
AC_CONFIG_SUBDIRS([third_party/googletest])
|
||||
|
||||
AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
|
||||
AC_OUTPUT
|
||||
@ -2719,6 +2719,10 @@ void BinaryAndJsonConformanceSuite::RunSuiteImpl() {
|
||||
})",
|
||||
"repeated_timestamp: {seconds: -62135596800}"
|
||||
"repeated_timestamp: {seconds: 253402300799 nanos: 999999999}");
|
||||
RunValidJsonTest(
|
||||
"TimestampLeap", REQUIRED,
|
||||
R"({"optionalTimestamp": "1993-02-10T00:00:00.000Z"})",
|
||||
"optional_timestamp: {seconds: 729302400}");
|
||||
RunValidJsonTest("TimestampWithPositiveOffset", REQUIRED,
|
||||
R"({"optionalTimestamp": "1970-01-01T08:00:01+08:00"})",
|
||||
"optional_timestamp: {seconds: 1}");
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<title>Google Protocol Buffers tools</title>
|
||||
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
|
||||
<description>See project site for more info.</description>
|
||||
<version>3.10.0-rc0</version>
|
||||
<version>3.10.0</version>
|
||||
<authors>Google Inc.</authors>
|
||||
<owners>protobuf-packages</owners>
|
||||
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>
|
||||
|
||||
43
csharp/Google.Protobuf.Tools.nuspec.orig
Normal file
43
csharp/Google.Protobuf.Tools.nuspec.orig
Normal file
@ -0,0 +1,43 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<package>
|
||||
<metadata>
|
||||
<id>Google.Protobuf.Tools</id>
|
||||
<title>Google Protocol Buffers tools</title>
|
||||
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
|
||||
<description>See project site for more info.</description>
|
||||
<<<<<<< HEAD
|
||||
<version>3.10.0-rc0</version>
|
||||
=======
|
||||
<version>3.10.0</version>
|
||||
>>>>>>> 3.10.x
|
||||
<authors>Google Inc.</authors>
|
||||
<owners>protobuf-packages</owners>
|
||||
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>
|
||||
<projectUrl>https://github.com/protocolbuffers/protobuf</projectUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<releaseNotes>Tools for Protocol Buffers</releaseNotes>
|
||||
<copyright>Copyright 2015, Google Inc.</copyright>
|
||||
<tags>Protocol Buffers Binary Serialization Format Google proto proto3</tags>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="protoc\windows_x86\protoc.exe" target="tools\windows_x86\protoc.exe"/>
|
||||
<file src="protoc\windows_x64\protoc.exe" target="tools\windows_x64\protoc.exe"/>
|
||||
<file src="protoc\linux_x86\protoc" target="tools\linux_x86\protoc"/>
|
||||
<file src="protoc\linux_x64\protoc" target="tools\linux_x64\protoc"/>
|
||||
<file src="protoc\macosx_x86\protoc" target="tools\macosx_x86\protoc"/>
|
||||
<file src="protoc\macosx_x64\protoc" target="tools\macosx_x64\protoc"/>
|
||||
<file src="..\src\google\protobuf\any.proto" target="tools\google\protobuf"/>
|
||||
<file src="..\src\google\protobuf\api.proto" target="tools\google\protobuf"/>
|
||||
<file src="..\src\google\protobuf\descriptor.proto" target="tools\google\protobuf"/>
|
||||
<file src="..\src\google\protobuf\duration.proto" target="tools\google\protobuf"/>
|
||||
<file src="..\src\google\protobuf\empty.proto" target="tools\google\protobuf"/>
|
||||
<file src="..\src\google\protobuf\field_mask.proto" target="tools\google\protobuf"/>
|
||||
<file src="..\src\google\protobuf\source_context.proto" target="tools\google\protobuf"/>
|
||||
<file src="..\src\google\protobuf\struct.proto" target="tools\google\protobuf"/>
|
||||
<file src="..\src\google\protobuf\timestamp.proto" target="tools\google\protobuf"/>
|
||||
<file src="..\src\google\protobuf\type.proto" target="tools\google\protobuf"/>
|
||||
<file src="..\src\google\protobuf\wrappers.proto" target="tools\google\protobuf"/>
|
||||
<file src="Google.Protobuf.Tools.targets" target="buildCrossTargeting"/>
|
||||
<file src="Google.Protobuf.Tools.targets" target="build"/>
|
||||
</files>
|
||||
</package>
|
||||
@ -4,7 +4,7 @@
|
||||
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
|
||||
<Copyright>Copyright 2015, Google Inc.</Copyright>
|
||||
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
|
||||
<VersionPrefix>3.10.0-rc0</VersionPrefix>
|
||||
<VersionPrefix>3.10.0</VersionPrefix>
|
||||
<LangVersion>6</LangVersion>
|
||||
<Authors>Google Inc.</Authors>
|
||||
<TargetFrameworks>netstandard1.0;netstandard2.0;net45</TargetFrameworks>
|
||||
|
||||
46
csharp/src/Google.Protobuf/Google.Protobuf.csproj.orig
Normal file
46
csharp/src/Google.Protobuf/Google.Protobuf.csproj.orig
Normal file
@ -0,0 +1,46 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
|
||||
<Copyright>Copyright 2015, Google Inc.</Copyright>
|
||||
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
|
||||
<<<<<<< HEAD
|
||||
<VersionPrefix>3.10.0-rc0</VersionPrefix>
|
||||
=======
|
||||
<VersionPrefix>3.10.0</VersionPrefix>
|
||||
>>>>>>> 3.10.x
|
||||
<LangVersion>6</LangVersion>
|
||||
<Authors>Google Inc.</Authors>
|
||||
<TargetFrameworks>netstandard1.0;netstandard2.0;net45</TargetFrameworks>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<AssemblyOriginatorKeyFile>../../keys/Google.Protobuf.snk</AssemblyOriginatorKeyFile>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
|
||||
<PackageTags>Protocol;Buffers;Binary;Serialization;Format;Google;proto;proto3</PackageTags>
|
||||
<PackageReleaseNotes>C# proto3 support</PackageReleaseNotes>
|
||||
<PackageProjectUrl>https://github.com/protocolbuffers/protobuf</PackageProjectUrl>
|
||||
<PackageLicenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</PackageLicenseUrl>
|
||||
<RepositoryType>git</RepositoryType>
|
||||
<RepositoryUrl>https://github.com/protocolbuffers/protobuf.git</RepositoryUrl>
|
||||
<!-- Include PDB in the built .nupkg -->
|
||||
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'netstandard2.0' ">
|
||||
<DefineConstants>$(DefineConstants);GOOGLE_PROTOBUF_SUPPORT_SYSTEM_MEMORY</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Needed for the net45 build to work on Unix. See https://github.com/dotnet/designs/pull/33 -->
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'netstandard2.0' ">
|
||||
<PackageReference Include="System.Memory" Version="4.5.2"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.0.0-beta2-18618-05"/>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-bom</artifactId>
|
||||
<version>3.10.0-rc-0</version>
|
||||
<version>3.10.0</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>Protocol Buffers [BOM]</name>
|
||||
|
||||
114
java/bom/pom.xml.orig
Normal file
114
java/bom/pom.xml.orig
Normal file
@ -0,0 +1,114 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-bom</artifactId>
|
||||
<<<<<<< HEAD
|
||||
<version>3.10.0-rc-0</version>
|
||||
=======
|
||||
<version>3.10.0</version>
|
||||
>>>>>>> 3.10.x
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>Protocol Buffers [BOM]</name>
|
||||
<description>A compatible set of open source libraries for working with protocol buffers.</description>
|
||||
<url>https://developers.google.com/protocol-buffers/</url>
|
||||
|
||||
<organization>
|
||||
<name>Google LLC</name>
|
||||
<url>https://cloud.google.com</url>
|
||||
</organization>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<id>haon</id>
|
||||
<name>Hao Nguyen</name>
|
||||
<email>haon@google.com</email>
|
||||
<organization>Google</organization>
|
||||
<organizationUrl>https://cloud.google.com</organizationUrl>
|
||||
<timezone>America/Los_Angeles</timezone>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>The Apache License, Version 2.0</name>
|
||||
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<scm>
|
||||
<url>https://github.com/protocolbuffers/protobuf</url>
|
||||
<connection>scm:git:https://github.com/protocolbuffers/protobuf.git</connection>
|
||||
</scm>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
<snapshotRepository>
|
||||
<id>sonatype-nexus-staging</id>
|
||||
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
|
||||
</snapshotRepository>
|
||||
<repository>
|
||||
<id>sonatype-nexus-staging</id>
|
||||
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-java-util</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<!-- If you see the error message
|
||||
gpg: signing failed: Inappropriate ioctl for device
|
||||
when signing run the command
|
||||
export GPG_TTY=$(tty)
|
||||
and try again. -->
|
||||
<id>release</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-gpg-plugin</artifactId>
|
||||
<version>1.6</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>sign-artifacts</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>sign</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.sonatype.plugins</groupId>
|
||||
<artifactId>nexus-staging-maven-plugin</artifactId>
|
||||
<version>1.6.6</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
|
||||
<serverId>sonatype-nexus-staging</serverId>
|
||||
<autoReleaseAfterClose>false</autoReleaseAfterClose>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-parent</artifactId>
|
||||
<version>3.10.0-rc-0</version>
|
||||
<version>3.10.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
|
||||
162
java/core/pom.xml.orig
Normal file
162
java/core/pom.xml.orig
Normal file
@ -0,0 +1,162 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-parent</artifactId>
|
||||
<<<<<<< HEAD
|
||||
<version>3.10.0-rc-0</version>
|
||||
=======
|
||||
<version>3.10.0</version>
|
||||
>>>>>>> 3.10.x
|
||||
</parent>
|
||||
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
<packaging>bundle</packaging>
|
||||
|
||||
<name>Protocol Buffers [Core]</name>
|
||||
<description>
|
||||
Core Protocol Buffers library. Protocol Buffers are a way of encoding structured data in an
|
||||
efficient yet extensible format.
|
||||
</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.easymock</groupId>
|
||||
<artifactId>easymock</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.easymock</groupId>
|
||||
<artifactId>easymockclassextension</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<!-- Include core protos in the bundle as resources -->
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>${protobuf.source.dir}</directory>
|
||||
<includes>
|
||||
<include>google/protobuf/any.proto</include>
|
||||
<include>google/protobuf/api.proto</include>
|
||||
<include>google/protobuf/descriptor.proto</include>
|
||||
<include>google/protobuf/duration.proto</include>
|
||||
<include>google/protobuf/empty.proto</include>
|
||||
<include>google/protobuf/field_mask.proto</include>
|
||||
<include>google/protobuf/source_context.proto</include>
|
||||
<include>google/protobuf/struct.proto</include>
|
||||
<include>google/protobuf/timestamp.proto</include>
|
||||
<include>google/protobuf/type.proto</include>
|
||||
<include>google/protobuf/wrappers.proto</include>
|
||||
<include>google/protobuf/compiler/plugin.proto</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
<testResources>
|
||||
<testResource>
|
||||
<directory>${protobuf.source.dir}</directory>
|
||||
<includes>
|
||||
<include>google/protobuf/testdata/golden_message_oneof_implemented</include>
|
||||
<include>google/protobuf/testdata/golden_packed_fields_message</include>
|
||||
</includes>
|
||||
</testResource>
|
||||
</testResources>
|
||||
|
||||
<plugins>
|
||||
<!-- Use Antrun plugin to generate sources with protoc -->
|
||||
<plugin>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<executions>
|
||||
<!-- Generate core protos -->
|
||||
<execution>
|
||||
<id>generate-sources</id>
|
||||
<phase>generate-sources</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
<ant antfile="generate-sources-build.xml"/>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
|
||||
<!-- Generate the test protos -->
|
||||
<execution>
|
||||
<id>generate-test-sources</id>
|
||||
<phase>generate-test-sources</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
<ant antfile="generate-test-sources-build.xml"/>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- Add the generated sources to the build -->
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>add-generated-sources</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>add-source</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<sources>
|
||||
<source>${generated.sources.dir}</source>
|
||||
</sources>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>add-generated-test-sources</id>
|
||||
<phase>generate-test-sources</phase>
|
||||
<goals>
|
||||
<goal>add-test-source</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<sources>
|
||||
<source>${generated.testsources.dir}</source>
|
||||
</sources>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- OSGI bundle configuration -->
|
||||
<plugin>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<instructions>
|
||||
<Automatic-Module-Name>com.google.protobuf</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
|
||||
<Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
|
||||
<Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
|
||||
<Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
|
||||
<Import-Package>sun.misc;resolution:=optional,*</Import-Package>
|
||||
</instructions>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-parent</artifactId>
|
||||
<version>3.10.0-rc-0</version>
|
||||
<version>3.10.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>protobuf-javalite</artifactId>
|
||||
|
||||
342
java/lite/pom.xml.orig
Normal file
342
java/lite/pom.xml.orig
Normal file
@ -0,0 +1,342 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-parent</artifactId>
|
||||
<<<<<<< HEAD
|
||||
<version>3.10.0-rc-0</version>
|
||||
=======
|
||||
<version>3.10.0</version>
|
||||
>>>>>>> 3.10.x
|
||||
</parent>
|
||||
|
||||
<artifactId>protobuf-javalite</artifactId>
|
||||
<packaging>bundle</packaging>
|
||||
|
||||
<name>Protocol Buffers [Lite]</name>
|
||||
<description>
|
||||
Lite version of Protocol Buffers library. This version is optimized for code size, but does
|
||||
not guarantee API/ABI stability.
|
||||
</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.easymock</groupId>
|
||||
<artifactId>easymock</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.easymock</groupId>
|
||||
<artifactId>easymockclassextension</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<!-- Include core protos in the bundle as resources -->
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>${protobuf.source.dir}</directory>
|
||||
<includes>
|
||||
<include>google/protobuf/any.proto</include>
|
||||
<include>google/protobuf/api.proto</include>
|
||||
<include>google/protobuf/empty.proto</include>
|
||||
<include>google/protobuf/field_mask.proto</include>
|
||||
<include>google/protobuf/source_context.proto</include>
|
||||
<include>google/protobuf/struct.proto</include>
|
||||
<include>google/protobuf/timestamp.proto</include>
|
||||
<include>google/protobuf/type.proto</include>
|
||||
<include>google/protobuf/wrappers.proto</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
<testResources>
|
||||
<testResource>
|
||||
<directory>${protobuf.source.dir}</directory>
|
||||
<includes>
|
||||
<include>google/protobuf/testdata/golden_message_oneof_implemented</include>
|
||||
<include>google/protobuf/testdata/golden_packed_fields_message</include>
|
||||
</includes>
|
||||
</testResource>
|
||||
</testResources>
|
||||
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-source-files</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>copy-resources</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<outputDirectory>${generated.sources.dir}/com/google/protobuf</outputDirectory>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>${basedir}/../core/src/main/java/com/google/protobuf</directory>
|
||||
<includes>
|
||||
<!-- Keep in sync with //:BUILD -->
|
||||
<include>AbstractMessageLite.java</include>
|
||||
<include>AbstractParser.java</include>
|
||||
<include>AbstractProtobufList.java</include>
|
||||
<include>AllocatedBuffer.java</include>
|
||||
<include>Android.java</include>
|
||||
<include>ArrayDecoders.java</include>
|
||||
<include>BinaryReader.java</include>
|
||||
<include>BinaryWriter.java</include>
|
||||
<include>BooleanArrayList.java</include>
|
||||
<include>BufferAllocator.java</include>
|
||||
<include>ByteBufferWriter.java</include>
|
||||
<include>ByteOutput.java</include>
|
||||
<include>ByteString.java</include>
|
||||
<include>CodedInputStream.java</include>
|
||||
<include>CodedInputStreamReader.java</include>
|
||||
<include>CodedOutputStream.java</include>
|
||||
<include>CodedOutputStreamWriter.java</include>
|
||||
<include>DoubleArrayList.java</include>
|
||||
<include>ExperimentalApi.java</include>
|
||||
<include>ExtensionLite.java</include>
|
||||
<include>ExtensionRegistryFactory.java</include>
|
||||
<include>ExtensionRegistryLite.java</include>
|
||||
<include>ExtensionSchema.java</include>
|
||||
<include>ExtensionSchemaLite.java</include>
|
||||
<include>ExtensionSchemas.java</include>
|
||||
<include>FieldInfo.java</include>
|
||||
<include>FieldSet.java</include>
|
||||
<include>FieldType.java</include>
|
||||
<include>FloatArrayList.java</include>
|
||||
<include>GeneratedMessageInfoFactory.java</include>
|
||||
<include>GeneratedMessageLite.java</include>
|
||||
<include>IntArrayList.java</include>
|
||||
<include>Internal.java</include>
|
||||
<include>InvalidProtocolBufferException.java</include>
|
||||
<include>IterableByteBufferInputStream.java</include>
|
||||
<include>JavaType.java</include>
|
||||
<include>LazyField.java</include>
|
||||
<include>LazyFieldLite.java</include>
|
||||
<include>LazyStringArrayList.java</include>
|
||||
<include>LazyStringList.java</include>
|
||||
<include>ListFieldSchema.java</include>
|
||||
<include>LongArrayList.java</include>
|
||||
<include>ManifestSchemaFactory.java</include>
|
||||
<include>MapEntryLite.java</include>
|
||||
<include>MapFieldLite.java</include>
|
||||
<include>MapFieldSchema.java</include>
|
||||
<include>MapFieldSchemaLite.java</include>
|
||||
<include>MapFieldSchemas.java</include>
|
||||
<include>MessageInfo.java</include>
|
||||
<include>MessageInfoFactory.java</include>
|
||||
<include>MessageLite.java</include>
|
||||
<include>MessageLiteOrBuilder.java</include>
|
||||
<include>MessageLiteToString.java</include>
|
||||
<include>MessageSchema.java</include>
|
||||
<include>MessageSetSchema.java</include>
|
||||
<include>MutabilityOracle.java</include>
|
||||
<include>NewInstanceSchema.java</include>
|
||||
<include>NewInstanceSchemaLite.java</include>
|
||||
<include>NewInstanceSchemas.java</include>
|
||||
<include>NioByteString.java</include>
|
||||
<include>OneofInfo.java</include>
|
||||
<include>Parser.java</include>
|
||||
<include>PrimitiveNonBoxingCollection.java</include>
|
||||
<include>ProtoSyntax.java</include>
|
||||
<include>Protobuf.java</include>
|
||||
<include>ProtobufArrayList.java</include>
|
||||
<include>ProtobufLists.java</include>
|
||||
<include>ProtocolStringList.java</include>
|
||||
<include>RawMessageInfo.java</include>
|
||||
<include>Reader.java</include>
|
||||
<include>RopeByteString.java</include>
|
||||
<include>Schema.java</include>
|
||||
<include>SchemaFactory.java</include>
|
||||
<include>SchemaUtil.java</include>
|
||||
<include>SmallSortedMap.java</include>
|
||||
<include>StructuralMessageInfo.java</include>
|
||||
<include>TextFormatEscaper.java</include>
|
||||
<include>UninitializedMessageException.java</include>
|
||||
<include>UnknownFieldSchema.java</include>
|
||||
<include>UnknownFieldSetLite.java</include>
|
||||
<include>UnknownFieldSetLiteSchema.java</include>
|
||||
<include>UnmodifiableLazyStringList.java</include>
|
||||
<include>UnsafeUtil.java</include>
|
||||
<include>Utf8.java</include>
|
||||
<include>WireFormat.java</include>
|
||||
<include>Writer.java</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>copy-test-source-files</id>
|
||||
<phase>generate-test-sources</phase>
|
||||
<goals>
|
||||
<goal>copy-resources</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<outputDirectory>${generated.testsources.dir}/com/google/protobuf</outputDirectory>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>${basedir}/../core/src/test/java/com/google/protobuf</directory>
|
||||
<!-- For sources, we want to be explicit about what we add so we don't accidentally
|
||||
increase the size of the lite runtime library. For tests, we want to be defensive
|
||||
and exclude only the full runtime exclusive tests so we don't accidentally miss
|
||||
any test. -->
|
||||
<excludes>
|
||||
<exclude>AbstractMessageTest.java</exclude>
|
||||
<exclude>AbstractProto2SchemaTest.java</exclude>
|
||||
<exclude>AnyTest.java</exclude>
|
||||
<exclude>CodedInputStreamTest.java</exclude>
|
||||
<exclude>DeprecatedFieldTest.java</exclude>
|
||||
<exclude>DescriptorsTest.java</exclude>
|
||||
<exclude>DiscardUnknownFieldsTest.java</exclude>
|
||||
<exclude>DynamicMessageTest.java</exclude>
|
||||
<exclude>ExtensionRegistryFactoryTest.java</exclude>
|
||||
<exclude>FieldPresenceTest.java</exclude>
|
||||
<exclude>ForceFieldBuildersPreRun.java</exclude>
|
||||
<exclude>GeneratedMessageTest.java</exclude>
|
||||
<exclude>LazyFieldTest.java</exclude>
|
||||
<exclude>LazyStringEndToEndTest.java</exclude>
|
||||
<exclude>MapForProto2Test.java</exclude>
|
||||
<exclude>MapTest.java</exclude>
|
||||
<exclude>MessageTest.java</exclude>
|
||||
<exclude>NestedBuildersTest.java</exclude>
|
||||
<exclude>PackedFieldTest.java</exclude>
|
||||
<exclude>ParserTest.java</exclude>
|
||||
<exclude>ParseExceptionsTest.java</exclude>
|
||||
<exclude>Proto2ExtensionLookupSchemaTest.java</exclude>
|
||||
<exclude>Proto2SchemaTest.java</exclude>
|
||||
<exclude>Proto2UnknownEnumValueTest.java</exclude>
|
||||
<exclude>RepeatedFieldBuilderV3Test.java</exclude>
|
||||
<exclude>ServiceTest.java</exclude>
|
||||
<exclude>SingleFieldBuilderV3Test.java</exclude>
|
||||
<exclude>TestBadIdentifiers.java</exclude>
|
||||
<exclude>TextFormatParseInfoTreeTest.java</exclude>
|
||||
<exclude>TextFormatParseLocationTest.java</exclude>
|
||||
<exclude>TextFormatTest.java</exclude>
|
||||
<exclude>TestUtil.java</exclude>
|
||||
<exclude>TypeRegistryTest.java</exclude>
|
||||
<exclude>UnknownEnumValueTest.java</exclude>
|
||||
<exclude>UnknownFieldSetLiteTest.java</exclude>
|
||||
<exclude>UnknownFieldSetTest.java</exclude>
|
||||
<exclude>WellKnownTypesTest.java</exclude>
|
||||
<exclude>WireFormatTest.java</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
</resources>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- Use Antrun plugin to generate sources with protoc -->
|
||||
<plugin>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<executions>
|
||||
<!-- Generate core protos -->
|
||||
<execution>
|
||||
<id>generate-sources</id>
|
||||
<phase>generate-sources</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
<ant antfile="generate-sources-build.xml"/>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
|
||||
<!-- Generate the test protos -->
|
||||
<execution>
|
||||
<id>generate-test-sources</id>
|
||||
<phase>generate-test-sources</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
<ant antfile="generate-test-sources-build.xml"/>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
|
||||
<execution>
|
||||
<id>process-lite-sources</id>
|
||||
<phase>generate-test-sources</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
<ant antfile="process-lite-sources-build.xml"/>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>add-generated-sources</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>add-source</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<sources>
|
||||
<source>${generated.sources.dir}</source>
|
||||
</sources>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
<execution>
|
||||
<id>add-generated-test-sources</id>
|
||||
<phase>generate-test-sources</phase>
|
||||
<goals>
|
||||
<goal>add-test-source</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<sources>
|
||||
<source>${generated.testsources.dir}</source>
|
||||
</sources>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- OSGI bundle configuration -->
|
||||
<plugin>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<instructions>
|
||||
<Automatic-Module-Name>com.google.protobuf</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
|
||||
<Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
|
||||
<Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
|
||||
<Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
|
||||
<Import-Package>sun.misc;resolution:=optional,*</Import-Package>
|
||||
</instructions>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-parent</artifactId>
|
||||
<version>3.10.0-rc-0</version>
|
||||
<version>3.10.0</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>Protocol Buffers [Parent]</name>
|
||||
|
||||
247
java/pom.xml.orig
Normal file
247
java/pom.xml.orig
Normal file
@ -0,0 +1,247 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-parent</artifactId>
|
||||
<<<<<<< HEAD
|
||||
<version>3.10.0-rc-0</version>
|
||||
=======
|
||||
<version>3.10.0</version>
|
||||
>>>>>>> 3.10.x
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>Protocol Buffers [Parent]</name>
|
||||
<inceptionYear>2008</inceptionYear>
|
||||
<url>https://developers.google.com/protocol-buffers/</url>
|
||||
<description>
|
||||
Protocol Buffers are a way of encoding structured data in an efficient yet
|
||||
extensible format.
|
||||
</description>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<id>haon</id>
|
||||
<name>Hao Nguyen</name>
|
||||
<email>haon@google.com</email>
|
||||
<organization>Google</organization>
|
||||
<organizationUrl>https://cloud.google.com</organizationUrl>
|
||||
<timezone>America/Los_Angeles</timezone>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
|
||||
<!-- These are relative to the submodules -->
|
||||
<protobuf.basedir>${project.basedir}/../..</protobuf.basedir>
|
||||
<protobuf.source.dir>${protobuf.basedir}/src</protobuf.source.dir>
|
||||
<protoc>${protobuf.source.dir}/protoc</protoc>
|
||||
<test.proto.dir>src/test/proto</test.proto.dir>
|
||||
<generated.sources.dir>${project.build.directory}/generated-sources</generated.sources.dir>
|
||||
<generated.testsources.dir>${project.build.directory}/generated-test-sources</generated.testsources.dir>
|
||||
</properties>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>3-Clause BSD License</name>
|
||||
<url>https://opensource.org/licenses/BSD-3-Clause</url>
|
||||
<distribution>repo</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<scm>
|
||||
<url>https://github.com/protocolbuffers/protobuf</url>
|
||||
<connection>scm:git:https://github.com/protocolbuffers/protobuf.git</connection>
|
||||
</scm>
|
||||
|
||||
<distributionManagement>
|
||||
<snapshotRepository>
|
||||
<id>sonatype-nexus-staging</id>
|
||||
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
|
||||
</snapshotRepository>
|
||||
<repository>
|
||||
<id>sonatype-nexus-staging</id>
|
||||
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-bom</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.12</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.easymock</groupId>
|
||||
<artifactId>easymock</artifactId>
|
||||
<version>2.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.easymock</groupId>
|
||||
<artifactId>easymockclassextension</artifactId>
|
||||
<version>2.2.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>28.0-android</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava-testlib</artifactId>
|
||||
<version>28.0-jre</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.truth</groupId>
|
||||
<artifactId>truth</artifactId>
|
||||
<version>1.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.6.1</version>
|
||||
<configuration>
|
||||
<source>1.7</source>
|
||||
<target>1.7</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>2.4</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-sources</id>
|
||||
<goals>
|
||||
<goal>jar-no-fork</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.10.3</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-javadocs</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<failOnError>false</failOnError>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>2.6</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<version>1.10</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
<version>3.0.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<version>1.8</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>release</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>2.2.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-sources</id>
|
||||
<goals>
|
||||
<goal>jar-no-fork</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.10.3</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-javadocs</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<failOnError>false</failOnError>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-gpg-plugin</artifactId>
|
||||
<version>1.6</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>sign-artifacts</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>sign</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.sonatype.plugins</groupId>
|
||||
<artifactId>nexus-staging-maven-plugin</artifactId>
|
||||
<version>1.6.6</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<serverId>sonatype-nexus-staging</serverId>
|
||||
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
|
||||
<autoReleaseAfterClose>false</autoReleaseAfterClose>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<modules>
|
||||
<module>bom</module>
|
||||
<module>lite</module>
|
||||
<module>core</module>
|
||||
<module>util</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-parent</artifactId>
|
||||
<version>3.10.0-rc-0</version>
|
||||
<version>3.10.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>protobuf-java-util</artifactId>
|
||||
|
||||
144
java/util/pom.xml.orig
Normal file
144
java/util/pom.xml.orig
Normal file
@ -0,0 +1,144 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-parent</artifactId>
|
||||
<<<<<<< HEAD
|
||||
<version>3.10.0-rc-0</version>
|
||||
=======
|
||||
<version>3.10.0</version>
|
||||
>>>>>>> 3.10.x
|
||||
</parent>
|
||||
|
||||
<artifactId>protobuf-java-util</artifactId>
|
||||
<packaging>bundle</packaging>
|
||||
|
||||
<name>Protocol Buffers [Util]</name>
|
||||
<description>Utilities for Protocol Buffers</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.errorprone</groupId>
|
||||
<artifactId>error_prone_annotations</artifactId>
|
||||
<version>2.3.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava-testlib</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.code.gson</groupId>
|
||||
<artifactId>gson</artifactId>
|
||||
<version>2.8.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.easymock</groupId>
|
||||
<artifactId>easymock</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.easymock</groupId>
|
||||
<artifactId>easymockclassextension</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.truth</groupId>
|
||||
<artifactId>truth</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<properties>
|
||||
<!-- Use the core proto dir so that we can call the core generation script -->
|
||||
<test.proto.dir>../core/src/test/proto</test.proto.dir>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<executions>
|
||||
<!-- Generate the test protos -->
|
||||
<execution>
|
||||
<id>generate-test-sources</id>
|
||||
<phase>generate-test-sources</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
<!-- Generate all of the test protos from the core module -->
|
||||
<ant antfile="../core/generate-test-sources-build.xml"/>
|
||||
|
||||
<!-- Generate additional test protos for this module -->
|
||||
<exec executable="${protoc}">
|
||||
<arg value="--java_out=${generated.testsources.dir}"/>
|
||||
<arg value="--proto_path=${protobuf.source.dir}"/>
|
||||
<arg value="--proto_path=src/test/proto"/>
|
||||
<arg value="src/test/proto/com/google/protobuf/util/json_test.proto"/>
|
||||
</exec>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- Add the generated test sources to the build -->
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>add-generated-test-sources</id>
|
||||
<phase>generate-test-sources</phase>
|
||||
<goals>
|
||||
<goal>add-test-source</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<sources>
|
||||
<source>${generated.testsources.dir}</source>
|
||||
</sources>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- Configure the OSGI bundle -->
|
||||
<plugin>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<instructions>
|
||||
<Automatic-Module-Name>com.google.protobuf.util</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
|
||||
<Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
|
||||
<Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName>
|
||||
<Export-Package>com.google.protobuf.util;version=${project.version}</Export-Package>
|
||||
</instructions>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- Configure the fat jar to include all dependencies -->
|
||||
<plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<configuration>
|
||||
<descriptorRefs>
|
||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||
</descriptorRefs>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "google-protobuf",
|
||||
"version": "3.10.0-rc.0",
|
||||
"version": "3.10.0",
|
||||
"description": "Protocol Buffers for JavaScript",
|
||||
"main": "google-protobuf.js",
|
||||
"files": [
|
||||
|
||||
30
js/package.json.orig
Normal file
30
js/package.json.orig
Normal file
@ -0,0 +1,30 @@
|
||||
{
|
||||
"name": "google-protobuf",
|
||||
<<<<<<< HEAD
|
||||
"version": "3.10.0-rc.0",
|
||||
=======
|
||||
"version": "3.10.0",
|
||||
>>>>>>> 3.10.x
|
||||
"description": "Protocol Buffers for JavaScript",
|
||||
"main": "google-protobuf.js",
|
||||
"files": [
|
||||
"google"
|
||||
],
|
||||
"dependencies": {},
|
||||
"devDependencies": {
|
||||
"glob": "~7.1.4",
|
||||
"google-closure-compiler": "~20190819.0.0",
|
||||
"google-closure-library": "~20190819.0.0",
|
||||
"gulp": "~4.0.2",
|
||||
"jasmine": "~3.4.0"
|
||||
},
|
||||
"scripts": {
|
||||
"test": "node ./node_modules/gulp/bin/gulp.js test"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/protocolbuffers/protobuf/tree/master/js"
|
||||
},
|
||||
"author": "Google Protocol Buffers Team",
|
||||
"license": "BSD-3-Clause"
|
||||
}
|
||||
32
php/ext/google/protobuf/LICENSE
Normal file
32
php/ext/google/protobuf/LICENSE
Normal file
@ -0,0 +1,32 @@
|
||||
Copyright 2008 Google Inc. All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above
|
||||
copyright notice, this list of conditions and the following disclaimer
|
||||
in the documentation and/or other materials provided with the
|
||||
distribution.
|
||||
* Neither the name of Google Inc. nor the names of its
|
||||
contributors may be used to endorse or promote products derived from
|
||||
this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
Code generated by the Protocol Buffer compiler is owned by the owner
|
||||
of the input file used when generating it. This code is not
|
||||
standalone and requires a support library to be linked with it. This
|
||||
support library is itself covered by the above license.
|
||||
@ -10,15 +10,15 @@
|
||||
<email>protobuf-opensource@google.com</email>
|
||||
<active>yes</active>
|
||||
</lead>
|
||||
<date>2019-09-17</date>
|
||||
<time>16:00:29</time>
|
||||
<date>2019-09-12</date>
|
||||
<time>13:48:02</time>
|
||||
<version>
|
||||
<release>3.10.0RC0</release>
|
||||
<release>3.10.0</release>
|
||||
<api>3.10.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>beta</release>
|
||||
<api>beta</api>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
@ -389,5 +389,47 @@ G A release.
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.10.0RC1</release>
|
||||
<api>3.10.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>beta</release>
|
||||
<api>beta</api>
|
||||
</stability>
|
||||
<date>2019-09-04</date>
|
||||
<time>13:24:25</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.10.0RC1</release>
|
||||
<api>3.10.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>beta</release>
|
||||
<api>beta</api>
|
||||
</stability>
|
||||
<date>2019-09-05</date>
|
||||
<time>10:12:46</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.10.0</release>
|
||||
<api>3.10.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2019-09-12</date>
|
||||
<time>13:48:02</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
</changelog>
|
||||
</package>
|
||||
|
||||
442
php/ext/google/protobuf/package.xml.orig
Normal file
442
php/ext/google/protobuf/package.xml.orig
Normal file
@ -0,0 +1,442 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<package packagerversion="1.9.5" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
|
||||
<name>protobuf</name>
|
||||
<channel>pecl.php.net</channel>
|
||||
<summary>Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.</summary>
|
||||
<description>https://developers.google.com/protocol-buffers/</description>
|
||||
<lead>
|
||||
<name>Bo Yang</name>
|
||||
<user>stanleycheung</user>
|
||||
<email>protobuf-opensource@google.com</email>
|
||||
<active>yes</active>
|
||||
</lead>
|
||||
<<<<<<< HEAD
|
||||
<date>2019-09-17</date>
|
||||
<time>16:00:29</time>
|
||||
<version>
|
||||
<release>3.10.0RC0</release>
|
||||
=======
|
||||
<date>2019-09-12</date>
|
||||
<time>13:48:02</time>
|
||||
<version>
|
||||
<release>3.10.0</release>
|
||||
>>>>>>> 3.10.x
|
||||
<api>3.10.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>beta</release>
|
||||
<api>beta</api>
|
||||
</stability>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
<contents>
|
||||
<dir baseinstalldir="/" name="/">
|
||||
<file baseinstalldir="/" name="config.m4" role="src"/>
|
||||
<file baseinstalldir="/" name="array.c" role="src"/>
|
||||
<file baseinstalldir="/" name="builtin_descriptors.inc" role="src"/>
|
||||
<file baseinstalldir="/" name="def.c" role="src"/>
|
||||
<file baseinstalldir="/" name="encode_decode.c" role="src"/>
|
||||
<file baseinstalldir="/" name="map.c" role="src"/>
|
||||
<file baseinstalldir="/" name="message.c" role="src"/>
|
||||
<file baseinstalldir="/" name="protobuf.c" role="src"/>
|
||||
<file baseinstalldir="/" name="protobuf.h" role="src"/>
|
||||
<file baseinstalldir="/" name="storage.c" role="src"/>
|
||||
<file baseinstalldir="/" name="type_check.c" role="src"/>
|
||||
<file baseinstalldir="/" name="upb.c" role="src"/>
|
||||
<file baseinstalldir="/" name="upb.h" role="src"/>
|
||||
<file baseinstalldir="/" name="utf8.c" role="src"/>
|
||||
<file baseinstalldir="/" name="utf8.h" role="src"/>
|
||||
<file baseinstalldir="/" name="LICENSE" role="doc"/>
|
||||
</dir>
|
||||
</contents>
|
||||
<dependencies>
|
||||
<required>
|
||||
<php>
|
||||
<min>5.5.9</min>
|
||||
</php>
|
||||
<pearinstaller>
|
||||
<min>1.4.0</min>
|
||||
</pearinstaller>
|
||||
</required>
|
||||
</dependencies>
|
||||
<providesextension>protobuf</providesextension>
|
||||
<extsrcrelease/>
|
||||
<changelog>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.1.0a1</release>
|
||||
<api>3.1.0a1</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>alpha</release>
|
||||
<api>alpha</api>
|
||||
</stability>
|
||||
<date>2016-09-23</date>
|
||||
<time>16:06:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
First alpha release
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.2.0a1</release>
|
||||
<api>3.2.0a1</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>alpha</release>
|
||||
<api>alpha</api>
|
||||
</stability>
|
||||
<date>2017-01-13</date>
|
||||
<time>16:06:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
Second alpha release.
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.3.0</release>
|
||||
<api>3.3.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2017-04-28</date>
|
||||
<time>16:06:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
GA release.
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.3.1</release>
|
||||
<api>3.3.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2017-05-08</date>
|
||||
<time>15:33:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
GA release.
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.3.2</release>
|
||||
<api>3.3.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2017-06-21</date>
|
||||
<time>15:33:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
GA release.
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.4.0</release>
|
||||
<api>3.4.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2017-08-16</date>
|
||||
<time>15:33:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
GA release.
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.4.1</release>
|
||||
<api>3.4.1</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2017-09-14</date>
|
||||
<time>11:02:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
GA release.
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.5.0</release>
|
||||
<api>3.5.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2017-11-15</date>
|
||||
<time>11:02:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
GA release.
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.5.0.1</release>
|
||||
<api>3.5.0.1</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2017-12-06</date>
|
||||
<time>11:02:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
GA release.
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.5.1</release>
|
||||
<api>3.5.1</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2017-12-11</date>
|
||||
<time>11:02:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
GA release.
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.5.2</release>
|
||||
<api>3.5.2</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2018-03-06</date>
|
||||
<time>11:02:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
G A release.
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.6.0</release>
|
||||
<api>3.6.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2018-06-06</date>
|
||||
<time>11:02:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
G A release.
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.6.1</release>
|
||||
<api>3.6.1</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2018-08-03</date>
|
||||
<time>11:02:07</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>
|
||||
G A release.
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.7.0RC2</release>
|
||||
<api>3.7.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2019-02-1</date>
|
||||
<time>10:22:43</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.7.0RC3</release>
|
||||
<api>3.7.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>beta</release>
|
||||
<api>beta</api>
|
||||
</stability>
|
||||
<date>2019-02-22</date>
|
||||
<time>11:31:21</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.7.0</release>
|
||||
<api>3.7.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2019-02-28</date>
|
||||
<time>10:19:15</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.7.1</release>
|
||||
<api>3.7.1</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2019-03-25</date>
|
||||
<time>13:23:39</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.8.0RC1</release>
|
||||
<api>3.8.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>beta</release>
|
||||
<api>beta</api>
|
||||
</stability>
|
||||
<date>2019-04-23</date>
|
||||
<time>16:14:52</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.8.0</release>
|
||||
<api>3.8.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2019-05-21</date>
|
||||
<time>14:07:13</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.9.0RC1</release>
|
||||
<api>3.9.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>beta</release>
|
||||
<api>beta</api>
|
||||
</stability>
|
||||
<date>2019-06-17</date>
|
||||
<time>09:34:50</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.9.0</release>
|
||||
<api>3.9.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2019-07-10</date>
|
||||
<time>16:50:08</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.9.1</release>
|
||||
<api>3.9.1</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2019-08-02</date>
|
||||
<time>15:59:08</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.10.0RC1</release>
|
||||
<api>3.10.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>beta</release>
|
||||
<api>beta</api>
|
||||
</stability>
|
||||
<date>2019-09-04</date>
|
||||
<time>13:24:25</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.10.0RC1</release>
|
||||
<api>3.10.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>beta</release>
|
||||
<api>beta</api>
|
||||
</stability>
|
||||
<date>2019-09-05</date>
|
||||
<time>10:12:46</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
<release>
|
||||
<version>
|
||||
<release>3.10.0</release>
|
||||
<api>3.10.0</api>
|
||||
</version>
|
||||
<stability>
|
||||
<release>stable</release>
|
||||
<api>stable</api>
|
||||
</stability>
|
||||
<date>2019-09-12</date>
|
||||
<time>13:48:02</time>
|
||||
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
|
||||
<notes>GA release.</notes>
|
||||
</release>
|
||||
</changelog>
|
||||
</package>
|
||||
@ -37,7 +37,7 @@
|
||||
#include "upb.h"
|
||||
|
||||
#define PHP_PROTOBUF_EXTNAME "protobuf"
|
||||
#define PHP_PROTOBUF_VERSION "3.10.0RC0"
|
||||
#define PHP_PROTOBUF_VERSION "3.10.0"
|
||||
|
||||
#define MAX_LENGTH_OF_INT64 20
|
||||
#define SIZEOF_INT64 8
|
||||
|
||||
1523
php/ext/google/protobuf/protobuf.h.orig
Normal file
1523
php/ext/google/protobuf/protobuf.h.orig
Normal file
File diff suppressed because it is too large
Load Diff
@ -28,6 +28,60 @@
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
// The Zend Engine License, version 2.00
|
||||
// Copyright (c) 1999-2002 Zend Technologies Ltd. All rights reserved.
|
||||
// --------------------------------------------------------------------
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, is permitted provided that the following conditions
|
||||
// are met:
|
||||
//
|
||||
// 1. Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
//
|
||||
// 2. Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following
|
||||
// disclaimer in the documentation and/or other materials provided
|
||||
// with the distribution.
|
||||
//
|
||||
// 3. The names "Zend" and "Zend Engine" must not be used to endorse
|
||||
// or promote products derived from this software without prior
|
||||
// permission from Zend Technologies Ltd. For written permission,
|
||||
// please contact license@zend.com.
|
||||
//
|
||||
// 4. Zend Technologies Ltd. may publish revised and/or new versions
|
||||
// of the license from time to time. Each version will be given a
|
||||
// distinguishing version number.
|
||||
// Once covered code has been published under a particular version
|
||||
// of the license, you may always continue to use it under the
|
||||
// terms of that version. You may also choose to use such covered
|
||||
// code under the terms of any subsequent version of the license
|
||||
// published by Zend Technologies Ltd. No one other than Zend
|
||||
// Technologies Ltd. has the right to modify the terms applicable
|
||||
// to covered code created under this License.
|
||||
//
|
||||
// 5. Redistributions of any form whatsoever must retain the following
|
||||
// acknowledgment:
|
||||
// "This product includes the Zend Engine, freely available at
|
||||
// http://www.zend.com"
|
||||
//
|
||||
// 6. All advertising materials mentioning features or use of this
|
||||
// software must display the following acknowledgment:
|
||||
// "The Zend Engine is freely available at http://www.zend.com"
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND
|
||||
// ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
||||
// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
||||
// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ZEND
|
||||
// TECHNOLOGIES LTD. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
||||
// USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
// SUCH DAMAGE.
|
||||
|
||||
#include <Zend/zend_operators.h>
|
||||
#include <Zend/zend_exceptions.h>
|
||||
|
||||
|
||||
@ -10131,32 +10131,28 @@ const unsigned short int __mon_yday[2][13] = {
|
||||
{ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
|
||||
};
|
||||
|
||||
int64_t epoch(int year, int yday, int hour, int min, int sec) {
|
||||
int64_t years = year - EPOCH_YEAR;
|
||||
/* epoch_days(1970, 1, 1) == 1970-01-01 == 0. */
|
||||
static int epoch_days(int year, int month, int day) {
|
||||
static const uint16_t month_yday[12] = {0, 31, 59, 90, 120, 151,
|
||||
181, 212, 243, 273, 304, 334};
|
||||
int febs_since_0 = month > 2 ? year + 1 : year;
|
||||
int leap_days_since_0 = div_round_up(febs_since_0, 4) -
|
||||
div_round_up(febs_since_0, 100) +
|
||||
div_round_up(febs_since_0, 400);
|
||||
int days_since_0 =
|
||||
365 * year + month_yday[month - 1] + (day - 1) + leap_days_since_0;
|
||||
|
||||
int64_t leap_days = years / 4 - years / 100 + years / 400;
|
||||
|
||||
int64_t days = years * 365 + yday + leap_days;
|
||||
int64_t hours = days * 24 + hour;
|
||||
int64_t mins = hours * 60 + min;
|
||||
int64_t secs = mins * 60 + sec;
|
||||
return secs;
|
||||
/* Convert from 0-epoch (0001-01-01 BC) to Unix Epoch (1970-01-01 AD).
|
||||
* Since the "BC" system does not have a year zero, 1 BC == year zero. */
|
||||
return days_since_0 - 719528;
|
||||
}
|
||||
|
||||
|
||||
static int64_t upb_mktime(const struct tm *tp) {
|
||||
int sec = tp->tm_sec;
|
||||
int min = tp->tm_min;
|
||||
int hour = tp->tm_hour;
|
||||
int mday = tp->tm_mday;
|
||||
int mon = tp->tm_mon;
|
||||
int year = tp->tm_year + TM_YEAR_BASE;
|
||||
|
||||
/* Calculate day of year from year, month, and day of month. */
|
||||
int mon_yday = ((__mon_yday[isleap(year)][mon]) - 1);
|
||||
int yday = mon_yday + mday;
|
||||
|
||||
return epoch(year, yday, hour, min, sec);
|
||||
static int64_t upb_timegm(const struct tm *tp) {
|
||||
int64_t ret = epoch_days(tp->tm_year + 1900, tp->tm_mon + 1, tp->tm_mday);
|
||||
ret = (ret * 24) + tp->tm_hour;
|
||||
ret = (ret * 60) + tp->tm_min;
|
||||
ret = (ret * 60) + tp->tm_sec;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static bool end_timestamp_zone(upb_json_parser *p, const char *ptr) {
|
||||
@ -10186,7 +10182,7 @@ static bool end_timestamp_zone(upb_json_parser *p, const char *ptr) {
|
||||
}
|
||||
|
||||
/* Normalize tm */
|
||||
seconds = upb_mktime(&p->tm);
|
||||
seconds = upb_timegm(&p->tm);
|
||||
|
||||
/* Check timestamp boundary */
|
||||
if (seconds < -62135596800) {
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
</parent>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protoc</artifactId>
|
||||
<version>3.10.0-rc-0</version>
|
||||
<version>3.10.0</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>Protobuf Compiler</name>
|
||||
<description>
|
||||
|
||||
148
protoc-artifacts/pom.xml.orig
Normal file
148
protoc-artifacts/pom.xml.orig
Normal file
@ -0,0 +1,148 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.google</groupId>
|
||||
<artifactId>google</artifactId>
|
||||
<version>1</version>
|
||||
</parent>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protoc</artifactId>
|
||||
<<<<<<< HEAD
|
||||
<version>3.10.0-rc-0</version>
|
||||
=======
|
||||
<version>3.10.0</version>
|
||||
>>>>>>> 3.10.x
|
||||
<packaging>pom</packaging>
|
||||
<name>Protobuf Compiler</name>
|
||||
<description>
|
||||
Protobuf Compiler (protoc) is a compiler for .proto files. It generates
|
||||
language-specific code for Protobuf messages and RPC interfaces.
|
||||
</description>
|
||||
<inceptionYear>2008</inceptionYear>
|
||||
<url>https://developers.google.com/protocol-buffers/</url>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>3-Clause BSD License</name>
|
||||
<url>https://opensource.org/licenses/BSD-3-Clause</url>
|
||||
<distribution>repo</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
<scm>
|
||||
<url>https://github.com/protocolbuffers/protobuf</url>
|
||||
<connection>
|
||||
scm:git:https://github.com/protocolbuffers/protobuf.git
|
||||
</connection>
|
||||
</scm>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<version>1.8</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-artifacts</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>attach-artifact</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifacts>
|
||||
<artifact>
|
||||
<file>${basedir}/target/linux/x86_64/protoc.exe</file>
|
||||
<classifier>linux-x86_64</classifier>
|
||||
<type>exe</type>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<file>${basedir}/target/linux/x86_32/protoc.exe</file>
|
||||
<classifier>linux-x86_32</classifier>
|
||||
<type>exe</type>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<file>${basedir}/target/windows/x86_64/protoc.exe</file>
|
||||
<classifier>windows-x86_64</classifier>
|
||||
<type>exe</type>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<file>${basedir}/target/windows/x86_32/protoc.exe</file>
|
||||
<classifier>windows-x86_32</classifier>
|
||||
<type>exe</type>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<file>${basedir}/target/osx/x86_64/protoc.exe</file>
|
||||
<classifier>osx-x86_64</classifier>
|
||||
<type>exe</type>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<file>${basedir}/target/osx/x86_32/protoc.exe</file>
|
||||
<classifier>osx-x86_32</classifier>
|
||||
<type>exe</type>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<file>${basedir}/target/linux/aarch_64/protoc.exe</file>
|
||||
<classifier>linux-aarch_64</classifier>
|
||||
<type>exe</type>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<file>${basedir}/target/linux/ppcle_64/protoc.exe</file>
|
||||
<classifier>linux-ppcle_64</classifier>
|
||||
<type>exe</type>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<file>${basedir}/target/linux/s390x_64/protoc.exe</file>
|
||||
<classifier>linux-s390x_64</classifier>
|
||||
<type>exe</type>
|
||||
</artifact>
|
||||
</artifacts>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>release</id>
|
||||
<properties>
|
||||
<!-- Specify the staging repository to deploy to. This can be left
|
||||
empty for the first deployment, and Sonatype will create one. For
|
||||
subsequent deployments it should be set to what Sonatype has
|
||||
created, so that all deployments will go to the same repository.
|
||||
-->
|
||||
<staging.repository/>
|
||||
</properties>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-gpg-plugin</artifactId>
|
||||
<version>1.5</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>sign-artifacts</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>sign</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.sonatype.plugins</groupId>
|
||||
<artifactId>nexus-staging-maven-plugin</artifactId>
|
||||
<version>1.6.3</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<serverId>sonatype-nexus-staging</serverId>
|
||||
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
|
||||
<skipStagingRepositoryClose>true</skipStagingRepositoryClose>
|
||||
<autoReleaseAfterClose>false</autoReleaseAfterClose>
|
||||
<stagingRepositoryId>${staging.repository}</stagingRepositoryId>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
# Copyright 2007 Google Inc. All Rights Reserved.
|
||||
|
||||
__version__ = '3.10.0rc0'
|
||||
__version__ = '3.10.0'
|
||||
|
||||
if __name__ != '__main__':
|
||||
try:
|
||||
|
||||
43
python/google/protobuf/__init__.py.orig
Executable file
43
python/google/protobuf/__init__.py.orig
Executable file
@ -0,0 +1,43 @@
|
||||
# Protocol Buffers - Google's data interchange format
|
||||
# Copyright 2008 Google Inc. All rights reserved.
|
||||
# https://developers.google.com/protocol-buffers/
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above
|
||||
# copyright notice, this list of conditions and the following disclaimer
|
||||
# in the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# * Neither the name of Google Inc. nor the names of its
|
||||
# contributors may be used to endorse or promote products derived from
|
||||
# this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
# Copyright 2007 Google Inc. All Rights Reserved.
|
||||
|
||||
<<<<<<< HEAD
|
||||
__version__ = '3.10.0rc0'
|
||||
=======
|
||||
__version__ = '3.10.0'
|
||||
>>>>>>> 3.10.x
|
||||
|
||||
if __name__ != '__main__':
|
||||
try:
|
||||
__import__('pkg_resources').declare_namespace(__name__)
|
||||
except ImportError:
|
||||
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
|
||||
@ -10117,46 +10117,28 @@ static void start_timestamp_zone(upb_json_parser *p, const char *ptr) {
|
||||
capture_begin(p, ptr);
|
||||
}
|
||||
|
||||
#define EPOCH_YEAR 1970
|
||||
#define TM_YEAR_BASE 1900
|
||||
/* epoch_days(1970, 1, 1) == 1970-01-01 == 0. */
|
||||
static int epoch_days(int year, int month, int day) {
|
||||
static const uint16_t month_yday[12] = {0, 31, 59, 90, 120, 151,
|
||||
181, 212, 243, 273, 304, 334};
|
||||
int febs_since_0 = month > 2 ? year + 1 : year;
|
||||
int leap_days_since_0 = div_round_up(febs_since_0, 4) -
|
||||
div_round_up(febs_since_0, 100) +
|
||||
div_round_up(febs_since_0, 400);
|
||||
int days_since_0 =
|
||||
365 * year + month_yday[month - 1] + (day - 1) + leap_days_since_0;
|
||||
|
||||
static bool isleap(int year) {
|
||||
return (year % 4) == 0 && (year % 100 != 0 || (year % 400) == 0);
|
||||
/* Convert from 0-epoch (0001-01-01 BC) to Unix Epoch (1970-01-01 AD).
|
||||
* Since the "BC" system does not have a year zero, 1 BC == year zero. */
|
||||
return days_since_0 - 719528;
|
||||
}
|
||||
|
||||
const unsigned short int __mon_yday[2][13] = {
|
||||
/* Normal years. */
|
||||
{ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
|
||||
/* Leap years. */
|
||||
{ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
|
||||
};
|
||||
|
||||
int64_t epoch(int year, int yday, int hour, int min, int sec) {
|
||||
int64_t years = year - EPOCH_YEAR;
|
||||
|
||||
int64_t leap_days = years / 4 - years / 100 + years / 400;
|
||||
|
||||
int64_t days = years * 365 + yday + leap_days;
|
||||
int64_t hours = days * 24 + hour;
|
||||
int64_t mins = hours * 60 + min;
|
||||
int64_t secs = mins * 60 + sec;
|
||||
return secs;
|
||||
}
|
||||
|
||||
|
||||
static int64_t upb_mktime(const struct tm *tp) {
|
||||
int sec = tp->tm_sec;
|
||||
int min = tp->tm_min;
|
||||
int hour = tp->tm_hour;
|
||||
int mday = tp->tm_mday;
|
||||
int mon = tp->tm_mon;
|
||||
int year = tp->tm_year + TM_YEAR_BASE;
|
||||
|
||||
/* Calculate day of year from year, month, and day of month. */
|
||||
int mon_yday = ((__mon_yday[isleap(year)][mon]) - 1);
|
||||
int yday = mon_yday + mday;
|
||||
|
||||
return epoch(year, yday, hour, min, sec);
|
||||
static int64_t upb_timegm(const struct tm *tp) {
|
||||
int64_t ret = epoch_days(tp->tm_year + 1900, tp->tm_mon + 1, tp->tm_mday);
|
||||
ret = (ret * 24) + tp->tm_hour;
|
||||
ret = (ret * 60) + tp->tm_min;
|
||||
ret = (ret * 60) + tp->tm_sec;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static bool end_timestamp_zone(upb_json_parser *p, const char *ptr) {
|
||||
@ -10186,7 +10168,7 @@ static bool end_timestamp_zone(upb_json_parser *p, const char *ptr) {
|
||||
}
|
||||
|
||||
/* Normalize tm */
|
||||
seconds = upb_mktime(&p->tm);
|
||||
seconds = upb_timegm(&p->tm);
|
||||
|
||||
/* Check timestamp boundary */
|
||||
if (seconds < -62135596800) {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Gem::Specification.new do |s|
|
||||
s.name = "google-protobuf"
|
||||
s.version = "3.10.0.rc.0"
|
||||
s.version = "3.10.0"
|
||||
git_tag = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag
|
||||
s.licenses = ["BSD-3-Clause"]
|
||||
s.summary = "Protocol Buffers"
|
||||
|
||||
33
ruby/google-protobuf.gemspec.orig
Normal file
33
ruby/google-protobuf.gemspec.orig
Normal file
@ -0,0 +1,33 @@
|
||||
Gem::Specification.new do |s|
|
||||
s.name = "google-protobuf"
|
||||
<<<<<<< HEAD
|
||||
s.version = "3.10.0.rc.0"
|
||||
=======
|
||||
s.version = "3.10.0"
|
||||
>>>>>>> 3.10.x
|
||||
git_tag = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag
|
||||
s.licenses = ["BSD-3-Clause"]
|
||||
s.summary = "Protocol Buffers"
|
||||
s.description = "Protocol Buffers are Google's data interchange format."
|
||||
s.homepage = "https://developers.google.com/protocol-buffers"
|
||||
s.authors = ["Protobuf Authors"]
|
||||
s.email = "protobuf@googlegroups.com"
|
||||
s.metadata = { "source_code_uri" => "https://github.com/protocolbuffers/protobuf/tree/#{git_tag}/ruby" }
|
||||
s.require_paths = ["lib"]
|
||||
s.files = Dir.glob('lib/**/*.rb')
|
||||
if RUBY_PLATFORM == "java"
|
||||
s.platform = "java"
|
||||
s.files += ["lib/google/protobuf_java.jar"]
|
||||
else
|
||||
s.files += Dir.glob('ext/**/*')
|
||||
s.extensions= ["ext/google/protobuf_c/extconf.rb"]
|
||||
s.add_development_dependency "rake-compiler-dock", "~> 0.6.0"
|
||||
end
|
||||
s.test_files = ["tests/basic.rb",
|
||||
"tests/stress.rb",
|
||||
"tests/generated_code_test.rb"]
|
||||
s.required_ruby_version = '>= 2.3'
|
||||
s.add_development_dependency "rake-compiler", "~> 0.9.5"
|
||||
s.add_development_dependency "test-unit", '~> 3.0', '>= 3.0.9'
|
||||
s.add_development_dependency "rubygems-tasks", "~> 0.2.4"
|
||||
end
|
||||
@ -1462,6 +1462,18 @@ module CommonTests
|
||||
assert_raise(Google::Protobuf::TypeError) { m.timestamp = 2.4 }
|
||||
assert_raise(Google::Protobuf::TypeError) { m.timestamp = '4' }
|
||||
assert_raise(Google::Protobuf::TypeError) { m.timestamp = proto_module::TimeMessage.new }
|
||||
|
||||
def test_time(year, month, day)
|
||||
str = ("\"%04d-%02d-%02dT00:00:00.000+00:00\"" % [year, month, day])
|
||||
t = Google::Protobuf::Timestamp.decode_json(str)
|
||||
time = Time.new(year, month, day, 0, 0, 0, "+00:00")
|
||||
assert_equal t.seconds, time.to_i
|
||||
end
|
||||
|
||||
(1970..2010).each do |year|
|
||||
test_time(year, 2, 28)
|
||||
test_time(year, 3, 01)
|
||||
end
|
||||
end
|
||||
|
||||
def test_converts_duration
|
||||
|
||||
Loading…
Reference in New Issue
Block a user