# Conflicts:
#   build.gradle

Update plugin io.spring.dependency-management to v1.0.12.RELEASE

See merge request !152

Update dependency quasar to v2.7.7

See merge request !151

Update dependency griefed/baseimage-ubuntu-jdk-8 to v2.0.12

See merge request !150

Update dependency ghcr.io/griefed/gitlab-ci-cd to v2.0.9

See merge request !149

Update dependency ghcr.io/griefed/baseimage-ubuntu-jdk-8 to v2.0.12

See merge request !148

Update dependency @babel/eslint-parser to v7.18.9

See merge request !146

Update dependency electron to v19.0.11

See merge request !147

Bump actions/setup-node from 3.4.0 to 3.4.1

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3.4.0...v3.4.1

)

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

Signed-off-by: dependabot[bot] <support@github.com>

Bump actions/setup-node from 3.3.0 to 3.4.0

Bump plist from 3.0.4 to 3.0.5 in /frontend

Bump node-forge from 1.2.1 to 1.3.1 in /frontend

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3.3.0...v3.4.0

)

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

Signed-off-by: dependabot[bot] <support@github.com>

Bumps [plist](https://github.com/TooTallNate/node-plist) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/TooTallNate/node-plist/releases)
- [Changelog](https://github.com/TooTallNate/plist.js/blob/master/History.md)
- [Commits](https://github.com/TooTallNate/node-plist/commits

)

---
updated-dependencies:
- dependency-name: plist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.2.1 to 1.3.1.
- [Release notes](https://github.com/digitalbazaar/forge/releases)
- [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md)
- [Commits](https://github.com/digitalbazaar/forge/compare/v1.2.1...v1.3.1

)

---
updated-dependencies:
- dependency-name: node-forge
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge branch 'renovate-org.apache.logging.log4j-log4j-slf4j-impl-2.x' of https://git.griefed.de/prosper/docker-template-repo

# Conflicts:
#	build.gradle

Merge branch 'renovate-org.apache.logging.log4j-log4j-web-2.x' of https://git.griefed.de/prosper/docker-template-repo

# Conflicts:
#	build.gradle

# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json

Update dependency org.apache.logging.log4j:log4j-core to v2.18.0

See merge request !138

Update dependency electron to v18.3.5

See merge request !134

Merge branch 'renovate-eslint-plugin-vue-9.x' of https://git.griefed.de/prosper/docker-template-repo

# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json

# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json

# Conflicts:
#   frontend/package.json