aboutsummaryrefslogtreecommitdiffhomepage
path: root/java/pom.xml
diff options
context:
space:
mode:
authorGravatar Paul Yang <TeBoring@users.noreply.github.com>2018-04-02 15:55:28 -0700
committerGravatar GitHub <noreply@github.com>2018-04-02 15:55:28 -0700
commitc93174346149f259ebc85fdb46826fcf84abb07d (patch)
tree284fd957f2007db39101adb0d51ca0fb0b007255 /java/pom.xml
parent579f81e1c66d64395031a1bbcb54ba7a44dade55 (diff)
Merge branch (#4466)
* Fix setup.py for windows build. * Bump version number to 3.5.2 * Cat the test-suite.log on errors for presubits
Diffstat (limited to 'java/pom.xml')
-rw-r--r--java/pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/pom.xml b/java/pom.xml
index b7c3e485..c42cae11 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -11,7 +11,7 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.5.1</version>
+ <version>3.5.2</version>
<packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name>