diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 838f189b..f787e2f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: temurin
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index e88fdc39..b3132dbb 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -25,7 +25,7 @@ jobs:
url: ${{steps.deployment.outputs.page_url}}
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: temurin
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f154a8f5..ea843eb4 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -8,7 +8,7 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
diff --git a/pom.xml b/pom.xml
index 035a3892..ffe53d3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
org.openrewrite.maven
rewrite-maven-plugin
- 5.5.0-SNAPSHOT
+ 5.6.0-SNAPSHOT
rewrite-maven-plugin
maven-plugin
@@ -80,8 +80,8 @@
- 8.2.0-SNAPSHOT
- 1.1.0-SNAPSHOT
+ 8.6.0-SNAPSHOT
+ 1.2.0-SNAPSHOT
1.4.0-SNAPSHOT
@@ -96,7 +96,7 @@
2.15.2
4.1.94.Final
- 8.3.2
+ 8.5.3
1.1.4
0.12.0
3.9.4
@@ -239,7 +239,7 @@
io.micrometer
micrometer-core
- 1.11.3
+ 1.11.4
io.rsocket
@@ -464,7 +464,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.5.0
+ 3.6.0
diff --git a/src/main/java/org/openrewrite/maven/ConfigurableRewriteMojo.java b/src/main/java/org/openrewrite/maven/ConfigurableRewriteMojo.java
index d948bbfc..e086a092 100644
--- a/src/main/java/org/openrewrite/maven/ConfigurableRewriteMojo.java
+++ b/src/main/java/org/openrewrite/maven/ConfigurableRewriteMojo.java
@@ -122,20 +122,23 @@ protected Set getPlainTextMasks() {
"**/META-INF/services/**",
"**/META-INF/spring.factories",
"**/META-INF/spring/**",
- "**/.gitignore",
- "**/.gitattributes",
- "**/.java-version",
- "**/.sdkmanrc",
- "**/*.sh",
"**/*.bash",
"**/*.bat",
- "**/*.ksh",
- "**/*.txt",
+ "**/CODEOWNERS",
+ "**/*.config",
+ "**/Dockerfile",
+ "**/.gitattributes",
+ "**/.gitignore",
+ "**/.java-version",
+ "**/Jenkinsfile",
"**/*.jsp",
+ "**/*.ksh",
+ "**/*.md",
"**/*.qute.java",
+ "**/.sdkmanrc",
+ "**/*.sh",
"**/*.sql",
- "**/Dockerfile",
- "**/Jenkinsfile"
+ "**/*.txt"
));
} else {
Set masks = toSet(rewritePlainTextMasks);
diff --git a/src/main/java/org/openrewrite/maven/MavenLoggingMeterRegistry.java b/src/main/java/org/openrewrite/maven/MavenLoggingMeterRegistry.java
index eb873bf4..59421785 100644
--- a/src/main/java/org/openrewrite/maven/MavenLoggingMeterRegistry.java
+++ b/src/main/java/org/openrewrite/maven/MavenLoggingMeterRegistry.java
@@ -46,8 +46,9 @@ public class MavenLoggingMeterRegistry extends MeterRegistry {
public MavenLoggingMeterRegistry(Log log) {
super(Clock.SYSTEM);
this.log = log;
- }
-
+ }
+
+ @Override
public void close() {
getMeters().stream()
.sorted((m1, m2) -> {
diff --git a/suppressions.xml b/suppressions.xml
index 5b28e7a4..77059092 100644
--- a/suppressions.xml
+++ b/suppressions.xml
@@ -1,6 +1,6 @@
-
+
^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$
CVE-2023-35116
-
+
^pkg:maven/io\.micrometer\.prometheus/prometheus\-rsocket\-client@.*$
CVE-2019-3826
-
+
^pkg:maven/com\.google\.guava/guava@31.1-jre$
CVE-2023-2976
+
+
+ ^pkg:maven/com\.google\.guava/guava@.*$
+ CVE-2020-8908
+
+
+
+ ^pkg:maven/org\.eclipse\.jgit/org\.eclipse\.jgit@.*$
+ CVE-2023-4759
+