diff --git a/docs/source/contributor-guide/adding_a_new_operator.md b/docs/source/contributor-guide/adding_a_new_operator.md
index 5414bbe83db..b3ebce49491 100644
--- a/docs/source/contributor-guide/adding_a_new_operator.md
+++ b/docs/source/contributor-guide/adding_a_new_operator.md
@@ -229,7 +229,7 @@ The validation workflow in `CometExecRule.isOperatorEnabled`:
#### Simple Example (Filter)
```scala
-import com.google.common.base.Objects
+import java.util.Objects
object CometFilterExec extends CometOperatorSerde[FilterExec] {
@@ -287,14 +287,14 @@ case class CometFilterExec(
}
}
- override def hashCode(): Int = Objects.hashCode(output, condition, child)
+ override def hashCode(): Int = Objects.hash(output, condition, child)
}
```
#### More Complex Example (Project)
```scala
-import com.google.common.base.Objects
+import java.util.Objects
object CometProjectExec extends CometOperatorSerde[ProjectExec] {
@@ -351,7 +351,7 @@ case class CometProjectExec(
}
}
- override def hashCode(): Int = Objects.hashCode(output, projectList, child)
+ override def hashCode(): Int = Objects.hash(output, projectList, child)
override protected def outputExpressions: Seq[NamedExpression] = projectList
}
diff --git a/pom.xml b/pom.xml
index 6a4b17c002e..ad1189269d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -364,15 +364,15 @@ under the License.
${spark.maven.scope}
-
+
com.google.guava
guava
${guava.version}
+ test
-
@@ -1373,6 +1373,29 @@ under the License.
+
+
+ ban-guava-outside-tests
+
+ enforce
+
+
+
+
+ true
+
+ com.google.guava:guava:*:*:compile
+ com.google.guava:guava:*:*:runtime
+ com.google.guava:failureaccess:*:*:compile
+ com.google.guava:failureaccess:*:*:runtime
+
+ Comet does not ship Guava. Use the JDK equivalent instead, or keep the
+ dependency at test scope.
+
+
+
+
no-duplicate-declared-dependencies
@@ -1422,15 +1445,6 @@ under the License.
javax.annotation.meta.TypeQualifierNickname
-
- com.google.guava
- guava
-
- com.google.thirdparty.publicsuffix.TrieParser
- com.google.thirdparty.publicsuffix.PublicSuffixPatterns
- com.google.thirdparty.publicsuffix.PublicSuffixType
-
-
org.apache.datasketches
datasketches-memory
diff --git a/spark/pom.xml b/spark/pom.xml
index c4693056304..3af3fd0ddef 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -130,23 +130,6 @@ under the License.
com.google.guava
guava
-
-
- *
- *
-
-
-
-
-
- com.google.guava
- failureaccess
- 1.0.2
test
@@ -733,7 +716,6 @@ under the License.
org.apache.arrow:*
com.google.protobuf:protobuf-java
- com.google.guava:guava
@@ -794,14 +776,6 @@ under the License.
com.google.protobuf
${comet.shade.packageName}.protobuf
-
- com.google.common
- ${comet.shade.packageName}.guava
-
-
- com.google.thirdparty
- ${comet.shade.packageName}.guava.thirdparty
-