Skip to content

Commit 57d328f

Browse files
committed
Build: Remove extra copies of netty license (#23361)
The dependencyLicenses check has the ability to map multiple jar files to the same license file. However, netty was not taking advantage of this, and had duplicate copies of its license/notice files for each jar. This commit reduces the copies to one and uses the mapping feature.
1 parent de54d16 commit 57d328f

15 files changed

+2
-1913
lines changed

modules/transport-netty4/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,8 @@ dependencies {
4242
compile "io.netty:netty-transport:4.1.7.Final"
4343
}
4444

45-
integTest {
46-
includePackaged = true
47-
}
48-
integTestCluster {
49-
numNodes = 2
45+
dependencyLicenses {
46+
mapping from: /netty-.*/, to: 'netty'
5047
}
5148

5249
thirdPartyAudit.excludes = [

modules/transport-netty4/licenses/netty-codec-LICENSE.txt

Lines changed: 0 additions & 202 deletions
This file was deleted.

modules/transport-netty4/licenses/netty-codec-NOTICE.txt

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)