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
The following commit(s) were added to refs/heads/trunk by this push:
new b73f034 Upgrade JNA to 5.6.0
b73f034 is described below
commit b73f034da12ac5d3f5abb11733d6a1bef87f3af1
Author: Mick Semb Wever <[email protected]>
AuthorDate: Thu Nov 12 09:27:17 2020 +0100
Upgrade JNA to 5.6.0
Also remove remaining comments/doc referencing
`-Dcassandra.boot_without_jna`
patch by Adrain Cole, Mick Semb Wever; reviewed by Benjamin Lerer, Joey
Lynch for CASSANDRA-16212
Co-authored-by: Adrian Cole <[email protected]>
---
NEWS.txt | 2 ++
build.xml | 2 +-
doc/source/configuration/cass_env_sh_file.rst | 4 ----
lib/jna-4.2.2.jar | Bin 1137286 -> 0 bytes
lib/jna-5.6.0.jar | Bin 0 -> 1509440 bytes
lib/licenses/{jna-4.2.2.txt => jna-5.6.0.txt} | 0
.../org/apache/cassandra/service/StartupCheck.java | 3 +--
7 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/NEWS.txt b/NEWS.txt
index 7d16a97..de472c4 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -254,6 +254,8 @@ Upgrading
default (16) was meant for spinning disk volumes. See CASSANDRA-14902
for details.
- Custom compaction strategies must now handle getting sstables
added/removed notifications for
sstables already added/removed - see CASSANDRA-14103 for details.
+ - Support for JNA with glibc 2.6 and earlier has been removed. Centos 5,
Debian 4, and Ubuntu 7.10 operating systems
+ must be first upgraded. See CASSANDRA-16212 for more.
Deprecation
diff --git a/build.xml b/build.xml
index a02c566..f8183ae 100644
--- a/build.xml
+++ b/build.xml
@@ -607,7 +607,7 @@
<exclusion groupId="asm" artifactId="asm"/> <!-- this is the
outdated version 3.1 -->
<exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
</dependency>
- <dependency groupId="net.java.dev.jna" artifactId="jna"
version="4.2.2"/>
+ <dependency groupId="net.java.dev.jna" artifactId="jna"
version="5.6.0"/>
<dependency groupId="org.jacoco" artifactId="org.jacoco.agent"
version="${jacoco.version}"/>
<dependency groupId="org.jacoco" artifactId="org.jacoco.ant"
version="${jacoco.version}"/>
diff --git a/doc/source/configuration/cass_env_sh_file.rst
b/doc/source/configuration/cass_env_sh_file.rst
index 457f39f..eb48a51 100644
--- a/doc/source/configuration/cass_env_sh_file.rst
+++ b/doc/source/configuration/cass_env_sh_file.rst
@@ -18,10 +18,6 @@ Facilitates setting auto_bootstrap to false on initial
set-up of the cluster. Th
---------------------------------------------------------
In a multi-instance deployment, multiple Cassandra instances will
independently assume that all CPU processors are available to it. This setting
allows you to specify a smaller set of processors.
-``cassandra.boot_without_jna=true``
------------------------------------
-If JNA fails to initialize, Cassandra fails to boot. Use this command to boot
Cassandra without JNA.
-
``cassandra.config=<directory>``
--------------------------------
The directory location of the ``cassandra.yaml file``. The default location
depends on the type of installation.
diff --git a/lib/jna-4.2.2.jar b/lib/jna-4.2.2.jar
deleted file mode 100644
index a943670..0000000
Binary files a/lib/jna-4.2.2.jar and /dev/null differ
diff --git a/lib/jna-5.6.0.jar b/lib/jna-5.6.0.jar
new file mode 100644
index 0000000..fda5aa4
Binary files /dev/null and b/lib/jna-5.6.0.jar differ
diff --git a/lib/licenses/jna-4.2.2.txt b/lib/licenses/jna-5.6.0.txt
similarity index 100%
rename from lib/licenses/jna-4.2.2.txt
rename to lib/licenses/jna-5.6.0.txt
diff --git a/src/java/org/apache/cassandra/service/StartupCheck.java
b/src/java/org/apache/cassandra/service/StartupCheck.java
index 4d23098..649f13c 100644
--- a/src/java/org/apache/cassandra/service/StartupCheck.java
+++ b/src/java/org/apache/cassandra/service/StartupCheck.java
@@ -25,8 +25,7 @@ import org.apache.cassandra.exceptions.StartupException;
* information or advice on tuning and non-fatal environmental issues (e.g.
like
* checking for and warning about suboptimal JVM settings).
* Other checks may indicate that they system is not in a correct state to be
started.
- * Examples include inability to load JNA when the cassandra.boot_without_jna
option
- * is not set, missing or unaccessible data directories, unreadable sstables
and
+ * Examples include missing or unaccessible data directories, unreadable
sstables and
* misconfiguration of cluster_name in cassandra.yaml.
*
* The StartupChecks class manages a collection of these tests, which it
executes
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
