Skip to content

Commit 4d94edc

Browse files
michael-omichael-o
committed
[MPIR-446] Update to Maven SCM 2.0.
1 parent 91a065b commit 4d94edc

22 files changed

+7
-426
lines changed

‎pom.xml

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ under the License.
117117
<doxiaVersion>1.11.1</doxiaVersion>
118118
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
119119
<mavenVersion>3.2.5</mavenVersion>
120-
<scmVersion>1.13.0</scmVersion>
120+
<scmVersion>2.0.1</scmVersion>
121121
<aetherVersion>1.0.0.v20140518</aetherVersion>
122122
<sitePluginVersion>3.12.1</sitePluginVersion>
123123
<fluidoSkinVersion>1.11.1</fluidoSkinVersion>
@@ -236,28 +236,12 @@ under the License.
236236
<artifactId>maven-scm-manager-plexus</artifactId>
237237
<version>${scmVersion}</version>
238238
<scope>runtime</scope>
239-
<exclusions>
240-
<exclusion>
241-
<groupId>org.codehaus.plexus</groupId>
242-
<artifactId>plexus-container-default</artifactId>
243-
</exclusion>
244-
</exclusions>
245239
</dependency>
246240
<dependency>
247241
<groupId>org.apache.maven.scm</groupId>
248242
<artifactId>maven-scm-provider-hg</artifactId>
249243
<version>${scmVersion}</version>
250244
</dependency>
251-
<dependency>
252-
<groupId>org.apache.maven.scm</groupId>
253-
<artifactId>maven-scm-provider-perforce</artifactId>
254-
<version>${scmVersion}</version>
255-
</dependency>
256-
<dependency>
257-
<groupId>org.apache.maven.scm</groupId>
258-
<artifactId>maven-scm-provider-starteam</artifactId>
259-
<version>${scmVersion}</version>
260-
</dependency>
261245
<dependency>
262246
<groupId>org.apache.maven.scm</groupId>
263247
<artifactId>maven-scm-provider-svn-commons</artifactId>
@@ -269,23 +253,6 @@ under the License.
269253
<version>${scmVersion}</version>
270254
<scope>runtime</scope>
271255
</dependency>
272-
<dependency>
273-
<groupId>org.apache.maven.scm</groupId>
274-
<artifactId>maven-scm-provider-cvs-commons</artifactId>
275-
<version>${scmVersion}</version>
276-
</dependency>
277-
<dependency>
278-
<groupId>org.apache.maven.scm</groupId>
279-
<artifactId>maven-scm-provider-cvsexe</artifactId>
280-
<version>${scmVersion}</version>
281-
<scope>runtime</scope>
282-
</dependency>
283-
<dependency>
284-
<groupId>org.apache.maven.scm</groupId>
285-
<artifactId>maven-scm-provider-cvsjava</artifactId>
286-
<version>${scmVersion}</version>
287-
<scope>runtime</scope>
288-
</dependency>
289256
<dependency>
290257
<groupId>org.apache.maven.scm</groupId>
291258
<artifactId>maven-scm-provider-git-commons</artifactId>

‎src/main/java/org/apache/maven/report/projectinfo/ScmReport.java

