File tree Expand file tree Collapse file tree 4 files changed +0
-29
lines changed Expand file tree Collapse file tree 4 files changed +0
-29
lines changed Original file line number Diff line number Diff line change @@ -109,7 +109,6 @@ lazy val sparkCobol = (project in file("spark-cobol"))
109
109
}
110
110
},
111
111
libraryDependencies ++= SparkCobolDependencies (scalaVersion.value) :+ getScalaDependency(scalaVersion.value),
112
- dependencyOverrides ++= SparkCobolDependenciesOverride ,
113
112
Test / fork := true , // Spark tests fail randomly otherwise
114
113
populateBuildInfoTemplate,
115
114
releasePublishArtifactsAction := PgpKeys .publishSigned.value,
Original file line number Diff line number Diff line change 102
102
<maven .release.version>2.4.2</maven .release.version>
103
103
<maven .scm.provider.gitexe.version>1.8.1</maven .scm.provider.gitexe.version>
104
104
<maven .scoverage.version>1.3.0</maven .scoverage.version>
105
- <maven .rat.plugin.version>0.12</maven .rat.plugin.version>
106
105
<maven .gpg.plugin.version>1.6</maven .gpg.plugin.version>
107
106
108
107
<!-- Frameworks and libraries -->
111
110
<spark .version>3.5.6</spark .version>
112
111
<scalatest .version>3.2.19</scalatest .version>
113
112
<specs .version>2.4.16</specs .version>
114
- <guava .version>15.0</guava .version>
115
113
<jackson .version>2.13.1</jackson .version>
116
114
<mockito .version>4.11.0</mockito .version>
117
115
<scala_logging .version>3.7.2</scala_logging .version>
250
248
<version >${mockito.version} </version >
251
249
<scope >test</scope >
252
250
</dependency >
253
- <dependency >
254
- <groupId >com.google.guava</groupId >
255
- <artifactId >guava</artifactId >
256
- <version >${guava.version} </version >
257
- </dependency >
258
251
</dependencies >
259
252
</dependencyManagement >
260
253
267
260
<groupId >org.apache.maven.plugins</groupId >
268
261
<artifactId >maven-compiler-plugin</artifactId >
269
262
<version >${maven.compiler.version} </version >
270
- <configuration >
271
- <source >${maven.compiler.source} </source >
272
- <target >${maven.compiler.target} </target >
273
- </configuration >
274
263
</plugin >
275
264
<!-- the Maven Scala plugin -->
276
265
<plugin >
Original file line number Diff line number Diff line change 17
17
import sbt ._
18
18
19
19
object Dependencies {
20
- private val guavaVersion = " 15.0"
21
20
private val scodecCoreVersion = " 1.11.4"
22
21
private val antlrValue = " 4.8"
23
22
private val slf4jVersion = " 1.7.25"
@@ -62,13 +61,6 @@ object Dependencies {
62
61
" org.mockito" % " mockito-core" % mockitoVersion % Test
63
62
)
64
63
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
-
72
64
val CobolParserDependencies : Seq [ModuleID ] = Seq (
73
65
// compile
74
66
" org.antlr" % " antlr4-runtime" % antlrValue,
Original file line number Diff line number Diff line change 42
42
<scope >provided</scope >
43
43
</dependency >
44
44
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
-
54
45
<!-- COBOL parser -->
55
46
<dependency >
56
47
<groupId >za.co.absa.cobrix</groupId >
You can’t perform that action at this time.
0 commit comments