Skip to content

Commit

Permalink
Merge branch 'apache:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
polarnik authored Sep 21, 2024
2 parents be21f47 + 7550111 commit c773c2f
Show file tree
Hide file tree
Showing 1,824 changed files with 36,786 additions and 15,216 deletions.
25 changes: 25 additions & 0 deletions .asf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories

github:
description: "Apache JMeter open-source load testing tool for analyzing and measuring the performance of a variety of services"
homepage: https://jmeter.apache.org/
labels:
- performance
- test
- java

enabled_merge_buttons:
squash: true
merge: false
rebase: true

features:
wiki: false
issues: true
projects: false

notifications:
commits: [email protected]
issues: [email protected]
pullrequests: [email protected]
jira_options: link label
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ insert_final_newline = true
charset = utf-8
indent_style = space
max_line_length = 120
ij_any_align_multiline_parameters = false
ij_any_do_while_brace_force = always
ij_any_for_brace_force = always
ij_any_if_brace_force = always
ij_any_while_brace_force = always

[{*.sh,gradlew}]
end_of_line = lf
Expand All @@ -28,3 +33,6 @@ ij_kotlin_continuation_indent_size = 4
#"static ", "java.", "javax", "org", "net", "com", ""
ij_java_imports_layout = $*,|,java.**,|,javax.**,|,org.**,|,net.**,|,com.**,|,*
ij_java_use_single_class_imports = true

