This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git
commit 1236ef4c0e2eb0a31250fed69bd43047159590bc Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Oct 27 21:05:53 2026 +0100 Keep MavenMultiPageReport behind a package-private compat interface maven-site-plugin 3.22 and older load maven-reporting-api 4.0.0 and reach the multi-page generate only through MavenMultiPageReport, so the interface must stay. The compat interface keeps the deprecation warning in one file; remove it once the site plugin minimum is 3.23.0. --- .../maven/reporting/AbstractMavenReport.java | 6 ++--- .../maven/reporting/MultiPageReportCompat.java | 27 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java index 2c1e056..4b46b92 100644 --- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java +++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java @@ -69,17 +69,17 @@ import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; * Both invocations are delegated to <code>abstract executeReport( Locale )</code> from: * <ul> * <li>Mojo's <code>execute()</code> method, see maven-plugin-api</li> - * <li>MavenMultiPageReport's <code>generate( Sink, SinkFactory, Locale )</code>, see maven-reporting-api</li> + * <li>MavenReport's <code>generate( Sink, SinkFactory, Locale )</code>, see maven-reporting-api</li> * </ul> * * @author <a href="[email protected]">Emmanuel Venisse</a> * @since 2.0 * @see #execute() <code>Mojo.execute()</code>, from maven-plugin-api - * @see #generate(Sink, SinkFactory, Locale) <code>MavenMultiPageReport.generate( Sink, SinkFactory, Locale )</code>, + * @see #generate(Sink, SinkFactory, Locale) <code>MavenReport.generate( Sink, SinkFactory, Locale )</code>, * from maven-reporting-api * @see #executeReport(Locale) <code>abstract executeReport( Locale )</code> */ -public abstract class AbstractMavenReport extends AbstractMojo implements MavenMultiPageReport { +public abstract class AbstractMavenReport extends AbstractMojo implements MultiPageReportCompat { /** * The shared 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 shared diff --git a/src/main/java/org/apache/maven/reporting/MultiPageReportCompat.java b/src/main/java/org/apache/maven/reporting/MultiPageReportCompat.java new file mode 100644 index 0000000..daf6159 --- /dev/null +++ b/src/main/java/org/apache/maven/reporting/MultiPageReportCompat.java @@ -0,0 +1,27 @@ +/* + * 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. + */ +package org.apache.maven.reporting; + +/** + * Keeps reports multi-page under maven-site-plugin 3.22 and older, which load maven-reporting-api 4.0.0 and only call + * {@code generate(Sink, SinkFactory, Locale)} through {@code MavenMultiPageReport}. Remove once the site plugin + * minimum is 3.23.0. + */ +@SuppressWarnings("deprecation") +interface MultiPageReportCompat extends org.apache.maven.reporting.MavenMultiPageReport {}
