You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2026/08/03 11:39:54 UTC

(maven-archiver) branch i373 created (now 5ee8fbd)

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a change to branch i373
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git


      at 5ee8fbd  small optimization

This branch includes the following new commits:

     new 5ee8fbd  small optimization

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(maven-archiver) 01/01: small optimization

Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch i373
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git

commit 5ee8fbde44cdce2819ae0c6077f947e9e6b7792b
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Mon Aug 3 07:39:42 2026 -0400

    small optimization
---
 .../java/org/apache/maven/shared/archiver/BuildHelper.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/archiver/BuildHelper.java b/src/main/java/org/apache/maven/shared/archiver/BuildHelper.java
index f23495e..306f2ac 100644
--- a/src/main/java/org/apache/maven/shared/archiver/BuildHelper.java
+++ b/src/main/java/org/apache/maven/shared/archiver/BuildHelper.java
@@ -18,8 +18,8 @@
  */
 package org.apache.maven.shared.archiver;
 
-import java.util.Arrays;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.maven.api.model.Build;
 import org.apache.maven.api.model.Model;
@@ -57,17 +57,17 @@ public class BuildHelper {
         return normalizeJavaVersion(jdk);
     }
 
+    private static final Set<String> LEGACY_JDK_VERSIONS = Set.of("1.5", "1.6", "1.7", "1.8");
+
     /**
      * Normalize Java version, for versions 5 to 8 where there is a 1.x alias.
      *
      * @param jdk can be null
-     * @return normalized version if an alias was used
+     * @return normalized version if a known alias is used
      */
     public static String normalizeJavaVersion(String jdk) {
-        if (jdk != null
-                && jdk.length() == 3
-                && Arrays.asList("1.5", "1.6", "1.7", "1.8").contains(jdk)) {
-            jdk = jdk.substring(2);
+        if (jdk != null && LEGACY_JDK_VERSIONS.contains(jdk)) {
+            return jdk.substring(2); // alternatively, just return the exact string you want, e.g., "5"
         }
         return jdk;
     }