You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/11/14 21:57:47 UTC
svn commit: r1409391 - in /maven/plugins/trunk/maven-invoker-plugin/src:
it/invoker-report/src/it/skip-jre/ it/invoker-report/src/it/skip-maven/
it/invoker-report/src/it/skip-os/
main/java/org/apache/maven/plugin/invoker/ main/resources/
Author: rfscholte
Date: Wed Nov 14 20:57:45 2012
New Revision: 1409391
URL: http://svn.apache.org/viewvc?rev=1409391&view=rev
Log:
[MINVOKER-124] Reporting the reason for skipping an integration tests
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-jre/
maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-jre/invoker.properties
maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-jre/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-maven/
maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-maven/invoker.properties
maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-maven/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-os/
maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-os/invoker.properties
maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-os/pom.xml
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report.properties
maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_de.properties
maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_fr.properties
Added: maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-jre/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-jre/invoker.properties?rev=1409391&view=auto
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-jre/invoker.properties (added)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-jre/invoker.properties Wed Nov 14 20:57:45 2012
@@ -0,0 +1,2 @@
+invoker.description = A build job skipped due to JRE version.
+invoker.java.version = 1.0
\ No newline at end of file
Added: maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-jre/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-jre/pom.xml?rev=1409391&view=auto
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-jre/pom.xml (added)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-jre/pom.xml Wed Nov 14 20:57:45 2012
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+</project>
Added: maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-maven/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-maven/invoker.properties?rev=1409391&view=auto
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-maven/invoker.properties (added)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-maven/invoker.properties Wed Nov 14 20:57:45 2012
@@ -0,0 +1,2 @@
+invoker.description = A build job skipped due to Maven version.
+invoker.maven.version = 2.1.5
\ No newline at end of file
Added: maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-maven/pom.xml?rev=1409391&view=auto
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-maven/pom.xml (added)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-maven/pom.xml Wed Nov 14 20:57:45 2012
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+</project>
Added: maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-os/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-os/invoker.properties?rev=1409391&view=auto
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-os/invoker.properties (added)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-os/invoker.properties Wed Nov 14 20:57:45 2012
@@ -0,0 +1,2 @@
+invoker.description = A build job skipped due to Operation System.
+invoker.os.family = ties
\ No newline at end of file
Added: maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-os/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-os/pom.xml?rev=1409391&view=auto
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-os/pom.xml (added)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/skip-os/pom.xml Wed Nov 14 20:57:45 2012
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+</project>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1409391&r1=1409390&r2=1409391&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java Wed Nov 14 20:57:45 2012
@@ -1340,31 +1340,36 @@ public abstract class AbstractInvokerMoj
{
buildJob.setResult( BuildJob.Result.SKIPPED );
- if ( !suppressSummaries )
+ StringBuilder message = new StringBuilder();
+ if ( ( selection & SELECTOR_MAVENVERSION ) != 0 )
{
- StringBuilder message = new StringBuilder();
- if ( ( selection & SELECTOR_MAVENVERSION ) != 0 )
- {
- message.append( "Maven version" );
- }
- if ( ( selection & SELECTOR_JREVERSION ) != 0 )
+ message.append( "Maven version" );
+ }
+ if ( ( selection & SELECTOR_JREVERSION ) != 0 )
+ {
+ if( message.length() > 0 )
{
- if( message.length() > 0 )
- {
- message.append( ", " );
- }
- message.append( "JRE version" );
+ message.append( ", " );
}
- if ( ( selection & SELECTOR_OSFAMILY ) != 0 )
+ message.append( "JRE version" );
+ }
+ if ( ( selection & SELECTOR_OSFAMILY ) != 0 )
+ {
+ if( message.length() > 0 )
{
- if( message.length() > 0 )
- {
- message.append( ", " );
- }
- message.append( "OS" );
+ message.append( ", " );
}
+ message.append( "OS" );
+ }
+
+ if ( !suppressSummaries )
+ {
getLog().info( "..SKIPPED due to " + message.toString() );
}
+
+ // Abuse failureMessage, the field in the report which should contain the reason for skipping
+ // Consider skipCode + I18N
+ buildJob.setFailureMessage( "Skipped due to " + message.toString() );
}
}
catch ( RunErrorException e )
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java?rev=1409391&r1=1409390&r2=1409391&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java Wed Nov 14 20:57:45 2012
@@ -223,6 +223,7 @@ public class InvokerReport
sinkTableHeader( sink, getText( locale, "report.invoker.summary.number" ) );
sinkTableHeader( sink, getText( locale, "report.invoker.summary.success" ) );
sinkTableHeader( sink, getText( locale, "report.invoker.summary.failed" ) );
+ sinkTableHeader( sink, getText( locale, "report.invoker.summary.skipped" ) );
sinkTableHeader( sink, getText( locale, "report.invoker.summary.success.rate" ) );
sinkTableHeader( sink, getText( locale, "report.invoker.summary.time.total" ) );
sinkTableHeader( sink, getText( locale, "report.invoker.summary.time.avg" ) );
@@ -230,6 +231,7 @@ public class InvokerReport
int number = buildJobs.size();
int success = 0;
int failed = 0;
+ int skipped = 0;
double totalTime = 0;
for ( BuildJob buildJob : buildJobs )
@@ -238,7 +240,11 @@ public class InvokerReport
{
success++;
}
- else if ( !BuildJob.Result.SKIPPED.equals( buildJob.getResult() ) )
+ else if ( BuildJob.Result.SKIPPED.equals( buildJob.getResult() ) )
+ {
+ skipped++;
+ }
+ else
{
failed++;
}
@@ -251,6 +257,7 @@ public class InvokerReport
sinkCell( sink, Integer.toString( number ) );
sinkCell( sink, Integer.toString( success ) );
sinkCell( sink, Integer.toString( failed ) );
+ sinkCell( sink, Integer.toString( skipped ) );
if ( success + failed > 0 )
{
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report.properties?rev=1409391&r1=1409390&r2=1409391&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report.properties (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report.properties Wed Nov 14 20:57:45 2012
@@ -22,6 +22,7 @@ report.invoker.summary.title = Su
report.invoker.summary.number = Builds
report.invoker.summary.success = Success
report.invoker.summary.failed = Failures
+report.invoker.summary.skipped = Skipped
report.invoker.summary.success.rate = Success Rate
report.invoker.summary.time.total = Total Time
report.invoker.summary.time.avg = Avg Time
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_de.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_de.properties?rev=1409391&r1=1409390&r2=1409391&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_de.properties (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_de.properties Wed Nov 14 20:57:45 2012
@@ -22,6 +22,7 @@ report.invoker.summary.title = Zu
report.invoker.summary.number = Builds
report.invoker.summary.success = Erfolge
report.invoker.summary.failed = Fehlschl\u00E4ge
+report.invoker.summary.skipped = Ausgelassen
report.invoker.summary.success.rate = Erfolgsrate
report.invoker.summary.time.total = Gesamtzeit
report.invoker.summary.time.avg = Durchschnittszeit
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_fr.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_fr.properties?rev=1409391&r1=1409390&r2=1409391&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_fr.properties (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_fr.properties Wed Nov 14 20:57:45 2012
@@ -22,6 +22,7 @@ report.invoker.summary.title = So
report.invoker.summary.number = Builds
report.invoker.summary.success = Réussis
report.invoker.summary.failed = Echecs
+report.invoker.summary.skipped = Ignoré
report.invoker.summary.success.rate = Taux de réussite
report.invoker.summary.time.total = Durée totale
report.invoker.summary.time.avg = Durée moyenne