From 6a0772b6d64ac5584ac528979e490d1b79a387ec Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Mon, 01 Sep 2025 12:03:33 +0000
Subject: [PATCH] Merge branch 'master' into update-jdk-11
---
.github/FUNDING.yml | 15 +++++++++++++++
.github/ISSUE_TEMPLATE/Bug_report.md | 4 ++++
.github/ISSUE_TEMPLATE/Feature_request.md | 3 +++
SECURITY.md | 2 +-
opendj-core/pom.xml | 2 +-
README.md | 19 +++++++++++++++++--
6 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..107aa59
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: [OpenIdentityPlatform]
+patreon: # Replace with a single Patreon username
+open_collective: opendj
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: ['https://www.openidentityplatform.org/sponsor'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index 4de26c7..d898138 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -33,3 +33,7 @@
**Additional context**
Add any other context about the problem here.
+
+[Vote to raise the priority 🖐️](https://opencollective.com/openidentityplatform/projects/opendj/contribute/vote-to-raise-the-priority-of-an-issue-92500)
+
+
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
index 5384295..3b33969 100644
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -15,3 +15,6 @@
**Additional context**
Add any other context or screenshots about the feature request here.
+
+[Vote to raise the priority 🖐️](https://opencollective.com/openidentityplatform/projects/opendj/contribute/vote-to-raise-the-priority-of-an-issue-92500)
+
diff --git a/README.md b/README.md
index e278ad5..d4d1fa0 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,21 @@
## Contributing
Please, make [Pull request](https://github.com/OpenIdentityPlatform/OpenDJ/pulls)
-<a href="https://github.com/OpenIdentityPlatform/OpenDJ/graphs/contributors">
- <img src="https://contributors-img.web.app/image?repo=OpenIdentityPlatform/OpenDJ" />
+<a href="https://opencollective.com/OpenDJ/tiers" target="_blank">
+ <!--img src="https://contributors-img.web.app/image?repo=OpenIdentityPlatform/OpenDJ" /-->
+ <img src="https://opencollective.com/OpenDJ/contributors.svg?width=890&button=true" />
+</a>
+
+## Backers
+Thank you to all our backers! [Become a backer 🙏](https://opencollective.com/OpenDJ/tiers)
+
+<a href="https://opencollective.com/OpenDJ/tiers" target="_blank">
+ <img src="https://opencollective.com/OpenDJ/backers.svg?width=890">
+</a>
+
+## Sponsors
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [Become a sponsor ❤️](https://opencollective.com/OpenDJ/tiers)
+
+<a href="https://opencollective.com/OpenDJ/tiers" target="_blank">
+ <img src="https://opencollective.com/OpenDJ/sponsors.svg?width=890">
</a>
diff --git a/SECURITY.md b/SECURITY.md
index 2bf1fbd..0ab26ba 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -11,4 +11,4 @@
## Reporting a Vulnerability
-Please create issue https://github.com/OpenIdentityPlatform/OpenDJ/issues/new?template=Bug_report.md
+Please draft [security advisory](https://github.com/OpenIdentityPlatform/OpenDJ/security/advisories/new)
diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml
index 680ffd4..6d31842 100644
--- a/opendj-core/pom.xml
+++ b/opendj-core/pom.xml
@@ -113,7 +113,7 @@
<properties>
- <bc.fips.version>2.1.0</bc.fips.version>
+ <bc.fips.version>2.1.1</bc.fips.version>
<bctls.fips.version>2.1.20</bctls.fips.version>
<opendj.osgi.import.additional>
--
Gitblit v1.10.0