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 2015/09/06 18:46:57 UTC

svn commit: r1701499 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version: invoker.properties plugin/pom.xml pluginManagement/pom.xml property/pom.xml verify.groovy

Author: hboutemy
Date: Sun Sep  6 16:46:56 2015
New Revision: 1701499

URL: http://svn.apache.org/r1701499
Log:
[MINVOKER-194] removed config for analysis now that this is explained by invoker config in parent pom (see r1646983)

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/plugin/pom.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/pluginManagement/pom.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/property/pom.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/verify.groovy

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=1701499&r1=1701498&r2=1701499&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 Sun Sep  6 16:46:56 2015
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:summary help:effective-pom -Doutput=effective-poms.xml
+invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:summary

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/plugin/pom.xml?rev=1701499&r1=1701498&r2=1701499&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/plugin/pom.xml Sun Sep  6 16:46:56 2015
@@ -32,8 +32,8 @@ under the License.
   <name>target bytecode defined by plugin configuration: 1.5 expected</name>
 
   <properties><!-- will be overridden -->
-    <maven.compiler.source>1.3</maven.compiler.source>
-    <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
+    <maven.compiler.source>${maven.compiler.target}</maven.compiler.source>
+    <maven.compiler.target>1.3</maven.compiler.target>
   </properties>
 
   <build>

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/pluginManagement/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/pluginManagement/pom.xml?rev=1701499&r1=1701498&r2=1701499&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/pluginManagement/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/pluginManagement/pom.xml Sun Sep  6 16:46:56 2015
@@ -32,8 +32,8 @@ under the License.
   <name>target bytecode defined by pluginManagement configuration: 1.4 expected</name>
 
   <properties><!-- will be overridden -->
-    <maven.compiler.source>1.3</maven.compiler.source>
-    <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
+    <maven.compiler.source>${maven.compiler.target}</maven.compiler.source>
+    <maven.compiler.target>1.3</maven.compiler.target>
   </properties>
 
   <build>

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/property/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/property/pom.xml?rev=1701499&r1=1701498&r2=1701499&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/property/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/it/java-version/property/pom.xml Sun Sep  6 16:46:56 2015
@@ -35,7 +35,9 @@ under the License.
     <maven.compiler.source>1.3</maven.compiler.source>
     <maven.compiler.target>1.3</maven.compiler.target>
     <!--maven.compiler.target>${maven.compiler.source}</maven.compiler.target-->
-    <!-- MINVOKER-194: with Maven 3.3.x, this ${maven.compiler.source} property is interpolated
-         in invoker to 1.5 instead of 1.3 -->
+    <!-- can't use ${maven.compiler.source} property since it is interpolated
+         in invoker to 1.5 instead of 1.3 because of http://svn.apache.org/r1646983
+         see MINVOKER-194 for detailed analysis
+    -->
   </properties>
 </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=1701499&r1=1701498&r2=1701499&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 Sun Sep  6 16:46:56 2015
@@ -21,10 +21,4 @@ assert new File( basedir, 'plugin/target
 assert new File( basedir, 'pluginManagement/target/site/project-summary.html' ).text.contains( '<td>1.4</td>' )
 assert new File( basedir, 'property/target/site/project-summary.html' ).text.contains( '<td>1.3</td>' )
 
-// trying to understand MINVOKER-194 bug when IT run with Maven 3.3.x
-if ( new File( basedir, 'effective-poms.xml' ).text.contains( '<maven.compiler.target>1.5</maven.compiler.target>' ) )
-{
-  println "WARN: MINVOKER-194 unexpected <maven.compiler.target>1.5</maven.compiler.target> in effective pom: should be 1.3"
-}
-
 return true;
\ No newline at end of file