You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/02/06 09:26:14 UTC
[maven-jxr] branch JXR-150 created (now a439639)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch JXR-150
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git.
at a439639 [JXR-150] Remove calls to deprecated MavenProject.getReportPlugins()
This branch includes the following new commits:
new ff7500b (doc) Bump junit from to 4.13.1 in it tests
new a439639 [JXR-150] Remove calls to deprecated MavenProject.getReportPlugins()
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.
[maven-jxr] 02/02: [JXR-150] Remove calls to deprecated
MavenProject.getReportPlugins()
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch JXR-150
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
commit a439639ef7879b911051c5bdbc26a5aeae425944
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Feb 6 10:22:04 2021 +0100
[JXR-150] Remove calls to deprecated MavenProject.getReportPlugins()
---
.../main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
index c0520cc..ecde8e9 100644
--- a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
+++ b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
@@ -26,7 +26,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Calendar;
-import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -209,10 +209,10 @@ public abstract class AbstractJxrReport
{
// wanna know if Javadoc is being generated
// TODO: what if it is not part of the site though, and just on the command line?
- Collection<ReportPlugin> plugin = project.getReportPlugins();
- if ( plugin != null )
+ if ( project.getModel().getReporting() != null )
{
- for ( ReportPlugin reportPlugin : plugin )
+ for ( ReportPlugin reportPlugin : Collections.unmodifiableList(
+ project.getModel().getReporting().getPlugins() ) )
{
if ( "maven-javadoc-plugin".equals( reportPlugin.getArtifactId() ) )
{
[maven-jxr] 01/02: (doc) Bump junit from to 4.13.1 in it tests
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch JXR-150
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
commit ff7500bbc2c935da03f6eacdb071ec6abdd9d8db
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Feb 6 10:22:56 2021 +0100
(doc) Bump junit from to 4.13.1 in it tests
---
maven-jxr-plugin/src/it/aggregate/pom.xml | 2 +-
maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/maven-jxr-plugin/src/it/aggregate/pom.xml b/maven-jxr-plugin/src/it/aggregate/pom.xml
index c1ccbee..94d94ff 100644
--- a/maven-jxr-plugin/src/it/aggregate/pom.xml
+++ b/maven-jxr-plugin/src/it/aggregate/pom.xml
@@ -32,7 +32,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml b/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml
index 0d211a7..d58351a 100644
--- a/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml
+++ b/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml
@@ -39,7 +39,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>