diff --git a/.build/build-rat.xml b/.build/build-rat.xml index ffa00d37d8..2178551698 100644 --- a/.build/build-rat.xml +++ b/.build/build-rat.xml @@ -1,4 +1,3 @@ - - - - - - - - + + + diff --git a/.build/build-resolver.xml b/.build/build-resolver.xml new file mode 100644 index 0000000000..768fb87124 --- /dev/null +++ b/.build/build-resolver.xml @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + Downloading Resolver ANT Tasks... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.circleci/license.yml b/.circleci/license.yml index 01d7057208..3df60b02f7 100644 --- a/.circleci/license.yml +++ b/.circleci/license.yml @@ -15,4 +15,3 @@ # See the License for the specific language governing permissions and # limitations under the License. # - diff --git a/.gitignore b/.gitignore index 715f971827..d8159b4205 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ data/ conf/hotspot_compiler doc/cql3/CQL.html pylib/src/ +lib/ # C* debs build-stamp @@ -53,6 +54,7 @@ out/ target/ # General +**/__pycache__ *.pyc *~ *.bak @@ -72,6 +74,7 @@ lib/jsr223/jython/*.jar lib/jsr223/jython/cachedir lib/jsr223/scala/*.jar +/.ant-targets-build.xml .ant_targets # Python virtual environment diff --git a/CHANGES.txt b/CHANGES.txt index 08a46c0e35..cf775e268a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,6 @@ 3.0.25: + * Binary releases no longer bundle the apidocs (javadoc) (CASSANDRA-16557) + * Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks, removing lib/ directory from version control (CASSANDRA-16557) * Don't allow seeds to replace without using unsafe (CASSANDRA-14463) * Calculate time remaining correctly for all compaction types in compactionstats (CASSANDRA-14701) * Receipt of gossip shutdown notification updates TokenMetadata (CASSANDRA-16796) diff --git a/build.xml b/build.xml index 87851b8ec1..07d3e246ff 100644 --- a/build.xml +++ b/build.xml @@ -112,8 +112,10 @@ + + @@ -152,15 +154,18 @@ - - - - - - - - + + + + + + + + + + + @@ -205,6 +210,7 @@ + @@ -220,10 +226,8 @@ Building Grammar ${build.src.java}/org/apache/cassandra/cql3/Cql.g ... - @@ -234,13 +238,7 @@ - - - - - - - + @@ -270,69 +268,9 @@ tofile="${maven-ant-tasks.local}/${maven-ant-tasks.version}/maven-ant-tasks-${maven-ant-tasks.version}.jar"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -360,15 +298,24 @@ - + + + + + + + + + + @@ -381,31 +328,35 @@ - - + + + + + + + - - - - - - + + + + + - + - - + + @@ -420,31 +371,51 @@ - - + + - + - + + + + - + + + + - - - + + + + + + + + + + + + - + - + + + + + - + + @@ -499,28 +470,27 @@ artifactId="cassandra-build-deps"> + version="${version}" + relativePath="${final.name}-parent.pom"/> + - - - - - + + - + - + + + @@ -572,7 +535,8 @@ name="Apache Cassandra"> + version="${version}" + relativePath="${final.name}-parent.pom"/> @@ -583,7 +547,8 @@ - + + @@ -597,6 +562,7 @@ + @@ -605,11 +571,11 @@ - + - - + + @@ -626,7 +592,18 @@ - + + + + + + + + + + + + + version="${version}" + relativePath="${final.name}-parent.pom"/> @@ -650,71 +628,12 @@ artifactId="cassandra-parent" version="${version}"/> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}"> + destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}"> @@ -810,33 +726,24 @@ - - - - - + + - - + + - - - - - - + - + - + + @@ -847,7 +754,7 @@ The jar target makes cassandra.jar output. --> @@ -925,6 +832,7 @@ + @@ -939,7 +847,7 @@ - + @@ -961,8 +869,7 @@ - + @@ -1009,7 +916,8 @@ - @@ -1024,10 +932,8 @@ - - - - + + @@ -1097,19 +1003,25 @@ prefix="${final.name}-src"> + + + + + + @@ -1144,7 +1056,7 @@ - + - + @@ -1229,8 +1141,11 @@ else=""> - - + + + + + @@ -1240,7 +1155,7 @@ - + @@ -1270,6 +1185,7 @@ + @@ -1474,7 +1390,7 @@ - + @@ -1516,7 +1432,7 @@ - + @@ -1536,10 +1452,7 @@ - - - - + @@ -1814,17 +1727,25 @@ + + + -