Merge branch 'cassandra-2.1' into cassandra-2.2

This commit is contained in:
Michael Shuler 2017-06-15 14:06:17 -05:00
commit 13e153b090
2 changed files with 3 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# Maven2 Repository Locations (you can override these in "build.properties" to point to a local proxy, e.g. Nexus)
artifact.remoteRepository.central: http://repo1.maven.org/maven2
artifact.remoteRepository.apache: https://repository.apache.org/content/repositories/releases
artifact.remoteRepository.apache: http://repo.maven.apache.org/maven2

View File

@ -235,6 +235,8 @@
<artifact:dependencies pathId="wikitext.classpath">
<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
<remoteRepository refid="central"/>
<remoteRepository refid="apache"/>
</artifact:dependencies>
<taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
<wikitext-to-html markupLanguage="Textile">