From 3259d6de37ad8ad231d44ccd4ca9c378b987f835 Mon Sep 17 00:00:00 2001 From: Mick Semb Wever Date: Mon, 29 Mar 2021 00:51:11 +0200 Subject: [PATCH] Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks - This removes lib/ from version control. - The generated pom files are now the source of truth to the project's depdendencies, and the lib/ folder re-created during the build from compile scope dependencies excluding provided and system scopes. Project dependencies are first downloaded to the maven local repository at `~/.m2/repository`. - Maven is now required to be installed to build, that is the `mvn` command needs to be found in the path. - The new resolver-ant-tasks targets have been encapsulated into the `build/build-resolver.xml` ant file. - Most classpaths in build.xml are replaced with resolver:resolve definitions. - The build-deps-pom generated pom file is now only used for declaring test dependencies. patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16557 --- .build/build-rat.xml | 12 +- .build/build-resolver.xml | 235 ++++++++++ .circleci/license.yml | 1 - .gitignore | 3 + CHANGES.txt | 2 + build.xml | 406 +++++++----------- debian/cassandra.install | 1 - ide/idea-iml-file.xml | 23 +- lib/ST4-4.0.8.jar | Bin 239543 -> 0 bytes lib/airline-0.6.jar | Bin 86653 -> 0 bytes lib/antlr-runtime-3.5.2.jar | Bin 167761 -> 0 bytes lib/asm-5.0.4.jar | Bin 53297 -> 0 bytes lib/cassandra-driver-core-3.0.1-shaded.jar | Bin 2445093 -> 0 bytes ...a-driver-internal-only-3.11.0-bb96859b.zip | Bin 266661 -> 0 bytes lib/commons-cli-1.1.jar | Bin 36174 -> 0 bytes lib/commons-codec-1.2.jar | Bin 30085 -> 0 bytes lib/commons-lang3-3.1.jar | Bin 315805 -> 0 bytes lib/commons-math3-3.2.jar | Bin 1692782 -> 0 bytes lib/compress-lzf-0.8.4.jar | Bin 25490 -> 0 bytes lib/concurrentlinkedhashmap-lru-1.4.jar | Bin 116575 -> 0 bytes lib/disruptor-3.0.1.jar | Bin 66843 -> 0 bytes lib/ecj-4.4.2.jar | Bin 2310271 -> 0 bytes lib/futures-2.1.6-py2.py3-none-any.zip | Bin 16571 -> 0 bytes lib/guava-18.0.jar | Bin 2256213 -> 0 bytes lib/high-scale-lib-1.0.6.jar | Bin 105118 -> 0 bytes lib/jackson-core-asl-1.9.2.jar | Bin 228286 -> 0 bytes lib/jackson-mapper-asl-1.9.2.jar | Bin 765648 -> 0 bytes lib/jamm-0.3.0.jar | Bin 21033 -> 0 bytes lib/javax.inject.jar | Bin 2497 -> 0 bytes lib/jbcrypt-0.3m.jar | Bin 17750 -> 0 bytes lib/jcl-over-slf4j-1.7.7.jar | Bin 16519 -> 0 bytes lib/jna-4.2.2.jar | Bin 1137286 -> 0 bytes lib/joda-time-2.4.jar | Bin 586201 -> 0 bytes lib/json-simple-1.1.jar | Bin 16046 -> 0 bytes lib/jstackjunit-0.0.1.jar | Bin 2836 -> 0 bytes lib/libthrift-0.9.2.jar | Bin 227712 -> 0 bytes lib/licenses/ST4-4.0.8.txt | 27 -- lib/licenses/airline-0.6.txt | 202 --------- lib/licenses/antlr-runtime-3.5.2.txt | 27 -- lib/licenses/asm-5.0.4.txt | 29 -- lib/licenses/cassandra-driver-3.0.1.txt | 177 -------- lib/licenses/commons-cli-1.1.txt | 202 --------- lib/licenses/commons-codec-1.2.txt | 202 --------- lib/licenses/commons-lang3-3.1.txt | 202 --------- lib/licenses/commons-math3-3.2.txt | 202 --------- lib/licenses/compress-lzf-0.8.4.txt | 11 - .../concurrentlinkedhashmap-lru-1.4.txt | 202 --------- lib/licenses/disruptor-3.0.1.txt | 201 --------- lib/licenses/ecj-4.4.2.txt | 210 --------- lib/licenses/futures-2.1.6.txt | 21 - lib/licenses/guava-18.0.txt | 202 --------- lib/licenses/high-scale-lib-1.0.6.txt | 29 -- lib/licenses/jackson-core-asl-1.9.2.txt | 202 --------- lib/licenses/jackson-mapper-asl-1.9.2.txt | 202 --------- lib/licenses/jamm-0.3.0.txt | 202 --------- lib/licenses/javax.inject.txt | 202 --------- lib/licenses/jbcrypt-0.3m.txt | 17 - lib/licenses/jcl-over-slf4j-1.7.7.txt | 20 - lib/licenses/jna-4.2.2.txt | 202 --------- lib/licenses/joda-time-2.4.txt | 201 --------- lib/licenses/json-simple-1.1.txt | 202 --------- lib/licenses/jstackjunit-0.0.1.txt | 209 --------- lib/licenses/libthrift-0.9.2.txt | 202 --------- lib/licenses/log4j-over-slf4j-1.7.7.txt | 20 - lib/licenses/logback-classic-1.1.3.txt | 70 --- lib/licenses/logback-core-1.1.3.txt | 70 --- lib/licenses/lz4-1.3.0.txt | 235 ---------- lib/licenses/metrics-core-3.1.0.txt | 202 --------- lib/licenses/metrics-jvm-3.1.0.txt | 202 --------- lib/licenses/metrics-logback-3.1.0.txt | 202 --------- lib/licenses/netty-all-4.0.44.Final.txt | 202 --------- lib/licenses/ohc-0.4.3.txt | 201 --------- lib/licenses/reporter-config-base-3.0.0.txt | 177 -------- lib/licenses/reporter-config3-3.0.0.txt | 177 -------- lib/licenses/sigar-1.6.4.txt | 201 --------- lib/licenses/six-1.7.3.txt | 18 - lib/licenses/slf4j-api-1.7.7.txt | 20 - lib/licenses/snakeyaml-1.11.txt | 202 --------- lib/licenses/snappy-java-1.1.1.7.txt | 209 --------- lib/licenses/stream-2.5.2.txt | 202 --------- lib/licenses/thrift-server-0.3.7.txt | 202 --------- lib/log4j-over-slf4j-1.7.7.jar | Bin 24220 -> 0 bytes lib/logback-classic-1.1.3.jar | Bin 280926 -> 0 bytes lib/logback-core-1.1.3.jar | Bin 455041 -> 0 bytes lib/lz4-1.3.0.jar | Bin 277311 -> 0 bytes lib/metrics-core-3.1.0.jar | Bin 111908 -> 0 bytes lib/metrics-jvm-3.1.0.jar | Bin 35907 -> 0 bytes lib/metrics-logback-3.1.0.jar | Bin 4130 -> 0 bytes lib/netty-all-4.0.44.Final.jar | Bin 2342652 -> 0 bytes lib/ohc-core-0.4.3.jar | Bin 127053 -> 0 bytes lib/ohc-core-j8-0.4.3.jar | Bin 4995 -> 0 bytes lib/reporter-config-base-3.0.0.jar | Bin 23633 -> 0 bytes lib/reporter-config3-3.0.0.jar | Bin 14379 -> 0 bytes lib/sigar-1.6.4.jar | Bin 428580 -> 0 bytes lib/sigar-bin/libsigar-amd64-freebsd-6.so | Bin 210641 -> 0 bytes lib/sigar-bin/libsigar-amd64-linux.so | Bin 246605 -> 0 bytes lib/sigar-bin/libsigar-amd64-solaris.so | Bin 251360 -> 0 bytes lib/sigar-bin/libsigar-ia64-hpux-11.sl | Bin 577452 -> 0 bytes lib/sigar-bin/libsigar-ia64-linux.so | Bin 494929 -> 0 bytes lib/sigar-bin/libsigar-pa-hpux-11.sl | Bin 516096 -> 0 bytes lib/sigar-bin/libsigar-ppc-aix-5.so | Bin 400925 -> 0 bytes lib/sigar-bin/libsigar-ppc-linux.so | Bin 258547 -> 0 bytes lib/sigar-bin/libsigar-ppc64-aix-5.so | Bin 425077 -> 0 bytes lib/sigar-bin/libsigar-ppc64-linux.so | Bin 330767 -> 0 bytes lib/sigar-bin/libsigar-s390x-linux.so | Bin 269932 -> 0 bytes lib/sigar-bin/libsigar-sparc-solaris.so | Bin 285004 -> 0 bytes lib/sigar-bin/libsigar-sparc64-solaris.so | Bin 261896 -> 0 bytes lib/sigar-bin/libsigar-universal-macosx.dylib | Bin 377668 -> 0 bytes .../libsigar-universal64-macosx.dylib | Bin 397440 -> 0 bytes lib/sigar-bin/libsigar-x86-freebsd-5.so | Bin 179751 -> 0 bytes lib/sigar-bin/libsigar-x86-freebsd-6.so | Bin 179379 -> 0 bytes lib/sigar-bin/libsigar-x86-linux.so | Bin 233385 -> 0 bytes lib/sigar-bin/libsigar-x86-solaris.so | Bin 242880 -> 0 bytes lib/sigar-bin/sigar-amd64-winnt.dll | Bin 402432 -> 0 bytes lib/sigar-bin/sigar-x86-winnt.dll | Bin 266240 -> 0 bytes lib/sigar-bin/sigar-x86-winnt.lib | Bin 99584 -> 0 bytes lib/six-1.7.3-py2.py3-none-any.zip | Bin 9503 -> 0 bytes lib/slf4j-api-1.7.7.jar | Bin 29257 -> 0 bytes lib/snakeyaml-1.11.jar | Bin 270552 -> 0 bytes lib/snappy-java-1.1.1.7.jar | Bin 594033 -> 0 bytes lib/stream-2.5.2.jar | Bin 152489 -> 0 bytes lib/thrift-server-0.3.7.jar | Bin 39988 -> 0 bytes .../org/apache/cassandra/JStackJUnitTask.java | 122 ++++++ 123 files changed, 542 insertions(+), 7082 deletions(-) create mode 100644 .build/build-resolver.xml delete mode 100644 lib/ST4-4.0.8.jar delete mode 100644 lib/airline-0.6.jar delete mode 100644 lib/antlr-runtime-3.5.2.jar delete mode 100644 lib/asm-5.0.4.jar delete mode 100644 lib/cassandra-driver-core-3.0.1-shaded.jar delete mode 100644 lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip delete mode 100644 lib/commons-cli-1.1.jar delete mode 100644 lib/commons-codec-1.2.jar delete mode 100644 lib/commons-lang3-3.1.jar delete mode 100644 lib/commons-math3-3.2.jar delete mode 100644 lib/compress-lzf-0.8.4.jar delete mode 100644 lib/concurrentlinkedhashmap-lru-1.4.jar delete mode 100644 lib/disruptor-3.0.1.jar delete mode 100644 lib/ecj-4.4.2.jar delete mode 100644 lib/futures-2.1.6-py2.py3-none-any.zip delete mode 100644 lib/guava-18.0.jar delete mode 100644 lib/high-scale-lib-1.0.6.jar delete mode 100644 lib/jackson-core-asl-1.9.2.jar delete mode 100644 lib/jackson-mapper-asl-1.9.2.jar delete mode 100644 lib/jamm-0.3.0.jar delete mode 100644 lib/javax.inject.jar delete mode 100644 lib/jbcrypt-0.3m.jar delete mode 100644 lib/jcl-over-slf4j-1.7.7.jar delete mode 100644 lib/jna-4.2.2.jar delete mode 100644 lib/joda-time-2.4.jar delete mode 100644 lib/json-simple-1.1.jar delete mode 100644 lib/jstackjunit-0.0.1.jar delete mode 100644 lib/libthrift-0.9.2.jar delete mode 100644 lib/licenses/ST4-4.0.8.txt delete mode 100644 lib/licenses/airline-0.6.txt delete mode 100644 lib/licenses/antlr-runtime-3.5.2.txt delete mode 100644 lib/licenses/asm-5.0.4.txt delete mode 100644 lib/licenses/cassandra-driver-3.0.1.txt delete mode 100644 lib/licenses/commons-cli-1.1.txt delete mode 100644 lib/licenses/commons-codec-1.2.txt delete mode 100644 lib/licenses/commons-lang3-3.1.txt delete mode 100644 lib/licenses/commons-math3-3.2.txt delete mode 100644 lib/licenses/compress-lzf-0.8.4.txt delete mode 100644 lib/licenses/concurrentlinkedhashmap-lru-1.4.txt delete mode 100644 lib/licenses/disruptor-3.0.1.txt delete mode 100644 lib/licenses/ecj-4.4.2.txt delete mode 100644 lib/licenses/futures-2.1.6.txt delete mode 100644 lib/licenses/guava-18.0.txt delete mode 100644 lib/licenses/high-scale-lib-1.0.6.txt delete mode 100644 lib/licenses/jackson-core-asl-1.9.2.txt delete mode 100644 lib/licenses/jackson-mapper-asl-1.9.2.txt delete mode 100644 lib/licenses/jamm-0.3.0.txt delete mode 100644 lib/licenses/javax.inject.txt delete mode 100644 lib/licenses/jbcrypt-0.3m.txt delete mode 100644 lib/licenses/jcl-over-slf4j-1.7.7.txt delete mode 100644 lib/licenses/jna-4.2.2.txt delete mode 100644 lib/licenses/joda-time-2.4.txt delete mode 100644 lib/licenses/json-simple-1.1.txt delete mode 100644 lib/licenses/jstackjunit-0.0.1.txt delete mode 100644 lib/licenses/libthrift-0.9.2.txt delete mode 100644 lib/licenses/log4j-over-slf4j-1.7.7.txt delete mode 100644 lib/licenses/logback-classic-1.1.3.txt delete mode 100644 lib/licenses/logback-core-1.1.3.txt delete mode 100644 lib/licenses/lz4-1.3.0.txt delete mode 100644 lib/licenses/metrics-core-3.1.0.txt delete mode 100644 lib/licenses/metrics-jvm-3.1.0.txt delete mode 100644 lib/licenses/metrics-logback-3.1.0.txt delete mode 100644 lib/licenses/netty-all-4.0.44.Final.txt delete mode 100644 lib/licenses/ohc-0.4.3.txt delete mode 100644 lib/licenses/reporter-config-base-3.0.0.txt delete mode 100644 lib/licenses/reporter-config3-3.0.0.txt delete mode 100644 lib/licenses/sigar-1.6.4.txt delete mode 100644 lib/licenses/six-1.7.3.txt delete mode 100644 lib/licenses/slf4j-api-1.7.7.txt delete mode 100644 lib/licenses/snakeyaml-1.11.txt delete mode 100644 lib/licenses/snappy-java-1.1.1.7.txt delete mode 100644 lib/licenses/stream-2.5.2.txt delete mode 100644 lib/licenses/thrift-server-0.3.7.txt delete mode 100644 lib/log4j-over-slf4j-1.7.7.jar delete mode 100644 lib/logback-classic-1.1.3.jar delete mode 100644 lib/logback-core-1.1.3.jar delete mode 100644 lib/lz4-1.3.0.jar delete mode 100644 lib/metrics-core-3.1.0.jar delete mode 100644 lib/metrics-jvm-3.1.0.jar delete mode 100644 lib/metrics-logback-3.1.0.jar delete mode 100644 lib/netty-all-4.0.44.Final.jar delete mode 100644 lib/ohc-core-0.4.3.jar delete mode 100644 lib/ohc-core-j8-0.4.3.jar delete mode 100644 lib/reporter-config-base-3.0.0.jar delete mode 100644 lib/reporter-config3-3.0.0.jar delete mode 100644 lib/sigar-1.6.4.jar delete mode 100644 lib/sigar-bin/libsigar-amd64-freebsd-6.so delete mode 100644 lib/sigar-bin/libsigar-amd64-linux.so delete mode 100644 lib/sigar-bin/libsigar-amd64-solaris.so delete mode 100644 lib/sigar-bin/libsigar-ia64-hpux-11.sl delete mode 100644 lib/sigar-bin/libsigar-ia64-linux.so delete mode 100644 lib/sigar-bin/libsigar-pa-hpux-11.sl delete mode 100644 lib/sigar-bin/libsigar-ppc-aix-5.so delete mode 100644 lib/sigar-bin/libsigar-ppc-linux.so delete mode 100644 lib/sigar-bin/libsigar-ppc64-aix-5.so delete mode 100644 lib/sigar-bin/libsigar-ppc64-linux.so delete mode 100644 lib/sigar-bin/libsigar-s390x-linux.so delete mode 100644 lib/sigar-bin/libsigar-sparc-solaris.so delete mode 100644 lib/sigar-bin/libsigar-sparc64-solaris.so delete mode 100644 lib/sigar-bin/libsigar-universal-macosx.dylib delete mode 100644 lib/sigar-bin/libsigar-universal64-macosx.dylib delete mode 100644 lib/sigar-bin/libsigar-x86-freebsd-5.so delete mode 100644 lib/sigar-bin/libsigar-x86-freebsd-6.so delete mode 100644 lib/sigar-bin/libsigar-x86-linux.so delete mode 100644 lib/sigar-bin/libsigar-x86-solaris.so delete mode 100644 lib/sigar-bin/sigar-amd64-winnt.dll delete mode 100644 lib/sigar-bin/sigar-x86-winnt.dll delete mode 100644 lib/sigar-bin/sigar-x86-winnt.lib delete mode 100644 lib/six-1.7.3-py2.py3-none-any.zip delete mode 100644 lib/slf4j-api-1.7.7.jar delete mode 100644 lib/snakeyaml-1.11.jar delete mode 100644 lib/snappy-java-1.1.1.7.jar delete mode 100644 lib/stream-2.5.2.jar delete mode 100644 lib/thrift-server-0.3.7.jar create mode 100644 test/unit/org/apache/cassandra/JStackJUnitTask.java 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 @@ + + + -