Feat: Use Besu plugin Gradle plugin

Signed-off-by: Fabio Di Fabio <[email protected]>

Author: fab-10

arithmetization/build.gradle

@@ -17,47 +17,28 @@ plugins {
   id 'java-library'
   id 'common-plugins'
   id 'com.github.hierynomus.license'
-  id "de.undercouch.download"
+  id 'net.consensys.besu-plugin-library'
 }
 
 group = 'net.consensys.linea.besu.plugin'
 version = rootProject.version
 
 apply from: rootProject.file("gradle/java.gradle")
 apply from: rootProject.file("gradle/dependency-management.gradle")
-apply from: rootProject.file("gradle/common-dependencies.gradle")
 apply from: rootProject.file("gradle/corset.gradle")
 apply from: rootProject.file("gradle/tests.gradle")
 apply from: rootProject.file("gradle/build-aliases.gradle")
 apply from: rootProject.file("gradle/check-licenses.gradle")
 apply from: rootProject.file("gradle/lint.gradle")
 
 dependencies {
-  implementation "${besuArtifactGroup}:besu-datatypes"
-  implementation "${besuArtifactGroup}:besu-evm"
-  implementation "${besuArtifactGroup}:besu-plugin-api"
-  implementation "${besuArtifactGroup}.internal:besu-consensus-clique"
-  implementation "${besuArtifactGroup}.internal:besu-crypto-algorithms"
-  implementation "${besuArtifactGroup}.internal:besu-ethereum-api"
-  implementation "${besuArtifactGroup}.internal:besu-ethereum-core"
-  implementation "${besuArtifactGroup}.internal:besu-ethereum-rlp"
-
-  implementation "org.hyperledger.besu:gnark:1.4.1-SNAPSHOT"
-  // implementation "${besuArtifactGroup}:gnark"
-  implementation 'net.java.dev.jna:jna:5.13.0'
-
+  implementation 'org.hyperledger.besu:gnark:1.4.1-SNAPSHOT'
   implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
-  implementation 'info.picocli:picocli'
-  implementation 'com.google.code.gson:gson'
-
-  implementation 'io.consensys.tuweni:tuweni-bytes'
-  implementation 'io.consensys.tuweni:tuweni-units'
-  implementation 'io.consensys.tuweni:tuweni-toml'
-
-  implementation 'io.vertx:vertx-web'
-
-  testImplementation project(path: ':testing')
+  testImplementation project(':testing')
+  testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.platform:junit-platform-launcher'
+  testImplementation 'org.junit.jupiter:junit-jupiter-api'
+  testImplementation 'org.junit.jupiter:junit-jupiter-params'
 }
 
 jar {
@@ -75,14 +56,3 @@ jar {
 }
 
 apply from: rootProject.file("gradle/publishing.gradle")
-
-configure(allprojects) {
-  repositories {
-    maven {
-      url 'https://hyperledger.jfrog.io/artifactory/besu-maven'
-      content { includeGroupByRegex('org\\.hyperledger\\..*') }
-    }
-
-    mavenCentral()
-  }
-}

build.gradle

@@ -6,11 +6,14 @@ buildscript {
     besuUrl = "${distributionBaseUrl}${besuVersion}/${besuFilename}"
     besuPluginsIdentifier = "${distributionIdentifier}-${version}"
     besuPluginDir = File.createTempDir("plugins")
+    besuRepo = "https://artifacts.consensys.net/public/linea-besu/maven/"
   }
 }
 
 plugins {
   id 'java-library'
+  id 'net.consensys.besu-plugin-library' version '0.1.1'
+  id 'net.consensys.besu-plugin-distribution' version '0.1.1'
   id "org.sonarqube" version "4.3.1.3277"
 }
 

gradle/allprojects.gradle

@@ -24,7 +24,7 @@ def buildAliases = [
   ],
   'artifacts' : [
     'jar',
-    'distPlugin'
+    'distZip'
   ]
 ]
 

gradle/build-aliases.gradle

