[NC-1684] Fix licenses for PicoCLI & Rocksdbjni (#42)

- Remove custom Rocksdbjni and use upgraded version from rocksdb
- Remove custom picocli lib and use the upgraded version from pico
Eric Kellstrand 6 years ago committed by GitHub
parent 7f7a5e781e
commit 63b34e5332
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      gradle/check-licenses.gradle
  2. 4
      gradle/versions.gradle
  3. 5
      pantheon/build.gradle
  4. BIN
      pantheon/libs/picocli-3.6.0-SNAPSHOT.jar
  5. 2
      services/kvstore/build.gradle

@ -28,9 +28,7 @@ ext.acceptedLicenses = [
'Mozilla Public License Version 2.0',
'CC0 1.0 Universal License',
'Common Development and Distribution License 1.0',
'Unicode/ICU License',
'No license found',// for temporary use with Picocli jar
'TODO to be fixed' // use it for temporary states when a license needs investigation.
'Unicode/ICU License'
]*.toLowerCase()
/**
@ -52,7 +50,6 @@ downloadLicenses {
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.todoToBeFixed = license('TODO to be fixed', 'TODO to be fixed')
aliases = [
(apache) : [
'The Apache Software License, Version 2.0',

@ -32,9 +32,7 @@ dependencyManagement {
dependency('com.github.docker-java:docker-java:3.0.14')
// Disable picocli while the 3.6 release with default enhancement is published.
// The jar is directly inserted until then.
// dependency('info.picocli:picocli:3.3.0')
dependency('info.picocli:picocli:3.6.0')
dependency('net.consensys.cava:cava-toml:0.3.1')
dependency('org.openjdk.jmh:jmh-core:1.21')

@ -23,10 +23,7 @@ dependencies {
implementation project(':services:kvstore')
implementation 'com.google.guava:guava'
// Disable picocli while the 3.6 release with default enhancement is published.
// The jar is directly inserted until then.
// implementation 'info.picocli:picocli'
compile files('libs/picocli-3.6.0-SNAPSHOT.jar')
implementation('info.picocli:picocli')
implementation 'net.consensys.cava:cava-toml'
implementation 'io.vertx:vertx-core'
implementation 'io.vertx:vertx-web'

@ -12,7 +12,7 @@ dependencies {
api project(':util')
implementation 'com.google.guava:guava'
implementation group: 'net.consensys', name: 'rocksdbjni', version: '5.14.2'
implementation group: 'org.rocksdb', name: 'rocksdbjni', version: '5.15.10'
implementation 'org.apache.logging.log4j:log4j-api'
runtime 'org.apache.logging.log4j:log4j-core'

Loading…
Cancel
Save