[*.xml]
indent_size = 2
59 changes: 59 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Bug report
description: Create a report and help us improve
labels:
- defect
- to-triage
body:
- type: markdown
attributes:
value: |
Please fill in all required fields with as many details as possible.
Read the [User manual](https://jmeter.apache.org/usermanual/index.html) and/or [Reference documentation](https://jmeter.apache.org/usermanual/component_reference.html)
- type: textarea
id: expected
attributes:
label: Expected behavior
description: |
Describe what you were expecting JMeter to do
placeholder: |
Here you can also attach log files, screenshots or a video
- type: textarea
id: actual
attributes:
label: Actual behavior
description: |
Describe what you observed JMeter did instead
placeholder: |
Here you can also attach log files (e.g. jmeter.log), screenshots or a video
- type: textarea
id: steps
attributes:
label: Steps to reproduce the problem
description: |
- If the problem relates to a third-party plugin, consider removing them first
placeholder: |
Here you can also attach log files, screenshots or a video
validations:
required: true
- type: input
id: jmeter-version
attributes:
label: JMeter Version
description: |
What JMeter version and edition did you use?
Note: While you can obviously continue using older versions of JMeter, it may well be that your bug is already fixed. If you're using an older version, please also try to reproduce the bug in the latest version of JMeter before reporting it.
placeholder: ex. 5.6
validations:
required: true
- type: input
id: java-version
attributes:
label: Java Version
description: What JDK version and distribution did you use (use `java -version`)
placeholder: ex. openjdk version "17" 2021-09-14
- type: input
id: os-version
attributes:
label: OS Version
description: What operating system version and distribution did you use (use e.g. `ver` on Windows)
placeholder: ex. Microsoft Windows [Version 10.0.22000.856]
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: JMeter users mailing list
url: https://jmeter.apache.org/mail2.html
about: Please ask questions on JMeter usage on users mailing list (note that you need to subscribe first)
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/documentation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Feedback about the manual
description: Found an issue with the documentation?
labels:
- documentation
- to-triage
body:
- type: markdown
attributes:
value: |
Please fill in all required fields with as many details as possible.
- type: input
id: url
attributes:
label: The documentation URL
placeholder: ex. https://jmeter.apache.org/usermanual/best-practices.html
validations:
required: true
- type: textarea
id: feedback
attributes:
label: Feedback
description: |
Describe what issue with the documentation you've found
placeholder: |
Here you can also attach log files, screenshots or a video
validations:
required: true
58 changes: 58 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Feature Request
description: Suggest an idea
labels:
- enhancement
- to-triage
body:
- type: markdown
attributes:
value: |
Please describe the use-case you have. This will better help us understand the context in which you're looking for a new feature.
- type: textarea
id: use-case
attributes:
label: Use case
description: |
Please describe the use-case you have. This will better help us understand the context in which you're looking for a new feature.
placeholder: Describe the use-case here
validations:
required: true
- type: textarea
id: solution
attributes:
label: Possible solution
description: |
Please describe a possible solution you'd like to see in JMeter, ideally with example code.
Please note, it's not always easy to describe a good solution. Describing the use-case above is much more important to us.
placeholder: Describe the possible solution here.
validations:
required: false
- type: textarea
id: workarounds
attributes:
label: Possible workarounds
description: |
Please describe the possible workarounds you've implemented to work around the lacking functionality.
placeholder: Describe the possible workarounds here.
validations:
required: false
- type: input
id: jmeter-version
attributes:
label: JMeter Version
description: What JMeter version and edition did you use?
placeholder: ex. 5.6
validations:
required: true
- type: input
id: java-version
attributes:
label: Java Version
description: What JDK version and distribution did you use (use `java -version`)
placeholder: ex. openjdk version "17" 2021-09-14
- type: input
id: os-version
attributes:
label: OS Version
description: What operating system version and distribution did you use (use e.g. `ver` on Windows)
placeholder: ex. Microsoft Windows [Version 10.0.22000.856]
59 changes: 59 additions & 0 deletions .github/ISSUE_TEMPLATE/regression.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Regression
description: Report a problem about something that used to work
labels:
- regression
- to-triage
body:
- type: markdown
attributes:
value: |
Please fill in all required fields with as many details as possible.
Read the [User manual](https://jmeter.apache.org/usermanual/index.html) and/or [Reference documentation](https://jmeter.apache.org/usermanual/component_reference.html)
- type: textarea
id: expected
attributes:
label: Expected behavior
description: |
Describe what you were expecting JMeter to do
placeholder: |
Here you can also attach log files, screenshots or a video
- type: textarea
id: actual
attributes:
label: Actual behavior
description: |
Describe what you observed JMeter did instead
placeholder: |
Here you can also attach log files (e.g. jmeter.log), screenshots or a video
- type: textarea
id: steps
attributes:
label: Steps to reproduce the problem
description: |
- If the problem relates to a third-party plugin, consider removing them first
placeholder: |
Here you can also attach log files, screenshots or a video
validations:
required: true
- type: input
id: jmeter-version
attributes:
label: JMeter Version
description: |
What JMeter version and edition did you use?
Note: While you can obviously continue using older versions of JMeter, it may well be that your bug is already fixed. If you're using an older version, please also try to reproduce the bug in the latest version of JMeter before reporting it.
placeholder: ex. 5.6
validations:
required: true
- type: input
id: java-version
attributes:
label: Java Version
description: What JDK version and distribution did you use (use `java -version`)
placeholder: ex. openjdk version "17" 2021-09-14
- type: input
id: os-version
attributes:
label: OS Version
description: What operating system version and distribution did you use (use e.g. `ver` on Windows)
placeholder: ex. Microsoft Windows [Version 10.0.22000.856]
File renamed without changes.
75 changes: 75 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# See https://github.com/release-drafter/release-drafter#configuration-options
name-template: 'v$RESOLVED_VERSION'
tag-template: 'rel/v$RESOLVED_VERSION'
# Filter previous releases to consider only those with the target matching the current branch
filter-by-commitish: true
tag-prefix: REL
exclude-labels:
- 'skip-changelog'
categories:
- title: '🚀 Features'
labels:
- 'feature'
- 'enhancement'
- title: '🐛 Bug Fixes'
labels:
- 'fix'
- 'bugfix'
- 'bug'
- 'defect'
- title: '📝 Documentation'
labels:
- 'documentation'
- title: '🧰 Maintenance'
label: 'chore'
- title: '⬆️ Dependencies'
collapse-after: 8
labels:
- 'dependencies'
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
version-resolver:
major:
labels:
- 'major'
minor:
labels:
- 'minor'
patch:
labels:
- 'patch'
default: patch
template: |
## Changes
$CHANGES
# See https://github.com/release-drafter/release-drafter#autolabeler
# This is more like a reference, since auto-labelling PRs seems to require too much privileges
autolabeler:
- label: 'dependencies'
files:
- 'gradle-wrapper.properties'
title:
- '/^fix\(deps\)/i'
- '/^chore:\s*bump/i'
- label: 'chore'
files:
- '*gradle*'
branch:
- '/docs{0,1}\/.+/'
title:
- '/^chore/i'
- label: 'documentation'
files:
- '*.md'
- 'docs/**'
- label: 'bug'
branch:
- '/fix\/.+/'
title:
- '/^fix/i'
- label: 'enhancement'
branch:
- '/feature\/.+/'
title:
- '/^feat/i'
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ jobs:
name: "Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v1
Loading

0 comments on commit c773c2f

Please sign in to comment.