Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-reporting-impl for
openSUSE:Factory checked in at 2023-09-25 20:02:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-reporting-impl (Old)
and /work/SRC/openSUSE:Factory/.maven-reporting-impl.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-reporting-impl"
Mon Sep 25 20:02:47 2023 rev:5 rq:1113248 version:3.2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-reporting-impl/maven-reporting-impl.changes
2023-09-07 21:14:09.280337416 +0200
+++
/work/SRC/openSUSE:Factory/.maven-reporting-impl.new.1770/maven-reporting-impl.changes
2023-09-25 20:51:44.407358016 +0200
@@ -1,0 +2,15 @@
+Sun Sep 24 01:58:46 UTC 2023 - Fridrich Strba <[email protected]>
+
+- Upgrade to version 3.2.0
+ * Improvement:
+ + MSHARED-1099 - Render with a skin when report is run in
+ standalone mode
+ * Dependency upgrades:
+ + MSHARED-1120 - Upgrade Maven Reporting API to 3.1.1
+ + MSHARED-1121 - Upgrade plugins and components in project and
+ ITs
+- Modified patch:
+ * 0001-Remove-dependency-on-junit-addons.patch
+ + rediff
+
+-------------------------------------------------------------------
Old:
----
maven-reporting-impl-3.1.0-source-release.zip
New:
----
maven-reporting-impl-3.2.0-source-release.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-reporting-impl.spec ++++++
--- /var/tmp/diff_new_pack.1oJhVd/_old 2023-09-25 20:51:45.555399489 +0200
+++ /var/tmp/diff_new_pack.1oJhVd/_new 2023-09-25 20:51:45.555399489 +0200
@@ -17,7 +17,7 @@
Name: maven-reporting-impl
-Version: 3.1.0
+Version: 3.2.0
Release: 0
Summary: Abstract classes to manage report generation
License: Apache-2.0
@@ -37,7 +37,7 @@
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-lib
BuildRequires: maven-plugin-annotations
-BuildRequires: maven-reporting-api
+BuildRequires: maven-reporting-api >= 3.1.1
BuildRequires: maven-shared-utils
BuildRequires: plexus-utils
BuildRequires: unzip
@@ -63,8 +63,6 @@
cp %{SOURCE1} build.xml
%patch0 -p1
-%pom_remove_parent
-
# integration tests try to download stuff from the internet
# and therefore they don't work in Build Service
%pom_remove_plugin :maven-invoker-plugin
@@ -78,7 +76,10 @@
maven-doxia/doxia-module-xhtml5 \
maven-doxia/doxia-sink-api \
maven-doxia-sitetools/doxia-decoration-model \
+ maven-doxia-sitetools/doxia-integration-tools \
maven-doxia-sitetools/doxia-site-renderer \
+ maven/maven-artifact \
+ maven/maven-compat \
maven/maven-core \
maven/maven-plugin-api \
maven-plugin-tools/maven-plugin-annotations \
++++++ 0001-Remove-dependency-on-junit-addons.patch ++++++
--- /var/tmp/diff_new_pack.1oJhVd/_old 2023-09-25 20:51:45.571400067 +0200
+++ /var/tmp/diff_new_pack.1oJhVd/_new 2023-09-25 20:51:45.575400212 +0200
@@ -1,7 +1,20 @@
---- maven-reporting-impl-3.1.0/pom.xml 2022-03-10 17:08:29.894389771 +0100
-+++ maven-reporting-impl-3.1.0/pom.xml 2022-03-10 17:09:12.654649105 +0100
-@@ -140,12 +140,6 @@
- <version>4.13.1</version>
+From b087582c8bbe88ac8fd3a59c129d4bd7953a720f Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <[email protected]>
+Date: Wed, 9 Feb 2022 14:37:18 -0700
+Subject: [PATCH] Remove dependency on junit-addons
+
+---
+ pom.xml | 6 ------
+ .../maven/reporting/AbstractMavenReportRenderer.java | 2 +-
+ .../reporting/AbstractMavenReportRendererTest.java | 10 ++--------
+ 3 files changed, 3 insertions(+), 15 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index d46a817..6b6295c 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -151,12 +151,6 @@
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
- <dependency>
@@ -13,9 +26,11 @@
</dependencies>
<build>
----
maven-reporting-impl-3.1.0/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
2022-03-10 17:08:29.894389771 +0100
-+++
maven-reporting-impl-3.1.0/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
2022-03-10 17:09:12.654649105 +0100
-@@ -599,7 +599,7 @@
+diff --git
a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
+index 4c9a07c..4693e1d 100644
+--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
++++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
+@@ -599,7 +599,7 @@ public abstract class AbstractMavenRepor
* @param text a text with or without the pattern <code>{text, url}</code>
* @return a map of text/href
*/
@@ -24,9 +39,11 @@
{
if ( StringUtils.isEmpty( text ) )
{
----
maven-reporting-impl-3.1.0/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
2022-03-10 17:08:29.898389795 +0100
-+++
maven-reporting-impl-3.1.0/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
2022-03-10 17:09:12.654649105 +0100
-@@ -24,7 +24,8 @@
+diff --git
a/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
b/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
+index cdb9299..e8dce8f 100644
+---
a/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
++++
b/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
+@@ -24,7 +24,8 @@ import java.util.List;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -36,7 +53,7 @@
/**
* Test case for some public method in AbstractMavenReportRenderer.
-@@ -32,13 +33,6 @@
+@@ -32,13 +33,6 @@ import junitx.util.PrivateAccessor;
public class AbstractMavenReportRendererTest
extends TestCase
{
@@ -50,4 +67,6 @@
private static void checkPattern( String pattern, String[] expectedResult
) throws Throwable
{
List<String> result = applyPattern( pattern );
+--
+2.34.1
++++++ maven-reporting-impl-3.1.0-source-release.zip ->
maven-reporting-impl-3.2.0-source-release.zip ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-reporting-impl-3.1.0/DEPENDENCIES
new/maven-reporting-impl-3.2.0/DEPENDENCIES
--- old/maven-reporting-impl-3.1.0/DEPENDENCIES 2022-02-05 21:35:12.000000000
+0100
+++ new/maven-reporting-impl-3.2.0/DEPENDENCIES 2022-08-06 21:51:48.000000000
+0200
@@ -45,7 +45,7 @@
License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
- Plexus :: Default Container
(http://codehaus-plexus.github.io/plexus-containers/plexus-container-default/)
org.codehaus.plexus:plexus-container-default:jar:2.1.0
License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Plexus Common Utilities (http://codehaus-plexus.github.io/plexus-utils/)
org.codehaus.plexus:plexus-utils:jar:3.0.24
+ - Plexus Common Utilities (http://codehaus-plexus.github.io/plexus-utils/)
org.codehaus.plexus:plexus-utils:jar:3.3.1
License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
- Plexus Velocity Component
(http://codehaus-plexus.github.io/plexus-components/plexus-velocity/)
org.codehaus.plexus:plexus-velocity:jar:1.2
License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -121,6 +121,8 @@
License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
- Doxia Sitetools :: Decoration Model
(https://maven.apache.org/doxia/doxia-sitetools/doxia-decoration-model/)
org.apache.maven.doxia:doxia-decoration-model:jar:1.11.1
License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Doxia Sitetools :: Integration Tools
(https://maven.apache.org/doxia/doxia-sitetools/doxia-integration-tools/)
org.apache.maven.doxia:doxia-integration-tools:jar:1.11.1
+ License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
- Doxia :: Logging API
(https://maven.apache.org/doxia/doxia/doxia-logging-api/)
org.apache.maven.doxia:doxia-logging-api:jar:1.11.1
License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
- Doxia :: XHTML Module
(https://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xhtml/)
org.apache.maven.doxia:doxia-module-xhtml:jar:1.11.1
@@ -133,9 +135,9 @@
License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
- Doxia Sitetools :: Skin Model
(https://maven.apache.org/doxia/doxia-sitetools/doxia-skin-model/)
org.apache.maven.doxia:doxia-skin-model:jar:1.11.1
License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
- - Apache Maven Reporting API
(https://maven.apache.org/shared/maven-reporting-api/)
org.apache.maven.reporting:maven-reporting-api:jar:3.1.0
+ - Apache Maven Reporting API
(https://maven.apache.org/shared/maven-reporting-api/)
org.apache.maven.reporting:maven-reporting-api:jar:3.1.1
License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
- - Apache Maven Shared Utils
(https://maven.apache.org/shared/maven-shared-utils/)
org.apache.maven.shared:maven-shared-utils:jar:3.3.3
+ - Apache Maven Shared Utils
(https://maven.apache.org/shared/maven-shared-utils/)
org.apache.maven.shared:maven-shared-utils:jar:3.3.4
License: Apache License, Version 2.0
(https://www.apache.org/licenses/LICENSE-2.0.txt)
From: 'The Eclipse Foundation' (http://www.eclipse.org/)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-reporting-impl-3.1.0/pom.xml
new/maven-reporting-impl-3.2.0/pom.xml
--- old/maven-reporting-impl-3.1.0/pom.xml 2022-02-05 21:35:12.000000000
+0100
+++ new/maven-reporting-impl-3.2.0/pom.xml 2022-08-06 21:51:48.000000000
+0200
@@ -29,7 +29,7 @@
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<name>Apache Maven Reporting Implementation</name>
<description>Abstract classes to manage report generation.</description>
@@ -50,7 +50,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-reporting-impl.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-reporting-impl.git</developerConnection>
<url>https://github.com/apache/maven-reporting-impl/tree/${project.scm.tag}</url>
- <tag>maven-reporting-impl-3.1.0</tag>
+ <tag>maven-reporting-impl-3.2.0</tag>
</scm>
<issueManagement>
<system>jira</system>
@@ -58,7 +58,7 @@
</issueManagement>
<ciManagement>
<system>Jenkins</system>
-
<url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-reporting-impl/</url>
+
<url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-reporting-impl/</url>
</ciManagement>
<distributionManagement>
<site>
@@ -68,18 +68,19 @@
</distributionManagement>
<properties>
+ <javaVersion>7</javaVersion>
<mavenVersion>3.1.0</mavenVersion>
<doxiaVersion>1.11.1</doxiaVersion>
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
- <javaVersion>7</javaVersion>
-
<project.build.outputTimestamp>2022-02-05T21:35:12Z</project.build.outputTimestamp>
+ <reportingApiVersion>3.1.1</reportingApiVersion>
+
<project.build.outputTimestamp>2022-08-06T21:51:47Z</project.build.outputTimestamp>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>${reportingApiVersion}</version>
</dependency>
<!-- Maven -->
@@ -90,13 +91,18 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4</version>
</dependency>
<!-- Doxia -->
@@ -117,6 +123,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-integration-tools</artifactId>
+ <version>${doxiaSitetoolsVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
<version>${doxiaSitetoolsVersion}</version>
</dependency>
@@ -130,14 +141,14 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.24</version>
+ <version>3.3.1</version>
</dependency>
<!-- test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-reporting-impl-3.1.0/src/it/setup-reporting-plugin/pom.xml
new/maven-reporting-impl-3.2.0/src/it/setup-reporting-plugin/pom.xml
--- old/maven-reporting-impl-3.1.0/src/it/setup-reporting-plugin/pom.xml
2022-02-05 21:35:12.000000000 +0100
+++ new/maven-reporting-impl-3.2.0/src/it/setup-reporting-plugin/pom.xml
2022-08-06 21:51:48.000000000 +0200
@@ -46,26 +46,26 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>@reportingApiVersion@</version>
</dependency>
<!-- plugin API and plugin-tools -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0.5</version>
+ <version>@mavenVersion@</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.3</version>
+ <version>3.6.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>0.7</version>
+ <version>3.3.4</version>
</dependency>
</dependencies>
@@ -82,7 +82,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
+ <version>3.6.4</version>
<executions>
<execution>
<id>default-descriptor</id>
@@ -93,9 +93,6 @@
<goals>
<goal>helpmojo</goal>
</goals>
- <configuration><!-- TODO: remove when upgrading plugin-tools to
3.4: see MPLUGIN-238 -->
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
</execution>
</executions>
</plugin>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-reporting-impl-3.1.0/src/it/use-as-site-report/pom.xml
new/maven-reporting-impl-3.2.0/src/it/use-as-site-report/pom.xml
--- old/maven-reporting-impl-3.1.0/src/it/use-as-site-report/pom.xml
2022-02-05 21:35:12.000000000 +0100
+++ new/maven-reporting-impl-3.2.0/src/it/use-as-site-report/pom.xml
2022-08-06 21:51:48.000000000 +0200
@@ -37,7 +37,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.10.0</version>
+ <version>3.11.0</version>
</plugin>
</plugins>
</build>
@@ -47,7 +47,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.4.0</version>
<reportSets>
<reportSet>
<reports>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-reporting-impl-3.1.0/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
new/maven-reporting-impl-3.2.0/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
---
old/maven-reporting-impl-3.1.0/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
2022-02-05 21:35:12.000000000 +0100
+++
new/maven-reporting-impl-3.2.0/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
2022-08-06 21:51:48.000000000 +0200
@@ -19,6 +19,8 @@
* under the License.
*/
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkFactory;
import org.apache.maven.doxia.site.decoration.DecorationModel;
@@ -27,6 +29,8 @@
import org.apache.maven.doxia.siterenderer.RenderingContext;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+import org.apache.maven.doxia.tools.SiteTool;
+import org.apache.maven.doxia.tools.SiteToolException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
@@ -35,12 +39,15 @@
import org.apache.maven.shared.utils.WriterFactory;
import org.codehaus.plexus.util.ReaderFactory;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.HashMap;
+import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -91,6 +98,24 @@
private String outputEncoding;
/**
+ * The local repository.
+ */
+ @Parameter( defaultValue = "${localRepository}", readonly = true, required
= true )
+ protected ArtifactRepository localRepository;
+
+ /**
+ * Remote repositories used for the project.
+ */
+ @Parameter( defaultValue = "${project.remoteArtifactRepositories}",
readonly = true, required = true )
+ protected List<ArtifactRepository> remoteRepositories;
+
+ /**
+ * SiteTool.
+ */
+ @Component
+ protected SiteTool siteTool;
+
+ /**
* Doxia Site Renderer component.
*/
@Component
@@ -126,19 +151,17 @@
Locale locale = Locale.getDefault();
- SiteRenderingContext siteContext = new SiteRenderingContext();
- siteContext.setDecoration( new DecorationModel() );
- siteContext.setTemplateName(
"org/apache/maven/doxia/siterenderer/resources/default-site.vm" );
- siteContext.setLocale( locale );
- siteContext.setTemplateProperties( getTemplateProperties() );
+ try
+ {
+ SiteRenderingContext siteContext = createSiteRenderingContext(
locale );
- // TODO Replace null with real value
- RenderingContext context = new RenderingContext( outputDirectory,
filename, null );
+ // copy resources
+ getSiteRenderer().copyResources( siteContext, outputDirectory );
- SiteRendererSink sink = new SiteRendererSink( context );
+ // TODO Replace null with real value
+ RenderingContext docRenderingContext = new RenderingContext(
outputDirectory, filename, null );
- try
- {
+ SiteRendererSink sink = new SiteRendererSink( docRenderingContext
);
generate( sink, null, locale );
@@ -147,12 +170,16 @@
outputDirectory.mkdirs();
try ( Writer writer =
- new OutputStreamWriter( new FileOutputStream( new File(
outputDirectory, filename ) ),
- getOutputEncoding() ) )
+ new OutputStreamWriter( new FileOutputStream( new File(
outputDirectory, filename ) ),
+ getOutputEncoding() ) )
{
+ // render report
getSiteRenderer().mergeDocumentIntoSite( writer, sink,
siteContext );
}
}
+
+ // copy generated resources also
+ getSiteRenderer().copyResources( siteContext, outputDirectory );
}
catch ( RendererException | IOException | MavenReportException e )
{
@@ -161,14 +188,14 @@
}
}
- /**
- * create template properties like done in maven-site-plugin's
- * <code>AbstractSiteRenderingMojo.createSiteRenderingContext( Locale
)</code>
- * @return properties
- */
- private Map<String, Object> getTemplateProperties()
+ private SiteRenderingContext createSiteRenderingContext( Locale locale )
+ throws MavenReportException, IOException
{
+ DecorationModel decorationModel = new DecorationModel();
+
Map<String, Object> templateProperties = new HashMap<>();
+ // We tell the skin that we are rendering in standalone mode
+ templateProperties.put( "standalone", Boolean.TRUE );
templateProperties.put( "project", getProject() );
templateProperties.put( "inputEncoding", getInputEncoding() );
templateProperties.put( "outputEncoding", getOutputEncoding() );
@@ -177,7 +204,32 @@
{
templateProperties.put( (String) entry.getKey(), entry.getValue()
);
}
- return templateProperties;
+
+ SiteRenderingContext context;
+ try
+ {
+ Artifact skinArtifact =
+ siteTool.getSkinArtifactFromRepository( localRepository,
remoteRepositories, decorationModel );
+
+ getLog().info( buffer().a( "Rendering content with " ).strong(
skinArtifact.getId()
+ + " skin" ).a( '.' ).toString() );
+
+ context = siteRenderer.createContextForSkin( skinArtifact,
templateProperties, decorationModel,
+ project.getName(),
locale );
+ }
+ catch ( SiteToolException e )
+ {
+ throw new MavenReportException( "Failed to retrieve skin
artifact", e );
+ }
+ catch ( RendererException e )
+ {
+ throw new MavenReportException( "Failed to create context for
skin", e );
+ }
+
+ // Generate static site
+ context.setRootDirectory( project.getBasedir() );
+
+ return context;
}
/**
@@ -189,6 +241,7 @@
* @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
*/
@Deprecated
+ @Override
public void generate( org.codehaus.doxia.sink.Sink sink, Locale locale )
throws MavenReportException
{
@@ -204,7 +257,6 @@
* @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
*/
@Deprecated
- @Override
public void generate( Sink sink, Locale locale )
throws MavenReportException
{
++++++ maven-reporting-impl-build.xml ++++++
--- /var/tmp/diff_new_pack.1oJhVd/_old 2023-09-25 20:51:45.651402957 +0200
+++ /var/tmp/diff_new_pack.1oJhVd/_new 2023-09-25 20:51:45.651402957 +0200
@@ -11,14 +11,15 @@
<property name="project.groupId" value="org.apache.maven.reporting"/>
<property name="project.artifactId" value="maven-reporting-impl"/>
<property name="project.name" value="Apache Maven Reporting Implementation"/>
- <property name="project.version" value="3.1.0"/>
+ <property name="project.version" value="3.2.0"/>
- <property name="spec.version" value="3.1"/>
+ <property name="spec.version" value="3.2"/>
<property name="project.organization.name"
value="The Apache Software Foundation"/>
- <property name="compiler.source" value="1.8"/>
+ <property name="compiler.release" value="8"/>
+ <property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName"
@@ -60,6 +61,7 @@
encoding="UTF-8"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
