Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

o Update maven-scm dependencies

Browse Source 
o [MPSCM-56] Add Starteam support, plus scm:add, scm:status, scm:checkin


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@219622 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
evenisse 2005-07-19 06:04:30 +00:00
parent d18ddae37f
commit 1af0bf9ca1
7 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scm/project.xml
View File

@ -109,13 +109,21 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-3</version>
<version>1.0-alpha-5</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0-alpha-3</version>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-scm</artifactId>
<version>1.0-alpha-1-20050705.084636-3</version>
</dependency>
<dependency>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
@ -124,22 +132,22 @@
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
<version>1.0-alpha-2-20050610.043511-1</version>
<version>1.0-alpha-2-20050712.151302-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-cvs</artifactId>
<version>1.0-alpha-2-20050610.043511-1</version>
<version>1.0-alpha-2-20050712.151302-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svn</artifactId>
<version>1.0-alpha-2-20050610.054835-1</version>
<version>1.0-alpha-2-20050712.155105-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-starteam</artifactId>
<version>1.0-alpha-2-20050610.051724-1</version>
<version>1.0-alpha-2-20050712.153836-2</version>
</dependency>
</dependencies>
</project>

2
scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
View File

@ -19,8 +19,8 @@ package org.apache.maven.plugins.scm;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.add.AddScmResult;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.scm.ScmManager;
import java.io.File;

13
scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
View File

@ -19,17 +19,18 @@ package org.apache.maven.plugins.scm;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.command.update.UpdateScmResult;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.codehaus.plexus.embed.Embedder;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.scm.ScmManager;
import org.apache.maven.scm.log.DefaultLog;
import org.codehaus.plexus.scm.NoSuchScmProviderException;
import java.io.File;
@ -125,7 +126,6 @@ public class ScmBean
{
StarteamScmProviderRepository starteamRepo = (StarteamScmProviderRepository) repository.getProviderRepository();
/* TODO: reinstate when the provider supports it
if ( username != null && username.length() > 0 )
{
starteamRepo.setUser( username );
@ -134,7 +134,6 @@ public class ScmBean
{
starteamRepo.setPassword( password );
}
*/
}
return repository;
@ -145,6 +144,8 @@ public class ScmBean
{
Embedder embedder = getEmbedder();
ScmManager scmManager = (ScmManager) embedder.lookup( ScmManager.ROLE );
scmManager.addListener( new DefaultLog() );
return scmManager;
}

3
scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
View File

@ -19,9 +19,8 @@ package org.apache.maven.plugins.scm;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.checkin.CheckInScmResult;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.embed.Embedder;
import org.codehaus.plexus.scm.ScmManager;
import java.io.File;

2
scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
View File

@ -19,10 +19,10 @@ package org.apache.maven.plugins.scm;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.diff.DiffScmResult;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.embed.Embedder;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.scm.ScmManager;
import java.io.File;

3
scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
View File

@ -20,9 +20,8 @@ package org.apache.maven.plugins.scm;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.status.StatusScmResult;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.embed.Embedder;
import org.codehaus.plexus.scm.ScmManager;
import java.io.File;
import java.util.Iterator;

2
scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
View File

@ -19,8 +19,8 @@ package org.apache.maven.plugins.scm;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.update.UpdateScmResult;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.scm.ScmManager;
import java.io.File;