1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java
index 16b4fb650c..b74fc1fff6 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java
@@ -124,9 +124,13 @@ public class MavenJarFunction extends HttpArchiveFunction {
     // Add a WORKSPACE file & BUILD file to the Maven jar.
     DecompressorValue value;
     try {
-      value = (DecompressorValue) env.getValueOrThrow(DecompressorValue.jarKey(
-          MavenJarRule.NAME, downloader.getName(), repositoryJar,
-          outputDirectoryValue.realRootedPath().asPath()), IOException.class);
+      value = (DecompressorValue) env.getValueOrThrow(DecompressorValue.key(
+          JarFunction.NAME, DecompressorDescriptor.builder()
+              .setTargetKind(MavenJarRule.NAME)
+              .setTargetName(downloader.getName())
+              .setArchivePath(repositoryJar)
+              .setRepositoryPath(outputDirectoryValue.realRootedPath().asPath()).build()),
+          IOException.class);
       if (value == null) {
         return null;
       }