You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/01/04 11:25:31 UTC
svn commit: r124082 - in maven/maven-1/plugins/branches/scm-1.5-branch: . src/main/org/apache/maven/plugins/scm xdocs
Author: brett
Date: Tue Jan 4 02:25:29 2005
New Revision: 124082
URL: http://svn.apache.org/viewcvs?view=rev&rev=124082
Log:
update connection
Modified:
maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly
maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties
maven/maven-1/plugins/branches/scm-1.5-branch/project.xml
maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java
maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly?view=diff&rev=124082&p1=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r1=124081&p2=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r2=124082
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly (original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly Tue Jan 4 02:25:29 2005
@@ -135,7 +135,7 @@
<ant:echo>Tagging ${scmConnection} with ${maven.scm.tag}</ant:echo>
- <scm:tag var="scmTagBean" url="${scmConnection}" workingDirectory="${basedir}" tag="${maven.scm.tag}" />
+ <scm:tag var="scmTagBean" url="${scmConnection}" workingDirectory="${basedir}" tag="${maven.scm.tag}" tagBase="${maven.scm.svn.tag.base}" />
</goal>
<!-- TODO: change prereqs to scm:find-connection only -->
@@ -222,7 +222,7 @@
<scm:checkin var="scmCheckinBean" url="${scmConnection}" workingDirectory="${basedir}" includes="project.xml,xdocs/changes.xml" message="[maven-scm-plugin] prepare release ${version_name}" />
<ant:echo>Tagging source tree</ant:echo>
- <scm:tag var="scmTagBean" url="${scmConnection}" workingDirectory="${basedir}" tag="${tag_name}" />
+ <scm:tag var="scmTagBean" url="${scmConnection}" workingDirectory="${basedir}" tag="${tag_name}" tagBase="${maven.scm.svn.tag.base}" />
</goal>
<!--
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties?view=diff&rev=124082&p1=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties&r1=124081&p2=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties&r2=124082
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties (original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties Tue Jan 4 02:25:29 2005
@@ -17,7 +17,8 @@
# Directory to checkout to
maven.scm.checkout.dir=${maven.build.dir}/checkouts
-
+# Tag base for SVN if specified - should be a URL
+maven.scm.svn.tag.base=
# TODO: remove/review
maven.scm.method=cvs
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/project.xml
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/project.xml?view=diff&rev=124082&p1=maven/maven-1/plugins/branches/scm-1.5-branch/project.xml&r1=124081&p2=maven/maven-1/plugins/branches/scm-1.5-branch/project.xml&r2=124082
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/project.xml (original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/project.xml Tue Jan 4 02:25:29 2005
@@ -29,9 +29,9 @@
<issueTrackingUrl>http://jira.codehaus.org/browse/MPSCM</issueTrackingUrl>
<siteDirectory>/www/maven.apache.org/reference/plugins/scm/</siteDirectory>
<repository>
- <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/scm/</connection>
- <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/scm/</developerConnection>
- <url>http://cvs.apache.org/viewcvs/maven-plugins/scm/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/branches/scm-1.5-branch/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins/branches/scm-1.5-branch/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/scm/</url>
</repository>
<versions>
<version>
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java?view=diff&rev=124082&p1=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java&r1=124081&p2=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java&r2=124082
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java (original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java Tue Jan 4 02:25:29 2005
@@ -19,6 +19,7 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.command.update.UpdateScmResult;
@@ -45,6 +46,8 @@
// note - this should not have a setter
private File checkoutDirectory;
+ private String tagBase;
+
protected Embedder getEmbedder()
throws Exception
{
@@ -129,6 +132,12 @@
ScmRepository repository = scmManager.makeScmRepository( url );
+ if ( tagBase != null && tagBase.length() > 0 )
+ {
+ SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) repository.getProviderRepository();
+ svnRepo.setTagBase( tagBase );
+ }
+
// TODO: svn tag base, unless is HEAD, BASE, COMMITTED, PREV, rev#, {DATE}
// TODO: want includes/excludes?
TagScmResult result = scmManager.tag( repository, new ScmFileSet( new File( workingDirectory ) ), tag );
@@ -170,5 +179,16 @@
{
return checkoutDirectory;
}
+
+ public String getTagBase()
+ {
+ return tagBase;
+ }
+
+ public void setTagBase( String tagBase )
+ {
+ this.tagBase = tagBase;
+ }
+
}
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml?view=diff&rev=124082&p1=maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml&r1=124081&p2=maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml&r2=124082
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml Tue Jan 4 02:25:29 2005
@@ -24,13 +24,12 @@
<author email="brett@apache.org">Brett Porter</author>
</properties>
<body>
- <release version="1.5-SNAPSHOT" date="in CVS">
+ <release version="1.5-beta-1" date="2005-01-04">
<action dev="brett" type="add">Add support for subversion</action>
<action dev="brett" type="add">Rewritten to utilise the Maven SCM library</action>
<action dev="dion" type="fix" issue="MPSCM-25">Ignore whitespace when creating a patch</action>
<action dev="carlos" type="fix">Ignore POM if the scm root is specified in command line</action>
</release>
-
<release version="1.4.1" date="2004-07-30">
<action dev="dion" type="fix" issue="MPSCM-16">Trim goals after prompting from the user</action>
<action dev="dion" type="add" issue="MPSCM-20">Add scm:cvs-create-patch goal to help in creating patches</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org