From 45136aabd47f7915a5fc38375b67e368c3a646a0 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Sat, 20 Jul 2019 19:06:54 +0200
Subject: [PATCH] Upgrade to Protobuf 3.9 (plus consistent XMLUnit
 declarations)

---
 spring-core/spring-core.gradle                               | 2 +-
 spring-oxm/spring-oxm.gradle                                 | 2 +-
 spring-web/spring-web.gradle                                 | 4 ++--
 .../converter/protobuf/ProtobufHttpMessageConverter.java     | 5 +++--
 spring-webflux/spring-webflux.gradle                         | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index 3a63e5b681..c6f7cdbbef 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -86,8 +86,8 @@ dependencies {
 	testCompile("io.projectreactor:reactor-test")
 	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
 	testCompile("com.google.code.findbugs:jsr305:3.0.2")
-	testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
 	testCompile("org.xmlunit:xmlunit-assertj:2.6.2")
+	testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
 	testCompile("javax.xml.bind:jaxb-api:2.3.1")
 	testCompile("com.fasterxml.woodstox:woodstox-core:5.2.0") {
 		exclude group: "stax", module: "stax-api"
diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle
index 0ec272ea6d..e35c478ab3 100644
--- a/spring-oxm/spring-oxm.gradle
+++ b/spring-oxm/spring-oxm.gradle
@@ -70,8 +70,8 @@ dependencies {
 		exclude group: "stax", module: "stax-api"
 	}
 	testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
-	testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
 	testCompile("org.xmlunit:xmlunit-assertj:2.6.2")
+	testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
 	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
 	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")
 }
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index ea35ddd1e7..631f2aa41d 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -56,7 +56,7 @@ dependencies {
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2Version}")
 	optional("com.google.code.gson:gson:2.8.5")
-	optional("com.google.protobuf:protobuf-java-util:3.7.1")
+	optional("com.google.protobuf:protobuf-java-util:3.9.0")
 	optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
 	optional("com.rometools:rome:1.12.1")
 	optional("com.caucho:hessian:4.0.51")
@@ -78,8 +78,8 @@ dependencies {
 	testCompile("com.squareup.okhttp3:mockwebserver:3.14.2")
 	testCompile("org.jetbrains.kotlin:kotlin-reflect")
 	testCompile("org.skyscreamer:jsonassert:1.5.0")
-	testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
 	testCompile("org.xmlunit:xmlunit-assertj:2.6.2")
+	testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
 	testRuntime("com.sun.mail:javax.mail:1.6.2")
 	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
 	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")
diff --git a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
index 7cfa952112..ba06466948 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -231,6 +231,7 @@ public class ProtobufHttpMessageConverter extends AbstractHttpMessageConverter<M
 				(this.protobufFormatSupport != null && this.protobufFormatSupport.supportsWriteOnly(mediaType)));
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	protected void writeInternal(Message message, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
@@ -253,7 +254,7 @@ public class ProtobufHttpMessageConverter extends AbstractHttpMessageConverter<M
 		}
 		else if (TEXT_PLAIN.isCompatibleWith(contentType)) {
 			OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputMessage.getBody(), charset);
-			TextFormat.print(message, outputStreamWriter);
+			TextFormat.print(message, outputStreamWriter);  // deprecated on Protobuf 3.9
 			outputStreamWriter.flush();
 			outputMessage.getBody().flush();
 		}
diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle
index 9d1bf280c5..e0c9196de0 100644
--- a/spring-webflux/spring-webflux.gradle
+++ b/spring-webflux/spring-webflux.gradle
@@ -40,7 +40,7 @@ dependencies {
 	}
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
-	optional("com.google.protobuf:protobuf-java-util:3.7.1")
+	optional("com.google.protobuf:protobuf-java-util:3.9.0")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:${coroutinesVersion}")
 	testCompile("javax.xml.bind:jaxb-api:2.3.1")