aboutsummaryrefslogtreecommitdiffhomepage
path: root/java/pom.xml
diff options
context:
space:
mode:
authorGravatar Feng Xiao <xfxyjwf@gmail.com>2014-10-21 16:36:59 -0700
committerGravatar Feng Xiao <xfxyjwf@gmail.com>2014-10-21 16:36:59 -0700
commitf9e623b1671c8333247f251c5c4a2ef2ad7bcb2d (patch)
treebaaba8a2cbfbe263870769401b3ca52dd5e36da2 /java/pom.xml
parent2853cd4a10febda5ba7407e2e8570eae411761a6 (diff)
parentbba83652e1be610bdb7ee1566ad18346d98b843c (diff)
Merge changes from 2.6.1 release branch.
Diffstat (limited to 'java/pom.xml')
-rw-r--r--java/pom.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/pom.xml b/java/pom.xml
index 0d9779ff..2e68b0ee 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.6.1rc1</version>
+ <version>2.6.1</version>
<packaging>bundle</packaging>
<name>Protocol Buffer Java API</name>
<description>
@@ -148,7 +148,7 @@
<instructions>
<Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
<Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
- <Export-Package>com.google.protobuf;version=2.6.1rc1</Export-Package>
+ <Export-Package>com.google.protobuf;version=2.6.1</Export-Package>
</instructions>
</configuration>
</plugin>