From 38e5dd31d521d21ae5a1d55d92a4cba3885bb4b8 Mon Sep 17 00:00:00 2001 From: Nischal Sharma Date: Fri, 12 Apr 2024 14:59:11 +0530 Subject: [PATCH] master to main changes and repo migration fixes Signed-off-by: Nischal Sharma --- .github/CODEOWNERS | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 5 +++++ .github/workflows/build.yml | 4 ++-- .github/workflows/publish-snapshot.yml | 9 ++++----- .github/workflows/release.yml | 7 +++---- .gitignore | 1 - CHANGELOG.md | 8 ++++---- build.gradle | 2 +- gradle/publish/build.gradle | 13 ++++++------- gradle/spotless/build.gradle | 4 ++-- web3j.asc.enc | Bin 5216 -> 0 bytes 11 files changed, 28 insertions(+), 27 deletions(-) delete mode 100644 web3j.asc.enc diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fcd531c..e72f50d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @conor10 @iikirilov \ No newline at end of file +* @conor10 @gtebrean @NickSneo \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9594b66..188a143 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -7,3 +7,8 @@ ### Why is it needed? *required* +## Checklist + +- [ ] I've read the contribution guidelines. +- [ ] I've added tests (if applicable). +- [ ] I've added a changelog entry if necessary. \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03ff393..6795a5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,9 @@ name: Build on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] workflow_dispatch: jobs: diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index f8ccbfc..af3ad35 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -3,7 +3,7 @@ name: Publish snapshot on: workflow_run: workflows: [ 'Build' ] - branches: [ master ] + branches: [ main ] types: [ completed ] jobs: @@ -11,9 +11,10 @@ jobs: if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_USERNAME: ${{ secrets.OSSRH_WEB3J_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + 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 }} steps: - uses: actions/checkout@v2 @@ -29,8 +30,6 @@ jobs: restore-keys: ${{ runner.os }}-gradle - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Decrypt secret key - run: openssl aes-256-cbc -K ${{ secrets.GPG_KEY }} -iv ${{ secrets.GPG_IV }} -in web3j.asc.enc -out web3j.asc -d - name: Publish snapshot run: ./gradlew publish diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1955247..16363cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,9 +7,10 @@ jobs: release: runs-on: ubuntu-latest env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_USERNAME: ${{ secrets.OSSRH_WEB3J_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + 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 }} steps: - uses: actions/checkout@v2 @@ -36,8 +37,6 @@ jobs: restore-keys: ${{ runner.os }}-gradle - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Decrypt secret key - run: openssl aes-256-cbc -K ${{ secrets.GPG_KEY }} -iv ${{ secrets.GPG_IV }} -in web3j.asc.enc -out web3j.asc -d - name: Release name id: release_name uses: actions/github-script@v4 diff --git a/.gitignore b/.gitignore index 9c8bf10..876d13c 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,6 @@ docs/build # OS X .DS_Store -web3j.asc bin .classpath diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d15ce9..da5502a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. -# [4.11.2]() (Upcoming) +# [4.11.3]() (Upcoming) ### Bug Fixes @@ -11,11 +11,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Features -* +* bump snapshot version to 4.11.3 [#104](https://github.com/hyperledger/web3j-evm/pull/104) ### BREAKING CHANGES -* +* Master branch rename to main and repo migration fixes [#106](https://github.com/hyperledger/web3j-evm/pull/106) # [4.11.2](https://github.com/web3j/web3j-evm/releases/tag/v4.11.2) (2024-03-27) @@ -25,7 +25,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Features -* Web3J upgrade and Bump version [#104](https://github.com/web3j/web3j-evm/pull/104) +* Web3J upgrade and Bump version [#103](https://github.com/web3j/web3j-evm/pull/103) ### BREAKING CHANGES diff --git a/build.gradle b/build.gradle index 88ac314..0d05116 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ apply { 'junit' ].each { buildScript -> download { - src "https://raw.githubusercontent.com/web3j/build-tools/master/gradle/$buildScript/build.gradle" + src "https://raw.githubusercontent.com/hyperledger/web3j-build-tools/main/gradle/$buildScript/build.gradle" dest "$rootDir/gradle/$buildScript/build.gradle" overwrite false quiet true diff --git a/gradle/publish/build.gradle b/gradle/publish/build.gradle index 9cc5f44..4d3ab52 100644 --- a/gradle/publish/build.gradle +++ b/gradle/publish/build.gradle @@ -48,9 +48,9 @@ publishing { slug = project.rootProjectOverride } - url = "https://github.com/web3j/$slug" - connection = "scm:https://github.com/web3j/${slug}.git" - developerConnection = "scm:git://github.com/web3j/${slug}.git" + url = "https://github.com/hyperledger/$slug" + connection = "scm:https://github.com/hyperledger/${slug}.git" + developerConnection = "scm:git://github.com/hyperledger/${slug}.git" } developers { @@ -84,8 +84,7 @@ nexusStaging { signing { sign publishing.publications.maven - def signingKey = new File("$rootDir/web3j.asc") - if (signingKey.exists()) { - useInMemoryPgpKeys(signingKey.getText('UTF-8'), System.getenv('GPG_PASSPHRASE')) - } + def gpgSecretKey = System.getenv('OSSRH_GPG_SECRET_KEY') + def password = System.getenv('OSSRH_GPG_SECRET_KEY_PASSWORD') + useInMemoryPgpKeys(gpgSecretKey, password) } diff --git a/gradle/spotless/build.gradle b/gradle/spotless/build.gradle index 2edff87..3531176 100644 --- a/gradle/spotless/build.gradle +++ b/gradle/spotless/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.diffplug.gradle.spotless' apply plugin: "de.undercouch.download" task downloadJavaLicense(type: Download) { - src 'https://raw.githubusercontent.com/web3j/build-tools/master/gradle/spotless/java.license' + src 'https://raw.githubusercontent.com/hyperledger/web3j-build-tools/main/gradle/spotless/java.license' dest new File("$rootDir/gradle/spotless",'java.license') quiet true onlyIfModified true @@ -11,7 +11,7 @@ task downloadJavaLicense(type: Download) { task downloadFormatterProperties(type: Download) { - src 'https://raw.githubusercontent.com/web3j/build-tools/master/gradle/spotless/formatter.properties' + src 'https://raw.githubusercontent.com/hyperledger/web3j-build-tools/main/gradle/spotless/formatter.properties' dest new File("$rootDir/gradle/spotless",'formatter.properties') quiet true onlyIfModified true diff --git a/web3j.asc.enc b/web3j.asc.enc deleted file mode 100644 index 2bc247e7a009775411c50611430269d8530d1f4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5216 zcmV-m6rbzx|4<0T`3LDzB>fwsZSWP5EM;US?1c!EXci|jok(aK%vtC-5s*jR4^dh3 zK$hKOX_n1dGkzbc!HSNLreqt0|ADh z1FfYG+)n8Q2|TBFf>HuAuBavmJOO50Mx8s{9oGDPq%)-KTGpIvB$ ztJU7SogiTuigfbzFL{RcWm8=IMxMXW!b`S1BrzUFqxmhNNW)`^!zC^#9J?)e>;|?` z((?ocT`bsln62}J>h@jftCA%`!@)Y#U5*Z^_VCr}hYivMEjr1oT5jX|l=2bZA@$?N zCii^7OeA)MhPA@Cs3)gv_|HEbaaL!iY9`pbaeXQ6^tUIwsbue-&CZ*=uZQNigbW#5 zu|GgF7G-_uxo$_$G)*02Y!>*+&non)XvSg+;aZLa%>$RCDJ=3ET-){xaq3a_j|>^F_*`erFgS# zH4Zi=Kt!{tpZ{B4yQ6~TDa#%y*#i>V%qR#Bq^$xiPSLK19VM3^k8qQ014d`Faa3|1 ze)keaKj1+&rCw79x3EH40QTNt(X{H-l>OCpJEtyiHSawJW#7z&igF4p3p zZ4{Q&8A!+)8|2arF)_noESu`Ir+yIOe^mTt6rPyAcG(T9qT!8Tz zMq+q^1V&}dPZ)fPgQw8&%_6Oq=On@t>!;D$1?rDpOo z8t`Q+ssM2SukvU?ai+Nbr;Y>*)=x_;o#lbQgHa9exfr7(<>JKd)8|;0_b7m& zyEW#O6jXTxVSH8jr<1{kDC{k!gU){&HFg;BQM;J5<|sG{NNIdy&|!k8+Nn*M_mP9s z^hd*(v}(&$zdG7t#qu2Ot^l*g4hP7CWoAnux-X>)LpnzzNu*kCV{d+i%I&{i%dXQ@ z@`@RDx@~HEx?=h8#*hh9DRQ+FfT>>gtbJ2oCeakVIwpAAa#rp{v6VsjJv~=d_vCa9 zdrc-uj2uZ<2PJ=4Rnqvv(PwQI2ikK6XD547gVr=5E_R1wm*vAK`HvV>D2lf$9KC(> zvMl%5f5-_jz^fFP%xF(!+M+Ve-z_8kHN~VfPAt?j(acg* zs=b`|dtMxxWT$^3!c7+$$t)g%R#%c=IU;=r;fj3WfF!!G3K<+qI=`)ra(<<``5h;% zZDPpf=#t|Nn=mz256tF(XoF5u_&oh@8RSXynEnpkF&`|OcM3Bu ziG{q=>74M2%bS+F`p3pW91g7*xMC()~#QAELOJ5YWk!cOcRc zzLB<1$;z=hJWN4y__^iUaV0fi)9({SHFwLZgQ_0h;#c$qv+fX?j`9IUc0d$8or`9S zS6&5!4ffbCl?CJBCic9jf0RNq`aItRi4#3h<*~l71&%F$2W
  • -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 a>FjJ)>eUBRkqel?IyR