You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bm...@apache.org on 2023/05/27 08:33:52 UTC

[shiro] branch github_features updated (e6e793cf4 -> fcf49f1f1)

This is an automated email from the ASF dual-hosted git repository.

bmarwell pushed a change to branch github_features
in repository https://gitbox.apache.org/repos/asf/shiro.git


 discard e6e793cf4 [GitHub] enable github issues and projects.
     new fcf49f1f1 [GitHub] enable github issues and projects.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e6e793cf4)
            \
             N -- N -- N   refs/heads/github_features (fcf49f1f1)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/pull_request_template.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


[shiro] 01/01: [GitHub] enable github issues and projects.

Posted by bm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bmarwell pushed a commit to branch github_features
in repository https://gitbox.apache.org/repos/asf/shiro.git

commit fcf49f1f194e098efe42bcdf7cae98db06200f59
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Sat May 27 10:34:59 2023 +0200

    [GitHub] enable github issues and projects.
    
     - also enable dependabot alerts (but no PRs)
     - disable force push to main branch
---
 .asf.yaml                        |  7 +++++--
 .github/pull_request_template.md | 16 ++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index ab5ec7682..36306ad45 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -17,10 +17,13 @@
 github:
   description: "Apache Shiro"
   homepage: https://shiro.apache.org/
+  dependabot_alerts: true
+  protected_branches:
+    main: { }
   features:
     wiki: false
-    issues: false
-    projects: false
+    issues: true
+    projects: true
   enabled_merge_buttons:
     squash:  false
     merge:   true
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index fa73c39c3..e6afe2ba0 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -5,19 +5,20 @@ For more details on how to report a vulnerablity see: https://www.apache.org/sec
 
 Following this checklist to help us incorporate your contribution quickly and easily:
 
- - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SHIRO) filed 
+ - [ ] Make sure there is a [GitHub issue](https://github.com/apache/shiro/issues) filed 
        for the change (usually before you start working on it).  Trivial changes like typos do not 
-       require a JIRA issue.  Your pull request should address just this issue, without pulling in other changes.
+       require a GitHub issue.  Your pull request should address just this issue, without pulling in other changes.
  - [ ] Each commit in the pull request should have a meaningful subject line and body.
- - [ ] Format the pull request title like `[SHIRO-XXX] - Fixes bug in SessionManager`,
-       where you replace `SHIRO-XXX` with the appropriate JIRA issue. Best practice
-       is to use the JIRA issue title in the pull request title and in the first line of the commit message.
+ - [ ] Format the pull request title like `[#XXX] - Fixes bug in SessionManager`,
+       where you replace `#XXX` with the appropriate GitHub issue. Best practice
+       is to use the GitHub issue title in the pull request title and in the first line of the commit message.
  - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
+ - [ ] add `fixes #XXX` if merging the PR should close a related issue.
  - [ ] Run `mvn clean install apache-rat:check` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically.
  - [ ] If you have a group of commits related to the same change, please squash your commits into one and force push your branch using `git rebase -i`. 
  
-Trivial changes like typos do not require a JIRA issue (javadoc, comments...). 
-In this case, just format the pull request title like `(DOC) - Add javadoc in SessionManager`.
+Trivial changes like typos do not require a GitHub issue (javadoc, comments...). 
+In this case, just format the pull request title like `[DOC] - Add javadoc in SessionManager`.
  
 If this is your first contribution, you have to read the [Contribution Guidelines](https://github.com/apache/shiro/blob/master/CONTRIBUTING.md)
 
@@ -29,4 +30,3 @@ you have to acknowledge this by using the following check-box.
 
  - [ ] I hereby declare this contribution to be licenced under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0)
  - [ ] In any other case, please file an [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
-