JVM lockfile invalidation headers and verification

3rdparty/jvm/global_scalac_plugins.lock

@@ -1 +1,12 @@
+# This lockfile was autogenerated by Pants. To regenerate, run:
+#
+#    ./pants jvm-generate-lockfiles
+#
+# --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
+# {
+#   "version": 1,
+#   "generated_with_requirements": []
+# }
+# --- END PANTS LOCKFILE METADATA ---
+
 entries = []

3rdparty/jvm/testprojects.lockfile

@@ -1 +1,12 @@
+# This lockfile was autogenerated by Pants. To regenerate, run:
+#
+#    ./pants generate-lockfiles
+#
+# --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
+# {
+#   "version": 1,
+#   "generated_with_requirements": []
+# }
+# --- END PANTS LOCKFILE METADATA ---
+
 entries = []

src/python/pants/backend/codegen/avro/java/avro-tools.default.lockfile.txt

@@ -1,3 +1,16 @@
+# This lockfile was autogenerated by Pants. To regenerate, run:
+#
+#    ./pants jvm-generate-lockfiles
+#
+# --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
+# {
+#   "version": 1,
+#   "generated_with_requirements": [
+#     "org.apache.avro:avro-tools:1.11.0,url=not_provided,jar=not_provided"
+#   ]
+# }
+# --- END PANTS LOCKFILE METADATA ---
+
 [[entries]]
 directDependencies = []
 dependencies = []

src/python/pants/backend/codegen/avro/java/rules.py

@@ -37,7 +37,12 @@
 from pants.jvm.goals import lockfile
 from pants.jvm.goals.lockfile import JvmLockfileRequest
 from pants.jvm.jdk_rules import JdkSetup
-from pants.jvm.resolve.coursier_fetch import MaterializedClasspath, MaterializedClasspathRequest
+from pants.jvm.resolve.coursier_fetch import (
+    CoursierResolvedLockfile,
+    MaterializedClasspath,
+    MaterializedClasspathRequest,
+)
+from pants.jvm.resolve.jvm_tool import ValidatedJvmToolLockfileRequest
 from pants.source.source_root import SourceRoot, SourceRootRequest
 from pants.util.logging import LogLevel
 
