From 9dfaf72cac52c6870963b7eb027079e3e65aa57d Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Thu, 22 Aug 2024 09:55:23 +0200 Subject: [PATCH] ci: launch test workflow also on release and bugfix branches (#214) --- .github/workflows/codeql-analysis.yml | 50 ------ .github/workflows/dependency-check.yml | 14 -- .../workflows/{publish.yaml => nightly.yaml} | 3 - .github/workflows/verify.yaml | 147 ++---------------- DEPENDENCIES | 73 ++++----- gradle/libs.versions.toml | 1 + .../build.gradle.kts | 1 + .../build.gradle.kts | 1 + 8 files changed, 43 insertions(+), 247 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yml delete mode 100644 .github/workflows/dependency-check.yml rename .github/workflows/{publish.yaml => nightly.yaml} (96%) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index da54a6b8..00000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: "CodeQL" - -on: - push: - branches-ignore: - - 'dependabot/**' - pull_request: - branches: [ main ] - paths-ignore: - - '**.md' - - 'docs/**' - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - language: [ 'java' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - uses: actions/checkout@v4 - - uses: eclipse-edc/.github/.github/actions/setup-build@main - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - queries: +security-and-quality - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Compiles production Java source (without tests) - - name: Build - run: ./gradlew compileJava --no-daemon - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml deleted file mode 100644 index e56a6daf..00000000 --- a/.github/workflows/dependency-check.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: 'Dependency Review' -on: - push: - branches: - - main - pull_request: - -permissions: - contents: read - -jobs: - check: - uses: eclipse-edc/.github/.github/workflows/dependency-check.yml@main - secrets: inherit diff --git a/.github/workflows/publish.yaml b/.github/workflows/nightly.yaml similarity index 96% rename from .github/workflows/publish.yaml rename to .github/workflows/nightly.yaml index 54ed6392..72af5bba 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/nightly.yaml @@ -46,11 +46,8 @@ jobs: fi Run-Tests: - needs: [ Secrets-Presence, Determine-Version ] uses: ./.github/workflows/verify.yaml secrets: inherit - with: - version: ${{ needs.Determine-Version.outputs.VERSION }} Publish-Artefacts: runs-on: ubuntu-latest diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index 2182799d..dd81560a 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -2,20 +2,10 @@ name: Run Tests on: workflow_call: - inputs: - version: - required: false - type: string - description: optional version of upstream EDC components to use workflow_dispatch: - inputs: - version: - required: false - type: string - description: optional version of upstream EDC components to use push: pull_request: - branches: [ main ] + branches: [ main, release/*, bugfix/* ] paths-ignore: - '**.md' - 'docs/**' @@ -28,160 +18,49 @@ concurrency: jobs: Checkstyle: - permissions: - id-token: write - checks: write - pull-requests: write runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: eclipse-edc/.github/.github/actions/setup-build@main - - name: "Set upstream EDC version" - run: | - # update EDC dependencies in the version catalog - if [ ! -z ${{ env.VERSION }} ]; then - echo "set EDC version to ${{ env.VERSION }}" - existingVersion=$(grep "version" gradle.properties | awk -F= '{print $2}') - sed -i "s/$existingVersion/${{ env.VERSION }}/g" gradle/libs.versions.toml - - # some debug print - head -20 gradle/libs.versions.toml - fi - - name: Run Checkstyle run: ./gradlew checkstyleMain checkstyleTest + CodeQL: + uses: eclipse-edc/.github/.github/workflows/codeql-analysis.yml@main + secrets: inherit + + Dependency-Check: + uses: eclipse-edc/.github/.github/workflows/dependency-check.yml@main + secrets: inherit + Unit-Tests: runs-on: ubuntu-latest - env: - JACOCO: true steps: - uses: actions/checkout@v4 - uses: eclipse-edc/.github/.github/actions/setup-build@main - - name: "Set upstream EDC version" - run: | - # update EDC dependencies in the version catalog - if [ ! -z ${{ env.VERSION }} ]; then - echo "set EDC version to ${{ env.VERSION }}" - existingVersion=$(grep "version" gradle.properties | awk -F= '{print $2}') - sed -i "s/$existingVersion/${{ env.VERSION }}/g" gradle/libs.versions.toml - - # some debug print - head -20 gradle/libs.versions.toml - fi - - name: Run unit tests - uses: eclipse-edc/.github/.github/actions/run-tests@main - with: - command: ./gradlew test jacocoTestReport + run: ./gradlew test Component-Tests: - env: - JACOCO: true runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: eclipse-edc/.github/.github/actions/setup-build@main - - name: "Set upstream EDC version" - run: | - # update EDC dependencies in the version catalog - if [ ! -z ${{ env.VERSION }} ]; then - echo "set EDC version to ${{ env.VERSION }}" - existingVersion=$(grep "version" gradle.properties | awk -F= '{print $2}') - sed -i "s/$existingVersion/${{ env.VERSION}}/g" gradle/libs.versions.toml - - # some debug print - head -20 gradle/libs.versions.toml - fi - - name: Component Tests - uses: eclipse-edc/.github/.github/actions/run-tests@main - with: - command: ./gradlew jacocoTestReport -DincludeTags="ComponentTest" + run: ./gradlew -DincludeTags="ComponentTest" End-To-End-Tests: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: eclipse-edc/.github/.github/actions/setup-build@main - - name: "Set upstream EDC version" - run: | - # update EDC dependencies in the version catalog - if [ ! -z ${{ env.VERSION }} ]; then - echo "set EDC version to ${{ env.VERSION }}" - existingVersion=$(grep "version" gradle.properties | awk -F= '{print $2}') - sed -i "s/$existingVersion/${{ env.VERSION }}/g" gradle/libs.versions.toml - - # some debug print - head -20 gradle/libs.versions.toml - fi - - name: End to End Integration Tests - uses: eclipse-edc/.github/.github/actions/run-tests@main - with: - command: ./gradlew test -DincludeTags="EndToEndTest" + run: ./gradlew test -DincludeTags="EndToEndTest" API-Tests: - env: - JACOCO: true runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: eclipse-edc/.github/.github/actions/setup-build@main - - name: "Set upstream EDC version" - run: | - # update EDC dependencies in the version catalog - if [ ! -z ${{ env.VERSION }} ]; then - echo "set EDC version to ${{ env.VERSION }}" - existingVersion=$(grep "version" gradle.properties | awk -F= '{print $2}') - sed -i "s/$existingVersion/${{ env.VERSION }}/g" gradle/libs.versions.toml - - # some debug print - head -20 gradle/libs.versions.toml - fi - - name: Component Tests - uses: eclipse-edc/.github/.github/actions/run-tests@main - with: - command: ./gradlew test jacocoTestReport -DincludeTags="ApiTest" - - - Upload-Test-Report: - needs: - - Unit-Tests - - End-To-End-Tests - - Component-Tests - - permissions: - checks: write - pull-requests: write - - runs-on: ubuntu-latest - if: always() - steps: - - name: Download Artifacts - uses: actions/download-artifact@v3 - with: - path: artifacts - - name: Publish Test Results - uses: EnricoMi/publish-unit-test-result-action@v2 - if: always() - with: - junit_files: "**/test-results/**/*.xml" - - Upload-Coverage-Report-To-Codecov: - needs: - - Unit-Tests - - Component-Tests - - API-Tests - runs-on: ubuntu-latest - if: always() - steps: - # Sources are needed for Codecov report - - uses: actions/checkout@v4 - - name: Download Artifacts - uses: actions/download-artifact@v3 - with: - path: artifacts - - name: CodeCov - uses: codecov/codecov-action@v3 + run: ./gradlew test -DincludeTags="ApiTest" diff --git a/DEPENDENCIES b/DEPENDENCIES index 1e4485c3..2b4fa24a 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,9 +1,3 @@ -maven/mavencentral/com.apicatalog/carbon-did/0.3.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.apicatalog/copper-multibase/0.5.0, Apache-2.0, approved, #14501 -maven/mavencentral/com.apicatalog/copper-multicodec/0.1.1, Apache-2.0, approved, #14500 -maven/mavencentral/com.apicatalog/iron-verifiable-credentials/0.14.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.apicatalog/titanium-json-ld/1.0.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.0, Apache-2.0, approved, #15200 maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.1, Apache-2.0, approved, #15200 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.10.3, Apache-2.0, approved, CQ21280 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.16.2, Apache-2.0, approved, #11606 @@ -164,7 +158,6 @@ maven/mavencentral/io.rest-assured/rest-assured/5.3.2, Apache-2.0, approved, #92 maven/mavencentral/io.rest-assured/rest-assured/5.5.0, Apache-2.0, approved, #15676 maven/mavencentral/io.rest-assured/xml-path/5.3.2, Apache-2.0, approved, #9267 maven/mavencentral/io.rest-assured/xml-path/5.5.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.setl/rdf-urdna/1.1, Apache-2.0, approved, clearlydefined maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.22, Apache-2.0, approved, #5947 maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.22, Apache-2.0, approved, #5929 maven/mavencentral/io.swagger.core.v3/swagger-integration-jakarta/2.2.22, Apache-2.0, approved, #11475 @@ -248,7 +241,7 @@ maven/mavencentral/org.eclipse.edc/api-core/0.8.2-SNAPSHOT, Apache-2.0, approved maven/mavencentral/org.eclipse.edc/asset-api/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/asset-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/auth-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/autodoc-processor/+, Apache-2.0, approved, technology.edc +maven/mavencentral/org.eclipse.edc/autodoc-processor/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/boot-lib/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/boot-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/boot/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc @@ -273,7 +266,6 @@ maven/mavencentral/org.eclipse.edc/control-plane-spi/0.8.2-SNAPSHOT, Apache-2.0, maven/mavencentral/org.eclipse.edc/control-plane-transfer/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/control-plane-transform/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/core-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/crypto-common-lib/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/data-address-http-data-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/data-plane-client-embedded/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/data-plane-control-api/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc @@ -311,8 +303,6 @@ maven/mavencentral/org.eclipse.edc/http-lib/0.8.2-SNAPSHOT, Apache-2.0, approved maven/mavencentral/org.eclipse.edc/http-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/http/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/iam-mock/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-did-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/identity-trust-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/jersey-core/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/jersey-providers-lib/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/jetty-core/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc @@ -322,8 +312,6 @@ maven/mavencentral/org.eclipse.edc/json-ld/0.8.2-SNAPSHOT, Apache-2.0, approved, maven/mavencentral/org.eclipse.edc/json-lib/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/junit-base/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/junit/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jwt-signer-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/jwt-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/keys-lib/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/keys-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/management-api-configuration/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc @@ -337,12 +325,10 @@ maven/mavencentral/org.eclipse.edc/policy-evaluator-lib/0.8.2-SNAPSHOT, Apache-2 maven/mavencentral/org.eclipse.edc/policy-model/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/policy-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/query-lib/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.8.2-20240813-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/secrets-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/state-machine-lib/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/store-lib/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/token-core/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/token-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/transaction-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc @@ -355,30 +341,29 @@ maven/mavencentral/org.eclipse.edc/transform-spi/0.8.2-SNAPSHOT, Apache-2.0, app maven/mavencentral/org.eclipse.edc/util-lib/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/validator-lib/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/validator-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc -maven/mavencentral/org.eclipse.edc/verifiable-credentials-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.edc/web-spi/0.8.2-SNAPSHOT, Apache-2.0, approved, technology.edc maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-servlet-api/5.0.2, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-websocket-api/2.0.0, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-client/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-common/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-server/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-client/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-common/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-server/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty.websocket/websocket-servlet/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-alpn-client/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-annotations/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-client/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-jndi/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-plus/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-security/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-server/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty -maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.22, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-client/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-common/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-server/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-client/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-common/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-server/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty.websocket/websocket-servlet/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-alpn-client/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-annotations/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-client/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-jndi/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-plus/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-security/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-server/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty +maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.23, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.parsson/parsson/1.1.7, EPL-2.0, approved, ee4j.parsson maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.6, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish @@ -394,7 +379,6 @@ maven/mavencentral/org.glassfish.jersey.ext/jersey-entity-filtering/3.1.8, EPL-2 maven/mavencentral/org.glassfish.jersey.inject/jersey-hk2/3.1.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey maven/mavencentral/org.glassfish.jersey.media/jersey-media-json-jackson/3.1.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey maven/mavencentral/org.glassfish.jersey.media/jersey-media-multipart/3.1.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey -maven/mavencentral/org.glassfish/jakarta.json/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp maven/mavencentral/org.hamcrest/hamcrest-core/1.3, BSD-2-Clause, approved, CQ11429 maven/mavencentral/org.hamcrest/hamcrest/2.1, BSD-3-Clause, approved, clearlydefined maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined @@ -413,16 +397,13 @@ maven/mavencentral/org.jetbrains/annotations/13.0, Apache-2.0, approved, clearly maven/mavencentral/org.jetbrains/annotations/17.0.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains/annotations/24.1.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.json/json/20240303, NONE, restricted, clearlydefined -maven/mavencentral/org.junit-pioneer/junit-pioneer/2.2.0, EPL-2.0, approved, #11857 maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.10.1, EPL-2.0, approved, #9714 -maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.10.3, EPL-2.0, approved, #9714 -maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.10.3, EPL-2.0, approved, #9711 -maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.10.3, EPL-2.0, approved, #15250 -maven/mavencentral/org.junit.platform/junit-platform-commons/1.10.3, EPL-2.0, approved, #9715 -maven/mavencentral/org.junit.platform/junit-platform-engine/1.10.3, EPL-2.0, approved, #9709 -maven/mavencentral/org.junit.platform/junit-platform-launcher/1.10.3, EPL-2.0, approved, #15216 -maven/mavencentral/org.junit/junit-bom/5.10.3, EPL-2.0, approved, #9844 -maven/mavencentral/org.junit/junit-bom/5.9.2, EPL-2.0, approved, #4711 +maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.11.0, EPL-2.0, approved, #15935 +maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.11.0, EPL-2.0, approved, #15939 +maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.11.0, EPL-2.0, approved, #15940 +maven/mavencentral/org.junit.platform/junit-platform-commons/1.11.0, EPL-2.0, approved, #15936 +maven/mavencentral/org.junit.platform/junit-platform-engine/1.11.0, EPL-2.0, approved, #15932 +maven/mavencentral/org.junit/junit-bom/5.11.0, , restricted, clearlydefined maven/mavencentral/org.jvnet.mimepull/mimepull/1.9.15, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, CQ21484 maven/mavencentral/org.mockito/mockito-core/5.12.0, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #14678 maven/mavencentral/org.mockito/mockito-core/5.2.0, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #7401 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e6b9ceed..d2fede3c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -45,6 +45,7 @@ edc-dpf-client = { module = "org.eclipse.edc:data-plane-client", version.ref = " edc-dpf-selector-client = { module = "org.eclipse.edc:data-plane-selector-client", version.ref = "edc" } edc-dpf-selector-core = { module = "org.eclipse.edc:data-plane-selector-core", version.ref = "edc" } edc-dsp = { module = "org.eclipse.edc:dsp", version.ref = "edc" } +edc-http = { module = "org.eclipse.edc:http", version.ref = "edc" } edc-iam-mock = { module = "org.eclipse.edc:iam-mock", version.ref = "edc" } edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" } edc-keys-spi = { module = "org.eclipse.edc:keys-spi", version.ref = "edc" } diff --git a/system-tests/runtimes/gcp-bigquery-transfer-consumer/build.gradle.kts b/system-tests/runtimes/gcp-bigquery-transfer-consumer/build.gradle.kts index 93241b98..7c7f607d 100644 --- a/system-tests/runtimes/gcp-bigquery-transfer-consumer/build.gradle.kts +++ b/system-tests/runtimes/gcp-bigquery-transfer-consumer/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { implementation(libs.edc.control.plane.core) implementation(libs.edc.control.plane.api.client) implementation(libs.edc.dsp) + implementation(libs.edc.http) implementation(libs.edc.configuration.filesystem) implementation(libs.edc.iam.mock) implementation(libs.edc.management.api) diff --git a/system-tests/runtimes/gcp-bigquery-transfer-provider/build.gradle.kts b/system-tests/runtimes/gcp-bigquery-transfer-provider/build.gradle.kts index f2c05f54..5d3ff9c7 100644 --- a/system-tests/runtimes/gcp-bigquery-transfer-provider/build.gradle.kts +++ b/system-tests/runtimes/gcp-bigquery-transfer-provider/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { implementation(libs.edc.control.plane.core) implementation(libs.edc.control.plane.api.client) implementation(libs.edc.dsp) + implementation(libs.edc.http) implementation(libs.edc.configuration.filesystem) implementation(libs.edc.iam.mock) implementation(libs.edc.management.api)