Skip to content

Commit cecb60b

Browse files
committed
Use regex to match artifact; add check that we patch all classes in the matched artifacts
1 parent 791c56b commit cecb60b

File tree

1 file changed

+3
-4
lines changed
  • build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/patches/hdfs

1 file changed

+3
-4
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/patches/hdfs/HdfsClassPatcher.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,11 @@
3333
import java.util.List;
3434
import java.util.Locale;
3535
import java.util.Map;
36-
import java.util.Set;
3736
import java.util.function.Function;
3837
import java.util.jar.JarEntry;
3938
import java.util.jar.JarFile;
4039
import java.util.jar.JarOutputStream;
4140
import java.util.regex.Pattern;
42-
import java.util.stream.Stream;
4341

4442
import static java.util.Map.entry;
4543

@@ -87,8 +85,9 @@ public void transform(@NotNull TransformOutputs outputs) {
8785
File inputFile = getInputArtifact().get().getAsFile();
8886

8987
List<String> matchingArtifacts = getParameters().getMatchingArtifacts();
90-
List<JarPatchers> patchersToApply = allPatchers.stream().filter(jp -> matchingArtifacts.contains(jp.artifactTag()) &&
91-
jp.artifactPattern().asMatchPredicate().test(inputFile.getName())).toList();
88+
List<JarPatchers> patchersToApply = allPatchers.stream()
89+
.filter(jp -> matchingArtifacts.contains(jp.artifactTag()) && jp.artifactPattern().matcher(inputFile.getName()).find())
90+
.toList();
9291
if (patchersToApply.isEmpty()) {
9392
outputs.file(getInputArtifact());
9493
} else {

0 commit comments

Comments
 (0)