You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/04/03 18:02:55 UTC
git commit: Update POM generation after migration to git
Updated Branches:
refs/heads/cassandra-1.0 3fd0fb6aa -> 062ee3f2e
Update POM generation after migration to git
patch by stephenc; reviewed by slebresne for CASSANDRA-3732
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/062ee3f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/062ee3f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/062ee3f2
Branch: refs/heads/cassandra-1.0
Commit: 062ee3f2ee7cf71f79f2e883da515871d97a7b5f
Parents: 3fd0fb6
Author: Stephen Connolly <st...@gmail.com>
Authored: Tue Apr 3 09:30:06 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Apr 3 18:02:03 2012 +0200
----------------------------------------------------------------------
build.xml | 44 +++++---------------------------------------
1 files changed, 5 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/062ee3f2/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index f13f1ad..ebd80f6 100644
--- a/build.xml
+++ b/build.xml
@@ -24,12 +24,11 @@
<property file="build.properties.default" />
<property name="debuglevel" value="source,lines,vars"/>
- <!-- default version and SCM information (we need the default SCM info as people may checkout with git-svn) -->
+ <!-- default version and SCM information -->
<property name="base.version" value="1.0.9"/>
- <property name="scm.default.path" value="cassandra/branches/cassandra-1.0.0"/>
- <property name="scm.default.connection" value="scm:svn:http://svn.apache.org/repos/asf/${scm.default.path}"/>
- <property name="scm.default.developerConnection" value="scm:svn:https://svn.apache.org/repos/asf/${scm.default.path}"/>
- <property name="scm.default.url" value="http://svn.apache.org/viewvc/${scm.default.path}"/>
+ <property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
+ <property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
+ <property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
<!-- directory details -->
<property name="basedir" value="."/>
@@ -107,14 +106,6 @@
<available file="${build.src.java}" type="dir" />
</condition>
- <condition property="scm.provider.git-svn">
- <available file="${basedir}/.git" type="dir"/>
- </condition>
-
- <condition property="scm.provider.svn">
- <available file="${basedir}/.svn" type="dir"/>
- </condition>
-
<tstamp>
<format property="YEAR" pattern="yyyy"/>
</tstamp>
@@ -231,31 +222,6 @@
</wikitext-to-html>
</target>
- <target name="scm-svn-info" description="Determines the current Subversion URL with peg revision"
- if="scm.provider.svn">
- <exec executable="svn" dir="${basedir}" output="${build.dir}/svn-info.xml">
- <arg line="info --xml"/>
- </exec>
- <xmlproperty file="${build.dir}/svn-info.xml" collapseAttributes="true" prefix="svn" keepRoot="false"/>
- <echo file="${build.dir}/scm.properties">
-connection=scm:svn:${svn.entry.url}@${svn.entry.commit.revision}
-developerConnection=scm:svn:${svn.entry.url}@${svn.entry.commit.revision}
-url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
- </echo>
- <replace file="${build.dir}/scm.properties">
- <replacefilter token="connection=scm:svn:https:" value="connection=scm:svn:http:"/>
- <replacefilter token="Connection=scm:svn:http:" value="Connection=scm:svn:https:"/>
- <replacefilter token="url=${svn.entry.repository.root}" value="url=http://svn.apache.org/viewvc"/>
- </replace>
- <property file="${build.dir}/scm.properties" prefix="scm"/>
- </target>
-
- <target name="scm-info" description="Determines the SCM details"
- unless="scm.connection" depends="scm-svn-info">
- <property name="scm.connection" value="${scm.default.connection}"/>
- <property name="scm.developerConnection" value="${scm.default.developerConnection}"/>
- <property name="scm.url" value="${scm.default.url}"/>
- </target>
<!--
Fetch Maven Ant Tasks and Cassandra's dependencies
These targets are intentionally free of dependencies so that they
@@ -330,7 +296,7 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
<!-- this task defines the dependencies that will be fetched by Maven ANT Tasks
the dependencies are re-used for publishing artifacts to Maven Central
in order to keep everything consistent -->
- <target name="maven-declare-dependencies" depends="maven-ant-tasks-init, scm-info"
+ <target name="maven-declare-dependencies" depends="maven-ant-tasks-init"
description="Define dependencies and dependency versions">
<!-- The parent pom defines the versions of all dependencies -->
<artifact:pom id="parent-pom"