Skip to content

Commit

Permalink
THRIFT-4396 inconsistent (or plain wrong) version numbers in master/t…
Browse files Browse the repository at this point in the history
…runk

Client: (multiple)
Patch: Jens Geyer

This closes apache#1422
  • Loading branch information
Jens-G committed Nov 30, 2017
1 parent 026c9d0 commit 2147466
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "1.0.0-dev"
}
}
}
2 changes: 1 addition & 1 deletion contrib/thrift.spec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Name: thrift
License: Apache License v2.0
Group: Development
Summary: RPC and serialization framework
Version: 0.9.1
Version: 0.11.0
Release: 0
URL: http://thrift.apache.org
Packager: Thrift Developers <[email protected]>
Expand Down
8 changes: 8 additions & 0 deletions doap.rdf
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,31 @@
<programming-language>C++</programming-language>
<programming-language>Cocoa</programming-language>
<programming-language>D</programming-language>
<programming-language>Dart</programming-language>
<programming-language>Delphi</programming-language>
<programming-language>Erlang</programming-language>
<programming-language>Go</programming-language>
<programming-language>Haskell</programming-language>
<programming-language>Haxe</programming-language>
<programming-language>Java</programming-language>
<programming-language>JavaScript</programming-language>
<programming-language>node.js</programming-language>
<programming-language>OCaml</programming-language>
<programming-language>Perl</programming-language>
<programming-language>PHP</programming-language>
<programming-language>Python</programming-language>
<programming-language>Rust</programming-language>
<programming-language>SmallTalk</programming-language>
<category rdf:resource="http://projects.apache.org/category/http" />
<category rdf:resource="http://projects.apache.org/category/library" />
<category rdf:resource="http://projects.apache.org/category/network-client" />
<category rdf:resource="http://projects.apache.org/category/network-server" />
<release rdf:parseType="Collection">
<Version>
<name>Apache Thrift</name>
<created>2017-03-01</created>
<revision>0.10.0</revision>
</Version>
<Version>
<name>Apache Thrift</name>
<created>2015-09-25</created>
Expand Down
4 changes: 2 additions & 2 deletions lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.0.*")]
[assembly: AssemblyFileVersion("0.9.0.*")]
[assembly: AssemblyVersion("0.11.0.*")]
[assembly: AssemblyFileVersion("0.11.0.*")]
2 changes: 1 addition & 1 deletion lib/haxe/haxelib.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "Apache",
"tags": ["thrift", "rpc", "serialization", "cross", "framework"],
"description": "Haxe bindings for the Apache Thrift RPC and serialization framework",
"version": "1.0.0-alpha.160215",
"version": "1.0.0-dev",
"releasenote": "Licensed under Apache License, Version 2.0. The Apache Thrift compiler needs to be installed separately.",
"contributors": ["Apache Software Foundation (ASF)"],
"dependencies": { },
Expand Down

0 comments on commit 2147466

Please sign in to comment.