natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Brandon Williams 2014-05-06 13:48:14 -05:00
parent aae8d8cc74 ef92bb5f33
commit 9224dd5cf3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.xml
View File

@ -264,7 +264,7 @@
<artifact:remoteRepository id="central" url="${artifact.remoteRepository.central}"/>
<artifact:remoteRepository id="java.net2" url="${artifact.remoteRepository.java.net2}"/>
<artifact:remoteRepository id="apache" url="${artifact.remoteRepository.apache}"/>
<artifact:remoteRepository id="boundary" url="${artifact.remoteRepository.boundary}"/>
<!-- <artifact:remoteRepository id="boundary" url="${artifact.remoteRepository.boundary}"/> -->
<macrodef name="install">
<attribute name="pomFile"/>
@ -529,7 +529,7 @@
<remoteRepository refid="central"/>
<remoteRepository refid="apache"/>
<remoteRepository refid="java.net2"/>
<remoteRepository refid="boundary"/>
<!-- <remoteRepository refid="boundary"/> -->
</artifact:dependencies>
<artifact:dependencies pomRefId="coverage-deps-pom"
pathId="cobertura.classpath">
@ -555,7 +555,7 @@
<remoteRepository refid="apache"/>
<remoteRepository refid="central"/>
<remoteRepository refid="oauth"/>
<remoteRepository refid="boundary"/>
<!-- <remoteRepository refid="boundary"/> -->
</artifact:dependencies>
<copy todir="${test.lib}/jars">
<fileset refid="test-dependency-jars"/>
@ -576,7 +576,7 @@
<remoteRepository refid="apache"/>
<remoteRepository refid="central"/>
<remoteRepository refid="java.net2"/>
<remoteRepository refid="boundary"/>
<!-- <remoteRepository refid="boundary"/> -->
</artifact:dependencies>
<copy todir="${build.dir.lib}/jars">
<fileset refid="test-dependency-jars"/>