You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/10/18 13:15:29 UTC
svn commit: r1632754 - in /maven/sandbox/trunk/dist-tools/dist-tool-plugin:
./ src/main/java/org/apache/maven/dist/tools/ src/site/ src/site/markdown/
Author: hboutemy
Date: Sat Oct 18 11:15:28 2014
New Revision: 1632754
URL: http://svn.apache.org/r1632754
Log:
renamed classes, plugins, ... to better match the intent
Added:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ListPluginsPrerequisitesMojo.java
- copied, changed from r1632749, 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/PluginPrerequisites.java
- copied, changed from r1632736, maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenJDKInformation.java
Removed:
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/MavenJDKInformation.java
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml
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/site/markdown/index.md
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/site.xml
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml?rev=1632754&r1=1632753&r2=1632754&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml Sat Oct 18 11:15:28 2014
@@ -279,7 +279,7 @@
<report>check-site</report>
<report>check-source-release</report>
<report>check-index-page</report>
- <report>check-prerequisites-site</report>
+ <report>list-plugins-prerequisites</report>
</reports>
</reportSet>
<reportSet>
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=1632754&r1=1632753&r2=1632754&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 Sat Oct 18 11:15:28 2014
@@ -98,7 +98,7 @@ public class GetPrerequisites
return BASEURL + pluginName + "/plugin-info.html";
}
- public MavenJDKInformation getMavenJdkInformation( String pluginName )
+ public PluginPrerequisites getPluginPrerequisites( String pluginName )
throws IOException
{
String url = getPluginInfoUrl( pluginName );
@@ -115,7 +115,7 @@ public class GetPrerequisites
if ( select.size() < 1 )
{
System.err.println( "Could not find expected plugin info for " + url );
- return new MavenJDKInformation( pluginName, "?", "?", "?" );
+ return new PluginPrerequisites( pluginName, "?", "?", "?" );
}
Element tableInfo = select.get( 1 );
@@ -148,19 +148,18 @@ public class GetPrerequisites
pluginVersion = pluginVersion.substring( 0, pluginVersion.indexOf( "</version>" ) );
}
- MavenJDKInformation mjdk = new MavenJDKInformation( pluginName, pluginVersion, mavenVersion, jdkVersion );
- return mjdk;
+ return new PluginPrerequisites( pluginName, pluginVersion, mavenVersion, jdkVersion );
}
- public List<MavenJDKInformation> getPrequisites()
+ public List<PluginPrerequisites> getPrequisites()
{
- List<MavenJDKInformation> result = new ArrayList<MavenJDKInformation>();
+ List<PluginPrerequisites> result = new ArrayList<PluginPrerequisites>();
for ( String pluginName : pluginNames )
{
try
{
- result.add( getMavenJdkInformation( pluginName ) );
+ result.add( getPluginPrerequisites( pluginName ) );
}
catch ( IOException e )
{
@@ -171,19 +170,18 @@ public class GetPrerequisites
return result;
}
- public Map<ArtifactVersion, List<MavenJDKInformation>> getGroupedPrequisites()
+ public Map<ArtifactVersion, List<PluginPrerequisites>> getGroupedPrequisites()
{
- Map<ArtifactVersion, List<MavenJDKInformation>> result =
- new HashMap<ArtifactVersion, List<MavenJDKInformation>>();
+ Map<ArtifactVersion, List<PluginPrerequisites>> result =
+ new HashMap<ArtifactVersion, List<PluginPrerequisites>>();
- List<MavenJDKInformation> prequisites = getPrequisites();
- for ( MavenJDKInformation mavenJDKInformation : prequisites )
+ for ( PluginPrerequisites pluginPrerequisites : getPrequisites() )
{
- if ( !result.containsKey( mavenJDKInformation.getMavenVersion() ) )
+ if ( !result.containsKey( pluginPrerequisites.getMavenVersion() ) )
{
- result.put( mavenJDKInformation.getMavenVersion(), new ArrayList<MavenJDKInformation>() );
+ result.put( pluginPrerequisites.getMavenVersion(), new ArrayList<PluginPrerequisites>() );
}
- result.get( mavenJDKInformation.getMavenVersion() ).add( mavenJDKInformation );
+ result.get( pluginPrerequisites.getMavenVersion() ).add( pluginPrerequisites );
}
return result;
Copied: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ListPluginsPrerequisitesMojo.java (from r1632749, 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/ListPluginsPrerequisitesMojo.java?p2=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ListPluginsPrerequisitesMojo.java&p1=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistPrerequisiteMojo.java&r1=1632749&r2=1632754&rev=1632754&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/ListPluginsPrerequisitesMojo.java Sat Oct 18 11:15:28 2014
@@ -39,8 +39,8 @@ import org.apache.maven.reporting.MavenR
/**
* @author Karl Heinz Marbaise
*/
-@Mojo( name = "check-prerequisites-site", requiresProject = false )
-public class DistPrerequisiteMojo
+@Mojo( name = "list-plugins-prerequisites", requiresProject = false )
+public class ListPluginsPrerequisitesMojo
extends AbstractMavenReport
{
@@ -65,13 +65,13 @@ public class DistPrerequisiteMojo
@Override
public String getName( Locale locale )
{
- return "Dist Tool> Plugins Prerequisites";
+ return "Dist Tool> List Plugins Prerequisites";
}
@Override
public String getDescription( Locale locale )
{
- return "Maven version prerequisites and JDK Version for plugins";
+ return "Maven and JDK version prerequisites for plugins";
}
@Override
@@ -94,7 +94,7 @@ public class DistPrerequisiteMojo
sink.head_();
sink.body();
- Map<ArtifactVersion, List<MavenJDKInformation>> groupedPrequisites = prerequisites.getGroupedPrequisites();
+ Map<ArtifactVersion, List<PluginPrerequisites>> groupedPrequisites = prerequisites.getGroupedPrequisites();
sink.table();
@@ -105,11 +105,11 @@ public class DistPrerequisiteMojo
for ( ArtifactVersion mavenVersion : sortedVersion)
{
- List<MavenJDKInformation> info = groupedPrequisites.get( mavenVersion );
+ List<PluginPrerequisites> pluginsPrerequisites = groupedPrequisites.get( mavenVersion );
sink.tableRow();
sink.tableHeaderCell();
- sink.rawText( "Maven Version Prerequisite " + mavenVersion + ": " + info.size() + " / "
+ sink.rawText( "Maven Version Prerequisite " + mavenVersion + ": " + pluginsPrerequisites.size() + " / "
+ prerequisites.pluginNames.length );
sink.tableHeaderCell_();
@@ -123,22 +123,22 @@ public class DistPrerequisiteMojo
sink.tableRow_();
- for ( MavenJDKInformation mavenJDKInformation : info )
+ for ( PluginPrerequisites pluginPrerequisites : pluginsPrerequisites )
{
sink.tableRow();
sink.tableCell();
- sink.link( prerequisites.getPluginInfoUrl( mavenJDKInformation.getPluginName() ) );
- sink.text( mavenJDKInformation.getPluginName() );
+ sink.link( prerequisites.getPluginInfoUrl( pluginPrerequisites.getPluginName() ) );
+ sink.text( pluginPrerequisites.getPluginName() );
sink.link_();
sink.text( " " );
- sink.text( mavenJDKInformation.getPluginVersion() );
+ sink.text( pluginPrerequisites.getPluginVersion() );
sink.tableCell_();
sink.tableCell();
- sink.text( mavenJDKInformation.getMavenVersion().toString() );
+ sink.text( pluginPrerequisites.getMavenVersion().toString() );
sink.tableCell_();
sink.tableCell();
- sink.text( mavenJDKInformation.getJdkVersion() );
+ sink.text( pluginPrerequisites.getJdkVersion() );
sink.tableCell_();
sink.tableRow_();
}
Copied: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/PluginPrerequisites.java (from r1632736, 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/PluginPrerequisites.java?p2=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/PluginPrerequisites.java&p1=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenJDKInformation.java&r1=1632736&r2=1632754&rev=1632754&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/PluginPrerequisites.java Sat Oct 18 11:15:28 2014
@@ -26,7 +26,7 @@ import org.apache.maven.artifact.version
* @author Karl Heinz Marbaise
*
*/
-public class MavenJDKInformation
+public class PluginPrerequisites
{
private String pluginName;
@@ -36,7 +36,7 @@ public class MavenJDKInformation
private String jdkVersion;
- public MavenJDKInformation( String pluginName, String pluginVersion, String mavenVersion, String jdkVersion )
+ public PluginPrerequisites( String pluginName, String pluginVersion, String mavenVersion, String jdkVersion )
{
this.pluginName = pluginName;
this.pluginVersion = pluginVersion;
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/index.md
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/index.md?rev=1632754&r1=1632753&r2=1632754&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/index.md (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/index.md Sat Oct 18 11:15:28 2014
@@ -32,7 +32,7 @@ Results are displayed in 3 reports:
In addition, dist-tool-plugin provides report for some interesting information about Maven artifacts:
-* [Plugins Prerequisites][7] report, displaying plugins' Maven and JDK version prerequisites.
+* [List Plugins Prerequisites][7] report, displaying plugins' Maven and JDK version prerequisites.
Notice that this plugin is actually intended for Maven itself only: if interest is expressed to use it
in other context, it would require more configurations.
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/site.xml?rev=1632754&r1=1632753&r2=1632754&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/site.xml (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/site.xml Sat Oct 18 11:15:28 2014
@@ -40,7 +40,7 @@ under the License.
<item name="Check Index Pages" href="dist-tool-check-index-page.html" />
</menu>
<menu name="Dist Tool Informations">
- <item name="Plugins Prerequisites" href="dist-tool-prerequisites.html" />
+ <item name="List Plugins Prerequisites" href="dist-tool-prerequisites.html" />
</menu>
<menu name="for dev">
<item name="TODO" href="todo.html" />