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 upstream #122

Merged
merged 24 commits into from
Nov 6, 2023
Merged

Merge upstream #122

merged 24 commits into from
Nov 6, 2023

Conversation

banterCZ
Copy link
Member

@banterCZ banterCZ commented Nov 6, 2023

No description provided.

banterCZ and others added 22 commits October 4, 2023 08:16
Fix #880: Wrong bouncycastle version in jboss deployment
Fix #882: Filter jboss descriptor with bouncycastle version from pom
Bumps [net.javacrumbs.shedlock:shedlock-bom](https://github.com/lukas-krecan/ShedLock) from 5.8.0 to 5.9.0.
- [Commits](lukas-krecan/ShedLock@shedlock-parent-5.8.0...shedlock-parent-5.9.0)

---
updated-dependencies:
- dependency-name: net.javacrumbs.shedlock:shedlock-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [net.javacrumbs.shedlock:shedlock-bom](https://github.com/lukas-krecan/ShedLock) from 5.9.0 to 5.9.1.
- [Commits](lukas-krecan/ShedLock@shedlock-parent-5.9.0...shedlock-parent-5.9.1)

---
updated-dependencies:
- dependency-name: net.javacrumbs.shedlock:shedlock-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.1.4...v3.1.5)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-starter-parent
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Fix #891: Change defaulting of locales for template finding
* Optimize defaulting of locales for template finding

A follow-up to #891
…s-text

Fix #899: Remove implicit commons-text dependency
Fix #902: Update Wultra dependencies to SNAPSHOT version
* Fix #889: Executable war
@banterCZ banterCZ requested review from romanstrobl and jnpsk November 6, 2023 08:04
@banterCZ banterCZ requested a review from zcgandcomp November 6, 2023 09:29
Copy link
Member

@romanstrobl romanstrobl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks OK.

@banterCZ banterCZ merged commit 8b31658 into develop Nov 6, 2023
4 checks passed
@banterCZ banterCZ deleted the issues/merge-upstream branch November 6, 2023 09:36
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