-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathcassandra-3.11.1-build.patch
185 lines (176 loc) · 10.3 KB
/
cassandra-3.11.1-build.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
From 79279dfa0c9f7c84e5974dbeeb835c73ab83b9f8 Mon Sep 17 00:00:00 2001
From: Tomas Repik <[email protected]>
Date: Wed, 12 Jul 2017 13:46:52 +0200
Subject: [PATCH] tweak the build
---
build.xml | 42 ++++++++++++++++++++----------------------
1 file changed, 20 insertions(+), 22 deletions(-)
diff --git a/build.xml b/build.xml
index 9464acb..8c27678 100644
--- a/build.xml
+++ b/build.xml
@@ -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" />
@@ -73,7 +73,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}"/>
@@ -171,7 +171,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>
@@ -222,7 +223,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>
@@ -382,7 +383,7 @@
<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.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="org.yaml" artifactId="snakeyaml" version="1.11"/>
@@ -390,7 +391,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"/>
@@ -423,7 +424,7 @@
<dependency groupId="io.netty" artifactId="netty-all" version="4.0.44.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"/>
@@ -439,7 +440,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="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" />
<dependency groupId="org.jctools" artifactId="jctools-core" version="1.2.1"/>
@@ -498,11 +499,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"/>
@@ -524,7 +525,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"/>
@@ -587,7 +588,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.hihg-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"/>
@@ -599,11 +600,11 @@
<dependency groupId="ch.qos.logback" artifactId="logback-classic"/>
<!-- 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"/>
@@ -728,10 +729,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! -->
@@ -813,7 +814,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" />
<copy file="LICENSE.txt"
@@ -843,7 +844,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>
@@ -1051,9 +1052,6 @@
</jar>
</target>
- <!-- use https://github.com/krummas/jstackjunit to get thread dumps when unit tests time out -->
- <taskdef name="junit" classname="org.krummas.junit.JStackJUnitTask" classpath="lib/jstackjunit-0.0.1.jar"/>
-
<target name="build-test" depends="build" description="Compile test classes">
<javac
compiler="modern"
--
2.9.4