Skip to content
This repository has been archived by the owner on Apr 5, 2024. It is now read-only.

update version of tuweni #432

Merged
merged 3 commits into from
Feb 2, 2022
Merged

update version of tuweni #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c625cb9
update version of tuweni
macfarla Feb 2, 2022
e2af4b5
one change at a time
macfarla Feb 2, 2022
68a6627
added extra licenses for tuweni 2.1.0
macfarla Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion gradle/license-report-config/allowed-licenses.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@
},
{
"moduleName": "io.netty:netty-tcnative-classes"
},
{
"moduleLicense": "Unicode/ICU License",
"moduleVersion": "58.2",
"moduleName": "com.ibm.icu:icu4j"
}
],
"overrideLicenses": [
Expand Down Expand Up @@ -110,4 +115,4 @@
"moduleLicense": "Apache License, Version 2.0"
}
]
}
}
10 changes: 8 additions & 2 deletions gradle/license-report-config/license-normalizer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(.*)" }
]
}
4 changes: 2 additions & 2 deletions gradle/versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down Expand Up @@ -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'
}
}
Expand Down