svn commit: r1647803 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src: it/java-version/invoker.properties it/java-version/pom.xml it/java-version/verify.groovy main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java

[hb...@apache.org]

Author: hboutemy
Date: Wed Dec 24 15:08:58 2014
New Revision: 1647803

URL: http://svn.apache.org/r1647803
Log:
[MPIR-263] improved minimum java requirement when m-compiler-p not explicitely configured: use default properties

Modified:
    maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/invoker.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/pom.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/verify.groovy
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/invoker.properties?rev=1647803&r1=1647802&r2=1647803&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/invoker.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/invoker.properties Wed Dec 24 15:08:58 2014
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals = project-info-reports:summary
+invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:summary

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/pom.xml?rev=1647803&r1=1647802&r2=1647803&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/pom.xml Wed Dec 24 15:08:58 2014
@@ -43,4 +43,15 @@
     <module>pluginManagement</module>
     <module>property</module>
   </modules>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.2</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/verify.groovy?rev=1647803&r1=1647802&r2=1647803&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/verify.groovy (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/verify.groovy Wed Dec 24 15:08:58 2014
@@ -19,6 +19,6 @@
 
 assert new File( basedir, 'plugin/target/site/project-summary.html' ).text.contains( '<td>1.5</td>' )
 assert new File( basedir, 'pluginManagement/target/site/project-summary.html' ).text.contains( '<td>1.4</td>' )
-//MPIR-263: assert new File( basedir, 'property/target/site/project-summary.html' ).text.contains( '<td>1.3</td>' )
+assert new File( basedir, 'property/target/site/project-summary.html' ).text.contains( '<td>1.3</td>' )
 
 return true;
\ No newline at end of file

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java?rev=1647803&r1=1647802&r2=1647803&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java Wed Dec 24 15:08:58 2014
@@ -23,7 +23,6 @@ import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.model.DistributionManagement;
 import org.apache.maven.model.Organization;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.MavenReportException;
 import org.codehaus.plexus.util.FileUtils;
@@ -180,8 +179,10 @@ public class ProjectSummaryReport
             }
             else
             {
-                // no source, target, compilerVersion: toolchain? default target attribute of current
-                // maven-compiler-plugin's version? analyze packaged jar (like dependencies)?
+                // ${maven.compiler.target} default value
+                minimumJavaVersion = project.getProperties().getProperty( "maven.compiler.target" );
+
+                // default to 1.5 if not set?
             }
 
             return minimumJavaVersion;