CipherLabs
/
besu
mirror of https://github.com/hyperledger/besu
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix License Check (#568)

Browse Source 
License reporting depends on the deprecated "compile" dependency in the
root project.  Restore that so that license checking can work.

Also clean out old unused license types and one unneeded dependency.

Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
pull/573/head
Danno Ferrin 5 years ago committed by GitHub
parent 56c60e03df
commit 5e368dd7e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 70 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      acceptance-tests/tests/build.gradle
  2. 2
      build.gradle
  3. 77
      gradle/check-licenses.gradle
  4. 11
      gradle/versions.gradle

3
acceptance-tests/tests/build.gradle
Unescape View File

@ -44,9 +44,6 @@ dependencies {
testImplementation 'tech.pegasys.ethsigner.internal:file-based'
testImplementation 'org.apache.commons:commons-compress'
testImplementation 'commons-io:commons-io'
compile('javax.activation:activation'){
force = true
}
testCompile "com.github.tomakehurst:wiremock-jre8-standalone:2.25.1"
}

2
build.gradle
Unescape View File

@ -485,7 +485,7 @@ startScripts {
dependencies {
implementation project(':besu')
compile project(':besu')
errorprone 'com.google.errorprone:error_prone_core'
}

77
gradle/check-licenses.gradle
Unescape View File

@ -62,95 +62,52 @@ downloadLicenses {
ext.mit = license('MIT License', 'http://www.opensource.org/licenses/mit-license.php')
ext.bsd = license('BSD License', 'http://www.opensource.org/licenses/bsd-license.php')
ext.bsd3Clause = license('BSD 3-Clause', 'http://opensource.org/licenses/BSD-3-Clause')
ext.mpl = license('Mozilla Public License', 'http://www.mozilla.org/MPL')
ext.mpl1_1 = license('Mozilla Public License Version 1.1', 'http://www.mozilla.org/MPL/1.1/')
ext.mpl2_0 = license('Mozilla Public License, Version 2.0', 'http://www.mozilla.org/MPL/2.0/')
ext.cddl = license('Common Development and Distribution License 1.0', 'http://opensource.org/licenses/CDDL-1.0')
ext.cddl1_1 = license('Common Development and Distribution License 1.0', 'http://oss.oracle.com/licenses/CDDL-1.1')
ext.cc0 = license('Public Domain (CC0) License 1.0', 'https://creativecommons.org/publicdomain/zero/1.0')
aliases = [
(apache) : [
'The Apache Software License, Version 2.0',
'The Apache Software License, version 2.0',
'Apache License Version 2.0',
'Apache License, Version 2.0',
'The Apache License, Version 2.0',
'Apache 2',
'Apache 2.0',
'Apache License 2.0',
'Apache-2.0',
license('Apache License', 'http://www.apache.org/licenses/LICENSE-2.0'),
license('Apache Software Licenses', 'http://www.apache.org/licenses/LICENSE-2.0.txt'),
license('Apache', 'http://www.opensource.org/licenses/Apache-2.0')
],
(mit) : ['The MIT License', 'MIT', 'MIT license'],
(mit) : [
'MIT',
'The MIT License',
],
(bsd) : [
'BSD',
'BSD licence',
'The BSD License',
'Berkeley Software Distribution (BSD) License',
license('New BSD License', 'http://www.opensource.org/licenses/bsd-license.php')
],
(bsd3Clause): [
'BSD 3-Clause',
'BSD 3-Clause "New" or "Revised" License (BSD-3-Clause)',
'3-Clause BSD License',
license('BSD 3-clause', 'http://opensource.org/licenses/BSD-3-Clause'),
license('BSD 3-Clause', 'http://www.scala-lang.org/license.html')
],
(mpl): [
'MPL',
'Mozilla Public License',
'Mozilla Public License 1.0',
license('Mozilla Public License', 'http://www.mozilla.org/MPL')
],
(mpl1_1): [
'MPL 1.1',
'Mozilla Public License Version 1.1',
license('Mozilla Public License Version 1.1', 'http://www.mozilla.org/media/MPL/1.1/index.0c5913925d40.txt')
],
(mpl2_0): [
'MPL 2.0',
'Mozilla Public License Version 2.0',
license('Mozilla Public License 2.0', 'http://www.mozilla.org/media/MPL/2.0/index.815ca599c9df.txt')
],
(cddl): [
'CDDL 1.0',
'CDDL',
'Common Development and Distribution License 1.0',
'CDDL + GPLv2 with classpath exception',
'Dual license consisting of the CDDL v1.1 and GPL v2'
],
(cddl1_1): [
'CDDL 1.1',
'COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1',
'CDDL 1.0',
],
(cc0): ['Public Domain (CC0) License 1.0', 'CC0']
(cc0): [
'CC0'
]
]
licenses = [
(group('besu')) : apache,
(group('besu.ethereum.api')) : apache,
(group('besu.consensus')) : apache,
(group('besu.ethereum')) : apache,
(group('besu.metrics')) : apache,
(group('besu.plugins')) : apache,
(group('besu.services')) : apache,
(group('besu')) : apache,
(group('besu.ethereum.api')): apache,
(group('besu.consensus')) : apache,
(group('besu.ethereum')) : apache,
(group('besu.metrics')) : apache,
(group('besu.plugins')) : apache,
(group('besu.services')) : apache,
// https://checkerframework.org/manual/#license
// The more permissive MIT License applies to code that you might want
// to include in your own program, such as the annotations and run-time utility classes.
(group('org.checkerframework')): mit,
// RocksDB is dual licensed under Apache v2.0 and GPL 2 licenses
// Explicitly declare that we are using the Apache v2.0 license
(group('org.rocksdb')): apache,
/// Explicilitly declare Apache 2.0 license for javassist
(group('org.javassist')): apache,
/// Explicilitly declare Apache 2.0 license for javassist
(group('javax.ws.rs')): cddl1_1,
(group('javax.activation')): cddl1_1,
(group('org.glassfish.jersey.core')): apache,
(group('org.glassfish.jersey.bundles.repackaged')): apache,
(group('org.glassfish.jersey.connectors')): apache
(group('org.rocksdb')) : apache,
]
}

11
gradle/versions.gradle
Unescape View File

@ -34,8 +34,12 @@ dependencyManagement {
dependency 'commons-cli:commons-cli:1.4'
dependency 'commons-io:commons-io:2.6'
dependency 'info.picocli:picocli:4.1.4'
dependency 'io.kubernetes:client-java:5.0.0'
dependency 'io.pkts:pkts-core:3.0.5'
dependency 'io.prometheus:simpleclient:0.8.0'
@ -55,6 +59,7 @@ dependencyManagement {
dependency 'net.consensys:orion:1.5.0-SNAPSHOT'
dependency 'org.apache.commons:commons-compress:1.20'
dependency 'org.apache.commons:commons-text:1.8'
dependency 'org.apache.logging.log4j:log4j-api:2.13.0'
@ -99,14 +104,8 @@ dependencyManagement {
dependency 'org.xerial.snappy:snappy-java:1.1.7.3'
dependency 'io.kubernetes:client-java:5.0.0'
dependency 'tech.pegasys.ethsigner.internal:core:0.4.0'
dependency 'tech.pegasys.ethsigner.internal:file-based:0.4.0'
dependency 'tech.pegasys.ethsigner.internal:signing-api:0.4.0'
dependency 'javax.activation:activation:1.1.1'
dependency 'org.apache.commons:commons-compress:1.20'
dependency 'commons-io:commons-io:2.6'
}
}

Write Preview
Loading…
Cancel
Save