Merge branch '3.1.x' into 3.2.x

Closes gh-40117
This commit is contained in:
Moritz Halbritter
2024-03-27 09:34:39 +01:00
13 changed files with 24 additions and 24 deletions

View File

@@ -11,6 +11,6 @@ dependencies {
checkRuntimeClasspathForConflicts {
ignore { name -> name.startsWith("org/bouncycastle/") ||
name.matches("^org\\/apache\\/pulsar\\/.*\\/package-info.class\$") ||
name.matches("^org/apache/pulsar/.*/package-info.class\$") ||
name.equals("findbugsExclude.xml") }
}

View File

@@ -11,6 +11,6 @@ dependencies {
checkRuntimeClasspathForConflicts {
ignore { name -> name.startsWith("org/bouncycastle/") ||
name.matches("^org\\/apache\\/pulsar\\/.*\\/package-info.class\$") ||
name.matches("^org/apache/pulsar/.*/package-info.class\$") ||
name.equals("findbugsExclude.xml") }
}