diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 71748e8fc4d..c4ff747b549 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -14,7 +14,7 @@ permissions: jobs: compiler: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/ApacheThrift.nuspec b/ApacheThrift.nuspec index cd9a29c6c90..cd9ed133fe2 100644 --- a/ApacheThrift.nuspec +++ b/ApacheThrift.nuspec @@ -4,9 +4,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,8 +25,8 @@ ApacheThrift - 0.20.0 - Apache Thrift 0.20.0 + 0.20.1 + Apache Thrift 0.20.1 Apache Thrift Developers Apache Software Foundation Apache-2.0 @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/CMakeLists.txt b/CMakeLists.txt index a685e4f3705..019803b023b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ # under the License. # -cmake_minimum_required(VERSION 3.4) +cmake_minimum_required(VERSION 3.16) if(POLICY CMP0048) cmake_policy(SET CMP0048 NEW) # package version behavior added in cmake 3.0 @@ -28,7 +28,7 @@ endif() # PACKAGE_VERSION is used by cpack scripts currently # Both thrift_VERSION and PACKAGE_VERSION should be the same for now -set(thrift_VERSION "0.20.0") +set(thrift_VERSION "0.20.1") set(PACKAGE_VERSION ${thrift_VERSION}) project("thrift" VERSION ${PACKAGE_VERSION}) diff --git a/Thrift.podspec b/Thrift.podspec index 8bf70f64f18..8d92a90743e 100644 --- a/Thrift.podspec +++ b/Thrift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Thrift' - s.version = '0.20.0' + s.version = '0.20.1' s.summary = "Apache Thrift is a lightweight, language-independent software stack with an associated code generation mechanism for RPC." s.description = <<-DESC The Apache Thrift scalable cross-language software framework for networked services development combines a software stack with a code generation engine to build services that work efficiently and seamlessly between many programming languages. diff --git a/appveyor.yml b/appveyor.yml index 5847ea926ba..5d94de9e8c4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,7 @@ # build Apache Thrift on AppVeyor - https://ci.appveyor.com -version: '0.20.0.{build}' +version: '0.20.1.{build}' shallow_clone: true diff --git a/bower.json b/bower.json index 84f3a989012..1349cba27ad 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "thrift", - "version": "0.20.0", + "version": "0.20.1", "homepage": "https://github.com/apache/thrift.git", "authors": [ "Apache Thrift " diff --git a/compiler/cpp/CMakeLists.txt b/compiler/cpp/CMakeLists.txt index 013d3d3c985..db5fcb07f61 100644 --- a/compiler/cpp/CMakeLists.txt +++ b/compiler/cpp/CMakeLists.txt @@ -17,7 +17,7 @@ # under the License. # -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.16) project("thrift-compiler" VERSION ${PACKAGE_VERSION}) # version.h now handled via veralign.sh diff --git a/compiler/cpp/src/thrift/generate/t_js_generator.cc b/compiler/cpp/src/thrift/generate/t_js_generator.cc index 7b0aa94c40d..d9adca35f92 100644 --- a/compiler/cpp/src/thrift/generate/t_js_generator.cc +++ b/compiler/cpp/src/thrift/generate/t_js_generator.cc @@ -225,9 +225,12 @@ class t_js_generator : public t_oop_generator { std::string get_import_path(t_program* program); std::string declare_field(t_field* tfield, bool init = false, bool obj = false); std::string function_signature(t_function* tfunction, - std::string prefix = "", - bool include_callback = false); - std::string argument_list(t_struct* tstruct, bool include_callback = false); + std::string prefix = "", + bool include_callback = false, + const std::string& callback_name = "callback"); + std::string argument_list(t_struct* tstruct, + bool include_callback = false, + const std::string& callback_name = "callback"); std::string type_to_enum(t_type* ttype); std::string make_valid_nodeJs_identifier(std::string const& name); std::string next_identifier_name(std::vector const& fields, std::string const& base_name); @@ -313,9 +316,10 @@ class t_js_generator : public t_oop_generator { * TypeScript Definition File helper functions */ - string ts_function_signature(t_function* tfunction, bool include_callback); - string ts_get_type(t_type* type); - +string ts_function_signature(t_function* tfunction, + bool include_callback, + const std::string& callback_name = "callback"); +string ts_get_type(t_type* type); /** * Special indentation for TypeScript Definitions because of the module. * Returns the normal indentation + " " if a module was defined. @@ -927,9 +931,9 @@ void t_js_generator::generate_js_struct_definition(ostream& out, // Special case. Exceptions derive from Error, and error has a non optional message field. // Ignore the optional flag in this case, otherwise we will generate a incompatible field - // in the eyes of typescript. + // in the eyes of typescript. string optional_flag = is_exception && member_name == "message" ? "" : ts_get_req(*m_iter); - + f_types_ts_ << ts_indent() << ts_access << member_name << optional_flag << ": " << ts_get_type((*m_iter)->get_type()) << ";" << endl; } @@ -1830,6 +1834,7 @@ void t_js_generator::generate_service_client(t_service* tservice) { for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) { t_struct* arg_struct = (*f_iter)->get_arglist(); const vector& fields = arg_struct->get_members(); + const std::string callback_name = next_identifier_name(fields, "callback"); vector::const_iterator fld_iter; string funname = (*f_iter)->get_name(); string arglist = argument_list(arg_struct); @@ -1840,20 +1845,20 @@ void t_js_generator::generate_service_client(t_service* tservice) { indent(f_service_) << funname << " (" << arglist << ") {" << endl; } else { indent(f_service_) << js_namespace(tservice->get_program()) << service_name_ << "Client.prototype." - << function_signature(*f_iter, "", !gen_es6_) << " {" << endl; + << function_signature(*f_iter, "", !gen_es6_, callback_name) << " {" << endl; } indent_up(); if (gen_ts_) { // function definition without callback - f_service_ts_ << ts_print_doc(*f_iter) << ts_indent() << ts_function_signature(*f_iter, false) << endl; + f_service_ts_ << ts_print_doc(*f_iter) << ts_indent() << ts_function_signature(*f_iter, false, callback_name) << endl; if (!gen_es6_) { // overload with callback - f_service_ts_ << ts_print_doc(*f_iter) << ts_indent() << ts_function_signature(*f_iter, true) << endl; + f_service_ts_ << ts_print_doc(*f_iter) << ts_indent() << ts_function_signature(*f_iter, true, callback_name) << endl; } else { // overload with callback - f_service_ts_ << ts_print_doc(*f_iter) << ts_indent() << ts_function_signature(*f_iter, true) << endl; + f_service_ts_ << ts_print_doc(*f_iter) << ts_indent() << ts_function_signature(*f_iter, true, callback_name) << endl; } } @@ -1872,7 +1877,7 @@ void t_js_generator::generate_service_client(t_service* tservice) { indent(f_service_) << "});" << endl; } else if (gen_node_) { // Node.js output ./gen-nodejs f_service_ << indent() << "this._seqid = this.new_seqid();" << endl << indent() - << "if (callback === undefined) {" << endl; + << "if (" << callback_name << " === undefined) {" << endl; indent_up(); f_service_ << indent() << js_const_type_ << "_defer = Q.defer();" << endl << indent() << "this._reqs[this.seqid()] = function(error, result) {" << endl; @@ -1893,7 +1898,7 @@ void t_js_generator::generate_service_client(t_service* tservice) { indent_down(); indent(f_service_) << "} else {" << endl; indent_up(); - f_service_ << indent() << "this._reqs[this.seqid()] = callback;" << endl << indent() + f_service_ << indent() << "this._reqs[this.seqid()] = " << callback_name << ";" << endl << indent() << "this.send_" << funname << "(" << arglist << ");" << endl; indent_down(); indent(f_service_) << "}" << endl; @@ -1911,7 +1916,7 @@ void t_js_generator::generate_service_client(t_service* tservice) { f_service_ << indent() << "});" << endl; } else if (gen_jquery_) { // jQuery output ./gen-js - f_service_ << indent() << "if (callback === undefined) {" << endl; + f_service_ << indent() << "if (" << callback_name << " === undefined) {" << endl; indent_up(); f_service_ << indent() << "this.send_" << funname << "(" << arglist << ");" << endl; if (!(*f_iter)->is_oneway()) { @@ -1935,9 +1940,9 @@ void t_js_generator::generate_service_client(t_service* tservice) { f_service_ << indent() << "}" << endl; } else { // Standard JavaScript ./gen-js f_service_ << indent() << "this.send_" << funname << "(" << arglist - << (arglist.empty() ? "" : ", ") << "callback); " << endl; + << (arglist.empty() ? "" : ", ") << callback_name << "); " << endl; if (!(*f_iter)->is_oneway()) { - f_service_ << indent() << "if (!callback) {" << endl; + f_service_ << indent() << "if (!" << callback_name << ") {" << endl; f_service_ << indent(); if (!(*f_iter)->get_returntype()->is_void()) { f_service_ << " return "; @@ -2643,14 +2648,11 @@ string t_js_generator::declare_field(t_field* tfield, bool init, bool obj) { */ string t_js_generator::function_signature(t_function* tfunction, string prefix, - bool include_callback) { - + bool include_callback, + const std::string& callback_name) { string str; - str = prefix + tfunction->get_name() + " = function("; - - str += argument_list(tfunction->get_arglist(), include_callback); - + str += argument_list(tfunction->get_arglist(), include_callback, callback_name); str += ")"; return str; } @@ -2658,9 +2660,10 @@ string t_js_generator::function_signature(t_function* tfunction, /** * Renders a field list */ -string t_js_generator::argument_list(t_struct* tstruct, bool include_callback) { +string t_js_generator::argument_list(t_struct* tstruct, + bool include_callback, + const std::string& callback_name) { string result = ""; - const vector& fields = tstruct->get_members(); vector::const_iterator f_iter; bool first = true; @@ -2677,7 +2680,7 @@ string t_js_generator::argument_list(t_struct* tstruct, bool include_callback) { if (!fields.empty()) { result += ", "; } - result += "callback"; + result += callback_name; } return result; @@ -2818,7 +2821,9 @@ string t_js_generator::ts_get_type(t_type* type) { * @param bool in-/exclude the callback argument * @return String of rendered function definition */ -std::string t_js_generator::ts_function_signature(t_function* tfunction, bool include_callback) { +std::string t_js_generator::ts_function_signature(t_function* tfunction, + bool include_callback, + const std::string& callback_name) { string str; const vector& fields = tfunction->get_arglist()->get_members(); vector::const_iterator f_iter; @@ -2857,12 +2862,12 @@ std::string t_js_generator::ts_function_signature(t_function* tfunction, bool in } } if (exception_types == "") { - str += "callback: (error: void, response: " + ts_get_type(tfunction->get_returntype()) + ")=>void): "; + str += callback_name + ": (error: void, response: " + ts_get_type(tfunction->get_returntype()) + ")=>void): "; } else { - str += "callback: (error: " + exception_types + ", response: " + ts_get_type(tfunction->get_returntype()) + ")=>void): "; + str += callback_name + ": (error: " + exception_types + ", response: " + ts_get_type(tfunction->get_returntype()) + ")=>void): "; } } else { - str += "callback: (data: " + ts_get_type(tfunction->get_returntype()) + ")=>void): "; + str += callback_name + ": (data: " + ts_get_type(tfunction->get_returntype()) + ")=>void): "; } if (gen_jquery_) { diff --git a/compiler/cpp/src/thrift/version.h b/compiler/cpp/src/thrift/version.h index 65e0f43684b..0beb499cdd6 100644 --- a/compiler/cpp/src/thrift/version.h +++ b/compiler/cpp/src/thrift/version.h @@ -24,6 +24,6 @@ #pragma once #endif // _MSC_VER -#define THRIFT_VERSION "0.20.0" +#define THRIFT_VERSION "0.20.1" #endif // _THRIFT_VERSION_H_ diff --git a/compiler/cpp/tests/CMakeLists.txt b/compiler/cpp/tests/CMakeLists.txt index d9c5209134c..96f8d396e8e 100644 --- a/compiler/cpp/tests/CMakeLists.txt +++ b/compiler/cpp/tests/CMakeLists.txt @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.16) project(thrift_compiler_tests) @@ -61,7 +61,7 @@ add_library(parse STATIC ${parse_SOURCES}) set(thrift_compiler_tests ) -# you can add some files manually there +# you can add some files manually there set(thrift_compiler_tests_manual_SOURCES # tests file to avoid main in every test file ${CMAKE_CURRENT_SOURCE_DIR}/tests_main.cc diff --git a/configure.ac b/configure.ac index a8778237a96..29120e16b6e 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ(2.65) AC_CONFIG_MACRO_DIR([./aclocal]) -AC_INIT([thrift], [0.20.0]) +AC_INIT([thrift], [0.20.1]) AC_CONFIG_AUX_DIR([.]) diff --git a/contrib/Rebus/Properties/AssemblyInfo.cs b/contrib/Rebus/Properties/AssemblyInfo.cs index 33b0aa872c6..9c501b907ac 100644 --- a/contrib/Rebus/Properties/AssemblyInfo.cs +++ b/contrib/Rebus/Properties/AssemblyInfo.cs @@ -34,5 +34,5 @@ [assembly: Guid("0af10984-40d3-453d-b1e5-421529e8c7e2")] -[assembly: AssemblyVersion("0.20.0.0")] -[assembly: AssemblyFileVersion("0.20.0.0")] +[assembly: AssemblyVersion("0.20.1.0")] +[assembly: AssemblyFileVersion("0.20.1.0")] diff --git a/contrib/thrift-maven-plugin/pom.xml b/contrib/thrift-maven-plugin/pom.xml index 46f3cb18327..42e403a74a3 100644 --- a/contrib/thrift-maven-plugin/pom.xml +++ b/contrib/thrift-maven-plugin/pom.xml @@ -29,7 +29,7 @@ thrift-maven-plugin maven-plugin thrift-maven-plugin - 0.20.0 + 0.20.1 1.8 @@ -108,4 +108,4 @@ test - \ No newline at end of file + diff --git a/contrib/thrift.spec b/contrib/thrift.spec index 90bf4aae567..d236597dcdd 100644 --- a/contrib/thrift.spec +++ b/contrib/thrift.spec @@ -28,7 +28,7 @@ Name: thrift License: Apache License v2.0 Group: Development Summary: RPC and serialization framework -Version: 0.20.0 +Version: 0.20.1 Release: 0 URL: http://thrift.apache.org Packager: Thrift Developers @@ -248,5 +248,5 @@ umask 007 %changelog * Wed Aug 21 2013 Thrift Dev - Thrift 0.9.1 release. -* Wed Oct 10 2012 Thrift Dev +* Wed Oct 10 2012 Thrift Dev - Thrift 0.9.0 release. diff --git a/contrib/zeromq/csharp/AssemblyInfo.cs b/contrib/zeromq/csharp/AssemblyInfo.cs index 8d7ed390b49..34a784d5780 100644 --- a/contrib/zeromq/csharp/AssemblyInfo.cs +++ b/contrib/zeromq/csharp/AssemblyInfo.cs @@ -36,7 +36,7 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("0.20.0.0")] +[assembly: AssemblyVersion("0.20.1.0")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/doc/specs/idl.md b/doc/specs/idl.md index 0980f5bbc6d..f05d05676cd 100644 --- a/doc/specs/idl.md +++ b/doc/specs/idl.md @@ -1,6 +1,6 @@ ## Thrift interface description language -For Thrift version 0.20.0. +For Thrift version 0.20.1. The Thrift interface definition language (IDL) allows for the definition of [Thrift Types](/docs/types). A Thrift IDL file is processed by the Thrift code generator to produce code for the various target languages to support the defined structs and services in the IDL file. diff --git a/lib/d/src/thrift/base.d b/lib/d/src/thrift/base.d index e843a5c8549..69b4820f8d6 100644 --- a/lib/d/src/thrift/base.d +++ b/lib/d/src/thrift/base.d @@ -50,7 +50,7 @@ class TCompoundOperationException : TException { /// The Thrift version string, used for informative purposes. // Note: This is currently hardcoded, but will likely be filled in by the build // system in future versions. -enum VERSION = "0.20.0"; +enum VERSION = "0.20.1"; /** * Functions used for logging inside Thrift. diff --git a/lib/dart/pubspec.yaml b/lib/dart/pubspec.yaml index 7e205483adc..310b186957c 100644 --- a/lib/dart/pubspec.yaml +++ b/lib/dart/pubspec.yaml @@ -16,7 +16,7 @@ # under the License. name: thrift -version: 0.20.0 +version: 0.20.1 description: > A Dart library for Apache Thrift author: Apache Thrift Developers @@ -40,4 +40,4 @@ dev_dependencies: dart_style: ">=1.3.1 <3.0.0" mockito: ">=4.1.1 <6.0.0" test: ^1.9.1 - workiva_analysis_options: ^1.0.0 \ No newline at end of file + workiva_analysis_options: ^1.0.0 diff --git a/lib/delphi/src/Thrift.pas b/lib/delphi/src/Thrift.pas index 6696a195a57..66b3e42ad66 100644 --- a/lib/delphi/src/Thrift.pas +++ b/lib/delphi/src/Thrift.pas @@ -28,7 +28,7 @@ interface Thrift.Protocol; const - Version = '0.20.0'; + Version = '0.20.1'; type TException = Thrift.Exception.TException; // compatibility alias diff --git a/lib/erl/src/thrift.app.src b/lib/erl/src/thrift.app.src index 0e25b675592..c721848deca 100644 --- a/lib/erl/src/thrift.app.src +++ b/lib/erl/src/thrift.app.src @@ -22,7 +22,7 @@ {description, "Thrift bindings"}, % The version of the applicaton - {vsn, "0.20.0"}, + {vsn, "0.20.1"}, % All modules used by the application. {modules, []}, diff --git a/lib/haxe/haxelib.json b/lib/haxe/haxelib.json index 78779da4534..f9a25f07e39 100644 --- a/lib/haxe/haxelib.json +++ b/lib/haxe/haxelib.json @@ -3,17 +3,17 @@ "url" : "http://thrift.apache.org", "license": "Apache", "tags": [ - "thrift", - "rpc", - "serialization", - "cross", + "thrift", + "rpc", + "serialization", + "cross", "framework" ], "description": "Haxe bindings for the Apache Thrift RPC and serialization framework", - "version": "0.20.0", + "version": "0.20.1", "releasenote": "Licensed under Apache License, Version 2.0. The Apache Thrift compiler needs to be installed separately.", "contributors": ["ApacheThrift"], - "dependencies": { + "dependencies": { "crypto": "", "uuid": "" }, diff --git a/lib/java/gradle.properties b/lib/java/gradle.properties index 0d9ff39c364..106596ea53b 100644 --- a/lib/java/gradle.properties +++ b/lib/java/gradle.properties @@ -1,7 +1,7 @@ # This file is shared currently between this Gradle build and the # Ant builds for fd303 and JavaScript. Keep the dotted notation for # the properties to minimize the changes in the dependencies. -thrift.version=0.20.0 +thrift.version=0.20.1 thrift.groupid=org.apache.thrift release=false diff --git a/lib/java/gradle/unitTests.gradle b/lib/java/gradle/unitTests.gradle index 4f06fcfcdbf..24affad396c 100644 --- a/lib/java/gradle/unitTests.gradle +++ b/lib/java/gradle/unitTests.gradle @@ -79,11 +79,10 @@ test { maxHeapSize = '512m' systemProperties = [ - 'build.test': "${compileTestJava.destinationDir}", 'test.port': "${testPort}", 'javax.net.ssl.trustStore': "${projectDir}/src/crossTest/resources/.truststore", 'javax.net.ssl.trustStorePassword': 'thrift', - 'javax.net.ssl.keyStore': "${projectDir}/src/crossTest/resources/.keystore", + 'javax.net.ssl.keyStore': "${projectDir}/src/crossTest/resources/.serverkeystore", 'javax.net.ssl.keyStorePassword': 'thrift' ] } diff --git a/lib/js/package-lock.json b/lib/js/package-lock.json index 0d9de1242b8..df5c97adbf0 100644 --- a/lib/js/package-lock.json +++ b/lib/js/package-lock.json @@ -1,12 +1,12 @@ { "name": "thrift", - "version": "0.20.0", + "version": "0.20.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "thrift", - "version": "0.20.0", + "version": "0.20.1", "license": "Apache-2.0", "devDependencies": { "browserify": "~16.5", diff --git a/lib/js/package.json b/lib/js/package.json index 8543b2500c4..6f01e9ac4dc 100644 --- a/lib/js/package.json +++ b/lib/js/package.json @@ -1,6 +1,6 @@ { "name": "thrift", - "version": "0.20.0", + "version": "0.20.1", "description": "Thrift is a software framework for scalable cross-language services development.", "main": "./src/thrift", "author": { diff --git a/lib/js/src/thrift.js b/lib/js/src/thrift.js index 7dbb560c740..50c2de09c8e 100644 --- a/lib/js/src/thrift.js +++ b/lib/js/src/thrift.js @@ -46,7 +46,7 @@ var Thrift = { * @const {string} Version * @memberof Thrift */ - Version: '0.20.0', + Version: '0.20.1', /** * Thrift IDL type string to Id mapping. diff --git a/lib/lua/Thrift.lua b/lib/lua/Thrift.lua index 1f9a562fac0..8b3de345751 100644 --- a/lib/lua/Thrift.lua +++ b/lib/lua/Thrift.lua @@ -48,7 +48,7 @@ function ttable_size(t) return count end -version = '0.20.0' +version = '0.20.1' TType = { STOP = 0, diff --git a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj index 3f8345926ae..2840e5568a3 100644 --- a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj +++ b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -23,7 +23,7 @@ latestMajor Thrift.IntegrationTests Thrift.IntegrationTests - 0.20.0.0 + 0.20.1.0 Exe false false @@ -51,4 +51,4 @@ - \ No newline at end of file + diff --git a/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj index 7c5775026b8..7a4fbed5267 100644 --- a/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj +++ b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -19,7 +19,7 @@ --> - 0.20.0 + 0.20.1 Thrift version $(ThriftVersion) net8.0 latestMajor diff --git a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj index a37be1b1046..8f8f1ee9f52 100644 --- a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj +++ b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -21,7 +21,7 @@ net8.0 latestMajor - 0.20.0.0 + 0.20.1.0 enable @@ -45,4 +45,4 @@ - \ No newline at end of file + diff --git a/lib/netstd/Thrift/Properties/AssemblyInfo.cs b/lib/netstd/Thrift/Properties/AssemblyInfo.cs index bd84c4ea37a..fd2186e956b 100644 --- a/lib/netstd/Thrift/Properties/AssemblyInfo.cs +++ b/lib/netstd/Thrift/Properties/AssemblyInfo.cs @@ -5,9 +5,9 @@ // to you under the Apache License, Version 2.0 (the // "License"); you may not use this file except in compliance // with the License. You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, // software distributed under the License is distributed on an // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -52,5 +52,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.20.0.0")] -[assembly: AssemblyFileVersion("0.20.0.0")] +[assembly: AssemblyVersion("0.20.1.0")] +[assembly: AssemblyFileVersion("0.20.1.0")] diff --git a/lib/netstd/Thrift/Thrift.csproj b/lib/netstd/Thrift/Thrift.csproj index d255f37c4eb..56846899ef6 100644 --- a/lib/netstd/Thrift/Thrift.csproj +++ b/lib/netstd/Thrift/Thrift.csproj @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -40,8 +40,8 @@ true thrift.snk false - Apache Thrift 0.20.0 - 0.20.0.0 + Apache Thrift 0.20.1 + 0.20.1.0 false http://thrift.apache.org/ Apache Thrift Developers @@ -72,7 +72,7 @@ - + @@ -86,7 +86,7 @@ 7.0.9 - + 8.0.0 diff --git a/lib/ocaml/_oasis b/lib/ocaml/_oasis index be1ce1265b9..73b62b979c2 100644 --- a/lib/ocaml/_oasis +++ b/lib/ocaml/_oasis @@ -1,5 +1,5 @@ Name: libthrift-ocaml -Version: 0.20.0 +Version: 0.20.1 OASISFormat: 0.3 Synopsis: OCaml bindings for the Apache Thrift RPC system Authors: Apache Thrift Developers diff --git a/lib/perl/lib/Thrift.pm b/lib/perl/lib/Thrift.pm index 4b5f781e09f..cb092182c2b 100644 --- a/lib/perl/lib/Thrift.pm +++ b/lib/perl/lib/Thrift.pm @@ -31,6 +31,6 @@ use warnings; # package Thrift; -use version 0.77; our $VERSION = version->declare("v0.20.0"); +use version 0.77; our $VERSION = version->declare("v0.20.1"); 1; diff --git a/lib/py/setup.py b/lib/py/setup.py index f5371af753c..0f63ca31059 100644 --- a/lib/py/setup.py +++ b/lib/py/setup.py @@ -105,7 +105,7 @@ def run_setup(with_binary): twisted_deps = ['twisted'] setup(name='thrift', - version='0.20.0', + version='0.20.1', description='Python bindings for the Apache Thrift RPC system', long_description=read_file("README.md"), long_description_content_type="text/markdown", diff --git a/lib/rb/thrift.gemspec b/lib/rb/thrift.gemspec index 6b510c78be9..5a5de607118 100644 --- a/lib/rb/thrift.gemspec +++ b/lib/rb/thrift.gemspec @@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__) Gem::Specification.new do |s| s.name = 'thrift' - s.version = '0.20.0' + s.version = '0.20.1' s.authors = ['Apache Thrift Developers'] s.email = ['dev@thrift.apache.org'] s.homepage = 'http://thrift.apache.org' diff --git a/lib/rs/Cargo.toml b/lib/rs/Cargo.toml index a6e8533aa57..8f06e3bf140 100644 --- a/lib/rs/Cargo.toml +++ b/lib/rs/Cargo.toml @@ -2,7 +2,7 @@ name = "thrift" description = "Rust bindings for the Apache Thrift RPC system" edition = "2021" -version = "0.20.0" +version = "0.20.1" license = "Apache-2.0" authors = ["Apache Thrift Developers "] homepage = "http://thrift.apache.org" diff --git a/lib/swift/Sources/Thrift.swift b/lib/swift/Sources/Thrift.swift index 22981a0fcf4..39868168f0d 100644 --- a/lib/swift/Sources/Thrift.swift +++ b/lib/swift/Sources/Thrift.swift @@ -1,3 +1,3 @@ class Thrift { - let version = "0.20.0" + let version = "0.20.1" } diff --git a/lib/swift/Tests/ThriftTests/ThriftTests.swift b/lib/swift/Tests/ThriftTests/ThriftTests.swift index 3c6854c6587..37c3de65bfc 100644 --- a/lib/swift/Tests/ThriftTests/ThriftTests.swift +++ b/lib/swift/Tests/ThriftTests/ThriftTests.swift @@ -3,7 +3,7 @@ import XCTest class ThriftTests: XCTestCase { func testVersion() { - XCTAssertEqual(Thrift().version, "0.20.0") + XCTAssertEqual(Thrift().version, "0.20.1") } static var allTests : [(String, (ThriftTests) -> () throws -> Void)] { diff --git a/lib/ts/package-lock.json b/lib/ts/package-lock.json index f99d8a34713..e4818d772d1 100644 --- a/lib/ts/package-lock.json +++ b/lib/ts/package-lock.json @@ -1,12 +1,12 @@ { "name": "thrift", - "version": "0.20.0", + "version": "0.20.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "thrift", - "version": "0.20.0", + "version": "0.20.1", "license": "Apache-2.0", "dependencies": { "bufferutil": "^4.0.1", diff --git a/lib/ts/package.json b/lib/ts/package.json index 054807f91c9..23ffcfee9e3 100644 --- a/lib/ts/package.json +++ b/lib/ts/package.json @@ -1,6 +1,6 @@ { "name": "thrift", - "version": "0.20.0", + "version": "0.20.1", "description": "Thrift is a software framework for scalable cross-language services development.", "author": { "name": "Apache Thrift Developers", diff --git a/package-lock.json b/package-lock.json index 3f8780a5ab5..c3a1f680c6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "thrift", - "version": "0.20.0", + "version": "0.20.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "thrift", - "version": "0.20.0", + "version": "0.20.1", "license": "Apache-2.0", "dependencies": { "browser-or-node": "^1.2.1", diff --git a/package.json b/package.json index 47f9e874884..f4da632d772 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "type": "git", "url": "https://github.com/apache/thrift.git" }, - "version": "0.20.0", + "version": "0.20.1", "author": { "name": "Apache Thrift Developers", "email": "dev@thrift.apache.org", diff --git a/sonar-project.properties b/sonar-project.properties index 258dfe913af..775913aacdc 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -16,7 +16,7 @@ development, combines a software stack with a code generation engine to build services that work efficiently and seamlessly between all major languages. # Apache Thrift Version -sonar.projectVersion=0.20.0 +sonar.projectVersion=0.20.1 # use this to set another version string # $ sonar-runner -D sonar.projectVersion=`git rev-parse HEAD` # set projectDate in combination with projectVersion for imports of old releases @@ -54,7 +54,7 @@ module1.sonar.projectName=Apache Thrift - Java Library module1.sonar.projectBaseDir=lib/java module1.sonar.sources=src module1.sonar.tests=test -module1.sonar.binaries=build/libs/libthrift-0.20.0.jar +module1.sonar.binaries=build/libs/libthrift-0.20.1.jar module1.sonar.libraries=build/deps/*.jar module1.sonar.language=java @@ -62,7 +62,7 @@ module2.sonar.projectName=Apache Thrift - Java Tutorial module2.sonar.projectBaseDir=. module2.sonar.sources=tutorial/java/src, tutorial/java/gen-java module2.sonar.binaries=tutorial/java/tutorial.jar -module2.sonar.libraries=lib/java/build/deps/*.jar,lib/java/build/libs/libthrift-0.20.0.jar +module2.sonar.libraries=lib/java/build/deps/*.jar,lib/java/build/libs/libthrift-0.20.1.jar module2.sonar.language=java module3.sonar.projectName=Apache Thrift - JavaScript Library diff --git a/test/dart/test_client/pubspec.yaml b/test/dart/test_client/pubspec.yaml index 177e2cdf141..d876ca40e9a 100644 --- a/test/dart/test_client/pubspec.yaml +++ b/test/dart/test_client/pubspec.yaml @@ -16,7 +16,7 @@ # under the License. name: thrift_test_client -version: 0.20.0 +version: 0.20.1 description: A client integration test for the Dart Thrift library author: Apache Thrift Developers homepage: http://thrift.apache.org diff --git a/test/erl/src/thrift_test.app.src b/test/erl/src/thrift_test.app.src index 9d68a564533..49f7e9cfd7b 100644 --- a/test/erl/src/thrift_test.app.src +++ b/test/erl/src/thrift_test.app.src @@ -22,7 +22,7 @@ {description, "Thrift cross language test"}, % The version of the applicaton - {vsn, "0.20.0"}, + {vsn, "0.20.1"}, % All modules used by the application. {modules, [ diff --git a/test/netstd/Client/Client.csproj b/test/netstd/Client/Client.csproj index aa90e2c5ec7..d02106571ea 100644 --- a/test/netstd/Client/Client.csproj +++ b/test/netstd/Client/Client.csproj @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -24,7 +24,7 @@ Client Client Exe - 0.20.0.0 + 0.20.1.0 false false false diff --git a/test/netstd/Server/Server.csproj b/test/netstd/Server/Server.csproj index 63ce613bbda..e374c3cae3a 100644 --- a/test/netstd/Server/Server.csproj +++ b/test/netstd/Server/Server.csproj @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -24,7 +24,7 @@ Server Server Exe - 0.20.0.0 + 0.20.1.0 false false false diff --git a/tutorial/dart/client/pubspec.yaml b/tutorial/dart/client/pubspec.yaml index e8c6db8ab90..224c9a3f819 100644 --- a/tutorial/dart/client/pubspec.yaml +++ b/tutorial/dart/client/pubspec.yaml @@ -16,7 +16,7 @@ # under the License. name: tutorial_client -version: 0.20.0 +version: 0.20.1 description: A Dart client implementation of the Apache Thrift tutorial author: Apache Thrift Developers homepage: http://thrift.apache.org diff --git a/tutorial/dart/console_client/pubspec.yaml b/tutorial/dart/console_client/pubspec.yaml index e5c0938b973..0207db45900 100644 --- a/tutorial/dart/console_client/pubspec.yaml +++ b/tutorial/dart/console_client/pubspec.yaml @@ -16,7 +16,7 @@ # under the License. name: tutorial_console_client -version: 0.20.0 +version: 0.20.1 description: > A Dart console client to implementation of the Apache Thrift tutorial author: Apache Thrift Developers diff --git a/tutorial/dart/server/pubspec.yaml b/tutorial/dart/server/pubspec.yaml index 5f7edb9bc25..303ab587e3a 100644 --- a/tutorial/dart/server/pubspec.yaml +++ b/tutorial/dart/server/pubspec.yaml @@ -16,7 +16,7 @@ # under the License. name: tutorial_server -version: 0.20.0 +version: 0.20.1 description: A Dart server to support the Apache Thrift tutorial author: Apache Thrift Developers homepage: http://thrift.apache.org diff --git a/tutorial/delphi/DelphiClient/DelphiClient.dproj b/tutorial/delphi/DelphiClient/DelphiClient.dproj index 34d9f03dc22..e0d3560863b 100644 --- a/tutorial/delphi/DelphiClient/DelphiClient.dproj +++ b/tutorial/delphi/DelphiClient/DelphiClient.dproj @@ -124,13 +124,13 @@ popd]]> Thrift Tutorial - 0.20.0.0 + 0.20.1.0 DelphiClient Copyright © 2012 The Apache Software Foundation DelphiClient.exe Thrift - 0.20.0.0 + 0.20.1.0 diff --git a/tutorial/delphi/DelphiServer/DelphiServer.dproj b/tutorial/delphi/DelphiServer/DelphiServer.dproj index fa8cb92d84a..ea3c0df5347 100644 --- a/tutorial/delphi/DelphiServer/DelphiServer.dproj +++ b/tutorial/delphi/DelphiServer/DelphiServer.dproj @@ -121,13 +121,13 @@ popd]]> Thrift Tutorial - 0.20.0.0 + 0.20.1.0 DelphiServer Copyright © 2012 The Apache Software Foundation DelphiServer.exe Thrift - 0.20.0.0 + 0.20.1.0 diff --git a/tutorial/netstd/Client/Client.csproj b/tutorial/netstd/Client/Client.csproj index 994d6be7be6..f1cae0a63c9 100644 --- a/tutorial/netstd/Client/Client.csproj +++ b/tutorial/netstd/Client/Client.csproj @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -24,7 +24,7 @@ Client Client Exe - 0.20.0.0 + 0.20.1.0 false false false diff --git a/tutorial/netstd/Interfaces/Interfaces.csproj b/tutorial/netstd/Interfaces/Interfaces.csproj index c3524575adc..89512021e66 100644 --- a/tutorial/netstd/Interfaces/Interfaces.csproj +++ b/tutorial/netstd/Interfaces/Interfaces.csproj @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -22,7 +22,7 @@ net6.0 Interfaces Interfaces - 0.20.0.0 + 0.20.1.0 false false false diff --git a/tutorial/netstd/Server/Server.csproj b/tutorial/netstd/Server/Server.csproj index c72ec88ce34..8a76eb04b5b 100644 --- a/tutorial/netstd/Server/Server.csproj +++ b/tutorial/netstd/Server/Server.csproj @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -24,7 +24,7 @@ Server Server Exe - 0.20.0.0 + 0.20.1.0 false false false diff --git a/tutorial/ocaml/_oasis b/tutorial/ocaml/_oasis index 6072e4b969f..c61339c77cb 100644 --- a/tutorial/ocaml/_oasis +++ b/tutorial/ocaml/_oasis @@ -1,5 +1,5 @@ Name: tutorial -Version: 0.20.0 +Version: 0.20.1 OASISFormat: 0.3 Synopsis: OCaml Tutorial example Authors: Apache Thrift Developers