diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 000000000000..8fc30111dd55
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1 @@
+-XX:-TieredCompilation -XX:TieredStopAtLevel=1 -XX:+UseParallelGC -Djava.awt.headless=true
\ No newline at end of file
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 000000000000..cc57db8375d4
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1,2 @@
+-T2C
+--strict-checksums
diff --git a/pom.xml b/pom.xml
index 79ecb39a58dc..fb3964861235 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,10 @@
Parent for guava artifacts
https://github.com/google/guava
+
+ all
+ false
+ 48
%regex[.*.class]
1.4.2
@@ -31,6 +35,7 @@
HEAD-android-SNAPSHOT
android
android
+ 3
GitHub Issues
@@ -230,7 +235,7 @@
maven-surefire-plugin
- 2.7.2
+ 3.2.5
${test.include}
@@ -249,6 +254,8 @@
-Xmx1536M -Duser.language=hi -Duser.country=IN ${test.add.opens}
+ true
+ 2C