Fix Gradle 7.0 compatibility issues and build warnings (#288)

Removes as many Gradle 7.0 compatibility issues as possible * `baseName` -> `archiveBaseName` * `extension` -> `archiveExtension` * `destinationDir` -> `destinationDirectory` * `runtime` -> `runtimeOnly` * Change some log4j-api and log4j-core dependencies * Remove an unneeded and outdated plugin (`net.ltgt.apt`) * tweak the plugin-api change detector's property annotations. Warnings still exist with one external plugin used for license file checking that we do not control the source code for. Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
5 years ago · 838f7aa5e0
parent cb56b3c745
commit 838f7aa5e0
30 changed files with 121 additions and 113 deletions
--- a/besu/build.gradle
+++ b/besu/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu'
+  archiveBaseName = 'besu'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -58,13 +58,13 @@ dependencies {
  implementation 'io.vertx:vertx-core'
  implementation 'io.vertx:vertx-web'
  implementation 'org.apache.logging.log4j:log4j-api'
+  implementation 'org.apache.logging.log4j:log4j-core'
  implementation 'org.apache.tuweni:tuweni-bytes'
  implementation 'org.apache.tuweni:tuweni-config'
  implementation 'org.apache.tuweni:tuweni-units'
  implementation 'org.springframework.security:spring-security-crypto'

-  runtime 'org.apache.logging.log4j:log4j-core'
-  runtime 'org.apache.logging.log4j:log4j-slf4j-impl'
+  runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'

  testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
  testImplementation project(':testutil')
@ -81,12 +81,12 @@ dependencies {
 }

 task testJar(type: Jar) {
-  archiveName 'testPlugins.jar'
+  archiveFileName = 'testPlugins.jar'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
--- a/build.gradle
+++ b/build.gradle
@ -309,7 +309,7 @@ subprojects {
  }

  task testSupportJar(type: Jar) {
-    baseName = "${project.name}-support-test"
+    archiveBaseName = "${project.name}-support-test"
    classifier = 'test-support'
    from sourceSets.testSupport.output
  }
@ -401,6 +401,12 @@ subprojects {
    group = "verification"
    description = "Runs the Besu integration tests"

+    jvmArgs = [
+      '--add-opens',
+      'java.base/java.util=ALL-UNNAMED',
+      '--add-opens',
+      'java.base/java.util.concurrent=ALL-UNNAMED'
+    ]
    testClassesDirs = sourceSets.integrationTest.output.classesDirs
    classpath = sourceSets.integrationTest.runtimeClasspath
    outputs.upToDateWhen { false }
@ -499,7 +505,7 @@ distTar {
    delete fileTree(dir: 'build/distributions', include: '*.tar.gz')
  }
  compression = Compression.GZIP
-  extension = 'tar.gz'
+  archiveExtension = 'tar.gz'
 }

 distZip {
@ -684,8 +690,8 @@ bintray {
  key = bintrayKey

  filesSpec {
-    from distTar.destinationDir.path
-    from distZip.destinationDir.path
+    from distTar.destinationDirectory
+    from distZip.destinationDirectory
    into '.'
  }

--- a/config/build.gradle
+++ b/config/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-config'
+  archiveBaseName = 'besu-config'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -32,7 +32,7 @@ dependencies {
  implementation 'com.google.guava:guava'
  implementation 'org.apache.logging.log4j:log4j-api'

-  runtime 'org.apache.logging.log4j:log4j-core'
+  runtimeOnly 'org.apache.logging.log4j:log4j-core'

  testImplementation project(':testutil')

--- a/consensus/clique/build.gradle
+++ b/consensus/clique/build.gradle
@ -16,12 +16,12 @@
 plugins { id 'java' }

 jar {
-  baseName 'besu-clique'
+  archiveBaseName = 'besu-clique'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
--- a/consensus/common/build.gradle
+++ b/consensus/common/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-consensus-common'
+  archiveBaseName = 'besu-consensus-common'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -48,7 +48,7 @@ dependencies {
 }
 configurations { testArtifacts }
 task testJar (type: Jar) {
-  baseName = "${project.name}-test"
+  archiveBaseName = "${project.name}-test"
  from sourceSets.test.output
 }

--- a/consensus/ibft/build.gradle
+++ b/consensus/ibft/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-ibft'
+  archiveBaseName = 'besu-ibft'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
--- a/consensus/ibftlegacy/build.gradle
+++ b/consensus/ibftlegacy/build.gradle
@ -1,12 +1,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-ibftlegacy'
+  archiveBaseName = 'besu-ibftlegacy'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
--- a/crypto/build.gradle
+++ b/crypto/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-crypto'
+  archiveBaseName = 'besu-crypto'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -38,7 +38,7 @@ dependencies {
  implementation 'org.apache.tuweni:tuweni-bytes'
  implementation 'org.apache.tuweni:tuweni-units'

-  runtime 'org.apache.logging.log4j:log4j-core'
+  runtimeOnly 'org.apache.logging.log4j:log4j-core'

  testImplementation 'junit:junit'
  testImplementation 'org.assertj:assertj-core'
--- a/errorprone-checks/build.gradle
+++ b/errorprone-checks/build.gradle
@ -13,10 +13,6 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-// See https://github.com/tbroyer/gradle-errorprone-plugin
-// See https://github.com/tbroyer/gradle-apt-plugin
-plugins { id 'net.ltgt.apt' version '0.21' apply false }
-
 // we use this config to get the path of the JDK 9 javac jar, to
 // stick it in the bootclasspath when running tests
 configurations.maybeCreate("epJavac")
@ -24,7 +20,6 @@ configurations.maybeCreate("epJavac")

 apply plugin: 'java'
 apply plugin: 'net.ltgt.errorprone'
-apply plugin: 'net.ltgt.apt'

 sourceCompatibility = 11
 targetCompatibility = 11
--- a/ethereum/api/build.gradle
+++ b/ethereum/api/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-api'
+  archiveBaseName = 'besu-api'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -48,6 +48,7 @@ dependencies {
  implementation 'io.vertx:vertx-core'
  implementation 'io.vertx:vertx-unit'
  implementation 'io.vertx:vertx-web'
+  implementation 'org.apache.logging.log4j:log4j-core'
  implementation 'org.apache.tuweni:tuweni-bytes'
  implementation 'org.apache.tuweni:tuweni-net'
  implementation 'org.apache.tuweni:tuweni-toml'
--- a/ethereum/blockcreation/build.gradle
+++ b/ethereum/blockcreation/build.gradle
@ -1,12 +1,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-blockcreation'
+  archiveBaseName = 'besu-blockcreation'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
--- a/ethereum/core/build.gradle
+++ b/ethereum/core/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-core'
+  archiveBaseName = 'besu-core'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -46,13 +46,14 @@ dependencies {
  implementation 'org.apache.tuweni:tuweni-bytes'
  implementation 'org.apache.tuweni:tuweni-units'

-  runtime 'org.apache.logging.log4j:log4j-core'
+  runtimeOnly 'org.apache.logging.log4j:log4j-core'

  testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
  testImplementation project(path:':ethereum:referencetests', configuration: 'testOutput')
  testImplementation project(':testutil')

  testImplementation 'junit:junit'
+  testImplementation 'org.apache.logging.log4j:log4j-core'
  testImplementation 'org.apache.tuweni:tuweni-bytes'
  testImplementation 'org.apache.tuweni:tuweni-io'
  testImplementation 'org.apache.tuweni:tuweni-units'
@ -91,7 +92,7 @@ dependencies {

 configurations { testArtifacts }
 task testJar (type: Jar) {
-  baseName = "${project.name}-test"
+  archiveBaseName = "${project.name}-test"
  from sourceSets.test.output
 }

--- a/ethereum/eth/build.gradle
+++ b/ethereum/eth/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-eth'
+  archiveBaseName = 'besu-eth'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
--- a/ethereum/mock-p2p/build.gradle
+++ b/ethereum/mock-p2p/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-mock-p2p'
+  archiveBaseName = 'besu-mock-p2p'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
--- a/ethereum/p2p/build.gradle
+++ b/ethereum/p2p/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-p2p'
+  archiveBaseName = 'besu-p2p'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -42,7 +42,7 @@ dependencies {
  implementation 'org.apache.tuweni:tuweni-units'
  implementation 'org.xerial.snappy:snappy-java'

-  runtime 'org.apache.logging.log4j:log4j-core'
+  runtimeOnly 'org.apache.logging.log4j:log4j-core'

  // test dependencies.
  testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
--- a/ethereum/permissioning/build.gradle
+++ b/ethereum/permissioning/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-permissioning'
+  archiveBaseName = 'besu-permissioning'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
--- a/ethereum/retesteth/build.gradle
+++ b/ethereum/retesteth/build.gradle
@ -14,12 +14,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-retesteth'
+  archiveBaseName = 'besu-retesteth'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -50,5 +50,5 @@ dependencies {
  testImplementation 'org.assertj:assertj-core'
  testImplementation 'org.mockito:mockito-core'

-  runtime 'org.apache.logging.log4j:log4j-core'
+  runtimeOnly 'org.apache.logging.log4j:log4j-core'
 }
--- a/ethereum/rlp/build.gradle
+++ b/ethereum/rlp/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-ethereum-rlp'
+  archiveBaseName = 'besu-ethereum-rlp'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
--- a/ethereum/stratum/build.gradle
+++ b/ethereum/stratum/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-ethereum-stratum'
+  archiveBaseName = 'besu-ethereum-stratum'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
--- a/ethereum/trie/build.gradle
+++ b/ethereum/trie/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-trie'
+  archiveBaseName = 'besu-trie'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
--- a/metrics/core/build.gradle
+++ b/metrics/core/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-metrics-core'
+  archiveBaseName = 'besu-metrics-core'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -46,7 +46,7 @@ dependencies {
  implementation 'io.vertx:vertx-web'
  implementation 'org.apache.logging.log4j:log4j-api'

-  runtime 'org.apache.logging.log4j:log4j-core'
+  runtimeOnly 'org.apache.logging.log4j:log4j-core'

  // test dependencies.
  testImplementation project(':util')
--- a/metrics/rocksdb/build.gradle
+++ b/metrics/rocksdb/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-metrics-rocksdb'
+  archiveBaseName = 'besu-metrics-rocksdb'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
--- a/nat/build.gradle
+++ b/nat/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-nat'
+  archiveBaseName = 'besu-nat'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -34,7 +34,7 @@ dependencies {
  implementation 'org.jupnp:org.jupnp'
  implementation 'org.jupnp:org.jupnp.support'

-  runtime 'org.apache.logging.log4j:log4j-core'
+  runtimeOnly 'org.apache.logging.log4j:log4j-core'

  // test dependencies.
  testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
--- a/plugin-api/build.gradle
+++ b/plugin-api/build.gradle
@ -15,12 +15,12 @@ import java.security.MessageDigest

 apply plugin: 'java-library'
 jar {
-  baseName 'plugin-api'
+  archiveBaseName = 'plugin-api'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -35,7 +35,11 @@ configurations { testArtifacts }
 artifacts { testSupportArtifacts testSupportJar }

 class FileStateChecker extends DefaultTask {
+
+  @Input
  Set<File> files
+
+  @Input
  String knownHash

  @TaskAction
--- a/plugins/rocksdb/build.gradle
+++ b/plugins/rocksdb/build.gradle
@ -14,12 +14,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-plugin-rocksdb'
+  archiveBaseName = 'besu-plugin-rocksdb'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -46,7 +46,7 @@ dependencies {
  implementation 'org.apache.tuweni:tuweni-bytes'
  implementation 'org.rocksdb:rocksdbjni'

-  runtime 'org.apache.logging.log4j:log4j-core'
+  runtimeOnly 'org.apache.logging.log4j:log4j-core'

  testImplementation project(':testutil')

--- a/services/kvstore/build.gradle
+++ b/services/kvstore/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-kvstore'
+  archiveBaseName = 'besu-kvstore'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -40,7 +40,7 @@ dependencies {
  implementation 'org.apache.tuweni:tuweni-bytes'
  implementation 'org.rocksdb:rocksdbjni'

-  runtime 'org.apache.logging.log4j:log4j-core'
+  runtimeOnly 'org.apache.logging.log4j:log4j-core'

  testImplementation project(':testutil')

--- a/services/pipeline/build.gradle
+++ b/services/pipeline/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-pipeline'
+  archiveBaseName = 'besu-pipeline'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -36,7 +36,7 @@ dependencies {
  implementation 'com.google.guava:guava'
  implementation 'org.apache.logging.log4j:log4j-api'

-  runtime 'org.apache.logging.log4j:log4j-core'
+  runtimeOnly 'org.apache.logging.log4j:log4j-core'

  testImplementation 'junit:junit'
  testImplementation 'org.assertj:assertj-core'
--- a/services/tasks/build.gradle
+++ b/services/tasks/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-tasks'
+  archiveBaseName = 'besu-tasks'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
@ -40,7 +40,7 @@ dependencies {
  implementation 'org.apache.logging.log4j:log4j-api'
  implementation 'org.apache.tuweni:tuweni-bytes'

-  runtime 'org.apache.logging.log4j:log4j-core'
+  runtimeOnly 'org.apache.logging.log4j:log4j-core'

  testImplementation 'junit:junit'
  testImplementation 'org.assertj:assertj-core'
--- a/testutil/build.gradle
+++ b/testutil/build.gradle
@ -16,12 +16,12 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-util-test'
+  archiveBaseName = 'besu-util-test'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
--- a/util/build.gradle
+++ b/util/build.gradle
@ -16,27 +16,28 @@
 apply plugin: 'java-library'

 jar {
-  baseName 'besu-util'
+  archiveBaseName = 'besu-util'
  manifest {
    attributes(
-      'Specification-Title': baseName,
+      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
-      'Implementation-Title': baseName,
+      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion()
      )
  }
 }

 dependencies {
+  api 'org.apache.logging.log4j:log4j-api'
+
  implementation project(':plugin-api')

  implementation 'com.google.guava:guava'
  implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.logging.log4j:log4j-api'
  implementation 'org.apache.tuweni:tuweni-bytes'
  implementation 'org.apache.tuweni:tuweni-units'

-  runtime 'org.apache.logging.log4j:log4j-core'
+  runtimeOnly 'org.apache.logging.log4j:log4j-core'

  testImplementation 'junit:junit'
  testImplementation 'org.assertj:assertj-core'