Skip to content

Commit

Permalink
Bump avro version to 1.11.4
Browse files Browse the repository at this point in the history
Addresses critical vulnerability CVE-2024-47561
  • Loading branch information
julianpeeters committed Oct 8, 2024
1 parent 3850ca1 commit e0ddde4
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 13 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ _Note:_ Currently [Treehugger](http://eed3si9n.com/treehugger/comments.html#Scal

##### Get the dependency with:

"com.julianpeeters" %% "avrohugger-core" % "2.8.3"
"com.julianpeeters" %% "avrohugger-core" % "2.8.4"


##### Description:
Expand Down Expand Up @@ -211,7 +211,7 @@ namespace rewritten. Multiple conflicting wildcards are not permitted.

##### Get the dependency with:

"com.julianpeeters" %% "avrohugger-filesorter" % "2.8.3"
"com.julianpeeters" %% "avrohugger-filesorter" % "2.8.4"


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


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`:
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`:


* `generate` generates Scala case class definitions:

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


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

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


## Warnings
Expand Down
13 changes: 8 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
lazy val avroVersion = "1.11.3"
lazy val avroVersion = "1.11.4"

lazy val commonSettings = Seq(
organization := "com.julianpeeters",
version := "2.8.3",
version := "2.8.4",
ThisBuild / versionScheme := Some("semver-spec"),
scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature"),
Test / scalacOptions ++= Seq("-Yrangepos"),
scalaVersion := "3.3.1",
crossScalaVersions := Seq("2.12.18", "2.13.12", scalaVersion.value),
scalaVersion := "3.3.4",
crossScalaVersions := Seq("2.12.20", "2.13.15", scalaVersion.value),
libraryDependencies += "org.apache.avro" % "avro" % avroVersion,
libraryDependencies += "org.apache.avro" % "avro-compiler" % avroVersion,
libraryDependencies := { CrossVersion.partialVersion(scalaVersion.value) match {
Expand Down Expand Up @@ -73,7 +73,10 @@ lazy val `avrohugger-filesorter` = (project in file("avrohugger-filesorter"))
lazy val `avrohugger-tools` = (project in file("avrohugger-tools"))
.settings(
commonSettings,
libraryDependencies += "org.apache.avro" % "avro-tools" % avroVersion exclude("org.slf4j", "*"),
libraryDependencies += "org.apache.avro" % "avro-tools" % avroVersion
exclude("org.slf4j", "*")
exclude ("org.apache.avro", "trevni-avro")
exclude ("org.apache.avro", "trevni-core"),
Compile / assembly / artifact := {
val art: Artifact = (Compile / assembly / artifact).value
art.withClassifier(Some("assembly"))
Expand Down
2 changes: 1 addition & 1 deletion project/assembly.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.8
sbt.version=1.10.2
2 changes: 1 addition & 1 deletion project/gpg.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0")

0 comments on commit e0ddde4

Please sign in to comment.