aboutsummaryrefslogtreecommitdiffhomepage
path: root/ruby
diff options
context:
space:
mode:
authorGravatar Jisi Liu <jisi.liu@gmail.com>2016-09-14 09:37:48 -0700
committerGravatar Jisi Liu <jisi.liu@gmail.com>2016-09-14 09:37:48 -0700
commit58860c021f0bdd0c79e612e7092c6c3d692488c0 (patch)
tree7c05b76a3b5573130daf2d0bf4e70359d87f02c1 /ruby
parent86fcd879b38505446799b2f2a2929415ddad620a (diff)
parent57170b93438b25c9c7da9bc53a9545dad261fbcb (diff)
Merge remote-tracking branch 'origin/3.0.x' into merge
Diffstat (limited to 'ruby')
-rw-r--r--ruby/google-protobuf.gemspec2
-rw-r--r--ruby/pom.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec
index 286d8fe3..67b15c33 100644
--- a/ruby/google-protobuf.gemspec
+++ b/ruby/google-protobuf.gemspec
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "google-protobuf"
- s.version = "3.0.0"
+ s.version = "3.0.2"
s.licenses = ["BSD"]
s.summary = "Protocol Buffers"
s.description = "Protocol Buffers are Google's data interchange format."
diff --git a/ruby/pom.xml b/ruby/pom.xml
index 99e8449b..7b896137 100644
--- a/ruby/pom.xml
+++ b/ruby/pom.xml
@@ -86,7 +86,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.0.0-beta-4</version>
+ <version>3.0.0</version>
</dependency>
</dependencies>
</project>