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/core/pom.xml | 2 +-
 java/pom.xml      | 2 +-
 java/util/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'java')

diff --git a/java/core/pom.xml b/java/core/pom.xml
index 4b65e72e..8139241b 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.5.1</version>
+    <version>3.5.2</version>
   </parent>
 
   <artifactId>protobuf-java</artifactId>
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>
diff --git a/java/util/pom.xml b/java/util/pom.xml
index 3de624fa..4e55df0d 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.5.1</version>
+    <version>3.5.2</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>
-- 
cgit v1.2.3