Index: trunk/.classpath
===================================================================
--- trunk/.classpath	(revision 16162)
+++ trunk/.classpath	(revision 16163)
@@ -49,9 +49,4 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="tools/guava.jar">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="lib" path="test/lib/system-rules-1.19.0.jar">
 		<attributes>
Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 16162)
+++ trunk/build.xml	(revision 16163)
@@ -59,5 +59,4 @@
         <property name="javacutil.jar" location="${tools.dir}/javacutil.jar"/>
         <property name="failureaccess.jar" location="${tools.dir}/failureaccess.jar"/>
-        <property name="guava.jar" location="${tools.dir}/guava.jar"/>
         <property name="commons-lang3.jar" location="${pmd.dir}/commons-lang3-3.8.1.jar"/>
         <property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
@@ -102,5 +101,4 @@
             <pathelement path="${resources.dir}"/>
             <pathelement path="${failureaccess.jar}"/>
-            <pathelement path="${guava.jar}"/>
             <pathelement path="${commons-lang3.jar}"/>
             <pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
@@ -116,5 +114,4 @@
             <pathelement location="${javacutil.jar}"/>
             <pathelement location="${failureaccess.jar}"/>
-            <pathelement location="${guava.jar}"/>
             <pathelement location="${jformatstring.jar}"/>
             <pathelement location="${auto-value-annotations.jar}"/>
@@ -852,5 +849,4 @@
                 <pathelement path="${build.dir}"/>
                 <pathelement path="${test.dir}/build/unit"/>
-                <pathelement path="${guava.jar}"/>
                 <pathelement path="${commons-lang3.jar}"/>
             </classpath>
@@ -868,5 +864,4 @@
                     <pathelement path="${build.dir}"/>
                     <pathelement path="${script-build.dir}"/>
-                    <pathelement path="${guava.jar}"/>
                     <pathelement path="${commons-lang3.jar}"/>
                 </classpath>
@@ -894,5 +889,4 @@
                 <pathelement path="${build.dir}"/>
                 <pathelement path="${script-build.dir}"/>
-                <pathelement path="${guava.jar}"/>
                 <pathelement path="${commons-lang3.jar}"/>
             </classpath>
Index: trunk/ide/netbeans/nbproject/project.properties
===================================================================
--- trunk/ide/netbeans/nbproject/project.properties	(revision 16162)
+++ trunk/ide/netbeans/nbproject/project.properties	(revision 16163)
@@ -37,5 +37,4 @@
 file.reference.equalsverifier-3.1.2.jar=../../test/lib/equalsverifier-3.1.2.jar
 file.reference.spotbugs.jar=../../tools/spotbugs/spotbugs.jar
-file.reference.guava.jar=../../tools/guava.jar
 file.reference.hamcrest-core-1.3.jar=../../test/lib/junit/hamcrest-core-1.3.jar
 file.reference.jfcunit.jar=../../test/lib/jfcunit.jar
@@ -70,5 +69,4 @@
     ${file.reference.equalsverifier-3.1.2.jar}:\
     ${file.reference.hamcrest-core-1.3.jar}:\
-    ${file.reference.guava.jar}:\
     ${file.reference.classgraph.jar}:\
     ${file.reference.commons-lang3-3.8.1.jar}:\