Add missing dependencies in pom-all patch by Shichao An; reviewed by Jay Zhuang for CASSANDRA-14422
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38096da2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38096da2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38096da2 Branch: refs/heads/cassandra-3.11 Commit: 38096da25bd72346628c001d5b310417f8f703cd Parents: 06b3521 Author: Shichao An <[email protected]> Authored: Thu Apr 26 17:35:39 2018 -0700 Committer: Jay Zhuang <[email protected]> Committed: Wed May 30 21:55:53 2018 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 96 +++++++++++++++++++++++++++++--------------------------- 2 files changed, 51 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/38096da2/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1293bd4..16fe6d1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.17 + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/38096da2/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 7bab97c..3fc64fb 100644 --- a/build.xml +++ b/build.xml @@ -65,10 +65,10 @@ <property name="test.microbench.src" value="${test.dir}/microbench"/> <property name="dist.dir" value="${build.dir}/dist"/> <property name="tmp.dir" value="${java.io.tmpdir}"/> - + <property name="source.version" value="1.8"/> <property name="target.version" value="1.8"/> - + <condition property="version" value="${base.version}"> <isset property="release"/> </condition> @@ -76,7 +76,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"/> @@ -102,7 +102,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" /> @@ -215,7 +215,7 @@ srcfile="${build.src.java}/org/apache/cassandra/cql3/Cql.g" targetfile="${build.src.gen-java}/org/apache/cassandra/cql3/Cql.tokens"/> </target> - + <target name="gen-cql3-grammar" depends="check-gen-cql3-grammar" unless="cql3current"> <echo>Building Grammar ${build.src.java}/org/apache/cassandra/cql3/Cql.g ...</echo> <java classname="org.antlr.Tool" @@ -360,7 +360,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"/> </dependency> @@ -414,6 +414,7 @@ <exclusion groupId="log4j" artifactId="log4j"/> </dependency> <dependency groupId="joda-time" artifactId="joda-time" version="2.4" /> + <dependency groupId="org.ow2.asm" artifactId="asm" version="5.0.4" /> </dependencyManagement> <developer id="adelapena" name="Andres de la Peña"/> @@ -552,6 +553,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"/> @@ -582,6 +584,8 @@ <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="org.ow2.asm" artifactId="asm"/> </artifact:pom> <artifact:pom id="thrift-pom" artifactId="cassandra-thrift" @@ -607,7 +611,7 @@ <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/> <dependency groupId="com.google.guava" artifactId="guava"/> </artifact:pom> - + <artifact:pom id="dist-pom" artifactId="apache-cassandra" packaging="pom" @@ -666,8 +670,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"/> @@ -822,7 +826,7 @@ <target name="write-poms" unless="without.maven"> <antcall target="_write-poms" /> </target> - + <!-- The jar target makes cassandra.jar output. --> @@ -946,7 +950,7 @@ </create-javadoc> <jar jarfile="${build.dir}/${ant.project.name}-clientutil-${version}-javadoc.jar" basedir="${javadoc.jars.dir}/clientutil"/> - <!-- 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> @@ -1037,7 +1041,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"> @@ -1134,7 +1138,7 @@ debuglevel="${debuglevel}" destdir="${test.classes}" includeantruntime="true" - source="${source.version}" + source="${source.version}" target="${target.version}" encoding="utf-8"> <classpath> @@ -1273,7 +1277,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"> @@ -1340,7 +1344,7 @@ <jvmarg value="-Dcassandra.skip_sync=true" /> </testmacro> </target> - + <target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled"> <property name="compressed_yaml" value="${build.test.dir}/cassandra.compressed.yaml"/> <concat destfile="${compressed_yaml}"> @@ -1360,12 +1364,12 @@ <jvmarg value="-Dcassandra.test-serialization-writes=True"/> </testmacro> </target> - + <target name="msg-ser-test" depends="build-test" description="Tests message serializations"> <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"> @@ -1464,10 +1468,10 @@ </sequential> </target> - <target name="test-all" - depends="eclipse-warnings,test,long-test,test-compression" + <target name="test-all" + depends="eclipse-warnings,test,long-test,test-compression" 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"> @@ -1523,7 +1527,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> @@ -1791,7 +1795,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" /> @@ -1805,27 +1809,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> @@ -1845,29 +1849,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" /> @@ -1875,13 +1879,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" @@ -1899,8 +1903,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" @@ -1910,7 +1914,7 @@ file="${build.dir}/${ant.project.name}-thrift-${version}-javadoc.jar" classifier="javadoc"/> - <!-- the cassandra-clientutil jar --> + <!-- the cassandra-clientutil jar --> <install pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom" file="${build.dir}/${ant.project.name}-clientutil-${version}.jar"/> <install pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom" @@ -1935,7 +1939,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" @@ -1953,8 +1957,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" @@ -1964,7 +1968,7 @@ file="${build.dir}/${ant.project.name}-thrift-${version}-javadoc.jar" classifier="javadoc"/> - <!-- the cassandra-clientutil jar --> + <!-- the cassandra-clientutil jar --> <deploy pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom" file="${build.dir}/${ant.project.name}-clientutil-${version}.jar"/> <deploy pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
