Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master for release #2788

Merged
merged 26 commits into from
Jan 4, 2024
Merged

Merge develop into master for release #2788

merged 26 commits into from
Jan 4, 2024

Conversation

sven-dmlr
Copy link
Member

No description provided.

dependabot bot and others added 26 commits December 20, 2023 14:42
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.9.0 to 2.11.1.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](gradle/gradle-build-action@842c587...982da8e)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
2 - After Xray Wrapper release: Merge master back into develop [auto-generated]
…coding-convention

yaml template coding convention updated #2774
* Initial pds kics draft

* Removed sechub.json; corrected assets

* Updated pds base image version

* Fixed kics.sh & kics_mock.sh location

* Fixed dockerfile; Added IaC to deployment.yaml

* Fixed readme

* Added script that extends default CWE

* Fix for location in report

* Fixed mocked results

* Update README.adoc

* Update sechub-pds-solutions/iac/helm/pds-iac/Chart.yaml

Co-authored-by: Sven <[email protected]>

* Various requested fixes

* Apply suggestions from code review

Co-authored-by: Sven <[email protected]>

* Added git branch for kics

* Removed false url

* Fixed indentation

---------

Co-authored-by: Sven <[email protected]>
- builder stages introduced
- options: copy + download
- obsolete jdk install removed (java is already installed)
- BUILDER_BASE_IMAGE made configurable
…ease-and-build-part2

Feature 2762 pds xray release and build part2
…are-build+publish

Feature 2779 pds iac prepare build+publish
…/gradle/gradle-build-action-2.11.1

Bump gradle/gradle-build-action from 2.9.0 to 2.11.1
…/actions/upload-artifact-4

Bump actions/upload-artifact from 3 to 4
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4.1.0 to 5.0.0.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@93397be...0c52d54)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.13.0 to 4.0.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@0ab4596...387ac29)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
…/actions/setup-go-5.0.0

Bump actions/setup-go from 4.1.0 to 5.0.0
…/actions/setup-java-4.0.0

Bump actions/setup-java from 3.13.0 to 4.0.0
* New system tests for Kics and GitLeaks #2771

- add wrong secrets and sanity check to GitLeaks test suite
- add system tests for Kics #2771w

* Changes from review #2771
@sven-dmlr sven-dmlr merged commit c919546 into master Jan 4, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants