testing signing changes

Signed-off-by: Nischal Sharma <[email protected]>
hyperledger-web3j · Apr 16, 2024 · 2b33fc2 · 2b33fc2
1 parent 4d2ac70
commit 2b33fc2
Show file tree

Hide file tree

Showing 19 changed files with 103 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,8 +27,8 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      - name: Run integration tests
-        run: ./gradlew integration-tests:test -Pintegration-tests=true
+#      - name: Run integration tests
+#        run: ./gradlew integration-tests:test -Pintegration-tests=true
   build:
     runs-on: ubuntu-latest
     steps:

diff --git a/abi/build.gradle b/abi/build.gradle
@@ -4,3 +4,10 @@ description 'Ethereum Application Binary Interface (ABI) for working with smart
 dependencies {
     compile project(':utils')
 }
+
+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)
+}
diff --git a/besu/build.gradle b/besu/build.gradle
@@ -5,3 +5,10 @@ dependencies {
     compile project(':eea')
     testCompile project(path: ':core', configuration: 'testArtifacts')
 }
+
+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)
+}
diff --git a/codegen/build.gradle b/codegen/build.gradle
@@ -37,3 +37,10 @@ file("src/test/resources/solidity").listFiles().each { File file ->
         test.dependsOn generateTask
     }
 }
+
+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)
+}
diff --git a/contracts/build.gradle b/contracts/build.gradle
@@ -5,3 +5,10 @@ dependencies {
     compile project(':core')
     testCompile project(path: ':core', configuration: 'testArtifacts')
 }
+
+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)
+}
diff --git a/core/build.gradle b/core/build.gradle
@@ -55,7 +55,7 @@ gitPublish {
     }
 
     // branch will be created if it doesn't exist
-    branch = 'master'
+    branch = 'main'
 
     def coreDocs = files("${buildDir.path}/docs/javadoc/")
 
@@ -78,3 +78,10 @@ classes { dependsOn createProperties }
 configurations { testArtifacts.extendsFrom testRuntime }
 
 artifacts { testArtifacts testsJar }
+
+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)
+}
diff --git a/crypto/build.gradle b/crypto/build.gradle
@@ -12,3 +12,10 @@ dependencies {
 configurations { testArtifacts.extendsFrom testRuntime }
 
 artifacts { testArtifacts testsJar }
+
+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)
+}
diff --git a/eea/build.gradle b/eea/build.gradle
@@ -5,3 +5,10 @@ dependencies {
     compile project(':core')
     testCompile project(path: ':core', configuration: 'testArtifacts')
 }
+
+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)
+}
diff --git a/geth/build.gradle b/geth/build.gradle
@@ -5,3 +5,10 @@ dependencies {
     compile project(':core')
     testCompile project(path: ':core', configuration: 'testArtifacts')
 }
+
+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)
+}
diff --git a/gradle/jacoco/build.gradle b/gradle/jacoco/build.gradle
@@ -6,7 +6,9 @@ task jacocoRootTestReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
     getAdditionalSourceDirs().from(subprojects.sourceSets.main.allSource.srcDirs)
     getClassDirectories().from(subprojects.sourceSets.main.output)
     getExecutionData().from(subprojects.jacocoTestReport.executionData)
-    reports { xml.enabled = true }
+    reports {
+        xml.enabled true
+    }
 
     doFirst {
         getExecutionData().from(executionData.findAll { it.exists() })
@@ -26,6 +28,6 @@ task jacocoRootTestReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
 }
 
 jacoco {
-    toolVersion = "0.8.4"
+    toolVersion = "0.8.10"
 }
 
diff --git a/gradle/java/build.gradle b/gradle/java/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17
 
 compileJava {
     options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"

diff --git a/gradle/publish/build.gradle b/gradle/publish/build.gradle
@@ -81,10 +81,3 @@ nexusStaging {
     packageGroup = rootProject.group
 }
 
-
-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)
-}
diff --git a/gradle/repositories/build.gradle b/gradle/repositories/build.gradle
@@ -3,4 +3,5 @@ repositories {
     jcenter()
     maven { url 'https://oss.sonatype.org/content/repositories/releases/' }
     maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+    maven { url "https://artifacts.consensys.net/public/maven/maven/" }
 }
diff --git a/gradle/spotless/build.gradle b/gradle/spotless/build.gradle
@@ -3,14 +3,14 @@ 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
 }
 
 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/hosted-providers/build.gradle b/hosted-providers/build.gradle
@@ -2,3 +2,10 @@
 description 'web3j customisations for working with hosted web3 providers (Infura.io & Nodesmith.io)'
 
 dependencies { compile project(':core') }
+
+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)
+}
diff --git a/parity/build.gradle b/parity/build.gradle
@@ -6,3 +6,10 @@ dependencies {
     testCompile project(path: ':core', configuration: 'testArtifacts'),
     "nl.jqno.equalsverifier:equalsverifier:$equalsverifierVersion"
 }
+
+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)
+}
diff --git a/rlp/build.gradle b/rlp/build.gradle
@@ -2,3 +2,10 @@
 description 'Ethereum Recursive Length Prefix (RLP) encoding for serializing objects'
 
 dependencies { compile project(':utils') }
+
+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)
+}
diff --git a/tuples/build.gradle b/tuples/build.gradle
@@ -1,2 +1,9 @@
 
 description 'Simple Java tuples library'
+
+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)
+}
diff --git a/utils/build.gradle b/utils/build.gradle
@@ -2,3 +2,10 @@
 description 'Minimal set of web3j utility classes'
 
 dependencies { compile "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion" }
+
+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)
+}