aboutsummaryrefslogtreecommitdiff
path: root/java/util
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@google.com>2017-12-01 10:05:19 -0800
committerAdam Cozzette <acozzette@google.com>2017-12-01 10:05:19 -0800
commit0ba8eea655a5e40d19ab95c773192b5d908c5a61 (patch)
tree4c2c97ade1ab197d361c146bacae5adde55986bf /java/util
parent92a7e778e7394386f413cec28d67a07630f784b1 (diff)
parenta711e3d5b4ee1dd7f9d21197dca8432a5819a64e (diff)
downloadprotobuf-0ba8eea655a5e40d19ab95c773192b5d908c5a61.tar.gz
protobuf-0ba8eea655a5e40d19ab95c773192b5d908c5a61.tar.bz2
protobuf-0ba8eea655a5e40d19ab95c773192b5d908c5a61.zip
Merge branch 'master' into down-integrate
Diffstat (limited to 'java/util')
-rw-r--r--java/util/pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/util/pom.xml b/java/util/pom.xml
index 35afb844..c3f2a69a 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.4.1</version>
+ <version>3.5.0</version>
</parent>
<artifactId>protobuf-java-util</artifactId>