From 3e4c5efcfff7db28d8b96b4f02550804ab7c2135 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Fri, 11 Oct 2024 08:57:05 +0200 Subject: [PATCH 1/2] feat(ci): use re-usable verify-bom.yml workflow --- .github/workflows/verify.yaml | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index 6a96022651..ba7a12f08b 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -96,8 +96,7 @@ jobs: uses: eclipse-edc/.github/.github/workflows/verify-openapi.yml@main secrets: inherit - Verify-BOM: - runs-on: ubuntu-latest + Verify-EDC-BOM: strategy: fail-fast: false @@ -106,28 +105,8 @@ jobs: bom-directory: [ "dist/bom/dataplane-base-bom", "dist/bom/controlplane-dcp-bom", "dist/bom/sts-feature-bom" ] - steps: - - uses: actions/checkout@v4 - - uses: eclipse-edc/.github/.github/actions/setup-build@main - - name: Build runtime - run: ./gradlew -p ${{ matrix.bom-directory }} build - - name: Smoke Test - timeout-minutes: 10 - run: | - # Start the program in the background - java -Dedc.fs.config=${{ matrix.bom-directory }}/example.properties -cp "$(./gradlew -q -p ${{ matrix.bom-directory }} printClassPath)" org.eclipse.edc.boot.system.runtime.BaseRuntime > ${{ matrix.bom-directory }}/log.txt & - - # Get the PID of the running command - PID=$! - - # Monitor the output and kill the process when desired output is found - while :; do - # Capture the output of the command - cat ${{ matrix.bom-directory }}/log.txt 2>/dev/null | grep -q "Runtime .* ready" && break - sleep 1 - done - - # Kill the process once the output is detected - kill $PID - echo "Runtime ${{ matrix.bom-directory }} shutdown after ready signal detected." - rm ${{ matrix.bom-directory }}/log.txt + uses: eclipse-edc/.github/.github/workflows/verify-bom.yml@main + with: + module-dir: ${{ matrix.bom-directory }} + properties-file: example.properties + From eea05dfffdfad12bce20ff6f21f7d849bead0a9e Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Fri, 11 Oct 2024 09:10:13 +0200 Subject: [PATCH 2/2] DEPENDENCIES --- DEPENDENCIES | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 62954f4807..606886b0a0 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -30,17 +30,17 @@ maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.18.0, Apache-2. maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.14.0, Apache-2.0, approved, #5933 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.16.2, Apache-2.0, approved, #11855 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.18.0, Apache-2.0, approved, #16370 -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.18.0, Apache-2.0, restricted, clearlydefined +maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.18.0, Apache-2.0, approved, #16622 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.0, Apache-2.0, approved, #4699 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.16.2, Apache-2.0, approved, #11853 -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.18.0, , restricted, clearlydefined -maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.18.0, , restricted, clearlydefined +maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.18.0, Apache-2.0, approved, #16625 +maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.18.0, Apache-2.0, approved, #16626 maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.16.2, Apache-2.0, approved, #11858 -maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.18.0, , restricted, clearlydefined +maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.18.0, Apache-2.0, approved, #16623 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.17.1, Apache-2.0, approved, #13668 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.18.0, Apache-2.0, approved, #16368 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.16.2, Apache-2.0, approved, #11852 -maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.18.0, , restricted, clearlydefined +maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.18.0, Apache-2.0, approved, #16628 maven/mavencentral/com.fasterxml.uuid/java-uuid-generator/4.1.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.github.cliftonlabs/json-simple/3.0.2, Apache-2.0, approved, clearlydefined maven/mavencentral/com.github.docker-java/docker-java-api/3.4.0, Apache-2.0, approved, clearlydefined @@ -302,8 +302,8 @@ maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.9.10, Apache-2.0, a maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.9.10, Apache-2.0, approved, #11827 maven/mavencentral/org.jetbrains/annotations/13.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains/annotations/17.0.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.jetbrains/annotations/25.0.0, , restricted, clearlydefined -maven/mavencentral/org.jetbrains/annotations/26.0.0, , restricted, clearlydefined +maven/mavencentral/org.jetbrains/annotations/25.0.0, Apache-2.0, approved, #16624 +maven/mavencentral/org.jetbrains/annotations/26.0.0, Apache-2.0, approved, #16629 maven/mavencentral/org.junit-pioneer/junit-pioneer/2.2.0, EPL-2.0, approved, #11857 maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.11.1, EPL-2.0, approved, #15935 maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.11.2, EPL-2.0, approved, #15935 @@ -346,11 +346,11 @@ maven/mavencentral/org.slf4j/slf4j-api/1.7.35, MIT, approved, CQ13368 maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368 maven/mavencentral/org.slf4j/slf4j-api/2.0.6, MIT, approved, #5915 maven/mavencentral/org.slf4j/slf4j-api/2.0.9, MIT, approved, #5915 -maven/mavencentral/org.testcontainers/database-commons/1.20.2, , restricted, clearlydefined -maven/mavencentral/org.testcontainers/jdbc/1.20.2, , restricted, clearlydefined +maven/mavencentral/org.testcontainers/database-commons/1.20.2, Apache-2.0, approved, #16630 +maven/mavencentral/org.testcontainers/jdbc/1.20.2, Apache-2.0, approved, #16621 maven/mavencentral/org.testcontainers/junit-jupiter/1.20.2, None, restricted, #16552 maven/mavencentral/org.testcontainers/kafka/1.20.2, , restricted, clearlydefined -maven/mavencentral/org.testcontainers/postgresql/1.20.2, , restricted, clearlydefined +maven/mavencentral/org.testcontainers/postgresql/1.20.2, None, restricted, #16627 maven/mavencentral/org.testcontainers/testcontainers/1.20.2, MIT, approved, #15747 maven/mavencentral/org.testcontainers/vault/1.20.2, , restricted, clearlydefined maven/mavencentral/org.xerial.snappy/snappy-java/1.1.10.5, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #9098