Skip to content

Commit 6fd9c62

Browse files
authored
Improve development-related documentation (#3677)
1 parent 69b3058 commit 6fd9c62

File tree

3 files changed

+46
-11
lines changed

3 files changed

+46
-11
lines changed

.github/pull_request_template.md

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,40 @@
1-
[A clear and concise description of what the pull request is for along with a reference to the associated issue IDs, if they exist.]
1+
**INSERT HERE** a clear and concise description of what the pull request is for along with a reference to the associated issue IDs, if they exist.
2+
3+
> [!IMPORTANT]
4+
> Base your changes on `2.x` branch if you are targeting Log4j 2; use `main` otherwise.
25
36
## Checklist
47

5-
* Base your changes on `2.x` branch if you are targeting Log4j 2; use `main` otherwise
6-
* `./mvnw verify` succeeds (if it fails due to code formatting issues reported by Spotless, simply run `./mvnw spotless:apply` and retry)
7-
* Non-trivial changes contain an entry file in the `src/changelog/.2.x.x` directory
8-
* Tests for the changes are provided
9-
* [Commits are signed](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) (optional, but highly recommended)
8+
Before we can review and merge your changes, please go through the checklist below. If you're still working on some items, feel free to submit your pull request as a draft—our CI will help guide you through the remaining steps.
9+
10+
### ✅ Required checks
11+
12+
- [ ] **License**: I confirm that my changes are submitted under the [Apache License, Version 2.0](https://apache.org/licenses/LICENSE-2.0).
13+
- [ ] **Commit signatures**: All commits are signed and verifiable. (See [GitHub Docs on Commit Signature Verification](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification)).
14+
- [ ] **Code formatting**: The code is formatted according to the project’s style guide.
15+
<details>
16+
<summary>How to check and fix formatting</summary>
17+
18+
- To **check** formatting: `./mvnw spotless:check`
19+
- To **fix** formatting: `./mvnw spotless:apply`
20+
21+
See [the build instructions](https://logging.apache.org/log4j/2.x/development.html#building) for details.
22+
</details>
23+
- [ ] **Build & Test**: I verified that the project builds and all unit tests pass.
24+
<details>
25+
<summary>How to build the project</summary>
26+
27+
Run: `./mvnw verify`
28+
29+
See [the build instructions](https://logging.apache.org/log4j/2.x/development.html#building) for details.
30+
</details>
31+
32+
### 🧪 Tests (select one)
33+
34+
- [ ] I have added or updated tests to cover my changes.
35+
- [ ] No additional tests are needed for this change.
36+
37+
### 📝 Changelog (select one)
38+
39+
- [ ] I added a changelog entry in `src/changelog/.2.x.x`. (See [Changelog Entry File Guide](https://logging.apache.org/log4j/tools/log4j-changelog.html#changelog-entry-file)).
40+
- [ ] This is a trivial change and does not require a changelog entry.

README.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,9 @@ https://github.com/apache/logging-log4j2/security/code-scanning[image:https://gi
2121
2222
Apache Log4j is a versatile, industrial-grade Java logging framework composed of an API, its implementation, and components to assist the deployment for various use cases.
2323
For further information (support, download, etc.) see https://logging.apache.org/log4j[the project website].
24+
25+
[#development]
26+
== Development
27+
28+
Looking for *build instructions*, branching scheme, and other developer resources?
29+
See https://logging.apache.org/log4j/2.x/development.html[the Development page] at the website.

src/site/antora/modules/ROOT/pages/development.adoc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,10 @@ Pitch it in a {logging-services-url}/support.html#discussions-maintainer[maintai
8383
[#committer]
8484
== I am a committer. How shall I push my changes?
8585
86-
. Is it something trivial?
87-
Go ahead and push it.
86+
As per https://lists.apache.org/thread/rx2hgc5mwql06yzwz2j8wkp8z6nmdcqk[the PMC resolution on 2025-04-10], all changes must be submitted in a pull request and undergo peer review.
87+
88+
Make sure a changelog entry is attached, and `./mvnw verify site` succeeds.
8889
89-
. Otherwise, submit a pull request.
90-
Make sure a changelog entry is attached and `./mvnw verify site` succeeds.
91-
+
9290
[TIP]
9391
====
9492
You are strongly advised to spar with another maintainer first (see {logging-services-url}/support.html#discussions-maintainer[maintainer discussion channels]) before starting to code.

0 commit comments

Comments
 (0)