Merge remote-tracking branch 'origin/foundation-2021' into foundation…

…-2022

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,11 +5,11 @@
 
 ### Contribution Checklist
 
-* Please [make an issue in the OpenNMS issue tracker](https://issues.opennms.org) if there isn't one already.<br />Once there is an issue, please:
+* Please [make an issue in the OpenNMS issue tracker](https://opennms.atlassian.net/) if there isn't one already.<br />Once there is an issue, please:
   1. update the title of this PR to be in the format: `${JIRA-ISSUE-NUMBER}: subject of pull request`
-  2. update the JIRA link at the bottom of this comment to refer to the real issue number
+  2. update the Jira link at the bottom of this comment to refer to the real issue number
   3. prefix your commit messages with the issue number, if possible
-  4. once you've created this PR, please link to it in a comment in the JIRA issue
+  4. once you've created this PR, please link to it in a comment in the Jira issue
   Don't worry if this sounds like a lot, we can help you get things set up properly.
 * **If this code is likely to affect the UI, did you name your branch with `-smoke` in it to trigger smoke tests?**
 * If this is a new or updated feature, is there documentation for the new behavior?
@@ -34,5 +34,5 @@ Thanks for taking time to contribute!
 
 ### External References
 
-* JIRA (Issue Tracker): http://issues.opennms.org/browse/${JIRA-ISSUE-NUMBER}
+* Jira (Issue Tracker): https://opennms.atlassian.net/browse/${JIRA-ISSUE-NUMBER}
 

.github/dependabot.yml

@@ -1,5 +1,20 @@
 version: 2
 updates:
+
+  - package-ecosystem: "npm"
+    # Look for `package.json` and `lock` files in the `root` directory
+    directory: "/ui"
+    target-branch: "develop"
+    reviewers:
+      - "mikewrosey"
+    labels:
+      - "dependency update"
+    commit-message:
+      prefix: "build"
+      include: "scope"
+    schedule:
+      interval: "weekly"
+
   - package-ecosystem: "npm"
     # Look for `package.json` and `lock` files in the `root` directory
     directory: "/core/web-assets/"

.github/workflows/auto-assign.yml

@@ -1,7 +1,7 @@
 name: "Auto Assign Pull Request"
 on:
-  pull_request:
-    types: [review_requested, ready_for_review, opened, synchronize, reopened]
+  pull_request_target:
+    # types: [review_requested, ready_for_review, opened, synchronize, reopened]
     branches:
       - develop
       - 'foundation-**'
@@ -11,7 +11,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-      - uses: shufo/[email protected].3
+      - uses: shufo/[email protected].4
         with:
           config: ".github/assign-by-files.yml"
           token: ${{ secrets.GITHUB_TOKEN }}

core/cli/src/main/resources/bin/find-java.sh

@@ -90,7 +90,7 @@ main() {
 	fi
 
 	if [ "$SKIP_DEFAULTS" -eq 0 ]; then
-		DEFAULTS=(/usr/lib/jvm /usr/java /System/Library/Java/JavaVirtualMachines /Library/Java/JavaVirtualMachines /Library/Java/Home /opt)
+		DEFAULTS=(/usr/lib/jvm /usr/java /System/Library/Java/JavaVirtualMachines /Library/Java/JavaVirtualMachines /Library/Java/Home /opt /usr/lib64/jvm)
 		# this is massively inefficient, but bash sucks and there aren't *that* many entries so it doesn't really matter
 		for default in "${DEFAULTS[@]}"; do
 			found=false