@@ -14,82 +14,6 @@
  */
 
 repositories {
-  maven {
-    url "https://artifacts.consensys.net/public/linea-besu/maven/"
-    content { includeGroupByRegex('org\\.hyperledger\\..*') }
-  }
-  maven {
-    url 'https://hyperledger.jfrog.io/hyperledger/besu-maven'
-    content { includeGroupByRegex('org\\.hyperledger\\..*') }
-  }
-  maven {
-    url 'https://artifacts.consensys.net/public/maven/maven/'
-    content { includeGroupByRegex('tech\\.pegasys(\\..*)?') }
-  }
-
-  maven {
-    url 'https://splunk.jfrog.io/splunk/ext-releases-local'
-    content { includeGroupByRegex('com\\.splunk\\..*') }
-  }
-
   mavenCentral()
   mavenLocal()
 }
-
-apply plugin: 'io.spring.dependency-management'
-
-dependencyManagement {
-  applyMavenExclusions = false
-  generatedPomCustomization {
-    enabled = false
-  }
-  imports {
-    mavenBom "${besuArtifactGroup}:bom:${besuVersion}"
-  }
-
-  dependencies {
-    // Logging dependencies
-    dependencySet(group: 'ch.qos.logback', version: '1.4.9') {
-      entry 'logback-core'
-      entry 'logback-classic'
-    }
-
-    dependency 'com.google.code.gson:gson:2.11.0'
-  }
-}
-
-
-configurations.all {
-  // transitive versions conflict new Besu coordinates
-  exclude group: "${besuArtifactGroup}.internal", module: 'dsl'
-  exclude group: "${besuArtifactGroup}.internal", module: 'besu'
-  exclude group: "${besuArtifactGroup}.internal", module: 'config'
-  exclude group: "${besuArtifactGroup}.internal", module: 'clique'
-  exclude group: "${besuArtifactGroup}.internal", module: 'common'
-  exclude group: "${besuArtifactGroup}.internal", module: 'ibft'
-  exclude group: "${besuArtifactGroup}.internal", module: 'ibftlegacy'
-  exclude group: "${besuArtifactGroup}.internal", module: 'merge'
-  exclude group: "${besuArtifactGroup}.internal", module: 'qbft'
-  exclude group: "${besuArtifactGroup}.internal", module: 'qbft-core'
-  exclude group: "${besuArtifactGroup}.internal", module: 'algorithms'
-  exclude group: "${besuArtifactGroup}.internal", module: 'services'
-  exclude group: "${besuArtifactGroup}.internal", module: 'api'
-  exclude group: "${besuArtifactGroup}.internal", module: 'blockcreation'
-  exclude group: "${besuArtifactGroup}.internal", module: 'core'
-  exclude group: "${besuArtifactGroup}.internal", module: 'eth'
-  exclude group: "${besuArtifactGroup}.internal", module: 'p2p'
-  exclude group: "${besuArtifactGroup}.internal", module: 'permissioning'
-  exclude group: "${besuArtifactGroup}.internal", module: 'referencetests'
-  exclude group: "${besuArtifactGroup}.internal", module: 'rlp'
-  exclude group: "${besuArtifactGroup}.internal", module: 'trie'
-  exclude group: "${besuArtifactGroup}", module: 'evm'
-  exclude group: "${besuArtifactGroup}.internal", module: 'metrics-core'
-  exclude group: "${besuArtifactGroup}", module: 'plugin-api'
-  exclude group: "${besuArtifactGroup}.internal", module: 'testutil'
-  exclude group: "${besuArtifactGroup}.internal", module: 'util'
-  exclude group: "${besuArtifactGroup}.internal", module: 'nat'
-  exclude group: "${besuArtifactGroup}.internal", module: 'tasks'
-  exclude group: "${besuArtifactGroup}.internal", module: 'pipeline'
-  exclude group: "${besuArtifactGroup}.internal", module: 'kvstore'
-  exclude group: "${besuArtifactGroup}.internal", module: 'enclave'
-}

gradle/common-dependencies.gradle

@@ -20,8 +20,14 @@ if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) {
     "  Detected version ${JavaVersion.current()}")
 }
 
-sourceCompatibility = 21
-targetCompatibility = 21
+java {
+    sourceCompatibility = 21
+    targetCompatibility = 21
+
+    consistentResolution {
+        useCompileClasspathVersions()
+    }
+}
 
 tasks.withType(JavaCompile) {
   options.compilerArgs += [