diff --git a/src/python/pants/backend/java/dependency_inference/java_parser.lockfile b/src/python/pants/backend/java/dependency_inference/java_parser.lockfile index 42833957952..f78c4984da6 100644 --- a/src/python/pants/backend/java/dependency_inference/java_parser.lockfile +++ b/src/python/pants/backend/java/dependency_inference/java_parser.lockfile @@ -90,19 +90,19 @@ packaging = "jar" [[entries.dependencies]] group = "com.fasterxml.jackson.core" -artifact = "jackson-core" +artifact = "jackson-annotations" version = "2.12.4" packaging = "jar" [[entries.dependencies]] group = "com.fasterxml.jackson.core" -artifact = "jackson-databind" +artifact = "jackson-core" version = "2.12.4" packaging = "jar" [[entries.dependencies]] group = "com.fasterxml.jackson.core" -artifact = "jackson-annotations" +artifact = "jackson-databind" version = "2.12.4" packaging = "jar" @@ -149,15 +149,9 @@ version = "3.28.0-GA" packaging = "jar" [[entries.dependencies]] -group = "com.google.guava" -artifact = "listenablefuture" -version = "9999.0-empty-to-avoid-conflict-with-guava" -packaging = "jar" - -[[entries.dependencies]] -group = "com.google.j2objc" -artifact = "j2objc-annotations" -version = "1.3" +group = "com.github.javaparser" +artifact = "javaparser-core" +version = "3.23.0" packaging = "jar" [[entries.dependencies]] @@ -167,33 +161,33 @@ version = "3.0.2" packaging = "jar" [[entries.dependencies]] -group = "com.github.javaparser" -artifact = "javaparser-core" -version = "3.23.0" +group = "com.google.errorprone" +artifact = "error_prone_annotations" +version = "2.5.1" packaging = "jar" [[entries.dependencies]] group = "com.google.guava" -artifact = "guava" -version = "30.1.1-jre" +artifact = "failureaccess" +version = "1.0.1" packaging = "jar" [[entries.dependencies]] group = "com.google.guava" -artifact = "failureaccess" -version = "1.0.1" +artifact = "guava" +version = "30.1.1-jre" packaging = "jar" [[entries.dependencies]] -group = "com.google.errorprone" -artifact = "error_prone_annotations" -version = "2.5.1" +group = "com.google.guava" +artifact = "listenablefuture" +version = "9999.0-empty-to-avoid-conflict-with-guava" packaging = "jar" [[entries.dependencies]] -group = "org.javassist" -artifact = "javassist" -version = "3.28.0-GA" +group = "com.google.j2objc" +artifact = "j2objc-annotations" +version = "1.3" packaging = "jar" [[entries.dependencies]] @@ -202,6 +196,12 @@ artifact = "checker-qual" version = "3.8.0" packaging = "jar" +[[entries.dependencies]] +group = "org.javassist" +artifact = "javassist" +version = "3.28.0-GA" +packaging = "jar" + [entries.coord] group = "com.github.javaparser" @@ -252,30 +252,12 @@ fingerprint = "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26" serialized_bytes_length = 4617 [[entries]] file_name = "com.google.guava_guava_30.1.1-jre.jar" -[[entries.directDependencies]] -group = "com.google.guava" -artifact = "listenablefuture" -version = "9999.0-empty-to-avoid-conflict-with-guava" -packaging = "jar" - -[[entries.directDependencies]] -group = "com.google.j2objc" -artifact = "j2objc-annotations" -version = "1.3" -packaging = "jar" - [[entries.directDependencies]] group = "com.google.code.findbugs" artifact = "jsr305" version = "3.0.2" packaging = "jar" -[[entries.directDependencies]] -group = "com.google.guava" -artifact = "failureaccess" -version = "1.0.1" -packaging = "jar" - [[entries.directDependencies]] group = "com.google.errorprone" artifact = "error_prone_annotations" @@ -283,29 +265,41 @@ version = "2.5.1" packaging = "jar" [[entries.directDependencies]] -group = "org.checkerframework" -artifact = "checker-qual" -version = "3.8.0" +group = "com.google.guava" +artifact = "failureaccess" +version = "1.0.1" packaging = "jar" -[[entries.dependencies]] +[[entries.directDependencies]] group = "com.google.guava" artifact = "listenablefuture" version = "9999.0-empty-to-avoid-conflict-with-guava" packaging = "jar" -[[entries.dependencies]] +[[entries.directDependencies]] group = "com.google.j2objc" artifact = "j2objc-annotations" version = "1.3" packaging = "jar" +[[entries.directDependencies]] +group = "org.checkerframework" +artifact = "checker-qual" +version = "3.8.0" +packaging = "jar" + [[entries.dependencies]] group = "com.google.code.findbugs" artifact = "jsr305" version = "3.0.2" packaging = "jar" +[[entries.dependencies]] +group = "com.google.errorprone" +artifact = "error_prone_annotations" +version = "2.5.1" +packaging = "jar" + [[entries.dependencies]] group = "com.google.guava" artifact = "failureaccess" @@ -313,9 +307,15 @@ version = "1.0.1" packaging = "jar" [[entries.dependencies]] -group = "com.google.errorprone" -artifact = "error_prone_annotations" -version = "2.5.1" +group = "com.google.guava" +artifact = "listenablefuture" +version = "9999.0-empty-to-avoid-conflict-with-guava" +packaging = "jar" + +[[entries.dependencies]] +group = "com.google.j2objc" +artifact = "j2objc-annotations" +version = "1.3" packaging = "jar" [[entries.dependencies]] diff --git a/src/python/pants/backend/scala/dependency_inference/scala_parser.lockfile b/src/python/pants/backend/scala/dependency_inference/scala_parser.lockfile index 66df3d8f816..8162ca49c9b 100644 --- a/src/python/pants/backend/scala/dependency_inference/scala_parser.lockfile +++ b/src/python/pants/backend/scala/dependency_inference/scala_parser.lockfile @@ -77,19 +77,13 @@ fingerprint = "a639a90e2d21bbafd8a5e213c65442aad200ee086951605cbda8835bc6ef11d3" serialized_bytes_length = 118671 [[entries]] file_name = "com.thesamet.scalapb_lenses_2.13_0.11.4.jar" -[[entries.directDependencies]] -group = "org.scala-lang" -artifact = "scala-library" -version = "2.13.7" -packaging = "jar" - [[entries.directDependencies]] group = "org.scala-lang.modules" artifact = "scala-collection-compat_2.13" version = "2.4.4" packaging = "jar" -[[entries.dependencies]] +[[entries.directDependencies]] group = "org.scala-lang" artifact = "scala-library" version = "2.13.7" @@ -101,6 +95,12 @@ artifact = "scala-collection-compat_2.13" version = "2.4.4" packaging = "jar" +[[entries.dependencies]] +group = "org.scala-lang" +artifact = "scala-library" +version = "2.13.7" +packaging = "jar" + [entries.coord] group = "com.thesamet.scalapb" @@ -124,18 +124,18 @@ artifact = "lenses_2.13" version = "0.11.4" packaging = "jar" -[[entries.directDependencies]] -group = "org.scala-lang" -artifact = "scala-library" -version = "2.13.7" -packaging = "jar" - [[entries.directDependencies]] group = "org.scala-lang.modules" artifact = "scala-collection-compat_2.13" version = "2.4.4" packaging = "jar" +[[entries.directDependencies]] +group = "org.scala-lang" +artifact = "scala-library" +version = "2.13.7" +packaging = "jar" + [[entries.dependencies]] group = "com.google.protobuf" artifact = "protobuf-java" @@ -148,18 +148,18 @@ artifact = "lenses_2.13" version = "0.11.4" packaging = "jar" -[[entries.dependencies]] -group = "org.scala-lang" -artifact = "scala-library" -version = "2.13.7" -packaging = "jar" - [[entries.dependencies]] group = "org.scala-lang.modules" artifact = "scala-collection-compat_2.13" version = "2.4.4" packaging = "jar" +[[entries.dependencies]] +group = "org.scala-lang" +artifact = "scala-library" +version = "2.13.7" +packaging = "jar" + [entries.coord] group = "com.thesamet.scalapb" @@ -190,15 +190,15 @@ version = "2.6.1" packaging = "jar" [[entries.dependencies]] -group = "org.scala-lang" -artifact = "scala-library" -version = "2.13.7" +group = "io.circe" +artifact = "circe-numbers_2.13" +version = "0.14.1" packaging = "jar" [[entries.dependencies]] -group = "org.typelevel" -artifact = "simulacrum-scalafix-annotations_2.13" -version = "0.5.4" +group = "org.scala-lang" +artifact = "scala-library" +version = "2.13.7" packaging = "jar" [[entries.dependencies]] @@ -208,15 +208,15 @@ version = "2.6.1" packaging = "jar" [[entries.dependencies]] -group = "io.circe" -artifact = "circe-numbers_2.13" -version = "0.14.1" +group = "org.typelevel" +artifact = "cats-kernel_2.13" +version = "2.6.1" packaging = "jar" [[entries.dependencies]] group = "org.typelevel" -artifact = "cats-kernel_2.13" -version = "2.6.1" +artifact = "simulacrum-scalafix-annotations_2.13" +version = "0.5.4" packaging = "jar" @@ -249,21 +249,15 @@ version = "2.13.7" packaging = "jar" [[entries.dependencies]] -group = "org.scala-lang" -artifact = "scala-library" -version = "2.13.7" -packaging = "jar" - -[[entries.dependencies]] -group = "org.typelevel" -artifact = "simulacrum-scalafix-annotations_2.13" -version = "0.5.4" +group = "com.chuusai" +artifact = "shapeless_2.13" +version = "2.3.7" packaging = "jar" [[entries.dependencies]] -group = "org.typelevel" -artifact = "cats-core_2.13" -version = "2.6.1" +group = "io.circe" +artifact = "circe-core_2.13" +version = "0.14.1" packaging = "jar" [[entries.dependencies]] @@ -273,15 +267,15 @@ version = "0.14.1" packaging = "jar" [[entries.dependencies]] -group = "com.chuusai" -artifact = "shapeless_2.13" -version = "2.3.7" +group = "org.scala-lang" +artifact = "scala-library" +version = "2.13.7" packaging = "jar" [[entries.dependencies]] -group = "io.circe" -artifact = "circe-core_2.13" -version = "0.14.1" +group = "org.typelevel" +artifact = "cats-core_2.13" +version = "2.6.1" packaging = "jar" [[entries.dependencies]] @@ -290,6 +284,12 @@ artifact = "cats-kernel_2.13" version = "2.6.1" packaging = "jar" +[[entries.dependencies]] +group = "org.typelevel" +artifact = "simulacrum-scalafix-annotations_2.13" +version = "0.5.4" +packaging = "jar" + [entries.coord] group = "io.circe" @@ -474,18 +474,6 @@ artifact = "scala-compiler" version = "2.13.7" packaging = "jar" -[[entries.dependencies]] -group = "org.scala-lang" -artifact = "scala-library" -version = "2.13.7" -packaging = "jar" - -[[entries.dependencies]] -group = "org.scala-lang" -artifact = "scala-compiler" -version = "2.13.7" -packaging = "jar" - [[entries.dependencies]] group = "net.java.dev.jna" artifact = "jna" @@ -498,6 +486,18 @@ artifact = "jline" version = "3.20.0" packaging = "jar" +[[entries.dependencies]] +group = "org.scala-lang" +artifact = "scala-compiler" +version = "2.13.7" +packaging = "jar" + +[[entries.dependencies]] +group = "org.scala-lang" +artifact = "scala-library" +version = "2.13.7" +packaging = "jar" + [[entries.dependencies]] group = "org.scala-lang" artifact = "scala-reflect" @@ -534,21 +534,27 @@ version = "2.13.7" packaging = "jar" [[entries.dependencies]] -group = "org.scala-lang" -artifact = "scala-library" -version = "2.13.7" +group = "com.google.protobuf" +artifact = "protobuf-java" +version = "3.15.8" +packaging = "jar" + +[[entries.dependencies]] +group = "com.lihaoyi" +artifact = "sourcecode_2.13" +version = "0.2.7" packaging = "jar" [[entries.dependencies]] group = "com.thesamet.scalapb" -artifact = "scalapb-runtime_2.13" +artifact = "lenses_2.13" version = "0.11.4" packaging = "jar" [[entries.dependencies]] -group = "com.lihaoyi" -artifact = "sourcecode_2.13" -version = "0.2.7" +group = "com.thesamet.scalapb" +artifact = "scalapb-runtime_2.13" +version = "0.11.4" packaging = "jar" [[entries.dependencies]] @@ -558,15 +564,9 @@ version = "2.4.4" packaging = "jar" [[entries.dependencies]] -group = "com.google.protobuf" -artifact = "protobuf-java" -version = "3.15.8" -packaging = "jar" - -[[entries.dependencies]] -group = "com.thesamet.scalapb" -artifact = "lenses_2.13" -version = "0.11.4" +group = "org.scala-lang" +artifact = "scala-library" +version = "2.13.7" packaging = "jar" @@ -628,27 +628,15 @@ version = "4.4.30" packaging = "jar" [[entries.dependencies]] -group = "org.scala-lang" -artifact = "scala-library" -version = "2.13.7" -packaging = "jar" - -[[entries.dependencies]] -group = "com.thesamet.scalapb" -artifact = "scalapb-runtime_2.13" -version = "0.11.4" -packaging = "jar" - -[[entries.dependencies]] -group = "org.scalameta" -artifact = "trees_2.13" -version = "4.4.30" +group = "com.google.protobuf" +artifact = "protobuf-java" +version = "3.15.8" packaging = "jar" [[entries.dependencies]] -group = "org.scalameta" -artifact = "common_2.13" -version = "4.4.30" +group = "com.lihaoyi" +artifact = "geny_2.13" +version = "0.6.5" packaging = "jar" [[entries.dependencies]] @@ -658,9 +646,15 @@ version = "0.2.7" packaging = "jar" [[entries.dependencies]] -group = "org.scalameta" -artifact = "fastparse-v2_2.13" -version = "2.3.1" +group = "com.thesamet.scalapb" +artifact = "lenses_2.13" +version = "0.11.4" +packaging = "jar" + +[[entries.dependencies]] +group = "com.thesamet.scalapb" +artifact = "scalapb-runtime_2.13" +version = "0.11.4" packaging = "jar" [[entries.dependencies]] @@ -670,21 +664,27 @@ version = "2.4.4" packaging = "jar" [[entries.dependencies]] -group = "com.google.protobuf" -artifact = "protobuf-java" -version = "3.15.8" +group = "org.scala-lang" +artifact = "scala-library" +version = "2.13.7" packaging = "jar" [[entries.dependencies]] -group = "com.thesamet.scalapb" -artifact = "lenses_2.13" -version = "0.11.4" +group = "org.scalameta" +artifact = "common_2.13" +version = "4.4.30" packaging = "jar" [[entries.dependencies]] -group = "com.lihaoyi" -artifact = "geny_2.13" -version = "0.6.5" +group = "org.scalameta" +artifact = "fastparse-v2_2.13" +version = "2.3.1" +packaging = "jar" + +[[entries.dependencies]] +group = "org.scalameta" +artifact = "trees_2.13" +version = "4.4.30" packaging = "jar" @@ -717,69 +717,69 @@ version = "4.4.30" packaging = "jar" [[entries.dependencies]] -group = "org.scala-lang" -artifact = "scala-library" -version = "2.13.7" +group = "com.google.protobuf" +artifact = "protobuf-java" +version = "3.15.8" packaging = "jar" [[entries.dependencies]] -group = "com.thesamet.scalapb" -artifact = "scalapb-runtime_2.13" -version = "0.11.4" +group = "com.lihaoyi" +artifact = "geny_2.13" +version = "0.6.5" packaging = "jar" [[entries.dependencies]] -group = "org.scalameta" -artifact = "parsers_2.13" -version = "4.4.30" +group = "com.lihaoyi" +artifact = "sourcecode_2.13" +version = "0.2.7" packaging = "jar" [[entries.dependencies]] -group = "org.scala-lang" -artifact = "scala-compiler" -version = "2.13.7" +group = "com.thesamet.scalapb" +artifact = "lenses_2.13" +version = "0.11.4" packaging = "jar" [[entries.dependencies]] -group = "net.java.dev.jna" -artifact = "jna" -version = "5.8.0" +group = "com.thesamet.scalapb" +artifact = "scalapb-runtime_2.13" +version = "0.11.4" packaging = "jar" [[entries.dependencies]] -group = "org.scalameta" -artifact = "trees_2.13" -version = "4.4.30" +group = "net.java.dev.jna" +artifact = "jna" +version = "5.8.0" packaging = "jar" [[entries.dependencies]] -group = "org.scalameta" -artifact = "common_2.13" -version = "4.4.30" +group = "org.jline" +artifact = "jline" +version = "3.20.0" packaging = "jar" [[entries.dependencies]] -group = "com.lihaoyi" -artifact = "sourcecode_2.13" -version = "0.2.7" +group = "org.scala-lang.modules" +artifact = "scala-collection-compat_2.13" +version = "2.4.4" packaging = "jar" [[entries.dependencies]] -group = "org.jline" -artifact = "jline" -version = "3.20.0" +group = "org.scala-lang" +artifact = "scala-compiler" +version = "2.13.7" packaging = "jar" [[entries.dependencies]] -group = "org.scalameta" -artifact = "fastparse-v2_2.13" -version = "2.3.1" +group = "org.scala-lang" +artifact = "scala-library" +version = "2.13.7" packaging = "jar" [[entries.dependencies]] -group = "org.scala-lang.modules" -artifact = "scala-collection-compat_2.13" -version = "2.4.4" +group = "org.scala-lang" +artifact = "scala-reflect" +version = "2.13.7" packaging = "jar" [[entries.dependencies]] @@ -789,27 +789,27 @@ version = "2.13.7" packaging = "jar" [[entries.dependencies]] -group = "org.scala-lang" -artifact = "scala-reflect" -version = "2.13.7" +group = "org.scalameta" +artifact = "common_2.13" +version = "4.4.30" packaging = "jar" [[entries.dependencies]] -group = "com.google.protobuf" -artifact = "protobuf-java" -version = "3.15.8" +group = "org.scalameta" +artifact = "fastparse-v2_2.13" +version = "2.3.1" packaging = "jar" [[entries.dependencies]] -group = "com.thesamet.scalapb" -artifact = "lenses_2.13" -version = "0.11.4" +group = "org.scalameta" +artifact = "parsers_2.13" +version = "4.4.30" packaging = "jar" [[entries.dependencies]] -group = "com.lihaoyi" -artifact = "geny_2.13" -version = "0.6.5" +group = "org.scalameta" +artifact = "trees_2.13" +version = "4.4.30" packaging = "jar" @@ -842,21 +842,15 @@ version = "2.3.1" packaging = "jar" [[entries.dependencies]] -group = "org.scala-lang" -artifact = "scala-library" -version = "2.13.7" -packaging = "jar" - -[[entries.dependencies]] -group = "com.thesamet.scalapb" -artifact = "scalapb-runtime_2.13" -version = "0.11.4" +group = "com.google.protobuf" +artifact = "protobuf-java" +version = "3.15.8" packaging = "jar" [[entries.dependencies]] -group = "org.scalameta" -artifact = "common_2.13" -version = "4.4.30" +group = "com.lihaoyi" +artifact = "geny_2.13" +version = "0.6.5" packaging = "jar" [[entries.dependencies]] @@ -866,9 +860,15 @@ version = "0.2.7" packaging = "jar" [[entries.dependencies]] -group = "org.scalameta" -artifact = "fastparse-v2_2.13" -version = "2.3.1" +group = "com.thesamet.scalapb" +artifact = "lenses_2.13" +version = "0.11.4" +packaging = "jar" + +[[entries.dependencies]] +group = "com.thesamet.scalapb" +artifact = "scalapb-runtime_2.13" +version = "0.11.4" packaging = "jar" [[entries.dependencies]] @@ -878,21 +878,21 @@ version = "2.4.4" packaging = "jar" [[entries.dependencies]] -group = "com.google.protobuf" -artifact = "protobuf-java" -version = "3.15.8" +group = "org.scala-lang" +artifact = "scala-library" +version = "2.13.7" packaging = "jar" [[entries.dependencies]] -group = "com.thesamet.scalapb" -artifact = "lenses_2.13" -version = "0.11.4" +group = "org.scalameta" +artifact = "common_2.13" +version = "4.4.30" packaging = "jar" [[entries.dependencies]] -group = "com.lihaoyi" -artifact = "geny_2.13" -version = "0.6.5" +group = "org.scalameta" +artifact = "fastparse-v2_2.13" +version = "2.3.1" packaging = "jar" diff --git a/src/python/pants/jvm/resolve/coursier_setup.py b/src/python/pants/jvm/resolve/coursier_setup.py index 63131fde2a3..b0110297ea0 100644 --- a/src/python/pants/jvm/resolve/coursier_setup.py +++ b/src/python/pants/jvm/resolve/coursier_setup.py @@ -104,10 +104,14 @@ class CoursierSubsystem(TemplatedExternalTool): options_scope = "coursier" name = "coursier" - help = "A dependency resolver for the Maven ecosystem." + help = "A dependency resolver for the Maven ecosystem. (https://get-coursier.io/)" - default_version = "v2.0.16-169-g194ebc55c" + default_version = "v2.1.0-M5-18-gfebf9838c" default_known_versions = [ + "v2.1.0-M5-18-gfebf9838c|linux_arm64 |d4ad15ba711228041ad8a46d848c83c8fbc421d7b01c415d8022074dd609760f|19264005", + "v2.1.0-M5-18-gfebf9838c|linux_x86_64|3e1a1ad1010d5582e9e43c5a26b273b0147baee5ebd27d3ac1ab61964041c90b|19551533", + "v2.1.0-M5-18-gfebf9838c|macos_arm64 |d13812c5a5ef4c9b3e25cc046d18addd09bacd149f95b20a14e4d2a73e358ecf|18826510", + "v2.1.0-M5-18-gfebf9838c|macos_x86_64|d13812c5a5ef4c9b3e25cc046d18addd09bacd149f95b20a14e4d2a73e358ecf|18826510", "v2.0.16-169-g194ebc55c|linux_arm64 |da38c97d55967505b8454c20a90370c518044829398b9bce8b637d194d79abb3|18114472", "v2.0.16-169-g194ebc55c|linux_x86_64|4c61a634c4bd2773b4543fe0fc32210afd343692891121cddb447204b48672e8|18486946", "v2.0.16-169-g194ebc55c|macos_arm64 |15bce235d223ef1d022da30b67b4c64e9228d236b876c834b64e029bbe824c6f|17957182",