Permalink
Browse files

upgrade to cascading 2.1

  • Loading branch information...
1 parent 2dbbd61 commit 3cbec10e784665d4f859087a39766368d1fd4cf3 @cwensel cwensel committed Oct 10, 2012
Showing with 13 additions and 10 deletions.
  1. +5 −5 build.xml
  2. +8 −5 ivy.xml
View
@@ -213,17 +213,17 @@
<property file="${publish.aws.properties}"/>
- <echo message="http://${publish.bucket}/${ant.project.name}/2.0/${ant.project.name}-${DSTAMP}.tgz"
+ <echo message="http://${publish.bucket}/${ant.project.name}/2.1/${ant.project.name}-${DSTAMP}.tgz"
file="latest.txt"/>
- <echo message="http://${publish.bucket}/${ant.project.name}/2.0/${ant.project.name}-${DSTAMP}.jar"
+ <echo message="http://${publish.bucket}/${ant.project.name}/2.1/${ant.project.name}-${DSTAMP}.jar"
file="latest-jar.txt"/>
<S3Upload verbose="true"
accessId="${publish.aws.accessId}"
secretKey="${publish.aws.secretKey}"
bucket="${publish.bucket}"
- prefix="${ant.project.name}/2.0/"
+ prefix="${ant.project.name}/2.1/"
publicRead="true">
<fileset file="${ant.project.name}-${DSTAMP}.tgz"/>
<fileset dir="${build.dir}/">
@@ -244,10 +244,10 @@
<ivy:settings id="ivy.conjars.settings" url="http://conjars.org/repo/ivysettings.xml"/>
<ivy:retrieve file="${multitool.basedir}/ivy.xml" settingsRef="ivy.conjars.settings" conf="default"
- pattern="${lib.dir}/[artifact]-[revision].[ext]" sync="true"/>
+ pattern="${lib.dir}/[artifact]-[revision](-[classifier]).[ext]" sync="true"/>
<ivy:retrieve file="${multitool.basedir}/ivy.xml" settingsRef="ivy.conjars.settings" conf="test"
- pattern="${build.dir}/deps/[artifact]-[revision].[ext]" sync="true"/>
+ pattern="${build.dir}/deps/[artifact]-[revision](-[classifier]).[ext]" sync="true"/>
</target>
<target name="markdown" depends="jar" description="update the CLI reference file as GitHub markdown">
View
@@ -18,8 +18,8 @@
~ limitations under the License.
-->
-<ivy-module version="2.0">
- <info organisation="cascading" module="cascading-multitool" revision="${cascading.release.full}">
+<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
+ <info organisation="cascading" module="cascading-multitool" revision="2.1">
<license name="GNU General Public License version 3" url="http://www.gnu.org/licenses/"/>
@@ -36,9 +36,12 @@
</configurations>
<dependencies>
- <dependency org="cascading" name="cascading-core" rev="2.0.+" conf="default"/>
- <dependency org="cascading" name="cascading-hadoop" rev="2.0.+" conf="default" transitive="false"/>
- <dependency org="cascading" name="cascading-test" rev="2.0.+" conf="test->default"/>
+ <dependency org="cascading" name="cascading-core" rev="2.1.+" conf="default"/>
+ <dependency org="cascading" name="cascading-core" rev="2.1.+" conf="test->tests(*)">
+ <artifact name="cascading-core" m:classifier="tests"/>
+ </dependency>
+
+ <dependency org="cascading" name="cascading-hadoop" rev="2.1.+" conf="default" transitive="false"/>
<dependency org="org.apache.hadoop" name="hadoop-core" rev="0.20.2" conf="test->default">
<exclude org="ant"/>

0 comments on commit 3cbec10

Please sign in to comment.