Update version number in trunk.
diff --git a/CHANGES.txt b/CHANGES.txt
index 3ffad2a..f62c663 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-????-??-?? version 2.1.0:
+2009-05-13 version 2.1.0:
General
* Repeated fields of primitive types (types other that string, group, and
diff --git a/configure.ac b/configure.ac
index b10473e..075d935 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
# 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],[2.0.4-pre],[protobuf@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[2.1.1-pre],[protobuf@googlegroups.com],[protobuf])
# Detect whether the user specified their own compilation flags. If so then
# we want to respect their decision, otherwise we will twiddle them later.
diff --git a/java/pom.xml b/java/pom.xml
index 9a5ada9..12787a4 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -11,7 +11,7 @@
</parent>-->
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.1.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Protocol Buffer Java API</name>
<description>
diff --git a/python/setup.py b/python/setup.py
index 6383bc1..e8ad11d 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -105,7 +105,7 @@
generate_proto("../src/google/protobuf/descriptor.proto")
setup(name = 'protobuf',
- version = '2.0.4-SNAPSHOT',
+ version = '2.1.1-SNAPSHOT',
packages = [ 'google' ],
namespace_packages = [ 'google' ],
test_suite = 'setup.MakeTestSuite',
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
index 7247bfd..6be8471 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@@ -7,12 +7,12 @@
#include <google/protobuf/stubs/common.h>
-#if GOOGLE_PROTOBUF_VERSION < 2000003
+#if GOOGLE_PROTOBUF_VERSION < 2001000
#error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
-#if 2000004 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 2001001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
index 96be91b..ace1077 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -83,24 +83,24 @@
// The current version, represented as a single integer to make comparison
// easier: major * 10^6 + minor * 10^3 + micro
-#define GOOGLE_PROTOBUF_VERSION 2000004
+#define GOOGLE_PROTOBUF_VERSION 2001001
// The minimum library version which works with the current version of the
// headers.
-#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2000003
+#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2001000
// The minimum header version which works with the current version of
// the library. This constant should only be used by protoc's C++ code
// generator.
-static const int kMinHeaderVersionForLibrary = 2000003;
+static const int kMinHeaderVersionForLibrary = 2001000;
// The minimum protoc version which works with the current version of the
// headers.
-#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2000003
+#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2001000
// The minimum header version which works with the current version of
// protoc. This constant should only be used in VerifyVersion().
-static const int kMinHeaderVersionForProtoc = 2000003;
+static const int kMinHeaderVersionForProtoc = 2001000;
// Verifies that the headers and libraries are compatible. Use the macro
// below to call this.
