diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4ed27ca2ee..6243e1e2db 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1393,6 +1393,10 @@ jobs: --files={./packages/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/flow-database-access-v4.8.test.ts,./packages/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/openapi/openapi-validation.test.ts} TAPE_TEST_RUNNER_DISABLED: false runs-on: ubuntu-22.04 + services: + docker: + image: docker:20.10.17-dind + options: --privileged steps: - name: Use Node.js ${{ env.NODEJS_VERSION }} uses: actions/setup-node@v4.0.3 diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/Dockerfile b/packages/cactus-plugin-ledger-connector-corda/src/main-server/Dockerfile index 2f9f83a0ba..720165b9fd 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/Dockerfile +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/Dockerfile @@ -8,34 +8,34 @@ WORKDIR /kotlin-spring/ RUN gradle clean build WORKDIR / -FROM openjdk:24-slim-bookworm +# FROM openjdk:24-slim-bookworm -ARG APP=/usr/src/app -ENV APP=/usr/src/app +# ARG APP=/usr/src/app +# ENV APP=/usr/src/app -RUN apt update -RUN apt install -y ca-certificates tzdata curl tini iputils-ping netcat-openbsd -RUN rm -rf /var/lib/apt/lists/* +# RUN apt update +# RUN apt install -y ca-certificates tzdata curl tini iputils-ping netcat-openbsd +# RUN rm -rf /var/lib/apt/lists/* -ENV TZ=Etc/UTC \ - APP_USER=appuser +# ENV TZ=Etc/UTC \ +# APP_USER=appuser -RUN groupadd $APP_USER \ - && useradd -g $APP_USER $APP_USER \ - && mkdir -p ${APP} +# RUN groupadd $APP_USER \ +# && useradd -g $APP_USER $APP_USER \ +# && mkdir -p ${APP} -COPY --from=builder /kotlin-spring/build/libs/ ${APP}/kotlin-spring/build/libs/ +# COPY --from=builder /kotlin-spring/build/libs/ ${APP}/kotlin-spring/build/libs/ -RUN chown -R $APP_USER:$APP_USER ${APP} +# RUN chown -R $APP_USER:$APP_USER ${APP} -USER $APP_USER -WORKDIR ${APP} +# USER $APP_USER +# WORKDIR ${APP} -COPY healthcheck.sh / -COPY start-app.sh / +# COPY healthcheck.sh / +# COPY start-app.sh / -EXPOSE 8080 +# EXPOSE 8080 -ENTRYPOINT ["/usr/bin/tini", "--"] -CMD ["/start-app.sh"] -HEALTHCHECK --interval=1s --timeout=5s --start-period=1s --retries=90 CMD /healthcheck.sh +# ENTRYPOINT ["/usr/bin/tini", "--"] +# CMD ["/start-app.sh"] +# HEALTHCHECK --interval=1s --timeout=5s --start-period=1s --retries=90 CMD /healthcheck.sh diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/build.gradle.kts b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/build.gradle.kts index f1f3314bc5..59643b760d 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/build.gradle.kts +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/build.gradle.kts @@ -1,4 +1,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile +import org.jetbrains.kotlin.gradle.dsl.JvmTarget group = "org.hyperledger.cactus.plugin.ledger.connector.corda.server" version = project.properties["version"]!! @@ -7,7 +9,7 @@ val corda_release_group = "net.corda" val corda_core_release_group = "net.corda" val corda_release_version = "4.12" val corda_core_release_version = "4.12" -val spring_boot_version = "3.3.1" +val spring_boot_version = "3.4.1" val jackson_version = "2.16.1" tasks.named("test") { @@ -21,7 +23,7 @@ buildscript { maven { url = uri("https://jitpack.io") } } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:3.3.1") + classpath("org.springframework.boot:spring-boot-gradle-plugin:3.4.1") } } @@ -31,20 +33,24 @@ repositories { maven { url = uri("https://jitpack.io") } } -tasks.withType { - kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString() +tasks.withType { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } } plugins { - val kotlinVersion = "1.9.24" + val kotlinVersion = "2.1.0" id("org.jetbrains.kotlin.jvm") version kotlinVersion - id("org.springframework.boot") version "3.3.1" + id("org.springframework.boot") version "3.4.1" } dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") + implementation("org.springframework:spring-core:$spring_boot_version") + implementation("org.springframework:spring-context:$spring_boot_version") implementation("org.springframework.boot:spring-boot-starter-web:$spring_boot_version") implementation("org.springframework.boot:spring-boot-starter-validation:$spring_boot_version") implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jackson_version") diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/gradle/wrapper/gradle-wrapper.properties b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f0..509c4a29b4 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/gradle/wrapper/gradle-wrapper.properties +++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts b/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts index fd1b0fc57d..7c92b5453c 100644 --- a/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts +++ b/packages/cactus-plugin-ledger-connector-corda/src/main/typescript/plugin-ledger-connector-corda.ts @@ -424,6 +424,7 @@ export class PluginLedgerConnectorCorda } public async getFlow(req: GetFlowCidV1Request): Promise { + console.log("test"); try { const { headers, agent } = await this.setupRequest( req.username,