diff --git a/.gitignore b/.gitignore index 4880c495de..d38133b822 100644 --- a/.gitignore +++ b/.gitignore @@ -82,10 +82,7 @@ src/**/*.log src/**/*.trs # JavaBuild output. -java/core/target -java/lite/target -java/util/target -javanano/target +java/**/target java/.idea java/**/*.iml diff --git a/CHANGES.txt b/CHANGES.txt index eb61034e97..4481b27b35 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -26,7 +26,7 @@ * Optimize Descriptor.isExtensionNumber. Python - * [python-runtime] Add MethodDescriptor.CopyToProto() (#8327) + * Add MethodDescriptor.CopyToProto() (#8327) * Remove unused python_protobuf.{cc,h} (#8513) * Start publishing python aarch64 manylinux wheels normally (#8530) * Fix constness issue detected by MSVC standard conforming mode (#8568) @@ -34,11 +34,11 @@ oneof are present and all but one is null. Ruby - * Ruby: Add support for proto3 json_name in compiler and field definitions (#8356) + * Add support for proto3 json_name in compiler and field definitions (#8356) * Fixed memory leak of Ruby arena objects. (#8461) * Fix source gem compilation (#8471) - * fix(ruby): Fix various exceptions in Ruby on 64-bit Windows (#8563) - * fix(ruby): Fix crash when calculating Message hash values on 64-bit Windows (#8565) + * Fix various exceptions in Ruby on 64-bit Windows (#8563) + * Fix crash when calculating Message hash values on 64-bit Windows (#8565) Conformance Tests * Added a conformance test for the case of multiple fields from the same diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index 7a68c6eae8..57d58f42bb 100644 --- a/Protobuf-C++.podspec +++ b/Protobuf-C++.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '3.17.0-rc2' + s.version = '3.17.0' s.summary = 'Protocol Buffers v3 runtime library for C++.' s.homepage = 'https://github.com/google/protobuf' s.license = '3-Clause BSD License' diff --git a/Protobuf.podspec b/Protobuf.podspec index 9b8be5aed2..1c2b1984a2 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -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.17.0-rc2' + s.version = '3.17.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' diff --git a/configure.ac b/configure.ac index 2e7462240e..c36328cd8d 100644 --- a/configure.ac +++ b/configure.ac @@ -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.17.0-rc-2],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.17.0],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index 78e61a12c7..fc01d7617c 100644 --- a/csharp/Google.Protobuf.Tools.nuspec +++ b/csharp/Google.Protobuf.Tools.nuspec @@ -5,7 +5,7 @@ Google Protocol Buffers tools Tools for Protocol Buffers - Google's data interchange format. See project site for more info. - 3.17.0-rc2 + 3.17.0 Google Inc. protobuf-packages https://github.com/protocolbuffers/protobuf/blob/master/LICENSE diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index f80a1a5669..dcc88eff12 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -4,7 +4,7 @@ C# runtime library for Protocol Buffers - Google's data interchange format. Copyright 2015, Google Inc. Google Protocol Buffers - 3.17.0-rc2 + 3.17.0 7.2 Google Inc. diff --git a/java/bom/pom.xml b/java/bom/pom.xml index 51bd520c73..43717f721b 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.17.0-rc-2 + 3.17.0 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index 59abf96c82..12fcdc1b9e 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.17.0-rc-2 + 3.17.0 protobuf-java diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index 17ea465423..5a70770167 100644 --- a/java/kotlin-lite/pom.xml +++ b/java/kotlin-lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.17.0-rc-2 + 3.17.0 protobuf-kotlin-lite diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index fef8550783..a1e50188d9 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.17.0-rc-2 + 3.17.0 protobuf-kotlin diff --git a/java/lite/pom.xml b/java/lite/pom.xml index f66c2162ce..6bd4653f20 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.17.0-rc-2 + 3.17.0 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index 5a58455324..5bf80cd11d 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.17.0-rc-2 + 3.17.0 pom Protocol Buffers [Parent] diff --git a/java/util/pom.xml b/java/util/pom.xml index 5232b54c9c..911acdd348 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.17.0-rc-2 + 3.17.0 protobuf-java-util diff --git a/js/package.json b/js/package.json index 16686a5e86..f92a1a3a93 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "google-protobuf", - "version": "3.17.0-rc.2", + "version": "3.17.0", "description": "Protocol Buffers for JavaScript", "main": "google-protobuf.js", "files": [ diff --git a/kokoro/linux/dist_install/build.sh b/kokoro/linux/dist_install/build.sh index 81a0516aa8..c456ee81fa 100755 --- a/kokoro/linux/dist_install/build.sh +++ b/kokoro/linux/dist_install/build.sh @@ -7,8 +7,8 @@ set -ex # exit immediately on error # Change to repo root cd $(dirname $0)/../../.. -# Run tests under release docker image. -export DOCKERFILE_DIR=kokoro/linux/64-bit +export DOCKERHUB_ORGANIZATION=protobuftesting +export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/java_stretch export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh export OUTPUT_DIR=testoutput export TEST_SET="dist_install" diff --git a/kokoro/linux/dockerfile/test/java_stretch/Dockerfile b/kokoro/linux/dockerfile/test/java_stretch/Dockerfile index fc5e82abdb..3e72046f47 100644 --- a/kokoro/linux/dockerfile/test/java_stretch/Dockerfile +++ b/kokoro/linux/dockerfile/test/java_stretch/Dockerfile @@ -1,6 +1,6 @@ FROM debian:stretch -# Install dependencies. We start with the basic ones require to build protoc +# Install dependencies. We start with the basic ones required to build protoc # and the C++ build RUN apt-get update && apt-get install -y \ autoconf \ @@ -20,12 +20,11 @@ RUN apt-get update && apt-get install -y \ parallel \ time \ wget \ - && apt-get clean - -# Java dependencies -RUN apt-get install -y \ - # -- For all Java builds -- \ + # Java dependencies maven \ - # -- For java_linkage_monitor \ openjdk-8-jdk \ + # Python dependencies + python-setuptools \ + python-pip \ + virtualenv \ && apt-get clean diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml index e19ff1dcc5..3d53f40010 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml @@ -10,15 +10,15 @@ protobuf-opensource@google.com yes - 2021-05-07 - + 2021-05-11 + - 3.17.0RC2 + 3.17.0 3.17.0 - beta - beta + stable + stable 3-Clause BSD License @@ -977,5 +977,20 @@ G A release. + + + 3.17.0 + 3.17.0 + + + stable + stable + + 2021-05-11 + + 3-Clause BSD License + + + diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index a9b7dbb90b..858b520a7f 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -76,7 +76,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() -#define PHP_PROTOBUF_VERSION "3.17.0RC2" +#define PHP_PROTOBUF_VERSION "3.17.0" // ptr -> PHP object cache. This is a weak map that caches lazily-created // wrapper objects around upb types: diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index d20c60958f..00fe9ff988 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.17.0-rc-2 + 3.17.0 pom Protobuf Compiler diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 64799d7b79..2f5ad27453 100644 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -30,4 +30,4 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.17.0rc2' +__version__ = '3.17.0' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 5ffb74736a..2ba7eab6f0 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.17.0.rc.2" + s.version = "3.17.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" diff --git a/src/google/protobuf/compiler/java/java_helpers.h b/src/google/protobuf/compiler/java/java_helpers.h index 13dd903567..5dc25d6c93 100644 --- a/src/google/protobuf/compiler/java/java_helpers.h +++ b/src/google/protobuf/compiler/java/java_helpers.h @@ -155,6 +155,7 @@ std::string GetOneofStoredType(const FieldDescriptor* field); // Whether we should generate multiple java files for messages. inline bool MultipleJavaFiles(const FileDescriptor* descriptor, bool immutable) { + (void) immutable; return descriptor->options().java_multiple_files(); } @@ -244,15 +245,15 @@ bool IsDefaultValueJavaDefault(const FieldDescriptor* field); bool IsByteStringWithCustomDefaultValue(const FieldDescriptor* field); // Does this message class have descriptor and reflection methods? -inline bool HasDescriptorMethods(const Descriptor* descriptor, +inline bool HasDescriptorMethods(const Descriptor* /* descriptor */, bool enforce_lite) { return !enforce_lite; } -inline bool HasDescriptorMethods(const EnumDescriptor* descriptor, +inline bool HasDescriptorMethods(const EnumDescriptor* /* descriptor */, bool enforce_lite) { return !enforce_lite; } -inline bool HasDescriptorMethods(const FileDescriptor* descriptor, +inline bool HasDescriptorMethods(const FileDescriptor* /* descriptor */, bool enforce_lite) { return !enforce_lite; } diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index d7d51e99f9..811d75edad 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -122,7 +122,7 @@ #ifdef PROTOBUF_VERSION_SUFFIX #error PROTOBUF_VERSION_SUFFIX was previously defined #endif -#define PROTOBUF_VERSION_SUFFIX "-rc2" +#define PROTOBUF_VERSION_SUFFIX "" #if defined(PROTOBUF_NAMESPACE) || defined(PROTOBUF_NAMESPACE_ID) #error PROTOBUF_NAMESPACE or PROTOBUF_NAMESPACE_ID was previously defined diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 9772b5a69c..4faf238b78 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -85,7 +85,7 @@ namespace internal { #define GOOGLE_PROTOBUF_VERSION 3017000 // A suffix string for alpha, beta or rc releases. Empty for stable releases. -#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc2" +#define GOOGLE_PROTOBUF_VERSION_SUFFIX "" // The minimum header version which works with the current version of // the library. This constant should only be used by protoc's C++ code diff --git a/tests.sh b/tests.sh index 972e64f960..923201a821 100755 --- a/tests.sh +++ b/tests.sh @@ -104,7 +104,7 @@ build_dist_install() { # Try to install Java pushd java - use_java jdk7 + use_java jdk8 $MVN install popd @@ -208,7 +208,13 @@ build_java() { # Java build needs `protoc`. internal_build_cpp cp -r java $dir - cd $dir && $MVN clean && $MVN test + cd $dir && $MVN clean + # Skip the Kotlin tests on Oracle 7 + if [ "$version" == "oracle7" ]; then + $MVN test -pl bom,lite,core,util + else + $MVN test + fi cd ../.. }