THRIFT-4396 inconsistent (or plain wrong) version numbers in master/trunk

Client: (multiple)
Patch: Jens Geyer

This closes #1422

5 files changed, 13 insertions, 5 deletions

diff --git a/composer.json b/composer.json
index 0f22b76ea..ad71f910c 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.0.0-dev"
         }
     }
 }
diff --git a/contrib/thrift.spec b/contrib/thrift.spec
index 93f000c91..034ebc879 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.9.1
+Version:        0.11.0
 Release:        0
 URL:            http://thrift.apache.org
 Packager:       Thrift Developers <dev@thrift.apache.org>
diff --git a/doap.rdf b/doap.rdf
index ac8d7854d..75274aa7b 100755
--- a/doap.rdf
+++ b/doap.rdf
@@ -38,10 +38,12 @@
     <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>
@@ -49,6 +51,7 @@
     <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" />
@@ -57,6 +60,11 @@
     <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>
         <revision>0.9.3</revision>
       </Version>
diff --git a/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs b/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
index 2e08e6678..974cf2795 100644
--- a/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
+++ b/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
@@ -56,5 +56,5 @@ using System.Runtime.InteropServices;
 // 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.*")]
diff --git a/lib/haxe/haxelib.json b/lib/haxe/haxelib.json
index 9f318844f..f76990e8b 100644
--- a/lib/haxe/haxelib.json
+++ b/lib/haxe/haxelib.json
@@ -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": { },