maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1612116 - in /maven/plugins/trunk/maven-project-info-reports-plugin: pom.xml src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
Date Sun, 20 Jul 2014 16:38:26 GMT
Author: hboutemy
Date: Sun Jul 20 16:38:26 2014
New Revision: 1612116

URL: http://svn.apache.org/r1612116
Log:
replaced @Component with @parameter for Maven internals

Modified:
    maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=1612116&r1=1612115&r2=1612116&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Sun Jul 20 16:38:26 2014
@@ -117,8 +117,8 @@ under the License.
     <mavenVersion>2.2.1</mavenVersion>
     <wagonVersion>1.0</wagonVersion>
     <scmVersion>1.8</scmVersion>
-    <sitePluginVersion>3.3</sitePluginVersion>
-    <mavenPluginVersion>3.2</mavenPluginVersion>
+    <sitePluginVersion>3.4</sitePluginVersion>
+    <mavenPluginVersion>3.3</mavenPluginVersion>
   </properties>
 
   <dependencies>

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=1612116&r1=1612115&r2=1612116&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
Sun Jul 20 16:38:26 2014
@@ -128,7 +128,7 @@ public abstract class AbstractProjectInf
     /**
      * The Maven Project.
      */
-    @Component
+    @Parameter( defaultValue = "${project}", readonly = true )
     protected MavenProject project;
 
     /**
@@ -150,7 +150,7 @@ public abstract class AbstractProjectInf
      *
      * @since 2.3
      */
-    @Component
+    @Parameter( defaultValue = "${settings}", readonly = true )
     protected Settings settings;
 
     /**

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java?rev=1612116&r1=1612115&r2=1612116&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
Sun Jul 20 16:38:26 2014
@@ -23,7 +23,6 @@ import org.apache.commons.validator.rout
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.util.HtmlTools;
 import org.apache.maven.model.License;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
@@ -56,12 +55,6 @@ public class LicenseReport
     // ----------------------------------------------------------------------
 
     /**
-     * The Maven Settings.
-     */
-    @Component
-    private Settings settings;
-
-    /**
      * Whether the system is currently offline.
      */
     @Parameter( property = "settings.offline" )



Mime
View raw message