|
 |
e42c61e |
From 79279dfa0c9f7c84e5974dbeeb835c73ab83b9f8 Mon Sep 17 00:00:00 2001
|
|
|
496008e |
From: Tomas Repik <trepik@redhat.com>
|
|
|
e42c61e |
Date: Wed, 12 Jul 2017 13:46:52 +0200
|
|
|
e42c61e |
Subject: [PATCH] tweak the build
|
|
|
496008e |
|
|
|
496008e |
---
|
|
|
496008e |
build.xml | 42 ++++++++++++++++++++----------------------
|
|
|
496008e |
1 file changed, 20 insertions(+), 22 deletions(-)
|
|
|
496008e |
|
|
|
496008e |
diff --git a/build.xml b/build.xml
|
|
|
e42c61e |
index 9464acb..8c27678 100644
|
|
|
496008e |
--- a/build.xml
|
|
|
496008e |
+++ b/build.xml
|
|
|
2a3c276 |
@@ -17,7 +17,7 @@
|
|
|
2a3c276 |
~ specific language governing permissions and limitations
|
|
|
2a3c276 |
~ under the License.
|
|
|
2a3c276 |
-->
|
|
|
2a3c276 |
-
|
|
|
2a3c276 |
+
|
|
|
2a3c276 |
xmlns:artifact="antlib:org.apache.maven.artifact.ant">
|
|
|
2a3c276 |
<property environment="env"/>
|
|
|
2a3c276 |
<property file="build.properties" />
|
|
|
496008e |
@@ -73,7 +73,7 @@
|
|
|
2a3c276 |
<condition property="version" value="${base.version}">
|
|
|
2a3c276 |
<isset property="release"/>
|
|
|
2a3c276 |
</condition>
|
|
|
2a3c276 |
- <property name="version" value="${base.version}-SNAPSHOT"/>
|
|
|
2a3c276 |
+ <property name="version" value="${base.version}"/>
|
|
|
2a3c276 |
|
|
|
2a3c276 |
value="${build.src.resources}/org/apache/cassandra/config/" />
|
|
|
2a3c276 |
<property name="final.name" value="${ant.project.name}-${version}"/>
|
|
|
e42c61e |
@@ -171,7 +171,8 @@
|
|
|
2a3c276 |
windowtitle="${ant.project.name} API" classpathref="cassandra.classpath"
|
|
|
2a3c276 |
bottom="Copyright © ${YEAR} The Apache Software Foundation"
|
|
|
2a3c276 |
useexternalfile="yes"
|
|
|
2a3c276 |
- maxmemory="256m">
|
|
|
2a3c276 |
+ maxmemory="256m"
|
|
|
496008e |
+ encoding="utf-8">
|
|
|
2a3c276 |
<filesets/>
|
|
|
2a3c276 |
</javadoc>
|
|
|
2a3c276 |
</sequential>
|
|
|
e42c61e |
@@ -222,7 +223,7 @@
|
|
|
2a3c276 |
<target name="gen-cql3-grammar" depends="check-gen-cql3-grammar" unless="cql3current">
|
|
|
2a3c276 |
<echo>Building Grammar ${build.src.antlr}/Cql.g ...</echo>
|
|
|
2a3c276 |
|
|
|
2a3c276 |
- 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"
|
|
|
2a3c276 |
+ classpath="${build.lib}/[antlr3].jar;${build.lib}/[antlr3-runtime].jar;${build.lib}/[stringtemplate4]ST4.jar"
|
|
|
2a3c276 |
fork="true"
|
|
|
2a3c276 |
failonerror="true">
|
|
|
2a3c276 |
<jvmarg value="-Xmx512M" />
|
|
|
e42c61e |
@@ -267,7 +268,7 @@
|
|
|
2a3c276 |
grammar files
|
|
|
2a3c276 |
-->
|
|
|
2a3c276 |
<target name="generate-jflex-java" description="Generate Java from jflex grammar">
|
|
|
2a3c276 |
- <taskdef classname="jflex.anttask.JFlexTask" classpath="${build.lib}/jflex-1.6.0.jar" name="jflex" />
|
|
|
2a3c276 |
+ <taskdef classname="jflex.anttask.JFlexTask" classpath="${build.lib}/[jflex].jar;${build.lib}/[java_cup].jar" name="jflex" />
|
|
|
2a3c276 |
<jflex file="${build.src.java}/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex" destdir="${build.src.gen-java}/" />
|
|
|
2a3c276 |
</target>
|
|
|
2a3c276 |
|
|
|
e42c61e |
@@ -382,7 +383,7 @@
|
|
|
2a3c276 |
<dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl" version="1.9.2"/>
|
|
|
2a3c276 |
<dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl" version="1.9.2"/>
|
|
|
2a3c276 |
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
|
|
|
2a3c276 |
- <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/>
|
|
|
496008e |
+ <dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib" version="1.0.6"/>
|
|
|
496008e |
<dependency groupId="com.github.jbellis" artifactId="jamm" version="0.3.0"/>
|
|
|
496008e |
|
|
|
496008e |
<dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/>
|
|
|
e42c61e |
@@ -390,7 +391,7 @@
|
|
|
2a3c276 |
<dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.10">
|
|
|
2a3c276 |
<exclusion groupId="commons-lang" artifactId="commons-lang"/>
|
|
|
2a3c276 |
</dependency>
|
|
|
2a3c276 |
- <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3">
|
|
|
2a3c276 |
+ <dependency groupId="org.apache.hadoop" artifactId="hadoop-common" version="2.4.1">
|
|
|
2a3c276 |
<exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
|
|
|
2a3c276 |
<exclusion groupId="commons-logging" artifactId="commons-logging"/>
|
|
|
2a3c276 |
<exclusion groupId="org.eclipse.jdt" artifactId="core"/>
|
|
|
e42c61e |
@@ -423,7 +424,7 @@
|
|
|
e42c61e |
<dependency groupId="io.netty" artifactId="netty-all" version="4.0.44.Final" />
|
|
|
2a3c276 |
<dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" />
|
|
|
2a3c276 |
<dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" />
|
|
|
2a3c276 |
- <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.0.1" classifier="shaded">
|
|
|
496008e |
+ <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.0.1">
|
|
|
2a3c276 |
<exclusion groupId="io.netty" artifactId="netty-buffer"/>
|
|
|
2a3c276 |
<exclusion groupId="io.netty" artifactId="netty-codec"/>
|
|
|
2a3c276 |
<exclusion groupId="io.netty" artifactId="netty-handler"/>
|
|
|
e42c61e |
@@ -439,7 +440,7 @@
|
|
|
2a3c276 |
<dependency groupId="joda-time" artifactId="joda-time" version="2.4" />
|
|
|
2a3c276 |
<dependency groupId="com.carrotsearch" artifactId="hppc" version="0.5.4" />
|
|
|
2a3c276 |
<dependency groupId="de.jflex" artifactId="jflex" version="1.6.0" />
|
|
|
2a3c276 |
- <dependency groupId="com.github.rholder" artifactId="snowball-stemmer" version="1.3.0.581.1" />
|
|
|
2a3c276 |
+ <dependency groupId="org.tartarus" artifactId="snowball" version="0" />
|
|
|
2a3c276 |
<dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees" version="2.4.0" />
|
|
|
2a3c276 |
<dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.2.6" />
|
|
|
e42c61e |
<dependency groupId="org.jctools" artifactId="jctools-core" version="1.2.1"/>
|
|
|
e42c61e |
@@ -498,11 +499,11 @@
|
|
|
2a3c276 |
version="${version}"/>
|
|
|
2a3c276 |
<dependency groupId="junit" artifactId="junit"/>
|
|
|
2a3c276 |
<dependency groupId="org.apache.rat" artifactId="apache-rat"/>
|
|
|
2a3c276 |
- <dependency groupId="org.apache.hadoop" artifactId="hadoop-core"/>
|
|
|
2a3c276 |
+ <dependency groupId="org.apache.hadoop" artifactId="hadoop-common"/>
|
|
|
2a3c276 |
<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster"/>
|
|
|
2a3c276 |
<dependency groupId="com.google.code.findbugs" artifactId="jsr305"/>
|
|
|
2a3c276 |
<dependency groupId="org.antlr" artifactId="antlr"/>
|
|
|
2a3c276 |
- <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" classifier="shaded">
|
|
|
2a3c276 |
+ <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core">
|
|
|
2a3c276 |
<exclusion groupId="io.netty" artifactId="netty-buffer"/>
|
|
|
2a3c276 |
<exclusion groupId="io.netty" artifactId="netty-codec"/>
|
|
|
2a3c276 |
<exclusion groupId="io.netty" artifactId="netty-handler"/>
|
|
|
e42c61e |
@@ -524,7 +525,7 @@
|
|
|
2a3c276 |
artifactId="cassandra-parent"
|
|
|
2a3c276 |
version="${version}"/>
|
|
|
2a3c276 |
<dependency groupId="junit" artifactId="junit"/>
|
|
|
2a3c276 |
- <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" classifier="shaded">
|
|
|
2a3c276 |
+ <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core">
|
|
|
2a3c276 |
<exclusion groupId="io.netty" artifactId="netty-buffer"/>
|
|
|
2a3c276 |
<exclusion groupId="io.netty" artifactId="netty-codec"/>
|
|
|
2a3c276 |
<exclusion groupId="io.netty" artifactId="netty-handler"/>
|
|
|
e42c61e |
@@ -587,7 +588,7 @@
|
|
|
2a3c276 |
<dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl"/>
|
|
|
2a3c276 |
<dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/>
|
|
|
2a3c276 |
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple"/>
|
|
|
2a3c276 |
- <dependency groupId="com.boundary" artifactId="high-scale-lib"/>
|
|
|
496008e |
+ <dependency groupId="com.github.stephenc.hihg-scale-lib" artifactId="high-scale-lib"/>
|
|
|
2a3c276 |
<dependency groupId="org.yaml" artifactId="snakeyaml"/>
|
|
|
2a3c276 |
<dependency groupId="org.mindrot" artifactId="jbcrypt"/>
|
|
|
2a3c276 |
<dependency groupId="io.dropwizard.metrics" artifactId="metrics-core"/>
|
|
|
e42c61e |
@@ -599,11 +600,11 @@
|
|
|
496008e |
<dependency groupId="ch.qos.logback" artifactId="logback-classic"/>
|
|
|
2a3c276 |
|
|
|
2a3c276 |
|
|
|
2a3c276 |
- <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" optional="true"/>
|
|
|
2a3c276 |
+ <dependency groupId="org.apache.hadoop" artifactId="hadoop-common" optional="true"/>
|
|
|
2a3c276 |
<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" optional="true"/>
|
|
|
2a3c276 |
|
|
|
2a3c276 |
|
|
|
2a3c276 |
- <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" classifier="shaded" optional="true">
|
|
|
2a3c276 |
+ <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" optional="true">
|
|
|
2a3c276 |
<exclusion groupId="io.netty" artifactId="netty-buffer"/>
|
|
|
2a3c276 |
<exclusion groupId="io.netty" artifactId="netty-codec"/>
|
|
|
2a3c276 |
<exclusion groupId="io.netty" artifactId="netty-handler"/>
|
|
|
e42c61e |
@@ -728,10 +729,10 @@
|
|
|
2a3c276 |
The build target builds all the .class files
|
|
|
2a3c276 |
-->
|
|
|
2a3c276 |
|
|
|
2a3c276 |
- depends="maven-ant-tasks-retrieve-build,build-project" description="Compile Cassandra classes"/>
|
|
|
2a3c276 |
+ depends="build-project" description="Compile Cassandra classes"/>
|
|
|
2a3c276 |
<target name="codecoverage" depends="jacoco-run,jacoco-report" description="Create code coverage report"/>
|
|
|
2a3c276 |
|
|
|
2a3c276 |
-
|
|
|
2a3c276 |
+
|
|
|
2a3c276 |
name="build-project">
|
|
|
2a3c276 |
<echo message="${ant.project.name}: ${ant.file}"/>
|
|
|
2a3c276 |
|
|
|
e42c61e |
@@ -813,7 +814,7 @@
|
|
|
2a3c276 |
The jar target makes cassandra.jar output.
|
|
|
2a3c276 |
-->
|
|
|
2a3c276 |
|
|
|
2a3c276 |
- depends="build, build-test, stress-build, write-poms"
|
|
|
2a3c276 |
+ depends="build, build-test, stress-build"
|
|
|
2a3c276 |
description="Assemble Cassandra JAR files">
|
|
|
2a3c276 |
<mkdir dir="${build.classes.main}/META-INF" />
|
|
|
496008e |
|
|
|
e42c61e |
@@ -843,7 +844,7 @@
|
|
|
2a3c276 |
</manifest>
|
|
|
2a3c276 |
<mkdir dir="${stress.build.classes}/META-INF" />
|
|
|
2a3c276 |
<mkdir dir="${build.dir}/tools/lib/" />
|
|
|
2a3c276 |
- <jar destfile="${build.dir}/tools/lib/stress.jar" manifest="${stress.manifest}">
|
|
|
2a3c276 |
+ <jar destfile="${build.dir}/tools/lib/${ant.project.name}-stress.jar" manifest="${stress.manifest}">
|
|
|
2a3c276 |
<fileset dir="${stress.build.classes}"/>
|
|
|
2a3c276 |
</jar>
|
|
|
2a3c276 |
</target>
|
|
|
e42c61e |
@@ -1051,9 +1052,6 @@
|
|
|
e42c61e |
</jar>
|
|
|
e42c61e |
</target>
|
|
|
e42c61e |
|
|
|
e42c61e |
-
|
|
|
e42c61e |
- <taskdef name="junit" classname="org.krummas.junit.JStackJUnitTask" classpath="lib/jstackjunit-0.0.1.jar"/>
|
|
|
e42c61e |
-
|
|
|
e42c61e |
<target name="build-test" depends="build" description="Compile test classes">
|
|
|
e42c61e |
|
|
|
e42c61e |
compiler="modern"
|
|
|
496008e |
--
|
|
|
e42c61e |
2.9.4
|
|
|
496008e |
|