@@ -98,11 +103,13 @@ async def compile_avro_source(
     output_dir = "_generated_files"
     toolcp_relpath = "__toolcp"
 
+    lockfile = await Get(CoursierResolvedLockfile, ValidatedJvmToolLockfileRequest(avro_tools))
+
     tool_classpath, subsetted_input_digest, empty_output_dir = await MultiGet(
         Get(
             MaterializedClasspath,
             MaterializedClasspathRequest(
-                lockfiles=(avro_tools.resolved_lockfile(),),
+                lockfiles=(lockfile,),
             ),
         ),
         Get(

src/python/pants/backend/codegen/protobuf/scala/rules.py

@@ -48,8 +48,12 @@
 from pants.jvm.goals.lockfile import JvmLockfileRequest
 from pants.jvm.jdk_rules import JdkSetup
 from pants.jvm.resolve.common import ArtifactRequirements, Coordinate
-from pants.jvm.resolve.coursier_fetch import MaterializedClasspath, MaterializedClasspathRequest
-from pants.jvm.resolve.jvm_tool import GatherJvmCoordinatesRequest
+from pants.jvm.resolve.coursier_fetch import (
+    CoursierResolvedLockfile,
+    MaterializedClasspath,
+    MaterializedClasspathRequest,
+)
+from pants.jvm.resolve.jvm_tool import GatherJvmCoordinatesRequest, ValidatedJvmToolLockfileRequest
 from pants.source.source_root import SourceRoot, SourceRootRequest
 from pants.util.logging import LogLevel
 from pants.util.ordered_set import FrozenOrderedSet
@@ -112,6 +116,8 @@ async def generate_scala_from_protobuf(
     plugins_relpath = "__plugins"
     protoc_relpath = "__protoc"
 
+    lockfile = await Get(CoursierResolvedLockfile, ValidatedJvmToolLockfileRequest(scalapb))
+
     (
         downloaded_protoc_binary,
         tool_classpath,
@@ -123,7 +129,7 @@ async def generate_scala_from_protobuf(
         Get(
             MaterializedClasspath,
             MaterializedClasspathRequest(
-                lockfiles=(scalapb.resolved_lockfile(),),
+                lockfiles=(lockfile,),
             ),
         ),
         Get(Digest, CreateDigest([Directory(output_dir)])),
@@ -279,6 +285,8 @@ async def setup_scalapb_shim_classfiles(
 
     scalapb_shim_source = FileContent("ScalaPBShim.scala", scalapb_shim_content)
 
+    lockfile = await Get(CoursierResolvedLockfile, ValidatedJvmToolLockfileRequest(scalapb))
+
     tool_classpath, shim_classpath, source_digest = await MultiGet(
         Get(
             MaterializedClasspath,
@@ -311,7 +319,7 @@ async def setup_scalapb_shim_classfiles(
             MaterializedClasspath,
             MaterializedClasspathRequest(
                 prefix="__shimcp",
-                lockfiles=(scalapb.resolved_lockfile(),),
+                lockfiles=(lockfile,),
             ),
         ),
         Get(

src/python/pants/backend/codegen/protobuf/scala/scalapbc.default.lockfile.txt

@@ -1,3 +1,16 @@
+# This lockfile was autogenerated by Pants. To regenerate, run:
+#
+#    ./pants jvm-generate-lockfiles
+#
+# --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
+# {
+#   "version": 1,
+#   "generated_with_requirements": [
+#     "com.thesamet.scalapb:scalapbc_2.13:0.11.6,url=not_provided,jar=not_provided"
+#   ]
+# }
+# --- END PANTS LOCKFILE METADATA ---
+
 [[entries]]
 file_name = "com.chuusai_shapeless_2.13_2.3.3.jar"
 [[entries.directDependencies]]

src/python/pants/backend/codegen/thrift/scrooge/rules.py

@@ -18,7 +18,12 @@
 from pants.jvm.goals import lockfile
 from pants.jvm.goals.lockfile import JvmLockfileRequest
 from pants.jvm.jdk_rules import JdkSetup
-from pants.jvm.resolve.coursier_fetch import MaterializedClasspath, MaterializedClasspathRequest
+from pants.jvm.resolve.coursier_fetch import (
+    CoursierResolvedLockfile,
+    MaterializedClasspath,
+    MaterializedClasspathRequest,
+)
+from pants.jvm.resolve.jvm_tool import ValidatedJvmToolLockfileRequest
 from pants.source.source_root import SourceRootsRequest, SourceRootsResult
 from pants.util.logging import LogLevel
 
@@ -49,11 +54,13 @@ async def generate_scrooge_thrift_sources(
     output_dir = "_generated_files"
     toolcp_relpath = "__toolcp"
 
+    lockfile = await Get(CoursierResolvedLockfile, ValidatedJvmToolLockfileRequest(scrooge))
+
     tool_classpath, transitive_targets, empty_output_dir_digest, wrapped_target = await MultiGet(
         Get(
             MaterializedClasspath,
             MaterializedClasspathRequest(
-                lockfiles=(scrooge.resolved_lockfile(),),
+                lockfiles=(lockfile,),
             ),
         ),
         Get(TransitiveTargets, TransitiveTargetsRequest([request.thrift_source_field.address])),

src/python/pants/backend/codegen/thrift/scrooge/scrooge.default.lockfile.txt

@@ -1,3 +1,16 @@
+# This lockfile was autogenerated by Pants. To regenerate, run:
+#
+#    ./pants jvm-generate-lockfiles
+#
+# --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
+# {
+#   "version": 1,
+#   "generated_with_requirements": [
+#     "com.twitter:scrooge-generator_2.13:21.12.0,url=not_provided,jar=not_provided"
+#   ]
+# }
+# --- END PANTS LOCKFILE METADATA ---
+
 [[entries]]
 file_name = "com.github.scopt_scopt_2.13_4.0.0-RC2.jar"
 [[entries.directDependencies]]

src/python/pants/backend/java/dependency_inference/java_parser.lockfile

@@ -1,3 +1,18 @@
+# This lockfile was autogenerated by Pants. To regenerate, run:
+#
+#    ./pants generate-lockfiles
+#
+# --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
+# {
+#   "version": 1,
+#   "generated_with_requirements": [
+#     "com.fasterxml.jackson.core:jackson-databind:2.12.4,url=not_provided,jar=not_provided",
+#     "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.4,url=not_provided,jar=not_provided",
+#     "com.github.javaparser:javaparser-symbol-solver-core:3.23.0,url=not_provided,jar=not_provided"
+#   ]
+# }
+# --- END PANTS LOCKFILE METADATA ---
+
 [[entries]]
 directDependencies = []
 dependencies = []

src/python/pants/backend/java/lint/google_java_format/google_java_format.default.lockfile.txt

@@ -1,3 +1,16 @@
+# This lockfile was autogenerated by Pants. To regenerate, run:
+#
+#    ./pants jvm-generate-lockfiles
+#
+# --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
+# {
+#   "version": 1,
+#   "generated_with_requirements": [
+#     "com.google.googlejavaformat:google-java-format:1.13.0,url=not_provided,jar=not_provided"
+#   ]
+# }
+# --- END PANTS LOCKFILE METADATA ---
+
 [[entries]]
 directDependencies = []
 dependencies = []

src/python/pants/backend/java/lint/google_java_format/rules.py

@@ -1,6 +1,7 @@
 # Copyright 2021 Pants project contributors (see CONTRIBUTORS.md).
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 import dataclasses
+import logging
 from dataclasses import dataclass
 
 from pants.backend.java.lint.google_java_format.skip_field import SkipGoogleJavaFormatField
@@ -19,10 +20,17 @@
 from pants.jvm.goals import lockfile
 from pants.jvm.goals.lockfile import JvmLockfileRequest
 from pants.jvm.jdk_rules import JdkSetup
-from pants.jvm.resolve.coursier_fetch import MaterializedClasspath, MaterializedClasspathRequest
+from pants.jvm.resolve.coursier_fetch import (
+    CoursierResolvedLockfile,
+    MaterializedClasspath,
+    MaterializedClasspathRequest,
+)
+from pants.jvm.resolve.jvm_tool import ValidatedJvmToolLockfileRequest
 from pants.util.logging import LogLevel
 from pants.util.strutil import pluralize
 
+logger = logging.getLogger(__name__)
+
 
 @dataclass(frozen=True)
 class GoogleJavaFormatFieldSet(FieldSet):
@@ -62,6 +70,9 @@ async def setup_google_java_format(
     jdk_setup: JdkSetup,
     bash: BashBinary,
 ) -> Setup:
+
+    lockfile = await Get(CoursierResolvedLockfile, ValidatedJvmToolLockfileRequest(tool))
+
     source_files, tool_classpath = await MultiGet(
         Get(
             SourceFiles,
@@ -70,7 +81,7 @@ async def setup_google_java_format(
         Get(
             MaterializedClasspath,
             MaterializedClasspathRequest(
-                lockfiles=(tool.resolved_lockfile(),),
+                lockfiles=(lockfile,),
             ),
         ),
     )

src/python/pants/backend/scala/dependency_inference/scala_parser.lockfile

@@ -1,3 +1,17 @@
+# This lockfile was autogenerated by Pants. To regenerate, run:
+#
+#    ./pants generate-lockfiles
+#
+# --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
+# {
+#   "version": 1,
+#   "generated_with_requirements": [
+#     "io.circe:circe-generic_2.13:0.14.1,url=not_provided,jar=not_provided",
+#     "org.scalameta:scalameta_2.13:4.4.30,url=not_provided,jar=not_provided"
+#   ]
+# }
+# --- END PANTS LOCKFILE METADATA ---
+
 [[entries]]
 file_name = "com.chuusai_shapeless_2.13_2.3.7.jar"
 [[entries.directDependencies]]

src/python/pants/backend/scala/lint/scalafmt/rules.py

@@ -32,7 +32,12 @@
 from pants.jvm.goals import lockfile
 from pants.jvm.goals.lockfile import JvmLockfileRequest
 from pants.jvm.jdk_rules import JdkSetup
-from pants.jvm.resolve.coursier_fetch import MaterializedClasspath, MaterializedClasspathRequest
+from pants.jvm.resolve.coursier_fetch import (
+    CoursierResolvedLockfile,
+    MaterializedClasspath,
+    MaterializedClasspathRequest,
+)
+from pants.jvm.resolve.jvm_tool import ValidatedJvmToolLockfileRequest
 from pants.util.frozendict import FrozenDict
 from pants.util.logging import LogLevel
 from pants.util.strutil import pluralize
@@ -197,6 +202,9 @@ async def setup_scalafmt(
     bash: BashBinary,
 ) -> Setup:
     toolcp_relpath = "__toolcp"
+
+    lockfile = await Get(CoursierResolvedLockfile, ValidatedJvmToolLockfileRequest(tool))
+
     source_files, tool_classpath = await MultiGet(
         Get(
             SourceFiles,
@@ -205,7 +213,7 @@ async def setup_scalafmt(
         Get(
             MaterializedClasspath,
             MaterializedClasspathRequest(
-                lockfiles=(tool.resolved_lockfile(),),
+                lockfiles=(lockfile,),
             ),
         ),
     )

src/python/pants/backend/scala/lint/scalafmt/scalafmt.default.lockfile.txt

@@ -1,3 +1,16 @@
+# This lockfile was autogenerated by Pants. To regenerate, run:
+#
+#    ./pants jvm-generate-lockfiles
+#
+# --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
+# {
+#   "version": 1,
+#   "generated_with_requirements": [
+#     "org.scalameta:scalafmt-cli_2.13:3.2.1,url=not_provided,jar=not_provided"
+#   ]
+# }
+# --- END PANTS LOCKFILE METADATA ---
+
 [[entries]]
 file_name = "com.geirsson_metaconfig-core_2.13_0.9.15.jar"
 [[entries.directDependencies]]

src/python/pants/backend/scala/subsystems/scalatest.default.lockfile.txt

@@ -1,3 +1,16 @@
+# This lockfile was autogenerated by Pants. To regenerate, run:
+#
+#    ./pants jvm-generate-lockfiles
+#
+# --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
+# {
+#   "version": 1,
+#   "generated_with_requirements": [
+#     "org.scalatest:scalatest_2.13:3.2.10,url=not_provided,jar=not_provided"
+#   ]
+# }
+# --- END PANTS LOCKFILE METADATA ---
+
 [[entries]]
 file_name = "org.scala-lang.modules_scala-xml_2.13_1.3.0.jar"
 [[entries.directDependencies]]

src/python/pants/backend/scala/test/scalatest.py

@@ -24,7 +24,12 @@
 from pants.jvm.goals import lockfile
 from pants.jvm.goals.lockfile import JvmLockfileRequest
 from pants.jvm.jdk_rules import JdkSetup
-from pants.jvm.resolve.coursier_fetch import MaterializedClasspath, MaterializedClasspathRequest
+from pants.jvm.resolve.coursier_fetch import (
+    CoursierResolvedLockfile,
+    MaterializedClasspath,
+    MaterializedClasspathRequest,
+)
+from pants.jvm.resolve.jvm_tool import ValidatedJvmToolLockfileRequest
 from pants.jvm.subsystems import JvmSubsystem
 from pants.util.logging import LogLevel
 
@@ -63,11 +68,14 @@ async def setup_scalatest_for_target(
     scalatest: Scalatest,
     test_subsystem: TestSubsystem,
 ) -> TestSetup:
+
+    lockfile = await Get(CoursierResolvedLockfile, ValidatedJvmToolLockfileRequest(scalatest))
+
     classpath, scalatest_classpath = await MultiGet(
         Get(Classpath, Addresses([request.field_set.address])),
         Get(
             MaterializedClasspath,
-            MaterializedClasspathRequest(lockfiles=(scalatest.resolved_lockfile(),)),
+            MaterializedClasspathRequest(lockfiles=(lockfile,)),
         ),
     )
 

src/python/pants/core/util_rules/lockfile_metadata.py

@@ -16,6 +16,7 @@
 
 
 class LockfileScope(Enum):
+    JVM = "jvm"
     PYTHON = "python"