diff --git a/gradle/license-report-config/allowed-licenses.json b/gradle/license-report-config/allowed-licenses.json index cc9e01dcc..132a91abc 100644 --- a/gradle/license-report-config/allowed-licenses.json +++ b/gradle/license-report-config/allowed-licenses.json @@ -62,6 +62,11 @@ }, { "moduleName": "io.netty:netty-tcnative-classes" + }, + { + "moduleLicense": "Unicode/ICU License", + "moduleVersion": "58.2", + "moduleName": "com.ibm.icu:icu4j" } ], "overrideLicenses": [ @@ -110,4 +115,4 @@ "moduleLicense": "Apache License, Version 2.0" } ] -} \ No newline at end of file +} diff --git a/gradle/license-report-config/license-normalizer.json b/gradle/license-report-config/license-normalizer.json index efb8cbb7e..9e6bb5649 100644 --- a/gradle/license-report-config/license-normalizer.json +++ b/gradle/license-report-config/license-normalizer.json @@ -1,8 +1,14 @@ { "bundles" : [ - { "bundleName" : "MIT", "licenseName" : "MIT License", "licenseUrl" : "https://opensource.org/licenses/MIT" } + { "bundleName" : "MIT", "licenseName" : "MIT License", "licenseUrl" : "https://opensource.org/licenses/MIT" }, + { "bundleName" : "BSD", "licenseName" : "The BSD License", "licenseUrl" : "https://opensource.org/licenses/BSD-3-Clause" }, + { "bundleName" : "CDDL-1.1", "licenseName" : "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1", "licenseUrl" : "https://spdx.org/licenses/CDDL-1.1.html" }, + { "bundleName" : "Apache-2.0", "licenseName" : "Apache License, Version 2.0", "licenseUrl" : "https://www.apache.org/licenses/LICENSE-2.0" } ], "transformationRules" : [ - { "bundleName" : "MIT", "licenseNamePattern" : "\"MIT\\sLicense\"" } + { "bundleName" : "MIT", "licenseNamePattern" : "\"MIT\\sLicense\"" }, + { "bundleName" : "BSD", "licenseNamePattern" : "BSD licence" }, + { "bundleName" : "CDDL-1.1", "licenseNamePattern" : "(.*)Dual license consisting of the CDDL v1.1 and GPL v2(.*)" }, + { "bundleName" : "Apache-2.0", "licenseNamePattern" : "(.*)Apache-2.0(.*)" } ] } diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 4f4f112fc..39b507f1c 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -46,7 +46,7 @@ dependencyManagement { entry 'log4j-slf4j-impl' } - dependencySet(group: 'org.apache.tuweni', version: '2.0.0') { + dependencySet(group: 'org.apache.tuweni', version: '2.1.0') { entry 'tuweni-net' entry 'tuweni-toml' } @@ -77,7 +77,7 @@ dependencyManagement { dependencySet(group: 'org.web3j', version: '4.8.9') { entry 'besu' entry 'core' - entry('crypto') { + entry ('crypto') { exclude group: 'com.github.jnr', name: 'jnr-unixsocket' } }