From 5ff9889efc9fcaa1b3e3d63d7480bc2603dd0fbf Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Wed, 4 Oct 2023 18:27:18 +0200 Subject: [PATCH] Rename artifacts group it to linea-besu and remove uneeded stuff Signed-off-by: Fabio Di Fabio --- build.gradle | 52 +--------------------------------- crypto/algorithms/build.gradle | 2 +- crypto/services/build.gradle | 2 +- datatypes/build.gradle | 4 +-- ethereum/rlp/build.gradle | 2 +- evm/build.gradle | 4 +-- plugin-api/build.gradle | 4 +-- util/build.gradle | 2 +- 8 files changed, 11 insertions(+), 61 deletions(-) diff --git a/build.gradle b/build.gradle index 1a97d1ee2..32491dcc1 100644 --- a/build.gradle +++ b/build.gradle @@ -29,27 +29,14 @@ plugins { id 'me.champeau.jmh' version '0.7.0' apply false id 'net.ltgt.errorprone' version '2.0.2' id 'maven-publish' - id 'org.sonarqube' version '3.4.0.2513' } -sonarqube { - properties { - property "sonar.projectKey", "hyperledger_besu" - property "sonar.organization", "hyperledger" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.coverage.jacoco.xmlReportPaths", "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml" - property "sonar.coverage.exclusions", "acceptance-tests/**/*" - } -} - -project.tasks["sonarqube"].dependsOn "jacocoRootReport" - if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { throw new GradleException("Java 17 or later is required to build Besu.\n" + " Detected version ${JavaVersion.current()}") } -group = 'org.hyperledger.besu' +group = 'com.consensys.linea-besu' defaultTasks 'build', 'checkLicenses', 'javadoc' @@ -612,43 +599,6 @@ distZip { } } -publishing { - publications { - distArtifactory(MavenPublication) { - groupId = '.' - version = project.version - artifactId = 'besu' - artifact("$buildDir/distributions/besu-${project.version}.zip") - artifact("$buildDir/distributions/besu-${project.version}.tar.gz") { extension = 'tar.gz' } - } - } -} - -def artifactoryUser = project.hasProperty('artifactoryUser') ? project.property('artifactoryUser') : System.getenv('ARTIFACTORY_USER') -def artifactoryKey = project.hasProperty('artifactoryApiKey') ? project.property('artifactoryApiKey') : System.getenv('ARTIFACTORY_KEY') -def artifactoryOrg = System.getenv('ARTIFACTORY_ORG') ?: 'hyperledger' - -artifactory { - contextUrl = "https://hyperledger.jfrog.io/${artifactoryOrg}" - publish { - repository { - repoKey = "besu-binaries" - username = artifactoryUser - password = artifactoryKey - } - defaults { - publications('distArtifactory') - publishArtifacts = true - publishPom = false - } - } -} - -artifactoryPublish { - dependsOn distTar - dependsOn distZip -} - def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}" def dockerOrgName = project.hasProperty('dockerOrgName') ? project.getProperty("dockerOrgName") : "hyperledger" def dockerArtifactName = project.hasProperty("dockerArtifactName") ? project.getProperty("dockerArtifactName") : "besu" diff --git a/crypto/algorithms/build.gradle b/crypto/algorithms/build.gradle index dcddb83be..70b76cd48 100644 --- a/crypto/algorithms/build.gradle +++ b/crypto/algorithms/build.gradle @@ -23,7 +23,7 @@ jar { 'Specification-Version': project.version, 'Implementation-Title': archiveBaseName, 'Implementation-Version': calculateVersion(), - 'Automatic-Module-Name': 'org.hyperledger.besu.internal.crypto' + 'Automatic-Module-Name': 'com.consensys.linea-besu.internal.crypto' ) } } diff --git a/crypto/services/build.gradle b/crypto/services/build.gradle index f6e082836..32d4076b1 100644 --- a/crypto/services/build.gradle +++ b/crypto/services/build.gradle @@ -23,7 +23,7 @@ jar { 'Specification-Version': project.version, 'Implementation-Title': archiveBaseName, 'Implementation-Version': calculateVersion(), - 'Automatic-Module-Name': 'org.hyperledger.besu.internal.crypto' + 'Automatic-Module-Name': 'com.consensys.linea-besu.internal.crypto' ) } } diff --git a/datatypes/build.gradle b/datatypes/build.gradle index a55bf4e45..0bcc65552 100644 --- a/datatypes/build.gradle +++ b/datatypes/build.gradle @@ -23,7 +23,7 @@ jar { 'Specification-Version': project.version, 'Implementation-Title': archiveBaseName, 'Implementation-Version': calculateVersion(), - 'Automatic-Module-Name': 'org.hyperledger.besu.datatypes' + 'Automatic-Module-Name': 'com.consensys.linea-besu.datatypes' ) } } @@ -48,7 +48,7 @@ configurations { testArtifacts } publishing { publications { mavenJava(MavenPublication) { - groupId 'org.hyperledger.besu' + groupId 'com.consensys.linea-besu' artifactId 'besu-datatypes' pom { name = 'Besu Datatypes' diff --git a/ethereum/rlp/build.gradle b/ethereum/rlp/build.gradle index 682d26761..180e2b6af 100644 --- a/ethereum/rlp/build.gradle +++ b/ethereum/rlp/build.gradle @@ -23,7 +23,7 @@ jar { 'Specification-Version': project.version, 'Implementation-Title': archiveBaseName, 'Implementation-Version': calculateVersion(), - 'Automatic-Module-Name': 'org.hyperledger.besu.internal.rlp' + 'Automatic-Module-Name': 'com.consensys.linea-besu.internal.rlp' ) } } diff --git a/evm/build.gradle b/evm/build.gradle index 83caaae31..2afd6da98 100644 --- a/evm/build.gradle +++ b/evm/build.gradle @@ -25,7 +25,7 @@ jar { 'Specification-Version': project.version, 'Implementation-Title': archiveBaseName, 'Implementation-Version': calculateVersion(), - 'Automatic-Module-Name': 'org.hyperledger.besu.evm' + 'Automatic-Module-Name': 'com.consensys.linea-besu.evm' ) } } @@ -61,7 +61,7 @@ dependencies { publishing { publications { mavenJava(MavenPublication) { - groupId 'org.hyperledger.besu' + groupId 'com.consensys.linea-besu' pom { name = 'Besu EVM' description = 'EVM Engine component' diff --git a/plugin-api/build.gradle b/plugin-api/build.gradle index 79b4cbee8..1922bf2d9 100644 --- a/plugin-api/build.gradle +++ b/plugin-api/build.gradle @@ -22,7 +22,7 @@ jar { 'Specification-Version': project.version, 'Implementation-Title': archiveBaseName, 'Implementation-Version': calculateVersion(), - 'Automatic-Module-Name': 'org.hyperledger.besu.plugin.api' + 'Automatic-Module-Name': 'com.consensys.linea-besu.plugin.api' ) } } @@ -76,7 +76,7 @@ check.dependsOn('checkAPIChanges') publishing { publications { mavenJava(MavenPublication) { - groupId 'org.hyperledger.besu' + groupId 'com.consensys.linea-besu' pom { name = 'Besu Plugins Library' description = 'Core Plugins Libraries for Besu' diff --git a/util/build.gradle b/util/build.gradle index 9136a20b7..b82c1a389 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -23,7 +23,7 @@ jar { 'Specification-Version': project.version, 'Implementation-Title': archiveBaseName, 'Implementation-Version': calculateVersion(), - 'Automatic-Module-Name': 'org.hyperledger.besu.internal.util' + 'Automatic-Module-Name': 'com.consensys.linea-besu.internal.util' ) } }