You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2009/07/21 14:57:40 UTC
svn commit: r796281 -
/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Author: vsiveton
Date: Tue Jul 21 12:57:39 2009
New Revision: 796281
URL: http://svn.apache.org/viewvc?rev=796281&view=rev
Log:
o make getFullClirrGoal() static
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=796281&r1=796280&r2=796281&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java Tue Jul 21 12:57:39 2009
@@ -634,51 +634,6 @@
}
/**
- * @return the full clirr goal, i.e. <code>groupId:artifactId:version:goal</code>. The clirr-plugin version
- * could be load from the pom.properties in the clirr-maven-plugin dependency.
- */
- private String getFullClirrGoal()
- {
- StringBuffer sb = new StringBuffer();
-
- sb.append( CLIRR_MAVEN_PLUGIN_GROUPID ).append( ":" );
- sb.append( CLIRR_MAVEN_PLUGIN_ARTIFACTID ).append( ":" );
- String clirrVersion = CLIRR_MAVEN_PLUGIN_VERSION;
- InputStream resourceAsStream = null;
- try
- {
- String resource =
- "META-INF/maven/" + CLIRR_MAVEN_PLUGIN_GROUPID + "/" + CLIRR_MAVEN_PLUGIN_ARTIFACTID
- + "/pom.properties";
- resourceAsStream = AbstractFixJavadocMojo.class.getClassLoader().getResourceAsStream( resource );
-
- if ( resourceAsStream != null )
- {
- Properties properties = new Properties();
- properties.load( resourceAsStream );
-
- if ( StringUtils.isNotEmpty( properties.getProperty( "version" ) ) )
- {
- clirrVersion = properties.getProperty( "version" );
- }
- }
- }
- catch ( IOException e )
- {
- // nop
- }
- finally
- {
- IOUtil.close( resourceAsStream );
- }
-
- sb.append( clirrVersion ).append( ":" );
- sb.append( CLIRR_MAVEN_PLUGIN_GOAL );
-
- return sb.toString();
- }
-
- /**
* @param clirrTextOutputFile not null
* @throws IOException if any
*/
@@ -2866,6 +2821,51 @@
}
/**
+ * @return the full clirr goal, i.e. <code>groupId:artifactId:version:goal</code>. The clirr-plugin version
+ * could be load from the pom.properties in the clirr-maven-plugin dependency.
+ */
+ private static String getFullClirrGoal()
+ {
+ StringBuffer sb = new StringBuffer();
+
+ sb.append( CLIRR_MAVEN_PLUGIN_GROUPID ).append( ":" );
+ sb.append( CLIRR_MAVEN_PLUGIN_ARTIFACTID ).append( ":" );
+ String clirrVersion = CLIRR_MAVEN_PLUGIN_VERSION;
+ InputStream resourceAsStream = null;
+ try
+ {
+ String resource =
+ "META-INF/maven/" + CLIRR_MAVEN_PLUGIN_GROUPID + "/" + CLIRR_MAVEN_PLUGIN_ARTIFACTID
+ + "/pom.properties";
+ resourceAsStream = AbstractFixJavadocMojo.class.getClassLoader().getResourceAsStream( resource );
+
+ if ( resourceAsStream != null )
+ {
+ Properties properties = new Properties();
+ properties.load( resourceAsStream );
+
+ if ( StringUtils.isNotEmpty( properties.getProperty( "version" ) ) )
+ {
+ clirrVersion = properties.getProperty( "version" );
+ }
+ }
+ }
+ catch ( IOException e )
+ {
+ // nop
+ }
+ finally
+ {
+ IOUtil.close( resourceAsStream );
+ }
+
+ sb.append( clirrVersion ).append( ":" );
+ sb.append( CLIRR_MAVEN_PLUGIN_GOAL );
+
+ return sb.toString();
+ }
+
+ /**
* Default comment for class.
*
* @param javaClass not null