diff --git a/pom.xml b/pom.xml index 8c84f61..5a526fa 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.shared maven-shared-components - 43 + 45 maven-mapping @@ -57,6 +57,7 @@ 3.6.3 8 2020-04-04T09:03:59Z + 2.81.0 diff --git a/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java b/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java index ced6da1..073a569 100644 --- a/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java @@ -93,17 +93,15 @@ void mappingWithNullClassifier() throws InterpolationException { */ @Test void mappingWithOptionalClassifier() throws InterpolationException { - final String MAPPING_WITH_OPTIONAL_CLASSIFIER_1 = "@{artifactId}@-@{version}@@{dashClassifier}@.@{extension}@"; - final String MAPPING_WITH_OPTIONAL_CLASSIFIER_2 = "@{artifactId}@-@{version}@@{dashClassifier?}@.@{extension}@"; + final String mappingWithOptionalClassifier1 = "@{artifactId}@-@{version}@@{dashClassifier}@.@{extension}@"; + final String mappingWithOptionalClassifier2 = "@{artifactId}@-@{version}@@{dashClassifier?}@.@{extension}@"; Artifact jar = new DefaultArtifact( "org.apache.sample", "maven-test-lib", "1.0", null, "jar", null, new DefaultArtifactHandler("jar")); assertEquals( - "maven-test-lib-1.0.jar", - MappingUtils.evaluateFileNameMapping(MAPPING_WITH_OPTIONAL_CLASSIFIER_1, jar)); + "maven-test-lib-1.0.jar", MappingUtils.evaluateFileNameMapping(mappingWithOptionalClassifier1, jar)); assertEquals( - "maven-test-lib-1.0.jar", - MappingUtils.evaluateFileNameMapping(MAPPING_WITH_OPTIONAL_CLASSIFIER_2, jar)); + "maven-test-lib-1.0.jar", MappingUtils.evaluateFileNameMapping(mappingWithOptionalClassifier2, jar)); jar = new DefaultArtifact( "org.apache.sample", @@ -115,9 +113,9 @@ void mappingWithOptionalClassifier() throws InterpolationException { new DefaultArtifactHandler("jar")); assertEquals( "maven-test-lib-1.0-classifier.jar", - MappingUtils.evaluateFileNameMapping(MAPPING_WITH_OPTIONAL_CLASSIFIER_1, jar)); + MappingUtils.evaluateFileNameMapping(mappingWithOptionalClassifier1, jar)); assertEquals( "maven-test-lib-1.0-classifier.jar", - MappingUtils.evaluateFileNameMapping(MAPPING_WITH_OPTIONAL_CLASSIFIER_2, jar)); + MappingUtils.evaluateFileNameMapping(mappingWithOptionalClassifier2, jar)); } }