You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/12/14 12:21:58 UTC
[maven-invoker-plugin] branch MINVOKER-315 updated (8f50dc4 -> b99f3c1)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MINVOKER-315
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
omit 8f50dc4 [MINVOKER-315] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
add bfb75f9 Use shared action v3 for release-drafter
add 5e5c120 [MINVOKER-316] Refresh plugins versions in IT tests
add 22f12f6 Disable merge button and add jira autolink
add bf51507 Update download page
new b99f3c1 [MINVOKER-315] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8f50dc4)
\
N -- N -- N refs/heads/MINVOKER-315 (b99f3c1)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.asf.yaml | 6 ++
.github/workflows/release-drafter.yml | 2 +-
pom.xml | 12 +++
src/it/MINVOKER-191/pom.xml | 6 +-
src/it/MINVOKER-196_junit_report_file/pom.xml | 4 +-
.../src/it/project_2/pom.xml | 2 +-
src/it/invocation-cmdline-exclude/pom.xml | 1 +
.../src/it/minvoker-140-executable/pom.xml | 2 +-
.../src/it/minvoker-140-ignorable/pom.xml | 2 +-
src/it/invocation-debug/pom.xml | 1 +
.../invocation-debug/src/it/minvoker-142/pom.xml | 2 +-
src/it/invocation-emptyproperty/pom.xml | 1 +
.../src/it/minvoker-118/pom.xml | 2 +-
src/it/invocation-environmentvariable/pom.xml | 2 +
.../src/it/minvoker-145/pom.xml | 2 +-
.../src/it/minvoker-255/pom.xml | 2 +-
.../src/it/minvoker-273/pom.xml | 2 +-
.../src/it/projects/group-1/sub-1/pom.xml | 2 +-
.../src/it/projects/group-1/sub-2/pom.xml | 2 +-
.../src/it/projects/group-2/sub-1/pom.xml | 2 +-
.../src/it/projects/group-2/sub-2/pom.xml | 2 +-
src/it/invocation-multiple/pom.xml | 7 ++
src/it/invocation-multiple/src/it/project/pom.xml | 17 +--
src/it/invocation-reactor-indirect/pom.xml | 6 +-
src/it/invocation-spaces/pom.xml | 5 +
.../src/it projects/project/spacy pom.xml | 10 +-
src/it/local-repo-path/pom.xml | 6 +-
src/it/local-repo-url/pom.xml | 4 +-
src/it/pom-filtering-encoding/pom.xml | 4 +
.../pom-filtering-encoding/src/it/latin-1/pom.xml | 2 +-
src/it/pom-filtering-encoding/src/it/utf-8/pom.xml | 2 +-
src/it/pom-filtering/pom.xml | 1 +
src/it/pom-filtering/src/it/project/pom.xml | 2 +-
src/it/postbuild-executed-only-once/pom.xml | 2 +
.../src/it/project/pom.xml | 4 +-
src/it/settings-inherit/pom.xml | 1 +
src/it/settings-inherit/src/it/project/pom.xml | 2 +-
src/it/settings-merge/pom.xml | 1 +
src/it/settings-merge/src/it/project/pom.xml | 2 +-
src/it/settings-merge_jdk9+/pom.xml | 2 +
src/it/settings-merge_jdk9+/src/it/project/pom.xml | 4 +-
src/it/settings-override/pom.xml | 1 +
src/it/settings-override/src/it/project/pom.xml | 2 +-
src/it/spaces-should-work_non-windows/pom.xml | 1 +
.../src/it/minvoker-test/pom.xml | 2 +-
src/it/spaces-should-work_windows/pom.xml | 1 +
.../src/it/minvoker-test/pom.xml | 2 +-
src/it/special-characters-should-work/pom.xml | 1 +
.../src/it/minvoker-test/pom.xml | 2 +-
src/it/staging-pom/pom.xml | 2 +-
src/it/staging-reactor/mod1-parent/pom.xml | 2 +-
src/it/staging-reactor/mod2/pom.xml | 2 +-
src/it/staging-reactor/pom.xml | 2 +-
src/it/updateOnly/pom.xml | 2 +-
src/site/xdoc/download.xml.vm | 117 ++++++---------------
55 files changed, 144 insertions(+), 138 deletions(-)
[maven-invoker-plugin] 01/01: [MINVOKER-315] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MINVOKER-315
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
commit b99f3c1fe8914dd4d983dbfe778e3dde17fe17b1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Dec 11 23:37:38 2022 +0100
[MINVOKER-315] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
This closes #155
---
pom.xml | 32 +++++++++++++++-
.../maven/plugins/invoker/InvokerReport.java | 43 +++-------------------
2 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/pom.xml b/pom.xml
index fe018b0..1a30a4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,11 +143,23 @@ under the License.
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- shared -->
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>3.1.1</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -156,6 +168,13 @@ under the License.
</exclusions>
</dependency>
+ <!-- doxia -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>1.11.1</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
@@ -213,6 +232,17 @@ under the License.
<artifactId>plexus-interpolation</artifactId>
<version>1.26</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-i18n</artifactId>
+ <version>1.0-beta-10</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
diff --git a/src/main/java/org/apache/maven/plugins/invoker/InvokerReport.java b/src/main/java/org/apache/maven/plugins/invoker/InvokerReport.java
index 316a6f4..71fff65 100644
--- a/src/main/java/org/apache/maven/plugins/invoker/InvokerReport.java
+++ b/src/main/java/org/apache/maven/plugins/invoker/InvokerReport.java
@@ -30,13 +30,11 @@ import java.util.List;
import java.util.Locale;
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.plugins.invoker.model.BuildJob;
import org.apache.maven.plugins.invoker.model.io.xpp3.BuildJobXpp3Reader;
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;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.plexus.i18n.I18N;
@@ -58,32 +56,12 @@ public class InvokerReport
extends AbstractMavenReport
{
- /**
- * The Maven Project.
- */
- @Parameter( defaultValue = "${project}", readonly = true, required = true )
- protected MavenProject project;
-
- /**
- * Doxia Site Renderer component.
- */
- @Component
- protected Renderer siteRenderer;
-
/**
* Internationalization component.
*/
@Component
protected I18N i18n;
- /**
- * The output directory for the report. Note that this parameter is only evaluated if the goal is run directly from
- * the command line. If the goal is run indirectly as part of a site generation, the output directory configured in
- * the Maven Site Plugin is used instead.
- */
- @Parameter( defaultValue = "${project.reporting.outputDirectory}", required = true )
- protected File outputDirectory;
-
/**
* Base directory where all build reports have been written to.
*/
@@ -185,6 +163,7 @@ public class InvokerReport
// detail tests table header
sink.table();
+ sink.tableRows( null, false );
sink.tableRow();
// -------------------------------------------
@@ -202,6 +181,7 @@ public class InvokerReport
renderBuildJob( buildJob );
}
+ sink.tableRows_();
sink.table_();
sink.body_();
@@ -228,6 +208,8 @@ public class InvokerReport
// ------------------------------------------------------------------------
sink.table();
+ sink.tableRows( null, false );
+
sink.tableRow();
sinkTableHeader( sink, getText( locale, "report.invoker.summary.number" ) );
@@ -283,6 +265,8 @@ public class InvokerReport
sinkCell( sink, secondsFormat.format( totalTime / number ) );
sink.tableRow_();
+
+ sink.tableRows_();
sink.table_();
}
@@ -337,21 +321,6 @@ public class InvokerReport
return nameAndDescriptionFormat.format( new Object[] { name, description } );
}
- protected String getOutputDirectory()
- {
- return outputDirectory.getAbsolutePath();
- }
-
- protected MavenProject getProject()
- {
- return project;
- }
-
- protected Renderer getSiteRenderer()
- {
- return siteRenderer;
- }
-
public String getDescription( Locale locale )
{
return getText( locale, "report.invoker.result.description" );