Lines changed: 4 additions & 190 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,8 @@
3030
import org.apache.maven.plugins.annotations.Mojo;
3131
import org.apache.maven.plugins.annotations.Parameter;
3232
import org.apache.maven.scm.manager.ScmManager;
33-
import org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
3433
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
3534
import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository;
36-
import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
37-
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
3835
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
3936
import org.apache.maven.scm.repository.ScmRepository;
4037
import org.codehaus.plexus.i18n.I18N;
@@ -260,30 +257,14 @@ protected void renderBody() {
260257
private void renderOverviewSection(ScmRepository anonymousRepository, ScmRepository devRepository) {
261258
startSection(getI18nString("overview.title"));
262259

263-
if (isScmSystem(anonymousRepository, "clearcase") || isScmSystem(devRepository, "clearcase")) {
264-
sink.paragraph();
265-
linkPatternedText(getI18nString("clearcase.intro"));
266-
sink.paragraph_();
267-
} else if (isScmSystem(anonymousRepository, "cvs") || isScmSystem(devRepository, "cvs")) {
268-
sink.paragraph();
269-
linkPatternedText(getI18nString("cvs.intro"));
270-
sink.paragraph_();
271-
} else if (isScmSystem(anonymousRepository, "git") || isScmSystem(devRepository, "git")) {
260+
if (isScmSystem(anonymousRepository, "git") || isScmSystem(devRepository, "git")) {
272261
sink.paragraph();
273262
linkPatternedText(getI18nString("git.intro"));
274263
sink.paragraph_();
275264
} else if (isScmSystem(anonymousRepository, "hg") || isScmSystem(devRepository, "hg")) {
276265
sink.paragraph();
277266
linkPatternedText(getI18nString("hg.intro"));
278267
sink.paragraph_();
279-
} else if (isScmSystem(anonymousRepository, "perforce") || isScmSystem(devRepository, "perforce")) {
280-
sink.paragraph();
281-
linkPatternedText(getI18nString("perforce.intro"));
282-
sink.paragraph_();
283-
} else if (isScmSystem(anonymousRepository, "starteam") || isScmSystem(devRepository, "starteam")) {
284-
sink.paragraph();
285-
linkPatternedText(getI18nString("starteam.intro"));
286-
sink.paragraph_();
287268
} else if (isScmSystem(anonymousRepository, "svn") || isScmSystem(devRepository, "svn")) {
288269
sink.paragraph();
289270
linkPatternedText(getI18nString("svn.intro"));
@@ -323,21 +304,13 @@ private void renderWebAccessSection(String scmUrl) {
323304
* @param anonymousRepository the anonymous repository
324305
*/
325306
private void renderAnonymousAccessSection(ScmRepository anonymousRepository) {
326-
if (isScmSystem(anonymousRepository, "clearcase")
327-
|| isScmSystem(anonymousRepository, "perforce")
328-
|| isScmSystem(anonymousRepository, "starteam")
329-
|| (anonymousConnection == null || anonymousConnection.isEmpty())) {
307+
if (anonymousConnection == null || anonymousConnection.isEmpty()) {
330308
return;
331309
}
332310

333311
startSection(getI18nString("anonymousaccess.title"));
334312

335-
if (anonymousRepository != null && isScmSystem(anonymousRepository, "cvs")) {
336-
CvsScmProviderRepository cvsRepo =
337-
(CvsScmProviderRepository) anonymousRepository.getProviderRepository();
338-
339-
anonymousAccessCVS(cvsRepo);
340-
} else if (anonymousRepository != null && isScmSystem(anonymousRepository, "git")) {
313+
if (anonymousRepository != null && isScmSystem(anonymousRepository, "git")) {
341314
GitScmProviderRepository gitRepo =
342315
(GitScmProviderRepository) anonymousRepository.getProviderRepository();
343316

@@ -372,30 +345,14 @@ private void renderDeveloperAccessSection(ScmRepository devRepository) {
372345

373346
startSection(getI18nString("devaccess.title"));
374347

375-
if (devRepository != null && isScmSystem(devRepository, "clearcase")) {
376-
developerAccessClearCase();
377-
} else if (devRepository != null && isScmSystem(devRepository, "cvs")) {
378-
CvsScmProviderRepository cvsRepo = (CvsScmProviderRepository) devRepository.getProviderRepository();
379-
380-
developerAccessCVS(cvsRepo);
381-
} else if (devRepository != null && isScmSystem(devRepository, "git")) {
348+
if (devRepository != null && isScmSystem(devRepository, "git")) {
382349
GitScmProviderRepository gitRepo = (GitScmProviderRepository) devRepository.getProviderRepository();
383350

384351
developerAccessGit(gitRepo);
385352
} else if (devRepository != null && isScmSystem(devRepository, "hg")) {
386353
HgScmProviderRepository hgRepo = (HgScmProviderRepository) devRepository.getProviderRepository();
387354

388355
developerAccessMercurial(hgRepo);
389-
} else if (devRepository != null && isScmSystem(devRepository, "perforce")) {
390-
PerforceScmProviderRepository perforceRepo =
391-
(PerforceScmProviderRepository) devRepository.getProviderRepository();
392-
393-
developerAccessPerforce(perforceRepo);
394-
} else if (devRepository != null && isScmSystem(devRepository, "starteam")) {
395-
StarteamScmProviderRepository starteamRepo =
396-
(StarteamScmProviderRepository) devRepository.getProviderRepository();
397-
398-
developerAccessStarteam(starteamRepo);
399356
} else if (devRepository != null && isScmSystem(devRepository, "svn")) {
400357
SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) devRepository.getProviderRepository();
401358

@@ -423,8 +380,6 @@ private void renderAccessBehindFirewallSection(ScmRepository devRepository) {
423380
paragraph(getI18nString("accessbehindfirewall.svn.intro"));
424381

425382
verbatimText("$ svn checkout " + svnRepo.getUrl() + " " + checkoutDirectoryName);
426-
} else if (devRepository != null && isScmSystem(devRepository, "cvs")) {
427-
linkPatternedText(getI18nString("accessbehindfirewall.cvs.intro"));
428383
} else {
429384
paragraph(getI18nString("accessbehindfirewall.general.intro"));
430385
}
@@ -453,46 +408,6 @@ private void renderAccessThroughProxySection(ScmRepository anonymousRepository,
453408
}
454409
}
455410

456-
// Clearcase
457-
458-
/**
459-
* Create the documentation to provide an developer access with a <code>Clearcase</code> SCM. For example,
460-
* generate the following command line:
461-
* <p>
462-
* cleartool checkout module
463-
* </p>
464-
*/
465-
private void developerAccessClearCase() {
466-
paragraph(getI18nString("devaccess.clearcase.intro"));
467-
468-
verbatimText("$ cleartool checkout ");
469-
}
470-
471-
// CVS
472-
473-
// CHECKSTYLE_OFF: LineLength
474-
/**
475-
* Create the documentation to provide an anonymous access with a <code>CVS</code> SCM. For example, generate
476-
* the following command line:
477-
* <p>
478-
* cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login
479-
* </p>
480-
* <p>
481-
* cvs -z3 -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic co maven-plugins/dist
482-
* </p>
483-
*
484-
* @param cvsRepo
485-
* @see <a
486-
* href="https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115">https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115</a>
487-
*/
488-
// CHECKSTYLE_ON: LineLength
489-
private void anonymousAccessCVS(CvsScmProviderRepository cvsRepo) {
490-
paragraph(getI18nString("anonymousaccess.cvs.intro"));
491-
492-
verbatimText("$ cvs -d " + cvsRepo.getCvsRoot() + " login" + LS + "$ cvs -z3 -d " + cvsRepo.getCvsRoot()
493-
+ " co " + cvsRepo.getModule());
494-
}
495-
496411
// Git
497412

498413
private void gitClone(String url) {
@@ -543,32 +458,6 @@ private void anonymousAccessMercurial(HgScmProviderRepository hgRepo) {
543458
verbatimText("$ hg clone " + hgRepo.getURI());
544459
}
545460

546-
// CHECKSTYLE_OFF: LineLength
547-
/**
548-
* Create the documentation to provide an developer access with a <code>CVS</code> SCM. For example, generate
549-
* the following command line:
550-
* <p>
551-
* cvs -d :pserver:username@cvs.apache.org:/home/cvs login
552-
* </p>
553-
* <p>
554-
* cvs -z3 -d :ext:username@cvs.apache.org:/home/cvs co maven-plugins/dist
555-
* </p>
556-
*
557-
* @param cvsRepo
558-
* @see <a
559-
* href="https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115">https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115</a>
560-
*/
561-
// CHECKSTYLE_ON: LineLength
562-
private void developerAccessCVS(CvsScmProviderRepository cvsRepo) {
563-
paragraph(getI18nString("devaccess.cvs.intro"));
564-
565-
// Safety: remove the username if present
566-
String cvsRoot = StringUtils.replace(cvsRepo.getCvsRoot(), cvsRepo.getUser(), "username");
567-
568-
verbatimText(
569-
"$ cvs -d " + cvsRoot + " login" + LS + "$ cvs -z3 -d " + cvsRoot + " co " + cvsRepo.getModule());
570-
}
571-
572461
// Git
573462

574463
/**
@@ -607,81 +496,6 @@ private void developerAccessMercurial(HgScmProviderRepository hgRepo) {
607496
verbatimText("$ hg clone " + hgRepo.getURI());
608497
}
609498

610-
// Perforce
611-
612-
// CHECKSTYLE_OFF: LineLength
613-
/**
614-
* Create the documentation to provide an developer access with a <code>Perforce</code> SCM. For example,
615-
* generate the following command line:
616-
* <p>
617-
* p4 -H hostname -p port -u username -P password path
618-
* </p>
619-
* <p>
620-
* p4 -H hostname -p port -u username -P password path submit -c changement
621-
* </p>
622-
*
623-
* @param perforceRepo
624-
* @see <a
625-
* href="http://www.perforce.com/perforce/doc.051/manuals/cmdref/index.html">http://www.perforce.com/
626-
* perforce
627-
* /doc.051/manuals/cmdref/index.html</>
628-
*/
629-
// CHECKSTYLE_ON: LineLength
630-
private void developerAccessPerforce(PerforceScmProviderRepository perforceRepo) {
631-
paragraph(getI18nString("devaccess.perforce.intro"));
632-
633-
StringBuilder command = new StringBuilder();
634-
command.append("$ p4");
635-
if (!StringUtils.isEmpty(perforceRepo.getHost())) {
636-
command.append(" -H ").append(perforceRepo.getHost());
637-
}
638-
if (perforceRepo.getPort() > 0) {
639-
command.append(" -p ").append(perforceRepo.getPort());
640-
}
641-
command.append(" -u username");
642-
command.append(" -P password");
643-
command.append(" ");
644-
command.append(perforceRepo.getPath());
645-
command.append(LS);
646-
command.append("$ p4 submit -c \"A comment\"");
647-
648-
verbatimText(command.toString());
649-
}
650-
651-
// Starteam
652-
653-
/**
654-
* Create the documentation to provide an developer access with a <code>Starteam</code> SCM. For example,
655-
* generate the following command line:
656-
* <p>
657-
* stcmd co -x -nologo -stop -p myusername:mypassword@myhost:1234/projecturl -is
658-
* </p>
659-
* <p>
660-
* stcmd ci -x -nologo -stop -p myusername:mypassword@myhost:1234/projecturl -f NCI -is
661-
* </p>
662-
*
663-
* @param starteamRepo
664-
*/
665-
private void developerAccessStarteam(StarteamScmProviderRepository starteamRepo) {
666-
paragraph(getI18nString("devaccess.starteam.intro"));
667-
668-
StringBuilder command = new StringBuilder();
669-
670-
// Safety: remove the username/password if present
671-
String fullUrl = StringUtils.replace(starteamRepo.getFullUrl(), starteamRepo.getUser(), "username");
672-
fullUrl = StringUtils.replace(fullUrl, starteamRepo.getPassword(), "password");
673-
674-
command.append("$ stcmd co -x -nologo -stop -p ");
675-
command.append(fullUrl);
676-
command.append(" -is");
677-
command.append(LS);
678-
command.append("$ stcmd ci -x -nologo -stop -p ");
679-
command.append(fullUrl);
680-
command.append(" -f NCI -is");
681-
682-
verbatimText(command.toString());
683-
}
684-
685499
// Subversion
686500

687501
/**

0 commit comments

Comments
 (0)