Merge branch 'master' into update/sbt-ci-release-1.6.1

sbt · Sep 17, 2024 · d8fc295 · d8fc295
2 parents ec6b7bc + d864f44
commit d8fc295
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/build.sbt b/build.sbt
@@ -3,7 +3,7 @@ organization := "com.github.sbt"
 homepage := Some(url("https://github.com/sbt/sbt-native-packager"))
 
 Global / onChangedBuildSource := ReloadOnSourceChanges
-Global / scalaVersion := "2.12.19"
+Global / scalaVersion := "2.12.20"
 
 // crossBuildingSettings
 crossSbtVersions := Vector("1.1.6")
@@ -17,9 +17,9 @@ libraryDependencies ++= Seq(
   // these dependencies have to be explicitly added by the user
   "com.spotify" % "docker-client" % "8.16.0" % Provided,
   "org.vafer" % "jdeb" % "1.10" % Provided artifacts Artifact("jdeb", "jar", "jar"),
-  "org.apache.commons" % "commons-compress" % "1.27.0",
+  "org.apache.commons" % "commons-compress" % "1.27.1",
   // for jdkpackager
-  "org.apache.ant" % "ant" % "1.10.14",
+  "org.apache.ant" % "ant" % "1.10.15",
   // workaround for the command line size limit
   "com.github.eldis" % "tool-launcher" % "0.2.2",
   "org.scalatest" %% "scalatest" % "3.2.19" % Test

diff --git a/integration-tests-ansible/test-project-play-rpm/project/build.properties b/integration-tests-ansible/test-project-play-rpm/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.1
+sbt.version=1.10.2
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.1
+sbt.version=1.10.2
diff --git a/src/sbt-test/ash/top-level-main/project/build.properties b/src/sbt-test/ash/top-level-main/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.1
+sbt.version=1.10.2
diff --git a/src/sbt-test/bash/top-level-main/project/build.properties b/src/sbt-test/bash/top-level-main/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.1
+sbt.version=1.10.2