commit 82a1252133e05e713505130ca52835bfb85f6507
author Hervé Boutemy <hboutemy@apache.org> Thu Jul 23 18:35:17 2020 +0200
committer Hervé Boutemy <hboutemy@apache.org> Thu Jul 23 18:35:17 2020 +0200
tree 5476e1b647b558b03ca87a6117748e971b27d249
parent 4466c6acc725f92423e551a2ca2dbcfbc80ac7d4

remove "1." prefix from JDK version

src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java

diff --git a/src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java b/src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java
index e38ee67..6795bd9 100644
--- a/src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java
+++ b/src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java
@@ -135,7 +135,7 @@
 
         //Leave only version part...
         mavenVersion = mavenVersion.replace( "Maven ", "" );
-        jdkVersion = jdkVersion.replace( "JDK ", "" );
+        jdkVersion = jdkVersion.replace( "JDK ", "" ).replace( "1.", "" );
 
         String pluginVersion = doc.select( "pre" ).text();
         int index = pluginVersion.indexOf( "<version>" );

src/main/java/org/apache/maven/dist/tools/prerequisites/PluginPrerequisites.java

diff --git a/src/main/java/org/apache/maven/dist/tools/prerequisites/PluginPrerequisites.java b/src/main/java/org/apache/maven/dist/tools/prerequisites/PluginPrerequisites.java
index 215c563..38b5f6b 100644
--- a/src/main/java/org/apache/maven/dist/tools/prerequisites/PluginPrerequisites.java
+++ b/src/main/java/org/apache/maven/dist/tools/prerequisites/PluginPrerequisites.java
@@ -61,10 +61,6 @@
 
     public void setJdkVersion( String jdkVersion )
     {
-        if ( jdkVersion.startsWith( "1." ) )
-        {
-            jdkVersion = jdkVersion.substring( 2 );
-        }
         this.jdkVersion = jdkVersion;
     }