You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mb...@apache.org on 2025/11/24 18:53:16 UTC
(maven-mapping) branch master updated: Update parent to 45 and palantir format for Java 25 (#48)
This is an automated email from the ASF dual-hosted git repository.
mbuenger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
The following commit(s) were added to refs/heads/master by this push:
new ba5235c Update parent to 45 and palantir format for Java 25 (#48)
ba5235c is described below
commit ba5235c2417c9307cee225eae1c30258efc9e73b
Author: Matthias Bünger <Bu...@users.noreply.github.com>
AuthorDate: Mon Nov 24 19:53:12 2025 +0100
Update parent to 45 and palantir format for Java 25 (#48)
---
pom.xml | 3 ++-
.../org/apache/maven/shared/mapping/MappingUtilsTest.java | 14 ++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8c84f61..5a526fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>43</version>
+ <version>45</version>
</parent>
<artifactId>maven-mapping</artifactId>
@@ -57,6 +57,7 @@
<mavenVersion>3.6.3</mavenVersion>
<javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-04-04T09:03:59Z</project.build.outputTimestamp>
+ <version.palantirJavaFormat>2.81.0</version.palantirJavaFormat>
</properties>
<dependencies>
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 @@ class MappingUtilsTest {
*/
@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 @@ class MappingUtilsTest {
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));
}
}