Merge pull request #96 from LFDT-web3j/update_maven_release

gtebrean · web-flow · commit 57a59a70b3db · 2026-01-16T22:19:59.000+02:00
release update
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,10 +11,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK 21
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'zulu'
           java-version: 21
       - name: Cache Gradle packages
         uses: actions/cache@v4
@@ -26,6 +27,5 @@ jobs:
         run: chmod +x gradlew
       - name: Build
         run: ./gradlew check jacocoTestReport
-      - name: After success
-        run: bash <(curl -s https://codecov.io/bash)
-        if: ${{ success() }}
+      - name: Upload coverage reports to Codecov with GitHub Action
+        uses: codecov/codecov-action@v3
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -11,16 +11,18 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     env:
-      OSSRH_USERNAME: ${{ secrets.OSSRH_WEB3J_USERNAME }}
-      OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-      OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
-      OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      JRELEASER_MAVENCENTRAL_CENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_CENTRAL_USERNAME }}
+      JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
+      JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}
+      JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
+      JRELEASER_MAVENCENTRAL_CENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_CENTRAL_PASSWORD }}
+      JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK 21
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'zulu'
           java-version: 21
       - name: Cache Gradle packages
         uses: actions/cache@v4
@@ -31,5 +33,4 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Publish snapshot
-        run: ./gradlew publish
-
+        run: ./gradlew publishSnapshot
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,27 +7,29 @@ jobs:
   release:
     runs-on: ubuntu-latest
     env:
-      OSSRH_USERNAME: ${{ secrets.OSSRH_WEB3J_USERNAME }}
-      OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-      OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
-      OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      JRELEASER_MAVENCENTRAL_CENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_CENTRAL_USERNAME }}
+      JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
+      JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}
+      JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
+      JRELEASER_MAVENCENTRAL_CENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_CENTRAL_PASSWORD }}
+      JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Build Workflow Dispatch
         uses: convictional/trigger-workflow-and-wait@v1.3.0
         with:
           owner: LFDT-web3j
           repo: web3j-unit
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
           workflow_file_name: build.yml
           wait_interval: 10
           propagate_failure: true
           trigger_workflow: true
           wait_workflow: true
       - name: Set up JDK 21
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'zulu'
           java-version: 21
       - name: Cache Gradle packages
         uses: actions/cache@v4
@@ -37,31 +39,36 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      - name: Release name
+      - name: Extract release version from branch
         id: release_name
-        uses: actions/github-script@v4
-        with:
-          result-encoding: string
-          script: |
-            const branch_name = process.env.GITHUB_REF
-            const web3j_release_version = branch_name.substring(branch_name.lastIndexOf('/') +1 ,branch_name.length  )
-            process.env.VERSION = web3j_release_version
-            return web3j_release_version
-      - name: Build and stage release
-        run: ./gradlew publish -Pversion=${{ steps.release_name.outputs.result }}
-      - name: Release
-        run: ./gradlew closeAndReleaseRepository
-    outputs:
-      stripped_version: ${{ steps.release_name.outputs.result }}
-  git-release:
+        run: |
+          BRANCH="${GITHUB_REF##*/}"
+          echo "version=$BRANCH" >> "$GITHUB_OUTPUT"
+      - name: Fail if version is a SNAPSHOT
+        if: endsWith(steps.release_name.outputs.version, '-SNAPSHOT')
+        run: |
+          echo "This workflow is for releases only. Version '${{ steps.release_name.outputs.version }}' ends with -SNAPSHOT." >&2
+          exit 1
+
+      # Publish artifacts to local staging repo (your Gradle config already defines it)
+      - name: Stage artifacts locally
+        run: ./gradlew -Pversion=${{ steps.release_name.outputs.version }} publishMavenPublicationToLocalStagingRepository --stacktrace
+
+      # Deploy to Central Portal via JReleaser (Publisher API)
+      - name: Deploy to Maven Central (Portal)
+        run: ./gradlew -Pversion=${{ steps.release_name.outputs.version }} jreleaserDeploy --stacktrace
+
+  javadocs-release:
     needs: release
     runs-on: ubuntu-latest
     steps:
