mirror of https://github.com/apache/cassandra
Merge branch 'cassandra-3.0' into cassandra-3.11
This commit is contained in:
Jay Zhuang
commit
b92d90dc14
|
|
@ -16,6 +16,7 @@
|
|||
* RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163)
|
||||
* Fix wildcard GROUP BY queries (CASSANDRA-14209)
|
||||
Merged from 3.0:
|
||||
* Add Missing dependencies in pom-all (CASSANDRA-14422)
|
||||
* Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
|
||||
* Fix deprecated repair error notifications from 3.x clusters to legacy JMX clients (CASSANDRA-13121)
|
||||
* Cassandra not starting when using enhanced startup scripts in windows (CASSANDRA-14418)
|
||||
|
|
|
|||
84
build.xml
84
build.xml
|
|
@ -68,10 +68,10 @@
|
|||
<property name="tmp.dir" value="${java.io.tmpdir}"/>
|
||||
|
||||
<property name="doc.dir" value="${basedir}/doc"/>
|
||||
|
||||
|
||||
<property name="source.version" value="1.8"/>
|
||||
<property name="target.version" value="1.8"/>
|
||||
|
||||
|
||||
<condition property="version" value="${base.version}">
|
||||
<isset property="release"/>
|
||||
</condition>
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
<property name="version.properties.dir"
|
||||
value="${build.src.resources}/org/apache/cassandra/config/" />
|
||||
<property name="final.name" value="${ant.project.name}-${version}"/>
|
||||
|
||||
|
||||
<!-- details of what version of Maven ANT Tasks to fetch -->
|
||||
<property name="maven-ant-tasks.version" value="2.1.3" />
|
||||
<property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/>
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
|
||||
<!-- skip flushing schema tables during tests -->
|
||||
<property name="cassandra.test.flush_local_schema_changes" value="false" />
|
||||
|
||||
|
||||
<!-- http://www.eclemma.org/jacoco/ -->
|
||||
<property name="jacoco.export.dir" value="${build.dir}/jacoco/" />
|
||||
<property name="jacoco.partials.dir" value="${jacoco.export.dir}/partials" />
|
||||
|
|
@ -222,7 +222,7 @@
|
|||
</srcfiles>
|
||||
</uptodate>
|
||||
</target>
|
||||
|
||||
|
||||
<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"
|
||||
|
|
@ -388,7 +388,7 @@
|
|||
<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.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.7">
|
||||
<exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
|
||||
<exclusion groupId="junit" artifactId="junit"/>
|
||||
|
|
@ -604,6 +604,7 @@
|
|||
<dependency groupId="com.boundary" artifactId="high-scale-lib"/>
|
||||
<dependency groupId="org.yaml" artifactId="snakeyaml"/>
|
||||
<dependency groupId="org.mindrot" artifactId="jbcrypt"/>
|
||||
<dependency groupId="io.airlift" artifactId="airline"/>
|
||||
<dependency groupId="io.dropwizard.metrics" artifactId="metrics-core"/>
|
||||
<dependency groupId="io.dropwizard.metrics" artifactId="metrics-jvm"/>
|
||||
<dependency groupId="com.addthis.metrics" artifactId="reporter-config3"/>
|
||||
|
|
@ -639,6 +640,7 @@
|
|||
<dependency groupId="org.fusesource" artifactId="sigar"/>
|
||||
<dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
|
||||
<dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/>
|
||||
<dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8"/>
|
||||
<dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" />
|
||||
<dependency groupId="org.jctools" artifactId="jctools-core"/>
|
||||
<dependency groupId="org.ow2.asm" artifactId="asm" />
|
||||
|
|
@ -720,8 +722,8 @@
|
|||
<target name="maven-ant-tasks-retrieve-test" depends="maven-ant-tasks-init">
|
||||
<artifact:dependencies pomRefId="test-deps-pom"
|
||||
filesetId="test-dependency-jars"
|
||||
sourcesFilesetId="test-dependency-sources"
|
||||
cacheDependencyRefs="true"
|
||||
sourcesFilesetId="test-dependency-sources"
|
||||
cacheDependencyRefs="true"
|
||||
dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
|
||||
<remoteRepository refid="apache"/>
|
||||
<remoteRepository refid="central"/>
|
||||
|
|
@ -904,7 +906,7 @@
|
|||
<target name="write-poms" unless="without.maven">
|
||||
<antcall target="_write-poms" />
|
||||
</target>
|
||||
|
||||
|
||||
<!--
|
||||
The jar target makes cassandra.jar output.
|
||||
-->
|
||||
|
|
@ -995,7 +997,7 @@
|
|||
<jar jarfile="${build.dir}/${final.name}-javadoc.jar"
|
||||
basedir="${javadoc.jars.dir}/main"/>
|
||||
|
||||
<!-- javadoc task always rebuilds so might as well remove the generated docs to prevent
|
||||
<!-- javadoc task always rebuilds so might as well remove the generated docs to prevent
|
||||
being pulled into the distribution by accident -->
|
||||
<delete quiet="true" dir="${javadoc.jars.dir}"/>
|
||||
</target>
|
||||
|
|
@ -1083,7 +1085,7 @@
|
|||
<include name="*.jar" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<artifact:writepom pomRefId="dist-pom"
|
||||
<artifact:writepom pomRefId="dist-pom"
|
||||
file="${build.dir}/${final.name}-dist.pom"/>
|
||||
<tar compression="gzip" longfile="gnu"
|
||||
destfile="${build.dir}/${final.name}-bin.tar.gz">
|
||||
|
|
@ -1201,7 +1203,7 @@
|
|||
debuglevel="${debuglevel}"
|
||||
destdir="${test.classes}"
|
||||
includeantruntime="true"
|
||||
source="${source.version}"
|
||||
source="${source.version}"
|
||||
target="${target.version}"
|
||||
encoding="utf-8">
|
||||
<classpath>
|
||||
|
|
@ -1310,7 +1312,7 @@
|
|||
</testmacro>
|
||||
<fileset dir="${test.unit.src}" />
|
||||
</target>
|
||||
|
||||
|
||||
<!-- Will not generate a junit report or fail on error since it is called in parallel for test-compression
|
||||
That is taken care of by testparallel -->
|
||||
<macrodef name="testlist">
|
||||
|
|
@ -1396,7 +1398,7 @@
|
|||
<jvmarg value="-Dcassandra.skip_sync=true" />
|
||||
</testmacro>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="test-compression" depends="build-test,stress-build" description="Execute unit tests with sstable compression enabled">
|
||||
<property name="compressed_yaml" value="${build.test.dir}/cassandra.compressed.yaml"/>
|
||||
<concat destfile="${compressed_yaml}">
|
||||
|
|
@ -1434,7 +1436,7 @@
|
|||
<testmacro inputdir="${test.unit.src}" timeout="${test.timeout}"
|
||||
filter="**/SerializationsTest.java"/>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="msg-ser-test-7" depends="build-test" description="Generates message serializations">
|
||||
<testmacro inputdir="${test.unit.src}"
|
||||
timeout="${test.timeout}" filter="**/SerializationsTest.java">
|
||||
|
|
@ -1533,10 +1535,10 @@
|
|||
</sequential>
|
||||
</target>
|
||||
|
||||
<target name="test-all"
|
||||
<target name="test-all"
|
||||
depends="eclipse-warnings,test,long-test,test-compression,stress-test"
|
||||
description="Run all tests except for those under test-burn" />
|
||||
|
||||
|
||||
<!-- Use JaCoCo ant extension without needing externally saved lib -->
|
||||
<target name="jacoco-init" depends="maven-ant-tasks-init">
|
||||
<artifact:dependencies pathId="jacocoant.classpath">
|
||||
|
|
@ -1592,7 +1594,7 @@
|
|||
</target>
|
||||
|
||||
<target name="rat-check" depends="rat-init">
|
||||
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
|
||||
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
|
||||
reportFile="${build.dir}/rat-report.log">
|
||||
<fileset dir="." excludesfile=".rat-excludes" />
|
||||
</rat:report>
|
||||
|
|
@ -1862,7 +1864,7 @@
|
|||
<classpathentry kind="lib" path="test/conf"/>
|
||||
<classpathentry kind="lib" path="${java.home}/../lib/tools.jar"/>
|
||||
]]>
|
||||
</echo>
|
||||
</echo>
|
||||
<path id="eclipse-project-libs-path">
|
||||
<fileset dir="lib">
|
||||
<include name="**/*.jar" />
|
||||
|
|
@ -1876,27 +1878,27 @@
|
|||
var File = java.io.File;
|
||||
var FilenameUtils = Packages.org.apache.commons.io.FilenameUtils;
|
||||
jars = project.getProperty("eclipse-project-libs").split(project.getProperty("path.separator"));
|
||||
|
||||
|
||||
cp = "";
|
||||
for (i=0; i< jars.length; i++) {
|
||||
srcjar = FilenameUtils.getBaseName(jars[i]) + '-sources.jar';
|
||||
srcdir = FilenameUtils.concat(project.getProperty("build.dir.lib"), 'sources');
|
||||
srcfile = new File(FilenameUtils.concat(srcdir, srcjar));
|
||||
|
||||
|
||||
cp += ' <classpathentry kind="lib" path="' + jars[i] + '"';
|
||||
if (srcfile.exists()) {
|
||||
cp += ' sourcepath="' + srcfile.getAbsolutePath() + '"';
|
||||
}
|
||||
cp += '/>\n';
|
||||
}
|
||||
|
||||
|
||||
cp += '</classpath>';
|
||||
|
||||
|
||||
echo = project.createTask("echo");
|
||||
echo.setMessage(cp);
|
||||
echo.setFile(new File(".classpath"));
|
||||
echo.setAppend(true);
|
||||
echo.perform();
|
||||
echo.perform();
|
||||
]]> </script>
|
||||
<mkdir dir=".settings" />
|
||||
</target>
|
||||
|
|
@ -1916,29 +1918,29 @@
|
|||
</target>
|
||||
|
||||
|
||||
<target name="eclipse-warnings" depends="build" description="Run eclipse compiler code analysis">
|
||||
<target name="eclipse-warnings" depends="build" description="Run eclipse compiler code analysis">
|
||||
<property name="ecj.log.dir" value="${build.dir}/ecj" />
|
||||
<property name="ecj.warnings.file" value="${ecj.log.dir}/eclipse_compiler_checks.txt"/>
|
||||
<mkdir dir="${ecj.log.dir}" />
|
||||
|
||||
<property name="ecj.properties" value="${basedir}/eclipse_compiler.properties" />
|
||||
<property name="ecj.properties" value="${basedir}/eclipse_compiler.properties" />
|
||||
|
||||
<echo message="Running Eclipse Code Analysis. Output logged to ${ecj.warnings.file}" />
|
||||
|
||||
<java
|
||||
<echo message="Running Eclipse Code Analysis. Output logged to ${ecj.warnings.file}" />
|
||||
|
||||
<java
|
||||
jar="${build.dir.lib}/jars/ecj-${ecj.version}.jar"
|
||||
fork="true"
|
||||
failonerror="true"
|
||||
maxmemory="512m">
|
||||
maxmemory="512m">
|
||||
<arg value="-source"/>
|
||||
<arg value="${source.version}" />
|
||||
<arg value="${source.version}" />
|
||||
<arg value="-target"/>
|
||||
<arg value="${target.version}" />
|
||||
<arg value="${target.version}" />
|
||||
<arg value="-d" />
|
||||
<arg value="none" />
|
||||
<arg value="-proc:none" />
|
||||
<arg value="-proc:none" />
|
||||
<arg value="-log" />
|
||||
<arg value="${ecj.warnings.file}" />
|
||||
<arg value="${ecj.warnings.file}" />
|
||||
<arg value="-properties" />
|
||||
<arg value="${ecj.properties}" />
|
||||
<arg value="-cp" />
|
||||
|
|
@ -1946,13 +1948,13 @@
|
|||
<arg value="${build.src.java}" />
|
||||
</java>
|
||||
</target>
|
||||
|
||||
|
||||
|
||||
<!-- Publish artifacts to Maven repositories -->
|
||||
<target name="mvn-install"
|
||||
depends="maven-declare-dependencies,artifacts,jar,sources-jar,javadoc-jar"
|
||||
description="Installs the artifacts in the Maven Local Repository">
|
||||
|
||||
|
||||
<!-- the parent -->
|
||||
<install pomFile="${build.dir}/${final.name}-parent.pom"
|
||||
file="${build.dir}/${final.name}-parent.pom"
|
||||
|
|
@ -1970,8 +1972,8 @@
|
|||
file="${build.dir}/${final.name}-src.tar.gz"
|
||||
packaging="tar.gz"
|
||||
classifier="src"/>
|
||||
|
||||
<!-- the cassandra-thrift jar -->
|
||||
|
||||
<!-- the cassandra-thrift jar -->
|
||||
<install pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom"
|
||||
file="${build.dir}/${ant.project.name}-thrift-${version}.jar"/>
|
||||
<install pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom"
|
||||
|
|
@ -1996,7 +1998,7 @@
|
|||
depends="mvn-install"
|
||||
if="release"
|
||||
description="Publishes the artifacts to the Maven repository">
|
||||
|
||||
|
||||
<!-- the parent -->
|
||||
<deploy pomFile="${build.dir}/${final.name}-parent.pom"
|
||||
file="${build.dir}/${final.name}-parent.pom"
|
||||
|
|
@ -2014,8 +2016,8 @@
|
|||
file="${build.dir}/${final.name}-src.tar.gz"
|
||||
packaging="tar.gz"
|
||||
classifier="src"/>
|
||||
|
||||
<!-- the cassandra-thrift jar -->
|
||||
|
||||
<!-- the cassandra-thrift jar -->
|
||||
<deploy pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom"
|
||||
file="${build.dir}/${ant.project.name}-thrift-${version}.jar"/>
|
||||
<deploy pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom"
|
||||
|
|
|
|||
Loading…
Reference in New Issue