aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2013-02-27 18:49:03 +0000
committerFeng Xiao <xfxyjwf@gmail.com>2015-03-24 16:38:08 -0700
commit774d630bde574f5fcbb6dae6eaa0f91f7bc12967 (patch)
tree36b6618e503f49713bb0a94b945b3c7b287b158e
parenta36f1b43e738a7f5e40ab11b621803d684c3d65a (diff)
downloadprotobuf-2.5.0.tar.gz
protobuf-2.5.0.tar.bz2
protobuf-2.5.0.zip
Update version number to 2.5.0v2.5.0
Change-Id: Ie5114bde3574c6cb0c67d5852b4658287561a0d3
-rw-r--r--CHANGES.txt4
-rw-r--r--configure.ac2
-rw-r--r--java/pom.xml2
-rwxr-xr-xpython/setup.py2
4 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index a21e956c..5eefe9a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-2012-09-19 version 2.5.0:
+2013-02-27 version 2.5.0:
General
* New notion "import public" that allows a proto file to forward the content
@@ -32,7 +32,7 @@
comments for corresponding classes and data members.
* Added Parser to parse directly into messages without a Builder. For
example,
- Foo foo = Foo.getParser().ParseFrom(input);
+ Foo foo = Foo.PARSER.ParseFrom(input);
Using Parser is ~25% faster than using Builder to parse messages.
* Added getters/setters to access the underlying ByteString of a string field
directly.
diff --git a/configure.ac b/configure.ac
index 9c90ddeb..b2325290 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,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],[2.5.0-pre],[protobuf@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[2.5.0],[protobuf@googlegroups.com],[protobuf])
AM_MAINTAINER_MODE([enable])
diff --git a/java/pom.xml b/java/pom.xml
index 9f464c14..a3746fad 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -10,7 +10,7 @@
</parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>2.5.0-pre</version>
+ <version>2.5.0</version>
<packaging>bundle</packaging>
<name>Protocol Buffer Java API</name>
<description>
diff --git a/python/setup.py b/python/setup.py
index 8a986298..777839a0 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -156,7 +156,7 @@ if __name__ == '__main__':
libraries = [ "protobuf" ]))
setup(name = 'protobuf',
- version = '2.5.0-pre',
+ version = '2.5.0',
packages = [ 'google' ],
namespace_packages = [ 'google' ],
test_suite = 'setup.MakeTestSuite',