You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:13:55 UTC
[maven-doap-plugin] branch mvn4 created (now 6ca3467)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-doap-plugin.git.
at 6ca3467 mvn4 aggregator
This branch includes the following new commits:
new 6ca3467 mvn4 aggregator
The 1 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-doap-plugin] 01/01: mvn4 aggregator
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-doap-plugin.git
commit 6ca3467cf99eb37618601eadac1388248c007f55
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:13:53 2022 +0100
mvn4 aggregator
---
pom.xml | 29 ++++++----------------
.../org/apache/maven/plugin/doap/DoapMojo.java | 23 ++++++-----------
2 files changed, 14 insertions(+), 38 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5b430b4..f2dda52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
<relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
</parent>
@@ -62,10 +62,10 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>2.2.1</mavenVersion>
- <scmVersion>1.11.1</scmVersion>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
+ <scmVersion>2.0.0-M2-SNAPSHOT</scmVersion>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
@@ -73,7 +73,7 @@ under the License.
<!-- Maven -->
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
@@ -108,21 +108,6 @@ under the License.
<artifactId>maven-scm-provider-svnexe</artifactId>
<version>${scmVersion}</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvs-commons</artifactId>
- <version>${scmVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvsexe</artifactId>
- <version>${scmVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvsjava</artifactId>
- <version>${scmVersion}</version>
- </dependency>
<!-- misc -->
<dependency>
@@ -161,7 +146,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.2</version>
+ <version>3.4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
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 211374a..bc37b17 100644
--- a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
+++ b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
@@ -48,7 +48,6 @@ import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.manager.ScmManager;
-import org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
@@ -794,13 +793,14 @@ public class DoapMojo
// Releases
writeReleases( writer, project );
- // Developers
- List<Contributor> developers = project.getDevelopers();
- writeContributors( writer, developers );
+ // Developers && Contributors
+ List<Developer> developers = project.getDevelopers();
+ List<Contributor> contributors = project.getContributors();
// 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();
@@ -1659,16 +1659,7 @@ public class DoapMojo
DoapUtil.writeStartElement( writer, doapOptions.getXmlnsPrefix(), "repository" );
- if ( isScmSystem( repository, "cvs" ) )
- {
- DoapUtil.writeStartElement( writer, doapOptions.getXmlnsPrefix(), "CVSRepository" );
-
- CvsScmProviderRepository cvsRepo = (CvsScmProviderRepository) repository.getProviderRepository();
-
- DoapUtil.writeElement( writer, doapOptions.getXmlnsPrefix(), "anon-root", cvsRepo.getCvsRoot() );
- DoapUtil.writeElement( writer, doapOptions.getXmlnsPrefix(), "module", cvsRepo.getModule() );
- }
- else if ( isScmSystem( repository, "svn" ) )
+ if ( isScmSystem( repository, "svn" ) )
{
DoapUtil.writeStartElement( writer, doapOptions.getXmlnsPrefix(), "SVNRepository" );