Skip to content

Commit

Permalink
Bump maven-reporting-impl from 3.0.0 to 3.2.0 (#452)
Browse files Browse the repository at this point in the history
* Bump maven-reporting-impl from 3.0.0 to 3.2.0

Bumps [maven-reporting-impl](https://github.com/apache/maven-reporting-impl) from 3.0.0 to 3.2.0.
- [Release notes](https://github.com/apache/maven-reporting-impl/releases)
- [Commits](apache/maven-reporting-impl@maven-reporting-impl-3.0.0...maven-reporting-impl-3.2.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.reporting:maven-reporting-impl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fix AbstractThirdPartyReportMojo implementation

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Slawomir Jaranowski <[email protected]>
  • Loading branch information
dependabot[bot] and slawekjaranowski committed Jun 6, 2023
1 parent 1a01832 commit 82f9e43
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 57 deletions.
8 changes: 7 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,13 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>3.0.0</version>
<version>3.2.0</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Doxia -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
Expand Down Expand Up @@ -271,16 +270,6 @@ public abstract class AbstractThirdPartyReportMojo extends AbstractMavenReport
@Parameter( property = "license.licenseMergesUrl" )
protected String licenseMergesUrl;

/**
* 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.
*
* @since 1.1
*/
@Parameter( defaultValue = "${project.reporting.outputDirectory}", required = true )
private File outputDirectory;

/**
* Flag to activate verbose mode.
* <p>
Expand All @@ -303,26 +292,10 @@ public abstract class AbstractThirdPartyReportMojo extends AbstractMavenReport
@Parameter( property = "license.encoding", defaultValue = "${project.build.sourceEncoding}" )
private String encoding;

/**
* The Maven Project.
*
* @since 1.1
*/
@Parameter( defaultValue = "${project}", readonly = true )
private MavenProject project;

// ----------------------------------------------------------------------
// Plexus Components
// ----------------------------------------------------------------------

/**
* Doxia Site Renderer component.
*
* @since 1.1
*/
@Component
private Renderer siteRenderer;

/**
* Internationalization component.
*
Expand Down Expand Up @@ -461,35 +434,7 @@ protected void executeReport( Locale locale )
/**
* {@inheritDoc}
*/
protected MavenProject getProject()
{
return project;
}

/**
* {@inheritDoc}
*/
protected String getOutputDirectory()
{
if ( !outputDirectory.isAbsolute() )
{
outputDirectory = new File( project.getBasedir(), outputDirectory.getPath() );
}

return outputDirectory.getAbsolutePath();
}

/**
* {@inheritDoc}
*/
protected Renderer getSiteRenderer()
{
return siteRenderer;
}

/**
* {@inheritDoc}
*/
@Override
public String getDescription( Locale locale )
{
return i18n.getString( getOutputName(), locale, "report.description" );
Expand All @@ -498,6 +443,7 @@ public String getDescription( Locale locale )
/**
* {@inheritDoc}
*/
@Override
public String getName( Locale locale )
{
return i18n.getString( getOutputName(), locale, "report.title" );
Expand All @@ -510,6 +456,7 @@ public String getName( Locale locale )
/**
* {@inheritDoc}
*/
@Override
public boolean isIncludeTransitiveDependencies()
{
return includeTransitiveDependencies;
Expand All @@ -518,12 +465,14 @@ public boolean isIncludeTransitiveDependencies()
/**
* {@inheritDoc}
*/
@Override
public boolean isExcludeTransitiveDependencies()
{
return excludeTransitiveDependencies;
}

/** {@inheritDoc} */
@Override
public ArtifactFilters getArtifactFilters()
{
if ( artifactFilters == null )
Expand All @@ -538,6 +487,7 @@ public ArtifactFilters getArtifactFilters()
/**
* {@inheritDoc}
*/
@Override
public boolean isVerbose()
{
return verbose;
Expand Down

0 comments on commit 82f9e43

Please sign in to comment.