Skip to content

Commit e0ddde4

Browse files
committed
Bump avro version to 1.11.4
Addresses critical vulnerability CVE-2024-47561
1 parent 3850ca1 commit e0ddde4

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ _Note:_ Currently [Treehugger](http://eed3si9n.com/treehugger/comments.html#Scal
119119

120120
##### Get the dependency with:
121121

122-
"com.julianpeeters" %% "avrohugger-core" % "2.8.3"
122+
"com.julianpeeters" %% "avrohugger-core" % "2.8.4"
123123

124124

125125
##### Description:
@@ -211,7 +211,7 @@ namespace rewritten. Multiple conflicting wildcards are not permitted.
211211

212212
##### Get the dependency with:
213213

214-
"com.julianpeeters" %% "avrohugger-filesorter" % "2.8.3"
214+
"com.julianpeeters" %% "avrohugger-filesorter" % "2.8.4"
215215

216216

217217
##### Description:
@@ -231,17 +231,17 @@ To ensure dependent schemas are compiled in the proper order (thus avoiding `org
231231
#### `avrohugger-tools`
232232

233233

234-
Download the avrohugger-tools jar for Scala [2.12](https://search.maven.org/remotecontent?filepath=com/julianpeeters/avrohugger-tools_2.12/2.8.3/avrohugger-tools_2.12-2.8.3-assembly.jar), or Scala [2.13](https://search.maven.org/remotecontent?filepath=com/julianpeeters/avrohugger-tools_2.13/2.8.3/avrohugger-tools_2.13-2.8.3-assembly.jar) (>30MB!) and use it like the avro-tools jar `Usage: [-string] (schema|protocol|datafile) input... outputdir`:
234+
Download the avrohugger-tools jar for Scala [2.12](https://search.maven.org/remotecontent?filepath=com/julianpeeters/avrohugger-tools_2.12/2.8.4/avrohugger-tools_2.12-2.8.4-assembly.jar), or Scala [2.13](https://search.maven.org/remotecontent?filepath=com/julianpeeters/avrohugger-tools_2.13/2.8.4/avrohugger-tools_2.13-2.8.4-assembly.jar) (>30MB!) and use it like the avro-tools jar `Usage: [-string] (schema|protocol|datafile) input... outputdir`:
235235

236236

237237
* `generate` generates Scala case class definitions:
238238

239-
`java -jar /path/to/avrohugger-tools_2.12-2.8.3-assembly.jar generate schema user.avsc . `
239+
`java -jar /path/to/avrohugger-tools_2.12-2.8.4-assembly.jar generate schema user.avsc . `
240240

241241

242242
* `generate-specific` generates definitions that extend Avro's `SpecificRecordBase`:
243243

244-
`java -jar /path/to/avrohugger-tools_2.12-2.8.3-assembly.jar generate-specific schema user.avsc . `
244+
`java -jar /path/to/avrohugger-tools_2.12-2.8.4-assembly.jar generate-specific schema user.avsc . `
245245

246246

247247
## Warnings

build.sbt

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
lazy val avroVersion = "1.11.3"
1+
lazy val avroVersion = "1.11.4"
22

33
lazy val commonSettings = Seq(
44
organization := "com.julianpeeters",
5-
version := "2.8.3",
5+
version := "2.8.4",
66
ThisBuild / versionScheme := Some("semver-spec"),
77
scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature"),
88
Test / scalacOptions ++= Seq("-Yrangepos"),
9-
scalaVersion := "3.3.1",
10-
crossScalaVersions := Seq("2.12.18", "2.13.12", scalaVersion.value),
9+
scalaVersion := "3.3.4",
10+
crossScalaVersions := Seq("2.12.20", "2.13.15", scalaVersion.value),
1111
libraryDependencies += "org.apache.avro" % "avro" % avroVersion,
1212
libraryDependencies += "org.apache.avro" % "avro-compiler" % avroVersion,
1313
libraryDependencies := { CrossVersion.partialVersion(scalaVersion.value) match {
@@ -73,7 +73,10 @@ lazy val `avrohugger-filesorter` = (project in file("avrohugger-filesorter"))
7373
lazy val `avrohugger-tools` = (project in file("avrohugger-tools"))
7474
.settings(
7575
commonSettings,
76-
libraryDependencies += "org.apache.avro" % "avro-tools" % avroVersion exclude("org.slf4j", "*"),
76+
libraryDependencies += "org.apache.avro" % "avro-tools" % avroVersion
77+
exclude("org.slf4j", "*")
78+
exclude ("org.apache.avro", "trevni-avro")
79+
exclude ("org.apache.avro", "trevni-core"),
7780
Compile / assembly / artifact := {
7881
val art: Artifact = (Compile / assembly / artifact).value
7982
art.withClassifier(Some("assembly"))

project/assembly.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
1+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.8
1+
sbt.version=1.10.2

project/gpg.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
1+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0")

0 commit comments

Comments
 (0)