This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from e5bc257  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 3259d6d  Migrate dependency handling from maven-ant-tasks to 
resolver-ant-tasks
     new 3d7c824  Offline build mode
     new 6bf9b8b  Update IDE, Eclipse and NetBeans, classpaths for tests
     new e243026  Don't put apidocs (javadoc) into the binary artifact
     new d3e174f  Fix broken IntelliJ configuration Authored by Jacek 
Lewandowski; reviewed by Ekaterina Dimitrova and Michael Semb Wever for 
CASSANDRA-16618
     new 27de93e  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 2fdf1d2  Migrate dependency handling from maven-ant-tasks to 
resolver-ant-tasks
     new e695051  Offline build mode
     new c44dfab  Add JStackJUnitTask to avoid downloading the jar
     new fd77323  Update IDE, Eclipse and NetBeans, classpaths for tests
     new b2cfe2e  Fix warning about multiple versions of ant detected when 
running ant test patch by Ekaterina Dimitrova; reviewed by Brandon Williams and 
Mick Semb Wever for CASSANDRA-16571
     new 7fafda8  Don't fork jvms in the build
     new 3e54ed7  Don't put apidocs (javadoc) into the binary artifact
     new 8857d04  Fix broken IntelliJ configuration Authored by Jacek 
Lewandowski; reviewed by Ekaterina Dimitrova and Michael Semb Wever for 
CASSANDRA-16618
     new 4950878  update IDEA setup generation to mark test/conf as test 
resources

