diff --git a/build.gradle.kts b/build.gradle.kts index efaeaaa68..ca6cb55d7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -160,7 +160,7 @@ dependencies { testImplementation("com.github.marschall:memoryfilesystem:latest.release") // for generating properties migration configurations - testImplementation("com.fasterxml.jackson.core:jackson-databind:2.14.0") + testImplementation("com.fasterxml.jackson.core:jackson-databind:2.13.4") testImplementation("io.github.classgraph:classgraph:latest.release") testImplementation("org.openrewrite:rewrite-java-17:${rewriteVersion}") testImplementation("org.openrewrite.recipe:rewrite-migrate-java:${rewriteVersion}") diff --git a/src/main/java/org/openrewrite/java/spring/AddSpringProperty.java b/src/main/java/org/openrewrite/java/spring/AddSpringProperty.java index 4b7638918..ed7490117 100644 --- a/src/main/java/org/openrewrite/java/spring/AddSpringProperty.java +++ b/src/main/java/org/openrewrite/java/spring/AddSpringProperty.java @@ -63,7 +63,7 @@ public class AddSpringProperty extends Recipe { @Option(displayName = "Optional list of file path matcher", description = "Each value in this list represents a glob expression that is used to match which files will " + "be modified. If this value is not present, this recipe will query the execution context for " + - "reasonable defaults. (\"**/application.yml\", \"**/application.yml\", and \"**/application.properties\"", + "reasonable defaults. (\"**/application.yml\", \"**/application.yml\", and \"**/application.properties\".", required = false, example = "**/application.yml") @Nullable @@ -71,7 +71,7 @@ public class AddSpringProperty extends Recipe { @Override public String getDisplayName() { - return "Add a spring configuration property to a configuration file if it does not already exist in that file."; + return "Add a spring configuration property to a configuration file if it does not already exist in that file"; } @Override diff --git a/src/main/java/org/openrewrite/java/spring/ChangeSpringPropertyKey.java b/src/main/java/org/openrewrite/java/spring/ChangeSpringPropertyKey.java index c2ae60b82..ef69eb8a9 100644 --- a/src/main/java/org/openrewrite/java/spring/ChangeSpringPropertyKey.java +++ b/src/main/java/org/openrewrite/java/spring/ChangeSpringPropertyKey.java @@ -36,7 +36,7 @@ public class ChangeSpringPropertyKey extends Recipe { @Override public String getDisplayName() { - return "Change the key of a spring application property."; + return "Change the key of a spring application property"; } @Option(displayName = "Old property key", diff --git a/src/main/java/org/openrewrite/java/spring/DeleteSpringProperty.java b/src/main/java/org/openrewrite/java/spring/DeleteSpringProperty.java index 921ea3ee6..ca83eb6a9 100644 --- a/src/main/java/org/openrewrite/java/spring/DeleteSpringProperty.java +++ b/src/main/java/org/openrewrite/java/spring/DeleteSpringProperty.java @@ -38,7 +38,7 @@ public class DeleteSpringProperty extends Recipe { @Override public String getDisplayName() { - return "Delete a spring configuration property from any configuration files that contains a matching key."; + return "Delete a spring configuration property from any configuration files that contains a matching key"; } @Override diff --git a/src/main/java/org/openrewrite/java/spring/YamlPropertiesToKebabCase.java b/src/main/java/org/openrewrite/java/spring/YamlPropertiesToKebabCase.java index ef8615c6d..51e3da520 100644 --- a/src/main/java/org/openrewrite/java/spring/YamlPropertiesToKebabCase.java +++ b/src/main/java/org/openrewrite/java/spring/YamlPropertiesToKebabCase.java @@ -37,7 +37,7 @@ public String getDescription() { "With [Spring's relaxed binding](https://docs.spring.io/spring-boot/docs/2.5.6/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding), " + "`kebab-case` may be used in properties files and still be converted to configuration beans. " + "Note, an exception to this is the case of `@Value`, which is match-sensitive. For example, `@Value(\"${anExampleValue}\")` will not match `an-example-value`. " + - "[The Spring reference documentation recommends using `kebab-case` for properties where possible.](https://docs.spring.io/spring-boot/docs/2.5.6/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding)"; + "[The Spring reference documentation recommends using `kebab-case` for properties where possible.](https://docs.spring.io/spring-boot/docs/2.5.6/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding) ."; } @Override diff --git a/src/main/java/org/openrewrite/java/spring/boot2/DatabaseComponentAndBeanInitializationOrdering.java b/src/main/java/org/openrewrite/java/spring/boot2/DatabaseComponentAndBeanInitializationOrdering.java index 4a6f6429f..1bd1b4d25 100644 --- a/src/main/java/org/openrewrite/java/spring/boot2/DatabaseComponentAndBeanInitializationOrdering.java +++ b/src/main/java/org/openrewrite/java/spring/boot2/DatabaseComponentAndBeanInitializationOrdering.java @@ -41,7 +41,7 @@ public class DatabaseComponentAndBeanInitializationOrdering extends Recipe { @Override public String getDisplayName() { - return "Adds @DependsOnDatabaseInitialization to Spring Beans and Components depending on javax.sql.DataSource."; + return "Adds @DependsOnDatabaseInitialization to Spring Beans and Components depending on javax.sql.DataSource"; } @Override diff --git a/src/main/java/org/openrewrite/java/spring/boot2/MigrateActuatorMediaTypeToApiVersion.java b/src/main/java/org/openrewrite/java/spring/boot2/MigrateActuatorMediaTypeToApiVersion.java index 164ed7632..510b5e246 100644 --- a/src/main/java/org/openrewrite/java/spring/boot2/MigrateActuatorMediaTypeToApiVersion.java +++ b/src/main/java/org/openrewrite/java/spring/boot2/MigrateActuatorMediaTypeToApiVersion.java @@ -33,7 +33,7 @@ public String getDisplayName() { @Override public String getDescription() { - return "Spring-Boot-Actuator `ActuatorMediaType` was deprecated in 2.5 in favor of `ApiVersion#getProducedMimeType()`. Replace `MediaType.parseMediaType(ActuatorMediaType.Vx_JSON)` with `MediaType.asMediaType(ApiVersion.Vx.getProducedMimeType())`"; + return "Spring-Boot-Actuator `ActuatorMediaType` was deprecated in 2.5 in favor of `ApiVersion#getProducedMimeType()`. Replace `MediaType.parseMediaType(ActuatorMediaType.Vx_JSON)` with `MediaType.asMediaType(ApiVersion.Vx.getProducedMimeType())`."; } @Override diff --git a/src/main/java/org/openrewrite/java/spring/boot2/MigrateDatabaseCredentials.java b/src/main/java/org/openrewrite/java/spring/boot2/MigrateDatabaseCredentials.java index 7f1a68b08..dc53789f4 100644 --- a/src/main/java/org/openrewrite/java/spring/boot2/MigrateDatabaseCredentials.java +++ b/src/main/java/org/openrewrite/java/spring/boot2/MigrateDatabaseCredentials.java @@ -35,7 +35,7 @@ public class MigrateDatabaseCredentials extends Recipe { @Override public String getDisplayName() { - return "Migrate flyway and liquibase credentials."; + return "Migrate flyway and liquibase credentials"; } @Override diff --git a/src/main/java/org/openrewrite/java/spring/boot3/PreciseBeanType.java b/src/main/java/org/openrewrite/java/spring/boot3/PreciseBeanType.java index 2002a4d9a..af230fc2d 100644 --- a/src/main/java/org/openrewrite/java/spring/boot3/PreciseBeanType.java +++ b/src/main/java/org/openrewrite/java/spring/boot3/PreciseBeanType.java @@ -38,7 +38,7 @@ public String getDisplayName() { @Override public String getDescription() { - return "Replace Bean method return types with concrete types being returned. This is required for Spring 6 AOT"; + return "Replace Bean method return types with concrete types being returned. This is required for Spring 6 AOT."; } @Override diff --git a/src/main/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapter.java b/src/main/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapter.java index 1c5e83040..27dec9fe9 100644 --- a/src/main/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapter.java +++ b/src/main/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapter.java @@ -31,7 +31,7 @@ public class MigrateWebMvcConfigurerAdapter extends Recipe { @Override public String getDisplayName() { - return "Transform classes that extend `WebMvcConfigurerAdapter` to implement the `WebMvcConfigurer` interface instead."; + return "Transform classes that extend `WebMvcConfigurerAdapter` to implement the `WebMvcConfigurer` interface instead"; } @Override diff --git a/src/main/java/org/openrewrite/maven/spring/UpgradeExplicitSpringBootDependencies.java b/src/main/java/org/openrewrite/maven/spring/UpgradeExplicitSpringBootDependencies.java index 4045a94c5..bdfa65caa 100644 --- a/src/main/java/org/openrewrite/maven/spring/UpgradeExplicitSpringBootDependencies.java +++ b/src/main/java/org/openrewrite/maven/spring/UpgradeExplicitSpringBootDependencies.java @@ -68,7 +68,7 @@ public String getDisplayName() { @Override public String getDescription() { - return "Upgrades un-managed spring-boot project dependencies according to the specified spring-boot version"; + return "Upgrades un-managed spring-boot project dependencies according to the specified spring-boot version."; } private synchronized void buildDependencyMap() throws MavenDownloadingException { diff --git a/suppressions.xml b/suppressions.xml index fbf9371b9..afab111d2 100644 --- a/suppressions.xml +++ b/suppressions.xml @@ -1,3 +1,12 @@ + + + ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ + CVE-2022-42003 +