Merge branch '3.1.x' into 3.2.x
Closes gh-40117
This commit is contained in:
@@ -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") }
|
||||
}
|
||||
|
||||
@@ -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") }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user