Skip to content

Commit

Permalink
minor touchups
Browse files Browse the repository at this point in the history
  • Loading branch information
ben-manes committed May 17, 2024
1 parent c8ba23a commit 7d795d3
Show file tree
Hide file tree
Showing 10 changed files with 75 additions and 11 deletions.
6 changes: 5 additions & 1 deletion .github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Reporting Security Issues

If you discover a security issue, please report it by sending the maintainers an email or opening an issue.
If you discover a security issue, please use GitHub's mechanism for [privately reporting a vulnerability].
Under the main repository's [security tab], click "Report a vulnerability" to open the advisory form.

Thanks for helping make everyone safer.

[privately reporting a vulnerability]: https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability
[security tab]: https://github.com/ben-manes/caffeine/security
1 change: 1 addition & 0 deletions .github/actions/run-gradle/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ runs:
ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
shell: bash
run: |
echo "::add-matcher::.github/problem-matcher.json"
for ((i=1; i<=${{ inputs.attempt-limit }}; i++)); do
./gradlew $(echo "${{ inputs.arguments }}" | tr -d '\n') && break
if [ $i -lt ${{ inputs.attempt-limit }} ]; then
Expand Down
58 changes: 58 additions & 0 deletions .github/problem-matcher.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"problemMatcher": [
{
"owner": "error-prone",
"pattern": [
{
"regexp": "^\\s*(?<file>[^:]+):(?<line>\\d+):(?<column>\\d+): (?<type>error|warning): (?<message>.*)$",
"file": 1,
"line": 2,
"column": 3,
"severity": 4,
"message": 5
}
]
},
{
"owner": "gradle",
"pattern": [
{
"regexp": "^(error|quiet|warning|lifecycle|info|debug)\\s+(\\S+)\\s+(.+)$",
"severity": 1,
"code": 2,
"message": 3
},
{
"regexp": "^([^\\s]+):([\\d]+)$",
"file": 1,
"line": 2
}
]
},
{
"owner": "java",
"pattern": [
{
"regexp": "^\\s*(?<file>[^:]+):(?<line>\\d+): (?<type>error|warning): (?<message>.*)$",
"file": 1,
"line": 2,
"severity": 3,
"message": 4
}
]
},
{
"owner": "kotlin",
"pattern": [
{
"regexp": "^(e|w):\\s+(\\S+):\\s+\\((\\d+),\\s+(\\d+)\\):\\s+(.+)$",
"severity": 1,
"file": 2,
"line": 3,
"column": 4,
"message": 5
}
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,8 @@ boolean refreshAfterWrite() {
* expired or refreshed. By default, {@link System#nanoTime} is used.
* <p>
* The primary intent of this method is to facilitate testing of caches which have been configured
* with {@link #expireAfterWrite}, {@link #expireAfterAccess}, or {@link #refreshAfterWrite}.
* with {@link #expireAfterWrite}, {@link #expireAfterAccess}, or {@link #refreshAfterWrite}. Note
* that this ticker is not used when recording statistics.
*
* @param ticker a nanosecond-precision time source
* @return this {@code Caffeine} instance (for chaining)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
caffeine = "3.1.8"
junit = "5.11.0-M1"
reactor = "3.6.5"
junit = "5.11.0-M2"
reactor = "3.6.6"
truth = "1.4.2"
versions = "0.51.0"

Expand Down
4 changes: 2 additions & 2 deletions examples/graal-native/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
caffeine = "3.1.8"
graal = "0.10.1"
junit = "5.11.0-M1"
graal = "0.10.2"
junit = "5.11.0-M2"
truth = "1.4.2"
versions = "0.51.0"

Expand Down
2 changes: 1 addition & 1 deletion examples/hibernate/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
caffeine = "3.1.8"
h2 = "2.2.224"
hibernate = "6.5.0.Final"
junit = "5.11.0-M1"
junit = "5.11.0-M2"
log4j2 = "3.0.0-beta2"
slf4j = "2.0.7"
truth = "1.4.2"
Expand Down
2 changes: 1 addition & 1 deletion examples/resilience-failsafe/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
caffeine = "3.1.8"
failsafe = "3.3.2"
junit = "5.11.0-M1"
junit = "5.11.0-M2"
truth = "1.4.2"
versions = "0.51.0"

Expand Down
2 changes: 1 addition & 1 deletion examples/write-behind-rxjava/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
awaitility = "4.2.1"
caffeine = "3.1.8"
junit = "5.11.0-M1"
junit = "5.11.0-M2"
rxjava = "3.1.8"
versions = "0.51.0"

Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ commons-text = "1.12.0"
concurrentlinkedhashmap = "1.4.2"
config = "1.4.3"
coveralls = "2.12.2"
dependency-check = "9.1.0"
dependency-check = "9.2.0"
eclipse-collections = "12.0.0.M3"
ehcache3 = "3.10.8"
errorprone-core = "2.27.1"
Expand Down Expand Up @@ -63,7 +63,7 @@ json-bind = "1.0"
jsoup = "1.17.2"
junit-testng = "1.0.5"
junit4 = "4.13.2"
junit5 = "5.11.0-M1"
junit5 = "5.11.0-M2"
kotlin = "1.9.24"
lincheck = "2.29"
mockito = "5.12.0"
Expand Down

0 comments on commit 7d795d3

Please sign in to comment.