From a3aedc67072bdfc01850dec7f87195cd8bf86381 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Thu, 17 Feb 2022 15:59:39 -0500
Subject: [PATCH] Revise Issue Template etc.

---
 .github/ISSUE_TEMPLATE.md                 | 27 -----------------
 .github/ISSUE_TEMPLATE/bug_report.md      | 36 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml         |  5 ++++
 .github/ISSUE_TEMPLATE/feature_request.md | 25 ++++++++++++++++
 .github/PULL_REQUEST_TEMPLATE.md          |  3 +-
 src/dist/license.txt => LICENSE.txt       |  0
 README.md                                 | 10 ++++++-
 build.gradle                              | 12 ++++++--
 8 files changed, 86 insertions(+), 32 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 rename src/dist/license.txt => LICENSE.txt (100%)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 58356963ad..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-!!! To report Security Vulnerabilities, please go to https://tanzu.vmware.com/security !!!
--->
-**Affects Version(s):** \<Spring AMQP version>
-
----
-<!--
-Thanks for raising a Spring AMQP issue. What sort of issue are you raising?
-
-## Question
-
-Please ask questions about how to use something, or to understand why something isn't
-working as you expect it to, on
-[Stack Overflow using the `spring-amqp` tag](https://stackoverflow.com/questions/tagged/spring-amqp).
-
-## Bug report
-
-Please provide details of the problem, including the version of Spring AMQP that you
-are using. If possible, please provide a test case or sample application that reproduces
-the problem. This makes it much easier for us to diagnose the problem and to verify that
-we have fixed it.
-
-## Enhancement
-
-Please start by describing the problem that you are trying to solve. There may already
-be a solution, or there may be a way to solve it that you hadn't considered.
--->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..cfab0e3ba9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'type: bug, status: waiting-for-triage'
+assignees: ''
+
+---
+
+**In what version(s) of Spring AMQP are you seeing this issue?**
+
+For example:
+
+2.4.2
+
+Between 2.3.0 and 2.4.2
+
+**Describe the bug**
+
+A clear and concise description of what the bug is.
+Do not create an issue to ask a question; see below.
+
+**To Reproduce**
+
+Steps to reproduce the behavior.
+
+**Expected behavior**
+
+A clear and concise description of what you expected to happen.
+
+**Sample**
+
+A link to a GitHub repository with a [minimal, reproducible,  sample](https://stackoverflow.com/help/minimal-reproducible-example).
+
+Reports that include a sample will take priority over reports that do not.
+At times, we may require a sample, so it is good to try and include a sample up front.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..bddfd341d4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Community Support
+    url: https://stackoverflow.com/questions/tagged/spring-amqp
+    about: Please ask and answer questions on StackOverflow with the tag spring-amqp, or use the Discussions tab above
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..faa6dff469
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'status: waiting-for-triage, type: enhancement'
+assignees: ''
+
+---
+
+**Expected Behavior**
+
+<!--- Tell us how it should work -->
+
+**Current Behavior**
+
+<!--- Explain the difference from current behavior -->
+
+**Context**
+
+<!---
+How has this issue affected you?
+What are you trying to accomplish?
+What other alternatives have you considered?
+Are you aware of any workarounds?
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f232d0d7b0..eb37328f9a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,6 @@
 <!--
-Thanks for contributing to Spring AMQP. Please provide a brief description of your pull-request and reference any related issue numbers (prefix references with #).
+Thanks for contributing to Spring AMQP.
+Please provide a brief description of your pull-request and reference any related issue numbers (prefix references with #).
 
 See the [Contributor Guidelines for more information](https://github.com/spring-projects/spring-amqp/blob/main/CONTRIBUTING.adoc).
 -->
diff --git a/src/dist/license.txt b/LICENSE.txt
similarity index 100%
rename from src/dist/license.txt
rename to LICENSE.txt
diff --git a/README.md b/README.md
index cc8d252965..8dc67cf47d 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,14 @@ Spring AMQP [<img src="https://build.spring.io/plugins/servlet/wittified/build-s
 
 This project provides support for using Spring and Java with [AMQP 0.9.1](https://www.rabbitmq.com/amqp-0-9-1-reference.html), and in particular [RabbitMQ](https://www.rabbitmq.com/).
 
+# Code of Conduct
+
+Please see our [Code of conduct](https://github.com/spring-projects/.github/blob/master/CODE_OF_CONDUCT.md).
+
+# Reporting Security Vulnerabilities
+
+Please see our [Security policy](https://github.com/spring-projects/spring-amqp/security/policy).
+
 # Checking out and Building
 
 To check out the project from [GitHub](https://github.com/SpringSource/spring-amqp) and build from source using [Gradle](https://gradle.org/), do the following:
@@ -119,4 +127,4 @@ None of these is essential for a pull request, but they will all help.  They can
 
 # License
 
-Spring AMQP is released under the terms of the Apache Software License Version 2.0 (see license.txt).
+Spring AMQP is released under the terms of the Apache Software License Version 2.0 (see LICENSE.txt).
diff --git a/build.gradle b/build.gradle
index 0184a2ee03..6cf2f05521 100644
--- a/build.gradle
+++ b/build.gradle
@@ -323,11 +323,14 @@ subprojects { subproject ->
 		}
 
 		from("${rootProject.projectDir}/src/dist") {
-			include 'license.txt'
 			include 'notice.txt'
 			into 'META-INF'
 			expand(copyright: new Date().format('yyyy'), version: project.version)
 		}
+		from("${rootProject.projectDir}") {
+			include 'LICENSE.txt'
+			into 'META-INF'
+		}
 	}
 
 	check.dependsOn javadoc
@@ -656,12 +659,15 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
 
 	from('src/dist') {
 		include 'README.md'
-		include 'apache-license.txt'
-		include 'epl-license.txt'
 		include 'notice.txt'
 		into "${baseDir}"
 	}
 
+	from("$project.rootDir") {
+		include 'LICENSE.txt'
+		into "${baseDir}"
+	}
+
 	from(zipTree(docsZip.archivePath)) {
 		into "${baseDir}/docs"
 	}