(maven-doap-plugin) 01/01: mvn4 aggregator

[slachiewicz]

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-doap-plugin.git

commit 7127fb3b07a54e6101e9767fe6eb3acbf7d77e91
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jan 28 23:13:53 2022 +0100

    mvn4 aggregator
---
 pom.xml                                                  |  6 +++---
 src/main/java/org/apache/maven/plugin/doap/DoapMojo.java | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7a92c78..bdaa596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,8 +61,8 @@ under the License.
 
   <properties>
     <javaVersion>8</javaVersion>
-    <mavenVersion>3.2.5</mavenVersion>
-    <scmVersion>1.12.2</scmVersion>
+    <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
+    <scmVersion>2.0.0-M2-SNAPSHOT</scmVersion>
     <aetherVersion>1.0.0.v20140518</aetherVersion>
     
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
   </properties>
@@ -150,7 +150,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>3.3.0</version>
+      <version>3.4.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java 
b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
index c03f1b0..e60a995 100644
--- a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
+++ b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
@@ -731,13 +731,13 @@ public class DoapMojo extends AbstractMojo {
         // Releases
         writeReleases(writer, project);
 
-        // Developers
+        // Developers && Contributors
         List<Developer> developers = project.getDevelopers();
-        writeContributors(writer, new ArrayList<Contributor>(developers));
-
-        // Contributors
         List<Contributor> contributors = project.getContributors();
-        writeContributors(writer, contributors);
+
+        List<Contributor> all = new ArrayList<>( developers );
+        all.addAll( contributors );
+        writeContributors( writer, all);
 
         // Extra DOAP
         Map<Object, String> map = doapOptions.getExtra();