diff --git a/CHANGES.txt b/CHANGES.txt index 18dca097ed..164470fb57 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -36,6 +36,8 @@ * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410) * Fix NPE issue in StorageService (CASSANDRA-13060) Merged from 2.2: + * upgrade JNA version to 4.4.0 (CASSANDRA-13072) + * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119) * Avoid starting gossiper in RemoveTest (CASSANDRA-13407) * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393) * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773) diff --git a/build.xml b/build.xml index ce12b90b5f..de6564a143 100644 --- a/build.xml +++ b/build.xml @@ -380,7 +380,7 @@ - + diff --git a/lib/jna-4.0.0.jar b/lib/jna-4.0.0.jar deleted file mode 100644 index 9038048dc2..0000000000 Binary files a/lib/jna-4.0.0.jar and /dev/null differ diff --git a/lib/jna-4.4.0.jar b/lib/jna-4.4.0.jar new file mode 100644 index 0000000000..521bd92f6a Binary files /dev/null and b/lib/jna-4.4.0.jar differ diff --git a/lib/licenses/jna-4.0.0.txt b/lib/licenses/jna-4.4.0.txt similarity index 100% rename from lib/licenses/jna-4.0.0.txt rename to lib/licenses/jna-4.4.0.txt