This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0bb1c511624ebb725acbb21c9059393001c31c17 Author: Bereng <berenguerbl...@gmail.com> AuthorDate: Mon Nov 16 09:43:46 2020 +0100 Update jctools from 1.2.1 to 3.1.0 patch by Berenguer Blasi; reviewed by Mick Semb Wever for CASSANDRA-16255 --- CHANGES.txt | 1 + build.xml | 2 +- ide/nbproject/project.xml | 2 +- lib/jctools-core-1.2.1.jar | Bin 106714 -> 0 bytes lib/jctools-core-3.1.0.jar | Bin 0 -> 323697 bytes .../{jctools-core-1.2.1.txt => jctools-core-3.1.0.txt} | 9 +++++---- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index beb878a..44c9787 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0-beta4 + * Update jctools dependency to 3.1.0 (CASSANDRA-16255) * 'SSLEngine closed already' exception on failed outbound connection (CASSANDRA-16277) * Drain and/or shutdown might throw because of slow messaging service shutdown (CASSANDRA-16276) * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems (CASSANDRA-16212) diff --git a/build.xml b/build.xml index 55c043f..7b17409 100644 --- a/build.xml +++ b/build.xml @@ -665,7 +665,7 @@ <dependency groupId="com.github.rholder" artifactId="snowball-stemmer" version="1.3.0.581.1" /> <dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees" version="2.4.0" /> <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.3.5" /> - <dependency groupId="org.jctools" artifactId="jctools-core" version="1.2.1"/> + <dependency groupId="org.jctools" artifactId="jctools-core" version="3.1.0"/> <dependency groupId="org.ow2.asm" artifactId="asm" version="${asm.version}" /> <dependency groupId="org.ow2.asm" artifactId="asm-tree" version="${asm.version}" /> <dependency groupId="org.ow2.asm" artifactId="asm-commons" version="${asm.version}" /> diff --git a/ide/nbproject/project.xml b/ide/nbproject/project.xml index 505a547..23427ee 100644 --- a/ide/nbproject/project.xml +++ b/ide/nbproject/project.xml @@ -7,7 +7,7 @@ <properties> <property name="project.dir">..</property> <!-- the compile classpaths should be distinct per compilation unit… but it is kept simple and the build will catch errors --> - <property name="cassandra.classpath.jars">${project.dir}/lib/HdrHistogram-2.1.9.jar:${project.dir}/lib/ST4-4.0.8.jar:${project.dir}/lib/airline-0.8.jar:${project.dir}/lib/antlr-runtime-3.5.2.jar:${project.dir}/lib/asm-7.1.jar:${project.dir}/lib/caffeine-2.3.5.jar:${project.dir}/lib/cassandra-driver-core-3.9.0-shaded.jar:${project.dir}/lib/chronicle-bytes-1.16.3.jar:${project.dir}/lib/chronicle-core-1.16.4.jar:${project.dir}/lib/chronicle-queue-4.16.3.jar:${project.dir}/li [...] + <property name="cassandra.classpath.jars">${project.dir}/lib/HdrHistogram-2.1.9.jar:${project.dir}/lib/ST4-4.0.8.jar:${project.dir}/lib/airline-0.8.jar:${project.dir}/lib/antlr-runtime-3.5.2.jar:${project.dir}/lib/asm-7.1.jar:${project.dir}/lib/caffeine-2.3.5.jar:${project.dir}/lib/cassandra-driver-core-3.9.0-shaded.jar:${project.dir}/lib/chronicle-bytes-1.16.3.jar:${project.dir}/lib/chronicle-core-1.16.4.jar:${project.dir}/lib/chronicle-queue-4.16.3.jar:${project.dir}/li [...] </properties> <folders> <source-folder> diff --git a/lib/jctools-core-1.2.1.jar b/lib/jctools-core-1.2.1.jar deleted file mode 100644 index fa1137b..0000000 Binary files a/lib/jctools-core-1.2.1.jar and /dev/null differ diff --git a/lib/jctools-core-3.1.0.jar b/lib/jctools-core-3.1.0.jar new file mode 100644 index 0000000..eb64344 Binary files /dev/null and b/lib/jctools-core-3.1.0.jar differ diff --git a/lib/licenses/jctools-core-1.2.1.txt b/lib/licenses/jctools-core-3.1.0.txt similarity index 99% rename from lib/licenses/jctools-core-1.2.1.txt rename to lib/licenses/jctools-core-3.1.0.txt index d645695..984f944 100644 --- a/lib/licenses/jctools-core-1.2.1.txt +++ b/lib/licenses/jctools-core-3.1.0.txt @@ -1,5 +1,4 @@ - - Apache License +Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -179,7 +178,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" + boilerplate notice, with the fields enclosed by brackets "{}" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -187,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright {yyyy} {name of copyright owner} Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -200,3 +199,5 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org