diff -urN cassandra-cassandra-3.9/build.xml cassandra-cassandra-3.9new/build.xml
--- cassandra-cassandra-3.9/build.xml 2016-11-30 11:59:19.400942783 +0100
+++ cassandra-cassandra-3.9new/build.xml 2016-12-01 10:49:05.383549756 +0100
@@ -17,7 +17,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<project basedir="." default="jar" name="apache-cassandra"
+<project basedir="." default="jar" name="cassandra"
xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<property environment="env"/>
<property file="build.properties" />
@@ -76,7 +76,7 @@
<condition property="version" value="${base.version}">
<isset property="release"/>
</condition>
- <property name="version" value="${base.version}-SNAPSHOT"/>
+ <property name="version" value="${base.version}"/>
<property name="version.properties.dir"
value="${build.src.resources}/org/apache/cassandra/config/" />
<property name="final.name" value="${ant.project.name}-${version}"/>
@@ -173,7 +173,8 @@
windowtitle="${ant.project.name} API" classpathref="cassandra.classpath"
bottom="Copyright &copy; ${YEAR} The Apache Software Foundation"
useexternalfile="yes"
- maxmemory="256m">
+ maxmemory="256m"
+ encoding="utf-8">
<filesets/>
</javadoc>
</sequential>
@@ -224,7 +225,7 @@
<target name="gen-cql3-grammar" depends="check-gen-cql3-grammar" unless="cql3current">
<echo>Building Grammar ${build.src.antlr}/Cql.g ...</echo>
<java classname="org.antlr.Tool"
- classpath="${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/ST4-4.0.8.jar"
+ classpath="${build.lib}/[antlr3].jar;${build.lib}/[antlr3-runtime].jar;${build.lib}/[stringtemplate4]ST4.jar"
fork="true"
failonerror="true">
<jvmarg value="-Xmx512M" />
@@ -267,7 +268,7 @@
grammar files
-->
<target name="generate-jflex-java" description="Generate Java from jflex grammar">
- <taskdef classname="jflex.anttask.JFlexTask" classpath="${build.lib}/jflex-1.6.0.jar" name="jflex" />
+ <taskdef classname="jflex.anttask.JFlexTask" classpath="${build.lib}/[jflex].jar;${build.lib}/[java_cup].jar" name="jflex" />
<jflex file="${build.src.java}/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex" destdir="${build.src.gen-java}/" />
</target>
@@ -383,9 +384,8 @@
<dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl" version="1.9.2"/>
<dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl" version="1.9.2"/>
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
- <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/>
- <dependency groupId="com.github.jbellis" artifactId="jamm" version="0.3.0"/>
-
+ <dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib" version="1.0.6"/>
+ <dependency groupId="com.github.jbellis" artifactId="jamm" version="0.3.0"/>
<dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.7">
<exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
<exclusion groupId="junit" artifactId="junit"/>
@@ -398,7 +398,7 @@
<dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.10">
<exclusion groupId="commons-lang" artifactId="commons-lang"/>
</dependency>
- <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3">
+ <dependency groupId="org.apache.hadoop" artifactId="hadoop-common" version="2.4.1">
<exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
<exclusion groupId="commons-logging" artifactId="commons-logging"/>
<exclusion groupId="org.eclipse.jdt" artifactId="core"/>
@@ -430,7 +430,7 @@
<dependency groupId="io.netty" artifactId="netty-all" version="4.0.39.Final" />
<dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" />
<dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" />
- <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.0.1" classifier="shaded">
+ <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.0.1" >
<exclusion groupId="io.netty" artifactId="netty-buffer"/>
<exclusion groupId="io.netty" artifactId="netty-codec"/>
<exclusion groupId="io.netty" artifactId="netty-handler"/>
@@ -446,8 +446,7 @@
<dependency groupId="joda-time" artifactId="joda-time" version="2.4" />
<dependency groupId="com.carrotsearch" artifactId="hppc" version="0.5.4" />
<dependency groupId="de.jflex" artifactId="jflex" version="1.6.0" />
- <dependency groupId="net.mintern" artifactId="primitive" version="1.0" />
- <dependency groupId="com.github.rholder" artifactId="snowball-stemmer" version="1.3.0.581.1" />
+ <dependency groupId="org.tartarus" artifactId="snowball" version="0" />
<dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees" version="2.4.0" />
<dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.2.6" />
</dependencyManagement>
@@ -489,11 +488,11 @@
version="${version}"/>
<dependency groupId="junit" artifactId="junit"/>
<dependency groupId="org.apache.rat" artifactId="apache-rat"/>
- <dependency groupId="org.apache.hadoop" artifactId="hadoop-core"/>
+ <dependency groupId="org.apache.hadoop" artifactId="hadoop-common"/>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster"/>
<dependency groupId="com.google.code.findbugs" artifactId="jsr305"/>
<dependency groupId="org.antlr" artifactId="antlr"/>
- <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" classifier="shaded">
+ <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core">
<exclusion groupId="io.netty" artifactId="netty-buffer"/>
<exclusion groupId="io.netty" artifactId="netty-codec"/>
<exclusion groupId="io.netty" artifactId="netty-handler"/>
@@ -515,7 +514,7 @@
artifactId="cassandra-parent"
version="${version}"/>
<dependency groupId="junit" artifactId="junit"/>
- <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" classifier="shaded">
+ <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core">
<exclusion groupId="io.netty" artifactId="netty-buffer"/>
<exclusion groupId="io.netty" artifactId="netty-codec"/>
<exclusion groupId="io.netty" artifactId="netty-handler"/>
@@ -577,7 +576,7 @@
<dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl"/>
<dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/>
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple"/>
- <dependency groupId="com.boundary" artifactId="high-scale-lib"/>
+ <dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib"/>
<dependency groupId="org.yaml" artifactId="snakeyaml"/>
<dependency groupId="org.mindrot" artifactId="jbcrypt"/>
<dependency groupId="io.dropwizard.metrics" artifactId="metrics-core"/>
@@ -593,11 +592,11 @@
<dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift"/>
<!-- don't need hadoop classes to run, but if you use the hadoop stuff -->
- <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" optional="true"/>
+ <dependency groupId="org.apache.hadoop" artifactId="hadoop-common" optional="true"/>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" optional="true"/>
<!-- don't need the Java Driver to run, but if you use the hadoop stuff or UDFs -->
- <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" classifier="shaded" optional="true">
+ <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" optional="true">
<exclusion groupId="io.netty" artifactId="netty-buffer"/>
<exclusion groupId="io.netty" artifactId="netty-codec"/>
<exclusion groupId="io.netty" artifactId="netty-handler"/>
@@ -632,8 +631,7 @@
<dependency groupId="org.apache.thrift" artifactId="libthrift"/>
<dependency groupId="com.carrotsearch" artifactId="hppc" version="0.5.4" />
<dependency groupId="de.jflex" artifactId="jflex" version="1.6.0" />
- <dependency groupId="net.mintern" artifactId="primitive" version="1.0" />
- <dependency groupId="com.github.rholder" artifactId="snowball-stemmer" version="1.3.0.581.1" />
+ <dependency groupId="org.tartarus" artifactId="snowball" version="0" />
<dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees" version="2.4.0" />
</artifact:pom>
@@ -799,10 +797,10 @@
The build target builds all the .class files
-->
<target name="build"
- depends="maven-ant-tasks-retrieve-build,build-project" description="Compile Cassandra classes"/>
+ depends="build-project" description="Compile Cassandra classes"/>
<target name="codecoverage" depends="jacoco-run,jacoco-report" description="Create code coverage report"/>
- <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java"
+ <target depends="init,gen-cql3-grammar,generate-jflex-java"
name="build-project">
<echo message="${ant.project.name}: ${ant.file}"/>
<!-- Order matters! -->
@@ -873,7 +871,7 @@
The jar target makes cassandra.jar output.
-->
<target name="jar"
- depends="build, build-test, stress-build, write-poms"
+ depends="build, build-test, stress-build"
description="Assemble Cassandra JAR files">
<mkdir dir="${build.classes.main}/META-INF" />
<mkdir dir="${build.classes.thrift}/META-INF" />
@@ -913,8 +911,6 @@
<attribute name="Implementation-Vendor" value="Apache"/>
<attribute name="Premain-Class"
value="org.apache.cassandra.infrastructure.continuations.CAgent"/>
- <attribute name="Class-Path"
- value="${ant.project.name}-clientutil-${version}.jar ${ant.project.name}-thrift-${version}.jar" />
<!-- </section> -->
</manifest>
</jar>
@@ -947,7 +943,7 @@
</manifest>
<mkdir dir="${stress.build.classes}/META-INF" />
<mkdir dir="${build.dir}/tools/lib/" />
- <jar destfile="${build.dir}/tools/lib/stress.jar" manifest="${stress.manifest}">
+ <jar destfile="${build.dir}/tools/lib/${ant.project.name}-stress.jar" manifest="${stress.manifest}">
<fileset dir="${stress.build.classes}"/>
</jar>
</target>