Skip to content

Commit

Permalink
Merge pull request #609 from catenax-ng/main
Browse files Browse the repository at this point in the history
chore: bump versions of dependencies and fix response descriptions
  • Loading branch information
ds-mwesener authored Feb 2, 2024
2 parents e43977f + 61aa397 commit a96e05c
Show file tree
Hide file tree
Showing 11 changed files with 1,057 additions and 1,009 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/e2e-tests-xray_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
run: ./scripts/xray-download-feature-files.sh

- name: Save cypress/e2e folder
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cypress - e2e
if-no-files-found: error
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
node-version: 18.x

- name: Cypress run all tests
uses: cypress-io/github-action@v6.6.0 # use the explicit version number
uses: cypress-io/github-action@v6.6.1 # use the explicit version number
with:
start: npm run start:auth:e2ea
wait-on: "http://localhost:4200"
Expand All @@ -127,7 +127,7 @@ jobs:
- name: Archive cypress artifacts
if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cypress generated files - chrome
path: |
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
# node-version: 18.x
#
# - name: Cypress run all tests
# uses: cypress-io/github-action@v6.6.0 # use the explicit version number
# uses: cypress-io/github-action@v6.6.1 # use the explicit version number
# with:
# start: npm start
# wait-on: "http://localhost:4200"
Expand All @@ -182,7 +182,7 @@ jobs:
#
# - name: Archive cypress artifacts
# if: success() || failure()
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: cypress generated files - firefox
# path: |
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:
# run: npx playwright install --with-deps webkit
#
# - name: Cypress run all tests
# uses: cypress-io/github-action@v6.6.0 # use the explicit version number
# uses: cypress-io/github-action@v6.6.1 # use the explicit version number
# with:
# start: npm start:auth:e2ea
# wait-on: "http://localhost:4200"
Expand All @@ -245,7 +245,7 @@ jobs:
#
# - name: Archive cypress artifacts
# if: success() || failure()
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: cypress generated files - webkit
# path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/eclipse-dash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

- name: upload results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: DEPENDENCIES_FRONTEND

Expand Down Expand Up @@ -79,6 +79,6 @@ jobs:
- name: upload results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: DEPENDENCIES_BACKEND
2 changes: 1 addition & 1 deletion .github/workflows/pull-request_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
fetch-depth: 0
- name: Check if CHANGELOG is updated
id: updated-changelog
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v42
with:
# Avoid using single or double quotes for multiline patterns
files: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ jobs:
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.16.1
with:
trivyignores: "./.github/workflows/.trivyignore"
image-ref: 'localhost:5000/traceability-foss:fe_${{ github.sha }}'
format: "sarif"
limit-severities-for-sarif: true
Expand Down Expand Up @@ -133,6 +134,7 @@ jobs:
- name: Run Trivy vulnerability scanner in repo mode
uses: aquasecurity/trivy-action@0.16.1
with:
trivyignores: "./.github/workflows/.trivyignore"
scan-type: "config"
hide-progress: false
format: "sarif"
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- Update Spring version to 3.1.8
- Migrated from okhttpclient (feign implementation) to resttemplate.
- Refactored rest templates
- Bumped jacoco-maven-plugin from 0.8.8 to 0.8.11
- Bumped cypress-io/github-action from 6.6.0 to 6.6.1
- Bumped tj-actions/changed-files from v41 to v42
- Fixed some response type descriptions within swagger documentation

### Removed

Expand Down
2 changes: 1 addition & 1 deletion DEPENDENCIES_FRONTEND
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,7 @@ npm/npmjs/@angular-eslint/template-parser/16.3.1, MIT, approved, clearlydefined
npm/npmjs/@angular-eslint/utils/16.3.1, MIT, approved, clearlydefined
npm/npmjs/@angular-material-components/datetime-picker/16.0.1, MIT, approved, clearlydefined
npm/npmjs/@angular/animations/16.2.12, MIT, approved, clearlydefined
npm/npmjs/@angular/cdk/16.2.13, , restricted, clearlydefined
npm/npmjs/@angular/cdk/16.2.13, MIT, approved, clearlydefined
npm/npmjs/@angular/cli/16.2.12, , restricted, clearlydefined
npm/npmjs/@angular/common/16.2.12, MIT, approved, clearlydefined
npm/npmjs/@angular/compiler-cli/16.2.12, MIT, approved, clearlydefined
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ SPDX-License-Identifier: Apache-2.0
<start-class>org.eclipse.tractusx.traceability.TraceabilityApplication</start-class>

<!-- versions for Maven plugin -->
<maven-jxr-plugin.version>3.3.1</maven-jxr-plugin.version>
<maven-jxr-plugin.version>3.3.2</maven-jxr-plugin.version>
<ascii-doctor.maven.plugin.version>2.2.4</ascii-doctor.maven.plugin.version>
<checkstyle-plugin.version>3.3.1</checkstyle-plugin.version>
<compiler-plugin.version>3.11.0</compiler-plugin.version>
<findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
<install-plugin.version>3.1.1</install-plugin.version>
<jacoco-plugin.version>0.8.8</jacoco-plugin.version>
<jacoco-plugin.version>0.8.11</jacoco-plugin.version>
<jar-plugin.version>3.3.0</jar-plugin.version>
<owasp-plugin.version>9.0.9</owasp-plugin.version>
<spotbugs-plugin.version>4.8.3.0</spotbugs-plugin.version>
Expand Down
Loading

0 comments on commit a96e05c

Please sign in to comment.