Release version 0.0.1 (#86)

* Bump actions/checkout from 2 to 3 (#1) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Release version 0.0.1 (#2) * Bump actions/checkout from 2 to 3 (#1) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Prepare release 0.0.1 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: GitHub actions <[email protected]> * helm: add image pull secret template (#3) * helm: add image pull secret template Signed-off-by: Denis Neuling <[email protected]> * helm: replace configuration properties delimiter by underscore Signed-off-by: Denis Neuling <[email protected]> * helm: add config properties for cosmosdb based contract definition/negotiation store Signed-off-by: Denis Neuling <[email protected]> * edc: use ref 705a44712fecb9cf5ac18622311e6a2dbd86ffc3 (#4) Signed-off-by: Denis Neuling <[email protected]> * Make docker images distroless (#5) Signed-off-by: Denis Neuling <[email protected]> * Feature: classpath hardening (#6) control/data-plane classpath hardening * Collect all non-sample/launcher edc artifacts within pom's dependencyManagement * Revise control/data plane dependencies * Add minimal memory controlplane (#7) * Bumb edc to 3305340d6a19ba919540d28a731b3cab6d23857a + enable image publication of develop branch (#8) * Update .gitignore & fix ServiceExtension directory (#9) * add '.vscode' to .gitignore * mv ServiceExtension file into META-INF/serices * add DS_STORE to .gitignore * Fix controlplane cosmosdb servicelocator (#11) Signed-off-by: Denis Neuling <[email protected]> * fix createAsset API in ControlPlaneController.java Signed-off-by: Dominik Pinsel <[email protected]> * Use azure bom for cosmosdb backend controlplane (#13) * new aas controller extension (#14) * Add default config for Opentelemetry + logging (#15) * Bump alpine (#17) Bumps alpine from 3.14 to 3.15.4. * Bump alpine from 3.14 to 3.15.4 in /edc-dataplane/src/main/docker (#16) Bumps alpine from 3.14 to 3.15.4. * Add controlplane-postgres flavor (#10) * Use edc release milestone-3 (#19) * Use DAPS as IAM system (#20) * Add BPN validation (#21) * Rework edc data/control-plane svc/ingress endpoints (#23) * Rework edc data/control-plane svc/ingress endpoints * Bump actions/setup-java from 2 to 3.1.1 (#22) * Add issue templates (#24) * Add controlplane-postgresql dependabot section (#25) * Add missing license headers (#26) * Bump mikefarah/yq from 4.24.2 to 4.24.4 (#28) Bumps [mikefarah/yq](https://github.com/mikefarah/yq) from 4.24.2 to 4.24.4. * Add initial documentation (#27) * Bump mikefarah/yq from 4.24.2 to 4.24.5 (#30) Bumps [mikefarah/yq](https://github.com/mikefarah/yq) from 4.24.2 to 4.24.5. - [Release notes](https://github.com/mikefarah/yq/releases) - [Changelog](https://github.com/mikefarah/yq/blob/master/release_notes.txt) - [Commits](mikefarah/yq@v4.24.2...v4.24.5) --- updated-dependencies: - dependency-name: mikefarah/yq dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Rename project to product-edc (#32) * Bump edc to 79b58b8 (#33) Signed-off-by: Denis Neuling <[email protected]> * Extend helm notes (#35) * Bump actions/setup-python from 2 to 3 (#36) * Bump azure/setup-helm from 1 to 2.1 (#37) * Bump actions/setup-java from 3.1.1 to 3.2.0 (#38) * Update dependabot configuration to cover edc git submodule (#39) * Bump postgresql from 42.2.6 to 42.3.4 (#45) * Bump spotless-maven-plugin from 1.31.3 to 2.22.2 (#44) * Bump maven-surefire-plugin from 2.19.1 to 2.22.2 (#41) * Bump flyway-core from 8.5.5 to 8.5.9 (#42) * Bump junit-platform-surefire-provider from 1.1.0 to 1.3.2 (#43) * Remove edc checkout step in build workflow (#47) * Remove junit-platform-surefire-provider due to deprecation (#51) * Bump maven-shade-plugin from 3.2.4 to 3.3.0 (#52) * Bump jakarta.ws.rs-api from 3.0.0 to 3.1.0 (#53) * Bump spotless-maven-plugin from 2.22.2 to 2.22.3 (#57) * Bump azure-sdk-bom from 1.2.0 to 1.2.1 (#54) * Activate edc data-management-api (#50) * Fix due to renaming broken edc sql extension dependencies (#60) * Fix gh action docker push (#61) * Fix gh action docker push (#62) * Use CXNG_GHCR_PAT instead of GITHUB_TOKEN for authentication \w ghcr (#64) * Add capability to define container environment variables (#65) * Bump edc from `79b58b8` to `0da15e1` Bumps [edc](https://github.com/eclipse-dataspaceconnector/DataSpaceConnector) from `79b58b8` to `0da15e1`. - [Release notes](https://github.com/eclipse-dataspaceconnector/DataSpaceConnector/releases) - [Commits](eclipse-edc/Connector@79b58b8...0da15e1) --- updated-dependencies: - dependency-name: edc dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Bump mikefarah/yq from 4.24.5 to 4.25.1 (#67) * Bump flyway-core from 8.5.9 to 8.5.10 (#69) * update control plane documentation * Parallelize build steps (#59) * Ignore non-helm related paths when running gh action helm-lint step (#58) * Fix gh build workflow: replace GITHUB_TOKEN by CXNG_GHCR_PAT (#77) * Apply suggestions from code review Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]> * update known issues Signed-off-by: Dominik Pinsel <[email protected]> * Remove all in-memory stores deps which are now default (#80) * Bump spotless-maven-plugin from 2.22.3 to 2.22.4 (#81) * Update edc bom section and use policy-store-cosmos in edc-controlplane-cosmosdb (#82) * Update sql migration for edc_contract_definition due to introduction of access_policy_id and contract_policy_id (#83) * Bump actions/setup-java from 3.2.0 to 3.3.0 (#85) * Provide functionality to configure more than one ingress / hostname (#78) * update README.md Signed-off-by: Dominik Pinsel <[email protected]> * Bump postgresql from 42.3.4 to 42.3.5 (#96) * Bump docker/metadata-action from 3 to 4 (#94) * Expose validation endpoint through k8s service (#99) * Remove keystore configurations These are not needed, because they are only used in the vault-fs extension of the edc. * bpn - register rules and update docu * Replace dockerfile-maven-plugin by exec-maven-plugin for building docker images (#93) * Restart pods if configmap changed (#100) * Integrate veracode into gh build workflow (#102) * update documentation and schema for postgresql * Fix build workflow due to broken docker push action (#115) * Change gh build workflow: Allow Veracode scan to fail (#116) * Create SECURITY.md (#113) Proposal of a security proposal. This is the template provided by the Catena-X Security Expert team. * Bump docker/build-push-action from 2 to 3 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 3. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v2...v3) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Bump veracode/veracode-uploadandscan-action from 0.2.1 to 1.0 (#111) * Bump docker/login-action from 1 to 2 Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v1...v2) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * update workflows/build.yaml Signed-off-by: Dominik Pinsel <[email protected]> * update cosmos db documentation * typo * secure data mgmt API with auth key (#123) * secure data mgmt API with auth key * Update edc-controlplane/README.md Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]> * add edc.api.auth.key to values.yaml Co-authored-by: Dominik Pinsel <[email protected]> Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]> * Fix docker image step when running on PRs (#127) * Bump spotless-maven-plugin from 2.22.4 to 2.22.5 (#125) * sql fix: udate edc and schema (#129) * remove edc jar shading (#130) * Add LICENSE and NOTICE.md (#133) * Milestone 3 Docu (#132) * Bump jaxb-runtime from 2.3.6 to 3.0.2 (#134) Bumps jaxb-runtime from 2.3.6 to 3.0.2. --- updated-dependencies: - dependency-name: org.glassfish.jaxb:jaxb-runtime dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Replace iam-mock by iam-daps at controlplane-memory Signed-off-by: Denis Neuling <[email protected]> * Fix typo in ContractDefinitions URL (#141) * Bump flyway-core from 8.5.10 to 8.5.11 (#142) * Enable gh workflow for building published releases/tags as well (#137) * Use different secrets for performing veracode scans (#144) * Update edc-controlplane/edc-controlplane-memory/README.md Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]> * Introduce helm chart releaser action (#85) Signed-off-by: Denis Neuling <[email protected]> * Prepare release 0.0.1 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub actions <[email protected]> Co-authored-by: Denis Neuling <[email protected]> Co-authored-by: Dominik-Pinsel <[email protected]> Co-authored-by: Dominik-Pinsel <[email protected]> Co-authored-by: Dominik Pinsel <[email protected]> Co-authored-by: Denis Neuling <[email protected]> Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]> Co-authored-by: Zied-Belkhiria-Mhp <[email protected]>
catenax-ng · May 19, 2022 · dfecf43 · dfecf43
1 parent 861afa0
commit dfecf43
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 30 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -6,8 +6,13 @@ on:
     branches:
       - main
       - develop
+      - release/*
+      - hotfix/*
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
+  release:
+    types:
+      - released
   pull_request:
     branches:
       - '*'
@@ -17,15 +22,15 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       CXNG_GHCR_PAT: ${{ steps.secret-presence.outputs.CXNG_GHCR_PAT }}
-      VERACODE_ID: ${{ steps.secret-presence.outputs.VERACODE_ID }}
-      VERACODE_SECRET_KEY: ${{ steps.secret-presence.outputs.VERACODE_SECRET_KEY }}
+      ORG_VERACODE_API_ID: ${{ steps.secret-presence.outputs.ORG_VERACODE_API_ID }}
+      ORG_VERACODE_API_KEY: ${{ steps.secret-presence.outputs.ORG_VERACODE_API_KEY }}
     steps:
       - name: Check whether secrets exist
         id: secret-presence
         run: |
           [ ! -z "${{ secrets.CXNG_GHCR_PAT }}" ] && echo "::set-output name=CXNG_GHCR_PAT::true"
-          [ ! -z "${{ secrets.VERACODE_ID }}" ] && echo "::set-output name=VERACODE_ID::true"
-          [ ! -z "${{ secrets.VERACODE_SECRET_KEY }}" ] && echo "::set-output name=VERACODE_SECRET_KEY::true"
+          [ ! -z "${{ secrets.ORG_VERACODE_API_ID }}" ] && echo "::set-output name=ORG_VERACODE_API_ID::true"
+          [ ! -z "${{ secrets.ORG_VERACODE_API_KEY }}" ] && echo "::set-output name=ORG_VERACODE_API_KEY::true"
 
           exit 0
   #####################
@@ -99,7 +104,7 @@ jobs:
       name: Veracode Upload And Scan
       uses: veracode/[email protected]
       if: |
-        needs.secret-presence.outputs.VERACODE_ID && needs.secret-presence.outputs.VERACODE_SECRET_KEY && contains('
+        needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY && contains('
           refs/heads/develop
           refs/heads/release/
           refs/tags/
@@ -108,10 +113,10 @@ jobs:
       with:
         appname: 'product-edc/edc-dataplane'
         createprofile: true
-        version: ${{ github.ref }}
+        version: ${{ github.ref }}-${{ github.sha }}
         filepath: edc-dataplane/target/edc-dataplane.jar
-        vid: ${{ secrets.VERACODE_ID }}
-        vkey: ${{ secrets.VERACODE_SECRET_KEY }}
+        vid: ${{ secrets.ORG_VERACODE_API_ID }}
+        vkey: ${{ secrets.ORG_VERACODE_API_KEY }}
 
   #################################
   ### edc-controlplane-memory ###
@@ -184,7 +189,7 @@ jobs:
       name: Veracode Upload And Scan
       uses: veracode/[email protected]
       if: |
-        needs.secret-presence.outputs.VERACODE_ID && needs.secret-presence.outputs.VERACODE_SECRET_KEY && contains('
+        needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY && contains('
           refs/heads/develop
           refs/heads/release/
           refs/tags/
@@ -193,10 +198,10 @@ jobs:
       with:
         appname: 'product-edc/edc-controlplane-memory'
         createprofile: true
-        version: ${{ github.ref }}
+        version: ${{ github.ref }}-${{ github.sha }}
         filepath: edc-controlplane/edc-controlplane-memory/target/edc-controlplane-memory.jar
-        vid: ${{ secrets.VERACODE_ID }}
-        vkey: ${{ secrets.VERACODE_SECRET_KEY }}
+        vid: ${{ secrets.ORG_VERACODE_API_ID }}
+        vkey: ${{ secrets.ORG_VERACODE_API_KEY }}
 
   #################################
   ### edc-controlplane-cosmosdb ###
@@ -269,7 +274,7 @@ jobs:
       name: Veracode Upload And Scan
       uses: veracode/[email protected]
       if: |
-        needs.secret-presence.outputs.VERACODE_ID && needs.secret-presence.outputs.VERACODE_SECRET_KEY && contains('
+        needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY && contains('
           refs/heads/develop
           refs/heads/release/
           refs/tags/
@@ -279,9 +284,9 @@ jobs:
         appname: 'product-edc/edc-controlplane-cosmosdb'
         createprofile: true
         filepath: edc-controlplane/edc-controlplane-cosmosdb/target/edc-controlplane-cosmosdb.jar
-        version: ${{ github.ref }}
-        vid: ${{ secrets.VERACODE_ID }}
-        vkey: ${{ secrets.VERACODE_SECRET_KEY }}
+        version: ${{ github.ref }}-${{ github.sha }}
+        vid: ${{ secrets.ORG_VERACODE_API_ID }}
+        vkey: ${{ secrets.ORG_VERACODE_API_KEY }}
 
   ###################################
   ### edc-controlplane-postgresql ###
@@ -354,7 +359,7 @@ jobs:
       name: Veracode Upload And Scan
       uses: veracode/[email protected]
       if: |
-        needs.secret-presence.outputs.VERACODE_ID && needs.secret-presence.outputs.VERACODE_SECRET_KEY && contains('
+        needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY && contains('
           refs/heads/develop
           refs/heads/release/
           refs/tags/
@@ -364,6 +369,6 @@ jobs:
         appname: 'product-edc/edc-controlplane-postgresql'
         createprofile: true
         filepath: edc-controlplane/edc-controlplane-postgresql/target/edc-controlplane-postgresql.jar
-        version: ${{ github.ref }}
-        vid: ${{ secrets.VERACODE_ID }}
-        vkey: ${{ secrets.VERACODE_SECRET_KEY }}
+        version: ${{ github.ref_name }}-${{ github.sha }}
+        vid: ${{ secrets.ORG_VERACODE_API_ID }}
+        vkey: ${{ secrets.ORG_VERACODE_API_KEY }}
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
@@ -9,10 +9,22 @@ on:
       - closed
 
 jobs:
+  secret-presence:
+    runs-on: ubuntu-latest
+    outputs:
+      CXNG_RELEASE_PAT: ${{ steps.secret-presence.outputs.CXNG_RELEASE_PAT }}
+    steps:
+      - name: Check whether secrets exist
+        id: secret-presence
+        run: |
+          [ ! -z "${{ secrets.CXNG_RELEASE_PAT }}" ] && echo "::set-output name=CXNG_RELEASE_PAT::true"
+
+          exit 0
   release:
     name: Publish new release
+    needs: [ secret-presence ]
     runs-on: ubuntu-latest
-    if: github.event.pull_request.merged == true
+    if: github.event.pull_request.merged == true && needs.secret-presence.outputs.CXNG_RELEASE_PAT
     steps:
       - uses: actions/checkout@v3
         with:
@@ -36,10 +48,11 @@ jobs:
           echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
       -
         name: Create Release Tag
+        id: create_release_tag
         run: |
           # Prepare git env
-          git config user.name "GitHub actions"
-          git config user.email noreply@github.com
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected].github.aaakk.us.kg"
 
           # informative
           git branch -a
@@ -48,11 +61,24 @@ jobs:
           # Create & push tag
           git tag --force ${{ env.RELEASE_VERSION }}
           git push --force origin ${{ env.RELEASE_VERSION }}
+      -
+        name: Install Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.8.1
+      -
+        name: Run chart-releaser
+        uses: helm/[email protected]
+        with:
+          charts_dir: deployment/helm
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
       -
         name: Create Github Release
+        id: create_release
         uses: thomaseizinger/[email protected]
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.CXNG_RELEASE_PAT }}
         with:
           target_commitish: ${{ github.event.pull_request.merge_commit_sha }}
           tag_name: ${{ env.RELEASE_VERSION }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.1] - 2022-05-19
+
 ## [0.0.1] - 2022-05-13
 
-[Unreleased]: https://github.com/catenax-ng/product-edc/compare/0.0.1...HEAD
+[Unreleased]: https://github.com/denisneuling/edc-cx/compare/0.0.1...HEAD
+
+[0.0.1]: https://github.com/denisneuling/edc-cx/compare/0.0.1...0.0.1
 
 [0.0.1]: https://github.com/catenax-ng/product-edc/compare/a02601306fed39a88a3b3b18fae98b80791157b9...0.0.1
diff --git a/edc-controlplane/README.md b/edc-controlplane/README.md
@@ -448,7 +448,7 @@ __publicContractDefinition="
         }"
 
 # Call Data Mgmt API
-curl -X POST "$__connectorUrl/$__dataMgmtPath/policies" --header "$__apiKey: $__apiKeyValue" --header "Content-Type: application/json" --data "$__publicContractDefinition"
+curl -X POST "$__connectorUrl/$__dataMgmtPath/contractdefinitions" --header "$__apiKey: $__apiKeyValue" --header "Content-Type: application/json" --data "$__publicContractDefinition"
 ```
 
 #### Bash Parameters
@@ -468,7 +468,7 @@ curl -X POST "$__connectorUrl/$__dataMgmtPath/policies" --header "$__apiKey: $__
 Get Contract Definition
 
 ```bash
-curl -X GET "$__connectorUrl/$__dataMgmtPath/policies/$__policyId" --header "$__apiKey: $__apiKeyValue" --header "Content-Type: application/json" | jq
+curl -X GET "$__connectorUrl/$__dataMgmtPath/contractdefinitions/$__contractDefinitionId" --header "$__apiKey: $__apiKeyValue" --header "Content-Type: application/json" | jq
 ```
 
 ### 4. Get Contract Offer Catalog

diff --git a/edc-controlplane/edc-controlplane-memory/README.md b/edc-controlplane/edc-controlplane-memory/README.md
@@ -36,6 +36,14 @@ Details regarding each configuration property can be found at the [documentary s
 | edc.api.control.auth.apikey.key                       |           | X-Api-Key | |
 | edc.api.control.auth.apikey.value                     |           | super-strong-api-key | |
 | edc.hostname                                          |           | localhost | |
+| edc.oauth.token.url                                   | X         | https://daps.catena-x.net | |
+| edc.oauth.public.key.alias                            | X         | key-to-daps-certificate-in-keyvault | |
+| edc.oauth.private.key.alias                           | X         | key-to-private-key-in-keyvault | |
+| edc.oauth.client.id                                   | X         | daps-oauth-client-id | |
+| edc.vault.clientid                                    | X         | 00000000-1111-2222-3333-444444444444 | | 
+| edc.vault.tenantid                                    | X         | 55555555-6666-7777-8888-999999999999 | |
+| edc.vault.name                                        | X         | my-vault-name | |
+| edc.vault.clientsecret                                | X         | 34-chars-secret | |
 | edc.transfer.proxy.endpoint                  | X         | | |
 | edc.transfer.proxy.token.signer.privatekey.alias  | X         | | |
 
@@ -76,6 +84,11 @@ edc.api.control.auth.apikey.value=pass
 
 edc.hostname=localhost
 
+# OAuth / DAPS related configuration
+edc.oauth.token.url=https://daps.catena-x.net
+edc.oauth.public.key.alias=key-to-daps-certificate-in-keyvault
+edc.oauth.private.key.alias=key-to-private-key-in-keyvault
+edc.oauth.client.id=daps-oauth-client-id
 
 # Azure vault related configuration
 edc.vault.clientid=00000000-1111-2222-3333-444444444444

diff --git a/edc-controlplane/edc-controlplane-memory/pom.xml b/edc-controlplane/edc-controlplane-memory/pom.xml
@@ -186,7 +186,11 @@
         <!-- IAM -->
         <dependency>
             <groupId>org.eclipse.dataspaceconnector</groupId>
-            <artifactId>iam-mock</artifactId>
+            <artifactId>oauth2-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <artifactId>iam-daps</artifactId>
         </dependency>
 
         <!-- Telemetry -->

diff --git a/pom.xml b/pom.xml
@@ -53,7 +53,7 @@
         <com.azure.sdk.bom.version>1.2.1</com.azure.sdk.bom.version>
         <jakarta.ws.rs.api.version>3.1.0</jakarta.ws.rs.api.version>
         <org.postgresql.version>42.3.5</org.postgresql.version>
-        <org.flywaydb.version>8.5.10</org.flywaydb.version>
+        <org.flywaydb.version>8.5.11</org.flywaydb.version>
 
         <!-- test dependency version -->
         <junit.jupiter.version>5.8.2</junit.jupiter.version>
@@ -943,7 +943,7 @@
                             <dependency>
                                 <groupId>org.glassfish.jaxb</groupId>
                                 <artifactId>jaxb-runtime</artifactId>
-                                <version>2.3.6</version>
+                                <version>3.0.2</version>
                             </dependency>
                         </dependencies>
                         <configuration>