From c93174346149f259ebc85fdb46826fcf84abb07d Mon Sep 17 00:00:00 2001
From: Paul Yang <TeBoring@users.noreply.github.com>
Date: Mon, 2 Apr 2018 15:55:28 -0700
Subject: 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
---
 java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/pom.xml')

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>
-- 
cgit v1.2.3