From 81b0d84c787aac144229ecb922be3ee5a19dabbd Mon Sep 17 00:00:00 2001
From: Shoothzj <shoothzj@gmail.com>
Date: Thu, 30 Dec 2021 21:33:42 +0800
Subject: [PATCH 1/2] bump guava version to 31.0.1

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index de72b19d010..8f2fa7652f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,8 +157,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<!-- for jdk 7 compatibility -->
-				<version>29.0-android</version>
+				<version>31.0.1-jre</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.code.gson</groupId>

From 86ef176250472c85c1316ffd2139e200bbbf4316 Mon Sep 17 00:00:00 2001
From: Shoothzj <shoothzj@gmail.com>
Date: Thu, 30 Dec 2021 21:53:31 +0800
Subject: [PATCH 2/2] bump guava version to 31.0.1

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 15500d3ea59..005c6b3be7b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,7 @@ Apollo 2.0.0
 * [Support only show difference keys when compare namespace](https://github.com/apolloconfig/apollo/pull/4165)
 * [Fix the issue that property placeholder doesn't work for dubbo reference beans](https://github.com/apolloconfig/apollo/pull/4175)
 * [Fix the NPE occurred when using EnableApolloConfig with Spring 3.1.1](https://github.com/apolloconfig/apollo/pull/4180)
+* [Bump guava from 29.0 to 31.0.1](https://github.com/apolloconfig/apollo/pull/4182)
 
 ------------------
 All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)