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

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

Browse Source 
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>
pull/302/head
Danno Ferrin 5 years ago committed by GitHub
parent cb56b3c745
commit 838f7aa5e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 121 additions and 113 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. 16
      besu/build.gradle
  2. 14
      build.gradle
  3. 8
      config/build.gradle
  4. 6
      consensus/clique/build.gradle
  5. 8
      consensus/common/build.gradle
  6. 6
      consensus/ibft/build.gradle
  7. 6
      consensus/ibftlegacy/build.gradle
  8. 8
      crypto/build.gradle
  9. 5
      errorprone-checks/build.gradle
  10. 7
      ethereum/api/build.gradle
  11. 6
      ethereum/blockcreation/build.gradle
  12. 11
      ethereum/core/build.gradle
  13. 6
      ethereum/eth/build.gradle
  14. 6
      ethereum/mock-p2p/build.gradle
  15. 8
      ethereum/p2p/build.gradle
  16. 6
      ethereum/permissioning/build.gradle
  17. 8
      ethereum/retesteth/build.gradle
  18. 6
      ethereum/rlp/build.gradle
  19. 6
      ethereum/stratum/build.gradle
  20. 6
      ethereum/trie/build.gradle
  21. 8
      metrics/core/build.gradle
  22. 6
      metrics/rocksdb/build.gradle
  23. 8
      nat/build.gradle
  24. 10
      plugin-api/build.gradle
  25. 8
      plugins/rocksdb/build.gradle
  26. 8
      services/kvstore/build.gradle
  27. 8
      services/pipeline/build.gradle
  28. 8
      services/tasks/build.gradle
  29. 6
      testutil/build.gradle
  30. 11
      util/build.gradle

16
besu/build.gradle
Unescape View File

