Skip to content

Commit 4dbe0c0

Browse files
mbwhitembwhite
authored
Merge pull request #297 from mbwhite/relmain/update-gradle
Updated to match the release-2.5 gradle file
2 parents 737e5a4 + d3ac597 commit 4dbe0c0

2 files changed

Lines changed: 21 additions & 45 deletions

File tree

‎.github/workflows/test.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ jobs:
5151
cache: 'gradle'
5252
- name: Populate chaincode with latest java-version
5353
run: |
54-
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/repository publishShimJarPublicationToFabricRepository
55-
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository publishShimJarPublicationToFabricRepository
56-
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-gradle/repository publishShimJarPublicationToFabricRepository
57-
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-maven/repository publishShimJarPublicationToFabricRepository
58-
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/wrapper-maven/repository publishShimJarPublicationToFabricRepository
54+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/repository publishShimPublicationToFabricRepository
55+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository publishShimPublicationToFabricRepository
56+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-gradle/repository publishShimPublicationToFabricRepository
57+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-maven/repository publishShimPublicationToFabricRepository
58+
./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/wrapper-maven/repository publishShimPublicationToFabricRepository
5959
- name: Ensure that the Peer/weft tools are available
6060
run: |
6161
curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary

‎fabric-chaincode-shim/build.gradle‎

Lines changed: 16 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -290,67 +290,43 @@ publishing {
290290
}
291291
}
292292

293-
shimJar(MavenPublication) {
294-
from components.java
295-
artifactId 'fabric-chaincode-shim'
296-
pom.withXml {
297-
def repository = asNode()
298-
.appendNode('repositories')
299-
.appendNode('repository');
300-
repository.appendNode('id', 'jitpack.io')
301-
repository.appendNode('url', 'https://jitpack.io')
302-
}
303-
}
304293
}
305294

306295
repositories {
307296
maven {
308297
name = "release"
309-
if (nightly) {
310-
url = "https://hyperledger-fabric.jfrog.io/artifactory/fabric-maven"
311-
credentials {
312-
username = project.findProperty('artifactoryUsername')
313-
password = project.findProperty('artifactoryPassword')
314-
}
315-
} else {
316-
url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
317-
credentials {
318-
username = project.findProperty('ossrhUsername')
319-
password = project.findProperty('ossrhPassword')
320-
}
298+
url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
299+
credentials {
300+
username = project.findProperty('ossrhUsername')
301+
password = project.findProperty('ossrhPassword')
321302
}
303+
322304
}
323305

324306
maven {
325-
name = "snapshot"
326-
if (nightly) {
327-
url = "https://hyperledger-fabric.jfrog.io/artifactory/fabric-maven"
328-
credentials {
329-
username = project.findProperty('artifactoryUsername')
330-
password = project.findProperty('artifactoryPassword')
331-
}
332-
} else {
333-
url = "https://oss.sonatype.org/content/repositories/snapshots/"
334-
credentials {
335-
username = project.findProperty('ossrhUsername')
336-
password = project.findProperty('ossrhPassword')
337-
}
307+
name = "GitHubPackages"
308+
url = "https://maven.pkg.github.com/hyperledger/fabric-chaincode-java"
309+
credentials {
310+
username = System.getenv("GITHUB_ACTOR")
311+
password = System.getenv("GITHUB_TOKEN")
338312
}
339313
}
340314
}
341315
}
342316

343317
signing {
318+
println "Signing"
344319
if (project.findProperty('signing.key')) {
345-
def signingKey = findProperty("signing.key")
346-
def signingPassword = findProperty("signing.password")
320+
def signingKey = project.findProperty('signing.key')
321+
def signingPassword = project.findProperty('signing.password')
347322
useInMemoryPgpKeys(signingKey, signingPassword)
348323

349324
sign publishing.publications.shim
350-
sign publishing.publications.shimJar
325+
println "... signed"
326+
} else {
327+
println "... no keys to use "
351328
}
352329
}
353-
354330
// Need to specify the sourcesJar task BEFORE the java{withSourcesJar()} so that it picks up the duplicatesStratergy
355331
// otherwise this fails with a duplicates error.
356332
// (see https://github.com/gradle/gradle/issues/17236)

0 commit comments

Comments
 (0)