The 15 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .build/build-rat.xml                               |  12 +-
 .build/build-resolver.xml                          | 246 ++++++++++++
 .circleci/license.yml                              |   1 -
 .gitignore                                         |  13 +-
 CHANGES.txt                                        |   2 +
 build.xml                                          | 442 ++++++++-------------
 debian/cassandra.install                           |   1 -
 ide/idea-iml-file.xml                              |  20 +-
 lib/HdrHistogram-2.1.9.jar                         | Bin 114165 -> 0 bytes
 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/caffeine-2.2.6.jar                             | Bin 947685 -> 0 bytes
 lib/cassandra-driver-core-3.0.1-shaded.jar         | Bin 2445093 -> 0 bytes
 lib/cassandra-driver-internal-only-3.10.zip        | Bin 256997 -> 0 bytes
 ...sandra-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.9.jar                          | Bin 263965 -> 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/concurrent-trees-2.4.0.jar                     | Bin 118696 -> 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/hppc-0.5.4.jar                                 | Bin 1305173 -> 0 bytes
 lib/jackson-annotations-2.9.10.jar                 | Bin 66894 -> 0 bytes
 lib/jackson-core-2.9.10.jar                        | Bin 325636 -> 0 bytes
 lib/jackson-databind-2.9.10.8.jar                  | Bin 1350092 -> 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/jctools-core-1.2.1.jar                         | Bin 106714 -> 0 bytes
 lib/jflex-1.6.0.jar                                | Bin 1048692 -> 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/caffeine-2.2.6.txt                    | 202 ----------
 lib/licenses/cassandra-driver-3.0.1.txt            | 177 ---------
 lib/licenses/commons-cli-1.1.txt                   | 202 ----------
 lib/licenses/commons-codec-1.9.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 -
 lib/licenses/concurrent-trees-2.4.0.txt            | 201 ----------
 lib/licenses/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/hdrhistogram-2.1.9.txt                |  41 --
 lib/licenses/high-scale-lib-1.0.6.txt              |  29 --
 lib/licenses/hppc-0.5.4.txt                        | 202 ----------
 lib/licenses/jackson-core-asl-1.9.13.txt           | 202 ----------
 lib/licenses/jackson-mapper-asl-1.9.13.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/jctools-core-1.2.1.txt                | 202 ----------
 lib/licenses/jflex-1.6.0.txt                       | 201 ----------
 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.5.txt                | 202 ----------
 lib/licenses/metrics-jvm-3.1.5.txt                 | 202 ----------
 lib/licenses/metrics-logback-3.1.5.txt             | 202 ----------
 lib/licenses/netty-all-4.0.44.Final.txt            | 202 ----------
 lib/licenses/ohc-0.4.4.txt                         | 201 ----------
 lib/licenses/reporter-config-base-3.0.3.txt        | 177 ---------
 lib/licenses/reporter-config3-3.0.3.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/snowball-stemmer-1.3.0.581.1.txt      |  15 -
 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.5.jar                         | Bin 120465 -> 0 bytes
 lib/metrics-jvm-3.1.5.jar                          | Bin 39283 -> 0 bytes
 lib/metrics-logback-3.1.5.jar                      | Bin 4136 -> 0 bytes
 lib/netty-all-4.0.44.Final.jar                     | Bin 2342652 -> 0 bytes
 lib/ohc-core-0.4.4.jar                             | Bin 135369 -> 0 bytes
 lib/ohc-core-j8-0.4.4.jar                          | Bin 4995 -> 0 bytes
 lib/reporter-config-base-3.0.3.jar                 | Bin 29055 -> 0 bytes
 lib/reporter-config3-3.0.3.jar                     | Bin 33167 -> 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
 lib/sigar-bin/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/snowball-stemmer-1.3.0.581.1.jar               | Bin 93019 -> 0 bytes
 lib/stream-2.5.2.jar                               | Bin 152489 -> 0 bytes
 lib/thrift-server-0.3.7.jar                        | Bin 39988 -> 0 bytes
 .../unit/org/apache/cassandra/JStackJUnitTask.java | 122 ++++++
 139 files changed, 543 insertions(+), 8199 deletions(-)
 create mode 100644 .build/build-resolver.xml
 delete mode 100644 lib/HdrHistogram-2.1.9.jar
 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/caffeine-2.2.6.jar
 delete mode 100644 lib/cassandra-driver-core-3.0.1-shaded.jar
 delete mode 100644 lib/cassandra-driver-internal-only-3.10.zip
 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.9.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/concurrent-trees-2.4.0.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/hppc-0.5.4.jar
 delete mode 100644 lib/jackson-annotations-2.9.10.jar
 delete mode 100644 lib/jackson-core-2.9.10.jar
 delete mode 100644 lib/jackson-databind-2.9.10.8.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/jctools-core-1.2.1.jar
 delete mode 100644 lib/jflex-1.6.0.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/caffeine-2.2.6.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.9.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/concurrent-trees-2.4.0.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/hdrhistogram-2.1.9.txt
 delete mode 100644 lib/licenses/high-scale-lib-1.0.6.txt
 delete mode 100644 lib/licenses/hppc-0.5.4.txt
 delete mode 100644 lib/licenses/jackson-core-asl-1.9.13.txt
 delete mode 100644 lib/licenses/jackson-mapper-asl-1.9.13.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/jctools-core-1.2.1.txt
 delete mode 100644 lib/licenses/jflex-1.6.0.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.5.txt
 delete mode 100644 lib/licenses/metrics-jvm-3.1.5.txt
 delete mode 100644 lib/licenses/metrics-logback-3.1.5.txt
 delete mode 100644 lib/licenses/netty-all-4.0.44.Final.txt
 delete mode 100644 lib/licenses/ohc-0.4.4.txt
 delete mode 100644 lib/licenses/reporter-config-base-3.0.3.txt
 delete mode 100644 lib/licenses/reporter-config3-3.0.3.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/snowball-stemmer-1.3.0.581.1.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.5.jar
 delete mode 100644 lib/metrics-jvm-3.1.5.jar
 delete mode 100644 lib/metrics-logback-3.1.5.jar
 delete mode 100644 lib/netty-all-4.0.44.Final.jar
 delete mode 100644 lib/ohc-core-0.4.4.jar
 delete mode 100644 lib/ohc-core-j8-0.4.4.jar
 delete mode 100644 lib/reporter-config-base-3.0.3.jar
 delete mode 100644 lib/reporter-config3-3.0.3.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/snowball-stemmer-1.3.0.581.1.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

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to