-      - name: Github Release
-        uses: marvinpinto/action-automatic-releases@latest
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          automatic_release_tag: 'v${{ needs.release.outputs.stripped_version }}'
-          prerelease: false
-          files: |
-            "web3j-unit-"+${{ steps.release_name.outputs.result }}.*
+          distribution: zulu
+          java-version: 21
+      - name: Publish Javadocs (gh-pages)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew core:gitPublishPush
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,11 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [4.14.1]() (Upcoming)
+# [5.0.1]() (Upcoming)
 
 ### Bug Fixes
 
-* 
+* maven release repo update [#96](https://github.com/LFDT-web3j/web3j-unit/pull/96)
 
 ### Features
 
@@ -17,7 +17,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 * 
 
-
 # [4.14.0](https://github.com/LFDT-web3j/web3j-unit/releases/tag/v4.14.0) (2025-04-10)
 
 ### Bug Fixes
diff --git a/build.gradle b/build.gradle
@@ -1,19 +1,21 @@
 plugins {
     id 'java'
+    id 'maven-publish'
     id 'idea'
     id 'jacoco'
     id 'com.diffplug.spotless' version '6.25.0'
     id 'io.codearte.nexus-staging' version '0.30.0'
     id 'de.marcphilipp.nexus-publish' version '0.4.0'
     id 'org.jetbrains.kotlin.jvm' version '2.1.0'
     id 'de.undercouch.download' version '4.1.2'
+    id 'org.jreleaser' version '1.19.0'
 }
 
 description 'Web3j-unit extension'
 
 
 ext {
-    web3jVersion = version
+    web3jVersion = '5.0.1'
     kotlinLoggingVersion = '3.0.5'
     logbackVersion = '1.5.6'
     mockitoKotlinVersion = '1.9.24'
@@ -47,6 +49,7 @@ apply {
 }
 
 repositories {
+    mavenCentral()
     maven { url "https://hyperledger.jfrog.io/artifactory/besu-maven/" }
     maven { url "https://artifacts.consensys.net/public/maven/maven/" }
     maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
diff --git a/gradle/jacoco/build.gradle b/gradle/jacoco/build.gradle
@@ -1,29 +1,23 @@
-apply plugin: 'jacoco'
+apply(plugin: 'jacoco')
 
-task jacocoRootTestReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
-    dependsOn = subprojects.test
-    getSourceDirectories().from(subprojects.sourceSets.main.allSource.srcDirs)
-    getAdditionalSourceDirs().from(subprojects.sourceSets.main.allSource.srcDirs)
-    getClassDirectories().from(subprojects.sourceSets.main.output)
-    getExecutionData().from(subprojects.jacocoTestReport.executionData)
-    reports {
-        xml.required.set(true)
-    }
+test {
+    useJUnitPlatform()
+    finalizedBy jacocoTestReport
+}
 
-    doFirst {
-        getExecutionData().from(executionData.findAll { it.exists() })
+jacocoTestReport {
+    classDirectories.from files(subprojects.sourceSets.main.output).asFileTree.matching {
+        exclude 'org/web3j/abi/datatypes/generated/**',
+                'org/web3j/tuples/generated/**',
+                'org/web3j/ens/contracts/generated/**',
+                'org/gradle/**'
     }
-
-    afterEvaluate {
-        getClassDirectories().from(files(classDirectories.files.collect {
-            fileTree(dir: it,
-                    exclude: [
-                            'org/web3j/abi/datatypes/generated/**',
-                            'org/web3j/tuples/generated/**',
-                            'org/web3j/ens/contracts/generated/**',
-                            'org/gradle/**'
-                    ])
-        }))
+    dependsOn test
+    reports {
+        xml.required.set(true)
+        html.required.set(false)
+        csv.required.set(false)
+        xml.destination file("${buildDir}/reports/jacoco.xml")
     }
 }
 
diff --git a/gradle/publish/build.gradle b/gradle/publish/build.gradle
@@ -1,35 +1,33 @@
+apply plugin: 'java-library'
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
-apply plugin: "de.marcphilipp.nexus-publish"
+apply plugin: 'org.jreleaser'
 
-task javadocsJar(type: Jar) {
+tasks.register('javadocsJar', Jar) {
     archiveClassifier = 'javadoc'
     from javadoc
 }
 
-task sourcesJar(type: Jar) {
+tasks.register('sourcesJar', Jar) {
     archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 
-task testsJar(type: Jar) {
+tasks.register('testsJar', Jar) {
     archiveClassifier = 'tests'
     from sourceSets.test.output
 }
 
-javadoc { options.encoding = 'UTF-8' }
-
-artifacts { archives sourcesJar, javadocsJar, testsJar }
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
 
 publishing {
     publications {
         maven(MavenPublication) {
             from components.java
 
-            artifact sourcesJar
-            artifact javadocsJar
-            artifact testsJar
-
             pom {
                 name = project.name
                 description.set(project.provider({ project.description }))
@@ -63,28 +61,47 @@ publishing {
             }
         }
     }
-}
 
-nexusPublishing {
     repositories {
-        sonatype {
-            username = System.getenv('OSSRH_USERNAME')
-            password = System.getenv('OSSRH_PASSWORD')
+        maven {
+            name = "localStaging"
+            url = uri(layout.buildDirectory.dir("staging-deploy"))
+        }
+        maven {
+            name = "sonatypeSnapshots"
+            url = uri("https://central.sonatype.com/repository/maven-snapshots/")
+            credentials {
+                username = findProperty("JRELEASER_MAVENCENTRAL_CENTRAL_USERNAME") ?: System.getenv("JRELEASER_MAVENCENTRAL_CENTRAL_USERNAME")
+                password = findProperty("JRELEASER_MAVENCENTRAL_CENTRAL_PASSWORD") ?: System.getenv("JRELEASER_MAVENCENTRAL_CENTRAL_PASSWORD")
+            }
         }
     }
 }
 
-
-nexusStaging {
-    username System.getenv('OSSRH_USERNAME')
-    password System.getenv('OSSRH_PASSWORD')
-    packageGroup = rootProject.group
+jreleaser {
+    signing {
+        active = 'ALWAYS'
+        armored = true
+    }
+    deploy {
+        maven {
+            mavenCentral {
+                'central' {
+                    active = 'RELEASE'
+                    url = 'https://central.sonatype.com/api/v1/publisher'
+                    applyMavenCentralRules = true
+                    stagingRepository("${buildDir}/staging-deploy")
+                }
+            }
+        }
+    }
 }
 
+tasks.register("publishSnapshot") {
+    dependsOn("publishMavenPublicationToSonatypeSnapshotsRepository")
+    onlyIf { version.endsWith("-SNAPSHOT") }
+}
 
-signing {
-    sign publishing.publications.maven
-    def gpgSecretKey = System.getenv('OSSRH_GPG_SECRET_KEY')
-    def password = System.getenv('OSSRH_GPG_SECRET_KEY_PASSWORD')
-    useInMemoryPgpKeys(gpgSecretKey, password)
+tasks.named("jreleaserDeploy").configure {
+    dependsOn("publishMavenPublicationToLocalStagingRepository")
 }
diff --git a/gradle/repositories/build.gradle b/gradle/repositories/build.gradle
@@ -1,5 +1,8 @@
 repositories {
     mavenCentral()
-    maven { url 'https://oss.sonatype.org/content/repositories/releases/' }
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+    maven {
+        url 'https://plugins.gradle.org/m2/'
+    }
+    maven { url 'https://central.sonatype.com/repository/maven-snapshots/' }
+
 }
diff --git a/src/test/kotlin/org/web3j/BesuGreeterTest.kt b/src/test/kotlin/org/web3j/BesuGreeterTest.kt
@@ -13,12 +13,14 @@
 package org.web3j
 
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.web3j.greeter.Greeter
 import org.web3j.protocol.Web3j
 import org.web3j.tx.TransactionManager
 import org.web3j.tx.gas.ContractGasProvider
 @EVMTest(NodeType.BESU)
+@Disabled
 class BesuGreeterTest {
 
     @Test
