svn commit: r1631596 - in /maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools: DistPrerequisiteMojo.java GetPrerequisites.java MavenJDKInformation.java

[hboutemy]

Author: hboutemy
Date: Mon Oct 13 22:48:44 2014
New Revision: 1631596

URL: http://svn.apache.org/r1631596
Log:
display plugin version

Modified:
    
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistPrerequisiteMojo.java
    
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
    
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenJDKInformation.java

Modified: 
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistPrerequisiteMojo.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistPrerequisiteMojo.java?rev=1631596&r1=1631595&r2=1631596&view=diff
==============================================================================
--- 
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistPrerequisiteMojo.java
 (original)
+++ 
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistPrerequisiteMojo.java
 Mon Oct 13 22:48:44 2014
@@ -125,6 +125,8 @@ public class DistPrerequisiteMojo
                 sink.tableRow();
                 sink.tableCell();
                 sink.text( mavenJDKInformation.getPluginName() );
+                sink.text( " " );
+                sink.text( mavenJDKInformation.getPluginVersion() );
                 sink.tableCell_();
                 sink.tableCell();
                 sink.text( mavenJDKInformation.getMavenVersion().toString() );

Modified: 
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java?rev=1631596&r1=1631595&r2=1631596&view=diff
==============================================================================
--- 
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
 (original)
+++ 
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
 Mon Oct 13 22:48:44 2014
@@ -109,7 +109,19 @@ public class GetPrerequisites
         mavenVersion = mavenVersion.replace( "Maven ", "" );
         jdkVersion = jdkVersion.replace( "JDK ", "" );
 
-        MavenJDKInformation mjdk = new MavenJDKInformation( pluginName, 
mavenVersion, jdkVersion );
+        String pluginVersion = doc.select( "pre" ).text();
+        int index = pluginVersion.indexOf( "<version>" );
+        if ( index < 0 )
+        {
+            pluginVersion = "";
+        }
+        else
+        {
+            pluginVersion = pluginVersion.substring( index + 
"<version>".length() );
+            pluginVersion = pluginVersion.substring( 0, pluginVersion.indexOf( 
"</version>" ) );
+        }
+
+        MavenJDKInformation mjdk = new MavenJDKInformation( pluginName, 
pluginVersion, mavenVersion, jdkVersion );
         return mjdk;
     }
 

Modified: 
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenJDKInformation.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenJDKInformation.java?rev=1631596&r1=1631595&r2=1631596&view=diff
==============================================================================
--- 
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenJDKInformation.java
 (original)
+++ 
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenJDKInformation.java
 Mon Oct 13 22:48:44 2014
@@ -30,13 +30,16 @@ public class MavenJDKInformation
 {
     private String pluginName;
 
+    private String pluginVersion;
+
     private ArtifactVersion mavenVersion;
 
     private String jdkVersion;
 
-    public MavenJDKInformation( String pluginName, String mavenVersion, String 
jdkVersion )
+    public MavenJDKInformation( String pluginName, String pluginVersion, 
String mavenVersion, String jdkVersion )
     {
         this.pluginName = pluginName;
+        this.pluginVersion = pluginVersion;
         this.mavenVersion = new DefaultArtifactVersion( mavenVersion );
         this.jdkVersion = jdkVersion;
     }
@@ -66,6 +69,11 @@ public class MavenJDKInformation
         return pluginName;
     }
 
+    public String getPluginVersion()
+    {
+        return pluginVersion;
+    }
+
     public void setPluginName( String pluginName )
     {
         this.pluginName = pluginName;