@ -16,12 +16,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu' archiveBaseName = 'besu'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
@ -58,13 +58,13 @@ dependencies {
implementation 'io.vertx:vertx-core' implementation 'io.vertx:vertx-core'
implementation 'io.vertx:vertx-web' implementation 'io.vertx:vertx-web'
implementation 'org.apache.logging.log4j:log4j-api' 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-bytes'
implementation 'org.apache.tuweni:tuweni-config' implementation 'org.apache.tuweni:tuweni-config'
implementation 'org.apache.tuweni:tuweni-units' implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.springframework.security:spring-security-crypto' implementation 'org.springframework.security:spring-security-crypto'
runtime 'org.apache.logging.log4j:log4j-core' runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
runtime 'org.apache.logging.log4j:log4j-slf4j-impl'
testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation project(':testutil') testImplementation project(':testutil')
@ -81,12 +81,12 @@ dependencies {
} }
task testJar(type: Jar) { task testJar(type: Jar) {
archiveName 'testPlugins.jar' archiveFileName = 'testPlugins.jar'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }

14
build.gradle
Unescape View File

@ -309,7 +309,7 @@ subprojects {
} }
task testSupportJar(type: Jar) { task testSupportJar(type: Jar) {
baseName = "${project.name}-support-test" archiveBaseName = "${project.name}-support-test"
classifier = 'test-support' classifier = 'test-support'
from sourceSets.testSupport.output from sourceSets.testSupport.output
} }
@ -401,6 +401,12 @@ subprojects {
group = "verification" group = "verification"
description = "Runs the Besu integration tests" 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 testClassesDirs = sourceSets.integrationTest.output.classesDirs
classpath = sourceSets.integrationTest.runtimeClasspath classpath = sourceSets.integrationTest.runtimeClasspath
outputs.upToDateWhen { false } outputs.upToDateWhen { false }
@ -499,7 +505,7 @@ distTar {
delete fileTree(dir: 'build/distributions', include: '*.tar.gz') delete fileTree(dir: 'build/distributions', include: '*.tar.gz')
} }
compression = Compression.GZIP compression = Compression.GZIP
extension = 'tar.gz' archiveExtension = 'tar.gz'
} }
distZip { distZip {
@ -684,8 +690,8 @@ bintray {
key = bintrayKey key = bintrayKey
filesSpec { filesSpec {
from distTar.destinationDir.path from distTar.destinationDirectory
from distZip.destinationDir.path from distZip.destinationDirectory
into '.' into '.'
} }

8
config/build.gradle
Unescape View File

@ -16,12 +16,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-config' archiveBaseName = 'besu-config'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
@ -32,7 +32,7 @@ dependencies {
implementation 'com.google.guava:guava' implementation 'com.google.guava:guava'
implementation 'org.apache.logging.log4j:log4j-api' implementation 'org.apache.logging.log4j:log4j-api'
runtime 'org.apache.logging.log4j:log4j-core' runtimeOnly 'org.apache.logging.log4j:log4j-core'
testImplementation project(':testutil') testImplementation project(':testutil')

6
consensus/clique/build.gradle
Unescape View File

@ -16,12 +16,12 @@
plugins { id 'java' } plugins { id 'java' }
jar { jar {
baseName 'besu-clique' archiveBaseName = 'besu-clique'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }

8
consensus/common/build.gradle
Unescape View File

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

6
consensus/ibft/build.gradle
Unescape View File

@ -16,12 +16,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-ibft' archiveBaseName = 'besu-ibft'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }

6
consensus/ibftlegacy/build.gradle
Unescape View File

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

8
crypto/build.gradle
Unescape View File

@ -16,12 +16,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-crypto' archiveBaseName = 'besu-crypto'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
@ -38,7 +38,7 @@ dependencies {
implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units' implementation 'org.apache.tuweni:tuweni-units'
runtime 'org.apache.logging.log4j:log4j-core' runtimeOnly 'org.apache.logging.log4j:log4j-core'
testImplementation 'junit:junit' testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core' testImplementation 'org.assertj:assertj-core'

5
errorprone-checks/build.gradle
Unescape View File

@ -13,10 +13,6 @@
* SPDX-License-Identifier: Apache-2.0 * 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 // we use this config to get the path of the JDK 9 javac jar, to
// stick it in the bootclasspath when running tests // stick it in the bootclasspath when running tests
configurations.maybeCreate("epJavac") configurations.maybeCreate("epJavac")
@ -24,7 +20,6 @@ configurations.maybeCreate("epJavac")
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'net.ltgt.errorprone' apply plugin: 'net.ltgt.errorprone'
apply plugin: 'net.ltgt.apt'
sourceCompatibility = 11 sourceCompatibility = 11
targetCompatibility = 11 targetCompatibility = 11

7
ethereum/api/build.gradle
Unescape View File

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

6
ethereum/blockcreation/build.gradle
Unescape View File

@ -1,12 +1,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-blockcreation' archiveBaseName = 'besu-blockcreation'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }

11
ethereum/core/build.gradle
Unescape View File

@ -16,12 +16,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-core' archiveBaseName = 'besu-core'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
@ -46,13 +46,14 @@ dependencies {
implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units' 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: ':config', configuration: 'testSupportArtifacts')
testImplementation project(path:':ethereum:referencetests', configuration: 'testOutput') testImplementation project(path:':ethereum:referencetests', configuration: 'testOutput')
testImplementation project(':testutil') testImplementation project(':testutil')
testImplementation 'junit:junit' testImplementation 'junit:junit'
testImplementation 'org.apache.logging.log4j:log4j-core'
testImplementation 'org.apache.tuweni:tuweni-bytes' testImplementation 'org.apache.tuweni:tuweni-bytes'
testImplementation 'org.apache.tuweni:tuweni-io' testImplementation 'org.apache.tuweni:tuweni-io'
testImplementation 'org.apache.tuweni:tuweni-units' testImplementation 'org.apache.tuweni:tuweni-units'
@ -91,7 +92,7 @@ dependencies {
configurations { testArtifacts } configurations { testArtifacts }
task testJar (type: Jar) { task testJar (type: Jar) {
baseName = "${project.name}-test" archiveBaseName = "${project.name}-test"
from sourceSets.test.output from sourceSets.test.output
} }

6
ethereum/eth/build.gradle
Unescape View File

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

6
ethereum/mock-p2p/build.gradle
Unescape View File

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

8
ethereum/p2p/build.gradle
Unescape View File

@ -16,12 +16,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-p2p' archiveBaseName = 'besu-p2p'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
@ -42,7 +42,7 @@ dependencies {
implementation 'org.apache.tuweni:tuweni-units' implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.xerial.snappy:snappy-java' implementation 'org.xerial.snappy:snappy-java'
runtime 'org.apache.logging.log4j:log4j-core' runtimeOnly 'org.apache.logging.log4j:log4j-core'
// test dependencies. // test dependencies.
testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts') testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')

6
ethereum/permissioning/build.gradle
Unescape View File

@ -16,12 +16,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-permissioning' archiveBaseName = 'besu-permissioning'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }

8
ethereum/retesteth/build.gradle
Unescape View File

@ -14,12 +14,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-retesteth' archiveBaseName = 'besu-retesteth'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
@ -50,5 +50,5 @@ dependencies {
testImplementation 'org.assertj:assertj-core' testImplementation 'org.assertj:assertj-core'
testImplementation 'org.mockito:mockito-core' testImplementation 'org.mockito:mockito-core'
runtime 'org.apache.logging.log4j:log4j-core' runtimeOnly 'org.apache.logging.log4j:log4j-core'
} }

6
ethereum/rlp/build.gradle
Unescape View File

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

6
ethereum/stratum/build.gradle
Unescape View File

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

6
ethereum/trie/build.gradle
Unescape View File

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

8
metrics/core/build.gradle
Unescape View File

@ -16,12 +16,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-metrics-core' archiveBaseName = 'besu-metrics-core'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
@ -46,7 +46,7 @@ dependencies {
implementation 'io.vertx:vertx-web' implementation 'io.vertx:vertx-web'
implementation 'org.apache.logging.log4j:log4j-api' implementation 'org.apache.logging.log4j:log4j-api'
runtime 'org.apache.logging.log4j:log4j-core' runtimeOnly 'org.apache.logging.log4j:log4j-core'
// test dependencies. // test dependencies.
testImplementation project(':util') testImplementation project(':util')

6
metrics/rocksdb/build.gradle
Unescape View File

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

8
nat/build.gradle
Unescape View File

@ -16,12 +16,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-nat' archiveBaseName = 'besu-nat'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
@ -34,7 +34,7 @@ dependencies {
implementation 'org.jupnp:org.jupnp' implementation 'org.jupnp:org.jupnp'
implementation 'org.jupnp:org.jupnp.support' implementation 'org.jupnp:org.jupnp.support'
runtime 'org.apache.logging.log4j:log4j-core' runtimeOnly 'org.apache.logging.log4j:log4j-core'
// test dependencies. // test dependencies.
testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts') testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')

10
plugin-api/build.gradle
Unescape View File

@ -15,12 +15,12 @@ import java.security.MessageDigest
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'plugin-api' archiveBaseName = 'plugin-api'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
@ -35,7 +35,11 @@ configurations { testArtifacts }
artifacts { testSupportArtifacts testSupportJar } artifacts { testSupportArtifacts testSupportJar }
class FileStateChecker extends DefaultTask { class FileStateChecker extends DefaultTask {
@Input
Set<File> files Set<File> files
@Input
String knownHash String knownHash
@TaskAction @TaskAction

8
plugins/rocksdb/build.gradle
Unescape View File

@ -14,12 +14,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-plugin-rocksdb' archiveBaseName = 'besu-plugin-rocksdb'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
@ -46,7 +46,7 @@ dependencies {
implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.rocksdb:rocksdbjni' implementation 'org.rocksdb:rocksdbjni'
runtime 'org.apache.logging.log4j:log4j-core' runtimeOnly 'org.apache.logging.log4j:log4j-core'
testImplementation project(':testutil') testImplementation project(':testutil')

8
services/kvstore/build.gradle
Unescape View File

@ -16,12 +16,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-kvstore' archiveBaseName = 'besu-kvstore'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
@ -40,7 +40,7 @@ dependencies {
implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.rocksdb:rocksdbjni' implementation 'org.rocksdb:rocksdbjni'
runtime 'org.apache.logging.log4j:log4j-core' runtimeOnly 'org.apache.logging.log4j:log4j-core'
testImplementation project(':testutil') testImplementation project(':testutil')

8
services/pipeline/build.gradle
Unescape View File

@ -16,12 +16,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-pipeline' archiveBaseName = 'besu-pipeline'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
@ -36,7 +36,7 @@ dependencies {
implementation 'com.google.guava:guava' implementation 'com.google.guava:guava'
implementation 'org.apache.logging.log4j:log4j-api' 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 'junit:junit'
testImplementation 'org.assertj:assertj-core' testImplementation 'org.assertj:assertj-core'

8
services/tasks/build.gradle
Unescape View File

@ -16,12 +16,12 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-tasks' archiveBaseName = 'besu-tasks'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
@ -40,7 +40,7 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-api' implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.apache.tuweni:tuweni-bytes'
runtime 'org.apache.logging.log4j:log4j-core' runtimeOnly 'org.apache.logging.log4j:log4j-core'
testImplementation 'junit:junit' testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core' testImplementation 'org.assertj:assertj-core'

6
testutil/build.gradle
Unescape View File

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

11
util/build.gradle
Unescape View File

@ -16,27 +16,28 @@
apply plugin: 'java-library' apply plugin: 'java-library'
jar { jar {
baseName 'besu-util' archiveBaseName = 'besu-util'
manifest { manifest {
attributes( attributes(
'Specification-Title': baseName, 'Specification-Title': archiveBaseName,
'Specification-Version': project.version, 'Specification-Version': project.version,
'Implementation-Title': baseName, 'Implementation-Title': archiveBaseName,
'Implementation-Version': calculateVersion() 'Implementation-Version': calculateVersion()
) )
} }
} }
dependencies { dependencies {
api 'org.apache.logging.log4j:log4j-api'
implementation project(':plugin-api') implementation project(':plugin-api')
implementation 'com.google.guava:guava' implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core' implementation 'io.vertx:vertx-core'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units' implementation 'org.apache.tuweni:tuweni-units'
runtime 'org.apache.logging.log4j:log4j-core' runtimeOnly 'org.apache.logging.log4j:log4j-core'
testImplementation 'junit:junit' testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core' testImplementation 'org.assertj:assertj-core'

Write Preview
Loading…
Cancel
Save