Skip to content

Commit 0d0b07e

Browse files
committed
Remove redundant Guava dependency. It was needed for older versions of Spark.
1 parent 0731745 commit 0d0b07e

File tree

4 files changed

+0
-29
lines changed

4 files changed

+0
-29
lines changed

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ lazy val sparkCobol = (project in file("spark-cobol"))
109109
}
110110
},
111111
libraryDependencies ++= SparkCobolDependencies(scalaVersion.value) :+ getScalaDependency(scalaVersion.value),
112-
dependencyOverrides ++= SparkCobolDependenciesOverride,
113112
Test / fork := true, // Spark tests fail randomly otherwise
114113
populateBuildInfoTemplate,
115114
releasePublishArtifactsAction := PgpKeys.publishSigned.value,

pom.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
<maven.release.version>2.4.2</maven.release.version>
103103
<maven.scm.provider.gitexe.version>1.8.1</maven.scm.provider.gitexe.version>
104104
<maven.scoverage.version>1.3.0</maven.scoverage.version>
105-
<maven.rat.plugin.version>0.12</maven.rat.plugin.version>
106105
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
107106

108107
<!-- Frameworks and libraries -->
@@ -111,7 +110,6 @@
111110
<spark.version>3.5.6</spark.version>
112111
<scalatest.version>3.2.19</scalatest.version>
113112
<specs.version>2.4.16</specs.version>
114-
<guava.version>15.0</guava.version>
115113
<jackson.version>2.13.1</jackson.version>
116114
<mockito.version>4.11.0</mockito.version>
117115
<scala_logging.version>3.7.2</scala_logging.version>
@@ -250,11 +248,6 @@
250248
<version>${mockito.version}</version>
251249
<scope>test</scope>
252250
</dependency>
253-
<dependency>
254-
<groupId>com.google.guava</groupId>
255-
<artifactId>guava</artifactId>
256-
<version>${guava.version}</version>
257-
</dependency>
258251
</dependencies>
259252
</dependencyManagement>
260253

@@ -267,10 +260,6 @@
267260
<groupId>org.apache.maven.plugins</groupId>
268261
<artifactId>maven-compiler-plugin</artifactId>
269262
<version>${maven.compiler.version}</version>
270-
<configuration>
271-
<source>${maven.compiler.source}</source>
272-
<target>${maven.compiler.target}</target>
273-
</configuration>
274263
</plugin>
275264
<!-- the Maven Scala plugin -->
276265
<plugin>

project/Dependencies.scala

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import sbt._
1818

1919
object Dependencies {
20-
private val guavaVersion = "15.0"
2120
private val scodecCoreVersion = "1.11.4"
2221
private val antlrValue = "4.8"
2322
private val slf4jVersion = "1.7.25"
@@ -62,13 +61,6 @@ object Dependencies {
6261
"org.mockito" % "mockito-core" % mockitoVersion % Test
6362
)
6463

65-
val SparkCobolDependenciesOverride: Seq[ModuleID] = Seq(
66-
// Needs to be added as a separate dependency since Spark uses an newer
67-
// version of Guava which has removed 'com.google.common.base.Stopwatch.elapsedMillis',
68-
// however, the version of Hadoop imported by Spark relies on that method.
69-
"com.google.guava" % "guava" % guavaVersion,
70-
)
71-
7264
val CobolParserDependencies: Seq[ModuleID] = Seq(
7365
// compile
7466
"org.antlr" % "antlr4-runtime" % antlrValue,

spark-cobol/pom.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,6 @@
4242
<scope>provided</scope>
4343
</dependency>
4444

45-
<!-- guava -->
46-
<!-- Needs to be added as a separate dependency since Spark uses an newer
47-
version of Guava which has removed 'com.google.common.base.Stopwatch.elapsedMillis',
48-
however, the version of Hadoop imported by Spark relies on that method. -->
49-
<dependency>
50-
<groupId>com.google.guava</groupId>
51-
<artifactId>guava</artifactId>
52-
</dependency>
53-
5445
<!-- COBOL parser -->
5546
<dependency>
5647
<groupId>za.co.absa.cobrix</groupId>

0 commit comments

Comments
 (0)