Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ jobs:
- publishAllPublicationsToReleaseRepository
runs-on: ubuntu-latest
needs: test
permissions:
contents: read
packages: write
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

apply plugin: 'idea'
apply plugin: 'eclipse-wtp'
version = '2.5.1'
version = '2.5.2'


// If the nightly property is set, then this is the scheduled main
Expand Down
2 changes: 1 addition & 1 deletion examples/fabric-contract-example-as-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repositories {
}

dependencies {
compile 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.1'
compile 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.2'
compile 'org.json:json:20231013'
testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
testImplementation 'org.assertj:assertj-core:3.11.1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ java {


dependencies {
implementation("org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.1")
implementation("org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.2")
implementation("org.json:json:20231013")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")

Expand Down
2 changes: 1 addition & 1 deletion examples/fabric-contract-example-gradle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repositories {
}

dependencies {
compile 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.1'
compile 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.2'
compile 'org.json:json:20231013'
testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
testImplementation 'org.assertj:assertj-core:3.11.1'
Expand Down
2 changes: 1 addition & 1 deletion examples/fabric-contract-example-maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- fabric-chaincode-java -->
<fabric-chaincode-java.version>2.5.1</fabric-chaincode-java.version>
<fabric-chaincode-java.version>2.5.2</fabric-chaincode-java.version>

<!-- Logging -->
<logback.version>1.3.14</logback.version>
Expand Down
2 changes: 1 addition & 1 deletion examples/ledger-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repositories {
}

dependencies {
compile 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.1'
compile 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.2'
compile 'org.json:json:20231013'
testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
testImplementation 'org.assertj:assertj-core:3.11.1'
Expand Down
13 changes: 6 additions & 7 deletions fabric-chaincode-docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:11.0.22_7-jdk as builder
FROM eclipse-temurin:11-jdk as builder
ENV DEBIAN_FRONTEND=noninteractive

# Build tools
Expand All @@ -13,7 +13,7 @@ SHELL ["/bin/bash", "-c"]
RUN source /root/.sdkman/bin/sdkman-init.sh; sdk install gradle 8.6
RUN source /root/.sdkman/bin/sdkman-init.sh; sdk install maven 3.9.6

FROM eclipse-temurin:11.0.22_7-jdk as dependencies
FROM eclipse-temurin:11-jdk as dependencies

COPY --from=builder /root/.sdkman/candidates/gradle/current /usr/bin/gradle
COPY --from=builder /root/.sdkman/candidates/maven/current /usr/bin/maven
Expand Down Expand Up @@ -53,20 +53,19 @@ RUN mvn -N io.takari:maven:wrapper

# Creating final javaenv image which will include all required
# dependencies to build and compile java chaincode
FROM eclipse-temurin:11.0.22_7-jdk
FROM eclipse-temurin:11-jdk

RUN apt-get update \
&& apt-get -y install zip unzip \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* \
&& mkdir -p /chaincode/input \
&& mkdir -p /chaincode/output

SHELL ["/bin/bash", "-c"]

# Copy setup scripts, and the cached dependeices
COPY --from=dependencies /root/chaincode-java /root/chaincode-java
COPY --from=dependencies /root/.m2 /root/.m2

RUN mkdir -p /chaincode/input
RUN mkdir -p /chaincode/output

WORKDIR /root/chaincode-java
2 changes: 1 addition & 1 deletion fabric-chaincode-docker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ task copyAllDeps(type: Copy) {
task buildImage(type: DockerBuildImage) {
dependsOn copyAllDeps
inputDir = project.file('Dockerfile').parentFile
tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:2.5', 'hyperledger/fabric-javaenv:amd64-2.5.1', 'hyperledger/fabric-javaenv:amd64-latest']
tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:2.5', 'hyperledger/fabric-javaenv:amd64-2.5.2', 'hyperledger/fabric-javaenv:amd64-latest']
}

Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repositories {
}

dependencies {
implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.1'
implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.2'
implementation 'org.hyperledger.fabric:fabric-protos:0.3.3'
}

Expand Down
4 changes: 2 additions & 2 deletions fabric-chaincode-shim/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ tasks.withType(org.gradle.api.tasks.testing.Test) {

dependencies {
implementation 'org.hyperledger.fabric:fabric-protos:0.3.3'
implementation 'org.bouncycastle:bcpkix-jdk18on:1.78'
implementation 'org.bouncycastle:bcprov-jdk18on:1.78'
implementation 'org.bouncycastle:bcpkix-jdk18on:1.78.1'
implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'
implementation 'io.github.classgraph:classgraph:4.8.165'
implementation 'com.github.everit-org.json-schema:org.everit.json.schema:1.14.4'
implementation 'org.json:json:20240303'
Expand Down