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/02/05 19:59:43 UTC
[maven-reporting-impl] branch dependency-updates updated (4c468a0 -> 1d49d2d)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git.
discard 4c468a0 [MSHARED-1028] Upgrade Maven Reporting API to 3.1.0
discard 6325c61 [MSHARED-1027] Update Doxia to 1.11.1 and Doxia Sitetools to 1.11.1
add 6554ad3 Remove old Maven 2 profile
new faee2f9 [MSHARED-1027] Update Doxia to 1.11.1 and Doxia Sitetools to 1.11.1
new 1d49d2d [MSHARED-1028] Upgrade Maven Reporting API to 3.1.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 (4c468a0)
\
N -- N -- N refs/heads/dependency-updates (1d49d2d)
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 2 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:
pom.xml | 2 +-
src/it/setup-reporting-plugin/pom.xml | 34 +---------------------------------
2 files changed, 2 insertions(+), 34 deletions(-)
[maven-reporting-impl] 01/02: [MSHARED-1027] Update Doxia to 1.11.1 and Doxia Sitetools to 1.11.1
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git
commit faee2f932280282e24d767cf6016d466bb15e62e
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 24 12:50:53 2022 +0100
[MSHARED-1027] Update Doxia to 1.11.1 and Doxia Sitetools to 1.11.1
---
pom.xml | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index f5234d9..93dbb31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,8 +69,8 @@
<properties>
<mavenVersion>3.1.0</mavenVersion>
- <doxiaVersion>1.7</doxiaVersion>
- <doxiaSitetoolsVersion>1.7.4</doxiaSitetoolsVersion>
+ <doxiaVersion>1.11.1</doxiaVersion>
+ <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
<javaVersion>7</javaVersion>
<project.build.outputTimestamp>2020-04-04T09:03:59Z</project.build.outputTimestamp>
</properties>
@@ -120,11 +120,6 @@
<artifactId>doxia-site-renderer</artifactId>
<version>${doxiaSitetoolsVersion}</version>
</dependency>
- <dependency><!-- TODO remove dependency when upgrading Doxia Sitetools to 1.7.5 -->
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
<!-- misc -->
<dependency>
[maven-reporting-impl] 02/02: [MSHARED-1028] Upgrade Maven Reporting API to 3.1.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git
commit 1d49d2db3ffc044bafcdb878b5a5db2bcd416bf5
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 24 13:12:35 2022 +0100
[MSHARED-1028] Upgrade Maven Reporting API to 3.1.0
---
pom.xml | 2 +-
src/it/setup-reporting-plugin/pom.xml | 2 +-
src/main/java/org/apache/maven/reporting/AbstractMavenReport.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 93dbb31..fafa1d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
+ <version>3.1.0</version>
</dependency>
<!-- Maven -->
diff --git a/src/it/setup-reporting-plugin/pom.xml b/src/it/setup-reporting-plugin/pom.xml
index 744f21f..c7a3191 100644
--- a/src/it/setup-reporting-plugin/pom.xml
+++ b/src/it/setup-reporting-plugin/pom.xml
@@ -46,7 +46,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
+ <version>3.1.0</version>
</dependency>
<!-- plugin API and plugin-tools -->
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
index 8a2b3aa..2c53dc2 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
@@ -188,7 +188,6 @@ public abstract class AbstractMavenReport
* @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
*/
@Deprecated
- @Override
public void generate( org.codehaus.doxia.sink.Sink sink, Locale locale )
throws MavenReportException
{
@@ -201,10 +200,11 @@ public abstract class AbstractMavenReport
* @param sink
* @param locale
* @throws MavenReportException
- * @see org.apache.maven.reporting.MavenReport#generate(org.codehaus.doxia.sink.Sink, Locale)
+ * @see org.apache.maven.reporting.MavenReport#generate(Sink, Locale)
* @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
*/
@Deprecated
+ @Override
public void generate( Sink sink, Locale locale )
throws MavenReportException
{